From dc8b25cbf36a1926c93319fed6259b2a2344bdde Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 Jul 2013 13:58:22 +0200
Subject: [PATCH] Update runtime files.

---
 runtime/doc/quickref.txt |  40 ++--
 runtime/doc/todo.txt     |   9 +-
 src/po/ja.euc-jp.po      | 487 ++++++++++++++++++++++++---------------
 src/po/ja.po             | 487 ++++++++++++++++++++++++---------------
 src/po/ja.sjis.po        | 487 ++++++++++++++++++++++++---------------
 5 files changed, 945 insertions(+), 565 deletions(-)

diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8dcf3298f7..d8a2555a42 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 e769537198..7e50c71deb 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 0344943799..49ae304eb3 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 563f246a96..a0ee4c2afa 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: 筝�罩c����医���с��: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: 羌���絨�佂�号�違����絖����������宴�c�����障��"
+
 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: ���鴻��������絖����������宴�c�����障��"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: 莨��後������絖����������宴�c�����障��"
 
-msgid "E806: using Float as a String"
-msgstr "E806: 羌���絨�佂�号�違����絖����������宴�c�����障��"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: 紊��違������筝��眼���障����: %s"
@@ -1647,9 +1650,6 @@ msgstr "[�純�宴����]"
 msgid "[character special]"
 msgstr "[�㏍�c�����帥�祉�����ゃ��]"
 
-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 ��篏帥�c��緇��� :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 ��篏帥�c��緇��� :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( ���c�����c�����障����"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ����� ] �������障����"
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4756,6 +4723,36 @@ msgstr "E54: %s( ���c�����c�����障����"
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ���c�����c�����障����"
 
+#
+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�����c�����障����"
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ ������罩c����絖��������障����"
@@ -4784,27 +4781,10 @@ msgstr "E64:%s%c ����������������障����"
 msgid "E65: Illegal back reference"
 msgstr "E65: 筝�罩c����劫��с�с��"
 
-#
-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����絖��������障����"
 
-#
-#, 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] ������罩c����絖��������障����"
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% ������罩c����絖��������障����"
 
-#
-#, 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 ���帥��膓��������障����"
+"罩h�茵�憗���潟�吾�潟�������御�������障����"
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (NFA 罩h�茵��) 鋎�臀���茯ゃ�c�����障��: %c"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) ��緇��������閫h�茵�憗���腴����育�����障����"
+
+#, 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 罩h�茵��) 靪違��菴������狗�����違��茯㊧昭筝㏍��������"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (NFA 罩h�茵��) 靪違��菴��� ����� 膵違��菴��� ���с���障����!"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA 罩h�茵��) '(' ��鎀������障��"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA 罩h�茵��) \\z( ��鎀������障��"
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (NFA 罩h�茵��) 靚�腴���激�������障����"
+
+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 罩h�茵��) (鏅�臀���絖�����NFA�����筝㏍��) "
+"�鴻�帥��������������鴻���若����紊������障��"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA 罩h�茵��) 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罩h�茵�憗���潟�吾�括�����㏍�違���<�ゃ�����梧昭�������������障������"
+"�㏍�違���羣��阪�����阪�����障����"
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) �㏍�違���<�ゃ�� %s �������障����!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "NFA罩h�茵�憗���潟�吾�括�����㏍�違���<�ゃ�����梧昭�������������障������"
+
 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: 筝�罩c����違�с��: %s"
@@ -5334,9 +5387,6 @@ msgstr "E390: 筝�罩c����違�с��: %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 "�鴻���ゃ�鴻�������鴻��������篁e�ャ�с���障��"
+#, 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 "�違�㏍�若���������激�с�潟��┃絎�茹i�ゃ���с���障����"
-
-msgid "unable to unset option without global value"
-msgstr "�違�㏍�若������違��篏帥����ù�����激�с�潟��┃絎�茹i�ゃ���с���障����"
-
-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�潟����������筝㏍���馹����榊�����障����"
 
 #, c-format
-msgid "<tabpage object (deleted) at %p>"
-msgstr "<�帥�����若�吾�����吾�с���� (羔��紙���) %p>"
+msgid "unable to unset global option %s"
+msgstr "�違�㏍�若���������激�с�� %s ��┃絎�茹i�ゃ���с���障����"
 
 #, c-format
-msgid "<tabpage object (unknown) at %p>"
-msgstr "<�帥�����若�吾�����吾�с���� (筝���) %p>"
+msgid "unable to unset option %s which does not have global value"
+msgstr "�違�㏍�若�������ゃ���<�������激�с�� %s ��┃絎�茹i�ゃ���с���障����"
 
-#, 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 "���ゃ���������c�潟���������с�����������障����"
 
-msgid "readonly attribute"
-msgstr "茯㊧昭絨������"
+msgid "readonly attribute: buffer"
+msgstr "茯㊧昭絨������: �������<��"
 
 msgid "cursor position outside buffer"
 msgstr "���若�純���臀����������<����眼�с��"
 
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<���c�潟���������吾�с���� (羔��紙���) %p>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<���c�潟���������吾�с���� (筝���) %p>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<���c�潟���� %d>"
-
 msgid "no such window"
 msgstr "�������������c�潟�����������障����"
 
 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 "�上�����帥��������絎����������c�潟�����������障�����с����"
@@ -6667,17 +6759,50 @@ msgstr "�上�����帥��������絎����������c�潟�����������障������
 msgid "did not switch to the specified window"
 msgstr "��絎����������c�潟�����������帥���障�����с����"
 
-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 f0ce9c5137..27659425b6 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' ���������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�[������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�����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�����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 ����\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 ""
+"�p�X������s�����: sys.path ����X�g���������\n"
+"���� vim.VIM_SPECIAL_PATH �� sys.path ����������"
-- 
GitLab