commit 26967617a30e55aedc98b8f14b841d88469abd0e
author Bram Moolenaar <Bram@vim.org> Sun Mar 17 17:13:16 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Mar 17 17:13:16 2019 +0100
tree 0db92ea69e6ff8e9c3d4aca63ffed3bd129b5f9d
parent 049ca59236d5a981f23cf5dfe40f54536fe7cad2

Update runtime files.

runtime/doc/autocmd.txt

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 087e31a..6480d72 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.1.  Last change: 2019 Jan 19
+*autocmd.txt*   For Vim version 8.1.  Last change: 2019 Mar 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -621,6 +621,8 @@
 				Not triggered when there is typeahead or when
 				an operator is pending.
 				For an example see |match-parens|.
+				Note: This can not be skipped with
+				`:noautocmd`.
 				Careful: This is triggered very often, don't
 				do anything that the user does not expect or
 				that is slow.
@@ -1024,6 +1026,8 @@
 				was defined).
 				Not triggered when there is typeahead or when
 				an operator is pending.
+				Note: This can not be skipped with
+				`:noautocmd`.
 				Careful: This is triggered very often, don't
 				do anything that the user does not expect or
 				that is slow.
@@ -1465,8 +1469,8 @@
 instead of ":q!".
 
 							*autocmd-nested* *E218*
-By default, autocommands do not nest.  If you use ":e" or ":w" in an
-autocommand, Vim does not execute the BufRead and BufWrite autocommands for
+By default, autocommands do not nest.  For example, if you use ":e" or ":w" in
+an autocommand, Vim does not execute the BufRead and BufWrite autocommands for
 those commands.  If you do want this, use the "nested" flag for those commands
 in which you want nesting.  For example: >
   :autocmd FileChangedShell *.c nested e!
@@ -1612,5 +1616,8 @@
 This will write the file without triggering the autocommands defined by the
 gzip plugin.
 
+Note that some autocommands are not triggered right away, but only later.
+This specifically applies to |CursorMoved| and |TextChanged|.
+
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/diff.txt

diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 6670f45..6b638fa 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.1.  Last change: 2017 Oct 03
+*diff.txt*      For Vim version 8.1.  Last change: 2019 Feb 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -179,8 +179,8 @@
 need another buffer.  This command is useful: >
 	 command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
 	 	\ | diffthis | wincmd p | diffthis
-(this is in |vimrc_example.vim|).  Use ":DiffOrig" to see the differences
-between the current buffer and the file it was loaded from.
+(this is in |defaults.vim|).  Use ":DiffOrig" to see the differences between
+the current buffer and the file it was loaded from.
 
 A buffer that is unloaded cannot be used for the diff.  But it does work for
 hidden buffers.  You can use ":hide" to close a window without unloading the

runtime/doc/index.txt

diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 005bdae..2406a27 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 8.1.  Last change: 2019 Feb 22
+*index.txt*     For Vim version 8.1.  Last change: 2019 Mar 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -544,10 +544,8 @@
 |CTRL-W_CTRL-]|	CTRL-W CTRL-]	   same as "CTRL-W ]"
 |CTRL-W_CTRL-^|	CTRL-W CTRL-^	   same as "CTRL-W ^"
 |CTRL-W_CTRL-_|	CTRL-W CTRL-_	   same as "CTRL-W _"
-|CTRL-W_quote|	CTRL-W "	   terminal window: paste register
 |CTRL-W_+|	CTRL-W +	   increase current window height N lines
 |CTRL-W_-|	CTRL-W -	   decrease current window height N lines
-|CTRL-W_.|	CTRL-W .	   terminal window: type CTRL-W
 |CTRL-W_:|	CTRL-W :	   same as |:|, edit a command line
 |CTRL-W_<|	CTRL-W <	   decrease current window width N columns
 |CTRL-W_=|	CTRL-W =	   make all windows the same height & width
@@ -556,7 +554,6 @@
 |CTRL-W_J|	CTRL-W J	   move current window to the very bottom
 |CTRL-W_K|	CTRL-W K	   move current window to the very top
 |CTRL-W_L|	CTRL-W L	   move current window to the far right
-|CTRL-W_N|	CTRL-W N	   terminal window: go to Terminal Normal mode
 |CTRL-W_P|	CTRL-W P	   go to preview window
 |CTRL-W_R|	CTRL-W R	   rotate windows upwards N times
 |CTRL-W_S|	CTRL-W S	   same as "CTRL-W s"
@@ -586,6 +583,8 @@
 |CTRL-W_gF|	CTRL-W g F	   edit file name under the cursor in a new
 				   tab page and jump to the line number
 				   following the file name.
+|CTRL-W_gt|	CTRL-W g t	   same as `gt`: go to next tab page
+|CTRL-W_gT|	CTRL-W g T	   same as `gT`: go to previous tab page
 |CTRL-W_h|	CTRL-W h	   go to Nth left window (stop at first window)
 |CTRL-W_i|	CTRL-W i	   split window and jump to declaration of
 				   identifier under the cursor
@@ -875,7 +874,7 @@
 
 These can be used after an operator, but before a {motion} has been entered.
 
-tag		char		action in Insert mode	~
+tag		char		action in Operator-pending mode	~
 -----------------------------------------------------------------------
 |o_v|		v		force operator to work characterwise
 |o_V|		V		force operator to work linewise
@@ -1003,7 +1002,7 @@
 "Completion" below refers to context-sensitive completion.  It will complete
 file names, tags, commands etc. as appropriate.
 
-tag		command	      action in Command-line editing mode	~
+tag		command		action in Command-line editing mode	~
 ------------------------------------------------------------------------------
 		CTRL-@		not used
 |c_CTRL-A|	CTRL-A		do completion on the pattern in front of the
@@ -1100,16 +1099,19 @@
 a terminal window. Switch to Terminal-Normal mode to use them.
 This assumes 'termwinkey' is not set.
 
-tag		char		action in Insert mode	~
+tag		char		action in Terminal-Job mode	~
 -----------------------------------------------------------------------
 |t_CTRL-\_CTRL-N| CTRL-\ CTRL-N	switch to Terminal-Normal mode
-|CTRL-W_N|	CTRL-W N	switch to Terminal-Normal mode
-|CTRL-W_:|	CTRL-W :	enter an Ex command
-|CTRL-W_.|	CTRL-W .	type CTRL-W in the terminal
+|t_CTRL-W_N|	CTRL-W N	switch to Terminal-Normal mode
+|t_CTRL-W_:|	CTRL-W :	enter an Ex command
+|t_CTRL-W_.|	CTRL-W .	type CTRL-W in the terminal
 		CTRL-W CTRL-\	send a CTRL-\ to the job in the terminal
-|CTRL-W_quote|	CTRL-W " {0-9a-z"%#*:=}
+|t_CTRL-W_quote|	CTRL-W " {0-9a-z"%#*:=}
 				paste register in the terminal
 |t_CTRL-W_CTRL-C| CTRL-W CTRL-C	forcefully ends the job
+|t_CTRL-W_CTRL-W| CTRL-W CTRL-W   move focus to the next window
+|t_CTRL-W_gt|	CTRL-W gt	go to next tabpage, same as `gt`
+|t_CTRL-W_gT|	CTRL-W gT	go to previous tabpage, same as `gT`
 
 You found it, Arthur!				*holy-grail* *:smile*
 
@@ -1120,7 +1122,7 @@
 mentioning any arguments.  The optional part of the command name is inside [].
 The commands are sorted on the non-optional part of their name.
 
-tag	      command	      action ~
+tag		command		action ~
 ------------------------------------------------------------------------------
 |:!|		:!		filter lines or execute an external command
 |:!!|		:!!		repeat last ":!" command

runtime/doc/motion.txt

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 77ec53f..7ebdee6 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.1.  Last change: 2018 Dec 27
+*motion.txt*    For Vim version 8.1.  Last change: 2019 Mar 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -320,7 +320,7 @@
 G			Goto line [count], default last line, on the first
 			non-blank character |linewise|.  If 'startofline' not
 			set, keep the same column.
-			G is a one of |jump-motions|.
+			G is one of the |jump-motions|.
 
 							*<C-End>*
 <C-End>			Goto line [count], default last line, on the last
@@ -1021,7 +1021,7 @@
 
 A "jump" is a command that normally moves the cursor several lines away.  If
 you make the cursor "jump" the position of the cursor before the jump is
-remembered.  You can return to that position with the "''" and "``" command,
+remembered.  You can return to that position with the "''" and "``" commands,
 unless the line containing that position was changed or deleted.  The
 following commands are "jump" commands: "'", "`", "G", "/", "?", "n", "N",
 "%", "(", ")", "[[", "]]", "{", "}", ":s", ":tag", "L", "M", "H" and the

runtime/doc/options.txt

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3554e96..97dbb5a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2019 Feb 19
+*options.txt*	For Vim version 8.1.  Last change: 2019 Mar 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -383,9 +383,9 @@
 
 			When the optional FALLBACK argument is present, a
 			later :setfiletype command will override the
-			'filetype'.  This is to used for filetype detections
-			that are just a guess.  |did_filetype()| will return
-			false after this command.
+			'filetype'.  This is to be used for filetype
+			detections that are just a guess.  |did_filetype()|
+			will return false after this command.
 
 			{not in Vi}
 

runtime/doc/pi_netrw.txt

diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 478338e..2b7e565 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -3504,7 +3504,7 @@
 			- Click "Add..."
 			- Set External Editor (adjust path as needed, include
 			  the quotes and !.! at the end):
