Updated runtime files.
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index d5f19a6..18cc812 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -600,7 +600,7 @@
 								*g&*
 g&			Synonym for `:%s//~/&` (repeat last substitute with
 			last search pattern on all lines with the same flags).
-			For exaple, when you first do a substitution with
+			For example, when you first do a substitution with
 			`:s/pattern/repl/flags` and then `/search` for
 			something else, `g&` will do `:%s/search/repl/flags`.
 			Mnemonic: global substitute. {not in Vi}
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 57ca2fd..7ce87cf 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.3.  Last change: 2012 Jul 25
+*index.txt*     For Vim version 7.3.  Last change: 2013 Feb 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1134,7 +1134,7 @@
 |:cgetbuffer|	:cgetb[uffer]	get errors from buffer
 |:cgetexpr|	:cgete[xpr]	get errors from expr
 |:cgetfile|	:cg[etfile]	read file with error messages
-|:changes|	:cha[nges]	print the change list
+|:changes|	:changes	print the change list
 |:chdir|	:chd[ir]	change directory
 |:checkpath|	:che[ckpath]	list included files
 |:checktime|	:checkt[ime]	check timestamp of loaded buffers
@@ -1383,7 +1383,7 @@
 |:promptrepl|	:promptr[epl]	open GUI dialog for search/replace
 |:perldo|	:perld[o]	execute Perl command for each line
 |:pop|		:po[p]		jump to older entry in tag stack
-|:popup|	:pop[up]	popup a menu by name
+|:popup|	:popu[p]	popup a menu by name
 |:ppop|		:pp[op]		":pop" in preview window
 |:preserve|	:pre[serve]	write all text to swap file
 |:previous|	:prev[ious]	go to previous file in argument list
@@ -1469,7 +1469,7 @@
 |:slast|	:sla[st]	split window and go to last file in the
 				argument list
 |:smagic|	:sm[agic]	:substitute with 'magic'
-|:smap|		:sma[p]		like ":map" but for Select mode
+|:smap|		:smap		like ":map" but for Select mode
 |:smapclear|	:smapc[lear]	remove all mappings for Select mode
 |:smenu|	:sme[nu]	add menu for Select mode
 |:snext|	:sn[ext]	split window and go to next file in the
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index c2d9510..6164793 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1067,7 +1067,7 @@
 is mapped to "A" and "b" to "B".  Thus the first item is mapped to the second
 item.  This is done for each line, until the end of the file.
 These items are exactly the same as what can be used in a |:lnoremap| command,
-using "<buffer>" to make the mappings local to the buffer..
+using "<buffer>" to make the mappings local to the buffer.
 You can check the result with this command: >
 	:lmap
 The two items must be separated by white space.  You cannot include white
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 97c4525..35f6c49 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.3.  Last change: 2011 May 10
+*message.txt*   For Vim version 7.3.  Last change: 2013 Feb 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -730,7 +730,11 @@
   Can't open file {filename}
   Can't read file {filename}
 
-Vim cannot read a temporary file.
+Vim cannot read a temporary file.  Especially on Windows, this can be caused
+by wrong escaping of special characters for cmd.exe; the approach was
+changed with patch 7.3.443.  Try using |shellescape()| for all shell arguments
+given to |system()|, or explicitly add escaping with ^.  Also see
+'shellxquote' and 'shellxescape'.
 
 							*E464*  >
   Ambiguous use of user-defined command
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 559a619..143656a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2013 Feb 20
+*options.txt*	For Vim version 7.3.  Last change: 2013 Feb 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -986,7 +986,7 @@
 	- The backup file will be created in the first directory in the list
 	  where this is possible.  The directory must exist, Vim will not
 	  create it for you.
