Update runtime files.

2019-03-17 17:13:16 +01:00
parent 049ca59236
commit 26967617a3
26 changed files with 1327 additions and 811 deletions
--- 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 @@ CursorMoved			After the cursor was moved in Normal or Visual
 				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 @@ TextChanged			After a change was made to the text in the
 				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 @@ If you want the buffer to be unmodified after changing it, reset the
 instead of ":q!".
 							*autocmd-nested* *E218*
-By default, autocommands do not nest.  If you use ":e" or ":w" in an
+By default, autocommands do not nest.  For example, if you use ":e" or ":w" in
-autocommand, Vim does not execute the BufRead and BufWrite autocommands for
+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 @@ following command.  Example: >
 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:
--- 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 @@ loaded.  Since Vim doesn't allow having two buffers for the same file, you
 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
+(this is in |defaults.vim|).  Use ":DiffOrig" to see the differences between
-between the current buffer and the file it was loaded from.
+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
--- 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 @@ tag		command		   action in Normal mode	~
 |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 @@ tag		command		   action in Normal mode	~
 |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 @@ tag		command		   action in Normal mode	~
 |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 @@ tag		char	      note action in Normal mode	~
 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 @@ Normal characters are inserted at the current cursor position.
 "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 @@ Most Normal mode commands except for window commands (|CTRL-W|) do not work in
 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
+|t_CTRL-W_N|	CTRL-W N	switch to Terminal-Normal mode
-|CTRL-W_:|	CTRL-W :	enter an Ex command
+|t_CTRL-W_:|	CTRL-W :	enter an Ex command
-|CTRL-W_.|	CTRL-W .	type CTRL-W in the terminal
+|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 @@ This is a brief but complete listing of all the ":" commands, without
 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
--- 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 @@ _  <underscore>		[count] - 1 lines downward, on the first non-blank
 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 @@ These commands are not marks themselves, but jump to a mark:
 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
--- 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 @@ Setting the filetype
 			When the optional FALLBACK argument is present, a
 			later :setfiletype command will override the
-			'filetype'.  This is to used for filetype detections
+			'filetype'.  This is to be used for filetype
-			that are just a guess.  |did_filetype()| will return
+			detections that are just a guess.  |did_filetype()|
-			false after this command.
+			will return false after this command.
 			{not in Vi}
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -3504,7 +3504,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 			- 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 @@ by obtaining a copy of the latest (often developmental) netrw at:
 The <netrw.vim> script is typically installed on systems as something like:
 >
