From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 Jul 2013 11:58:22 +0000 (+0200)
Subject: Update runtime files.
X-Git-Tag: v7.4a~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8b25cbf36a1926c93319fed6259b2a2344bdde;p=vim

Update runtime files.
---

diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8dcf3298f..d8a2555a4 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -170,18 +170,18 @@ N is used to indicate an optional count that can be given before the command.
 ------------------------------------------------------------------------------
 *Q_ma*		Marks and motions
 
-|m|	   m{a-zA-Z}	mark current position with mark {a-zA-Z}
-|`a|	   `{a-z}	go to mark {a-z} within current file
-|`A|	   `{A-Z}	go to mark {A-Z} in any file
-|`0|	   `{0-9}	go to the position where Vim was previously exited
-|``|	   ``		go to the position before the last jump
+|m|        m{a-zA-Z}	mark current position with mark {a-zA-Z}
+|`a|       `{a-z}	go to mark {a-z} within current file
+|`A|       `{A-Z}	go to mark {A-Z} in any file
+|`0|       `{0-9}	go to the position where Vim was previously exited
+|``|       ``		go to the position before the last jump
 |`quote|   `"		go to the position when last editing this file
-|`[|	   `[		go to the start of the previously operated or put text
-|`]|	   `]		go to the end of the previously operated or put text
-|`<|	   `<		go to the start of the (previous) Visual area
-|`>|	   `>		go to the end of the (previous) Visual area
-|`.|	   `.		go to the position of the last change in this file
-|'|	   '{a-zA-Z0-9[]'"<>.}
+|`[|       `[		go to the start of the previously operated or put text
+|`]|       `]		go to the end of the previously operated or put text
+|`<|       `<		go to the start of the (previous) Visual area
+|`>|       `>		go to the end of the (previous) Visual area
+|`.|       `.		go to the position of the last change in this file
+|'|        '{a-zA-Z0-9[]'"<>.}
 			same as `, but on the first non-blank in the line
 |:marks|  :marks	print the active marks
 |CTRL-O|  N  CTRL-O	go to Nth older position in jump list
@@ -648,7 +648,7 @@ Short explanation of each option:		*option-list*
 'completefunc'	  'cfu'     function to be used for Insert mode completion
 'completeopt'	  'cot'     options for Insert mode completion
 'concealcursor'	  'cocu'    whether concealable text is hidden in cursor line
-'conceallevel'	  'cole'    whether concealable text is shown or hidden 
+'conceallevel'	  'cole'    whether concealable text is shown or hidden
 'confirm'	  'cf'	    ask what to do about unsaved/read-only files
 'conskey'	  'consk'   get keys directly from console (MS-DOS only)
 'copyindent'	  'ci'	    make 'autoindent' use existing indent structure
@@ -1328,14 +1328,14 @@ Context-sensitive completion on the command-line:
 |:bdelete|	:bdelete[!] [N]		unload buffer [N] and delete it from
 					   the buffer list
 
-	      in current window   in new window	~
-|:buffer|     :[N]buffer [N]	  :[N]sbuffer [N]     to arg/buf N
-|:bnext|      :[N]bnext [N]	  :[N]sbnext [N]      to Nth next arg/buf
-|:bNext|      :[N]bNext [N]	  :[N]sbNext [N]      to Nth previous arg/buf
-|:bprevious|  :[N]bprevious [N]   :[N]sbprevious [N]  to Nth previous arg/buf
-|:bfirst|     :bfirst		  :sbfirst	      to first arg/buf
-|:blast|      :blast		  :sblast	      to last arg/buf
-|:bmodified|  :[N]bmod [N]	  :[N]sbmod [N]	      to Nth modified buf
+		in current window  in new window       ~
+|:buffer|	:[N]buffer [N]     :[N]sbuffer [N]     to arg/buf N
+|:bnext|	:[N]bnext [N]      :[N]sbnext [N]      to Nth next arg/buf
+|:bNext|	:[N]bNext [N]      :[N]sbNext [N]      to Nth previous arg/buf
+|:bprevious|	:[N]bprevious [N]  :[N]sbprevious [N]  to Nth previous arg/buf
+|:bfirst|	:bfirst	           :sbfirst            to first arg/buf
+|:blast|	:blast	           :sblast             to last arg/buf
+|:bmodified|	:[N]bmod [N]       :[N]sbmod [N]       to Nth modified buf
 ------------------------------------------------------------------------------
 *Q_sy*		Syntax Highlighting
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e76953719..7e50c71de 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 Jul 05
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Jul 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -107,6 +107,9 @@ Second one. Update May 22.
 
 Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
 
+MS-Windows: Patch to make tests copy files to avoid changing the fileformat of
+the files under version control. (Taro Muraoka, 2013 Jul 5)
+
 Issue 54: document behavior of -complete, also expands arg.
 
 -   Add regex for 'paragraphs' and 'sections': 'parare' and 'sectre'.  Combine
@@ -190,6 +193,9 @@ Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
 Patch to add ":ldo" and ":cdo", execute commands over quickfix list and
 location list. (Yegappan Lakshmanan, 2013 Jun 2)
 
+8   "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
+    Patch by Christian Wellenbrock, 2013 Jul 5.
+
 MS-Windows resizing problems:
 - Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
   20.  Uses getWindowRect() instead of GetWindowPlacement()
@@ -2289,7 +2295,6 @@ Macintosh:
     UnxUtils.zip archive.
     Alternate one: http://www.pramodx.20m.com/tee_for_win32.htm, but Walter
     Briscoe says it's not as good.
-8   "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
 8   When doing Insert mode completion a mapping cannot recursively call
     edit(), because the completion information is global.  Put everything in
     an allocated structure?
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 034494379..49ae304eb 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -3,9 +3,9 @@
 # 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: 2013 May 19
+# Last Change: 2013 Jul 06
 #
-# Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
 # Generated from ja.po, DO NOT EDIT.
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-19 12:20+0900\n"
-"PO-Revision-Date: 2013-05-19 12:30+0900\n"
+"POT-Creation-Date: 2013-07-06 13:50+0900\n"
+"PO-Revision-Date: 2013-07-06 15:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language: Japanese\n"
@@ -141,6 +141,9 @@ msgstr "[
 msgid "[Read errors]"
 msgstr "[Æɹþ¥¨¥é¡¼]"
 
+msgid "[RO]"
+msgstr "[ÆÉÀì]"
+
 msgid "[readonly]"
 msgstr "[ÆɹþÀìÍÑ]"
 
@@ -424,6 +427,9 @@ msgstr "E130: ̤
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: ÉÔÀµ¤ÊÊÑ¿ô̾¤Ç¤¹: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: ÉâÆ°¾®¿ôÅÀ¿ô¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¾¯¤Ê¤¤¤Ç¤¹"
 
@@ -584,13 +590,13 @@ msgstr "E785: complete() 
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "extend() argument"
-msgstr "extend() ¤Î°ú¿ô"
-
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: ¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
 
+msgid "extend() argument"
+msgstr "extend() ¤Î°ú¿ô"
+
 msgid "map() argument"
 msgstr "map() ¤Î°ú¿ô"
 
@@ -689,9 +695,6 @@ msgstr "E730: 
 msgid "E731: using Dictionary as a String"
 msgstr "E731: ¼­½ñ·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
 
-msgid "E806: using Float as a String"
-msgstr "E806: ÉâÆ°¾®¿ôÅÀ¿ô¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: ÊÑ¿ô¤Î·¿¤¬°ìÃפ·¤Þ¤»¤ó: %s"
@@ -1647,9 +1650,6 @@ msgstr "[
 msgid "[character special]"
 msgstr "[¥­¥ã¥é¥¯¥¿¡¦¥Ç¥Ð¥¤¥¹]"
 
-msgid "[RO]"
-msgstr "[ÆÉÀì]"
-
 msgid "[CR missing]"
 msgstr "[CR̵]"
 
@@ -2246,32 +2246,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "¥Õ¥©¥ó¥È '%s' ¤Ï¸ÇÄêÉý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: ¥Õ¥©¥ó¥È¥»¥Ã¥È̾: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: ¥Õ¥©¥ó¥È¥»¥Ã¥È̾: %s"
 
 #, c-format
-msgid "Font0: %s\n"
-msgstr "¥Õ¥©¥ó¥È0: %s\n"
+msgid "Font0: %s"
+msgstr "¥Õ¥©¥ó¥È0: %s"
 
 #, c-format
-msgid "Font1: %s\n"
-msgstr "¥Õ¥©¥ó¥È1: %s\n"
+msgid "Font1: %s"
+msgstr "¥Õ¥©¥ó¥È1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "¥Õ¥©¥ó¥È%ld ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤Î2ÇܤǤϤ¢¤ê¤Þ¤»¤ó\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "¥Õ¥©¥ó¥È%ld ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤Î2ÇܤǤϤ¢¤ê¤Þ¤»¤ó"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "¥Õ¥©¥ó¥È0¤ÎÉý: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "¥Õ¥©¥ó¥È0¤ÎÉý: %ld"
 
 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"¥Õ¥©¥ó¥È1¤ÎÉý: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "¥Õ¥©¥ó¥È1¤ÎÉý: %ld"
 
 msgid "Invalid font specification"
 msgstr "̵¸ú¤Ê¥Õ¥©¥ó¥È»ØÄê¤Ç¤¹"
@@ -2460,6 +2456,9 @@ msgstr "E566: cscope
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope¤Îµ¯Æ°½àÈ÷(fork)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection ¤Ø¤Î setpgid ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
@@ -2638,9 +2637,6 @@ msgstr ""
 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."
@@ -2652,30 +2648,9 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ¤òºÆµ¢Åª¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: ¼°É¾²Á¤ÏÍ­¸ú¤Êpython¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr "E859: ÊÖ¤µ¤ì¤¿python¥ª¥Ö¥¸¥§¥¯¥È¤òvim¤ÎÃͤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-msgid "failed to run the code"
-msgstr "¥³¡¼¥É¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-msgid "E863: return value must be an instance of str"
-msgstr "E863: Ìá¤êÃͤÏʸ»úÎó¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
 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 "index must be int or slice"
-msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÏÀ°¿ô¤«¥¹¥é¥¤¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ ¤Ïʸ»úÎó¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
@@ -4731,18 +4706,10 @@ msgstr "E777: ʸ
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ̵¸ú¤Ê¹àÌܤǤ¹: %s%%[]"
 
-msgid "E339: Pattern too long"
-msgstr "E339: ¥Ñ¥¿¡¼¥ó¤¬Ä¹²á¤®¤Þ¤¹"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( ¤¬Â¿²á¤®¤Þ¤¹"
-
+#
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( ¤¬Â¿²á¤®¤Þ¤¹"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4756,6 +4723,36 @@ msgstr "E54: %s( 
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
+#
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( ¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 ¤½¤Î¾¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: %s%%[] ¤¬¶õ¤Ç¤¹"
+
+msgid "E339: Pattern too long"
+msgstr "E339: ¥Ñ¥¿¡¼¥ó¤¬Ä¹²á¤®¤Þ¤¹"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( ¤¬Â¿²á¤®¤Þ¤¹"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( ¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
@@ -4784,27 +4781,10 @@ msgstr "E64:%s%c 
 msgid "E65: Illegal back reference"
 msgstr "E65: ÉÔÀµ¤Ê¸åÊý»²¾È¤Ç¤¹"
 
-#
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 ¤½¤Î¾¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
 #
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
 
-#
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] ¤¬¶õ¤Ç¤¹"
-
 #
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
@@ -4815,11 +4795,6 @@ msgstr "E678: %s%%[dxouU] 
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
 
-#
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
-
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} Æâ¤Ëʸˡ¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹"
@@ -4827,6 +4802,81 @@ msgstr "E554: %s{...} 
 msgid "External submatches:\n"
 msgstr "³°Éô¤ÎÉôʬ³ºÅö:\n"
 
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= ¤Ë¤Ï 0, 1 ¤â¤·¤¯¤Ï 2 ¤Î¤ß¤¬Â³¤±¤é¤ì¤Þ¤¹¡£"
+"Àµµ¬É½¸½¥¨¥ó¥¸¥ó¤Ï¼«Æ°ÁªÂò¤µ¤ì¤Þ¤¹¡£"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (NFA Àµµ¬É½¸½) °ÌÃÖ¤¬¸í¤Ã¤Æ¤¤¤Þ¤¹: %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) ´üÂÔ¤è¤êÁ᤯Àµµ¬É½¸½¤Î½ªÃ¼¤ËÅþ㤷¤Þ¤·¤¿"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) ̤ÃΤΥª¥Ú¥ì¡¼¥¿¤Ç¤¹: '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) ̤ÃΤΥª¥Ú¥ì¡¼¥¿¤Ç¤¹: '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Åù²Á¥¯¥é¥¹¤ò´Þ¤àNFA¹½Ãۤ˼ºÇÔ¤·¤Þ¤·¤¿!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) ̤ÃΤΥª¥Ú¥ì¡¼¥¿¤Ç¤¹: '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (NFA Àµµ¬É½¸½) ·«¤êÊÖ¤·¤ÎÀ©¸Â²ó¿ô¤òÆɹþÃæ¤Ë¥¨¥é¡¼"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (NFA Àµµ¬É½¸½) ·«¤êÊÖ¤· ¤Î¸å¤Ë ·«¤êÊÖ¤· ¤Ï¤Ç¤­¤Þ¤»¤ó!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA Àµµ¬É½¸½) '(' ¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA Àµµ¬É½¸½) \\z( ¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (NFA Àµµ¬É½¸½) ½ªÃ¼µ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (NFA) ¥¹¥¿¥Ã¥¯¤ò¥Ý¥Ã¥×¤Ç¤­¤Þ¤»¤ó!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (NFA Àµµ¬É½¸½) (¸åÃÖʸ»úÎó¤òNFA¤ËÊÑ´¹Ãæ¤Ë) "
+"¥¹¥¿¥Ã¥¯¤Ë»Ä¤µ¤ì¤¿¥¹¥Æ¡¼¥È¤¬Â¿²á¤®¤Þ¤¹"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA Àµµ¬É½¸½) NFAÁ´ÂΤòÊݸ¤¹¤ë¤Ë¤Ï¶õ¤­¥¹¥Ú¡¼¥¹¤¬Â­¤ê¤Þ¤»¤ó"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) ¸½ºß²£ÃÇÃæ¤Î¥Ö¥é¥ó¥Á¤Ë½½Ê¬¤Ê¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr "NFAÀµµ¬É½¸½¥¨¥ó¥¸¥óÍÑ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ò½ñ¹þÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó¡£"
+"¥í¥°¤Ïɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤¹¡£"
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) ¥í¥°¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "NFAÀµµ¬É½¸½¥¨¥ó¥¸¥óÍÑ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ò½ñ¹þÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó¡£"
+
 msgid " VREPLACE"
 msgstr " ²¾ÁÛÃÖ´¹"
 
@@ -5326,6 +5376,9 @@ msgstr "E782: .sug 
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP ¥¨¥ó¥È¥ê¤Ë½Åʣʸ»ú¤¬Â¸ºß¤·¤Þ¤¹"
 
+msgid "No Syntax items defined for this buffer"
+msgstr "¤³¤Î¥Ð¥Ã¥Õ¥¡¤ËÄêµÁ¤µ¤ì¤¿¹½Ê¸Í×ÁǤϤ¢¤ê¤Þ¤»¤ó"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
@@ -5334,9 +5387,6 @@ msgstr "E390: 
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ¤½¤Î¤è¤¦¤Ê¹½Ê¸¥¯¥é¥¹¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "¤³¤Î¥Ð¥Ã¥Õ¥¡¤ËÄêµÁ¤µ¤ì¤¿¹½Ê¸Í×ÁǤϤ¢¤ê¤Þ¤»¤ó"
-
 msgid "syncing on C-style comments"
 msgstr "C¸À¸ìÉ÷¥³¥á¥ó¥È¤«¤éƱ´üÃæ"
 
@@ -5462,6 +5512,11 @@ msgstr "E409: ̤
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ̵¸ú¤Ê :syntax ¤Î¥µ¥Ö¥³¥Þ¥ó¥É: %s"
 
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim ¤ÎºÆµ¢¸Æ¤Ó½Ð¤·¤ò¸¡½Ð¤·¤Þ¤·¤¿"
 
@@ -6513,107 +6568,154 @@ msgstr "
 msgid "Need encryption key for \"%s\""
 msgstr "°Å¹æ¥­¡¼¤¬É¬ÍפǤ¹: \"%s\""
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+msgid "empty keys are not allowed"
+msgstr "¶õ¤Î¥­¡¼¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+msgid "dictionary is locked"
+msgstr "¼­½ñ¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+msgid "list is locked"
+msgstr "¥ê¥¹¥È¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "¼­½ñ¤Ë¥­¡¼ '%s' ¤òÄɲ乤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï %s ¤Ç¤Ï¤Ê¤¯À°¿ô¤«¥¹¥é¥¤¥¹¤Ë¤·¤Æ¤¯¤À¤µ¤¤"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() ¤â¤·¤¯¤Ï unicode() ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() ¤â¤·¤¯¤Ï str() ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() ¤«¤½¤ì¤ØÊÑ´¹²Äǽ¤Ê¤â¤Î¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() ¤«¤½¤ì¤ØÊÑ´¹²Äǽ¤Ê¤â¤Î¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
+
+msgid "value is too large to fit into C int type"
+msgstr "C¸À¸ì¤Î int ·¿¤È¤·¤Æ¤ÏÃͤ¬Â礭²á¤®¤Þ¤¹"
 
-msgid "softspace must be an integer"
-msgstr "softspace ¤Ï integer ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+msgid "value is too small to fit into C int type"
+msgstr "C¸À¸ì¤Î int ·¿¤È¤·¤Æ¤ÏÃͤ¬¾®¤µ²á¤®¤Þ¤¹"
 
-msgid "invalid attribute"
-msgstr "̵¸ú¤Ê°À­¤Ç¤¹"
+msgid "number must be greater then zero"
+msgstr "¿ôÃÍ¤Ï 0 ¤è¤êÂ礭¤¯¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-msgid "writelines() requires list of strings"
-msgstr "writelines() ¤Ë¤Ïʸ»úÎó¤Î¥ê¥¹¥È¤¬É¬ÍפǤ¹"
+msgid "number must be greater or equal to zero"
+msgstr "¿ôÃÍ¤Ï 0 ¤«¤½¤ì°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "̵¸ú¤Ê°À­¤Ç¤¹: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/O¥ª¥Ö¥¸¥§¥¯¥È¤Î½é´ü²½¥¨¥é¡¼"
 
-msgid "empty keys are not allowed"
-msgstr "¶õ¤Î¥­¡¼¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgid "failed to change directory"
+msgstr "¼­½ñ¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-msgid "Cannot delete DictionaryObject attributes"
-msgstr "DictionaryObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 2 Í×ÁǤΥ¿¥×¥ë)"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "impl.find_module() ¤¬ %d Í×ÁǤΥ¿¥×¥ë¤òÊÖ¤·¤Þ¤·¤¿ (´üÂÔÃÍ: 2)"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "ÆâÉô¥¨¥é¡¼: imp.find_module ¤¬ NULL ¤ò´Þ¤à¥¿¥×¥ë¤òÊÖ¤·¤Þ¤·¤¿"
 
-msgid "Cannot modify fixed dictionary"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary°À­¤Ï¾Ã¤»¤Þ¤»¤ó"
+
+msgid "cannot modify fixed dictionary"
 msgstr "¸ÇÄꤵ¤ì¤¿¼­½ñ¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-msgid "Cannot set this attribute"
-msgstr "¤³¤Î°À­¤ÏÀßÄê¤Ç¤­¤Þ¤»¤ó"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "°À­ %s ¤ÏÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-msgid "dict is locked"
-msgstr "¼­½ñ¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+msgid "hashtab changed during iteration"
+msgstr "¥¤¥Æ¥ì¡¼¥·¥ç¥óÃæ¤Ë hashtab ¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
 
-msgid "failed to add key to dictionary"
-msgstr "¼­½ñ¤Ø¤Î¥­¡¼¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "¥·¡¼¥±¥ó¥¹¤ÎÍ×ÁÇ¿ô¤Ë¤Ï 2 ¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¤¬ %d ¤Ç¤·¤¿"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "¥ê¥¹¥È¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¥­¡¼¥ï¡¼¥É°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó"
 
 msgid "list index out of range"
 msgstr "¥ê¥¹¥ÈÈϰϳ°¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤¹"
 
-msgid "internal error: failed to get vim list item"
-msgstr "ÆâÉô¥¨¥é¡¼: vim¤Î¥ê¥¹¥ÈÍ×ÁǤμèÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-
-msgid "list is locked"
-msgstr "¥ê¥¹¥È¤Ï¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "ÆâÉô¥¨¥é¡¼: vim¤Î¥ê¥¹¥ÈÍ×ÁÇ %d ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-msgid "Failed to add item to list"
+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 "¥¹¥é¥¤¥¹¤Ë¤Ï¥ê¥¹¥È¤À¤±¤¬ÂåÆþ¤Ç¤­¤Þ¤¹"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "ÆâÉô¥¨¥é¡¼: vim¤Î¥ê¥¹¥ÈÍ×ÁÇ %d ¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 msgid "internal error: failed to add item to list"
 msgstr "ÆâÉô¥¨¥é¡¼: ¥ê¥¹¥È¤Ø¤ÎÍ×ÁÇÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
 
-msgid "can only concatenate with lists"
-msgstr "¥ê¥¹¥È¤È¤Î¤ßÀܳ¤Ç¤­¤Þ¤¹"
-
-msgid "cannot delete vim.dictionary attributes"
-msgstr "vim.dictionary°À­¤Ï¾Ã¤»¤Þ¤»¤ó"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List °À­¤Ï¾Ã¤»¤Þ¤»¤ó"
 
 msgid "cannot modify fixed list"
 msgstr "¸ÇÄꤵ¤ì¤¿¥ê¥¹¥È¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-msgid "cannot set this attribute"
-msgstr "¤³¤Î°À­¤ÏÀßÄê¤Ç¤­¤Þ¤»¤ó"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "̵̾´Ø¿ô %s ¤Ï¸ºß¤·¤Þ¤»¤ó"
 
-msgid "'self' argument must be a dictionary"
-msgstr "'self' °ú¿ô¤Ï¼­½ñ·¿¤ÎÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+#, c-format
+msgid "function %s does not exist"
+msgstr "´Ø¿ô %s ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-msgid "failed to run function"
-msgstr "´Ø¿ô¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgid "function constructor does not accept keyword arguments"
+msgstr "´Ø¿ô¤Î¥³¥ó¥¹¥È¥é¥¯¥¿¤Ï¥­¡¼¥ï¡¼¥É°ú¿ô¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "´Ø¿ô %s ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 msgid "unable to get option value"
 msgstr "¥ª¥×¥·¥ç¥ó¤ÎÃͤϼèÆÀ¤Ç¤­¤Þ¤»¤ó"
 
-msgid "unable to unset global option"
-msgstr "¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥ó¤ÎÀßÄê²ò½ü¤Ï¤Ç¤­¤Þ¤»¤ó"
-
-msgid "unable to unset option without global value"
-msgstr "¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤ò»È¤ï¤º¤Ë¥ª¥×¥·¥ç¥ó¤ÎÀßÄê²ò½ü¤Ï¤Ç¤­¤Þ¤»¤ó"
-
-msgid "object must be integer"
-msgstr "¥ª¥Ö¥¸¥§¥¯¥È¤ÏÀ°¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+msgid "internal error: unknown option type"
+msgstr "ÆâÉô¥¨¥é¡¼: ̤ÃΤΥª¥×¥·¥ç¥ó·¿¤Ç¤¹"
 
-msgid "object must be string"
-msgstr "¥ª¥Ö¥¸¥§¥¯¥È¤Ïʸ»úÎó¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-msgid "attempt to refer to deleted tab page"
-msgstr "ºï½ü¤µ¤ì¤¿¥¿¥Ö¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
+msgid "problem while switching windows"
+msgstr "¥¦¥£¥ó¥É¥¦¤òÀÚ´¹Ãæ¤ËÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿"
 
 #, c-format
-msgid "<tabpage object (deleted) at %p>"
-msgstr "<¥¿¥Ö¥Ú¡¼¥¸¥ª¥Ö¥¸¥§¥¯¥È (¾ÃµîºÑ¤ß) %p>"
+msgid "unable to unset global option %s"
+msgstr "¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥ó %s ¤ÎÀßÄê²ò½ü¤Ï¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
-msgid "<tabpage object (unknown) at %p>"
-msgstr "<¥¿¥Ö¥Ú¡¼¥¸¥ª¥Ö¥¸¥§¥¯¥È (ÉÔÌÀ) %p>"
+msgid "unable to unset option %s which does not have global value"
+msgstr "¥°¥í¡¼¥Ð¥ë¤ÊÃͤÎ̵¤¤¥ª¥×¥·¥ç¥ó %s ¤ÎÀßÄê²ò½ü¤Ï¤Ç¤­¤Þ¤»¤ó"
 
-#, c-format
-msgid "<tabpage %d>"
-msgstr "<¥¿¥Ö¥Ú¡¼¥¸ %d>"
+msgid "attempt to refer to deleted tab page"
+msgstr "ºï½ü¤µ¤ì¤¿¥¿¥Ö¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
 
 msgid "no such tab page"
 msgstr "¤½¤Î¤è¤¦¤Ê¥¿¥Ö¥Ú¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó"
@@ -6621,45 +6723,35 @@ msgstr "
 msgid "attempt to refer to deleted window"
 msgstr "ºï½ü¤µ¤ì¤¿¥¦¥£¥ó¥É¥¦¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
 
-msgid "readonly attribute"
-msgstr "ÆɹþÀìÍÑ°À­"
+msgid "readonly attribute: buffer"
+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 "ºï½ü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤ò»²¾È¤·¤è¤¦¤È¤·¤Þ¤·¤¿"
 
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<¥Ð¥Ã¥Õ¥¡¥ª¥Ö¥¸¥§¥¯¥È (¾ÃµîºÑ¤ß) %p>"
+msgid "failed to rename buffer"
+msgstr "¥Ð¥Ã¥Õ¥¡Ì¾¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-msgid "key must be integer"
-msgstr "¥­¡¼¤ÏÀ°¿ôÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+msgid "mark name must be a single character"
+msgstr "¥Þ¡¼¥¯Ì¾¤Ï1ʸ»ú¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-msgid "expected vim.buffer object"
-msgstr "vim.buffer¥ª¥Ö¥¸¥§¥¯¥È¤ò´üÂÔ¤·¤Æ¤¤¤Þ¤¹"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Buffer¥ª¥Ö¥¸¥§¥¯¥È¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
 
-msgid "failed to switch to given buffer"
-msgstr "»ØÄꤵ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ø¤ÎÀÚ¤êÂؤ¨¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "»ØÄꤵ¤ì¤¿¥Ð¥Ã¥Õ¥¡ %d ¤Ø¤ÎÀÚ¤êÂؤ¨¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-msgid "expected vim.window object"
-msgstr "vim.window¥ª¥Ö¥¸¥§¥¯¥È¤ò´üÂÔ¤·¤Æ¤¤¤Þ¤¹"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Window¥ª¥Ö¥¸¥§¥¯¥È¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
 
 msgid "failed to find window in the current tab page"
 msgstr "¸½ºß¤Î¥¿¥Ö¤Ë¤Ï»ØÄꤵ¤ì¤¿¥¦¥£¥ó¥É¥¦¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
@@ -6667,17 +6759,50 @@ msgstr "
 msgid "did not switch to the specified window"
 msgstr "»ØÄꤵ¤ì¤¿¥¦¥£¥ó¥É¥¦¤ËÀÚ¤êÂؤ¨¤Þ¤»¤ó¤Ç¤·¤¿"
 
-msgid "expected vim.tabpage object"
-msgstr "vim.tabpage¥ª¥Ö¥¸¥§¥¯¥È¤ò´üÂÔ¤·¤Æ¤¤¤Þ¤¹"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPage¥ª¥Ö¥¸¥§¥¯¥È¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ë %s ¤Ç¤·¤¿"
 
 msgid "did not switch to the specified tab page"
 msgstr "»ØÄꤵ¤ì¤¿¥¿¥Ö¥Ú¡¼¥¸¤ËÀÚ¤êÂؤ¨¤Þ¤»¤ó¤Ç¤·¤¿"
 
-msgid "unable to convert to vim structure"
-msgstr "vim¤Î¹½Â¤ÂΤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
+msgid "failed to run the code"
+msgstr "¥³¡¼¥É¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: ¼°É¾²Á¤ÏÍ­¸ú¤Êpython¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: ÊÖ¤µ¤ì¤¿python¥ª¥Ö¥¸¥§¥¯¥È¤òvim¤ÎÃͤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vim¤Î¼­½ñ·¿¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s ¤òvim¤Î¹½Â¤ÂΤËÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
 
-msgid "NULL reference passed"
-msgstr "NULL»²¾È¤¬ÅϤµ¤ì¤Þ¤·¤¿"
+msgid "internal error: NULL reference passed"
+msgstr "ÆâÉô¥¨¥é¡¼: NULL»²¾È¤¬ÅϤµ¤ì¤Þ¤·¤¿"
 
 msgid "internal error: invalid value type"
 msgstr "ÆâÉô¥¨¥é¡¼: ̵¸ú¤ÊÃÍ·¿¤Ç¤¹"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"¥Ñ¥¹¥Õ¥Ã¥¯¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: sys.path_hooks ¤¬¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+"¤¹¤°¤Ë²¼µ­¤ò¼Â»Ü¤·¤Æ¤¯¤À¤µ¤¤:\n"
+"- vim.path_hooks ¤ò sys.path_hooks ¤ØÄɲÃ\n"
+"- vim.VIM_SPECIAL_PATH ¤ò sys.path ¤ØÄɲÃ\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"¥Ñ¥¹¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: sys.path ¤¬¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+"¤¹¤°¤Ë vim.VIM_SPECIAL_PATH ¤ò sys.path ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤"
diff --git a/src/po/ja.po b/src/po/ja.po
index 563f246a9..a0ee4c2af 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,9 +3,9 @@
 # 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: 2013 May 19
+# Last Change: 2013 Jul 06
 #
-# Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
 # Original translations.
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-19 12:20+0900\n"
-"PO-Revision-Date: 2013-05-19 12:30+0900\n"
+"POT-Creation-Date: 2013-07-06 13:50+0900\n"
+"PO-Revision-Date: 2013-07-06 15:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language: Japanese\n"
@@ -141,6 +141,9 @@ msgstr "[新ファイル]"
 msgid "[Read errors]"
 msgstr "[読込エラー]"
 
+msgid "[RO]"
+msgstr "[読専]"
+
 msgid "[readonly]"
 msgstr "[読込専用]"
 
@@ -424,6 +427,9 @@ msgstr "E130: 未知の関数です: %s"
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: 浮動小数点数を文字列として扱っています"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
 
@@ -584,13 +590,13 @@ msgstr "E785: complete() は挿入モードでしか利用できません"
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "extend() argument"
-msgstr "extend() の引数"
-
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: キーは既に存在します: %s"
 
+msgid "extend() argument"
+msgstr "extend() の引数"
+
 msgid "map() argument"
 msgstr "map() の引数"
 
@@ -689,9 +695,6 @@ msgstr "E730: リスト型を文字列として扱っています"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: 辞書型を文字列として扱っています"
 
-msgid "E806: using Float as a String"
-msgstr "E806: 浮動小数点数を文字列として扱っています"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: 変数の型が一致しません: %s"
@@ -1647,9 +1650,6 @@ msgstr "[ソケット]"
 msgid "[character special]"
 msgstr "[キャラクタ・デバイス]"
 
-msgid "[RO]"
-msgstr "[読専]"
-
 msgid "[CR missing]"
 msgstr "[CR無]"
 
@@ -2246,32 +2246,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "フォント '%s' は固定幅ではありません"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: フォントセット名: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: フォントセット名: %s"
 
 #, c-format
-msgid "Font0: %s\n"
-msgstr "フォント0: %s\n"
+msgid "Font0: %s"
+msgstr "フォント0: %s"
 
 #, c-format
-msgid "Font1: %s\n"
-msgstr "フォント1: %s\n"
+msgid "Font1: %s"
+msgstr "フォント1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "フォント%ld の幅がフォント0の2倍ではありません\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "フォント%ld の幅がフォント0の2倍ではありません"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "フォント0の幅: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "フォント0の幅: %ld"
 
 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"フォント1の幅: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "フォント1の幅: %ld"
 
 msgid "Invalid font specification"
 msgstr "無効なフォント指定です"
@@ -2460,6 +2456,9 @@ msgstr "E566: cscopeパイプを作成できませんでした"
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscopeの起動準備(fork)に失敗しました"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection への setpgid に失敗しました"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection の実行に失敗しました"
 
@@ -2638,9 +2637,6 @@ msgstr ""
 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."
@@ -2652,30 +2648,9 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python を再帰的に実行することはできません"
 
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
-
-msgid "failed to run the code"
-msgstr "コードの実行に失敗しました"
-
-msgid "E863: return value must be an instance of str"
-msgstr "E863: 戻り値は文字列のインスタンスでなければなりません"
-
 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 "index must be int or slice"
-msgstr "インデックスは整数かスライスでなければなりません"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ は文字列のインスタンスでなければなりません"
 
@@ -4731,18 +4706,10 @@ msgstr "E777: 文字列かリストが必要です"
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: 無効な項目です: %s%%[]"
 
-msgid "E339: Pattern too long"
-msgstr "E339: パターンが長過ぎます"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( が多過ぎます"
-
+#
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( が多過ぎます"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( が釣り合っていません"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ の後に ] がありません"
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4756,6 +4723,36 @@ msgstr "E54: %s( が釣り合っていません"
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) が釣り合っていません"
 
+#
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( はココでは許可されていません"
+
+#
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 その他はココでは許可されていません"
+
+#
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ の後に ] がありません"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: %s%%[] が空です"
+
+msgid "E339: Pattern too long"
+msgstr "E339: パターンが長過ぎます"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( が多過ぎます"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( が多過ぎます"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( が釣り合っていません"
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ の後に不正な文字がありました"
@@ -4784,27 +4781,10 @@ msgstr "E64:%s%c の後になにもありません"
 msgid "E65: Illegal back reference"
 msgstr "E65: 不正な後方参照です"
 
-#
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( はココでは許可されていません"
-
-#
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 その他はココでは許可されていません"
-
 #
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
-#
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ の後に ] がありません"
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] が空です"
-
 #
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
@@ -4815,11 +4795,6 @@ msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% の後に不正な文字がありました"
 
-#
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ の後に ] がありません"
-
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} 内に文法エラーがあります"
@@ -4827,6 +4802,81 @@ msgstr "E554: %s{...} 内に文法エラーがあります"
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。"
+"正規表現エンジンは自動選択されます。"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) 未知のオペレータです: '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) 未知のオペレータです: '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: 等価クラスを含むNFA構築に失敗しました!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) 未知のオペレータです: '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (NFA 正規表現) 繰り返しの制限回数を読込中にエラー"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA 正規表現) '(' が多過ぎます"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA 正規表現) \\z( が多過ぎます"
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (NFA 正規表現) 終端記号がありません"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (NFA) スタックをポップできません!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (NFA 正規表現) (後置文字列をNFAに変換中に) "
+"スタックに残されたステートが多過ぎます"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペースが足りません"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
+"ログは標準出力に出力します。"
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) ログファイル %s を開けません!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
+
 msgid " VREPLACE"
 msgstr " 仮想置換"
 
@@ -5326,6 +5376,9 @@ msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP エントリに重複文字が存在します"
 
+msgid "No Syntax items defined for this buffer"
+msgstr "このバッファに定義された構文要素はありません"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
@@ -5334,9 +5387,6 @@ msgstr "E390: 不正な引数です: %s"
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: そのような構文クラスタはありません: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "このバッファに定義された構文要素はありません"
-
 msgid "syncing on C-style comments"
 msgstr "C言語風コメントから同期中"
 
@@ -5462,6 +5512,11 @@ msgstr "E409: 未知のグループ名: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 無効な :syntax のサブコマンド: %s"
 
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
 
@@ -6513,107 +6568,154 @@ msgstr "下まで検索したので上に戻ります"
 msgid "Need encryption key for \"%s\""
 msgstr "暗号キーが必要です: \"%s\""
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject属性を消せません"
+msgid "empty keys are not allowed"
+msgstr "空のキーは許可されていません"
+
+msgid "dictionary is locked"
+msgstr "辞書はロックされています"
+
+msgid "list is locked"
+msgstr "リストはロックされています"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "辞書にキー '%s' を追加するのに失敗しました"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "インデックスは %s ではなく整数かスライスにしてください"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() もしくは unicode() のインスタンスが期待されているのに %s でした"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() もしくは str() のインスタンスが期待されているのに %s でした"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() かそれへ変換可能なものが期待されているのに %s でした"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() かそれへ変換可能なものが期待されているのに %s でした"
+
+msgid "value is too large to fit into C int type"
+msgstr "C言語の int 型としては値が大き過ぎます"
 
-msgid "softspace must be an integer"
-msgstr "softspace は integer でなければなりません"
+msgid "value is too small to fit into C int type"
+msgstr "C言語の int 型としては値が小さ過ぎます"
 
-msgid "invalid attribute"
-msgstr "無効な属性です"
+msgid "number must be greater then zero"
+msgstr "数値は 0 より大きくなければなりません"
 
-msgid "writelines() requires list of strings"
-msgstr "writelines() には文字列のリストが必要です"
+msgid "number must be greater or equal to zero"
+msgstr "数値は 0 かそれ以上でなければなりません"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject属性を消せません"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "無効な属性です: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
 
-msgid "empty keys are not allowed"
-msgstr "空のキーは許可されていません"
+msgid "failed to change directory"
+msgstr "辞書の変更に失敗しました"
 
-msgid "Cannot delete DictionaryObject attributes"
-msgstr "DictionaryObject属性を消せません"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() が %s を返しました (期待値: 2 要素のタプル)"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "impl.find_module() が %d 要素のタプルを返しました (期待値: 2)"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
 
-msgid "Cannot modify fixed dictionary"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary属性は消せません"
+
+msgid "cannot modify fixed dictionary"
 msgstr "固定された辞書は変更できません"
 
-msgid "Cannot set this attribute"
-msgstr "この属性は設定できません"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "属性 %s は設定できません"
 
-msgid "dict is locked"
-msgstr "辞書はロックされています"
+msgid "hashtab changed during iteration"
+msgstr "イテレーション中に hashtab が変更されました"
 
-msgid "failed to add key to dictionary"
-msgstr "辞書へのキーの追加に失敗しました"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "シーケンスの要素数には 2 が期待されていましたが %d でした"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "リストのコンストラクタはキーワード引数を受け付けません"
 
 msgid "list index out of range"
 msgstr "リスト範囲外のインデックスです"
 
-msgid "internal error: failed to get vim list item"
-msgstr "内部エラー: vimのリスト要素の取得に失敗しました"
-
-msgid "list is locked"
-msgstr "リストはロックされています"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました"
 
-msgid "Failed to add item to list"
+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 "スライスにはリストだけが代入できます"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d はありません"
 
 msgid "internal error: failed to add item to list"
 msgstr "内部エラー: リストへの要素追加に失敗しました"
 
-msgid "can only concatenate with lists"
-msgstr "リストとのみ接続できます"
-
-msgid "cannot delete vim.dictionary attributes"
-msgstr "vim.dictionary属性は消せません"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List 属性は消せません"
 
 msgid "cannot modify fixed list"
 msgstr "固定されたリストは変更できません"
 
-msgid "cannot set this attribute"
-msgstr "この属性は設定できません"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "無名関数 %s は存在しません"
 
-msgid "'self' argument must be a dictionary"
-msgstr "'self' 引数は辞書型の値でなければなりません"
+#, c-format
+msgid "function %s does not exist"
+msgstr "関数 %s がありません"
 
-msgid "failed to run function"
-msgstr "関数の実行に失敗しました"
+msgid "function constructor does not accept keyword arguments"
+msgstr "関数のコンストラクタはキーワード引数を受け付けません"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "関数 %s の実行に失敗しました"
 
 msgid "unable to get option value"
 msgstr "オプションの値は取得できません"
 
-msgid "unable to unset global option"
-msgstr "グローバルオプションの設定解除はできません"
-
-msgid "unable to unset option without global value"
-msgstr "グローバル変数を使わずにオプションの設定解除はできません"
-
-msgid "object must be integer"
-msgstr "オブジェクトは整数でなければなりません"
+msgid "internal error: unknown option type"
+msgstr "内部エラー: 未知のオプション型です"
 
-msgid "object must be string"
-msgstr "オブジェクトは文字列でなければなりません"
-
-msgid "attempt to refer to deleted tab page"
-msgstr "削除されたタブを参照しようとしました"
+msgid "problem while switching windows"
+msgstr "ウィンドウを切換中に問題が発生しました"
 
 #, c-format
-msgid "<tabpage object (deleted) at %p>"
-msgstr "<タブページオブジェクト (消去済み) %p>"
+msgid "unable to unset global option %s"
+msgstr "グローバルオプション %s の設定解除はできません"
 
 #, c-format
-msgid "<tabpage object (unknown) at %p>"
-msgstr "<タブページオブジェクト (不明) %p>"
+msgid "unable to unset option %s which does not have global value"
+msgstr "グローバルな値の無いオプション %s の設定解除はできません"
 
-#, c-format
-msgid "<tabpage %d>"
-msgstr "<タブページ %d>"
+msgid "attempt to refer to deleted tab page"
+msgstr "削除されたタブを参照しようとしました"
 
 msgid "no such tab page"
 msgstr "そのようなタブページはありません"
@@ -6621,45 +6723,35 @@ msgstr "そのようなタブページはありません"
 msgid "attempt to refer to deleted window"
 msgstr "削除されたウィンドウを参照しようとしました"
 
-msgid "readonly attribute"
-msgstr "読込専用属性"
+msgid "readonly attribute: buffer"
+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 "削除されたバッファを参照しようとしました"
 
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<バッファオブジェクト (消去済み) %p>"
+msgid "failed to rename buffer"
+msgstr "バッファ名の変更に失敗しました"
 
-msgid "key must be integer"
-msgstr "キーは整数値でなければなりません"
+msgid "mark name must be a single character"
+msgstr "マーク名は1文字のアルファベットでなければなりません"
 
-msgid "expected vim.buffer object"
-msgstr "vim.bufferオブジェクトを期待しています"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Bufferオブジェクトが期待されているのに %s でした"
 
-msgid "failed to switch to given buffer"
-msgstr "指定されたバッファへの切り替えに失敗しました"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "指定されたバッファ %d への切り替えに失敗しました"
 
-msgid "expected vim.window object"
-msgstr "vim.windowオブジェクトを期待しています"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Windowオブジェクトが期待されているのに %s でした"
 
 msgid "failed to find window in the current tab page"
 msgstr "現在のタブには指定されたウィンドウがありませんでした"
@@ -6667,17 +6759,50 @@ msgstr "現在のタブには指定されたウィンドウがありませんで
 msgid "did not switch to the specified window"
 msgstr "指定されたウィンドウに切り替えませんでした"
 
-msgid "expected vim.tabpage object"
-msgstr "vim.tabpageオブジェクトを期待しています"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPageオブジェクトが期待されているのに %s でした"
 
 msgid "did not switch to the specified tab page"
 msgstr "指定されたタブページに切り替えませんでした"
 
-msgid "unable to convert to vim structure"
-msgstr "vimの構造体に変換できません"
+msgid "failed to run the code"
+msgstr "コードの実行に失敗しました"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vimの辞書型に変換できません"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s をvimの構造体に変換できません"
 
-msgid "NULL reference passed"
-msgstr "NULL参照が渡されました"
+msgid "internal error: NULL reference passed"
+msgstr "内部エラー: NULL参照が渡されました"
 
 msgid "internal error: invalid value type"
 msgstr "内部エラー: 無効な値型です"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"パスフックの設定に失敗しました: sys.path_hooks がリストではありません\n"
+"すぐに下記を実施してください:\n"
+"- vim.path_hooks を sys.path_hooks へ追加\n"
+"- vim.VIM_SPECIAL_PATH を sys.path へ追加\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"パスの設定に失敗しました: sys.path がリストではありません\n"
+"すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index f0ce9c513..27659425b 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,9 +3,9 @@
 # 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: 2013 May 19
+# Last Change: 2013 Jul 06
 #
-# Copyright (C) 2001-12 MURAOKA Taro <koron.kaoriya@gmail.com>
+# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
 # Original translations.
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-19 12:20+0900\n"
-"PO-Revision-Date: 2013-05-19 12:30+0900\n"
+"POT-Creation-Date: 2013-07-06 13:50+0900\n"
+"PO-Revision-Date: 2013-07-06 15:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language: Japanese\n"
@@ -141,6 +141,9 @@ msgstr "[
 msgid "[Read errors]"
 msgstr "[“ǍžƒGƒ‰[]"
 
+msgid "[RO]"
+msgstr "[“ǐê]"
+
 msgid "[readonly]"
 msgstr "[“Ǎžê—p]"
 
@@ -424,6 +427,9 @@ msgstr "E130: 
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: •s³‚ȕϐ”–¼‚Å‚·: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: •‚“®¬”“_”‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: ƒ^[ƒQƒbƒg‚ªƒŠƒXƒgŒ^“à‚Ì—v‘f‚æ‚è‚à­‚È‚¢‚Å‚·"
 
@@ -584,13 +590,13 @@ msgstr "E785: complete() 
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "extend() argument"
-msgstr "extend() ‚̈ø”"
-
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: ƒL[‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·: %s"
 
+msgid "extend() argument"
+msgstr "extend() ‚̈ø”"
+
 msgid "map() argument"
 msgstr "map() ‚̈ø”"
 
@@ -689,9 +695,6 @@ msgstr "E730: 
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Ž«‘Œ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
 
-msgid "E806: using Float as a String"
-msgstr "E806: •‚“®¬”“_”‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: •Ï”‚ÌŒ^‚ªˆê’v‚µ‚Ü‚¹‚ñ: %s"
@@ -1647,9 +1650,6 @@ msgstr "[
 msgid "[character special]"
 msgstr "[ƒLƒƒƒ‰ƒNƒ^EƒfƒoƒCƒX]"
 
-msgid "[RO]"
-msgstr "[“ǐê]"
-
 msgid "[CR missing]"
 msgstr "[CR–³]"
 
@@ -2246,32 +2246,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "ƒtƒHƒ“ƒg '%s' ‚͌Œ蕝‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: ƒtƒHƒ“ƒgƒZƒbƒg–¼: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: ƒtƒHƒ“ƒgƒZƒbƒg–¼: %s"
 
 #, c-format
-msgid "Font0: %s\n"
-msgstr "ƒtƒHƒ“ƒg0: %s\n"
+msgid "Font0: %s"
+msgstr "ƒtƒHƒ“ƒg0: %s"
 
 #, c-format
-msgid "Font1: %s\n"
-msgstr "ƒtƒHƒ“ƒg1: %s\n"
+msgid "Font1: %s"
+msgstr "ƒtƒHƒ“ƒg1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "ƒtƒHƒ“ƒg%ld ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì2”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "ƒtƒHƒ“ƒg%ld ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì2”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "ƒtƒHƒ“ƒg0‚Ì•: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "ƒtƒHƒ“ƒg0‚Ì•: %ld"
 
 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"ƒtƒHƒ“ƒg1‚Ì•: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "ƒtƒHƒ“ƒg1‚Ì•: %ld"
 
 msgid "Invalid font specification"
 msgstr "–³Œø‚ȃtƒHƒ“ƒgŽw’è‚Å‚·"
@@ -2460,6 +2456,9 @@ msgstr "E566: cscope
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope‚Ì‹N“®€”õ(fork)‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection ‚Ö‚Ì setpgid ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
@@ -2638,9 +2637,6 @@ msgstr ""
 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."
@@ -2652,30 +2648,9 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ‚ðÄ‹A“I‚ÉŽÀs‚·‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: Ž®•]‰¿‚Í—LŒø‚ÈpythonƒIƒuƒWƒFƒNƒg‚ð•Ô‚µ‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr "E859: •Ô‚³‚ꂽpythonƒIƒuƒWƒFƒNƒg‚ðvim‚Ì’l‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-msgid "failed to run the code"
-msgstr "ƒR[ƒh‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-
-msgid "E863: return value must be an instance of str"
-msgstr "E863: –ß‚è’l‚Í•¶Žš—ñ‚̃Cƒ“ƒXƒ^ƒ“ƒX‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
 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 "index must be int or slice"
-msgstr "ƒCƒ“ƒfƒbƒNƒX‚͐®”‚©ƒXƒ‰ƒCƒX‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ ‚Í•¶Žš—ñ‚̃Cƒ“ƒXƒ^ƒ“ƒX‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
@@ -4731,18 +4706,10 @@ msgstr "E777: 
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: –³Œø‚ȍ€–Ú‚Å‚·: %s%%[]"
 
-msgid "E339: Pattern too long"
-msgstr "E339: ƒpƒ^[ƒ“‚ª’·‰ß‚¬‚Ü‚·"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( ‚ª‘½‰ß‚¬‚Ü‚·"
-
+#
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( ‚ª‘½‰ß‚¬‚Ü‚·"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( ‚ª’ނ荇‚Á‚Ä‚¢‚Ü‚¹‚ñ"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4756,6 +4723,36 @@ msgstr "E54: %s( 
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ‚ª’ނ荇‚Á‚Ä‚¢‚Ü‚¹‚ñ"
 
+#
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 ‚»‚Ì‘¼‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: %s%%[] ‚ª‹ó‚Å‚·"
+
+msgid "E339: Pattern too long"
+msgstr "E339: ƒpƒ^[ƒ“‚ª’·‰ß‚¬‚Ü‚·"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( ‚ª‘½‰ß‚¬‚Ü‚·"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( ‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( ‚ª’ނ荇‚Á‚Ä‚¢‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
@@ -4784,27 +4781,10 @@ msgstr "E64:%s%c 
 msgid "E65: Illegal back reference"
 msgstr "E65: •s³‚ÈŒã•ûŽQÆ‚Å‚·"
 
-#
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 ‚»‚Ì‘¼‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
 #
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
 
-#
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] ‚ª‹ó‚Å‚·"
-
 #
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
@@ -4815,11 +4795,6 @@ msgstr "E678: %s%%[dxouU] 
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
 
-#
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
-
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} “à‚É•¶–@ƒGƒ‰[‚ª‚ ‚è‚Ü‚·"
@@ -4827,6 +4802,81 @@ msgstr "E554: %s{...} 
 msgid "External submatches:\n"
 msgstr "ŠO•”‚Ì•”•ªŠY“–:\n"
 
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= ‚É‚Í 0, 1 ‚à‚µ‚­‚Í 2 ‚Ì‚Ý‚ª‘±‚¯‚ç‚ê‚Ü‚·B"
+"³‹K•\\Œ»ƒGƒ“ƒWƒ“‚ÍŽ©“®‘I‘ð‚³‚ê‚Ü‚·B"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (NFA ³‹K•\\Œ») ˆÊ’u‚ªŒë‚Á‚Ä‚¢‚Ü‚·: %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) Šú‘Ò‚æ‚葁‚­³‹K•\\Œ»‚̏I’[‚É“ž’B‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) –¢’m‚̃IƒyƒŒ[ƒ^‚Å‚·: '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) –¢’m‚̃IƒyƒŒ[ƒ^‚Å‚·: '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: “™‰¿ƒNƒ‰ƒX‚ðŠÜ‚ÞNFA\\’z‚ÉŽ¸”s‚µ‚Ü‚µ‚½!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) –¢’m‚̃IƒyƒŒ[ƒ^‚Å‚·: '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (NFA ³‹K•\\Œ») ŒJ‚è•Ô‚µ‚̐§ŒÀ‰ñ”‚ð“Ǎž’†‚ɃGƒ‰["
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (NFA ³‹K•\\Œ») ŒJ‚è•Ô‚µ ‚ÌŒã‚É ŒJ‚è•Ô‚µ ‚Í‚Å‚«‚Ü‚¹‚ñ!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA ³‹K•\\Œ») '(' ‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA ³‹K•\\Œ») \\z( ‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (NFA ³‹K•\\Œ») I’[‹L†‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (NFA) ƒXƒ^ƒbƒN‚ðƒ|ƒbƒv‚Å‚«‚Ü‚¹‚ñ!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (NFA ³‹K•\\Œ») (Œã’u•¶Žš—ñ‚ðNFA‚É•ÏŠ·’†‚É) "
+"ƒXƒ^ƒbƒN‚ÉŽc‚³‚ꂽƒXƒe[ƒg‚ª‘½‰ß‚¬‚Ü‚·"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA ³‹K•\\Œ») NFA‘S‘Ì‚ð•Û‘¶‚·‚é‚ɂ͋󂫃Xƒy[ƒX‚ª‘«‚è‚Ü‚¹‚ñ"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) Œ»Ý‰¡’f’†‚̃uƒ‰ƒ“ƒ`‚ɏ\\•ª‚ȃƒ‚ƒŠ‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr "NFA³‹K•\\Œ»ƒGƒ“ƒWƒ“—p‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘ž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñB"
+"ƒƒO‚Í•W€o—͂ɏo—Í‚µ‚Ü‚·B"
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) ƒƒOƒtƒ@ƒCƒ‹ %s ‚ðŠJ‚¯‚Ü‚¹‚ñ!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "NFA³‹K•\\Œ»ƒGƒ“ƒWƒ“—p‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘ž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñB"
+
 msgid " VREPLACE"
 msgstr " ‰¼‘z’uŠ·"
 
@@ -5326,6 +5376,9 @@ msgstr "E782: .sug 
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP ƒGƒ“ƒgƒŠ‚ɏd•¡•¶Žš‚ª‘¶Ý‚µ‚Ü‚·"
 
+msgid "No Syntax items defined for this buffer"
+msgstr "‚±‚̃oƒbƒtƒ@‚É’è‹`‚³‚ꂽ\\•¶—v‘f‚Í‚ ‚è‚Ü‚¹‚ñ"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: •s³‚Ȉø”‚Å‚·: %s"
@@ -5334,9 +5387,6 @@ msgstr "E390: 
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ‚»‚̂悤‚ȍ\\•¶ƒNƒ‰ƒXƒ^‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "‚±‚̃oƒbƒtƒ@‚É’è‹`‚³‚ꂽ\\•¶—v‘f‚Í‚ ‚è‚Ü‚¹‚ñ"
-
 msgid "syncing on C-style comments"
 msgstr "CŒ¾Œê•—ƒRƒƒ“ƒg‚©‚瓯Šú’†"
 
@@ -5462,6 +5512,11 @@ msgstr "E409: 
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: –³Œø‚È :syntax ‚̃TƒuƒRƒ}ƒ“ƒh: %s"
 
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim ‚̍ċAŒÄ‚яo‚µ‚ðŒŸo‚µ‚Ü‚µ‚½"
 
