summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-06 13:58:22 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-06 13:58:22 +0200
commitdc8b25cbf36a1926c93319fed6259b2a2344bdde (patch)
treee647fded5b33c7144f9009ffab861ac85634dbef
parent0d86e9b568df3ec4f3e44dfa60e328b2e48bffaf (diff)
downloadvim-git-dc8b25cbf36a1926c93319fed6259b2a2344bdde.tar.gz
Update runtime files.
-rw-r--r--runtime/doc/quickref.txt40
-rw-r--r--runtime/doc/todo.txt9
-rw-r--r--src/po/ja.euc-jp.po487
-rw-r--r--src/po/ja.po487
-rw-r--r--src/po/ja.sjis.po487
5 files changed, 945 insertions, 565 deletions
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: 未知の関数です: %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@ の後に不正な文字がありました"
@@ -4785,28 +4782,11 @@ 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]"
msgstr "E678: %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.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: 筝罩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 綛潟02с障\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "潟%ld 綛潟02с障"
#, 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( cc障"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ 緇 ] 障"
#, c-format
msgid "E53: Unmatched %s%%("
@@ -4756,6 +4723,36 @@ msgstr "E54: %s( cc障"
msgid "E55: Unmatched %s)"
msgstr "E55: %s) cc障"
+#
+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( cc障"
+
#, c-format
msgid "E59: invalid character after %s@"
msgstr "E59: %s@ 緇筝罩c絖障"
@@ -4785,28 +4782,11 @@ 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]"
msgstr "E678: %s%%[dxouU] 緇筝罩c絖障"
@@ -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 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 "[Vt@C]"
msgid "[Read errors]"
msgstr "[G[]"
+msgid "[RO]"
+msgstr "[]"
+
msgid "[readonly]"
msgstr "[p]"
@@ -424,6 +427,9 @@ msgstr "E130: m: %s"
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: ^[QbgXg^vf"
@@ -584,13 +590,13 @@ msgstr "E785: complete() }[hp"
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: Xg^"
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 "[\\Pbg]"
msgid "[character special]"
msgstr "[LN^EfoCX]"
-msgid "[RO]"
-msgstr "[]"
-
msgid "[CR missing]"
msgstr "[CR]"
@@ -2246,32 +2246,28 @@ msgid "Font '%s' is not fixed-width"
msgstr "tHg '%s' "
#, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: tHgZbg: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: tHgZbg: %s"
#, c-format
-msgid "Font0: %s\n"
-msgstr "tHg0: %s\n"
+msgid "Font0: %s"
+msgstr "tHg0: %s"
#, c-format
-msgid "Font1: %s\n"
-msgstr "tHg1: %s\n"
+msgid "Font1: %s"
+msgstr "tHg1: %s"
#, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "tHg%ld tHg02{\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "tHg%ld tHg02{"
#, c-format
-msgid "Font0 width: %ld\n"
-msgstr "tHg0: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "tHg0: %ld"
#, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"tHg1: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "tHg1: %ld"
msgid "Invalid font specification"
msgstr "tHgw"
@@ -2460,6 +2456,9 @@ msgstr "E566: cscopepCv"
msgid "E622: Could not fork for cscope"
msgstr "E622: cscopeN(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 AIタs"
-msgid "E858: Eval did not return a valid python object"
-msgstr "E858: ョ]LpythonIuWFNg"
-
-msgid "E859: Failed to convert returned python object to vim value"
-msgstr "E859: pythonIuWFNgviml"
-
-msgid "failed to run the code"
-msgstr "R[hタsクs"
-
-msgid "E863: return value must be an instance of str"
-msgstr "E863: lCX^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: ョ]Lpython 3IuWFNg"
-
-msgid "E861: Failed to convert returned python 3 object to vim value"
-msgstr "E861: python 3IuWFNgviml"
-
-msgid "index must be int or slice"
-msgstr "CfbNXXCX"
-
msgid "E265: $_ must be an instance of String"
msgstr "E265: $_ CX^X"
@@ -4731,18 +4706,10 @@ msgstr "E777: XgKv"
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( RR"
+
+#
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 RR"
+
+#
+#, 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"
@@ -4785,28 +4782,11 @@ msgid "E65: Illegal back reference"
msgstr "E65: sQ"
#
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( RR"
-
-#
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 RR"
-
-#
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]"
msgstr "E678: %s%%[dxouU] s"
@@ -4815,11 +4795,6 @@ msgstr "E678: %s%%[dxouU] s"
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{...} @G["
msgid "External submatches:\n"
msgstr "OY:\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\\GWゥIB"
+
+#, 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) mIy[^: '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) mIy[^: '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: NXNFA\\zクs!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) mIy[^: '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (NFA K\\) JG["
+
+#. 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^bN|bv!"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr ""
+"E875: (NFA K\\) (uNFA) "
+"X^bNcXe[g"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA K\\) NFASXy[X"
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) fu`\\!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr "NFAK\\GWpOt@CpJB"
+"OWooB"
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) Ot@C %s J!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "NFAK\\GWpOt@CpJB"
+
msgid " VREPLACE"
msgstr " zu"
@@ -5326,6 +5376,9 @@ msgstr "E782: .sug t@CG[: %s"
msgid "E783: duplicate char in MAP entry"
msgstr "E783: MAP Ggd"
+msgid "No Syntax items defined for this buffer"
+msgstr "obt@`\\vf"
+
#, c-format
msgid "E390: Illegal argument: %s"
msgstr "E390: s: %s"
@@ -5334,9 +5387,6 @@ msgstr "E390: s: %s"
msgid "E391: No such syntax cluster: %s"
msgstr "E391: \\NX^: %s"
-msgid "No Syntax items defined for this buffer"
-msgstr "obt@`\\vf"
-
msgid "syncing on C-style comments"
msgstr "CRg"
@@ -5462,6 +5512,11 @@ msgstr "E409: mO[v: %s"
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: :syntax TuR}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 Aoo"
@@ -6513,107 +6568,154 @@ msgstr ""
msgid "Need encryption key for \"%s\""
msgstr "L[Kv: \"%s\""
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject"
+msgid "empty keys are not allowed"
+msgstr "L["
+
+msgid "dictionary is locked"
+msgstr "ォbN"
+
+msgid "list is locked"
+msgstr "XgbN"
+
+#, 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 "CfbNX %s XCX"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() unicode() CX^X %s "
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() str() CX^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() XgKv"
+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/OIuWFNgG["
-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 vf^v)"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "impl.find_module() %d vf^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 "ォbN"
+msgid "hashtab changed during iteration"
+msgstr "Ce[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[PXvf 2 %d "
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "XgRXgN^L[[ht"
msgid "list index out of range"
msgstr "XgOCfbNX"
-msgid "internal error: failed to get vim list item"
-msgstr "G[: vimXgvfクs"
-
-msgid "list is locked"
-msgstr "XgbN"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "G[: vimXgvf %d クs"
-msgid "Failed to add item to list"
+msgid "failed to add item to list"
msgstr "Xgvfクs"
-msgid "internal error: no vim list item"
-msgstr "G[: vimXgvf"
-
-msgid "can only assign lists to slice"
-msgstr "XCXXg"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "G[: vimXgvf %d "
msgid "internal error: failed to add item to list"
msgstr "G[: Xgvfクs"
-msgid "can only concatenate with lists"
-msgstr "Xg"
-
-msgid "cannot delete vim.dictionary attributes"
-msgstr "vim.dictionary"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List "
msgid "cannot modify fixed list"
msgstr "XgX"
-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 "RXgN^L[[ht"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr " %s タsクs"
msgid "unable to get option value"
msgstr "IvVl"
-msgid "unable to unset global option"
-msgstr "O[oIvV"
-
-msgid "unable to unset option without global value"
-msgstr "O[ogIvV"
-
-msgid "object must be integer"
-msgstr "IuWFNg"
+msgid "internal error: unknown option type"
+msgstr "G[: mIvV^"
-msgid "object must be string"
-msgstr "IuWFNg"
-
-msgid "attempt to refer to deleted tab page"
-msgstr "^uQ"
+msgid "problem while switching windows"
+msgstr "EBhE"
#, c-format
-msgid "<tabpage object (deleted) at %p>"
-msgstr "<^uy[WIuWFNg () %p>"
+msgid "unable to unset global option %s"
+msgstr "O[oIvV %s "
#, c-format
-msgid "<tabpage object (unknown) at %p>"
-msgstr "<^uy[WIuWFNg (s) %p>"
+msgid "unable to unset option %s which does not have global value"
+msgstr "O[olIvV %s "
-#, c-format
-msgid "<tabpage %d>"
-msgstr "<^uy[W %d>"
+msgid "attempt to refer to deleted tab page"
+msgstr "^uQ"
msgid "no such tab page"
msgstr "^uy[W"
@@ -6621,45 +6723,35 @@ msgstr "^uy[W"
msgid "attempt to refer to deleted window"
msgstr "EBhEQ"
-msgid "readonly attribute"
-msgstr "p"
+msgid "readonly attribute: buffer"
+msgstr "p: obt@["
msgid "cursor position outside buffer"
msgstr "J[\\uobt@O"
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<EBhEIuWFNg () %p>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<EBhEIuWFNg (s) %p>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<EBhE %d>"
-
msgid "no such window"
msgstr "EBhE"
msgid "attempt to refer to deleted buffer"
msgstr "obt@Q"
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<obt@IuWFNg () %p>"
+msgid "failed to rename buffer"
+msgstr "obt@Xクs"
-msgid "key must be integer"
-msgstr "L[l"
+msgid "mark name must be a single character"
+msgstr "}[N1At@xbg"
-msgid "expected vim.buffer object"
-msgstr "vim.bufferIuWFNg"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.BufferIuWFNg %s "
-msgid "failed to switch to given buffer"
-msgstr "wobt@クs"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "wobt@ %d クs"
-msgid "expected vim.window object"
-msgstr "vim.windowIuWFNg"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.WindowIuWFNg %s "
msgid "failed to find window in the current tab page"
msgstr "^uwEBhE"
@@ -6667,17 +6759,50 @@ msgstr "^uwEBhE"
msgid "did not switch to the specified window"
msgstr "wEBhE"
-msgid "expected vim.tabpage object"
-msgstr "vim.tabpageIuWFNg"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPageIuWFNg %s "
msgid "did not switch to the specified tab page"
msgstr "w^uy[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: ョ]LpythonIuWFNg"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: pythonIuWFNgviml"
+
+#, 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 "NULLQn"
+msgid "internal error: NULL reference passed"
+msgstr "G[: NULLQn"
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 ""
+"pXtbNクs: sys.path_hooks Xg\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 ""
+"pXクs: sys.path Xg\n"
+" vim.VIM_SPECIAL_PATH sys.path "