-	/usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
+	/usr/local/share/vim/vim8x/plugin/netrwPlugin.vim
-	/usr/local/share/vim/vim7x/autoload/netrw.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
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -312,25 +312,25 @@ Exceptions:
  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
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3645,7 +3645,6 @@ CTRL-V-alternative	gui_w32.txt	/*CTRL-V-alternative*
 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_H	windows.txt	/*CTRL-W_H*
 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_c	windows.txt	/*CTRL-W_c*
 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_n	windows.txt	/*CTRL-W_n*
 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 @@ quake.vim	syntax.txt	/*quake.vim*
 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_AL	term.txt	/*t_AL*
 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*
--- 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
--- 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 @@ When the keyboard focus is in the terminal window, typed keys will be sent to
 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 next tabpage, same as `gt`	*t_CTRL-W_gt*
-	CTRL-W gT	go to previous tabpage, same as `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 @@ to the job.  For example:
 	'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-N    same as CTRL-W N |t_CTRL-W_N|
-	'termwinkey' CTRL-C    same as |t_CTRL-W_CTRL-C|
+	'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.
--- 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 @@ browser use: https://github.com/vim/vim/issues/1234
 							*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 @@ Terminal emulator window:
 - 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 @@ Does not build with MinGW out of the box:
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
 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 @@ Improve fallback for menu translations, to avoid having to create lots of
 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 @@ Should do current file first and not split it up when more results are found.
 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.
+Bug: script written with "-W scriptout" contains Key codes, while the script
-(ichizok, #3961)
+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 @@ Support setting the character displayed below the last line?  Neovim uses
 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 @@ balloonexpr() on MS-Windows GUI doesn't handle accented chars? (nivaemail,
 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 fix modify_fname() does not work well with some 'encoding's.
 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 @@ Invalid memory access with old regexp engine. (Dominique Pelle, 2018 Sep 3,
 #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
+Patch to add complete_info  Shougo - #3866.  Ready to include.
 Higashi, 2019 Jan 27, included now?
 Patch to make winnr() return the window above/below/beside a window.
 (Yegappan Lakshmanan, #3993)
@@ -290,7 +331,7 @@ kept, which means part of the text isn't displayed.  Better show all the text
 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 @@ Lemonboy can reproduce (2017 Jun 5)
 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 @@ Tests failing for "make testgui" with GTK:
 - 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 @@ missing: --nofork, -A , -b, -h, etc.
 ":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 @@ When session file has name in argument list but the buffer was deleted, the
 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 @@ Apr 23, #1653)
 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 @@ Have a way to get the call stack, in a function and from an exception.
 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 @@ Autoconf problem: when checking for iconv library we may add -L/usr/local/lib,
 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 @@ Windows installer: licence text should not use indent, causes bad word wrap.
 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 @@ Small problem displaying diff filler line when opening windows with a script.
 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 @@ Awaiting updated patches:
 			+ 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 @@ Awaiting updated patches:
    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 @@ Problems that will (probably) not be solved:
 -   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 @@ Multi-byte characters:
 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 @@ Various improvements:
    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)
--- 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 @@ will be explained though.  Use the ":help" command to find out more.
 >
 	" 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 @@ The following explains what defaults.vim is doing.
 	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 @@ character before where Insert mode started.  See 'backspace'.
 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 @@ will not need it.
 >
 	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 @@ typing commands at the command-line.
 		  \ | 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
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -2378,7 +2378,7 @@ Solution:   Use the msgfmt command found by configure. (Danek Duvall)
 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 @@ Solution:   Use R for a running job and F for a finished job.
 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 @@ Solution:   Add type cast. (Mike Williams)
 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 @@ Files:      src/ex_getln.c, src/proto/search.pro, src/search.c,
            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 @@ Solution:   Take the winbar into account when computing the new window
 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 @@ Files:      src/edit.c, src/testdir/test_ins_complete.vim,
            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 @@ Files:      runtime/doc/eval.txt, runtime/doc/usr_41.txt, src/Makefile,
            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 @@ Solution:   Restore emsg_silent before executing :try. (closes #2531)
 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
--- 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 @@ gn			Search forward for the last used search pattern, like
 			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*
--- 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 @@ CTRL-W gF						*CTRL-W_gF*
 		{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.
--- a/runtime/tutor/tutor.cs
+++ b/runtime/tutor/tutor.cs
@@ -1,5 +1,5 @@
 ===============================================================================
-=    V <EFBFBD> t e j t e   v  t u t o r i a l u   V I M       -    Verze 1.5        =
+=    V <EFBFBD> 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<EFBFBD>konn<EFBFBD> editor, kter<EFBFBD> m<EFBFBD> p<EFBFBD><EFBFBD>li<EFBFBD> mnoho p<EFBFBD><EFBFBD>kaz<EFBFBD> na to, aby
@@ -18,7 +18,7 @@
     nau<EFBFBD>en<EFBFBD>. Pokud si jen <EFBFBD>te<EFBFBD> text, p<EFBFBD><EFBFBD>kazy zapomene<EFBFBD>!
     Nyn<EFBFBD> se p<EFBFBD>esv<EFBFBD>d<EFBFBD>te, <EFBFBD>e Caps-Lock NEN<EFBFBD> stla<EFBFBD>en<EFBFBD> a n<EFBFBD>kolikr<EFBFBD>t stiskn<EFBFBD>te
-     kl<EFBFBD>vesu  j   aby se kurzor posunul natolik, <EFBFBD>e lekce 1.1 zapln<EFBFBD> celou
+     kl<EFBFBD>vesu   j   aby se kurzor posunul natolik, <EFBFBD>e lekce 1.1 zapln<EFBFBD> celou
     obrazovku.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekce 1.1:  POHYB KURZORU
--- a/runtime/tutor/tutor.cs.cp1250
+++ b/runtime/tutor/tutor.cs.cp1250
@@ -1,5 +1,5 @@
 ===============================================================================
-=    V <20> t e j t e   v  t u t o r i a l u   V I M       -    Verze 1.5        =
+=    V <20> 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<6E> editor, kter<65> m<> p<><70>li<6C> mnoho p<><70>kaz<61> na to, aby
@@ -18,7 +18,7 @@
     nau<61>en<65>. Pokud si jen <20>te<74> text, p<><70>kazy zapomene<6E>!
     Nyn<79> se p<>esv<73>d<EFBFBD>te, <20>e Caps-Lock NEN<45> stla<6C>en<65> a n<>kolikr<6B>t stiskn<6B>te
-     kl<6B>vesu  j   aby se kurzor posunul natolik, <20>e lekce 1.1 zapln<6C> celou
+     kl<6B>vesu   j   aby se kurzor posunul natolik, <20>e lekce 1.1 zapln<6C> celou
     obrazovku.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lekce 1.1:  POHYB KURZORU
--- 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
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -846,7 +846,7 @@ NOTE: 1
  6. ":set xxx" <20>ȥ<EFBFBD><C8A5><EFBFBD><EFBFBD>פ<EFBFBD><D7A4><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD> "xxx" <20><><EFBFBD><EFBFBD><EFBFBD>ꤵ<EFBFBD><EAA4B5><EFBFBD>롣
 	'ic' 'ignorecase'	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD>ζ<EFBFBD><CEB6>̤<EFBFBD><CCA4>ʤ<EFBFBD>
 	'is' 'incsearch'	<09><><EFBFBD><EFBFBD><EFBFBD>ե졼<D5A5><ECA1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD>ޥå<DEA5><C3A5><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	'hls' 'hlsearch'	<09>ޥå<DEA5><C3A5><EFBFBD><EFBFBD>뤹<EFBFBD>٤<EFBFBD><D9A4><EFBFBD>Ĵɽ<C4B4><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	'hls' 'hlsearch'	<09>ޥå<DEA5><C3A5><EFBFBD><EFBFBD>뤹<EFBFBD>٤Ƥ<EFBFBD><EFBFBD><EFBFBD>Ĵɽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     Ĺ<><C4B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD><EFBFBD>ѤǤ<D1A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>
  7. <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ˤ<EFBFBD> "no" <20><><EFBFBD><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD>ޤ<EFBFBD>:  :set noic
@@ -969,8 +969,9 @@ NOTE:
  Modified for Vim by Bram Moolenaar.
-  <20><><EFBFBD>ܸ<EFBFBD><DCB8><EFBFBD>  <20><><EFBFBD><EFBFBD> <20>ٹ<EFBFBD>  <mattn.jp@gmail.com>
+  <20><><EFBFBD>ܸ<EFBFBD><DCB8><EFBFBD>  <20><><EFBFBD><EFBFBD> <20>ٹ<EFBFBD>    <mattn.jp@gmail.com>
-  <EFBFBD>ƽ<EFBFBD>      ¼<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>Ϻ  <koron.kaoriya@gmail.com>
+            vim-jp<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <https://github.com/vim-jp/lang-ja>
  <20>ƽ<EFBFBD>      ¼<><C2BC> <20><>Ϻ    <koron.kaoriya@gmail.com>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 vi:set ts=8 sts=4 sw=4 tw=78:
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -846,7 +846,7 @@ NOTE: 1
  6. ":set xxx" <20>ƃ^<5E>C<EFBFBD>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD>ƃI<C683>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD> "xxx" <20><><EFBFBD>ݒ肳<DD92><E882B3><EFBFBD><EFBFBD><EFBFBD>B
 	'ic' 'ignorecase'	<09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɑ啶<C991><E595B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̋<EFBFBD><CC8B>ʂ<EFBFBD><CA82>Ȃ<EFBFBD>
 	'is' 'incsearch'	<09><><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD><74><EFBFBD>[<5B>Y<EFBFBD>ɕ<EFBFBD><C995><EFBFBD><EFBFBD>}<7D>b<EFBFBD>`<60><><EFBFBD>Ă<EFBFBD><C482>镔<EFBFBD><E99594><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	'hls' 'hlsearch'	<09>}<7D>b<EFBFBD>`<60><><EFBFBD>邷<EFBFBD>ׂ<EFBFBD><D782><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	'hls' 'hlsearch'	<09>}<7D>b<EFBFBD>`<60><><EFBFBD>邷<EFBFBD>ׂĂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>Z<EFBFBD><5A><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>ǂ<EFBFBD><C782><EFBFBD><EFBFBD>̃I<CC83>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>g<EFBFBD>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
  7. <20>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>𖳌<EFBFBD><F096B38C>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>ɂ<EFBFBD> "no" <20><><EFBFBD>t<EFBFBD>^<5E><><EFBFBD>܂<EFBFBD>:  :set noic
@@ -969,8 +969,9 @@ NOTE:
  Modified for Vim by Bram Moolenaar.
-  <20><><EFBFBD>{<7B><><EFBFBD><EFBFBD>  <20><><EFBFBD>{ <20>׍O  <mattn.jp@gmail.com>
+  <20><><EFBFBD>{<7B><><EFBFBD><EFBFBD>  <20><><EFBFBD>{ <20>׍O    <mattn.jp@gmail.com>
-  <EFBFBD>ďC      <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>Y  <koron.kaoriya@gmail.com>
+            vim-jp<6A>`<60>[<5B><> <https://github.com/vim-jp/lang-ja>
  <20>ďC      <20><><EFBFBD><EFBFBD> <20><><EFBFBD>Y    <koron.kaoriya@gmail.com>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 vi:set ts=8 sts=4 sw=4 tw=78:
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -846,7 +846,7 @@ NOTE: 1つの検索コマンドだけ大文字小文字の区別をやめたい
  6. ":set xxx" とタイプするとオプション "xxx" が設定される。
 	'ic' 'ignorecase'	検索時に大文字小文字の区別しない
 	'is' 'incsearch'	検索フレーズに部分マッチしている部分を表示する
-	'hls' 'hlsearch'	マッチするすべを強調表示する
+	'hls' 'hlsearch'	マッチするすべてを強調表示する
     長い方、短い方、どちらのオプション名でも使用できます。
  7. オプションを無効にするには "no" を付与します:  :set noic
@@ -969,8 +969,9 @@ NOTE: 補完は多くのコマンドで動作します。そして CTRL-D と <T
  Modified for Vim by Bram Moolenaar.
-  日本語訳  松本 泰弘  <mattn.jp@gmail.com>
+  日本語訳  松本 泰弘    <mattn.jp@gmail.com>
-  監修      村岡 太郎  <koron.kaoriya@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:
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -30,7 +30,7 @@ on MS-Windows.  Download the gettext packages, for example from:
 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
--- 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 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+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 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 msgid "--Deleted--"
 msgstr "--<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--"
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <<3C>Хåե<C3A5>=%d> <20><><EFBFBD><EFBFBD>ưŪ<C6B0>˺<EFBFBD><CBBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: <20><><EFBFBD>Υ<EFBFBD><CEA5>롼<EFBFBD>פϤ<D7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: \"%s\""
 msgid "E936: Cannot delete the current group"
 msgstr "E936: <20><><EFBFBD>ߤΥ<DFA4><CEA5>롼<EFBFBD>פϺ<D7A4><CFBA><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> augroup <20><><EFBFBD>ä<EFBFBD><C3A4><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * <20>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: <20><><EFBFBD>Τ褦<CEA4>ʥ<EFBFBD><CAA5>٥<EFBFBD><D9A5>ȤϤ<C8A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: <20><><EFBFBD>Τ褦<CEA4>ʥ<EFBFBD><CAA5>롼<EFBFBD>פ⤷<D7A4><E2A4B7><EFBFBD>ϥ<EFBFBD><CFA5>٥<EFBFBD><D9A5>ȤϤ<C8A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 msgid ""
 "\n"
 "--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocommands ---"
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <<3C>Хåե<C3A5>=%d>: ̵<><CCB5><EFBFBD>ʥХåե<C3A5><D5A5>ֹ<EFBFBD><D6B9>Ǥ<EFBFBD> "
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: <20><><EFBFBD>ƤΥ<C6A4><CEA5>٥<EFBFBD><D9A5>Ȥ<EFBFBD><C8A4>Ф<EFBFBD><D0A4>Ƥ<EFBFBD>autocommand<6E>ϼ¹ԤǤ<D4A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "No matching autocommands"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>autocommand<6E><64>¸<EFBFBD>ߤ<EFBFBD><DFA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand<6E><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҥ<EFBFBD><D2A4><EFBFBD><EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "%s Autocommands for \"%s\""
 msgstr "%s Autocommands for \"%s\""
 #, c-format
 msgid "Executing %s"
 msgstr "%s <20><><EFBFBD>¹Ԥ<C2B9><D4A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() <20><><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD>ɤǸƤӽФ<D3BD><D0A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -100,8 +161,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>ǽ<EFBFBD><C7BD>ΥХåե<C3A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؤϰ<D8A4>ư<EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
-msgstr "E89: <20>Хåե<C3A5> %ld <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD> (! <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>˴<EFBFBD>)"
+msgstr "E89: <20>Хåե<C3A5> %d <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD> (! <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>˴<EFBFBD>)"
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: <20><><EFBFBD><EFBFBD><EFBFBD>֤Ϥޤ<CFA4><DEA4>¹<EFBFBD><C2B9><EFBFBD><EFBFBD>Ǥ<EFBFBD> (! <20><><EFBFBD>ɲäǥ<C3A4><C7A5><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD>λ)"
@@ -119,8 +180,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20>ٹ<EFBFBD>: <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Υꥹ<CEA5>Ȥ<EFBFBD>Ĺ<EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 #, c-format
-msgid "E92: Buffer %ld not found"
+msgid "E92: Buffer %d not found"
-msgstr "E92: <20>Хåե<C3A5> %ld <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E92: <20>Хåե<C3A5> %d <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@ msgstr "[
 msgid "[Scratch]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
 "--- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ---"
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s <20>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD>:"
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    <20><>=%ld  <20><><EFBFBD>̻<EFBFBD>=%d  ̾<><CCBE>=%s"
 msgid "E902: Cannot connect to port"
 msgstr "E902: <20>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD>³<EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -309,8 +355,8 @@ msgid "E737: Key already exists: %s"
 msgstr "E737: <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><CFB4><EFBFBD>¸<EFBFBD>ߤ<EFBFBD><DFA4>ޤ<EFBFBD>: %s"
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
+msgid "E96: Cannot diff more than %d buffers"
-msgstr "E96: %ld <20>ʾ<EFBFBD><CABE>ΥХåե<C3A5><D5A5><EFBFBD>diff<66>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E96: %d <20>ʾ<EFBFBD><CABE>ΥХåե<C3A5><D5A5><EFBFBD>diff<66>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@ msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: <20>Хåե<C3A5> \"%s\" <20>Ϻ<EFBFBD>ʬ<EFBFBD>⡼<EFBFBD>ɤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<C3A5><D5A5><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E787: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<C3A5><D5A5><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Escape<70>ϻ<EFBFBD><CFBB>ѤǤ<D1A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "Custom"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Latin supplement"
 msgstr "<22><><EFBFBD>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Greek and Coptic"
 msgstr "<22><><EFBFBD>ꥷ<EFBFBD><EAA5B7><EFBFBD>ȥ<EFBFBD><C8A5>ץ<EFBFBD>"
 msgid "Cyrillic"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Hebrew"
 msgstr "<22>إ֥饤"
 msgid "Arabic"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ӥ<EFBFBD>"
 msgid "Latin extended"
 msgstr "<22><><EFBFBD>ƥ<EFBFBD><C6A5><EFBFBD>ĥ"
 msgid "Greek extended"
 msgstr "<22><><EFBFBD>ꥷ<EFBFBD><EAA5B7><EFBFBD><EFBFBD>ĥ"
 msgid "Punctuation"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Super- and subscripts"
 msgstr "<22><><EFBFBD>դ<EFBFBD><D5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>դ<EFBFBD>"
 msgid "Currency"
 msgstr "<22>̲ߵ<CCB2><DFB5><EFBFBD>"
 msgid "Other"
 msgstr "<22><><EFBFBD><EFBFBD>¾"
 msgid "Roman numbers"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>޿<EFBFBD><DEBF><EFBFBD>"
 msgid "Arrows"
 msgstr "<22><><EFBFBD><EFBFBD>"
 msgid "Mathematical operators"
 msgstr "<22><><EFBFBD>ص<EFBFBD><D8B5><EFBFBD>"
 msgid "Technical"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ѵ<EFBFBD><D1B5><EFBFBD>"
 msgid "Box drawing"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Block elements"
 msgstr "<22>֥<EFBFBD><D6A5>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Geometric shapes"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Symbols"
 msgstr "<22><><EFBFBD><EFBFBD>"
 msgid "Dingbats"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "CJK symbols and punctuation"
 msgstr "CJK<4A><4B><EFBFBD><EFBFBD><EFBFBD>ڤӶ<DAA4><D3B6><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Hiragana"
 msgstr "ʿ<><CABF>̾"
 msgid "Katakana"
 msgstr "<22>Ҳ<EFBFBD>̾"
 msgid "Bopomofo"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "E544: Keymap file not found"
 msgstr "E544: <20><><EFBFBD><EFBFBD><EFBFBD>ޥåץե<D7A5><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -510,14 +631,17 @@ msgstr "
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s <20><><EFBFBD>ͤ<EFBFBD><CDA4><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
-msgid "E689: Can only index a List or Dictionary"
+msgid "E689: Can only index a List, Dictionary or Blob"
-msgstr "E689: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7>ȼ<EFBFBD><EFBFBD>񷿰ʳ<EFBFBD><EFBFBD>ϥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǥå<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E689: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񷿡<EFBFBD>Blob<EFBFBD><EFBFBD><EFBFBD>ʳ<EFBFBD><EFBFBD>ϥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǥå<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>"
 msgid "E708: [:] must come last"
 msgstr "E708: [:] <20>ϺǸ<CFBA><C7B8>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Ф<EFBFBD><D0A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
-msgid "E709: [:] requires a List value"
+msgid "E709: [:] requires a List or Blob value"
-msgstr "E709: [:] <20>ˤϥꥹ<CFA5>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD>ͤ<EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
+msgstr "E709: [:] <20>ˤϥꥹ<CFA5>ȷ<EFBFBD><C8B7><EFBFBD>Blob<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͤ<EFBFBD>ɬ<EFBFBD>פǤ<EFBFBD>"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: Blob<6F><62><EFBFBD><EFBFBD><EFBFBD>ͤΥХ<CEA5><D0A5>ȿ<EFBFBD><C8BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E710: List value has more items than target"
 msgstr "E710: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7>ѿ<EFBFBD><D1BF>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>åȤ<C3A5><C8A4><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
@@ -545,6 +669,9 @@ msgstr "E109: '?'
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' <20><><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ߹<C8A4><DFB9>碌<EFBFBD>ƤϻȤ<CFBB><C8A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E973: Blob literal should have an even number of hex characters"
 msgstr "E973: Blob<6F><62><EFBFBD>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD>Ĥ<EFBFBD>16<31>ʿ<EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E110: Missing ')'"
 msgstr "E110: ')' <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -595,6 +722,9 @@ msgstr "E910:
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: <20><><EFBFBD><EFBFBD><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͤȤ<CDA4><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E974: Using a Blob as a Number"
 msgstr "E974: Blob<6F><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͤȤ<CDA4><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: <20>ؿ<EFBFBD><D8BF><EFBFBD><EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
@@ -616,6 +746,9 @@ msgstr "E911:
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: <20><><EFBFBD><EFBFBD><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E975: Using a Blob as a Float"
 msgstr "E975: Blob<6F><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E729: using Funcref as a String"
 msgstr "E729: <20>ؿ<EFBFBD><D8BF><EFBFBD><EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
@@ -625,9 +758,16 @@ msgstr "E730:
 msgid "E731: using Dictionary as a String"
 msgstr "E731: <20><><EFBFBD>񷿤<EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E976: using Blob as a String"
 msgstr "E976: Blob<6F><62><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD>ͤ<EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ư<EFBFBD><C6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "E963: setting %s to value with wrong type"
 msgstr "E963: %s <20><><EFBFBD>ְ<EFBFBD><D6B0>ä<EFBFBD><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͤ<EFBFBD><CDA4><EFBFBD><EFBFBD>ꤷ<EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: <20>ѿ<EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -671,6 +811,9 @@ msgstr ""
 msgid " line "
 msgstr " <20><> "
 msgid "E977: Can only compare Blob with Blob"
 msgstr "E977: Blob<6F><62><EFBFBD><EFBFBD>Blob<6F><62><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӤǤ<D3A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E691: Can only compare List with List"
 msgstr "E691: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7>ϥꥹ<CFA5>ȷ<EFBFBD><C8B7>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӤǤ<D3A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -696,6 +839,10 @@ msgstr "filter()
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: %s <20>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD>ϥꥹ<CFA5>ȷ<EFBFBD><C8B7>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E899: Argument of %s must be a List or Blob"
 msgstr "E899: %s <20>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD>ϥꥹ<CFA5>ȷ<EFBFBD><C8B7>ޤ<EFBFBD><DEA4><EFBFBD>Blob<6F><62><EFBFBD>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E928: String required"
 msgstr "E928: ʸ<><CAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
@@ -705,12 +852,19 @@ msgstr "E808:
 msgid "add() argument"
 msgstr "add() <20>ΰ<EFBFBD><CEB0><EFBFBD>"
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵<><CCB5><EFBFBD>ʥХåե<C3A5>̾<EFBFBD>Ǥ<EFBFBD>: %s"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⡼<EFBFBD>ɤǤ<C9A4><C7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѤǤ<D1A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "&Ok"
 msgstr "&Ok"
 msgid "E980: lowlevel input not supported"
 msgstr "E980: <20><><EFBFBD><EFBFBD><EFBFBD>٥<EFBFBD><D9A5><EFBFBD><EFBFBD>Ϥϥ<CFA4><CFA5>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -752,8 +906,8 @@ msgid "E957: Invalid window number"
 msgstr "E957: ̵<><CCB5><EFBFBD>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ֹ<EFBFBD><D6B9>Ǥ<EFBFBD>"
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
+msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID <20><> \":match\" <20>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD>ͽ<EFBFBD>󤵤<EFBFBD><F3A4B5A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>: %ld"
+msgstr "E798: ID <20><> \":match\" <20>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD>ͽ<EFBFBD>󤵤<EFBFBD><F3A4B5A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>: %d"
 msgid "E726: Stride is zero"
 msgstr "E726: <20><><EFBFBD>ȥ饤<C8A5><E9A5A4>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)<29><> 0 <20>Ǥ<EFBFBD>"
@@ -795,11 +949,11 @@ msgstr "E258:
 #, c-format
 msgid "E927: Invalid action: '%s'"
-msgstr "E927: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: %s"
+msgstr "E927: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: '%s'"
 #, c-format
 msgid "E962: Invalid action: '%s'"
-msgstr "E962: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: %s"
+msgstr "E962: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: '%s'"
 msgid "sort() argument"
 msgstr "sort() <20>ΰ<EFBFBD><CEB0><EFBFBD>"
@@ -818,7 +972,7 @@ msgstr "(̵
 #, c-format
 msgid "E935: invalid submatch number: %d"
-msgstr "E935: ̵<><CCB5><EFBFBD>ʥ<EFBFBD><CAA5>֥ޥå<DEA5><C3A5>ֹ<EFBFBD>: %d"
+msgstr "E935: ̵<><CCB5><EFBFBD>ʥ<EFBFBD><CAA5>֥ޥå<DEA5><C3A5>ֹ<EFBFBD><EFBFBD>Ǥ<EFBFBD>: %d"
 msgid "E677: Error writing temp file"
 msgstr "E677: <20><><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˥<EFBFBD><CBA5>顼<EFBFBD><E9A1BC>ȯ<EFBFBD><C8AF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -995,8 +1149,8 @@ msgstr "E143: autocommand
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: <20><><EFBFBD>ǤϤʤ<CFA4><CAA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :z <20><><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
-msgid "E145: Shell commands not allowed in rvim"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
-msgstr "E145: rvim<69>Ǥϥ<C7A4><CFA5><EFBFBD><EFBFBD>륳<EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E145: rvim<69>Ǥϥ<C7A4><CFA5><EFBFBD><EFBFBD>륳<EFBFBD>ޥ<EFBFBD><DEA5>ɤȰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ε<EFBFBD>ǽ<EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>"
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: <20><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD>Ƕ<EFBFBD><C7B6>ڤ뤳<DAA4>Ȥ<EFBFBD><C8A4>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -1091,52 +1245,6 @@ msgstr "E154:
 msgid "E150: Not a directory: %s"
 msgstr "E150: <20>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ<EFBFBD><C8A5>ǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤<>Τ<EFBFBD>sign<67><6E><EFBFBD>ޥ<EFBFBD><DEA5>ɤǤ<C9A4>: %s"
 msgid "E156: Missing sign name"
 msgstr "E156: sign̾<6E><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E612: Too many signs defined"
 msgstr "E612: sign<67><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ̵<><CCB5><EFBFBD><EFBFBD>sign<67>Υƥ<CEA5><C6A5><EFBFBD><EFBFBD>ȤǤ<C8A4>: %s"
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ̤<>Τ<EFBFBD>sign<67>Ǥ<EFBFBD>: %s"
 msgid "E159: Missing sign number"
 msgstr "E159: sign<67><6E><EFBFBD>ֹ椬<D6B9><E6A4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵<><CCB5><EFBFBD>ʥХåե<C3A5>̾<EFBFBD>Ǥ<EFBFBD>: %s"
 msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: ̾<><CCBE><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>Хåե<C3A5><D5A5>ؤϥ<D8A4><CFA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>פǤ<D7A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ̵<><CCB5><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>̻ҤǤ<D2A4>: %ld"
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: <20>ѹ<EFBFBD><D1B9>Ǥ<EFBFBD><C7A4>ʤ<EFBFBD> sign <20>Ǥ<EFBFBD>: %s"
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
 msgstr " (<28><><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>)"
 msgid " (not supported)"
 msgstr " (<28>󥵥ݡ<F3A5B5A5><DDA1><EFBFBD>)"
 msgid "[Deleted]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 msgid "No old files"
 msgstr "<22>Ť<EFBFBD><C5A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -1325,6 +1433,9 @@ msgstr "E464:
 msgid "E492: Not an editor command"
 msgstr "E492: <20><><EFBFBD>ǥ<EFBFBD><C7A5><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5>ɤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E981: Command not allowed in rvim"
 msgstr "E981: rvim<69>ǤϤ<C7A4><CFA4>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E493: Backwards range given"
 msgstr "E493: <20>դ<EFBFBD><D5A4>ޤ<EFBFBD><DEA4>ϰϤ<CFB0><CFA4><EFBFBD><EFBFBD>ꤵ<EFBFBD><EAA4B5><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -1348,12 +1459,13 @@ msgid_plural "%d more files to edit.  Quit anyway?"
 msgstr[0] "<22>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD> %d <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>?"
 #, c-format
-msgid "E173: %ld more file to edit"
+msgid "E173: %d more file to edit"
-msgid_plural "E173: %ld more files to edit"
+msgid_plural "E173: %d more files to edit"
-msgstr[0] "E173: <20>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD> %ld <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+msgstr[0] "E173: <20>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD> %d <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
-msgid "E174: Command already exists: add ! to replace it"
+#, c-format
-msgstr "E174: <EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><EFBFBD>ɤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD> ! <20><><EFBFBD>ɲä<C9B2><C3A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E174: Command already exists: add ! to replace it: %s"
 msgstr "E174: <20><><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ޤ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD> ! <20><><EFBFBD>ɲä<C9B2><C3A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@ msgstr "
 msgid "Debug Line"
 msgstr "<22>ǥХå<D0A5><C3A5><EFBFBD>"
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar <20><><EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD>Ĺ<EFBFBD><C4B9>Ķ<EFBFBD><C4B6><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: <20><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>֤ʥ<D6A4><CAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD>Хåե<C3A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -1994,73 +2103,46 @@ msgstr "E462: \"%s\"
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" <20>ϥ<EFBFBD><CFA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɤǤ<C9A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>"
 msgid "--Deleted--"
 msgstr "--<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>--"
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <<3C>Хåե<C3A5>=%d> <20><><EFBFBD><EFBFBD>ưŪ<C6B0>˺<EFBFBD><CBBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: <20><><EFBFBD>Υ<EFBFBD><CEA5>롼<EFBFBD>פϤ<D7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: \"%s\""
 msgid "E936: Cannot delete the current group"
 msgstr "E936: <20><><EFBFBD>ߤΥ<DFA4><CEA5>롼<EFBFBD>פϺ<D7A4><CFBA><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> augroup <20><><EFBFBD>ä<EFBFBD><C3A4><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * <20>θ<EFBFBD><CEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: <20><><EFBFBD>Τ褦<CEA4>ʥ<EFBFBD><CAA5>٥<EFBFBD><D9A5>ȤϤ<C8A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: <20><><EFBFBD>Τ褦<CEA4>ʥ<EFBFBD><CAA5>롼<EFBFBD>פ⤷<D7A4><E2A4B7><EFBFBD>ϥ<EFBFBD><CFA5>٥<EFBFBD><D9A5>ȤϤ<C8A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 msgid ""
 "\n"
 "--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocommands ---"
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <<3C>Хåե<C3A5>=%d>: ̵<><CCB5><EFBFBD>ʥХåե<C3A5><D5A5>ֹ<EFBFBD><D6B9>Ǥ<EFBFBD> "
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: <20><><EFBFBD>ƤΥ<C6A4><CEA5>٥<EFBFBD><D9A5>Ȥ<EFBFBD><C8A4>Ф<EFBFBD><D0A4>Ƥ<EFBFBD>autocommand<6E>ϼ¹ԤǤ<D4A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "No matching autocommands"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>autocommand<6E><64>¸<EFBFBD>ߤ<EFBFBD><DFA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand<6E><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҥ<EFBFBD><D2A4><EFBFBD><EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "%s Autocommands for \"%s\""
 msgstr "%s Autocommands for \"%s\""
 #, c-format
 msgid "Executing %s"
 msgstr "%s <20><><EFBFBD>¹Ԥ<C2B9><D4A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 msgid "E219: Missing {."
 msgstr "E219: { <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>."
 msgid "E220: Missing }."
 msgstr "E220: } <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>."
 msgid "E854: path too long for completion"
 msgstr "E854: <20>ѥ<EFBFBD><D1A5><EFBFBD>Ĺ<EFBFBD>᤮<EFBFBD><E1A4AE><EFBFBD>䴰<EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
 "E343: ̵<><CCB5><EFBFBD>ʥѥ<CAA5><D1A5>Ǥ<EFBFBD>: '**[<5B><><EFBFBD><EFBFBD>]' <20><>path<74>κǸ夫 '%s' <20><>³<EFBFBD><C2B3><EFBFBD>Ƥʤ<C6A4><CAA4>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 "<22><>."
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ꤬<C8A5><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath<74>ˤϤ<CBA4><CFA4><EFBFBD><EFBFBD>ʾ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ꤬<C8A5><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: <20>ѥ<EFBFBD><D1A5>ˤϤ<CBA4><CFA4><EFBFBD><EFBFBD>ʾ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E446: No file name under cursor"
 msgstr "E446: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β<EFBFBD><CEB2>˥ե<CBA5><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E490: No fold found"
 msgstr "E490: <20>޾<EFBFBD><DEBE>ߤ<EFBFBD><DFA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -2336,20 +2418,20 @@ msgid "Font0: %s"
 msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0: %s"
 #, c-format
-msgid "Font1: %s"
+msgid "Font%d: %s"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>1: %s"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%d: %s"
 #, c-format
-msgid "Font%ld width is not twice that of font0"
+msgid "Font%d width is not twice that of font0"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>2<EFBFBD>ܤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>2<EFBFBD>ܤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
-msgid "Font0 width: %ld"
+msgid "Font0 width: %d"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>: %ld"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>: %d"
 #, c-format
-msgid "Font1 width: %ld"
+msgid "Font%d width: %d"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%d<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d"
 msgid "Invalid font specification"
 msgstr "̵<><CCB5><EFBFBD>ʥե<CAA5><D5A5><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
@@ -2525,8 +2607,8 @@ msgid "Added cscope database %s"
 msgstr "cscope<70>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD>١<EFBFBD><D9A1><EFBFBD> %s <20><><EFBFBD>ɲ<EFBFBD>"
 #, c-format
-msgid "E262: error reading cscope connection %ld"
+msgid "E262: error reading cscope connection %d"
-msgstr "E262: cscope<70><65><EFBFBD><EFBFBD>³ %ld <20><><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>顼<EFBFBD>Ǥ<EFBFBD>"
+msgstr "E262: cscope<70><65><EFBFBD><EFBFBD>³ %d <20><><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>顼<EFBFBD>Ǥ<EFBFBD>"
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤<>Τ<EFBFBD>cscope<70><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
@@ -3064,9 +3146,6 @@ msgstr "-A\t\t\t
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t<>إ֥饤<D6A5><E9A5A4><EFBFBD>⡼<EFBFBD>ɤǵ<C9A4>ư<EFBFBD><C6B0><EFBFBD><EFBFBD>"
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t<>ڥ륷<DAA5><EBA5B7><EFBFBD><EFBFBD><EFBFBD>⡼<EFBFBD>ɤǵ<C9A4>ư<EFBFBD><C6B0><EFBFBD><EFBFBD>"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tü<74><C3BC><EFBFBD><EFBFBD> <terminal> <20><><EFBFBD><EFBFBD><EFBFBD>ꤹ<EFBFBD><EAA4B9>"
@@ -3819,9 +3898,6 @@ msgstr "E326:
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: <20><><EFBFBD>˥塼<CBA5><E5A1BC><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>Υѥ<CEA5><D1A5><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC><EFBFBD><EFBFBD><EFBFBD>֥<EFBFBD><D6A5>˥塼<CBA5>ǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: <20><><EFBFBD>˥塼<CBA5><E5A1BC>¾<EFBFBD>Υ⡼<CEA5>ɤˤ<C9A4><CBA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˥塼<CBA5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -4015,41 +4091,14 @@ msgstr "E548:
 msgid "E549: Illegal percentage"
 msgstr "E549: <20><><EFBFBD><EFBFBD><EFBFBD>ʥѡ<CAA5><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD><C6A1><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
 msgid "E854: path too long for completion"
 msgstr "E854: <20>ѥ<EFBFBD><D1A5><EFBFBD>Ĺ<EFBFBD>᤮<EFBFBD><E1A4AE><EFBFBD>䴰<EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
 "E343: ̵<><CCB5><EFBFBD>ʥѥ<CAA5><D1A5>Ǥ<EFBFBD>: '**[<5B><><EFBFBD><EFBFBD>]' <20><>path<74>κǸ夫 '%s' <20><>³<EFBFBD><C2B3><EFBFBD>Ƥʤ<C6A4><CAA4>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 "<22><>."
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ꤬<C8A5><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath<74>ˤϤ<CBA4><CFA4><EFBFBD><EFBFBD>ʾ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>쥯<EFBFBD>ȥ꤬<C8A5><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: <20>ѥ<EFBFBD><D1A5>ˤϤ<CBA4><CFA4><EFBFBD><EFBFBD>ʾ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans<6E><73><EFBFBD><EFBFBD>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⡼<EFBFBD>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>꤬<EFBFBD><EAA4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>: \"%s\""
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %d"
-msgstr "E658: <20>Хåե<C3A5> %ld <20><> NetBeans <20><>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E658: <20>Хåե<C3A5> %d <20><> NetBeans <20><>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans<6E>Ϥ<EFBFBD><CFA4><EFBFBD>GUI<55>ˤ<EFBFBD><CBA4>б<EFBFBD><D0B1><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -4809,8 +4858,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA <20><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>) <20><><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD>äƤ<C3A4><C6A4>ޤ<EFBFBD>: %c"
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
-msgstr "E877: (NFA <20><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>) ̵<><CCB5><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>饹: %ld"
+msgstr "E877: (NFA <20><><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>) ̵<><CCB5><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD><EFBFBD>饹<EFBFBD>Ǥ<EFBFBD>: %d"
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@ msgid "not found "
 msgstr "<22><><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD> "
 msgid "in path ---\n"
-msgstr "<22>ѥ<EFBFBD><D1A5><EFBFBD> ----\n"
+msgstr "<22>ѥ<EFBFBD><D1A5><EFBFBD> ---\n"
 msgid "  (Already listed)"
 msgstr "  (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -4986,6 +5035,67 @@ msgstr ""
 "# <20>Ǹ<EFBFBD><C7B8><EFBFBD> %s<><73><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD>:\n"
 "~"
 msgid "[Deleted]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
 "--- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ---"
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s <20>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD>:"
 #, c-format
 msgid "  group=%s"
 msgstr "  <20><><EFBFBD>롼<EFBFBD><EBA1BC>=%s"
 #, c-format
 msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
 msgstr "    <20><>=%ld  <20><><EFBFBD>̻<EFBFBD>=%d%s  ̾<><CCBE>=%s  ͥ<><CDA5><EFBFBD><EFBFBD>=%d"
 msgid "E612: Too many signs defined"
 msgstr "E612: sign<67><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ̵<><CCB5><EFBFBD><EFBFBD>sign<67>Υƥ<CEA5><C6A5><EFBFBD><EFBFBD>ȤǤ<C8A4>: %s"
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ̤<>Τ<EFBFBD>sign<67>Ǥ<EFBFBD>: %s"
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: <20>ѹ<EFBFBD><D1B9>Ǥ<EFBFBD><C7A4>ʤ<EFBFBD> sign <20>Ǥ<EFBFBD>: %s"
 msgid "E159: Missing sign number"
 msgstr "E159: sign<67><6E><EFBFBD>ֹ椬<D6B9><E6A4AC><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E157: Invalid sign ID: %d"
 msgstr "E157: ̵<><CCB5><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>̻ҤǤ<D2A4>: %d"
 msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: ̾<><CCBE><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>Хåե<C3A5><D5A5>ؤϥ<D8A4><CFA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>פǤ<D7A4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤<>Τ<EFBFBD>sign<67><6E><EFBFBD>ޥ<EFBFBD><DEA5>ɤǤ<C9A4>: %s"
 msgid "E156: Missing sign name"
 msgstr "E156: sign̾<6E><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
 msgstr " (<28><><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>)"
 msgid " (not supported)"
 msgstr " (<28>󥵥ݡ<F3A5B5A5><DDA1><EFBFBD>)"
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: <20><><EFBFBD>ڥ<EFBFBD><DAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5><EFBFBD>̵<EFBFBD><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
@@ -5097,10 +5207,6 @@ msgstr "%s (%d
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s <20><><EFBFBD>μ<EFBFBD><CEBC><EFBFBD><EFBFBD>Ѵ<EFBFBD><D1B4>ϥ<EFBFBD><CFA5>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>: %s <20><><EFBFBD><EFBFBD> %s <20><>"
 #, c-format
 msgid "Conversion in %s not supported"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD><D1B4>ϥ<EFBFBD><CFA5>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s <20><><EFBFBD><EFBFBD> %d <20><><EFBFBD>ܤ<EFBFBD> FLAG <20><>̵<EFBFBD><CCB5><EFBFBD><EFBFBD><EFBFBD>ͤ<EFBFBD><CDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>: %s"
@@ -5319,8 +5425,8 @@ msgid "E751: Output file name must not have region name"
 msgstr "E751: <20><><EFBFBD>ϥե<CFA5><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>ˤ<EFBFBD><CBA4>ϰ<EFBFBD>̾<EFBFBD><CCBE><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
-msgid "E754: Only up to %ld regions supported"
+msgid "E754: Only up to %d regions supported"
-msgstr "E754: <20>ϰϤ<CFB0> %ld <20>ĤޤǤ<DEA4><C7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E754: <20>ϰϤ<CFB0> %d <20>ĤޤǤ<DEA4><C7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݡ<EFBFBD><DDA1>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@ msgid "Done!"
 msgstr "<22>¹Ԥ<C2B9><D4A4>ޤ<EFBFBD><DEA4><EFBFBD>!"
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
+msgid "E765: 'spellfile' does not have %d entries"
-msgstr "E765: 'spellfile' <20>ˤ<EFBFBD> %ld <20>ĤΥ<C4A4><CEA5><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "E765: 'spellfile' <20>ˤ<EFBFBD> %d <20>ĤΥ<C4A4><CEA5><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@ msgstr "E409: ̤
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ̵<><CCB5><EFBFBD><EFBFBD> :syntax <20>Υ<EFBFBD><CEA5>֥<EFBFBD><D6A5>ޥ<EFBFBD><DEA5><EFBFBD>: %s"
+msgstr "E410: ̵<><CCB5><EFBFBD><EFBFBD> :syntax <20>Υ<EFBFBD><CEA5>֥<EFBFBD><D6A5>ޥ<EFBFBD><DEA5>ɤǤ<EFBFBD>: %s"
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
@@ -5740,6 +5846,38 @@ msgstr "E953:
 msgid "E955: Not a terminal buffer"
 msgstr "E955: ü<><C3BC><EFBFBD>Хåե<C3A5><D5A5>ǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E982: ConPTY is not available"
 msgstr "E982: ConPTY <20><>̵<EFBFBD><CCB5><EFBFBD>Ǥ<EFBFBD>"
 #, c-format
 msgid "E971: Property type %s does not exist"
 msgstr "E971: <20>ץ<EFBFBD><D7A5>ѥƥ<D1A5><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E964: Invalid column number: %ld"
 msgstr "E964: ̵<><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9>Ǥ<EFBFBD>: %ld"
 #, c-format
 msgid "E966: Invalid line number: %ld"
 msgstr "E966: ̵<><CCB5><EFBFBD>ʹ<EFBFBD><CAB9>ֹ<EFBFBD><D6B9>Ǥ<EFBFBD>: %ld"
 msgid "E965: missing property type name"
 msgstr "E965: <20>ץ<EFBFBD><D7A5>ѥƥ<D1A5><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E967: text property info corrupted"
 msgstr "E967: <20>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD>ȥץ<C8A5><D7A5>ѥƥ<D1A5><C6A5><EFBFBD><EFBFBD>󤬲<EFBFBD><F3A4ACB2><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 msgid "E968: Need at least one of 'id' or 'type'"
 msgstr "E968: <20><><EFBFBD><EFBFBD> 1 <20>Ĥ<EFBFBD> 'id' <20>ޤ<EFBFBD><DEA4><EFBFBD> 'type' <20><>ɬ<EFBFBD>פǤ<D7A4>"
 #, c-format
 msgid "E969: Property type %s already defined"
 msgstr "E969: <20>ץ<EFBFBD><D7A5>ѥƥ<D1A5><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 #, c-format
 msgid "E970: Unknown highlight group name: '%s'"
 msgstr "E970: ̤<>ΤΥϥ<CEA5><CFA5>饤<EFBFBD>ȥ<EFBFBD><C8A5>롼<EFBFBD><EBA1BC>̾: '%s'"
 msgid "new shell started\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD>ޤ<EFBFBD>\n"
@@ -6293,6 +6431,10 @@ msgstr "
 msgid "Already only one window"
 msgstr "<22><><EFBFBD>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD>1<EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: <20>Хåե<C3A5> %ld <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E441: There is no preview window"
 msgstr "E441: <20>ץ<EFBFBD><D7A5>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -6314,31 +6456,24 @@ msgstr "E814: autocmd
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾<>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ˤ<EFBFBD><CBA4>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
-msgid "E446: No file name under cursor"
+#, c-format
-msgstr "E446: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β<EFBFBD><CEB2>˥ե<CBA5><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
 msgstr "E799: ̵<><CCB5><EFBFBD><EFBFBD> ID: %d (1 <20>ʾ<EFBFBD><CABE>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>)"
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
+msgid "E801: ID already taken: %d"
-msgstr "E447: path<74>ˤ<EFBFBD> \"%s\" <20>Ȥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E801: ID <20>Ϥ<EFBFBD><EFBFBD>Ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: %d"
 #, c-format
 msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
 msgstr "E799: ̵<><CCB5><EFBFBD><EFBFBD> ID: %ld (1 <20>ʾ<EFBFBD><CABE>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>)"
 #, c-format
 msgid "E801: ID already taken: %ld"
 msgstr "E801: ID <20>Ϥ<EFBFBD><CFA4>Ǥ<EFBFBD><C7A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>: %ld"
 msgid "List or number required"
 msgstr "<22>ꥹ<EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ͤ<EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: ̵<><CCB5><EFBFBD><EFBFBD> ID: %ld (1 <20>ʾ<EFBFBD><CABE>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>)"
+msgstr "E802: ̵<><CCB5><EFBFBD><EFBFBD> ID: %d (1 <20>ʾ<EFBFBD><CABE>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>)"
 #, c-format
-msgid "E803: ID not found: %ld"
+msgid "E803: ID not found: %d"
-msgstr "E803: ID <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %ld"
+msgstr "E803: ID <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %d"
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@ msgstr "E25: GUI
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: <20>إ֥饤<D6A5><E9A5A4><EFBFBD>ϻ<EFBFBD><CFBB><EFBFBD><EFBFBD>Բ<EFBFBD>ǽ<EFBFBD>Ǥ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>\n"
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgid "E27: Farsi support has been removed\n"
-msgstr "E27: <20>ڥ륷<DAA5><EBA5B7><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Բ<EFBFBD>ǽ<EFBFBD>Ǥ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>\n"
+msgstr "E27: <20>ڥ륷<DAA5><EBA5B7><EFBFBD>쥵<EFBFBD>ݡ<EFBFBD><EFBFBD>ȤϺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><EFBFBD><EFBFBD>\n"
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: <20><><EFBFBD><EFBFBD><EFBFBD>ӥ<EFBFBD><D3A5><EFBFBD><EFBFBD>ϻ<EFBFBD><CFBB><EFBFBD><EFBFBD>Բ<EFBFBD>ǽ<EFBFBD>Ǥ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>\n"
@@ -6643,6 +6778,13 @@ msgstr "E715:
 msgid "E684: list index out of range: %ld"
 msgstr "E684: <20>ꥹ<EFBFBD>ȤΥ<C8A4><CEA5><EFBFBD><EFBFBD>ǥå<C7A5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %ld"
 #, c-format
 msgid "E979: Blob index out of range: %ld"
 msgstr "E979: Blob<6F>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD>ǥå<C7A5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %ld"
 msgid "E978: Invalid operation for Blob"
 msgstr "E978: Blob<6F><62><EFBFBD>ˤ<EFBFBD>̵<EFBFBD><CCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: <20>ؿ<EFBFBD><D8BF>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD><EFBFBD>¿<EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>: %s"
@@ -6654,10 +6796,17 @@ msgstr "E716:
 msgid "E714: List required"
 msgstr "E714: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
 msgid "E897: List or Blob required"
 msgstr "E897: <20>ꥹ<EFBFBD>ȷ<EFBFBD><C8B7>ޤ<EFBFBD><DEA4><EFBFBD>Blob<6F><62><EFBFBD><EFBFBD>ɬ<EFBFBD>פǤ<D7A4>"
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s <20>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD>ϥꥹ<CFA5>ȷ<EFBFBD><C8B7>ޤ<EFBFBD><DEA4>ϼ<EFBFBD><CFBC>񷿤Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 #, c-format
 msgid "E896: Argument of %s must be a List, Dictionary or Blob"
 msgstr "E896: %s <20>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD>ϥꥹ<CFA5>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񷿤ޤ<F1B7BFA4><DEA4><EFBFBD>Blob<6F><62><EFBFBD>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>Фʤ<D0A4><CAA4>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E47: Error while reading errorfile"
 msgstr "E47: <20><><EFBFBD>顼<EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD>˥<EFBFBD><CBA5>顼<EFBFBD><E9A1BC>ȯ<EFBFBD><C8AF><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -6760,6 +6909,9 @@ msgstr "E919:
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Autocommand<6E><64><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: <20><><EFBFBD>˥塼<CBA5><E5A1BC>¾<EFBFBD>Υ⡼<CEA5>ɤˤ<C9A4><CBA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "<22><><EFBFBD>ޤǸ<DEA4><C7B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τǲ<CEA4><C7B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
--- 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 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+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 @@ msgstr ""
 "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 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
-msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
+msgstr "E89: バッファ %d の変更は保存されていません (! で変更を破棄)"
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: ジョブはまだ実行中です (! を追加でジョブを終了)"
@@ -119,8 +180,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 #, c-format
-msgid "E92: Buffer %ld not found"
+msgid "E92: Buffer %d not found"
-msgstr "E92: バッファ %ld が見つかりません"
+msgstr "E92: バッファ %d が見つかりません"
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@ msgstr "[プロンプト]"
 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 @@ msgid "E737: Key already exists: %s"
 msgstr "E737: キーは既に存在します: %s"
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
+msgid "E96: Cannot diff more than %d buffers"
-msgstr "E96: %ld 以上のバッファはdiffできません"
+msgstr "E96: %d 以上のバッファはdiffできません"
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@ msgid "E103: Buffer \"%s\" is not in diff mode"
 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 @@ msgstr "リスト型の値に2つ以上の ; が検出されました"
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s の値を一覧表示できません"
-msgid "E689: Can only index a List or Dictionary"
+msgid "E689: Can only index a List, Dictionary or Blob"
-msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
+msgstr "E689: リスト型、辞書型、Blob型以外はインデックス指定できません"
 msgid "E708: [:] must come last"
 msgstr "E708: [:] は最後でなければいけません"
-msgid "E709: [:] requires a List value"
+msgid "E709: [:] requires a List or Blob value"
-msgstr "E709: [:] にはリスト型の値が必要です"
+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 @@ msgstr "E109: '?' の後に ':' がありません"
 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 @@ msgstr "E910: ジョブを数値として扱っています"
 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 @@ msgstr "E911: ジョブを浮動小数点数として扱っています"
 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,9 +758,16 @@ msgstr "E730: リスト型を文字列として扱っています"
 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 @@ msgstr ""
 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 @@ msgstr "filter() の引数"
 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 @@ msgstr "E808: 数値か浮動小数点数が必要です"
 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 @@ msgid "E957: Invalid window number"
 msgstr "E957: 無効なウィンドウ番号です"
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
+msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID は \":match\" のために予約されています: %ld"
+msgstr "E798: ID は \":match\" のために予約されています: %d"
 msgid "E726: Stride is zero"
 msgstr "E726: ストライド(前進量)が 0 です"
@@ -795,11 +949,11 @@ msgstr "E258: クライアントへ送ることができません"
 #, 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 @@ msgstr "(無効)"
 #, 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 @@ msgstr "E143: autocommandが予期せず新しいバッファ %s を削除しま
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
-msgid "E145: Shell commands not allowed in rvim"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
-msgstr "E145: rvimではシェルコマンドを使えません"
+msgstr "E145: rvimではシェルコマンドと一部の機能を使えません"
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
@@ -1091,52 +1245,6 @@ msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 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 @@ msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
 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 @@ msgid_plural "%d more files to edit.  Quit anyway?"
 msgstr[0] "編集すべきファイルがあと %d 個ありますが、終了しますか?"
 #, c-format
-msgid "E173: %ld more file to edit"
+msgid "E173: %d more file to edit"
-msgid_plural "E173: %ld more files to edit"
+msgid_plural "E173: %d more files to edit"
-msgstr[0] "E173: 編集すべきファイルがあと %ld 個あります"
+msgstr[0] "E173: 編集すべきファイルがあと %d 個あります"
-msgid "E174: Command already exists: add ! to replace it"
+#, c-format
-msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
+msgid "E174: Command already exists: add ! to replace it: %s"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください: %s"
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@ msgstr "入力行"
 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 @@ msgstr "E462: \"%s\" をリロードする準備ができませんでした"
 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 @@ msgid "Font0: %s"
 msgstr "フォント0: %s"
 #, c-format
-msgid "Font1: %s"
+msgid "Font%d: %s"
-msgstr "フォント1: %s"
+msgstr "フォント%d: %s"
 #, c-format
-msgid "Font%ld width is not twice that of font0"
+msgid "Font%d width is not twice that of font0"
-msgstr "フォント%ld の幅がフォント0の2倍ではありません"
+msgstr "フォント%d の幅がフォント0の2倍ではありません"
 #, c-format
-msgid "Font0 width: %ld"
+msgid "Font0 width: %d"
-msgstr "フォント0の幅: %ld"
+msgstr "フォント0の幅: %d"
 #, c-format
-msgid "Font1 width: %ld"
+msgid "Font%d width: %d"
-msgstr "フォント1の幅: %ld"
+msgstr "フォント%dの幅: %d"
 msgid "Invalid font specification"
 msgstr "無効なフォント指定です"
@@ -2525,8 +2607,8 @@ msgid "Added cscope database %s"
 msgstr "cscopeデータベース %s を追加"
 #, c-format
-msgid "E262: error reading cscope connection %ld"
+msgid "E262: error reading cscope connection %d"
-msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
+msgstr "E262: cscopeの接続 %d を読込み中のエラーです"
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
@@ -3064,9 +3146,6 @@ msgstr "-A\t\t\tアラビア語モードで起動する"
 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 @@ msgstr "E326: スワップファイルが多数見つかりました"
 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 @@ msgstr "E548: 数値が必要です"
 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"
+msgid "E658: NetBeans connection lost for buffer %d"
-msgstr "E658: バッファ %ld の NetBeans 接続が失われました"
+msgstr "E658: バッファ %d の NetBeans 接続が失われました"
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeansはこのGUIには対応していません"
@@ -4809,8 +4858,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
-msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
+msgstr "E877: (NFA 正規表現) 無効な文字クラスです: %d"
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@ msgid "not found "
 msgstr "見つかりません "
 msgid "in path ---\n"
-msgstr "パスに ----\n"
+msgstr "パスに ---\n"
 msgid "  (Already listed)"
 msgstr "  (既に列挙)"
@@ -4986,6 +5035,67 @@ msgstr ""
 "# 最後の %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: スペルチェックは無効化されています"
@@ -5097,10 +5207,6 @@ msgstr "%s (%d 行目) の単語を変換できませんでした: %s"
 msgid "Conversion in %s not supported: from %s to %s"
 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 @@ msgid "E751: Output file name must not have region name"
 msgstr "E751: 出力ファイル名には範囲名を含められません"
 #, c-format
-msgid "E754: Only up to %ld regions supported"
+msgid "E754: Only up to %d regions supported"
-msgstr "E754: 範囲は %ld 個までしかサポートされていません"
+msgstr "E754: 範囲は %d 個までしかサポートされていません"
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@ msgid "Done!"
 msgstr "実行しました!"
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
+msgid "E765: 'spellfile' does not have %d entries"
-msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
+msgstr "E765: 'spellfile' には %d 個のエントリはありません"
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@ msgstr "E409: 未知のグループ名: %s"
 #, 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 @@ msgstr "E953: ファイルは既に存在します: %s"
 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 @@ msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照し
 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 @@ msgstr "E814: autocmdウィンドウしか残らないため、ウィンドウ
 msgid "E445: Other window contains changes"
 msgstr "E445: 他のウィンドウには変更があります"
-msgid "E446: No file name under cursor"
+#, c-format
-msgstr "E446: カーソルの下にファイル名がありません"
+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"
+msgid "E801: ID already taken: %d"
-msgstr "E447: pathには \"%s\" というファイルがありません"
+msgstr "E801: ID はすでに利用中です: %d"
 #, 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 "List or number required"
 msgstr "リストか数値が必要です"
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
+msgstr "E802: 無効な ID: %d (1 以上でなければなりません)"
 #, c-format
-msgid "E803: ID not found: %ld"
+msgid "E803: ID not found: %d"
-msgstr "E803: ID はありません: %ld"
+msgstr "E803: ID はありません: %d"
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@ msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされ
 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"
+msgid "E27: Farsi support has been removed\n"
-msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
+msgstr "E27: ペルシア語サポートは削除されました\n"
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
@@ -6643,6 +6778,13 @@ msgstr "E715: 辞書型が必要です"
 msgid "E684: list index out of range: %ld"
 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 @@ msgstr "E716: 辞書型にキーが存在しません: %s"
 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 @@ msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
 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 "上まで検索したので下に戻ります"
--- 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 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-13 19:44+0900\n"
+"POT-Creation-Date: 2019-02-18 19:15+0900\n"
-"PO-Revision-Date: 2018-11-16 09:41+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 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 msgid "--Deleted--"
 msgstr "--<2D>폜<EFBFBD><ED8F9C>--"
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <<3C>o<EFBFBD>b<EFBFBD>t<EFBFBD>@=%d> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>ɍ폜<C98D><ED8F9C><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: <20><><EFBFBD>̃O<CC83><4F><EFBFBD>[<5B>v<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: \"%s\""
 msgid "E936: Cannot delete the current group"
 msgstr "E936: <20><><EFBFBD>݂̃O<CC83><4F><EFBFBD>[<5B>v<EFBFBD>͍폜<CD8D>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: <20>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD> augroup <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * <20>̌<EFBFBD><CC8C>ɕs<C995><73><EFBFBD>ȕ<EFBFBD><C895><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: <20><><EFBFBD>̂悤<CC82>ȃC<C883>x<EFBFBD><78><EFBFBD>g<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: <20><><EFBFBD>̂悤<CC82>ȃO<C883><4F><EFBFBD>[<5B>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̓C<CD83>x<EFBFBD><78><EFBFBD>g<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 msgid ""
 "\n"
 "--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocommands ---"
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <<3C>o<EFBFBD>b<EFBFBD>t<EFBFBD>@=%d>: <20><><EFBFBD><EFBFBD><EFBFBD>ȃo<C883>b<EFBFBD>t<EFBFBD>@<40>ԍ<EFBFBD><D48D>ł<EFBFBD> "
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: <20>S<EFBFBD>ẴC<CC83>x<EFBFBD><78><EFBFBD>g<EFBFBD>ɑ΂<C991><CE82>Ă<EFBFBD>autocommand<6E>͎<EFBFBD><CD8E>s<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "No matching autocommands"
 msgstr "<22>Y<EFBFBD><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD>autocommand<6E>͑<EFBFBD><CD91>݂<EFBFBD><DD82>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand<6E>̓<EFBFBD><CC93><EFBFBD><EFBFBD>q<EFBFBD><71><EFBFBD>[<5B>߂<EFBFBD><DF82>܂<EFBFBD>"
 #, c-format
 msgid "%s Autocommands for \"%s\""
 msgstr "%s Autocommands for \"%s\""
 #, c-format
 msgid "Executing %s"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() <20><><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>X<EFBFBD><58><EFBFBD>[<5B>h<EFBFBD>ŌĂяo<D18F><6F><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -100,8 +161,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>ŏ<EFBFBD><C58F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>ւ͈ړ<CD88><DA93>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
-msgstr "E89: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20>̕ύX<CF8D>͕ۑ<CD95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD> (! <20>ŕύX<CF8D><58><EFBFBD>j<EFBFBD><6A>)"
+msgstr "E89: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %d <20>̕ύX<CF8D>͕ۑ<CD95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD> (! <20>ŕύX<CF8D><58><EFBFBD>j<EFBFBD><6A>)"
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: <20>W<EFBFBD><57><EFBFBD>u<EFBFBD>͂܂<CD82><DC82><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>ł<EFBFBD> (! <20><><EFBFBD>ǉ<EFBFBD><C789>ŃW<C583><57><EFBFBD>u<EFBFBD><75><EFBFBD>I<EFBFBD><49>)"
@@ -119,8 +180,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20>x<EFBFBD><78>: <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>̃<EFBFBD><CC83>X<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>܂<EFBFBD>"
 #, c-format
-msgid "E92: Buffer %ld not found"
+msgid "E92: Buffer %d not found"
-msgstr "E92: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E92: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E93: More than one match for %s"
@@ -201,21 +262,6 @@ msgstr "[
 msgid "[Scratch]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
 "--- <20>T<EFBFBD>C<EFBFBD><43> ---"
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s <20>̃T<CC83>C<EFBFBD><43>:"
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    <20>s=%ld  <20><><EFBFBD>ʎq=%d  <20><><EFBFBD>O=%s"
 msgid "E902: Cannot connect to port"
 msgstr "E902: <20>|<7C>[<5B>g<EFBFBD>ɐڑ<C990><DA91>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -309,8 +355,8 @@ msgid "E737: Key already exists: %s"
 msgstr "E737: <20>L<EFBFBD>[<5B>͊<EFBFBD><CD8A>ɑ<EFBFBD><C991>݂<EFBFBD><DD82>܂<EFBFBD>: %s"
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
+msgid "E96: Cannot diff more than %d buffers"
-msgstr "E96: %ld <20>ȏ<EFBFBD><C88F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><>diff<66>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E96: %d <20>ȏ<EFBFBD><C88F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><>diff<66>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "Not enough memory to use internal diff for buffer \"%s\""
@@ -359,11 +405,86 @@ msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ \"%s\" <20>͍<EFBFBD><CD8D><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ύX<CF8D>ύX<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E787: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Escape<70>͎g<CD8E>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "Custom"
 msgstr "<22>J<EFBFBD>X<EFBFBD>^<5E><>"
 msgid "Latin supplement"
 msgstr "<22><><EFBFBD>e<EFBFBD><65><EFBFBD>⏕"
 msgid "Greek and Coptic"
 msgstr "<22>M<EFBFBD><4D><EFBFBD>V<EFBFBD><56><EFBFBD>ƃR<C683>v<EFBFBD>g"
 msgid "Cyrillic"
 msgstr "<22>L<EFBFBD><4C><EFBFBD><EFBFBD>"
 msgid "Hebrew"
 msgstr "<22>w<EFBFBD>u<EFBFBD><75><EFBFBD>C"
 msgid "Arabic"
 msgstr "<22>A<EFBFBD><41><EFBFBD>r<EFBFBD>A"
 msgid "Latin extended"
 msgstr "<22><><EFBFBD>e<EFBFBD><65><EFBFBD>g<EFBFBD><67>"
 msgid "Greek extended"
 msgstr "<22>M<EFBFBD><4D><EFBFBD>V<EFBFBD><56><EFBFBD>g<EFBFBD><67>"
 msgid "Punctuation"
 msgstr "<22><><EFBFBD>Ǔ_"
 msgid "Super- and subscripts"
 msgstr "<22><><EFBFBD>t<EFBFBD><74><EFBFBD>E<EFBFBD><45><EFBFBD>t<EFBFBD><74>"
 msgid "Currency"
 msgstr "<22>ʉ݋L<DD8B><4C>"
 msgid "Other"
 msgstr "<22><><EFBFBD>̑<EFBFBD>"
 msgid "Roman numbers"
 msgstr "<22><><EFBFBD>[<5B>}<7D><><EFBFBD><EFBFBD>"
 msgid "Arrows"
 msgstr "<22><><EFBFBD><EFBFBD>"
 msgid "Mathematical operators"
 msgstr "<22><><EFBFBD>w<EFBFBD>L<EFBFBD><4C>"
 msgid "Technical"
 msgstr "<22>Z<EFBFBD>p<EFBFBD>p<EFBFBD>L<EFBFBD><4C>"
 msgid "Box drawing"
 msgstr "<22>r<EFBFBD><72><EFBFBD>f<EFBFBD><66>"
 msgid "Block elements"
 msgstr "<22>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>v<EFBFBD>f"
 msgid "Geometric shapes"
 msgstr "<22>􉽊w<F489BD8A>͗l"
 msgid "Symbols"
 msgstr "<22>L<EFBFBD><4C>"
 msgid "Dingbats"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD><4C>"
 msgid "CJK symbols and punctuation"
 msgstr "CJK<4A>L<EFBFBD><4C><EFBFBD>y<EFBFBD>ы<EFBFBD><D18B>Ǔ_"
 msgid "Hiragana"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "Katakana"
 msgstr "<22>Љ<EFBFBD><D089><EFBFBD>"
 msgid "Bopomofo"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "E544: Keymap file not found"
 msgstr "E544: <20>L<EFBFBD>[<5B>}<7D>b<EFBFBD>v<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -510,14 +631,17 @@ msgstr "
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s <20>̒l<CC92><6C><EFBFBD>ꗗ<EFBFBD>\\<5C><><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
-msgid "E689: Can only index a List or Dictionary"
+msgid "E689: Can only index a List, Dictionary or Blob"
-msgstr "E689: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E>Ǝ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E>ȊO<C88A>̓C<CD83><43><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD>w<EFBFBD><77><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E689: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E>ABlob<EFBFBD>^<5E>ȊO<EFBFBD>̓C<EFBFBD><EFBFBD><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD>w<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD>"
 msgid "E708: [:] must come last"
 msgstr "E708: [:] <20>͍Ō<CD8D><C58C>łȂ<C582><C882><EFBFBD><EFBFBD>΂<EFBFBD><CE82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
-msgid "E709: [:] requires a List value"
+msgid "E709: [:] requires a List or Blob value"
-msgstr "E709: [:] <20>ɂ̓<C982><CD83>X<EFBFBD>g<EFBFBD>^<5E>̒l<CC92><6C><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
+msgstr "E709: [:] <20>ɂ̓<C982><CD83>X<EFBFBD>g<EFBFBD>^<5E><EFBFBD>Blob<EFBFBD>^<5E>̒l<EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: Blob<6F>^<5E>̒l<CC92>̃o<CC83>C<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E710: List value has more items than target"
 msgstr "E710: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E>ϐ<EFBFBD><CF90>Ƀ^<5E>[<5B>Q<EFBFBD>b<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>f<EFBFBD><66><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
@@ -545,6 +669,9 @@ msgstr "E109: '?'
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' <20>𕂓<EFBFBD><F0958293><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>Ƒg<C691>ݍ<EFBFBD><DD8D>킹<EFBFBD>Ă͎g<CD8E><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E973: Blob literal should have an even number of hex characters"
 msgstr "E973: Blob<6F><62><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD>͋<EFBFBD><CD8B><EFBFBD><EFBFBD><EFBFBD>16<31>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E110: Missing ')'"
 msgstr "E110: ')' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -595,6 +722,9 @@ msgstr "E910:
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: <20>`<60><><EFBFBD>l<EFBFBD><6C><EFBFBD>𐔒l<F0909492>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E974: Using a Blob as a Number"
 msgstr "E974: Blob<6F>^<5E>𐔒l<F0909492>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: <20>֐<EFBFBD><D690>Q<EFBFBD>ƌ^<5E>𕂓<EFBFBD><F0958293><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
@@ -616,6 +746,9 @@ msgstr "E911:
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: <20>`<60><><EFBFBD>l<EFBFBD><6C><EFBFBD>𕂓<EFBFBD><F0958293><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E975: Using a Blob as a Float"
 msgstr "E975: Blob<6F>^<5E>𕂓<EFBFBD><F0958293><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E729: using Funcref as a String"
 msgstr "E729: <20>֐<EFBFBD><D690>Q<EFBFBD>ƌ^<5E>𕶎<EFBFBD><F095B68E><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
@@ -625,9 +758,16 @@ msgstr "E730:
 msgid "E731: using Dictionary as a String"
 msgstr "E731: <20><><EFBFBD><EFBFBD><EFBFBD>^<5E>𕶎<EFBFBD><F095B68E><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E976: using Blob as a String"
 msgstr "E976: Blob<6F>^<5E>𕶎<EFBFBD><F095B68E><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: <20><><EFBFBD><EFBFBD><EFBFBD>Ȓl<C892>𕶎<EFBFBD><F095B68E><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ĉ<EFBFBD><C488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "E963: setting %s to value with wrong type"
 msgstr "E963: %s <20><><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E>̒l<CC92>Őݒ肵<DD92>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: <20>ϐ<EFBFBD> %s <20><><EFBFBD>폜<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -671,6 +811,9 @@ msgstr ""
 msgid " line "
 msgstr " <20>s "
 msgid "E977: Can only compare Blob with Blob"
 msgstr "E977: Blob<6F>^<5E><>Blob<6F>^<5E>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E691: Can only compare List with List"
 msgstr "E691: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E>̓<EFBFBD><CD83>X<EFBFBD>g<EFBFBD>^<5E>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -696,6 +839,10 @@ msgstr "filter()
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: %s <20>̈<EFBFBD><CC88><EFBFBD><EFBFBD>̓<EFBFBD><CD83>X<EFBFBD>g<EFBFBD>^<5E>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E899: Argument of %s must be a List or Blob"
 msgstr "E899: %s <20>̈<EFBFBD><CC88><EFBFBD><EFBFBD>̓<EFBFBD><CD83>X<EFBFBD>g<EFBFBD>^<5E>܂<EFBFBD><DC82><EFBFBD>Blob<6F>^<5E>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E928: String required"
 msgstr "E928: <20><><EFBFBD><EFBFBD><EFBFBD>񂪕K<F182AA95>v<EFBFBD>ł<EFBFBD>"
@@ -705,12 +852,19 @@ msgstr "E808:
 msgid "add() argument"
 msgstr "add() <20>̈<EFBFBD><CC88><EFBFBD>"
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><><EFBFBD><EFBFBD><EFBFBD>ȃo<C883>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ł<EFBFBD>: %s"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() <20>͑}<7D><><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł<EFBFBD><C582><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "&Ok"
 msgstr "&Ok"
 msgid "E980: lowlevel input not supported"
 msgstr "E980: <20>჌<EFBFBD>x<EFBFBD><78><EFBFBD><EFBFBD><EFBFBD>͂̓T<CD83>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "+-%s%3ld line: "
 msgid_plural "+-%s%3ld lines: "
@@ -752,8 +906,8 @@ msgid "E957: Invalid window number"
 msgstr "E957: <20><><EFBFBD><EFBFBD><EFBFBD>ȃE<C883>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD>ԍ<EFBFBD><D48D>ł<EFBFBD>"
 #, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
+msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID <20><> \":match\" <20>̂<EFBFBD><CC82>߂ɗ\\<5C>񂳂<EFBFBD><F182B382>Ă<EFBFBD><C482>܂<EFBFBD>: %ld"
+msgstr "E798: ID <20><> \":match\" <20>̂<EFBFBD><CC82>߂ɗ\\<5C>񂳂<EFBFBD><F182B382>Ă<EFBFBD><C482>܂<EFBFBD>: %d"
 msgid "E726: Stride is zero"
 msgstr "E726: <20>X<EFBFBD>g<EFBFBD><67><EFBFBD>C<EFBFBD>h(<28>O<EFBFBD>i<EFBFBD><69>)<29><> 0 <20>ł<EFBFBD>"
@@ -795,11 +949,11 @@ msgstr "E258:
 #, c-format
 msgid "E927: Invalid action: '%s'"
-msgstr "E927: <20><><EFBFBD><EFBFBD><EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>ł<EFBFBD>: %s"
+msgstr "E927: <20><><EFBFBD><EFBFBD><EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>ł<EFBFBD>: '%s'"
 #, c-format
 msgid "E962: Invalid action: '%s'"
-msgstr "E962: <20><><EFBFBD><EFBFBD><EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>ł<EFBFBD>: %s"
+msgstr "E962: <20><><EFBFBD><EFBFBD><EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>ł<EFBFBD>: '%s'"
 msgid "sort() argument"
 msgstr "sort() <20>̈<EFBFBD><CC88><EFBFBD>"
@@ -818,7 +972,7 @@ msgstr "(
 #, c-format
 msgid "E935: invalid submatch number: %d"
-msgstr "E935: <20><><EFBFBD><EFBFBD><EFBFBD>ȃT<C883>u<EFBFBD>}<7D>b<EFBFBD>`<60>ԍ<EFBFBD>: %d"
+msgstr "E935: <20><><EFBFBD><EFBFBD><EFBFBD>ȃT<C883>u<EFBFBD>}<7D>b<EFBFBD>`<60>ԍ<EFBFBD><EFBFBD>ł<EFBFBD>: %d"
 msgid "E677: Error writing temp file"
 msgstr "E677: <20>ꎞ<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɃG<C983><47><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -995,8 +1149,8 @@ msgstr "E143: autocommand
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: <20><><EFBFBD>ł͂Ȃ<CD82><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :z <20>ɓn<C993><6E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
-msgid "E145: Shell commands not allowed in rvim"
+msgid "E145: Shell commands and some functionality not allowed in rvim"
-msgstr "E145: rvim<69>ł̓V<CD83>F<EFBFBD><46><EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E145: rvim<69>ł̓V<CD83>F<EFBFBD><46><EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD>ƈꕔ<EFBFBD>̋@<40>\\<5C><EFBFBD><EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD>"
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: <20><><EFBFBD>K<EFBFBD>\\<5C><><EFBFBD>͕<EFBFBD><CD95><EFBFBD><EFBFBD>ŋ<EFBFBD><C58B>؂邱<D882>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -1091,52 +1245,6 @@ msgstr "E154:
 msgid "E150: Not a directory: %s"
 msgstr "E150: <20>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: <20><><EFBFBD>m<EFBFBD><6D>sign<67>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD>ł<EFBFBD>: %s"
 msgid "E156: Missing sign name"
 msgstr "E156: sign<67><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E612: Too many signs defined"
 msgstr "E612: sign<67>̒<EFBFBD><CC92>`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67>̃e<CC83>L<EFBFBD>X<EFBFBD>g<EFBFBD>ł<EFBFBD>: %s"
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: <20><><EFBFBD>m<EFBFBD><6D>sign<67>ł<EFBFBD>: %s"
 msgid "E159: Missing sign number"
 msgstr "E159: sign<67>̔ԍ<CC94><D48D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><><EFBFBD><EFBFBD><EFBFBD>ȃo<C883>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ł<EFBFBD>: %s"
 msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: <20><><EFBFBD>O<EFBFBD>̖<EFBFBD><CC96><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>ւ̓W<CD83><57><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>ʎq<CA8E>ł<EFBFBD>: %ld"
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: <20>ύX<CF8D>ł<EFBFBD><C582>Ȃ<EFBFBD> sign <20>ł<EFBFBD>: %s"
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
 msgstr " (<28><><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>)"
 msgid " (not supported)"
 msgstr " (<28><><EFBFBD>T<EFBFBD>|<7C>[<5B>g)"
 msgid "[Deleted]"
 msgstr "[<5B>폜<EFBFBD><ED8F9C>]"
 msgid "No old files"
 msgstr "<22>Â<EFBFBD><C382>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -1325,6 +1433,9 @@ msgstr "E464:
 msgid "E492: Not an editor command"
 msgstr "E492: <20>G<EFBFBD>f<EFBFBD>B<EFBFBD>^<5E>̃R<CC83>}<7D><><EFBFBD>h<EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E981: Command not allowed in rvim"
 msgstr "E981: rvim<69>ł͂<C582><CD82>̃R<CC83>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E493: Backwards range given"
 msgstr "E493: <20>t<EFBFBD><74><EFBFBD>܂͈̔͂<CD88><CD82>w<EFBFBD>肳<EFBFBD><E882B3><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -1348,12 +1459,13 @@ msgid_plural "%d more files to edit.  Quit anyway?"
 msgstr[0] "<22>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d <20><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A<EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>?"
 #, c-format
-msgid "E173: %ld more file to edit"
+msgid "E173: %d more file to edit"
-msgid_plural "E173: %ld more files to edit"
+msgid_plural "E173: %d more files to edit"
-msgstr[0] "E173: <20>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD>"
+msgstr[0] "E173: <20>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d <20><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD>"
-msgid "E174: Command already exists: add ! to replace it"
+#, c-format
-msgstr "E174: <EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD>: <20>Ē<EFBFBD><C492>`<60><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> ! <20><><EFBFBD>ǉ<EFBFBD><C789><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E174: Command already exists: add ! to replace it: %s"
 msgstr "E174: <20>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD>: <20>Ē<EFBFBD><C492>`<60><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> ! <20><><EFBFBD>ǉ<EFBFBD><C789><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 msgid ""
 "\n"
@@ -1684,9 +1796,6 @@ msgstr "
 msgid "Debug Line"
 msgstr "<22>f<EFBFBD>o<EFBFBD>b<EFBFBD>O<EFBFBD>s"
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar <20><><EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD>𒴂<EFBFBD><F092B482>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: <20>A<EFBFBD>N<EFBFBD>e<EFBFBD>B<EFBFBD>u<EFBFBD>ȃE<C883>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>폜<EFBFBD><ED8F9C><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -1994,73 +2103,46 @@ msgstr "E462: \"%s\"
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" <20>̓<EFBFBD><CD83><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD><EFBFBD>ł<EFBFBD><C582><EFBFBD>"
 msgid "--Deleted--"
 msgstr "--<2D>폜<EFBFBD><ED8F9C>--"
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <<3C>o<EFBFBD>b<EFBFBD>t<EFBFBD>@=%d> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>ɍ폜<C98D><ED8F9C><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: <20><><EFBFBD>̃O<CC83><4F><EFBFBD>[<5B>v<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: \"%s\""
 msgid "E936: Cannot delete the current group"
 msgstr "E936: <20><><EFBFBD>݂̃O<CC83><4F><EFBFBD>[<5B>v<EFBFBD>͍폜<CD8D>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: <20>g<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD> augroup <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * <20>̌<EFBFBD><CC8C>ɕs<C995><73><EFBFBD>ȕ<EFBFBD><C895><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: <20><><EFBFBD>̂悤<CC82>ȃC<C883>x<EFBFBD><78><EFBFBD>g<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: <20><><EFBFBD>̂悤<CC82>ȃO<C883><4F><EFBFBD>[<5B>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̓C<CD83>x<EFBFBD><78><EFBFBD>g<EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 msgid ""
 "\n"
 "--- Autocommands ---"
 msgstr ""
 "\n"
 "--- Autocommands ---"
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <<3C>o<EFBFBD>b<EFBFBD>t<EFBFBD>@=%d>: <20><><EFBFBD><EFBFBD><EFBFBD>ȃo<C883>b<EFBFBD>t<EFBFBD>@<40>ԍ<EFBFBD><D48D>ł<EFBFBD> "
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: <20>S<EFBFBD>ẴC<CC83>x<EFBFBD><78><EFBFBD>g<EFBFBD>ɑ΂<C991><CE82>Ă<EFBFBD>autocommand<6E>͎<EFBFBD><CD8E>s<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 msgid "No matching autocommands"
 msgstr "<22>Y<EFBFBD><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD>autocommand<6E>͑<EFBFBD><CD91>݂<EFBFBD><DD82>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand<6E>̓<EFBFBD><CC93><EFBFBD><EFBFBD>q<EFBFBD><71><EFBFBD>[<5B>߂<EFBFBD><DF82>܂<EFBFBD>"
 #, c-format
 msgid "%s Autocommands for \"%s\""
 msgstr "%s Autocommands for \"%s\""
 #, c-format
 msgid "Executing %s"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 msgid "E219: Missing {."
 msgstr "E219: { <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>."
 msgid "E220: Missing }."
 msgstr "E220: } <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>."
 msgid "E854: path too long for completion"
 msgstr "E854: <20>p<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>ĕ⊮<C495>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
 "E343: <20><><EFBFBD><EFBFBD><EFBFBD>ȃp<C883>X<EFBFBD>ł<EFBFBD>: '**[<5B><><EFBFBD>l]' <20><>path<74>̍Ōォ '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĂȂ<C482><C882>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>܂<EFBFBD>"
 "<22><>."
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath<74>ɂ͂<C982><CD82><EFBFBD><EFBFBD>ȏ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: <20>p<EFBFBD>X<EFBFBD>ɂ͂<C982><CD82><EFBFBD><EFBFBD>ȏ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E446: No file name under cursor"
 msgstr "E446: <20>J<EFBFBD>[<5B>\\<5C><><EFBFBD>̉<EFBFBD><CC89>Ƀt<C983>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E490: No fold found"
 msgstr "E490: <20>܏<EFBFBD><DC8F>݂<EFBFBD><DD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -2336,20 +2418,20 @@ msgid "Font0: %s"
 msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0: %s"
 #, c-format
-msgid "Font1: %s"
+msgid "Font%d: %s"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g1: %s"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%d: %s"
 #, c-format
-msgid "Font%ld width is not twice that of font0"
+msgid "Font%d width is not twice that of font0"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%ld <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67><30>2<EFBFBD>{<7B>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%d <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67><30>2<EFBFBD>{<7B>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
-msgid "Font0 width: %ld"
+msgid "Font0 width: %d"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67>̕<EFBFBD>: %ld"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67>̕<EFBFBD>: %d"
 #, c-format
-msgid "Font1 width: %ld"
+msgid "Font%d width: %d"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g1<EFBFBD>̕<EFBFBD>: %ld"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%d<EFBFBD>̕<EFBFBD>: %d"
 msgid "Invalid font specification"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ȃt<C883>H<EFBFBD><48><EFBFBD>g<EFBFBD>w<EFBFBD><77><EFBFBD>ł<EFBFBD>"
@@ -2525,8 +2607,8 @@ msgid "Added cscope database %s"
 msgstr "cscope<70>f<EFBFBD>[<5B>^<5E>x<EFBFBD>[<5B>X %s <20><><EFBFBD>ǉ<EFBFBD>"
 #, c-format
-msgid "E262: error reading cscope connection %ld"
+msgid "E262: error reading cscope connection %d"
-msgstr "E262: cscope<70>̐ڑ<CC90> %ld <20><><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD><DD92>̃G<CC83><47><EFBFBD>[<5B>ł<EFBFBD>"
+msgstr "E262: cscope<70>̐ڑ<CC90> %d <20><><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD><DD92>̃G<CC83><47><EFBFBD>[<5B>ł<EFBFBD>"
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20><><EFBFBD>m<EFBFBD><6D>cscope<70><65><EFBFBD><EFBFBD><EFBFBD>^<5E>ł<EFBFBD>"
@@ -3064,9 +3146,6 @@ msgstr "-A\t\t\t
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t<>w<EFBFBD>u<EFBFBD><75><EFBFBD>C<EFBFBD>ꃂ<EFBFBD>[<5B>h<EFBFBD>ŋN<C58B><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t<>y<EFBFBD><79><EFBFBD>V<EFBFBD>A<EFBFBD>ꃂ<EFBFBD>[<5B>h<EFBFBD>ŋN<C58B><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t<>[<5B><><EFBFBD><EFBFBD> <terminal> <20>ɐݒ肷<DD92><E882B7>"
@@ -3819,9 +3898,6 @@ msgstr "E326:
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: <20><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B>A<EFBFBD>C<EFBFBD>e<EFBFBD><65><EFBFBD>̃p<CC83>X<EFBFBD>̕<EFBFBD><CC95><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD>u<EFBFBD><75><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: <20><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B>͑<EFBFBD><CD91>̃<EFBFBD><CC83>[<5B>h<EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -4015,41 +4091,14 @@ msgstr "E548:
 msgid "E549: Illegal percentage"
 msgstr "E549: <20>s<EFBFBD><73><EFBFBD>ȃp<C883>[<5B>Z<EFBFBD><5A><EFBFBD>e<EFBFBD>[<5B>W<EFBFBD>ł<EFBFBD>"
 msgid "E854: path too long for completion"
 msgstr "E854: <20>p<EFBFBD>X<EFBFBD><58><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>ĕ⊮<C495>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
 "E343: <20><><EFBFBD><EFBFBD><EFBFBD>ȃp<C883>X<EFBFBD>ł<EFBFBD>: '**[<5B><><EFBFBD>l]' <20><>path<74>̍Ōォ '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĂȂ<C482><C882>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>܂<EFBFBD>"
 "<22><>."
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath<74>ɂ͂<C982><CD82><EFBFBD><EFBFBD>ȏ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: <20>p<EFBFBD>X<EFBFBD>ɂ͂<C982><CD82><EFBFBD><EFBFBD>ȏ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans<6E>̐ڑ<CC90><DA91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̃A<CC83>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>[<5B>h<EFBFBD>ɖ<EFBFBD><C996>肪<EFBFBD><E882AA><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>: \"%s\""
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %d"
-msgstr "E658: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20><> NetBeans <20>ڑ<EFBFBD><DA91><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E658: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %d <20><> NetBeans <20>ڑ<EFBFBD><DA91><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans<6E>͂<EFBFBD><CD82><EFBFBD>GUI<55>ɂ͑Ή<CD91><CE89><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
@@ -4809,8 +4858,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA <20><><EFBFBD>K<EFBFBD>\\<5C><>) <20>ʒu<CA92><75><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>: %c"
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
-msgstr "E877: (NFA <20><><EFBFBD>K<EFBFBD>\\<5C><>) <20><><EFBFBD><EFBFBD><EFBFBD>ȕ<EFBFBD><C895><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD>X: %ld"
+msgstr "E877: (NFA <20><><EFBFBD>K<EFBFBD>\\<5C><>) <20><><EFBFBD><EFBFBD><EFBFBD>ȕ<EFBFBD><C895><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD>X<EFBFBD>ł<EFBFBD>: %d"
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4942,7 +4991,7 @@ msgid "not found "
 msgstr "<22><><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD> "
 msgid "in path ---\n"
-msgstr "<22>p<EFBFBD>X<EFBFBD><58> ----\n"
+msgstr "<22>p<EFBFBD>X<EFBFBD><58> ---\n"
 msgid "  (Already listed)"
 msgstr "  (<28><><EFBFBD>ɗ<EFBFBD><C997><EFBFBD>)"
@@ -4986,6 +5035,67 @@ msgstr ""
 "# <20>Ō<EFBFBD><C58C><EFBFBD> %s<><73><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>^<5E>[<5B><>:\n"
 "~"
 msgid "[Deleted]"
 msgstr "[<5B>폜<EFBFBD><ED8F9C>]"
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
 "--- <20>T<EFBFBD>C<EFBFBD><43> ---"
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s <20>̃T<CC83>C<EFBFBD><43>:"
 #, c-format
 msgid "  group=%s"
 msgstr "  <20>O<EFBFBD><4F><EFBFBD>[<5B>v=%s"
 #, c-format
 msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
 msgstr "    <20>s=%ld  <20><><EFBFBD>ʎq=%d%s  <20><><EFBFBD>O=%s  <20>D<EFBFBD><44><EFBFBD>x=%d"
 msgid "E612: Too many signs defined"
 msgstr "E612: sign<67>̒<EFBFBD><CC92>`<60><><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>܂<EFBFBD>"
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67>̃e<CC83>L<EFBFBD>X<EFBFBD>g<EFBFBD>ł<EFBFBD>: %s"
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: <20><><EFBFBD>m<EFBFBD><6D>sign<67>ł<EFBFBD>: %s"
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: <20>ύX<CF8D>ł<EFBFBD><C582>Ȃ<EFBFBD> sign <20>ł<EFBFBD>: %s"
 msgid "E159: Missing sign number"
 msgstr "E159: sign<67>̔ԍ<CC94><D48D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E157: Invalid sign ID: %d"
 msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>ʎq<CA8E>ł<EFBFBD>: %d"
 msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: <20><><EFBFBD>O<EFBFBD>̖<EFBFBD><CC96><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>ւ̓W<CD83><57><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: <20><><EFBFBD>m<EFBFBD><6D>sign<67>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD>ł<EFBFBD>: %s"
 msgid "E156: Missing sign name"
 msgstr "E156: sign<67><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
 msgstr " (<28><><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>)"
 msgid " (not supported)"
 msgstr " (<28><><EFBFBD>T<EFBFBD>|<7C>[<5B>g)"
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: <20>X<EFBFBD>y<EFBFBD><79><EFBFBD>`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD>͖<EFBFBD><CD96><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
@@ -5097,10 +5207,6 @@ msgstr "%s (%d
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s <20><><EFBFBD>̎<EFBFBD><CC8E>̕ϊ<CC95><CF8A>̓T<CD83>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>: %s <20><><EFBFBD><EFBFBD> %s <20><>"
 #, c-format
 msgid "Conversion in %s not supported"
 msgstr "%s <20><><EFBFBD>̕ϊ<CC95><CF8A>̓T<CD83>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s <20><><EFBFBD><EFBFBD> %d <20>s<EFBFBD>ڂ<EFBFBD> FLAG <20>ɖ<EFBFBD><C996><EFBFBD><EFBFBD>Ȓl<C892><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>: %s"
@@ -5319,8 +5425,8 @@ msgid "E751: Output file name must not have region name"
 msgstr "E751: <20>o<EFBFBD>̓t<CD83>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>ɂ͔͈͖<CD88><CD96><EFBFBD><EFBFBD>܂߂<DC82><DF82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
-msgid "E754: Only up to %ld regions supported"
+msgid "E754: Only up to %d regions supported"
-msgstr "E754: <20>͈͂<CD88> %ld <20>܂ł<DC82><C582><EFBFBD><EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E754: <20>͈͂<CD88> %d <20>܂ł<DC82><C582><EFBFBD><EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5337,8 +5443,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD>s<EFBFBD><73><EFBFBD>܂<EFBFBD><DC82><EFBFBD>!"
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
+msgid "E765: 'spellfile' does not have %d entries"
-msgstr "E765: 'spellfile' <20>ɂ<EFBFBD> %ld <20>̃G<CC83><47><EFBFBD>g<EFBFBD><67><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E765: 'spellfile' <20>ɂ<EFBFBD> %d <20>̃G<CC83><47><EFBFBD>g<EFBFBD><67><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5522,7 +5628,7 @@ msgstr "E409:
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :syntax <20>̃T<CC83>u<EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h: %s"
+msgstr "E410: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :syntax <20>̃T<CC83>u<EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD>ł<EFBFBD>: %s"
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
@@ -5740,6 +5846,38 @@ msgstr "E953:
 msgid "E955: Not a terminal buffer"
 msgstr "E955: <20>[<5B><><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E982: ConPTY is not available"
 msgstr "E982: ConPTY <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD>"
 #, c-format
 msgid "E971: Property type %s does not exist"
 msgstr "E971: <20>v<EFBFBD><76><EFBFBD>p<EFBFBD>e<EFBFBD>B<EFBFBD>^<5E>C<EFBFBD>v %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E964: Invalid column number: %ld"
 msgstr "E964: <20><><EFBFBD><EFBFBD><EFBFBD>ȗ<EFBFBD><C897>ԍ<EFBFBD><D48D>ł<EFBFBD>: %ld"
 #, c-format
 msgid "E966: Invalid line number: %ld"
 msgstr "E966: <20><><EFBFBD><EFBFBD><EFBFBD>ȍs<C88D>ԍ<EFBFBD><D48D>ł<EFBFBD>: %ld"
 msgid "E965: missing property type name"
 msgstr "E965: <20>v<EFBFBD><76><EFBFBD>p<EFBFBD>e<EFBFBD>B<EFBFBD>^<5E>C<EFBFBD>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E967: text property info corrupted"
 msgstr "E967: <20>e<EFBFBD>L<EFBFBD>X<EFBFBD>g<EFBFBD>v<EFBFBD><76><EFBFBD>p<EFBFBD>e<EFBFBD>B<EFBFBD><42><EFBFBD>񂪉<EFBFBD><F182AA89><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 msgid "E968: Need at least one of 'id' or 'type'"
 msgstr "E968: <20>Œ<EFBFBD> 1 <20><EFBFBD> 'id' <20>܂<EFBFBD><DC82><EFBFBD> 'type' <20><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
 #, c-format
 msgid "E969: Property type %s already defined"
 msgstr "E969: <20>v<EFBFBD><76><EFBFBD>p<EFBFBD>e<EFBFBD>B<EFBFBD>^<5E>C<EFBFBD>v %s <20>͊<EFBFBD><CD8A>ɒ<EFBFBD><C992>`<60><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 #, c-format
 msgid "E970: Unknown highlight group name: '%s'"
 msgstr "E970: <20><><EFBFBD>m<EFBFBD>̃n<CC83>C<EFBFBD><43><EFBFBD>C<EFBFBD>g<EFBFBD>O<EFBFBD><4F><EFBFBD>[<5B>v<EFBFBD><76>: '%s'"
 msgid "new shell started\n"
 msgstr "<22>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>V<EFBFBD>F<EFBFBD><46><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>\n"
@@ -6293,6 +6431,10 @@ msgstr "
 msgid "Already only one window"
 msgstr "<22><><EFBFBD>ɃE<C983>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45>1<EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E441: There is no preview window"
 msgstr "E441: <20>v<EFBFBD><76><EFBFBD>r<EFBFBD><72><EFBFBD>[<5B>E<EFBFBD>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD><45><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -6314,31 +6456,24 @@ msgstr "E814: autocmd
 msgid "E445: Other window contains changes"
 msgstr "E445: <20><><EFBFBD>̃E<CC83>B<EFBFBD><42><EFBFBD>h<EFBFBD>E<EFBFBD>ɂ͕ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
-msgid "E446: No file name under cursor"
+#, c-format
-msgstr "E446: <20>J<EFBFBD>[<5B>\\<5C><><EFBFBD>̉<EFBFBD><CC89>Ƀt<C983>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
 msgstr "E799: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID: %d (1 <20>ȏ<EFBFBD><C88F>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>)"
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
+msgid "E801: ID already taken: %d"
-msgstr "E447: path<74>ɂ<EFBFBD> \"%s\" <20>Ƃ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "E801: ID <20>͂<EFBFBD><EFBFBD>łɗ<EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD>: %d"
 #, c-format
 msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
 msgstr "E799: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID: %ld (1 <20>ȏ<EFBFBD><C88F>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>)"
 #, c-format
 msgid "E801: ID already taken: %ld"
 msgstr "E801: ID <20>͂<EFBFBD><CD82>łɗ<C582><C997>p<EFBFBD><70><EFBFBD>ł<EFBFBD>: %ld"
 msgid "List or number required"
 msgstr "<22><><EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
 #, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID: %ld (1 <20>ȏ<EFBFBD><C88F>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>)"
+msgstr "E802: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID: %d (1 <20>ȏ<EFBFBD><C88F>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>)"
 #, c-format
-msgid "E803: ID not found: %ld"
+msgid "E803: ID not found: %d"
-msgstr "E803: ID <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %ld"
+msgstr "E803: ID <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %d"
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6518,8 +6653,8 @@ msgstr "E25: GUI
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: <20>w<EFBFBD>u<EFBFBD><75><EFBFBD>C<EFBFBD><43><EFBFBD>͎g<CD8E>p<EFBFBD>s<EFBFBD>\\<5C>ł<EFBFBD>: <20>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>ɖ<EFBFBD><C996><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>\n"
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgid "E27: Farsi support has been removed\n"
-msgstr "E27: <20>y<EFBFBD><79><EFBFBD>V<EFBFBD>A<EFBFBD><41><EFBFBD>͎g<EFBFBD>p<EFBFBD>s<EFBFBD>\\<5C>ł<EFBFBD>: <20>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>ɖ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>܂<EFBFBD>\n"
+msgstr "E27: <20>y<EFBFBD><79><EFBFBD>V<EFBFBD>A<EFBFBD><41><EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD>͍폜<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD>\n"
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: <20>A<EFBFBD><41><EFBFBD>r<EFBFBD>A<EFBFBD><41><EFBFBD>͎g<CD8E>p<EFBFBD>s<EFBFBD>\\<5C>ł<EFBFBD>: <20>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>ɖ<EFBFBD><C996><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>\n"
@@ -6643,6 +6778,13 @@ msgstr "E715:
 msgid "E684: list index out of range: %ld"
 msgstr "E684: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>̃C<CC83><43><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD><58><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %ld"
 #, c-format
 msgid "E979: Blob index out of range: %ld"
 msgstr "E979: Blob<6F>̃C<CC83><43><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD><58><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %ld"
 msgid "E978: Invalid operation for Blob"
 msgstr "E978: Blob<6F>^<5E>ɂ͖<C982><CD96><EFBFBD><EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>ł<EFBFBD>"
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: <20>֐<EFBFBD><D690>̈<EFBFBD><CC88><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>܂<EFBFBD>: %s"
@@ -6654,10 +6796,17 @@ msgstr "E716:
 msgid "E714: List required"
 msgstr "E714: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
 msgid "E897: List or Blob required"
 msgstr "E897: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>^<5E>܂<EFBFBD><DC82><EFBFBD>Blob<6F>^<5E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>"
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s <20>̈<EFBFBD><CC88><EFBFBD><EFBFBD>̓<EFBFBD><CD83>X<EFBFBD>g<EFBFBD>^<5E>܂<EFBFBD><DC82>͎<EFBFBD><CD8E><EFBFBD><EFBFBD>^<5E>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
 #, c-format
 msgid "E896: Argument of %s must be a List, Dictionary or Blob"
 msgstr "E896: %s <20>̈<EFBFBD><CC88><EFBFBD><EFBFBD>̓<EFBFBD><CD83>X<EFBFBD>g<EFBFBD>^<5E>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>^<5E>܂<EFBFBD><DC82><EFBFBD>Blob<6F>^<5E>łȂ<C582><C882><EFBFBD><EFBFBD>΂Ȃ<CE82><C882>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E47: Error while reading errorfile"
 msgstr "E47: <20>G<EFBFBD><47><EFBFBD>[<5B>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̓Ǎ<CC93><C78D><EFBFBD><EFBFBD>ɃG<C983><47><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -6760,6 +6909,9 @@ msgstr "E919:
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Autocommand<6E><64><EFBFBD>ċA<C48B><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: <20><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B>͑<EFBFBD><CD91>̃<EFBFBD><CC83>[<5B>h<EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "<22><><EFBFBD>܂Ō<DC82><C58C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŉ<CC82><C589>ɖ߂<C996><DF82>܂<EFBFBD>"
`@@ -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`	`VIM REFERENCE MANUAL by Bram Moolenaar`