@@ -6513,107 +6568,154 @@ msgstr "
 msgid "Need encryption key for \"%s\""
 msgstr "ˆÃ†ƒL[‚ª•K—v‚Å‚·: \"%s\""
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+msgid "empty keys are not allowed"
+msgstr "‹ó‚̃L[‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+msgid "dictionary is locked"
+msgstr "Ž«‘‚̓ƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·"
+
+msgid "list is locked"
+msgstr "ƒŠƒXƒg‚̓ƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "Ž«‘‚ɃL[ '%s' ‚ð’ljÁ‚·‚é‚Ì‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "ƒCƒ“ƒfƒbƒNƒX‚Í %s ‚Å‚Í‚È‚­®”‚©ƒXƒ‰ƒCƒX‚É‚µ‚Ä‚­‚¾‚³‚¢"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() ‚à‚µ‚­‚Í unicode() ‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() ‚à‚µ‚­‚Í str() ‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() ‚©‚»‚ê‚Ö•ÏŠ·‰Â”\\‚È‚à‚Ì‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() ‚©‚»‚ê‚Ö•ÏŠ·‰Â”\\‚È‚à‚Ì‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
+
+msgid "value is too large to fit into C int type"
+msgstr "CŒ¾Œê‚Ì int Œ^‚Æ‚µ‚Ä‚Í’l‚ª‘å‚«‰ß‚¬‚Ü‚·"
 
-msgid "softspace must be an integer"
-msgstr "softspace ‚Í integer ‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+msgid "value is too small to fit into C int type"
+msgstr "CŒ¾Œê‚Ì int Œ^‚Æ‚µ‚Ä‚Í’l‚ª¬‚³‰ß‚¬‚Ü‚·"
 
-msgid "invalid attribute"
-msgstr "–³Œø‚È‘®«‚Å‚·"
+msgid "number must be greater then zero"
+msgstr "”’l‚Í 0 ‚æ‚è‘å‚«‚­‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
-msgid "writelines() requires list of strings"
-msgstr "writelines() ‚É‚Í•¶Žš—ñ‚̃ŠƒXƒg‚ª•K—v‚Å‚·"
+msgid "number must be greater or equal to zero"
+msgstr "”’l‚Í 0 ‚©‚»‚êˆÈã‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "–³Œø‚È‘®«‚Å‚·: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/OƒIƒuƒWƒFƒNƒg‚̏‰Šú‰»ƒGƒ‰["
 
-msgid "empty keys are not allowed"
-msgstr "‹ó‚̃L[‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+msgid "failed to change directory"
+msgstr "Ž«‘‚̕ύX‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
-msgid "Cannot delete DictionaryObject attributes"
-msgstr "DictionaryObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 2 —v‘f‚̃^ƒvƒ‹)"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "impl.find_module() ‚ª %d —v‘f‚̃^ƒvƒ‹‚ð•Ô‚µ‚Ü‚µ‚½ (Šú‘Ò’l: 2)"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "“à•”ƒGƒ‰[: imp.find_module ‚ª NULL ‚ðŠÜ‚Þƒ^ƒvƒ‹‚ð•Ô‚µ‚Ü‚µ‚½"
 
-msgid "Cannot modify fixed dictionary"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary‘®«‚͏Á‚¹‚Ü‚¹‚ñ"
+
+msgid "cannot modify fixed dictionary"
 msgstr "ŒÅ’肳‚ꂽŽ«‘‚͕ύX‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "Cannot set this attribute"
-msgstr "‚±‚Ì‘®«‚͐ݒè‚Å‚«‚Ü‚¹‚ñ"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "‘®« %s ‚͐ݒè‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "dict is locked"
-msgstr "Ž«‘‚̓ƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·"
+msgid "hashtab changed during iteration"
+msgstr "ƒCƒeƒŒ[ƒVƒ‡ƒ“’†‚É hashtab ‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
 
-msgid "failed to add key to dictionary"
-msgstr "Ž«‘‚ւ̃L[‚̒ljÁ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "ƒV[ƒPƒ“ƒX‚Ì—v‘f”‚É‚Í 2 ‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚Ü‚µ‚½‚ª %d ‚Å‚µ‚½"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "ƒŠƒXƒg‚̃Rƒ“ƒXƒgƒ‰ƒNƒ^‚̓L[ƒ[ƒhˆø”‚ðŽó‚¯•t‚¯‚Ü‚¹‚ñ"
 
 msgid "list index out of range"
 msgstr "ƒŠƒXƒg”͈͊O‚̃Cƒ“ƒfƒbƒNƒX‚Å‚·"
 
-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‚³‚ê‚Ä‚¢‚Ü‚·"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "“à•”ƒGƒ‰[: vim‚̃ŠƒXƒg—v‘f %d ‚̎擾‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
-msgid "Failed to add item to list"
+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‚¾‚¯‚ª‘ã“ü‚Å‚«‚Ü‚·"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "“à•”ƒGƒ‰[: vim‚̃ŠƒXƒg—v‘f %d ‚Í‚ ‚è‚Ü‚¹‚ñ"
 
 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 delete vim.dictionary attributes"
-msgstr "vim.dictionary‘®«‚͏Á‚¹‚Ü‚¹‚ñ"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List ‘®«‚͏Á‚¹‚Ü‚¹‚ñ"
 
 msgid "cannot modify fixed list"
 msgstr "ŒÅ’肳‚ꂽƒŠƒXƒg‚͕ύX‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "cannot set this attribute"
-msgstr "‚±‚Ì‘®«‚͐ݒè‚Å‚«‚Ü‚¹‚ñ"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "–³–¼ŠÖ” %s ‚Í‘¶Ý‚µ‚Ü‚¹‚ñ"
 
-msgid "'self' argument must be a dictionary"
-msgstr "'self' ˆø”‚ÍŽ«‘Œ^‚Ì’l‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+#, c-format
+msgid "function %s does not exist"
+msgstr "ŠÖ” %s ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
-msgid "failed to run function"
-msgstr "ŠÖ”‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+msgid "function constructor does not accept keyword arguments"
+msgstr "ŠÖ”‚̃Rƒ“ƒXƒgƒ‰ƒNƒ^‚̓L[ƒ[ƒhˆø”‚ðŽó‚¯•t‚¯‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "ŠÖ” %s ‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
 msgid "unable to get option value"
 msgstr "ƒIƒvƒVƒ‡ƒ“‚Ì’l‚͎擾‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "unable to unset global option"
-msgstr "ƒOƒ[ƒoƒ‹ƒIƒvƒVƒ‡ƒ“‚̐ݒè‰ðœ‚Í‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "unable to unset option without global value"
-msgstr "ƒOƒ[ƒoƒ‹•Ï”‚ðŽg‚킸‚ɃIƒvƒVƒ‡ƒ“‚̐ݒè‰ðœ‚Í‚Å‚«‚Ü‚¹‚ñ"
-
-msgid "object must be integer"
-msgstr "ƒIƒuƒWƒFƒNƒg‚͐®”‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+msgid "internal error: unknown option type"
+msgstr "“à•”ƒGƒ‰[: –¢’m‚̃IƒvƒVƒ‡ƒ“Œ^‚Å‚·"
 
-msgid "object must be string"
-msgstr "ƒIƒuƒWƒFƒNƒg‚Í•¶Žš—ñ‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-
-msgid "attempt to refer to deleted tab page"
-msgstr "íœ‚³‚ꂽƒ^ƒu‚ðŽQÆ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
+msgid "problem while switching windows"
+msgstr "ƒEƒBƒ“ƒhƒE‚ðØŠ·’†‚É–â‘肪”­¶‚µ‚Ü‚µ‚½"
 
 #, c-format
-msgid "<tabpage object (deleted) at %p>"
-msgstr "<ƒ^ƒuƒy[ƒWƒIƒuƒWƒFƒNƒg (Á‹ŽÏ‚Ý) %p>"
+msgid "unable to unset global option %s"
+msgstr "ƒOƒ[ƒoƒ‹ƒIƒvƒVƒ‡ƒ“ %s ‚̐ݒè‰ðœ‚Í‚Å‚«‚Ü‚¹‚ñ"
 
 #, c-format
-msgid "<tabpage object (unknown) at %p>"
-msgstr "<ƒ^ƒuƒy[ƒWƒIƒuƒWƒFƒNƒg (•s–¾) %p>"
+msgid "unable to unset option %s which does not have global value"
+msgstr "ƒOƒ[ƒoƒ‹‚È’l‚Ì–³‚¢ƒIƒvƒVƒ‡ƒ“ %s ‚̐ݒè‰ðœ‚Í‚Å‚«‚Ü‚¹‚ñ"
 
-#, c-format
-msgid "<tabpage %d>"
-msgstr "<ƒ^ƒuƒy[ƒW %d>"
+msgid "attempt to refer to deleted tab page"
+msgstr "íœ‚³‚ꂽƒ^ƒu‚ðŽQÆ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
 
 msgid "no such tab page"
 msgstr "‚»‚̂悤‚ȃ^ƒuƒy[ƒW‚Í‚ ‚è‚Ü‚¹‚ñ"
@@ -6621,45 +6723,35 @@ msgstr "
 msgid "attempt to refer to deleted window"
 msgstr "íœ‚³‚ꂽƒEƒBƒ“ƒhƒE‚ðŽQÆ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
 
-msgid "readonly attribute"
-msgstr "“Ǎžê—p‘®«"
+msgid "readonly attribute: buffer"
+msgstr "“Ǎžê—p‘®«: ƒoƒbƒtƒ@["
 
 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Æ‚µ‚悤‚Æ‚µ‚Ü‚µ‚½"
 
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<ƒoƒbƒtƒ@ƒIƒuƒWƒFƒNƒg (Á‹ŽÏ‚Ý) %p>"
+msgid "failed to rename buffer"
+msgstr "ƒoƒbƒtƒ@–¼‚̕ύX‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
-msgid "key must be integer"
-msgstr "ƒL[‚͐®”’l‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+msgid "mark name must be a single character"
+msgstr "ƒ}[ƒN–¼‚Í1•¶Žš‚̃Aƒ‹ƒtƒ@ƒxƒbƒg‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
 
-msgid "expected vim.buffer object"
-msgstr "vim.bufferƒIƒuƒWƒFƒNƒg‚ðŠú‘Ò‚µ‚Ä‚¢‚Ü‚·"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.BufferƒIƒuƒWƒFƒNƒg‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
 
-msgid "failed to switch to given buffer"
-msgstr "Žw’肳‚ꂽƒoƒbƒtƒ@‚ւ̐؂è‘Ö‚¦‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "Žw’肳‚ꂽƒoƒbƒtƒ@ %d ‚ւ̐؂è‘Ö‚¦‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
-msgid "expected vim.window object"
-msgstr "vim.windowƒIƒuƒWƒFƒNƒg‚ðŠú‘Ò‚µ‚Ä‚¢‚Ü‚·"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.WindowƒIƒuƒWƒFƒNƒg‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
 
 msgid "failed to find window in the current tab page"
 msgstr "Œ»Ý‚̃^ƒu‚É‚ÍŽw’肳‚ꂽƒEƒBƒ“ƒhƒE‚ª‚ ‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
@@ -6667,17 +6759,50 @@ msgstr "
 msgid "did not switch to the specified window"
 msgstr "Žw’肳‚ꂽƒEƒBƒ“ƒhƒE‚ɐ؂è‘Ö‚¦‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-msgid "expected vim.tabpage object"
-msgstr "vim.tabpageƒIƒuƒWƒFƒNƒg‚ðŠú‘Ò‚µ‚Ä‚¢‚Ü‚·"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPageƒIƒuƒWƒFƒNƒg‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é‚Ì‚É %s ‚Å‚µ‚½"
 
 msgid "did not switch to the specified tab page"
 msgstr "Žw’肳‚ꂽƒ^ƒuƒy[ƒW‚ɐ؂è‘Ö‚¦‚Ü‚¹‚ñ‚Å‚µ‚½"
 
-msgid "unable to convert to vim structure"
-msgstr "vim‚̍\\‘¢‘Ì‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
+msgid "failed to run the code"
+msgstr "ƒR[ƒh‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Ž®•]‰¿‚Í—LŒø‚ÈpythonƒIƒuƒWƒFƒNƒg‚ð•Ô‚µ‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+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 "unable to convert %s to vim dictionary"
+msgstr "%s vim‚ÌŽ«‘Œ^‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s ‚ðvim‚̍\\‘¢‘Ì‚É•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
 
-msgid "NULL reference passed"
-msgstr "NULLŽQÆ‚ª“n‚³‚ê‚Ü‚µ‚½"
+msgid "internal error: NULL reference passed"
+msgstr "“à•”ƒGƒ‰[: NULLŽQÆ‚ª“n‚³‚ê‚Ü‚µ‚½"
 
 msgid "internal error: invalid value type"
 msgstr "“à•”ƒGƒ‰[: –³Œø‚È’lŒ^‚Å‚·"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"ƒpƒXƒtƒbƒN‚̐ݒè‚ÉŽ¸”s‚µ‚Ü‚µ‚½: sys.path_hooks ‚ªƒŠƒXƒg‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
+"‚·‚®‚ɉº‹L‚ðŽÀŽ{‚µ‚Ä‚­‚¾‚³‚¢:\n"
+"- vim.path_hooks ‚ð sys.path_hooks ‚֒ljÁ\n"
+"- vim.VIM_SPECIAL_PATH ‚ð sys.path ‚֒ljÁ\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"ƒpƒX‚̐ݒè‚ÉŽ¸”s‚µ‚Ü‚µ‚½: sys.path ‚ªƒŠƒXƒg‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
+"‚·‚®‚É vim.VIM_SPECIAL_PATH ‚ð sys.path ‚ɒljÁ‚µ‚Ä‚­‚¾‚³‚¢"