-			    "c:\Program Files\Vim\vim70\gvim.exe" !.!
+			    "c:\Program Files\Vim\vim81\gvim.exe" !.!
 			- Check that the filetype in the box below is
 			  {asterisk}.{asterisk} (all files), or whatever types
 			  you want (cec: change {asterisk} to * ; I had to
@@ -3754,8 +3754,8 @@
 
 The <netrw.vim> script is typically installed on systems as something like:
 >
-	/usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
-	/usr/local/share/vim/vim7x/autoload/netrw.vim
+	/usr/local/share/vim/vim8x/plugin/netrwPlugin.vim
+	/usr/local/share/vim/vim8x/autoload/netrw.vim
 		(see output of :echo &rtp)
 <
 which is loaded automatically at startup (assuming :set nocp).  If you

runtime/doc/spell.txt

diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index cee9e01..c7c83aa 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -312,25 +312,25 @@
   spell file is used.
 
 For example, with these values:
-	'runtimepath' is "~/.vim,/usr/share/vim70,~/.vim/after"
+	'runtimepath' is "~/.vim,/usr/share/vim81,~/.vim/after"
 	'encoding'    is "iso-8859-2"
 	'spelllang'   is "pl"
 
 Vim will look for:
 1. ~/.vim/spell/pl.iso-8859-2.spl
-2. /usr/share/vim70/spell/pl.iso-8859-2.spl
+2. /usr/share/vim81/spell/pl.iso-8859-2.spl
 3. ~/.vim/spell/pl.iso-8859-2.add.spl
-4. /usr/share/vim70/spell/pl.iso-8859-2.add.spl
+4. /usr/share/vim81/spell/pl.iso-8859-2.add.spl
 5. ~/.vim/after/spell/pl.iso-8859-2.add.spl
 
 This assumes 1. is not found and 2. is found.
 
 If 'encoding' is "latin1" Vim will look for:
 1. ~/.vim/spell/pl.latin1.spl
-2. /usr/share/vim70/spell/pl.latin1.spl
+2. /usr/share/vim81/spell/pl.latin1.spl
 3. ~/.vim/after/spell/pl.latin1.spl
 4. ~/.vim/spell/pl.ascii.spl
-5. /usr/share/vim70/spell/pl.ascii.spl
+5. /usr/share/vim81/spell/pl.ascii.spl
 6. ~/.vim/after/spell/pl.ascii.spl
 
 This assumes none of them are found (Polish doesn't make sense when leaving

runtime/doc/tags

diff --git a/runtime/doc/tags b/runtime/doc/tags
index df34ced..a9df438 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3645,7 +3645,6 @@
 CTRL-W	index.txt	/*CTRL-W*
 CTRL-W_+	windows.txt	/*CTRL-W_+*
 CTRL-W_-	windows.txt	/*CTRL-W_-*
-CTRL-W_.	terminal.txt	/*CTRL-W_.*
 CTRL-W_:	windows.txt	/*CTRL-W_:*
 CTRL-W_<	windows.txt	/*CTRL-W_<*
 CTRL-W_<BS>	windows.txt	/*CTRL-W_<BS>*
@@ -3685,7 +3684,6 @@
 CTRL-W_J	windows.txt	/*CTRL-W_J*
 CTRL-W_K	windows.txt	/*CTRL-W_K*
 CTRL-W_L	windows.txt	/*CTRL-W_L*
-CTRL-W_N	terminal.txt	/*CTRL-W_N*
 CTRL-W_P	windows.txt	/*CTRL-W_P*
 CTRL-W_R	windows.txt	/*CTRL-W_R*
 CTRL-W_S	windows.txt	/*CTRL-W_S*
@@ -3700,9 +3698,11 @@
 CTRL-W_d	tagsrch.txt	/*CTRL-W_d*
 CTRL-W_f	windows.txt	/*CTRL-W_f*
 CTRL-W_gF	windows.txt	/*CTRL-W_gF*
+CTRL-W_gT	windows.txt	/*CTRL-W_gT*
 CTRL-W_g]	windows.txt	/*CTRL-W_g]*
 CTRL-W_g_CTRL-]	windows.txt	/*CTRL-W_g_CTRL-]*
 CTRL-W_gf	windows.txt	/*CTRL-W_gf*
+CTRL-W_gt	windows.txt	/*CTRL-W_gt*
 CTRL-W_g}	windows.txt	/*CTRL-W_g}*
 CTRL-W_h	windows.txt	/*CTRL-W_h*
 CTRL-W_i	tagsrch.txt	/*CTRL-W_i*
@@ -3713,7 +3713,6 @@
 CTRL-W_o	windows.txt	/*CTRL-W_o*
 CTRL-W_p	windows.txt	/*CTRL-W_p*
 CTRL-W_q	windows.txt	/*CTRL-W_q*
-CTRL-W_quote	terminal.txt	/*CTRL-W_quote*
 CTRL-W_r	windows.txt	/*CTRL-W_r*
 CTRL-W_s	windows.txt	/*CTRL-W_s*
 CTRL-W_t	windows.txt	/*CTRL-W_t*
@@ -8251,6 +8250,7 @@
 quickfix	quickfix.txt	/*quickfix*
 quickfix-6	version6.txt	/*quickfix-6*
 quickfix-ID	quickfix.txt	/*quickfix-ID*
+quickfix-buffer	quickfix.txt	/*quickfix-buffer*
 quickfix-changedtick	quickfix.txt	/*quickfix-changedtick*
 quickfix-context	quickfix.txt	/*quickfix-context*
 quickfix-directory-stack	quickfix.txt	/*quickfix-directory-stack*
@@ -8826,7 +8826,14 @@
 t_BD	term.txt	/*t_BD*
 t_BE	term.txt	/*t_BE*
 t_CS	term.txt	/*t_CS*
+t_CTRL-W_.	terminal.txt	/*t_CTRL-W_.*
+t_CTRL-W_:	terminal.txt	/*t_CTRL-W_:*
 t_CTRL-W_CTRL-C	terminal.txt	/*t_CTRL-W_CTRL-C*
+t_CTRL-W_CTRL-W	terminal.txt	/*t_CTRL-W_CTRL-W*
+t_CTRL-W_N	terminal.txt	/*t_CTRL-W_N*
+t_CTRL-W_gT	terminal.txt	/*t_CTRL-W_gT*
+t_CTRL-W_gt	terminal.txt	/*t_CTRL-W_gt*
+t_CTRL-W_quote	terminal.txt	/*t_CTRL-W_quote*
 t_CTRL-\_CTRL-N	terminal.txt	/*t_CTRL-\\_CTRL-N*
 t_CV	term.txt	/*t_CV*
 t_Ce	term.txt	/*t_Ce*

runtime/doc/tagsrch.txt

diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 865fcb1..ef1e515 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.1.  Last change: 2019 Feb 13
+*tagsrch.txt*   For Vim version 8.1.  Last change: 2019 Feb 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -578,7 +578,7 @@
 		the bar) and ;" is used to have Vi ignore the rest of the
 		line.  Example:
 			APP	file.c	call cursor(3, 4)|;"	v
-			
+
 {field} ..	A list of optional fields.  Each field has the form:
 
 			<Tab>{fieldname}:{value}

runtime/doc/terminal.txt

diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 297f37a..006422d 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.1.  Last change: 2019 Feb 22
+*terminal.txt*	For Vim version 8.1.  Last change: 2019 Feb 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -66,22 +66,23 @@
 the job.  This uses a pty when possible.  You can click outside of the
 terminal window to move keyboard focus elsewhere.
 
+						*t_CTRL-W_CTRL-W* *t_CTRL-W_:*
 CTRL-W can be used to navigate between windows and other CTRL-W commands, e.g.:
 	CTRL-W CTRL-W	move focus to the next window
 	CTRL-W :	enter an Ex command
 See |CTRL-W| for more commands.
 
-Special in the terminal window:			*CTRL-W_.*  *CTRL-W_N* 
+Special in the terminal window:			*t_CTRL-W_.*  *t_CTRL-W_N* 
 	CTRL-W .	send a CTRL-W to the job in the terminal
 	CTRL-W CTRL-\	send a CTRL-\ to the job in the terminal
 	CTRL-W N	go to Terminal-Normal mode, see |Terminal-mode|
 	CTRL-\ CTRL-N   go to Terminal-Normal mode, see |Terminal-mode|
-	CTRL-W " {reg}  paste register {reg}		*CTRL-W_quote*
+	CTRL-W " {reg}  paste register {reg}		*t_CTRL-W_quote*
 			Also works with the = register to insert the result of
 			evaluating an expression.
 	CTRL-W CTRL-C	ends the job, see below |t_CTRL-W_CTRL-C|
-	CTRL-W gt	go to next tabpage, same as `gt`
-	CTRL-W gT	go to previous tabpage, same as `gT`
+	CTRL-W gt	go to next tabpage, same as `gt`	*t_CTRL-W_gt*
+	CTRL-W gT	go to previous tabpage, same as `gT`	*t_CTRL-W_gT*
 
 See option 'termwinkey' for specifying another key instead of CTRL-W that
 will work like CTRL-W.  However, typing 'termwinkey' twice sends 'termwinkey'
@@ -92,8 +93,8 @@
 	'termwinkey' .	       send 'termwinkey' to the job in the terminal
 	'termwinkey' CTRL-\    send a CTRL-\ to the job in the terminal
 	'termwinkey' N	       go to terminal Normal mode, see below
-	'termwinkey' CTRL-N    same as CTRL-W N
-	'termwinkey' CTRL-C    same as |t_CTRL-W_CTRL-C|
+	'termwinkey' CTRL-N    same as CTRL-W N |t_CTRL-W_N|
+	'termwinkey' CTRL-C    same as CTRL-W CTRL-C |t_CTRL-W_CTRL-C|
 							*t_CTRL-\_CTRL-N*
 The special key combination CTRL-\ CTRL-N can be used to switch to Normal
 mode, just like this works in any other mode.

runtime/doc/todo.txt

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index bbba024..7f512ea 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Feb 22
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Mar 14
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,15 +38,16 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Check https://github.com/macvim-dev/macvim/issues/861. 
->
-Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
+Patch to add Farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
 Added test, updates, June 23.
 Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
 Remark from Ameretat Reith (2014 Oct 13) with patch on top.
+Updated patch from Ameretat Reith, 2019 Mar 1.
 
 Timer test doesn't work on MS-Windows console, any way to make it work?
 
+Drop FEAT_TAG_ANYWHITE ?  It should not be a compile time option.
+
 'incsearch' with :s: (#3321)
 - Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
   was set. (#3837)
@@ -113,6 +114,13 @@
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
+Support for popup widows:
+- Use text properties to define highlighting.
+- Proposal on issue #4063
+
+Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
+(#4087)
+
 Problem with Visual yank when 'linebreak' and 'showbreak' are set.
 Patch with tests, but it's not clear how it is supposed to work. (tommm, 2018
 Nov 17)  Asked about this, Dec 22. Christian will have a look.
@@ -121,6 +129,14 @@
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
 
+Patch for 'listchars' when there is a composing character on a space.
+How about when there is a double-width composing character on a space?
+(Yasuhiro Matsumoto, #4046)
+Test doesn't fail without patch?
+
+Patch to add ruby cflags. (#4050, fixes #1081)
+Needs modification.
+
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
 
@@ -131,10 +147,6 @@
 files that source the actual file.  E.g. menu_da_de -> menu_da
 Include part of #3242?
 
-Improvement for :terminal winpty/conpty option.  Ozaki Kiichi, #3905
-
-Patch to avoid compiler warnings. (Yasuhiro Matsumoto, #3979)
-
 When a terminal exit_cb closes the window, a following typed key is lost, if
 it's in a mapping. (2018 Oct 6, #2302, #3522)
 
@@ -147,20 +159,40 @@
 Internal diff doesn't handle binary file like external diff does. (Mike
 Williams, 2018 Oct 30)
 
-Patch to fix that dosinstall still has buffer overflow problems. (Yasuhiro
-Matsumoto, #4002)
-
 Problem with :tlmenu: Detach item added with all modes?  Issue #3563.
 
-Patch to reduce amount of memory used by functions that keep reference.
-(ichizok, #3961)
+Bug: script written with "-W scriptout" contains Key codes, while the script
+read with "-s scriptin" expects escape codes.  Probably "scriptout" needs to
+be adjusted. (Daniel Steinberg, 2019 Feb 24, #4041)
+
+Patch to move insert-expand code to insexpand.c. (Yegappan Lakshmanan, #4044)
+
+Patch for larger icons in installer. (#978)  Still not good.
+
+Patch on issue #3964 to let sign column stop at the last buffer line.
+(Christian Brabandt, 2019 Feb 24)
 
 Patch to use wide font functions. (Ken Takata, 2019 Feb 18, #4000)
 
+Patch on #4073, Andy Massimino.  Is this a real problem?
+
+Bug: "vipgw" does not put cursor back where it belongs. (Jason Franklin, 2019
+Mar 5)
+
+Patch to add blob2str() and str2blob(). (Yasuhiro Matsumoto, #4049)
+Make docs clearer. Is it symmetric?
+
 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.
 
+Using "5gj" starting inside a closed fold does not work on screen lines but on
+text lines. (Julius Hulsmann, #4095)
+
+Add "-once" to ":autocmd". Also add "-nested" as an alias for "nested".
+(Justin M. Keyes, #4100)  Syntax of -once may be strange.  ++once and ++nested
+is better?
+
 C syntax: {} inside () causes following {} to be highlighted as error.
 (Michalis Giannakidis, 2006 Jun 1)
 
@@ -170,6 +202,8 @@
 Check: __attribute__((format(printf, on semsg() and siemsg().  Where was this
 added?
 
+Patch to remove some unneeded {}. (Hirohito Higashi, #3982)
+
 Make balloon_show() work outside of 'balloonexpr'?  Users expect it to work:
 #2948. (related to #1512?)
 On Win32 it stops showing, because showState is already ShS_SHOWING.
@@ -181,6 +215,8 @@
 2018 Sep 14)
 Another request: #3811.
 
+Patch for autoconf to add -fPIC for Fedora. (#4047)
+
 Height of quickfix window is not retained with vertical splits. (Lifepillar,
 2018 Aug 24, #2998)
 Patch on the issue by Hongbo Liu, 2019 Feb 19 #4013
@@ -200,11 +236,17 @@
 
 Patch to make vim_getenv() work with wide API. (Ken Takata, #4008)
 
+How to make (async) complete function depending on completion type?
+Patch on #4083 to do this with an autocommand.  Probably want something else,
+like 'ominfunc'.
+
 Patch to add equal field to complete items. (#3887)
 
 When using exclusive selection and vi" that fails, cursor moves to the left.
 Cursor should not move. (#4024)
 
+Patch to fix handling long line in tags file.  #4051, #4084 (Andy Massimino)
+
 Patch to fix that executable() may fail on very long filename in MS-Windows.
 (Ken Takata, 2016 Feb 1, update 2018 Oct 7, update 2019 Feb 19)
 Now in pull request #4015.
@@ -273,8 +315,7 @@
 #3405)  Introduced by 8.0.1517, which was fixing another memory access error.
 (Sep 8)
 
-Patch to add complete_mode().  Shougo - #3866.  Alternate patch by Hirohito
-Higashi, 2019 Jan 27, included now?
+Patch to add complete_info  Shougo - #3866.  Ready to include.
 
 Patch to make winnr() return the window above/below/beside a window.
 (Yegappan Lakshmanan, #3993)
@@ -290,7 +331,7 @@
 when possible. (Dylan Lloyd, #3973)
 
 Tag stack is incorrect after CTRL-T and then :tag. (Andy Massimino, 2019 Feb
-12, #3944)  With Patch for a solution.  Needs a test.
+12, #3944)  With Patch for a solution (Feb 23).  Needs a test.
 
 Patch to implement 'diffref' option. (#3535)
   Easier to use a 'diffmaster' option, is the extra complexity needed?
@@ -442,9 +483,6 @@
 Also reproduced by Benjamin Doherty, 2018 Oct 4.
 Simpler way: Ken Takata, Oct 6.
 
-Window size is wrong when using quickfix window. (Lifepillar, 2018 Aug 24,
-#2999)
-
 Add more testing of the GTK GUI.
 - gtk_test_widget_click() can be used to simulate a click in a widget.
 
@@ -452,11 +490,6 @@
 - Test_setbufvar_options()
 - Test_exit_callback_interval()
 
-When using CTRL-W CR in the quickfix window, the jumplist in the opened window
-is cleared, to avoid going back to the list of errors buffer (would have two
-windows with it).  Can we just remove the jump list entries for the quickfix
-buffer?
-
 Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6)
 Update Sep 7.  Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1.
 Patch to be able to disable default digraphs (incomplete) (Eric Pruitt, 2018
@@ -512,9 +545,6 @@
 ":au * * command" should not be allowed, only use * for event when listing or
 deleting autocmds, not when adding them.
 
-Quickfix window height is not kept with a vertical split. (Lifepillar, 2018
-Jun 10, #2998)
-
 Alternative manpager.vim. (Enno, 2018 Jan 5, #2529)
 
 Delete all the specific stuff for the Borland compiler? (#3374)
@@ -866,9 +896,6 @@
 buffer is not deleted when using the session file. (#1393)
 Should add the buffer in hidden state.
 
-When an item in the quickfix list has a file name that does not exist, behave
-like the item was not a match for :cnext.
-
 Wrong diff highlighting with three files. (2016 Oct 20, #1186)
 Also get E749 on exit.
 Another example in #1309
@@ -974,10 +1001,6 @@
 Window resizing with 'winfixheight': With a vertical split the height changes
 anyway. (Tommy allen, 2017 Feb 21, #1502)
 
-When adding an item to a new quickfix list make ":cnext" jump to that item.
-Make a difference being at the first item and not having used :cnext at all.
-(Afanasiy Fet, 2017 Jan 3)
-
 Invalid behavior with NULL list. (Nikolai Pavlov, #768)
 E.g. deepcopy(test_null_list())
 
@@ -1168,9 +1191,6 @@
 Second problem in #966: ins_compl_add_tv() uses get_dict_string() multiple
 times, overwrites the one buffer. (Nikolay Pavlov, 2016 Aug 5)
 
-This does not work: :set cscopequickfix=a-
-(Linewi, 2015 Jul 12, #914)
-
 Possibly wrong value for seq_cur. (Florent Fayolle, 2016 May 15, #806)
 
 Filetype plugin for awk. (Doug Kearns, 2016 Sep 5)
@@ -2571,8 +2591,6 @@
 but when compiling further tests -liconv is added without the -L argument,
 that may fail (e.g., sizeof(int)). (Blaine, 2007 Aug 21)
 
-When opening quickfix window, disable spell checking?
-
 Problem with ".add" files when using two languages and restarting Vim. (Raul
 Coronado, 2008 Oct 30)
 
@@ -2635,7 +2653,7 @@
 Dos uninstal may delete vim.bat from the wrong directory (e.g., when someone
 makes his own wrapper).  Add a magic string with the version number to the
 .bat file and check for it in the uninstaller.  E.g.
-          # uninstall key: vim7.3*
+          # uninstall key: vim8.1*
 
 Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov,
 2007 Feb 8)
@@ -2916,9 +2934,6 @@
 Is it allowed that 'backupext' is empty?  Problems when backup is in same dir
 as original file?  If it's OK don't compare with 'patchmode'. (Thierry Closen)
 
-Patch for supporting count before CR in quickfix window. (AOYAMA Shotaro, 2007
-Jan 1)
-
 Patch for adding ":lscscope". (Navdeep Parhar, 2007 Apr 26; update 2008 Apr
 23)
 
@@ -3071,8 +3086,6 @@
 			+ 1", but that's ugly.
 7   Add patch from Benoit Cerrina to integrate Vim and Perl functions
     better.  Now also works for Ruby (2001 Nov 10)
--   Patch from Herculano de Lima Einloft Neto for better formatting of the
-    quickfix window (2004 dec 2)
 7   When 'rightleft' is set, the search pattern should be displayed right
     to left as well?  See patch of Dec 26. (Nadim Shaikli)
 8   Option to lock all used memory so that it doesn't get swapped to disk
@@ -3090,6 +3103,35 @@
     and GTK by degreneir (nov 10 and nov 18).
 -   Patch for "paranoid mode" by Kevin Collins, March 7.  Needs much more work.
 
+Quickfix/Location List:
+-   Window size is wrong when using quickfix window. (Lifepillar, 2018 Aug 24,
+    #2999)
+-   When using CTRL-W CR in the quickfix window, the jumplist in the opened
+    window is cleared, to avoid going back to the list of errors buffer (would
+    have two windows with it).  Can we just remove the jump list entries for
+    the quickfix buffer?
+-   Quickfix window height is not kept with a vertical split. (Lifepillar,
+    2018 Jun 10, #2998)
+-   When an item in the quickfix list has a file name that does not exist,
+    behave like the item was not a match for :cnext.
+-   When adding an item to a new quickfix list make ":cnext" jump to that
+    item.  Make a difference being at the first item and not having used
+    :cnext at all.  (Afanasiy Fet, 2017 Jan 3)
+-   This does not work: :set cscopequickfix=a-
+    (Linewi, 2015 Jul 12, #914)
+-   When opening quickfix window, disable spell checking?
+-   Patch for supporting count before CR in quickfix window. (AOYAMA Shotaro,
+    2007 Jan 1)
+-   Patch from Herculano de Lima Einloft Neto for better formatting of the
+    quickfix window (2004 dec 2)
+-   Amiga: When using quickfix with the Manx compiler we only get the first 25
+    errors.  How do we get the rest?
+8   The quickfix file is read without conversion, thus in 'encoding'.  Add an
+    option to specify the encoding of the errorfile and convert it.  Also for
+    ":grep" and ":helpgrep".
+    More generic solution: support a filter (e.g., by calling a function).
+7   Add a command that goes back to the position from before jumping to the
+    first quickfix location.  ":cbefore"?
 
 Vi incompatibility:
 -   Try new POSIX tests, made after my comments. (Geoff Clare, 2005 April 7)
@@ -3732,8 +3774,6 @@
 -   In zsh, "gvim&" changes the terminal settings.  This is a zsh problem.
     (Jennings)
 -   Problem with HPterm under X: old contents of window is lost (Cosentino).
--   Amiga: When using quickfix with the Manx compiler we only get the first 25
-    errors.  How do we get the rest?
 -   Amiga: The ":cq" command does not always abort the Manx compiler.  Why?
 -   Linux: A file with protection r--rw-rw- is seen readonly for others.  The
     access() function in GNU libc is probably wrong.
@@ -4066,10 +4106,6 @@
 8   Add an item in 'fileencodings' to check the first line of an XML file for
     the encoding.  <?xml version="1.0" encoding="UTF-8"?>  Or "charset=UTF-8"?
     For HTML look for "charset=utf-8".
-8   The quickfix file is read without conversion, thus in 'encoding'.  Add an
-    option to specify the encoding of the errorfile and convert it.  Also for
-    ":grep" and ":helpgrep".
-    More generic solution: support a filter (e.g., by calling a function).
 8   When a file was converted from 'fileencoding' to 'encoding', a tag search
     should also do this on the search pattern. (Andrzej M. Ostruszka)
 8   When filtering changes the encoding 'fileencoding' may not work.  E.g.,
@@ -5877,8 +5913,6 @@
     from the 'makeprg'?
 -   Add %b to 'errorformat': buffer number. (Yegappan Lakshmanan / Suresh
     Govindachar)
-7   Add a command that goes back to the position from before jumping to the
-    first quickfix location.  ":cbefore"?
 7   Allow a window not to have a statusline.  Makes it possible to use a
     window as a buffer-tab selection.
 8   Allow non-active windows to have a different statusline. (Yakov Lerner)

runtime/doc/usr_05.txt

diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 9694efb..10623fd 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 8.1.  Last change: 2019 Jan 26
+*usr_05.txt*	For Vim version 8.1.  Last change: 2019 Feb 27
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -85,7 +85,7 @@
 >
 	" Get the defaults that most users want.
 	source $VIMRUNTIME/defaults.vim
->
+
 This loads the "defaults.vim" file in the $VIMRUNTIME directory.  This sets up
 Vim for how most users like it.  If you are one of the few that don't, then
 comment out this line.  The commands are explained below:
@@ -164,13 +164,13 @@
 	if exists('skip_defaults_vim')
 	  finish
 	endif
->
+
 Loading defaults.vim can be disabled with this command: >
 	let skip_defaults_vim = 1
 This has to be done in the system vimrc file.  See |system-vimrc|.  If you
 have a user vimrc this is not needed, since defaults.vim will not be loaded
 automatically.
->
+
 >
 	set nocompatible
 
@@ -191,8 +191,8 @@
 
 Keep 200 commands and 200 search patterns in the history.  Use another number
 if you want to remember fewer or more lines.  See 'history'.
->
 
+>
 	set ruler
 
 Always display the current cursor position in the lower right corner of the
@@ -257,7 +257,7 @@
 
 >
 	inoremap <C-U> <C-G>u<C-U>
->
+
 CTRL-U in insert mode deletes all entered text in the current line.  Use
 CTRL-G u to first break undo, so that you can undo CTRL-U after inserting a
 line break.  Revert with ":iunmap <C-U>".
@@ -325,7 +325,7 @@
 		  \ | wincmd p | diffthis
 
 This adds the ":DiffOrig" command.  Use this in a modified buffer to see the
-differences with the file it was loaded from.  See |diff|.
+differences with the file it was loaded from.  See |diff| and |:DiffOrig|.
 
 >
 	set nolangremap

runtime/doc/version8.txt

diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 50ebf33..3590db5 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -2378,7 +2378,7 @@
 Files:	    src/config.mk.in, src/po/Makefile
 
 Patch 7.4.323
-Problem:    Substitute() with zero width pattern breaks multi-byte character.
+Problem:    substitute() with zero width pattern breaks multi-byte character.
 Solution:   Take multi-byte character size into account. (Yukihiro Nakadaira)
 Files:	    src/eval.c src/testdir/test69.in, src/testdir/test69.ok
 
@@ -20311,7 +20311,7 @@
 Files:      src/buffer.c
 
 Patch 8.0.0936
-Problem:    Mode() returns wrong value for a terminal window.
+Problem:    mode() returns wrong value for a terminal window.
 Solution:   Return 't' when typed keys go to a job.
 Files:      src/evalfunc.c, src/testdir/test_terminal.vim
 
@@ -20697,7 +20697,7 @@
 Files:      src/channel.c
 
 Patch 8.0.1004
-Problem:    Matchstrpos() without a match returns too many items.
+Problem:    matchstrpos() without a match returns too many items.
 Solution:   Also remove the second item when the position is beyond the end of
             the string. (Hirohito Higashi)  Use an enum for the type.
 Files:      src/evalfunc.c, src/testdir/test_match.vim
@@ -22544,7 +22544,7 @@
             src/testdir/test_search.vim
 
 Patch 8.0.1305
-Problem:    Writefile() never calls fsync().
+Problem:    writefile() never calls fsync().
 Solution:   Follow the 'fsync' option with override to enable or disable.
 Files:      src/fileio.c, src/evalfunc.c, runtime/doc/eval.txt, src/globals.h,
             src/testdir/test_writefile.vim
@@ -22732,7 +22732,7 @@
 Files:      src/vim.h, src/window.c
 
 Patch 8.0.1335
-Problem:    Writefile() using fsync() may give an error for a device.
+Problem:    writefile() using fsync() may give an error for a device.
             (Yasuhiro Matsumoto)
 Solution:   Ignore fsync() failing. (closes #2373)
 Files:      src/evalfunc.c
@@ -23618,7 +23618,7 @@
             src/testdir/test_popup.vim, src/testdir/test_edit.vim
 
 Patch 8.0.1483
-Problem:    Searchpair() might return an invalid value on timeout.
+Problem:    searchpair() might return an invalid value on timeout.
 Solution:   When the second search times out, do not accept a match from the
             first search. (Daniel Hahler, closes #2552)
 Files:      src/search.c
@@ -23722,7 +23722,7 @@
             src/testdir/Make_all.mak, src/testdir/test_jumplist.vim
 
 Patch 8.0.1498 (after 8.0.1497)
-Problem:    Getjumplist() returns duplicate entries. (lacygoill)
+Problem:    getjumplist() returns duplicate entries. (lacygoill)
 Solution:   Call cleanup_jumplist(). (Yegappan Lakshmanan)
 Files:      src/evalfunc.c, src/mark.c, src/proto/mark.pro,
             src/testdir/test_jumplist.vim
@@ -23842,7 +23842,7 @@
 Files:      src/ex_docmd.c, src/testdir/test_eval_stuff.vim
 
 Patch 8.0.1519
-Problem:    Getchangelist() does not use argument as bufname().
+Problem:    getchangelist() does not use argument as bufname().
 Solution:   Use get_buf_tv(). (Yegappan Lakshmanan, closes #2641)
 Files:      src/evalfunc.c, src/testdir/test_changelist.vim
 

runtime/doc/visual.txt

diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 0b012c6..f63a08d 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 8.1.  Last change: 2019 Feb 19
+*visual.txt*    For Vim version 8.1.  Last change: 2019 Feb 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -118,7 +118,7 @@
 			E.g., "dgn" deletes the text of the next match.
 			If Visual mode is active, extends the selection
 			until the end of the next match.
-			Note: Unlinke `n` the search direction does not depend
+			Note: Unlike `n` the search direction does not depend
 			on the previous search command.
 
 								*gN* *v_gN*

runtime/doc/windows.txt

diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 90a1789..0b96115 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 8.1.  Last change: 2018 Apr 24
+*windows.txt*   For Vim version 8.1.  Last change: 2019 Mar 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -842,6 +842,12 @@
 		{not available when the |+file_in_path| feature was disabled
 		at compile time}
 
+CTRL-W gt						*CTRL-W_gt*
+		Go to next tab page, same as `gt`.
+
+CTRL-W gT						*CTRL-W_gT*
+		Go to previous tab page, same as `gT`.
+
 Also see |CTRL-W_CTRL-I|: open window for an included file that includes
 the keyword under the cursor.
 

runtime/lang/menu_da.latin1.vim

diff --git a/runtime/lang/menu_da.latin1.vim b/runtime/lang/menu_da.latin1.vim
index 3187c9e..b258495 100644
--- a/runtime/lang/menu_da.latin1.vim
+++ b/runtime/lang/menu_da.latin1.vim
@@ -1,3 +1,3 @@
 " Menu Translations:	Danish for iso-8859-1 encoding
 
-source <sfile>:p:h/menu_da.utf-8.vim
\ No newline at end of file
+source <sfile>:p:h/menu_da.utf-8.vim

runtime/tutor/tutor.cs

diff --git a/runtime/tutor/tutor.cs b/runtime/tutor/tutor.cs
index 6cbd520..d8e170d 100644
--- a/runtime/tutor/tutor.cs
+++ b/runtime/tutor/tutor.cs
@@ -1,5 +1,5 @@
 ===============================================================================
-=    V í t e j t e   v  t u t o r i a l u   V I M       -    Verze 1.5        =
+=    V í t e j t e   v   t u t o r i a l u   V I M       -    Verze 1.5       =
 ===============================================================================
 
      Vim je velmi výkonný editor, který má pøíli¹ mnoho pøíkazù na to, aby
@@ -18,7 +18,7 @@
      nauèení. Pokud si jen ète¹ text, pøíkazy zapomene¹!
 
      Nyní se pøesvìdète, ¾e Caps-Lock NENÍ stlaèený a nìkolikrát stisknìte
-     klávesu  j   aby se kurzor posunul natolik, ¾e lekce 1.1 zaplní celou
+     klávesu   j   aby se kurzor posunul natolik, ¾e lekce 1.1 zaplní celou
      obrazovku.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekce 1.1:  POHYB KURZORU

runtime/tutor/tutor.cs.cp1250

diff --git a/runtime/tutor/tutor.cs.cp1250 b/runtime/tutor/tutor.cs.cp1250
index 0d05bfb..9266cd5 100644
--- a/runtime/tutor/tutor.cs.cp1250
+++ b/runtime/tutor/tutor.cs.cp1250
@@ -1,5 +1,5 @@
 ===============================================================================
-=    V í t e j t e   v  t u t o r i a l u   V I M       -    Verze 1.5        =
+=    V í t e j t e   v   t u t o r i a l u   V I M       -    Verze 1.5       =
 ===============================================================================
 
      Vim je velmi výkonný editor, který má pøíliš mnoho pøíkazù na to, aby
@@ -18,7 +18,7 @@
      nauèení. Pokud si jen èteš text, pøíkazy zapomeneš!
 
      Nyní se pøesvìdète, že Caps-Lock NENÍ stlaèený a nìkolikrát stisknìte
-     klávesu  j   aby se kurzor posunul natolik, že lekce 1.1 zaplní celou
+     klávesu   j   aby se kurzor posunul natolik, že lekce 1.1 zaplní celou
      obrazovku.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekce 1.1:  POHYB KURZORU

runtime/tutor/tutor.cs.utf-8

diff --git a/runtime/tutor/tutor.cs.utf-8 b/runtime/tutor/tutor.cs.utf-8
index 97a1953..58ad83d 100644
--- a/runtime/tutor/tutor.cs.utf-8
+++ b/runtime/tutor/tutor.cs.utf-8
@@ -1,5 +1,5 @@
 ===============================================================================
-=    V í t e j t e   v  t u t o r i a l u   V I M       -    Verze 1.5        =
+=    V í t e j t e   v   t u t o r i a l u   V I M       -    Verze 1.5       =
 ===============================================================================
 
      Vim je velmi výkonný editor, který má příliš mnoho příkazů na to, aby
@@ -18,7 +18,7 @@
      naučení. Pokud si jen čteš text, příkazy zapomeneš!
 
      Nyní se přesvědčte, že Caps-Lock NENÍ stlačený a několikrát stiskněte
-     klávesu  j   aby se kurzor posunul natolik, že lekce 1.1 zaplní celou
+     klávesu   j   aby se kurzor posunul natolik, že lekce 1.1 zaplní celou
      obrazovku.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekce 1.1:  POHYB KURZORU

runtime/tutor/tutor.ja.euc

diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 0054b32..b899805 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -846,7 +846,7 @@
   6. ":set xxx" ¤È¥¿¥¤¥×¤¹¤ë¤È¥ª¥×¥·¥ç¥ó "xxx" ¤¬ÀßÄꤵ¤ì¤ë¡£
 	'ic' 'ignorecase'	¸¡º÷»þ¤ËÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤·¤Ê¤¤
 	'is' 'incsearch'	¸¡º÷¥Õ¥ì¡¼¥º¤ËÉôʬ¥Þ¥Ã¥Á¤·¤Æ¤¤¤ëÉôʬ¤òɽ¼¨¤¹¤ë
-	'hls' 'hlsearch'	¥Þ¥Ã¥Á¤¹¤ë¤¹¤Ù¤ò¶¯Ä´É½¼¨¤¹¤ë
+	'hls' 'hlsearch'	¥Þ¥Ã¥Á¤¹¤ë¤¹¤Ù¤Æ¤ò¶¯Ä´É½¼¨¤¹¤ë
      Ť¤Êý¡¢Ã»¤¤Êý¡¢¤É¤Á¤é¤Î¥ª¥×¥·¥ç¥ó̾¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£
 
   7. ¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï "no" ¤òÉÕÍ¿¤·¤Þ¤¹:  :set noic
@@ -969,8 +969,9 @@
 
   Modified for Vim by Bram Moolenaar.
 
-  ÆüËܸìÌõ  ¾¾ËÜ ÂÙ¹°  <mattn.jp@gmail.com>
-  ´Æ½¤      ¼²¬ ÂÀϺ  <koron.kaoriya@gmail.com>
+  ÆüËܸìÌõ  ¾¾ËÜ ÂÙ¹°    <mattn.jp@gmail.com>
+            vim-jp¥Á¡¼¥à <https://github.com/vim-jp/lang-ja>
+  ´Æ½¤      ¼²¬ ÂÀϺ    <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:

runtime/tutor/tutor.ja.sjis

diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index c722819..0562a00 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -846,7 +846,7 @@
   6. ":set xxx" ‚ƃ^ƒCƒv‚·‚é‚ƃIƒvƒVƒ‡ƒ“ "xxx" ‚ªÝ’肳‚ê‚éB
 	'ic' 'ignorecase'	ŒŸõŽž‚ɑ啶Žš¬•¶Žš‚Ì‹æ•Ê‚µ‚È‚¢
 	'is' 'incsearch'	ŒŸõƒtƒŒ[ƒY‚É•”•ªƒ}ƒbƒ`‚µ‚Ä‚¢‚é•”•ª‚ð•\Ž¦‚·‚é
-	'hls' 'hlsearch'	ƒ}ƒbƒ`‚·‚é‚·‚×‚ð‹­’²•\Ž¦‚·‚é
+	'hls' 'hlsearch'	ƒ}ƒbƒ`‚·‚é‚·‚×‚Ä‚ð‹­’²•\Ž¦‚·‚é
      ’·‚¢•ûA’Z‚¢•ûA‚Ç‚¿‚ç‚̃IƒvƒVƒ‡ƒ“–¼‚Å‚àŽg—p‚Å‚«‚Ü‚·B
 
   7. ƒIƒvƒVƒ‡ƒ“‚𖳌ø‚É‚·‚é‚É‚Í "no" ‚ð•t—^‚µ‚Ü‚·:  :set noic
@@ -969,8 +969,9 @@
 
   Modified for Vim by Bram Moolenaar.
 
-  “ú–{Œê–ó  ¼–{ ‘׍O  <mattn.jp@gmail.com>
-  ŠÄC      ‘º‰ª ‘¾˜Y  <koron.kaoriya@gmail.com>
+  “ú–{Œê–ó  ¼–{ ‘׍O    <mattn.jp@gmail.com>
+            vim-jpƒ`[ƒ€ <https://github.com/vim-jp/lang-ja>
+  ŠÄC      ‘º‰ª ‘¾˜Y    <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:

runtime/tutor/tutor.ja.utf-8

diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index a1bb905..a604d9a 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -846,7 +846,7 @@
   6. ":set xxx" とタイプするとオプション "xxx" が設定される。
 	'ic' 'ignorecase'	検索時に大文字小文字の区別しない
 	'is' 'incsearch'	検索フレーズに部分マッチしている部分を表示する
-	'hls' 'hlsearch'	マッチするすべを強調表示する
+	'hls' 'hlsearch'	マッチするすべてを強調表示する
      長い方、短い方、どちらのオプション名でも使用できます。
 
   7. オプションを無効にするには "no" を付与します:  :set noic
@@ -969,8 +969,9 @@
 
   Modified for Vim by Bram Moolenaar.
 
-  日本語訳  松本 泰弘  <mattn.jp@gmail.com>
-  監修      村岡 太郎  <koron.kaoriya@gmail.com>
+  日本語訳  松本 泰弘    <mattn.jp@gmail.com>
+            vim-jpチーム <https://github.com/vim-jp/lang-ja>
+  監修      村岡 太郎    <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:

src/po/README.txt

diff --git a/src/po/README.txt b/src/po/README.txt
index d283210..e60d1d2 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -30,7 +30,7 @@
 
 You might have to do the commands manually.  Example:
 
-   cd c:\vim\vim71
+   cd c:\vim\vim81
    mkdir runtime\lang\ja\LC_MESSAGES
    msgfmt -o runtime\lang\ja\LC_MESSAGES\vim.mo src\po\ja.po
 

src/po/ja.euc-jp.po

diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 4759103..e503f31 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -3,7 +3,7 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2019 MURAOKA Taro <koron.kaoriya@gmail.com>,
 # 			  vim-jp <http://vim-jp.org/>
 #
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
+"PO-Revision-Date: 2019-03-12 08:23+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"
@@ -24,6 +24,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "--Deleted--"
+msgstr "--ºï½üºÑ--"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <¥Ð¥Ã¥Õ¥¡=%d> ¤¬¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367: ¤½¤Î¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936: ¸½ºß¤Î¥°¥ë¡¼¥×¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: »ÈÍÑÃæ¤Î augroup ¤ò¾Ã¤½¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: * ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤â¤·¤¯¤Ï¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <¥Ð¥Ã¥Õ¥¡=%d>: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹ "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217: Á´¤Æ¤Î¥¤¥Ù¥ó¥È¤ËÂФ·¤Æ¤Îautocommand¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
+
+msgid "No matching autocommands"
+msgstr "³ºÅö¤¹¤ëautocommand¤Ï¸ºß¤·¤Þ¤»¤ó"
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218: autocommand¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr "%s ¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "autocommand %s"
+msgstr "autocommand %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() ¤¬¶õ¥Ñ¥¹¥ï¡¼¥É¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Þ¤·¤¿"
 
@@ -100,8 +161,8 @@
 msgstr "E88: ºÇ½é¤Î¥Ð¥Ã¥Õ¥¡¤è¤êÁ°¤Ø¤Ï°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: ¥Ð¥Ã¥Õ¥¡ %ld ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤ÇÊѹ¹¤òÇË´þ)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr "E89: ¥Ð¥Ã¥Õ¥¡ %d ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤ÇÊѹ¹¤òÇË´þ)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: ¥¸¥ç¥Ö¤Ï¤Þ¤À¼Â¹ÔÃæ¤Ç¤¹ (! ¤òÄɲäǥ¸¥ç¥Ö¤ò½ªÎ»)"
@@ -119,8 +180,8 @@
 msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgid "E92: Buffer %d not found"
+msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %d ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@
 msgid "[Scratch]"
 msgstr "[²¼½ñ¤­]"
 
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- ¥µ¥¤¥ó ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s ¤Î¥µ¥¤¥ó:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    ¹Ô=%ld  ¼±ÊÌ»Ò=%d  ̾Á°=%s"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ¥Ý¡¼¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
 
@@ -309,8 +355,8 @@
 msgstr "E737: ¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96: %ld °Ê¾å¤Î¥Ð¥Ã¥Õ¥¡¤Ïdiff¤Ç¤­¤Þ¤»¤ó"
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96: %d °Ê¾å¤Î¥Ð¥Ã¥Õ¥¡¤Ïdiff¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@
 msgstr "E103: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ͽ´ü¤»¤º¥Ð¥Ã¥Õ¥¡¤¬Êѹ¹Êѹ¹¤µ¤ì¤Þ¤·¤¿"
+msgstr "E787: ͽ´ü¤»¤º¥Ð¥Ã¥Õ¥¡¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ¹ç»ú¤ËEscape¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
 
+msgid "Custom"
+msgstr "¥«¥¹¥¿¥à"
+
+msgid "Latin supplement"
+msgstr "¥é¥Æ¥óÊä½õ"
+
+msgid "Greek and Coptic"
+msgstr "¥®¥ê¥·¥ã¤È¥³¥×¥È"
+
+msgid "Cyrillic"
+msgstr "¥­¥ê¥ë"
+
+msgid "Hebrew"
+msgstr "¥Ø¥Ö¥é¥¤"
+
+msgid "Arabic"
+msgstr "¥¢¥é¥Ó¥¢"
+
+msgid "Latin extended"
+msgstr "¥é¥Æ¥ó³ÈÄ¥"
+
+msgid "Greek extended"
+msgstr "¥®¥ê¥·¥ã³ÈÄ¥"
+
+msgid "Punctuation"
+msgstr "¶çÆÉÅÀ"
+
+msgid "Super- and subscripts"
+msgstr "¾åÉÕ¤­¡¦²¼ÉÕ¤­"
+
+msgid "Currency"
+msgstr "Ä̲ߵ­¹æ"
+
+msgid "Other"
+msgstr "¤½¤Î¾"
+
+msgid "Roman numbers"
+msgstr "¥í¡¼¥Þ¿ô»ú"
+
+msgid "Arrows"
+msgstr "Ìð°õ"
+
+msgid "Mathematical operators"
+msgstr "¿ô³Øµ­¹æ"
+
+msgid "Technical"
+msgstr "µ»½ÑÍѵ­¹æ"
+
+msgid "Box drawing"
+msgstr "·ÓÀþÁÇÊÒ"
+
+msgid "Block elements"
+msgstr "¥Ö¥í¥Ã¥¯Í×ÁÇ"
+
+msgid "Geometric shapes"
+msgstr "´ö²¿³ØÌÏÍÍ"
+
+msgid "Symbols"
+msgstr "µ­¹æ"
+
+msgid "Dingbats"
+msgstr "Áõ¾þµ­¹æ"
+
+msgid "CJK symbols and punctuation"
+msgstr "CJKµ­¹æµÚ¤Ó¶çÆÉÅÀ"
+
+msgid "Hiragana"
+msgstr "Ê¿²¾Ì¾"
+
+msgid "Katakana"
+msgstr "ÊÒ²¾Ì¾"
+
+msgid "Bopomofo"
+msgstr "Ãí²»»úÊì"
+
 msgid "E544: Keymap file not found"
 msgstr "E544: ¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
@@ -510,14 +631,17 @@
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s ¤ÎÃͤò°ìÍ÷ɽ¼¨¤Ç¤­¤Þ¤»¤ó"
 
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ¥ê¥¹¥È·¿¤È¼­½ñ·¿°Ê³°¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄê¤Ç¤­¤Þ¤»¤ó"
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689: ¥ê¥¹¥È·¿¡¢¼­½ñ·¿¡¢Blob·¿°Ê³°¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄê¤Ç¤­¤Þ¤»¤ó"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] ¤ÏºÇ¸å¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ¤Ë¤Ï¥ê¥¹¥È·¿¤ÎÃͤ¬É¬ÍפǤ¹"
+msgid "E709: [:] requires a List or Blob value"
+msgstr "E709: [:] ¤Ë¤Ï¥ê¥¹¥È·¿¤«Blob·¿¤ÎÃͤ¬É¬ÍפǤ¹"
+
+msgid "E972: Blob value does not have the right number of bytes"
+msgstr "E972: Blob·¿¤ÎÃͤΥХ¤¥È¿ô¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë¥¿¡¼¥²¥Ã¥È¤è¤ê¤â¿¤¤Í×ÁǤ¬¤¢¤ê¤Þ¤¹"
@@ -545,6 +669,9 @@
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' ¤òÉâÆ°¾®¿ôÅÀ¿ô¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó"
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr "E973: Blob¥ê¥Æ¥é¥ë¤Ï¶ö¿ô¸Ä¤Î16¿Ê¿ôʸ»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
@@ -595,6 +722,9 @@
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: ¥Á¥ã¥Í¥ë¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Blob·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
@@ -616,6 +746,9 @@
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: ¥Á¥ã¥Í¥ë¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Blob·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
@@ -625,10 +758,17 @@
 msgid "E731: using Dictionary as a String"
 msgstr "E731: ¼­½ñ·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
+msgid "E976: using Blob as a String"
+msgstr "E976: Blob·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908: ̵¸ú¤ÊÃͤòʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
 #, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %s ¤ò´Ö°ã¤Ã¤¿·¿¤ÎÃͤÇÀßÄꤷ¤Æ¤¤¤Þ¤¹"
+
+#, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: ÊÑ¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
@@ -671,6 +811,9 @@
 msgid " line "
 msgstr " ¹Ô "
 
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Blob·¿¤ÏBlob·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: ¥ê¥¹¥È·¿¤Ï¥ê¥¹¥È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
 
@@ -696,6 +839,10 @@
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
+#, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤ÏBlob·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
 msgid "E928: String required"
 msgstr "E928: ʸ»úÎó¤¬É¬ÍפǤ¹"
 
@@ -705,12 +852,19 @@
 msgid "add() argument"
 msgstr "add() ¤Î°ú¿ô"
 
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡Ì¾¤Ç¤¹: %s"
+
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() ¤ÏÁÞÆþ¥â¡¼¥É¤Ç¤·¤«ÍøÍѤǤ­¤Þ¤»¤ó"
 
 msgid "&Ok"
 msgstr "&Ok"
 
+msgid "E980: lowlevel input not supported"
+msgstr "E980: Äã¥ì¥Ù¥ëÆþÎϤϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -752,8 +906,8 @@
 msgstr "E957: ̵¸ú¤Ê¥¦¥£¥ó¥É¥¦ÈÖ¹æ¤Ç¤¹"
 
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID ¤Ï \":match\" ¤Î¤¿¤á¤ËͽÌ󤵤ì¤Æ¤¤¤Þ¤¹: %ld"
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID ¤Ï \":match\" ¤Î¤¿¤á¤ËͽÌ󤵤ì¤Æ¤¤¤Þ¤¹: %d"
 
 msgid "E726: Stride is zero"
 msgstr "E726: ¥¹¥È¥é¥¤¥É(Á°¿ÊÎÌ)¤¬ 0 ¤Ç¤¹"
@@ -795,11 +949,11 @@
 
 #, c-format
 msgid "E927: Invalid action: '%s'"
-msgstr "E927: ̵¸ú¤ÊÁàºî¤Ç¤¹: %s"
+msgstr "E927: ̵¸ú¤ÊÁàºî¤Ç¤¹: '%s'"
 
 #, c-format
 msgid "E962: Invalid action: '%s'"
-msgstr "E962: ̵¸ú¤ÊÁàºî¤Ç¤¹: %s"
+msgstr "E962: ̵¸ú¤ÊÁàºî¤Ç¤¹: '%s'"
 
 msgid "sort() argument"
 msgstr "sort() ¤Î°ú¿ô"
@@ -818,7 +972,7 @@
 
 #, c-format
 msgid "E935: invalid submatch number: %d"
-msgstr "E935: ̵¸ú¤Ê¥µ¥Ö¥Þ¥Ã¥ÁÈÖ¹æ: %d"
+msgstr "E935: ̵¸ú¤Ê¥µ¥Ö¥Þ¥Ã¥ÁÈÖ¹æ¤Ç¤¹: %d"
 
 msgid "E677: Error writing temp file"
 msgstr "E677: °ì»þ¥Õ¥¡¥¤¥ë½ñ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -995,8 +1149,8 @@
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ¿ô¤Ç¤Ï¤Ê¤¤°ú¿ô¤¬ :z ¤ËÅϤµ¤ì¤Þ¤·¤¿"
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim¤Ç¤Ï¥·¥§¥ë¥³¥Þ¥ó¥É¤ò»È¤¨¤Þ¤»¤ó"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr "E145: rvim¤Ç¤Ï¥·¥§¥ë¥³¥Þ¥ó¥É¤È°ìÉô¤Îµ¡Ç½¤ò»È¤¨¤Þ¤»¤ó"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Àµµ¬É½¸½¤Ïʸ»ú¤Ç¶èÀڤ뤳¤È¤¬¤Ç¤­¤Þ¤»¤ó"
@@ -1091,52 +1245,6 @@
 msgid "E150: Not a directory: %s"
 msgstr "E150: ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: ̤ÃΤÎsign¥³¥Þ¥ó¥É¤Ç¤¹: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: sign̾¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: sign¤ÎÄêµÁ¤¬Â¿¿ô¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ̵¸ú¤Êsign¤Î¥Æ¥­¥¹¥È¤Ç¤¹: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: ̤ÃΤÎsign¤Ç¤¹: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: sign¤ÎÈֹ椬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡Ì¾¤Ç¤¹: %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: ̾Á°¤Î̵¤¤¥Ð¥Ã¥Õ¥¡¤Ø¤Ï¥¸¥ã¥ó¥×¤Ç¤­¤Þ¤»¤ó"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ̵¸ú¤Êsign¼±Ê̻ҤǤ¹: %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: Êѹ¹¤Ç¤­¤Ê¤¤ sign ¤Ç¤¹: %s"
-
-# Added at 27-Jan-2004.
-msgid " (NOT FOUND)"
-msgstr " (¸«¤Ä¤«¤ê¤Þ¤»¤ó)"
-
-msgid " (not supported)"
-msgstr " (È󥵥ݡ¼¥È)"
-
-msgid "[Deleted]"
-msgstr "[ºï½üºÑ]"
-
 msgid "No old files"
 msgstr "¸Å¤¤¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
 
@@ -1325,6 +1433,9 @@
 msgid "E492: Not an editor command"
 msgstr "E492: ¥¨¥Ç¥£¥¿¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981: rvim¤Ç¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¨¤Þ¤»¤ó"
+
 msgid "E493: Backwards range given"
 msgstr "E493: µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿"
 
@@ -1348,12 +1459,13 @@
 msgstr[0] "ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹¤¬¡¢½ªÎ»¤·¤Þ¤¹¤«?"
 
 #, c-format
-msgid "E173: %ld more file to edit"
-msgid_plural "E173: %ld more files to edit"
-msgstr[0] "E173: ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %ld ¸Ä¤¢¤ê¤Þ¤¹"
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173: ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹"
 
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ¥³¥Þ¥ó¥É¤¬´û¤Ë¤¢¤ê¤Þ¤¹: ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: ¥³¥Þ¥ó¥É¤¬´û¤Ë¤¢¤ê¤Þ¤¹: ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤: %s"
 
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@
 msgid "Debug Line"
 msgstr "¥Ç¥Ð¥Ã¥°¹Ô"
 
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ¤¬¥³¥Þ¥ó¥ÉŤòĶ¤¨¤Þ¤·¤¿"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: ¥¢¥¯¥Æ¥£¥Ö¤Ê¥¦¥£¥ó¥É¥¦¤«¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿"
 
@@ -1994,73 +2103,46 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ¤Ï¥ê¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-msgid "--Deleted--"
-msgstr "--ºï½üºÑ--"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "autocommand: %s <¥Ð¥Ã¥Õ¥¡=%d> ¤¬¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: ¤½¤Î¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936: ¸½ºß¤Î¥°¥ë¡¼¥×¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: »ÈÍÑÃæ¤Î augroup ¤ò¾Ã¤½¤¦¤È¤·¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤â¤·¤¯¤Ï¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"--- Autocommands ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <¥Ð¥Ã¥Õ¥¡=%d>: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹ "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Á´¤Æ¤Î¥¤¥Ù¥ó¥È¤ËÂФ·¤Æ¤Îautocommand¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-
-msgid "No matching autocommands"
-msgstr "³ºÅö¤¹¤ëautocommand¤Ï¸ºß¤·¤Þ¤»¤ó"
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s Autocommands for \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr "%s ¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "autocommand %s"
-msgstr "autocommand %s"
-
 msgid "E219: Missing {."
 msgstr "E219: { ¤¬¤¢¤ê¤Þ¤»¤ó."
 
 msgid "E220: Missing }."
 msgstr "E220: } ¤¬¤¢¤ê¤Þ¤»¤ó."
 
+msgid "E854: path too long for completion"
+msgstr "E854: ¥Ñ¥¹¤¬Ä¹²á¤®¤ÆÊä´°¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: ̵¸ú¤Ê¥Ñ¥¹¤Ç¤¹: '**[¿ôÃÍ]' ¤Ïpath¤ÎºÇ¸å¤« '%s' ¤¬Â³¤¤¤Æ¤Ê¤¤¤È¤¤¤±¤Þ¤»"
+"¤ó."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpath¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpath¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: ¥Ñ¥¹¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E446: No file name under cursor"
+msgstr "E446: ¥«¡¼¥½¥ë¤Î²¼¤Ë¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
+
 msgid "E490: No fold found"
 msgstr "E490: ÀÞ¾ö¤ß¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -2336,20 +2418,20 @@
 msgstr "¥Õ¥©¥ó¥È0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "¥Õ¥©¥ó¥È1: %s"
+msgid "Font%d: %s"
+msgstr "¥Õ¥©¥ó¥È%d: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "¥Õ¥©¥ó¥È%ld ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤Î2ÇܤǤϤ¢¤ê¤Þ¤»¤ó"
+msgid "Font%d width is not twice that of font0"
+msgstr "¥Õ¥©¥ó¥È%d ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤Î2ÇܤǤϤ¢¤ê¤Þ¤»¤ó"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "¥Õ¥©¥ó¥È0¤ÎÉý: %ld"
+msgid "Font0 width: %d"
+msgstr "¥Õ¥©¥ó¥È0¤ÎÉý: %d"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "¥Õ¥©¥ó¥È1¤ÎÉý: %ld"
+msgid "Font%d width: %d"
+msgstr "¥Õ¥©¥ó¥È%d¤ÎÉý: %d"
 
 msgid "Invalid font specification"
 msgstr "̵¸ú¤Ê¥Õ¥©¥ó¥È»ØÄê¤Ç¤¹"
@@ -2525,8 +2607,8 @@
 msgstr "cscope¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤òÄɲÃ"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope¤ÎÀܳ %ld ¤òÆɹþ¤ßÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262: cscope¤ÎÀܳ %d ¤òÆɹþ¤ßÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤ÃΤÎcscope¸¡º÷·¿¤Ç¤¹"
@@ -3064,9 +3146,6 @@
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t¥Ø¥Ö¥é¥¤¸ì¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë"
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t¥Ú¥ë¥·¥¢¸ì¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë"
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tüËö¤ò <terminal> ¤ËÀßÄꤹ¤ë"
 
@@ -3819,9 +3898,6 @@
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î¥Ñ¥¹¤ÎÉôʬ¤¬¥µ¥Ö¥á¥Ë¥å¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ¥á¥Ë¥å¡¼¤Ï¾¤Î¥â¡¼¥É¤Ë¤À¤±¤¢¤ê¤Þ¤¹"
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" ¤È¤¤¤¦¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
@@ -4015,41 +4091,14 @@
 msgid "E549: Illegal percentage"
 msgstr "E549: ÉÔÀµ¤Ê¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸¤Ç¤¹"
 
-msgid "E854: path too long for completion"
-msgstr "E854: ¥Ñ¥¹¤¬Ä¹²á¤®¤ÆÊä´°¤Ç¤­¤Þ¤»¤ó"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: ̵¸ú¤Ê¥Ñ¥¹¤Ç¤¹: '**[¿ôÃÍ]' ¤Ïpath¤ÎºÇ¸å¤« '%s' ¤¬Â³¤¤¤Æ¤Ê¤¤¤È¤¤¤±¤Þ¤»"
-"¤ó."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: ¥Ñ¥¹¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans¤ÎÀܳ¾ðÊó¥Õ¥¡¥¤¥ë¤Î¥¢¥¯¥»¥¹¥â¡¼¥É¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: ¥Ð¥Ã¥Õ¥¡ %ld ¤Î NetBeans Àܳ¤¬¼º¤ï¤ì¤Þ¤·¤¿"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658: ¥Ð¥Ã¥Õ¥¡ %d ¤Î NetBeans Àܳ¤¬¼º¤ï¤ì¤Þ¤·¤¿"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans¤Ï¤³¤ÎGUI¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó"
@@ -4809,8 +4858,8 @@
 msgstr "E866: (NFA Àµµ¬É½¸½) °ÌÃÖ¤¬¸í¤Ã¤Æ¤¤¤Þ¤¹: %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (NFA Àµµ¬É½¸½) ̵¸ú¤Êʸ»ú¥¯¥é¥¹: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (NFA Àµµ¬É½¸½) ̵¸ú¤Êʸ»ú¥¯¥é¥¹¤Ç¤¹: %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó "
 
 msgid "in path ---\n"
-msgstr "¥Ñ¥¹¤Ë ----\n"
+msgstr "¥Ñ¥¹¤Ë ---\n"
 
 msgid "  (Already listed)"
 msgstr "  (´û¤ËÎóµó)"
@@ -4986,6 +5035,67 @@
 "# ºÇ¸å¤Î %s¸¡º÷¥Ñ¥¿¡¼¥ó:\n"
 "~"
 
+msgid "[Deleted]"
+msgstr "[ºï½üºÑ]"
+
+msgid ""
+"\n"
+"--- Signs ---"
+msgstr ""
+"\n"
+"--- ¥µ¥¤¥ó ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "%s ¤Î¥µ¥¤¥ó:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  ¥°¥ë¡¼¥×=%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    ¹Ô=%ld  ¼±ÊÌ»Ò=%d%s  ̾Á°=%s  Í¥ÀèÅÙ=%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: sign¤ÎÄêµÁ¤¬Â¿²á¤®¤Þ¤¹"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: ̵¸ú¤Êsign¤Î¥Æ¥­¥¹¥È¤Ç¤¹: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: ̤ÃΤÎsign¤Ç¤¹: %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Êѹ¹¤Ç¤­¤Ê¤¤ sign ¤Ç¤¹: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: sign¤ÎÈֹ椬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157: ̵¸ú¤Êsign¼±Ê̻ҤǤ¹: %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ̾Á°¤Î̵¤¤¥Ð¥Ã¥Õ¥¡¤Ø¤Ï¥¸¥ã¥ó¥×¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: ̤ÃΤÎsign¥³¥Þ¥ó¥É¤Ç¤¹: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: sign̾¤¬¤¢¤ê¤Þ¤»¤ó"
+
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (¸«¤Ä¤«¤ê¤Þ¤»¤ó)"
+
+msgid " (not supported)"
+msgstr " (È󥵥ݡ¼¥È)"
+
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤Ï̵¸ú²½¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
@@ -5098,10 +5208,6 @@
 msgstr "%s Æâ¤Î¼¡¤ÎÊÑ´¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s ¤«¤é %s ¤Ø"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "%s Æâ¤ÎÊÑ´¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s Æâ¤Î %d ¹ÔÌܤΠFLAG ¤Ë̵¸ú¤ÊÃͤ¬¤¢¤ê¤Þ¤¹: %s"
 
@@ -5319,8 +5425,8 @@
 msgstr "E751: ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤Ë¤ÏÈÏ°Ï̾¤ò´Þ¤á¤é¤ì¤Þ¤»¤ó"
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754: ÈÏ°Ï¤Ï %ld ¸Ä¤Þ¤Ç¤·¤«¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgid "E754: Only up to %d regions supported"
+msgstr "E754: ÈÏ°Ï¤Ï %d ¸Ä¤Þ¤Ç¤·¤«¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@
 msgstr "¼Â¹Ô¤·¤Þ¤·¤¿!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' ¤Ë¤Ï %ld ¸Ä¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile' ¤Ë¤Ï %d ¸Ä¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@
 
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ̵¸ú¤Ê :syntax ¤Î¥µ¥Ö¥³¥Þ¥ó¥É: %s"
+msgstr "E410: ̵¸ú¤Ê :syntax ¤Î¥µ¥Ö¥³¥Þ¥ó¥É¤Ç¤¹: %s"
 
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
@@ -5740,6 +5846,38 @@
 msgid "E955: Not a terminal buffer"
 msgstr "E955: üËö¥Ð¥Ã¥Õ¥¡¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY ¤¬Ìµ¸ú¤Ç¤¹"
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971: ¥×¥í¥Ñ¥Æ¥£¥¿¥¤¥× %s ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964: ̵¸ú¤ÊÎóÈÖ¹æ¤Ç¤¹: %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966: ̵¸ú¤Ê¹ÔÈÖ¹æ¤Ç¤¹: %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965: ¥×¥í¥Ñ¥Æ¥£¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E967: text property info corrupted"
+msgstr "E967: ¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¾ðÊ󤬲õ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968: ºÇÄã 1 ¸Ä¤Î 'id' ¤Þ¤¿¤Ï 'type' ¤¬É¬ÍפǤ¹"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969: ¥×¥í¥Ñ¥Æ¥£¥¿¥¤¥× %s ¤Ï´û¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970: ̤ÃΤΥϥ¤¥é¥¤¥È¥°¥ë¡¼¥×̾: '%s'"
+
 msgid "new shell started\n"
 msgstr "¿·¤·¤¤¥·¥§¥ë¤òµ¯Æ°¤·¤Þ¤¹\n"
 
@@ -6293,6 +6431,10 @@
 msgid "Already only one window"
 msgstr "´û¤Ë¥¦¥£¥ó¥É¥¦¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
 msgid "E441: There is no preview window"
 msgstr "E441: ¥×¥ì¥Ó¥å¡¼¥¦¥£¥ó¥É¥¦¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -6314,31 +6456,24 @@
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾¤Î¥¦¥£¥ó¥É¥¦¤Ë¤ÏÊѹ¹¤¬¤¢¤ê¤Þ¤¹"
 
-msgid "E446: No file name under cursor"
-msgstr "E446: ¥«¡¼¥½¥ë¤Î²¼¤Ë¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: ̵¸ú¤Ê ID: %d (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
 
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799: ̵¸ú¤Ê ID: %ld (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID ¤Ï¤¹¤Ç¤ËÍøÍÑÃæ¤Ç¤¹: %ld"
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID ¤Ï¤¹¤Ç¤ËÍøÍÑÃæ¤Ç¤¹: %d"
 
 msgid "List or number required"
 msgstr "¥ê¥¹¥È¤«¿ôÃͤ¬É¬ÍפǤ¹"
 
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E802: ̵¸ú¤Ê ID: %ld (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: ̵¸ú¤Ê ID: %d (1 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)"
 
 #, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID ¤Ï¤¢¤ê¤Þ¤»¤ó: %ld"
+msgid "E803: ID not found: %d"
+msgstr "E803: ID ¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ¥Ø¥Ö¥é¥¤¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ¥Ú¥ë¥·¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: ¥Ú¥ë¥·¥¢¸ì¥µ¥Ý¡¼¥È¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: ¥¢¥é¥Ó¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
@@ -6644,6 +6779,13 @@
 msgstr "E684: ¥ê¥¹¥È¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Blob¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: Blob·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
 
@@ -6654,10 +6796,17 @@
 msgid "E714: List required"
 msgstr "E714: ¥ê¥¹¥È·¿¤¬É¬ÍפǤ¹"
 
+msgid "E897: List or Blob required"
+msgstr "E897: ¥ê¥¹¥È·¿¤Þ¤¿¤ÏBlob·¿¤¬É¬ÍפǤ¹"
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¡¢¼­½ñ·¿¤Þ¤¿¤ÏBlob·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë¤ÎÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
@@ -6760,6 +6909,9 @@
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Autocommand¤¬ºÆµ¢¤ò°ú¤­µ¯¤³¤·¤Þ¤·¤¿"
 
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: ¥á¥Ë¥å¡¼¤Ï¾¤Î¥â¡¼¥É¤Ë¤À¤±¤¢¤ê¤Þ¤¹"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
 

src/po/ja.po

diff --git a/src/po/ja.po b/src/po/ja.po
index 2e70701..38ec535 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,7 +3,7 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2019 MURAOKA Taro <koron.kaoriya@gmail.com>,
 # 			  vim-jp <http://vim-jp.org/>
 #
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
+"PO-Revision-Date: 2019-03-12 08:23+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"
@@ -24,6 +24,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "--Deleted--"
+msgstr "--削除済--"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367: そのグループはありません: \"%s\""
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936: 現在のグループは削除できません"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 使用中の augroup を消そうとしています"
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: * の後に不正な文字がありました: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: そのようなイベントはありません: %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: そのようなグループもしくはイベントはありません: %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <バッファ=%d>: 無効なバッファ番号です "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
+
+msgid "No matching autocommands"
+msgstr "該当するautocommandは存在しません"
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218: autocommandの入れ子が深過ぎます"
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr "%s を実行しています"
+
+#, c-format
+msgid "autocommand %s"
+msgstr "autocommand %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
 
@@ -100,8 +161,8 @@
 msgstr "E88: 最初のバッファより前へは移動できません"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr "E89: バッファ %d の変更は保存されていません (! で変更を破棄)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: ジョブはまだ実行中です (! を追加でジョブを終了)"
@@ -119,8 +180,8 @@
 msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: バッファ %ld が見つかりません"
+msgid "E92: Buffer %d not found"
+msgstr "E92: バッファ %d が見つかりません"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@
 msgid "[Scratch]"
 msgstr "[下書き]"
 
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- サイン ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s のサイン:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    行=%ld  識別子=%d  名前=%s"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ポートに接続できません"
 
@@ -309,8 +355,8 @@
 msgstr "E737: キーは既に存在します: %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96: %ld 以上のバッファはdiffできません"
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96: %d 以上のバッファはdiffできません"
 
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@
 msgstr "E103: バッファ \"%s\" は差分モードではありません"
 
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: 予期せずバッファが変更変更されました"
+msgstr "E787: 予期せずバッファが変更されました"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 合字にEscapeは使用できません"
 
+msgid "Custom"
+msgstr "カスタム"
+
+msgid "Latin supplement"
+msgstr "ラテン補助"
+
+msgid "Greek and Coptic"
+msgstr "ギリシャとコプト"
+
+msgid "Cyrillic"
+msgstr "キリル"
+
+msgid "Hebrew"
+msgstr "ヘブライ"
+
+msgid "Arabic"
+msgstr "アラビア"
+
+msgid "Latin extended"
+msgstr "ラテン拡張"
+
+msgid "Greek extended"
+msgstr "ギリシャ拡張"
+
+msgid "Punctuation"
+msgstr "句読点"
+
+msgid "Super- and subscripts"
+msgstr "上付き・下付き"
+
+msgid "Currency"
+msgstr "通貨記号"
+
+msgid "Other"
+msgstr "その他"
+
+msgid "Roman numbers"
+msgstr "ローマ数字"
+
+msgid "Arrows"
+msgstr "矢印"
+
+msgid "Mathematical operators"
+msgstr "数学記号"
+
+msgid "Technical"
+msgstr "技術用記号"
+
+msgid "Box drawing"
+msgstr "罫線素片"
+
+msgid "Block elements"
+msgstr "ブロック要素"
+
+msgid "Geometric shapes"
+msgstr "幾何学模様"
+
+msgid "Symbols"
+msgstr "記号"
+
+msgid "Dingbats"
+msgstr "装飾記号"
+
+msgid "CJK symbols and punctuation"
+msgstr "CJK記号及び句読点"
+
+msgid "Hiragana"
+msgstr "平仮名"
+
+msgid "Katakana"
+msgstr "片仮名"
+
+msgid "Bopomofo"
+msgstr "注音字母"
+
 msgid "E544: Keymap file not found"
 msgstr "E544: キーマップファイルが見つかりません"
 
@@ -510,14 +631,17 @@
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s の値を一覧表示できません"
 
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689: リスト型、辞書型、Blob型以外はインデックス指定できません"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] は最後でなければいけません"
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] にはリスト型の値が必要です"
+msgid "E709: [:] requires a List or Blob value"
+msgstr "E709: [:] にはリスト型かBlob型の値が必要です"
+
+msgid "E972: Blob value does not have the right number of bytes"
+msgstr "E972: Blob型の値のバイト数が正しくありません"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
@@ -545,6 +669,9 @@
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' を浮動小数点数と組み合わせては使えません"
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr "E973: Blobリテラルは偶数個の16進数文字でなければなりません"
+
 msgid "E110: Missing ')'"
 msgstr "E110: ')' が見つかりません"
 
@@ -595,6 +722,9 @@
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: チャネルを数値として扱っています"
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Blob型を数値として扱っています"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: 関数参照型を浮動小数点数として扱っています"
 
@@ -616,6 +746,9 @@
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: チャネルを浮動小数点数として扱っています"
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Blob型を浮動小数点数として扱っています"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: 関数参照型を文字列として扱っています"
 
@@ -625,10 +758,17 @@
 msgid "E731: using Dictionary as a String"
 msgstr "E731: 辞書型を文字列として扱っています"
 
+msgid "E976: using Blob as a String"
+msgstr "E976: Blob型を文字列として扱っています"
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908: 無効な値を文字列として扱っています"
 
 #, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %s を間違った型の値で設定しています"
+
+#, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: 変数 %s を削除できません"
 
@@ -671,6 +811,9 @@
 msgid " line "
 msgstr " 行 "
 
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Blob型はBlob型としか比較できません"
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: リスト型はリスト型としか比較できません"
 
@@ -696,6 +839,10 @@
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: %s の引数はリスト型でなければなりません"
 
+#, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s の引数はリスト型またはBlob型でなければなりません"
+
 msgid "E928: String required"
 msgstr "E928: 文字列が必要です"
 
@@ -705,12 +852,19 @@
 msgid "add() argument"
 msgstr "add() の引数"
 
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: 無効なバッファ名です: %s"
+
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() は挿入モードでしか利用できません"
 
 msgid "&Ok"
 msgstr "&Ok"
 
+msgid "E980: lowlevel input not supported"
+msgstr "E980: 低レベル入力はサポートされていません"
+
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -752,8 +906,8 @@
 msgstr "E957: 無効なウィンドウ番号です"
 
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID は \":match\" のために予約されています: %ld"
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID は \":match\" のために予約されています: %d"
 
 msgid "E726: Stride is zero"
 msgstr "E726: ストライド(前進量)が 0 です"
@@ -795,11 +949,11 @@
 
 #, c-format
 msgid "E927: Invalid action: '%s'"
-msgstr "E927: 無効な操作です: %s"
+msgstr "E927: 無効な操作です: '%s'"
 
 #, c-format
 msgid "E962: Invalid action: '%s'"
-msgstr "E962: 無効な操作です: %s"
+msgstr "E962: 無効な操作です: '%s'"
 
 msgid "sort() argument"
 msgstr "sort() の引数"
@@ -818,7 +972,7 @@
 
 #, c-format
 msgid "E935: invalid submatch number: %d"
-msgstr "E935: 無効なサブマッチ番号: %d"
+msgstr "E935: 無効なサブマッチ番号です: %d"
 
 msgid "E677: Error writing temp file"
 msgstr "E677: 一時ファイル書込中にエラーが発生しました"
@@ -995,8 +1149,8 @@
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvimではシェルコマンドを使えません"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr "E145: rvimではシェルコマンドと一部の機能を使えません"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
@@ -1091,52 +1245,6 @@
 msgid "E150: Not a directory: %s"
 msgstr "E150: ディレクトリではありません: %s"
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: 未知のsignコマンドです: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: sign名がありません"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: signの定義が多数見つかりました"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: 無効なsignのテキストです: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: 未知のsignです: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: signの番号がありません"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: 無効なバッファ名です: %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: 名前の無いバッファへはジャンプできません"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 無効なsign識別子です: %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: 変更できない sign です: %s"
-
-# Added at 27-Jan-2004.
-msgid " (NOT FOUND)"
-msgstr " (見つかりません)"
-
-msgid " (not supported)"
-msgstr " (非サポート)"
-
-msgid "[Deleted]"
-msgstr "[削除済]"
-
 msgid "No old files"
 msgstr "古いファイルはありません"
 
@@ -1325,6 +1433,9 @@
 msgid "E492: Not an editor command"
 msgstr "E492: エディタのコマンドではありません"
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981: rvimではこのコマンドを使えません"
+
 msgid "E493: Backwards range given"
 msgstr "E493: 逆さまの範囲が指定されました"
 
@@ -1348,12 +1459,13 @@
 msgstr[0] "編集すべきファイルがあと %d 個ありますが、終了しますか?"
 
 #, c-format
-msgid "E173: %ld more file to edit"
-msgid_plural "E173: %ld more files to edit"
-msgstr[0] "E173: 編集すべきファイルがあと %ld 個あります"
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173: 編集すべきファイルがあと %d 個あります"
 
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
 
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@
 msgid "Debug Line"
 msgstr "デバッグ行"
 
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar がコマンド長を超えました"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: アクティブなウィンドウかバッファが削除されました"
 
@@ -1994,73 +2103,46 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-msgid "--Deleted--"
-msgstr "--削除済--"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: そのグループはありません: \"%s\""
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936: 現在のグループは削除できません"
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: 使用中の augroup を消そうとしています"
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * の後に不正な文字がありました: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: そのようなイベントはありません: %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: そのようなグループもしくはイベントはありません: %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"--- Autocommands ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <バッファ=%d>: 無効なバッファ番号です "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
-
-msgid "No matching autocommands"
-msgstr "該当するautocommandは存在しません"
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommandの入れ子が深過ぎます"
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s Autocommands for \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr "%s を実行しています"
-
-#, c-format
-msgid "autocommand %s"
-msgstr "autocommand %s"
-
 msgid "E219: Missing {."
 msgstr "E219: { がありません."
 
 msgid "E220: Missing }."
 msgstr "E220: } がありません."
 
+msgid "E854: path too long for completion"
+msgstr "E854: パスが長過ぎて補完できません"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
+"ん."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpathには \"%s\" というディレクトリがありません"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: pathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpathにはこれ以上 \"%s\" というディレクトリがありません"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
+
+msgid "E446: No file name under cursor"
+msgstr "E446: カーソルの下にファイル名がありません"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: pathには \"%s\" というファイルがありません"
+
 msgid "E490: No fold found"
 msgstr "E490: 折畳みがありません"
 
@@ -2336,20 +2418,20 @@
 msgstr "フォント0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "フォント1: %s"
+msgid "Font%d: %s"
+msgstr "フォント%d: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "フォント%ld の幅がフォント0の2倍ではありません"
+msgid "Font%d width is not twice that of font0"
+msgstr "フォント%d の幅がフォント0の2倍ではありません"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "フォント0の幅: %ld"
+msgid "Font0 width: %d"
+msgstr "フォント0の幅: %d"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "フォント1の幅: %ld"
+msgid "Font%d width: %d"
+msgstr "フォント%dの幅: %d"
 
 msgid "Invalid font specification"
 msgstr "無効なフォント指定です"
@@ -2525,8 +2607,8 @@
 msgstr "cscopeデータベース %s を追加"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262: cscopeの接続 %d を読込み中のエラーです"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
@@ -3064,9 +3146,6 @@
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tヘブライ語モードで起動する"
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tペルシア語モードで起動する"
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
@@ -3819,9 +3898,6 @@
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: メニューアイテムのパスの部分がサブメニューではありません"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: メニューは他のモードにだけあります"
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" というメニューはありません"
@@ -4015,41 +4091,14 @@
 msgid "E549: Illegal percentage"
 msgstr "E549: 不正なパーセンテージです"
 
-msgid "E854: path too long for completion"
-msgstr "E854: パスが長過ぎて補完できません"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
-"ん."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpathには \"%s\" というディレクトリがありません"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: pathには \"%s\" というファイルがありません"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpathにはこれ以上 \"%s\" というディレクトリがありません"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: バッファ %ld の NetBeans 接続が失われました"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658: バッファ %d の NetBeans 接続が失われました"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeansはこのGUIには対応していません"
@@ -4809,8 +4858,8 @@
 msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (NFA 正規表現) 無効な文字クラスです: %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@
 msgstr "見つかりません "
 
 msgid "in path ---\n"
-msgstr "パスに ----\n"
+msgstr "パスに ---\n"
 
 msgid "  (Already listed)"
 msgstr "  (既に列挙)"
@@ -4986,6 +5035,67 @@
 "# 最後の %s検索パターン:\n"
 "~"
 
+msgid "[Deleted]"
+msgstr "[削除済]"
+
+msgid ""
+"\n"
+"--- Signs ---"
+msgstr ""
+"\n"
+"--- サイン ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "%s のサイン:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  グループ=%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    行=%ld  識別子=%d%s  名前=%s  優先度=%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: signの定義が多過ぎます"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: 無効なsignのテキストです: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: 未知のsignです: %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: 変更できない sign です: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: signの番号がありません"
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157: 無効なsign識別子です: %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 名前の無いバッファへはジャンプできません"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: 未知のsignコマンドです: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: sign名がありません"
+
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (見つかりません)"
+
+msgid " (not supported)"
+msgstr " (非サポート)"
+
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: スペルチェックは無効化されています"
 
@@ -5098,10 +5208,6 @@
 msgstr "%s 内の次の変換はサポートされていません: %s から %s へ"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "%s 内の変換はサポートされていません"
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s 内の %d 行目の FLAG に無効な値があります: %s"
 
@@ -5319,8 +5425,8 @@
 msgstr "E751: 出力ファイル名には範囲名を含められません"
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754: 範囲は %ld 個までしかサポートされていません"
+msgid "E754: Only up to %d regions supported"
+msgstr "E754: 範囲は %d 個までしかサポートされていません"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@
 msgstr "実行しました!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile' には %d 個のエントリはありません"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@
 
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: 無効な :syntax のサブコマンド: %s"
+msgstr "E410: 無効な :syntax のサブコマンドです: %s"
 
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
@@ -5740,6 +5846,38 @@
 msgid "E955: Not a terminal buffer"
 msgstr "E955: 端末バッファではありません"
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY が無効です"
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971: プロパティタイプ %s がありません"
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964: 無効な列番号です: %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966: 無効な行番号です: %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965: プロパティタイプ名がありません"
+
+msgid "E967: text property info corrupted"
+msgstr "E967: テキストプロパティ情報が壊れています"
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968: 最低 1 個の 'id' または 'type' が必要です"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969: プロパティタイプ %s は既に定義されています"
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970: 未知のハイライトグループ名: '%s'"
+
 msgid "new shell started\n"
 msgstr "新しいシェルを起動します\n"
 
@@ -6293,6 +6431,10 @@
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92: バッファ %ld が見つかりません"
+
 msgid "E441: There is no preview window"
 msgstr "E441: プレビューウィンドウがありません"
 
@@ -6314,31 +6456,24 @@
 msgid "E445: Other window contains changes"
 msgstr "E445: 他のウィンドウには変更があります"
 
-msgid "E446: No file name under cursor"
-msgstr "E446: カーソルの下にファイル名がありません"
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %d (1 以上でなければなりません)"
 
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: pathには \"%s\" というファイルがありません"
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799: 無効な ID: %ld (1 以上でなければなりません)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID はすでに利用中です: %ld"
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID はすでに利用中です: %d"
 
 msgid "List or number required"
 msgstr "リストか数値が必要です"
 
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %d (1 以上でなければなりません)"
 
 #, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID はありません: %ld"
+msgid "E803: ID not found: %d"
+msgstr "E803: ID はありません: %d"
 
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: ペルシア語サポートは削除されました\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
@@ -6644,6 +6779,13 @@
 msgstr "E684: リストのインデックスが範囲外です: %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Blobのインデックスが範囲外です: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: Blob型には無効な操作です"
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: 関数の引数が多過ぎます: %s"
 
@@ -6654,10 +6796,17 @@
 msgid "E714: List required"
 msgstr "E714: リスト型が必要です"
 
+msgid "E897: List or Blob required"
+msgstr "E897: リスト型またはBlob型が必要です"
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: %s の引数はリスト型、辞書型またはBlob型でなければなりません"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
@@ -6760,6 +6909,9 @@
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Autocommandが再帰を引き起こしました"
 
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: メニューは他のモードにだけあります"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "上まで検索したので下に戻ります"
 

src/po/ja.sjis.po

diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 9e70745..b8d0104 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,7 +3,7 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2019 MURAOKA Taro <koron.kaoriya@gmail.com>,
 # 			  vim-jp <http://vim-jp.org/>
 #
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
+"PO-Revision-Date: 2019-03-12 08:23+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"
@@ -24,6 +24,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "--Deleted--"
+msgstr "--íœÏ--"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <ƒoƒbƒtƒ@=%d> ‚ªŽ©“®“I‚ɍ폜‚³‚ê‚Ü‚·"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367: ‚»‚̃Oƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Œ»Ý‚̃Oƒ‹[ƒv‚͍폜‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Žg—p’†‚Ì augroup ‚ðÁ‚»‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: * ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: ‚»‚̂悤‚ȃCƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: ‚»‚̂悤‚ȃOƒ‹[ƒv‚à‚µ‚­‚̓Cƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Autocommands ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <ƒoƒbƒtƒ@=%d>: –³Œø‚ȃoƒbƒtƒ@”ԍ†‚Å‚· "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217: ‘S‚ẴCƒxƒ“ƒg‚ɑ΂µ‚Ä‚Ìautocommand‚ÍŽÀs‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "No matching autocommands"
+msgstr "ŠY“–‚·‚éautocommand‚Í‘¶Ý‚µ‚Ü‚¹‚ñ"
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218: autocommand‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Autocommands for \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr "%s ‚ðŽÀs‚µ‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "autocommand %s"
+msgstr "autocommand %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() ‚ª‹óƒpƒXƒ[ƒh‚ŌĂяo‚³‚ê‚Ü‚µ‚½"
 
@@ -100,8 +161,8 @@
 msgstr "E88: Å‰‚̃oƒbƒtƒ@‚æ‚è‘O‚ւ͈ړ®‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: ƒoƒbƒtƒ@ %ld ‚̕ύX‚Í•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚ŕύX‚ð”jŠü)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr "E89: ƒoƒbƒtƒ@ %d ‚̕ύX‚Í•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚ŕύX‚ð”jŠü)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: ƒWƒ‡ƒu‚Í‚Ü‚¾ŽÀs’†‚Å‚· (! ‚ð’ljÁ‚ŃWƒ‡ƒu‚ðI—¹)"
@@ -119,8 +180,8 @@
 msgstr "W14: Œx: ƒtƒ@ƒCƒ‹–¼‚̃ŠƒXƒg‚ª’·‰ß‚¬‚Ü‚·"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: ƒoƒbƒtƒ@ %ld ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
+msgid "E92: Buffer %d not found"
+msgstr "E92: ƒoƒbƒtƒ@ %d ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@
 msgid "[Scratch]"
 msgstr "[‰º‘‚«]"
 
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- ƒTƒCƒ“ ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s ‚̃TƒCƒ“:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    s=%ld  Ž¯•ÊŽq=%d  –¼‘O=%s"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ƒ|[ƒg‚ɐڑ±‚Å‚«‚Ü‚¹‚ñ"
 
@@ -309,8 +355,8 @@
 msgstr "E737: ƒL[‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·: %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96: %ld ˆÈã‚̃oƒbƒtƒ@‚Ídiff‚Å‚«‚Ü‚¹‚ñ"
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96: %d ˆÈã‚̃oƒbƒtƒ@‚Ídiff‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@
 msgstr "E103: ƒoƒbƒtƒ@ \"%s\" ‚͍·•ªƒ‚[ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: —\\Šú‚¹‚¸ƒoƒbƒtƒ@‚ª•ÏX•ÏX‚³‚ê‚Ü‚µ‚½"
+msgstr "E787: —\\Šú‚¹‚¸ƒoƒbƒtƒ@‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ‡Žš‚ÉEscape‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ"
 
+msgid "Custom"
+msgstr "ƒJƒXƒ^ƒ€"
+
+msgid "Latin supplement"
+msgstr "ƒ‰ƒeƒ“•â•"
+
+msgid "Greek and Coptic"
+msgstr "ƒMƒŠƒVƒƒ‚ƃRƒvƒg"
+
+msgid "Cyrillic"
+msgstr "ƒLƒŠƒ‹"
+
+msgid "Hebrew"
+msgstr "ƒwƒuƒ‰ƒC"
+
+msgid "Arabic"
+msgstr "ƒAƒ‰ƒrƒA"
+
+msgid "Latin extended"
+msgstr "ƒ‰ƒeƒ“Šg’£"
+
+msgid "Greek extended"
+msgstr "ƒMƒŠƒVƒƒŠg’£"
+
+msgid "Punctuation"
+msgstr "‹å“Ç“_"
+
+msgid "Super- and subscripts"
+msgstr "ã•t‚«E‰º•t‚«"
+
+msgid "Currency"
+msgstr "’ʉ݋L†"
+
+msgid "Other"
+msgstr "‚»‚Ì‘¼"
+
+msgid "Roman numbers"
+msgstr "ƒ[ƒ}”Žš"
+
+msgid "Arrows"
+msgstr "–îˆó"
+
+msgid "Mathematical operators"
+msgstr "”Šw‹L†"
+
+msgid "Technical"
+msgstr "‹Zp—p‹L†"
+
+msgid "Box drawing"
+msgstr "Œrü‘f•Ð"
+
+msgid "Block elements"
+msgstr "ƒuƒƒbƒN—v‘f"
+
+msgid "Geometric shapes"
+msgstr "Šô‰½Šw–Í—l"
+
+msgid "Symbols"
+msgstr "‹L†"
+
+msgid "Dingbats"
+msgstr "‘•ü‹L†"
+
+msgid "CJK symbols and punctuation"
+msgstr "CJK‹L†‹y‚Ñ‹å“Ç“_"
+
+msgid "Hiragana"
+msgstr "•½‰¼–¼"
+
+msgid "Katakana"
+msgstr "•Ð‰¼–¼"
+
+msgid "Bopomofo"
+msgstr "’‰¹Žš•ê"
+
 msgid "E544: Keymap file not found"
 msgstr "E544: ƒL[ƒ}ƒbƒvƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
@@ -510,14 +631,17 @@
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s ‚Ì’l‚ðˆê——•\\Ž¦‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ƒŠƒXƒgŒ^‚ÆŽ«‘Œ^ˆÈŠO‚̓Cƒ“ƒfƒbƒNƒXŽw’è‚Å‚«‚Ü‚¹‚ñ"
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689: ƒŠƒXƒgŒ^AŽ«‘Œ^ABlobŒ^ˆÈŠO‚̓Cƒ“ƒfƒbƒNƒXŽw’è‚Å‚«‚Ü‚¹‚ñ"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] ‚͍Ōã‚Å‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ‚ɂ̓ŠƒXƒgŒ^‚Ì’l‚ª•K—v‚Å‚·"
+msgid "E709: [:] requires a List or Blob value"
+msgstr "E709: [:] ‚ɂ̓ŠƒXƒgŒ^‚©BlobŒ^‚Ì’l‚ª•K—v‚Å‚·"
+
+msgid "E972: Blob value does not have the right number of bytes"
+msgstr "E972: BlobŒ^‚Ì’l‚̃oƒCƒg”‚ª³‚µ‚­‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: ƒŠƒXƒgŒ^•Ï”‚Ƀ^[ƒQƒbƒg‚æ‚è‚à‘½‚¢—v‘f‚ª‚ ‚è‚Ü‚·"
@@ -545,6 +669,9 @@
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' ‚ð•‚“®¬”“_”‚Æ‘g‚ݍ‡‚킹‚Ä‚ÍŽg‚¦‚Ü‚¹‚ñ"
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr "E973: BlobƒŠƒeƒ‰ƒ‹‚Í‹ô”ŒÂ‚Ì16i”•¶Žš‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
@@ -595,6 +722,9 @@
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: ƒ`ƒƒƒlƒ‹‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: BlobŒ^‚𐔒l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: ŠÖ”ŽQÆŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
@@ -616,6 +746,9 @@
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: ƒ`ƒƒƒlƒ‹‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: BlobŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: ŠÖ”ŽQÆŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
@@ -625,10 +758,17 @@
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Ž«‘Œ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
+msgid "E976: using Blob as a String"
+msgstr "E976: BlobŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908: –³Œø‚È’l‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
 #, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %s ‚ðŠÔˆá‚Á‚½Œ^‚Ì’l‚Őݒ肵‚Ä‚¢‚Ü‚·"
+
+#, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: •Ï” %s ‚ðíœ‚Å‚«‚Ü‚¹‚ñ"
 
@@ -671,6 +811,9 @@
 msgid " line "
 msgstr " s "
 
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: BlobŒ^‚ÍBlobŒ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: ƒŠƒXƒgŒ^‚̓ŠƒXƒgŒ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
 
@@ -696,6 +839,10 @@
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍBlobŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
 msgid "E928: String required"
 msgstr "E928: •¶Žš—ñ‚ª•K—v‚Å‚·"
 
@@ -705,12 +852,19 @@
 msgid "add() argument"
 msgstr "add() ‚̈ø”"
 
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: –³Œø‚ȃoƒbƒtƒ@–¼‚Å‚·: %s"
+
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() ‚Í‘}“üƒ‚[ƒh‚Å‚µ‚©—˜—p‚Å‚«‚Ü‚¹‚ñ"
 
 msgid "&Ok"
 msgstr "&Ok"
 
+msgid "E980: lowlevel input not supported"
+msgstr "E980: ’჌ƒxƒ‹“ü—͂̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -752,8 +906,8 @@
 msgstr "E957: –³Œø‚ȃEƒBƒ“ƒhƒE”ԍ†‚Å‚·"
 
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID ‚Í \":match\" ‚Ì‚½‚ß‚É—\\–ñ‚³‚ê‚Ä‚¢‚Ü‚·: %ld"
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID ‚Í \":match\" ‚Ì‚½‚ß‚É—\\–ñ‚³‚ê‚Ä‚¢‚Ü‚·: %d"
 
 msgid "E726: Stride is zero"
 msgstr "E726: ƒXƒgƒ‰ƒCƒh(‘Oi—Ê)‚ª 0 ‚Å‚·"
@@ -795,11 +949,11 @@
 
 #, c-format
 msgid "E927: Invalid action: '%s'"
-msgstr "E927: –³Œø‚È‘€ì‚Å‚·: %s"
+msgstr "E927: –³Œø‚È‘€ì‚Å‚·: '%s'"
 
 #, c-format
 msgid "E962: Invalid action: '%s'"
-msgstr "E962: –³Œø‚È‘€ì‚Å‚·: %s"
+msgstr "E962: –³Œø‚È‘€ì‚Å‚·: '%s'"
 
 msgid "sort() argument"
 msgstr "sort() ‚̈ø”"
@@ -818,7 +972,7 @@
 
 #, c-format
 msgid "E935: invalid submatch number: %d"
-msgstr "E935: –³Œø‚ȃTƒuƒ}ƒbƒ`”ԍ†: %d"
+msgstr "E935: –³Œø‚ȃTƒuƒ}ƒbƒ`”ԍ†‚Å‚·: %d"
 
 msgid "E677: Error writing temp file"
 msgstr "E677: ˆêŽžƒtƒ@ƒCƒ‹‘ž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
@@ -995,8 +1149,8 @@
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ”‚Å‚Í‚È‚¢ˆø”‚ª :z ‚É“n‚³‚ê‚Ü‚µ‚½"
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim‚ł̓VƒFƒ‹ƒRƒ}ƒ“ƒh‚ðŽg‚¦‚Ü‚¹‚ñ"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr "E145: rvim‚ł̓VƒFƒ‹ƒRƒ}ƒ“ƒh‚ƈꕔ‚Ì‹@”\\‚ðŽg‚¦‚Ü‚¹‚ñ"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ³‹K•\\Œ»‚Í•¶Žš‚Å‹æØ‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
@@ -1091,52 +1245,6 @@
 msgid "E150: Not a directory: %s"
 msgstr "E150: ƒfƒBƒŒƒNƒgƒŠ‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: –¢’m‚ÌsignƒRƒ}ƒ“ƒh‚Å‚·: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: sign–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: sign‚Ì’è‹`‚ª‘½”Œ©‚‚©‚è‚Ü‚µ‚½"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: –³Œø‚Èsign‚̃eƒLƒXƒg‚Å‚·: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: –¢’m‚Ìsign‚Å‚·: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: sign‚̔ԍ†‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: –³Œø‚ȃoƒbƒtƒ@–¼‚Å‚·: %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: –¼‘O‚Ì–³‚¢ƒoƒbƒtƒ@‚ւ̓Wƒƒƒ“ƒv‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: –³Œø‚ÈsignŽ¯•ÊŽq‚Å‚·: %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: •ÏX‚Å‚«‚È‚¢ sign ‚Å‚·: %s"
-
-# Added at 27-Jan-2004.
-msgid " (NOT FOUND)"
-msgstr " (Œ©‚‚©‚è‚Ü‚¹‚ñ)"
-
-msgid " (not supported)"
-msgstr " (”ñƒTƒ|[ƒg)"
-
-msgid "[Deleted]"
-msgstr "[íœÏ]"
-
 msgid "No old files"
 msgstr "ŒÃ‚¢ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
@@ -1325,6 +1433,9 @@
 msgid "E492: Not an editor command"
 msgstr "E492: ƒGƒfƒBƒ^‚̃Rƒ}ƒ“ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981: rvim‚Å‚Í‚±‚̃Rƒ}ƒ“ƒh‚ðŽg‚¦‚Ü‚¹‚ñ"
+
 msgid "E493: Backwards range given"
 msgstr "E493: ‹t‚³‚܂͈̔͂ªŽw’肳‚ê‚Ü‚µ‚½"
 
@@ -1348,12 +1459,13 @@
 msgstr[0] "•ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %d ŒÂ‚ ‚è‚Ü‚·‚ªAI—¹‚µ‚Ü‚·‚©?"
 
 #, c-format
-msgid "E173: %ld more file to edit"
-msgid_plural "E173: %ld more files to edit"
-msgstr[0] "E173: •ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %ld ŒÂ‚ ‚è‚Ü‚·"
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173: •ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %d ŒÂ‚ ‚è‚Ü‚·"
 
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ƒRƒ}ƒ“ƒh‚ªŠù‚É‚ ‚è‚Ü‚·: Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: ƒRƒ}ƒ“ƒh‚ªŠù‚É‚ ‚è‚Ü‚·: Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢: %s"
 
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@
 msgid "Debug Line"
 msgstr "ƒfƒoƒbƒOs"
 
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ‚ªƒRƒ}ƒ“ƒh’·‚ð’´‚¦‚Ü‚µ‚½"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: ƒAƒNƒeƒBƒu‚ȃEƒBƒ“ƒhƒE‚©ƒoƒbƒtƒ@‚ªíœ‚³‚ê‚Ü‚µ‚½"
 
@@ -1994,73 +2103,46 @@
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ‚̓Šƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-msgid "--Deleted--"
-msgstr "--íœÏ--"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "autocommand: %s <ƒoƒbƒtƒ@=%d> ‚ªŽ©“®“I‚ɍ폜‚³‚ê‚Ü‚·"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: ‚»‚̃Oƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936: Œ»Ý‚̃Oƒ‹[ƒv‚͍폜‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: Žg—p’†‚Ì augroup ‚ðÁ‚»‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: ‚»‚̂悤‚ȃCƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: ‚»‚̂悤‚ȃOƒ‹[ƒv‚à‚µ‚­‚̓Cƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"--- Autocommands ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <ƒoƒbƒtƒ@=%d>: –³Œø‚ȃoƒbƒtƒ@”ԍ†‚Å‚· "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ‘S‚ẴCƒxƒ“ƒg‚ɑ΂µ‚Ä‚Ìautocommand‚ÍŽÀs‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "No matching autocommands"
-msgstr "ŠY“–‚·‚éautocommand‚Í‘¶Ý‚µ‚Ü‚¹‚ñ"
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s Autocommands for \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr "%s ‚ðŽÀs‚µ‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "autocommand %s"
-msgstr "autocommand %s"
-
 msgid "E219: Missing {."
 msgstr "E219: { ‚ª‚ ‚è‚Ü‚¹‚ñ."
 
 msgid "E220: Missing }."
 msgstr "E220: } ‚ª‚ ‚è‚Ü‚¹‚ñ."
 
+msgid "E854: path too long for completion"
+msgstr "E854: ƒpƒX‚ª’·‰ß‚¬‚ĕ⊮‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: –³Œø‚ȃpƒX‚Å‚·: '**[”’l]' ‚Ípath‚̍Ōォ '%s' ‚ª‘±‚¢‚Ä‚È‚¢‚Æ‚¢‚¯‚Ü‚¹"
+"‚ñ."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpath‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpath‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: ƒpƒX‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E446: No file name under cursor"
+msgstr "E446: ƒJ[ƒ\\ƒ‹‚̉º‚Ƀtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
+
 msgid "E490: No fold found"
 msgstr "E490: Üô‚Ý‚ª‚ ‚è‚Ü‚¹‚ñ"
 
@@ -2336,20 +2418,20 @@
 msgstr "ƒtƒHƒ“ƒg0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "ƒtƒHƒ“ƒg1: %s"
+msgid "Font%d: %s"
+msgstr "ƒtƒHƒ“ƒg%d: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "ƒtƒHƒ“ƒg%ld ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì2”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
+msgid "Font%d width is not twice that of font0"
+msgstr "ƒtƒHƒ“ƒg%d ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì2”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "ƒtƒHƒ“ƒg0‚Ì•: %ld"
+msgid "Font0 width: %d"
+msgstr "ƒtƒHƒ“ƒg0‚Ì•: %d"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "ƒtƒHƒ“ƒg1‚Ì•: %ld"
+msgid "Font%d width: %d"
+msgstr "ƒtƒHƒ“ƒg%d‚Ì•: %d"
 
 msgid "Invalid font specification"
 msgstr "–³Œø‚ȃtƒHƒ“ƒgŽw’è‚Å‚·"
@@ -2525,8 +2607,8 @@
 msgstr "cscopeƒf[ƒ^ƒx[ƒX %s ‚ð’ljÁ"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope‚̐ڑ± %ld ‚ð“Ǎž‚Ý’†‚̃Gƒ‰[‚Å‚·"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262: cscope‚̐ڑ± %d ‚ð“Ǎž‚Ý’†‚̃Gƒ‰[‚Å‚·"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: –¢’m‚ÌcscopeŒŸõŒ^‚Å‚·"
@@ -3064,9 +3146,6 @@
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tƒwƒuƒ‰ƒCŒêƒ‚[ƒh‚Å‹N“®‚·‚é"
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tƒyƒ‹ƒVƒAŒêƒ‚[ƒh‚Å‹N“®‚·‚é"
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t’[––‚ð <terminal> ‚ɐݒ肷‚é"
 
@@ -3819,9 +3898,6 @@
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ƒƒjƒ…[ƒAƒCƒeƒ€‚̃pƒX‚Ì•”•ª‚ªƒTƒuƒƒjƒ…[‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ƒƒjƒ…[‚Í‘¼‚̃‚[ƒh‚É‚¾‚¯‚ ‚è‚Ü‚·"
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" ‚Æ‚¢‚¤ƒƒjƒ…[‚Í‚ ‚è‚Ü‚¹‚ñ"
@@ -4015,41 +4091,14 @@
 msgid "E549: Illegal percentage"
 msgstr "E549: •s³‚ȃp[ƒZƒ“ƒe[ƒW‚Å‚·"
 
-msgid "E854: path too long for completion"
-msgstr "E854: ƒpƒX‚ª’·‰ß‚¬‚ĕ⊮‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: –³Œø‚ȃpƒX‚Å‚·: '**[”’l]' ‚Ípath‚̍Ōォ '%s' ‚ª‘±‚¢‚Ä‚È‚¢‚Æ‚¢‚¯‚Ü‚¹"
-"‚ñ."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: ƒpƒX‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans‚̐ڑ±î•ñƒtƒ@ƒCƒ‹‚̃AƒNƒZƒXƒ‚[ƒh‚É–â‘肪‚ ‚è‚Ü‚·: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: ƒoƒbƒtƒ@ %ld ‚Ì NetBeans Ú‘±‚ªŽ¸‚í‚ê‚Ü‚µ‚½"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658: ƒoƒbƒtƒ@ %d ‚Ì NetBeans Ú‘±‚ªŽ¸‚í‚ê‚Ü‚µ‚½"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans‚Í‚±‚ÌGUI‚ɂ͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ"
@@ -4809,8 +4858,8 @@
 msgstr "E866: (NFA ³‹K•\\Œ») ˆÊ’u‚ªŒë‚Á‚Ä‚¢‚Ü‚·: %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (NFA ³‹K•\\Œ») –³Œø‚È•¶ŽšƒNƒ‰ƒX: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (NFA ³‹K•\\Œ») –³Œø‚È•¶ŽšƒNƒ‰ƒX‚Å‚·: %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@
 msgstr "Œ©‚‚©‚è‚Ü‚¹‚ñ "
 
 msgid "in path ---\n"
-msgstr "ƒpƒX‚É ----\n"
+msgstr "ƒpƒX‚É ---\n"
 
 msgid "  (Already listed)"
 msgstr "  (Šù‚É—ñ‹“)"
@@ -4986,6 +5035,67 @@
 "# ÅŒã‚Ì %sŒŸõƒpƒ^[ƒ“:\n"
 "~"
 
+msgid "[Deleted]"
+msgstr "[íœÏ]"
+
+msgid ""
+"\n"
+"--- Signs ---"
+msgstr ""
+"\n"
+"--- ƒTƒCƒ“ ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "%s ‚̃TƒCƒ“:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  ƒOƒ‹[ƒv=%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    s=%ld  Ž¯•ÊŽq=%d%s  –¼‘O=%s  —Dæ“x=%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: sign‚Ì’è‹`‚ª‘½‰ß‚¬‚Ü‚·"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: –³Œø‚Èsign‚̃eƒLƒXƒg‚Å‚·: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: –¢’m‚Ìsign‚Å‚·: %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: •ÏX‚Å‚«‚È‚¢ sign ‚Å‚·: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: sign‚̔ԍ†‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157: –³Œø‚ÈsignŽ¯•ÊŽq‚Å‚·: %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: –¼‘O‚Ì–³‚¢ƒoƒbƒtƒ@‚ւ̓Wƒƒƒ“ƒv‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: –¢’m‚ÌsignƒRƒ}ƒ“ƒh‚Å‚·: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: sign–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (Œ©‚‚©‚è‚Ü‚¹‚ñ)"
+
+msgid " (not supported)"
+msgstr " (”ñƒTƒ|[ƒg)"
+
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: ƒXƒyƒ‹ƒ`ƒFƒbƒN‚Í–³Œø‰»‚³‚ê‚Ä‚¢‚Ü‚·"
 
@@ -5098,10 +5208,6 @@
 msgstr "%s “à‚ÌŽŸ‚Ì•ÏŠ·‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %s ‚©‚ç %s ‚Ö"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "%s “à‚Ì•ÏŠ·‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s “à‚Ì %d s–Ú‚Ì FLAG ‚É–³Œø‚È’l‚ª‚ ‚è‚Ü‚·: %s"
 
@@ -5319,8 +5425,8 @@
 msgstr "E751: o—̓tƒ@ƒCƒ‹–¼‚ɂ͔͈͖¼‚ðŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754: ”ÍˆÍ‚Í %ld ŒÂ‚Ü‚Å‚µ‚©ƒTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+msgid "E754: Only up to %d regions supported"
+msgstr "E754: ”ÍˆÍ‚Í %d ŒÂ‚Ü‚Å‚µ‚©ƒTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@
 msgstr "ŽÀs‚µ‚Ü‚µ‚½!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' ‚É‚Í %ld ŒÂ‚̃Gƒ“ƒgƒŠ‚Í‚ ‚è‚Ü‚¹‚ñ"
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile' ‚É‚Í %d ŒÂ‚̃Gƒ“ƒgƒŠ‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@
 
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: –³Œø‚È :syntax ‚̃TƒuƒRƒ}ƒ“ƒh: %s"
+msgstr "E410: –³Œø‚È :syntax ‚̃TƒuƒRƒ}ƒ“ƒh‚Å‚·: %s"
 
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
@@ -5740,6 +5846,38 @@
 msgid "E955: Not a terminal buffer"
 msgstr "E955: ’[––ƒoƒbƒtƒ@‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY ‚ª–³Œø‚Å‚·"
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971: ƒvƒƒpƒeƒBƒ^ƒCƒv %s ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964: –³Œø‚È—ñ”ԍ†‚Å‚·: %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966: –³Œø‚ȍs”ԍ†‚Å‚·: %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965: ƒvƒƒpƒeƒBƒ^ƒCƒv–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E967: text property info corrupted"
+msgstr "E967: ƒeƒLƒXƒgƒvƒƒpƒeƒBî•ñ‚ª‰ó‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968: Å’á 1 ŒÂ‚Ì 'id' ‚Ü‚½‚Í 'type' ‚ª•K—v‚Å‚·"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969: ƒvƒƒpƒeƒBƒ^ƒCƒv %s ‚ÍŠù‚É’è‹`‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970: –¢’m‚̃nƒCƒ‰ƒCƒgƒOƒ‹[ƒv–¼: '%s'"
+
 msgid "new shell started\n"
 msgstr "V‚µ‚¢ƒVƒFƒ‹‚ð‹N“®‚µ‚Ü‚·\n"
 
@@ -6293,6 +6431,10 @@
 msgid "Already only one window"
 msgstr "Šù‚ɃEƒBƒ“ƒhƒE‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92: ƒoƒbƒtƒ@ %ld ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
+
 msgid "E441: There is no preview window"
 msgstr "E441: ƒvƒŒƒrƒ…[ƒEƒBƒ“ƒhƒE‚ª‚ ‚è‚Ü‚¹‚ñ"
 
@@ -6314,31 +6456,24 @@
 msgid "E445: Other window contains changes"
 msgstr "E445: ‘¼‚̃EƒBƒ“ƒhƒE‚ɂ͕ύX‚ª‚ ‚è‚Ü‚·"
 
-msgid "E446: No file name under cursor"
-msgstr "E446: ƒJ[ƒ\\ƒ‹‚̉º‚Ƀtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: –³Œø‚È ID: %d (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
 
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799: –³Œø‚È ID: %ld (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID ‚Í‚·‚Å‚É—˜—p’†‚Å‚·: %ld"
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID ‚Í‚·‚Å‚É—˜—p’†‚Å‚·: %d"
 
 msgid "List or number required"
 msgstr "ƒŠƒXƒg‚©”’l‚ª•K—v‚Å‚·"
 
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E802: –³Œø‚È ID: %ld (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: –³Œø‚È ID: %d (1 ˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ)"
 
 #, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID ‚Í‚ ‚è‚Ü‚¹‚ñ: %ld"
+msgid "E803: ID not found: %d"
+msgstr "E803: ID ‚Í‚ ‚è‚Ü‚¹‚ñ: %d"
 
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ƒwƒuƒ‰ƒCŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ƒyƒ‹ƒVƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: ƒyƒ‹ƒVƒAŒêƒTƒ|[ƒg‚͍폜‚³‚ê‚Ü‚µ‚½\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: ƒAƒ‰ƒrƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
@@ -6644,6 +6779,13 @@
 msgstr "E684: ƒŠƒXƒg‚̃Cƒ“ƒfƒbƒNƒX‚ª”͈͊O‚Å‚·: %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Blob‚̃Cƒ“ƒfƒbƒNƒX‚ª”͈͊O‚Å‚·: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: BlobŒ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
 
@@ -6654,10 +6796,17 @@
 msgid "E714: List required"
 msgstr "E714: ƒŠƒXƒgŒ^‚ª•K—v‚Å‚·"
 
+msgid "E897: List or Blob required"
+msgstr "E897: ƒŠƒXƒgŒ^‚Ü‚½‚ÍBlobŒ^‚ª•K—v‚Å‚·"
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍŽ«‘Œ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: %s ‚̈ø”‚̓ŠƒXƒgŒ^AŽ«‘Œ^‚Ü‚½‚ÍBlobŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ƒGƒ‰[ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
 
@@ -6760,6 +6909,9 @@
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Autocommand‚ªÄ‹A‚ðˆø‚«‹N‚±‚µ‚Ü‚µ‚½"
 
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: ƒƒjƒ…[‚Í‘¼‚̃‚[ƒh‚É‚¾‚¯‚ ‚è‚Ü‚·"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "ã‚Ü‚ÅŒŸõ‚µ‚½‚̂ʼnº‚É–ß‚è‚Ü‚·"