updated for version 7.0055v7.0055

author: Bram Moolenaar <Bram@vim.org> 2005-03-04 23:39:37 +0000
committer: Bram Moolenaar <Bram@vim.org> 2005-03-04 23:39:37 +0000
commit: 19a09a189379659b917cf5ccff78f3e5ec061015 (patch)
tree: 806d594bf7af04ef956c0c96ad64adfcd96325dc
parent: 7383034c0ab657158c4c69146254beffdea4859e (diff)
download: vim-git-19a09a189379659b917cf5ccff78f3e5ec061015.tar.gz
39 files changed, 5024 insertions, 3455 deletions
diff --git a/Filelist b/Filelist
index bdd33c162..57edbe981 100644
--- a/Filelist
+++ b/Filelist
@@ -325,7 +325,7 @@ SRC_DOS =	\
 
 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN =	\
-		src/VisVim/Res \
+		src/VisVim/Res/*.bmp \
 		src/tearoff.bmp \
 		src/tools.bmp \
 		src/tools16.bmp \
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e994df886..44608a0bf 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 21
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -286,7 +286,7 @@ FileChangedShell		When Vim notices that the modification time of
 				change. |timestamp|
 				Mostly triggered after executing a shell
 				command, but also with a |:checktime| command
-				or when Vim regains input focus.
+				or when Gvim regains input focus.
 				This autocommand is triggered for each changed
 				file.  It is not used when 'autoread' is set
 				and the buffer was not changed.  If a
@@ -294,6 +294,9 @@ FileChangedShell		When Vim notices that the modification time of
 				warning message and prompt is not given.
 				This is useful for reloading related buffers
 				which are affected by a single command.
+				The |v:fcs_reason| variable is set to indicate
+				what happened and |v:fcs_choice| can be used
+				to tell Vim what to do next.
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer that was changed "<afile>".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1838a8225..1cfa7b0fc 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 26
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1183,6 +1183,32 @@ v:exception	The value of the exception most recently caught and not
 	:endtry
 <		Output: "caught oops".
 
+					*v:fcs_reason* *fcs_reason-variable*
+v:fcs_reason	The reason why the |FileChangedShell| event was triggered.
+		Can be used in an autocommand to decide what to do and/or what
+		to set v:fcs_choice to.  Possible values:
+			deleted		file no longer exists
+			conflict	file contents, mode or timestamp was
+					changed and buffer is modified
+			changed		file contents has changed
+			mode		mode of file changed
+			time		only file timestamp changed
+
+					*v:fcs_choice* *fcs_choice-variable*
+v:fcs_choice	What should happen after a |FileChangedShell| event was
+		triggered.  Can be used in an autocommand to tell Vim what to
+		do with the affected buffer:
+			reload		Reload the buffer (does not work if
+					the file was deleted).
+			ask		Ask the user what to do, as if there
+					was no autocommand.  Except that when
+					only the timestamp changed nothing
+					will happen.
+			<empty>		Nothing, the autocommand should do
+					everything that needs to be done.
+		The default is empty.  If another (invalid) value is used then
+		Vim behaves like it is empty, there is no warning message.
+
 					*v:fname_in* *fname_in-variable*
 v:fname_in	The name of the input file.  Only valid while evaluating:
 			option		used for ~
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4bf27f66d..d0b5abf74 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 23
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -6833,9 +6833,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Window height.  Do not confuse this with the height of the Vim window,
 	use 'lines' for that.
-	Used for |CTRL-F| and |CTRL-B| when the value is smaller than 'lines'
-	minus one.  The screen will scroll 'window' minus two lines, with a
-	minimum of one.
+	Used for |CTRL-F| and |CTRL-B| when there is only one window and the
+	value is smaller than 'lines' minus one.  The screen will scroll
+	'window' minus two lines, with a minimum of one.
 	When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll
 	in a much smarter way, taking care of wrapping lines.
 	When resizing the Vim window, the value is smaller than 1 or more than
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 4f73e69b2..c4cdbbb92 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4782,6 +4782,8 @@ faq	intro.txt	/*faq*
 farsi	farsi.txt	/*farsi*
 farsi.txt	farsi.txt	/*farsi.txt*
 fasm.vim	syntax.txt	/*fasm.vim*
+fcs_choice-variable	eval.txt	/*fcs_choice-variable*
+fcs_reason-variable	eval.txt	/*fcs_reason-variable*
 feature-list	eval.txt	/*feature-list*
 fetch	pi_netrw.txt	/*fetch*
 file-browser-5.2	version5.txt	/*file-browser-5.2*
@@ -5078,6 +5080,7 @@ hebrew	hebrew.txt	/*hebrew*
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
+help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -5901,6 +5904,7 @@ printing	print.txt	/*printing*
 printing-formfeed	print.txt	/*printing-formfeed*
 profile	repeat.txt	/*profile*
 profiling	repeat.txt	/*profiling*
+profiling-variable	eval.txt	/*profiling-variable*
 progname-variable	eval.txt	/*progname-variable*
 progress-syntax	syntax.txt	/*progress-syntax*
 progress.vim	syntax.txt	/*progress.vim*
@@ -6620,6 +6624,8 @@ v:ctype	eval.txt	/*v:ctype*
 v:dying	eval.txt	/*v:dying*
 v:errmsg	eval.txt	/*v:errmsg*
 v:exception	eval.txt	/*v:exception*
+v:fcs_choice	eval.txt	/*v:fcs_choice*
+v:fcs_reason	eval.txt	/*v:fcs_reason*
 v:fname_diff	eval.txt	/*v:fname_diff*
 v:fname_in	eval.txt	/*v:fname_in*
 v:fname_new	eval.txt	/*v:fname_new*
@@ -6634,6 +6640,7 @@ v:lang	eval.txt	/*v:lang*
 v:lc_time	eval.txt	/*v:lc_time*
 v:lnum	eval.txt	/*v:lnum*
 v:prevcount	eval.txt	/*v:prevcount*
+v:profiling	eval.txt	/*v:profiling*
 v:progname	eval.txt	/*v:progname*
 v:register	eval.txt	/*v:register*
 v:servername	eval.txt	/*v:servername*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index b9252a93d..fba493c70 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2004 Dec 07
+*term.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -146,7 +146,7 @@ sequence of bytes.
 
 				*vt100-function-keys* *xterm-function-keys*
 An xterm can send function keys F1 to F4 in two modes: vt100 compatible or
-not.  Because Vim cannot know what the xterm is sending, both types of keys
+not.  Because Vim may not know what the xterm is sending, both types of keys
 are recognized.  The same happens for the <Home> and <End> keys.
 			normal			vt100 ~
 	<F1>	t_k1	<Esc>[11~	<xF1>	<Esc>OP	    *<xF1>-xterm*
@@ -167,6 +167,18 @@ recognizes most of them.  Use ":set termcap" to check which are supported and
 what the codes are.  Mostly these are not in a termcap, they are only
 supported by the builtin_xterm termcap.
 
+							*xterm-modifier-keys*
+Newer versions of xterm support Alt and Ctrl for most function keys.  To avoid
+having to add all combinations of Alt, Ctrl and Shift for every key a special
+sequence is recognized at the end of a termcap entry: ";*X".  The "X" can be
+any character, often '~' is used.  The ";*" stands for an optional modifier
+argument.  ";2" is Shift, ";3" is Alt, ";5" is Ctrl and ";9" is Meta (when
+it's different from Alt).  They can be combined.  Examples: >
+	:set <F8>=^[[19;*~
+	:set <Home>=^[[1;*H
+Another speciality about these codes is that they are not overwritten by
+another code.  That is to avoid that the codes obtained from xterm directly
+|t_RV| overwrite them.
 							*xterm-scroll-region*
 The default termcap entry for xterm on Sun and other platforms does not
 contain the entry for scroll regions.  Add ":cs=\E[%i%d;%dr:" to the xterm
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a1c487de2..833b6aa71 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Feb 28
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,17 +30,25 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+-   Steve Wall has a patch (2005 Mar 3) for adding function keys up to 37,
+    with modifiers.
+    Still need to recognize modifiers in "ESC O 5 F".  "ESC O * F"?
+":map <C-S-End> lll" has no effect.
+
 Mingw code to catch out-of-stack error doesn't work.  See MINGW_TRY in
 regexp.c.  Try with example from Michaelis.
 
-Russian helpfile doesn't show up correctly when 'encoding' is koi8-r.
-(Vassily Ragosin 2005 Feb 16)
-
 Mac unicode patch (Da Woon Jung):
-- typing doesn't work
 - selecting proportional font breaks display
+- UTF-8 text causes display problems.  Character width wrong?
 
 Patch for gettags(). Yegappan Lakshmanan Feb 27
+- docs: use of ^ and $ in pattern, refer to |tag-regexp|
+	  explain what the fields mean.
+	  use of 'tags' option
+
+-   Patch from Steve Wall (2005 Mar 3) for xterm mouse positioning above
+    column 223.
 
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -55,6 +63,8 @@ autoload:
 
 Patch for 'balloonexpr' option.  Sergey Khorev, Feb 26.  Addition Feb 27.
 
+Patch for "paranoid mode" by Kevin Collins, March 3.
+
 Awaiting response:
 -   Patch for mch_FullName() also in Vim 6.3?  os_mswin.c
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
@@ -181,10 +191,6 @@ PLANNED FOR VERSION 7.0:
 	screen has not yet been allocated with the new size.
 -   Running a shell command from the GUI still has limitations.  Look into how
     the Vim shell project can help: http://vimshell.wana.at
-8   When a file is change outside of Vim and unmodified in Vim there is no
-    simple way to automatically reload the file.  Either add an option for
-    this or make it simple to have the FileChangedShell invoke the normal
-    action, telling it what to do.
 -   Displaying size of Visual area: use 24-33 column display.
     When selecting multiple lines, up to about a screenfull, also count the
     characters.
@@ -258,12 +264,6 @@ Updated Ruby interface. (Ryan Paul)
 
 Awaiting updated patches:
     --- awaiting updated patch ---
-    7   Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
-	'flipcase' variable: upper/lowercase pairs.
-	Insert comma's between pairs and allow a range, make it look like
-	'isfname'.  E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153".  The colon to
-	separate the from and to part is optional.
-	Resp: no time now.
     8   Add GTK 2.3 file dialog support.  Patch by Grahame Bowland, 2004 Mar
 	15, but it doesn't use "initdir" or "dflt". (will update patch)
     8   Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
@@ -323,12 +323,6 @@ Awaiting updated patches:
 	done for filetype detection.  Patch from Walter Briscoe, 2003 Jul 1.
     7   Add a "-@ filelist" argument: read file names from a file. (David
 	Kotchan has a patch for it)
-    8   Add term entries for function keys on xterm with alt and ctrl (new in
-	pl 94).  E.g., Control adds ";5" in "<Esc>[20;5~".  Find a generic way
-	to prepend a modifier in console mode, to avoid having to specify each
-	individual modified key.
-	Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37,
-	with modifiers.
     8   Include a connection to an external program through a pipe?  See
 	patches from Felbinger for a mathematica interface.
 	Or use emacs server kind of thing?
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 31aa8af34..7c0e74d04 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 21
+*various.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -324,6 +324,7 @@ N  *+path_extra*	Up/downwards search in 'path' and 'tags'
 m  *+perl*		Perl interface |perl|, may have |/dyn|
    *+postscript*	|:hardcopy| writes a PostScript file
 N  *+printer*		|:hardcopy| command
+H  *+profile*		|:profile| command
 m  *+python*		Python interface |python|, may have |/dyn|
 N  *+quickfix*		|:make| and |quickfix| commands
 B  *+rightleft*		Right to left typing |'rightleft'|
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 2ac2ceac2..5fb35644e 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Feb 27
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -412,6 +412,9 @@ Autocommands can be defined local to a buffer.  This means they will also work
 when the buffer does not have a name or no specific name.  See
 |autocmd-buflocal|.  (Yakov Lerner)
 
+For xterm most combinations of modifiers with function keys are recognized.
+|xterm-modifier-keys|
+
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
 
@@ -539,7 +542,11 @@ To count items (pattern matches) without changing the buffer the 'n' flag has
 been added to |:substitute|.  See |count-items|.
 
 The "screen.linux" $TERM name is recognized to set the default for
-'background' to "dark". (Ciaran McCreesh)
+'background' to "dark". (Ciaran McCreesh)  Also for "cygwin".
+
+The |FileChangedShell| autocommand event can now use the |v:fcs_reason|
+variable that specifies what triggered the event.  |v:fcs_choice| can be used
+to reload the buffer or ask the user what to do.
 
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
@@ -897,4 +904,9 @@ from the terminal we actually get 3 lines for the cmdline in gvim.
 
 When setting $HOME allocated memory would leak.
 
+Win32: bold characters may sometimes write in another character cell.  Use
+unicodepdy[] as for UTF-8. (Taro Muraoka)
+
+":w fname" didn't work for files with 'buftype' set to "nofile".
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/keymap/canfr-win.vim b/runtime/keymap/canfr-win.vim
new file mode 100644
index 000000000..7a405bf0b
--- /dev/null
+++ b/runtime/keymap/canfr-win.vim
@@ -0,0 +1,91 @@
+" Vim Keymap file for the normalized Canadian multilingual keyboard
+" CAN/CSA Z243.200-92 using the latin1 encoding.
+" This mapping is limited in scope, as it assumes that the AltGr
+" key works as it typically does in a Windows system with a multilingual
+" English keyboard.  It probably won't work with the US keyboard on US
+" English versions of Windows, because those don't provide the AltGr keys.
+" The mapping was tested with Win2k and WinXP.
+
+" Maintainer: Eric Joanis <joanis@cs.toronto.edu>
+" Last Change: 2004 Jan 13
+
+" 2003 Dec 04
+" Initial Revision
+
+" 2004 Jan 13
+" Added the upper case accented characters, forgotten in the initial version.
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding latin1
+
+" Use this short name in the status line.
+let b:keymap_name = "canfr"
+
+loadkeymap
+<	'
+>	"
+/	�
+?	�
+'	�
+\"	�
+\\	�
+|	�
+[a	�
+[e	�
+[i	�
+[o	�
+[u	�
+[A	�
+[E	�
+[I	�
+[O	�
+[U	�
+[[	^
+{a	�
+{e	�
+{i	�
+{o	�
+{u	�
+{y	�
+{A	�
+{E	�
+{I	�
+{O	�
+{U	�
+]	�
+}	�
+`	/
+~	\\
+^	?
+�	�
+�	�
+�	<
+�	>
+�	�
+�a	�
+�e	�
+�i	�
+�o	�
+�u	�
+�A	�
+�E	�
+�I	�
+�O	�
+�U	�
+��	`
+�a	�
+�o	�
+�n	�
+�s	�
+�A	�
+�O	�
+�N	�
+�S	�
+��	~
+�	|
+�	{
+�	}
+�	[
+�	]
+�	�
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 69bee3aaf..e25da8717 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2004 Oct 02
+" Last change:	2005 Mar 04
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -222,6 +222,10 @@ else
   elseif s:line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
     set ft=cvs
 
+    " Prescribe
+  elseif s:line1 =~ '^!R!'
+    set ft=prescribe
+
     " Send-pr
   elseif s:line1 =~ '^SEND-PR:'
     set ft=sendpr
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
new file mode 100644
index 000000000..d89ee3525
--- /dev/null
+++ b/runtime/syntax/prescribe.vim
@@ -0,0 +1,69 @@
+" Vim syntax file
+" Language:	Kyocera PreScribe2e
+" Maintainer:	Klaus Muth <klaus@hampft.de>
+" URL:          http://www.hampft.de/vim/syntax/prescribe.vim
+" Last Change:	2005 Mar 04
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn match   prescribeSpecial	"!R!"
+
+" all prescribe commands
+syn keyword prescribeStatement	ALTF AMCR ARC ASFN ASTK BARC BLK BOX CALL 
+syn keyword prescribeStatement	CASS CIR CLIP CLPR CLSP COPY CPTH CSET CSTK
+syn keyword prescribeStatement	CTXT DAF DAM DAP DELF DELM DPAT DRP DRPA DUPX
+syn keyword prescribeStatement	DXPG DXSD DZP ENDD ENDM ENDR EPL EPRM EXIT
+syn keyword prescribeStatement	FDIR FILL FLAT FLST FONT FPAT FRPO FSET FTMD
+syn keyword prescribeStatement	GPAT ICCD INTL JOG LDFC MAP MCRO MDAT MID
+syn keyword prescribeStatement	MLST MRP MRPA MSTK MTYP MZP NEWP PAGE PARC PAT
+syn keyword prescribeStatement	PCRP PCZP PDIR RDRP PDZP PELP PIE PMRA PMRP PMZP
+syn keyword prescribeStatement	PRBX PRRC PSRC PXPL RDMP RES RSL RGST RPCS RPF
+syn keyword prescribeStatement	RPG RPP RPU RTTX RTXT RVCD RVRD SBM SCAP SCCS
+syn keyword prescribeStatement	SCF SCG SCP SCPI SCRC SCS SCU SDP SEM SETF SFA
+syn keyword prescribeStatement	SFNT SIMG SIR SLJN SLM SLPI SLPP SLS  SMLT SPD
+syn keyword prescribeStatement	SPL SPLT SPO SPSZ SPW SRM SRO SROP SSTK STAT STRK
+syn keyword prescribeStatement	SULP SVCP TATR TEXT TPRS UNIT UOM WIDE WRED XPAT
+syn match   prescribeStatement	"\<ALTB\s\+[ACDEGRST]\>"
+syn match   prescribeStatement	"\<CPPY\s\+[DE]\>"
+syn match   prescribeStatement	"\<EMCR\s\+[DE]\>"
+syn match   prescribeStatement	"\<FRPO\s\+INIT\>"
+syn match   prescribeStatement	"\<JOB[DLOPST]\>"
+syn match   prescribeStatement	"\<LDFC\s\+[CFS]\>"
+syn match   prescribeStatement	"\<RWER\s\+[DFILRSTW]\>"
+
+syn match   prescribeCSETArg	"[0-9]\{1,3}[A-Z]"
+syn match   prescribeFRPOArg	"[A-Z][0-9]\{1,2}"
+syn match   prescribeNumber	"[0-9]\+"
+syn region  prescribeString	start=+'+ end=+'+ skip=+\\'+
+syn region  prescribeComment	start=+CMNT+ end=+;+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_prescribe_syn_inits")
+  if version < 508
+    let did_prescribe_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink prescribeSpecial		PreProc
+  HiLink prescribeStatement		Statement
+  HiLink prescribeNumber		Number
+  HiLink prescribeCSETArg		String
+  HiLink prescribeFRPOArg		String
+  HiLink prescribeComment		Comment
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "prescribe"
+
+" vim: ts=8
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index b9af06416..29575c7ac 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
 " Language:	Vim 7.0 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
 " Last Change:	February 22, 2005
-" Version:	7.0-07
+" Version:	7.0-08
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -245,7 +245,7 @@ syn match  vimFilter contained	"^!.\{-}\(|\|$\)"		contains=vimSpecFile
 syn match  vimFilter contained	"\A!.\{-}\(|\|$\)"ms=s+1	contains=vimSpecFile
 
 " Complex repeats (:h complex-repeat) {{{2
-syn match  vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
+"syn match  vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
 syn match  vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
 
 " Set command and associated set-options (vimOptions) with comment {{{2
diff --git a/src/VisVim/Res/ToolbarL.bmp b/src/VisVim/Res/ToolbarL.bmp
new file mode 100644
index 000000000..e11c66fc6
--- /dev/null
+++ b/src/VisVim/Res/ToolbarL.bmp
diff --git a/src/VisVim/Res/ToolbarM.bmp b/src/VisVim/Res/ToolbarM.bmp
new file mode 100644
index 000000000..22e15f489
--- /dev/null
+++ b/src/VisVim/Res/ToolbarM.bmp
diff --git a/src/eval.c b/src/eval.c
index bde12e56e..c7aba5145 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -316,6 +316,8 @@ static struct vimvar
     {VV_NAME("val",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("key",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("profiling",	 VAR_NUMBER), VV_RO},
+    {VV_NAME("fcs_reason",	 VAR_STRING), VV_RO},
+    {VV_NAME("fcs_choice",	 VAR_STRING), 0},
 };
 
 /* shorthand */
@@ -549,6 +551,7 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tolower __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_toupper __ARGS((typval_T *argvars, typval_T *rettv));
@@ -6196,6 +6199,7 @@ static struct fst
     {"synIDattr",	2, 3, f_synIDattr},
     {"synIDtrans",	1, 1, f_synIDtrans},
     {"system",		1, 2, f_system},
+    {"taglist",		1, 1, f_taglist},
     {"tempname",	0, 0, f_tempname},
     {"tolower",		1, 1, f_tolower},
     {"toupper",		1, 1, f_toupper},
@@ -13134,6 +13138,35 @@ done:
 }
 
 /*
+ * "gettags()" function
+ */
+    static void
+f_taglist(argvars, rettv)
+    typval_T  *argvars;
+    typval_T  *rettv;
+{
+    char_u  *tag_pattern;
+    list_T  *l;
+
+    tag_pattern = get_tv_string(&argvars[0]);
+
+    rettv->vval.v_number = FALSE;
+
+    l = list_alloc();
+    if (l != NULL)
+    {
+	if (get_tags(l, tag_pattern) != FAIL)
+	{
+	    rettv->vval.v_list = l;
+	    rettv->v_type = VAR_LIST;
+	    ++l->lv_refcount;
+	}
+	else
+	    list_free(l);
+    }
+}
+
+/*
  * "tempname()" function
  */
 /*ARGSUSED*/
@@ -14010,7 +14043,7 @@ set_vim_var_nr(idx, val)
 }
 
 /*
- * Get number v: variable value;
+ * Get number v: variable value.
  */
     long
 get_vim_var_nr(idx)
@@ -14019,6 +14052,18 @@ get_vim_var_nr(idx)
     return vimvars[idx].vv_nr;
 }
 
+#if defined(FEAT_AUTOCMD) || defined(PROTO)
+/*
+ * Get string v: variable value.  Uses a static buffer, can only be used once.
+ */
+    char_u *
+get_vim_var_str(idx)
+    int		idx;
+{
+    return get_tv_string(&vimvars[idx].vv_tv);
+}
+#endif
+
 /*
  * Set v:count, v:count1 and v:prevcount.
  */
diff --git a/src/fileio.c b/src/fileio.c
index c3aef90a1..1edf0ae79 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1331,7 +1331,8 @@ retry:
 
 		/*
 		 * If there is conversion error or not enough room try using
-		 * another conversion.
+		 * another conversion.  Except for when there is no
+		 * alternative (help files).
 		 */
 		while ((iconv(iconv_fd, (void *)&fromp, &from_size,
 							       &top, &to_size)
@@ -2753,7 +2754,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_BUFWRITEPRE,
@@ -2765,7 +2766,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_FILEWRITEPRE,
@@ -5917,7 +5918,10 @@ buf_check_timestamp(buf, focus)
 #endif
 #ifdef FEAT_AUTOCMD
     static int	busy = FALSE;
+    int		n;
+    char_u	*s;
 #endif
+    char	*reason;
 
     /* If there is no file name, the buffer is not loaded, 'buftype' is
      * set, we are in the middle of a save or being called recursively: ignore
@@ -5975,15 +5979,26 @@ buf_check_timestamp(buf, focus)
 	    reload = TRUE;
 	else
 	{
-#ifdef FEAT_AUTOCMD
-	    int n;
+	    if (stat_res < 0)
+		reason = "deleted";
+	    else if (bufIsChanged(buf))
+		reason = "conflict";
+	    else if (orig_size != buf->b_orig_size || buf_contents_changed(buf))
+		reason = "changed";
+	    else if (orig_mode != buf->b_orig_mode)
+		reason = "mode";
+	    else
+		reason = "time";
 
+#ifdef FEAT_AUTOCMD
 	    /*
 	     * Only give the warning if there are no FileChangedShell
 	     * autocommands.
 	     * Avoid being called recursively by setting "busy".
 	     */
 	    busy = TRUE;
+	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+	    set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
 	    n = apply_autocmds(EVENT_FILECHANGEDSHELL,
 				      buf->b_fname, buf->b_fname, FALSE, buf);
 	    busy = FALSE;
@@ -5991,13 +6006,19 @@ buf_check_timestamp(buf, focus)
 	    {
 		if (!buf_valid(buf))
 		    EMSG(_("E246: FileChangedShell autocommand deleted buffer"));
-		return 2;
+		s = get_vim_var_str(VV_FCS_CHOICE);
+		if (STRCMP(s, "reload") == 0 && *reason != 'd')
+		    reload = TRUE;
+		else if (STRCMP(s, "ask") == 0)
+		    n = FALSE;
+		else
+		    return 2;
 	    }
-	    else
+	    if (!n)
 #endif
 	    {
-		if (stat_res < 0)
-		    mesg = _("E211: Warning: File \"%s\" no longer available");
+		if (*reason == 'd')
+		    mesg = _("E211: File \"%s\" no longer available");
 		else
 		{
 		    helpmesg = TRUE;
@@ -6010,13 +6031,22 @@ buf_check_timestamp(buf, focus)
 		     * checked out of CVS).  Always warn when the buffer was
 		     * changed.
 		     */
-		    if (bufIsChanged(buf))
+		    if (reason[2] == 'n')
+		    {
 			mesg = _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
-		    else if (orig_size != buf->b_orig_size
-			    || buf_contents_changed(buf))
+			mesg2 = _("See \":help W12\" for more info.");
+		    }
+		    else if (reason[1] == 'h')
+		    {
 			mesg = _("W11: Warning: File \"%s\" has changed since editing started");
-		    else if (orig_mode != buf->b_orig_mode)
+			mesg2 = _("See \":help W11\" for more info.");
+		    }
+		    else if (*reason == 'm')
+		    {
 			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+			mesg2 = _("See \":help W16\" for more info.");
+		    }
+		    /* Else: only timestamp changed, ignored */
 		}
 	    }
 	}
@@ -6038,9 +6068,7 @@ buf_check_timestamp(buf, focus)
 	path = home_replace_save(buf, buf->b_fname);
 	if (path != NULL)
 	{
-	    if (helpmesg)
-		mesg2 = _("See \":help W11\" for more info.");
-	    else
+	    if (!helpmesg)
 		mesg2 = "";
 	    tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
 							+ STRLEN(mesg2) + 2));
diff --git a/src/getchar.c b/src/getchar.c
index 8328e19a1..e93ce0529 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1483,10 +1483,14 @@ vgetc()
 #endif
 	   )
 	{
+	    int	    save_allow_keys = allow_keys;
+
 	    ++no_mapping;
+	    allow_keys = 0;		/* make sure BS is not found */
 	    c2 = vgetorpeek(TRUE);	/* no mapping for these chars */
 	    c = vgetorpeek(TRUE);
 	    --no_mapping;
+	    allow_keys = save_allow_keys;
 	    if (c2 == KS_MODIFIER)
 	    {
 		mod_mask = c;
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8abdf8613..debc11bc4 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -896,6 +896,38 @@ keyval_to_string(unsigned int keyval, unsigned int state, char_u *string)
 }
 #endif /* HAVE_GTK2 */
 
+    static int
+modifiers_gdk2vim(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOD_MASK_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOD_MASK_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOD_MASK_ALT;
+    if (state & GDK_MOD4_MASK)
+	modifiers |= MOD_MASK_META;
+
+    return modifiers;
+}
+
+    static int
+modifiers_gdk2mouse(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOUSE_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOUSE_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOUSE_ALT;
+
+    return modifiers;
+}
+
 /*
  * Main keyboard handler:
  */
@@ -1112,13 +1144,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #endif
 	    )
     {
-	modifiers = 0;
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOD_MASK_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOD_MASK_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOD_MASK_ALT;
+	modifiers = modifiers_gdk2vim(state);
 
 	/*
 	 * For some keys a shift modifier is translated into another key
@@ -1598,13 +1624,7 @@ process_motion_notify(int x, int y, GdkModifierType state)
     }
 
     /* translate modifier coding between the main engine and GTK */
-    vim_modifiers = 0x0;
-    if (state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(state);
 
     /* inform the editor engine about the occurence of this event */
     gui_send_mouse_event(button, x, y, FALSE, vim_modifiers);
@@ -1796,13 +1816,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	xim_reset();
 #endif
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -1821,7 +1835,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
     int	    button;
-    int_u   vim_modifiers = 0;
+    int_u   vim_modifiers;
 
     if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
 	gtk_widget_grab_focus(widget);
@@ -1844,12 +1858,7 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 	xim_reset();
 # endif
 
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, (int)event->x, (int)event->y,
 							FALSE, vim_modifiers);
@@ -1881,13 +1890,7 @@ button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
     x = event->x;
     y = event->y;
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -2001,16 +2004,11 @@ drag_handle_uri_list(GdkDragContext	*context,
 
     if (fnames != NULL && nfiles > 0)
     {
-	int_u   modifiers = 0;
+	int_u   modifiers;
 
 	gtk_drag_finish(context, TRUE, FALSE, time_); /* accept */
 
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOUSE_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOUSE_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOUSE_ALT;
+	modifiers = modifiers_gdk2mouse(state);
 
 	gui_handle_drop(x, y, modifiers, fnames, nfiles);
     }
@@ -2061,12 +2059,7 @@ drag_handle_text(GdkDragContext	    *context,
     vim_free(tmpbuf);
 # endif
 
-    if (state & GDK_SHIFT_MASK)
-	dropkey[2] |= MOD_MASK_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	dropkey[2] |= MOD_MASK_CTRL;
-    if (state & GDK_MOD1_MASK)
-	dropkey[2] |= MOD_MASK_ALT;
+    dropkey[2] = modifiers_gdk2vim(state);
 
     if (dropkey[2] != 0)
 	add_to_input_buf(dropkey, (int)sizeof(dropkey));
diff --git a/src/gui_w32.c b/src/gui_w32.c
index d6d37c4d1..230836247 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1958,7 +1958,7 @@ gui_mch_draw_string(
 	    ++clen;
 	}
 	ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			     foptions, pcliprect, unicodebuf, clen, unicodepdy);
+			   foptions, pcliprect, unicodebuf, clen, unicodepdy);
 	len = cells;	/* used for underlining */
     }
     else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9)
@@ -1975,8 +1975,26 @@ gui_mch_draw_string(
 			(char *)text, len,
 			(LPWSTR)unicodebuf, unibuflen);
 	    if (len != 0)
+	    {
+		/* Use unicodepdy to make characters fit as we expect, even
+		 * when the font uses different widths (e.g., bold character
+		 * is wider). */
+		if (unicodepdy != NULL)
+		{
+		    int i;
+		    int cw;
+
+		    for (i = 0; i < len; ++i)
+		    {
+			cw = utf_char2cells(unicodebuf[i]);
+			if (cw > 2)
+			    cw = 1;
+			unicodepdy[i] = cw * gui.char_width;
+		    }
+		}
 		ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			      foptions, pcliprect, unicodebuf, len, NULL);
+			    foptions, pcliprect, unicodebuf, len, unicodepdy);
+	    }
 	}
     }
     else
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 6d990c5d1..809054f0f 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -998,6 +998,8 @@ gui_x11_key_hit_cb(w, dud, event, dum)
 	    modifiers |= MOD_MASK_CTRL;
 	if (ev_press->state & Mod1Mask)
 	    modifiers |= MOD_MASK_ALT;
+	if (ev_press->state & Mod4Mask)
+	    modifiers |= MOD_MASK_META;
 
 	/*
 	 * For some keys a shift modifier is translated into another key
diff --git a/src/keymap.h b/src/keymap.h
index cb79ad1e1..5babdf4af 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -458,23 +458,24 @@ enum key_extra
 #define MOD_MASK_SHIFT	    0x02
 #define MOD_MASK_CTRL	    0x04
 #define MOD_MASK_ALT	    0x08	/* aka META */
-#define MOD_MASK_2CLICK	    0x10	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_3CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_4CLICK	    0x30	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_META	    0x10	/* META when it's different from ALT */
+#define MOD_MASK_2CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_3CLICK	    0x40	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_4CLICK	    0x60	/* use MOD_MASK_MULTI_CLICK */
 #ifdef MACOS
-# define MOD_MASK_CMD	     0x80
+# define MOD_MASK_CMD	    0x80
 #endif
 
 #define MOD_MASK_MULTI_CLICK	(MOD_MASK_2CLICK|MOD_MASK_3CLICK|MOD_MASK_4CLICK)
 
 /*
  * The length of the longest special key name, including modifiers.
- * Current longest is <M-C-S-4-MiddleRelease> (length includes '<' and '>').
+ * Current longest is <M-C-S-T-4-MiddleRelease> (length includes '<' and '>').
  */
-#define MAX_KEY_NAME_LEN    23
+#define MAX_KEY_NAME_LEN    25
 
 /* Maximum length of a special key event as tokens.  This includes modifiers.
- * The longest event is something like <M-C-S-4-LeftDrag> which would be the
+ * The longest event is something like <M-C-S-T-4-LeftDrag> which would be the
  * following string of tokens:
  *
  * <K_SPECIAL> <KS_MODIFIER> bitmask <K_SPECIAL> <KS_EXTRA> <KT_LEFTDRAG>.
diff --git a/src/misc2.c b/src/misc2.c
index d5a80929b..9b21168d8 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1644,6 +1644,7 @@ static struct modmasktable
 } mod_mask_table[] =
 {
     {MOD_MASK_ALT,		MOD_MASK_ALT,		(char_u)'M'},
+    {MOD_MASK_META,		MOD_MASK_META,		(char_u)'T'},
     {MOD_MASK_CTRL,		MOD_MASK_CTRL,		(char_u)'C'},
     {MOD_MASK_SHIFT,		MOD_MASK_SHIFT,		(char_u)'S'},
     {MOD_MASK_MULTI_CLICK,	MOD_MASK_2CLICK,	(char_u)'2'},
diff --git a/src/normal.c b/src/normal.c
index 2d2efc2f3..9bf2e66b7 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2257,7 +2257,8 @@ do_mouse(oap, c, dir, count, fixindent)
      * multiple clicks and the middle mouse button.
      * Accept shift-leftmouse drags when 'mousemodel' is "popup.*".
      */
-    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT))
+    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT
+							     | MOD_MASK_META))
 	    && (!is_click
 		|| (mod_mask & MOD_MASK_MULTI_CLICK)
 		|| which_button == MOUSE_MIDDLE)
diff --git a/src/option.c b/src/option.c
index 5cf1b4620..e7210b3f9 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3149,11 +3149,13 @@ set_init_2()
 	 * with a dark background, that can handle color.  Recognized are:
 	 * "linux"	    Linux console
 	 * "screen.linux"   Linux console with screen
+	 * "cygwin"	    Cygwin shell
 	 */
 	idx = findoption((char_u *)"bg");
 	if (!(options[idx].flags & P_WAS_SET)
 		&& (STRCMP(T_NAME, "linux") == 0
-		    || STRCMP(T_NAME, "screen.linux") == 0))
+		    || STRCMP(T_NAME, "screen.linux") == 0
+		    || STRCMP(T_NAME, "cygwin") == 0))
 	{
 	    set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
 	    /* don't mark it as set, when starting the GUI it may be changed
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 68d46c0f2..eed0ebbe9 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -292,7 +292,13 @@ mac_conv_init()
 
     if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
 		utf8_canon_encoding) != noErr)
-	gUTF16ToUTF8Converter = NULL;
+    {
+	/* On pre-10.3, Unicode normalization is not available so
+	 * fall back to non-normalizing converter */
+	if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
+		    utf8_encoding) != noErr)
+	    gUTF16ToUTF8Converter = NULL;
+    }
 }
 
 /*
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 4f3a49bef..5e96da8af 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -385,6 +385,7 @@ mch_FullName(
     else
 #endif
     {
+#ifdef FEAT_MBYTE
 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
 # ifdef __BORLANDC__
 		/* Wide functions of Borland C 5.5 do not work on Windows 98. */
@@ -415,7 +416,6 @@ mch_FullName(
 	    vim_free(wname);
 	    vim_free(cname);
 	}
-#ifdef FEAT_MBYTE
 	if (nResult == FAIL)	    /* fall back to non-wide function */
 #endif
 	{
@@ -2487,8 +2487,13 @@ serverSendEnc(HWND target)
     COPYDATASTRUCT data;
 
     data.dwData = COPYDATA_ENCODING;
+#ifdef FEAT_MBYTE
     data.cbData = STRLEN(p_enc) + 1;
     data.lpData = p_enc;
+#else
+    data.cbData = STRLEN("latin1") + 1;
+    data.lpData = "latin1";
+#endif
     (void)SendMessage(target, WM_COPYDATA, (WPARAM)message_window,
 							     (LPARAM)(&data));
 }
diff --git a/src/po/ja.po b/src/po/ja.po
index 17d94d516..8b8559efc 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,188 +3,188 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:102
+#: ../buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �Хåե���1�Ĥ�����Ǥ��ʤ��Τ�, ��λ���ޤ�..."
 
-#: buffer.c:105
+#: ../buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �Хåե�������Ǥ��ʤ��Τ�, ¾�Τ���Ѥ��ޤ�..."
 
-#: buffer.c:805
+#: ../buffer.c:857
 msgid "E515: No buffers were unloaded"
 msgstr "E515: �������줿�Хåե��Ϥ���ޤ���"
 
-#: buffer.c:807
+#: ../buffer.c:859
 msgid "E516: No buffers were deleted"
 msgstr "E516: ������줿�Хåե��Ϥ���ޤ���"
 
-#: buffer.c:809
+#: ../buffer.c:861
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �˴����줿�Хåե��Ϥ���ޤ���"
 
-#: buffer.c:817
+#: ../buffer.c:869
 msgid "1 buffer unloaded"
 msgstr "1 �ĤΥХåե�����������ޤ���"
 
-#: buffer.c:819
+#: ../buffer.c:871
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d �ĤΥХåե�����������ޤ���"
 
-#: buffer.c:824
+#: ../buffer.c:876
 msgid "1 buffer deleted"
 msgstr "1 �ĤΥХåե����������ޤ���"
 
-#: buffer.c:826
+#: ../buffer.c:878
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d �ĤΥХåե����������ޤ���"
 
-#: buffer.c:831
+#: ../buffer.c:883
 msgid "1 buffer wiped out"
 msgstr "1 �ĤΥХåե����˴�����ޤ���"
 
-#: buffer.c:833
+#: ../buffer.c:885
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d �ĤΥХåե����˴�����ޤ���"
 
-#: buffer.c:894
+#: ../buffer.c:946
 msgid "E84: No modified buffer found"
 msgstr "E84: �ѹ����줿�Хåե��Ϥ���ޤ���"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
 msgid "E85: There is no listed buffer"
 msgstr "E85: �ꥹ��ɽ�������Хåե��Ϥ���ޤ���"
 
-#: buffer.c:945
+#: ../buffer.c:997
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: �Хåե� %ld �Ϥ���ޤ���"
 
-#: buffer.c:948
+#: ../buffer.c:1000
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �Ǹ�ΥХåե���ۤ��ư�ư�ϤǤ��ޤ���"
 
-#: buffer.c:950
+#: ../buffer.c:1002
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �ǽ�ΥХåե�������ؤϰ�ư�Ǥ��ޤ���"
 
-#: buffer.c:988
+#: ../buffer.c:1044
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: �Хåե� %ld ���ѹ�����¸����Ƥ��ޤ��� (! ���ѹ����˴�)"
 
-#: buffer.c:1005
+#: ../buffer.c:1061
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ǹ�ΥХåե��ϲ����Ǥ��ޤ���"
 
-#: buffer.c:1538
+#: ../buffer.c:1611
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: �ٹ�: �ե�����̾�Υꥹ�Ȥ�Ĺ�����ޤ�"
+msgstr "W14: �ٹ�: �ե�����̾�Υꥹ�Ȥ�Ĺ�᤮�ޤ�"
 
-#: buffer.c:1709
+#: ../buffer.c:1795
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: �Хåե� %ld ���ߤĤ���ޤ���"
 
-#: buffer.c:1940
+#: ../buffer.c:2058
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s ��ʣ���γ���������ޤ���"
 
-#: buffer.c:1942
+#: ../buffer.c:2060
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s �˳�������Хåե��Ϥ���ޤ���Ǥ���"
 
-#: buffer.c:2337
+#: ../buffer.c:2473
 #, c-format
 msgid "line %ld"
 msgstr "�� %ld"
 
-#: buffer.c:2420
+#: ../buffer.c:2561
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: ����̾���ΥХåե��ϴ��ˤ���ޤ�"
 
-#: buffer.c:2713
+#: ../buffer.c:2878
 msgid " [Modified]"
 msgstr " [�ѹ�����]"
 
-#: buffer.c:2718
+#: ../buffer.c:2883
 msgid "[Not edited]"
 msgstr "[̤�Խ�]"
 
-#: buffer.c:2723
+#: ../buffer.c:2888
 msgid "[New file]"
 msgstr "[���ե�����]"
 
-#: buffer.c:2724
+#: ../buffer.c:2889
 msgid "[Read errors]"
 msgstr "[�ɹ����顼]"
 
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
 msgid "[readonly]"
 msgstr "[�ɹ�����]"
 
-#: buffer.c:2747
+#: ../buffer.c:2912
 msgid "1 line --%d%%--"
 msgstr "1 �� --%d%%--"
 
-#: buffer.c:2749
+#: ../buffer.c:2914
 msgid "%ld lines --%d%%--"
 msgstr "%ld �� --%d%%--"
 
-#: buffer.c:2756
+#: ../buffer.c:2921
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "�� %ld (���� %ld) --%d%%-- col "
 
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[̵��]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[̵̾]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
 msgid "help"
 msgstr "�إ��"
 
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
 msgid "[help]"
 msgstr "[�إ��]"
 
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
 msgid "[Preview]"
 msgstr "[�ץ�ӥ塼]"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "All"
 msgstr "����"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "Bot"
 msgstr "����"
 
-#: buffer.c:3777
+#: ../buffer.c:3933
 msgid "Top"
 msgstr "��Ƭ"
 
-#: buffer.c:4523
+#: ../buffer.c:4702
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
 "\n"
 "# �Хåե��ꥹ��:\n"
 
-#: buffer.c:4556
+#: ../buffer.c:4737
 msgid "[Error List]"
 msgstr "[���顼�ꥹ��]"
 
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[̵��]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
 msgid ""
 "\n"
 "--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
 "\n"
 "--- ������ ---"
 
-#: buffer.c:4901
+#: ../buffer.c:5082
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s �Υ�����:"
 
-#: buffer.c:4907
+#: ../buffer.c:5088
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    ��=%ld  ���̻�=%d  ̾��=%s"
 
-#: diff.c:139
+#: ../diff.c:163
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: %ld �ʾ�ΥХåե���diff�Ǥ��ޤ���"
 
-#: diff.c:709
+#: ../diff.c:737
 msgid "E97: Cannot create diffs"
 msgstr "E97: ��ʬ������Ǥ��ޤ��� "
 
-#: diff.c:814
+#: ../diff.c:843
 msgid "Patch file"
 msgstr "�ѥå��ե�����"
 
-#: diff.c:1065
+#: ../diff.c:1146
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�ν��Ϥ��ɹ���ޤ���"
 
-#: diff.c:1815
+#: ../diff.c:1896
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���ߤΥХåե��Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: diff.c:1827
+#: ../diff.c:1908
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: ��ʬ�⡼�ɤǤ���¾�ΥХåե��Ϥ���ޤ���"
 
-#: diff.c:1835
+#: ../diff.c:1916
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: ��ʬ�⡼�ɤΥХåե���2�İʾ夢��Τǡ��ɤ��Ȥ�������Ǥ��ޤ���"
 
-#: diff.c:1858
+#: ../diff.c:1939
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �Хåե� \"%s\" ���ߤĤ���ޤ���"
 
-#: diff.c:1864
+#: ../diff.c:1945
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �Хåե� \"%s\" �Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: digraph.c:2199
+#: ../digraph.c:2200
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����Escape�ϻ��ѤǤ��ޤ���"
 
-#: digraph.c:2384
+#: ../digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: �����ޥåץե����뤬�ߤĤ���ޤ���"
 
-#: digraph.c:2411
+#: ../digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source �Ǽ����ե�����ʳ��Ǥ� :loadkeymap ��Ȥ��ޤ���"
 
-#: edit.c:40
+#: ../edit.c:41
 msgid " Keyword completion (^N^P)"
 msgstr " ��������䴰 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: edit.c:41
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " ^X �⡼�� (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X �⡼�� (^E^Y^L^]^F^I^K^D^U^V^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-#: edit.c:44
+#: ../edit.c:45
 msgid " Keyword Local completion (^N^P)"
 msgstr " �ɽꥭ������䴰 (^N^P)"
 
-#: edit.c:45
+#: ../edit.c:46
 msgid " Whole line completion (^L^N^P)"
 msgstr " ��(����)�䴰 (^L^N^P)"
 
-#: edit.c:46
+#: ../edit.c:47
 msgid " File name completion (^F^N^P)"
 msgstr "�ե�����̾�䴰 (^F^N^P)"
 
-#: edit.c:47
+#: ../edit.c:48
 msgid " Tag completion (^]^N^P)"
 msgstr " �����䴰 (^]^N^P)"
 
-#: edit.c:48
+#: ../edit.c:49
 msgid " Path pattern completion (^N^P)"
 msgstr " �ѥ��ѥ������䴰 (^N^P)"
 
-#: edit.c:49
+#: ../edit.c:50
 msgid " Definition completion (^D^N^P)"
 msgstr " ����䴰 (^D^N^P)"
 
-#: edit.c:51
+#: ../edit.c:52
 msgid " Dictionary completion (^K^N^P)"
 msgstr " �����䴰 (^K^N^P)"
 
-#: edit.c:52
+#: ../edit.c:53
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " �������饹�䴰 (^T^N^P)"
 
-#: edit.c:53
+#: ../edit.c:54
 msgid " Command-line completion (^V^N^P)"
 msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
 
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " �桼������䴰 (^U^N^P)"
+
+#: ../edit.c:58
 msgid "Hit end of paragraph"
 msgstr "����κǸ�˥ҥå�"
 
-#: edit.c:962
+#: ../edit.c:994
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' ���ץ���󤬶��Ǥ�"
 
-#: edit.c:1166
+#: ../edit.c:1204
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' ���ץ���󤬶��Ǥ�"
 
-#: edit.c:2162
+#: ../edit.c:2204
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "����򥹥������: %s"
 
-#: edit.c:2368
+#: ../edit.c:2410
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (����) ����������(^E/^Y)"
 
-#: edit.c:2370
+#: ../edit.c:2412
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (�ִ�) ���������� (^E/^Y)"
 
-#: edit.c:2684
+#: ../edit.c:2813
 #, c-format
 msgid "Scanning: %s"
 msgstr "���������: %s"
 
-#: edit.c:2719
+#: ../edit.c:2848
 msgid "Scanning tags."
 msgstr "�����򥹥������."
 
-#: edit.c:3381
+#: ../edit.c:3549
 msgid " Adding"
 msgstr " �ɲ���"
 
@@ -359,121 +359,283 @@ msgstr " �ɲ���"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3430
+#: ../edit.c:3598
 msgid "-- Searching..."
 msgstr "-- ������..."
 
-#: edit.c:3486
+#: ../edit.c:3654
 msgid "Back at original"
 msgstr "�Ϥ�����"
 
-#: edit.c:3491
+#: ../edit.c:3659
 msgid "Word from other line"
 msgstr "¾�ιԤ�ñ��"
 
-#: edit.c:3496
+#: ../edit.c:3664
 msgid "The only match"
 msgstr "ͣ��γ���"
 
-#: edit.c:3555
+#: ../edit.c:3723
 #, c-format
 msgid "match %d of %d"
 msgstr "%d ���ܤγ��� (������ %d ����)"
 
-#: edit.c:3558
+#: ../edit.c:3726
 #, c-format
 msgid "match %d"
 msgstr "%d ���ܤγ���"
 
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: ͽ������ʸ���� :let �ˤ���ޤ���"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: ̤������ѿ��Ǥ�: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' ���ߤĤ���ޤ���"
+
+#: ../eval.c:97
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: ̤�Τ��ѿ�: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: �ꥹ�ȷ���ɬ�פǤ�"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: ���񷿤�ɬ�פǤ�"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] �򼭽񷿤��Ȥ߹�碌�ƤϻȤ��ޤ���"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: �ۤʤä������ѿ��Ǥ� %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: �������åȤ��ꥹ�ȷ�������Ǥ��⾯�ʤ��Ǥ�"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: �������åȤ��ꥹ�ȷ�������Ǥ���¿���Ǥ�"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "�ꥹ�ȷ����ͤ�2�İʾ�� ; �����Ф���ޤ���"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ���ͤ����ɽ���Ǥ��ޤ���"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: �ꥹ�ȷ��ȼ��񷿰ʳ��ϥ���ǥå�������Ǥ��ޤ���"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] �ϺǸ�Ǥʤ���Ф����ޤ���"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] �ˤϥꥹ�ȷ����ͤ�ɬ�פǤ�"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: �ꥹ�ȷ��ѿ��˥������åȤ���¿�����Ǥ�����ޤ�"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: �ꥹ�ȷ��ѿ��˽�ʬ�ʿ������Ǥ�����ޤ���"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for �θ�� \"in\" ������ޤ���"
 
-#: eval.c:1320
+#: ../eval.c:2721
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: ���å� '(' ������ޤ���: %s"
 
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �����ѿ��Ϥ���ޤ���: \"%s\""
 
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (�����)���å�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
+
+#: ../eval.c:3336
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' �θ�� ':' ������ޤ���"
 
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: �ꥹ�ȷ��ϥꥹ�ȷ��Ȥ�����ӤǤ��ޤ���"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: �ꥹ�ȷ��ˤ�̵�������Ǥ�"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ���񷿤ϼ��񷿤Ȥ�����ӤǤ��ޤ���"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ���񷿤ˤ�̵�������Ǥ�"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: �ؿ����ȷ��ϴؿ����ȷ��Ȥ�����ӤǤ��ޤ���"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �ؿ����ȷ��ˤ�̵�������Ǥ�"
+
+#: ../eval.c:4086
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ���ߤĤ���ޤ���"
 
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' ���ߤĤ���ޤ���"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: �ؿ����ȷ��ϥ���ǥå����Ǥ��ޤ���"
 
-#: eval.c:2466
+#: ../eval.c:4432
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ���ץ����̾������ޤ���: %s"
 
-#: eval.c:2484
+#: ../eval.c:4450
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ̤�ΤΥ��ץ����Ǥ�: %s"
 
-#: eval.c:2555
+#: ../eval.c:4516
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ������ (\") ������ޤ���: %s"
 
-#: eval.c:2698
+#: ../eval.c:4652
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ������ (') ������ޤ���: %s"
 
-#: eval.c:3054
+#: ../eval.c:4731
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �ؿ� %s �ˤ�̵���ʰ����Ǥ�"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
 
-#: eval.c:3083
+#: ../eval.c:4739
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
 
-#: eval.c:3084
+#: ../eval.c:5768
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �ؿ��ΰ�����¿�����ޤ�: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: ���񷿤˽�ʣ���������󤶤����ޤ�"
 
-#: eval.c:3085
+#: ../eval.c:5811
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ؿ��ΰ�������ޤ���: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
 
-#: eval.c:3086
+#: ../eval.c:5819
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: ɽ������ˤ��ѿ�������Ҥ����᤮�ޤ�"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: ��¿�᤮�ޤ�"
 
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s �Ȥ��������ϴ���¸�ߤ��ޤ�"
+
+#: ../eval.c:8339
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld ��:"
 
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
+
+#: ../eval.c:9966
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
 "����(&O)\n"
 "����󥻥�(&C)"
 
-#: eval.c:5517
+#: ../eval.c:10005
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() �� inputsave() ����¿���ƤФ�ޤ���"
 
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ����ܥ�å���󥯤�¿�᤮�ޤ� (�۴Ĥ��Ƥ����ǽ��������ޤ�)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
 
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<��>"
+
+#: ../eval.c:11287
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim �����Фؤ���³������ޤ���"
 
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
+
+#: ../eval.c:11465
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �����Фα���������ޤ���"
 
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ����ܥ�å���󥯤�¿�᤮�ޤ� (�۴Ĥ��Ƥ����ǽ��������ޤ�)"
+
+#: ../eval.c:12144
 msgid "E258: Unable to send to client"
 msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
 
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
 
-#: eval.c:6882
+#: ../eval.c:12670
 msgid "(Invalid)"
 msgstr "(̵��)"
 
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: ����ե���������˥��顼��ȯ�����ޤ���"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: �ؿ����ȷ�����ͤȤ��ư��äƤ��ޤ���"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: �ꥹ�ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �ѿ�����ʸ����Ȥ��ư��äƤ��ޤ�"
+
+#: ../eval.c:14826
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ̤������ѿ��Ǥ�: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: �ؿ����ȷ��ѿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: �ѿ�̾����¸�δؿ�̾�Ⱦ��ͤ��ޤ�: %s"
 
-#: eval.c:8492
+#: ../eval.c:14840
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �������ѿ�̾�Ǥ�: %s"
 
-#: eval.c:8784
+#: ../eval.c:14857
 #, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: �ѿ��η������פ��ޤ���: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: �ͤ����å�����Ƥ��ޤ�: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "����"
 
-#: eval.c:8857
+#: ../eval.c:14952
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤����δؿ��Ǥ�: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ���ͤ��ѹ��Ǥ��ޤ���"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ���ԡ�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: eval.c:8870
+#: ../eval.c:15458
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ������ޤ���: %s"
 
-#: eval.c:8903
+#: ../eval.c:15491
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: �����ʰ����Ǥ�: %s"
 
-#: eval.c:8982
+#: ../eval.c:15579
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ������ޤ���"
 
-#: eval.c:9089
+#: ../eval.c:15765
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
 
-#: eval.c:9159
+#: ../eval.c:15878
 msgid "E129: Function name required"
 msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
 
-#: eval.c:9210
+#: ../eval.c:15963
 #, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: �ؿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: �ؿ�̾����ʸ���ǻϤޤ뤫�������ޤޤʤ���Фʤ�ޤ���: %s"
 
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: ̤����δؿ��Ǥ�: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
 
-#: eval.c:9455
+#: ../eval.c:16561
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
 #, c-format
 msgid "calling %s"
 msgstr "%s ��¹���Ǥ�"
 
-#: eval.c:9570
+#: ../eval.c:16785
 #, c-format
 msgid "%s aborted"
 msgstr "%s �����Ǥ���ޤ���"
 
-#: eval.c:9572
+#: ../eval.c:16787
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s �� #%ld ���֤��ޤ���"
 
-#: eval.c:9579
+#: ../eval.c:16797
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s �� \"%s\" ���֤��ޤ���"
+msgid "%s returning %s"
+msgstr "%s �� %s ���֤��ޤ���"
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
 #, c-format
 msgid "continuing in %s"
 msgstr "%s �μ¹Ԥ��³��Ǥ�"
 
-#: eval.c:9621
+#: ../eval.c:16866
 msgid "E133: :return not inside a function"
 msgstr "E133: �ؿ����� :return ������ޤ���"
 
-#: eval.c:9952
+#: ../eval.c:17266
 msgid ""
 "\n"
 "# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
 "\n"
 "# �������Х��ѿ�:\n"
 
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16�ʿ� %02x,  8�ʿ� %03o"
 
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16�ʿ� %04x, 8�ʿ� %o"
 
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�ʿ� %08x, 8�ʿ� %o"
 
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: �Ԥ򤽤켫�Ȥˤϰ�ư�Ǥ��ޤ���"
 
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
 msgid "1 line moved"
 msgstr "1 �Ԥ���ư����ޤ���"
 
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld �Ԥ���ư����ޤ���"
 
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld �Ԥ��ե��륿��������ޤ���"
 
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *�ե��륿* autocommand�ϸ��ߤΥХåե����ѹ����ƤϤ����ޤ���"
 
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
 msgid "[No write since last change]\n"
 msgstr "[�Ǹ���ѹ�����¸����Ƥ��ޤ���]\n"
 
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s ����: "
 
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: ���顼��¿�᤮��Τ�, �ʹߤϥ����åפ��ޤ�"
 
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfo�ե����� \"%s\"%s%s%s ���ɹ����� "
 
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
 msgid " info"
 msgstr " ����"
 
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
 msgid " marks"
 msgstr " �ޡ���"
 
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
 msgid " FAILED"
 msgstr " ����"
 
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfo�ե����뤬����ߤǤ��ޤ���: %s"
 
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�ե����� %s ����¸�Ǥ��ޤ���!"
 
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfo�ե����� \"%s\" ��������"
 
 #. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ���� viminfo �ե������ Vim %s �ˤ�ä���������ޤ���.\n"
 
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -708,47 +935,47 @@ msgstr ""
 "# �ѹ�����ݤˤϽ�ʬ���դ��Ƥ�������!\n"
 "\n"
 
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# ���Υե����뤬�񤫤줿���� 'encoding' ����\n"
 
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
 msgid "Illegal starting char"
 msgstr "��������Ƭʸ���Ǥ�"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
 msgid "Save As"
 msgstr "��̾����¸"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Ʊ��̾���Υե����뤬¾�ΥХåե����ɹ��ޤ�Ƥ��ޤ�"
 
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
 msgid "Write partial file?"
 msgstr "�ե��������ʬŪ����¸���ޤ���?"
 
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: �Хåե�����ʬŪ����¸����ˤ� ! ��ȤäƤ�������"
 
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "��¸�Υե����� \"%.*s\" ���񤭤��ޤ���?"
 
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: �Хåե� %ld �ˤ�̾��������ޤ���"
 
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: �ե��������¸����ޤ���Ǥ���: 'write' ���ץ����ˤ��̵���Ǥ�"
 
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
 "\"%.*s\" �ˤ� 'readonly' ���ץ�������ꤵ��Ƥ��ޤ�\n"
 "����Ū�˾�񤭤��ޤ���?"
 
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
 msgid "Edit File"
 msgstr "�ե�������Խ�"
 
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommand��ͽ�������������Хåե� %s �������ޤ���"
 
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ���ǤϤʤ������� :z ���Ϥ���ޤ���"
 
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim�Ǥϥ����륳�ޥ�ɤ�Ȥ��ޤ���"
 
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ����ɽ����ʸ���Ƕ��ڤ뤳�Ȥ��Ǥ��ޤ���"
 
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
 msgid "(Interrupted) "
 msgstr "(����ޤ�ޤ���)"
 
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 �ս곺�����ޤ���"
+
+#: ../ex_cmds.c:4547
 msgid "1 substitution"
 msgstr "1 �ս��ִ����ޤ���"
 
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld �ս곺�����ޤ���"
+
+#: ../ex_cmds.c:4550
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld �ս��ִ����ޤ���"
 
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
 msgid " on 1 line"
 msgstr " (�� 1 ����)"
 
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
 #, c-format
 msgid " on %ld lines"
 msgstr " (�� %ld ����)"
 
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ��Ƶ�Ū�ˤϻȤ��ޤ���"
 
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global���ޥ�ɤ�����ɽ�������ꤵ��Ƥ��ޤ���"
 
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "�ѥ��������ƤιԤǤߤĤ���ޤ���: %s"
 
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
 "# �Ǹ���ִ����줿ʸ����:\n"
 "$"
 
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
 msgid "E478: Don't panic!"
 msgstr "E478: ���Ƥʤ��Ǥ�������"
 
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: ��ǰ�Ǥ��� '%s' �Υإ�פ� %s �ˤϤ���ޤ���"
 
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: ��ǰ�Ǥ��� %s �ˤϥإ�פ�����ޤ���"
 
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" ���ߤĤ���ޤ���"
 
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
 
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: ������Ѥ� %s �򳫤��ޤ���"
 
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �ɹ��Ѥ� %s �򳫤��ޤ���"
 
 # Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1�Ĥθ���Υإ�ץե������ʣ���Υ��󥳡��ɤ����ߤ��Ƥ��ޤ�: %s"
 
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
 #, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ���� \"%s\" ���ե����� %s �˽�ʣ���Ƥ��ޤ�"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: ���� \"%s\" ���ե����� %s/%s �˽�ʣ���Ƥ��ޤ�"
 
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤�Τ�sign���ޥ�ɤǤ�: %s"
 
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
 msgid "E156: Missing sign name"
 msgstr "E156: sign̾������ޤ���"
 
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
 msgid "E612: Too many signs defined"
 msgstr "E612: sign�������¿�����Ĥ���ޤ���"
 
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ̵����sign�Υƥ����ȤǤ�: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ̤�Τ�sign�Ǥ�: %s"
 
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
 msgid "E159: Missing sign number"
 msgstr "E159: sign���ֹ椬����ޤ���"
 
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵���ʥХåե�̾�Ǥ�: %s"
 
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ̵����sign���̻ҤǤ�: %ld"
 
 # Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
 msgid " (NOT FOUND)"
 msgstr "  (�ߤĤ���ޤ���)"
 
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
 msgid " (not supported)"
 msgstr " (�󥵥ݡ���)"
 
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
 msgid "[Deleted]"
 msgstr "[�����]"
 
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
 #, c-format
 msgid "line %ld: %s"
 msgstr "�� %ld: %s"
 
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
 #, c-format
 msgid "cmd: %s"
 msgstr "���ޥ��: %s"
 
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "�֥졼���ݥ���� \"%s%s\" �� %ld"
 
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �֥졼���ݥ���Ȥ��ߤĤ���ޤ���: %s"
 
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
 msgid "No breakpoints defined"
 msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
 
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  �� %ld"
 
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ���� :profile start <fname> ��¹Ԥ��Ƥ�������"
+
+#: ../ex_cmds2.c:1305
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "�ѹ��� \"%.*s\" ����¸���ޤ���?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
 msgid "Untitled"
 msgstr "̵��"
 
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: �Хåե� \"%s\" ���ѹ�����¸����Ƥ��ޤ���"
 
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "�ٹ�: ͽ������¾�Хåե��ذ�ư���ޤ��� (autocommands ��Ĵ�٤Ƥ�������)"
 
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
 msgid "E163: There is only one file to edit"
 msgstr "E163: �Խ�����ե������1�Ĥ�������ޤ���"
 
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
 msgid "E164: Cannot go before first file"
 msgstr "E164: �ǽ�Υե����������ˤϹԤ��ޤ���"
 
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �Ǹ�Υե������ۤ��Ƹ�ˤϹԤ��ޤ���"
 
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ���Υ���ѥ���ˤ��б����Ƥ��ޤ���: %s"
 
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" �� \"%s\" ���鸡����"
 
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" �򸡺���"
 
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "'runtimepath' ����ˤϤߤĤ���ޤ���: \"%s\""
 
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
 msgid "Source Vim script"
 msgstr "Vim������ץȤμ����"
 
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�ǥ��쥯�ȥ�ϼ����ޤ���: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" ������ޤ���"
 
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "�� %ld: \"%s\" ������ޤ���"
 
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" ������"
 
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "�� %ld: %s ������"
 
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s �μ����λ"
 
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �ٹ�: �Զ��ڤ������Ǥ�. ^M ���ʤ��ΤǤ��礦"
 
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
 #, c-format
 msgid "Page %d"
 msgstr "%d �ڡ���"
 
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
 msgid "No text to be printed"
 msgstr "��������ƥ����Ȥ�����ޤ���"
 
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
 msgid "Printing page %d (%d%%)"
 msgstr "������: �ڡ��� %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
 #, c-format
 msgid " Copy %d of %d"
 msgstr " ���ԡ� %d (�� %d ��)"
 
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
 #, c-format
 msgid "Printed: %s"
 msgstr "�������ޤ���: %s"
 
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
 msgid "Printing aborted"
 msgstr "��������ߤ���ޤ���"
 
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript���ϥե�����ν���ߥ��顼�Ǥ�"
 
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScript�Υ꥽�����ե����� \"%s\" ���ɹ���ޤ���"
 
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: �ե����� \"%s\" �� PostScript �꥽�����ե�����ǤϤ���ޤ���"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: �ե����� \"%s\" ���б����Ƥ��ʤ� PostScript �꥽�����ե�����Ǥ�"
 
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: �꥽�����ե����� \"%s\" �ϥС�����󤬰ۤʤ�ޤ�"
 
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: �ߴ�����̵���ޥ���Х��ȥ��󥳡��ǥ��󥰤�ʸ�����åȤǤ�"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: �ޥ���Х��ȥ��󥳡��ǥ��󥰤Ǥ� printmbcharset ����ˤǤ��ޤ���"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: �ޥ���Х���ʸ����������뤿��Υǥե���ȥե���Ȥ����ꤵ��Ƥ��ޤ���"
+
+#: ../ex_cmds2.c:6175
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript�����ѤΥե�����򳫤��ޤ���"
 
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"prolog.ps\" ���ߤĤ���ޤ���"
 
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScript�Υ꥽�����ե����� \"cidfont.ps\" ���ߤĤ���ޤ���"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"%s.ps\" ���ߤĤ���ޤ���"
 
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
 #, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: �ޥ���Х���ʸ���򥨥󥳡��� \"%s\" ���Ѵ��Ǥ��ޤ���"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: �������󥳡��� \"%s\" ���Ѵ��Ǥ��ޤ���"
 
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
 msgid "Sending to printer..."
 msgstr "�ץ�󥿤�������..."
 
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript�ե�����ΰ����˼��Ԥ��ޤ���"
 
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
 msgid "Print job sent."
 msgstr "��������֤��������ޤ���."
 
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "���ߤ� %s����: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ����� \"%s\" ������Ǥ��ޤ���"
 
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex�⡼�ɤ�����ޤ�. �Ρ��ޥ�����ˤ�\"visual\"�����Ϥ��Ƥ�������."
 
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
 msgid "E501: At end-of-file"
 msgstr "E501: �ե�����ν�λ����"
 
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
 msgid "E169: Command too recursive"
 msgstr "E169: ���ޥ�ɤ��Ƶ�Ū�᤮�ޤ�"
 
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: �㳰����ª����ޤ���Ǥ���: %s"
 
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
 msgid "End of sourced file"
 msgstr "����ե�����κǸ�Ǥ�"
 
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
 msgid "End of function"
 msgstr "�ؿ��κǸ�Ǥ�"
 
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: �桼��������ޥ�ɤΤ����ޤ��ʻ��ѤǤ�"
 
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
 msgid "E492: Not an editor command"
 msgstr "E492: ���ǥ����Υ��ޥ�ɤǤϤ���ޤ���"
 
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
 msgid "E493: Backwards range given"
 msgstr "E493: �դ��ޤ��ϰϤ����ꤵ��ޤ���"
 
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
 msgid "Backwards range given, OK to swap"
 msgstr "�դ��ޤ��ϰϤ����ꤵ��ޤ���, ���ؤ��ޤ���?"
 
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
 msgid "E494: Use w or w>>"
 msgstr "E494: w �⤷���� w>> ����Ѥ��Ƥ�������"
 
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���ΥС������ǤϤ��Υ��ޥ�ɤ����ѤǤ��ޤ���, �����ʤ���"
 
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
 msgid "E172: Only one file name allowed"
 msgstr "E172: �ե�����̾�� 1 �Ĥˤ��Ƥ�������"
 
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬 1 �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬���� %d �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
 msgid "E173: 1 more file to edit"
 msgstr "E173: �Խ����٤��ե����뤬 1 �Ĥ���ޤ�"
 
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: �Խ����٤��ե����뤬���� %ld �Ĥ���ޤ�"
 
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������"
 
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
 "\n"
 "    ̾��        ���� �ϰ�  �䴰      ���"
 
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
 msgid "No user-defined commands found"
 msgstr "�桼��������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
 
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
 msgid "E175: No attribute specified"
 msgstr "E175: °�����������Ƥ��ޤ���"
 
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
 msgid "E176: Invalid number of arguments"
 msgstr "E176: �����ο���̵���Ǥ�"
 
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: ������Ȥ�2�Ż��ꤹ�뤳�ȤϤǤ��ޤ���"
 
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
 msgid "E178: Invalid default value for count"
 msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
 
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
 msgid "E179: argument required for complete"
 msgstr "E179: �䴰�Τ���ΰ�����ɬ�פǤ�"
 
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: ̵�����䴰����Ǥ�: %s"
 
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: �䴰�����ϥ��������䴰�Ǥ������ѤǤ��ޤ���"
 
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: ���������䴰�ˤϰ����Ȥ��ƴؿ���ɬ�פǤ�"
 
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ̵����°���Ǥ�: %s"
 
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
 msgid "E182: Invalid command name"
 msgstr "E182: ̵���ʥ��ޥ��̾�Ǥ�"
 
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: �桼��������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
 
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: ���Υ桼��������ޥ�ɤϤ���ޤ���: %s"
 
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: ���顼�������� %s ���ߤĤ���ޤ���"
 
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
 msgid "Greetings, Vim user!"
 msgstr "Vim �Ȥ����󡢤䤢!"
 
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
 msgid "Edit File in new window"
 msgstr "������������ɥ��ǥե�������Խ����ޤ�"
 
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
 msgid "No swap file"
 msgstr "����åץե����뤬����ޤ���"
 
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
 msgid "Append File"
 msgstr "�ɲåե�����"
 
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: �Хåե�����������Ƥ���Τ�, �ǥ��쥯�ȥ���ѹ��Ǥ��ޤ��� (! "
+"���ɲäǾ��)"
+
+#: ../ex_docmd.c:7248
 msgid "E186: No previous directory"
 msgstr "E186: ���Υǥ��쥯�ȥ�Ϥ���ޤ���"
 
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
 msgid "E187: Unknown"
 msgstr "E187: ̤��"
 
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: "
 
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "������ɥ�����: X %d, Y %d"
 
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: ���Υץ�åȥۡ���ˤϥ�����ɥ����֤μ�����ǽ�ϼ�������Ƥ��ޤ���"
 
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
 msgid "Save Redirection"
 msgstr "������쥯�Ȥ���¸���ޤ�"
 
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
 msgid "Save View"
 msgstr "�ӥ塼����¸���ޤ�"
 
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
 msgid "Save Session"
 msgstr "���å����������¸���ޤ�"
 
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
 msgid "Save Setup"
 msgstr "�������¸���ޤ�"
 
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: �ǥ��쥯�ȥ������Ǥ��ޤ���: %s"
+
+#: ../ex_docmd.c:8185
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ��¸�ߤ��ޤ� (��񤹤�ˤ� ! ���ɲä��Ƥ�������)"
 
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" �������ѤȤ��Ƴ����ޤ���"
 
 #. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: ������ʸ��������/���९�����ȤǤ��ʤ���Ф����ޤ���"
 
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �κƵ����Ѥ������ʤꤹ���ޤ���"
+msgstr "E192: :normal �κƵ����Ѥ������ʤ�᤮�ޤ���"
 
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'���֤����������ե������̾��������ޤ���"
 
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"���֤�������autocommand�Υե�����̾������ޤ���"
 
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"���֤�������autocommand�Хåե��ֹ椬����ޤ���"
 
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"���֤�������autocommand�γ���̾������ޤ���"
 
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"���֤������� :source �оݥե�����̾������ޤ���"
 
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' �� '#' ��̵̾�ե�����ʤΤ� \":p:h\" ��ȼ��ʤ��Ȥ����ϤǤ��ޤ���"
 
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ��ʸ����Ȥ���ɾ������ޤ���"
 
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo�ե�������ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
 msgid "E196: No digraphs in this version"
 msgstr "E196: ���ΥС������˹���Ϥ���ޤ���"
 
-#: ex_eval.c:440
+#: ../ex_eval.c:439
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' �ǻϤޤ��㳰�� :throw �Ǥ��ޤ���"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "�㳰��ȯ�����ޤ���: %s"
 
-#: ex_eval.c:576
+#: ../ex_eval.c:575
 #, c-format
 msgid "Exception finished: %s"
 msgstr "�㳰����«���ޤ���: %s"
 
-#: ex_eval.c:577
+#: ../ex_eval.c:576
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "�㳰���˴�����ޤ���: %s"
 
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, �� %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
 #, c-format
 msgid "Exception caught: %s"
 msgstr "�㳰����ª����ޤ���: %s"
 
-#: ex_eval.c:713
+#: ../ex_eval.c:712
 #, c-format
 msgid "%s made pending"
 msgstr "%s �ˤ��̤������֤������ޤ���"
 
-#: ex_eval.c:716
+#: ../ex_eval.c:715
 #, c-format
 msgid "%s resumed"
 msgstr "%s ���Ƴ����ޤ���"
 
-#: ex_eval.c:720
+#: ../ex_eval.c:719
 #, c-format
 msgid "%s discarded"
 msgstr "%s ���˴�����ޤ���"
 
-#: ex_eval.c:746
+#: ../ex_eval.c:745
 msgid "Exception"
 msgstr "�㳰"
 
-#: ex_eval.c:752
+#: ../ex_eval.c:751
 msgid "Error and interrupt"
 msgstr "���顼�ȳ����"
 
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
 msgid "Error"
 msgstr "���顼"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
 msgid "Interrupt"
 msgstr "�����"
 
-#: ex_eval.c:830
+#: ../ex_eval.c:829
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if ������Ҥ����᤮�ޤ�"
 
-#: ex_eval.c:867
+#: ../ex_eval.c:866
 msgid "E580: :endif without :if"
 msgstr "E580: :if �Τʤ� :endif ������ޤ�"
 
-#: ex_eval.c:911
+#: ../ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :if �Τʤ� :else ������ޤ�"
 
-#: ex_eval.c:914
+#: ../ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :if �Τʤ� :elseif ������ޤ�"
 
-#: ex_eval.c:921
+#: ../ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: ʣ���� :else ������ޤ�"
 
-#: ex_eval.c:924
+#: ../ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :else �θ�� :elseif ������ޤ�"
 
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while ������Ҥ������᤮�ޤ�"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while �� :for ������Ҥ����᤮�ޤ�"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while �� :for �Τʤ� :continue ������ޤ�"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while �� :for �Τʤ� :break ������ޤ�"
 
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while �Τʤ� :continue ������ޤ�"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor �� :while ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while �Τʤ� :break ������ޤ�"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile �� :for ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try ������Ҥ����᤮�ޤ�"
 
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
 msgid "E603: :catch without :try"
 msgstr "E603: :try �Τʤ� :catch ������ޤ�"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally �θ�� :catch ������ޤ�"
 
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
 msgid "E606: :finally without :try"
 msgstr "E606: :try �Τʤ� :finally ������ޤ�"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
 msgid "E607: multiple :finally"
 msgstr "E607: ʣ���� :finalyy ������ޤ�"
 
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
 msgid "E602: :endtry without :try"
 msgstr "E602: :try �Τʤ� :endtry �Ǥ�"
 
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �ؿ��γ��� :endfunction ������ޤ���"
 
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
 msgid "tagname"
 msgstr "����̾"
 
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
 msgid " kind file\n"
 msgstr " �ե��������\n"
 
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
 msgid "'history' option is zero"
 msgstr "���ץ���� 'history' �������Ǥ�"
 
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
 #, c-format
 msgid ""
 "\n"
@@ -1563,259 +1839,263 @@ msgstr ""
 "\n"
 "# %s ���ܤ����� (��������Τ���Ť���Τ�):\n"
 
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
 msgid "Command Line"
 msgstr "���ޥ�ɥ饤��"
 
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
 msgid "Search String"
 msgstr "����ʸ����"
 
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
 msgid "Expression"
 msgstr "��"
 
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
 msgid "Input Line"
 msgstr "���Ϲ�"
 
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar �����ޥ��Ĺ��Ķ���ޤ���"
 
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: �����ƥ��֤ʥ�����ɥ����Хåե����������ޤ���"
 
-#: fileio.c:371
+#: ../fileio.c:374
 msgid "Illegal file name"
 msgstr "�����ʥե�����̾"
 
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
 msgid "is a directory"
 msgstr " �ϥǥ��쥯�ȥ�Ǥ�"
 
-#: fileio.c:397
+#: ../fileio.c:401
 msgid "is not a file"
 msgstr " �ϥե�����ǤϤ���ޤ���"
 
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
 msgid "[New File]"
 msgstr "[���ե�����]"
 
-#: fileio.c:584
+#: ../fileio.c:594
 msgid "[Permission Denied]"
 msgstr "[ǧ�Ĥ�����ޤ���]"
 
-#: fileio.c:688
+#: ../fileio.c:705
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand ���ե�������ɹ��ԲĤˤ��ޤ���"
 
-#: fileio.c:690
+#: ../fileio.c:707
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand �ϸ��ߤΥХåե����Ѥ����ޤ���"
 
-#: fileio.c:711
+#: ../fileio.c:728
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: ɸ�����Ϥ����ɹ���...\n"
 
-#: fileio.c:717
+#: ../fileio.c:734
 msgid "Reading from stdin..."
 msgstr "ɸ�����Ϥ����ɹ�����..."
 
 #. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �Ѵ����ե�������ɹ��ԲĤˤ��ޤ���"
 
-#: fileio.c:2027
+#: ../fileio.c:2084
 msgid "[fifo/socket]"
 msgstr "[FIFO/�����å�]"
 
-#: fileio.c:2034
+#: ../fileio.c:2091
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#: fileio.c:2041
+#: ../fileio.c:2098
 msgid "[socket]"
 msgstr "[�����å�]"
 
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
 msgid "[RO]"
 msgstr "[����]"
 
-#: fileio.c:2059
+#: ../fileio.c:2116
 msgid "[CR missing]"
 msgstr "[CR̵]"
 
-#: fileio.c:2064
+#: ../fileio.c:2121
 msgid "[NL found]"
 msgstr "[NLͭ]"
 
-#: fileio.c:2069
+#: ../fileio.c:2126
 msgid "[long lines split]"
 msgstr "[Ĺ��ʬ��]"
 
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
 msgid "[NOT converted]"
 msgstr "[̤�Ѵ�]"
 
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
 msgid "[converted]"
 msgstr "[�Ѵ���]"
 
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
 msgid "[crypted]"
 msgstr "[�Ź沽]"
 
-#: fileio.c:2094
+#: ../fileio.c:2151
 msgid "[CONVERSION ERROR]"
 msgstr "[�Ѵ����顼]"
 
-#: fileio.c:2100
+#: ../fileio.c:2157
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[%ld ���ܤ������ʥХ���]"
 
-#: fileio.c:2107
+#: ../fileio.c:2164
 msgid "[READ ERRORS]"
 msgstr "[�ɹ����顼]"
 
-#: fileio.c:2323
+#: ../fileio.c:2380
 msgid "Can't find temp file for conversion"
 msgstr "�Ѵ���ɬ�פʰ���ե����뤬�ߤĤ���ޤ���"
 
-#: fileio.c:2330
+#: ../fileio.c:2387
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' �ˤ���Ѵ������Ԥ��ޤ���"
 
-#: fileio.c:2333
+#: ../fileio.c:2390
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' �ν��Ϥ��ɹ���ޤ���Ǥ���"
 
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwrite�Хåե��γ�������autocommand��¸�ߤ��ޤ���"
+
+#: ../fileio.c:2821
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: ��¸����Хåե���autocommand��������������ޤ���"
 
-#: fileio.c:2756
+#: ../fileio.c:2844
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommand��ͽ��������ˡ�ǹԿ����ѹ����ޤ���"
 
 # Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
 msgid "NetBeans dissallows writes of unmodified buffers"
 msgstr "NetBeans��̤�ѹ��ΥХåե����񤹤뤳�Ȥϵ��Ĥ��Ƥ��ޤ���"
 
-#: fileio.c:2802
+#: ../fileio.c:2892
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans�Хåե��ΰ�����񤭽Ф����ȤϤǤ��ޤ���"
 
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
 msgid "is not a file or writable device"
 msgstr "�ϥե�����Ǥ����߲�ǽ�ǥХ����Ǥ⤢��ޤ���"
 
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
 msgid "is read-only (add ! to override)"
 msgstr "���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
 
-#: fileio.c:3272
+#: ../fileio.c:3362
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �Хå����åץե��������¸�Ǥ��ޤ��� (! ���ɲäǶ�����¸)"
 
-#: fileio.c:3284
+#: ../fileio.c:3374
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: �Хå����åץե�������Ĥ���ݤ˥��顼��ȯ�����ޤ��� (! ���ɲäǶ���)"
 
-#: fileio.c:3286
+#: ../fileio.c:3376
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �Хå����å��ѥե�������ɹ���ޤ��� (! ���ɲäǶ����ɹ�)"
 
-#: fileio.c:3302
+#: ../fileio.c:3392
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#: fileio.c:3405
+#: ../fileio.c:3495
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#: fileio.c:3467
+#: ../fileio.c:3557
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
 
-#: fileio.c:3566
+#: ../fileio.c:3667
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ��¸�Ѱ���ե����뤬�ߤĤ���ޤ���"
 
-#: fileio.c:3584
+#: ../fileio.c:3685
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �Ѵ��Ǥ��ޤ��� (! ���ɲä��Ѵ���������¸)"
 
-#: fileio.c:3619
+#: ../fileio.c:3720
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: ��󥯤��줿�ե�����˽����ޤ���"
 
-#: fileio.c:3623
+#: ../fileio.c:3724
 msgid "E212: Can't open file for writing"
 msgstr "E212: ������Ѥ˥ե�����򳫤��ޤ���"
 
-#: fileio.c:3885
+#: ../fileio.c:4000
 msgid "E667: Fsync failed"
 msgstr "E667: fsync �˼��Ԥ��ޤ���"
 
-#: fileio.c:3892
+#: ../fileio.c:4007
 msgid "E512: Close failed"
 msgstr "E512: �Ĥ��뤳�Ȥ˼���"
 
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: ����ߥ��顼, �Ѵ�����"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: ����ߥ��顼, �Ѵ����� (��񤹤�ˤ� 'fenc' ����ˤ��Ƥ�������)"
 
-#: fileio.c:3969
+#: ../fileio.c:4084
 msgid "E514: write error (file system full?)"
 msgstr "E514: ����ߥ��顼, (�ե����륷���ƥब����?)"
 
-#: fileio.c:4036
+#: ../fileio.c:4151
 msgid " CONVERSION ERROR"
 msgstr " �Ѵ����顼"
 
-#: fileio.c:4052
+#: ../fileio.c:4167
 msgid "[Device]"
 msgstr "[�ǥХ���]"
 
-#: fileio.c:4057
+#: ../fileio.c:4172
 msgid "[New]"
 msgstr "[��]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " [a]"
 msgstr " [a]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " appended"
 msgstr " �ɲ�"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " [w]"
 msgstr " [w]"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " written"
 msgstr " �����"
 
-#: fileio.c:4131
+#: ../fileio.c:4249
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: ���ܥե��������¸�Ǥ��ޤ���"
 
-#: fileio.c:4153
+#: ../fileio.c:4271
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: ���θ��ܥե������touch�Ǥ��ޤ���"
 
-#: fileio.c:4168
+#: ../fileio.c:4286
 msgid "E207: Can't delete backup file"
 msgstr "E207: �Хå����åץե������ä��ޤ���"
 
-#: fileio.c:4232
+#: ../fileio.c:4350
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
 "\n"
 "�ٹ�: ���ܥե����뤬����줿���ѹ�����ޤ���\n"
 
-#: fileio.c:4234
+#: ../fileio.c:4352
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�ե��������¸����������ޤǥ��ǥ�����λ���ʤ��Ǥ�������!"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos format]"
 msgstr "[dos�ե����ޥå�]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac format]"
 msgstr "[mac�ե����ޥå�]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix format]"
 msgstr "[unix�ե����ޥå�]"
 
-#: fileio.c:4364
+#: ../fileio.c:4482
 msgid "1 line, "
 msgstr "1 ��, "
 
-#: fileio.c:4366
+#: ../fileio.c:4484
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld ��, "
 
-#: fileio.c:4369
+#: ../fileio.c:4487
 msgid "1 character"
 msgstr "1 ʸ��"
 
-#: fileio.c:4371
+#: ../fileio.c:4489
 #, c-format
 msgid "%ld characters"
 msgstr "%ld ʸ��"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[Incomplete last line]"
 msgstr "[�ǽ��Ԥ��Դ���]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4400
+#: ../fileio.c:4518
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "�ٹ�: �ɹ������˥ե�������ѹ�������ޤ���!!!"
 
-#: fileio.c:4402
+#: ../fileio.c:4520
 msgid "Do you really want to write to it"
 msgstr "�����˾�񤭤��ޤ���"
 
-#: fileio.c:5566
+#: ../fileio.c:5746
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" ��������Υ��顼�Ǥ�"
 
-#: fileio.c:5573
+#: ../fileio.c:5753
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" ���Ĥ�����˥��顼�Ǥ�"
 
-#: fileio.c:5576
+#: ../fileio.c:5756
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" ���ɹ���Υ��顼�Ǥ�"
 
-#: fileio.c:5810
+#: ../fileio.c:5993
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand �� FileChangedShell ���Хåե��������ޤ���"
 
-#: fileio.c:5817
+#: ../fileio.c:6000
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: �ٹ�: �ե����� \"%s\" �ϴ���¸�ߤ��ޤ���"
 
-#: fileio.c:5831
+#: ../fileio.c:6014
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: �ٹ�: �ե����� \"%s\" ���ѹ�����Vim�ΥХåե����ѹ�����ޤ���"
 
-#: fileio.c:5834
+#: ../fileio.c:6017
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: �ٹ�: �ե����� \"%s\" ���Խ����ϸ���ѹ�����ޤ���"
 
-#: fileio.c:5836
+#: ../fileio.c:6019
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: �ٹ�: �ե����� \"%s\" �Υ⡼�ɤ��Խ����ϸ���ѹ�����ޤ���"
 
-#: fileio.c:5846
+#: ../fileio.c:6029
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: �ٹ�: �ե����� \"%s\" ���Խ����ϸ�˺�������ޤ���"
 
-#: fileio.c:5859
+#: ../fileio.c:6042
 msgid "See \":help W11\" for more info."
 msgstr "�ܺ٤� \":help W11\" �򻲾Ȥ��Ƥ�������"
 
-#: fileio.c:5873
+#: ../fileio.c:6056
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: fileio.c:5874
+#: ../fileio.c:6057
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
 "&OK\n"
 "�ե������ɹ�(&L)"
 
-#: fileio.c:5980
+#: ../fileio.c:6159
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" �������ɤ���������Ǥ��ޤ���Ǥ���"
 
-#: fileio.c:5999
+#: ../fileio.c:6178
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �ϥ�����ɤǤ��ޤ���Ǥ���"
 
-#: fileio.c:6580
+#: ../fileio.c:6773
 msgid "--Deleted--"
 msgstr "--�����--"
 
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <�Хåե�=%d> ����ưŪ�˺������ޤ�"
+
 #. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���Υ��롼�פϤ���ޤ���: \"%s\""
 
-#: fileio.c:6866
+#: ../fileio.c:7090
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �θ��������ʸ��������ޤ���: %s"
 
-#: fileio.c:6878
+#: ../fileio.c:7102
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: ���Τ褦�ʥ��٥�ȤϤ���ޤ���: %s"
 
-#: fileio.c:6880
+#: ../fileio.c:7104
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: ���Τ褦�ʥ��롼�פ⤷���ϥ��٥�ȤϤ���ޤ���: %s"
 
 #. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <�Хåե�=%d>: ̵���ʥХåե��ֹ�Ǥ�"
+
+#: ../fileio.c:7635
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: ���ƤΥ��٥�Ȥ��Ф��Ƥ�autocommand�ϼ¹ԤǤ��ޤ���"
 
-#: fileio.c:7332
+#: ../fileio.c:7658
 msgid "No matching autocommands"
 msgstr "��������autocommand��¸�ߤ��ޤ���"
 
-#: fileio.c:7653
+#: ../fileio.c:7982
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand������Ҥ��������ޤ�"
+msgstr "E218: autocommand������Ҥ����᤮�ޤ�"
 
-#: fileio.c:7928
+#: ../fileio.c:8290
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: fileio.c:7936
+#: ../fileio.c:8298
 #, c-format
 msgid "Executing %s"
 msgstr "%s ��¹Ԥ��Ƥ��ޤ�"
 
 #. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8571
+#: ../fileio.c:8961
 msgid "E219: Missing {."
 msgstr "E219: { ������ޤ���."
 
-#: fileio.c:8573
+#: ../fileio.c:8963
 msgid "E220: Missing }."
 msgstr "E220: } ������ޤ���."
 
-#: fold.c:68
+#: ../fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: �޾��ߤ�����ޤ���"
 
-#: fold.c:593
+#: ../fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�����Ǥ��ޤ���"
 
-#: fold.c:595
+#: ../fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ����Ǥ��ޤ���"
 
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ���"
+
+#: ../getchar.c:249
 msgid "E222: Add to read buffer"
 msgstr "E222: �ɹ��Хåե����ɲ�"
 
-#: getchar.c:2198
+#: ../getchar.c:2234
 msgid "E223: recursive mapping"
 msgstr "E223: �Ƶ�Ū�ޥåԥ�"
 
-#: getchar.c:3077
+#: ../getchar.c:3114
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s �Ȥ����������Х�û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: getchar.c:3080
+#: ../getchar.c:3117
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s �Ȥ����������Х�ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: getchar.c:3212
+#: ../getchar.c:3249
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s �Ȥ���û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: getchar.c:3215
+#: ../getchar.c:3252
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �Ȥ����ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: getchar.c:3279
+#: ../getchar.c:3316
 msgid "No abbreviation found"
 msgstr "û�����ϤϤߤĤ���ޤ���Ǥ���"
 
-#: getchar.c:3281
+#: ../getchar.c:3318
 msgid "No mapping found"
 msgstr "�ޥåԥ󥰤ϤߤĤ���ޤ���Ǥ���"
 
-#: getchar.c:4173
+#: ../getchar.c:4210
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �����ʥ⡼��"
 
-#: gui.c:220
+#: ../gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUI�򳫻ϤǤ��ޤ���"
 
-#: gui.c:349
+#: ../gui.c:355
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: gui.c:472
+#: ../gui.c:478
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: ͭ���ʥե���Ȥ����Ĥ���ʤ��Τ�, GUI�򳫻ϤǤ��ޤ���"
 
-#: gui.c:477
+#: ../gui.c:483
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 'guifontwide' ��̵���Ǥ�"
 
-#: gui.c:547
+#: ../gui.c:553
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: 'imactivatekey' �����ꤵ�줿�ͤ�̵���Ǥ�"
 
-#: gui.c:4061
+#: ../gui.c:4070
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: %s �ο��������Ƥ��ޤ���"
 
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
+
+#: ../gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<�����ޤ���>"
 
-#: gui_at_fs.c:1136
+#: ../gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: �ե���� %s ������Ǥ��ޤ���"
 
-#: gui_at_fs.c:2781
+#: ../gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: ���ߤΥǥ��쥯�ȥ�����ޤ���"
 
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "�ѥ�̾:"
 
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: ���ߤΥǥ��쥯�ȥ������Ǥ��ޤ���"
 
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
 msgid "OK"
 msgstr "OK"
 
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "����������С�: ����������Ǥ��ޤ���Ǥ���."
 
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
 msgid "Vim dialog"
 msgstr "Vim ����������"
 
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
 
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
 msgid "Vim dialog..."
 msgstr "Vim ����������..."
 
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
 "������(&N)\n"
 "����󥻥�(&C)"
 
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
 msgid "Input _Methods"
 msgstr "����ץåȥ᥽�å�"
 
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
 msgid "VIM - Search and Replace..."
 msgstr "VIM - �������ִ�..."
 
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
 msgid "VIM - Search..."
 msgstr "VIM - ����..."
 
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
 msgid "Find what:"
 msgstr "����ʸ����:"
 
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
 msgid "Replace with:"
 msgstr "�ִ�ʸ����:"
 
 #. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
 msgid "Match whole word only"
 msgstr "���Τ˳��������Τ���"
 
 #. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
 msgid "Match case"
 msgstr "��ʸ��/��ʸ������̤���"
 
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
 msgid "Direction"
 msgstr "����"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
 msgid "Up"
 msgstr "��"
 
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
 msgid "Down"
 msgstr "��"
 
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
 msgid "Find Next"
 msgstr "���򸡺�"
 
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
 msgid "Replace"
 msgstr "�ִ�"
 
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
 msgid "Replace All"
 msgstr "�����ִ�"
 
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
 
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: �ᥤ�󥦥���ɥ����԰դ��˲�����ޤ���\n"
 
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
 msgid "Font Selection"
 msgstr "�ե��������"
 
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "���������ΰ�Τ�����CUT_BUFFER0�����Ѥ���ޤ���"
 
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "�ե��륿"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "�ե��륿(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "����󥻥�(&C)"
 
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
 msgid "Directories"
 msgstr "�ǥ��쥯�ȥ�"
 
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "�إ��"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "�ե��륿"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "�إ��(&H)"
 
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
 msgid "Files"
 msgstr "�ե�����"
 
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
 msgid "Selection"
 msgstr "����"
 
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "����ɥ�"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "���򸡺�(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "�ִ�(&R)"
 
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "�����ִ�(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "����ɥ�(&U)"
+
+#: ../gui_riscos.c:952
 #, c-format
 msgid "E610: Can't load Zap font '%s'"
 msgstr "E610: Zap�ե���� '%s' ���ɹ���ޤ���"
 
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
 #, c-format
 msgid "E611: Can't use font %s"
 msgstr "E611: �ե���� %s ����ѤǤ��ޤ���"
 
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
 "\n"
 "�ҥץ���������ߥ�å�������������Ǥ�.\n"
 
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϤߤĤ���ޤ���"
+
+#: ../gui_w32.c:848
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
 
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
+
+#: ../gui_w48.c:2213
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
 
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
 
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "�Ȥ��ޤ���"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
+
+#: ../gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
 
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: �ʲ���ʸ�����åȤΥե���Ȥ�����ޤ��� %s:"
 
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: �ե���ȥ��å�̾: %s"
 
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "�ե���� '%s' �ϸ������ǤϤ���ޤ���"
 
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: �ե���ȥ��å�̾: %s\n"
 
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
 #, c-format
 msgid "Font0: %s\n"
 msgstr "�ե����0: %s\n"
 
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
 #, c-format
 msgid "Font1: %s\n"
 msgstr "�ե����1: %s\n"
 
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "�ե����%d �������ե����0���ܤǤϤ���ޤ���\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "�ե����%ld �������ե����0��2�ܤǤϤ���ޤ���\n"
 
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "�ե����0����: %ld\n"
 
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
 "�ե����1����: %ld\n"
 "\n"
 
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "̵���ʥե���Ȼ���Ǥ�"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "�Ѳ�����(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "�ޥå������Τ�����ޤ���"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - �ե��������"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "̾��:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "��������ݥ���Ȥ�ɽ������"
+
+# msgid " BLOCK"
+# msgstr " �֥��å�"
+# msgid " LINE"
+# msgstr " ��"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "���󥳡���:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "�ե����:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "��������:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "������:"
+
+#: ../hangulin.c:610
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: �ϥ󥰥륪���ȥޥȥ󥨥顼"
 
-#: if_cscope.c:77
+#: ../if_cscope.c:77
 msgid "Add a new database"
 msgstr "���ǡ����١������ɲ�"
 
-#: if_cscope.c:79
+#: ../if_cscope.c:79
 msgid "Query for a pattern"
 msgstr "�ѥ�����Υ����꡼���ɲ�"
 
-#: if_cscope.c:81
+#: ../if_cscope.c:81
 msgid "Show this message"
 msgstr "���Υ�å�������ɽ������"
 
-#: if_cscope.c:83
+#: ../if_cscope.c:83
 msgid "Kill a connection"
 msgstr "��³��λ����"
 
-#: if_cscope.c:85
+#: ../if_cscope.c:85
 msgid "Reinit all connections"
 msgstr "���Ƥ���³��ƽ��������"
 
-#: if_cscope.c:87
+#: ../if_cscope.c:87
 msgid "Show connections"
 msgstr "��³��ɽ������"
 
-#: if_cscope.c:95
+#: ../if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: ������ˡ: cs[cope] %s"
 
-#: if_cscope.c:124
+#: ../if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "����cscope���ޥ�ɤ�ʬ�䥦����ɥ��Ǥϥ��ݡ��Ȥ���ޤ���.\n"
 
-#: if_cscope.c:175
+#: ../if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: ����ˡ: cstag <ident>"
 
-#: if_cscope.c:231
+#: ../if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �������ߤĤ���ޤ���"
 
-#: if_cscope.c:409
+#: ../if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) ���顼: %d"
 
-#: if_cscope.c:419
+#: ../if_cscope.c:419
 msgid "E563: stat error"
 msgstr "E563: stat ���顼"
 
-#: if_cscope.c:516
+#: ../if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s �ϥǥ��쥯�ȥ�ڤ�ͭ����cscope�Υǡ����١����ǤϤ���ޤ���"
 
-#: if_cscope.c:534
+#: ../if_cscope.c:534
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscope�ǡ����١��� %s ���ɲ�"
 
-#: if_cscope.c:589
+#: ../if_cscope.c:589
 #, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: cscope����³ %ld ���ɹ�����Υ��顼�Ǥ�"
 
-#: if_cscope.c:694
+#: ../if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤�Τ�cscope�������Ǥ�"
 
-#: if_cscope.c:736
+#: ../if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscope�ѥ��פ�����Ǥ��ޤ���Ǥ���"
 
-#: if_cscope.c:753
+#: ../if_cscope.c:753
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope�ε�ư����(fork)�˼��Ԥ��ޤ���"
 
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#: if_cscope.c:898
+#: ../if_cscope.c:898
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscope�ץ�������ư�Ǥ��ޤ���Ǥ���"
 
-#: if_cscope.c:911
+#: ../if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: if_cscope.c:913
+#: ../if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: if_cscope.c:951
+#: ../if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: cscope��³�˼��Ԥ��ޤ���"
 
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscope�����꡼ %s of %s �˳���������ޤ���Ǥ���"
 
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: ̵���� cscopequickfix �ե饰 %c �� %c �Ǥ�"
 
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscope���ޥ��:\n"
 
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
 #, c-format
 msgid "%-5s: %-30s (Usage: %s)"
 msgstr "%-5s: %-30s (����ˡ: %s)"
 
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: cscope�ǡ����١���: %s �򳫤����Ȥ��Ǥ��ޤ���"
 
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
 msgid "E626: cannot get cscope database information"
 msgstr "E626: cscope�ǡ����١����ξ��������Ǥ��ޤ���"
 
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ��ʣ����cscope�ǡ����١������ɲä���ޤ���Ǥ���"
 
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: cscope��³�κ������ã���ޤ���"
 
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope��³ %s ���ߤĤ���ޤ���Ǥ���"
 
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope��³ %s ���Ĥ����ޤ���"
 
 #. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ����̿Ū�ʥ��顼�Ǥ�"
 
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope ����: %s"
 
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
 msgid ""
 "\n"
 "   #   line"
@@ -2507,28 +2894,123 @@ msgstr ""
 "\n"
 "   #   ���ֹ�"
 
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "�ե�����̾ / ʸ̮ / ��\n"
 
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscope���顼: %s"
 
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "���Ƥ�cscope�ǡ����١�����ꥻ�åȤ��ޤ�"
 
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "cscope��³������ޤ���\n"
 
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    �ǡ����١���̾                      prepend �ѥ�\n"
 
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: ���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: MzScheme "
+"�饤�֥�������ɤǤ��ޤ���Ǥ���."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "̵���ʼ��Ǥ�"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "�������ץ����"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "̤�ΤΥ��ץ����Ǥ�"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "�ϰϳ��Υ�����ɥ��ֹ�Ǥ�"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "�Хåե��򳫤��ޤ���"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "����ɥ�������¸�Ǥ��ޤ���"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "�Ԥ�ä��ޤ���"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "�Ԥ��ִ��Ǥ��ޤ���"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "�Ԥ������Ǥ��ޤ���"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim ���顼: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim ���顼"
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "�Хåե���̵���Ǥ�"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "������ɥ���̵���Ǥ�"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ����ɥܥå����Ǥ� Safe "
+"�⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����Ƥ��ޤ�"
+
+#: ../if_python.c:438
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
 "Python�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
 # Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ��Ƶ�Ū�˼¹Ԥ��뤳�ȤϤǤ��ޤ���"
 
-#: if_python.c:701
+#: ../if_python.c:705
 msgid "can't delete OutputObject attributes"
 msgstr "OutputObject°����ä��ޤ���"
 
-#: if_python.c:708
+#: ../if_python.c:712
 msgid "softspace must be an integer"
 msgstr "softspace �� integer �Ǥʤ���Фʤ�ޤ���"
 
-#: if_python.c:716
+#: ../if_python.c:720
 msgid "invalid attribute"
 msgstr "̵����°���Ǥ�"
 
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
 msgid "writelines() requires list of strings"
 msgstr "writelines() �ˤ�ʸ����Υꥹ�Ȥ�ɬ�פǤ�"
 
-#: if_python.c:895
+#: ../if_python.c:899
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/O���֥������Ȥν������˥��顼�Ǥ�"
 
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "̵���ʼ��Ǥ�"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
 msgid "attempt to refer to deleted buffer"
 msgstr "�ä��줿�Хåե������Ȥ���ޤ���"
 
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
 msgid "line number out of range"
 msgstr "�ϰϳ��ι��ֹ�Ǥ�"
 
-#: if_python.c:1362
+#: ../if_python.c:1366
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<�Хåե����֥������� (�õ�Ѥ�) %8lX>"
 
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
 msgid "invalid mark name"
 msgstr "̵���ʥޡ���̾�Ǥ�"
 
-#: if_python.c:1733
+#: ../if_python.c:1737
 msgid "no such buffer"
 msgstr "���Τ褦�ʥХåե��Ϥ���ޤ���"
 
-#: if_python.c:1821
+#: ../if_python.c:1825
 msgid "attempt to refer to deleted window"
 msgstr "�ä��줿������ɥ������Ȥ���ޤ���"
 
-#: if_python.c:1866
+#: ../if_python.c:1870
 msgid "readonly attribute"
 msgstr "�ɹ�����°��"
 
-#: if_python.c:1879
+#: ../if_python.c:1883
 msgid "cursor position outside buffer"
 msgstr "�������뤬�Хåե��γ��ˤ���ޤ�"
 
-#: if_python.c:1956
+#: ../if_python.c:1960
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<������ɥ����֥������� (�õ��) %.8lX>"
 
-#: if_python.c:1968
+#: ../if_python.c:1972
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<������ɥ����֥������� (̤��) %.8lX>"
 
-#: if_python.c:1970
+#: ../if_python.c:1974
 #, c-format
 msgid "<window %d>"
 msgstr "<������ɥ� %d>"
 
-#: if_python.c:2046
+#: ../if_python.c:2050
 msgid "no such window"
 msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
 
-#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
-#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1999
-msgid "cannot save undo information"
-msgstr "����ɥ�������¸�Ǥ��ޤ���"
-
-#: if_python.c:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "�Ԥ�ä��ޤ���"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "�Ԥ��ִ��Ǥ��ޤ���"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "�Ԥ������Ǥ��ޤ���"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: "
 "Ruby�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
-#: if_ruby.c:485
+#: ../if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ̤�Τ�longjmp����: %d"
 
-#: if_sniff.c:67
+#: ../if_sniff.c:67
 msgid "Toggle implementation/definition"
 msgstr "������������ڤ��ؤ���"
 
-#: if_sniff.c:68
+#: ../if_sniff.c:68
 msgid "Show base class of"
 msgstr "���Υ��饹�δ����ɽ��"
 
-#: if_sniff.c:69
+#: ../if_sniff.c:69
 msgid "Show overridden member function"
 msgstr "�����С��饤�ɤ��줿���дؿ���ɽ��"
 
-#: if_sniff.c:70
+#: ../if_sniff.c:70
 msgid "Retrieve from file"
 msgstr "�ե����뤫���������"
 
-#: if_sniff.c:71
+#: ../if_sniff.c:71
 msgid "Retrieve from project"
 msgstr "�ץ��������Ȥ����������"
 
-#: if_sniff.c:73
+#: ../if_sniff.c:73
 msgid "Retrieve from all projects"
 msgstr "���ƤΥץ��������Ȥ����������"
 
-#: if_sniff.c:74
+#: ../if_sniff.c:74
 msgid "Retrieve"
 msgstr "����"
 
-#: if_sniff.c:75
+#: ../if_sniff.c:75
 msgid "Show source of"
 msgstr "���Υ�������ɽ������"
 
-#: if_sniff.c:76
+#: ../if_sniff.c:76
 msgid "Find symbol"
 msgstr "�ߤĤ�������ܥ�"
 
-#: if_sniff.c:77
+#: ../if_sniff.c:77
 msgid "Browse class"
 msgstr "���饹�򻲾�"
 
-#: if_sniff.c:78
+#: ../if_sniff.c:78
 msgid "Show class in hierarchy"
 msgstr "���ؤǥ��饹��ɽ��"
 
-#: if_sniff.c:79
+#: ../if_sniff.c:79
 msgid "Show class in restricted hierarchy"
 msgstr "���ꤵ�줿���ؤǥ��饹��ɽ��"
 
-#: if_sniff.c:80
+#: ../if_sniff.c:80
 msgid "Xref refers to"
 msgstr "Xref �λ�����"
 
-#: if_sniff.c:81
+#: ../if_sniff.c:81
 msgid "Xref referred by"
 msgstr "Xref �����Ȥ����"
 
-#: if_sniff.c:82
+#: ../if_sniff.c:82
 msgid "Xref has a"
 msgstr "Xref �����Τ�Τ��äƤ��ޤ�"
 
-#: if_sniff.c:83
+#: ../if_sniff.c:83
 msgid "Xref used by"
 msgstr "Xref �����Ѥ����"
 
-#: if_sniff.c:84
+#: ../if_sniff.c:84
 msgid "Show docu of"
 msgstr "����ʸ�Ϥ�ɽ��"
 
-#: if_sniff.c:85
+#: ../if_sniff.c:85
 msgid "Generate docu for"
 msgstr "����ʸ�Ϥ�����"
 
-#: if_sniff.c:97
+#: ../if_sniff.c:97
 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
 "$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
 "SNiFF+����³�Ǥ��ޤ���. �Ķ�������å����Ƥ�������(sniffemacs �� $PATH "
 "�ˤʤ���Фʤ�ޤ���).\n"
 
-#: if_sniff.c:425
+#: ../if_sniff.c:425
 msgid "E274: Sniff: Error during read. Disconnected"
 msgstr "E274: Sniff: �ɹ���˥��顼��ȯ�����ޤ���. ���Ǥ��ޤ���"
 
-#: if_sniff.c:553
+#: ../if_sniff.c:553
 msgid "SNiFF+ is currently "
 msgstr "����SNiFF+ �ξ��֤ϡ�"
 
-#: if_sniff.c:555
+#: ../if_sniff.c:555
 msgid "not "
 msgstr "̤"
 
-#: if_sniff.c:556
+#: ../if_sniff.c:556
 msgid "connected"
 msgstr "��³�פǤ�"
 
-#: if_sniff.c:592
+#: ../if_sniff.c:592
 #, c-format
 msgid "E275: Unknown SNiFF+ request: %s"
 msgstr "E275: ̤�Τ� SNiFF+ �ꥯ�����ȤǤ�: %s"
 
-#: if_sniff.c:605
+#: ../if_sniff.c:605
 msgid "E276: Error connecting to SNiFF+"
 msgstr "E276: SNiFF+ �ؤ���³��Υ��顼�Ǥ�"
 
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
 msgid "E278: SNiFF+ not connected"
 msgstr "E278: SNiFF+ ����³����Ƥ��ޤ���"
 
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
 msgid "E279: Not a SNiFF+ buffer"
 msgstr "E279: SNiFF+ �Хåե�������ޤ���"
 
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
 msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: �������˥��顼��ȯ�������Τ����Ǥ��ޤ���"
 
-#: if_tcl.c:418
+#: ../if_tcl.c:422
 msgid "invalid buffer number"
 msgstr "̵���ʥХåե��ֹ�Ǥ�"
 
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
 msgid "not implemented yet"
 msgstr "�ޤ���������Ƥ��ޤ���"
 
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "̤�ΤΥ��ץ����Ǥ�"
-
 #. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
 msgid "cannot set line(s)"
 msgstr "�Ԥ�����Ǥ��ޤ���"
 
-#: if_tcl.c:845
+#: ../if_tcl.c:849
 msgid "mark not set"
 msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
 
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
 #, c-format
 msgid "row %d column %d"
 msgstr "�� %d �� %d"
 
-#: if_tcl.c:881
+#: ../if_tcl.c:885
 msgid "cannot insert/append line"
 msgstr "�Ԥ�����/�ɲä�Ǥ��ޤ���"
 
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
 msgid "unknown flag: "
 msgstr "̤�ΤΥե饰:"
 
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
 msgid "unknown vimOption"
 msgstr "̤�Τ� vimOption �Ǥ�"
 
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
 msgid "keyboard interrupt"
 msgstr "�����ܡ��ɳ����"
 
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
 msgid "vim error"
 msgstr "vim ���顼"
 
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr ""
 "�Хåե�/������ɥ��������ޥ�ɤ�����Ǥ��ޤ���: "
 "���֥������Ȥ��õ��Ƥ��ޤ���"
 
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
 "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ������˾õ��ޤ���"
 
 #. This should never happen.  Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
 "vim-dev@vim.org"
 msgstr ""
 "E280: TCL ��̿Ū���顼: reflist ����!? vim-dev@vim.org ����𤷤Ƥ�������"
 
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: "
 "�Хåե�/������ɥ��λ��Ȥ��ߤĤ���ޤ���"
 
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: "
 "Tcl�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr ""
 "E281: TCL ���顼: ��λ�����ɤ������ͤǤϤ���ޤ���!? vim-dev@vim.org "
 "����𤷤Ƥ�������"
 
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
 msgid "cannot get line"
 msgstr "�Ԥ�����Ǥ��ޤ���"
 
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
 msgid "Unable to register a command server name"
 msgstr "̿�᥵���Ф�̾������Ͽ�Ǥ��ޤ���"
 
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: ��Ū�Υץ������ؤΥ��ޥ�������˼��Ԥ��ޤ���"
 
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: ̵���ʥ�����ID���Ȥ��ޤ���: %s"
 
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
 
-#: main.c:60
+#: ../main.c:60
 msgid "Unknown option"
 msgstr "̤�ΤΥ��ץ����Ǥ�"
 
-#: main.c:62
+#: ../main.c:62
 msgid "Too many edit arguments"
-msgstr "�Խ�������¿�����ޤ�"
+msgstr "�Խ�������¿�᤮�ޤ�"
 
-#: main.c:64
+#: ../main.c:64
 msgid "Argument missing after"
 msgstr "����������ޤ���"
 
-#: main.c:66
+#: ../main.c:66
 msgid "Garbage after option"
 msgstr "���ץ����θ�˥��ߤ�����ޤ�"
 
-#: main.c:68
+#: ../main.c:68
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" �ΰ�����¿�����ޤ�"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" �ΰ�����¿�᤮�ޤ�"
 
-#: main.c:70
+#: ../main.c:70
 msgid "Invalid argument for"
 msgstr "̵���ʰ����Ǥ�: "
 
-#: main.c:466
+#: ../main.c:481
 msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
 
-#: main.c:932
+#: ../main.c:958
 msgid "Attempt to open script file again: \""
 msgstr "������ץȥե������Ƥӳ����Ƥߤޤ�: \""
 
 # msgid "\"\n"
 # msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
 msgid "Cannot open for reading: \""
 msgstr "�ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: main.c:985
+#: ../main.c:1021
 msgid "Cannot open for script output: \""
 msgstr "������ץȽ����Ѥ򳫤��ޤ���"
 
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d �ĤΥե����뤬�Խ��򹵤��Ƥ��ޤ�\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
 
-#: main.c:1233
+#: ../main.c:1302
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �ٹ�: ü���ؤν��ϤǤϤ���ޤ���\n"
 
-#: main.c:1235
+#: ../main.c:1304
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: �ٹ�: ü����������ϤǤϤ���ޤ���\n"
 
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d �ĤΥե����뤬�Խ��򹵤��Ƥ��ޤ�\n"
+
 #. just in case..
-#: main.c:1297
+#: ../main.c:1377
 msgid "pre-vimrc command line"
 msgstr "vimrc���Υ��ޥ�ɥ饤��"
 
-#: main.c:1338
+#: ../main.c:1418
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: main.c:2411
+#: ../main.c:2521
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
 "\n"
 "���ܺ٤ʾ����: \"vim -h\"\n"
 
-#: main.c:2444
+#: ../main.c:2554
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�ե�����..]    ����ե�������Խ�����"
 
-#: main.c:2445
+#: ../main.c:2555
 msgid "-               read text from stdin"
 msgstr "-               ɸ�����Ϥ���ƥ����Ȥ��ɹ���"
 
-#: main.c:2446
+#: ../main.c:2556
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t ����         ������������줿�Ȥ��������Խ�����"
 
-#: main.c:2448
+#: ../main.c:2558
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  �ǽ�Υ��顼���Խ�����"
 
-#: main.c:2457
+#: ../main.c:2567
 msgid ""
 "\n"
 "\n"
@@ -2978,11 +3431,11 @@ msgstr ""
 "\n"
 "����ˡ:"
 
-#: main.c:2460
+#: ../main.c:2570
 msgid " vim [arguments] "
 msgstr " vim [����]"
 
-#: main.c:2464
+#: ../main.c:2574
 msgid ""
 "\n"
 "   or:"
@@ -2990,7 +3443,11 @@ msgstr ""
 "\n"
 "   �⤷����:"
 
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "��ʸ����ʸ����̵�뤵��ޤ� / �ե饰����ʸ���ˤ��Ƥ�������"
+
+#: ../main.c:2580
 msgid ""
 "\n"
 "\n"
@@ -3000,241 +3457,241 @@ msgstr ""
 "\n"
 "����:\n"
 
-#: main.c:2468
+#: ../main.c:2581
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t���Τ��Ȥˤϥե�����̾����"
 
-#: main.c:2470
+#: ../main.c:2583
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t�磻��ɥ����ɤ�Ÿ�����ʤ�"
 
-#: main.c:2473
+#: ../main.c:2586
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\t����gvim��OLE�Ȥ�����Ͽ����"
 
-#: main.c:2474
+#: ../main.c:2587
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tgvim��OLE��Ͽ��������"
 
-#: main.c:2477
+#: ../main.c:2590
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
 
-#: main.c:2478
+#: ../main.c:2591
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
 
-#: main.c:2480
+#: ../main.c:2593
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi�⡼�� (\"vi\" ��Ʊ��)"
 
-#: main.c:2481
+#: ../main.c:2594
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx�⡼�� (\"ex\" ��Ʊ��)"
 
-#: main.c:2482
+#: ../main.c:2595
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t��������(�Хå�)�⡼�� (\"ex\" ����)"
 
-#: main.c:2484
+#: ../main.c:2597
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t��ʬ�⡼�� (\"vidiff\" ��Ʊ��)"
 
-#: main.c:2486
+#: ../main.c:2599
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t���������⡼�� (\"evim\" ��Ʊ��, �⡼��̵)"
 
-#: main.c:2487
+#: ../main.c:2600
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�ɹ����ѥ⡼�� (\"view\" ��Ʊ��)"
 
-#: main.c:2488
+#: ../main.c:2601
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t���¥⡼�� (\"rvim\" ��Ʊ��)"
 
-#: main.c:2489
+#: ../main.c:2602
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t�ѹ� (�ե�������¸��) ��Ǥ��ʤ��褦�ˤ���"
 
-#: main.c:2490
+#: ../main.c:2603
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�ƥ����Ȥ��Խ���Ԥʤ��ʤ��褦�ˤ���"
 
-#: main.c:2491
+#: ../main.c:2604
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t�Х��ʥ�⡼��"
 
-#: main.c:2493
+#: ../main.c:2606
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp�⡼��"
 
-#: main.c:2495
+#: ../main.c:2608
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi�ߴ��⡼��: 'compatible'"
 
-#: main.c:2496
+#: ../main.c:2609
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi��ߴ��⡼��: 'nocompatible"
 
-#: main.c:2497
+#: ../main.c:2610
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose ��٥�"
 
-#: main.c:2498
+#: ../main.c:2611
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�ǥХå��⡼��"
 
-#: main.c:2499
+#: ../main.c:2612
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t����åץե��������Ѥ����������"
 
-#: main.c:2500
+#: ../main.c:2613
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t����åץե��������󤷽�λ"
 
-#: main.c:2501
+#: ../main.c:2614
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�ե�����̾)\t����å��夷�����å���������"
 
-#: main.c:2502
+#: ../main.c:2615
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-r��Ʊ��"
 
-#: main.c:2504
+#: ../main.c:2617
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t������ɥ��򳫤��Τ� newcli ����Ѥ��ʤ�"
 
-#: main.c:2505
+#: ../main.c:2618
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/O�� <device> ����Ѥ���"
 
-#: main.c:2508
+#: ../main.c:2621
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\t����ӥ���⡼�ɤǵ�ư����"
 
-#: main.c:2511
+#: ../main.c:2624
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t�إ֥饤��⡼�ɤǵ�ư����"
 
-#: main.c:2514
+#: ../main.c:2627
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t�ڥ륷����⡼�ɤǵ�ư����"
 
-#: main.c:2516
+#: ../main.c:2629
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tü���� <terminal> �����ꤹ��"
 
-#: main.c:2517
+#: ../main.c:2630
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc������� <vimrc> ��Ȥ�"
 
-#: main.c:2519
+#: ../main.c:2632
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t.gvimrc������� <gvimrc> ��Ȥ�"
 
-#: main.c:2521
+#: ../main.c:2634
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�ץ饰���󥹥���ץȤ�����ɤ��ʤ�"
 
-#: main.c:2522
+#: ../main.c:2635
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN �ĥ�����ɥ��򳫤�(��ά��: �ե�����ˤĤ�1��)"
 
-#: main.c:2523
+#: ../main.c:2636
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-o��Ʊ��������ľʬ��"
 
-#: main.c:2524
+#: ../main.c:2637
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t�ե�����κǸ夫��Ϥ����"
 
-#: main.c:2525
+#: ../main.c:2638
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> �Ԥ���Ϥ����"
 
-#: main.c:2527
+#: ../main.c:2640
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrc������ɤ������� <command> ��¹Ԥ���"
 
-#: main.c:2529
+#: ../main.c:2642
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t�ǽ�Υե����������ɸ� <command> ��¹Ԥ���"
 
-#: main.c:2530
+#: ../main.c:2643
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t�ǽ�Υե����������ɸ�ե����� <session> ������"
 
-#: main.c:2531
+#: ../main.c:2644
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t�ե����� <scriptin> ����Ρ��ޥ륳�ޥ�ɤ��ɹ���"
 
-#: main.c:2532
+#: ../main.c:2645
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ���ɲä���"
 
-#: main.c:2533
+#: ../main.c:2646
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ����¸����"
 
-#: main.c:2535
+#: ../main.c:2648
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t�Ź沽���줿�ե�������Խ�����"
 
-#: main.c:2539
+#: ../main.c:2652
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\tvim����ꤷ�� X �����Ф���³����"
 
-#: main.c:2541
+#: ../main.c:2654
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tX�����Ф���³���ʤ�"
 
-#: main.c:2544
+#: ../main.c:2657
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t��ǽ�ʤ��Vim�����Ф� <files> ���Խ�����"
 
-#: main.c:2545
+#: ../main.c:2658
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silnet <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
 
-#: main.c:2546
+#: ../main.c:2659
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
 
-#: main.c:2547
+#: ../main.c:2660
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
 
-#: main.c:2548
+#: ../main.c:2661
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVim�����Ф� <keys> ���������ƽ�λ����"
 
-#: main.c:2549
+#: ../main.c:2662
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\t�����Ф� <expr> ��¹Ԥ��Ʒ�̤�ɽ������"
 
-#: main.c:2550
+#: ../main.c:2663
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\tVim������̾�ΰ�����ɽ�����ƽ�λ����"
 
-#: main.c:2551
+#: ../main.c:2664
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servename <name>\t\tVim������ <name> ������/̾�����ꤹ��"
 
-#: main.c:2554
+#: ../main.c:2667
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo������� <viminfo> ��Ȥ�"
 
-#: main.c:2556
+#: ../main.c:2669
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\t�إ��(���Υ�å�����)��ɽ������λ����"
 
-#: main.c:2557
+#: ../main.c:2670
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�С����������ɽ������λ����"
 
-#: main.c:2561
+#: ../main.c:2674
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
 "\n"
 "gvim�ˤ�äƲ�ᤵ������(Motif�С������):\n"
 
-#: main.c:2565
+#: ../main.c:2678
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
 "\n"
 "gvim�ˤ�äƲ�ᤵ������(neXtaw�С������):\n"
 
-#: main.c:2567
+#: ../main.c:2680
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
 "\n"
 "gvim�ˤ�äƲ�ᤵ������(Athena�С������):\n"
 
-#: main.c:2571
+#: ../main.c:2684
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t<display> ��vim��¹Ԥ���"
 
-#: main.c:2572
+#: ../main.c:2685
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t�Ǿ����������֤�vim��ư����"
 
-#: main.c:2574
+#: ../main.c:2687
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\tvim��̾�� <name> �Ǥ���Ȥ��ƥ꥽������Ȥ�"
 
-#: main.c:2575
+#: ../main.c:2688
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (��������Ƥ��ʤ�)\n"
 
-#: main.c:2577
+#: ../main.c:2690
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t�طʿ��� <color> ��Ȥ�(Ʊ��: -bg)"
 
-#: main.c:2578
+#: ../main.c:2691
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t���ʿ��� <color> ��Ȥ�(Ʊ��: -fg)"
 
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t\t�ƥ�����ɽ���� <font> ��Ȥ�(Ʊ��: -fn)"
 
-#: main.c:2580
+#: ../main.c:2693
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t������ <font> ��Ȥ�"
 
-#: main.c:2581
+#: ../main.c:2694
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <for>\t���λ��� <font> ��Ȥ�"
 
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t������֤� <geom> ��Ȥ�(Ʊ��: -geom)"
 
-#: main.c:2583
+#: ../main.c:2696
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t���������� <width> �ˤ���(Ʊ��: -bw)"
 
-#: main.c:2584
+#: ../main.c:2697
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
 "-scrollbarwidth <width>  ����������С������� <width> �ˤ���(Ʊ��: -sw)"
 
-#: main.c:2586
+#: ../main.c:2699
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\t��˥塼�С��ι⤵�� <height> �ˤ���(Ʊ��: -mh)"
 
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tȿž��������Ѥ���(Ʊ��: -rv)"
 
-#: main.c:2589
+#: ../main.c:2702
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\tȿž��������Ѥ��ʤ�(Ʊ��: +rv)"
 
-#: main.c:2590
+#: ../main.c:2703
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t����Υ꥽��������Ѥ���"
 
-#: main.c:2593
+#: ../main.c:2706
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
 "\n"
 "gvim�ˤ�äƲ�ᤵ������(RISC OS�С������):\n"
 
-#: main.c:2594
+#: ../main.c:2707
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t����Υ�����ɥ��Υ����ñ�̤���"
 
-#: main.c:2595
+#: ../main.c:2708
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\t����Υ�����ɥ��ι�ñ�̤ι⤵"
 
-#: main.c:2598
+#: ../main.c:2711
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
 "\n"
 "gvim�ˤ�äƲ�ᤵ������(GTK+�С������):\n"
 
-#: main.c:2602
+#: ../main.c:2715
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t<display> ��vim��¹Ԥ���(Ʊ��: --display)"
 
-#: main.c:2604
+#: ../main.c:2717
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
 
-#: main.c:2606
+#: ../main.c:2719
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
 
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvim�ˤ�äƲ�ᤵ������(KDE�С������):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\tȿž���̤���Ѥ���"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\t��ư���˥��åץ�����������ɽ������"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\t���åץ�����������̵���ˤ���"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> ��vim��¹Ԥ���"
+
+#: ../main.c:2733
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <�ƤΥ����ȥ�>\tVim��ƥ��ץꥱ����������ǵ�ư����"
 
 # msgid "--help\t\tShow Gnome arguments"
 # msgstr "--help\t\tGNOME�ΰ����򸫤���"
-#: main.c:2847
+#: ../main.c:2971
 msgid "No display"
 msgstr "�ǥ����ץ쥤�����Ĥ���ޤ���"
 
 #. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
 msgid ": Send failed.\n"
 msgstr ": �����˼��Ԥ��ޤ���.\n"
 
 #. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": �����˼��Ԥ��ޤ���. ��������Ǥμ¹Ԥ��ߤƤ��ޤ�\n"
 
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d �� (%d ����) �Υե�������Խ����ޤ���"
 
-#: main.c:2949
+#: ../main.c:3073
 msgid "No display: Send expression failed.\n"
 msgstr "�ǥ����ץ쥤������ޤ���: ���������˼��Ԥ��ޤ���.\n"
 
-#: main.c:2961
+#: ../main.c:3085
 msgid ": Send expression failed.\n"
 msgstr ": ���������˼��Ԥ��ޤ���.\n"
 
-#: mark.c:709
+#: ../mark.c:705
 msgid "No marks set"
 msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
 
-#: mark.c:711
+#: ../mark.c:707
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" �˳�������ޡ���������ޤ���"
 
 #. Highlight title
-#: mark.c:722
+#: ../mark.c:718
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
 "mark   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: mark.c:760
+#: ../mark.c:841
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
 " jump   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: mark.c:805
+#: ../mark.c:886
 msgid ""
 "\n"
 "change line  col text"
@@ -3428,7 +3909,7 @@ msgstr ""
 "\n"
 "�ѹ�   ��    ��  �ƥ�����"
 
-#: mark.c:1281
+#: ../mark.c:1362
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
 "# �ե�����ޡ���:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
 "\n"
 "# �����ץꥹ�� (��������Τ���):\n"
 
-#: mark.c:1412
+#: ../mark.c:1493
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
 "\n"
 "# �ե�������ޡ��������� (��������Τ���Ť����):\n"
 
-#: mark.c:1501
+#: ../mark.c:1582
 msgid "Missing '>'"
 msgstr "'>' ���ߤĤ���ޤ���"
 
-#: mbyte.c:467
+#: ../mbyte.c:470
 msgid "E543: Not a valid codepage"
 msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
 
-#: mbyte.c:4431
+#: ../mbyte.c:4513
 msgid "E284: Cannot set IC values"
 msgstr "E284: IC���ͤ�����Ǥ��ޤ���"
 
-#: mbyte.c:4583
+#: ../mbyte.c:4669
 msgid "E285: Failed to create input context"
 msgstr "E285: ����ץåȥ���ƥ����Ȥκ����˼��Ԥ��ޤ���"
 
-#: mbyte.c:4741
+#: ../mbyte.c:4827
 msgid "E286: Failed to open input method"
 msgstr "E286: ����ץåȥ᥽�åɤΥ����ץ�˼��Ԥ��ޤ���"
 
-#: mbyte.c:4752
+#: ../mbyte.c:4838
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: �ٹ�: IM���˲�������Хå�������Ǥ��ޤ���Ǥ���"
 
-#: mbyte.c:4758
+#: ../mbyte.c:4844
 msgid "E288: input method doesn't support any style"
 msgstr "E288: ����ץåȥ᥽�åɤϤɤ�ʥ�������⥵�ݡ��Ȥ��ޤ���"
 
-#: mbyte.c:4815
+#: ../mbyte.c:4901
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: ����ץåȥ᥽�åɤ� my preedit type �򥵥ݡ��Ȥ��ޤ���"
 
-#: mbyte.c:4889
+#: ../mbyte.c:4975
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot ��������ˤ�fontset��ɬ�פǤ�"
 
-#: mbyte.c:4925
+#: ../mbyte.c:5011
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: GTK+��1.2.3����Ť��Τǥ��ơ��������ꥢ��̵���Ǥ�"
 
-#: mbyte.c:5232
+#: ../mbyte.c:5318
 msgid "E292: Input Method Server is not running"
 msgstr "E292: ����ץåȥ᥽�åɥ����� ��ư��Ƥ��ޤ���"
 
-#: memfile.c:488
+#: ../memfile.c:488
 msgid "E293: block was not locked"
 msgstr "E293: �֥��å������å�����Ƥ��ޤ���"
 
-#: memfile.c:1005
+#: ../memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: ����åץե������ɹ����˥��������顼�Ǥ�"
 
-#: memfile.c:1010
+#: ../memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: ����åץե�������ɹ��ߥ��顼�Ǥ�"
 
-#: memfile.c:1062
+#: ../memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: ����åץե��������߻��˥��������顼�Ǥ�"
 
-#: memfile.c:1080
+#: ../memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: ����åץե�����ν���ߥ��顼�Ǥ�"
 
-#: memfile.c:1277
+#: ../memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: ����åץե����뤬����¸�ߤ��ޤ� (symlink�ˤ�빶��?)"
 
-#: memline.c:275
+#: ../memline.c:310
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: �֥��å� 0 ������Ǥ��ޤ���?"
 
-#: memline.c:315
+#: ../memline.c:351
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: �֥��å� 1 ������Ǥ��ޤ���?"
 
-#: memline.c:333
+#: ../memline.c:369
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �֥��å� 2 ������Ǥ��ޤ���?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: ../memline.c:482
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ���ä�, ����åץե����뤬�����ޤ���!!!"
 
-#: memline.c:448
+#: ../memline.c:487
 msgid "E302: Could not rename swap file"
 msgstr "E302: ����åץե������̾�����Ѥ����ޤ���"
 
-#: memline.c:518
+#: ../memline.c:559
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" �Υ���åץե�����򳫤��ʤ��Τǥꥫ�Х���Բ�ǽ�Ǥ�"
 
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: �֥��å� 0 ������Ǥ��ޤ���Ǥ���??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): �֥��å� 0 ������Ǥ��ޤ���Ǥ���??"
 
-#: memline.c:757
+#: ../memline.c:872
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s �ˤϥ���åץե����뤬�ߤĤ���ޤ���"
 
-#: memline.c:767
+#: ../memline.c:882
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "���Ѥ��륹��åץե�������ֹ�����Ϥ��Ƥ�������(0 �ǽ�λ): "
 
-#: memline.c:812
+#: ../memline.c:927
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s �򳫤��ޤ���"
 
-#: memline.c:834
+#: ../memline.c:949
 msgid "Unable to read block 0 from "
 msgstr "�֥��å� 0 ���ɹ���ޤ��� "
 
-#: memline.c:837
+#: ../memline.c:952
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
 "\n"
 "���餯�ѹ�������Ƥ��ʤ���Vim������åץե�����򹹿����Ƥ��ޤ���."
 
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim�Τ��ΥС������Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: memline.c:849
+#: ../memline.c:964
 msgid "Use Vim version 3.0.\n"
 msgstr "Vim�ΥС������3.0����Ѥ��Ƥ�������.\n"
 
-#: memline.c:855
+#: ../memline.c:970
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�"
 
-#: memline.c:868
+#: ../memline.c:983
 msgid " cannot be used on this computer.\n"
 msgstr " ���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: memline.c:870
+#: ../memline.c:985
 msgid "The file was created on "
 msgstr "���Υե�����ϼ��ξ��Ǻ���ޤ��� "
 
-#: memline.c:874
+#: ../memline.c:989
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
 ",\n"
 "�⤷���ϥե����뤬»�����Ƥ��ޤ�."
 
-#: memline.c:903
+#: ../memline.c:1018
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "����åץե����� \"%s\" �������"
 
-#: memline.c:909
+#: ../memline.c:1024
 #, c-format
 msgid "Original file \"%s\""
 msgstr "���ܥե����� \"%s\""
 
-#: memline.c:922
+#: ../memline.c:1037
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: �ٹ�: ���ܥե����뤬�ѹ�����Ƥ��ޤ�"
 
-#: memline.c:975
+#: ../memline.c:1111
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s ����֥��å� 1 ���ɹ���ޤ���"
 
-#: memline.c:979
+#: ../memline.c:1115
 msgid "???MANY LINES MISSING"
 msgstr "???¿���ιԤ������Ƥ��ޤ�"
 
-#: memline.c:995
+#: ../memline.c:1131
 msgid "???LINE COUNT WRONG"
 msgstr "???�Կ����ְ�äƤ��ޤ�"
 
-#: memline.c:1002
+#: ../memline.c:1138
 msgid "???EMPTY BLOCK"
 msgstr "???�֥��å������Ǥ�"
 
-#: memline.c:1028
+#: ../memline.c:1164
 msgid "???LINES MISSING"
 msgstr "???�Ԥ������Ƥ��ޤ�"
 
-#: memline.c:1060
+#: ../memline.c:1196
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: �֥��å� 1 ��ID���ְ�äƤ��ޤ�(%s ��.swp�ե�����Ǥʤ�?)"
 
-#: memline.c:1065
+#: ../memline.c:1201
 msgid "???BLOCK MISSING"
 msgstr "???�֥��å�������ޤ���"
 
-#: memline.c:1081
+#: ../memline.c:1217
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ��������???END�ޤǤιԤ��˲�����Ƥ���褦�Ǥ�"
 
-#: memline.c:1097
+#: ../memline.c:1233
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ��������??END�ޤǤιԤ�������������줿�褦�Ǥ�"
 
-#: memline.c:1117
+#: ../memline.c:1253
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1143
+#: ../memline.c:1279
 msgid "E311: Recovery Interrupted"
 msgstr "E311: �ꥫ�Х꤬����ޤ�ޤ���"
 
-#: memline.c:1148
+#: ../memline.c:1284
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: �ꥫ�Х�κ���˥��顼�����Ф���ޤ���; ???�ǻϤޤ�Ԥ򻲾Ȥ��Ƥ�������"
 
-#: memline.c:1150
+#: ../memline.c:1286
 msgid "See \":help E312\" for more information."
 msgstr "�ܺ٤� \":help E312\" �򻲾Ȥ��Ƥ�������"
 
-#: memline.c:1155
+#: ../memline.c:1291
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "�ꥫ�Х꤬��λ���ޤ���. ���Ƥ��������������å����Ƥ�������."
 
-#: memline.c:1156
+#: ../memline.c:1292
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
 "\n"
 "(�ѹ�������å����뤿���, ���Υե�������̤�̾������¸�������\n"
 
-#: memline.c:1157
+#: ../memline.c:1293
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "���ܥե�����Ȥ� diff ��¹Ԥ�����ɤ��Ǥ��礦)\n"
 
-#: memline.c:1158
+#: ../memline.c:1294
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3701,51 +4182,51 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
 msgid "Swap files found:"
 msgstr "����åץե����뤬ʣ�����Ĥ���ޤ���:"
 
-#: memline.c:1392
+#: ../memline.c:1528
 msgid "   In current directory:\n"
 msgstr "   ���ߤΥǥ��쥯�ȥ�:\n"
 
-#: memline.c:1394
+#: ../memline.c:1530
 msgid "   Using specified name:\n"
 msgstr "   ����̾���������:\n"
 
-#: memline.c:1398
+#: ../memline.c:1534
 msgid "   In directory "
 msgstr "   �ǥ��쥯�ȥ� "
 
-#: memline.c:1416
+#: ../memline.c:1552
 msgid "      -- none --\n"
 msgstr "      -- �ʤ� --\n"
 
-#: memline.c:1488
+#: ../memline.c:1625
 msgid "          owned by: "
 msgstr "            ��ͭ��: "
 
-#: memline.c:1490
+#: ../memline.c:1627
 msgid "   dated: "
 msgstr "   ����: "
 
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
 msgid "             dated: "
 msgstr "             ����: "
 
-#: memline.c:1510
+#: ../memline.c:1647
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: memline.c:1514
+#: ../memline.c:1651
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�]"
 
-#: memline.c:1518
+#: ../memline.c:1655
 msgid "         file name: "
 msgstr "        �ե�����̾: "
 
-#: memline.c:1524
+#: ../memline.c:1661
 msgid ""
 "\n"
 "          modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
 "\n"
 "          �ѹ�����: "
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "YES"
 msgstr "����"
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "no"
 msgstr "�ʤ�"
 
-#: memline.c:1529
+#: ../memline.c:1666
 msgid ""
 "\n"
 "         user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
 "\n"
 "          �桼��̾: "
 
-#: memline.c:1536
+#: ../memline.c:1673
 msgid "   host name: "
 msgstr "   �ۥ���̾: "
 
-#: memline.c:1538
+#: ../memline.c:1675
 msgid ""
 "\n"
 "         host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
 "\n"
 "          �ۥ���̾: "
 
-#: memline.c:1544
+#: ../memline.c:1681
 msgid ""
 "\n"
 "        process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
 "\n"
 "        �ץ�����ID: "
 
-#: memline.c:1550
+#: ../memline.c:1687
 msgid " (still running)"
 msgstr " (�ޤ��¹���)"
 
-#: memline.c:1562
+#: ../memline.c:1699
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
 "\n"
 "         [����Vim�С������Ǥϻ��ѤǤ��ޤ���]"
 
-#: memline.c:1565
+#: ../memline.c:1702
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
 "\n"
 "         [���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���]"
 
-#: memline.c:1570
+#: ../memline.c:1707
 msgid "         [cannot be read]"
 msgstr "         [�ɹ���ޤ���]"
 
-#: memline.c:1574
+#: ../memline.c:1711
 msgid "         [cannot be opened]"
 msgstr "         [�����ޤ���]"
 
-#: memline.c:1764
+#: ../memline.c:1901
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: ����åץե����뤬̵���Τǰݻ��Ǥ��ޤ���"
 
-#: memline.c:1817
+#: ../memline.c:1954
 msgid "File preserved"
 msgstr "�ե����뤬�ݻ�����ޤ�"
 
-#: memline.c:1819
+#: ../memline.c:1956
 msgid "E314: Preserve failed"
 msgstr "E314: �ݻ��˼��Ԥ��ޤ���"
 
-#: memline.c:1890
+#: ../memline.c:2027
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: ̵����lnum�Ǥ�: %ld"
 
-#: memline.c:1916
+#: ../memline.c:2053
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: �� %ld ��ߤĤ����ޤ���"
 
-#: memline.c:2306
+#: ../memline.c:2443
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 3"
 
-#: memline.c:2386
+#: ../memline.c:2523
 msgid "stack_idx should be 0"
 msgstr "stack_idx �� 0 �Ǥ���٤��Ǥ�"
 
-#: memline.c:2448
+#: ../memline.c:2585
 msgid "E318: Updated too many blocks?"
-msgstr "E318: �������줿�֥��å���¿�����뤫��?"
+msgstr "E318: �������줿�֥��å���¿�᤮�뤫��?"
 
-#: memline.c:2630
+#: ../memline.c:2767
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 4"
 
-#: memline.c:2657
+#: ../memline.c:2794
 msgid "deleted block 1?"
 msgstr "�֥��å� 1 �Ͼä��줿?"
 
-#: memline.c:2857
+#: ../memline.c:2994
 #, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: �� %ld ���ߤĤ���ޤ���"
 
-#: memline.c:3100
+#: ../memline.c:3237
 msgid "E317: pointer block id wrong"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ�"
 
-#: memline.c:3116
+#: ../memline.c:3253
 msgid "pe_line_count is zero"
 msgstr "pe_line_count �������Ǥ�"
 
-#: memline.c:3145
+#: ../memline.c:3282
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: ���ֹ椬�ϰϳ��Ǥ�: %ld Ķ���Ƥ��ޤ�"
 
-#: memline.c:3149
+#: ../memline.c:3286
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: �֥��å� %ld �ιԥ�����Ȥ��ְ�äƤ��ޤ�"
 
-#: memline.c:3198
+#: ../memline.c:3335
 msgid "Stack size increases"
 msgstr "�����å��������������ޤ�"
 
-#: memline.c:3244
+#: ../memline.c:3381
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 2"
 
-#: memline.c:3674
+#: ../memline.c:3827
 msgid "E325: ATTENTION"
 msgstr "E325: ����"
 
-#: memline.c:3675
+#: ../memline.c:3828
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
 "\n"
 "����̾���ǥ���åץե�����򸫤Ĥ��ޤ��� \""
 
-#: memline.c:3679
+#: ../memline.c:3832
 msgid "While opening file \""
 msgstr "���Υե�����򳫤��Ƥ������ \""
 
-#: memline.c:3688
+#: ../memline.c:3841
 msgid "      NEWER than swap file!\n"
 msgstr "      ����åץե�������⿷�����Ǥ�!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
 "    ���ξ��ˤ�, �ѹ��򤷤��ݤ˺ǽ�Ū��, Ʊ���ե�����ΰۤʤ�\n"
 "    2�ĤΥ��󥹥��󥹤��Ǥ��Ƥ��ޤ����Ȥ����դ��Ƥ�������.\n"
 
-#: memline.c:3693
+#: ../memline.c:3846
 msgid "    Quit, or continue with caution.\n"
 msgstr "    ��λ���뤫, ���դ��ʤ���³���ޤ�.\n"
 
-#: memline.c:3694
+#: ../memline.c:3847
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
 "\n"
 "(2) ���Υե�������Խ����å���󤬥���å��夷��.\n"
 
-#: memline.c:3695
+#: ../memline.c:3848
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ���ξ��ˤ� \":recover\" �� \"vim -r "
 
-#: memline.c:3697
+#: ../memline.c:3850
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
 "\"\n"
 "    ����Ѥ����ѹ���ꥫ�С����ޤ�(\":help recover\" �򻲾�).\n"
 
-#: memline.c:3698
+#: ../memline.c:3851
 msgid "    If you did this already, delete the swap file \""
 msgstr "    ���ˤ����Ԥʤä��Τʤ��, ����åץե����� \""
 
-#: memline.c:3700
+#: ../memline.c:3853
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
 "\"\n"
 "    ��ä��Ф��Υ�å����������Ǥ��ޤ�.\n"
 
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
 msgid "Swap file \""
 msgstr "����åץե����� \""
 
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
 msgid "\" already exists!"
 msgstr "\" �����ˤ���ޤ�!"
 
-#: memline.c:3724
+#: ../memline.c:3877
 msgid "VIM - ATTENTION"
 msgstr "VIM - ����"
 
-#: memline.c:3726
+#: ../memline.c:3879
 msgid "Swap file already exists!"
 msgstr "����åץե����뤬����¸�ߤ��ޤ�!"
 
-#: memline.c:3730
+#: ../memline.c:3883
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
 "��λ����(&Q)\n"
 "��ߤ���(&A)"
 
-#: memline.c:3732
+#: ../memline.c:3885
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
 "��ߤ���(&A)\n"
 "�õ��(&D)"
 
-#: memline.c:3789
+#: ../memline.c:3942
 msgid "E326: Too many swap files found"
 msgstr "E326: ����åץե����뤬¿�����Ĥ���ޤ���"
 
-#: menu.c:64
+#: ../menu.c:64
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ��˥塼�����ƥ�Υѥ�����ʬ�����֥�˥塼�ǤϤ���ޤ���"
 
-#: menu.c:65
+#: ../menu.c:65
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ��˥塼��¾�Υ⡼�ɤˤ�������ޤ�"
 
-#: menu.c:66
+#: ../menu.c:66
 msgid "E329: No menu of that name"
 msgstr "E329: ����̾���Υ�˥塼�Ϥ���ޤ���"
 
-#: menu.c:525
+#: ../menu.c:522
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ��˥塼�ѥ��ϥ��֥�˥塼��������٤��ǤϤ���ޤ���"
 
-#: menu.c:564
+#: ../menu.c:561
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ��˥塼�С��ˤ�ľ�ܥ�˥塼�����ƥ���ɲäǤ��ޤ���"
 
-#: menu.c:570
+#: ../menu.c:567
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ���ڤ�ϥ�˥塼�ѥ��ΰ����ǤϤ���ޤ���"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: menu.c:1097
+#: ../menu.c:1093
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
 "\n"
 "--- ��˥塼 ---"
 
-#: menu.c:2019
+#: ../menu.c:2011
 msgid "Tear off this menu"
 msgstr "���Υ�˥塼���ڤ���"
 
-#: menu.c:2084
+#: ../menu.c:2076
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ��˥塼�ѥ��ϥ�˥塼�����ƥ�������ʤ���Ф����ޤ���"
 
-#: menu.c:2104
+#: ../menu.c:2096
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: ��˥塼���ߤĤ���ޤ���: %s"
 
-#: menu.c:2173
+#: ../menu.c:2169
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s �ˤϥ�˥塼���������Ƥ��ޤ���"
 
-#: menu.c:2211
+#: ../menu.c:2208
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ��˥塼�ѥ��ϥ��֥�˥塼�������ʤ���Ф����ޤ���"
 
-#: menu.c:2232
+#: ../menu.c:2229
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: ��˥塼���ߤĤ���ޤ��� - ��˥塼̾���ǧ���Ƥ�������"
 
-#: message.c:414
+#: ../message.c:429
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s �ν�����˥��顼�����Ф���ޤ���:"
 
-#: message.c:440
+#: ../message.c:454
 #, c-format
 msgid "line %4ld:"
 msgstr "�� %4ld:"
 
-#: message.c:647
+#: ../message.c:657
 msgid "[string too long]"
-msgstr "[ʸ����Ĺ�����ޤ�]"
+msgstr "[ʸ����Ĺ�᤮�ޤ�]"
 
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ̵���ʥ쥸����̾: '%s'"
+
+#: ../message.c:814
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr "���ܸ��å���������/�ƽ�: ¼�� ��Ϻ <koron@tka.att.ne.jp>"
 
-#: message.c:1025
+#: ../message.c:1040
 msgid "Interrupt: "
 msgstr "�����: "
 
-#: message.c:1028
+#: ../message.c:1043
 msgid "Hit ENTER to continue"
 msgstr "³����ˤ�ENTER�򲡤��Ƥ�������"
 
-#: message.c:1030
+#: ../message.c:1045
 msgid "Hit ENTER or type command to continue"
 msgstr "³����ˤ�ENTER�򲡤������ޥ�ɤ����Ϥ��Ƥ�������"
 
-#: message.c:2351
+#: ../message.c:2370
 msgid "-- More --"
 msgstr "-- ��³ --"
 
-#: message.c:2354
+#: ../message.c:2373
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: ������, SPACE/b: �ڡ�������, d/u: Ⱦ�ڡ�������, q: ��λ)"
 
-#: message.c:2355
+#: ../message.c:2374
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: ������, SPACE: �ڡ�������, d: Ⱦ�ڡ�������, q: ��λ)"
 
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
 msgid "Question"
 msgstr "����"
 
-#: message.c:2978
+#: ../message.c:3001
 msgid ""
 "&Yes\n"
 "&No"
@@ -4124,7 +4610,7 @@ msgstr ""
 "�Ϥ�(&Y)\n"
 "������(&N)"
 
-#: message.c:3011
+#: ../message.c:3034
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
 "��������(&D)\n"
 "����󥻥�(&C)"
 
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "�ǥ��쥯�ȥ��������������"
+
+#: ../message.c:3077
 msgid "Save File dialog"
 msgstr "�ե�������¸����������"
 
-#: message.c:3054
+#: ../message.c:3079
 msgid "Open File dialog"
 msgstr "�ե������ɹ�����������"
 
 #. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: ���󥽡���⡼�ɤǤϥե�����֥饦����Ȥ��ޤ���, �����ʤ���"
 
-#: misc1.c:2773
+#: ../misc1.c:2860
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: �ٹ�: �ɹ����ѥե�������ѹ����ޤ�"
 
-#: misc1.c:3021
+#: ../misc1.c:3113
 msgid "1 more line"
 msgstr "1 �� �ɲä��ޤ���"
 
-#: misc1.c:3023
+#: ../misc1.c:3115
 msgid "1 line less"
 msgstr "1 �� ������ޤ���"
 
-#: misc1.c:3028
+#: ../misc1.c:3120
 #, c-format
 msgid "%ld more lines"
 msgstr "%ld �� �ɲä��ޤ���"
 
-#: misc1.c:3030
+#: ../misc1.c:3122
 #, c-format
 msgid "%ld fewer lines"
 msgstr "%ld �� ������ޤ���"
 
-#: misc1.c:3033
+#: ../misc1.c:3125
 msgid " (Interrupted)"
 msgstr " (����ޤ�ޤ���)"
 
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "�ӡ���!"
+
+#: ../misc1.c:7814
 msgid "Vim: preserving files...\n"
 msgstr "Vim: �ե��������¸��...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
 msgid "Vim: Finished.\n"
 msgstr "Vim: ��λ���ޤ���.\n"
 
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
 msgid "ERROR: "
 msgstr "���顼: "
 
-#: misc2.c:715
+#: ../misc2.c:710
 #, c-format
 msgid ""
 "\n"
@@ -4199,7 +4693,7 @@ msgstr ""
 "\n"
 "[����(�Х���)] ������-������ %lu-%lu, ������ %lu, �ԡ����� %lu\n"
 
-#: misc2.c:717
+#: ../misc2.c:712
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
 "[�ƽ�] �� re/malloc() ��� %lu, �� free() ��� %lu\n"
 "\n"
 
-#: misc2.c:772
+#: ../misc2.c:767
 msgid "E340: Line is becoming too long"
-msgstr "E340: �Ԥ�Ĺ���ʤꤹ���ޤ���"
+msgstr "E340: �Ԥ�Ĺ���ʤ�᤮�ޤ���"
 
-#: misc2.c:816
+#: ../misc2.c:811
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: �������顼: lalloc(%ld,)"
 
-#: misc2.c:924
+#: ../misc2.c:919
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: ���꤬��ޤ���!  (%lu �Х��Ȥ�����׵�)"
 
-#: misc2.c:2593
+#: ../misc2.c:2580
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "�¹ԤΤ���˥������ƽФ���: \"%s\""
 
-#: misc2.c:2815
+#: ../misc2.c:2845
 msgid "E545: Missing colon"
 msgstr "E545: �����󤬤���ޤ���"
 
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
 msgid "E546: Illegal mode"
 msgstr "E546: �����ʥ⡼�ɤǤ�"
 
-#: misc2.c:2883
+#: ../misc2.c:2913
 msgid "E547: Illegal mouseshape"
 msgstr "E547: ������ 'mouseshape' �Ǥ�"
 
-#: misc2.c:2923
+#: ../misc2.c:2953
 msgid "E548: digit expected"
 msgstr "E548: ���ͤ�ɬ�פǤ�"
 
-#: misc2.c:2928
+#: ../misc2.c:2958
 msgid "E549: Illegal percentage"
 msgstr "E549: �����ʥѡ�����ơ����Ǥ�"
 
-#: misc2.c:3238
+#: ../misc2.c:3270
 msgid "Enter encryption key: "
 msgstr "�Ź沽�ѤΥ��������Ϥ��Ƥ�������: "
 
-#: misc2.c:3239
+#: ../misc2.c:3271
 msgid "Enter same key again: "
 msgstr "�⤦����Ʊ�����������Ϥ��Ƥ�������: "
 
-#: misc2.c:3249
+#: ../misc2.c:3281
 msgid "Keys don't match!"
 msgstr "���������פ��ޤ���"
 
-#: misc2.c:3798
+#: ../misc2.c:3825
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
 "E343: ̵���ʥѥ��Ǥ�: '**[����]' ��path�κǸ夫 '%s' "
 "��³���Ƥʤ��Ȥ����ޤ���."
 
-#: misc2.c:5077
+#: ../misc2.c:5104
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#: misc2.c:5080
+#: ../misc2.c:5107
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#: misc2.c:5086
+#: ../misc2.c:5113
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#: misc2.c:5089
+#: ../misc2.c:5116
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: �ѥ��ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#: misc2.c:5323
+#: ../misc2.c:5356
 msgid "E550: Missing colon"
 msgstr "E550: �����󤬤���ޤ���"
 
-#: misc2.c:5335
+#: ../misc2.c:5368
 msgid "E551: Illegal component"
 msgstr "E551: �����ʹ�ʸ���ǤǤ�"
 
-#: misc2.c:5343
+#: ../misc2.c:5376
 msgid "E552: digit expected"
 msgstr "E552: ���ͤ�ɬ�פǤ�"
 
 #. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
 msgid "Cannot connect to Netbeans #2"
 msgstr "Netbeans #2 ����³�Ǥ��ޤ���"
 
-#: netbeans.c:404
+#: ../netbeans.c:417
 msgid "Cannot connect to Netbeans"
 msgstr "Netbeans ����³�Ǥ��ޤ���"
 
-#: netbeans.c:450
+#: ../netbeans.c:461
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans����³����ե�����Υ��������⡼�ɤ����꤬����ޤ�: \"%s\""
 
-#: netbeans.c:749
+#: ../netbeans.c:760
 msgid "read from Netbeans socket"
 msgstr "Netbeans �Υ����åȤ��ɹ���"
 
-#: netbeans.c:1638
+#: ../netbeans.c:1680
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: �Хåե� %ld �� NetBeans ��³�������ޤ���"
 
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
 msgid "Warning: terminal cannot highlight"
 msgstr "�ٹ�: ���Ѥ��Ƥ���ü���ϥϥ��饤�ȤǤ��ޤ���"
 
-#: normal.c:3276
+#: ../normal.c:3293
 msgid "E348: No string under cursor"
 msgstr "E348: ��������ΰ��֤ˤ�ʸ���󤬤���ޤ���"
 
-#: normal.c:3278
+#: ../normal.c:3295
 msgid "E349: No identifier under cursor"
 msgstr "E349: ��������ΰ��֤ˤϼ��̻Ҥ�����ޤ���"
 
-#: normal.c:4519
+#: ../normal.c:4537
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�õ�Ǥ��ޤ���"
 
-#: normal.c:6708
+#: ../normal.c:6808
 msgid "E664: changelist is empty"
 msgstr "E664: �ѹ��ꥹ�Ȥ����Ǥ�"
 
-#: normal.c:6710
+#: ../normal.c:6810
 msgid "E662: At start of changelist"
 msgstr "E662: �ѹ��ꥹ�Ȥ���Ƭ"
 
-#: normal.c:6712
+#: ../normal.c:6812
 msgid "E663: At end of changelist"
 msgstr "E663: �ѹ��ꥹ�Ȥ�����"
 
-#: normal.c:7973
+#: ../normal.c:8085
 msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vim��λ����ˤ� :quit<Enter> �����Ϥ��Ƥ�������"
 
-#: ops.c:294
+#: ../ops.c:291
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ops.c:296
+#: ../ops.c:293
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 �Ԥ� %s �� %d ���������ޤ���"
 
-#: ops.c:301
+#: ../ops.c:298
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ops.c:304
+#: ../ops.c:301
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld �Ԥ� %s �� %d ���������ޤ���"
 
-#: ops.c:662
+#: ../ops.c:659
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld �Ԥ�����ǥ�Ȥ���ޤ�... "
 
-#: ops.c:712
+#: ../ops.c:709
 msgid "1 line indented "
 msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ���"
 
-#: ops.c:714
+#: ../ops.c:711
 #, c-format
 msgid "%ld lines indented "
 msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ���"
 
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
+
 #. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
 msgid "cannot yank; delete anyway"
 msgstr "��󥯤Ǥ��ޤ���; �Ȥˤ����õ�"
 
-#: ops.c:2185
+#: ../ops.c:2223
 msgid "1 line changed"
 msgstr "1 �Ԥ��ѹ�����ޤ���"
 
-#: ops.c:2187
+#: ../ops.c:2225
 #, c-format
 msgid "%ld lines changed"
 msgstr "%ld �Ԥ��ѹ�����ޤ���"
 
-#: ops.c:2571
+#: ../ops.c:2609
 #, c-format
 msgid "freeing %ld lines"
 msgstr "%ld �Ԥ�����"
 
-#: ops.c:2852
+#: ../ops.c:2891
 msgid "1 line yanked"
 msgstr "1 �Ԥ���󥯤���ޤ���"
 
-#: ops.c:2854
+#: ../ops.c:2893
 #, c-format
 msgid "%ld lines yanked"
 msgstr "%ld �Ԥ���󥯤���ޤ���"
 
-#: ops.c:3139
+#: ../ops.c:3188
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: �쥸���� %s �ˤϲ��⤢��ޤ���"
 
 #. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
 "\n"
 "--- �쥸���� ---"
 
-#: ops.c:4997
+#: ../ops.c:5066
 msgid "Illegal register name"
 msgstr "�����ʥ쥸����̾"
 
-#: ops.c:5085
+#: ../ops.c:5154
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
 "\n"
 "# �쥸����:\n"
 
-#: ops.c:5135
+#: ../ops.c:5210
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ̤�ΤΥ쥸������ %d �Ǥ�"
 
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ̵���ʥ쥸����̾: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ��; "
 
-#: ops.c:5987
+#: ../ops.c:6092
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "���� %s%ld / %ld ��; %ld / %ld ñ��; %ld / %ld ʸ��"
 
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "���� %s%ld / %ld ��; %ld / %ld ñ��; %ld / %ld ʸ��; %ld / %ld �Х���"
+
+#: ../ops.c:6116
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "�� %s / %s; �� %ld of %ld; ñ�� %ld / %ld; ʸ�� %ld / %ld"
 
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"�� %s / %s; �� %ld / %ld; ñ�� %ld / %ld; ʸ�� %ld / %ld; �Х��� %ld of %ld"
+
+#: ../ops.c:6135
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1643
+#: ../option.c:1692
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N �ڡ���"
 
-#: option.c:2092
+#: ../option.c:2171
 msgid "Thanks for flying Vim"
 msgstr "Vim ��ȤäƤ���Ƥ��꤬�Ȥ�"
 
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
 msgid "E518: Unknown option"
 msgstr "E518: ̤�ΤΥ��ץ����Ǥ�"
 
-#: option.c:3432
+#: ../option.c:3607
 msgid "E519: Option not supported"
 msgstr "E519: ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: option.c:3457
+#: ../option.c:3632
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline �Ǥϵ��Ĥ���ޤ���"
 
-#: option.c:3522
+#: ../option.c:3703
 msgid ""
 "\n"
 "\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
 "\n"
 "\tLast set from "
 
-#: option.c:3661
+#: ../option.c:3842
 msgid "E521: Number required after ="
 msgstr "E521: = �θ�ˤϿ�����ɬ�פǤ�"
 
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ��ˤߤĤ���ޤ���"
 
-#: option.c:4064
+#: ../option.c:4258
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ������ʸ���Ǥ� <%s>"
 
-#: option.c:4611
+#: ../option.c:4823
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' �ˤ϶�ʸ���������Ǥ��ޤ���"
 
-#: option.c:4614
+#: ../option.c:4826
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: GUI�Ǥ� 'term' ���ѹ��Ǥ��ޤ���"
 
-#: option.c:4616
+#: ../option.c:4828
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: GUI�򥹥����Ȥ���ˤ� \":gui\" ����Ѥ��Ƥ�������"
 
-#: option.c:4645
+#: ../option.c:4857
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' �� 'patchmode' ��Ʊ���Ǥ�"
 
-#: option.c:4860
+#: ../option.c:5085
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+2 GUI�Ǥ��ѹ��Ǥ��ޤ���"
 
-#: option.c:5016
+#: ../option.c:5249
 msgid "E524: Missing colon"
 msgstr "E524: �����󤬤���ޤ���"
 
-#: option.c:5018
+#: ../option.c:5251
 msgid "E525: Zero length string"
 msgstr "E525: ʸ�����Ĺ���������Ǥ�"
 
-#: option.c:5086
+#: ../option.c:5326
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> �θ�˿���������ޤ���"
 
-#: option.c:5100
+#: ../option.c:5340
 msgid "E527: Missing comma"
 msgstr "E527: ����ޤ�����ޤ���"
 
-#: option.c:5107
+#: ../option.c:5347
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' ���ͤ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: option.c:5148
+#: ../option.c:5388
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: ɽ���Ǥ��ʤ�ʸ�����磻��ʸ����ޤ�Ǥ��ޤ�"
 
-#: option.c:5197
+#: ../option.c:5432
 msgid "E596: Invalid font(s)"
 msgstr "E596: ̵���ʥե���ȤǤ�"
 
-#: option.c:5205
+#: ../option.c:5440
 msgid "E597: can't select fontset"
 msgstr "E597: �ե���ȥ��åȤ�����Ǥ��ޤ���"
 
-#: option.c:5207
+#: ../option.c:5442
 msgid "E598: Invalid fontset"
 msgstr "E598: ̵���ʥե���ȥ��åȤǤ�"
 
-#: option.c:5214
+#: ../option.c:5449
 msgid "E533: can't select wide font"
 msgstr "E533: �磻�ɥե���Ȥ�����Ǥ��ޤ���"
 
-#: option.c:5216
+#: ../option.c:5451
 msgid "E534: Invalid wide font"
 msgstr "E534: ̵���ʥ磻�ɥե���ȤǤ�"
 
-#: option.c:5486
+#: ../option.c:5728
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> �θ��������ʸ��������ޤ�"
 
-#: option.c:5597
+#: ../option.c:5839
 msgid "E536: comma required"
 msgstr "E536: ����ޤ�ɬ�פǤ�"
 
-#: option.c:5607
+#: ../option.c:5849
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' �϶��Ǥ��뤫 %s ��ޤ�ɬ�פ�����ޤ�"
 
-#: option.c:5679
+#: ../option.c:5924
 msgid "E538: No mouse support"
 msgstr "E538: �ޥ����ϥ��ݡ��Ȥ���ޤ���"
 
-#: option.c:5947
+#: ../option.c:6195
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: ������λ���Ƥ��ޤ���"
 
-#: option.c:5951
+#: ../option.c:6199
 msgid "E541: too many items"
-msgstr "E541: ���Ǥ�¿�����ޤ�"
+msgstr "E541: ���Ǥ�¿�᤮�ޤ�"
 
-#: option.c:5953
+#: ../option.c:6201
 msgid "E542: unbalanced groups"
 msgstr "E542: ���롼�פ���礤�ޤ���"
 
-#: option.c:6193
+#: ../option.c:6441
 msgid "E590: A preview window already exists"
 msgstr "E590: �ץ�ӥ塼������ɥ�������¸�ߤ��ޤ�"
 
-#: option.c:6450
+#: ../option.c:6688
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: ����ӥ�ʸ���ˤ�UTF-8��ɬ�פʤΤ�, ':set encoding=utf-8' ���Ƥ�������"
 
-#: option.c:6776
+#: ../option.c:7052
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: ���� %d �ιԿ���ɬ�פǤ�"
 
-#: option.c:6786
+#: ../option.c:7062
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: ���� %d �Υ��������ɬ�פǤ�"
 
-#: option.c:7093
+#: ../option.c:7371
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ̤�ΤΥ��ץ����Ǥ�: %s"
 
-#: option.c:7213
+#: ../option.c:7504
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
 "\n"
 "--- ü�������� ---"
 
-#: option.c:7215
+#: ../option.c:7506
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
 "\n"
 "--- �������Х륪�ץ������ ---"
 
-#: option.c:7217
+#: ../option.c:7508
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
 "\n"
 "--- �������륪�ץ������ ---"
 
-#: option.c:7219
+#: ../option.c:7510
 msgid ""
 "\n"
 "--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
 "\n"
 "--- ���ץ���� ---"
 
-#: option.c:7925
+#: ../option.c:8240
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp ���顼"
 
-#: option.c:8896
+#: ../option.c:9217
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s ���б�����ʸ��������ޤ���"
 
-#: option.c:8930
+#: ../option.c:9243
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': ���ߥ�����θ��;ʬ��ʸ��������ޤ�: %s"
 
-#: os_amiga.c:280
+#: ../os_amiga.c:280
 msgid "cannot open "
 msgstr "�����ޤ��� "
 
-#: os_amiga.c:314
+#: ../os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: ������ɥ��򳫤��ޤ���!\n"
 
-#: os_amiga.c:338
+#: ../os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados�ΥС������ 2.04������ʹߤ�ɬ�פǤ�\n"
 
-#: os_amiga.c:344
+#: ../os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "%s �ΥС������ %ld ��ɬ�פǤ�\n"
 
-#: os_amiga.c:416
+#: ../os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "NIL�򳫤��ޤ���:\n"
 
-#: os_amiga.c:427
+#: ../os_amiga.c:427
 msgid "Cannot create "
 msgstr "�����Ǥ��ޤ��� "
 
-#: os_amiga.c:905
+#: ../os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim�� %d �ǽ�λ���ޤ�\n"
 
-#: os_amiga.c:937
+#: ../os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "���󥽡���⡼�ɤ��ѹ��Ǥ��ޤ���?!\n"
 
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ���󥽡���ǤϤʤ�??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f ���ץ����ǥ������¹ԤǤ��ޤ���"
 
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "�¹ԤǤ��ޤ��� "
 
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
 msgid "shell "
 msgstr "������ "
 
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
 msgid " returned\n"
 msgstr " ���ޤ���\n"
 
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE �����������ޤ�."
+msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
 
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "�����ϥ��顼"
 
-#: os_mswin.c:539
+#: ../os_mswin.c:597
 msgid "...(truncated)"
 msgstr "...(��ά)"
 
-#: os_mswin.c:641
+#: ../os_mswin.c:714
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ��80�ǤϤʤ�����, �������ޥ�ɤ�¹ԤǤ��ޤ���"
 
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
 msgid "E237: Printer selection failed"
 msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
 
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
 #, c-format
 msgid "to %s on %s"
 msgstr "%s �� (%s ���)"
 
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: ̤�ΤΥץ�󥿥��ץ����Ǥ�: %s"
 
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: �������顼: %s"
 
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "����"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
 #, c-format
 msgid "Printing '%s'"
 msgstr "�������Ƥ��ޤ�: '%s'"
 
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
 
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
 
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: ̵���� 'osfiletype' ���ץ���� - \"Text\" ��Ȥ��ޤ�"
 
-#: os_unix.c:927
+#: ../os_unix.c:989
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: 2�ŤΥ����ʥ�Τ���, ��λ���ޤ�\n"
 
-#: os_unix.c:933
+#: ../os_unix.c:995
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: ��̿Ū�����ʥ� %s ���Τ��ޤ���\n"
 
-#: os_unix.c:936
+#: ../os_unix.c:998
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: ��̿Ū�����ʥ���Τ��ޤ���\n"
 
-#: os_unix.c:1199
+#: ../os_unix.c:1318
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "X�����Фؤ���³�� %ld �ߥ��ä�����ޤ���"
 
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X �Υ��顼�򸡽Ф��ޤ�����³�Ԥ��ޤ�...\n"
+
+#: ../os_unix.c:1351
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
 "\n"
 "Vim: X �Υ��顼�򸡽Ф��ޤ���r\n"
 
-#: os_unix.c:1334
+#: ../os_unix.c:1464
 msgid "Testing the X display failed"
 msgstr "X display �Υ����å��˼��Ԥ��ޤ���"
 
-#: os_unix.c:1473
+#: ../os_unix.c:1603
 msgid "Opening the X display timed out"
 msgstr "X display �� open �������ॢ���Ȥ��ޤ���"
 
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
 "\n"
 "�������¹ԤǤ��ޤ��� "
 
-#: os_unix.c:3275
+#: ../os_unix.c:3432
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
 "\n"
 "sh �������¹ԤǤ��ޤ���\n"
 
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
 msgid ""
 "\n"
 "shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
 "\n"
 "�����뤬�ͤ��֤��ޤ��� "
 
-#: os_unix.c:3414
+#: ../os_unix.c:3578
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
 "\n"
 "�ѥ��פ�����Ǥ��ޤ���\n"
 
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
 "\n"
 "fork �Ǥ��ޤ���\n"
 
-#: os_unix.c:3920
+#: ../os_unix.c:4233
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
 "\n"
 "���ޥ�ɤ����Ǥ��ޤ���\n"
 
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
 msgid "XSMP lost ICE connection"
 msgstr "XSMP ��ICE��³�򼺤��ޤ���"
 
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
 msgid "Opening the X display failed"
 msgstr "X display �� open �˼��Ԥ��ޤ���"
 
-#: os_unix.c:5880
+#: ../os_unix.c:6297
 msgid "XSMP handling save-yourself request"
 msgstr "XSMP ��save-yourself�׵��������Ƥ��ޤ�"
 
-#: os_unix.c:5999
+#: ../os_unix.c:6416
 msgid "XSMP opening connection"
 msgstr "XSMP ����³�򳫻Ϥ��Ƥ��ޤ�"
 
-#: os_unix.c:6018
+#: ../os_unix.c:6435
 msgid "XSMP ICE connection watch failed"
 msgstr "XSMP ICE��³�����Ԥ����褦�Ǥ�"
 
-#: os_unix.c:6038
+#: ../os_unix.c:6455
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection�����Ԥ��ޤ���: %s"
 
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
 msgid "At line"
 msgstr "��"
 
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "���ޥ�ɥ饤��˥���������Ƥ��ޤ���"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
 
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
 msgid "VIM Error"
 msgstr "VIM���顼"
 
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
 
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
 #, c-format
 msgid "shell returned %d"
 msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
 
-#: os_win32.c:2655
+#: ../os_win32.c:2776
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ���٥�� %s ����\n"
 
-#: os_win32.c:2657
+#: ../os_win32.c:2778
 msgid "close"
 msgstr "�Ĥ���"
 
-#: os_win32.c:2659
+#: ../os_win32.c:2780
 msgid "logoff"
 msgstr "��������"
 
-#: os_win32.c:2660
+#: ../os_win32.c:2781
 msgid "shutdown"
 msgstr "����åȥ�����"
 
-#: os_win32.c:3150
+#: ../os_win32.c:3270
 msgid "E371: Command not found"
 msgstr "E371: ���ޥ�ɤ�����ޤ���"
 
-#: os_win32.c:3163
+#: ../os_win32.c:3283
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
 "�������ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
 "�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
 
-#: os_win32.c:3166
+#: ../os_win32.c:3286
 msgid "Vim Warning"
 msgstr "Vim�ηٹ�"
 
-#: quickfix.c:258
+#: ../quickfix.c:284
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: �ե����ޥå�ʸ����� %%%c ��¿�����ޤ�"
+msgstr "E372: �ե����ޥå�ʸ����� %%%c ��¿�᤮�ޤ�"
 
-#: quickfix.c:271
+#: ../quickfix.c:297
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: �ե����ޥå�ʸ�����ͽ������ %%%c ������ޤ���"
 
-#: quickfix.c:325
+#: ../quickfix.c:351
 msgid "E374: Missing ] in format string"
 msgstr "E374: �ե����ޥå�ʸ����� ] ������ޤ���"
 
-#: quickfix.c:339
+#: ../quickfix.c:365
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: �ե����ޥå�ʸ����Ǥ� %%%c �ϥ��ݡ��Ȥ���ޤ���"
 
-#: quickfix.c:357
+#: ../quickfix.c:383
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: �ե����ޥå�ʸ��������֤�̵���� %%%c ������ޤ�"
 
-#: quickfix.c:365
+#: ../quickfix.c:391
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �ե����ޥå�ʸ�����̵���� %%%c ������ޤ�"
 
-#: quickfix.c:391
+#: ../quickfix.c:417
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �˥ѥ����󤬻��ꤵ��Ƥ��ޤ���"
 
-#: quickfix.c:501
+#: ../quickfix.c:537
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �ǥ��쥯�ȥ�̾��̵�������Ǥ�"
 
-#: quickfix.c:990
+#: ../quickfix.c:1027
 msgid "E553: No more items"
 msgstr "E553: ���Ǥ��⤦����ޤ���"
 
-#: quickfix.c:1229
+#: ../quickfix.c:1324
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: quickfix.c:1231
+#: ../quickfix.c:1326
 msgid " (line deleted)"
 msgstr " (�Ԥ��������ޤ���)"
 
-#: quickfix.c:1444
+#: ../quickfix.c:1539
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �����å��������Ǥ�"
 
-#: quickfix.c:1453
+#: ../quickfix.c:1548
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �����å�����Ƭ�Ǥ�"
 
-#: quickfix.c:1465
+#: ../quickfix.c:1560
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "���顼���� %d of %d; %d �ĥ��顼"
 
-#: quickfix.c:1943
+#: ../quickfix.c:2042
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ���ץ�������ꤵ��Ƥ���Τǽ���ߤޤ���"
 
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �����ѥ����󤫶��ڤ국�椬�����Ǥ�"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: �ե�����̾��̵����̵���ʥѥ�����Ǥ�"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "�ե����� \"%s\" �򳫤��ޤ���"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: �Хåե����ɤ߹��ޤ�ޤ���Ǥ���"
+
+#: ../regexp.c:1006
 msgid "E339: Pattern too long"
-msgstr "E339: �ѥ�����Ĺ�����ޤ�"
+msgstr "E339: �ѥ�����Ĺ�᤮�ޤ�"
 
-#: regexp.c:1009
+#: ../regexp.c:1177
 msgid "E50: Too many \\z("
-msgstr "E50: \\z( ��¿�����ޤ�"
+msgstr "E50: \\z( ��¿�᤮�ޤ�"
 
-#: regexp.c:1020
+#: ../regexp.c:1188
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: %s( ��¿�����ޤ�"
+msgstr "E51: %s( ��¿�᤮�ޤ�"
 
-#: regexp.c:1077
+#: ../regexp.c:1245
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( ������äƤ��ޤ���"
 
-#: regexp.c:1081
+#: ../regexp.c:1249
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ������äƤ��ޤ���"
 
-#: regexp.c:1083
+#: ../regexp.c:1251
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ������äƤ��ޤ���"
 
-#: regexp.c:1088
+#: ../regexp.c:1256
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ������äƤ��ޤ���"
 
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* ����ʸ����ˤʤ��ǽ��������ޤ�"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ ����ʸ����ˤʤ��ǽ��������ޤ�"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ �θ��������ʸ��������ޤ���"
 
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ ����ʸ����ˤʤ��ǽ��������ޤ�"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
 #, c-format
 msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ʣ���� %s{...} ��¿�����ޤ�"
+msgstr "E60: ʣ���� %s{...} ��¿�᤮�ޤ�"
 
-#: regexp.c:1370
+#: ../regexp.c:1524
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* ������ҤˤʤäƤ��ޤ�"
 
-#: regexp.c:1373
+#: ../regexp.c:1527
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c ������ҤˤʤäƤ��ޤ�"
 
 #
-#: regexp.c:1491
+#: ../regexp.c:1647
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ��̵���ʻ�����ˡ�Ǥ�"
 
-#: regexp.c:1536
+#: ../regexp.c:1692
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c �θ�ˤʤˤ⤢��ޤ���"
 
 #
-#: regexp.c:1592
+#: ../regexp.c:1748
 msgid "E65: Illegal back reference"
 msgstr "E65: �����ʸ������ȤǤ�"
 
 #
-#: regexp.c:1605
+#: ../regexp.c:1761
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: regexp.c:1624
+#: ../regexp.c:1780
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 ����¾�ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: regexp.c:1635
+#: ../regexp.c:1791
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �θ��������ʸ��������ޤ���"
 
 #
-#: regexp.c:1684
+#: ../regexp.c:1840
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ �θ�� ] ������ޤ���"
 
-#: regexp.c:1700
+#: ../regexp.c:1856
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] �����Ǥ�"
 
 #
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] �θ��������ʸ��������ޤ���"
+
+#
+#: ../regexp.c:1952
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% �θ��������ʸ��������ޤ���"
 
-#: regexp.c:2557
+#: ../regexp.c:2922
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} ���ʸˡ���顼������ޤ�"
 
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ����å���ˤ������; ����ɽ����ʣ���᤮�뤫��?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: �ѥ�����ˤ�륹���å������顼�Ǥ�"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
 msgid "External submatches:\n"
 msgstr "��������ʬ����:\n"
 
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ���"
-
-#: screen.c:7959
+#: ../screen.c:7969
 msgid " VREPLACE"
 msgstr " �����ִ�"
 
-#: screen.c:7963
+#: ../screen.c:7973
 msgid " REPLACE"
 msgstr " �ִ�"
 
-#: screen.c:7968
+#: ../screen.c:7978
 msgid " REVERSE"
 msgstr " ȿž"
 
-#: screen.c:7970
+#: ../screen.c:7980
 msgid " INSERT"
 msgstr " ����"
 
-#: screen.c:7973
+#: ../screen.c:7983
 msgid " (insert)"
 msgstr " (����)"
 
-#: screen.c:7975
+#: ../screen.c:7985
 msgid " (replace)"
 msgstr " (�ִ�)"
 
-#: screen.c:7977
+#: ../screen.c:7987
 msgid " (vreplace)"
 msgstr " (�����ִ�)"
 
-#: screen.c:7980
+#: ../screen.c:7990
 msgid " Hebrew"
 msgstr " �إ֥饤"
 
-#: screen.c:7991
+#: ../screen.c:8001
 msgid " Arabic"
 msgstr " ����ӥ�"
 
-#: screen.c:7994
+#: ../screen.c:8004
 msgid " (lang)"
 msgstr " (����)"
 
-#: screen.c:7998
+#: ../screen.c:8008
 msgid " (paste)"
 msgstr " (Ž���դ�)"
 
-#: screen.c:8011
+#: ../screen.c:8021
 msgid " VISUAL"
 msgstr " �ӥ��奢��"
 
-#: screen.c:8012
+#: ../screen.c:8022
 msgid " VISUAL LINE"
 msgstr " �ӥ��奢�� ��"
 
-#: screen.c:8013
+#: ../screen.c:8023
 msgid " VISUAL BLOCK"
 msgstr " �ӥ��奢�� ���"
 
-#: screen.c:8014
+#: ../screen.c:8024
 msgid " SELECT"
 msgstr " ���쥯��"
 
-#: screen.c:8015
+#: ../screen.c:8025
 msgid " SELECT LINE"
 msgstr " �Իظ�����"
 
-#: screen.c:8016
+#: ../screen.c:8026
 msgid " SELECT BLOCK"
 msgstr " �������"
 
@@ -5226,118 +5739,118 @@ msgstr " �������"
 # msgstr " �֥��å�"
 # msgid " LINE"
 # msgstr " ��"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
 msgid "recording"
 msgstr "��Ͽ��"
 
-#: search.c:37
+#: ../search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "��ޤǸ��������Τǲ������ޤ�"
 
-#: search.c:38
+#: ../search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "���ޤǸ��������ΤǾ�����ޤ�"
 
-#: search.c:526
+#: ../search.c:525
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ̵���ʸ���ʸ����Ǥ�: %s"
 
-#: search.c:853
+#: ../search.c:868
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ��ޤǸ�����������ɳ����ս�Ϥ���ޤ���: %s"
 
-#: search.c:856
+#: ../search.c:871
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ���ޤǸ�����������ɳ����ս�Ϥ���ޤ���: %s"
 
-#: search.c:1249
+#: ../search.c:1265
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' �Τ��Ȥˤ� '?' �� '/' �����Ԥ���Ƥ���"
 
-#: search.c:3758
+#: ../search.c:4147
 msgid " (includes previously listed match)"
 msgstr " (������󤷤������ս��ޤ�)"
 
 #. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
 msgid "--- Included files "
 msgstr "--- ���󥯥롼�ɤ��줿�ե�����"
 
-#: search.c:3780
+#: ../search.c:4169
 msgid "not found "
 msgstr "�ߤĤ���ޤ��� "
 
-#: search.c:3781
+#: ../search.c:4170
 msgid "in path ---\n"
 msgstr "�ѥ��� ----\n"
 
-#: search.c:3820
+#: ../search.c:4227
 msgid "  (Already listed)"
 msgstr "  (�������)"
 
-#: search.c:3822
+#: ../search.c:4229
 msgid "  NOT FOUND"
 msgstr "  �ߤĤ���ޤ���"
 
-#: search.c:3874
+#: ../search.c:4281
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "���󥯥롼�ɤ��줿�ե�����򥹥������: %s"
 
-#: search.c:4092
+#: ../search.c:4499
 msgid "E387: Match is on current line"
 msgstr "E387: ���߹Ԥ˳���������ޤ�"
 
-#: search.c:4235
+#: ../search.c:4642
 msgid "All included files were found"
 msgstr "���ƤΥ��󥯥롼�ɤ��줿�ե����뤬�ߤĤ���ޤ���"
 
-#: search.c:4237
+#: ../search.c:4644
 msgid "No included files"
 msgstr "���󥯥롼�ɥե�����Ϥ���ޤ���"
 
-#: search.c:4253
+#: ../search.c:4660
 msgid "E388: Couldn't find definition"
 msgstr "E388: �����ߤĤ����ޤ���"
 
-#: search.c:4255
+#: ../search.c:4662
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �ѥ������ߤĤ����ޤ���"
 
-#: syntax.c:3050
+#: ../syntax.c:3070
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �����ʰ����Ǥ�: %s"
 
-#: syntax.c:3230
+#: ../syntax.c:3247
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: syntax.c:3394
+#: ../syntax.c:3411
 msgid "No Syntax items defined for this buffer"
 msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 
-#: syntax.c:3402
+#: ../syntax.c:3419
 msgid "syncing on C-style comments"
 msgstr "C�����������Ȥ���Ʊ����"
 
-#: syntax.c:3410
+#: ../syntax.c:3427
 msgid "no syncing"
 msgstr "��Ʊ��"
 
-#: syntax.c:3413
+#: ../syntax.c:3430
 msgid "syncing starts "
 msgstr "Ʊ������ "
 
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
 msgid " lines before top line"
 msgstr " ����(�ȥå׹Ԥ���)"
 
-#: syntax.c:3420
+#: ../syntax.c:3437
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
 "\n"
 "--- ��ʸƱ������ ---"
 
-#: syntax.c:3425
+#: ../syntax.c:3442
 msgid ""
 "\n"
 "syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
 "\n"
 "���Ǿ��Ʊ����"
 
-#: syntax.c:3431
+#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
 "\n"
 "--- ��ʸ���� ---"
 
-#: syntax.c:3454
+#: ../syntax.c:3471
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: syntax.c:3480
+#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal"
 
-#: syntax.c:3487
+#: ../syntax.c:3504
 msgid "maximal "
 msgstr "maximal"
 
-#: syntax.c:3499
+#: ../syntax.c:3516
 msgid "; match "
 msgstr "; ���� "
 
-#: syntax.c:3501
+#: ../syntax.c:3518
 msgid " line breaks"
 msgstr " �Ĥβ���"
 
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: ���ξ��Ǥϰ���contains�ϵ��Ĥ���Ƥ��ޤ���"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: ���ξ��Ǥϰ���containedin�ϵ��Ĥ���Ƥ��ޤ���"
+
+#: ../syntax.c:4179
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: �����Ǥϥ��롼�פϵ��Ĥ���ޤ���"
 
-#: syntax.c:4159
+#: ../syntax.c:4203
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s ���ϰ����Ǥ��ߤĤ���ޤ���"
 
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ���ξ��Ǥϰ���contains�ϵ��Ĥ���Ƥ��ޤ���"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: ���ξ��Ǥϰ���containedin�ϵ��Ĥ���Ƥ��ޤ���"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
 msgid "E397: Filename required"
 msgstr "E397: �ե�����̾��ɬ�פǤ�"
 
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' ������ޤ���: %s"
+
+#: ../syntax.c:4644
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ������ޤ���: %s"
 
-#: syntax.c:4772
+#: ../syntax.c:4803
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ��������ޤ���: ��ʸ�ϰ� %s"
 
-#: syntax.c:5103
+#: ../syntax.c:5133
 msgid "E400: No cluster specified"
 msgstr "E400: ���饹�������ꤵ��Ƥ��ޤ���"
 
-#: syntax.c:5140
+#: ../syntax.c:5170
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �ѥ�������ڤ꤬�ߤĤ���ޤ���: %s"
 
-#: syntax.c:5215
+#: ../syntax.c:5245
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: �ѥ�����Τ��Ȥ˥��ߤ�����ޤ�: %s"
 
-#: syntax.c:5305
+#: ../syntax.c:5335
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: ��ʸƱ��: Ϣ³�ԥѥ�����2�ٻ��ꤵ��ޤ���"
 
-#: syntax.c:5362
+#: ../syntax.c:5392
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: �����ʰ����Ǥ�: %s"
 
-#: syntax.c:5412
+#: ../syntax.c:5442
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ������ sign ������ޤ���: %s"
 
-#: syntax.c:5418
+#: ../syntax.c:5448
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: ���ΰ���: %s"
 
-#: syntax.c:5445
+#: ../syntax.c:5475
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
-#: syntax.c:5452
+#: ../syntax.c:5482
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s �����ƥꥹ�Ȥ���Ƭ�Ǥʤ���Фʤ�ʤ�"
 
-#: syntax.c:5522
+#: ../syntax.c:5552
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ̤�ΤΥ��롼��̾: %s"
 
-#: syntax.c:5755
+#: ../syntax.c:5786
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ̵���� :syntax �Υ��֥��ޥ��: %s"
 
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim �κƵ��ƤӽФ��򸡽Ф��ޤ���"
+
+#: ../syntax.c:6181
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �ϥ��饤�ȥ��롼�פ��ߤĤ���ޤ���: %s"
 
-#: syntax.c:6158
+#: ../syntax.c:6205
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: ��������ʬ�ǤϤʤ�: \":highlight link %s\""
 
-#: syntax.c:6165
+#: ../syntax.c:6212
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ������¿�����ޤ�: \":highlight link %s\""
+msgstr "E413: ������¿�᤮�ޤ�: \":highlight link %s\""
 
-#: syntax.c:6185
+#: ../syntax.c:6232
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: ���롼�פ����ꤵ��Ƥ���Τǥϥ��饤�ȥ�󥯤�̵�뤵��ޤ�"
 
-#: syntax.c:6314
+#: ../syntax.c:6361
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: ͽ������Ʊ�� sign �Ǥ�: %s"
 
-#: syntax.c:6350
+#: ../syntax.c:6397
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: Ʊ�� sign ������ޤ���: %s"
 
-#: syntax.c:6378
+#: ../syntax.c:6425
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ����������ޤ���: %s"
 
-#: syntax.c:6415
+#: ../syntax.c:6462
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: �������ͤǤ�: %s"
 
-#: syntax.c:6534
+#: ../syntax.c:6581
 msgid "E419: FG color unknown"
 msgstr "E419: ̤�Τ����ʿ��Ǥ�"
 
-#: syntax.c:6545
+#: ../syntax.c:6592
 msgid "E420: BG color unknown"
 msgstr "E420: ̤�Τ��طʿ��Ǥ�"
 
-#: syntax.c:6606
+#: ../syntax.c:6653
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: ���顼̾���ֹ��ǧ���Ǥ��ޤ���: %s"
 
-#: syntax.c:6812
+#: ../syntax.c:6859
 #, c-format
 msgid "E422: terminal code too long: %s"
-msgstr "E422: ��ü�����ɤ�Ĺ�����ޤ�: %s"
+msgstr "E422: ��ü�����ɤ�Ĺ�᤮�ޤ�: %s"
 
-#: syntax.c:6859
+#: ../syntax.c:6906
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: �����ʰ����Ǥ�: %s"
 
-#: syntax.c:7388
+#: ../syntax.c:7435
 msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ¿���ΰۤʤ�ϥ��饤��°�����Ȥ�줹���Ƥ��ޤ�"
+msgstr "E424: ¿���ΰۤʤ�ϥ��饤��°�����Ȥ��᤮�Ƥ��ޤ�"
 
-#: syntax.c:7909
+#: ../syntax.c:7955
 msgid "E669: Unprintable character in group name"
 msgstr "E669: ���롼��̾�˰����Բ�ǽ��ʸ��������ޤ�"
 
-#. This is an error, but since there previously was no check only
-#. * give a warning.
-#: syntax.c:7916
+#: ../syntax.c:7963
 msgid "W18: Invalid character in group name"
 msgstr "W18: ���롼��̾��������ʸ��������ޤ�"
 
-#: tag.c:90
+#: ../tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ���������å��������Ǥ�"
 
-#: tag.c:91
+#: ../tag.c:91
 msgid "E556: at top of tag stack"
 msgstr "E556: ���������å�����Ƭ�Ǥ�"
 
-#: tag.c:412
+#: ../tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ǽ�γ���������Ķ������뤳�ȤϤǤ��ޤ���"
 
-#: tag.c:550
+#: ../tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: �������ߤĤ���ޤ���: %s"
 
-#: tag.c:583
+#: ../tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:586
+#: ../tag.c:586
 msgid "file\n"
 msgstr "�ե�����\n"
 
@@ -5571,44 +6091,44 @@ msgstr "�ե�����\n"
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:744
+#: ../tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "���򤹤��ֹ�����Ϥ��Ƥ������� (<CR>�����): "
 
-#: tag.c:784
+#: ../tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: ����������1�Ĥ�����������ޤ���"
 
-#: tag.c:786
+#: ../tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: �Ǹ�˳������륿����Ķ���ƿʤळ�ȤϤǤ��ޤ���"
 
-#: tag.c:810
+#: ../tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "�ե����� \"%s\" ������ޤ���"
 
 #. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "���� %d (��%d%s)"
 
-#: tag.c:826
+#: ../tag.c:826
 msgid " or more"
 msgstr " ������ʾ�"
 
-#: tag.c:828
+#: ../tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  ������ۤʤ�case�ǻ��Ѥ��ޤ�!"
 
-#: tag.c:872
+#: ../tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �ե����� \"%s\" ������ޤ���"
 
 #. Highlight title
-#: tag.c:941
+#: ../tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
 "\n"
 "  # TO ����        FROM ��    in file/text"
 
-#: tag.c:1363
+#: ../tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "�����ե����� %s �򸡺���"
 
-#: tag.c:1550
+#: ../tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: �����ե�����Υѥ��� %s ���ڤ�ΤƤ��ޤ���\n"
 
-#: tag.c:2203
+#: ../tag.c:2202
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: �����ե����� \"%s\" �Υե����ޥåȤ˥��顼������ޤ�"
 
-#: tag.c:2207
+#: ../tag.c:2206
 #, c-format
 msgid "Before byte %ld"
 msgstr "ľ���� %ld �Х���"
 
-#: tag.c:2240
+#: ../tag.c:2239
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: �����ե����뤬�����Ȥ���Ƥ��ޤ���: %s"
 
 #. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
 msgid "E433: No tags file"
 msgstr "E433: �����ե����뤬����ޤ���"
 
-#: tag.c:3016
+#: ../tag.c:3020
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �����ѥ������ߤĤ����ޤ���"
 
-#: tag.c:3027
+#: ../tag.c:3031
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: ������ߤĤ����ʤ��Τ�ñ�˿�¬���ޤ�!"
 
-#: term.c:1759
+#: ../term.c:1776
 msgid "' not known. Available builtin terminals are:"
 msgstr "' ��̤�ΤǤ�. ���Ԥ��Ȥ߹���ü���ϼ��ΤȤ���Ǥ�:"
 
-#: term.c:1783
+#: ../term.c:1800
 msgid "defaulting to '"
 msgstr "��ά�ͤ򼡤Τ褦�����ꤷ�ޤ� '"
 
-#: term.c:2141
+#: ../term.c:2158
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcap�ե�����򳫤��ޤ���"
 
-#: term.c:2145
+#: ../term.c:2162
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo��ü������ȥ��ߤĤ����ޤ���"
 
-#: term.c:2147
+#: ../term.c:2164
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap��ü������ȥ��ߤĤ����ޤ���"
 
-#: term.c:2306
+#: ../term.c:2323
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap�� \"%s\" �Υ���ȥ꤬����ޤ���"
 
-#: term.c:2780
+#: ../term.c:2797
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: ü���� \"cm\" ��ǽ��ɬ�פǤ�"
 
 #. Highlight title
-#: term.c:4990
+#: ../term.c:5039
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
 "\n"
 "--- ü������ ---"
 
-#: ui.c:258
+#: ../ui.c:276
 msgid "new shell started\n"
 msgstr "�������������ư���ޤ�\n"
 
-#: ui.c:1841
+#: ../ui.c:1860
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: ���Ϥ��ɹ�����Υ��顼�ˤ�꽪λ���ޤ�...\n"
 
 #. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
 msgid "No undo possible; continue anyway"
 msgstr "��ǽ�ʥ���ɥ��Ϥ���ޤ���: �Ȥꤢ����³���ޤ�"
 
-#: undo.c:561
+#: ../undo.c:578
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: ���ֹ椬�ְ�äƤ��ޤ�"
 
-#: undo.c:757
+#: ../undo.c:778
 msgid "1 change"
 msgstr "1 �ս��ѹ����ޤ���"
 
-#: undo.c:759
+#: ../undo.c:780
 #, c-format
 msgid "%ld changes"
 msgstr "%ld �ս��ѹ����ޤ���"
 
-#: undo.c:812
+#: ../undo.c:833
 msgid "E439: undo list corrupt"
 msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 
-#: undo.c:844
+#: ../undo.c:865
 msgid "E440: undo line missing"
 msgstr "E440: ����ɥ��Ԥ�����ޤ���"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
 "\n"
 "MS-Windows 16/32 �ӥå� GUI ��"
 
-#: version.c:1733
+#: ../version.c:724
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
 "\n"
 "MS-Windows 32 �ӥå� GUI ��"
 
-#: version.c:1736
+#: ../version.c:727
 msgid " in Win32s mode"
 msgstr " in Win32s �⡼��"
 
-#: version.c:1738
+#: ../version.c:729
 msgid " with OLE support"
 msgstr " with OLE ���ݡ���"
 
-#: version.c:1741
+#: ../version.c:732
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 �ӥå� ���󥽡��� ��"
 
-#: version.c:1745
+#: ../version.c:736
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
 "\n"
 "MS-Windows 16 �ӥå� ��"
 
-#: version.c:1749
+#: ../version.c:740
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
 "\n"
 "32 �ӥå� MS-DOS ��"
 
-#: version.c:1751
+#: ../version.c:742
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
 "\n"
 "16 �ӥå� MS-DOS ��"
 
-#: version.c:1757
+#: ../version.c:748
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
 "\n"
 "MacOS X (unix) ��"
 
-#: version.c:1759
+#: ../version.c:750
 msgid ""
 "\n"
 "MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
 "\n"
 "MacOS X ��"
 
-#: version.c:1762
+#: ../version.c:753
 msgid ""
 "\n"
 "MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
 "\n"
 "MacOS ��"
 
-#: version.c:1767
+#: ../version.c:758
 msgid ""
 "\n"
 "RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
 "\n"
 "RISC OS ��"
 
-#: version.c:1777
+#: ../version.c:768
 msgid ""
 "\n"
 "Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
 "\n"
 "Ŭ�Ѻѥѥå�: "
 
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
 msgid "Modified by "
 msgstr "Modified by "
 
-#: version.c:1810
+#: ../version.c:801
 msgid ""
 "\n"
 "Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: version.c:1813
+#: ../version.c:804
 msgid "by "
 msgstr "by "
 
-#: version.c:1825
+#: ../version.c:816
 msgid ""
 "\n"
 "Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
 "\n"
 "Huge �� "
 
-#: version.c:1828
+#: ../version.c:819
 msgid ""
 "\n"
 "Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
 "\n"
 "Big �� "
 
-#: version.c:1831
+#: ../version.c:822
 msgid ""
 "\n"
 "Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
 "\n"
 "�̾� �� "
 
-#: version.c:1834
+#: ../version.c:825
 msgid ""
 "\n"
 "Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
 "\n"
 "Small �� "
 
-#: version.c:1836
+#: ../version.c:827
 msgid ""
 "\n"
 "Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
 "\n"
 "Tiny �� "
 
-#: version.c:1842
+#: ../version.c:833
 msgid "without GUI."
 msgstr "without GUI."
 
-#: version.c:1847
+#: ../version.c:838
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
-#: version.c:1849
+#: ../version.c:840
 msgid "with GTK-GNOME GUI."
 msgstr "with GTK-GNOME GUI."
 
-#: version.c:1853
+#: ../version.c:844
 msgid "with GTK2 GUI."
 msgstr "with GTK2 GUI."
 
-#: version.c:1855
+#: ../version.c:846
 msgid "with GTK GUI."
 msgstr "with GTK GUI."
 
-#: version.c:1860
+#: ../version.c:851
 msgid "with X11-Motif GUI."
 msgstr "with X11-Motif GUI."
 
-#: version.c:1864
+#: ../version.c:855
 msgid "with X11-neXtaw GUI."
 msgstr "with X11-neXtaw GUI."
 
-#: version.c:1866
+#: ../version.c:857
 msgid "with X11-Athena GUI."
 msgstr "with X11-Athena GUI."
 
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
 msgid "with Photon GUI."
 msgstr "with Photon GUI."
 
-#: version.c:1876
+#: ../version.c:864
 msgid "with GUI."
 msgstr "with GUI."
 
-#: version.c:1879
+#: ../version.c:867
 msgid "with Carbon GUI."
 msgstr "with Carbon GUI."
 
-#: version.c:1882
+#: ../version.c:870
 msgid "with Cocoa GUI."
 msgstr "with Cocoa GUI."
 
-#: version.c:1885
+#: ../version.c:873
 msgid "with (classic) GUI."
 msgstr "with (���饷�å�) GUI."
 
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
 msgid "  Features included (+) or not (-):\n"
 msgstr "  ��ǽ�ΰ��� ͭ��(+)/̵��(-)\n"
 
-#: version.c:1908
+#: ../version.c:899
 msgid "   system vimrc file: \""
 msgstr "      �����ƥ� vimrc: \""
 
-#: version.c:1913
+#: ../version.c:904
 msgid "     user vimrc file: \""
 msgstr "        �桼�� vimrc: \""
 
-#: version.c:1918
+#: ../version.c:909
 msgid " 2nd user vimrc file: \""
 msgstr "     ��2�桼�� vimrc: \""
 
-#: version.c:1923
+#: ../version.c:914
 msgid " 3rd user vimrc file: \""
 msgstr "     ��3�桼�� vimrc: \""
 
-#: version.c:1928
+#: ../version.c:919
 msgid "      user exrc file: \""
 msgstr "         �桼�� exrc: \""
 
-#: version.c:1933
+#: ../version.c:924
 msgid "  2nd user exrc file: \""
 msgstr "      ��2�桼�� exrc: \""
 
-#: version.c:1939
+#: ../version.c:930
 msgid "  system gvimrc file: \""
 msgstr "     �����ƥ� gvimrc: \""
 
-#: version.c:1943
+#: ../version.c:934
 msgid "    user gvimrc file: \""
 msgstr "       �桼�� gvimrc: \""
 
-#: version.c:1947
+#: ../version.c:938
 msgid "2nd user gvimrc file: \""
 msgstr "    ��2�桼�� gvimrc: \""
 
-#: version.c:1952
+#: ../version.c:943
 msgid "3rd user gvimrc file: \""
 msgstr "    ��3�桼�� gvimrc: \""
 
-#: version.c:1959
+#: ../version.c:950
 msgid "    system menu file: \""
 msgstr "    �����ƥ��˥塼: \""
 
-#: version.c:1967
+#: ../version.c:958
 msgid "  fall-back for $VIM: \""
 msgstr "       ��ά���� $VIM: \""
 
-#: version.c:1973
+#: ../version.c:964
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "��ά���� $VIMRUNTIME: \""
 
-#: version.c:1977
+#: ../version.c:968
 msgid "Compilation: "
 msgstr "����ѥ���: "
 
-#: version.c:1983
+#: ../version.c:974
 msgid "Compiler: "
 msgstr "����ѥ���: "
 
-#: version.c:1988
+#: ../version.c:979
 msgid "Linking: "
 msgstr "���: "
 
-#: version.c:1993
+#: ../version.c:984
 msgid "  DEBUG BUILD"
 msgstr "�ǥХå��ӥ��"
 
-#: version.c:2032
+#: ../version.c:1023
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:2034
+#: ../version.c:1025
 msgid "version "
 msgstr "version "
 
-#: version.c:2035
+#: ../version.c:1026
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar ¾."
 
-#: version.c:2039
+#: ../version.c:1030
 msgid "Vim is open source and freely distributable"
 msgstr "Vim �ϥ����ץ󥽡����Ǥ��꼫ͳ�����۲�ǽ�Ǥ�"
 
-#: version.c:2041
+#: ../version.c:1032
 msgid "Help poor children in Uganda!"
 msgstr "��������ηäޤ�ʤ��Ҷ������˱����!"
 
-#: version.c:2042
+#: ../version.c:1033
 msgid "type  :help iccf<Enter>       for information "
 msgstr "�ܺ٤ʾ����           :help iccf<Enter>      "
 
-#: version.c:2044
+#: ../version.c:1035
 msgid "type  :q<Enter>               to exit         "
 msgstr "��λ����ˤ�           :q<Enter>              "
 
-#: version.c:2045
+#: ../version.c:1036
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "����饤��إ�פ�     :help<Enter> �� <F1>   "
 
-#: version.c:2046
-msgid "type  :help version6<Enter>   for version info"
-msgstr "�С����������       :help version6<Enter>  "
+#: ../version.c:1037
+msgid "type  :help version7<Enter>   for version info"
+msgstr "�С����������       :help version7<Enter>  "
 
-#: version.c:2049
+#: ../version.c:1040
 msgid "Running in Vi compatible mode"
 msgstr "Vi�ߴ��⡼�ɤ�ư����"
 
-#: version.c:2050
+#: ../version.c:1041
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim�侩�ͤˤ���ˤ�    :set nocp<Enter>       "
 
-#: version.c:2051
+#: ../version.c:1042
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "�ܺ٤ʾ����           :help cp-default<Enter>"
 
-#: version.c:2066
+#: ../version.c:1057
 msgid "menu  Help->Orphans           for information    "
 msgstr "�ܺ٤ϥ�˥塼�� �إ�ע��ɻ� �򻲾Ȥ��Ʋ�����   "
 
-#: version.c:2068
+#: ../version.c:1059
 msgid "Running modeless, typed text is inserted"
 msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
 
-#: version.c:2069
+#: ../version.c:1060
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "��˥塼�� �Խ����������ꢪ����(�鿴��)�⡼������"
 
-#: version.c:2070
+#: ../version.c:1061
 msgid "                              for two modes      "
 msgstr "                              �ǥ⡼��ͭ��       "
 
-#: version.c:2074
+#: ../version.c:1065
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "��˥塼�� �Խ����������ꢪVi�ߴ��⡼������      "
 
-#: version.c:2075
+#: ../version.c:1066
 msgid "                              for Vim defaults   "
 msgstr "                              ��Vim�Ȥ���ư��    "
 
-#: version.c:2122
+#: ../version.c:1113
 msgid "Sponsor Vim development!"
 msgstr "Vim�γ�ȯ����礷�Ƥ�������!"
 
-#: version.c:2123
+#: ../version.c:1114
 msgid "Become a registered Vim user!"
 msgstr "Vim����Ͽ�桼���ˤʤäƤ�������!"
 
-#: version.c:2126
+#: ../version.c:1117
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "�ܺ٤ʾ����           :help sponsor<Enter>   "
 
-#: version.c:2127
+#: ../version.c:1118
 msgid "type  :help register<Enter>   for information "
 msgstr "�ܺ٤ʾ����           :help register<Enter>  "
 
-#: version.c:2129
+#: ../version.c:1120
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "�ܺ٤ϥ�˥塼�� �إ�ע����ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����   "
 
-#: version.c:2139
+#: ../version.c:1130
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "   �ٹ�: Windows 95/98/Me �򸡽�  "
 
-#: version.c:2142
+#: ../version.c:1133
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " �ܺ٤ʾ����          :help windows95<Enter> "
 
-#: window.c:203
+#: ../window.c:208
 msgid "E441: There is no preview window"
 msgstr "E441: �ץ�ӥ塼������ɥ�������ޤ���"
 
-#: window.c:581
+#: ../window.c:603
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ����ȱ�����Ʊ����ʬ�䤹�뤳�ȤϤǤ��ޤ���"
 
-#: window.c:1340
+#: ../window.c:1362
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ¾�Υ�����ɥ���ʬ�䤵��Ƥ�����ˤϽ��Ǥ��ޤ���"
 
-#: window.c:1836
+#: ../window.c:1858
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ǹ�Υ�����ɥ����Ĥ��뤳�ȤϤǤ��ޤ���"
 
-#: window.c:2567
+#: ../window.c:2593
 msgid "Already only one window"
 msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
 
-#: window.c:2614
+#: ../window.c:2640
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾�Υ�����ɥ��ˤ��ѹ�������ޤ�"
 
-#: window.c:4480
+#: ../window.c:4564
 msgid "E446: No file name under cursor"
 msgstr "E446: ��������β��˥ե�����̾������ޤ���"
 
-#: window.c:4599
+#: ../window.c:4683
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#: globals.h:1232 if_perl.xs:326
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
-
-#: if_perl.xs:554
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: ����ɥܥå����Ǥ� Safe "
-"�⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����Ƥ��ޤ�"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "�ƥե�������̡��� Vim ���Խ�(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "���ե������1�Ĥ� Vim ���Խ�(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim �Ǻ�ʬ�Խ�(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim ���Խ�(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "��¸�� Vim ���Խ� - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "���򤵤줿�ե������ Vim ���Խ�"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "��ư���顼: gvim �˥ѥ����̤äƤ��뤫�Τ���Ƥ�������!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll ���顼"
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "�ѥ���Ĺ�����ޤ�!"
-
-#: globals.h:1022
+#: ../globals.h:1056
 msgid "--No lines in buffer--"
 msgstr "--�Хåե��˹Ԥ�����ޤ���--"
 
@@ -6200,388 +6668,418 @@ msgstr "--�Хåե��˹Ԥ�����ޤ���--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1185
+#: ../globals.h:1247
 msgid "E470: Command aborted"
 msgstr "E470: ���ޥ�ɤ����Ǥ���ޤ���"
 
-#: globals.h:1186
+#: ../globals.h:1248
 msgid "E471: Argument required"
 msgstr "E471: ������ɬ�פǤ�"
 
-#: globals.h:1187
+#: ../globals.h:1249
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ �θ�� / �� ? �� & �Ǥʤ���Фʤ�ޤ���"
 
-#: globals.h:1189
+#: ../globals.h:1251
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: ���ޥ�ɥ饤��Ǥ�̵���Ǥ�; <CR>�Ǽ¹�, CTRL-C�Ǥ���"
 
-#: globals.h:1191
+#: ../globals.h:1253
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: ���ߤΥǥ��쥯�ȥ�䥿�������Ǥ�exrc/vimrc�Υ��ޥ�ɤϵ��Ĥ���ޤ���"
 
-#: globals.h:1193
+#: ../globals.h:1255
 msgid "E171: Missing :endif"
 msgstr "E171: :endif ������ޤ���"
 
-#: globals.h:1194
+#: ../globals.h:1256
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry ������ޤ���"
 
-#: globals.h:1195
+#: ../globals.h:1257
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile ������ޤ���"
 
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ������ޤ���"
+
+#: ../globals.h:1259
 msgid "E588: :endwhile without :while"
 msgstr "E588: :while �Τʤ� :endwhile ������ޤ�"
 
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor �Τʤ� :for ������ޤ�"
+
+#: ../globals.h:1262
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: �ե����뤬¸�ߤ��ޤ� (! ���ɲäǾ��)"
 
-#: globals.h:1199
+#: ../globals.h:1263
 msgid "E472: Command failed"
 msgstr "E472: ���ޥ�ɤ����Ԥ��ޤ���"
 
-#: globals.h:1201
+#: ../globals.h:1265
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: ̤�ΤΥե���ȥ��å�: %s"
 
-#: globals.h:1205
+#: ../globals.h:1269
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: ̤�ΤΥե����: %s"
 
-#: globals.h:1208
+#: ../globals.h:1272
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
 
-#: globals.h:1210
+#: ../globals.h:1274
 msgid "E473: Internal error"
 msgstr "E473: �������顼�Ǥ�"
 
-#: globals.h:1211
+#: ../globals.h:1275
 msgid "Interrupted"
 msgstr "����ޤ�ޤ���"
 
-#: globals.h:1212
+#: ../globals.h:1276
 msgid "E14: Invalid address"
 msgstr "E14: ̵���ʥ��ɥ쥹�Ǥ�"
 
-#: globals.h:1213
+#: ../globals.h:1277
 msgid "E474: Invalid argument"
 msgstr "E474: ̵���ʰ����Ǥ�"
 
-#: globals.h:1214
+#: ../globals.h:1278
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: ̵���ʰ����Ǥ�: %s"
 
-#: globals.h:1216
+#: ../globals.h:1280
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: ̵���ʼ��Ǥ�: %s"
 
-#: globals.h:1218
+#: ../globals.h:1282
 msgid "E16: Invalid range"
 msgstr "E16: ̵�����ϰϤǤ�"
 
-#: globals.h:1219
+#: ../globals.h:1283
 msgid "E476: Invalid command"
 msgstr "E476: ̵���ʥ��ޥ�ɤǤ�"
 
-#: globals.h:1221
+#: ../globals.h:1285
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" �ϥǥ��쥯�ȥ�Ǥ�"
 
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: ͽ������ʸ���� '=' �����ˤ���ޤ���"
-
-#: globals.h:1227
+#: ../globals.h:1288
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: \"%s\"() �Υ饤�֥��ƽФ˼��Ԥ��ޤ���"
 
-#: globals.h:1233
+#: ../globals.h:1294
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: �饤�֥��δؿ� %s ������ɤǤ��ޤ���Ǥ���"
 
-#: globals.h:1235
+#: ../globals.h:1296
 msgid "E19: Mark has invalid line number"
 msgstr "E19: �ޡ�����̵���ʹ��ֹ椬���ꤵ��Ƥ��ޤ���"
 
-#: globals.h:1236
+#: ../globals.h:1297
 msgid "E20: Mark not set"
 msgstr "E20: �ޡ��������ꤵ��Ƥ��ޤ���"
 
-#: globals.h:1237
+#: ../globals.h:1298
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: 'modifiable' �����դʤΤ�, �ѹ��Ǥ��ޤ���"
 
-#: globals.h:1238
+#: ../globals.h:1299
 msgid "E22: Scripts nested too deep"
-msgstr "E22: ������ץȤ�����Ҥ��������ޤ�"
+msgstr "E22: ������ץȤ�����Ҥ����᤮�ޤ�"
 
-#: globals.h:1239
+#: ../globals.h:1300
 msgid "E23: No alternate file"
 msgstr "E23: ���ե�����Ϥ���ޤ���"
 
-#: globals.h:1240
+#: ../globals.h:1301
 msgid "E24: No such abbreviation"
 msgstr "E24: ���Τ褦��û�����ϤϤ���ޤ���"
 
-#: globals.h:1241
+#: ../globals.h:1302
 msgid "E477: No ! allowed"
 msgstr "E477: ! �ϵ��Ĥ���Ƥ��ޤ���"
 
-#: globals.h:1243
+#: ../globals.h:1304
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUI�ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�"
 
-#: globals.h:1246
+#: ../globals.h:1307
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: �إ֥饤��ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#: globals.h:1249
+#: ../globals.h:1310
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: �ڥ륷����ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#: globals.h:1252
+#: ../globals.h:1313
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: ����ӥ���ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#: globals.h:1255
+#: ../globals.h:1316
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: ���Τ褦��̾�Υϥ��饤�ȥ��롼�פϤ���ޤ���: %s"
 
-#: globals.h:1257
+#: ../globals.h:1318
 msgid "E29: No inserted text yet"
 msgstr "E29: �ޤ��ƥ����Ȥ���������Ƥ��ޤ���"
 
-#: globals.h:1258
+#: ../globals.h:1319
 msgid "E30: No previous command line"
 msgstr "E30: �����˥��ޥ�ɹԤ�����ޤ���"
 
-#: globals.h:1259
+#: ../globals.h:1320
 msgid "E31: No such mapping"
 msgstr "E31: ���Τ褦�ʥޥåԥ󥰤Ϥ���ޤ���"
 
-#: globals.h:1260
+#: ../globals.h:1321
 msgid "E479: No match"
 msgstr "E479: �����Ϥ���ޤ���"
 
-#: globals.h:1261
+#: ../globals.h:1322
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: �����Ϥ���ޤ���: %s"
 
-#: globals.h:1262
+#: ../globals.h:1323
 msgid "E32: No file name"
 msgstr "E32: �ե�����̾������ޤ���"
 
-#: globals.h:1263
+#: ../globals.h:1324
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: ����ɽ���ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#: globals.h:1264
+#: ../globals.h:1325
 msgid "E34: No previous command"
 msgstr "E34: ���ޥ�ɤ��ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#: globals.h:1265
+#: ../globals.h:1326
 msgid "E35: No previous regular expression"
 msgstr "E35: ����ɽ�����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#: globals.h:1266
+#: ../globals.h:1327
 msgid "E481: No range allowed"
 msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
 
-#: globals.h:1268
+#: ../globals.h:1329
 msgid "E36: Not enough room"
 msgstr "E36: ��ʬ�����̤�����ޤ���"
 
-#: globals.h:1271
+#: ../globals.h:1332
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: %s �Ȥ���̾������Ͽ���줿�����ФϤ���ޤ���"
 
-#: globals.h:1273
+#: ../globals.h:1334
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: �ե����� %s ������Ǥ��ޤ���"
 
-#: globals.h:1274
+#: ../globals.h:1335
 msgid "E483: Can't get temp file name"
 msgstr "E483: ����ե������̾��������Ǥ��ޤ���"
 
-#: globals.h:1275
+#: ../globals.h:1336
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: globals.h:1276
+#: ../globals.h:1337
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: �ե����� %s ���ɹ���ޤ���"
 
-#: globals.h:1277
+#: ../globals.h:1338
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
 
-#: globals.h:1278
+#: ../globals.h:1339
 msgid "E38: Null argument"
 msgstr "E38: ���������Ǥ�"
 
-#: globals.h:1280
+#: ../globals.h:1341
 msgid "E39: Number expected"
 msgstr "E39: ���ͤ��׵ᤵ��Ƥ��ޤ�"
 
-#: globals.h:1283
+#: ../globals.h:1344
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: ���顼�ե����� %s �򳫤��ޤ���"
 
-#: globals.h:1286
+#: ../globals.h:1347
 msgid "E233: cannot open display"
 msgstr "E233: �ǥ����ץ쥤�򳫤��ޤ���"
 
-#: globals.h:1288
+#: ../globals.h:1349
 msgid "E41: Out of memory!"
 msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
 
-#: globals.h:1290
+#: ../globals.h:1351
 msgid "Pattern not found"
 msgstr "�ѥ�����ϤߤĤ���ޤ���Ǥ���"
 
-#: globals.h:1292
+#: ../globals.h:1353
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: �ѥ�����ϤߤĤ���ޤ���Ǥ���: %s"
 
-#: globals.h:1293
+#: ../globals.h:1354
 msgid "E487: Argument must be positive"
 msgstr "E487: �����������ͤǤʤ���Фʤ�ޤ���"
 
-#: globals.h:1295
+#: ../globals.h:1356
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: ���Υǥ��쥯�ȥ�����ޤ���"
 
-#: globals.h:1299
+#: ../globals.h:1360
 msgid "E42: No Errors"
 msgstr "E42: ���顼�Ϥ���ޤ���"
 
-#: globals.h:1301
+#: ../globals.h:1362
 msgid "E43: Damaged match string"
 msgstr "E43: ����ʸ������»���Ƥ��ޤ�"
 
-#: globals.h:1302
+#: ../globals.h:1363
 msgid "E44: Corrupted regexp program"
 msgstr "E44: ����������ɽ���ץ������Ǥ�"
 
-#: globals.h:1303
+#: ../globals.h:1364
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly' ���ץ�������ꤵ��Ƥ��ޤ� (! ���ɲäǾ��)"
 
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: �ɼ������ѿ� \"%s\" �ˤ��ͤ�����Ǥ��ޤ���"
+
+#: ../globals.h:1367
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: �ɼ������ѿ� \"%s\" �����ꤹ�뤳�ȤϤǤ��ޤ���"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
 
-#: globals.h:1308
+#: ../globals.h:1370
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
 
-#: globals.h:1311
+#: ../globals.h:1373
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: ����ɥܥå����Ǥϵ�����ޤ���"
 
-#: globals.h:1313
+#: ../globals.h:1375
 msgid "E523: Not allowed here"
 msgstr "E523: �����Ǥϵ��Ĥ���ޤ���"
 
-#: globals.h:1316
+#: ../globals.h:1378
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: �����꡼��⡼�ɤ�����ˤ��б����Ƥ��ޤ���"
 
-#: globals.h:1318
+#: ../globals.h:1380
 msgid "E49: Invalid scroll size"
 msgstr "E49: ̵���ʥ����������̤Ǥ�"
 
-#: globals.h:1319
+#: ../globals.h:1381
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell' ���ץ���󤬶��Ǥ�"
 
-#: globals.h:1321
+#: ../globals.h:1383
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: sign �Υǡ������ɹ���ޤ���Ǥ���"
 
-#: globals.h:1323
+#: ../globals.h:1385
 msgid "E72: Close error on swap file"
 msgstr "E72: ����åץե�����Υ������������顼�Ǥ�"
 
-#: globals.h:1324
+#: ../globals.h:1386
 msgid "E73: tag stack empty"
 msgstr "E73: ���������å������Ǥ�"
 
-#: globals.h:1325
+#: ../globals.h:1387
 msgid "E74: Command too complex"
-msgstr "E74: ���ޥ�ɤ�ʣ�������ޤ�"
+msgstr "E74: ���ޥ�ɤ�ʣ���᤮�ޤ�"
 
-#: globals.h:1326
+#: ../globals.h:1388
 msgid "E75: Name too long"
-msgstr "E75: ̾����Ĺ�����ޤ�"
+msgstr "E75: ̾����Ĺ�᤮�ޤ�"
 
-#: globals.h:1327
+#: ../globals.h:1389
 msgid "E76: Too many ["
-msgstr "E76: [ ��¿�����ޤ�"
+msgstr "E76: [ ��¿�᤮�ޤ�"
 
-#: globals.h:1328
+#: ../globals.h:1390
 msgid "E77: Too many file names"
-msgstr "E77: �ե�����̾��¿�����ޤ�"
+msgstr "E77: �ե�����̾��¿�᤮�ޤ�"
 
-#: globals.h:1329
+#: ../globals.h:1391
 msgid "E488: Trailing characters"
 msgstr "E488: ;ʬ��ʸ��������ˤ���ޤ�"
 
-#: globals.h:1330
+#: ../globals.h:1392
 msgid "E78: Unknown mark"
 msgstr "E78: ̤�ΤΥޡ���"
 
-#: globals.h:1331
+#: ../globals.h:1393
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: �磻��ɥ����ɤ�Ÿ���Ǥ��ޤ���"
 
-#: globals.h:1333
+#: ../globals.h:1395
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' �� 'winminheight' ��꾮�����Ǥ��ޤ���"
 
-#: globals.h:1335
+#: ../globals.h:1397
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
 
-#: globals.h:1338
+#: ../globals.h:1400
 msgid "E80: Error while writing"
 msgstr "E80: �������Υ��顼"
 
-#: globals.h:1339
+#: ../globals.h:1401
 msgid "Zero count"
 msgstr "�����������"
 
-#: globals.h:1341
+#: ../globals.h:1403
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
 
-#: globals.h:1344
+#: ../globals.h:1406
 msgid "E449: Invalid expression received"
 msgstr "E449: ̵���ʼ���������ޤ���"
 
-#: globals.h:1347
+#: ../globals.h:1409
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �������顼�Ǥ�: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: ����å���ˤ������; ����ɽ����ʣ���᤮�뤫��?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: �ѥ�����ˤ�륹���å������顼�Ǥ�"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: �Хåե������Ǥ�"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index ae5c110c3..a7c6e3406 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,188 +3,188 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp932\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:102
+#: ../buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �o�b�t�@��1���쐬�ł��Ȃ��̂�, �I�����܂�..."
 
-#: buffer.c:105
+#: ../buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �o�b�t�@���쐬�ł��Ȃ��̂�, ���̂��g�p���܂�..."
 
-#: buffer.c:805
+#: ../buffer.c:857
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ������ꂽ�o�b�t�@�͂���܂���"
 
-#: buffer.c:807
+#: ../buffer.c:859
 msgid "E516: No buffers were deleted"
 msgstr "E516: �폜���ꂽ�o�b�t�@�͂���܂���"
 
-#: buffer.c:809
+#: ../buffer.c:861
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �j�����ꂽ�o�b�t�@�͂���܂���"
 
-#: buffer.c:817
+#: ../buffer.c:869
 msgid "1 buffer unloaded"
 msgstr "1 �̃o�b�t�@���������܂���"
 
-#: buffer.c:819
+#: ../buffer.c:871
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d �̃o�b�t�@���������܂���"
 
-#: buffer.c:824
+#: ../buffer.c:876
 msgid "1 buffer deleted"
 msgstr "1 �̃o�b�t�@���폜����܂���"
 
-#: buffer.c:826
+#: ../buffer.c:878
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d �̃o�b�t�@���폜����܂���"
 
-#: buffer.c:831
+#: ../buffer.c:883
 msgid "1 buffer wiped out"
 msgstr "1 �̃o�b�t�@���j������܂���"
 
-#: buffer.c:833
+#: ../buffer.c:885
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d �̃o�b�t�@���j������܂���"
 
-#: buffer.c:894
+#: ../buffer.c:946
 msgid "E84: No modified buffer found"
 msgstr "E84: �ύX���ꂽ�o�b�t�@�͂���܂���"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
 msgid "E85: There is no listed buffer"
 msgstr "E85: ���X�g�\\�������o�b�t�@�͂���܂���"
 
-#: buffer.c:945
+#: ../buffer.c:997
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: �o�b�t�@ %ld �͂���܂���"
 
-#: buffer.c:948
+#: ../buffer.c:1000
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �Ō�̃o�b�t�@���z���Ĉړ��͂ł��܂���"
 
-#: buffer.c:950
+#: ../buffer.c:1002
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �ŏ��̃o�b�t�@���O�ւ͈ړ��ł��܂���"
 
-#: buffer.c:988
+#: ../buffer.c:1044
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: �o�b�t�@ %ld �̕ύX�͕ۑ�����Ă��܂��� (! �ŕύX��j��)"
 
-#: buffer.c:1005
+#: ../buffer.c:1061
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ō�̃o�b�t�@�͉���ł��܂���"
 
-#: buffer.c:1538
+#: ../buffer.c:1611
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: �x��: �t�@�C�����̃��X�g���������܂�"
+msgstr "W14: �x��: �t�@�C�����̃��X�g�����߂��܂�"
 
-#: buffer.c:1709
+#: ../buffer.c:1795
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: �o�b�t�@ %ld ���݂���܂���"
 
-#: buffer.c:1940
+#: ../buffer.c:2058
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s �ɕ����̊Y��������܂���"
 
-#: buffer.c:1942
+#: ../buffer.c:2060
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s �ɊY������o�b�t�@�͂���܂���ł���"
 
-#: buffer.c:2337
+#: ../buffer.c:2473
 #, c-format
 msgid "line %ld"
 msgstr "�s %ld"
 
-#: buffer.c:2420
+#: ../buffer.c:2561
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: ���̖��O�̃o�b�t�@�͊��ɂ���܂�"
 
-#: buffer.c:2713
+#: ../buffer.c:2878
 msgid " [Modified]"
 msgstr " [�ύX����]"
 
-#: buffer.c:2718
+#: ../buffer.c:2883
 msgid "[Not edited]"
 msgstr "[���ҏW]"
 
-#: buffer.c:2723
+#: ../buffer.c:2888
 msgid "[New file]"
 msgstr "[�V�t�@�C��]"
 
-#: buffer.c:2724
+#: ../buffer.c:2889
 msgid "[Read errors]"
 msgstr "[�Ǎ��G���[]"
 
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
 msgid "[readonly]"
 msgstr "[�Ǎ���p]"
 
-#: buffer.c:2747
+#: ../buffer.c:2912
 msgid "1 line --%d%%--"
 msgstr "1 �s --%d%%--"
 
-#: buffer.c:2749
+#: ../buffer.c:2914
 msgid "%ld lines --%d%%--"
 msgstr "%ld �s --%d%%--"
 
-#: buffer.c:2756
+#: ../buffer.c:2921
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "�s %ld (�S�� %ld) --%d%%-- col "
 
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[����]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[����]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
 msgid "help"
 msgstr "�w���v"
 
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
 msgid "[help]"
 msgstr "[�w���v]"
 
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
 msgid "[Preview]"
 msgstr "[�v���r���[]"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "All"
 msgstr "�S��"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "Bot"
 msgstr "����"
 
-#: buffer.c:3777
+#: ../buffer.c:3933
 msgid "Top"
 msgstr "�擪"
 
-#: buffer.c:4523
+#: ../buffer.c:4702
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
 "\n"
 "# �o�b�t�@���X�g:\n"
 
-#: buffer.c:4556
+#: ../buffer.c:4737
 msgid "[Error List]"
 msgstr "[�G���[���X�g]"
 
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[����]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
 msgid ""
 "\n"
 "--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
 "\n"
 "--- �T�C�� ---"
 
-#: buffer.c:4901
+#: ../buffer.c:5082
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s �̃T�C��:"
 
-#: buffer.c:4907
+#: ../buffer.c:5088
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    �s=%ld  ���ʎq=%d  ���O=%s"
 
-#: diff.c:139
+#: ../diff.c:163
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: %ld �ȏ�̃o�b�t�@��diff�ł��܂���"
 
-#: diff.c:709
+#: ../diff.c:737
 msgid "E97: Cannot create diffs"
 msgstr "E97: �������쐬�ł��܂��� "
 
-#: diff.c:814
+#: ../diff.c:843
 msgid "Patch file"
 msgstr "�p�b�`�t�@�C��"
 
-#: diff.c:1065
+#: ../diff.c:1146
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�̏o�͂�Ǎ��߂܂���"
 
-#: diff.c:1815
+#: ../diff.c:1896
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���݂̃o�b�t�@�͍������[�h�ł͂���܂���"
 
-#: diff.c:1827
+#: ../diff.c:1908
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: �������[�h�ł��鑼�̃o�b�t�@�͂���܂���"
 
-#: diff.c:1835
+#: ../diff.c:1916
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: �������[�h�̃o�b�t�@��2�ȏ゠��̂ŁA�ǂ���g��������ł��܂���"
 
-#: diff.c:1858
+#: ../diff.c:1939
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �o�b�t�@ \"%s\" ���݂���܂���"
 
-#: diff.c:1864
+#: ../diff.c:1945
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �o�b�t�@ \"%s\" �͍������[�h�ł͂���܂���"
 
-#: digraph.c:2199
+#: ../digraph.c:2200
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ������Escape�͎g�p�ł��܂���"
 
-#: digraph.c:2384
+#: ../digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: �L�[�}�b�v�t�@�C�����݂���܂���"
 
-#: digraph.c:2411
+#: ../digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source �Ŏ捞�ރt�@�C���ȊO�ł� :loadkeymap ���g���܂���"
 
-#: edit.c:40
+#: ../edit.c:41
 msgid " Keyword completion (^N^P)"
 msgstr " �L�[���[�h�⊮ (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: edit.c:41
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " ^X ���[�h (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X ���[�h (^E^Y^L^]^F^I^K^D^U^V^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-#: edit.c:44
+#: ../edit.c:45
 msgid " Keyword Local completion (^N^P)"
 msgstr " �Ǐ��L�[���[�h�⊮ (^N^P)"
 
-#: edit.c:45
+#: ../edit.c:46
 msgid " Whole line completion (^L^N^P)"
 msgstr " �s(�S��)�⊮ (^L^N^P)"
 
-#: edit.c:46
+#: ../edit.c:47
 msgid " File name completion (^F^N^P)"
 msgstr "�t�@�C�����⊮ (^F^N^P)"
 
-#: edit.c:47
+#: ../edit.c:48
 msgid " Tag completion (^]^N^P)"
 msgstr " �^�O�⊮ (^]^N^P)"
 
-#: edit.c:48
+#: ../edit.c:49
 msgid " Path pattern completion (^N^P)"
 msgstr " �p�X�p�^�[���⊮ (^N^P)"
 
-#: edit.c:49
+#: ../edit.c:50
 msgid " Definition completion (^D^N^P)"
 msgstr " ��`�⊮ (^D^N^P)"
 
-#: edit.c:51
+#: ../edit.c:52
 msgid " Dictionary completion (^K^N^P)"
 msgstr " �����⊮ (^K^N^P)"
 
-#: edit.c:52
+#: ../edit.c:53
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " �V�\\�[���X�⊮ (^T^N^P)"
 
-#: edit.c:53
+#: ../edit.c:54
 msgid " Command-line completion (^V^N^P)"
 msgstr " �R�}���h���C���⊮ (^V^N^P)"
 
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ���[�U��`�⊮ (^U^N^P)"
+
+#: ../edit.c:58
 msgid "Hit end of paragraph"
 msgstr "�i���̍Ō�Ƀq�b�g"
 
-#: edit.c:962
+#: ../edit.c:994
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' �I�v�V��������ł�"
 
-#: edit.c:1166
+#: ../edit.c:1204
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' �I�v�V��������ł�"
 
-#: edit.c:2162
+#: ../edit.c:2204
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "�������X�L������: %s"
 
-#: edit.c:2368
+#: ../edit.c:2410
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (�}��) �X�N���[��(^E/^Y)"
 
-#: edit.c:2370
+#: ../edit.c:2412
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (�u��) �X�N���[�� (^E/^Y)"
 
-#: edit.c:2684
+#: ../edit.c:2813
 #, c-format
 msgid "Scanning: %s"
 msgstr "�X�L������: %s"
 
-#: edit.c:2719
+#: ../edit.c:2848
 msgid "Scanning tags."
 msgstr "�^�O���X�L������."
 
-#: edit.c:3381
+#: ../edit.c:3549
 msgid " Adding"
 msgstr " �ǉ���"
 
@@ -359,121 +359,283 @@ msgstr " �ǉ���"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3430
+#: ../edit.c:3598
 msgid "-- Searching..."
 msgstr "-- ������..."
 
-#: edit.c:3486
+#: ../edit.c:3654
 msgid "Back at original"
 msgstr "�n�߂ɖ߂�"
 
-#: edit.c:3491
+#: ../edit.c:3659
 msgid "Word from other line"
 msgstr "���̍s�̒P��"
 
-#: edit.c:3496
+#: ../edit.c:3664
 msgid "The only match"
 msgstr "�B��̊Y��"
 
-#: edit.c:3555
+#: ../edit.c:3723
 #, c-format
 msgid "match %d of %d"
 msgstr "%d �Ԗڂ̊Y�� (�S�Y�� %d ��)"
 
-#: edit.c:3558
+#: ../edit.c:3726
 #, c-format
 msgid "match %d"
 msgstr "%d �Ԗڂ̊Y��"
 
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: �\\�����ʕ����� :let �ɂ���܂���"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ���X�g�̃C���f�b�N�X���͈͊O�ł�: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: ����`�̕ϐ��ł�: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' ���݂���܂���"
+
+#: ../eval.c:97
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: ���m�̕ϐ�: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �̈����̓��X�g�^�łȂ���΂Ȃ�܂���"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s �̈����̓��X�g�^�܂��͎����^�łȂ���΂Ȃ�܂���"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: �����^�ɋ�̃L�[���g�����Ƃ͂ł��܂���"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: ���X�g�^���K�v�ł�"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: �����^���K�v�ł�"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �֐��̈��������߂��܂�: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: �����^�ɃL�[�����݂��܂���: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �֐� %s �͒�`�ςł�, �Ē�`����ɂ� ! ��ǉ����Ă�������"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: �����^���ɃG���g�������ɑ��݂��܂�"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: �֐��Q�ƌ^���v������܂�"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] �������^�Ƒg�ݍ��킹�Ă͎g���܂���"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: �قȂ����^�̕ϐ��ł� %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ���m�̊֐��ł�: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: �^�[�Q�b�g�����X�g�^���̗v�f�������Ȃ��ł�"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: �^�[�Q�b�g�����X�g�^���̗v�f���������ł�"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "���X�g�^�̒l��2�ȏ�� ; �����o����܂���"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s �̒l���ꗗ�\\���ł��܂���"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ���X�g�^�Ǝ����^�ȊO�̓C���f�b�N�X�w��ł��܂���"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] �͍Ō�łȂ���΂����܂���"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] �ɂ̓��X�g�^�̒l���K�v�ł�"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: ���X�g�^�ϐ��Ƀ^�[�Q�b�g���������v�f������܂�"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: ���X�g�^�ϐ��ɏ\\���Ȑ��̗v�f������܂���"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for �̌�� \"in\" ������܂���"
 
-#: eval.c:1320
+#: ../eval.c:2721
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: �J�b�R '(' ������܂���: %s"
 
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ���̕ϐ��͂���܂���: \"%s\""
 
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (�A���`)���b�N����ɂ͕ϐ��̓���q���[�߂��܂�"
+
+#: ../eval.c:3336
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' �̌�� ':' ������܂���"
 
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: ���X�g�^�̓��X�g�^�Ƃ�����r�ł��܂���"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ���X�g�^�ɂ͖����ȑ���ł�"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: �����^�͎����^�Ƃ�����r�ł��܂���"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: �����^�ɂ͖����ȑ���ł�"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: �֐��Q�ƌ^�͊֐��Q�ƌ^�Ƃ�����r�ł��܂���"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �֐��Q�ƌ^�ɂ͖����ȑ���ł�"
+
+#: ../eval.c:4086
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ���݂���܂���"
 
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' ���݂���܂���"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: �֐��Q�ƌ^�̓C���f�b�N�X�ł��܂���"
 
-#: eval.c:2466
+#: ../eval.c:4432
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: �I�v�V������������܂���: %s"
 
-#: eval.c:2484
+#: ../eval.c:4450
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ���m�̃I�v�V�����ł�: %s"
 
-#: eval.c:2555
+#: ../eval.c:4516
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ���p�� (\") ������܂���: %s"
 
-#: eval.c:2698
+#: ../eval.c:4652
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ���p�� (') ������܂���: %s"
 
-#: eval.c:3054
+#: ../eval.c:4731
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �֐� %s �ɂ͖����Ȉ����ł�"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ���X�g�^�ɃJ���}������܂���: %s"
 
-#: eval.c:3083
+#: ../eval.c:4739
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ���m�̊֐��ł�: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ���X�g�^�̍Ō�� ']' ������܂���: %s"
 
-#: eval.c:3084
+#: ../eval.c:5768
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �֐��̈������������܂�: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: �����^�ɃR����������܂���: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: �����^�ɏd���L�[�����񂴂����܂�"
 
-#: eval.c:3085
+#: ../eval.c:5811
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �֐��̈���������܂���: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: �����^�ɃJ���}������܂���: %s"
 
-#: eval.c:3086
+#: ../eval.c:5819
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: �X�N���v�g�ȊO��<SID>���g���܂���: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: �����^�̍Ō�� '}' ������܂���: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: �\\������ɂ͕ϐ��̓���q���[�߂��܂�"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: �����߂��܂�"
 
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s �Ƃ����L�[�͊��ɑ��݂��܂�"
+
+#: ../eval.c:8339
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld �s:"
 
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ���m�̊֐��ł�: %s"
+
+#: ../eval.c:9966
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
 "����(&O)\n"
 "�L�����Z��(&C)"
 
-#: eval.c:5517
+#: ../eval.c:10005
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() �� inputsave() ���������Ă΂�܂���"
 
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �V���{���b�N�����N�����߂��܂� (�z���Ă���\\��������܂�)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: �͈͎w��͋�����Ă��܂���"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() �ɂ͖����Ȍ^�ł�"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: �X�g���C�h(�O�i��)�� 0 �ł�"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: �J�n�ʒu���I���ʒu���z���܂���"
 
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<��>"
+
+#: ../eval.c:11287
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim �T�[�o�ւ̐ڑ�������܂���"
 
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s �֑��邱�Ƃ��ł��܂���"
+
+#: ../eval.c:11465
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �T�[�o�̉���������܂���"
 
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: �V���{���b�N�����N�����߂��܂� (�z���Ă���\\��������܂�)"
+
+#: ../eval.c:12144
 msgid "E258: Unable to send to client"
 msgstr "E258: �N���C�A���g�֑��邱�Ƃ��ł��܂���"
 
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s �֑��邱�Ƃ��ł��܂���"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: �\\�[�g�̔�r�֐������s���܂���"
 
-#: eval.c:6882
+#: ../eval.c:12670
 msgid "(Invalid)"
 msgstr "(����)"
 
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: �ꎞ�t�@�C���������ɃG���[���������܂���"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: �֐��Q�ƌ^�𐔒l�Ƃ��Ĉ����Ă��܂��B"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: ���X�g�^�𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: �����^�𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: �֐��Q�ƌ^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: ���X�g�^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �ϐ��^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+#: ../eval.c:14826
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ����`�̕ϐ��ł�: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: �֐��Q�ƌ^�ϐ����͑啶���Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: �ϐ����������̊֐����ƏՓ˂��܂�: %s"
 
-#: eval.c:8492
+#: ../eval.c:14840
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �s���ȕϐ����ł�: %s"
 
-#: eval.c:8784
+#: ../eval.c:14857
 #, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �֐� %s �͒�`�ςł�, �Ē�`����ɂ� ! ��ǉ����Ă�������"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: �ϐ��̌^����v���܂���: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: �l�����b�N����Ă��܂�: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "�s��"
 
-#: eval.c:8857
+#: ../eval.c:14952
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ����`�̊֐��ł�: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s �̒l��ύX�ł��܂���"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: �R�s�[�����ɂ͕ϐ��̓���q���[�߂��܂�"
 
-#: eval.c:8870
+#: ../eval.c:15458
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ������܂���: %s"
 
-#: eval.c:8903
+#: ../eval.c:15491
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: �s���Ȉ����ł�: %s"
 
-#: eval.c:8982
+#: ../eval.c:15579
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ������܂���"
 
-#: eval.c:9089
+#: ../eval.c:15765
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �֐� %s ���Ē�`�ł��܂���: �g�p���ł�"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �֐������X�N���v�g�̃t�@�C�����ƈ�v���܂���: %s"
 
-#: eval.c:9159
+#: ../eval.c:15878
 msgid "E129: Function name required"
 msgstr "E129: �֐������v������܂�"
 
-#: eval.c:9210
+#: ../eval.c:15963
 #, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: �֐����͑啶���Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: �֐����͑啶���Ŏn�܂邩�R�������܂܂Ȃ���΂Ȃ�܂���: %s"
 
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: ����`�̊֐��ł�: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: �֐� %s ���폜�ł��܂���: �g�p���ł�"
 
-#: eval.c:9455
+#: ../eval.c:16561
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: �֐��ďo�̓���q���� 'maxfuncdepth' �𒴂��܂���"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
 #, c-format
 msgid "calling %s"
 msgstr "%s �����s���ł�"
 
-#: eval.c:9570
+#: ../eval.c:16785
 #, c-format
 msgid "%s aborted"
 msgstr "%s �����f����܂���"
 
-#: eval.c:9572
+#: ../eval.c:16787
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s �� #%ld ��Ԃ��܂���"
 
-#: eval.c:9579
+#: ../eval.c:16797
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s �� \"%s\" ��Ԃ��܂���"
+msgid "%s returning %s"
+msgstr "%s �� %s ��Ԃ��܂���"
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
 #, c-format
 msgid "continuing in %s"
 msgstr "%s �̎��s���p�����ł�"
 
-#: eval.c:9621
+#: ../eval.c:16866
 msgid "E133: :return not inside a function"
 msgstr "E133: �֐��O�� :return ������܂���"
 
-#: eval.c:9952
+#: ../eval.c:17266
 msgid ""
 "\n"
 "# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
 "\n"
 "# �O���[�o���ϐ�:\n"
 
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16�i�� %02x,  8�i�� %03o"
 
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16�i�� %04x, 8�i�� %o"
 
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�i�� %08x, 8�i�� %o"
 
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: �s�����ꎩ�g�ɂ͈ړ��ł��܂���"
 
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
 msgid "1 line moved"
 msgstr "1 �s���ړ�����܂���"
 
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld �s���ړ�����܂���"
 
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld �s���t�B���^��������܂���"
 
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *�t�B���^* autocommand�͌��݂̃o�b�t�@��ύX���Ă͂����܂���"
 
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
 msgid "[No write since last change]\n"
 msgstr "[�Ō�̕ύX���ۑ�����Ă��܂���]\n"
 
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s �s��: "
 
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: �G���[�����߂���̂�, �ȍ~�̓X�L�b�v���܂�"
 
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfo�t�@�C�� \"%s\"%s%s%s ��Ǎ��ݒ� "
 
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
 msgid " info"
 msgstr " ���"
 
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
 msgid " marks"
 msgstr " �}�[�N"
 
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
 msgid " FAILED"
 msgstr " ���s"
 
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfo�t�@�C���������݂ł��܂���: %s"
 
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�t�@�C�� %s ��ۑ��ł��܂���!"
 
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfo�t�@�C�� \"%s\" �������ݒ�"
 
 #. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ���� viminfo �t�@�C���� Vim %s �ɂ���Đ�������܂���.\n"
 
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -708,47 +935,47 @@ msgstr ""
 "# �ύX����ۂɂ͏\\�����ӂ��Ă�������!\n"
 "\n"
 
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# ���̃t�@�C���������ꂽ���� 'encoding' �̒l\n"
 
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
 msgid "Illegal starting char"
 msgstr "�s���Ȑ擪�����ł�"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
 msgid "Save As"
 msgstr "�ʖ��ŕۑ�"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: �������O�̃t�@�C�������̃o�b�t�@�œǍ��܂�Ă��܂�"
 
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
 msgid "Write partial file?"
 msgstr "�t�@�C���𕔕��I�ɕۑ����܂���?"
 
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: �o�b�t�@�𕔕��I�ɕۑ�����ɂ� ! ���g���Ă�������"
 
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "�����̃t�@�C�� \"%.*s\" ���㏑�����܂���?"
 
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: �o�b�t�@ %ld �ɂ͖��O������܂���"
 
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: �t�@�C���͕ۑ�����܂���ł���: 'write' �I�v�V�����ɂ�薳���ł�"
 
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
 "\"%.*s\" �ɂ� 'readonly' �I�v�V�������ݒ肳��Ă��܂�\n"
 "�����I�ɏ㏑�����܂���?"
 
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
 msgid "Edit File"
 msgstr "�t�@�C����ҏW"
 
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommand���\\�������V�����o�b�t�@ %s ���폜���܂���"
 
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ���ł͂Ȃ������� :z �ɓn����܂���"
 
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim�ł̓V�F���R�}���h���g���܂���"
 
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ���K�\\���͕����ŋ�؂邱�Ƃ��ł��܂���"
 
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s �ɒu�����܂���? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
 msgid "(Interrupted) "
 msgstr "(�����܂�܂���)"
 
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 �ӏ��Y�����܂���"
+
+#: ../ex_cmds.c:4547
 msgid "1 substitution"
 msgstr "1 �ӏ��u�����܂���"
 
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld �ӏ��Y�����܂���"
+
+#: ../ex_cmds.c:4550
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld �ӏ��u�����܂���"
 
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
 msgid " on 1 line"
 msgstr " (�v 1 �s��)"
 
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
 #, c-format
 msgid " on %ld lines"
 msgstr " (�v %ld �s��)"
 
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ���ċA�I�ɂ͎g���܂���"
 
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global�R�}���h�ɐ��K�\\�����w�肳��Ă��܂���"
 
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "�p�^�[�����S�Ă̍s�ł݂���܂���: %s"
 
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
 "# �Ō�ɒu�����ꂽ������:\n"
 "$"
 
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
 msgid "E478: Don't panic!"
 msgstr "E478: �Q�ĂȂ��ł�������"
 
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: �c�O�ł��� '%s' �̃w���v�� %s �ɂ͂���܂���"
 
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: �c�O�ł��� %s �ɂ̓w���v������܂���"
 
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "�c�O�ł����w���v�t�@�C�� \"%s\" ���݂���܂���"
 
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: �f�B���N�g���ł͂���܂���: %s"
 
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: �����ݗp�� %s ���J���܂���"
 
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �Ǎ��p�� %s ���J���܂���"
 
 # Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1�̌���̃w���v�t�@�C���ɕ����̃G���R�[�h�����݂��Ă��܂�: %s"
 
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
 #, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: �^�O \"%s\" ���t�@�C�� %s �ɏd�����Ă��܂�"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: �^�O \"%s\" ���t�@�C�� %s/%s �ɏd�����Ă��܂�"
 
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ���m��sign�R�}���h�ł�: %s"
 
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
 msgid "E156: Missing sign name"
 msgstr "E156: sign��������܂���"
 
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
 msgid "E612: Too many signs defined"
 msgstr "E612: sign�̒�`������������܂���"
 
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ������sign�̃e�L�X�g�ł�: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ���m��sign�ł�: %s"
 
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
 msgid "E159: Missing sign number"
 msgstr "E159: sign�̔ԍ�������܂���"
 
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: �����ȃo�b�t�@���ł�: %s"
 
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ������sign���ʎq�ł�: %ld"
 
 # Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
 msgid " (NOT FOUND)"
 msgstr "  (�݂���܂���)"
 
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
 msgid " (not supported)"
 msgstr " (��T�|�[�g)"
 
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
 msgid "[Deleted]"
 msgstr "[�폜��]"
 
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�f�o�b�O���[�h�ɓ���܂�. ������ɂ� \"cont\" �Ɠ��͂��Ă�������."
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
 #, c-format
 msgid "line %ld: %s"
 msgstr "�s %ld: %s"
 
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
 #, c-format
 msgid "cmd: %s"
 msgstr "�R�}���h: %s"
 
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "�u���[�N�|�C���g \"%s%s\" �s %ld"
 
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �u���[�N�|�C���g���݂���܂���: %s"
 
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
 msgid "No breakpoints defined"
 msgstr "�u���[�N�|�C���g����`����Ă��܂���"
 
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  �s %ld"
 
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ���߂� :profile start <fname> �����s���Ă�������"
+
+#: ../ex_cmds2.c:1305
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "�ύX�� \"%.*s\" �ɕۑ����܂���?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
 msgid "Untitled"
 msgstr "����"
 
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: �o�b�t�@ \"%s\" �̕ύX�͕ۑ�����Ă��܂���"
 
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "�x��: �\\���������o�b�t�@�ֈړ����܂��� (autocommands �𒲂ׂĂ�������)"
 
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
 msgid "E163: There is only one file to edit"
 msgstr "E163: �ҏW����t�@�C����1��������܂���"
 
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
 msgid "E164: Cannot go before first file"
 msgstr "E164: �ŏ��̃t�@�C�����O�ɂ͍s���܂���"
 
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �Ō�̃t�@�C�����z���Č�ɂ͍s���܂���"
 
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ���̃R���p�C���ɂ͑Ή����Ă��܂���: %s"
 
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" �� \"%s\" ���猟����"
 
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" ��������"
 
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "'runtimepath' �̒��ɂ݂͂���܂���: \"%s\""
 
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
 msgid "Source Vim script"
 msgstr "Vim�X�N���v�g�̎捞��"
 
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�f�B���N�g���͎捞�߂܂���: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" ���捞�߂܂���"
 
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "�s %ld: \"%s\" ���捞�߂܂���"
 
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" ���捞��"
 
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "�s %ld: %s ���捞��"
 
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s �̎捞������"
 
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �x��: �s��؂��s���ł�. ^M ���Ȃ��̂ł��傤"
 
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"
 
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"
 
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
 #, c-format
 msgid "Page %d"
 msgstr "%d �y�[�W"
 
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
 msgid "No text to be printed"
 msgstr "�������e�L�X�g������܂���"
 
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
 msgid "Printing page %d (%d%%)"
 msgstr "�����: �y�[�W %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
 #, c-format
 msgid " Copy %d of %d"
 msgstr " �R�s�[ %d (�S %d ��)"
 
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
 #, c-format
 msgid "Printed: %s"
 msgstr "������܂���: %s"
 
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
 msgid "Printing aborted"
 msgstr "��������~����܂���"
 
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript�o�̓t�@�C���̏����݃G���[�ł�"
 
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: �t�@�C�� \"%s\" ���J���܂���"
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScript�̃��\\�[�X�t�@�C�� \"%s\" ��Ǎ��߂܂���"
 
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: �t�@�C�� \"%s\" �� PostScript ���\\�[�X�t�@�C���ł͂���܂���"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: �t�@�C�� \"%s\" �͑Ή����Ă��Ȃ� PostScript ���\\�[�X�t�@�C���ł�"
 
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: ���\\�[�X�t�@�C�� \"%s\" �̓o�[�W�������قȂ�܂�"
 
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: �݊����̖����}���`�o�C�g�G���R�[�f�B���O�ƕ����Z�b�g�ł�"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: �}���`�o�C�g�G���R�[�f�B���O�ł� printmbcharset ����ɂł��܂���"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: �}���`�o�C�g������������邽�߂̃f�t�H���g�t�H���g���w�肳��Ă��܂���"
+
+#: ../ex_cmds2.c:6175
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript�o�͗p�̃t�@�C�����J���܂���"
 
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �t�@�C�� \"%s\" ���J���܂���"
 
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"prolog.ps\" ���݂���܂���"
 
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"cidfont.ps\" ���݂���܂���"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"%s.ps\" ���݂���܂���"
 
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
 #, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: �}���`�o�C�g�������G���R�[�h \"%s\" �֕ϊ��ł��܂���"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: ����G���R�[�h \"%s\" �֕ϊ��ł��܂���"
 
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
 msgid "Sending to printer..."
 msgstr "�v�����^�ɑ��M��..."
 
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript�t�@�C���̈���Ɏ��s���܂���"
 
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
 msgid "Print job sent."
 msgstr "����W���u�𑗐M���܂���."
 
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "���݂� %s����: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ����� \"%s\" �ɐݒ�ł��܂���"
 
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex���[�h�ɓ���܂�. �m�[�}���ɖ߂�ɂ�\"visual\"�Ɠ��͂��Ă�������."
 
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
 msgid "E501: At end-of-file"
 msgstr "E501: �t�@�C���̏I���ʒu"
 
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
 msgid "E169: Command too recursive"
 msgstr "E169: �R�}���h���ċA�I�߂��܂�"
 
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: ��O���ߑ�����܂���ł���: %s"
 
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
 msgid "End of sourced file"
 msgstr "�捞�t�@�C���̍Ō�ł�"
 
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
 msgid "End of function"
 msgstr "�֐��̍Ō�ł�"
 
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ���[�U��`�R�}���h�̂����܂��Ȏg�p�ł�"
 
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
 msgid "E492: Not an editor command"
 msgstr "E492: �G�f�B�^�̃R�}���h�ł͂���܂���"
 
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
 msgid "E493: Backwards range given"
 msgstr "E493: �t���܂͈̔͂��w�肳��܂���"
 
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
 msgid "Backwards range given, OK to swap"
 msgstr "�t���܂͈̔͂��w�肳��܂���, ���ւ��܂���?"
 
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
 msgid "E494: Use w or w>>"
 msgstr "E494: w �������� w>> ���g�p���Ă�������"
 
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���̃o�[�W�����ł͂��̃R�}���h�͗��p�ł��܂���, ���߂�Ȃ���"
 
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
 msgid "E172: Only one file name allowed"
 msgstr "E172: �t�@�C������ 1 �ɂ��Ă�������"
 
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "�ҏW���ׂ��t�@�C���� 1 ����܂���, �I�����܂���?"
 
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "�ҏW���ׂ��t�@�C�������� %d ����܂���, �I�����܂���?"
 
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
 msgid "E173: 1 more file to edit"
 msgstr "E173: �ҏW���ׂ��t�@�C���� 1 ����܂�"
 
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: �ҏW���ׂ��t�@�C�������� %ld ����܂�"
 
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: �R�}���h�����ɂ���܂�: �Ē�`����ɂ� ! ��ǉ����Ă�������"
 
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
 "\n"
 "    ���O        ���� �͈�  �⊮      ��`"
 
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
 msgid "No user-defined commands found"
 msgstr "���[�U��`�R�}���h��������܂���ł���"
 
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
 msgid "E175: No attribute specified"
 msgstr "E175: �����͒�`����Ă��܂���"
 
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
 msgid "E176: Invalid number of arguments"
 msgstr "E176: �����̐��������ł�"
 
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: �J�E���g��2�d�w�肷�邱�Ƃ͂ł��܂���"
 
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
 msgid "E178: Invalid default value for count"
 msgstr "E178: �J�E���g�̏ȗ��l�������ł�"
 
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
 msgid "E179: argument required for complete"
 msgstr "E179: �⊮�̂��߂̈������K�v�ł�"
 
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: �����ȕ⊮�w��ł�: %s"
 
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: �⊮�����̓J�X�^���⊮�ł����g�p�ł��܂���"
 
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: �J�X�^���⊮�ɂ͈����Ƃ��Ċ֐����K�v�ł�"
 
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: �����ȑ����ł�: %s"
 
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
 msgid "E182: Invalid command name"
 msgstr "E182: �����ȃR�}���h���ł�"
 
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ���[�U��`�R�}���h�͉p�啶���Ŏn�܂�Ȃ���΂Ȃ�܂���"
 
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: ���̃��[�U��`�R�}���h�͂���܂���: %s"
 
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: �J���[�X�L�[�� %s ���݂���܂���"
 
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
 msgid "Greetings, Vim user!"
 msgstr "Vim �g������A�₠!"
 
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
 msgid "Edit File in new window"
 msgstr "�V�����E�B���h�E�Ńt�@�C����ҏW���܂�"
 
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
 msgid "No swap file"
 msgstr "�X���b�v�t�@�C��������܂���"
 
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
 msgid "Append File"
 msgstr "�ǉ��t�@�C��"
 
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: �o�b�t�@���C������Ă���̂�, �f�B���N�g����ύX�ł��܂��� (! "
+"��ǉ��ŏ㏑)"
+
+#: ../ex_docmd.c:7248
 msgid "E186: No previous directory"
 msgstr "E186: �O�̃f�B���N�g���͂���܂���"
 
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
 msgid "E187: Unknown"
 msgstr "E187: ���m"
 
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: "
 
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "�E�B���h�E�ʒu: X %d, Y %d"
 
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: ���̃v���b�g�z�[���ɂ̓E�B���h�E�ʒu�̎擾�@�\\�͎�������Ă��܂���"
 
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ɂ�2�̐��l�̈������K�v�ł�"
 
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
 msgid "Save Redirection"
 msgstr "���_�C���N�g��ۑ����܂�"
 
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
 msgid "Save View"
 msgstr "�r���[��ۑ����܂�"
 
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
 msgid "Save Session"
 msgstr "�Z�b�V��������ۑ����܂�"
 
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
 msgid "Save Setup"
 msgstr "�ݒ��ۑ����܂�"
 
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: �f�B���N�g�����쐬�ł��܂���: %s"
+
+#: ../ex_docmd.c:8185
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" �����݂��܂� (�㏑����ɂ� ! ��ǉ����Ă�������)"
 
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" �������ݗp�Ƃ��ĊJ���܂���"
 
 #. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: �����͕������O�i/��ރN�H�[�g�ł��Ȃ���΂����܂���"
 
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �̍ċA���p���[���Ȃ肷���܂���"
+msgstr "E192: :normal �̍ċA���p���[���Ȃ�߂��܂���"
 
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'��u�������镛�t�@�C���̖��O������܂���"
 
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"��u��������autocommand�̃t�@�C����������܂���"
 
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"��u��������autocommand�o�b�t�@�ԍ�������܂���"
 
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"��u��������autocommand�̊Y����������܂���"
 
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"��u�������� :source �Ώۃt�@�C����������܂���"
 
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' �� '#' �������t�@�C���Ȃ̂� \":p:h\" �𔺂�Ȃ��g�����͂ł��܂���"
 
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: �󕶎���Ƃ��ĕ]������܂���"
 
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo�t�@�C����Ǎ��p�Ƃ��ĊJ���܂���"
 
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
 msgid "E196: No digraphs in this version"
 msgstr "E196: ���̃o�[�W�����ɍ����͂���܂���"
 
-#: ex_eval.c:440
+#: ../ex_eval.c:439
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' �Ŏn�܂��O�� :throw �ł��܂���"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "��O���������܂���: %s"
 
-#: ex_eval.c:576
+#: ../ex_eval.c:575
 #, c-format
 msgid "Exception finished: %s"
 msgstr "��O���������܂���: %s"
 
-#: ex_eval.c:577
+#: ../ex_eval.c:576
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "��O���j������܂���: %s"
 
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, �s %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
 #, c-format
 msgid "Exception caught: %s"
 msgstr "��O���ߑ�����܂���: %s"
 
-#: ex_eval.c:713
+#: ../ex_eval.c:712
 #, c-format
 msgid "%s made pending"
 msgstr "%s �ɂ�薢�����Ԃ������܂���"
 
-#: ex_eval.c:716
+#: ../ex_eval.c:715
 #, c-format
 msgid "%s resumed"
 msgstr "%s ���ĊJ���܂���"
 
-#: ex_eval.c:720
+#: ../ex_eval.c:719
 #, c-format
 msgid "%s discarded"
 msgstr "%s ���j������܂���"
 
-#: ex_eval.c:746
+#: ../ex_eval.c:745
 msgid "Exception"
 msgstr "��O"
 
-#: ex_eval.c:752
+#: ../ex_eval.c:751
 msgid "Error and interrupt"
 msgstr "�G���[�Ɗ�����"
 
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
 msgid "Error"
 msgstr "�G���["
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
 msgid "Interrupt"
 msgstr "������"
 
-#: ex_eval.c:830
+#: ../ex_eval.c:829
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if �̓���q���[�߂��܂�"
 
-#: ex_eval.c:867
+#: ../ex_eval.c:866
 msgid "E580: :endif without :if"
 msgstr "E580: :if �̂Ȃ� :endif ������܂�"
 
-#: ex_eval.c:911
+#: ../ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :if �̂Ȃ� :else ������܂�"
 
-#: ex_eval.c:914
+#: ../ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :if �̂Ȃ� :elseif ������܂�"
 
-#: ex_eval.c:921
+#: ../ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: ������ :else ������܂�"
 
-#: ex_eval.c:924
+#: ../ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :else �̌�� :elseif ������܂�"
 
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while �̓���q���[���߂��܂�"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while �� :for �̓���q���[�߂��܂�"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while �� :for �̂Ȃ� :continue ������܂�"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while �� :for �̂Ȃ� :break ������܂�"
 
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while �̂Ȃ� :continue ������܂�"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor �� :while �Ƒg�ݍ��킹�Ă��܂�"
 
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while �̂Ȃ� :break ������܂�"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile �� :for �Ƒg�ݍ��킹�Ă��܂�"
 
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try �̓���q���[�߂��܂�"
 
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
 msgid "E603: :catch without :try"
 msgstr "E603: :try �̂Ȃ� :catch ������܂�"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally �̌�� :catch ������܂�"
 
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
 msgid "E606: :finally without :try"
 msgstr "E606: :try �̂Ȃ� :finally ������܂�"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
 msgid "E607: multiple :finally"
 msgstr "E607: ������ :finalyy ������܂�"
 
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
 msgid "E602: :endtry without :try"
 msgstr "E602: :try �̂Ȃ� :endtry �ł�"
 
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �֐��̊O�� :endfunction ������܂���"
 
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
 msgid "tagname"
 msgstr "�^�O��"
 
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
 msgid " kind file\n"
 msgstr " �t�@�C�����\n"
 
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
 msgid "'history' option is zero"
 msgstr "�I�v�V���� 'history' ���[���ł�"
 
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
 #, c-format
 msgid ""
 "\n"
@@ -1563,259 +1839,263 @@ msgstr ""
 "\n"
 "# %s ���ڂ̗��� (�V�������̂���Â����̂�):\n"
 
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
 msgid "Command Line"
 msgstr "�R�}���h���C��"
 
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
 msgid "Search String"
 msgstr "����������"
 
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
 msgid "Expression"
 msgstr "��"
 
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
 msgid "Input Line"
 msgstr "���͍s"
 
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ���R�}���h���𒴂��܂���"
 
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: �A�N�e�B�u�ȃE�B���h�E���o�b�t�@���폜����܂���"
 
-#: fileio.c:371
+#: ../fileio.c:374
 msgid "Illegal file name"
 msgstr "�s���ȃt�@�C����"
 
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
 msgid "is a directory"
 msgstr " �̓f�B���N�g���ł�"
 
-#: fileio.c:397
+#: ../fileio.c:401
 msgid "is not a file"
 msgstr " �̓t�@�C���ł͂���܂���"
 
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
 msgid "[New File]"
 msgstr "[�V�t�@�C��]"
 
-#: fileio.c:584
+#: ../fileio.c:594
 msgid "[Permission Denied]"
 msgstr "[�F������܂���]"
 
-#: fileio.c:688
+#: ../fileio.c:705
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand ���t�@�C����Ǎ��s�ɂ��܂���"
 
-#: fileio.c:690
+#: ../fileio.c:707
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand �͌��݂̃o�b�t�@��ς����܂���"
 
-#: fileio.c:711
+#: ../fileio.c:728
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: �W�����͂���Ǎ���...\n"
 
-#: fileio.c:717
+#: ../fileio.c:734
 msgid "Reading from stdin..."
 msgstr "�W�����͂���Ǎ��ݒ�..."
 
 #. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �ϊ����t�@�C����Ǎ��s�ɂ��܂���"
 
-#: fileio.c:2027
+#: ../fileio.c:2084
 msgid "[fifo/socket]"
 msgstr "[FIFO/�\\�P�b�g]"
 
-#: fileio.c:2034
+#: ../fileio.c:2091
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#: fileio.c:2041
+#: ../fileio.c:2098
 msgid "[socket]"
 msgstr "[�\\�P�b�g]"
 
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
 msgid "[RO]"
 msgstr "[�ǐ�]"
 
-#: fileio.c:2059
+#: ../fileio.c:2116
 msgid "[CR missing]"
 msgstr "[CR��]"
 
-#: fileio.c:2064
+#: ../fileio.c:2121
 msgid "[NL found]"
 msgstr "[NL�L]"
 
-#: fileio.c:2069
+#: ../fileio.c:2126
 msgid "[long lines split]"
 msgstr "[���s����]"
 
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
 msgid "[NOT converted]"
 msgstr "[���ϊ�]"
 
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
 msgid "[converted]"
 msgstr "[�ϊ���]"
 
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
 msgid "[crypted]"
 msgstr "[�Í���]"
 
-#: fileio.c:2094
+#: ../fileio.c:2151
 msgid "[CONVERSION ERROR]"
 msgstr "[�ϊ��G���[]"
 
-#: fileio.c:2100
+#: ../fileio.c:2157
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[%ld �s�ڂ̕s���ȃo�C�g]"
 
-#: fileio.c:2107
+#: ../fileio.c:2164
 msgid "[READ ERRORS]"
 msgstr "[�Ǎ��G���[]"
 
-#: fileio.c:2323
+#: ../fileio.c:2380
 msgid "Can't find temp file for conversion"
 msgstr "�ϊ��ɕK�v�Ȉꎞ�t�@�C�����݂���܂���"
 
-#: fileio.c:2330
+#: ../fileio.c:2387
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' �ɂ��ϊ������s���܂���"
 
-#: fileio.c:2333
+#: ../fileio.c:2390
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' �̏o�͂�Ǎ��߂܂���ł���"
 
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwrite�o�b�t�@�̊Y������autocommand�͑��݂��܂���"
+
+#: ../fileio.c:2821
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: �ۑ�����o�b�t�@��autocommand���폜��������܂���"
 
-#: fileio.c:2756
+#: ../fileio.c:2844
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommand���\\�����ʕ��@�ōs����ύX���܂���"
 
 # Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
 msgid "NetBeans dissallows writes of unmodified buffers"
 msgstr "NetBeans�͖��ύX�̃o�b�t�@���㏑���邱�Ƃ͋����Ă��܂���"
 
-#: fileio.c:2802
+#: ../fileio.c:2892
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans�o�b�t�@�̈ꕔ�������o�����Ƃ͂ł��܂���"
 
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
 msgid "is not a file or writable device"
 msgstr "�̓t�@�C���ł������݉\\�f�o�C�X�ł�����܂���"
 
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
 msgid "is read-only (add ! to override)"
 msgstr "�͓Ǎ���p�ł� (���������ɂ� ! ��ǉ�)"
 
-#: fileio.c:3272
+#: ../fileio.c:3362
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �o�b�N�A�b�v�t�@�C����ۑ��ł��܂��� (! ��ǉ��ŋ����ۑ�)"
 
-#: fileio.c:3284
+#: ../fileio.c:3374
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: �o�b�N�A�b�v�t�@�C�������ۂɃG���[���������܂��� (! ��ǉ��ŋ���)"
 
-#: fileio.c:3286
+#: ../fileio.c:3376
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �o�b�N�A�b�v�p�t�@�C����Ǎ��߂܂��� (! ��ǉ��ŋ����Ǎ�)"
 
-#: fileio.c:3302
+#: ../fileio.c:3392
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ����쐬)"
 
-#: fileio.c:3405
+#: ../fileio.c:3495
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �o�b�N�A�b�v�t�@�C�������܂��� (! ��ǉ��ŋ����쐬)"
 
-#: fileio.c:3467
+#: ../fileio.c:3557
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: ���\\�[�X�t�H�[�N�������邩������܂��� (! ��ǉ��ŋ���)"
 
-#: fileio.c:3566
+#: ../fileio.c:3667
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: �ۑ��p�ꎞ�t�@�C�����݂���܂���"
 
-#: fileio.c:3584
+#: ../fileio.c:3685
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �ϊ��ł��܂��� (! ��ǉ��ŕϊ������ɕۑ�)"
 
-#: fileio.c:3619
+#: ../fileio.c:3720
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: �����N���ꂽ�t�@�C���ɏ����߂܂���"
 
-#: fileio.c:3623
+#: ../fileio.c:3724
 msgid "E212: Can't open file for writing"
 msgstr "E212: �����ݗp�Ƀt�@�C�����J���܂���"
 
-#: fileio.c:3885
+#: ../fileio.c:4000
 msgid "E667: Fsync failed"
 msgstr "E667: fsync �Ɏ��s���܂���"
 
-#: fileio.c:3892
+#: ../fileio.c:4007
 msgid "E512: Close failed"
 msgstr "E512: ���邱�ƂɎ��s"
 
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: �����݃G���[, �ϊ����s"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: �����݃G���[, �ϊ����s (�㏑����ɂ� 'fenc' ����ɂ��Ă�������)"
 
-#: fileio.c:3969
+#: ../fileio.c:4084
 msgid "E514: write error (file system full?)"
 msgstr "E514: �����݃G���[, (�t�@�C���V�X�e�������t?)"
 
-#: fileio.c:4036
+#: ../fileio.c:4151
 msgid " CONVERSION ERROR"
 msgstr " �ϊ��G���["
 
-#: fileio.c:4052
+#: ../fileio.c:4167
 msgid "[Device]"
 msgstr "[�f�o�C�X]"
 
-#: fileio.c:4057
+#: ../fileio.c:4172
 msgid "[New]"
 msgstr "[�V]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " [a]"
 msgstr " [a]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " appended"
 msgstr " �ǉ�"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " [w]"
 msgstr " [w]"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " written"
 msgstr " ������"
 
-#: fileio.c:4131
+#: ../fileio.c:4249
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: ���{�t�@�C����ۑ��ł��܂���"
 
-#: fileio.c:4153
+#: ../fileio.c:4271
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: ��̌��{�t�@�C����touch�ł��܂���"
 
-#: fileio.c:4168
+#: ../fileio.c:4286
 msgid "E207: Can't delete backup file"
 msgstr "E207: �o�b�N�A�b�v�t�@�C���������܂���"
 
-#: fileio.c:4232
+#: ../fileio.c:4350
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
 "\n"
 "�x��: ���{�t�@�C��������ꂽ���ύX����܂���\n"
 
-#: fileio.c:4234
+#: ../fileio.c:4352
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�t�@�C���̕ۑ��ɐ�������܂ŃG�f�B�^���I�����Ȃ��ł�������!"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos format]"
 msgstr "[dos�t�H�[�}�b�g]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac format]"
 msgstr "[mac�t�H�[�}�b�g]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix format]"
 msgstr "[unix�t�H�[�}�b�g]"
 
-#: fileio.c:4364
+#: ../fileio.c:4482
 msgid "1 line, "
 msgstr "1 �s, "
 
-#: fileio.c:4366
+#: ../fileio.c:4484
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld �s, "
 
-#: fileio.c:4369
+#: ../fileio.c:4487
 msgid "1 character"
 msgstr "1 ����"
 
-#: fileio.c:4371
+#: ../fileio.c:4489
 #, c-format
 msgid "%ld characters"
 msgstr "%ld ����"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[Incomplete last line]"
 msgstr "[�ŏI�s���s���S]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4400
+#: ../fileio.c:4518
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "�x��: �Ǎ��񂾌�Ƀt�@�C���ɕύX������܂���!!!"
 
-#: fileio.c:4402
+#: ../fileio.c:4520
 msgid "Do you really want to write to it"
 msgstr "�{���ɏ㏑�����܂���"
 
-#: fileio.c:5566
+#: ../fileio.c:5746
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" �������ݒ��̃G���[�ł�"
 
-#: fileio.c:5573
+#: ../fileio.c:5753
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" ����鎞�ɃG���[�ł�"
 
-#: fileio.c:5576
+#: ../fileio.c:5756
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" ��Ǎ����̃G���[�ł�"
 
-#: fileio.c:5810
+#: ../fileio.c:5993
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand �� FileChangedShell ���o�b�t�@���폜���܂���"
 
-#: fileio.c:5817
+#: ../fileio.c:6000
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: �x��: �t�@�C�� \"%s\" �͊��ɑ��݂��܂���"
 
-#: fileio.c:5831
+#: ../fileio.c:6014
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: �x��: �t�@�C�� \"%s\" ���ύX����Vim�̃o�b�t�@���ύX����܂���"
 
-#: fileio.c:5834
+#: ../fileio.c:6017
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: �x��: �t�@�C�� \"%s\" �͕ҏW�J�n��ɕύX����܂���"
 
-#: fileio.c:5836
+#: ../fileio.c:6019
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: �x��: �t�@�C�� \"%s\" �̃��[�h���ҏW�J�n��ɕύX����܂���"
 
-#: fileio.c:5846
+#: ../fileio.c:6029
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: �x��: �t�@�C�� \"%s\" �͕ҏW�J�n��ɍ쐬����܂���"
 
-#: fileio.c:5859
+#: ../fileio.c:6042
 msgid "See \":help W11\" for more info."
 msgstr "�ڍׂ� \":help W11\" ���Q�Ƃ��Ă�������"
 
-#: fileio.c:5873
+#: ../fileio.c:6056
 msgid "Warning"
 msgstr "�x��"
 
-#: fileio.c:5874
+#: ../fileio.c:6057
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
 "&OK\n"
 "�t�@�C���Ǎ�(&L)"
 
-#: fileio.c:5980
+#: ../fileio.c:6159
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" �������[�h���鏀�����ł��܂���ł���"
 
-#: fileio.c:5999
+#: ../fileio.c:6178
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �̓����[�h�ł��܂���ł���"
 
-#: fileio.c:6580
+#: ../fileio.c:6773
 msgid "--Deleted--"
 msgstr "--�폜��--"
 
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <�o�b�t�@=%d> �������I�ɍ폜����܂�"
+
 #. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���̃O���[�v�͂���܂���: \"%s\""
 
-#: fileio.c:6866
+#: ../fileio.c:7090
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �̌�ɕs���ȕ���������܂���: %s"
 
-#: fileio.c:6878
+#: ../fileio.c:7102
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: ���̂悤�ȃC�x���g�͂���܂���: %s"
 
-#: fileio.c:6880
+#: ../fileio.c:7104
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: ���̂悤�ȃO���[�v�������̓C�x���g�͂���܂���: %s"
 
 #. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <�o�b�t�@=%d>: �����ȃo�b�t�@�ԍ��ł�"
+
+#: ../fileio.c:7635
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: �S�ẴC�x���g�ɑ΂��Ă�autocommand�͎��s�ł��܂���"
 
-#: fileio.c:7332
+#: ../fileio.c:7658
 msgid "No matching autocommands"
 msgstr "�Y������autocommand�͑��݂��܂���"
 
-#: fileio.c:7653
+#: ../fileio.c:7982
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand�̓���q���[�����܂�"
+msgstr "E218: autocommand�̓���q���[�߂��܂�"
 
-#: fileio.c:7928
+#: ../fileio.c:8290
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: fileio.c:7936
+#: ../fileio.c:8298
 #, c-format
 msgid "Executing %s"
 msgstr "%s �����s���Ă��܂�"
 
 #. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8571
+#: ../fileio.c:8961
 msgid "E219: Missing {."
 msgstr "E219: { ������܂���."
 
-#: fileio.c:8573
+#: ../fileio.c:8963
 msgid "E220: Missing }."
 msgstr "E220: } ������܂���."
 
-#: fold.c:68
+#: ../fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: �܏�݂�����܂���"
 
-#: fold.c:593
+#: ../fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: ���݂� 'foldmethod' �ł͐܏�݂��쐬�ł��܂���"
 
-#: fold.c:595
+#: ../fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ���݂� 'foldmethod' �ł͐܏�݂��폜�ł��܂���"
 
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld �s���܏�܂�܂���"
+
+#: ../getchar.c:249
 msgid "E222: Add to read buffer"
 msgstr "E222: �Ǎ��o�b�t�@�֒ǉ�"
 
-#: getchar.c:2198
+#: ../getchar.c:2234
 msgid "E223: recursive mapping"
 msgstr "E223: �ċA�I�}�b�s���O"
 
-#: getchar.c:3077
+#: ../getchar.c:3114
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s �Ƃ����O���[�o���Z�k���͂͊��ɑ��݂��܂�"
 
-#: getchar.c:3080
+#: ../getchar.c:3117
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s �Ƃ����O���[�o���}�b�s���O�͊��ɑ��݂��܂�"
 
-#: getchar.c:3212
+#: ../getchar.c:3249
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s �Ƃ����Z�k���͂͊��ɑ��݂��܂�"
 
-#: getchar.c:3215
+#: ../getchar.c:3252
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �Ƃ����}�b�s���O�͊��ɑ��݂��܂�"
 
-#: getchar.c:3279
+#: ../getchar.c:3316
 msgid "No abbreviation found"
 msgstr "�Z�k���݂͂͂���܂���ł���"
 
-#: getchar.c:3281
+#: ../getchar.c:3318
 msgid "No mapping found"
 msgstr "�}�b�s���O�݂͂���܂���ł���"
 
-#: getchar.c:4173
+#: ../getchar.c:4210
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �s���ȃ��[�h"
 
-#: gui.c:220
+#: ../gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUI���J�n�ł��܂���"
 
-#: gui.c:349
+#: ../gui.c:355
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: \"%s\"����Ǎ��ނ��Ƃ��ł��܂���"
 
-#: gui.c:472
+#: ../gui.c:478
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: �L���ȃt�H���g��������Ȃ��̂�, GUI���J�n�ł��܂���"
 
-#: gui.c:477
+#: ../gui.c:483
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 'guifontwide' �������ł�"
 
-#: gui.c:547
+#: ../gui.c:553
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: 'imactivatekey' �ɐݒ肳�ꂽ�l�������ł�"
 
-#: gui.c:4061
+#: ../gui.c:4070
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: %s �̐F�����蓖�Ă��܂���"
 
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "�J�[�\\���̈ʒu�Ƀ}�b�`�͂���܂���, �����������Ă��܂�"
+
+#: ../gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<�J���܂���>"
 
-#: gui_at_fs.c:1136
+#: ../gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: �t�H���g %s ���擾�ł��܂���"
 
-#: gui_at_fs.c:2781
+#: ../gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: ���݂̃f�B���N�g���ɖ߂�܂���"
 
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "�p�X��:"
 
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: ���݂̃f�B���N�g�����擾�ł��܂���"
 
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
 msgid "OK"
 msgstr "OK"
 
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
 msgid "Cancel"
 msgstr "�L�����Z��"
 
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "�X�N���[���o�[: �摜���擾�ł��܂���ł���."
 
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
 msgid "Vim dialog"
 msgstr "Vim �_�C�A���O"
 
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ���b�Z�[�W�ƃR�[���o�b�N�̂��� BalloonEval ���쐬�ł��܂���"
 
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
 msgid "Vim dialog..."
 msgstr "Vim �_�C�A���O..."
 
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
 "������(&N)\n"
 "�L�����Z��(&C)"
 
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
 msgid "Input _Methods"
 msgstr "�C���v�b�g���\\�b�h"
 
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
 msgid "VIM - Search and Replace..."
 msgstr "VIM - �����ƒu��..."
 
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
 msgid "VIM - Search..."
 msgstr "VIM - ����..."
 
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
 msgid "Find what:"
 msgstr "����������:"
 
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
 msgid "Replace with:"
 msgstr "�u��������:"
 
 #. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
 msgid "Match whole word only"
 msgstr "���m�ɊY��������̂���"
 
 #. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
 msgid "Match case"
 msgstr "�啶��/����������ʂ���"
 
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
 msgid "Direction"
 msgstr "����"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
 msgid "Up"
 msgstr "��"
 
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
 msgid "Down"
 msgstr "��"
 
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
 msgid "Find Next"
 msgstr "��������"
 
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
 msgid "Replace"
 msgstr "�u��"
 
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
 msgid "Replace All"
 msgstr "�S�Ēu��"
 
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: �Z�b�V�����}�l�[�W������ \"die\" �v�����󂯎��܂���\n"
 
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: ���C���E�B���h�E���s�ӂɔj�󂳂�܂���\n"
 
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
 msgid "Font Selection"
 msgstr "�t�H���g�I��"
 
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "��̑I��̈�̂�����CUT_BUFFER0���g�p����܂���"
 
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "�t�B���^"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "�t�B���^(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "�L�����Z��(&C)"
 
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
 msgid "Directories"
 msgstr "�f�B���N�g��"
 
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "�w���v"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "�t�B���^"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "�w���v(&H)"
 
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
 msgid "Files"
 msgstr "�t�@�C��"
 
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
 msgid "Selection"
 msgstr "�I��"
 
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "�A���h�D"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "��������(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "�u��(&R)"
 
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "�S�Ēu��(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "�A���h�D(&U)"
+
+#: ../gui_riscos.c:952
 #, c-format
 msgid "E610: Can't load Zap font '%s'"
 msgstr "E610: Zap�t�H���g '%s' ��Ǎ��߂܂���"
 
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
 #, c-format
 msgid "E611: Can't use font %s"
 msgstr "E611: �t�H���g %s ���g�p�ł��܂���"
 
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
 "\n"
 "�q�v���Z�X�֒�~���b�Z�[�W�𑗐M���ł�.\n"
 
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�݂͂���܂���"
+
+#: ../gui_w32.c:848
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: �����̓T�|�[�g����܂���: \"-%s\"; OLE�ł��g�p���Ă�������."
 
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI�A�v���̒��ł̓E�B���h�E���J���܂���"
+
+#: ../gui_w48.c:2213
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "���������� ('\\' ����������ɂ� '\\\\')"
 
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "�����E�u�� ('\\' ����������ɂ� '\\\\')"
 
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "�g���܂���"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "�f�B���N�g��\t*.nothing\n"
+
+#: ../gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �F�w�肪�������Ȃ��̂ŃG���g�������蓖�Ă��܂���"
 
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: �ȉ��̕����Z�b�g�̃t�H���g������܂��� %s:"
 
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: �t�H���g�Z�b�g��: %s"
 
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "�t�H���g '%s' �͌Œ蕝�ł͂���܂���"
 
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: �t�H���g�Z�b�g��: %s\n"
 
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
 #, c-format
 msgid "Font0: %s\n"
 msgstr "�t�H���g0: %s\n"
 
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
 #, c-format
 msgid "Font1: %s\n"
 msgstr "�t�H���g1: %s\n"
 
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "�t�H���g%d �̕����t�H���g0�̔{�ł͂���܂���\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "�t�H���g%ld �̕����t�H���g0��2�{�ł͂���܂���\n"
 
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "�t�H���g0�̕�: %ld\n"
 
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
 "�t�H���g1�̕�: %ld\n"
 "\n"
 
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "�����ȃt�H���g�w��ł�"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "�p������(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "�}�b�`������̂�����܂���"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - �t�H���g�I��"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "���O:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "�T�C�Y���|�C���g�ŕ\\������"
+
+# msgid " BLOCK"
+# msgstr " �u���b�N"
+# msgid " LINE"
+# msgstr " �s"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "�G���R�[�h:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "�t�H���g:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "�X�^�C��:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "�T�C�Y:"
+
+#: ../hangulin.c:610
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: �n���O���I�[�g�}�g���G���["
 
-#: if_cscope.c:77
+#: ../if_cscope.c:77
 msgid "Add a new database"
 msgstr "�V�f�[�^�x�[�X��ǉ�"
 
-#: if_cscope.c:79
+#: ../if_cscope.c:79
 msgid "Query for a pattern"
 msgstr "�p�^�[���̃N�G���[��ǉ�"
 
-#: if_cscope.c:81
+#: ../if_cscope.c:81
 msgid "Show this message"
 msgstr "���̃��b�Z�[�W��\\������"
 
-#: if_cscope.c:83
+#: ../if_cscope.c:83
 msgid "Kill a connection"
 msgstr "�ڑ����I������"
 
-#: if_cscope.c:85
+#: ../if_cscope.c:85
 msgid "Reinit all connections"
 msgstr "�S�Ă̐ڑ����ď���������"
 
-#: if_cscope.c:87
+#: ../if_cscope.c:87
 msgid "Show connections"
 msgstr "�ڑ���\\������"
 
-#: if_cscope.c:95
+#: ../if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: �g�p���@: cs[cope] %s"
 
-#: if_cscope.c:124
+#: ../if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "����cscope�R�}���h�͕����E�B���h�E�ł̓T�|�[�g����܂���.\n"
 
-#: if_cscope.c:175
+#: ../if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: �g�p�@: cstag <ident>"
 
-#: if_cscope.c:231
+#: ../if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �^�O���݂���܂���"
 
-#: if_cscope.c:409
+#: ../if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) �G���[: %d"
 
-#: if_cscope.c:419
+#: ../if_cscope.c:419
 msgid "E563: stat error"
 msgstr "E563: stat �G���["
 
-#: if_cscope.c:516
+#: ../if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s �̓f�B���N�g���y�їL����cscope�̃f�[�^�x�[�X�ł͂���܂���"
 
-#: if_cscope.c:534
+#: ../if_cscope.c:534
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscope�f�[�^�x�[�X %s ��ǉ�"
 
-#: if_cscope.c:589
+#: ../if_cscope.c:589
 #, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: cscope�̐ڑ� %ld ��Ǎ��ݒ��̃G���[�ł�"
 
-#: if_cscope.c:694
+#: ../if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: ���m��cscope�����^�ł�"
 
-#: if_cscope.c:736
+#: ../if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscope�p�C�v���쐬�ł��܂���ł���"
 
-#: if_cscope.c:753
+#: ../if_cscope.c:753
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope�̋N������(fork)�Ɏ��s���܂���"
 
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection �̎��s�Ɏ��s���܂���"
 
-#: if_cscope.c:898
+#: ../if_cscope.c:898
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscope�v���Z�X���N���ł��܂���ł���"
 
-#: if_cscope.c:911
+#: ../if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp �� fdopen �Ɏ��s���܂���"
 
-#: if_cscope.c:913
+#: ../if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp �� fdopen �Ɏ��s���܂���"
 
-#: if_cscope.c:951
+#: ../if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: cscope�ڑ��Ɏ��s���܂���"
 
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscope�N�G���[ %s of %s �ɊY��������܂���ł���"
 
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: ������ cscopequickfix �t���O %c �� %c �ł�"
 
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscope�R�}���h:\n"
 
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
 #, c-format
 msgid "%-5s: %-30s (Usage: %s)"
 msgstr "%-5s: %-30s (�g�p�@: %s)"
 
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: cscope�f�[�^�x�[�X: %s ���J�����Ƃ��ł��܂���"
 
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
 msgid "E626: cannot get cscope database information"
 msgstr "E626: cscope�f�[�^�x�[�X�̏����擾�ł��܂���"
 
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: �d������cscope�f�[�^�x�[�X�͒ǉ�����܂���ł���"
 
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: cscope�ڑ��̍ő吔�ɒB���܂���"
 
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope�ڑ� %s ���݂���܂���ł���"
 
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope�ڑ� %s �������܂���"
 
 #. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches �Œv���I�ȃG���[�ł�"
 
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope �^�O: %s"
 
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
 msgid ""
 "\n"
 "   #   line"
@@ -2507,28 +2894,123 @@ msgstr ""
 "\n"
 "   #   �s�ԍ�"
 
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "�t�@�C���� / ���� / �s\n"
 
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscope�G���[: %s"
 
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "�S�Ă�cscope�f�[�^�x�[�X�����Z�b�g���܂�"
 
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "cscope�ڑ�������܂���\n"
 
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    �f�[�^�x�[�X��                      prepend �p�X\n"
 
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: ���̃R�}���h�͖����ł�, ���߂�Ȃ���: MzScheme "
+"���C�u���������[�h�ł��܂���ł���."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "�����Ȏ��ł�"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "���̓R���p�C�����ɖ����ɂ���Ă��܂�"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "�B���I�v�V����"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "���m�̃I�v�V�����ł�"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "�͈͊O�̃E�B���h�E�ԍ��ł�"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "�o�b�t�@���J���܂���"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "�A���h�D��񂪕ۑ��ł��܂���"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "�s�������܂���"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "�s��u���ł��܂���"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "�s��}���ł��܂���"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "������ɂ͉��s�������܂߂��܂���"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim �G���[: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim �G���["
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "�o�b�t�@�͖����ł�"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "�E�B���h�E�͖����ł�"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "�͈͊O�̍s�ԍ��ł�"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���̃R�}���h�͖����ł�, ���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: �T���h�{�b�N�X�ł� Safe "
+"���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����Ă��܂�"
+
+#: ../if_python.c:438
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
 "Python���C�u���������[�h�ł��܂���ł���."
 
 # Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ���ċA�I�Ɏ��s���邱�Ƃ͂ł��܂���"
 
-#: if_python.c:701
+#: ../if_python.c:705
 msgid "can't delete OutputObject attributes"
 msgstr "OutputObject�����������܂���"
 
-#: if_python.c:708
+#: ../if_python.c:712
 msgid "softspace must be an integer"
 msgstr "softspace �� integer �łȂ���΂Ȃ�܂���"
 
-#: if_python.c:716
+#: ../if_python.c:720
 msgid "invalid attribute"
 msgstr "�����ȑ����ł�"
 
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
 msgid "writelines() requires list of strings"
 msgstr "writelines() �ɂ͕�����̃��X�g���K�v�ł�"
 
-#: if_python.c:895
+#: ../if_python.c:899
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/O�I�u�W�F�N�g�̏��������ɃG���[�ł�"
 
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "�����Ȏ��ł�"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "���̓R���p�C�����ɖ����ɂ���Ă��܂�"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
 msgid "attempt to refer to deleted buffer"
 msgstr "�����ꂽ�o�b�t�@���Q�Ƃ���܂���"
 
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
 msgid "line number out of range"
 msgstr "�͈͊O�̍s�ԍ��ł�"
 
-#: if_python.c:1362
+#: ../if_python.c:1366
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<�o�b�t�@�I�u�W�F�N�g (�����ς�) %8lX>"
 
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
 msgid "invalid mark name"
 msgstr "�����ȃ}�[�N���ł�"
 
-#: if_python.c:1733
+#: ../if_python.c:1737
 msgid "no such buffer"
 msgstr "���̂悤�ȃo�b�t�@�͂���܂���"
 
-#: if_python.c:1821
+#: ../if_python.c:1825
 msgid "attempt to refer to deleted window"
 msgstr "�����ꂽ�E�B���h�E���Q�Ƃ���܂���"
 
-#: if_python.c:1866
+#: ../if_python.c:1870
 msgid "readonly attribute"
 msgstr "�Ǎ���p����"
 
-#: if_python.c:1879
+#: ../if_python.c:1883
 msgid "cursor position outside buffer"
 msgstr "�J�[�\\�����o�b�t�@�̊O�ɂ���܂�"
 
-#: if_python.c:1956
+#: ../if_python.c:1960
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<�E�B���h�E�I�u�W�F�N�g (������) %.8lX>"
 
-#: if_python.c:1968
+#: ../if_python.c:1972
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<�E�B���h�E�I�u�W�F�N�g (���m) %.8lX>"
 
-#: if_python.c:1970
+#: ../if_python.c:1974
 #, c-format
 msgid "<window %d>"
 msgstr "<�E�B���h�E %d>"
 
-#: if_python.c:2046
+#: ../if_python.c:2050
 msgid "no such window"
 msgstr "���̂悤�ȃE�B���h�E�͂���܂���"
 
-#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
-#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1999
-msgid "cannot save undo information"
-msgstr "�A���h�D��񂪕ۑ��ł��܂���"
-
-#: if_python.c:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "�s�������܂���"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "�s��u���ł��܂���"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "�s��}���ł��܂���"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "������ɂ͉��s�������܂߂��܂���"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: ���̃R�}���h�͖����ł�,���߂�Ȃ���: "
 "Ruby���C�u���������[�h�ł��܂���ł���."
 
-#: if_ruby.c:485
+#: ../if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ���m��longjmp���: %d"
 
-#: if_sniff.c:67
+#: ../if_sniff.c:67
 msgid "Toggle implementation/definition"
 msgstr "�����ƒ�`��؂�ւ���"
 
-#: if_sniff.c:68
+#: ../if_sniff.c:68
 msgid "Show base class of"
 msgstr "���̃N���X�̊���\\��"
 
-#: if_sniff.c:69
+#: ../if_sniff.c:69
 msgid "Show overridden member function"
 msgstr "�I�[�o�[���C�h���ꂽ�����o�֐���\\��"
 
-#: if_sniff.c:70
+#: ../if_sniff.c:70
 msgid "Retrieve from file"
 msgstr "�t�@�C������񕜂���"
 
-#: if_sniff.c:71
+#: ../if_sniff.c:71
 msgid "Retrieve from project"
 msgstr "�v���W�F�N�g����񕜂���"
 
-#: if_sniff.c:73
+#: ../if_sniff.c:73
 msgid "Retrieve from all projects"
 msgstr "�S�Ẵv���W�F�N�g����񕜂���"
 
-#: if_sniff.c:74
+#: ../if_sniff.c:74
 msgid "Retrieve"
 msgstr "��"
 
-#: if_sniff.c:75
+#: ../if_sniff.c:75
 msgid "Show source of"
 msgstr "���̃\\�[�X��\\������"
 
-#: if_sniff.c:76
+#: ../if_sniff.c:76
 msgid "Find symbol"
 msgstr "�݂����V���{��"
 
-#: if_sniff.c:77
+#: ../if_sniff.c:77
 msgid "Browse class"
 msgstr "�N���X���Q��"
 
-#: if_sniff.c:78
+#: ../if_sniff.c:78
 msgid "Show class in hierarchy"
 msgstr "�K�w�ŃN���X��\\��"
 
-#: if_sniff.c:79
+#: ../if_sniff.c:79
 msgid "Show class in restricted hierarchy"
 msgstr "���肳�ꂽ�K�w�ŃN���X��\\��"
 
-#: if_sniff.c:80
+#: ../if_sniff.c:80
 msgid "Xref refers to"
 msgstr "Xref �̎Q�Ɛ�"
 
-#: if_sniff.c:81
+#: ../if_sniff.c:81
 msgid "Xref referred by"
 msgstr "Xref ���Q�Ƃ����"
 
-#: if_sniff.c:82
+#: ../if_sniff.c:82
 msgid "Xref has a"
 msgstr "Xref �����̂��̂������Ă��܂�"
 
-#: if_sniff.c:83
+#: ../if_sniff.c:83
 msgid "Xref used by"
 msgstr "Xref ���g�p�����"
 
-#: if_sniff.c:84
+#: ../if_sniff.c:84
 msgid "Show docu of"
 msgstr "���̕��͂�\\��"
 
-#: if_sniff.c:85
+#: ../if_sniff.c:85
 msgid "Generate docu for"
 msgstr "���̕��͂𐶐�"
 
-#: if_sniff.c:97
+#: ../if_sniff.c:97
 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
 "$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
 "SNiFF+�ɐڑ��ł��܂���. �����`�F�b�N���Ă�������(sniffemacs �� $PATH "
 "�ɂȂ���΂Ȃ�܂���).\n"
 
-#: if_sniff.c:425
+#: ../if_sniff.c:425
 msgid "E274: Sniff: Error during read. Disconnected"
 msgstr "E274: Sniff: �Ǎ����ɃG���[���������܂���. �ؒf���܂���"
 
-#: if_sniff.c:553
+#: ../if_sniff.c:553
 msgid "SNiFF+ is currently "
 msgstr "����SNiFF+ �̏�Ԃ́u"
 
-#: if_sniff.c:555
+#: ../if_sniff.c:555
 msgid "not "
 msgstr "��"
 
-#: if_sniff.c:556
+#: ../if_sniff.c:556
 msgid "connected"
 msgstr "�ڑ��v�ł�"
 
-#: if_sniff.c:592
+#: ../if_sniff.c:592
 #, c-format
 msgid "E275: Unknown SNiFF+ request: %s"
 msgstr "E275: ���m�� SNiFF+ ���N�G�X�g�ł�: %s"
 
-#: if_sniff.c:605
+#: ../if_sniff.c:605
 msgid "E276: Error connecting to SNiFF+"
 msgstr "E276: SNiFF+ �ւ̐ڑ����̃G���[�ł�"
 
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
 msgid "E278: SNiFF+ not connected"
 msgstr "E278: SNiFF+ �ɐڑ�����Ă��܂���"
 
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
 msgid "E279: Not a SNiFF+ buffer"
 msgstr "E279: SNiFF+ �o�b�t�@������܂���"
 
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
 msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: �����ݒ��ɃG���[�����������̂Őؒf���܂���"
 
-#: if_tcl.c:418
+#: ../if_tcl.c:422
 msgid "invalid buffer number"
 msgstr "�����ȃo�b�t�@�ԍ��ł�"
 
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
 msgid "not implemented yet"
 msgstr "�܂���������Ă��܂���"
 
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "���m�̃I�v�V�����ł�"
-
 #. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
 msgid "cannot set line(s)"
 msgstr "�s��ݒ�ł��܂���"
 
-#: if_tcl.c:845
+#: ../if_tcl.c:849
 msgid "mark not set"
 msgstr "�}�[�N�͐ݒ肳��Ă��܂���"
 
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
 #, c-format
 msgid "row %d column %d"
 msgstr "�s %d �� %d"
 
-#: if_tcl.c:881
+#: ../if_tcl.c:885
 msgid "cannot insert/append line"
 msgstr "�s�̑}��/�ǉ����ł��܂���"
 
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
 msgid "unknown flag: "
 msgstr "���m�̃t���O:"
 
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
 msgid "unknown vimOption"
 msgstr "���m�� vimOption �ł�"
 
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
 msgid "keyboard interrupt"
 msgstr "�L�[�{�[�h������"
 
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
 msgid "vim error"
 msgstr "vim �G���["
 
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr ""
 "�o�b�t�@/�E�B���h�E�쐬�R�}���h���쐬�ł��܂���: "
 "�I�u�W�F�N�g����������Ă��܂���"
 
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
 "�R�[���o�b�N�R�}���h��o�^�ł��܂���: �o�b�t�@/�E�B���h�E�����ɏ�������܂���"
 
 #. This should never happen.  Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
 "vim-dev@vim.org"
 msgstr ""
 "E280: TCL �v���I�G���[: reflist ����!? vim-dev@vim.org �ɕ񍐂��Ă�������"
 
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "�R�[���o�b�N�R�}���h��o�^�ł��܂���: "
 "�o�b�t�@/�E�B���h�E�̎Q�Ƃ��݂���܂���"
 
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: ���̃R�}���h�͖����ł�,���߂�Ȃ���: "
 "Tcl���C�u���������[�h�ł��܂���ł���."
 
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr ""
 "E281: TCL �G���[: �I���R�[�h�������l�ł͂���܂���!? vim-dev@vim.org "
 "�ɕ񍐂��Ă�������"
 
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
 msgid "cannot get line"
 msgstr "�s���擾�ł��܂���"
 
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
 msgid "Unable to register a command server name"
 msgstr "���߃T�[�o�̖��O��o�^�ł��܂���"
 
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: �ړI�̃v���O�����ւ̃R�}���h���M�Ɏ��s���܂���"
 
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: �����ȃT�[�oID���g���܂���: %s"
 
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���̂̓o�^�v���p�e�B���s���ł�. �������܂���!"
 
-#: main.c:60
+#: ../main.c:60
 msgid "Unknown option"
 msgstr "���m�̃I�v�V�����ł�"
 
-#: main.c:62
+#: ../main.c:62
 msgid "Too many edit arguments"
-msgstr "�ҏW�������������܂�"
+msgstr "�ҏW���������߂��܂�"
 
-#: main.c:64
+#: ../main.c:64
 msgid "Argument missing after"
 msgstr "����������܂���"
 
-#: main.c:66
+#: ../main.c:66
 msgid "Garbage after option"
 msgstr "�I�v�V�����̌�ɃS�~������܂�"
 
-#: main.c:68
+#: ../main.c:68
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" �̈������������܂�"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" �̈��������߂��܂�"
 
-#: main.c:70
+#: ../main.c:70
 msgid "Invalid argument for"
 msgstr "�����Ȉ����ł�: "
 
-#: main.c:466
+#: ../main.c:481
 msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim�ɂ�diff�@�\\������܂���(�R���p�C�����ݒ�)."
 
-#: main.c:932
+#: ../main.c:958
 msgid "Attempt to open script file again: \""
 msgstr "�X�N���v�g�t�@�C�����ĂъJ���Ă݂܂�: \""
 
 # msgid "\"\n"
 # msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
 msgid "Cannot open for reading: \""
 msgstr "�Ǎ��p�Ƃ��ĊJ���܂���"
 
-#: main.c:985
+#: ../main.c:1021
 msgid "Cannot open for script output: \""
 msgstr "�X�N���v�g�o�͗p���J���܂���"
 
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d �̃t�@�C�����ҏW���T���Ă��܂�\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: �G���[: NetBeans����gvim���X�^�[�g�ł��܂���\n"
 
-#: main.c:1233
+#: ../main.c:1302
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �x��: �[���ւ̏o�͂ł͂���܂���\n"
 
-#: main.c:1235
+#: ../main.c:1304
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: �x��: �[������̓��͂ł͂���܂���\n"
 
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d �̃t�@�C�����ҏW���T���Ă��܂�\n"
+
 #. just in case..
-#: main.c:1297
+#: ../main.c:1377
 msgid "pre-vimrc command line"
 msgstr "vimrc�O�̃R�}���h���C��"
 
-#: main.c:1338
+#: ../main.c:1418
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"����Ǎ��ނ��Ƃ��ł��܂���"
 
-#: main.c:2411
+#: ../main.c:2521
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
 "\n"
 "���ڍׂȏ���: \"vim -h\"\n"
 
-#: main.c:2444
+#: ../main.c:2554
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�t�@�C��..]    ����t�@�C����ҏW����"
 
-#: main.c:2445
+#: ../main.c:2555
 msgid "-               read text from stdin"
 msgstr "-               �W�����͂���e�L�X�g��Ǎ���"
 
-#: main.c:2446
+#: ../main.c:2556
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t �^�O         �^�O����`���ꂽ�Ƃ��납��ҏW����"
 
-#: main.c:2448
+#: ../main.c:2558
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  �ŏ��̃G���[�ŕҏW����"
 
-#: main.c:2457
+#: ../main.c:2567
 msgid ""
 "\n"
 "\n"
@@ -2978,11 +3431,11 @@ msgstr ""
 "\n"
 "�g�p�@:"
 
-#: main.c:2460
+#: ../main.c:2570
 msgid " vim [arguments] "
 msgstr " vim [����]"
 
-#: main.c:2464
+#: ../main.c:2574
 msgid ""
 "\n"
 "   or:"
@@ -2990,7 +3443,11 @@ msgstr ""
 "\n"
 "   ��������:"
 
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "�啶���������͖�������܂� / �t���O�͑啶���ɂ��Ă�������"
+
+#: ../main.c:2580
 msgid ""
 "\n"
 "\n"
@@ -3000,241 +3457,241 @@ msgstr ""
 "\n"
 "����:\n"
 
-#: main.c:2468
+#: ../main.c:2581
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t���̂��Ƃɂ̓t�@�C��������"
 
-#: main.c:2470
+#: ../main.c:2583
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t���C���h�J�[�h��W�J���Ȃ�"
 
-#: main.c:2473
+#: ../main.c:2586
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\t����gvim��OLE�Ƃ��ēo�^����"
 
-#: main.c:2474
+#: ../main.c:2587
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tgvim��OLE�o�^����������"
 
-#: main.c:2477
+#: ../main.c:2590
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUI�ŋN������ (\"gvim\" �Ɠ���)"
 
-#: main.c:2478
+#: ../main.c:2591
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f or  --nofork\t�t�H�A�O���E���h: GUI���n�߂�Ƃ���fork���Ȃ�"
 
-#: main.c:2480
+#: ../main.c:2593
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi���[�h (\"vi\" �Ɠ���)"
 
-#: main.c:2481
+#: ../main.c:2594
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx���[�h (\"ex\" �Ɠ���)"
 
-#: main.c:2482
+#: ../main.c:2595
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t�T�C�����g(�o�b�`)���[�h (\"ex\" ��p)"
 
-#: main.c:2484
+#: ../main.c:2597
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t�������[�h (\"vidiff\" �Ɠ���)"
 
-#: main.c:2486
+#: ../main.c:2599
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t�C�[�W�[���[�h (\"evim\" �Ɠ���, ���[�h��)"
 
-#: main.c:2487
+#: ../main.c:2600
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�Ǎ���p���[�h (\"view\" �Ɠ���)"
 
-#: main.c:2488
+#: ../main.c:2601
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t�������[�h (\"rvim\" �Ɠ���)"
 
-#: main.c:2489
+#: ../main.c:2602
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t�ύX (�t�@�C���ۑ���) ���ł��Ȃ��悤�ɂ���"
 
-#: main.c:2490
+#: ../main.c:2603
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�e�L�X�g�̕ҏW���s�Ȃ��Ȃ��悤�ɂ���"
 
-#: main.c:2491
+#: ../main.c:2604
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t�o�C�i�����[�h"
 
-#: main.c:2493
+#: ../main.c:2606
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp���[�h"
 
-#: main.c:2495
+#: ../main.c:2608
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi�݊����[�h: 'compatible'"
 
-#: main.c:2496
+#: ../main.c:2609
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi��݊����[�h: 'nocompatible"
 
-#: main.c:2497
+#: ../main.c:2610
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose ���x��"
 
-#: main.c:2498
+#: ../main.c:2611
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�f�o�b�O���[�h"
 
-#: main.c:2499
+#: ../main.c:2612
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t�X���b�v�t�@�C�����g�p��������������"
 
-#: main.c:2500
+#: ../main.c:2613
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t�X���b�v�t�@�C����񋓂��I��"
 
-#: main.c:2501
+#: ../main.c:2614
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�t�@�C����)\t�N���b�V�������Z�b�V�����𕜋A"
 
-#: main.c:2502
+#: ../main.c:2615
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-r�Ɠ���"
 
-#: main.c:2504
+#: ../main.c:2617
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t�E�B���h�E���J���̂� newcli ���g�p���Ȃ�"
 
-#: main.c:2505
+#: ../main.c:2618
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/O�� <device> ���g�p����"
 
-#: main.c:2508
+#: ../main.c:2621
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\t�A���r�A�ꃂ�[�h�ŋN������"
 
-#: main.c:2511
+#: ../main.c:2624
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t�w�u���C�ꃂ�[�h�ŋN������"
 
-#: main.c:2514
+#: ../main.c:2627
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t�y���V�A�ꃂ�[�h�ŋN������"
 
-#: main.c:2516
+#: ../main.c:2629
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t�[���� <terminal> �ɐݒ肷��"
 
-#: main.c:2517
+#: ../main.c:2630
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc�̑���� <vimrc> ���g��"
 
-#: main.c:2519
+#: ../main.c:2632
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t.gvimrc�̑���� <gvimrc> ���g��"
 
-#: main.c:2521
+#: ../main.c:2634
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�v���O�C���X�N���v�g�����[�h���Ȃ�"
 
-#: main.c:2522
+#: ../main.c:2635
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN �E�B���h�E���J��(�ȗ��l: �t�@�C���ɂ�1��)"
 
-#: main.c:2523
+#: ../main.c:2636
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-o�Ɠ���������������"
 
-#: main.c:2524
+#: ../main.c:2637
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t�t�@�C���̍Ōォ��͂��߂�"
 
-#: main.c:2525
+#: ../main.c:2638
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> �s����͂��߂�"
 
-#: main.c:2527
+#: ../main.c:2640
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrc�����[�h����O�� <command> �����s����"
 
-#: main.c:2529
+#: ../main.c:2642
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t�ŏ��̃t�@�C�������[�h�� <command> �����s����"
 
-#: main.c:2530
+#: ../main.c:2643
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t�ŏ��̃t�@�C�������[�h��t�@�C�� <session> ���捞��"
 
-#: main.c:2531
+#: ../main.c:2644
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t�t�@�C�� <scriptin> ����m�[�}���R�}���h��Ǎ���"
 
-#: main.c:2532
+#: ../main.c:2645
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t���͂����S�R�}���h���t�@�C�� <scriptout> �ɒǉ�����"
 
-#: main.c:2533
+#: ../main.c:2646
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t���͂����S�R�}���h���t�@�C�� <scriptout> �ɕۑ�����"
 
-#: main.c:2535
+#: ../main.c:2648
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t�Í������ꂽ�t�@�C����ҏW����"
 
-#: main.c:2539
+#: ../main.c:2652
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\tvim���w�肵�� X �T�[�o�ɐڑ�����"
 
-#: main.c:2541
+#: ../main.c:2654
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tX�T�[�o�ɐڑ����Ȃ�"
 
-#: main.c:2544
+#: ../main.c:2657
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t�\\�Ȃ��Vim�T�[�o�� <files> ��ҏW����"
 
-#: main.c:2545
+#: ../main.c:2658
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silnet <files>  ����, �T�[�o�������Ă��x�������o�͂��Ȃ�"
 
-#: main.c:2546
+#: ../main.c:2659
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>\t--remote�� �t�@�C���̕ҏW���I���̂�҂�"
 
-#: main.c:2547
+#: ../main.c:2660
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  ����, �T�[�o�������Ă��x�������o�͂��Ȃ�"
 
-#: main.c:2548
+#: ../main.c:2661
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVim�T�[�o�� <keys> �𑗐M���ďI������"
 
-#: main.c:2549
+#: ../main.c:2662
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\t�T�[�o�� <expr> �����s���Č��ʂ�\\������"
 
-#: main.c:2550
+#: ../main.c:2663
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\tVim�T�[�o���̈ꗗ��\\�����ďI������"
 
-#: main.c:2551
+#: ../main.c:2664
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servename <name>\t\tVim�T�[�o <name> �ɑ��M/���O�ݒ肷��"
 
-#: main.c:2554
+#: ../main.c:2667
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo�̑���� <viminfo> ���g��"
 
-#: main.c:2556
+#: ../main.c:2669
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\t�w���v(���̃��b�Z�[�W)��\\�����I������"
 
-#: main.c:2557
+#: ../main.c:2670
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�o�[�W��������\\�����I������"
 
-#: main.c:2561
+#: ../main.c:2674
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
 "\n"
 "gvim�ɂ���ĉ��߂�������(Motif�o�[�W����):\n"
 
-#: main.c:2565
+#: ../main.c:2678
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
 "\n"
 "gvim�ɂ���ĉ��߂�������(neXtaw�o�[�W����):\n"
 
-#: main.c:2567
+#: ../main.c:2680
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
 "\n"
 "gvim�ɂ���ĉ��߂�������(Athena�o�[�W����):\n"
 
-#: main.c:2571
+#: ../main.c:2684
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t<display> ��vim�����s����"
 
-#: main.c:2572
+#: ../main.c:2685
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t�ŏ���������Ԃ�vim���N������"
 
-#: main.c:2574
+#: ../main.c:2687
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\tvim�̖��� <name> �ł���Ƃ��ă��\\�[�X���g��"
 
-#: main.c:2575
+#: ../main.c:2688
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (��������Ă��Ȃ�)\n"
 
-#: main.c:2577
+#: ../main.c:2690
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t�w�i�F�� <color> ���g��(���`: -bg)"
 
-#: main.c:2578
+#: ../main.c:2691
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t�O�i�F�� <color> ���g��(���`: -fg)"
 
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t\t�e�L�X�g�\\���� <font> ���g��(���`: -fn)"
 
-#: main.c:2580
+#: ../main.c:2693
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t������ <font> ���g��"
 
-#: main.c:2581
+#: ../main.c:2694
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <for>\t�Α̎��� <font> ���g��"
 
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t�����z�u�� <geom> ���g��(���`: -geom)"
 
-#: main.c:2583
+#: ../main.c:2696
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t���E�̕��� <width> �ɂ���(���`: -bw)"
 
-#: main.c:2584
+#: ../main.c:2697
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
 "-scrollbarwidth <width>  �X�N���[���o�[�̕��� <width> �ɂ���(���`: -sw)"
 
-#: main.c:2586
+#: ../main.c:2699
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\t���j���[�o�[�̍����� <height> �ɂ���(���`: -mh)"
 
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t���]�f�����g�p����(���`: -rv)"
 
-#: main.c:2589
+#: ../main.c:2702
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\t���]�f�����g�p���Ȃ�(���`: +rv)"
 
-#: main.c:2590
+#: ../main.c:2703
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t����̃��\\�[�X���g�p����"
 
-#: main.c:2593
+#: ../main.c:2706
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
 "\n"
 "gvim�ɂ���ĉ��߂�������(RISC OS�o�[�W����):\n"
 
-#: main.c:2594
+#: ../main.c:2707
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t�����̃E�B���h�E�̃R�����P�ʂ̕�"
 
-#: main.c:2595
+#: ../main.c:2708
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\t�����̃E�B���h�E�̍s�P�ʂ̍���"
 
-#: main.c:2598
+#: ../main.c:2711
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
 "\n"
 "gvim�ɂ���ĉ��߂�������(GTK+�o�[�W����):\n"
 
-#: main.c:2602
+#: ../main.c:2715
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t<display> ��vim�����s����(���`: --display)"
 
-#: main.c:2604
+#: ../main.c:2717
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t���C���E�B���h�E�����ʂ����ӂȖ���(role)��ݒ肷��"
 
-#: main.c:2606
+#: ../main.c:2719
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t�قȂ�GTK widget��Vim���J��"
 
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvim�ɂ���ĉ��߂�������(KDE�o�[�W����):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\t���]��ʂ��g�p����"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\t�N�����Ƀ`�b�v�_�C�A���O��\\������"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\t�`�b�v�_�C�A���O�𖳌��ɂ���"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> ��vim�����s����"
+
+#: ../main.c:2733
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <�e�̃^�C�g��>\tVim��e�A�v���P�[�V�����̒��ŋN������"
 
 # msgid "--help\t\tShow Gnome arguments"
 # msgstr "--help\t\tGNOME�̈�����������"
-#: main.c:2847
+#: ../main.c:2971
 msgid "No display"
 msgstr "�f�B�X�v���C��������܂���"
 
 #. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
 msgid ": Send failed.\n"
 msgstr ": ���M�Ɏ��s���܂���.\n"
 
 #. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": ���M�Ɏ��s���܂���. ���[�J���ł̎��s�����݂Ă��܂�\n"
 
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d �� (%d ��) �̃t�@�C����ҏW���܂���"
 
-#: main.c:2949
+#: ../main.c:3073
 msgid "No display: Send expression failed.\n"
 msgstr "�f�B�X�v���C������܂���: ���̑��M�Ɏ��s���܂���.\n"
 
-#: main.c:2961
+#: ../main.c:3085
 msgid ": Send expression failed.\n"
 msgstr ": ���̑��M�Ɏ��s���܂���.\n"
 
-#: mark.c:709
+#: ../mark.c:705
 msgid "No marks set"
 msgstr "�}�[�N���ݒ肳��Ă��܂���"
 
-#: mark.c:711
+#: ../mark.c:707
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" �ɊY������}�[�N������܂���"
 
 #. Highlight title
-#: mark.c:722
+#: ../mark.c:718
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
 "mark   �s   �� �t�@�C��/�e�L�X�g"
 
 #. Highlight title
-#: mark.c:760
+#: ../mark.c:841
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
 " jump   �s   �� �t�@�C��/�e�L�X�g"
 
 #. Highlight title
-#: mark.c:805
+#: ../mark.c:886
 msgid ""
 "\n"
 "change line  col text"
@@ -3428,7 +3909,7 @@ msgstr ""
 "\n"
 "�ύX   �s    ��  �e�L�X�g"
 
-#: mark.c:1281
+#: ../mark.c:1362
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
 "# �t�@�C���}�[�N:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
 "\n"
 "# �W�����v���X�g (�V�������̂���):\n"
 
-#: mark.c:1412
+#: ../mark.c:1493
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
 "\n"
 "# �t�@�C�����}�[�N�̗��� (�V�������̂���Â�����):\n"
 
-#: mark.c:1501
+#: ../mark.c:1582
 msgid "Missing '>'"
 msgstr "'>' ���݂���܂���"
 
-#: mbyte.c:467
+#: ../mbyte.c:470
 msgid "E543: Not a valid codepage"
 msgstr "E543: �����ȃR�[�h�y�[�W�ł�"
 
-#: mbyte.c:4431
+#: ../mbyte.c:4513
 msgid "E284: Cannot set IC values"
 msgstr "E284: IC�̒l��ݒ�ł��܂���"
 
-#: mbyte.c:4583
+#: ../mbyte.c:4669
 msgid "E285: Failed to create input context"
 msgstr "E285: �C���v�b�g�R���e�L�X�g�̍쐬�Ɏ��s���܂���"
 
-#: mbyte.c:4741
+#: ../mbyte.c:4827
 msgid "E286: Failed to open input method"
 msgstr "E286: �C���v�b�g���\\�b�h�̃I�[�v���Ɏ��s���܂���"
 
-#: mbyte.c:4752
+#: ../mbyte.c:4838
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: �x��: IM�̔j��R�[���o�b�N��ݒ�ł��܂���ł���"
 
-#: mbyte.c:4758
+#: ../mbyte.c:4844
 msgid "E288: input method doesn't support any style"
 msgstr "E288: �C���v�b�g���\\�b�h�͂ǂ�ȃX�^�C�����T�|�[�g���܂���"
 
-#: mbyte.c:4815
+#: ../mbyte.c:4901
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: �C���v�b�g���\\�b�h�� my preedit type ���T�|�[�g���܂���"
 
-#: mbyte.c:4889
+#: ../mbyte.c:4975
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot �X�^�C���ɂ�fontset���K�v�ł�"
 
-#: mbyte.c:4925
+#: ../mbyte.c:5011
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: GTK+��1.2.3�����Â��̂ŃX�e�[�^�X�G���A�������ł�"
 
-#: mbyte.c:5232
+#: ../mbyte.c:5318
 msgid "E292: Input Method Server is not running"
 msgstr "E292: �C���v�b�g���\\�b�h�T�[�o �����삵�Ă��܂���"
 
-#: memfile.c:488
+#: ../memfile.c:488
 msgid "E293: block was not locked"
 msgstr "E293: �u���b�N�����b�N����Ă��܂���"
 
-#: memfile.c:1005
+#: ../memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: �X���b�v�t�@�C���Ǎ����ɃV�[�N�G���[�ł�"
 
-#: memfile.c:1010
+#: ../memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: �X���b�v�t�@�C���̓Ǎ��݃G���[�ł�"
 
-#: memfile.c:1062
+#: ../memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: �X���b�v�t�@�C�������ݎ��ɃV�[�N�G���[�ł�"
 
-#: memfile.c:1080
+#: ../memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: �X���b�v�t�@�C���̏����݃G���[�ł�"
 
-#: memfile.c:1277
+#: ../memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: �X���b�v�t�@�C�������ɑ��݂��܂� (symlink�ɂ��U��?)"
 
-#: memline.c:275
+#: ../memline.c:310
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: �u���b�N 0 ���擾�ł��܂���?"
 
-#: memline.c:315
+#: ../memline.c:351
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: �u���b�N 1 ���擾�ł��܂���?"
 
-#: memline.c:333
+#: ../memline.c:369
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �u���b�N 2 ���擾�ł��܂���?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: ../memline.c:482
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ������, �X���b�v�t�@�C���������܂���!!!"
 
-#: memline.c:448
+#: ../memline.c:487
 msgid "E302: Could not rename swap file"
 msgstr "E302: �X���b�v�t�@�C���̖��O��ς����܂���"
 
-#: memline.c:518
+#: ../memline.c:559
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" �̃X���b�v�t�@�C�����J���Ȃ��̂Ń��J�o���͕s�\\�ł�"
 
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: �u���b�N 0 ���擾�ł��܂���ł���??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): �u���b�N 0 ���擾�ł��܂���ł���??"
 
-#: memline.c:757
+#: ../memline.c:872
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s �ɂ̓X���b�v�t�@�C�����݂���܂���"
 
-#: memline.c:767
+#: ../memline.c:882
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "�g�p����X���b�v�t�@�C���̔ԍ�����͂��Ă�������(0 �ŏI��): "
 
-#: memline.c:812
+#: ../memline.c:927
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s ���J���܂���"
 
-#: memline.c:834
+#: ../memline.c:949
 msgid "Unable to read block 0 from "
 msgstr "�u���b�N 0 ��Ǎ��߂܂��� "
 
-#: memline.c:837
+#: ../memline.c:952
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
 "\n"
 "���炭�ύX������Ă��Ȃ���Vim���X���b�v�t�@�C�����X�V���Ă��܂���."
 
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim�̂��̃o�[�W�����ł͎g�p�ł��܂���.\n"
 
-#: memline.c:849
+#: ../memline.c:964
 msgid "Use Vim version 3.0.\n"
 msgstr "Vim�̃o�[�W����3.0���g�p���Ă�������.\n"
 
-#: memline.c:855
+#: ../memline.c:970
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��Vim�̃X���b�v�t�@�C���ł͂Ȃ��悤�ł�"
 
-#: memline.c:868
+#: ../memline.c:983
 msgid " cannot be used on this computer.\n"
 msgstr " ���̃R���s���[�^�ł͎g�p�ł��܂���.\n"
 
-#: memline.c:870
+#: ../memline.c:985
 msgid "The file was created on "
 msgstr "���̃t�@�C���͎��̏ꏊ�ō���܂��� "
 
-#: memline.c:874
+#: ../memline.c:989
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
 ",\n"
 "�������̓t�@�C�����������Ă��܂�."
 
-#: memline.c:903
+#: ../memline.c:1018
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "�X���b�v�t�@�C�� \"%s\" ���g�p��"
 
-#: memline.c:909
+#: ../memline.c:1024
 #, c-format
 msgid "Original file \"%s\""
 msgstr "���{�t�@�C�� \"%s\""
 
-#: memline.c:922
+#: ../memline.c:1037
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: �x��: ���{�t�@�C�����ύX����Ă��܂�"
 
-#: memline.c:975
+#: ../memline.c:1111
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s ����u���b�N 1 ��Ǎ��߂܂���"
 
-#: memline.c:979
+#: ../memline.c:1115
 msgid "???MANY LINES MISSING"
 msgstr "???�����̍s�������Ă��܂�"
 
-#: memline.c:995
+#: ../memline.c:1131
 msgid "???LINE COUNT WRONG"
 msgstr "???�s�����Ԉ���Ă��܂�"
 
-#: memline.c:1002
+#: ../memline.c:1138
 msgid "???EMPTY BLOCK"
 msgstr "???�u���b�N����ł�"
 
-#: memline.c:1028
+#: ../memline.c:1164
 msgid "???LINES MISSING"
 msgstr "???�s�������Ă��܂�"
 
-#: memline.c:1060
+#: ../memline.c:1196
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: �u���b�N 1 ��ID���Ԉ���Ă��܂�(%s ��.swp�t�@�C���łȂ�?)"
 
-#: memline.c:1065
+#: ../memline.c:1201
 msgid "???BLOCK MISSING"
 msgstr "???�u���b�N������܂���"
 
-#: memline.c:1081
+#: ../memline.c:1217
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ��������???END�܂ł̍s���j�󂳂�Ă���悤�ł�"
 
-#: memline.c:1097
+#: ../memline.c:1233
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ��������??END�܂ł̍s���}�����폜���ꂽ�悤�ł�"
 
-#: memline.c:1117
+#: ../memline.c:1253
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1143
+#: ../memline.c:1279
 msgid "E311: Recovery Interrupted"
 msgstr "E311: ���J�o���������܂�܂���"
 
-#: memline.c:1148
+#: ../memline.c:1284
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: ���J�o���̍Œ��ɃG���[�����o����܂���; ???�Ŏn�܂�s���Q�Ƃ��Ă�������"
 
-#: memline.c:1150
+#: ../memline.c:1286
 msgid "See \":help E312\" for more information."
 msgstr "�ڍׂ� \":help E312\" ���Q�Ƃ��Ă�������"
 
-#: memline.c:1155
+#: ../memline.c:1291
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "���J�o�����I�����܂���. �S�Ă����������`�F�b�N���Ă�������."
 
-#: memline.c:1156
+#: ../memline.c:1292
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
 "\n"
 "(�ύX���`�F�b�N���邽�߂�, ���̃t�@�C����ʂ̖��O�ŕۑ��������\n"
 
-#: memline.c:1157
+#: ../memline.c:1293
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "���{�t�@�C���Ƃ� diff �����s����Ɨǂ��ł��傤)\n"
 
-#: memline.c:1158
+#: ../memline.c:1294
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3701,51 +4182,51 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
 msgid "Swap files found:"
 msgstr "�X���b�v�t�@�C��������������܂���:"
 
-#: memline.c:1392
+#: ../memline.c:1528
 msgid "   In current directory:\n"
 msgstr "   ���݂̃f�B���N�g��:\n"
 
-#: memline.c:1394
+#: ../memline.c:1530
 msgid "   Using specified name:\n"
 msgstr "   ���閼�O���g�p��:\n"
 
-#: memline.c:1398
+#: ../memline.c:1534
 msgid "   In directory "
 msgstr "   �f�B���N�g�� "
 
-#: memline.c:1416
+#: ../memline.c:1552
 msgid "      -- none --\n"
 msgstr "      -- �Ȃ� --\n"
 
-#: memline.c:1488
+#: ../memline.c:1625
 msgid "          owned by: "
 msgstr "            ���L��: "
 
-#: memline.c:1490
+#: ../memline.c:1627
 msgid "   dated: "
 msgstr "   ���t: "
 
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
 msgid "             dated: "
 msgstr "             ���t: "
 
-#: memline.c:1510
+#: ../memline.c:1647
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: memline.c:1514
+#: ../memline.c:1651
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vim�̃X���b�v�t�@�C���ł͂Ȃ��悤�ł�]"
 
-#: memline.c:1518
+#: ../memline.c:1655
 msgid "         file name: "
 msgstr "        �t�@�C����: "
 
-#: memline.c:1524
+#: ../memline.c:1661
 msgid ""
 "\n"
 "          modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
 "\n"
 "          �ύX���: "
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "YES"
 msgstr "����"
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "no"
 msgstr "�Ȃ�"
 
-#: memline.c:1529
+#: ../memline.c:1666
 msgid ""
 "\n"
 "         user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
 "\n"
 "          ���[�U��: "
 
-#: memline.c:1536
+#: ../memline.c:1673
 msgid "   host name: "
 msgstr "   �z�X�g��: "
 
-#: memline.c:1538
+#: ../memline.c:1675
 msgid ""
 "\n"
 "         host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
 "\n"
 "          �z�X�g��: "
 
-#: memline.c:1544
+#: ../memline.c:1681
 msgid ""
 "\n"
 "        process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
 "\n"
 "        �v���Z�XID: "
 
-#: memline.c:1550
+#: ../memline.c:1687
 msgid " (still running)"
 msgstr " (�܂����s��)"
 
-#: memline.c:1562
+#: ../memline.c:1699
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
 "\n"
 "         [����Vim�o�[�W�����ł͎g�p�ł��܂���]"
 
-#: memline.c:1565
+#: ../memline.c:1702
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
 "\n"
 "         [���̃R���s���[�^�ł͎g�p�ł��܂���]"
 
-#: memline.c:1570
+#: ../memline.c:1707
 msgid "         [cannot be read]"
 msgstr "         [�Ǎ��߂܂���]"
 
-#: memline.c:1574
+#: ../memline.c:1711
 msgid "         [cannot be opened]"
 msgstr "         [�J���܂���]"
 
-#: memline.c:1764
+#: ../memline.c:1901
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: �X���b�v�t�@�C���������̂ňێ��ł��܂���"
 
-#: memline.c:1817
+#: ../memline.c:1954
 msgid "File preserved"
 msgstr "�t�@�C�����ێ�����܂�"
 
-#: memline.c:1819
+#: ../memline.c:1956
 msgid "E314: Preserve failed"
 msgstr "E314: �ێ��Ɏ��s���܂���"
 
-#: memline.c:1890
+#: ../memline.c:2027
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: ������lnum�ł�: %ld"
 
-#: memline.c:1916
+#: ../memline.c:2053
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: �s %ld ���݂����܂���"
 
-#: memline.c:2306
+#: ../memline.c:2443
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 3"
 
-#: memline.c:2386
+#: ../memline.c:2523
 msgid "stack_idx should be 0"
 msgstr "stack_idx �� 0 �ł���ׂ��ł�"
 
-#: memline.c:2448
+#: ../memline.c:2585
 msgid "E318: Updated too many blocks?"
-msgstr "E318: �X�V���ꂽ�u���b�N���������邩��?"
+msgstr "E318: �X�V���ꂽ�u���b�N�����߂��邩��?"
 
-#: memline.c:2630
+#: ../memline.c:2767
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 4"
 
-#: memline.c:2657
+#: ../memline.c:2794
 msgid "deleted block 1?"
 msgstr "�u���b�N 1 �͏����ꂽ?"
 
-#: memline.c:2857
+#: ../memline.c:2994
 #, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: �s %ld ���݂���܂���"
 
-#: memline.c:3100
+#: ../memline.c:3237
 msgid "E317: pointer block id wrong"
 msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂�"
 
-#: memline.c:3116
+#: ../memline.c:3253
 msgid "pe_line_count is zero"
 msgstr "pe_line_count ���[���ł�"
 
-#: memline.c:3145
+#: ../memline.c:3282
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: �s�ԍ����͈͊O�ł�: %ld �����Ă��܂�"
 
-#: memline.c:3149
+#: ../memline.c:3286
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: �u���b�N %ld �̍s�J�E���g���Ԉ���Ă��܂�"
 
-#: memline.c:3198
+#: ../memline.c:3335
 msgid "Stack size increases"
 msgstr "�X�^�b�N�T�C�Y�������܂�"
 
-#: memline.c:3244
+#: ../memline.c:3381
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 2"
 
-#: memline.c:3674
+#: ../memline.c:3827
 msgid "E325: ATTENTION"
 msgstr "E325: ����"
 
-#: memline.c:3675
+#: ../memline.c:3828
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
 "\n"
 "���̖��O�ŃX���b�v�t�@�C���������܂��� \""
 
-#: memline.c:3679
+#: ../memline.c:3832
 msgid "While opening file \""
 msgstr "���̃t�@�C�����J���Ă���Œ� \""
 
-#: memline.c:3688
+#: ../memline.c:3841
 msgid "      NEWER than swap file!\n"
 msgstr "      �X���b�v�t�@�C�������V�����ł�!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
 "    ���̏ꍇ�ɂ�, �ύX�������ۂɍŏI�I��, �����t�@�C���̈قȂ�\n"
 "    2�̃C���X�^���X���ł��Ă��܂����Ƃɒ��ӂ��Ă�������.\n"
 
-#: memline.c:3693
+#: ../memline.c:3846
 msgid "    Quit, or continue with caution.\n"
 msgstr "    �I�����邩, ���ӂ��Ȃ��瑱���܂�.\n"
 
-#: memline.c:3694
+#: ../memline.c:3847
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
 "\n"
 "(2) ���̃t�@�C���̕ҏW�Z�b�V�������N���b�V������.\n"
 
-#: memline.c:3695
+#: ../memline.c:3848
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ���̏ꍇ�ɂ� \":recover\" �� \"vim -r "
 
-#: memline.c:3697
+#: ../memline.c:3850
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
 "\"\n"
 "    ���g�p���ĕύX�����J�o�[���܂�(\":help recover\" ���Q��).\n"
 
-#: memline.c:3698
+#: ../memline.c:3851
 msgid "    If you did this already, delete the swap file \""
 msgstr "    ���ɂ�����s�Ȃ����̂Ȃ��, �X���b�v�t�@�C�� \""
 
-#: memline.c:3700
+#: ../memline.c:3853
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
 "\"\n"
 "    �������΂��̃��b�Z�[�W������ł��܂�.\n"
 
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
 msgid "Swap file \""
 msgstr "�X���b�v�t�@�C�� \""
 
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
 msgid "\" already exists!"
 msgstr "\" �����ɂ���܂�!"
 
-#: memline.c:3724
+#: ../memline.c:3877
 msgid "VIM - ATTENTION"
 msgstr "VIM - ����"
 
-#: memline.c:3726
+#: ../memline.c:3879
 msgid "Swap file already exists!"
 msgstr "�X���b�v�t�@�C�������ɑ��݂��܂�!"
 
-#: memline.c:3730
+#: ../memline.c:3883
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
 "�I������(&Q)\n"
 "���~����(&A)"
 
-#: memline.c:3732
+#: ../memline.c:3885
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
 "���~����(&A)\n"
 "��������(&D)"
 
-#: memline.c:3789
+#: ../memline.c:3942
 msgid "E326: Too many swap files found"
 msgstr "E326: �X���b�v�t�@�C��������������܂���"
 
-#: menu.c:64
+#: ../menu.c:64
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ���j���[�A�C�e���̃p�X�̕������T�u���j���[�ł͂���܂���"
 
-#: menu.c:65
+#: ../menu.c:65
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ���j���[�͑��̃��[�h�ɂ�������܂�"
 
-#: menu.c:66
+#: ../menu.c:66
 msgid "E329: No menu of that name"
 msgstr "E329: ���̖��O�̃��j���[�͂���܂���"
 
-#: menu.c:525
+#: ../menu.c:522
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ���j���[�p�X�̓T�u���j���[�𐶂���ׂ��ł͂���܂���"
 
-#: menu.c:564
+#: ../menu.c:561
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ���j���[�o�[�ɂ͒��ڃ��j���[�A�C�e����ǉ��ł��܂���"
 
-#: menu.c:570
+#: ../menu.c:567
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ��؂�̓��j���[�p�X�̈ꕔ�ł͂���܂���"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: menu.c:1097
+#: ../menu.c:1093
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
 "\n"
 "--- ���j���[ ---"
 
-#: menu.c:2019
+#: ../menu.c:2011
 msgid "Tear off this menu"
 msgstr "���̃��j���[��؂���"
 
-#: menu.c:2084
+#: ../menu.c:2076
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ���j���[�p�X�̓��j���[�A�C�e���𐶂��Ȃ���΂����܂���"
 
-#: menu.c:2104
+#: ../menu.c:2096
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: ���j���[���݂���܂���: %s"
 
-#: menu.c:2173
+#: ../menu.c:2169
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s �ɂ̓��j���[����`����Ă��܂���"
 
-#: menu.c:2211
+#: ../menu.c:2208
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ���j���[�p�X�̓T�u���j���[�𐶂��Ȃ���΂����܂���"
 
-#: menu.c:2232
+#: ../menu.c:2229
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: ���j���[���݂���܂��� - ���j���[�����m�F���Ă�������"
 
-#: message.c:414
+#: ../message.c:429
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s �̏������ɃG���[�����o����܂���:"
 
-#: message.c:440
+#: ../message.c:454
 #, c-format
 msgid "line %4ld:"
 msgstr "�s %4ld:"
 
-#: message.c:647
+#: ../message.c:657
 msgid "[string too long]"
-msgstr "[�����񂪒������܂�]"
+msgstr "[�����񂪒��߂��܂�]"
 
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: �����ȃ��W�X�^��: '%s'"
+
+#: ../message.c:814
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr "���{�ꃁ�b�Z�[�W�|��/�ďC: ���� ���Y <koron@tka.att.ne.jp>"
 
-#: message.c:1025
+#: ../message.c:1040
 msgid "Interrupt: "
 msgstr "������: "
 
-#: message.c:1028
+#: ../message.c:1043
 msgid "Hit ENTER to continue"
 msgstr "������ɂ�ENTER�������Ă�������"
 
-#: message.c:1030
+#: ../message.c:1045
 msgid "Hit ENTER or type command to continue"
 msgstr "������ɂ�ENTER���������R�}���h����͂��Ă�������"
 
-#: message.c:2351
+#: ../message.c:2370
 msgid "-- More --"
 msgstr "-- �p�� --"
 
-#: message.c:2354
+#: ../message.c:2373
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: �s����, SPACE/b: �y�[�W����, d/u: ���y�[�W����, q: �I��)"
 
-#: message.c:2355
+#: ../message.c:2374
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: �s����, SPACE: �y�[�W����, d: ���y�[�W����, q: �I��)"
 
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
 msgid "Question"
 msgstr "����"
 
-#: message.c:2978
+#: ../message.c:3001
 msgid ""
 "&Yes\n"
 "&No"
@@ -4124,7 +4610,7 @@ msgstr ""
 "�͂�(&Y)\n"
 "������(&N)"
 
-#: message.c:3011
+#: ../message.c:3034
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
 "�S�ĕ���(&D)\n"
 "�L�����Z��(&C)"
 
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "�f�B���N�g���I���_�C�A���O"
+
+#: ../message.c:3077
 msgid "Save File dialog"
 msgstr "�t�@�C���ۑ��_�C�A���O"
 
-#: message.c:3054
+#: ../message.c:3079
 msgid "Open File dialog"
 msgstr "�t�@�C���Ǎ��_�C�A���O"
 
 #. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: �R���\\�[�����[�h�ł̓t�@�C���u���E�U���g���܂���, ���߂�Ȃ���"
 
-#: misc1.c:2773
+#: ../misc1.c:2860
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: �x��: �Ǎ���p�t�@�C����ύX���܂�"
 
-#: misc1.c:3021
+#: ../misc1.c:3113
 msgid "1 more line"
 msgstr "1 �s �ǉ����܂���"
 
-#: misc1.c:3023
+#: ../misc1.c:3115
 msgid "1 line less"
 msgstr "1 �s �폜���܂���"
 
-#: misc1.c:3028
+#: ../misc1.c:3120
 #, c-format
 msgid "%ld more lines"
 msgstr "%ld �s �ǉ����܂���"
 
-#: misc1.c:3030
+#: ../misc1.c:3122
 #, c-format
 msgid "%ld fewer lines"
 msgstr "%ld �s �폜���܂���"
 
-#: misc1.c:3033
+#: ../misc1.c:3125
 msgid " (Interrupted)"
 msgstr " (�����܂�܂���)"
 
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "�r�[�b!"
+
+#: ../misc1.c:7814
 msgid "Vim: preserving files...\n"
 msgstr "Vim: �t�@�C����ۑ���...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
 msgid "Vim: Finished.\n"
 msgstr "Vim: �I�����܂���.\n"
 
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
 msgid "ERROR: "
 msgstr "�G���[: "
 
-#: misc2.c:715
+#: ../misc2.c:710
 #, c-format
 msgid ""
 "\n"
@@ -4199,7 +4693,7 @@ msgstr ""
 "\n"
 "[������(�o�C�g)] ������-����� %lu-%lu, �g�p�� %lu, �s�[�N�� %lu\n"
 
-#: misc2.c:717
+#: ../misc2.c:712
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
 "[�ďo] �� re/malloc() �� %lu, �� free() �� %lu\n"
 "\n"
 
-#: misc2.c:772
+#: ../misc2.c:767
 msgid "E340: Line is becoming too long"
-msgstr "E340: �s�������Ȃ肷���܂���"
+msgstr "E340: �s�������Ȃ�߂��܂���"
 
-#: misc2.c:816
+#: ../misc2.c:811
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: �����G���[: lalloc(%ld,)"
 
-#: misc2.c:924
+#: ../misc2.c:919
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: ������������܂���!  (%lu �o�C�g�������v��)"
 
-#: misc2.c:2593
+#: ../misc2.c:2580
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "���s�̂��߂ɃV�F�����ďo����: \"%s\""
 
-#: misc2.c:2815
+#: ../misc2.c:2845
 msgid "E545: Missing colon"
 msgstr "E545: �R����������܂���"
 
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
 msgid "E546: Illegal mode"
 msgstr "E546: �s���ȃ��[�h�ł�"
 
-#: misc2.c:2883
+#: ../misc2.c:2913
 msgid "E547: Illegal mouseshape"
 msgstr "E547: �s���� 'mouseshape' �ł�"
 
-#: misc2.c:2923
+#: ../misc2.c:2953
 msgid "E548: digit expected"
 msgstr "E548: ���l���K�v�ł�"
 
-#: misc2.c:2928
+#: ../misc2.c:2958
 msgid "E549: Illegal percentage"
 msgstr "E549: �s���ȃp�[�Z���e�[�W�ł�"
 
-#: misc2.c:3238
+#: ../misc2.c:3270
 msgid "Enter encryption key: "
 msgstr "�Í����p�̃L�[����͂��Ă�������: "
 
-#: misc2.c:3239
+#: ../misc2.c:3271
 msgid "Enter same key again: "
 msgstr "������x�����L�[����͂��Ă�������: "
 
-#: misc2.c:3249
+#: ../misc2.c:3281
 msgid "Keys don't match!"
 msgstr "�L�[����v���܂���"
 
-#: misc2.c:3798
+#: ../misc2.c:3825
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
 "E343: �����ȃp�X�ł�: '**[���l]' ��path�̍Ōォ '%s' "
 "�������ĂȂ��Ƃ����܂���."
 
-#: misc2.c:5077
+#: ../misc2.c:5104
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
 
-#: misc2.c:5080
+#: ../misc2.c:5107
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
 
-#: misc2.c:5086
+#: ../misc2.c:5113
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath�ɂ͂���ȏ� \"%s\" �Ƃ����t�@�C��������܂���"
 
-#: misc2.c:5089
+#: ../misc2.c:5116
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: �p�X�ɂ͂���ȏ� \"%s\" �Ƃ����t�@�C��������܂���"
 
-#: misc2.c:5323
+#: ../misc2.c:5356
 msgid "E550: Missing colon"
 msgstr "E550: �R����������܂���"
 
-#: misc2.c:5335
+#: ../misc2.c:5368
 msgid "E551: Illegal component"
 msgstr "E551: �s���ȍ\\���v�f�ł�"
 
-#: misc2.c:5343
+#: ../misc2.c:5376
 msgid "E552: digit expected"
 msgstr "E552: ���l���K�v�ł�"
 
 #. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
 msgid "Cannot connect to Netbeans #2"
 msgstr "Netbeans #2 �ɐڑ��ł��܂���"
 
-#: netbeans.c:404
+#: ../netbeans.c:417
 msgid "Cannot connect to Netbeans"
 msgstr "Netbeans �ɐڑ��ł��܂���"
 
-#: netbeans.c:450
+#: ../netbeans.c:461
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans�̐ڑ����t�@�C���̃A�N�Z�X���[�h�ɖ�肪����܂�: \"%s\""
 
-#: netbeans.c:749
+#: ../netbeans.c:760
 msgid "read from Netbeans socket"
 msgstr "Netbeans �̃\\�P�b�g��Ǎ���"
 
-#: netbeans.c:1638
+#: ../netbeans.c:1680
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: �o�b�t�@ %ld �� NetBeans �ڑ��������܂���"
 
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
 msgid "Warning: terminal cannot highlight"
 msgstr "�x��: �g�p���Ă���[���̓n�C���C�g�ł��܂���"
 
-#: normal.c:3276
+#: ../normal.c:3293
 msgid "E348: No string under cursor"
 msgstr "E348: �J�[�\\���̈ʒu�ɂ͕����񂪂���܂���"
 
-#: normal.c:3278
+#: ../normal.c:3295
 msgid "E349: No identifier under cursor"
 msgstr "E349: �J�[�\\���̈ʒu�ɂ͎��ʎq������܂���"
 
-#: normal.c:4519
+#: ../normal.c:4537
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: ���݂� 'foldmethod' �ł͐܏�݂������ł��܂���"
 
-#: normal.c:6708
+#: ../normal.c:6808
 msgid "E664: changelist is empty"
 msgstr "E664: �ύX���X�g����ł�"
 
-#: normal.c:6710
+#: ../normal.c:6810
 msgid "E662: At start of changelist"
 msgstr "E662: �ύX���X�g�̐擪"
 
-#: normal.c:6712
+#: ../normal.c:6812
 msgid "E663: At end of changelist"
 msgstr "E663: �ύX���X�g�̖���"
 
-#: normal.c:7973
+#: ../normal.c:8085
 msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vim���I������ɂ� :quit<Enter> �Ɠ��͂��Ă�������"
 
-#: ops.c:294
+#: ../ops.c:291
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 �s�� %s �� 1 �񏈗�����܂���"
 
-#: ops.c:296
+#: ../ops.c:293
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 �s�� %s �� %d �񏈗�����܂���"
 
-#: ops.c:301
+#: ../ops.c:298
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld �s�� %s �� 1 �񏈗�����܂���"
 
-#: ops.c:304
+#: ../ops.c:301
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld �s�� %s �� %d �񏈗�����܂���"
 
-#: ops.c:662
+#: ../ops.c:659
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld �s���C���f���g����܂�... "
 
-#: ops.c:712
+#: ../ops.c:709
 msgid "1 line indented "
 msgstr "1 �s���C���f���g���܂���"
 
-#: ops.c:714
+#: ../ops.c:711
 #, c-format
 msgid "%ld lines indented "
 msgstr "%ld �s���C���f���g���܂���"
 
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: �܂����W�X�^���g�p���Ă��܂���"
+
 #. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
 msgid "cannot yank; delete anyway"
 msgstr "�����N�ł��܂���; �Ƃɂ�������"
 
-#: ops.c:2185
+#: ../ops.c:2223
 msgid "1 line changed"
 msgstr "1 �s���ύX����܂���"
 
-#: ops.c:2187
+#: ../ops.c:2225
 #, c-format
 msgid "%ld lines changed"
 msgstr "%ld �s���ύX����܂���"
 
-#: ops.c:2571
+#: ../ops.c:2609
 #, c-format
 msgid "freeing %ld lines"
 msgstr "%ld �s���J����"
 
-#: ops.c:2852
+#: ../ops.c:2891
 msgid "1 line yanked"
 msgstr "1 �s�������N����܂���"
 
-#: ops.c:2854
+#: ../ops.c:2893
 #, c-format
 msgid "%ld lines yanked"
 msgstr "%ld �s�������N����܂���"
 
-#: ops.c:3139
+#: ../ops.c:3188
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: ���W�X�^ %s �ɂ͉�������܂���"
 
 #. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
 "\n"
 "--- ���W�X�^ ---"
 
-#: ops.c:4997
+#: ../ops.c:5066
 msgid "Illegal register name"
 msgstr "�s���ȃ��W�X�^��"
 
-#: ops.c:5085
+#: ../ops.c:5154
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
 "\n"
 "# ���W�X�^:\n"
 
-#: ops.c:5135
+#: ../ops.c:5210
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ���m�̃��W�X�^�^ %d �ł�"
 
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �����ȃ��W�X�^��: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ��; "
 
-#: ops.c:5987
+#: ../ops.c:6092
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld ����"
 
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld ����; %ld / %ld �o�C�g"
+
+#: ../ops.c:6116
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "�� %s / %s; �s %ld of %ld; �P�� %ld / %ld; ���� %ld / %ld"
 
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"�� %s / %s; �s %ld / %ld; �P�� %ld / %ld; ���� %ld / %ld; �o�C�g %ld of %ld"
+
+#: ../ops.c:6135
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1643
+#: ../option.c:1692
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N �y�[�W"
 
-#: option.c:2092
+#: ../option.c:2171
 msgid "Thanks for flying Vim"
 msgstr "Vim ���g���Ă���Ă��肪�Ƃ�"
 
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
 msgid "E518: Unknown option"
 msgstr "E518: ���m�̃I�v�V�����ł�"
 
-#: option.c:3432
+#: ../option.c:3607
 msgid "E519: Option not supported"
 msgstr "E519: �I�v�V�����̓T�|�[�g����Ă��܂���"
 
-#: option.c:3457
+#: ../option.c:3632
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline �ł͋�����܂���"
 
-#: option.c:3522
+#: ../option.c:3703
 msgid ""
 "\n"
 "\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
 "\n"
 "\tLast set from "
 
-#: option.c:3661
+#: ../option.c:3842
 msgid "E521: Number required after ="
 msgstr "E521: = �̌�ɂ͐������K�v�ł�"
 
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ���ɂ݂���܂���"
 
-#: option.c:4064
+#: ../option.c:4258
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: �s���ȕ����ł� <%s>"
 
-#: option.c:4611
+#: ../option.c:4823
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' �ɂ͋󕶎����ݒ�ł��܂���"
 
-#: option.c:4614
+#: ../option.c:4826
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: GUI�ł� 'term' ��ύX�ł��܂���"
 
-#: option.c:4616
+#: ../option.c:4828
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: GUI���X�^�[�g����ɂ� \":gui\" ���g�p���Ă�������"
 
-#: option.c:4645
+#: ../option.c:4857
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' �� 'patchmode' �������ł�"
 
-#: option.c:4860
+#: ../option.c:5085
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+2 GUI�ł͕ύX�ł��܂���"
 
-#: option.c:5016
+#: ../option.c:5249
 msgid "E524: Missing colon"
 msgstr "E524: �R����������܂���"
 
-#: option.c:5018
+#: ../option.c:5251
 msgid "E525: Zero length string"
 msgstr "E525: ������̒������[���ł�"
 
-#: option.c:5086
+#: ../option.c:5326
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> �̌�ɐ���������܂���"
 
-#: option.c:5100
+#: ../option.c:5340
 msgid "E527: Missing comma"
 msgstr "E527: �J���}������܂���"
 
-#: option.c:5107
+#: ../option.c:5347
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' �̒l���w�肵�Ȃ���΂Ȃ�܂���"
 
-#: option.c:5148
+#: ../option.c:5388
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: �\\���ł��Ȃ����������C�h�������܂�ł��܂�"
 
-#: option.c:5197
+#: ../option.c:5432
 msgid "E596: Invalid font(s)"
 msgstr "E596: �����ȃt�H���g�ł�"
 
-#: option.c:5205
+#: ../option.c:5440
 msgid "E597: can't select fontset"
 msgstr "E597: �t�H���g�Z�b�g��I���ł��܂���"
 
-#: option.c:5207
+#: ../option.c:5442
 msgid "E598: Invalid fontset"
 msgstr "E598: �����ȃt�H���g�Z�b�g�ł�"
 
-#: option.c:5214
+#: ../option.c:5449
 msgid "E533: can't select wide font"
 msgstr "E533: ���C�h�t�H���g��I���ł��܂���"
 
-#: option.c:5216
+#: ../option.c:5451
 msgid "E534: Invalid wide font"
 msgstr "E534: �����ȃ��C�h�t�H���g�ł�"
 
-#: option.c:5486
+#: ../option.c:5728
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> �̌�ɕs���ȕ���������܂�"
 
-#: option.c:5597
+#: ../option.c:5839
 msgid "E536: comma required"
 msgstr "E536: �J���}���K�v�ł�"
 
-#: option.c:5607
+#: ../option.c:5849
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' �͋�ł��邩 %s ���܂ޕK�v������܂�"
 
-#: option.c:5679
+#: ../option.c:5924
 msgid "E538: No mouse support"
 msgstr "E538: �}�E�X�̓T�|�[�g����܂���"
 
-#: option.c:5947
+#: ../option.c:6195
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: �����I�����Ă��܂���"
 
-#: option.c:5951
+#: ../option.c:6199
 msgid "E541: too many items"
-msgstr "E541: �v�f���������܂�"
+msgstr "E541: �v�f�����߂��܂�"
 
-#: option.c:5953
+#: ../option.c:6201
 msgid "E542: unbalanced groups"
 msgstr "E542: �O���[�v���ލ����܂���"
 
-#: option.c:6193
+#: ../option.c:6441
 msgid "E590: A preview window already exists"
 msgstr "E590: �v���r���[�E�B���h�E�����ɑ��݂��܂�"
 
-#: option.c:6450
+#: ../option.c:6688
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: �A���r�A�����ɂ�UTF-8���K�v�Ȃ̂�, ':set encoding=utf-8' ���Ă�������"
 
-#: option.c:6776
+#: ../option.c:7052
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: �Œ� %d �̍s�����K�v�ł�"
 
-#: option.c:6786
+#: ../option.c:7062
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: �Œ� %d �̃J���������K�v�ł�"
 
-#: option.c:7093
+#: ../option.c:7371
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ���m�̃I�v�V�����ł�: %s"
 
-#: option.c:7213
+#: ../option.c:7504
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
 "\n"
 "--- �[���R�[�h ---"
 
-#: option.c:7215
+#: ../option.c:7506
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
 "\n"
 "--- �O���[�o���I�v�V�����l ---"
 
-#: option.c:7217
+#: ../option.c:7508
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
 "\n"
 "--- ���[�J���I�v�V�����l ---"
 
-#: option.c:7219
+#: ../option.c:7510
 msgid ""
 "\n"
 "--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
 "\n"
 "--- �I�v�V���� ---"
 
-#: option.c:7925
+#: ../option.c:8240
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp �G���["
 
-#: option.c:8896
+#: ../option.c:9217
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s �ɑΉ����镶��������܂���"
 
-#: option.c:8930
+#: ../option.c:9243
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': �Z�~�R�����̌�ɗ]���ȕ���������܂�: %s"
 
-#: os_amiga.c:280
+#: ../os_amiga.c:280
 msgid "cannot open "
 msgstr "�J���܂��� "
 
-#: os_amiga.c:314
+#: ../os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: �E�B���h�E���J���܂���!\n"
 
-#: os_amiga.c:338
+#: ../os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados�̃o�[�W���� 2.04������ȍ~���K�v�ł�\n"
 
-#: os_amiga.c:344
+#: ../os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "%s �̃o�[�W���� %ld ���K�v�ł�\n"
 
-#: os_amiga.c:416
+#: ../os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "NIL���J���܂���:\n"
 
-#: os_amiga.c:427
+#: ../os_amiga.c:427
 msgid "Cannot create "
 msgstr "�쐬�ł��܂��� "
 
-#: os_amiga.c:905
+#: ../os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim�� %d �ŏI�����܂�\n"
 
-#: os_amiga.c:937
+#: ../os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "�R���\\�[�����[�h��ύX�ł��܂���?!\n"
 
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: �R���\\�[���ł͂Ȃ�??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f �I�v�V�����ŃV�F�������s�ł��܂���"
 
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "���s�ł��܂��� "
 
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
 msgid "shell "
 msgstr "�V�F�� "
 
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
 msgid " returned\n"
 msgstr " �߂�܂���\n"
 
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE �����������܂�."
+msgstr "ANCHOR_BUF_SIZE �������߂��܂�."
 
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "���o�̓G���["
 
-#: os_mswin.c:539
+#: ../os_mswin.c:597
 msgid "...(truncated)"
 msgstr "...(�ȗ�)"
 
-#: os_mswin.c:641
+#: ../os_mswin.c:714
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ��80�ł͂Ȃ�����, �O���R�}���h�����s�ł��܂���"
 
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
 msgid "E237: Printer selection failed"
 msgstr "E237: �v�����^�̑I���Ɏ��s���܂���"
 
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
 #, c-format
 msgid "to %s on %s"
 msgstr "%s �� (%s ���)"
 
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: ���m�̃v�����^�I�v�V�����ł�: %s"
 
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: ����G���[: %s"
 
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "�s��"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
 #, c-format
 msgid "Printing '%s'"
 msgstr "������Ă��܂�: '%s'"
 
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: �����Z�b�g�� \"%s\" �͕s���ł� (�t�H���g�� \"%s\")"
 
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' �͕s���ȕ����ł� (�t�H���g�� \"%s\")"
 
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: ������ 'osfiletype' �I�v�V���� - \"Text\" ���g���܂�"
 
-#: os_unix.c:927
+#: ../os_unix.c:989
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: 2�d�̃V�O�i���̂���, �I�����܂�\n"
 
-#: os_unix.c:933
+#: ../os_unix.c:995
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: �v���I�V�O�i�� %s �����m���܂���\n"
 
-#: os_unix.c:936
+#: ../os_unix.c:998
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: �v���I�V�O�i�������m���܂���\n"
 
-#: os_unix.c:1199
+#: ../os_unix.c:1318
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "X�T�[�o�ւ̐ڑ��� %ld �~���b������܂���"
 
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X �̃G���[�����o���܂��������s���܂�...\n"
+
+#: ../os_unix.c:1351
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
 "\n"
 "Vim: X �̃G���[�����o���܂���r\n"
 
-#: os_unix.c:1334
+#: ../os_unix.c:1464
 msgid "Testing the X display failed"
 msgstr "X display �̃`�F�b�N�Ɏ��s���܂���"
 
-#: os_unix.c:1473
+#: ../os_unix.c:1603
 msgid "Opening the X display timed out"
 msgstr "X display �� open ���^�C���A�E�g���܂���"
 
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
 "\n"
 "�V�F�������s�ł��܂��� "
 
-#: os_unix.c:3275
+#: ../os_unix.c:3432
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
 "\n"
 "sh �V�F�������s�ł��܂���\n"
 
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
 msgid ""
 "\n"
 "shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
 "\n"
 "�V�F�����l��Ԃ��܂��� "
 
-#: os_unix.c:3414
+#: ../os_unix.c:3578
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
 "\n"
 "�p�C�v���쐬�ł��܂���\n"
 
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
 "\n"
 "fork �ł��܂���\n"
 
-#: os_unix.c:3920
+#: ../os_unix.c:4233
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
 "\n"
 "�R�}���h�𒆒f���܂���\n"
 
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
 msgid "XSMP lost ICE connection"
 msgstr "XSMP ��ICE�ڑ��������܂���"
 
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
 msgid "Opening the X display failed"
 msgstr "X display �� open �Ɏ��s���܂���"
 
-#: os_unix.c:5880
+#: ../os_unix.c:6297
 msgid "XSMP handling save-yourself request"
 msgstr "XSMP ��save-yourself�v�����������Ă��܂�"
 
-#: os_unix.c:5999
+#: ../os_unix.c:6416
 msgid "XSMP opening connection"
 msgstr "XSMP ���ڑ����J�n���Ă��܂�"
 
-#: os_unix.c:6018
+#: ../os_unix.c:6435
 msgid "XSMP ICE connection watch failed"
 msgstr "XSMP ICE�ڑ������s�����悤�ł�"
 
-#: os_unix.c:6038
+#: ../os_unix.c:6455
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection�����s���܂���: %s"
 
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
 msgid "At line"
 msgstr "�s"
 
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "�R�}���h���C���Ƀ����������蓖�Ă��܂���"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll �����[�h�ł��܂���ł���"
 
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
 msgid "VIM Error"
 msgstr "VIM�G���["
 
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll �����[�h�ł��܂���ł���"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "DLL����֐��|�C���^���擾�ł��܂���ł���"
 
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
 #, c-format
 msgid "shell returned %d"
 msgstr "�V�F�����R�[�h %d �ŏI�����܂���"
 
-#: os_win32.c:2655
+#: ../os_win32.c:2776
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: �C�x���g %s �����m\n"
 
-#: os_win32.c:2657
+#: ../os_win32.c:2778
 msgid "close"
 msgstr "����"
 
-#: os_win32.c:2659
+#: ../os_win32.c:2780
 msgid "logoff"
 msgstr "���O�I�t"
 
-#: os_win32.c:2660
+#: ../os_win32.c:2781
 msgid "shutdown"
 msgstr "�V���b�g�_�E��"
 
-#: os_win32.c:3150
+#: ../os_win32.c:3270
 msgid "E371: Command not found"
 msgstr "E371: �R�}���h������܂���"
 
-#: os_win32.c:3163
+#: ../os_win32.c:3283
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
 "�O���R�}���h�̏I����Ɉꎞ��~�����܂���.\n"
 "�ڍׂ�  :help win32-vimrun  ���Q�Ƃ��Ă�������."
 
-#: os_win32.c:3166
+#: ../os_win32.c:3286
 msgid "Vim Warning"
 msgstr "Vim�̌x��"
 
-#: quickfix.c:258
+#: ../quickfix.c:284
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: �t�H�[�}�b�g������� %%%c ���������܂�"
+msgstr "E372: �t�H�[�}�b�g������� %%%c �����߂��܂�"
 
-#: quickfix.c:271
+#: ../quickfix.c:297
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: �t�H�[�}�b�g������ɗ\\������ %%%c ������܂���"
 
-#: quickfix.c:325
+#: ../quickfix.c:351
 msgid "E374: Missing ] in format string"
 msgstr "E374: �t�H�[�}�b�g������� ] ������܂���"
 
-#: quickfix.c:339
+#: ../quickfix.c:365
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: �t�H�[�}�b�g������ł� %%%c �̓T�|�[�g����܂���"
 
-#: quickfix.c:357
+#: ../quickfix.c:383
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: �t�H�[�}�b�g������̑O�u�ɖ����� %%%c ������܂�"
 
-#: quickfix.c:365
+#: ../quickfix.c:391
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �t�H�[�}�b�g������ɖ����� %%%c ������܂�"
 
-#: quickfix.c:391
+#: ../quickfix.c:417
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �Ƀp�^�[�����w�肳��Ă��܂���"
 
-#: quickfix.c:501
+#: ../quickfix.c:537
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �f�B���N�g��������������ł�"
 
-#: quickfix.c:990
+#: ../quickfix.c:1027
 msgid "E553: No more items"
 msgstr "E553: �v�f����������܂���"
 
-#: quickfix.c:1229
+#: ../quickfix.c:1324
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: quickfix.c:1231
+#: ../quickfix.c:1326
 msgid " (line deleted)"
 msgstr " (�s���폜����܂���)"
 
-#: quickfix.c:1444
+#: ../quickfix.c:1539
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �X�^�b�N�̖����ł�"
 
-#: quickfix.c:1453
+#: ../quickfix.c:1548
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �X�^�b�N�̐擪�ł�"
 
-#: quickfix.c:1465
+#: ../quickfix.c:1560
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "�G���[�ꗗ %d of %d; %d �G���["
 
-#: quickfix.c:1943
+#: ../quickfix.c:2042
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' �I�v�V�������ݒ肳��Ă���̂ŏ����݂܂���"
 
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �����p�^�[������؂�L�����s���ł�"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: �t�@�C�����������������ȃp�^�[���ł�"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "�t�@�C�� \"%s\" ���J���܂���"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: �o�b�t�@�͓ǂݍ��܂�܂���ł���"
+
+#: ../regexp.c:1006
 msgid "E339: Pattern too long"
-msgstr "E339: �p�^�[�����������܂�"
+msgstr "E339: �p�^�[�������߂��܂�"
 
-#: regexp.c:1009
+#: ../regexp.c:1177
 msgid "E50: Too many \\z("
-msgstr "E50: \\z( ���������܂�"
+msgstr "E50: \\z( �����߂��܂�"
 
-#: regexp.c:1020
+#: ../regexp.c:1188
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: %s( ���������܂�"
+msgstr "E51: %s( �����߂��܂�"
 
-#: regexp.c:1077
+#: ../regexp.c:1245
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( ���ނ荇���Ă��܂���"
 
-#: regexp.c:1081
+#: ../regexp.c:1249
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ���ނ荇���Ă��܂���"
 
-#: regexp.c:1083
+#: ../regexp.c:1251
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ���ނ荇���Ă��܂���"
 
-#: regexp.c:1088
+#: ../regexp.c:1256
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ���ނ荇���Ă��܂���"
 
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* ���󕶎���ɂȂ�\\��������܂�"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ ���󕶎���ɂȂ�\\��������܂�"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ �̌�ɕs���ȕ���������܂���"
 
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ ���󕶎���ɂȂ�\\��������܂�"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
 #, c-format
 msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ���G�� %s{...} ���������܂�"
+msgstr "E60: ���G�� %s{...} �����߂��܂�"
 
-#: regexp.c:1370
+#: ../regexp.c:1524
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* ������q�ɂȂ��Ă��܂�"
 
-#: regexp.c:1373
+#: ../regexp.c:1527
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c ������q�ɂȂ��Ă��܂�"
 
 #
-#: regexp.c:1491
+#: ../regexp.c:1647
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ �̖����Ȏg�p���@�ł�"
 
-#: regexp.c:1536
+#: ../regexp.c:1692
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c �̌�ɂȂɂ�����܂���"
 
 #
-#: regexp.c:1592
+#: ../regexp.c:1748
 msgid "E65: Illegal back reference"
 msgstr "E65: �s���Ȍ���Q�Ƃł�"
 
 #
-#: regexp.c:1605
+#: ../regexp.c:1761
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( �̓R�R�ł͋�����Ă��܂���"
 
 #
-#: regexp.c:1624
+#: ../regexp.c:1780
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 ���̑��̓R�R�ł͋�����Ă��܂���"
 
 #
-#: regexp.c:1635
+#: ../regexp.c:1791
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �̌�ɕs���ȕ���������܂���"
 
 #
-#: regexp.c:1684
+#: ../regexp.c:1840
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ �̌�� ] ������܂���"
 
-#: regexp.c:1700
+#: ../regexp.c:1856
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] ����ł�"
 
 #
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] �̌�ɕs���ȕ���������܂���"
+
+#
+#: ../regexp.c:1952
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% �̌�ɕs���ȕ���������܂���"
 
-#: regexp.c:2557
+#: ../regexp.c:2922
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} ���ɕ��@�G���[������܂�"
 
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: �N���b�V���ɂ�蒆�f; ���K�\\�������G�߂��邩��?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: �p�^�[���ɂ��X�^�b�N�s���G���[�ł�"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
 msgid "External submatches:\n"
 msgstr "�O���̕����Y��:\n"
 
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �s���܏�܂�܂���"
-
-#: screen.c:7959
+#: ../screen.c:7969
 msgid " VREPLACE"
 msgstr " ���z�u��"
 
-#: screen.c:7963
+#: ../screen.c:7973
 msgid " REPLACE"
 msgstr " �u��"
 
-#: screen.c:7968
+#: ../screen.c:7978
 msgid " REVERSE"
 msgstr " ���]"
 
-#: screen.c:7970
+#: ../screen.c:7980
 msgid " INSERT"
 msgstr " �}��"
 
-#: screen.c:7973
+#: ../screen.c:7983
 msgid " (insert)"
 msgstr " (�}��)"
 
-#: screen.c:7975
+#: ../screen.c:7985
 msgid " (replace)"
 msgstr " (�u��)"
 
-#: screen.c:7977
+#: ../screen.c:7987
 msgid " (vreplace)"
 msgstr " (���z�u��)"
 
-#: screen.c:7980
+#: ../screen.c:7990
 msgid " Hebrew"
 msgstr " �w�u���C"
 
-#: screen.c:7991
+#: ../screen.c:8001
 msgid " Arabic"
 msgstr " �A���r�A"
 
-#: screen.c:7994
+#: ../screen.c:8004
 msgid " (lang)"
 msgstr " (����)"
 
-#: screen.c:7998
+#: ../screen.c:8008
 msgid " (paste)"
 msgstr " (�\\��t��)"
 
-#: screen.c:8011
+#: ../screen.c:8021
 msgid " VISUAL"
 msgstr " �r�W���A��"
 
-#: screen.c:8012
+#: ../screen.c:8022
 msgid " VISUAL LINE"
 msgstr " �r�W���A�� �s"
 
-#: screen.c:8013
+#: ../screen.c:8023
 msgid " VISUAL BLOCK"
 msgstr " �r�W���A�� ��`"
 
-#: screen.c:8014
+#: ../screen.c:8024
 msgid " SELECT"
 msgstr " �Z���N�g"
 
-#: screen.c:8015
+#: ../screen.c:8025
 msgid " SELECT LINE"
 msgstr " �s�w���I��"
 
-#: screen.c:8016
+#: ../screen.c:8026
 msgid " SELECT BLOCK"
 msgstr " ��`�I��"
 
@@ -5226,118 +5739,118 @@ msgstr " ��`�I��"
 # msgstr " �u���b�N"
 # msgid " LINE"
 # msgstr " �s"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
 msgid "recording"
 msgstr "�L�^��"
 
-#: search.c:37
+#: ../search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "��܂Ō��������̂ŉ��ɖ߂�܂�"
 
-#: search.c:38
+#: ../search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "���܂Ō��������̂ŏ�ɖ߂�܂�"
 
-#: search.c:526
+#: ../search.c:525
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: �����Ȍ���������ł�: %s"
 
-#: search.c:853
+#: ../search.c:868
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ��܂Ō�����������ǊY���ӏ��͂���܂���: %s"
 
-#: search.c:856
+#: ../search.c:871
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ���܂Ō�����������ǊY���ӏ��͂���܂���: %s"
 
-#: search.c:1249
+#: ../search.c:1265
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' �̂��Ƃɂ� '?' �� '/' �����҂���Ă���"
 
-#: search.c:3758
+#: ../search.c:4147
 msgid " (includes previously listed match)"
 msgstr " (�O�ɗ񋓂����Y���ӏ����܂�)"
 
 #. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
 msgid "--- Included files "
 msgstr "--- �C���N���[�h���ꂽ�t�@�C��"
 
-#: search.c:3780
+#: ../search.c:4169
 msgid "not found "
 msgstr "�݂���܂��� "
 
-#: search.c:3781
+#: ../search.c:4170
 msgid "in path ---\n"
 msgstr "�p�X�� ----\n"
 
-#: search.c:3820
+#: ../search.c:4227
 msgid "  (Already listed)"
 msgstr "  (���ɗ�)"
 
-#: search.c:3822
+#: ../search.c:4229
 msgid "  NOT FOUND"
 msgstr "  �݂���܂���"
 
-#: search.c:3874
+#: ../search.c:4281
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "�C���N���[�h���ꂽ�t�@�C�����X�L������: %s"
 
-#: search.c:4092
+#: ../search.c:4499
 msgid "E387: Match is on current line"
 msgstr "E387: ���ݍs�ɊY��������܂�"
 
-#: search.c:4235
+#: ../search.c:4642
 msgid "All included files were found"
 msgstr "�S�ẴC���N���[�h���ꂽ�t�@�C�����݂���܂���"
 
-#: search.c:4237
+#: ../search.c:4644
 msgid "No included files"
 msgstr "�C���N���[�h�t�@�C���͂���܂���"
 
-#: search.c:4253
+#: ../search.c:4660
 msgid "E388: Couldn't find definition"
 msgstr "E388: ��`���݂����܂���"
 
-#: search.c:4255
+#: ../search.c:4662
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �p�^�[�����݂����܂���"
 
-#: syntax.c:3050
+#: ../syntax.c:3070
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �s���Ȉ����ł�: %s"
 
-#: syntax.c:3230
+#: ../syntax.c:3247
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
 
-#: syntax.c:3394
+#: ../syntax.c:3411
 msgid "No Syntax items defined for this buffer"
 msgstr "���̃o�b�t�@�ɒ�`���ꂽ�\\���v�f�͂���܂���"
 
-#: syntax.c:3402
+#: ../syntax.c:3419
 msgid "syncing on C-style comments"
 msgstr "C���ꕗ�R�����g���瓯����"
 
-#: syntax.c:3410
+#: ../syntax.c:3427
 msgid "no syncing"
 msgstr "�񓯊�"
 
-#: syntax.c:3413
+#: ../syntax.c:3430
 msgid "syncing starts "
 msgstr "�����J�n "
 
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
 msgid " lines before top line"
 msgstr " �s�O(�g�b�v�s����)"
 
-#: syntax.c:3420
+#: ../syntax.c:3437
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
 "\n"
 "--- �\\�������v�f ---"
 
-#: syntax.c:3425
+#: ../syntax.c:3442
 msgid ""
 "\n"
 "syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
 "\n"
 "�v�f��œ�����"
 
-#: syntax.c:3431
+#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
 "\n"
 "--- �\\���v�f ---"
 
-#: syntax.c:3454
+#: ../syntax.c:3471
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
 
-#: syntax.c:3480
+#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal"
 
-#: syntax.c:3487
+#: ../syntax.c:3504
 msgid "maximal "
 msgstr "maximal"
 
-#: syntax.c:3499
+#: ../syntax.c:3516
 msgid "; match "
 msgstr "; �Y�� "
 
-#: syntax.c:3501
+#: ../syntax.c:3518
 msgid " line breaks"
 msgstr " �̉��s"
 
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: ���̏ꏊ�ł͈���contains�͋�����Ă��܂���"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: ���̏ꏊ�ł͈���containedin�͋�����Ă��܂���"
+
+#: ../syntax.c:4179
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: �����ł̓O���[�v�͋�����܂���"
 
-#: syntax.c:4159
+#: ../syntax.c:4203
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s �͈̔͗v�f���݂���܂���"
 
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ���̏ꏊ�ł͈���contains�͋�����Ă��܂���"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: ���̏ꏊ�ł͈���containedin�͋�����Ă��܂���"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
 msgid "E397: Filename required"
 msgstr "E397: �t�@�C�������K�v�ł�"
 
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' ������܂���: %s"
+
+#: ../syntax.c:4644
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ������܂���: %s"
 
-#: syntax.c:4772
+#: ../syntax.c:4803
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ����������܂���: �\\���͈� %s"
 
-#: syntax.c:5103
+#: ../syntax.c:5133
 msgid "E400: No cluster specified"
 msgstr "E400: �N���X�^���w�肳��Ă��܂���"
 
-#: syntax.c:5140
+#: ../syntax.c:5170
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �p�^�[����؂肪�݂���܂���: %s"
 
-#: syntax.c:5215
+#: ../syntax.c:5245
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: �p�^�[���̂��ƂɃS�~������܂�: %s"
 
-#: syntax.c:5305
+#: ../syntax.c:5335
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: �\\������: �A���s�p�^�[����2�x�w�肳��܂���"
 
-#: syntax.c:5362
+#: ../syntax.c:5392
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: �s���Ȉ����ł�: %s"
 
-#: syntax.c:5412
+#: ../syntax.c:5442
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ������ sign ������܂���: %s"
 
-#: syntax.c:5418
+#: ../syntax.c:5448
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: ��̈���: %s"
 
-#: syntax.c:5445
+#: ../syntax.c:5475
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s �̓R�R�ł͋�����Ă��܂���"
 
-#: syntax.c:5452
+#: ../syntax.c:5482
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s �͓��e���X�g�̐擪�łȂ���΂Ȃ�Ȃ�"
 
-#: syntax.c:5522
+#: ../syntax.c:5552
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ���m�̃O���[�v��: %s"
 
-#: syntax.c:5755
+#: ../syntax.c:5786
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ������ :syntax �̃T�u�R�}���h: %s"
 
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim �̍ċA�Ăяo�������o���܂���"
+
+#: ../syntax.c:6181
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �n�C���C�g�O���[�v���݂���܂���: %s"
 
-#: syntax.c:6158
+#: ../syntax.c:6205
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: �������[���ł͂Ȃ�: \":highlight link %s\""
 
-#: syntax.c:6165
+#: ../syntax.c:6212
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �������������܂�: \":highlight link %s\""
+msgstr "E413: ���������߂��܂�: \":highlight link %s\""
 
-#: syntax.c:6185
+#: ../syntax.c:6232
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: �O���[�v���ݒ肳��Ă���̂Ńn�C���C�g�����N�͖�������܂�"
 
-#: syntax.c:6314
+#: ../syntax.c:6361
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: �\\�����ʓ��� sign �ł�: %s"
 
-#: syntax.c:6350
+#: ../syntax.c:6397
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: ���� sign ������܂���: %s"
 
-#: syntax.c:6378
+#: ../syntax.c:6425
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ����������܂���: %s"
 
-#: syntax.c:6415
+#: ../syntax.c:6462
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: �s���Ȓl�ł�: %s"
 
-#: syntax.c:6534
+#: ../syntax.c:6581
 msgid "E419: FG color unknown"
 msgstr "E419: ���m�̑O�i�F�ł�"
 
-#: syntax.c:6545
+#: ../syntax.c:6592
 msgid "E420: BG color unknown"
 msgstr "E420: ���m�̔w�i�F�ł�"
 
-#: syntax.c:6606
+#: ../syntax.c:6653
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: �J���[����ԍ���F���ł��܂���: %s"
 
-#: syntax.c:6812
+#: ../syntax.c:6859
 #, c-format
 msgid "E422: terminal code too long: %s"
-msgstr "E422: �I�[�R�[�h���������܂�: %s"
+msgstr "E422: �I�[�R�[�h�����߂��܂�: %s"
 
-#: syntax.c:6859
+#: ../syntax.c:6906
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: �s���Ȉ����ł�: %s"
 
-#: syntax.c:7388
+#: ../syntax.c:7435
 msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: �����̈قȂ�n�C���C�g�������g��ꂷ���Ă��܂�"
+msgstr "E424: �����̈قȂ�n�C���C�g�������g���߂��Ă��܂�"
 
-#: syntax.c:7909
+#: ../syntax.c:7955
 msgid "E669: Unprintable character in group name"
 msgstr "E669: �O���[�v���Ɉ���s�\\�ȕ���������܂�"
 
-#. This is an error, but since there previously was no check only
-#. * give a warning.
-#: syntax.c:7916
+#: ../syntax.c:7963
 msgid "W18: Invalid character in group name"
 msgstr "W18: �O���[�v���ɕs���ȕ���������܂�"
 
-#: tag.c:90
+#: ../tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: �^�O�X�^�b�N�̖����ł�"
 
-#: tag.c:91
+#: ../tag.c:91
 msgid "E556: at top of tag stack"
 msgstr "E556: �^�O�X�^�b�N�̐擪�ł�"
 
-#: tag.c:412
+#: ../tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ŏ��̊Y���^�O�𒴂��Ė߂邱�Ƃ͂ł��܂���"
 
-#: tag.c:550
+#: ../tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: �^�O���݂���܂���: %s"
 
-#: tag.c:583
+#: ../tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:586
+#: ../tag.c:586
 msgid "file\n"
 msgstr "�t�@�C��\n"
 
@@ -5571,44 +6091,44 @@ msgstr "�t�@�C��\n"
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:744
+#: ../tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "�I������ԍ�����͂��Ă������� (<CR>�Œ��~): "
 
-#: tag.c:784
+#: ../tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: �Y���^�O��1������������܂���"
 
-#: tag.c:786
+#: ../tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: �Ō�ɊY������^�O�𒴂��Đi�ނ��Ƃ͂ł��܂���"
 
-#: tag.c:810
+#: ../tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "�t�@�C�� \"%s\" ������܂���"
 
 #. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "�^�O %d (�S%d%s)"
 
-#: tag.c:826
+#: ../tag.c:826
 msgid " or more"
 msgstr " ������ȏ�"
 
-#: tag.c:828
+#: ../tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  �^�O���قȂ�case�Ŏg�p���܂�!"
 
-#: tag.c:872
+#: ../tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �t�@�C�� \"%s\" ������܂���"
 
 #. Highlight title
-#: tag.c:941
+#: ../tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
 "\n"
 "  # TO �^�O        FROM �s    in file/text"
 
-#: tag.c:1363
+#: ../tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "�^�O�t�@�C�� %s ��������"
 
-#: tag.c:1550
+#: ../tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: �^�O�t�@�C���̃p�X�� %s �ɐ؂�̂Ă��܂���\n"
 
-#: tag.c:2203
+#: ../tag.c:2202
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: �^�O�t�@�C�� \"%s\" �̃t�H�[�}�b�g�ɃG���[������܂�"
 
-#: tag.c:2207
+#: ../tag.c:2206
 #, c-format
 msgid "Before byte %ld"
 msgstr "���O�� %ld �o�C�g"
 
-#: tag.c:2240
+#: ../tag.c:2239
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: �^�O�t�@�C�����\\�[�g����Ă��܂���: %s"
 
 #. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
 msgid "E433: No tags file"
 msgstr "E433: �^�O�t�@�C��������܂���"
 
-#: tag.c:3016
+#: ../tag.c:3020
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �^�O�p�^�[�����݂����܂���"
 
-#: tag.c:3027
+#: ../tag.c:3031
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: �^�O���݂����Ȃ��̂ŒP�ɐ������܂�!"
 
-#: term.c:1759
+#: ../term.c:1776
 msgid "' not known. Available builtin terminals are:"
 msgstr "' �͖��m�ł�. ���s�̑g�ݍ��ݒ[���͎��̂Ƃ���ł�:"
 
-#: term.c:1783
+#: ../term.c:1800
 msgid "defaulting to '"
 msgstr "�ȗ��l�����̂悤�ɐݒ肵�܂� '"
 
-#: term.c:2141
+#: ../term.c:2158
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcap�t�@�C�����J���܂���"
 
-#: term.c:2145
+#: ../term.c:2162
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo�ɒ[���G���g�����݂����܂���"
 
-#: term.c:2147
+#: ../term.c:2164
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap�ɒ[���G���g�����݂����܂���"
 
-#: term.c:2306
+#: ../term.c:2323
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap�� \"%s\" �̃G���g��������܂���"
 
-#: term.c:2780
+#: ../term.c:2797
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: �[���� \"cm\" �@�\\���K�v�ł�"
 
 #. Highlight title
-#: term.c:4990
+#: ../term.c:5039
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
 "\n"
 "--- �[���L�[ ---"
 
-#: ui.c:258
+#: ../ui.c:276
 msgid "new shell started\n"
 msgstr "�V�����V�F�����N�����܂�\n"
 
-#: ui.c:1841
+#: ../ui.c:1860
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: ���͂�Ǎ��ݒ��̃G���[�ɂ��I�����܂�...\n"
 
 #. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
 msgid "No undo possible; continue anyway"
 msgstr "�\\�ȃA���h�D�͂���܂���: �Ƃ肠���������܂�"
 
-#: undo.c:561
+#: ../undo.c:578
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: �s�ԍ����Ԉ���Ă��܂�"
 
-#: undo.c:757
+#: ../undo.c:778
 msgid "1 change"
 msgstr "1 �ӏ��ύX���܂���"
 
-#: undo.c:759
+#: ../undo.c:780
 #, c-format
 msgid "%ld changes"
 msgstr "%ld �ӏ��ύX���܂���"
 
-#: undo.c:812
+#: ../undo.c:833
 msgid "E439: undo list corrupt"
 msgstr "E439: �A���h�D���X�g�����Ă��܂�"
 
-#: undo.c:844
+#: ../undo.c:865
 msgid "E440: undo line missing"
 msgstr "E440: �A���h�D�s������܂���"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
 "\n"
 "MS-Windows 16/32 �r�b�g GUI ��"
 
-#: version.c:1733
+#: ../version.c:724
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
 "\n"
 "MS-Windows 32 �r�b�g GUI ��"
 
-#: version.c:1736
+#: ../version.c:727
 msgid " in Win32s mode"
 msgstr " in Win32s ���[�h"
 
-#: version.c:1738
+#: ../version.c:729
 msgid " with OLE support"
 msgstr " with OLE �T�|�[�g"
 
-#: version.c:1741
+#: ../version.c:732
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 �r�b�g �R���\\�[�� ��"
 
-#: version.c:1745
+#: ../version.c:736
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
 "\n"
 "MS-Windows 16 �r�b�g ��"
 
-#: version.c:1749
+#: ../version.c:740
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
 "\n"
 "32 �r�b�g MS-DOS ��"
 
-#: version.c:1751
+#: ../version.c:742
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
 "\n"
 "16 �r�b�g MS-DOS ��"
 
-#: version.c:1757
+#: ../version.c:748
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
 "\n"
 "MacOS X (unix) ��"
 
-#: version.c:1759
+#: ../version.c:750
 msgid ""
 "\n"
 "MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
 "\n"
 "MacOS X ��"
 
-#: version.c:1762
+#: ../version.c:753
 msgid ""
 "\n"
 "MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
 "\n"
 "MacOS ��"
 
-#: version.c:1767
+#: ../version.c:758
 msgid ""
 "\n"
 "RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
 "\n"
 "RISC OS ��"
 
-#: version.c:1777
+#: ../version.c:768
 msgid ""
 "\n"
 "Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
 "\n"
 "�K�p�σp�b�`: "
 
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
 msgid "Modified by "
 msgstr "Modified by "
 
-#: version.c:1810
+#: ../version.c:801
 msgid ""
 "\n"
 "Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: version.c:1813
+#: ../version.c:804
 msgid "by "
 msgstr "by "
 
-#: version.c:1825
+#: ../version.c:816
 msgid ""
 "\n"
 "Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
 "\n"
 "Huge �� "
 
-#: version.c:1828
+#: ../version.c:819
 msgid ""
 "\n"
 "Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
 "\n"
 "Big �� "
 
-#: version.c:1831
+#: ../version.c:822
 msgid ""
 "\n"
 "Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
 "\n"
 "�ʏ� �� "
 
-#: version.c:1834
+#: ../version.c:825
 msgid ""
 "\n"
 "Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
 "\n"
 "Small �� "
 
-#: version.c:1836
+#: ../version.c:827
 msgid ""
 "\n"
 "Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
 "\n"
 "Tiny �� "
 
-#: version.c:1842
+#: ../version.c:833
 msgid "without GUI."
 msgstr "without GUI."
 
-#: version.c:1847
+#: ../version.c:838
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
-#: version.c:1849
+#: ../version.c:840
 msgid "with GTK-GNOME GUI."
 msgstr "with GTK-GNOME GUI."
 
-#: version.c:1853
+#: ../version.c:844
 msgid "with GTK2 GUI."
 msgstr "with GTK2 GUI."
 
-#: version.c:1855
+#: ../version.c:846
 msgid "with GTK GUI."
 msgstr "with GTK GUI."
 
-#: version.c:1860
+#: ../version.c:851
 msgid "with X11-Motif GUI."
 msgstr "with X11-Motif GUI."
 
-#: version.c:1864
+#: ../version.c:855
 msgid "with X11-neXtaw GUI."
 msgstr "with X11-neXtaw GUI."
 
-#: version.c:1866
+#: ../version.c:857
 msgid "with X11-Athena GUI."
 msgstr "with X11-Athena GUI."
 
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
 msgid "with Photon GUI."
 msgstr "with Photon GUI."
 
-#: version.c:1876
+#: ../version.c:864
 msgid "with GUI."
 msgstr "with GUI."
 
-#: version.c:1879
+#: ../version.c:867
 msgid "with Carbon GUI."
 msgstr "with Carbon GUI."
 
-#: version.c:1882
+#: ../version.c:870
 msgid "with Cocoa GUI."
 msgstr "with Cocoa GUI."
 
-#: version.c:1885
+#: ../version.c:873
 msgid "with (classic) GUI."
 msgstr "with (�N���V�b�N) GUI."
 
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
 msgid "  Features included (+) or not (-):\n"
 msgstr "  �@�\\�̈ꗗ �L��(+)/����(-)\n"
 
-#: version.c:1908
+#: ../version.c:899
 msgid "   system vimrc file: \""
 msgstr "      �V�X�e�� vimrc: \""
 
-#: version.c:1913
+#: ../version.c:904
 msgid "     user vimrc file: \""
 msgstr "        ���[�U vimrc: \""
 
-#: version.c:1918
+#: ../version.c:909
 msgid " 2nd user vimrc file: \""
 msgstr "     ��2���[�U vimrc: \""
 
-#: version.c:1923
+#: ../version.c:914
 msgid " 3rd user vimrc file: \""
 msgstr "     ��3���[�U vimrc: \""
 
-#: version.c:1928
+#: ../version.c:919
 msgid "      user exrc file: \""
 msgstr "         ���[�U exrc: \""
 
-#: version.c:1933
+#: ../version.c:924
 msgid "  2nd user exrc file: \""
 msgstr "      ��2���[�U exrc: \""
 
-#: version.c:1939
+#: ../version.c:930
 msgid "  system gvimrc file: \""
 msgstr "     �V�X�e�� gvimrc: \""
 
-#: version.c:1943
+#: ../version.c:934
 msgid "    user gvimrc file: \""
 msgstr "       ���[�U gvimrc: \""
 
-#: version.c:1947
+#: ../version.c:938
 msgid "2nd user gvimrc file: \""
 msgstr "    ��2���[�U gvimrc: \""
 
-#: version.c:1952
+#: ../version.c:943
 msgid "3rd user gvimrc file: \""
 msgstr "    ��3���[�U gvimrc: \""
 
-#: version.c:1959
+#: ../version.c:950
 msgid "    system menu file: \""
 msgstr "    �V�X�e�����j���[: \""
 
-#: version.c:1967
+#: ../version.c:958
 msgid "  fall-back for $VIM: \""
 msgstr "       �ȗ����� $VIM: \""
 
-#: version.c:1973
+#: ../version.c:964
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "�ȗ����� $VIMRUNTIME: \""
 
-#: version.c:1977
+#: ../version.c:968
 msgid "Compilation: "
 msgstr "�R���p�C��: "
 
-#: version.c:1983
+#: ../version.c:974
 msgid "Compiler: "
 msgstr "�R���p�C��: "
 
-#: version.c:1988
+#: ../version.c:979
 msgid "Linking: "
 msgstr "�����N: "
 
-#: version.c:1993
+#: ../version.c:984
 msgid "  DEBUG BUILD"
 msgstr "�f�o�b�O�r���h"
 
-#: version.c:2032
+#: ../version.c:1023
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:2034
+#: ../version.c:1025
 msgid "version "
 msgstr "version "
 
-#: version.c:2035
+#: ../version.c:1026
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar ��."
 
-#: version.c:2039
+#: ../version.c:1030
 msgid "Vim is open source and freely distributable"
 msgstr "Vim �̓I�[�v���\\�[�X�ł��莩�R�ɔz�z�\\�ł�"
 
-#: version.c:2041
+#: ../version.c:1032
 msgid "Help poor children in Uganda!"
 msgstr "�E�K���_�̌b�܂�Ȃ��q�������ɉ�����!"
 
-#: version.c:2042
+#: ../version.c:1033
 msgid "type  :help iccf<Enter>       for information "
 msgstr "�ڍׂȏ���           :help iccf<Enter>      "
 
-#: version.c:2044
+#: ../version.c:1035
 msgid "type  :q<Enter>               to exit         "
 msgstr "�I������ɂ�           :q<Enter>              "
 
-#: version.c:2045
+#: ../version.c:1036
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "�I�����C���w���v��     :help<Enter> �� <F1>   "
 
-#: version.c:2046
-msgid "type  :help version6<Enter>   for version info"
-msgstr "�o�[�W��������       :help version6<Enter>  "
+#: ../version.c:1037
+msgid "type  :help version7<Enter>   for version info"
+msgstr "�o�[�W��������       :help version7<Enter>  "
 
-#: version.c:2049
+#: ../version.c:1040
 msgid "Running in Vi compatible mode"
 msgstr "Vi�݊����[�h�œ��쒆"
 
-#: version.c:2050
+#: ../version.c:1041
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim�����l�ɂ���ɂ�    :set nocp<Enter>       "
 
-#: version.c:2051
+#: ../version.c:1042
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "�ڍׂȏ���           :help cp-default<Enter>"
 
-#: version.c:2066
+#: ../version.c:1057
 msgid "menu  Help->Orphans           for information    "
 msgstr "�ڍׂ̓��j���[�� �w���v���ǎ� ���Q�Ƃ��ĉ�����   "
 
-#: version.c:2068
+#: ../version.c:1059
 msgid "Running modeless, typed text is inserted"
 msgstr "���[�h���Ŏ��s��, �^�C�v�����������}������܂�"
 
-#: version.c:2069
+#: ../version.c:1060
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "���j���[�� �ҏW���S�̐ݒ聨�}��(���S��)���[�h�ؑ�"
 
-#: version.c:2070
+#: ../version.c:1061
 msgid "                              for two modes      "
 msgstr "                              �Ń��[�h�L��       "
 
-#: version.c:2074
+#: ../version.c:1065
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "���j���[�� �ҏW���S�̐ݒ聨Vi�݊����[�h�ؑ�      "
 
-#: version.c:2075
+#: ../version.c:1066
 msgid "                              for Vim defaults   "
 msgstr "                              ��Vim�Ƃ��ē���    "
 
-#: version.c:2122
+#: ../version.c:1113
 msgid "Sponsor Vim development!"
 msgstr "Vim�̊J�����������Ă�������!"
 
-#: version.c:2123
+#: ../version.c:1114
 msgid "Become a registered Vim user!"
 msgstr "Vim�̓o�^���[�U�ɂȂ��Ă�������!"
 
-#: version.c:2126
+#: ../version.c:1117
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "�ڍׂȏ���           :help sponsor<Enter>   "
 
-#: version.c:2127
+#: ../version.c:1118
 msgid "type  :help register<Enter>   for information "
 msgstr "�ڍׂȏ���           :help register<Enter>  "
 
-#: version.c:2129
+#: ../version.c:1120
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "�ڍׂ̓��j���[�� �w���v���X�|���T�[/�o�^ ���Q�Ƃ��ĉ�����   "
 
-#: version.c:2139
+#: ../version.c:1130
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "   �x��: Windows 95/98/Me �����o  "
 
-#: version.c:2142
+#: ../version.c:1133
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " �ڍׂȏ���          :help windows95<Enter> "
 
-#: window.c:203
+#: ../window.c:208
 msgid "E441: There is no preview window"
 msgstr "E441: �v���r���[�E�B���h�E������܂���"
 
-#: window.c:581
+#: ../window.c:603
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ����ƉE���𓯎��ɕ������邱�Ƃ͂ł��܂���"
 
-#: window.c:1340
+#: ../window.c:1362
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ���̃E�B���h�E����������Ă��鎞�ɂ͏���ł��܂���"
 
-#: window.c:1836
+#: ../window.c:1858
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ō�̃E�B���h�E����邱�Ƃ͂ł��܂���"
 
-#: window.c:2567
+#: ../window.c:2593
 msgid "Already only one window"
 msgstr "���ɃE�B���h�E��1��������܂���"
 
-#: window.c:2614
+#: ../window.c:2640
 msgid "E445: Other window contains changes"
 msgstr "E445: ���̃E�B���h�E�ɂ͕ύX������܂�"
 
-#: window.c:4480
+#: ../window.c:4564
 msgid "E446: No file name under cursor"
 msgstr "E446: �J�[�\\���̉��Ƀt�@�C����������܂���"
 
-#: window.c:4599
+#: ../window.c:4683
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
 
-#: globals.h:1232 if_perl.xs:326
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
-
-#: if_perl.xs:554
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���̃R�}���h�͖����ł�, ���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: �T���h�{�b�N�X�ł� Safe "
-"���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����Ă��܂�"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "�e�t�@�C����ʁX�� Vim �ŕҏW(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "�S�t�@�C����1�� Vim �ŕҏW(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim �ō����ҏW(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim �ŕҏW(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "������ Vim �ŕҏW - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "�I�����ꂽ�t�@�C���� Vim �ŕҏW"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "�N���G���[: gvim �Ƀp�X���ʂ��Ă��邩�m���߂Ă�������!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll �G���["
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "�p�X���������܂�!"
-
-#: globals.h:1022
+#: ../globals.h:1056
 msgid "--No lines in buffer--"
 msgstr "--�o�b�t�@�ɍs������܂���--"
 
@@ -6200,388 +6668,418 @@ msgstr "--�o�b�t�@�ɍs������܂���--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1185
+#: ../globals.h:1247
 msgid "E470: Command aborted"
 msgstr "E470: �R�}���h�����f����܂���"
 
-#: globals.h:1186
+#: ../globals.h:1248
 msgid "E471: Argument required"
 msgstr "E471: �������K�v�ł�"
 
-#: globals.h:1187
+#: ../globals.h:1249
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ �̌�� / �� ? �� & �łȂ���΂Ȃ�܂���"
 
-#: globals.h:1189
+#: ../globals.h:1251
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: �R�}���h���C���ł͖����ł�; <CR>�Ŏ��s, CTRL-C�ł�߂�"
 
-#: globals.h:1191
+#: ../globals.h:1253
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: ���݂̃f�B���N�g����^�O�����ł�exrc/vimrc�̃R�}���h�͋�����܂���"
 
-#: globals.h:1193
+#: ../globals.h:1255
 msgid "E171: Missing :endif"
 msgstr "E171: :endif ������܂���"
 
-#: globals.h:1194
+#: ../globals.h:1256
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry ������܂���"
 
-#: globals.h:1195
+#: ../globals.h:1257
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile ������܂���"
 
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ������܂���"
+
+#: ../globals.h:1259
 msgid "E588: :endwhile without :while"
 msgstr "E588: :while �̂Ȃ� :endwhile ������܂�"
 
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor �̂Ȃ� :for ������܂�"
+
+#: ../globals.h:1262
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: �t�@�C�������݂��܂� (! ��ǉ��ŏ㏑)"
 
-#: globals.h:1199
+#: ../globals.h:1263
 msgid "E472: Command failed"
 msgstr "E472: �R�}���h�����s���܂���"
 
-#: globals.h:1201
+#: ../globals.h:1265
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: ���m�̃t�H���g�Z�b�g: %s"
 
-#: globals.h:1205
+#: ../globals.h:1269
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: ���m�̃t�H���g: %s"
 
-#: globals.h:1208
+#: ../globals.h:1272
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: �t�H���g \"%s\" �͌Œ蕝�ł͂���܂���"
 
-#: globals.h:1210
+#: ../globals.h:1274
 msgid "E473: Internal error"
 msgstr "E473: �����G���[�ł�"
 
-#: globals.h:1211
+#: ../globals.h:1275
 msgid "Interrupted"
 msgstr "�����܂�܂���"
 
-#: globals.h:1212
+#: ../globals.h:1276
 msgid "E14: Invalid address"
 msgstr "E14: �����ȃA�h���X�ł�"
 
-#: globals.h:1213
+#: ../globals.h:1277
 msgid "E474: Invalid argument"
 msgstr "E474: �����Ȉ����ł�"
 
-#: globals.h:1214
+#: ../globals.h:1278
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: �����Ȉ����ł�: %s"
 
-#: globals.h:1216
+#: ../globals.h:1280
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: �����Ȏ��ł�: %s"
 
-#: globals.h:1218
+#: ../globals.h:1282
 msgid "E16: Invalid range"
 msgstr "E16: �����Ȕ͈͂ł�"
 
-#: globals.h:1219
+#: ../globals.h:1283
 msgid "E476: Invalid command"
 msgstr "E476: �����ȃR�}���h�ł�"
 
-#: globals.h:1221
+#: ../globals.h:1285
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" �̓f�B���N�g���ł�"
 
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: �\\�����ʕ����� '=' �̑O�ɂ���܂���"
-
-#: globals.h:1227
+#: ../globals.h:1288
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: \"%s\"() �̃��C�u�����ďo�Ɏ��s���܂���"
 
-#: globals.h:1233
+#: ../globals.h:1294
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: ���C�u�����̊֐� %s �����[�h�ł��܂���ł���"
 
-#: globals.h:1235
+#: ../globals.h:1296
 msgid "E19: Mark has invalid line number"
 msgstr "E19: �}�[�N�ɖ����ȍs�ԍ����w�肳��Ă��܂���"
 
-#: globals.h:1236
+#: ../globals.h:1297
 msgid "E20: Mark not set"
 msgstr "E20: �}�[�N�͐ݒ肳��Ă��܂���"
 
-#: globals.h:1237
+#: ../globals.h:1298
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: 'modifiable' ���I�t�Ȃ̂�, �ύX�ł��܂���"
 
-#: globals.h:1238
+#: ../globals.h:1299
 msgid "E22: Scripts nested too deep"
-msgstr "E22: �X�N���v�g�̓���q���[�����܂�"
+msgstr "E22: �X�N���v�g�̓���q���[�߂��܂�"
 
-#: globals.h:1239
+#: ../globals.h:1300
 msgid "E23: No alternate file"
 msgstr "E23: ���t�@�C���͂���܂���"
 
-#: globals.h:1240
+#: ../globals.h:1301
 msgid "E24: No such abbreviation"
 msgstr "E24: ���̂悤�ȒZ�k���͂͂���܂���"
 
-#: globals.h:1241
+#: ../globals.h:1302
 msgid "E477: No ! allowed"
 msgstr "E477: ! �͋�����Ă��܂���"
 
-#: globals.h:1243
+#: ../globals.h:1304
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUI�͎g�p�s�\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�"
 
-#: globals.h:1246
+#: ../globals.h:1307
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: �w�u���C��͎g�p�s�\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
 
-#: globals.h:1249
+#: ../globals.h:1310
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: �y���V�A��͎g�p�s�\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
 
-#: globals.h:1252
+#: ../globals.h:1313
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: �A���r�A��͎g�p�s�\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
 
-#: globals.h:1255
+#: ../globals.h:1316
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: ���̂悤�Ȗ��̃n�C���C�g�O���[�v�͂���܂���: %s"
 
-#: globals.h:1257
+#: ../globals.h:1318
 msgid "E29: No inserted text yet"
 msgstr "E29: �܂��e�L�X�g���}������Ă��܂���"
 
-#: globals.h:1258
+#: ../globals.h:1319
 msgid "E30: No previous command line"
 msgstr "E30: �ȑO�ɃR�}���h�s������܂���"
 
-#: globals.h:1259
+#: ../globals.h:1320
 msgid "E31: No such mapping"
 msgstr "E31: ���̂悤�ȃ}�b�s���O�͂���܂���"
 
-#: globals.h:1260
+#: ../globals.h:1321
 msgid "E479: No match"
 msgstr "E479: �Y���͂���܂���"
 
-#: globals.h:1261
+#: ../globals.h:1322
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: �Y���͂���܂���: %s"
 
-#: globals.h:1262
+#: ../globals.h:1323
 msgid "E32: No file name"
 msgstr "E32: �t�@�C����������܂���"
 
-#: globals.h:1263
+#: ../globals.h:1324
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: ���K�\\���u�����܂����s����Ă��܂���"
 
-#: globals.h:1264
+#: ../globals.h:1325
 msgid "E34: No previous command"
 msgstr "E34: �R�}���h���܂����s����Ă��܂���"
 
-#: globals.h:1265
+#: ../globals.h:1326
 msgid "E35: No previous regular expression"
 msgstr "E35: ���K�\\�����܂����s����Ă��܂���"
 
-#: globals.h:1266
+#: ../globals.h:1327
 msgid "E481: No range allowed"
 msgstr "E481: �͈͎w��͋�����Ă��܂���"
 
-#: globals.h:1268
+#: ../globals.h:1329
 msgid "E36: Not enough room"
 msgstr "E36: �[���ȗe�ʂ�����܂���"
 
-#: globals.h:1271
+#: ../globals.h:1332
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: %s �Ƃ������O�̓o�^���ꂽ�T�[�o�͂���܂���"
 
-#: globals.h:1273
+#: ../globals.h:1334
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: �t�@�C�� %s ���쐬�ł��܂���"
 
-#: globals.h:1274
+#: ../globals.h:1335
 msgid "E483: Can't get temp file name"
 msgstr "E483: �ꎞ�t�@�C���̖��O���擾�ł��܂���"
 
-#: globals.h:1275
+#: ../globals.h:1336
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: �t�@�C�� \"%s\" ���J���܂���"
 
-#: globals.h:1276
+#: ../globals.h:1337
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: �t�@�C�� %s ��Ǎ��߂܂���"
 
-#: globals.h:1277
+#: ../globals.h:1338
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: �Ō�̕ύX���ۑ�����Ă��܂��� (! ��ǉ��ŕύX��j��)"
 
-#: globals.h:1278
+#: ../globals.h:1339
 msgid "E38: Null argument"
 msgstr "E38: ��������ł�"
 
-#: globals.h:1280
+#: ../globals.h:1341
 msgid "E39: Number expected"
 msgstr "E39: ���l���v������Ă��܂�"
 
-#: globals.h:1283
+#: ../globals.h:1344
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: �G���[�t�@�C�� %s ���J���܂���"
 
-#: globals.h:1286
+#: ../globals.h:1347
 msgid "E233: cannot open display"
 msgstr "E233: �f�B�X�v���C���J���܂���"
 
-#: globals.h:1288
+#: ../globals.h:1349
 msgid "E41: Out of memory!"
 msgstr "E41: ���������s���ʂĂ܂���!"
 
-#: globals.h:1290
+#: ../globals.h:1351
 msgid "Pattern not found"
 msgstr "�p�^�[���݂͂���܂���ł���"
 
-#: globals.h:1292
+#: ../globals.h:1353
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: �p�^�[���݂͂���܂���ł���: %s"
 
-#: globals.h:1293
+#: ../globals.h:1354
 msgid "E487: Argument must be positive"
 msgstr "E487: �����͐��̒l�łȂ���΂Ȃ�܂���"
 
-#: globals.h:1295
+#: ../globals.h:1356
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: �O�̃f�B���N�g���ɖ߂�܂���"
 
-#: globals.h:1299
+#: ../globals.h:1360
 msgid "E42: No Errors"
 msgstr "E42: �G���[�͂���܂���"
 
-#: globals.h:1301
+#: ../globals.h:1362
 msgid "E43: Damaged match string"
 msgstr "E43: �Y�������񂪔j�����Ă��܂�"
 
-#: globals.h:1302
+#: ../globals.h:1363
 msgid "E44: Corrupted regexp program"
 msgstr "E44: �s���Ȑ��K�\\���v���O�����ł�"
 
-#: globals.h:1303
+#: ../globals.h:1364
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly' �I�v�V�������ݒ肳��Ă��܂� (! ��ǉ��ŏ㏑��)"
 
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: �ǎ��p�ϐ� \"%s\" �ɂ͒l��ݒ�ł��܂���"
+
+#: ../globals.h:1367
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: �ǎ��p�ϐ� \"%s\" �ɐݒ肷�邱�Ƃ͂ł��܂���"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: �T���h�{�b�N�X�ł͕ϐ� \"%s\" �ɒl��ݒ�ł��܂���"
 
-#: globals.h:1308
+#: ../globals.h:1370
 msgid "E47: Error while reading errorfile"
 msgstr "E47: �G���[�t�@�C���̓Ǎ����ɃG���[���������܂���"
 
-#: globals.h:1311
+#: ../globals.h:1373
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: �T���h�{�b�N�X�ł͋�����܂���"
 
-#: globals.h:1313
+#: ../globals.h:1375
 msgid "E523: Not allowed here"
 msgstr "E523: �����ł͋�����܂���"
 
-#: globals.h:1316
+#: ../globals.h:1378
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: �X�N���[�����[�h�̐ݒ�ɂ͑Ή����Ă��܂���"
 
-#: globals.h:1318
+#: ../globals.h:1380
 msgid "E49: Invalid scroll size"
 msgstr "E49: �����ȃX�N���[���ʂł�"
 
-#: globals.h:1319
+#: ../globals.h:1381
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell' �I�v�V��������ł�"
 
-#: globals.h:1321
+#: ../globals.h:1383
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: sign �̃f�[�^��Ǎ��߂܂���ł���"
 
-#: globals.h:1323
+#: ../globals.h:1385
 msgid "E72: Close error on swap file"
 msgstr "E72: �X���b�v�t�@�C���̃N���[�Y���G���[�ł�"
 
-#: globals.h:1324
+#: ../globals.h:1386
 msgid "E73: tag stack empty"
 msgstr "E73: �^�O�X�^�b�N����ł�"
 
-#: globals.h:1325
+#: ../globals.h:1387
 msgid "E74: Command too complex"
-msgstr "E74: �R�}���h�����G�����܂�"
+msgstr "E74: �R�}���h�����G�߂��܂�"
 
-#: globals.h:1326
+#: ../globals.h:1388
 msgid "E75: Name too long"
-msgstr "E75: ���O���������܂�"
+msgstr "E75: ���O�����߂��܂�"
 
-#: globals.h:1327
+#: ../globals.h:1389
 msgid "E76: Too many ["
-msgstr "E76: [ ���������܂�"
+msgstr "E76: [ �����߂��܂�"
 
-#: globals.h:1328
+#: ../globals.h:1390
 msgid "E77: Too many file names"
-msgstr "E77: �t�@�C�������������܂�"
+msgstr "E77: �t�@�C���������߂��܂�"
 
-#: globals.h:1329
+#: ../globals.h:1391
 msgid "E488: Trailing characters"
 msgstr "E488: �]���ȕ��������ɂ���܂�"
 
-#: globals.h:1330
+#: ../globals.h:1392
 msgid "E78: Unknown mark"
 msgstr "E78: ���m�̃}�[�N"
 
-#: globals.h:1331
+#: ../globals.h:1393
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: ���C���h�J�[�h��W�J�ł��܂���"
 
-#: globals.h:1333
+#: ../globals.h:1395
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' �� 'winminheight' ��菬�����ł��܂���"
 
-#: globals.h:1335
+#: ../globals.h:1397
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' �� 'winminwidth' ��菬�����ł��܂���"
 
-#: globals.h:1338
+#: ../globals.h:1400
 msgid "E80: Error while writing"
 msgstr "E80: �����ݒ��̃G���["
 
-#: globals.h:1339
+#: ../globals.h:1401
 msgid "Zero count"
 msgstr "�[���J�E���g"
 
-#: globals.h:1341
+#: ../globals.h:1403
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: �X�N���v�g�ȊO��<SID>���g���܂���"
 
-#: globals.h:1344
+#: ../globals.h:1406
 msgid "E449: Invalid expression received"
 msgstr "E449: �����Ȏ����󂯎��܂���"
 
-#: globals.h:1347
+#: ../globals.h:1409
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: �̈悪�ی삳��Ă���̂�, �ύX�ł��܂���"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans �͓Ǎ���p�t�@�C����ύX���邱�Ƃ������܂���"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �����G���[�ł�: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: �N���b�V���ɂ�蒆�f; ���K�\\�������G�߂��邩��?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: �p�^�[���ɂ��X�^�b�N�s���G���[�ł�"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: �o�b�t�@����ł�"
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 2a6f12e27..023f422c1 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -43,6 +43,7 @@ char_u *get_function_name __ARGS((expand_T *xp, int idx));
 char_u *get_expr_name __ARGS((expand_T *xp, int idx));
 void set_vim_var_nr __ARGS((int idx, long val));
 long get_vim_var_nr __ARGS((int idx));
+char_u *get_vim_var_str __ARGS((int idx));
 void set_vcount __ARGS((long count, long count1));
 void set_vim_var_string __ARGS((int idx, char_u *val, int len));
 void set_reg_var __ARGS((int c));
diff --git a/src/proto/tag.pro b/src/proto/tag.pro
index f8c236f56..5df6c30f7 100644
--- a/src/proto/tag.pro
+++ b/src/proto/tag.pro
@@ -5,4 +5,5 @@ void do_tags __ARGS((exarg_T *eap));
 int find_tags __ARGS((char_u *pat, int *num_matches, char_u ***matchesp, int flags, int mincount, char_u *buf_ffname));
 void simplify_filename __ARGS((char_u *filename));
 int expand_tags __ARGS((int tagnames, char_u *pat, int *num_file, char_u ***file));
+int get_tags __ARGS((list_T *list, char_u *pat));
 /* vim: set ft=c : */
diff --git a/src/regexp.c b/src/regexp.c
index bf5f7afd1..36f5bb456 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -100,10 +100,10 @@
  *
  *		       +----------------------+
  *		       V		      |
- * <aa>\+	BRANCH <aa> --> BRANCH --> BACK BRANCH --> NOTHING --> END
- *		     |	             |	        ^		       ^
- *		     |	             +----------+		       |
- *		     +-------------------------------------------------+
+ * <aa>\+	BRANCH <aa> --> BRANCH --> BACKP BRANCH --> NOTHING --> END
+ *		     |	             |	         ^		        ^
+ *		     |	             +-----------+		        |
+ *		     +--------------------------------------------------+
  *
  *
  *					+-------------------------+
@@ -229,6 +229,8 @@
 #define RE_COL		205	/* nr cmp  Match column number */
 #define RE_VCOL		206	/* nr cmp  Match virtual column number */
 
+#define BACKP		207	/*	Like BACK but for \+ */
+
 /*
  * Magic characters have a special meaning, they don't match literally.
  * Magic characters are negative.  This separates them from literal characters
@@ -281,6 +283,8 @@ toggle_Magic(x)
  * BACK		Normal "next" pointers all implicitly point forward; BACK
  *		exists to make loop structures possible.
  *
+ * BACKP	Like BACK, but used for \+.  Doesn't check for an empty match.
+ *
  * STAR,PLUS	'=', and complex '*' and '+', are implemented as circular
  *		BRANCH structures using BACK.  Simple cases (one character
  *		per match) are implemented with STAR and PLUS for speed
@@ -1448,7 +1452,7 @@ regpiece(flagp)
 		/* Emit x+ as x(&|), where & means "self". */
 		next = regnode(BRANCH); /* Either */
 		regtail(ret, next);
-		regtail(regnode(BACK), ret);	/* loop back */
+		regtail(regnode(BACKP), ret);	/* loop back */
 		regtail(next, regnode(BRANCH)); /* or */
 		regtail(ret, regnode(NOTHING)); /* null. */
 	    }
@@ -2483,7 +2487,7 @@ regtail(p, val)
 	scan = temp;
     }
 
-    if (OP(scan) == BACK)
+    if (OP(scan) == BACK || OP(scan) == BACKP)
 	offset = (int)(scan - val);
     else
 	offset = (int)(val - scan);
@@ -4092,6 +4096,9 @@ regmatch(scan, startp)
 		return FALSE;
 	    break;
 
+	  case BACKP:
+	    break;
+
 	  case MOPEN + 0:   /* Match start: \zs */
 	  case MOPEN + 1:   /* \( */
 	  case MOPEN + 2:
@@ -4356,6 +4363,10 @@ regmatch(scan, startp)
 	    {
 		if (OP(next) != BRANCH) /* No choice. */
 		    next = OPERAND(scan);	/* Avoid recursion. */
+		else if (startp != NULL && OP(OPERAND(scan)) == BACKP
+						    && reg_save_equal(startp))
+		    /* \+ with something empty before it */
+		    return FALSE;
 		else
 		{
 		    regsave_T	save;
@@ -5134,7 +5145,7 @@ regnext(p)
     if (offset == 0)
 	return NULL;
 
-    if (OP(p) == BACK)
+    if (OP(p) == BACK || OP(p) == BACKP)
 	return p - offset;
     else
 	return p + offset;
@@ -5604,6 +5615,9 @@ regprop(op)
       case BACK:
 	p = "BACK";
 	break;
+      case BACKP:
+	p = "BACKP";
+	break;
       case END:
 	p = "END";
 	break;
diff --git a/src/tag.c b/src/tag.c
index a3bed7a80..e2c5238b3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3536,3 +3536,128 @@ expand_tags(tagnames, pat, num_file, file)
     return ret;
 }
 #endif
+
+#if defined(FEAT_EVAL) || defined(PROTO)
+static int add_tag_field __ARGS((dict_T *dict, char *field_name, char_u *start, char_u *end));
+
+/*
+ * Add a tag field to the dictionary "dict"
+ */
+    static int
+add_tag_field(dict, field_name, start, end)
+    dict_T  *dict;
+    char    *field_name;
+    char_u  *start;
+    char_u  *end;
+{
+    char_u	buf[MAXPATHL];
+    int		len;
+
+    len = end - start;
+    if (len > sizeof(buf) - 1)
+	len = sizeof(buf) - 1;
+    STRNCPY(buf, start, len);
+    buf[len] = NUL;
+    return dict_add_nr_str(dict, field_name, 0L, buf);
+}
+
+/*
+ * Add the tags matching the specified pattern to the list "list"
+ * as a dictionary
+ */
+    int
+get_tags(list, pat)
+    list_T *list;
+    char_u *pat;
+{
+    int		num_matches, i, ret;
+    char_u	**matches, *p;
+    dict_T	*dict;
+    tagptrs_T	tp;
+    long	is_static;
+    char_u	buf[200];
+    char_u	*bp;
+
+    ret = find_tags(pat, &num_matches, &matches,
+				    TAG_REGEXP | TAG_NOIC, (int)MAXCOL, NULL);
+    if (ret == OK && num_matches > 0)
+    {
+	for (i = 0; i < num_matches; ++i)
+	{
+	    if ((dict = dict_alloc()) == NULL)
+		ret = FAIL;
+	    if (list_append_dict(list, dict) == FAIL)
+		ret = FAIL;
+
+	    parse_match(matches[i], &tp);
+	    is_static = test_for_static(&tp);
+
+	    if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
+		    || add_tag_field(dict, "filename", tp.fname,
+							 tp.fname_end) == FAIL
+		    || add_tag_field(dict, "cmd", tp.command,
+						       tp.command_end) == FAIL
+		    || add_tag_field(dict, "kind", tp.tagkind,
+						      tp.tagkind_end) == FAIL
+		    || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
+		ret = FAIL;
+
+	    bp = buf;
+
+	    if (tp.command_end != NULL)
+	    {
+		for (p = tp.command_end + 3;
+				   *p != NUL && *p != '\n' && *p != '\r'; ++p)
+		{
+		    if (p == tp.tagkind || (p + 5 == tp.tagkind
+					      && STRNCMP(p, "kind:", 5) == 0))
+			/* skip "kind:<kind>" and "<kind>" */
+			p = tp.tagkind_end - 1;
+		    else if (STRNCMP(p, "file:", 5) == 0)
+			/* skip "file:" (static tag) */
+			p += 4;
+		    else if (STRNCMP(p, "struct:", 7) == 0
+			    || STRNCMP(p, "enum:", 5) == 0
+			    || STRNCMP(p, "class:", 6) == 0)
+		    {
+			char_u	*s, *n;
+
+			/* Field we recognize, add as a dict entry. */
+			n = p;
+			if (*n == 's')
+			    p += 7;
+			else if (*n == 'e')
+			    p += 5;
+			else
+			    p += 6;
+			s = p;
+			while (*p != NUL && *p != '\n' && *p != '\r')
+			    ++p;
+			if (add_tag_field(dict,
+				    *n == 's' ? "struct"
+					       : *n == 'e' ? "enum" : "class",
+								s, p) == FAIL)
+			    ret = FAIL;
+			--p;
+		    }
+		    else if ((bp - buf) < sizeof(buf) - 1
+					    && (bp > buf || !vim_iswhite(*p)))
+			/* Field not recognized, add to "extra" dict entry. */
+			*bp++ = *p;
+		}
+
+		if (bp > buf)
+		{
+		    *bp = NUL;
+		    if (dict_add_nr_str(dict, "extra", 0L, buf) == FAIL)
+			ret = FAIL;
+		}
+	    }
+
+	    vim_free(matches[i]);
+	}
+	vim_free(matches);
+    }
+    return ret;
+}
+#endif
diff --git a/src/term.c b/src/term.c
index 12c506ab2..3097cc324 100644
--- a/src/term.c
+++ b/src/term.c
@@ -931,10 +931,6 @@ struct builtin_term builtin_termcaps[] =
 # endif
 
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
-/*
- * The xterm termcap is missing F14 and F15, because they send the same
- * codes as the undo and help key, although they don't work on all keyboards.
- */
     {(int)KS_NAME,	"xterm"},
     {(int)KS_CE,	IF_EB("\033[K", ESC_STR "[K")},
     {(int)KS_AL,	IF_EB("\033[L", ESC_STR "[L")},
@@ -1013,65 +1009,75 @@ struct builtin_term builtin_termcaps[] =
     {K_XF2,		IF_EB("\033OQ", ESC_STR "OQ")},
     {K_XF3,		IF_EB("\033OR", ESC_STR "OR")},
     {K_XF4,		IF_EB("\033OS", ESC_STR "OS")},
-    {K_F1,		IF_EB("\033[11~", ESC_STR "[11~")},
-    {K_F2,		IF_EB("\033[12~", ESC_STR "[12~")},
-    {K_F3,		IF_EB("\033[13~", ESC_STR "[13~")},
-    {K_F4,		IF_EB("\033[14~", ESC_STR "[14~")},
-    {K_F5,		IF_EB("\033[15~", ESC_STR "[15~")},
-    {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
-    {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
-    {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
-    {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
-    {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
-    {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
-    {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
+    {K_F1,		IF_EB("\033[11;*~", ESC_STR "[11;*~")},
+    {K_F2,		IF_EB("\033[12;*~", ESC_STR "[12;*~")},
+    {K_F3,		IF_EB("\033[13;*~", ESC_STR "[13;*~")},
+    {K_F4,		IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+    {K_F5,		IF_EB("\033[15;*~", ESC_STR "[15;*~")},
+    {K_F6,		IF_EB("\033[17;*~", ESC_STR "[17;*~")},
+    {K_F7,		IF_EB("\033[18;*~", ESC_STR "[18;*~")},
+    {K_F8,		IF_EB("\033[19;*~", ESC_STR "[19;*~")},
+    {K_F9,		IF_EB("\033[20;*~", ESC_STR "[20;*~")},
+    {K_F10,		IF_EB("\033[21;*~", ESC_STR "[21;*~")},
+    {K_F11,		IF_EB("\033[23;*~", ESC_STR "[23;*~")},
+    {K_F12,		IF_EB("\033[24;*~", ESC_STR "[24;*~")},
     {K_S_XF1,		IF_EB("\033O2P", ESC_STR "O2P")},
     {K_S_XF2,		IF_EB("\033O2Q", ESC_STR "O2Q")},
     {K_S_XF3,		IF_EB("\033O2R", ESC_STR "O2R")},
     {K_S_XF4,		IF_EB("\033O2S", ESC_STR "O2S")},
-    {K_S_F1,		IF_EB("\033[11;2~", ESC_STR "[11;2~")},
-    {K_S_F2,		IF_EB("\033[12;2~", ESC_STR "[12;2~")},
-    {K_S_F3,		IF_EB("\033[13;2~", ESC_STR "[13;2~")},
-    {K_S_F4,		IF_EB("\033[14;2~", ESC_STR "[14;2~")},
-    {K_S_F5,		IF_EB("\033[15;2~", ESC_STR "[15;2~")},
-    {K_S_F6,		IF_EB("\033[17;2~", ESC_STR "[17;2~")},
-    {K_S_F7,		IF_EB("\033[18;2~", ESC_STR "[18;2~")},
-    {K_S_F8,		IF_EB("\033[19;2~", ESC_STR "[19;2~")},
-    {K_S_F9,		IF_EB("\033[20;2~", ESC_STR "[20;2~")},
-    {K_S_F10,		IF_EB("\033[21;2~", ESC_STR "[21;2~")},
-    {K_S_F11,		IF_EB("\033[23;2~", ESC_STR "[23;2~")},
-    {K_S_F12,		IF_EB("\033[24;2~", ESC_STR "[24;2~")},
     {K_S_TAB,		IF_EB("\033[Z", ESC_STR "[Z")},
-    {K_HELP,		IF_EB("\033[28~", ESC_STR "[28~")},
-    {K_UNDO,		IF_EB("\033[26~", ESC_STR "[26~")},
-    {K_INS,		IF_EB("\033[2~", ESC_STR "[2~")},
-    {K_HOME,		IF_EB("\033[7~", ESC_STR "[7~")},
+    {K_HELP,		IF_EB("\033[28;*~", ESC_STR "[28;*~")},
+    {K_UNDO,		IF_EB("\033[26;*~", ESC_STR "[26;*~")},
+    {K_INS,		IF_EB("\033[2;*~", ESC_STR "[2;*~")},
+    {K_HOME,		IF_EB("\033[1;*H", ESC_STR "[1;*H")},
     {K_S_HOME,		IF_EB("\033O2H", ESC_STR "O2H")},
     {K_C_HOME,		IF_EB("\033O5H", ESC_STR "O5H")},
-    {K_KHOME,		IF_EB("\033[1~", ESC_STR "[1~")},
+    {K_KHOME,		IF_EB("\033[7;*~", ESC_STR "[7;*~")},
     {K_XHOME,		IF_EB("\033OH", ESC_STR "OH")},	/* alternate Home */
-    {K_END,		IF_EB("\033[8~", ESC_STR "[8~")},
+    {K_END,		IF_EB("\033[1;*F", ESC_STR "[1;*F")},
     {K_S_END,		IF_EB("\033O2F", ESC_STR "O2F")},
     {K_C_END,		IF_EB("\033O5F", ESC_STR "O5F")},
-    {K_KEND,		IF_EB("\033[4~", ESC_STR "[4~")},
+    {K_KEND,		IF_EB("\033[4;*~", ESC_STR "[4;*~")},
     {K_XEND,		IF_EB("\033OF", ESC_STR "OF")},	/* alternate End */
-    {K_PAGEUP,		IF_EB("\033[5~", ESC_STR "[5~")},
-    {K_PAGEDOWN,	IF_EB("\033[6~", ESC_STR "[6~")},
+    {K_PAGEUP,		IF_EB("\033[5;*~", ESC_STR "[5;*~")},
+    {K_PAGEDOWN,	IF_EB("\033[6;*~", ESC_STR "[6;*~")},
     {K_KPLUS,		IF_EB("\033Ok", ESC_STR "Ok")},	/* keypad plus */
     {K_KMINUS,		IF_EB("\033Om", ESC_STR "Om")},	/* keypad minus */
     {K_KDIVIDE,		IF_EB("\033Oo", ESC_STR "Oo")},	/* keypad / */
     {K_KMULTIPLY,	IF_EB("\033Oj", ESC_STR "Oj")},	/* keypad * */
     {K_KENTER,		IF_EB("\033OM", ESC_STR "OM")},	/* keypad Enter */
-    {K_KDEL,		IF_EB("\033[3~", ESC_STR "[3~")},	/* keypad Del */
+    {K_KPOINT,		IF_EB("\033On", ESC_STR "On")},	/* keypad . */
+    {K_KDEL,		IF_EB("\033[3;*~", ESC_STR "[3;*~")},	/* keypad Del */
 
     {BT_EXTRA_KEYS,   ""},
-    {TERMCAP2KEY('k', '0'), IF_EB("\033[10~", ESC_STR "[10~")},	/* F0 */
-    {TERMCAP2KEY('F', '3'), IF_EB("\033[25~", ESC_STR "[25~")},	/* F13 */
-    {TERMCAP2KEY('F', '6'), IF_EB("\033[29~", ESC_STR "[29~")},	/* F16 */
-    {TERMCAP2KEY('F', '7'), IF_EB("\033[31~", ESC_STR "[31~")},	/* F17 */
-    {TERMCAP2KEY('F', '8'), IF_EB("\033[32~", ESC_STR "[32~")},	/* F18 */
-    {TERMCAP2KEY('F', '9'), IF_EB("\033[33~", ESC_STR "[33~")},	/* F19 */
-    {TERMCAP2KEY('F', 'A'), IF_EB("\033[34~", ESC_STR "[34~")},	/* F20 */
+    {TERMCAP2KEY('k', '0'), IF_EB("\033[10;*~", ESC_STR "[10;*~")}, /* F0 */
+    {TERMCAP2KEY('F', '3'), IF_EB("\033[25;*~", ESC_STR "[25;*~")}, /* F13 */
+    /* F14 and F15 are missing, because they send the same codes as the undo
+     * and help key, although they don't work on all keyboards. */
+    {TERMCAP2KEY('F', '6'), IF_EB("\033[29;*~", ESC_STR "[29;*~")}, /* F16 */
+    {TERMCAP2KEY('F', '7'), IF_EB("\033[31;*~", ESC_STR "[31;*~")}, /* F17 */
+    {TERMCAP2KEY('F', '8'), IF_EB("\033[32;*~", ESC_STR "[32;*~")}, /* F18 */
+    {TERMCAP2KEY('F', '9'), IF_EB("\033[33;*~", ESC_STR "[33;*~")}, /* F19 */
+    {TERMCAP2KEY('F', 'A'), IF_EB("\033[34;*~", ESC_STR "[34;*~")}, /* F20 */
+
+    {TERMCAP2KEY('F', 'B'), IF_EB("\033[42;*~", ESC_STR "[42;*~")}, /* F21 */
+    {TERMCAP2KEY('F', 'C'), IF_EB("\033[43;*~", ESC_STR "[43;*~")}, /* F22 */
+    {TERMCAP2KEY('F', 'D'), IF_EB("\033[44;*~", ESC_STR "[44;*~")}, /* F23 */
+    {TERMCAP2KEY('F', 'E'), IF_EB("\033[45;*~", ESC_STR "[45;*~")}, /* F24 */
+    {TERMCAP2KEY('F', 'F'), IF_EB("\033[46;*~", ESC_STR "[46;*~")}, /* F25 */
+    {TERMCAP2KEY('F', 'G'), IF_EB("\033[47;*~", ESC_STR "[47;*~")}, /* F26 */
+    {TERMCAP2KEY('F', 'H'), IF_EB("\033[48;*~", ESC_STR "[48;*~")}, /* F27 */
+    {TERMCAP2KEY('F', 'I'), IF_EB("\033[49;*~", ESC_STR "[49;*~")}, /* F28 */
+    {TERMCAP2KEY('F', 'J'), IF_EB("\033[50;*~", ESC_STR "[50;*~")}, /* F29 */
+    {TERMCAP2KEY('F', 'K'), IF_EB("\033[51;*~", ESC_STR "[51;*~")}, /* F30 */
+
+    {TERMCAP2KEY('F', 'L'), IF_EB("\033[52;*~", ESC_STR "[52;*~")}, /* F31 */
+    {TERMCAP2KEY('F', 'M'), IF_EB("\033[53;*~", ESC_STR "[53;*~")}, /* F32 */
+    {TERMCAP2KEY('F', 'N'), IF_EB("\033[54;*~", ESC_STR "[54;*~")}, /* F33 */
+    {TERMCAP2KEY('F', 'O'), IF_EB("\033[55;*~", ESC_STR "[55;*~")}, /* F34 */
+    {TERMCAP2KEY('F', 'P'), IF_EB("\033[56;*~", ESC_STR "[56;*~")}, /* F35 */
+    {TERMCAP2KEY('F', 'Q'), IF_EB("\033[57;*~", ESC_STR "[57;*~")}, /* F36 */
+    {TERMCAP2KEY('F', 'R'), IF_EB("\033[58;*~", ESC_STR "[58;*~")}, /* F37 */
 # endif
 
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
@@ -1564,6 +1570,10 @@ static char *(key_names[]) =
     "#2", "#4", "%i", "*7",
     "k1", "k2", "k3", "k4", "k5", "k6",
     "k7", "k8", "k9", "k;", "F1", "F2",
+    "F3", "F4", "F5", "F6", "F7", "F8",
+    "F9", "FA", "FB", "FC", "FD", "FE",
+    "FF", "FG", "FH", "FI", "FJ", "FK",
+    "FL", "FM", "FN", "FO", "FP", "FQ", "FR",
     "%1", "&8", "kb", "kI", "kD", "kh",
     "@7", "kP", "kN", "K1", "K3", "K4", "K5", "kB",
     NULL
@@ -2996,7 +3006,7 @@ win_new_shellsize()
     if (old_Rows != Rows)
     {
 	/* if 'window' uses the whole screen, keep it using that */
-	if (p_window == old_Rows - 1)
+	if (p_window == old_Rows - 1 || old_Rows == 0)
 	    p_window = Rows - 1;
 	old_Rows = Rows;
 	shell_new_rows();	/* update window sizes */
@@ -3481,6 +3491,7 @@ struct termcode
     char_u  name[2];	    /* termcap name of entry */
     char_u  *code;	    /* terminal code (in allocated memory) */
     int	    len;	    /* STRLEN(code) */
+    int	    modlen;	    /* length of part before ";*~". */
 } *termcodes = NULL;
 
 static int  tc_max_len = 0; /* number of entries that termcodes[] can hold */
@@ -3518,6 +3529,7 @@ add_termcode(name, string, use_8bit)
     struct termcode *new_tc;
     int		    i, j;
     char_u	    *s;
+    int		    len;
 
     if (string == NULL || *string == NUL)
     {
@@ -3535,6 +3547,7 @@ add_termcode(name, string, use_8bit)
 	mch_memmove(s, s + 1, STRLEN(s));
 	s[0] = term_7to8bit(string);
     }
+    len = (int)STRLEN(s);
 
     need_gather = TRUE;		/* need to fill termleader[] */
 
@@ -3572,12 +3585,29 @@ add_termcode(name, string, use_8bit)
 		continue;
 	    /*
 	     * Exact match: Replace old code.
+	     * But don't replace ESC[123;*X with another.
 	     */
 	    if (termcodes[i].name[1] == name[1])
 	    {
-		vim_free(termcodes[i].code);
-		--tc_len;
-		break;
+		if (termcodes[i].len >= 4
+			&& STRNCMP(termcodes[i].code + termcodes[i].len - 3,
+								";*", 2) == 0)
+		{
+		    /* if they are equal but for the ";*" don't add it */
+		    if (len == termcodes[i].len - 2
+			    && STRNCMP(s, termcodes[i].code, len - 1) == 0
+			    && s[len - 1] == termcodes[i].code[len + 1])
+		    {
+			vim_free(s);
+			return;
+		    }
+		}
+		else
+		{
+		    vim_free(termcodes[i].code);
+		    --tc_len;
+		    break;
+		}
 	    }
 	}
 	/*
@@ -3591,7 +3621,12 @@ add_termcode(name, string, use_8bit)
     termcodes[i].name[0] = name[0];
     termcodes[i].name[1] = name[1];
     termcodes[i].code = s;
-    termcodes[i].len = (int)STRLEN(s);
+    termcodes[i].len = len;
+    /* recognize special code like "ESC[42;*X" that accepts modifiers */
+    if (len >= 5 && STRNCMP(s + len - 3, ";*", 2) == 0)
+	termcodes[i].modlen = len - 3;
+    else
+	termcodes[i].modlen = 0;
     ++tc_len;
 }
 
@@ -3886,6 +3921,69 @@ check_termcode(max_offset, buf, buflen)
 
 		    break;
 		}
+
+		/*
+		 * Check for code with modifier, like xterm uses:
+		 * ESC[123;2X (shift) ESC[123;3X (alt), etc.
+		 */
+		if (termcodes[idx].modlen > 0)
+		{
+		    slen = termcodes[idx].modlen;
+		    if (cpo_koffset && offset && len < slen)
+			continue;
+		    if (STRNCMP(termcodes[idx].code, tp,
+				      (size_t)(slen > len ? len : slen)) == 0)
+		    {
+			int	    n;
+			int	    mod;
+
+			if (len <= slen)	/* got a partial sequence */
+			    return -1;		/* need to get more chars */
+
+			if (tp[slen] == termcodes[idx].code[slen + 2])
+			    ++slen;	/* no modifiers */
+			else if (tp[slen] != ';')
+			    continue;	/* no match */
+			else
+			{
+			    /* Skip over the digits, the final char must
+			     * follow. */
+			    for (j = slen + 1; j < len && isdigit(tp[j]); ++j)
+				;
+			    ++j;
+			    if (len < j)	/* got a partial sequence */
+				return -1;	/* need to get more chars */
+			    if (tp[j - 1] != termcodes[idx].code[slen + 2])
+				continue;
+
+			    /* Match!  Convert modifier bits. */
+			    n = atoi((char *)tp + slen + 1) - 1;
+			    mod = 0x0;
+			    if (n & 1)
+				mod |= MOD_MASK_SHIFT;
+			    if (n & 2)
+				mod |= MOD_MASK_ALT;
+			    if (n & 4)
+				mod |= MOD_MASK_CTRL;
+			    if (n & 8)
+				mod |= MOD_MASK_META;
+
+			    /* Add the modifier codes to our string */
+			    if (mod != 0)
+			    {
+				string[new_slen++] = K_SPECIAL;
+				string[new_slen++] = (int)KS_MODIFIER;
+				string[new_slen++] = mod;
+			    }
+
+			    slen = j;
+			}
+			key_name[0] = termcodes[idx].name[0];
+			key_name[1] = termcodes[idx].name[1];
+
+			break;
+		    }
+		}
 	    }
 	}
 
diff --git a/src/testdir/test24.in b/src/testdir/test24.in
index b7bbedf5f..d9640e5f2 100644
--- a/src/testdir/test24.in
+++ b/src/testdir/test24.in
diff --git a/src/testdir/test24.ok b/src/testdir/test24.ok
index d5bc95623..752dad583 100644
--- a/src/testdir/test24.ok
+++ b/src/testdir/test24.ok
@@ -17,3 +17,6 @@ test text test text  [\x00]
 test text test text  [\x00-\x10]
 test text test text  [\x-z]
 test text test text  [\u-z]
+xx  xx a
+xx aaaaa xx a
+xx aaaaa xx a
diff --git a/src/undo.c b/src/undo.c
index 4675d9972..1abd41df4 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -492,6 +492,8 @@ u_doit(count)
 
     u_newcount = 0;
     u_oldcount = 0;
+    if (curbuf->b_ml.ml_flags & ML_EMPTY)
+	u_oldcount = -1;
     while (count--)
     {
 	if (undo_undoes)
@@ -525,6 +527,8 @@ u_doit(count)
 	    curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev;
 	}
     }
+    if (curbuf->b_ml.ml_flags & ML_EMPTY)
+	--u_newcount;
     u_undo_end();
 }
 
diff --git a/src/version.h b/src/version.h
index 9451a0e9f..b537d7208 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4, compiled "
diff --git a/src/vim.h b/src/vim.h
index 3fb9fa332..facb51a22 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1534,7 +1534,9 @@ int vim_memcmp __ARGS((void *, void *, size_t));
 #define VV_VAL		34
 #define VV_KEY		35
 #define VV_PROFILING	36
-#define VV_LEN		37	/* number of v: vars */
+#define VV_FCS_REASON	37
+#define VV_FCS_CHOICE	38
+#define VV_LEN		39	/* number of v: vars */
 
 #ifdef FEAT_CLIPBOARD
author	Bram Moolenaar <Bram@vim.org>	2005-03-04 23:39:37 +0000
committer	Bram Moolenaar <Bram@vim.org>	2005-03-04 23:39:37 +0000
commit	19a09a189379659b917cf5ccff78f3e5ec061015 (patch)
tree	806d594bf7af04ef956c0c96ad64adfcd96325dc
parent	7383034c0ab657158c4c69146254beffdea4859e (diff)
download	vim-git-19a09a189379659b917cf5ccff78f3e5ec061015.tar.gz