-	- Empty means that no backup file will be created ('patchmode' is
+	- Empty means that no backup file will be created ( 'patchmode' is
 	  impossible!).  Writing may fail because of this.
 	- A directory "." means to put the backup file in the same directory
 	  as the edited file.
@@ -1703,7 +1703,7 @@
 	when CTRL-P or CTRL-N are used.  It is also used for whole-line
 	completion |i_CTRL-X_CTRL-L|.  It indicates the type of completion
 	and the places to scan.  It is a comma separated list of flags:
-	.	scan the current buffer ('wrapscan' is ignored)
+	.	scan the current buffer ( 'wrapscan' is ignored)
 	w	scan buffers from other windows
 	b	scan other loaded buffers that are in the buffer list
 	u	scan the unloaded buffers that are in the buffer list
@@ -7085,7 +7085,7 @@
 			{not in Vi}
 	Encoding used for the terminal.  This specifies what character
 	encoding the keyboard produces and the display will understand.  For
-	the GUI it only applies to the keyboard ('encoding' is used for the
+	the GUI it only applies to the keyboard ( 'encoding' is used for the
 	display).  Except for the Mac when 'macatsui' is off, then
 	'termencoding' should be "macroman".
 	In the Win32 console version the default value is the console codepage
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b48307d..b69753a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
+*syntax.txt*	For Vim version 7.3.  Last change: 2013 Mar 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -999,6 +999,14 @@
 The ColdFusion syntax file is based on the HTML syntax file.
 
 
+CPP						*cpp.vim* *ft-cpp-syntax*
+
+Most of things are same as |ft-c-syntax|.
+
+Variable		Highlight ~
+cpp_no_c11		don't highlight C++11 standard items
+
+
 CSH						*csh.vim* *ft-csh-syntax*
 
 This covers the shell named "csh".  Note that on some systems tcsh is actually
@@ -2440,24 +2448,33 @@
 
 PYTHON						*python.vim* *ft-python-syntax*
 
-There are four options to control Python syntax highlighting.
+There are six options to control Python syntax highlighting.
 
 For highlighted numbers: >
-	:let python_highlight_numbers = 1
+	:let python_no_number_highlight = 1
 
 For highlighted builtin functions: >
-	:let python_highlight_builtins = 1
+	:let python_no_builtin_highlight = 1
 
 For highlighted standard exceptions: >
-	:let python_highlight_exceptions = 1
+	:let python_no_exception_highlight = 1
+
+For highlighted doctests and code inside: >
+	:let python_no_doctest_highlight = 1
+or >
+	:let python_no_doctest_code_highlight = 1
+(first option implies second one).
 
 For highlighted trailing whitespace and mix of spaces and tabs: >
-	:let python_highlight_space_errors = 1
+	:let python_space_error_highlight = 1
 
 If you want all possible Python highlighting (the same as setting the
-preceding three options): >
+preceding last option and unsetting all other ones): >
 	:let python_highlight_all = 1
 
+Note: only existence of these options matter, not their value. You can replace 
+      1 above with anything.
+
 
 QUAKE						*quake.vim* *ft-quake-syntax*
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index da079b2..89ac4a9 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4251,6 +4251,7 @@
 E86	windows.txt	/*E86*
 E860	eval.txt	/*E860*
 E861	eval.txt	/*E861*
+E862	eval.txt	/*E862*
 E87	windows.txt	/*E87*
 E88	windows.txt	/*E88*
 E89	message.txt	/*E89*
@@ -6694,6 +6695,7 @@
 mapmode-v	map.txt	/*mapmode-v*
 mapmode-x	map.txt	/*mapmode-x*
 mapping	map.txt	/*mapping*
+mapping-functions	usr_41.txt	/*mapping-functions*
 mark	motion.txt	/*mark*
 mark-functions	usr_41.txt	/*mark-functions*
 mark-motions	motion.txt	/*mark-motions*
@@ -7561,6 +7563,7 @@
 sh-awk	syntax.txt	/*sh-awk*
 sh-embed	syntax.txt	/*sh-embed*
 sh.vim	syntax.txt	/*sh.vim*
+sha256()	eval.txt	/*sha256()*
 shell-window	tips.txt	/*shell-window*
 shell_error-variable	eval.txt	/*shell_error-variable*
 shellescape()	eval.txt	/*shellescape()*
@@ -8523,6 +8526,7 @@
 whitespace	pattern.txt	/*whitespace*
 wildcard	editing.txt	/*wildcard*
 wildcards	editing.txt	/*wildcards*
+wildmenumode()	eval.txt	/*wildmenumode()*
 win16-!start	gui_w16.txt	/*win16-!start*
 win16-clipboard	gui_w16.txt	/*win16-clipboard*
 win16-colors	gui_w16.txt	/*win16-colors*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index f17d254..7fde2ed 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2013 Feb 20
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Mar 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,16 +34,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
-    Sutcliffe says it works well.
-    Update 2007 May 22 for Vim 7.1
-    Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
-    Update by Ken Takata (2012 Dec 31, 2013 Jan 4, 2013 Jan 26)
-
-Download counter for scripts no longer incremented?
-Because SourceForge does not have the IP address now, see ticket
-https://sourceforge.net/p/forge/site-support/2461/?page=1
-
 Several syntax file match "^\s*" which may get underlined if that's in the
 highlight group.  Add a "\zs" after it?
 
@@ -55,13 +45,38 @@
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
+Patch to build with Ruby 2.0 and Ming@ 64. (Ken Takata, 2013 Feb 28)
+
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
+Patch for this problem: (David Bürgin (glts), 2013 Mar 5)
+8   ":g//" gives "Pattern not found error" with E486.  Should not use the
+    error number, it's not a regular error message.
+
+Patch to fix ":vimgrep //". (David Bürgin (glts), 2013 Mar 5)
+
+Updates for Debian runtime files. (James McCoy, 2013 Mar 3)
+Also an update for debcontrol in another message.
+
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
+Patch for ":sort" not properly handling an empty search pattern when there is
+no previous search pattern. (David Bürgin, 2013 Mar 4)
+
+system() breaks clipboard text.  (Yukihiro Nakadaira, 2013 Feb 28)
+Patch by Christian Brabandt, 2013 Mar 1.
+
+Patch for replace multi-byte character in multiple lines. (Yasuhiro Matsumoto,
+2013 Feb 27)
+
+Patch to avoid register being changed when yanking. (Christian Brabandt, 2013
+Feb 26)
+
+Patch to trigger QuitPre in more situations. (Tatsuro Fujii, 2013 Mar 3)
+
 The CompleteDone autocommand needs some info passed to it:
 - The word that was selected (empty if abandoned complete)
 - Type of completion: tag, omnifunc, user func.
@@ -70,8 +85,8 @@
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
-Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
-Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
+Patch to fix wrong completion entry after using backspace. (reported by
+Olivier Teuliere, fixed by Christian Brabandt, 2013 Feb 26)
 
 Patch to detect value of 'ambiwidth' from the termresponse.
 (Hayaki Saito, 2013 Feb 11)
@@ -94,6 +109,9 @@
 Bug: search() does not use the match at the cursor position if it's empty.
 (Christian Brabandt, 2013 Feb 16)  Patch later.
 
+On Mac do not define CASE_INSENSITIVE_FILENAME ? (Richo Healey, 2013 Mar 3)
+But do set 'wildignorecase' ?
+
 Patch to make it possible to create Title Case in :s. with \L\u.
 (James McCoy, 2013 Feb 13)
 
@@ -112,6 +130,9 @@
 
 Issue 54: document behavior of -complete, also expands arg.
 
+Matches might be highlighted correctly. Inefficient patch by Christian
+Brabandt, 2013 Feb 26.
+
 New syntax files for apt. (quidame, 2012 Sep 21)
 
 'ff' is wrong for one-line file without EOL. (Issue 77)
@@ -152,7 +173,7 @@
 
 Patch to make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
 
-Patch to add functions for signs. (Christian Brabandt,, 2013 Jan 27)
+Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
 
 Patch to use directX to draw text on Windows.  Adds the 'directx' option.
 (Taro Muraoka, 2013 Jan 25)
@@ -189,7 +210,7 @@
 
 'iminsert' global value set when using ":setlocal iminsert"? (Wu, 2012 Jun 23)
 
-Help for b:undo_indent'. (Thilo Six, 2012 May 28)
+Help for 'b:undo_indent'. (Thilo Six, 2012 May 28)
 Also question if examples are correct.
 
 It should be possible to make globpath() return a list instead of a string,
@@ -261,6 +282,8 @@
 
 Should use has("browsefilter") in ftplugins.  Requires patch 7.3.593.
 
+Update for vim2html.pl. (Tyru, 2013 Feb 22)
+
 Issue 48: foldopen error can't be caught by try/catch
 
 "dg_" deletes including the last character, "d:normal! g_" doesn't.
@@ -2284,8 +2307,6 @@
     the :catch commands are always executed, also when the file is edited
     normally.  Should reset did_emsg and undo side effects.  Also make sure
     the ATTENTION message shows up.  Servatius Brandt works on this.
-8   ":g//" gives "Pattern not found error" with E486.  Should not use the
-    error number, it's not a regular error message.
 7   Vimtutor leaves escape sequence in terminal. This is the xterm response to
     requesting the version number.  (Yasuhiro Matsumoto)
 8   When redirecting and using ":silent" the current column for displaying and
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c427b18..aee617c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Feb 20
+" Last Change:	2013 Feb 28
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -325,6 +325,9 @@
 " C#
 au BufNewFile,BufRead *.cs			setf cs
 
+" CSDL
+au BufNewFile,BufRead *.csdl			setf csdl
+
 " Cabal
 au BufNewFile,BufRead *.cabal			setf cabal
 
@@ -2194,8 +2197,12 @@
 au BufNewFile,BufRead */etc/updatedb.conf	setf updatedb
 
 " Upstart (init(8)) config files
-au BufNewFile,BufRead */etc/init/*.conf,*/.init/*.conf          setf upstart
-au BufNewFile,BufRead */etc/init/*.override,*/.init/*.override  setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.conf               setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.override           setf upstart
+au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override  setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override        setf upstart
+au BufNewFile,BufRead */.config/upstart/*.conf                 setf upstart
+au BufNewFile,BufRead */.config/upstart/*.override             setf upstart
 
 " Vera
 au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
diff --git a/runtime/indent/falcon.vim b/runtime/indent/falcon.vim
index 41f8f34..46a228e 100644
--- a/runtime/indent/falcon.vim
+++ b/runtime/indent/falcon.vim
@@ -5,7 +5,6 @@
 " Credits: Thanks to the ruby.vim authors, I borrow a lot!
 " Previous Maintainer: Brent A. Fulgham <bfulgham@debian.org>
 " -----------------------------------------------------------
-" GetLatestVimScripts: 2752 1 :AutoInstall: falcon.vim
 
 "======================================
 "       SETUP
@@ -132,7 +131,7 @@
     " If previous line ends in a semi-colon reset indent to previous
     " lines setting
     if prevline =~? ';\s*$' && prevnonblank(prevline) =~? ',\s*$'
-        return chg = chg - (2 * &sw)
+        let chg = chg - (2 * &sw)
     endif
 
     " If previous line ended in a comma, indent again
diff --git a/runtime/indent/sdl.vim b/runtime/indent/sdl.vim
index b5e535e..ba03f2d 100644
--- a/runtime/indent/sdl.vim
+++ b/runtime/indent/sdl.vim
@@ -73,7 +73,7 @@
 
   " Systems and packages are always in column 0
   if getline(v:lnum) =~? '^\s*\(\(end\)\=system\|\(end\)\=package\)'
-    return 0;
+    return 0
   endif
 
   " Put each end* where the corresponding begin was
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 23a0093..d3961b9 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -2,7 +2,7 @@
 "
 " Menu Translations:	Japanese (EUC-JP)
 " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		15-Jun-2012.
+" Last Change:		24-Feb-2013.
 "
 " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@
 menutrans &Delete		ºï½ü(&D)
 menutrans Select\ Blockwise	¶ë·Á¥Ö¥í¥Ã¥¯ÁªÂò
 menutrans Select\ &Word		ñ¸ìÁªÂò(&W)
+menutrans Select\ &Sentence	ʸÁªÂò(&S)
+menutrans Select\ Pa&ragraph	ÃÊÍîÁªÂò(&R)
 menutrans Select\ &Line		¹ÔÁªÂò(&L)
 menutrans Select\ &Block	¥Ö¥í¥Ã¥¯ÁªÂò(&B)
 menutrans Select\ &All		¤¹¤Ù¤ÆÁªÂò(&A)
@@ -301,12 +303,12 @@
 " À®ÈݤÏiconv¼¡Â衢ɬ¤º¤·¤â»ØÄꤷ¤¿¥¨¥ó¥³¡¼¥É¤Ë¤Ê¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ
 if has('iconv')
   " iconv¤Î¥Ð¡¼¥¸¥ç¥óȽÄê
-  let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
-  "
+  let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
   " ÆÉ¤ß¹þ¤ß
   an 10.395 &File.-SEPICONV- <Nop>
   an 10.396.100.100 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..³«¤¯(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.100.110 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..³«¤¯(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
     an 10.396.100.120 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..³«¤¯(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
   else
@@ -317,7 +319,7 @@
 
   " ºÆÆÉ¹þ
   an 10.396.110.100 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..ºÆÆÉ¹þ(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.110.110 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..ºÆÆÉ¹þ(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
     an 10.396.110.120 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..ºÆÆÉ¹þ(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
   else
@@ -329,7 +331,7 @@
   " Êݸ
   an 10.396.115 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..-SEP1- <Nop>
   an 10.396.120.100 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.120.110 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
     an 10.396.120.120 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
   else
@@ -337,6 +339,8 @@
     an 10.396.120.120 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
   endif
   an 10.396.120.130 &File.¥¨¥ó¥³¡¼¥É»ØÄê(&E)\.\.\..Êݸ(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+  unlet s:support_jisx0213
 endif
 
 let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 2638c3c..0e48fcf 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -2,7 +2,7 @@
 "
 " Menu Translations:	Japanese (UTF-8)
 " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		15-Jun-2012.
+" Last Change:		24-Feb-2013.
 "
 " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@
 menutrans &Delete		削除(&D)
 menutrans Select\ Blockwise	矩形ブロック選択
 menutrans Select\ &Word		単語選択(&W)
+menutrans Select\ &Sentence	文選択(&S)
+menutrans Select\ Pa&ragraph	段落選択(&R)
 menutrans Select\ &Line		行選択(&L)
 menutrans Select\ &Block	ブロック選択(&B)
 menutrans Select\ &All		すべて選択(&A)
@@ -301,12 +303,12 @@
 " 成否はiconv次第、必ずしも指定したエンコードになるわけではないことに注意
 if has('iconv')
   " iconvのバージョン判定
-  let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
-  "
+  let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
   " 読み込み
   an 10.395 &File.-SEPICONV- <Nop>
   an 10.396.100.100 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.100.110 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
     an 10.396.100.120 &File.エンコード指定(&E)\.\.\..開く(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
   else
@@ -317,7 +319,7 @@
 
   " 再読込
   an 10.396.110.100 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.110.110 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
     an 10.396.110.120 &File.エンコード指定(&E)\.\.\..再読込(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
   else
@@ -329,7 +331,7 @@
   " 保存
   an 10.396.115 &File.エンコード指定(&E)\.\.\..-SEP1- <Nop>
   an 10.396.120.100 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.120.110 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
     an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
   else
@@ -337,6 +339,8 @@
     an 10.396.120.120 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
   endif
   an 10.396.120.130 &File.エンコード指定(&E)\.\.\..保存(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+  unlet s:support_jisx0213
 endif
 
 let &cpo = s:keepcpo
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index fc03013..eee7e76 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -2,7 +2,7 @@
 "
 " Menu Translations:	Japanese (CP932)
 " Translated By:	MURAOKA Taro  <koron.kaoriya@gmail.com>
-" Last Change:		15-Jun-2012.
+" Last Change:		24-Feb-2013.
 "
 " Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -241,6 +241,8 @@
 menutrans &Delete		íœ(&D)
 menutrans Select\ Blockwise	‹éŒ`ƒuƒƒbƒN‘I‘ð
 menutrans Select\ &Word		’PŒê‘I‘ð(&W)
+menutrans Select\ &Sentence	•¶‘I‘ð(&S)
+menutrans Select\ Pa&ragraph	’i—Ž‘I‘ð(&R)
 menutrans Select\ &Line		s‘I‘ð(&L)
 menutrans Select\ &Block	ƒuƒƒbƒN‘I‘ð(&B)
 menutrans Select\ &All		‚·‚ׂđI‘ð(&A)
@@ -301,12 +303,12 @@
 " ¬”Û‚ÍiconvŽŸ‘æA•K‚¸‚µ‚àŽw’肵‚½ƒGƒ“ƒR[ƒh‚ɂȂé‚킯‚ł͂Ȃ¢‚±‚ƂɒˆÓ
 if has('iconv')
   " iconv‚̃o[ƒWƒ‡ƒ“”»’è
-  let support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
-  "
+  let s:support_jisx0213 = (iconv("\x87\x64\x87\x6a", 'cp932', 'euc-jisx0213') ==# "\xad\xc5\xad\xcb") ? 1 : 0
+
   " “ǂݍž‚Ý
   an 10.395 &File.-SEPICONV- <Nop>
   an 10.396.100.100 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..ŠJ‚­(&O)\.\.\..SJIS(&S)<Tab>fenc=cp932 :browse confirm e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.100.110 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..ŠJ‚­(&O)\.\.\..EUC(&E)<Tab>fenc=euc-jp :browse confirm e ++enc=euc-jp<CR>
     an 10.396.100.120 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..ŠJ‚­(&O)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :browse confirm e ++enc=iso-2022-jp<CR>
   else
@@ -317,7 +319,7 @@
 
   " Ä“Ǎž
   an 10.396.110.100 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..Ä“Ǎž(&R)\.\.\..SJIS(&S)<Tab>fenc=cp932 :e ++enc=cp932<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.110.110 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..Ä“Ǎž(&R)\.\.\..EUC(&E)<Tab>fenc=euc-jp :e ++enc=euc-jp<CR>
     an 10.396.110.120 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..Ä“Ǎž(&R)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :e ++enc=iso-2022-jp<CR>
   else
@@ -329,7 +331,7 @@
   " •Û‘¶
   an 10.396.115 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..-SEP1- <Nop>
   an 10.396.120.100 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..•Û‘¶(&S)\.\.\..SJIS(&S)<Tab>fenc=cp932 :set fenc=cp932 \| w<CR>
-  if !support_jisx0213
+  if !s:support_jisx0213
     an 10.396.120.110 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..•Û‘¶(&S)\.\.\..EUC(&E)<Tab>fenc=euc-jp :set fenc=euc-jp \| w<CR>
     an 10.396.120.120 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..•Û‘¶(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp :set fenc=iso-2022-jp \| w<CR>
   else
@@ -337,6 +339,8 @@
     an 10.396.120.120 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..•Û‘¶(&S)\.\.\..JIS(&J)<Tab>fenc=iso-2022-jp-3 :set fenc=iso-2022-jp-3 \| w<CR>
   endif
   an 10.396.120.130 &File.ƒGƒ“ƒR[ƒhŽw’è(&E)\.\.\..•Û‘¶(&S)\.\.\..UTF-8(&8)<Tab>fenc=utf-8 :set fenc=utf-8 \| w<CR>
+
+  unlet s:support_jisx0213
 endif
 
 let &cpo = s:keepcpo
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index 07c55f6..c18f225 100644
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
 " Vim Plugin:	Edit the file with an existing Vim if possible
 " Maintainer:	Bram Moolenaar
-" Last Change:	2008 May 29
+" Last Change:	2013 Feb 24
 
 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
 " $VIM/vimfiles/plugin directory.  Or make a symbolic link, so that you
@@ -98,7 +98,7 @@
 	" Make this tab page the current one and find the window number.
 	exe 'tabnext ' . (i + 1)
 	let winnr = bufwinnr(a:fname)
-	break;
+	break
       endif
     endfor
   endif
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 92678d1..d964d0e 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -124,16 +124,17 @@
 an 50.20.370 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
 an 50.20.380 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
 an 50.20.390 &Syntax.C.Crontab :cal SetSyn("crontab")<CR>
-an 50.20.400 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.410 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.420 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
-an 50.20.430 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
-an 50.20.440 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.450 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.460 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.470 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
-an 50.20.480 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
-an 50.20.490 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
+an 50.20.400 &Syntax.C.CSDL :cal SetSyn("csdl")<CR>
+an 50.20.410 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.420 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.430 &Syntax.C.Cucumber :cal SetSyn("cucumber")<CR>
+an 50.20.440 &Syntax.C.CUDA :cal SetSyn("cuda")<CR>
+an 50.20.450 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.460 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.470 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.480 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.490 &Syntax.C.Cyn++ :cal SetSyn("cynpp")<CR>
+an 50.20.500 &Syntax.C.Cynlib :cal SetSyn("cynlib")<CR>
 an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
 an 50.30.110 &Syntax.DE.Datascript :cal SetSyn("datascript")<CR>
 an 50.30.120 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 501c91a..c663c4e 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Dec 14
+" Last Change:	2013 Mar 07
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -36,7 +36,13 @@
 if exists("c_no_cformat")
   syn region	cString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
   " cCppString: same as cString, but ends at end of line
-  syn region	cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,@Spell
+  if !exists("cpp_no_cpp11") " ISO C++11
+    syn region cCppString	start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+  else
+    syn region cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
+  endif
+  syn region	cCppOut2	contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
+  syn region	cCppSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
 else
   if !exists("c_no_c99") " ISO C99
     syn match	cFormat		display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 82660db..41c045f 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -1,12 +1,14 @@
 " Vim syntax file
-" Language:				CL
-" 					(pronounced alphabetically, and NOT known as Clever)
-" 					(CL was created by Multibase, http://www.mbase.com.au)
+" Language:		CL
+" 			(pronounced alphabetically: "Cee-El".
+" 			CL stands for Clever Language,
+" 			but the language is CL, not "Clever".
+" 			CL was created by Multibase, http://www.mbase.com.au)
 " Filename extensions:	*.ent
-"					*.eni
+"			*.eni
 " Maintainer:		Philip Uren	<philuSPAX@ieee.org> Remove SPAX spam block
-" Version:              5
-" Last Change:		Aug 16 2012
+" Version:              6
+" Last Change:		Mar 06 2013
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
diff --git a/runtime/syntax/csdl.vim b/runtime/syntax/csdl.vim
new file mode 100644
index 0000000..f7d30f1
--- /dev/null
+++ b/runtime/syntax/csdl.vim
@@ -0,0 +1,536 @@
+" Vim syntax file
+" Language: Curated Stream Definition Language (CSDL)
+" Maintainer: Jacek Artymiak
+" Latest Revision: 25 February 2013
+
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=.,@,48-57,_,192-255
+syn case ignore 
+
+syn match csdlKeyword "tag "
+syn match csdlKeyword "stream "
+syn match csdlKeyword "return "
+
+syn keyword csdlOperator contains
+syn match csdlOperator "cs contains"
+syn keyword csdlOperator substr
+syn match csdlOperator "cs substr"
+syn keyword csdlOperator contains_any
+syn match csdlOperator "cs contains_any"
+syn keyword csdlOperator any
+syn match csdlOperator "cs any"
+syn keyword csdlOperator contains_near
+syn match csdlOperator "cs contains_near"
+syn keyword csdlOperator exists
+syn keyword csdlOperator in
+syn keyword csdlOperator url_in
+syn match csdlOperator "=="
+syn match csdlOperator "!="
+syn match csdlOperator "cs =="
+syn match csdlOperator "cs !="
+syn match csdlOperator ">"
+syn match csdlOperator ">="
+syn match csdlOperator "<"
+syn match csdlOperator "<="
+syn keyword csdlOperator regex_partial
+syn keyword csdlOperator regex_exact
+syn keyword csdlOperator geo_box
+syn keyword csdlOperator geo_radius
+syn keyword csdlOperator geo_polygon
+
+syn keyword csdlLogicalOperator and
+syn keyword csdlLogicalOperator or
+syn keyword csdlLogicalOperator not
+
+syn match csdlTarget 'reddit\.title'
+syn match csdlTarget 'reddit\.content'
+syn match csdlTarget 'reddit\.contenttype'
+syn match csdlTarget 'reddit\.link'
+syn match csdlTarget 'reddit\.author\.name'
+syn match csdlTarget 'reddit\.author\.link'
+syn match csdlTarget 'reddit\.type'
+syn match csdlTarget 'reddit\.thread'
+syn match csdlTarget 'interaction\.type'
+syn match csdlTarget 'interaction\.title'
+syn match csdlTarget 'interaction\.content'
+syn match csdlTarget 'interaction\.source'
+syn match csdlTarget 'interaction\.geo'
+syn match csdlTarget 'interaction\.link'
+syn match csdlTarget 'interaction\.author\.username'
+syn match csdlTarget 'interaction\.author\.name'
+syn match csdlTarget 'interaction\.author\.id'
+syn match csdlTarget 'interaction\.author\.avatar'
+syn match csdlTarget 'interaction\.author\.link'
+syn match csdlTarget 'interaction\.sample'
+syn match csdlTarget 'links\.title'
+syn match csdlTarget 'links\.url'
+syn keyword csdlTarget links.normalized_url
+syn match csdlTarget 'links\.hops'
+syn match csdlTarget 'links\.code'
+syn match csdlTarget 'links\.domain'
+syn keyword csdlTarget links.retweet_count
+syn match csdlTarget 'links\.age'
+syn keyword csdlTarget links.meta.content_type
+syn match csdlTarget 'links\.meta\.charset'
+syn match csdlTarget 'links\.meta\.lang'
+syn match csdlTarget 'links\.meta\.keywords'
+syn match csdlTarget 'links\.meta\.description'
+syn match csdlTarget 'links\.meta\.newskeywords'
+syn match csdlTarget 'links\.meta\.standout'
+syn match csdlTarget 'links\.meta\.opengraph\.type'
+syn match csdlTarget 'links\.meta\.opengraph\.title'
+syn match csdlTarget 'links\.meta\.opengraph\.image'
+syn match csdlTarget 'links\.meta\.opengraph\.url'
+syn match csdlTarget 'links\.meta\.opengraph\.description'
+syn keyword csdlTarget links.meta.opengraph.site_name
+syn match csdlTarget 'links\.meta\.opengraph\.email'
+syn keyword csdlTarget links.meta.opengraph.phone_number
+syn keyword csdlTarget links.meta.opengraph.fax_number
+syn match csdlTarget 'links\.meta\.opengraph\.geo'
+syn keyword csdlTarget links.meta.opengraph.street_address
+syn match csdlTarget 'links\.meta\.opengraph\.locality'
+syn match csdlTarget 'links\.meta\.opengraph\.region'
+syn keyword csdlTarget links.meta.opengraph.postal_code
+syn match csdlTarget 'links\.meta\.opengraph\.activity'
+syn match csdlTarget 'links\.meta\.opengraph\.sport'
+syn match csdlTarget 'links\.meta\.opengraph\.bar'
+syn match csdlTarget 'links\.meta\.opengraph\.company'
+syn match csdlTarget 'links\.meta\.opengraph\.cafe'
+syn match csdlTarget 'links\.meta\.opengraph\.hotel'
+syn match csdlTarget 'links\.meta\.opengraph\.restaurant'
+syn match csdlTarget 'links\.meta\.opengraph\.cause'
+syn keyword csdlTarget links.meta.opengraph.sports_league
+syn keyword csdlTarget links.meta.opengraph.sports_team
+syn match csdlTarget 'links\.meta\.opengraph\.band'
+syn match csdlTarget 'links\.meta\.opengraph\.government'
+syn keyword csdlTarget links.meta.opengraph.non_profit
+syn match csdlTarget 'links\.meta\.opengraph\.school'
+syn match csdlTarget 'links\.meta\.opengraph\.university'
+syn match csdlTarget 'links\.meta\.opengraph\.actor'
+syn match csdlTarget 'links\.meta\.opengraph\.athlete'
+syn match csdlTarget 'links\.meta\.opengraph\.author'
+syn match csdlTarget 'links\.meta\.opengraph\.director'
+syn match csdlTarget 'links\.meta\.opengraph\.musician'
+syn match csdlTarget 'links\.meta\.opengraph\.politician'
+syn keyword csdlTarget links.meta.opengraph.public_figure
+syn match csdlTarget 'links\.meta\.opengraph\.city'
+syn match csdlTarget 'links\.meta\.opengraph\.country'
+syn match csdlTarget 'links\.meta\.opengraph\.landmark'
+syn keyword csdlTarget links.meta.opengraph.state_province
+syn match csdlTarget 'links\.meta\.opengraph\.album'
+syn match csdlTarget 'links\.meta\.opengraph\.book'
+syn match csdlTarget 'links\.meta\.opengraph\.drink'
+syn match csdlTarget 'links\.meta\.opengraph\.food'
+syn match csdlTarget 'links\.meta\.opengraph\.game'
+syn match csdlTarget 'links\.meta\.opengraph\.movie'
+syn match csdlTarget 'links\.meta\.opengraph\.product'
+syn match csdlTarget 'links\.meta\.opengraph\.song'
+syn keyword csdlTarget links.meta.opengraph.tv_show
+syn match csdlTarget 'links\.meta\.opengraph\.blog'
+syn match csdlTarget 'links\.meta\.opengraph\.website'
+syn match csdlTarget 'links\.meta\.opengraph\.article'
+syn match csdlTarget 'links\.meta\.twitter\.card'
+syn match csdlTarget 'links\.meta\.twitter\.site'
+syn keyword csdlTarget links.meta.twitter.site_id
+syn match csdlTarget 'links\.meta\.twitter\.creator'
+syn keyword csdlTarget links.meta.twitter.creator_id
+syn match csdlTarget 'links\.meta\.twitter\.url'
+syn match csdlTarget 'links\.meta\.twitter\.description'
+syn match csdlTarget 'links\.meta\.twitter\.title'
+syn match csdlTarget 'links\.meta\.twitter\.image'
+syn keyword csdlTarget links.meta.twitter.image_width
+syn keyword csdlTarget links.meta.twitter.image_height
+syn match csdlTarget 'links\.meta\.twitter\.player'
+syn keyword csdlTarget links.meta.twitter.player_width
+syn keyword csdlTarget links.meta.twitter.player_height
+syn keyword csdlTarget links.meta.twitter.player_stream
+syn keyword csdlTarget links.meta.twitter.player_stream_content_type
+syn match csdlTarget 'myspace\.link'
+syn match csdlTarget 'myspace\.content'
+syn match csdlTarget 'myspace\.contenttype'
+syn match csdlTarget 'myspace\.category'
+syn match csdlTarget 'myspace\.author\.username'
+syn match csdlTarget 'myspace\.author\.name'
+syn match csdlTarget 'myspace\.author\.id'
+syn match csdlTarget 'myspace\.author\.link'
+syn match csdlTarget 'myspace\.author\.avatar'
+syn match csdlTarget 'myspace\.geo'
+syn match csdlTarget 'myspace\.verb'
+syn match csdlTarget 'newscred\.type'
+syn match csdlTarget 'newscred\.article\.domain'
+syn match csdlTarget 'newscred\.video\.domain'
+syn match csdlTarget 'newscred\.article\.topics'
+syn match csdlTarget 'newscred\.video\.topics'
+syn match csdlTarget 'newscred\.article\.category'
+syn match csdlTarget 'newscred\.video\.category'
+syn match csdlTarget 'newscred\.article\.title'
+syn match csdlTarget 'newscred\.video\.title'
+syn match csdlTarget 'newscred\.article\.content'
+syn match csdlTarget 'newscred\.article\.fulltext'
+syn match csdlTarget 'newscred\.article\.authors'
+syn match csdlTarget 'newscred\.image\.caption'
+syn match csdlTarget 'newscred\.video\.caption'
+syn match csdlTarget 'newscred\.image\.attribution\.text'
+syn match csdlTarget 'newscred\.image\.attribution\.link'
+syn match csdlTarget 'newscred\.source\.name'
+syn match csdlTarget 'newscred\.source\.link'
+syn match csdlTarget 'newscred\.source\.domain'
+syn keyword csdlTarget newscred.source.media_type
+syn keyword csdlTarget newscred.source.company_type
+syn match csdlTarget 'newscred\.source\.country'
+syn match csdlTarget 'newscred\.source\.circulation'
+syn match csdlTarget 'newscred\.source\.founded'
+syn match csdlTarget 'imdb\.title'
+syn match csdlTarget 'imdb\.content'
+syn match csdlTarget 'imdb\.contenttype'
+syn match csdlTarget 'imdb\.link'
+syn match csdlTarget 'imdb\.author\.name'
+syn match csdlTarget 'imdb\.author\.link'
+syn match csdlTarget 'imdb\.type'
+syn match csdlTarget 'imdb\.thread'
+syn match csdlTarget 'amazon\.title'
+syn match csdlTarget 'amazon\.content'
+syn match csdlTarget 'amazon\.contenttype'
+syn match csdlTarget 'amazon\.link'
+syn match csdlTarget 'amazon\.author\.name'
+syn match csdlTarget 'amazon\.author\.link'
+syn match csdlTarget 'amazon\.type'
+syn match csdlTarget 'amazon\.thread'
+syn match csdlTarget 'salience\.content\.sentiment'
+syn match csdlTarget 'salience\.content\.topics'
+syn match csdlTarget 'salience\.title\.sentiment'
+syn match csdlTarget 'salience\.title\.topics'
+syn match csdlTarget 'salience\.content\.entities\.name'
+syn match csdlTarget 'salience\.content\.entities\.type'
+syn match csdlTarget 'salience\.title\.entities\.name'
+syn match csdlTarget 'salience\.title\.entities\.type'
+syn match csdlTarget 'klout\.score'
+syn match csdlTarget 'klout\.network'
+syn match csdlTarget 'klout\.amplification'
+syn keyword csdlTarget klout.true_reach
+syn match csdlTarget 'klout\.topics'
+syn match csdlTarget 'wikipedia\.author\.talk'
+syn match csdlTarget 'wikipedia\.author\.contributions'
+syn match csdlTarget 'wikipedia\.author\.username'
+syn match csdlTarget 'wikipedia\.body'
+syn match csdlTarget 'wikipedia\.title'
+syn match csdlTarget 'wikipedia\.images'
+syn match csdlTarget 'wikipedia\.categories'
+syn match csdlTarget 'wikipedia\.externallinks'
+syn match csdlTarget 'wikipedia\.ns'
+syn match csdlTarget 'wikipedia\.namespace'
+syn match csdlTarget 'wikipedia\.pageid'
+syn match csdlTarget 'wikipedia\.parentid'
+syn match csdlTarget 'wikipedia\.oldlen'
+syn match csdlTarget 'wikipedia\.newlen'
+syn match csdlTarget 'wikipedia\.changetype'
+syn match csdlTarget 'wikipedia\.diff\.from'
+syn match csdlTarget 'wikipedia\.diff\.to'
+syn match csdlTarget 'wikipedia\.diff\.changes\.added'
+syn match csdlTarget 'wikipedia\.diff\.changes\.removed'
+syn keyword csdlTarget demographic.twitter_activity
+syn match csdlTarget 'demographic\.location\.country'
+syn keyword csdlTarget demographic.location.us_state
+syn match csdlTarget 'demographic\.location\.city'
+syn match csdlTarget 'demographic\.type'
+syn match csdlTarget 'demographic\.sex'
+syn match csdlTarget 'demographic\.status\.relationship'
+syn match csdlTarget 'demographic\.status\.work'
+syn keyword csdlTarget demographic.likes_and_interests
+syn keyword csdlTarget demographic.first_language
+syn match csdlTarget 'demographic\.professions'
+syn match csdlTarget 'demographic\.services'
+syn keyword csdlTarget demographic.large_accounts_followed
+syn keyword csdlTarget demographic.age_range.start
+syn keyword csdlTarget demographic.age_range.end
+syn match csdlTarget 'demographic\.income\.start'
+syn match csdlTarget 'demographic\.income\.end'
+syn keyword csdlTarget demographic.main_street.dressed_by
+syn keyword csdlTarget demographic.main_street.shop_at
+syn keyword csdlTarget demographic.main_street.eat_and_drink_at
+syn match csdlTarget 'demographic\.accounts\.categories'
+syn match csdlTarget 'tumblr\.activity'
+syn match csdlTarget 'tumblr\.source\.blogid'
+syn match csdlTarget 'tumblr\.dest\.blogid'
+syn match csdlTarget 'tumblr\.dest\.postid'
+syn match csdlTarget 'tumblr\.root\.blogid'
+syn match csdlTarget 'tumblr\.root\.postid'
+syn match csdlTarget 'tumblr\.blogid'
+syn keyword csdlTarget tumblr.blog_name
+syn match csdlTarget 'tumblr\.type'
+syn match csdlTarget 'tumblr\.title'
+syn match csdlTarget 'tumblr\.body'
+syn match csdlTarget 'tumblr\.text'
+syn match csdlTarget 'tumblr\.tags'
+syn keyword csdlTarget tumblr.track_name
+syn match csdlTarget 'tumblr\.album'
+syn match csdlTarget 'tumblr\.link'
+syn match csdlTarget 'tumblr\.meta\.url'
+syn match csdlTarget 'tumblr\.meta\.type'
+syn match csdlTarget 'tumblr\.meta\.description'
+syn keyword csdlTarget tumblr.meta.likes_local
+syn keyword csdlTarget tumblr.meta.likes_global
+syn keyword csdlTarget tumblr.meta.reblogged_global
+syn match csdlTarget 'demographic\.gender'
+syn match csdlTarget 'flickr\.title'
+syn match csdlTarget 'flickr\.content'
+syn match csdlTarget 'flickr\.contenttype'
+syn match csdlTarget 'flickr\.link'
+syn match csdlTarget 'flickr\.author\.name'
+syn match csdlTarget 'flickr\.author\.link'
+syn match csdlTarget 'flickr\.author\.username'
+syn match csdlTarget 'flickr\.type'
+syn match csdlTarget 'flickr\.thread'
+syn match csdlTarget 'twitter\.text'
+syn match csdlTarget 'twitter\.source'
+syn match csdlTarget 'twitter\.mentions'
+syn keyword csdlTarget twitter.mention_ids
+syn match csdlTarget 'twitter\.links'
+syn match csdlTarget 'twitter\.domains'
+syn keyword csdlTarget twitter.in_reply_to_screen_name
+syn keyword csdlTarget twitter.in_reply_to_user_id
+syn keyword csdlTarget twitter.in_reply_to_status_id
+syn keyword csdlTarget twitter.filter_level
+syn match csdlTarget 'twitter\.lang'
+syn match csdlTarget 'twitter\.geo'
+syn match csdlTarget 'twitter\.user\.description'
+syn match csdlTarget 'twitter\.user\.location'
+syn keyword csdlTarget twitter.user.statuses_count
+syn keyword csdlTarget twitter.user.followers_count
+syn keyword csdlTarget twitter.user.follower_ratio
+syn keyword csdlTarget twitter.user.profile_age
+syn keyword csdlTarget twitter.user.friends_count
+syn keyword csdlTarget twitter.user.screen_name
+syn match csdlTarget 'twitter\.user\.lang'
+syn keyword csdlTarget twitter.user.time_zone
+syn match csdlTarget 'twitter\.user\.name'
+syn match csdlTarget 'twitter\.user\.id'
+syn keyword csdlTarget twitter.user.listed_count
+syn match csdlTarget 'twitter\.user\.url'
+syn match csdlTarget 'twitter\.user\.verified'
+syn keyword csdlTarget twitter.place.place_type
+syn match csdlTarget 'twitter\.place\.country'
+syn keyword csdlTarget twitter.place.country_code
+syn keyword csdlTarget twitter.place.full_name
+syn match csdlTarget 'twitter\.place\.name'
+syn match csdlTarget 'twitter\.place\.url'
+syn match csdlTarget 'twitter\.place\.attributes\.locality'
+syn match csdlTarget 'twitter\.place\.attributes\.region'
+syn keyword csdlTarget twitter.place.attributes.street_address
+syn match csdlTarget 'twitter\.status'
+syn match csdlTarget 'twitter\.retweet\.text'
+syn match csdlTarget 'twitter\.retweet\.elapsed'
+syn match csdlTarget 'twitter\.retweet\.source'
+syn keyword csdlTarget twitter.retweet.filter_level
+syn match csdlTarget 'twitter\.retweet\.lang'
+syn match csdlTarget 'twitter\.retweet\.user\.description'
+syn match csdlTarget 'twitter\.retweet\.user\.location'
+syn keyword csdlTarget twitter.retweet.user.statuses_count
+syn keyword csdlTarget twitter.retweet.user.followers_count
+syn keyword csdlTarget twitter.retweet.user.follower_ratio
+syn keyword csdlTarget twitter.retweet.user.profile_age
+syn keyword csdlTarget twitter.retweet.user.friends_count
+syn keyword csdlTarget twitter.retweet.user.screen_name
+syn match csdlTarget 'twitter\.retweet\.user\.lang'
+syn keyword csdlTarget twitter.retweet.user.time_zone
+syn match csdlTarget 'twitter\.retweet\.user\.name'
+syn match csdlTarget 'twitter\.retweet\.user\.id'
+syn keyword csdlTarget twitter.retweet.user.listed_count
+syn match csdlTarget 'twitter\.retweet\.user\.url'
+syn match csdlTarget 'twitter\.retweet\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.id'
+syn match csdlTarget 'twitter\.retweeted\.source'
+syn keyword csdlTarget twitter.retweeted.in_reply_to_screen_name
+syn keyword csdlTarget twitter.retweeted.in_reply_to_user_id_str
+syn keyword csdlTarget twitter.retweeted.in_reply_to_status_id
+syn match csdlTarget 'twitter\.retweet\.count'
+syn match csdlTarget 'twitter\.retweet\.mentions'
+syn keyword csdlTarget twitter.retweet.mention_ids
+syn match csdlTarget 'twitter\.retweet\.links'
+syn match csdlTarget 'twitter\.retweet\.domains'
+syn match csdlTarget 'twitter\.retweeted\.user\.description'
+syn match csdlTarget 'twitter\.retweeted\.user\.location'
+syn keyword csdlTarget twitter.retweeted.user.statuses_count
+syn keyword csdlTarget twitter.retweeted.user.followers_count
+syn keyword csdlTarget twitter.retweeted.user.follower_ratio
+syn keyword csdlTarget twitter.retweeted.user.profile_age
+syn keyword csdlTarget twitter.retweeted.user.friends_count
+syn keyword csdlTarget twitter.retweeted.user.screen_name
+syn match csdlTarget 'twitter\.retweeted\.user\.lang'
+syn keyword csdlTarget twitter.retweeted.user.time_zone
+syn match csdlTarget 'twitter\.retweeted\.user\.name'
+syn match csdlTarget 'twitter\.retweeted\.user\.id'
+syn keyword csdlTarget twitter.retweeted.user.listed_count
+syn match csdlTarget 'twitter\.retweeted\.user\.url'
+syn match csdlTarget 'twitter\.retweeted\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.geo'
+syn keyword csdlTarget twitter.retweeted.place.place_type
+syn match csdlTarget 'twitter\.retweeted\.place\.country'
+syn keyword csdlTarget twitter.retweeted.place.country_code
+syn keyword csdlTarget twitter.retweeted.place.full_name
+syn match csdlTarget 'twitter\.retweeted\.place\.name'
+syn match csdlTarget 'twitter\.retweeted\.place\.url'
+syn match csdlTarget 'twitter\.retweeted\.place\.attributes'
+syn match csdlTarget 'twitter\.hashtags'
+syn match csdlTarget 'twitter\.retweet\.hashtags'
+syn match csdlTarget 'twitter\.media\.type'
+syn keyword csdlTarget twitter.media.media_url
+syn keyword csdlTarget twitter.media.display_url
+syn match csdlTarget 'twitter\.retweet\.media\.type'
+syn keyword csdlTarget twitter.retweet.media.media_url
+syn keyword csdlTarget twitter.retweet.media.display_url
+syn match csdlTarget 'blog\.title'
+syn match csdlTarget 'blog\.content'
+syn match csdlTarget 'blog\.contenttype'
+syn match csdlTarget 'blog\.link'
+syn match csdlTarget 'blog\.domain'
+syn match csdlTarget 'blog\.author\.name'
+syn match csdlTarget 'blog\.author\.link'
+syn match csdlTarget 'blog\.author\.avatar'
+syn match csdlTarget 'blog\.author\.username'
+syn match csdlTarget 'blog\.type'
+syn match csdlTarget 'blog\.post\.link'
+syn match csdlTarget 'blog\.post\.title'
+syn match csdlTarget 'facebook\.author\.name'
+syn match csdlTarget 'facebook\.author\.link'
+syn match csdlTarget 'facebook\.author\.id'
+syn match csdlTarget 'facebook\.author\.avatar'
+syn match csdlTarget 'facebook\.message'
+syn match csdlTarget 'facebook\.description'
+syn match csdlTarget 'facebook\.caption'
+syn match csdlTarget 'facebook\.type'
+syn match csdlTarget 'facebook\.application'
+syn match csdlTarget 'facebook\.source'
+syn match csdlTarget 'facebook\.link'
+syn match csdlTarget 'facebook\.name'
+syn match csdlTarget 'facebook\.to\.names'
+syn match csdlTarget 'facebook\.to\.ids'
+syn match csdlTarget 'facebook\.og\.title'
+syn match csdlTarget 'facebook\.og\.location'
+syn match csdlTarget 'facebook\.og\.photos'
+syn match csdlTarget 'facebook\.og\.by'
+syn match csdlTarget 'facebook\.og\.description'
+syn match csdlTarget 'facebook\.og\.type'
+syn match csdlTarget 'facebook\.og\.length'
+syn match csdlTarget 'facebook\.likes\.count'
+syn match csdlTarget 'facebook\.likes\.names'
+syn match csdlTarget 'facebook\.likes\.ids'
+syn match csdlTarget 'topix\.title'
+syn match csdlTarget 'topix\.content'
+syn match csdlTarget 'topix\.contenttype'
+syn match csdlTarget 'topix\.link'
+syn match csdlTarget 'topix\.author\.name'
+syn match csdlTarget 'topix\.type'
+syn match csdlTarget 'topix\.thread'
+syn match csdlTarget 'topix\.author\.location'
+syn match csdlTarget 'bitly\.user\.agent'
+syn keyword csdlTarget bitly.url_hash
+syn match csdlTarget 'bitly\.share\.hash'
+syn match csdlTarget 'bitly\.cname'
+syn keyword csdlTarget bitly.referring_url
+syn keyword csdlTarget bitly.referring_domain
+syn match csdlTarget 'bitly\.url'
+syn match csdlTarget 'bitly\.domain'
+syn keyword csdlTarget bitly.country_code
+syn keyword csdlTarget bitly.geo_region_code
+syn match csdlTarget 'bitly\.country'
+syn keyword csdlTarget bitly.geo_region
+syn keyword csdlTarget bitly.geo_city
+syn match csdlTarget 'bitly\.geo'
+syn match csdlTarget 'bitly\.timezone'
+syn match csdlTarget 'trends\.type'
+syn match csdlTarget 'trends\.content'
+syn match csdlTarget 'trends\.source'
+syn match csdlTarget 'board\.title'
+syn match csdlTarget 'board\.content'
+syn match csdlTarget 'board\.contenttype'
+syn match csdlTarget 'board\.link'
+syn match csdlTarget 'board\.domain'
+syn match csdlTarget 'board\.author\.name'
+syn match csdlTarget 'board\.author\.link'
+syn match csdlTarget 'board\.author\.avatar'
+syn match csdlTarget 'board\.author\.username'
+syn match csdlTarget 'board\.type'
+syn match csdlTarget 'board\.thread'
+syn match csdlTarget 'board\.author\.location'
+syn match csdlTarget 'board\.author\.signature'
+syn match csdlTarget 'board\.author\.registered'
+syn match csdlTarget 'board\.author\.age'
+syn match csdlTarget 'board\.author\.gender'
+syn match csdlTarget 'video\.title'
+syn match csdlTarget 'video\.content'
+syn match csdlTarget 'video\.contenttype'
+syn match csdlTarget 'video\.domain'
+syn match csdlTarget 'video\.author\.name'
+syn match csdlTarget 'video\.author\.link'
+syn match csdlTarget 'video\.author\.avatar'
+syn match csdlTarget 'video\.author\.username'
+syn match csdlTarget 'video\.type'
+syn match csdlTarget 'video\.videolink'
+syn match csdlTarget 'video\.commentslink'
+syn match csdlTarget 'video\.duration'
+syn match csdlTarget 'video\.thumbnail'
+syn match csdlTarget 'video\.category'
+syn match csdlTarget 'video\.tags'
+syn match csdlTarget '2ch\.title'
+syn match csdlTarget '2ch\.content'
+syn match csdlTarget '2ch\.contenttype'
+syn match csdlTarget '2ch\.link'
+syn match csdlTarget '2ch\.author\.name'
+syn match csdlTarget '2ch\.type'
+syn match csdlTarget '2ch\.thread'
+syn match csdlTarget 'dailymotion\.title'
+syn match csdlTarget 'dailymotion\.content'
+syn match csdlTarget 'dailymotion\.contenttype'
+syn match csdlTarget 'dailymotion\.author\.link'
+syn match csdlTarget 'dailymotion\.author\.username'
+syn match csdlTarget 'dailymotion\.videolink'
+syn match csdlTarget 'dailymotion\.duration'
+syn match csdlTarget 'dailymotion\.thumbnail'
+syn match csdlTarget 'dailymotion\.category'
+syn match csdlTarget 'dailymotion\.tags'
+syn match csdlTarget 'language\.tag'
+syn match csdlTarget 'language\.confidence'
+syn match csdlTarget 'digg\.type'
+syn match csdlTarget 'digg\.user\.name'
+syn match csdlTarget 'digg\.user\.fullname'
+syn match csdlTarget 'digg\.user\.registered'
+syn match csdlTarget 'digg\.user\.profileviews'
+syn match csdlTarget 'digg\.user\.icon'
+syn match csdlTarget 'digg\.user\.links'
+syn match csdlTarget 'digg\.item\.status'
+syn match csdlTarget 'digg\.item\.description'
+syn match csdlTarget 'digg\.item\.title'
+syn match csdlTarget 'digg\.item\.diggs'
+syn match csdlTarget 'digg\.item\.comments'
+syn match csdlTarget 'digg\.item\.topic'
+syn match csdlTarget 'digg\.comment\.buries'
+syn match csdlTarget 'digg\.comment\.diggs'
+syn match csdlTarget 'digg\.comment\.text'
+syn match csdlTarget 'youtube\.title'
+syn match csdlTarget 'youtube\.content'
+syn match csdlTarget 'youtube\.contenttype'
+syn match csdlTarget 'youtube\.author\.name'
+syn match csdlTarget 'youtube\.author\.link'
+syn match csdlTarget 'youtube\.type'
+syn match csdlTarget 'youtube\.videolink'
+syn match csdlTarget 'youtube\.commentslink'
+syn match csdlTarget 'youtube\.duration'
+syn match csdlTarget 'youtube\.thumbnail'
+syn match csdlTarget 'youtube\.category'
+syn match csdlTarget 'youtube\.tags'
+
+syn match csdlComment "^\/\/.*$"
+syn match csdlComment "^\/\*.*$"
+syn match csdlComment "^.*\*\/$"
+
+highlight link csdlKeyword Statement
+highlight link csdlOperator Operator
+highlight link csdlLogicalOperator Operator
+highlight link csdlTarget Constant
+highlight link csdlComment Comment
+"
+let b:current_syntax = "csdl"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 0cdf9c4..71b4405 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Neil Schemenauer <nas@python.ca>
-" Last Change:	2010 Sep 21
+" Last Change:	2013 Feb 26
 " Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
 "		Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
@@ -236,7 +236,7 @@
 " Notice that the end of a string, either ''', or """, will end the contained
 " doctest too.  Thus, we do *not* need to have it as an end pattern.
 if !exists("python_no_doctest_highlight")
-  if !exists("python_no_doctest_code_higlight")
+  if !exists("python_no_doctest_code_highlight")
     syn region pythonDoctest
 	  \ start="^\s*>>>\s" end="^\s*$"
 	  \ contained contains=ALLBUT,pythonDoctest,@Spell
diff --git a/src/po/ja.po b/src/po/ja.po
index f34a35f..14ae378 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,7 +3,7 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Last Change: 15-Jun-2012.
+# Last Change: 24-Feb-2013.
 #
 # Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,11 @@
 msgstr ""
 "Project-Id-Version: Vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-15 08:50+0900\n"
-"PO-Revision-Date: 2012-06-15 09:45+0900\n"
+"POT-Creation-Date: 2013-02-24 12:38+0900\n"
+"PO-Revision-Date: 2013-02-24 13:30+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -109,7 +110,7 @@
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -234,7 +235,7 @@
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E102: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -247,7 +248,7 @@
 msgstr "E104: ¹ç»ú¤ËEscape¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
 
 msgid "E544: Keymap file not found"
-msgstr "E544: ¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E544: ¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source ¤Ç¼è¹þ¤à¥Õ¥¡¥¤¥ë°Ê³°¤Ç¤Ï :loadkeymap ¤ò»È¤¨¤Þ¤»¤ó"
@@ -369,7 +370,7 @@
 msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s"
 
 msgid "E111: Missing ']'"
-msgstr "E111: ']' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E111: ']' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E686: Argument of %s must be a List"
@@ -489,7 +490,7 @@
 msgstr "E804: '%' ¤òÉâÆ°¾®¿ôÅÀ¿ô¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó"
 
 msgid "E110: Missing ')'"
-msgstr "E110: ')' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E110: ')' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ´Ø¿ô»²¾È·¿¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤­¤Þ¤»¤ó"
@@ -596,7 +597,7 @@
 
 #, c-format
 msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ¹Ô:"
+msgstr "+-%s%3ld ¹Ô: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
@@ -727,10 +728,14 @@
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
 
+msgid "E862: Cannot use g: here"
+msgstr "E862: ¤³¤³¤Ç¤Ï g: ¤Ï»È¤¨¤Þ¤»¤ó"
+
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
 
+#, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: °ú¿ô̾¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹: %s"
 
@@ -960,7 +965,7 @@
 msgstr "%s ¤ËÃÖ´¹¤·¤Þ¤¹¤«? (y/n/a/q/l/^E/^Y)"
 
 msgid "(Interrupted) "
-msgstr "(³ä¹þ¤Þ¤ì¤Þ¤·¤¿)"
+msgstr "(³ä¹þ¤Þ¤ì¤Þ¤·¤¿) "
 
 msgid "1 match"
 msgstr "1 ²Õ½ê³ºÅö¤·¤Þ¤·¤¿"
@@ -991,7 +996,7 @@
 
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "¥Ñ¥¿¡¼¥ó¤¬Á´¤Æ¤Î¹Ô¤Ç¤ß¤Ä¤«¤ê¤Þ¤·¤¿: %s"
+msgstr "¥Ñ¥¿¡¼¥ó¤¬Á´¤Æ¤Î¹Ô¤Ç¸«¤Ä¤«¤ê¤Þ¤·¤¿: %s"
 
 msgid ""
 "\n"
@@ -1015,7 +1020,7 @@
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "»Äǰ¤Ç¤¹¤¬¥Ø¥ë¥×¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "»Äǰ¤Ç¤¹¤¬¥Ø¥ë¥×¥Õ¥¡¥¤¥ë \"%s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E150: Not a directory: %s"
@@ -1069,7 +1074,7 @@
 
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
-msgstr "  (¤ß¤Ä¤«¤ê¤Þ¤»¤ó)"
+msgstr "  (¸«¤Ä¤«¤ê¤Þ¤»¤ó)"
 
 msgid " (not supported)"
 msgstr " (È󥵥ݡ¼¥È)"
@@ -1094,7 +1099,7 @@
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E161: ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 msgid "No breakpoints defined"
 msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1143,7 +1148,7 @@
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ¤ÎÃæ¤Ë¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó: \"%s\""
+msgstr "'runtimepath' ¤ÎÃæ¤Ë¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vim¥¹¥¯¥ê¥×¥È¤Î¼è¹þ¤ß"
@@ -1317,8 +1322,8 @@
 msgstr "ÉÔÌÀ"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ¥«¥é¡¼¥¹¥­¡¼¥à %s ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: ¥«¥é¡¼¥¹¥­¡¼¥à '%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "Greetings, Vim user!"
 msgstr "Vim »È¤¤¤µ¤ó¡¢¤ä¤¢!"
@@ -1669,7 +1674,7 @@
 msgstr "[ÆÉ¹þ¥¨¥é¡¼]"
 
 msgid "Can't find temp file for conversion"
-msgstr "ÊÑ´¹¤ËɬÍפʰì»þ¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "ÊÑ´¹¤ËɬÍפʰì»þ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' ¤Ë¤è¤ëÊÑ´¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -1725,7 +1730,7 @@
 msgstr "E460: ¥ê¥½¡¼¥¹¥Õ¥©¡¼¥¯¤¬¼º¤ï¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©)"
 
 msgid "E214: Can't find temp file for writing"
-msgstr "E214: ÊݸÍѰì»þ¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E214: ÊݸÍѰì»þ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: ÊÑ´¹¤Ç¤­¤Þ¤»¤ó (! ¤òÄɲäÇÊÑ´¹¤»¤º¤ËÊݸ)"
@@ -1950,7 +1955,7 @@
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <¥Ð¥Ã¥Õ¥¡=%d>: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹"
+msgstr "E680: <¥Ð¥Ã¥Õ¥¡=%d>: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹ "
 
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Á´¤Æ¤Î¥¤¥Ù¥ó¥È¤ËÂФ·¤Æ¤Îautocommand¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
@@ -1990,7 +1995,7 @@
 
 #, c-format
 msgid "+--%3ld lines folded "
-msgstr "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿"
+msgstr "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿ "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: ÆÉ¹þ¥Ð¥Ã¥Õ¥¡¤ØÄɲÃ"
@@ -2015,365 +2020,14 @@
 msgstr "E227: %s ¤È¤¤¤¦¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
 
 msgid "No abbreviation found"
-msgstr "û½ÌÆþÎϤϤߤĤ«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "û½ÌÆþÎϤϸ«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
 msgid "No mapping found"
-msgstr "¥Þ¥Ã¥Ô¥ó¥°¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "¥Þ¥Ã¥Ô¥ó¥°¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ÉÔÀµ¤Ê¥â¡¼¥É"
 
-msgid "--No lines in buffer--"
-msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: ¥³¥Þ¥ó¥É¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
-
-msgid "E471: Argument required"
-msgstr "E471: °ú¿ô¤¬É¬ÍפǤ¹"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ¤Î¸å¤Ï / ¤« ? ¤« & ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï̵¸ú¤Ç¤¹; <CR>¤Ç¼Â¹Ô, CTRL-C¤Ç¤ä¤á¤ë"
-
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥¿¥°¸¡º÷¤Ç¤Ïexrc/vimrc¤Î¥³¥Þ¥ó¥É¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while ¤Î¤Ê¤¤ :endwhile ¤¬¤¢¤ê¤Þ¤¹"
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ¤Î¤Ê¤¤ :for ¤¬¤¢¤ê¤Þ¤¹"
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹ (! ¤òÄɲäǾå½ñ)"
-
-msgid "E472: Command failed"
-msgstr "E472: ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: ̤ÃΤΥե©¥ó¥È¥»¥Ã¥È: %s"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: ̤ÃΤΥե©¥ó¥È: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: ¥Õ¥©¥ó¥È \"%s\" ¤Ï¸ÇÄêÉý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E473: Internal error"
-msgstr "E473: ÆâÉô¥¨¥é¡¼¤Ç¤¹"
-
-msgid "Interrupted"
-msgstr "³ä¹þ¤Þ¤ì¤Þ¤·¤¿"
-
-msgid "E14: Invalid address"
-msgstr "E14: ̵¸ú¤Ê¥¢¥É¥ì¥¹¤Ç¤¹"
-
-msgid "E474: Invalid argument"
-msgstr "E474: ̵¸ú¤Ê°ú¿ô¤Ç¤¹"
-
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
-
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ̵¸ú¤Ê¼°¤Ç¤¹: %s"
-
-msgid "E16: Invalid range"
-msgstr "E16: ̵¸ú¤ÊÈϰϤǤ¹"
-
-msgid "E476: Invalid command"
-msgstr "E476: ̵¸ú¤Ê¥³¥Þ¥ó¥É¤Ç¤¹"
-
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹"
-
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() ¤Î¥é¥¤¥Ö¥é¥ê¸Æ½Ð¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ¥é¥¤¥Ö¥é¥ê %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ¥Þ¡¼¥¯¤Ë̵¸ú¤Ê¹ÔÈֹ椬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤·¤¿"
-
-msgid "E20: Mark not set"
-msgstr "E20: ¥Þ¡¼¥¯¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' ¤¬¥ª¥Õ¤Ê¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ¥¹¥¯¥ê¥×¥È¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-
-msgid "E23: No alternate file"
-msgstr "E23: Éû¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: ¤½¤Î¤è¤¦¤Êû½ÌÆþÎϤϤ¢¤ê¤Þ¤»¤ó"
-
-msgid "E477: No ! allowed"
-msgstr "E477: ! ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: GUI¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ¥Ø¥Ö¥é¥¤¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ¥Ú¥ë¥·¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: ¥¢¥é¥Ó¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ¤½¤Î¤è¤¦¤Ê̾¤Î¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: ¤Þ¤À¥Æ¥­¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E30: No previous command line"
-msgstr "E30: °ÊÁ°¤Ë¥³¥Þ¥ó¥É¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E31: No such mapping"
-msgstr "E31: ¤½¤Î¤è¤¦¤Ê¥Þ¥Ã¥Ô¥ó¥°¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E479: No match"
-msgstr "E479: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-
-msgid "E32: No file name"
-msgstr "E32: ¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Àµµ¬É½¸½ÃÖ´¹¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E34: No previous command"
-msgstr "E34: ¥³¥Þ¥ó¥É¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: Àµµ¬É½¸½¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E481: No range allowed"
-msgstr "E481: ÈϰϻØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E36: Not enough room"
-msgstr "E36: ½¼Ê¬¤ÊÍÆÎ̤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: %s ¤È¤¤¤¦Ì¾Á°¤ÎÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: °ì»þ¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
-
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ¥Õ¥¡¥¤¥ë %s ¤òÆÉ¹þ¤á¤Þ¤»¤ó"
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤òÄɲäÇÊѹ¹¤òÇË´þ)"
-
-msgid "E38: Null argument"
-msgstr "E38: °ú¿ô¤¬¶õ¤Ç¤¹"
-
-msgid "E39: Number expected"
-msgstr "E39: ¿ôÃͤ¬Í׵ᤵ¤ì¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó"
-
-msgid "E233: cannot open display"
-msgstr "E233: ¥Ç¥£¥¹¥×¥ì¥¤¤ò³«¤±¤Þ¤»¤ó"
-
-msgid "E41: Out of memory!"
-msgstr "E41: ¥á¥â¥ê¤¬¿Ô¤­²Ì¤Æ¤Þ¤·¤¿!"
-
-msgid "Pattern not found"
-msgstr "¥Ñ¥¿¡¼¥ó¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ¥Ñ¥¿¡¼¥ó¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-
-msgid "E487: Argument must be positive"
-msgstr "E487: °ú¿ô¤ÏÀµ¤ÎÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ì¤Þ¤»¤ó"
-
-msgid "E42: No Errors"
-msgstr "E42: ¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E776: No location list"
-msgstr "E776: ¾ì½ê¥ê¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-msgid "E43: Damaged match string"
-msgstr "E43: ³ºÅöʸ»úÎó¤¬ÇË»¤·¤Æ¤¤¤Þ¤¹"
-
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ÉÔÀµ¤ÊÀµµ¬É½¸½¥×¥í¥°¥é¥à¤Ç¤¹"
-
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ (! ¤òÄɲäǾå½ñ¤­)"
-
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ÆÉ¼èÀìÍÑÊÑ¿ô \"%s\" ¤Ë¤ÏÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊÑ¿ô \"%s\" ¤ËÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë¤ÎÆÉ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ïµö¤µ¤ì¤Þ¤»¤ó"
-
-msgid "E523: Not allowed here"
-msgstr "E523: ¤³¤³¤Ç¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤ÎÀßÄê¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: ̵¸ú¤Ê¥¹¥¯¥í¡¼¥ëÎ̤Ǥ¹"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign ¤Î¥Ç¡¼¥¿¤òÆÉ¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º»þ¥¨¥é¡¼¤Ç¤¹"
-
-msgid "E73: tag stack empty"
-msgstr "E73: ¥¿¥°¥¹¥¿¥Ã¥¯¤¬¶õ¤Ç¤¹"
-
-msgid "E74: Command too complex"
-msgstr "E74: ¥³¥Þ¥ó¥É¤¬Ê£»¨²á¤®¤Þ¤¹"
-
-msgid "E75: Name too long"
-msgstr "E75: ̾Á°¤¬Ä¹²á¤®¤Þ¤¹"
-
-msgid "E76: Too many ["
-msgstr "E76: [ ¤¬Â¿²á¤®¤Þ¤¹"
-
-msgid "E77: Too many file names"
-msgstr "E77: ¥Õ¥¡¥¤¥ë̾¤¬Â¿²á¤®¤Þ¤¹"
-
-msgid "E488: Trailing characters"
-msgstr "E488: ;ʬ¤Êʸ»ú¤¬¸å¤í¤Ë¤¢¤ê¤Þ¤¹"
-
-msgid "E78: Unknown mark"
-msgstr "E78: ̤ÃΤΥޡ¼¥¯"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ¥ï¥¤¥ë¥É¥«¡¼¥É¤òŸ³«¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ¤Ï 'winminheight' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ¤Ï 'winminwidth' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E80: Error while writing"
-msgstr "E80: ½ñ¹þ¤ßÃæ¤Î¥¨¥é¡¼"
-
-msgid "Zero count"
-msgstr "¥¼¥í¥«¥¦¥ó¥È"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿"
-
-msgid "E449: Invalid expression received"
-msgstr "E449: ̵¸ú¤Ê¼°¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
-
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: Îΰ褬Êݸ¤ì¤Æ¤¤¤ë¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
-
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr "E744: NetBeans ¤ÏÆÉ¹þÀìÍÑ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ë¤³¤È¤òµö¤·¤Þ¤»¤ó"
-
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: ÆâÉô¥¨¥é¡¼¤Ç¤¹: %s"
-
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ¥Ñ¥¿¡¼¥ó¤¬ 'maxmempattern' °Ê¾å¤Î¥á¥â¥ê¤ò»ÈÍѤ·¤Þ¤¹"
-
-msgid "E749: empty buffer"
-msgstr "E749: ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹"
-
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ¸¡º÷¥Ñ¥¿¡¼¥ó¤«¶èÀڤ국¹æ¤¬ÉÔÀµ¤Ç¤¹"
-
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Ʊ¤¸Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬Â¾¤Î¥Ð¥Ã¥Õ¥¡¤ÇÆÉ¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹"
-
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ¥ª¥×¥·¥ç¥ó '%s' ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-msgid "E850: Invalid register name"
-msgstr "E850: ̵¸ú¤Ê¥ì¥¸¥¹¥¿Ì¾¤Ç¤¹"
-
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "²¼¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç¾å¤ËÌá¤ê¤Þ¤¹"
-
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "°Å¹æ¥­¡¼¤¬É¬ÍפǤ¹: \"%s\""
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: GUIÍÑ¤Î¥×¥í¥»¥¹¤Îµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
@@ -2404,7 +2058,7 @@
 msgstr "¥«¡¼¥½¥ë¤Î°ÌÃ֤˥ޥåÁ¤Ï¤¢¤ê¤Þ¤»¤ó, ¼¡¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹"
 
 msgid "<cannot open> "
-msgstr "<³«¤±¤Þ¤»¤ó>"
+msgstr "<³«¤±¤Þ¤»¤ó> "
 
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
@@ -2541,7 +2195,7 @@
 
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: ¥¿¥¤¥È¥ë¤¬ \"%s\" ¤Î¥¦¥£¥ó¥É¥¦¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E671: ¥¿¥¤¥È¥ë¤¬ \"%s\" ¤Î¥¦¥£¥ó¥É¥¦¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
@@ -2719,14 +2373,14 @@
 msgstr "E456: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
 
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"prolog.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"prolog.ps\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"cidfont.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"cidfont.ps\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"%s.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"%s.ps\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
@@ -2770,7 +2424,7 @@
 msgstr "E562: »ÈÍÑË¡: cstag <ident>"
 
 msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: ¥¿¥°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E257: cstag: ¥¿¥°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E563: stat(%s) error: %d"
@@ -2863,7 +2517,7 @@
 
 #, c-format
 msgid "E261: cscope connection %s not found"
-msgstr "E261: cscopeÀܳ %s ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "E261: cscopeÀܳ %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #, c-format
 msgid "cscope connection %s closed"
@@ -2941,6 +2595,9 @@
 msgid "string cannot contain newlines"
 msgstr "ʸ»úÎó¤Ë¤Ï²þ¹Ôʸ»ú¤ò´Þ¤á¤é¤ì¤Þ¤»¤ó"
 
+msgid "error converting Scheme values to Vim"
+msgstr "SchemeÃͤÎVim¤Ø¤ÎÊÑ´¹¥¨¥é¡¼"
+
 msgid "Vim error: ~a"
 msgstr "Vim ¥¨¥é¡¼: ~a"
 
@@ -2959,6 +2616,10 @@
 msgid "not allowed in the Vim sandbox"
 msgstr "¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ïµö¤µ¤ì¤Þ¤»¤ó"
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ¥é¥¤¥Ö¥é¥ê %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
 "¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹, ¤´¤á¤ó¤Ê¤µ¤¤: Perl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
@@ -2971,6 +2632,9 @@
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ¤³¤ÎVim¤Ç¤Ï :py3 ¤ò»È¤Ã¤¿¸å¤Ë :python ¤ò»È¤¨¤Þ¤»¤ó"
 
+msgid "only string keys are allowed"
+msgstr "ʸ»úÎó¤Î¥­¡¼¤Î¤ß¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2982,14 +2646,11 @@
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ¤òºÆµ¢Åª¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: ¼°É¾²Á¤ÏÍ­¸ú¤Êpython¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤»¤ó¤Ç¤·¤¿"
 
-msgid "softspace must be an integer"
-msgstr "softspace ¤Ï integer ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "invalid attribute"
-msgstr "̵¸ú¤Ê°À­¤Ç¤¹"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: ÊÖ¤µ¤ì¤¿python¥ª¥Ö¥¸¥§¥¯¥È¤òvim¤ÎÃͤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #, c-format
 msgid "<buffer object (deleted) at %p>"
@@ -2998,6 +2659,12 @@
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: ¤³¤ÎVim¤Ç¤Ï :python ¤ò»È¤Ã¤¿¸å¤Ë :py3 ¤ò»È¤¨¤Þ¤»¤ó"
 
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: ¼°É¾²Á¤ÏÍ­¸ú¤Êpython 3¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: ÊÖ¤µ¤ì¤¿python 3¥ª¥Ö¥¸¥§¥¯¥È¤òvim¤ÎÃͤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ ¤Ïʸ»úÎó¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
@@ -3054,7 +2721,7 @@
 msgstr "¼¡¤Î¥½¡¼¥¹¤òɽ¼¨¤¹¤ë"
 
 msgid "Find symbol"
-msgstr "¤ß¤Ä¤±¤¿¥·¥ó¥Ü¥ë"
+msgstr "¸«¤Ä¤±¤¿¥·¥ó¥Ü¥ë"
 
 msgid "Browse class"
 msgstr "¥¯¥é¥¹¤ò»²¾È"
@@ -3145,7 +2812,7 @@
 msgstr "Èϰϳ°¤Î¹ÔÈÖ¹æ¤Ç¤¹"
 
 msgid "unknown flag: "
-msgstr "̤ÃΤΥե饰:"
+msgstr "̤ÃΤΥե饰: "
 
 msgid "unknown vimOption"
 msgstr "̤ÃΤΠvimOption ¤Ç¤¹"
@@ -3175,7 +2842,7 @@
 
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
-"¥³¡¼¥ë¥Ð¥Ã¥¯¥³¥Þ¥ó¥É¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó: ¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦¤Î»²¾È¤¬¤ß¤Ä¤«¤ê¤Þ¤»"
+"¥³¡¼¥ë¥Ð¥Ã¥¯¥³¥Þ¥ó¥É¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó: ¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦¤Î»²¾È¤¬¸«¤Ä¤«¤ê¤Þ¤»"
 "¤ó"
 
 msgid ""
@@ -3290,7 +2957,7 @@
 "»ÈÍÑË¡:"
 
 msgid " vim [arguments] "
-msgstr " vim [°ú¿ô]"
+msgstr " vim [°ú¿ô] "
 
 msgid ""
 "\n"
@@ -3670,7 +3337,7 @@
 "# ¥Õ¥¡¥¤¥ëÆâ¥Þ¡¼¥¯¤ÎÍúÎò (¿·¤·¤¤¤â¤Î¤«¤é¸Å¤¤¤â¤Î):\n"
 
 msgid "Missing '>'"
-msgstr "'>' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "'>' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E543: Not a valid codepage"
 msgstr "E543: ̵¸ú¤Ê¥³¡¼¥É¥Ú¡¼¥¸¤Ç¤¹"
@@ -3739,7 +3406,7 @@
 
 #, c-format
 msgid "E305: No swap file found for %s"
-msgstr "E305: %s ¤Ë¤Ï¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E305: %s ¤Ë¤Ï¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "»ÈÍѤ¹¤ë¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(0 ¤Ç½ªÎ»): "
@@ -4013,7 +3680,7 @@
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ¹Ô %ld ¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E316: ml_get: ¹Ô %ld ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ 3"
@@ -4032,7 +3699,7 @@
 
 #, c-format
 msgid "E320: Cannot find line %ld"
-msgstr "E320: ¹Ô %ld ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E320: ¹Ô %ld ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
@@ -4196,7 +3863,7 @@
 
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: ¥á¥Ë¥å¡¼¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E334: ¥á¥Ë¥å¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E335: Menu not defined for %s mode"
@@ -4206,7 +3873,7 @@
 msgstr "E336: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥µ¥Ö¥á¥Ë¥å¡¼¤òÀ¸¤¸¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: ¥á¥Ë¥å¡¼¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó - ¥á¥Ë¥å¡¼Ì¾¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "E337: ¥á¥Ë¥å¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó - ¥á¥Ë¥å¡¼Ì¾¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤"
 
 #, c-format
 msgid "Error detected while processing %s:"
@@ -4430,6 +4097,7 @@
 msgid "E511: netbeans already connected"
 msgstr "E511: NetBeans¤Ï´û¤ËÀܳ¤·¤Æ¤¤¤Þ¤¹"
 
+#, c-format
 msgid "E505: %s is read-only (add ! to override)"
 msgstr "E505: %s ¤ÏÆÉ¹þÀìÍѤǤ¹ (¶¯À©½ñ¹þ¤Ë¤Ï ! ¤òÄɲÃ)"
 
@@ -4484,11 +4152,11 @@
 msgstr "%ld ¹Ô¤¬¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤Þ¤¹... "
 
 msgid "1 line indented "
-msgstr "1 ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿"
+msgstr "1 ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿ "
 
 #, c-format
 msgid "%ld lines indented "
-msgstr "%ld ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿"
+msgstr "%ld ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿ "
 
 msgid "E748: No previously used register"
 msgstr "E748: ¤Þ¤À¥ì¥¸¥¹¥¿¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó"
@@ -4599,7 +4267,7 @@
 msgstr "E521: = ¤Î¸å¤Ë¤Ï¿ô»ú¤¬É¬ÍפǤ¹"
 
 msgid "E522: Not found in termcap"
-msgstr "E522: termcap Æâ¤Ë¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E522: termcap Æâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E539: Illegal character <%s>"
@@ -4973,7 +4641,7 @@
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"VIMRUN.EXE¤¬ $PATH ¤ÎÃæ¤Ë¤ß¤Ä¤«¤ê¤Þ¤»¤ó.\n"
+"VIMRUN.EXE¤¬ $PATH ¤ÎÃæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó.\n"
 "³°Éô¥³¥Þ¥ó¥É¤Î½ªÎ»¸å¤Ë°ì»þÄä»ß¤ò¤·¤Þ¤»¤ó.\n"
 "¾ÜºÙ¤Ï  :help win32-vimrun  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤."
 
@@ -5208,11 +4876,11 @@
 
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ¾å¤Þ¤Ç¸¡º÷¤·¤¿¤±¤ì¤É³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+msgstr "E384: ¾å¤Þ¤Ç¸¡º÷¤·¤Þ¤·¤¿¤¬³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ²¼¤Þ¤Ç¸¡º÷¤·¤¿¤±¤ì¤É³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+msgstr "E385: ²¼¤Þ¤Ç¸¡º÷¤·¤Þ¤·¤¿¤¬³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' ¤Î¤¢¤È¤Ë¤Ï '?' ¤« '/' ¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë"
@@ -5222,10 +4890,10 @@
 
 #. cursor at status line
 msgid "--- Included files "
-msgstr "--- ¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë"
+msgstr "--- ¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë "
 
 msgid "not found "
-msgstr "¤ß¤Ä¤«¤ê¤Þ¤»¤ó "
+msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó "
 
 msgid "in path ---\n"
 msgstr "¥Ñ¥¹¤Ë ----\n"
@@ -5234,7 +4902,7 @@
 msgstr "  (´û¤ËÎóµó)"
 
 msgid "  NOT FOUND"
-msgstr "  ¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "  ¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "Scanning included file: %s"
@@ -5248,16 +4916,16 @@
 msgstr "E387: ¸½ºß¹Ô¤Ë³ºÅö¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "All included files were found"
-msgstr "Á´¤Æ¤Î¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤·¤¿"
+msgstr "Á´¤Æ¤Î¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
 msgid "No included files"
 msgstr "¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E388: Couldn't find definition"
-msgstr "E388: ÄêµÁ¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E388: ÄêµÁ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 msgid "E389: Couldn't find pattern"
-msgstr "E389: ¥Ñ¥¿¡¼¥ó¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E389: ¥Ñ¥¿¡¼¥ó¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 msgid "Substitute "
 msgstr "Substitute "
@@ -5480,7 +5148,7 @@
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
-msgstr "%s ¤Î %d ¹ÔÌÜ¤Ç ½Åʣñ¸ì¤¬¤ß¤Ä¤«¤ê¤Þ¤·¤¿: %s"
+msgstr "%s ¤Î %d ¹ÔÌÜ¤Ç ½Åʣñ¸ì¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿: %s"
 
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
@@ -5620,7 +5288,7 @@
 
 #, c-format
 msgid "E753: Not found: %s"
-msgstr "E753: ¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E753: ¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
@@ -5696,10 +5364,10 @@
 msgstr "E392: ¤½¤Î¤è¤¦¤Ê¹½Ê¸¥¯¥é¥¹¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
 msgid "minimal "
-msgstr "minimal"
+msgstr "minimal "
 
 msgid "maximal "
-msgstr "maximal"
+msgstr "maximal "
 
 msgid "; match "
 msgstr "; ³ºÅö "
@@ -5718,7 +5386,7 @@
 
 #, c-format
 msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s ¤ÎÈϰÏÍ×ÁǤ¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E394: %s ¤ÎÈϰÏÍ×ÁǤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E397: Filename required"
 msgstr "E397: ¥Õ¥¡¥¤¥ë̾¤¬É¬ÍפǤ¹"
@@ -5746,7 +5414,7 @@
 
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: ¥Ñ¥¿¡¼¥ó¶èÀڤ꤬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E401: ¥Ñ¥¿¡¼¥ó¶èÀڤ꤬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E402: Garbage after pattern: %s"
@@ -5788,7 +5456,7 @@
 
 #, c-format
 msgid "E411: highlight group not found: %s"
-msgstr "E411: ¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E411: ¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -5858,7 +5526,7 @@
 
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: ¥¿¥°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
+msgstr "E426: ¥¿¥°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
@@ -5927,10 +5595,10 @@
 msgstr "E433: ¥¿¥°¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E434: Can't find tag pattern"
-msgstr "E434: ¥¿¥°¥Ñ¥¿¡¼¥ó¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E434: ¥¿¥°¥Ñ¥¿¡¼¥ó¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ¥¿¥°¤ò¤ß¤Ä¤±¤é¤ì¤Ê¤¤¤Î¤Çñ¤Ë¿ä¬¤·¤Þ¤¹!"
+msgstr "E435: ¥¿¥°¤ò¸«¤Ä¤±¤é¤ì¤Ê¤¤¤Î¤Çñ¤Ë¿ä¬¤·¤Þ¤¹!"
 
 #, c-format
 msgid "Duplicate field name: %s"
@@ -5946,10 +5614,10 @@
 msgstr "E557: termcap¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
 
 msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfo¤ËüËö¥¨¥ó¥È¥ê¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E558: terminfo¤ËüËö¥¨¥ó¥È¥ê¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcap¤ËüËö¥¨¥ó¥È¥ê¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
+msgstr "E559: termcap¤ËüËö¥¨¥ó¥È¥ê¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
@@ -6061,7 +5729,7 @@
 
 #, c-format
 msgid "E830: Undo number %ld not found"
-msgstr "E830: ¥¢¥ó¥É¥¥ÈÖ¹æ %ld ¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "E830: ¥¢¥ó¥É¥¥ÈÖ¹æ %ld ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: ¹ÔÈֹ椬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
@@ -6396,7 +6064,7 @@
 msgstr "¥â¡¼¥É̵¤Ç¼Â¹ÔÃæ, ¥¿¥¤¥×¤·¤¿Ê¸»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹"
 
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-msgstr "¥á¥Ë¥å¡¼¤Î ÊÔ½¸¢ªÁ´ÂÎÀßÄꢪÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ"
+msgstr "¥á¥Ë¥å¡¼¤Î ÊÔ½¸¢ªÁ´ÂÎÀßÄꢪÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ "
 
 msgid "                              for two modes      "
 msgstr "                              ¤Ç¥â¡¼¥ÉÍ­¤Ë       "
@@ -6458,3 +6126,486 @@
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "Edit with &multiple Vims"
+msgstr "Ê£¿ô¤ÎVim¤ÇÊÔ½¸¤¹¤ë (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1¤Ä¤ÎVim¤ÇÊÔ½¸¤¹¤ë (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vim¤Çº¹Ê¬¤òɽ¼¨¤¹¤ë"
+
+msgid "Edit with &Vim"
+msgstr "Vim¤ÇÊÔ½¸¤¹¤ë (&V)"
+
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "µ¯Æ°ºÑ¤ÎVim¤ÇÊÔ½¸¤¹¤ë - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "ÁªÂò¤·¤¿¥Õ¥¡¥¤¥ë¤òVim¤ÇÊÔ½¸¤¹¤ë"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "¥×¥í¥»¥¹¤ÎºîÀ®¤Ë¼ºÇÔ: gvim¤¬´Ä¶­ÊÑ¿ôPATH¾å¤Ë¤¢¤ë¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll ¥¨¥é¡¼"
+
+msgid "Path length too long!"
+msgstr "¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹!"
+
+msgid "--No lines in buffer--"
+msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
+
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: ¥³¥Þ¥ó¥É¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
+
+msgid "E471: Argument required"
+msgstr "E471: °ú¿ô¤¬É¬ÍפǤ¹"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ ¤Î¸å¤Ï / ¤« ? ¤« & ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï̵¸ú¤Ç¤¹; <CR>¤Ç¼Â¹Ô, CTRL-C¤Ç¤ä¤á¤ë"
+
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥¿¥°¸¡º÷¤Ç¤Ïexrc/vimrc¤Î¥³¥Þ¥ó¥É¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
+
+msgid "E171: Missing :endif"
+msgstr "E171: :endif ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while ¤Î¤Ê¤¤ :endwhile ¤¬¤¢¤ê¤Þ¤¹"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ¤Î¤Ê¤¤ :for ¤¬¤¢¤ê¤Þ¤¹"
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹ (! ¤òÄɲäǾå½ñ)"
+
+msgid "E472: Command failed"
+msgstr "E472: ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: ̤ÃΤΥե©¥ó¥È¥»¥Ã¥È: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: ̤ÃΤΥե©¥ó¥È: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ¥Õ¥©¥ó¥È \"%s\" ¤Ï¸ÇÄêÉý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E473: Internal error"
+msgstr "E473: ÆâÉô¥¨¥é¡¼¤Ç¤¹"
+
+msgid "Interrupted"
+msgstr "³ä¹þ¤Þ¤ì¤Þ¤·¤¿"
+
+msgid "E14: Invalid address"
+msgstr "E14: ̵¸ú¤Ê¥¢¥É¥ì¥¹¤Ç¤¹"
+
+msgid "E474: Invalid argument"
+msgstr "E474: ̵¸ú¤Ê°ú¿ô¤Ç¤¹"
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: ̵¸ú¤Ê¼°¤Ç¤¹: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: ̵¸ú¤ÊÈϰϤǤ¹"
+
+msgid "E476: Invalid command"
+msgstr "E476: ̵¸ú¤Ê¥³¥Þ¥ó¥É¤Ç¤¹"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() ¤Î¥é¥¤¥Ö¥é¥ê¸Æ½Ð¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: ¥Þ¡¼¥¯¤Ë̵¸ú¤Ê¹ÔÈֹ椬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤·¤¿"
+
+msgid "E20: Mark not set"
+msgstr "E20: ¥Þ¡¼¥¯¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' ¤¬¥ª¥Õ¤Ê¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: ¥¹¥¯¥ê¥×¥È¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+msgid "E23: No alternate file"
+msgstr "E23: Éû¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: ¤½¤Î¤è¤¦¤Êû½ÌÆþÎϤϤ¢¤ê¤Þ¤»¤ó"
+
+msgid "E477: No ! allowed"
+msgstr "E477: ! ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUI¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: ¥Ø¥Ö¥é¥¤¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: ¥Ú¥ë¥·¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ¥¢¥é¥Ó¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: ¤½¤Î¤è¤¦¤Ê̾¤Î¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: ¤Þ¤À¥Æ¥­¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E30: No previous command line"
+msgstr "E30: °ÊÁ°¤Ë¥³¥Þ¥ó¥É¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E31: No such mapping"
+msgstr "E31: ¤½¤Î¤è¤¦¤Ê¥Þ¥Ã¥Ô¥ó¥°¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E479: No match"
+msgstr "E479: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
+
+msgid "E32: No file name"
+msgstr "E32: ¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Àµµ¬É½¸½ÃÖ´¹¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E34: No previous command"
+msgstr "E34: ¥³¥Þ¥ó¥É¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: Àµµ¬É½¸½¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E481: No range allowed"
+msgstr "E481: ÈϰϻØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E36: Not enough room"
+msgstr "E36: ¥¦¥£¥ó¥É¥¦¤Ë½½Ê¬¤Ê¹â¤µ¤â¤·¤¯¤ÏÉý¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s ¤È¤¤¤¦Ì¾Á°¤ÎÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: °ì»þ¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ¥Õ¥¡¥¤¥ë %s ¤òÆÉ¹þ¤á¤Þ¤»¤ó"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤òÄɲäÇÊѹ¹¤òÇË´þ)"
+
+msgid "E38: Null argument"
+msgstr "E38: °ú¿ô¤¬¶õ¤Ç¤¹"
+
+msgid "E39: Number expected"
+msgstr "E39: ¿ôÃͤ¬Í׵ᤵ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó"
+
+msgid "E233: cannot open display"
+msgstr "E233: ¥Ç¥£¥¹¥×¥ì¥¤¤ò³«¤±¤Þ¤»¤ó"
+
+msgid "E41: Out of memory!"
+msgstr "E41: ¥á¥â¥ê¤¬¿Ô¤­²Ì¤Æ¤Þ¤·¤¿!"
+
+msgid "Pattern not found"
+msgstr "¥Ñ¥¿¡¼¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: ¥Ñ¥¿¡¼¥ó¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: °ú¿ô¤ÏÀµ¤ÎÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ì¤Þ¤»¤ó"
+
+msgid "E42: No Errors"
+msgstr "E42: ¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E776: No location list"
+msgstr "E776: ¾ì½ê¥ê¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E43: Damaged match string"
+msgstr "E43: ³ºÅöʸ»úÎó¤¬ÇË»¤·¤Æ¤¤¤Þ¤¹"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: ÉÔÀµ¤ÊÀµµ¬É½¸½¥×¥í¥°¥é¥à¤Ç¤¹"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ (! ¤òÄɲäǾå½ñ¤­)"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ÆÉ¼èÀìÍÑÊÑ¿ô \"%s\" ¤Ë¤ÏÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊÑ¿ô \"%s\" ¤ËÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë¤ÎÆÉ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ïµö¤µ¤ì¤Þ¤»¤ó"
+
+msgid "E523: Not allowed here"
+msgstr "E523: ¤³¤³¤Ç¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤ÎÀßÄê¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: ̵¸ú¤Ê¥¹¥¯¥í¡¼¥ëÎ̤Ǥ¹"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign ¤Î¥Ç¡¼¥¿¤òÆÉ¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º»þ¥¨¥é¡¼¤Ç¤¹"
+
+msgid "E73: tag stack empty"
+msgstr "E73: ¥¿¥°¥¹¥¿¥Ã¥¯¤¬¶õ¤Ç¤¹"
+
+msgid "E74: Command too complex"
+msgstr "E74: ¥³¥Þ¥ó¥É¤¬Ê£»¨²á¤®¤Þ¤¹"
+
+msgid "E75: Name too long"
+msgstr "E75: ̾Á°¤¬Ä¹²á¤®¤Þ¤¹"
+
+msgid "E76: Too many ["
+msgstr "E76: [ ¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E77: Too many file names"
+msgstr "E77: ¥Õ¥¡¥¤¥ë̾¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E488: Trailing characters"
+msgstr "E488: ;ʬ¤Êʸ»ú¤¬¸å¤í¤Ë¤¢¤ê¤Þ¤¹"
+
+msgid "E78: Unknown mark"
+msgstr "E78: ̤ÃΤΥޡ¼¥¯"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ¥ï¥¤¥ë¥É¥«¡¼¥É¤òŸ³«¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ¤Ï 'winminheight' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ¤Ï 'winminwidth' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E80: Error while writing"
+msgstr "E80: ½ñ¹þ¤ßÃæ¤Î¥¨¥é¡¼"
+
+msgid "Zero count"
+msgstr "¥¼¥í¥«¥¦¥ó¥È"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: ̵¸ú¤Ê¼°¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Îΰ褬Êݸ¤ì¤Æ¤¤¤ë¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ¤ÏÆÉ¹þÀìÍÑ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ë¤³¤È¤òµö¤·¤Þ¤»¤ó"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ÆâÉô¥¨¥é¡¼¤Ç¤¹: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ¥Ñ¥¿¡¼¥ó¤¬ 'maxmempattern' °Ê¾å¤Î¥á¥â¥ê¤ò»ÈÍѤ·¤Þ¤¹"
+
+msgid "E749: empty buffer"
+msgstr "E749: ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ¸¡º÷¥Ñ¥¿¡¼¥ó¤«¶èÀڤ국¹æ¤¬ÉÔÀµ¤Ç¤¹"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Ʊ¤¸Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬Â¾¤Î¥Ð¥Ã¥Õ¥¡¤ÇÆÉ¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ¥ª¥×¥·¥ç¥ó '%s' ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "E850: Invalid register name"
+msgstr "E850: ̵¸ú¤Ê¥ì¥¸¥¹¥¿Ì¾¤Ç¤¹"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "²¼¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç¾å¤ËÌá¤ê¤Þ¤¹"
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "°Å¹æ¥­¡¼¤¬É¬ÍפǤ¹: \"%s\""
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+
+msgid "softspace must be an integer"
+msgstr "softspace ¤Ï integer ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "invalid attribute"
+msgstr "̵¸ú¤Ê°À­¤Ç¤¹"
+
+msgid "writelines() requires list of strings"
+msgstr "writelines() ¤Ë¤Ïʸ»úÎó¤Î¥ê¥¹¥È¤¬É¬ÍפǤ¹"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/O¥ª¥Ö¥¸¥§¥¯¥È¤Î½é´ü²½¥¨¥é¡¼"
+
+msgid "no such buffer"
+msgstr "¤½¤Î¤è¤¦¤Ê¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "empty keys are not allowed"
+msgstr "¶õ¤Î¥­¡¼¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "failed to add key to dictionary"
+msgstr "¼­½ñ¤Ø¤Î¥­¡¼¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "DictionaryObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "¸ÇÄꤵ¤ì¤¿¼­½ñ¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "Only boolean objects are allowed"
+msgstr "boolean¥ª¥Ö¥¸¥§¥¯¥È¤À¤±¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "Cannot set this attribute"
+msgstr "¤³¤Î°À­¤ÏÀßÄê¤Ç¤­¤Þ¤»¤ó"
+
+msgid "no such key in dictionary"
+msgstr "¼­½ñ¤Ë¤½¤Î¤è¤¦¤Ê¥­¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "dict is locked"
+msgstr "¼­½ñ¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "internal error: failed to get vim list item"
+msgstr "ÆâÉô¥¨¥é¡¼: vim¤Î¥ê¥¹¥ÈÍ×ÁǤμèÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "list is locked"
+msgstr "¥ê¥¹¥È¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "Failed to add item to list"
+msgstr "¥ê¥¹¥È¤Ø¤ÎÍ×ÁÇÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "internal error: no vim list item"
+msgstr "ÆâÉô¥¨¥é¡¼: vim¤Î¥ê¥¹¥ÈÍ×ÁǤ¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "can only assign lists to slice"
+msgstr "¥¹¥é¥¤¥¹¤Ë¤Ï¥ê¥¹¥È¤À¤±¤¬ÂåÆþ¤Ç¤­¤Þ¤¹"
+
+msgid "internal error: failed to add item to list"
+msgstr "ÆâÉô¥¨¥é¡¼: ¥ê¥¹¥È¤Ø¤ÎÍ×ÁÇÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "can only concatenate with lists"
+msgstr "¥ê¥¹¥È¤È¤Î¤ßÀܳ¤Ç¤­¤Þ¤¹"
+
+msgid "Cannot modify fixed list"
+msgstr "¸ÇÄꤵ¤ì¤¿¥ê¥¹¥È¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "'self' argument must be a dictionary"
+msgstr "'self' °ú¿ô¤Ï¼­½ñ·¿¤ÎÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "failed to run function"
+msgstr "´Ø¿ô¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "attempt to refer to deleted window"
+msgstr "ºï½ü¤µ¤ì¤¿¥¦¥£¥ó¥É¥¦¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
+
+msgid "readonly attribute"
+msgstr "ÆÉ¹þÀìÍѰÀ­"
+
+msgid "cursor position outside buffer"
+msgstr "¥«¡¼¥½¥ë°ÌÃÖ¤¬¥Ð¥Ã¥Õ¥¡¤Î³°Â¦¤Ç¤¹"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<¥¦¥£¥ó¥É¥¦¥ª¥Ö¥¸¥§¥¯¥È (¾ÃµîºÑ¤ß) %p>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<¥¦¥£¥ó¥É¥¦¥ª¥Ö¥¸¥§¥¯¥È (ÉÔÌÀ) %p>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<¥¦¥£¥ó¥É¥¦ %d>"
+
+msgid "no such window"
+msgstr "¤½¤Î¤è¤¦¤Ê¥¦¥£¥ó¥É¥¦¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "ºï½ü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
+
+msgid "unable to convert to vim structure"
+msgstr "vim¤Î¹½Â¤ÂΤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
+
+msgid "NULL reference passed"
+msgstr "NULL»²¾È¤¬ÅϤµ¤ì¤Þ¤·¤¿"
+
+msgid "internal error: invalid value type"
+msgstr "ÆâÉô¥¨¥é¡¼: ̵¸ú¤ÊÃÍ·¿¤Ç¤¹"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 391e56e..bc2ee90 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,7 +3,7 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Last Change: 15-Jun-2012.
+# Last Change: 24-Feb-2013.
 #
 # Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,11 @@
 msgstr ""
 "Project-Id-Version: Vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-15 08:50+0900\n"
-"PO-Revision-Date: 2012-06-15 09:45+0900\n"
+"POT-Creation-Date: 2013-02-24 12:38+0900\n"
+"PO-Revision-Date: 2013-02-24 13:30+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp932\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -109,7 +110,7 @@
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: ƒoƒbƒtƒ@ %ld ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E92: ƒoƒbƒtƒ@ %ld ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -234,7 +235,7 @@
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: ƒoƒbƒtƒ@ \"%s\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E102: ƒoƒbƒtƒ@ \"%s\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
@@ -247,7 +248,7 @@
 msgstr "E104: ‡Žš‚ÉEscape‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ"
 
 msgid "E544: Keymap file not found"
-msgstr "E544: ƒL[ƒ}ƒbƒvƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E544: ƒL[ƒ}ƒbƒvƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source ‚Ŏ捞‚Þƒtƒ@ƒCƒ‹ˆÈŠO‚Å‚Í :loadkeymap ‚ðŽg‚¦‚Ü‚¹‚ñ"
@@ -369,7 +370,7 @@
 msgstr "E121: –¢’è‹`‚̕ϐ”‚Å‚·: %s"
 
 msgid "E111: Missing ']'"
-msgstr "E111: ']' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E111: ']' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E686: Argument of %s must be a List"
@@ -489,7 +490,7 @@
 msgstr "E804: '%' ‚ð•‚“®¬”“_”‚Æ‘g‚ݍ‡‚킹‚Ă͎g‚¦‚Ü‚¹‚ñ"
 
 msgid "E110: Missing ')'"
-msgstr "E110: ')' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E110: ')' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ŠÖ”ŽQÆŒ^‚̓Cƒ“ƒfƒbƒNƒX‚Å‚«‚Ü‚¹‚ñ"
@@ -596,7 +597,7 @@
 
 #, c-format
 msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld s:"
+msgstr "+-%s%3ld s: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
@@ -727,10 +728,14 @@
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
 
+msgid "E862: Cannot use g: here"
+msgstr "E862: ‚±‚±‚Å‚Í g: ‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: •s³‚Ȉø”‚Å‚·: %s"
 
+#, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: ˆø”–¼‚ªd•¡‚µ‚Ä‚¢‚Ü‚·: %s"
 
@@ -960,7 +965,7 @@
 msgstr "%s ‚É’uŠ·‚µ‚Ü‚·‚©? (y/n/a/q/l/^E/^Y)"
 
 msgid "(Interrupted) "
-msgstr "(Š„ž‚Ü‚ê‚Ü‚µ‚½)"
+msgstr "(Š„ž‚Ü‚ê‚Ü‚µ‚½) "
 
 msgid "1 match"
 msgstr "1 ‰ÓŠŠY“–‚µ‚Ü‚µ‚½"
@@ -991,7 +996,7 @@
 
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "ƒpƒ^[ƒ“‚ª‘S‚Ă̍s‚ł݂‚©‚è‚Ü‚µ‚½: %s"
+msgstr "ƒpƒ^[ƒ“‚ª‘S‚Ă̍s‚ÅŒ©‚‚©‚è‚Ü‚µ‚½: %s"
 
 msgid ""
 "\n"
@@ -1015,7 +1020,7 @@
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "Žc”O‚Å‚·‚ªƒwƒ‹ƒvƒtƒ@ƒCƒ‹ \"%s\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "Žc”O‚Å‚·‚ªƒwƒ‹ƒvƒtƒ@ƒCƒ‹ \"%s\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E150: Not a directory: %s"
@@ -1069,7 +1074,7 @@
 
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
-msgstr "  (‚݂‚©‚è‚Ü‚¹‚ñ)"
+msgstr "  (Œ©‚‚©‚è‚Ü‚¹‚ñ)"
 
 msgid " (not supported)"
 msgstr " (”ñƒTƒ|[ƒg)"
@@ -1094,7 +1099,7 @@
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E161: ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 msgid "No breakpoints defined"
 msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
@@ -1143,7 +1148,7 @@
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ‚Ì’†‚ɂ݂͂‚©‚è‚Ü‚¹‚ñ: \"%s\""
+msgstr "'runtimepath' ‚Ì’†‚ɂ͌©‚‚©‚è‚Ü‚¹‚ñ: \"%s\""
 
 msgid "Source Vim script"
 msgstr "VimƒXƒNƒŠƒvƒg‚̎捞‚Ý"
@@ -1317,8 +1322,8 @@
 msgstr "•s–¾"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ƒJƒ‰[ƒXƒL[ƒ€ %s ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: ƒJƒ‰[ƒXƒL[ƒ€ '%s' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "Greetings, Vim user!"
 msgstr "Vim Žg‚¢‚³‚ñA‚â‚ !"
@@ -1669,7 +1674,7 @@
 msgstr "[“ǍžƒGƒ‰[]"
 
 msgid "Can't find temp file for conversion"
-msgstr "•ÏŠ·‚É•K—v‚Ȉꎞƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "•ÏŠ·‚É•K—v‚Ȉꎞƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' ‚É‚æ‚é•ÏŠ·‚ªŽ¸”s‚µ‚Ü‚µ‚½"
@@ -1725,7 +1730,7 @@
 msgstr "E460: ƒŠƒ\\[ƒXƒtƒH[ƒN‚ªŽ¸‚í‚ê‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§)"
 
 msgid "E214: Can't find temp file for writing"
-msgstr "E214: •Û‘¶—pˆêŽžƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E214: •Û‘¶—pˆêŽžƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: •ÏŠ·‚Å‚«‚Ü‚¹‚ñ (! ‚ð’ljÁ‚ŕϊ·‚¹‚¸‚ɕۑ¶)"
@@ -1950,7 +1955,7 @@
 
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <ƒoƒbƒtƒ@=%d>: –³Œø‚ȃoƒbƒtƒ@”ԍ†‚Å‚·"
+msgstr "E680: <ƒoƒbƒtƒ@=%d>: –³Œø‚ȃoƒbƒtƒ@”ԍ†‚Å‚· "
 
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: ‘S‚ẴCƒxƒ“ƒg‚ɑ΂µ‚Ä‚Ìautocommand‚ÍŽÀs‚Å‚«‚Ü‚¹‚ñ"
@@ -1990,7 +1995,7 @@
 
 #, c-format
 msgid "+--%3ld lines folded "
-msgstr "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½"
+msgstr "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½ "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: “Ǎžƒoƒbƒtƒ@‚֒ljÁ"
@@ -2015,365 +2020,14 @@
 msgstr "E227: %s ‚Æ‚¢‚¤ƒ}ƒbƒsƒ“ƒO‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
 
 msgid "No abbreviation found"
-msgstr "’Zk“ü—݂͂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
+msgstr "’Zk“ü—͂͌©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
 
 msgid "No mapping found"
-msgstr "ƒ}ƒbƒsƒ“ƒO‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
+msgstr "ƒ}ƒbƒsƒ“ƒO‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
 
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: •s³‚ȃ‚[ƒh"
 
-msgid "--No lines in buffer--"
-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.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: ƒRƒ}ƒ“ƒh‚ª’†’f‚³‚ê‚Ü‚µ‚½"
-
-msgid "E471: Argument required"
-msgstr "E471: ˆø”‚ª•K—v‚Å‚·"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ‚ÌŒã‚Í / ‚© ? ‚© & ‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚ł͖³Œø‚Å‚·; <CR>‚ÅŽÀs, CTRL-C‚Å‚â‚ß‚é"
-
-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‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
-
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while ‚̂Ȃ¢ :endwhile ‚ª‚ ‚è‚Ü‚·"
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ‚̂Ȃ¢ :for ‚ª‚ ‚è‚Ü‚·"
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚· (! ‚ð’ljÁ‚ŏ㏑)"
-
-msgid "E472: Command failed"
-msgstr "E472: ƒRƒ}ƒ“ƒh‚ªŽ¸”s‚µ‚Ü‚µ‚½"
-
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: –¢’m‚̃tƒHƒ“ƒgƒZƒbƒg: %s"
-
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: –¢’m‚̃tƒHƒ“ƒg: %s"
-
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: ƒtƒHƒ“ƒg \"%s\" ‚͌Œ蕝‚ł͂ ‚è‚Ü‚¹‚ñ"
-
-msgid "E473: Internal error"
-msgstr "E473: “à•”ƒGƒ‰[‚Å‚·"
-
-msgid "Interrupted"
-msgstr "Š„ž‚Ü‚ê‚Ü‚µ‚½"
-
-msgid "E14: Invalid address"
-msgstr "E14: –³Œø‚ȃAƒhƒŒƒX‚Å‚·"
-
-msgid "E474: Invalid argument"
-msgstr "E474: –³Œø‚Ȉø”‚Å‚·"
-
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: –³Œø‚Ȉø”‚Å‚·: %s"
-
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: –³Œø‚ÈŽ®‚Å‚·: %s"
-
-msgid "E16: Invalid range"
-msgstr "E16: –³Œø‚Ȕ͈͂ł·"
-
-msgid "E476: Invalid command"
-msgstr "E476: –³Œø‚ȃRƒ}ƒ“ƒh‚Å‚·"
-
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" ‚̓fƒBƒŒƒNƒgƒŠ‚Å‚·"
-
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() ‚̃‰ƒCƒuƒ‰ƒŠŒÄo‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: ƒ‰ƒCƒuƒ‰ƒŠ‚̊֐” %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ƒ}[ƒN‚É–³Œø‚ȍs”ԍ†‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚µ‚½"
-
-msgid "E20: Mark not set"
-msgstr "E20: ƒ}[ƒN‚͐ݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' ‚ªƒIƒt‚Ȃ̂Å, •ύX‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ƒXƒNƒŠƒvƒg‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-
-msgid "E23: No alternate file"
-msgstr "E23: •›ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: ‚»‚̂悤‚È’Zk“ü—͂͂ ‚è‚Ü‚¹‚ñ"
-
-msgid "E477: No ! allowed"
-msgstr "E477: ! ‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: GUI‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·"
-
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ƒwƒuƒ‰ƒCŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ƒyƒ‹ƒVƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: ƒAƒ‰ƒrƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ‚»‚̂悤‚È–¼‚̃nƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: ‚Ü‚¾ƒeƒLƒXƒg‚ª‘}“ü‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E30: No previous command line"
-msgstr "E30: ˆÈ‘O‚ɃRƒ}ƒ“ƒhs‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E31: No such mapping"
-msgstr "E31: ‚»‚̂悤‚ȃ}ƒbƒsƒ“ƒO‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E479: No match"
-msgstr "E479: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-
-msgid "E32: No file name"
-msgstr "E32: ƒtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ³‹K•\\Œ»’uŠ·‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E34: No previous command"
-msgstr "E34: ƒRƒ}ƒ“ƒh‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: ³‹K•\\Œ»‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E481: No range allowed"
-msgstr "E481: ”͈͎w’è‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E36: Not enough room"
-msgstr "E36: [•ª‚È—e—Ê‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: %s ‚Æ‚¢‚¤–¼‘O‚Ì“o˜^‚³‚ꂽƒT[ƒo‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ƒtƒ@ƒCƒ‹ %s ‚ðì¬‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: ˆêŽžƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ƒtƒ@ƒCƒ‹ %s ‚ð“Ǎž‚߂܂¹‚ñ"
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ÅŒã‚̕ύX‚ª•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚ð’ljÁ‚ŕύX‚ð”jŠü)"
-
-msgid "E38: Null argument"
-msgstr "E38: ˆø”‚ª‹ó‚Å‚·"
-
-msgid "E39: Number expected"
-msgstr "E39: ”’l‚ª—v‹‚³‚ê‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: ƒGƒ‰[ƒtƒ@ƒCƒ‹ %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-
-msgid "E233: cannot open display"
-msgstr "E233: ƒfƒBƒXƒvƒŒƒC‚ðŠJ‚¯‚Ü‚¹‚ñ"
-
-msgid "E41: Out of memory!"
-msgstr "E41: ƒƒ‚ƒŠ‚ªs‚«‰Ê‚Ă܂µ‚½!"
-
-msgid "Pattern not found"
-msgstr "ƒpƒ^[ƒ“‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ƒpƒ^[ƒ“‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
-
-msgid "E487: Argument must be positive"
-msgstr "E487: ˆø”‚͐³‚Ì’l‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ‘O‚̃fƒBƒŒƒNƒgƒŠ‚É–ß‚ê‚Ü‚¹‚ñ"
-
-msgid "E42: No Errors"
-msgstr "E42: ƒGƒ‰[‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E776: No location list"
-msgstr "E776: êŠƒŠƒXƒg‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-msgid "E43: Damaged match string"
-msgstr "E43: ŠY“–•¶Žš—ñ‚ª”j‘¹‚µ‚Ä‚¢‚Ü‚·"
-
-msgid "E44: Corrupted regexp program"
-msgstr "E44: •s³‚Ȑ³‹K•\\Œ»ƒvƒƒOƒ‰ƒ€‚Å‚·"
-
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚· (! ‚ð’ljÁ‚ŏ㏑‚«)"
-
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: “ÇŽæê—p•ϐ” \"%s\" ‚ɂ͒l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: ƒTƒ“ƒhƒ{ƒbƒNƒX‚ł͕ϐ” \"%s\" ‚É’l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ƒGƒ‰[ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
-
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: ƒTƒ“ƒhƒ{ƒbƒNƒX‚ł͋–‚³‚ê‚Ü‚¹‚ñ"
-
-msgid "E523: Not allowed here"
-msgstr "E523: ‚±‚±‚ł͋–‰Â‚³‚ê‚Ü‚¹‚ñ"
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ƒXƒNƒŠ[ƒ“ƒ‚[ƒh‚̐ݒè‚ɂ͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: –³Œø‚ȃXƒNƒ[ƒ‹—ʂł·"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign ‚̃f[ƒ^‚ð“Ǎž‚߂܂¹‚ñ‚Å‚µ‚½"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚̃Nƒ[ƒYŽžƒGƒ‰[‚Å‚·"
-
-msgid "E73: tag stack empty"
-msgstr "E73: ƒ^ƒOƒXƒ^ƒbƒN‚ª‹ó‚Å‚·"
-
-msgid "E74: Command too complex"
-msgstr "E74: ƒRƒ}ƒ“ƒh‚ª•¡ŽG‰ß‚¬‚Ü‚·"
-
-msgid "E75: Name too long"
-msgstr "E75: –¼‘O‚ª’·‰ß‚¬‚Ü‚·"
-
-msgid "E76: Too many ["
-msgstr "E76: [ ‚ª‘½‰ß‚¬‚Ü‚·"
-
-msgid "E77: Too many file names"
-msgstr "E77: ƒtƒ@ƒCƒ‹–¼‚ª‘½‰ß‚¬‚Ü‚·"
-
-msgid "E488: Trailing characters"
-msgstr "E488: —]•ª‚È•¶Žš‚ªŒã‚ë‚É‚ ‚è‚Ü‚·"
-
-msgid "E78: Unknown mark"
-msgstr "E78: –¢’m‚̃}[ƒN"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ƒƒCƒ‹ƒhƒJ[ƒh‚ð“WŠJ‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ‚Í 'winminheight' ‚æ‚菬‚³‚­‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ‚Í 'winminwidth' ‚æ‚菬‚³‚­‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E80: Error while writing"
-msgstr "E80: ‘ž‚Ý’†‚̃Gƒ‰["
-
-msgid "Zero count"
-msgstr "ƒ[ƒƒJƒEƒ“ƒg"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½"
-
-msgid "E449: Invalid expression received"
-msgstr "E449: –³Œø‚ÈŽ®‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½"
-
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: —̈悪•ی삳‚ê‚Ä‚¢‚é‚Ì‚Å, •ύX‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "E744: NetBeans does not allow changes in read-only files"
-msgstr "E744: NetBeans ‚͓Ǎžê—pƒtƒ@ƒCƒ‹‚ð•ύX‚·‚邱‚Æ‚ð‹–‚µ‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: “à•”ƒGƒ‰[‚Å‚·: %s"
-
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ƒpƒ^[ƒ“‚ª 'maxmempattern' ˆÈã‚̃ƒ‚ƒŠ‚ðŽg—p‚µ‚Ü‚·"
-
-msgid "E749: empty buffer"
-msgstr "E749: ƒoƒbƒtƒ@‚ª‹ó‚Å‚·"
-
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ŒŸõƒpƒ^[ƒ“‚©‹æØ‚è‹L†‚ª•s³‚Å‚·"
-
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: “¯‚¶–¼‘O‚̃tƒ@ƒCƒ‹‚ª‘¼‚̃oƒbƒtƒ@‚œǍž‚Ü‚ê‚Ä‚¢‚Ü‚·"
-
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ƒIƒvƒVƒ‡ƒ“ '%s' ‚͐ݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-msgid "E850: Invalid register name"
-msgstr "E850: –³Œø‚ȃŒƒWƒXƒ^–¼‚Å‚·"
-
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "ã‚܂ŌŸõ‚µ‚½‚̂ʼnº‚É–ß‚è‚Ü‚·"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "‰º‚܂ŌŸõ‚µ‚½‚̂ŏã‚É–ß‚è‚Ü‚·"
-
-#, c-format
-msgid "Need encryption key for \"%s\""
-msgstr "ˆÃ†ƒL[‚ª•K—v‚Å‚·: \"%s\""
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: GUI—p‚̃vƒƒZƒX‚Ì‹N“®‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
@@ -2404,7 +2058,7 @@
 msgstr "ƒJ[ƒ\\ƒ‹‚̈ʒu‚Ƀ}ƒbƒ`‚Í‚ ‚è‚Ü‚¹‚ñ, ŽŸ‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·"
 
 msgid "<cannot open> "
-msgstr "<ŠJ‚¯‚Ü‚¹‚ñ>"
+msgstr "<ŠJ‚¯‚Ü‚¹‚ñ> "
 
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
@@ -2541,7 +2195,7 @@
 
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: ƒ^ƒCƒgƒ‹‚ª \"%s\" ‚̃EƒBƒ“ƒhƒE‚݂͂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E671: ƒ^ƒCƒgƒ‹‚ª \"%s\" ‚̃EƒBƒ“ƒhƒE‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
@@ -2719,14 +2373,14 @@
 msgstr "E456: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
 
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"prolog.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"prolog.ps\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"cidfont.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"cidfont.ps\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"%s.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E456: PostScript‚ÌƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"%s.ps\" ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
@@ -2770,7 +2424,7 @@
 msgstr "E562: Žg—p–@: cstag <ident>"
 
 msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: ƒ^ƒO‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E257: cstag: ƒ^ƒO‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E563: stat(%s) error: %d"
@@ -2863,7 +2517,7 @@
 
 #, c-format
 msgid "E261: cscope connection %s not found"
-msgstr "E261: cscopeÚ‘± %s ‚ª‚݂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
+msgstr "E261: cscopeÚ‘± %s ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
 
 #, c-format
 msgid "cscope connection %s closed"
@@ -2941,6 +2595,9 @@
 msgid "string cannot contain newlines"
 msgstr "•¶Žš—ñ‚ɂ͉üs•¶Žš‚ðŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ"
 
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme’l‚ÌVim‚ւ̕ϊ·ƒGƒ‰["
+
 msgid "Vim error: ~a"
 msgstr "Vim ƒGƒ‰[: ~a"
 
@@ -2959,6 +2616,10 @@
 msgid "not allowed in the Vim sandbox"
 msgstr "ƒTƒ“ƒhƒ{ƒbƒNƒX‚ł͋–‚³‚ê‚Ü‚¹‚ñ"
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
 "‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: Perlƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
@@ -2971,6 +2632,9 @@
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ‚±‚ÌVim‚Å‚Í :py3 ‚ðŽg‚Á‚½Œã‚É :python ‚ðŽg‚¦‚Ü‚¹‚ñ"
 
+msgid "only string keys are allowed"
+msgstr "•¶Žš—ñ‚̃L[‚݂̂ª‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚·"
+
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2982,14 +2646,11 @@
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ‚ðÄ‹A“I‚ÉŽÀs‚·‚邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Ž®•]‰¿‚Í—LŒø‚ÈpythonƒIƒuƒWƒFƒNƒg‚ð•Ô‚µ‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-msgid "softspace must be an integer"
-msgstr "softspace ‚Í integer ‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "invalid attribute"
-msgstr "–³Œø‚È‘®«‚Å‚·"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: •Ô‚³‚ꂽpythonƒIƒuƒWƒFƒNƒg‚ðvim‚Ì’l‚ɕϊ·‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
 
 #, c-format
 msgid "<buffer object (deleted) at %p>"
@@ -2998,6 +2659,12 @@
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: ‚±‚ÌVim‚Å‚Í :python ‚ðŽg‚Á‚½Œã‚É :py3 ‚ðŽg‚¦‚Ü‚¹‚ñ"
 
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: Ž®•]‰¿‚Í—LŒø‚Èpython 3ƒIƒuƒWƒFƒNƒg‚ð•Ô‚µ‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: •Ô‚³‚ꂽpython 3ƒIƒuƒWƒFƒNƒg‚ðvim‚Ì’l‚ɕϊ·‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ ‚Í•¶Žš—ñ‚̃Cƒ“ƒXƒ^ƒ“ƒX‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
@@ -3054,7 +2721,7 @@
 msgstr "ŽŸ‚̃\\[ƒX‚ð•\\ަ‚·‚é"
 
 msgid "Find symbol"
-msgstr "‚݂‚¯‚½ƒVƒ“ƒ{ƒ‹"
+msgstr "Œ©‚‚¯‚½ƒVƒ“ƒ{ƒ‹"
 
 msgid "Browse class"
 msgstr "ƒNƒ‰ƒX‚ðŽQÆ"
@@ -3145,7 +2812,7 @@
 msgstr "”͈͊O‚̍s”ԍ†‚Å‚·"
 
 msgid "unknown flag: "
-msgstr "–¢’m‚̃tƒ‰ƒO:"
+msgstr "–¢’m‚̃tƒ‰ƒO: "
 
 msgid "unknown vimOption"
 msgstr "–¢’m‚Ì vimOption ‚Å‚·"
@@ -3175,7 +2842,7 @@
 
 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Æ‚ª‚݂‚©‚è‚Ü‚¹"
+"ƒR[ƒ‹ƒoƒbƒNƒRƒ}ƒ“ƒh‚ð“o˜^‚Å‚«‚Ü‚¹‚ñ: ƒoƒbƒtƒ@/ƒEƒBƒ“ƒhƒE‚ÌŽQÆ‚ªŒ©‚‚©‚è‚Ü‚¹"
 "‚ñ"
 
 msgid ""
@@ -3290,7 +2957,7 @@
 "Žg—p–@:"
 
 msgid " vim [arguments] "
-msgstr " vim [ˆø”]"
+msgstr " vim [ˆø”] "
 
 msgid ""
 "\n"
@@ -3670,7 +3337,7 @@
 "# ƒtƒ@ƒCƒ‹“àƒ}[ƒN‚Ì—š—ð (V‚µ‚¢‚à‚Ì‚©‚çŒÃ‚¢‚à‚Ì):\n"
 
 msgid "Missing '>'"
-msgstr "'>' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "'>' ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E543: Not a valid codepage"
 msgstr "E543: –³Œø‚ȃR[ƒhƒy[ƒW‚Å‚·"
@@ -3739,7 +3406,7 @@
 
 #, c-format
 msgid "E305: No swap file found for %s"
-msgstr "E305: %s ‚ɂ̓Xƒƒbƒvƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E305: %s ‚ɂ̓Xƒƒbƒvƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Žg—p‚·‚éƒXƒƒbƒvƒtƒ@ƒCƒ‹‚̔ԍ†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢(0 ‚ŏI—¹): "
@@ -4013,7 +3680,7 @@
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: s %ld ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E316: ml_get: s %ld ‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚· 3"
@@ -4032,7 +3699,7 @@
 
 #, c-format
 msgid "E320: Cannot find line %ld"
-msgstr "E320: s %ld ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E320: s %ld ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
@@ -4196,7 +3863,7 @@
 
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: ƒƒjƒ…[‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E334: ƒƒjƒ…[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E335: Menu not defined for %s mode"
@@ -4206,7 +3873,7 @@
 msgstr "E336: ƒƒjƒ…[ƒpƒX‚̓Tƒuƒƒjƒ…[‚𐶂¶‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
 
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: ƒƒjƒ…[‚ª‚݂‚©‚è‚Ü‚¹‚ñ - ƒƒjƒ…[–¼‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢"
+msgstr "E337: ƒƒjƒ…[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ - ƒƒjƒ…[–¼‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢"
 
 #, c-format
 msgid "Error detected while processing %s:"
@@ -4430,6 +4097,7 @@
 msgid "E511: netbeans already connected"
 msgstr "E511: NetBeans‚ÍŠù‚ɐڑ±‚µ‚Ä‚¢‚Ü‚·"
 
+#, c-format
 msgid "E505: %s is read-only (add ! to override)"
 msgstr "E505: %s ‚͓Ǎžê—p‚Å‚· (‹­§‘ž‚É‚Í ! ‚ð’ljÁ)"
 
@@ -4484,11 +4152,11 @@
 msgstr "%ld s‚ªƒCƒ“ƒfƒ“ƒg‚³‚ê‚Ü‚·... "
 
 msgid "1 line indented "
-msgstr "1 s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½"
+msgstr "1 s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½ "
 
 #, c-format
 msgid "%ld lines indented "
-msgstr "%ld s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½"
+msgstr "%ld s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½ "
 
 msgid "E748: No previously used register"
 msgstr "E748: ‚Ü‚¾ƒŒƒWƒXƒ^‚ðŽg—p‚µ‚Ä‚¢‚Ü‚¹‚ñ"
@@ -4599,7 +4267,7 @@
 msgstr "E521: = ‚ÌŒã‚ɂ͐”Žš‚ª•K—v‚Å‚·"
 
 msgid "E522: Not found in termcap"
-msgstr "E522: termcap “à‚ɂ݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E522: termcap “à‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E539: Illegal character <%s>"
@@ -4973,7 +4641,7 @@
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"VIMRUN.EXE‚ª $PATH ‚Ì’†‚ɂ݂‚©‚è‚Ü‚¹‚ñ.\n"
+"VIMRUN.EXE‚ª $PATH ‚Ì’†‚ÉŒ©‚‚©‚è‚Ü‚¹‚ñ.\n"
 "ŠO•”ƒRƒ}ƒ“ƒh‚̏I—¹Œã‚Ɉꎞ’âŽ~‚ð‚µ‚Ü‚¹‚ñ.\n"
 "Ú×‚Í  :help win32-vimrun  ‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢."
 
@@ -5208,11 +4876,11 @@
 
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ã‚܂ŌŸõ‚µ‚½‚¯‚ê‚ÇŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+msgstr "E384: ã‚܂ŌŸõ‚µ‚Ü‚µ‚½‚ªŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ‰º‚܂ŌŸõ‚µ‚½‚¯‚ê‚ÇŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+msgstr "E385: ‰º‚܂ŌŸõ‚µ‚Ü‚µ‚½‚ªŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' ‚Ì‚ ‚Æ‚É‚Í '?' ‚© '/' ‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é"
@@ -5222,10 +4890,10 @@
 
 #. cursor at status line
 msgid "--- Included files "
-msgstr "--- ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹"
+msgstr "--- ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹ "
 
 msgid "not found "
-msgstr "‚݂‚©‚è‚Ü‚¹‚ñ "
+msgstr "Œ©‚‚©‚è‚Ü‚¹‚ñ "
 
 msgid "in path ---\n"
 msgstr "ƒpƒX‚É ----\n"
@@ -5234,7 +4902,7 @@
 msgstr "  (Šù‚É—ñ‹“)"
 
 msgid "  NOT FOUND"
-msgstr "  ‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "  Œ©‚‚©‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "Scanning included file: %s"
@@ -5248,16 +4916,16 @@
 msgstr "E387: Œ»Ýs‚ÉŠY“–‚ª‚ ‚è‚Ü‚·"
 
 msgid "All included files were found"
-msgstr "‘S‚ẴCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚µ‚½"
+msgstr "‘S‚ẴCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚µ‚½"
 
 msgid "No included files"
 msgstr "ƒCƒ“ƒNƒ‹[ƒhƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E388: Couldn't find definition"
-msgstr "E388: ’è‹`‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E388: ’è‹`‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 msgid "E389: Couldn't find pattern"
-msgstr "E389: ƒpƒ^[ƒ“‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E389: ƒpƒ^[ƒ“‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 msgid "Substitute "
 msgstr "Substitute "
@@ -5480,7 +5148,7 @@
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
-msgstr "%s ‚Ì %d s–Ú‚Å d•¡’PŒê‚ª‚݂‚©‚è‚Ü‚µ‚½: %s"
+msgstr "%s ‚Ì %d s–Ú‚Å d•¡’PŒê‚ªŒ©‚‚©‚è‚Ü‚µ‚½: %s"
 
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
@@ -5620,7 +5288,7 @@
 
 #, c-format
 msgid "E753: Not found: %s"
-msgstr "E753: ‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E753: Œ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
@@ -5696,10 +5364,10 @@
 msgstr "E392: ‚»‚̂悤‚ȍ\\•¶ƒNƒ‰ƒXƒ^‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
 msgid "minimal "
-msgstr "minimal"
+msgstr "minimal "
 
 msgid "maximal "
-msgstr "maximal"
+msgstr "maximal "
 
 msgid "; match "
 msgstr "; ŠY“– "
@@ -5718,7 +5386,7 @@
 
 #, c-format
 msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s ‚͈̔͗v‘f‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E394: %s ‚͈̔͗v‘f‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E397: Filename required"
 msgstr "E397: ƒtƒ@ƒCƒ‹–¼‚ª•K—v‚Å‚·"
@@ -5746,7 +5414,7 @@
 
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: ƒpƒ^[ƒ“‹æØ‚肪‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E401: ƒpƒ^[ƒ“‹æØ‚肪Œ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E402: Garbage after pattern: %s"
@@ -5788,7 +5456,7 @@
 
 #, c-format
 msgid "E411: highlight group not found: %s"
-msgstr "E411: ƒnƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E411: ƒnƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
@@ -5858,7 +5526,7 @@
 
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: ƒ^ƒO‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
+msgstr "E426: ƒ^ƒO‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %s"
 
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
@@ -5927,10 +5595,10 @@
 msgstr "E433: ƒ^ƒOƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E434: Can't find tag pattern"
-msgstr "E434: ƒ^ƒOƒpƒ^[ƒ“‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E434: ƒ^ƒOƒpƒ^[ƒ“‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ƒ^ƒO‚ð‚݂‚¯‚ç‚ê‚È‚¢‚̂ŒP‚ɐ„‘ª‚µ‚Ü‚·!"
+msgstr "E435: ƒ^ƒO‚ðŒ©‚Â‚¯‚ç‚ê‚È‚¢‚̂ŒP‚ɐ„‘ª‚µ‚Ü‚·!"
 
 #, c-format
 msgid "Duplicate field name: %s"
@@ -5946,10 +5614,10 @@
 msgstr "E557: termcapƒtƒ@ƒCƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñ"
 
 msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfo‚É’[––ƒGƒ“ƒgƒŠ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E558: terminfo‚É’[––ƒGƒ“ƒgƒŠ‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcap‚É’[––ƒGƒ“ƒgƒŠ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
+msgstr "E559: termcap‚É’[––ƒGƒ“ƒgƒŠ‚ðŒ©‚Â‚¯‚ç‚ê‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
@@ -6061,7 +5729,7 @@
 
 #, c-format
 msgid "E830: Undo number %ld not found"
-msgstr "E830: ƒAƒ“ƒhƒD”ԍ† %ld ‚݂͂‚©‚è‚Ü‚¹‚ñ"
+msgstr "E830: ƒAƒ“ƒhƒD”ԍ† %ld ‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: s”ԍ†‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
@@ -6396,7 +6064,7 @@
 msgstr "ƒ‚[ƒh–³‚ÅŽÀs’†, ƒ^ƒCƒv‚µ‚½•¶Žš‚ª‘}“ü‚³‚ê‚Ü‚·"
 
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-msgstr "ƒƒjƒ…[‚Ì •ҏW¨‘S‘̐ݒ聨‘}“ü(‰SŽÒ)ƒ‚[ƒhØ‘Ö"
+msgstr "ƒƒjƒ…[‚Ì •ҏW¨‘S‘̐ݒ聨‘}“ü(‰SŽÒ)ƒ‚[ƒhØ‘Ö "
 
 msgid "                              for two modes      "
 msgstr "                              ‚Ń‚[ƒh—L‚É       "
@@ -6458,3 +6126,486 @@
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "Edit with &multiple Vims"
+msgstr "•¡”‚ÌVim‚ŕҏW‚·‚é (&M)"
+
+msgid "Edit with single &Vim"
+msgstr "1‚‚ÌVim‚ŕҏW‚·‚é (&V)"
+
+msgid "Diff with Vim"
+msgstr "Vim‚ō·•ª‚ð•\\ަ‚·‚é"
+
+msgid "Edit with &Vim"
+msgstr "Vim‚ŕҏW‚·‚é (&V)"
+
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "‹N“®Ï‚ÌVim‚ŕҏW‚·‚é - "
+
+msgid "Edits the selected file(s) with Vim"
+msgstr "‘I‘ð‚µ‚½ƒtƒ@ƒCƒ‹‚ðVim‚ŕҏW‚·‚é"
+
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "ƒvƒƒZƒX‚̍쐬‚ÉŽ¸”s: gvim‚ªŠÂ‹«•ϐ”PATHã‚É‚ ‚é‚©Šm”F‚µ‚Ä‚­‚¾‚³‚¢!"
+
+msgid "gvimext.dll error"
+msgstr "gvimext.dll ƒGƒ‰["
+
+msgid "Path length too long!"
+msgstr "ƒpƒX‚ª’·‚·‚¬‚Ü‚·!"
+
+msgid "--No lines in buffer--"
+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.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: ƒRƒ}ƒ“ƒh‚ª’†’f‚³‚ê‚Ü‚µ‚½"
+
+msgid "E471: Argument required"
+msgstr "E471: ˆø”‚ª•K—v‚Å‚·"
+
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ ‚ÌŒã‚Í / ‚© ? ‚© & ‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚ł͖³Œø‚Å‚·; <CR>‚ÅŽÀs, CTRL-C‚Å‚â‚ß‚é"
+
+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‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
+
+msgid "E171: Missing :endif"
+msgstr "E171: :endif ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while ‚̂Ȃ¢ :endwhile ‚ª‚ ‚è‚Ü‚·"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ‚̂Ȃ¢ :for ‚ª‚ ‚è‚Ü‚·"
+
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚· (! ‚ð’ljÁ‚ŏ㏑)"
+
+msgid "E472: Command failed"
+msgstr "E472: ƒRƒ}ƒ“ƒh‚ªŽ¸”s‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: –¢’m‚̃tƒHƒ“ƒgƒZƒbƒg: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: –¢’m‚̃tƒHƒ“ƒg: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ƒtƒHƒ“ƒg \"%s\" ‚͌Œ蕝‚ł͂ ‚è‚Ü‚¹‚ñ"
+
+msgid "E473: Internal error"
+msgstr "E473: “à•”ƒGƒ‰[‚Å‚·"
+
+msgid "Interrupted"
+msgstr "Š„ž‚Ü‚ê‚Ü‚µ‚½"
+
+msgid "E14: Invalid address"
+msgstr "E14: –³Œø‚ȃAƒhƒŒƒX‚Å‚·"
+
+msgid "E474: Invalid argument"
+msgstr "E474: –³Œø‚Ȉø”‚Å‚·"
+
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: –³Œø‚Ȉø”‚Å‚·: %s"
+
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: –³Œø‚ÈŽ®‚Å‚·: %s"
+
+msgid "E16: Invalid range"
+msgstr "E16: –³Œø‚Ȕ͈͂ł·"
+
+msgid "E476: Invalid command"
+msgstr "E476: –³Œø‚ȃRƒ}ƒ“ƒh‚Å‚·"
+
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" ‚̓fƒBƒŒƒNƒgƒŠ‚Å‚·"
+
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() ‚̃‰ƒCƒuƒ‰ƒŠŒÄo‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ƒ‰ƒCƒuƒ‰ƒŠ‚̊֐” %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+msgid "E19: Mark has invalid line number"
+msgstr "E19: ƒ}[ƒN‚É–³Œø‚ȍs”ԍ†‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚µ‚½"
+
+msgid "E20: Mark not set"
+msgstr "E20: ƒ}[ƒN‚͐ݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' ‚ªƒIƒt‚Ȃ̂Å, •ύX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E22: Scripts nested too deep"
+msgstr "E22: ƒXƒNƒŠƒvƒg‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+msgid "E23: No alternate file"
+msgstr "E23: •›ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E24: No such abbreviation"
+msgstr "E24: ‚»‚̂悤‚È’Zk“ü—͂͂ ‚è‚Ü‚¹‚ñ"
+
+msgid "E477: No ! allowed"
+msgstr "E477: ! ‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUI‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: ƒwƒuƒ‰ƒCŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
+
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: ƒyƒ‹ƒVƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ƒAƒ‰ƒrƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
+
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: ‚»‚̂悤‚È–¼‚̃nƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid "E29: No inserted text yet"
+msgstr "E29: ‚Ü‚¾ƒeƒLƒXƒg‚ª‘}“ü‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E30: No previous command line"
+msgstr "E30: ˆÈ‘O‚ɃRƒ}ƒ“ƒhs‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E31: No such mapping"
+msgstr "E31: ‚»‚̂悤‚ȃ}ƒbƒsƒ“ƒO‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E479: No match"
+msgstr "E479: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
+
+msgid "E32: No file name"
+msgstr "E32: ƒtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: ³‹K•\\Œ»’uŠ·‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E34: No previous command"
+msgstr "E34: ƒRƒ}ƒ“ƒh‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E35: No previous regular expression"
+msgstr "E35: ³‹K•\\Œ»‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E481: No range allowed"
+msgstr "E481: ”͈͎w’è‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E36: Not enough room"
+msgstr "E36: ƒEƒBƒ“ƒhƒE‚ɏ\\•ª‚ȍ‚‚³‚à‚µ‚­‚Í•‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s ‚Æ‚¢‚¤–¼‘O‚Ì“o˜^‚³‚ꂽƒT[ƒo‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: ƒtƒ@ƒCƒ‹ %s ‚ðì¬‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: ˆêŽžƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ƒtƒ@ƒCƒ‹ %s ‚ð“Ǎž‚߂܂¹‚ñ"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ÅŒã‚̕ύX‚ª•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚ð’ljÁ‚ŕύX‚ð”jŠü)"
+
+msgid "E38: Null argument"
+msgstr "E38: ˆø”‚ª‹ó‚Å‚·"
+
+msgid "E39: Number expected"
+msgstr "E39: ”’l‚ª—v‹‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: ƒGƒ‰[ƒtƒ@ƒCƒ‹ %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+msgid "E233: cannot open display"
+msgstr "E233: ƒfƒBƒXƒvƒŒƒC‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+msgid "E41: Out of memory!"
+msgstr "E41: ƒƒ‚ƒŠ‚ªs‚«‰Ê‚Ă܂µ‚½!"
+
+msgid "Pattern not found"
+msgstr "ƒpƒ^[ƒ“‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: ƒpƒ^[ƒ“‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: ˆø”‚͐³‚Ì’l‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ‘O‚̃fƒBƒŒƒNƒgƒŠ‚É–ß‚ê‚Ü‚¹‚ñ"
+
+msgid "E42: No Errors"
+msgstr "E42: ƒGƒ‰[‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E776: No location list"
+msgstr "E776: êŠƒŠƒXƒg‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E43: Damaged match string"
+msgstr "E43: ŠY“–•¶Žš—ñ‚ª”j‘¹‚µ‚Ä‚¢‚Ü‚·"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: •s³‚Ȑ³‹K•\\Œ»ƒvƒƒOƒ‰ƒ€‚Å‚·"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚· (! ‚ð’ljÁ‚ŏ㏑‚«)"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: “ÇŽæê—p•ϐ” \"%s\" ‚ɂ͒l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: ƒTƒ“ƒhƒ{ƒbƒNƒX‚ł͕ϐ” \"%s\" ‚É’l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: ƒGƒ‰[ƒtƒ@ƒCƒ‹‚̓Ǎž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: ƒTƒ“ƒhƒ{ƒbƒNƒX‚ł͋–‚³‚ê‚Ü‚¹‚ñ"
+
+msgid "E523: Not allowed here"
+msgstr "E523: ‚±‚±‚ł͋–‰Â‚³‚ê‚Ü‚¹‚ñ"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ƒXƒNƒŠ[ƒ“ƒ‚[ƒh‚̐ݒè‚ɂ͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: –³Œø‚ȃXƒNƒ[ƒ‹—ʂł·"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign ‚̃f[ƒ^‚ð“Ǎž‚߂܂¹‚ñ‚Å‚µ‚½"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚̃Nƒ[ƒYŽžƒGƒ‰[‚Å‚·"
+
+msgid "E73: tag stack empty"
+msgstr "E73: ƒ^ƒOƒXƒ^ƒbƒN‚ª‹ó‚Å‚·"
+
+msgid "E74: Command too complex"
+msgstr "E74: ƒRƒ}ƒ“ƒh‚ª•¡ŽG‰ß‚¬‚Ü‚·"
+
+msgid "E75: Name too long"
+msgstr "E75: –¼‘O‚ª’·‰ß‚¬‚Ü‚·"
+
+msgid "E76: Too many ["
+msgstr "E76: [ ‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E77: Too many file names"
+msgstr "E77: ƒtƒ@ƒCƒ‹–¼‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E488: Trailing characters"
+msgstr "E488: —]•ª‚È•¶Žš‚ªŒã‚ë‚É‚ ‚è‚Ü‚·"
+
+msgid "E78: Unknown mark"
+msgstr "E78: –¢’m‚̃}[ƒN"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ƒƒCƒ‹ƒhƒJ[ƒh‚ð“WŠJ‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ‚Í 'winminheight' ‚æ‚菬‚³‚­‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ‚Í 'winminwidth' ‚æ‚菬‚³‚­‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E80: Error while writing"
+msgstr "E80: ‘ž‚Ý’†‚̃Gƒ‰["
+
+msgid "Zero count"
+msgstr "ƒ[ƒƒJƒEƒ“ƒg"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: –³Œø‚ÈŽ®‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: —̈悪•ی삳‚ê‚Ä‚¢‚é‚Ì‚Å, •ύX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ‚͓Ǎžê—pƒtƒ@ƒCƒ‹‚ð•ύX‚·‚邱‚Æ‚ð‹–‚µ‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: “à•”ƒGƒ‰[‚Å‚·: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ƒpƒ^[ƒ“‚ª 'maxmempattern' ˆÈã‚̃ƒ‚ƒŠ‚ðŽg—p‚µ‚Ü‚·"
+
+msgid "E749: empty buffer"
+msgstr "E749: ƒoƒbƒtƒ@‚ª‹ó‚Å‚·"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ŒŸõƒpƒ^[ƒ“‚©‹æØ‚è‹L†‚ª•s³‚Å‚·"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: “¯‚¶–¼‘O‚̃tƒ@ƒCƒ‹‚ª‘¼‚̃oƒbƒtƒ@‚œǍž‚Ü‚ê‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ƒIƒvƒVƒ‡ƒ“ '%s' ‚͐ݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "E850: Invalid register name"
+msgstr "E850: –³Œø‚ȃŒƒWƒXƒ^–¼‚Å‚·"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "ã‚܂ŌŸõ‚µ‚½‚̂ʼnº‚É–ß‚è‚Ü‚·"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "‰º‚܂ŌŸõ‚µ‚½‚̂ŏã‚É–ß‚è‚Ü‚·"
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "ˆÃ†ƒL[‚ª•K—v‚Å‚·: \"%s\""
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+
+msgid "softspace must be an integer"
+msgstr "softspace ‚Í integer ‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "invalid attribute"
+msgstr "–³Œø‚È‘®«‚Å‚·"
+
+msgid "writelines() requires list of strings"
+msgstr "writelines() ‚ɂ͕¶Žš—ñ‚ÌƒŠƒXƒg‚ª•K—v‚Å‚·"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/OƒIƒuƒWƒFƒNƒg‚̏‰Šú‰»ƒGƒ‰["
+
+msgid "no such buffer"
+msgstr "‚»‚̂悤‚ȃoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "empty keys are not allowed"
+msgstr "‹ó‚̃L[‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "failed to add key to dictionary"
+msgstr "Ž«‘‚ւ̃L[‚̒ljÁ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "DictionaryObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "ŒÅ’肳‚ê‚½Ž«‘‚͕ύX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "Only boolean objects are allowed"
+msgstr "booleanƒIƒuƒWƒFƒNƒg‚¾‚¯‚ª‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "Cannot set this attribute"
+msgstr "‚±‚Ì‘®«‚͐ݒè‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "no such key in dictionary"
+msgstr "Ž«‘‚É‚»‚̂悤‚ȃL[‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "dict is locked"
+msgstr "Ž«‘‚̓ƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "internal error: failed to get vim list item"
+msgstr "“à•”ƒGƒ‰[: vim‚ÌƒŠƒXƒg—v‘f‚̎擾‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "list is locked"
+msgstr "ƒŠƒXƒg‚̓ƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "Failed to add item to list"
+msgstr "ƒŠƒXƒg‚Ö‚Ì—v‘f’ljÁ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "internal error: no vim list item"
+msgstr "“à•”ƒGƒ‰[: vim‚ÌƒŠƒXƒg—v‘f‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "can only assign lists to slice"
+msgstr "ƒXƒ‰ƒCƒX‚É‚ÍƒŠƒXƒg‚¾‚¯‚ª‘ã“ü‚Å‚«‚Ü‚·"
+
+msgid "internal error: failed to add item to list"
+msgstr "“à•”ƒGƒ‰[: ƒŠƒXƒg‚Ö‚Ì—v‘f’ljÁ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "can only concatenate with lists"
+msgstr "ƒŠƒXƒg‚Ƃ̂ݐڑ±‚Å‚«‚Ü‚·"
+
+msgid "Cannot modify fixed list"
+msgstr "ŒÅ’肳‚ꂽƒŠƒXƒg‚͕ύX‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "'self' argument must be a dictionary"
+msgstr "'self' ˆø”‚ÍŽ«‘Œ^‚Ì’l‚łȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "failed to run function"
+msgstr "ŠÖ”‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "attempt to refer to deleted window"
+msgstr "íœ‚³‚ꂽƒEƒBƒ“ƒhƒE‚ðŽQÆ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
+
+msgid "readonly attribute"
+msgstr "“Ǎžê—p‘®«"
+
+msgid "cursor position outside buffer"
+msgstr "ƒJ[ƒ\\ƒ‹ˆÊ’u‚ªƒoƒbƒtƒ@‚ÌŠO‘¤‚Å‚·"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<ƒEƒBƒ“ƒhƒEƒIƒuƒWƒFƒNƒg (Á‹ŽÏ‚Ý) %p>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<ƒEƒBƒ“ƒhƒEƒIƒuƒWƒFƒNƒg (•s–¾) %p>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<ƒEƒBƒ“ƒhƒE %d>"
+
+msgid "no such window"
+msgstr "‚»‚̂悤‚ȃEƒBƒ“ƒhƒE‚Í‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "íœ‚³‚ꂽƒoƒbƒtƒ@‚ðŽQÆ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
+
+msgid "unable to convert to vim structure"
+msgstr "vim‚̍\\‘¢‘̂ɕϊ·‚Å‚«‚Ü‚¹‚ñ"
+
+msgid "NULL reference passed"
+msgstr "NULLŽQÆ‚ª“n‚³‚ê‚Ü‚µ‚½"
+
+msgid "internal error: invalid value type"
+msgstr "“à•”ƒGƒ‰[: –³Œø‚È’lŒ^‚Å‚·"