Runtime file and translation updates.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0a142e4..de4bb02 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9121,22 +9121,16 @@
Example: >
:if has("gui_running")
< *has-patch*
-3. Included patches. The "patch123" feature means that patch 123 has been
- included. Note that this form does not check the version of Vim, you need
- to inspect |v:version| for that.
- Example (checking version 6.2.148 or later): >
- :if v:version > 602 || v:version == 602 && has("patch148")
-< Note that it's possible for patch 147 to be omitted even though 148 is
- included.
-
-4. Beyond a certain version or at a certain version and including a specific
- patch. The "patch-7.4.237" feature means that the Vim version is 7.5 or
- later, or it is version 7.4 and patch 237 was included.
- Note that this only works for patch 7.4.237 and later, before that you
- need to use the example above that checks v:version. Example: >
+3. Beyond a certain version or at a certain version and including a specific
+ patch. The "patch-7.4.248" feature means that the Vim version is 7.5 or
+ later, or it is version 7.4 and patch 248 was included. Example: >
:if has("patch-7.4.248")
-< Note that it's possible for patch 147 to be omitted even though 148 is
- included.
+< Note that it's possible for patch 248 to be omitted even though 249 is
+ included. Only happens when cherry-picking patches.
+ Note that this form only works for patch 7.4.237 and later, before that
+ you need to check for the patch and the v:version. Example (checking
+ version 6.2.148 or later): >
+ :if v:version > 602 || (v:version == 602 && has("patch148"))
Hint: To find out if Vim supports backslashes in a file name (MS-Windows),
use: `if exists('+shellslash')`
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index eda14bc..13ab355 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -39,9 +39,10 @@
-------------------- Known bugs and current work -----------------------
Terminal emulator window:
-- Win32: Termdebug doesn't work, because gdb does not support mi2. This
- plugin: https://github.com/cpiger/NeoDebug runs gdb as a job, redirecting
- input and output. Command I/O is in gdb window.
+- Win32: Termdebug doesn't work, because gdb does not support mi2.
+ This plugin: https://github.com/cpiger/NeoDebug runs gdb as a job,
+ redirecting input and output.
+ Open new console for for program with: "set new-console on"
- Win32: Redirecting input does not work, half of Test_terminal_redir_file()
is disabled.
- Win32: Redirecting output works but includes escape sequences.
@@ -65,6 +66,8 @@
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
13, #2910) Can't reproduce?
+Deprecate using has("patch213") always include the version number.
+
On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
(Nobuhiro Takasaki, #2833) Also check t_Co.
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 8634c28..c091063 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -22104,7 +22104,7 @@
Patch 8.0.1238
Problem: Incremental search only shows one match.
Solution: When 'incsearch' and 'hlsearch' are both set highlight all
- matches. (haya14busa, itchyny closes #2198)
+ matches. (haya14busa, itchyny, closes #2198)
Files: runtime/doc/options.txt, src/ex_getln.c, src/proto/search.pro,
src/search.c, src/testdir/test_search.vim
@@ -22595,7 +22595,7 @@
Files: src/os_macosx.m
Patch 8.0.1316 (after 8.0.1312)
-Problem: Build still fails on Mac. (chdiza)
+Problem: Build still still fails on Mac. (chdiza)
Solution: Remove another bogus typedef.
Files: src/os_mac_conv.c
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/vim-ja.UTF-8.1
index 7742356..5b7798b 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/vim-ja.UTF-8.1
@@ -280,7 +280,7 @@
ぐことができます。
ファイルを保存したい場合は、":w!" のように、Ex コマンドに感嘆符を付けてくだ
さい。
-\-R オプションは \-n オプションの効果も含んでいます (下記参照)。
+\-R オプションは \-n オプションの効果も含んでいます (上記参照)。
オプション 'readonly' は ":set noro" でオフにできます。
詳しくは ":help 'readonly'" を参照してください。
.TP
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/xxd-ja.UTF-8.1
index a4cc583..47688f8 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/xxd-ja.UTF-8.1
@@ -76,6 +76,9 @@
.RI < cols >
オクテットで出力する。標準設定は 16 (\-i: 12, \-ps: 30, \-b: 6)。最大 256。
.TP
+.IR \-C " | " \-capitalize
+\-i を使用した際に、C インクルードファイル形式の変数名を大文字にする。
+.TP
.IR \-E " | " \-EBCDIC
右端に出力される文字のエンコーディングを ASCII から EBCDIC に変更する。
16 進ダンプの出力形式は変更されません。
diff --git a/runtime/lang/menu_ja.euc-jp.vim b/runtime/lang/menu_ja.euc-jp.vim
index 0eff4d9..4dcd60c 100644
--- a/runtime/lang/menu_ja.euc-jp.vim
+++ b/runtime/lang/menu_ja.euc-jp.vim
@@ -5,5 +5,5 @@
" Copyright (C) 2004,12 MURAOKA Taro <koron.kaoriya@gmail.com>
" THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
-" eucjp is the same as euc-jp. Source the other one from here.
+" ja is the same as ja_jp. Source the other one from here.
source <sfile>:p:h/menu_ja_jp.euc-jp.vim
diff --git a/runtime/lang/menu_ja.utf-8.vim b/runtime/lang/menu_ja.utf-8.vim
index 105a199..a47cdbe 100644
--- a/runtime/lang/menu_ja.utf-8.vim
+++ b/runtime/lang/menu_ja.utf-8.vim
@@ -1,4 +1,4 @@
" Menu Translations: Japanese
-" eucjp is the same as euc-jp. Source the other one from here.
+" ja is the same as ja_jp. Source the other one from here.
source <sfile>:p:h/menu_ja_jp.utf-8.vim
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index 3448e0d..6e81f8f 100644
--- a/runtime/lang/menu_ja_jp.euc-jp.vim
+++ b/runtime/lang/menu_ja_jp.euc-jp.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings Á´ÂÎÀßÄê(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ ¥Ñ¥¿¡¼¥ó¶¯Ä´ÀÚÂØ(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ Â羮ʸ»ú¶èÊÌÀÚÂØ(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ ¥Þ¥Ã¥Áɽ¼¨ÀÚÂØ(&S)<Tab>:set\ sm!
menutrans &Context\ lines ¥«¡¼¥½¥ë¼þÊÕ¹Ô¿ô(&C)
menutrans &Virtual\ Edit ²¾ÁÛÊÔ½¸(&V)
@@ -86,7 +86,7 @@
menutrans Always ¾ï»þ
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ ÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ Vi¸ß´¹¥â¡¼¥ÉÀÚÂØ(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. ¸¡º÷¥Ñ¥¹(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. ¥¿¥°¥Õ¥¡¥¤¥ë(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings ¥Õ¥¡¥¤¥ëÀßÄê(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ ¹ÔÈÖ¹æɽ¼¨ÀÚÂØ(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ ÁêÂйÔÈÖ¹æɽ¼¨ÀÚÂØ(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ ¥ê¥¹¥È¥â¡¼¥ÉÀÚÂØ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ ¹ÔÀÞÊÖ¤·ÀÚÂØ(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ ñ¸ìÀÞÊÖ¤·ÀÚÂØ(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ ¥¿¥ÖŸ³«ÀÚÂØ(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ ¼«Æ°»ú²¼¤²ÀÚÂØ(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C¸À¸ì»ú²¼¤²ÀÚÂØ(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "¥Õ¥¡¥¤¥ë½ÐÎϤκݤβþ¹Ôµ¹æ¤Î·Á¼°¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n¥¥ã¥ó¥»¥ë(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu ¿§¥Æ¡¼¥Þ¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&O)
menutrans C&olor\ Scheme ¿§¥Æ¡¼¥ÞÁªÂò(&O)
+menutrans Show\ &Keymaps\ in\ Menu ¥¡¼¥Þ¥Ã¥×¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&K)
menutrans &Keymap ¥¡¼¥Þ¥Ã¥×(&K)
menutrans None ¤Ê¤·
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose ÊĤ¸¤ë(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEX¤ØÊÑ´¹(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX¤«¤éµÕÊÑ´¹(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu ¥³¥ó¥Ñ¥¤¥éÀßÄê¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&T)
+menutrans Se&t\ Compiler ¥³¥ó¥Ñ¥¤¥éÀßÄê(&T)
" Tools.Spelling Menu
menutrans &Spelling ¥¹¥Ú¥ê¥ó¥°(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax ¥·¥ó¥¿¥Ã¥¯¥¹(&S)
-menutrans &Show\ filetypes\ in\ menu Âбþ·Á¼°¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&S)
+menutrans &Show\ File\ Types\ in\ Menu Âбþ·Á¼°¤ò¥á¥Ë¥å¡¼¤Ëɽ¼¨(&S)
menutrans Set\ '&syntax'\ only 'syntax'¤À¤±ÀßÄê(&S)
menutrans Set\ '&filetype'\ too 'filetype'¤âÀßÄê(&F)
menutrans &Off ̵¸ú²½(&O)
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index af15c0b..9dbc47c 100644
--- a/runtime/lang/menu_ja_jp.utf-8.vim
+++ b/runtime/lang/menu_ja_jp.utf-8.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings 全体設定(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ パターン強調切替(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ 大小文字区別切替(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ マッチ表示切替(&S)<Tab>:set\ sm!
menutrans &Context\ lines カーソル周辺行数(&C)
menutrans &Virtual\ Edit 仮想編集(&V)
@@ -86,7 +86,7 @@
menutrans Always 常時
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ 挿入(初心者)モード切替(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ Vi互換モード切替(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. 検索パス(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. タグファイル(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings ファイル設定(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ 行番号表示切替(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ 相対行番号表示切替(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ リストモード切替(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ 行折返し切替(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ 単語折返し切替(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ タブ展開切替(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ 自動字下げ切替(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C言語字下げ切替(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "ファイル出力の際の改行記号の形式を選んでください."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nキャンセル(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu 色テーマをメニューに表示(&O)
menutrans C&olor\ Scheme 色テーマ選択(&O)
+menutrans Show\ &Keymaps\ in\ Menu キーマップをメニューに表示(&K)
menutrans &Keymap キーマップ(&K)
menutrans None なし
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose 閉じる(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEXへ変換(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEXから逆変換(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler コンパイラ設定(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu コンパイラ設定をメニューに表示(&T)
+menutrans Se&t\ Compiler コンパイラ設定(&T)
" Tools.Spelling Menu
menutrans &Spelling スペリング(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax シンタックス(&S)
-menutrans &Show\ filetypes\ in\ menu 対応形式をメニューに表示(&S)
+menutrans &Show\ File\ Types\ in\ Menu 対応形式をメニューに表示(&S)
menutrans Set\ '&syntax'\ only 'syntax'だけ設定(&S)
menutrans Set\ '&filetype'\ too 'filetype'も設定(&F)
menutrans &Off 無効化(&O)
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 66c8166..a39d7da 100644
--- a/runtime/lang/menu_japanese_japan.932.vim
+++ b/runtime/lang/menu_japanese_japan.932.vim
@@ -73,9 +73,9 @@
menutrans &Global\ Settings SÌÝè(&G)
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!
\ p^[²ØÖ(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!
\ 嬶æÊØÖ(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showmatch<Tab>:set\ sm!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!
\ }b`\¦ØÖ(&S)<Tab>:set\ sm!
menutrans &Context\ lines J[\üÓs(&C)
menutrans &Virtual\ Edit ¼zÒW(&V)
@@ -86,7 +86,7 @@
menutrans Always í
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!
\ }ü(SÒ)[hØÖ(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!
\ ViÝ·[hØÖ(&O)<Tab>:set\ cp!
menutrans Search\ &Path\.\.\. õpX(&P)\.\.\.
menutrans Ta&g\ Files\.\.\. ^Ot@C(&G)\.\.\.
@@ -106,19 +106,19 @@
menutrans F&ile\ Settings t@CÝè(&I)
menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!
\ sÔ\¦ØÖ(&N)<Tab>:set\ nu!
-menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!
\ ÎsÔ\¦ØÖ(&V)<Tab>:set\ rnu!
menutrans Toggle\ &List\ Mode<Tab>:set\ list!
\ Xg[hØÖ(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!
\ sÜÔµØÖ(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!
+menutrans Toggle\ W&rapping\ at\ word<Tab>:set\ lbr!
\ PêÜÔµØÖ(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!
\ ^uWJØÖ(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!
\ ©®º°ØÖ(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!
\ C¾êº°ØÖ(&C)<Tab>:set\ cin!
" other options
@@ -131,7 +131,9 @@
let g:menutrans_fileformat_dialog = "t@CoÍÌÛÌüsLÌ`®ðIñž³¢."
let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nLZ(&C)"
+menutrans Show\ C&olor\ Schemes\ in\ Menu Fe[}ðj
[É\¦(&O)
menutrans C&olor\ Scheme Fe[}Ið(&O)
+menutrans Show\ &Keymaps\ in\ Menu L[}bvðj
[É\¦(&K)
menutrans &Keymap L[}bv(&K)
menutrans None ȵ
@@ -153,7 +155,8 @@
menutrans &Close<Tab>:cclose 妎(&C)<Tab>:cclose
menutrans &Convert\ to\ HEX<Tab>:%!xxd HEXÖÏ·(&C)<Tab>:%!xxd
menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEX©çtÏ·(&R)<Tab>%!xxd\ -r
-menutrans Se&T\ Compiler RpCÝè(&T)
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu RpCÝèðj
[É\¦(&T)
+menutrans Se&t\ Compiler RpCÝè(&T)
" Tools.Spelling Menu
menutrans &Spelling XyO(&S)
@@ -289,7 +292,7 @@
" Syntax menu
menutrans &Syntax V^bNX(&S)
-menutrans &Show\ filetypes\ in\ menu Î`®ðj
[É\¦(&S)
+menutrans &Show\ File\ Types\ in\ Menu Î`®ðj
[É\¦(&S)
menutrans Set\ '&syntax'\ only 'syntax'¾¯Ýè(&S)
menutrans Set\ '&filetype'\ too 'filetype'àÝè(&F)
menutrans &Off ³ø»(&O)
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index b932303..8cb63f2 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -18,9 +18,8 @@
¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Àµ¤·¤¯³Ø½¬¤¹¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¼ÂºÝ¤Ë»î¤µ¤Ê¤±¤ì¤Ð
¤Ê¤é¤Ê¤¤¤Î¤Ç¤¹¡£Ê¸¾Ï¤òÆɤó¤À¤À¤±¤Ê¤é¤Ð¡¢¤¤Ã¤È˺¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹!
- ¤µ¤¡¡¢Caps¥í¥Ã¥¯(Shift-Lock)¥¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢²èÌ̤Ë
- ¥ì¥Ã¥¹¥ó1.1 ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ
- ¤·¤ç¤¦¡£
+ ¤µ¤¡¡¢Caps¥í¥Ã¥¯¥¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢²èÌ̤˥ì¥Ã¥¹¥ó1.1
+ ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 1.1: ¥«¡¼¥½¥ë¤Î°ÜÆ°
@@ -155,7 +154,7 @@
4. Êѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹: :wq <ENTER>
- 5. ¥¹¥Æ¥Ã¥× 1 ¤Ç vimtutuor ¤ò½ªÎ»¤·¤¿¾ì¹ç¤Ï vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤Î
+ 5. ¥¹¥Æ¥Ã¥× 1 ¤Ç vimtutor ¤ò½ªÎ»¤·¤¿¾ì¹ç¤Ï vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤Î
Í×Ìó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
6. °Ê¾å¤Î¥¹¥Æ¥Ã¥×¤òÆɤó¤ÇÍý²ò¤·¤¿¾å¤Ç¤³¤ì¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index cc03472..1e70cbc 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -18,9 +18,8 @@
Ĩ©È¯êÎÈèܹñB³µwK·éÉÍR}hðÀÛɳȯêÎ
ÈçÈ¢ÌÅ·B¶ÍðÇñ¾¾¯ÈçÎA«ÁÆYêĵܢܷ!
- ³ACapsbN(Shift-Lock)L[ª³êĢȢ±ÆðmFµ½ãAæÊÉ
- bX1.1 ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ðÚ®µÜ
- µå¤B
+ ³ACapsbNL[ª³êĢȢ±ÆðmFµ½ãAæÊÉbX1.1
+ ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ðÚ®µÜµå¤B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1.1: J[\ÌÚ®
@@ -155,7 +154,7 @@
4. ÏXðt@CÉÛ¶µÜ·: :wq <ENTER>
- 5. Xebv 1 Å vimtutuor ðI¹µ½êÍ vimtutor ðÄxN®µAȺÌ
+ 5. Xebv 1 Å vimtutor ðI¹µ½êÍ vimtutor ðÄxN®µAȺÌ
vñÖiÝܵå¤B
6. ÈãÌXebvðÇñÅðµ½ãűêðÀsµÜµå¤B
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index aca6cf7..fdca0eb 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -18,9 +18,8 @@
ておかなければなりません。正しく学習するにはコマンドを実際に試さなければ
ならないのです。文章を読んだだけならば、きっと忘れてしまいます!
- さぁ、Capsロック(Shift-Lock)キーが押されていないことを確認した後、画面に
- レッスン1.1 が全部表示されるところまで、j キーを押してカーソルを移動しま
- しょう。
+ さぁ、Capsロックキーが押されていないことを確認した後、画面にレッスン1.1
+ が全部表示されるところまで、j キーを押してカーソルを移動しましょう。
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
レッスン 1.1: カーソルの移動
@@ -155,7 +154,7 @@
4. 変更をファイルに保存します: :wq <ENTER>
- 5. ステップ 1 で vimtutuor を終了した場合は vimtutor を再度起動し、以下の
+ 5. ステップ 1 で vimtutor を終了した場合は vimtutor を再度起動し、以下の
要約へ進みましょう。
6. 以上のステップを読んで理解した上でこれを実行しましょう。
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index eb1e8a2..0a92f04 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -3,7 +3,7 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
#
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 8.0\n"
+"Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 23:05+0900\n"
-"PO-Revision-Date: 2017-07-12 20:45+0900\n"
+"POT-Creation-Date: 2018-05-01 10:46+0900\n"
+"PO-Revision-Date: 2017-05-18 00:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n"
@@ -49,10 +49,10 @@
msgstr "E855: autocommand¤¬¥³¥Þ¥ó¥É¤ÎÄä»ß¤ò°ú¤µ¯¤³¤·¤Þ¤·¤¿"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ¥Ð¥Ã¥Õ¥¡¤ò1¤Ä¤âºîÀ®¤Ç¤¤Ê¤¤¤Î¤Ç, ½ªÎ»¤·¤Þ¤¹..."
+msgstr "E82: ¥Ð¥Ã¥Õ¥¡¤ò1¤Ä¤âºîÀ®¤Ç¤¤Ê¤¤¤Î¤Ç¡¢½ªÎ»¤·¤Þ¤¹..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤¤Ê¤¤¤Î¤Ç, ¾¤Î¤ò»ÈÍѤ·¤Þ¤¹..."
+msgstr "E83: ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤¤Ê¤¤¤Î¤Ç¡¢Â¾¤Î¤ò»ÈÍѤ·¤Þ¤¹..."
msgid "E931: Buffer cannot be registered"
msgstr "E931: ¥Ð¥Ã¥Õ¥¡¤òÅÐÏ¿¤Ç¤¤Þ¤»¤ó"
@@ -96,7 +96,6 @@
msgid "E84: No modified buffer found"
msgstr "E84: Êѹ¹¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#. back where we started, didn't find anything.
msgid "E85: There is no listed buffer"
msgstr "E85: ¥ê¥¹¥Èɽ¼¨¤µ¤ì¤ë¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
@@ -110,6 +109,18 @@
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: ¥Ð¥Ã¥Õ¥¡ %ld ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤ÇÊѹ¹¤òÇË´þ)"
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: ¥¸¥ç¥Ö¤Ï¤Þ¤À¼Â¹ÔÃæ¤Ç¤¹ (! ¤òÄɲäǥ¸¥ç¥Ö¤ò½ªÎ»)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤òÄɲäÇÊѹ¹¤òÇË´þ)"
+
+msgid "E948: Job still running"
+msgstr "E948: ¥¸¥ç¥Ö¤Ï¤Þ¤À¼Â¹ÔÃæ¤Ç¤¹"
+
+msgid "E37: No write since last change"
+msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
msgid "W14: Warning: List of file names overflow"
msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
@@ -165,7 +176,6 @@
msgid "[No Name]"
msgstr "[̵̾]"
-#. must be a help buffer
msgid "help"
msgstr "¥Ø¥ë¥×"
@@ -191,6 +201,9 @@
"\n"
"# ¥Ð¥Ã¥Õ¥¡¥ê¥¹¥È:\n"
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: 'buftype' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç½ñ¹þ¤á¤Þ¤»¤ó"
+
msgid "[Scratch]"
msgstr "[²¼½ñ¤]"
@@ -359,7 +372,6 @@
msgid " Keyword completion (^N^P)"
msgstr " ¥¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
-#. ctrl_x_mode == 0, ^P/^N compl.
msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
msgstr " ^X ¥â¡¼¥É (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
@@ -437,10 +449,6 @@
msgid " Adding"
msgstr " ÄɲÃÃæ"
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed. -- Acevedo.
-#.
msgid "-- Searching..."
msgstr "-- ¸¡º÷Ãæ..."
@@ -461,7 +469,6 @@
msgid "match %d"
msgstr "%d ÈÖÌܤγºÅö"
-#. maximum nesting of lists and dicts
msgid "E18: Unexpected characters in :let"
msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ :let ¤Ë¤¢¤ê¤Þ¤·¤¿"
@@ -522,8 +529,6 @@
msgid "E108: No such variable: \"%s\""
msgstr "E108: ¤½¤ÎÊÑ¿ô¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
#, c-format
msgid "E940: Cannot lock or unlock variable %s"
msgstr "E940: ÊÑ¿ô %s ¤Ï¥í¥Ã¥¯¤Þ¤¿¤Ï¥¢¥ó¥í¥Ã¥¯¤Ç¤¤Þ¤»¤ó"
@@ -534,21 +539,6 @@
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ¤Î¸å¤Ë ':' ¤¬¤¢¤ê¤Þ¤»¤ó"
-msgid "E691: Can only compare List with List"
-msgstr "E691: ¥ê¥¹¥È·¿¤Ï¥ê¥¹¥È·¿¤È¤·¤«Èæ³Ó¤Ç¤¤Þ¤»¤ó"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: ¥ê¥¹¥È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: ¼½ñ·¿¤Ï¼½ñ·¿¤È¤·¤«Èæ³Ó¤Ç¤¤Þ¤»¤ó"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: ¼½ñ·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: ´Ø¿ô»²¾È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
-
msgid "E804: Cannot use '%' with Float"
msgstr "E804: '%' ¤òÉâÆ°¾®¿ôÅÀ¿ô¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó"
@@ -588,7 +578,7 @@
msgstr "E805: ÉâÆ°¾®¿ôÅÀ¿ô¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E703: Using a Funcref as a Number"
-msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E745: Using a List as a Number"
msgstr "E745: ¥ê¥¹¥È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
@@ -600,10 +590,10 @@
msgstr "E910: ¥¸¥ç¥Ö¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E913: Using a Channel as a Number"
-msgstr "E913: ¥Á¥ã¥ó¥Í¥ë¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "E913: ¥Á¥ã¥ó¥Í¥ë¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E891: Using a Funcref as a Float"
-msgstr "E891: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "E891: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E892: Using a String as a Float"
msgstr "E892: ʸ»úÎó¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
@@ -621,7 +611,7 @@
msgstr "E911: ¥¸¥ç¥Ö¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E914: Using a Channel as a Float"
-msgstr "E914: ¥Á¥ã¥ó¥Í¥ë¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+msgstr "E914: ¥Á¥ã¥ó¥Í¥ë¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
msgid "E729: using Funcref as a String"
msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
@@ -675,6 +665,21 @@
"\n"
"\tºÇ¸å¤Ë¥»¥Ã¥È¤·¤¿¥¹¥¯¥ê¥×¥È: "
+msgid "E691: Can only compare List with List"
+msgstr "E691: ¥ê¥¹¥È·¿¤Ï¥ê¥¹¥È·¿¤È¤·¤«Èæ³Ó¤Ç¤¤Þ¤»¤ó"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: ¥ê¥¹¥È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ¼½ñ·¿¤Ï¼½ñ·¿¤È¤·¤«Èæ³Ó¤Ç¤¤Þ¤»¤ó"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ¼½ñ·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ´Ø¿ô»²¾È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
msgid "map() argument"
msgstr "map() ¤Î°ú¿ô"
@@ -697,15 +702,15 @@
msgid "E785: complete() can only be used in Insert mode"
msgstr "E785: complete() ¤ÏÁÞÆþ¥â¡¼¥É¤Ç¤·¤«ÍøÍѤǤ¤Þ¤»¤ó"
-#.
-#. * Yes this is ugly, I don't particularly like it either. But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all. See below what 'ok' and 'ync' are used for.
-#.
msgid "&Ok"
msgstr "&Ok"
#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ¹Ô: "
+
+#, c-format
msgid "E700: Unknown function: %s"
msgstr "E700: ̤ÃΤδؿô¤Ç¤¹: %s"
@@ -809,10 +814,22 @@
msgstr "E921: ̵¸ú¤Ê¥³¡¼¥ë¥Ð¥Ã¥¯°ú¿ô¤Ç¤¹"
#, c-format
+msgid "<%s>%s%s %d, Hex %02x, Oct %03o, Digr %s"
+msgstr "<%s>%s%s %d, 16¿Ê¿ô %02x, 8¿Ê¿ô %03o, ¥À¥¤¥°¥é¥Õ %s"
+
+#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16¿Ê¿ô %02x, 8¿Ê¿ô %03o"
#, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d, 16¿Ê¿ô %04x, 8¿Ê¿ô %o, ¥À¥¤¥°¥é¥Õ %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d, 16¿Ê¿ô %08x, 8¿Ê¿ô %o, ¥À¥¤¥°¥é¥Õ %s"
+
+#, c-format
msgid "> %d, Hex %04x, Octal %o"
msgstr "> %d, 16¿Ê¿ô %04x, 8¿Ê¿ô %o"
@@ -845,7 +862,7 @@
msgstr "%sviminfo: %s ¹ÔÌÜ: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, °Ê¹ß¤Ï¥¹¥¥Ã¥×¤·¤Þ¤¹"
+msgstr "E136: viminfo: ¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç¡¢°Ê¹ß¤Ï¥¹¥¥Ã¥×¤·¤Þ¤¹"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -863,7 +880,6 @@
msgid " FAILED"
msgstr " ¼ºÇÔ"
-#. avoid a wait_return for this message, it's annoying
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfo¥Õ¥¡¥¤¥ë¤¬½ñ¹þ¤ß¤Ç¤¤Þ¤»¤ó: %s"
@@ -884,7 +900,6 @@
msgid "E886: Can't rename viminfo file to %s!"
msgstr "E886: viminfo¥Õ¥¡¥¤¥ë¤ò %s ¤Ø̾Á°Êѹ¹¤Ç¤¤Þ¤»¤ó!"
-#. Write the info:
#, c-format
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# ¤³¤Î viminfo ¥Õ¥¡¥¤¥ë¤Ï Vim %s ¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤Þ¤·¤¿.\n"
@@ -1003,7 +1018,6 @@
msgid " on %ld lines"
msgstr " (·× %ld ¹ÔÆâ)"
-#. will increment global_busy to break out of the loop
msgid "E147: Cannot do :global recursive with a range"
msgstr "E147: :global ¤òÈÏ°ÏÉÕ¤¤ÇºÆµ¢Åª¤Ë¤Ï»È¤¨¤Þ¤»¤ó"
@@ -1120,6 +1134,14 @@
msgstr "¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ³¤±¤ë¤Ë¤Ï \"cont\" ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
#, c-format
+msgid "Oldval = \"%s\""
+msgstr "¸Å¤¤ÃÍ = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "¿·¤·¤¤ÃÍ = \"%s\""
+
+#, c-format
msgid "line %ld: %s"
msgstr "¹Ô %ld: %s"
@@ -1149,6 +1171,10 @@
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s ¹Ô %ld"
+#, c-format
+msgid "%3d expr %s"
+msgstr "%3d expr %s"
+
msgid "E750: First use \":profile start {fname}\""
msgstr "E750: ½é¤á¤Ë \":profile start {fname}\" ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤"
@@ -1156,8 +1182,9 @@
msgid "Save changes to \"%s\"?"
msgstr "Êѹ¹¤ò \"%s\" ¤ËÊݸ¤·¤Þ¤¹¤«?"
-msgid "Untitled"
-msgstr "̵Âê"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: ¥¸¥ç¥Ö¤Ï¥Ð¥Ã¥Õ¥¡ \"%s\" ¤Ç¤Þ¤À¼Â¹ÔÃæ¤Ç¤¹"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
@@ -1292,7 +1319,7 @@
msgstr "E493: µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿"
msgid "Backwards range given, OK to swap"
-msgstr "µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿, ÆþÂؤ¨¤Þ¤¹¤«?"
+msgstr "µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿¡¢ÆþÂؤ¨¤Þ¤¹¤«?"
msgid "E494: Use w or w>>"
msgstr "E494: w ¤â¤·¤¯¤Ï w>> ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤"
@@ -1303,17 +1330,14 @@
"¤µ¤¤"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ÏÍøÍѤǤ¤Þ¤»¤ó, ¤´¤á¤ó¤Ê¤µ¤¤"
-
-msgid "E172: Only one file name allowed"
-msgstr "E172: ¥Õ¥¡¥¤¥ë̾¤Ï 1 ¤Ä¤Ë¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "E319: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ÏÍøÍѤǤ¤Þ¤»¤ó¡¢¤´¤á¤ó¤Ê¤µ¤¤"
msgid "1 more file to edit. Quit anyway?"
-msgstr "ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹¤¬, ½ªÎ»¤·¤Þ¤¹¤«?"
+msgstr "ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹¤¬¡¢½ªÎ»¤·¤Þ¤¹¤«?"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹¤¬, ½ªÎ»¤·¤Þ¤¹¤«?"
+msgstr "ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹¤¬¡¢½ªÎ»¤·¤Þ¤¹¤«?"
msgid "E173: 1 more file to edit"
msgstr "E173: ÊÔ½¸¤¹¤Ù¤¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹"
@@ -1364,7 +1388,7 @@
msgstr "E183: ¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤Ï±ÑÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: ͽÌó̾¤Ê¤Î¤Ç, ¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤ËÍøÍѤǤ¤Þ¤»¤ó"
+msgstr "E841: ͽÌó̾¤Ê¤Î¤Ç¡¢¥æ¡¼¥¶¡¼ÄêµÁ¥³¥Þ¥ó¥É¤ËÍøÍѤǤ¤Þ¤»¤ó"
#, c-format
msgid "E184: No such user-defined command: %s"
@@ -1415,7 +1439,7 @@
msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr ""
-"E747: ¥Ð¥Ã¥Õ¥¡¤¬½¤Àµ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç, ¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤¤Þ¤»¤ó (! ¤òÄɲäÇ"
+"E747: ¥Ð¥Ã¥Õ¥¡¤¬½¤Àµ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤¤Þ¤»¤ó (! ¤òÄɲäÇ"
"¾å½ñ)"
msgid "E186: No previous directory"
@@ -1465,7 +1489,6 @@
msgid "E190: Cannot open \"%s\" for writing"
msgstr "E190: \"%s\" ¤ò½ñ¹þ¤ßÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
-#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
msgstr "E191: °ú¿ô¤Ï1ʸ»ú¤Î±Ñ»ú¤«°úÍÑÉä (' ¤« `) ¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
@@ -1504,13 +1527,15 @@
msgid "E195: Cannot open viminfo file for reading"
msgstr "E195: viminfo¥Õ¥¡¥¤¥ë¤òÆɹþÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
+msgid "Untitled"
+msgstr "̵Âê"
+
msgid "E196: No digraphs in this version"
msgstr "E196: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¹ç»ú¤Ï¤¢¤ê¤Þ¤»¤ó"
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: 'Vim' ¤Ç»Ï¤Þ¤ëÎã³°¤Ï :throw ¤Ç¤¤Þ¤»¤ó"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception thrown: %s"
msgstr "Îã³°¤¬È¯À¸¤·¤Þ¤·¤¿: %s"
@@ -1527,7 +1552,6 @@
msgid "%s, line %ld"
msgstr "%s, ¹Ô %ld"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception caught: %s"
msgstr "Îã³°¤¬Ê᪤µ¤ì¤Þ¤·¤¿: %s"
@@ -1553,7 +1577,6 @@
msgid "Error"
msgstr "¥¨¥é¡¼"
-#. if (pending & CSTP_INTERRUPT)
msgid "Interrupt"
msgstr "³ä¹þ¤ß"
@@ -1596,15 +1619,12 @@
msgid "E603: :catch without :try"
msgstr "E603: :try ¤Î¤Ê¤¤ :catch ¤¬¤¢¤ê¤Þ¤¹"
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
msgid "E604: :catch after :finally"
msgstr "E604: :finally ¤Î¸å¤Ë :catch ¤¬¤¢¤ê¤Þ¤¹"
msgid "E606: :finally without :try"
msgstr "E606: :try ¤Î¤Ê¤¤ :finally ¤¬¤¢¤ê¤Þ¤¹"
-#. Give up for a multiple ":finally" and ignore it.
msgid "E607: multiple :finally"
msgstr "E607: Ê£¿ô¤Î :finally ¤¬¤¢¤ê¤Þ¤¹"
@@ -1697,7 +1717,6 @@
msgid "Reading from stdin..."
msgstr "ɸ½àÆþÎϤ«¤éÆɹþ¤ßÃæ..."
-#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
msgstr "E202: ÊÑ´¹¤¬¥Õ¥¡¥¤¥ë¤òÆɹþÉԲĤˤ·¤Þ¤·¤¿"
@@ -1786,9 +1805,6 @@
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ºîÀ®)"
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: ¥ê¥½¡¼¥¹¥Õ¥©¡¼¥¯¤¬¼º¤ï¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©)"
-
msgid "E214: Can't find temp file for writing"
msgstr "E214: ÊݸÍÑ°ì»þ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
@@ -1801,25 +1817,25 @@
msgid "E212: Can't open file for writing"
msgstr "E212: ½ñ¹þ¤ßÍѤ˥ե¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-msgid "E667: Fsync failed"
-msgstr "E667: fsync ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgid "E949: File changed while writing"
+msgstr "E949: ½ñ¹þ¤ßÃæ¤Ë¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
msgid "E512: Close failed"
msgstr "E512: ÊĤ¸¤ë¤³¤È¤Ë¼ºÇÔ"
msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ½ñ¹þ¤ß¥¨¥é¡¼, ÊÑ´¹¼ºÇÔ (¾å½ñ¤¹¤ë¤Ë¤Ï 'fenc' ¤ò¶õ¤Ë¤·¤Æ¤¯¤À¤µ¤¤)"
+msgstr "E513: ½ñ¹þ¤ß¥¨¥é¡¼¡¢ÊÑ´¹¼ºÇÔ (¾å½ñ¤¹¤ë¤Ë¤Ï 'fenc' ¤ò¶õ¤Ë¤·¤Æ¤¯¤À¤µ¤¤)"
#, c-format
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
msgstr ""
-"E513: ½ñ¹þ¤ß¥¨¥é¡¼, ÊÑ´¹¼ºÇÔ, ¹Ô¿ô %ld (¾å½ñ¤¹¤ë¤Ë¤Ï 'fenc' ¤ò¶õ¤Ë¤·¤Æ¤¯¤À¤µ"
+"E513: ½ñ¹þ¤ß¥¨¥é¡¼¡¢ÊÑ´¹¼ºÇÔ¡¢¹Ô¿ô %ld (¾å½ñ¤¹¤ë¤Ë¤Ï 'fenc' ¤ò¶õ¤Ë¤·¤Æ¤¯¤À¤µ"
"¤¤)"
msgid "E514: write error (file system full?)"
-msgstr "E514: ½ñ¹þ¤ß¥¨¥é¡¼, (¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬ËþÇÕ?)"
+msgstr "E514: ½ñ¹þ¤ß¥¨¥é¡¼ (¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬ËþÇÕ?)"
msgid " CONVERSION ERROR"
msgstr " ÊÑ´¹¥¨¥é¡¼"
@@ -1903,9 +1919,6 @@
msgid "[Incomplete last line]"
msgstr "[ºÇ½ª¹Ô¤¬ÉÔ´°Á´]"
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
msgstr "·Ù¹ð: Æɹþ¤ó¤À¸å¤Ë¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤¬¤¢¤ê¤Þ¤·¤¿!!!"
@@ -1983,7 +1996,6 @@
msgid "auto-removing autocommand: %s <buffer=%d>"
msgstr "autocommand: %s <¥Ð¥Ã¥Õ¥¡=%d> ¤¬¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹"
-#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
msgstr "E367: ¤½¤Î¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
@@ -2006,7 +2018,6 @@
msgid "E216: No such group or event: %s"
msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤â¤·¤¯¤Ï¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
@@ -2054,6 +2065,11 @@
msgid "E351: Cannot delete fold with current 'foldmethod'"
msgstr "E351: ¸½ºß¤Î 'foldmethod' ¤Ç¤ÏÀÞ¾ö¤ß¤òºï½ü¤Ç¤¤Þ¤»¤ó"
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿"
+
msgid "E222: Add to read buffer"
msgstr "E222: Æɹþ¥Ð¥Ã¥Õ¥¡¤ØÄɲÃ"
@@ -2099,7 +2115,7 @@
msgstr "E230: \"%s\"¤«¤éÆɹþ¤à¤³¤È¤¬¤Ç¤¤Þ¤»¤ó"
msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: ͸ú¤Ê¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤¤¤Î¤Ç, GUI¤ò³«»Ï¤Ç¤¤Þ¤»¤ó"
+msgstr "E665: ͸ú¤Ê¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤¤¤Î¤Ç¡¢GUI¤ò³«»Ï¤Ç¤¤Þ¤»¤ó"
msgid "E231: 'guifontwide' invalid"
msgstr "E231: 'guifontwide' ¤¬Ìµ¸ú¤Ç¤¹"
@@ -2112,7 +2128,7 @@
msgstr "E254: %s ¤Î¿§¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó"
msgid "No match at cursor, finding next"
-msgstr "¥«¡¼¥½¥ë¤Î°ÌÃ֤˥ޥåÁ¤Ï¤¢¤ê¤Þ¤»¤ó, ¼¡¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹"
+msgstr "¥«¡¼¥½¥ë¤Î°ÌÃ֤˥ޥåÁ¤Ï¤¢¤ê¤Þ¤»¤ó¡¢¼¡¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹"
msgid "<cannot open> "
msgstr "<³«¤±¤Þ¤»¤ó> "
@@ -2187,18 +2203,15 @@
msgid "Replace with:"
msgstr "ÃÖ´¹Ê¸»úÎó:"
-#. whole word only button
msgid "Match whole word only"
msgstr "Àµ³Î¤Ë³ºÅö¤¹¤ë¤â¤Î¤À¤±"
-#. match case button
msgid "Match case"
msgstr "Âçʸ»ú/¾®Ê¸»ú¤ò¶èÊ̤¹¤ë"
msgid "Direction"
msgstr "Êý¸þ"
-#. 'Up' and 'Down' buttons
msgid "Up"
msgstr "¾å"
@@ -2277,8 +2290,6 @@
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "¸¡º÷¡¦ÃÖ´¹ ('\\' ¤ò¸¡º÷¤¹¤ë¤Ë¤Ï '\\\\')"
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
msgid "Not Used"
msgstr "»È¤ï¤ì¤Þ¤»¤ó"
@@ -2350,7 +2361,6 @@
msgid "Name:"
msgstr "̾Á°:"
-#. create toggle button
msgid "Show size in Points"
msgstr "¥µ¥¤¥º¤ò¥Ý¥¤¥ó¥È¤Çɽ¼¨¤¹¤ë"
@@ -2596,7 +2606,6 @@
msgid "cscope connection %s closed"
msgstr "cscopeÀܳ %s ¤¬ÊĤ¸¤é¤ì¤Þ¤·¤¿"
-#. should not reach here
msgid "E570: fatal error in cs_manage_matches"
msgstr "E570: cs_manage_matches ¤ÇÃ×̿Ū¤Ê¥¨¥é¡¼¤Ç¤¹"
@@ -2642,8 +2651,8 @@
"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
"could not be loaded."
msgstr ""
-"E895: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤. MzScheme ¤Î racket/base ¥â¥¸¥å¡¼¥ë"
-"¤¬¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
+"E895: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤. MzScheme ¤Î racket/base ¥â¥¸¥å¡¼"
+"¥ë¤¬¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
msgid "invalid expression"
msgstr "̵¸ú¤Ê¼°¤Ç¤¹"
@@ -2703,14 +2712,14 @@
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
msgstr ""
-"E263: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: Python¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó"
-"¤Ç¤·¤¿."
+"E263: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤: Python¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»"
+"¤ó¤Ç¤·¤¿."
msgid ""
"E887: Sorry, this command is disabled, the Python's site module could not be "
"loaded."
msgstr ""
-"E887: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤. Python ¤Î site ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É"
+"E887: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤. Python ¤Î site ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É"
"¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
# Added at 07-Feb-2004.
@@ -2726,8 +2735,8 @@
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
-"E266: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: Ruby¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç"
-"¤·¤¿."
+"E266: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤: Ruby¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó"
+"¤Ç¤·¤¿."
msgid "E267: unexpected return"
msgstr "E267: ͽ´ü¤»¤Ì return ¤Ç¤¹"
@@ -2757,7 +2766,6 @@
msgid "not implemented yet"
msgstr "¤Þ¤À¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#. ???
msgid "cannot set line(s)"
msgstr "¹Ô¤òÀßÄê¤Ç¤¤Þ¤»¤ó"
@@ -2799,7 +2807,6 @@
msgstr ""
"¥³¡¼¥ë¥Ð¥Ã¥¯¥³¥Þ¥ó¥É¤òÅÐÏ¿¤Ç¤¤Þ¤»¤ó: ¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦¤¬´û¤Ë¾Ãµî¤µ¤ì¤Þ¤·¤¿"
-#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
@@ -2814,7 +2821,7 @@
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
-"E571: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: Tcl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç"
+"E571: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤: Tcl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç"
"¤·¤¿."
#, c-format
@@ -2901,7 +2908,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: ·Ù¹ð: üËö¤«¤é¤ÎÆþÎϤǤϤ¢¤ê¤Þ¤»¤ó\n"
-#. just in case..
msgid "pre-vimrc command line"
msgstr "vimrcÁ°¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó"
@@ -2997,7 +3003,7 @@
msgstr "-d\t\t\tº¹Ê¬¥â¡¼¥É (\"vidiff\" ¤ÈƱ¤¸)"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t¥¤¡¼¥¸¡¼¥â¡¼¥É (\"evim\" ¤ÈƱ¤¸, ¥â¡¼¥É̵)"
+msgstr "-y\t\t\t¥¤¡¼¥¸¡¼¥â¡¼¥É (\"evim\" ¤ÈƱ¤¸¡¢¥â¡¼¥É̵)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\tÆɹþÀìÍѥ⡼¥É (\"view\" ¤ÈƱ¤¸)"
@@ -3120,7 +3126,7 @@
msgstr "--remote <files>\t²Äǽ¤Ê¤é¤ÐVim¥µ¡¼¥Ð¡¼¤Ç <files> ¤òÊÔ½¸¤¹¤ë"
msgid "--remote-silent <files> Same, don't complain if there is no server"
-msgstr "--remote-silent <files> Ʊ¾å, ¥µ¡¼¥Ð¡¼¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
+msgstr "--remote-silent <files> Ʊ¾å¡¢¥µ¡¼¥Ð¡¼¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
@@ -3129,7 +3135,7 @@
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr ""
-"--remote-wait-silent <files> Ʊ¾å, ¥µ¡¼¥Ð¡¼¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
+"--remote-wait-silent <files> Ʊ¾å¡¢¥µ¡¼¥Ð¡¼¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
@@ -3155,8 +3161,11 @@
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfo¤ÎÂå¤ï¤ê¤Ë <viminfo> ¤ò»È¤¦"
+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible'¡¢Vim¤Î´ûÄê¡¢¥×¥é¥°¥¤¥ó¤Ê¤·¡¢viminfo¤Ê¤·"
+
msgid "-h or --help\tPrint Help (this message) and exit"
-msgstr "-h or --help\t¥Ø¥ë¥×(¤³¤Î¥á¥Ã¥»¡¼¥¸)¤òɽ¼¨¤·½ªÎ»¤¹¤ë"
+msgstr "-h or --help\t¥Ø¥ë¥×(¤³¤Î¥á¥Ã¥»¡¼¥¸)¤òɽ¼¨¤·½ªÎ»¤¹¤ë"
msgid "--version\t\tPrint version information and exit"
msgstr "--version\t\t¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·½ªÎ»¤¹¤ë"
@@ -3253,11 +3262,9 @@
msgid "No display"
msgstr "¥Ç¥£¥¹¥×¥ì¥¤¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-#. Failed to send, abort.
msgid ": Send failed.\n"
msgstr ": Á÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿.\n"
-#. Let vim start normally.
msgid ": Send failed. Trying to execute locally\n"
msgstr ": Á÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿. ¥í¡¼¥«¥ë¤Ç¤Î¼Â¹Ô¤ò»î¤ß¤Æ¤¤¤Þ¤¹\n"
@@ -3278,7 +3285,6 @@
msgid "E283: No marks matching \"%s\""
msgstr "E283: \"%s\" ¤Ë³ºÅö¤¹¤ë¥Þ¡¼¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
-#. Highlight title
msgid ""
"\n"
"mark line col file/text"
@@ -3286,7 +3292,6 @@
"\n"
"mark ¹Ô Îó ¥Õ¥¡¥¤¥ë/¥Æ¥¥¹¥È"
-#. Highlight title
msgid ""
"\n"
" jump line col file/text"
@@ -3294,7 +3299,6 @@
"\n"
" jump ¹Ô Îó ¥Õ¥¡¥¤¥ë/¥Æ¥¥¹¥È"
-#. Highlight title
msgid ""
"\n"
"change line col text"
@@ -3309,7 +3313,6 @@
"\n"
"# ¥Õ¥¡¥¤¥ë¥Þ¡¼¥¯:\n"
-#. Write the jumplist with -'
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3378,9 +3381,8 @@
msgid "E843: Error while updating swap file crypt"
msgstr "E843: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î°Å¹æ¤ò¹¹¿·Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ¤ª¤Ã¤È, ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¼º¤ï¤ì¤Þ¤·¤¿!!!"
+msgstr "E301: ¤ª¤Ã¤È¡¢¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¼º¤ï¤ì¤Þ¤·¤¿!!!"
msgid "E302: Could not rename swap file"
msgstr "E302: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÊѤ¨¤é¤ì¤Þ¤»¤ó"
@@ -3465,7 +3467,7 @@
"If you entered a new crypt key but did not write the text file,"
msgstr ""
"\n"
-"¿·¤·¤¤°Å¹æ¥¡¼¤òÆþÎϤ·¤¿¤¢¤È¤Ë¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï,"
+"¿·¤·¤¤°Å¹æ¥¡¼¤òÆþÎϤ·¤¿¤¢¤È¤Ë¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢"
msgid ""
"\n"
@@ -3479,7 +3481,7 @@
"If you wrote the text file after changing the crypt key press enter"
msgstr ""
"\n"
-"°Å¹æ¥¡¼¤òÊѤ¨¤¿¤¢¤È¤Ë¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¾ì¹ç¤Ï, ¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤È"
+"°Å¹æ¥¡¼¤òÊѤ¨¤¿¤¢¤È¤Ë¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¾ì¹ç¤Ï¡¢¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤È"
msgid ""
"\n"
@@ -3539,7 +3541,7 @@
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(Êѹ¹¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë, ¤³¤Î¥Õ¥¡¥¤¥ë¤òÊ̤Î̾Á°¤ÇÊݸ¤·¤¿¾å¤Ç\n"
+"(Êѹ¹¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤òÊ̤Î̾Á°¤ÇÊݸ¤·¤¿¾å¤Ç\n"
msgid "and run diff with the original file to check for changes)"
msgstr "¸¶ËÜ¥Õ¥¡¥¤¥ë¤È¤Î diff ¤ò¼Â¹Ô¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦)"
@@ -3559,7 +3561,6 @@
msgid "Using crypt key from swap file for the text file.\n"
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤«¤é¼èÆÀ¤·¤¿°Å¹æ¥¡¼¤ò¥Æ¥¥¹¥È¥Õ¥¡¥¤¥ë¤Ë»È¤¤¤Þ¤¹.\n"
-#. use msg() to start the scrolling properly
msgid "Swap files found:"
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬Ê£¿ô¸«¤Ä¤«¤ê¤Þ¤·¤¿:"
@@ -3729,8 +3730,6 @@
msgid " NEWER than swap file!\n"
msgstr " ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤è¤ê¤â¿·¤·¤¤¤Ç¤¹!\n"
-#. Some of these messages are long to allow translation to
-#. * other languages.
msgid ""
"\n"
"(1) Another program may be editing the same file. If this is the case,\n"
@@ -3739,9 +3738,9 @@
msgstr ""
"\n"
"(1) ÊÌ¤Î¥×¥í¥°¥é¥à¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó.\n"
-" ¤³¤Î¾ì¹ç¤Ë¤Ï, Êѹ¹¤ò¤·¤Æ¤·¤Þ¤¦¤È1¤Ä¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ°Û¤Ê¤ë2¤Ä¤Î\n"
-" ¥¤¥ó¥¹¥¿¥ó¥¹¤¬¤Ç¤¤Æ¤·¤Þ¤¦¤Î¤Ç, ¤½¤¦¤·¤Ê¤¤¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤.\n"
-" ½ªÎ»¤¹¤ë¤«, Ãí°Õ¤·¤Ê¤¬¤é³¤±¤Æ¤¯¤À¤µ¤¤.\n"
+" ¤³¤Î¾ì¹ç¤Ë¤Ï¡¢Êѹ¹¤ò¤·¤Æ¤·¤Þ¤¦¤È1¤Ä¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ°Û¤Ê¤ë2¤Ä¤Î\n"
+" ¥¤¥ó¥¹¥¿¥ó¥¹¤¬¤Ç¤¤Æ¤·¤Þ¤¦¤Î¤Ç¡¢¤½¤¦¤·¤Ê¤¤¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤.\n"
+" ½ªÎ»¤¹¤ë¤«¡¢Ãí°Õ¤·¤Ê¤¬¤é³¤±¤Æ¤¯¤À¤µ¤¤.\n"
msgid "(2) An edit session for this file crashed.\n"
msgstr "(2) ¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¥»¥Ã¥·¥ç¥ó¤¬¥¯¥é¥Ã¥·¥å¤·¤¿.\n"
@@ -3757,7 +3756,7 @@
" ¤ò»ÈÍѤ·¤ÆÊѹ¹¤ò¥ê¥«¥Ð¡¼¤·¤Þ¤¹(\":help recovery\" ¤ò»²¾È).\n"
msgid " If you did this already, delete the swap file \""
-msgstr " ´û¤Ë¤³¤ì¤ò¹Ô¤Ê¤Ã¤¿¤Î¤Ê¤é¤Ð, ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \""
+msgstr " ´û¤Ë¤³¤ì¤ò¹Ô¤Ê¤Ã¤¿¤Î¤Ê¤é¤Ð¡¢¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \""
msgid ""
"\"\n"
@@ -3819,7 +3818,6 @@
msgid "E329: No menu \"%s\""
msgstr "E329: \"%s\" ¤È¤¤¤¦¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-#. Only a mnemonic or accelerator is not valid.
msgid "E792: Empty menu name"
msgstr "E792: ¥á¥Ë¥å¡¼Ì¾¤¬¶õ¤Ç¤¹"
@@ -3832,8 +3830,6 @@
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: ¶èÀÚ¤ê¤Ï¥á¥Ë¥å¡¼¥Ñ¥¹¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
msgid ""
"\n"
"--- Menus ---"
@@ -3844,6 +3840,10 @@
msgid "Tear off this menu"
msgstr "¤³¤Î¥á¥Ë¥å¡¼¤òÀÚ¤ê¼è¤ë"
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: %s ¤Ë¤Ï¥á¥Ë¥å¡¼¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
msgid "E333: Menu path must lead to a menu item"
msgstr "E333: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÀ¸¤¸¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
@@ -3851,10 +3851,6 @@
msgid "E334: Menu not found: %s"
msgstr "E334: ¥á¥Ë¥å¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ¤Ë¤Ï¥á¥Ë¥å¡¼¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥µ¥Ö¥á¥Ë¥å¡¼¤òÀ¸¤¸¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
@@ -3924,9 +3920,8 @@
msgid "Open File dialog"
msgstr "¥Õ¥¡¥¤¥ëÆɹþ¥À¥¤¥¢¥í¥°"
-#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: ¥³¥ó¥½¡¼¥ë¥â¡¼¥É¤Ç¤Ï¥Õ¥¡¥¤¥ë¥Ö¥é¥¦¥¶¤ò»È¤¨¤Þ¤»¤ó, ¤´¤á¤ó¤Ê¤µ¤¤"
+msgstr "E338: ¥³¥ó¥½¡¼¥ë¥â¡¼¥É¤Ç¤Ï¥Õ¥¡¥¤¥ë¥Ö¥é¥¦¥¶¤ò»È¤¨¤Þ¤»¤ó¡¢¤´¤á¤ó¤Ê¤µ¤¤"
msgid "E766: Insufficient arguments for printf()"
msgstr "E766: printf() ¤Î°ú¿ô¤¬ÉÔ½½Ê¬¤Ç¤¹"
@@ -4124,7 +4119,6 @@
msgid "E748: No previously used register"
msgstr "E748: ¤Þ¤À¥ì¥¸¥¹¥¿¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó"
-#. must display the prompt
msgid "cannot yank; delete anyway"
msgstr "¥ä¥ó¥¯¤Ç¤¤Þ¤»¤ó; ¤È¤Ë¤«¤¯¾Ãµî"
@@ -4139,25 +4133,30 @@
msgid "freeing %ld lines"
msgstr "%ld ¹Ô¤ò²òÊüÃæ"
-msgid "block of 1 line yanked"
-msgstr "1 ¹Ô¤Î¥Ö¥í¥Ã¥¯¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
-
-msgid "1 line yanked"
-msgstr "1 ¹Ô¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c ¤Ë"
#, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld ¹Ô¤Î¥Ö¥í¥Ã¥¯¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
+msgid "block of 1 line yanked%s"
+msgstr "1 ¹Ô¤Î¥Ö¥í¥Ã¥¯¤¬%s¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
#, c-format
-msgid "%ld lines yanked"
-msgstr "%ld ¹Ô¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
+msgid "1 line yanked%s"
+msgstr "1 ¹Ô¤¬%s¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "%ld ¹Ô¤Î¥Ö¥í¥Ã¥¯¤¬%s¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld ¹Ô¤¬%s¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
#, c-format
msgid "E353: Nothing in register %s"
msgstr "E353: ¥ì¥¸¥¹¥¿ %s ¤Ë¤Ï²¿¤â¤¢¤ê¤Þ¤»¤ó"
-#. Highlight title
msgid ""
"\n"
"--- Registers ---"
@@ -4212,11 +4211,8 @@
"%lld"
#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=%N ¥Ú¡¼¥¸"
+msgid "(+%lld for BOM)"
+msgstr "(+%lld for BOM)"
msgid "Thanks for flying Vim"
msgstr "Vim ¤ò»È¤Ã¤Æ¤¯¤ì¤Æ¤¢¤ê¤¬¤È¤¦"
@@ -4268,6 +4264,10 @@
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+2 GUI¤Ç¤ÏÊѹ¹¤Ç¤¤Þ¤»¤ó"
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: %s ¤È %s ¤Î´Ö¤ÇÊÑ´¹¤Ç¤¤Þ¤»¤ó"
+
msgid "E524: Missing colon"
msgstr "E524: ¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -4325,12 +4325,18 @@
msgid "E542: unbalanced groups"
msgstr "E542: ¥°¥ë¡¼¥×¤¬Äà¹ç¤¤¤Þ¤»¤ó"
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: ¼Â¹ÔÃæ¤Î¥¸¥ç¥Ö¤¬¤¢¤ëüËö¤ÏÊѹ¹²Äǽ¤Ë¤Ç¤¤Þ¤»¤ó"
+
msgid "E590: A preview window already exists"
msgstr "E590: ¥×¥ì¥Ó¥å¡¼¥¦¥£¥ó¥É¥¦¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
msgstr ""
-"W17: ¥¢¥é¥Ó¥¢Ê¸»ú¤Ë¤ÏUTF-8¤¬É¬ÍפʤΤÇ, ':set encoding=utf-8' ¤·¤Æ¤¯¤À¤µ¤¤"
+"W17: ¥¢¥é¥Ó¥¢Ê¸»ú¤Ë¤ÏUTF-8¤¬É¬ÍפʤΤǡ¢':set encoding=utf-8' ¤·¤Æ¤¯¤À¤µ¤¤"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bit¿§¤Ï¤³¤Î´Ä¶¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
#, c-format
msgid "E593: Need at least %d lines"
@@ -4344,9 +4350,6 @@
msgid "E355: Unknown option: %s"
msgstr "E355: ̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹: %s"
-#. There's another character after zeros or the string
-#. * is empty. In both cases, we are trying to set a
-#. * num option using a string.
#, c-format
msgid "E521: Number required: &%s = '%s'"
msgstr "E521: ¿ô»ú¤¬É¬ÍפǤ¹: &%s = '%s'"
@@ -4419,7 +4422,6 @@
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: ¥³¥ó¥½¡¼¥ë¤Ç¤Ï¤Ê¤¤??\n"
-#. if Vim opened a window: Executing a shell may cause crashes
msgid "E360: Cannot execute shell with -f option"
msgstr "E360: -f ¥ª¥×¥·¥ç¥ó¤Ç¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤¤Þ¤»¤ó"
@@ -4620,6 +4622,9 @@
msgid "shell returned %d"
msgstr "¥·¥§¥ë¤¬¥³¡¼¥É %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿"
+msgid "E926: Current location list was changed"
+msgstr "E926: ¸½ºß¤Î¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
+
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë %%%c ¤¬Â¿²á¤®¤Þ¤¹"
@@ -4643,7 +4648,6 @@
msgid "E377: Invalid %%%c in format string"
msgstr "E377: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë̵¸ú¤Ê %%%c ¤¬¤¢¤ê¤Þ¤¹"
-#. nothing found
msgid "E378: 'errorformat' contains no pattern"
msgstr "E378: 'errorformat' ¤Ë¥Ñ¥¿¡¼¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -4659,9 +4663,6 @@
msgid "E925: Current quickfix was changed"
msgstr "E925: ¸½ºß¤Î quickfix ¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
-msgid "E926: Current location list was changed"
-msgstr "E926: ¸½ºß¤Î¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
-
#, c-format
msgid "(%d of %d)%s%s: "
msgstr "(%d of %d)%s%s: "
@@ -4682,9 +4683,6 @@
msgid "No entries"
msgstr "¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 'buftype' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç½ñ¹þ¤ß¤Þ¤»¤ó"
-
msgid "Error file"
msgstr "¥¨¥é¡¼¥Õ¥¡¥¤¥ë"
@@ -4837,11 +4835,13 @@
msgid "E867: (NFA) Unknown operator '\\z%c'"
msgstr "E867: (NFA) ̤ÃΤΥª¥Ú¥ì¡¼¥¿¤Ç¤¹: '\\z%c'"
+msgid "E951: \\% value too large"
+msgstr "E951: \\% Ãͤ¬Ä¹²á¤®¤Þ¤¹"
+
#, 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¹½Ãۤ˼ºÇÔ¤·¤Þ¤·¤¿!"
@@ -4852,11 +4852,9 @@
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 Àµµ¬É½¸½) '(' ¤¬Â¿²á¤®¤Þ¤¹"
@@ -4964,7 +4962,6 @@
msgid " (includes previously listed match)"
msgstr " (Á°¤ËÎóµó¤·¤¿³ºÅö²Õ½ê¤ò´Þ¤à)"
-#. cursor at status line
msgid "--- Included files "
msgstr "--- ¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë "
@@ -5037,14 +5034,12 @@
msgstr "·Ù¹ð9: %s ¤È¤¤¤¦ÈϰϤϥµ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
msgid "Sorry, no suggestions"
-msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "»ÄÇ°¤Ç¤¹¤¬¡¢½¤Àµ¸õÊä¤Ï¤¢¤ê¤Þ¤»¤ó"
#, c-format
msgid "Sorry, only %ld suggestions"
-msgstr "»ÄÇ°¤Ç¤¹¤¬, ½¤Àµ¸õÊä¤Ï %ld ¸Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
+msgstr "»ÄÇ°¤Ç¤¹¤¬¡¢½¤Àµ¸õÊä¤Ï %ld ¸Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
-#. for when 'cmdheight' > 1
-#. avoid more prompt
#, c-format
msgid "Change \"%.*s\" to:"
msgstr "\"%.*s\" ¤ò¼¡¤ØÊÑ´¹:"
@@ -5089,7 +5084,7 @@
msgstr "E757: ¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹"
msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: ¸Å¤¤¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "E771: ¸Å¤¤¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤"
msgid "E772: Spell file is for newer version of Vim"
msgstr "E772: ¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Vim ÍѤΥ¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤Ç¤¹"
@@ -5103,7 +5098,7 @@
#, c-format
msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤: %s"
+msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤: %s"
#, c-format
msgid "E780: .sug file is for newer version of Vim: %s"
@@ -5263,8 +5258,8 @@
msgstr "E760: %s ¤Ë¤Ïñ¸ì¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "¹Ô %6d, ñ¸ì %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr "¹Ô %6d, ñ¸ì %6ld - %s"
#, c-format
msgid "Duplicate word in %s line %d: %s"
@@ -5300,7 +5295,7 @@
#, c-format
msgid "Too many regions in %s line %d: %s"
-msgstr "%s ¤Î %d ¹ÔÌÜ, ÈÏ°Ï»ØÄ꤬¿²á¤®¤Þ¤¹: %s"
+msgstr "%s ¤Î %d ¹ÔÌÜ¡¢ÈÏ°Ï»ØÄ꤬¿²á¤®¤Þ¤¹: %s"
#, c-format
msgid "/ line ignored in %s line %d: %s"
@@ -5328,10 +5323,6 @@
msgid "Reading back spell file..."
msgstr "¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤òµÕÆɹþÃæ"
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
msgid "Performing soundfolding..."
msgstr "²»À¼¾ö¹þ¤ß¤ò¼Â¹ÔÃæ..."
@@ -5354,8 +5345,9 @@
msgid "E751: Output file name must not have region name"
msgstr "E751: ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤Ë¤ÏÈÏ°Ï̾¤ò´Þ¤á¤é¤ì¤Þ¤»¤ó"
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ÈÏ°Ï¤Ï 8 ¸Ä¤Þ¤Ç¤·¤«¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: ÈÏ°Ï¤Ï %ld ¸Ä¤Þ¤Ç¤·¤«¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
#, c-format
msgid "E755: Invalid region in %s"
@@ -5386,8 +5378,6 @@
msgid "E763: Word characters differ between spell files"
msgstr "E763: ñ¸ì¤Îʸ»ú¤¬¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤È°Û¤Ê¤ê¤Þ¤¹"
-#. This should have been checked when generating the .spl
-#. * file.
msgid "E783: duplicate char in MAP entry"
msgstr "E783: MAP ¥¨¥ó¥È¥ê¤Ë½Åʣʸ»ú¤¬Â¸ºß¤·¤Þ¤¹"
@@ -5653,7 +5643,6 @@
msgid "File \"%s\" does not exist"
msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤¢¤ê¤Þ¤»¤ó"
-#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
msgstr "¥¿¥° %d (Á´%d%s)"
@@ -5668,7 +5657,6 @@
msgid "E429: File \"%s\" does not exist"
msgstr "E429: ¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤¢¤ê¤Þ¤»¤ó"
-#. Highlight title
msgid ""
"\n"
" # TO tag FROM line in file/text"
@@ -5699,7 +5687,6 @@
msgid "E432: Tags file not sorted: %s"
msgstr "E432: ¥¿¥°¥Õ¥¡¥¤¥ë¤¬¥½¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s"
-#. never opened any tags file
msgid "E433: No tags file"
msgstr "E433: ¥¿¥°¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -5735,7 +5722,6 @@
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: üËö¤Ë \"cm\" µ¡Ç½¤¬É¬ÍפǤ¹"
-#. Highlight title
msgid ""
"\n"
"--- Terminal keys ---"
@@ -5746,6 +5732,32 @@
msgid "Cannot open $VIMRUNTIME/rgb.txt"
msgstr "$VIMRUNTIME/rgb.txt¤ò³«¤±¤Þ¤»¤ó"
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "\"%s\" Æâ¤Î¥¸¥ç¥Ö¤ò½ªÎ»¤·¤Þ¤¹¤«?"
+
+msgid "Terminal"
+msgstr "üËö"
+
+msgid "Terminal-finished"
+msgstr "üËö (½ªÎ»)"
+
+msgid "active"
+msgstr "¥¢¥¯¥Æ¥£¥Ö"
+
+msgid "running"
+msgstr "¼Â¹ÔÃæ"
+
+msgid "finished"
+msgstr "½ªÎ»"
+
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953: ¥Õ¥¡¥¤¥ë¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: üËö¥Ð¥Ã¥Õ¥¡¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
msgid "new shell started\n"
msgstr "¿·¤·¤¤¥·¥§¥ë¤òµ¯Æ°¤·¤Þ¤¹\n"
@@ -5755,12 +5767,9 @@
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "¶õ¤ÎÁªÂòÎΰè¤Î¤«¤ï¤ê¤ËCUT_BUFFER0¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿"
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
msgid "E881: Line count changed unexpectedly"
msgstr "E881: ͽ´ü¤»¤º¹Ô¥«¥¦¥ó¥È¤¬ÊѤï¤ê¤Þ¤·¤¿"
-#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr "²Äǽ¤Ê¥¢¥ó¥É¥¥¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤ê¤¢¤¨¤ºÂ³¤±¤Þ¤¹"
@@ -5895,7 +5904,7 @@
#, c-format
msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
+msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹¡¢ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
msgid "E717: Dictionary entry already exists"
msgstr "E717: ¼½ñ·¿Æâ¤Ë¥¨¥ó¥È¥ê¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
@@ -6054,24 +6063,17 @@
msgid ""
"\n"
-"MacOS X (unix) version"
+"macOS version"
msgstr ""
"\n"
-"MacOS X (unix) ÈÇ"
+"macOS ÈÇ"
msgid ""
"\n"
-"MacOS X version"
+"macOS version w/o darwin feat."
msgstr ""
"\n"
-"MacOS X ÈÇ"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"MacOS ÈÇ"
+"macOS ÈÇ (darwin ̵¤·)"
msgid ""
"\n"
@@ -6175,9 +6177,6 @@
msgid "with Cocoa GUI."
msgstr "with Cocoa GUI."
-msgid "with (classic) GUI."
-msgstr "with (¥¯¥é¥·¥Ã¥¯) GUI."
-
msgid " Features included (+) or not (-):\n"
msgstr " µ¡Ç½¤Î°ìÍ÷ ͸ú(+)/̵¸ú(-)\n"
@@ -6275,7 +6274,7 @@
msgstr "¾ÜºÙ¤Ï¥á¥Ë¥å¡¼¤Î ¥Ø¥ë¥×->¸É»ù ¤ò»²¾È¤·¤Æ²¼¤µ¤¤ "
msgid "Running modeless, typed text is inserted"
-msgstr "¥â¡¼¥É̵¤Ç¼Â¹ÔÃæ, ¥¿¥¤¥×¤·¤¿Ê¸»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹"
+msgstr "¥â¡¼¥É̵¤Ç¼Â¹ÔÃæ¡£¥¿¥¤¥×¤·¤¿Ê¸»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "¥á¥Ë¥å¡¼¤Î ÊÔ½¸->Á´ÂÎÀßÄê->ÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ "
@@ -6360,7 +6359,7 @@
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
-"¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹, ¤´¤á¤ó¤Ê¤µ¤¤: Perl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
+"¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹¡¢¤´¤á¤ó¤Ê¤µ¤¤: Perl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
@@ -6379,7 +6378,6 @@
msgid "Edit with &Vim"
msgstr "Vim¤ÇÊÔ½¸¤¹¤ë (&V)"
-#. Now concatenate
msgid "Edit with existing Vim - "
msgstr "µ¯Æ°ºÑ¤ÎVim¤ÇÊÔ½¸¤¹¤ë - "
@@ -6398,10 +6396,6 @@
msgid "--No lines in buffer--"
msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
msgid "E470: Command aborted"
msgstr "E470: ¥³¥Þ¥ó¥É¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
@@ -6475,6 +6469,14 @@
msgstr "E475: ̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
#, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: °ú¿ô %s ¤ËÂФ·¤Æ̵¸ú¤ÊÃͤǤ¹"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: °ú¿ô %s ¤ËÂФ·¤Æ̵¸ú¤ÊÃͤǤ¹: %s"
+
+#, c-format
msgid "E15: Invalid expression: %s"
msgstr "E15: ̵¸ú¤Ê¼°¤Ç¤¹: %s"
@@ -6492,6 +6494,9 @@
msgid "E364: Library call failed for \"%s()\""
msgstr "E364: \"%s\"() ¤Î¥é¥¤¥Ö¥é¥ê¸Æ½Ð¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgid "E667: Fsync failed"
+msgstr "E667: fsync ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
#, c-format
msgid "E448: Could not load library function %s"
msgstr "E448: ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô %s ¤ò¥í¡¼¥É¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
@@ -6503,7 +6508,7 @@
msgstr "E20: ¥Þ¡¼¥¯¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' ¤¬¥ª¥Õ¤Ê¤Î¤Ç, Êѹ¹¤Ç¤¤Þ¤»¤ó"
+msgstr "E21: 'modifiable' ¤¬¥ª¥Õ¤Ê¤Î¤Ç¡¢Êѹ¹¤Ç¤¤Þ¤»¤ó"
msgid "E22: Scripts nested too deep"
msgstr "E22: ¥¹¥¯¥ê¥×¥È¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
@@ -6586,12 +6591,6 @@
msgid "E485: Can't read file %s"
msgstr "E485: ¥Õ¥¡¥¤¥ë %s ¤òÆɹþ¤á¤Þ¤»¤ó"
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤òÄɲäÇÊѹ¹¤òÇË´þ)"
-
-msgid "E37: No write since last change"
-msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
msgid "E38: Null argument"
msgstr "E38: °ú¿ô¤¬¶õ¤Ç¤¹"
@@ -6736,7 +6735,7 @@
msgstr "E449: ̵¸ú¤Ê¼°¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: Îΰ褬Êݸ¤ì¤Æ¤¤¤ë¤Î¤Ç, Êѹ¹¤Ç¤¤Þ¤»¤ó"
+msgstr "E463: Îΰ褬Êݸ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Êѹ¹¤Ç¤¤Þ¤»¤ó"
msgid "E744: NetBeans does not allow changes in read-only files"
msgstr "E744: NetBeans ¤ÏÆɹþÀìÍÑ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ë¤³¤È¤òµö¤·¤Þ¤»¤ó"
@@ -6768,6 +6767,9 @@
msgid "E919: Directory not found in '%s': \"%s\""
msgstr "E919: ¥Ç¥£¥ì¥¯¥È¥ê¤¬ '%s' ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó: \"%s\""
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Autocommand¤¬ºÆµ¢¤ò°ú¤µ¯¤³¤·¤Þ¤·¤¿"
+
msgid "search hit TOP, continuing at BOTTOM"
msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
@@ -6871,7 +6873,6 @@
msgid "list index out of range"
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 ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
@@ -7031,3 +7032,47 @@
msgstr ""
"¥Ñ¥¹¤ÎÀßÄê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: sys.path ¤¬¥ê¥¹¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
"¤¹¤°¤Ë vim.VIM_SPECIAL_PATH ¤ò sys.path ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim¥Þ¥¯¥í¥Õ¥¡¥¤¥ë (*.vim)\t*.vim\n"
+"¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*.*)\t*.*\n"
+"C¥½¡¼¥¹ (*.c, *.h)\t*.c;*.h\n"
+"C++¥½¡¼¥¹ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB¥³¡¼¥É (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim¥Õ¥¡¥¤¥ë (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim ¥Þ¥¯¥í¥Õ¥¡¥¤¥ë (*.vim)\t*.vim\n"
+"¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë (*)\t*\n"
+"C¥½¡¼¥¹ (*.c, *.h)\t*.c;*.h\n"
+"C++¥½¡¼¥¹ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim¥Õ¥¡¥¤¥ë (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
diff --git a/src/po/ja.po b/src/po/ja.po
index 45a7b0c..99c4683 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,7 +3,7 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
#
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 8.0\n"
+"Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 23:05+0900\n"
-"PO-Revision-Date: 2017-07-12 20:45+0900\n"
+"POT-Creation-Date: 2018-05-01 10:46+0900\n"
+"PO-Revision-Date: 2017-05-18 00:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n"
@@ -49,10 +49,10 @@
msgstr "E855: autocommandがコマンドの停止を引き起こしました"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: バッファを1つも作成できないので, 終了します..."
+msgstr "E82: バッファを1つも作成できないので、終了します..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: バッファを作成できないので, 他のを使用します..."
+msgstr "E83: バッファを作成できないので、他のを使用します..."
msgid "E931: Buffer cannot be registered"
msgstr "E931: バッファを登録できません"
@@ -96,7 +96,6 @@
msgid "E84: No modified buffer found"
msgstr "E84: 変更されたバッファはありません"
-#. back where we started, didn't find anything.
msgid "E85: There is no listed buffer"
msgstr "E85: リスト表示されるバッファはありません"
@@ -110,6 +109,18 @@
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: ジョブはまだ実行中です (! を追加でジョブを終了)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
+
+msgid "E948: Job still running"
+msgstr "E948: ジョブはまだ実行中です"
+
+msgid "E37: No write since last change"
+msgstr "E37: 最後の変更が保存されていません"
+
msgid "W14: Warning: List of file names overflow"
msgstr "W14: 警告: ファイル名のリストが長過ぎます"
@@ -165,7 +176,6 @@
msgid "[No Name]"
msgstr "[無名]"
-#. must be a help buffer
msgid "help"
msgstr "ヘルプ"
@@ -191,6 +201,9 @@
"\n"
"# バッファリスト:\n"
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: 'buftype' オプションが設定されているので書込めません"
+
msgid "[Scratch]"
msgstr "[下書き]"
@@ -359,7 +372,6 @@
msgid " Keyword completion (^N^P)"
msgstr " キーワード補完 (^N^P)"
-#. ctrl_x_mode == 0, ^P/^N compl.
msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
@@ -437,10 +449,6 @@
msgid " Adding"
msgstr " 追加中"
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed. -- Acevedo.
-#.
msgid "-- Searching..."
msgstr "-- 検索中..."
@@ -461,7 +469,6 @@
msgid "match %d"
msgstr "%d 番目の該当"
-#. maximum nesting of lists and dicts
msgid "E18: Unexpected characters in :let"
msgstr "E18: 予期せぬ文字が :let にありました"
@@ -522,8 +529,6 @@
msgid "E108: No such variable: \"%s\""
msgstr "E108: その変数はありません: \"%s\""
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
#, c-format
msgid "E940: Cannot lock or unlock variable %s"
msgstr "E940: 変数 %s はロックまたはアンロックできません"
@@ -534,21 +539,6 @@
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' の後に ':' がありません"
-msgid "E691: Can only compare List with List"
-msgstr "E691: リスト型はリスト型としか比較できません"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: リスト型には無効な操作です"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: 辞書型は辞書型としか比較できません"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: 辞書型には無効な操作です"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: 関数参照型には無効な操作です"
-
msgid "E804: Cannot use '%' with Float"
msgstr "E804: '%' を浮動小数点数と組み合わせては使えません"
@@ -588,7 +578,7 @@
msgstr "E805: 浮動小数点数を数値として扱っています"
msgid "E703: Using a Funcref as a Number"
-msgstr "E703: 関数参照型を数値として扱っています。"
+msgstr "E703: 関数参照型を数値として扱っています"
msgid "E745: Using a List as a Number"
msgstr "E745: リスト型を数値として扱っています"
@@ -600,10 +590,10 @@
msgstr "E910: ジョブを数値として扱っています"
msgid "E913: Using a Channel as a Number"
-msgstr "E913: チャンネルを数値として扱っています。"
+msgstr "E913: チャンネルを数値として扱っています"
msgid "E891: Using a Funcref as a Float"
-msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
+msgstr "E891: 関数参照型を浮動小数点数として扱っています"
msgid "E892: Using a String as a Float"
msgstr "E892: 文字列を浮動小数点数として扱っています"
@@ -621,7 +611,7 @@
msgstr "E911: ジョブを浮動小数点数として扱っています"
msgid "E914: Using a Channel as a Float"
-msgstr "E914: チャンネルを浮動小数点数として扱っています。"
+msgstr "E914: チャンネルを浮動小数点数として扱っています"
msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています"
@@ -675,6 +665,21 @@
"\n"
"\t最後にセットしたスクリプト: "
+msgid "E691: Can only compare List with List"
+msgstr "E691: リスト型はリスト型としか比較できません"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: リスト型には無効な操作です"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: 辞書型は辞書型としか比較できません"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: 辞書型には無効な操作です"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: 関数参照型には無効な操作です"
+
msgid "map() argument"
msgstr "map() の引数"
@@ -697,15 +702,15 @@
msgid "E785: complete() can only be used in Insert mode"
msgstr "E785: complete() は挿入モードでしか利用できません"
-#.
-#. * Yes this is ugly, I don't particularly like it either. But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all. See below what 'ok' and 'ync' are used for.
-#.
msgid "&Ok"
msgstr "&Ok"
#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
+
+#, c-format
msgid "E700: Unknown function: %s"
msgstr "E700: 未知の関数です: %s"
@@ -809,10 +814,22 @@
msgstr "E921: 無効なコールバック引数です"
#, c-format
+msgid "<%s>%s%s %d, Hex %02x, Oct %03o, Digr %s"
+msgstr "<%s>%s%s %d, 16進数 %02x, 8進数 %03o, ダイグラフ %s"
+
+#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16進数 %02x, 8進数 %03o"
#, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d, 16進数 %04x, 8進数 %o, ダイグラフ %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d, 16進数 %08x, 8進数 %o, ダイグラフ %s"
+
+#, c-format
msgid "> %d, Hex %04x, Octal %o"
msgstr "> %d, 16進数 %04x, 8進数 %o"
@@ -845,7 +862,7 @@
msgstr "%sviminfo: %s 行目: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします"
+msgstr "E136: viminfo: エラーが多過ぎるので、以降はスキップします"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -863,7 +880,6 @@
msgid " FAILED"
msgstr " 失敗"
-#. avoid a wait_return for this message, it's annoying
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfoファイルが書込みできません: %s"
@@ -884,7 +900,6 @@
msgid "E886: Can't rename viminfo file to %s!"
msgstr "E886: viminfoファイルを %s へ名前変更できません!"
-#. Write the info:
#, c-format
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
@@ -1003,7 +1018,6 @@
msgid " on %ld lines"
msgstr " (計 %ld 行内)"
-#. will increment global_busy to break out of the loop
msgid "E147: Cannot do :global recursive with a range"
msgstr "E147: :global を範囲付きで再帰的には使えません"
@@ -1120,6 +1134,14 @@
msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
#, c-format
+msgid "Oldval = \"%s\""
+msgstr "古い値 = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "新しい値 = \"%s\""
+
+#, c-format
msgid "line %ld: %s"
msgstr "行 %ld: %s"
@@ -1149,6 +1171,10 @@
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s 行 %ld"
+#, c-format
+msgid "%3d expr %s"
+msgstr "%3d expr %s"
+
msgid "E750: First use \":profile start {fname}\""
msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
@@ -1156,8 +1182,9 @@
msgid "Save changes to \"%s\"?"
msgstr "変更を \"%s\" に保存しますか?"
-msgid "Untitled"
-msgstr "無題"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: ジョブはバッファ \"%s\" でまだ実行中です"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
@@ -1292,7 +1319,7 @@
msgstr "E493: 逆さまの範囲が指定されました"
msgid "Backwards range given, OK to swap"
-msgstr "逆さまの範囲が指定されました, 入替えますか?"
+msgstr "逆さまの範囲が指定されました、入替えますか?"
msgid "E494: Use w or w>>"
msgstr "E494: w もしくは w>> を使用してください"
@@ -1303,17 +1330,14 @@
"さい"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
-
-msgid "E172: Only one file name allowed"
-msgstr "E172: ファイル名は 1 つにしてください"
+msgstr "E319: このバージョンではこのコマンドは利用できません、ごめんなさい"
msgid "1 more file to edit. Quit anyway?"
-msgstr "編集すべきファイルが 1 個ありますが, 終了しますか?"
+msgstr "編集すべきファイルが 1 個ありますが、終了しますか?"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "編集すべきファイルがあと %d 個ありますが, 終了しますか?"
+msgstr "編集すべきファイルがあと %d 個ありますが、終了しますか?"
msgid "E173: 1 more file to edit"
msgstr "E173: 編集すべきファイルが 1 個あります"
@@ -1364,7 +1388,7 @@
msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
+msgstr "E841: 予約名なので、ユーザー定義コマンドに利用できません"
#, c-format
msgid "E184: No such user-defined command: %s"
@@ -1415,7 +1439,7 @@
msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr ""
-"E747: バッファが修正されているので, ディレクトリを変更できません (! を追加で"
+"E747: バッファが修正されているので、ディレクトリを変更できません (! を追加で"
"上書)"
msgid "E186: No previous directory"
@@ -1465,7 +1489,6 @@
msgid "E190: Cannot open \"%s\" for writing"
msgstr "E190: \"%s\" を書込み用として開けません"
-#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
msgstr "E191: 引数は1文字の英字か引用符 (' か `) でなければいけません"
@@ -1504,13 +1527,15 @@
msgid "E195: Cannot open viminfo file for reading"
msgstr "E195: viminfoファイルを読込用として開けません"
+msgid "Untitled"
+msgstr "無題"
+
msgid "E196: No digraphs in this version"
msgstr "E196: このバージョンに合字はありません"
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: 'Vim' で始まる例外は :throw できません"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception thrown: %s"
msgstr "例外が発生しました: %s"
@@ -1527,7 +1552,6 @@
msgid "%s, line %ld"
msgstr "%s, 行 %ld"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception caught: %s"
msgstr "例外が捕捉されました: %s"
@@ -1553,7 +1577,6 @@
msgid "Error"
msgstr "エラー"
-#. if (pending & CSTP_INTERRUPT)
msgid "Interrupt"
msgstr "割込み"
@@ -1596,15 +1619,12 @@
msgid "E603: :catch without :try"
msgstr "E603: :try のない :catch があります"
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
msgid "E604: :catch after :finally"
msgstr "E604: :finally の後に :catch があります"
msgid "E606: :finally without :try"
msgstr "E606: :try のない :finally があります"
-#. Give up for a multiple ":finally" and ignore it.
msgid "E607: multiple :finally"
msgstr "E607: 複数の :finally があります"
@@ -1697,7 +1717,6 @@
msgid "Reading from stdin..."
msgstr "標準入力から読込み中..."
-#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
msgstr "E202: 変換がファイルを読込不可にしました"
@@ -1786,9 +1805,6 @@
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
-
msgid "E214: Can't find temp file for writing"
msgstr "E214: 保存用一時ファイルが見つかりません"
@@ -1801,25 +1817,25 @@
msgid "E212: Can't open file for writing"
msgstr "E212: 書込み用にファイルを開けません"
-msgid "E667: Fsync failed"
-msgstr "E667: fsync に失敗しました"
+msgid "E949: File changed while writing"
+msgstr "E949: 書込み中にファイルが変更されました"
msgid "E512: Close failed"
msgstr "E512: 閉じることに失敗"
msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: 書込みエラー, 変換失敗 (上書するには 'fenc' を空にしてください)"
+msgstr "E513: 書込みエラー、変換失敗 (上書するには 'fenc' を空にしてください)"
#, c-format
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
msgstr ""
-"E513: 書込みエラー, 変換失敗, 行数 %ld (上書するには 'fenc' を空にしてくださ"
+"E513: 書込みエラー、変換失敗、行数 %ld (上書するには 'fenc' を空にしてくださ"
"い)"
msgid "E514: write error (file system full?)"
-msgstr "E514: 書込みエラー, (ファイルシステムが満杯?)"
+msgstr "E514: 書込みエラー (ファイルシステムが満杯?)"
msgid " CONVERSION ERROR"
msgstr " 変換エラー"
@@ -1903,9 +1919,6 @@
msgid "[Incomplete last line]"
msgstr "[最終行が不完全]"
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
@@ -1983,7 +1996,6 @@
msgid "auto-removing autocommand: %s <buffer=%d>"
msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
-#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
msgstr "E367: そのグループはありません: \"%s\""
@@ -2006,7 +2018,6 @@
msgid "E216: No such group or event: %s"
msgstr "E216: そのようなグループもしくはイベントはありません: %s"
-#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
@@ -2054,6 +2065,11 @@
msgid "E351: Cannot delete fold with current 'foldmethod'"
msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld 行が折畳まれました"
+
msgid "E222: Add to read buffer"
msgstr "E222: 読込バッファへ追加"
@@ -2099,7 +2115,7 @@
msgstr "E230: \"%s\"から読込むことができません"
msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
+msgstr "E665: 有効なフォントが見つからないので、GUIを開始できません"
msgid "E231: 'guifontwide' invalid"
msgstr "E231: 'guifontwide' が無効です"
@@ -2112,7 +2128,7 @@
msgstr "E254: %s の色を割り当てられません"
msgid "No match at cursor, finding next"
-msgstr "カーソルの位置にマッチはありません, 次を検索しています"
+msgstr "カーソルの位置にマッチはありません、次を検索しています"
msgid "<cannot open> "
msgstr "<開けません> "
@@ -2187,18 +2203,15 @@
msgid "Replace with:"
msgstr "置換文字列:"
-#. whole word only button
msgid "Match whole word only"
msgstr "正確に該当するものだけ"
-#. match case button
msgid "Match case"
msgstr "大文字/小文字を区別する"
msgid "Direction"
msgstr "方向"
-#. 'Up' and 'Down' buttons
msgid "Up"
msgstr "上"
@@ -2277,8 +2290,6 @@
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "検索・置換 ('\\' を検索するには '\\\\')"
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
msgid "Not Used"
msgstr "使われません"
@@ -2350,7 +2361,6 @@
msgid "Name:"
msgstr "名前:"
-#. create toggle button
msgid "Show size in Points"
msgstr "サイズをポイントで表示する"
@@ -2596,7 +2606,6 @@
msgid "cscope connection %s closed"
msgstr "cscope接続 %s が閉じられました"
-#. should not reach here
msgid "E570: fatal error in cs_manage_matches"
msgstr "E570: cs_manage_matches で致命的なエラーです"
@@ -2642,8 +2651,8 @@
"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
"could not be loaded."
msgstr ""
-"E895: このコマンドは無効です,ごめんなさい. MzScheme の racket/base モジュール"
-"がロードできませんでした."
+"E895: このコマンドは無効です、ごめんなさい. MzScheme の racket/base モジュー"
+"ルがロードできませんでした."
msgid "invalid expression"
msgstr "無効な式です"
@@ -2703,14 +2712,14 @@
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
msgstr ""
-"E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできません"
-"でした."
+"E263: このコマンドは無効です、ごめんなさい: Pythonライブラリをロードできませ"
+"んでした."
msgid ""
"E887: Sorry, this command is disabled, the Python's site module could not be "
"loaded."
msgstr ""
-"E887: このコマンドは無効です,ごめんなさい. Python の site モジュールをロード"
+"E887: このコマンドは無効です、ごめんなさい. Python の site モジュールをロード"
"できませんでした."
# Added at 07-Feb-2004.
@@ -2726,8 +2735,8 @@
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
-"E266: このコマンドは無効です,ごめんなさい: Rubyライブラリをロードできませんで"
-"した."
+"E266: このコマンドは無効です、ごめんなさい: Rubyライブラリをロードできません"
+"でした."
msgid "E267: unexpected return"
msgstr "E267: 予期せぬ return です"
@@ -2757,7 +2766,6 @@
msgid "not implemented yet"
msgstr "まだ実装されていません"
-#. ???
msgid "cannot set line(s)"
msgstr "行を設定できません"
@@ -2799,7 +2807,6 @@
msgstr ""
"コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されました"
-#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
@@ -2814,7 +2821,7 @@
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
-"E571: このコマンドは無効です,ごめんなさい: Tclライブラリをロードできませんで"
+"E571: このコマンドは無効です、ごめんなさい: Tclライブラリをロードできませんで"
"した."
#, c-format
@@ -2901,7 +2908,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: 警告: 端末からの入力ではありません\n"
-#. just in case..
msgid "pre-vimrc command line"
msgstr "vimrc前のコマンドライン"
@@ -2997,7 +3003,7 @@
msgstr "-d\t\t\t差分モード (\"vidiff\" と同じ)"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tイージーモード (\"evim\" と同じ, モード無)"
+msgstr "-y\t\t\tイージーモード (\"evim\" と同じ、モード無)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\t読込専用モード (\"view\" と同じ)"
@@ -3120,7 +3126,7 @@
msgstr "--remote <files>\t可能ならばVimサーバーで <files> を編集する"
msgid "--remote-silent <files> Same, don't complain if there is no server"
-msgstr "--remote-silent <files> 同上, サーバーが無くても警告文を出力しない"
+msgstr "--remote-silent <files> 同上、サーバーが無くても警告文を出力しない"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
@@ -3129,7 +3135,7 @@
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr ""
-"--remote-wait-silent <files> 同上, サーバーが無くても警告文を出力しない"
+"--remote-wait-silent <files> 同上、サーバーが無くても警告文を出力しない"
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
@@ -3155,8 +3161,11 @@
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfoの代わりに <viminfo> を使う"
+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible'、Vimの既定、プラグインなし、viminfoなし"
+
msgid "-h or --help\tPrint Help (this message) and exit"
-msgstr "-h or --help\tヘルプ(このメッセージ)を表示し終了する"
+msgstr "-h or --help\tヘルプ(このメッセージ)を表示し終了する"
msgid "--version\t\tPrint version information and exit"
msgstr "--version\t\tバージョン情報を表示し終了する"
@@ -3253,11 +3262,9 @@
msgid "No display"
msgstr "ディスプレイが見つかりません"
-#. Failed to send, abort.
msgid ": Send failed.\n"
msgstr ": 送信に失敗しました.\n"
-#. Let vim start normally.
msgid ": Send failed. Trying to execute locally\n"
msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
@@ -3278,7 +3285,6 @@
msgid "E283: No marks matching \"%s\""
msgstr "E283: \"%s\" に該当するマークがありません"
-#. Highlight title
msgid ""
"\n"
"mark line col file/text"
@@ -3286,7 +3292,6 @@
"\n"
"mark 行 列 ファイル/テキスト"
-#. Highlight title
msgid ""
"\n"
" jump line col file/text"
@@ -3294,7 +3299,6 @@
"\n"
" jump 行 列 ファイル/テキスト"
-#. Highlight title
msgid ""
"\n"
"change line col text"
@@ -3309,7 +3313,6 @@
"\n"
"# ファイルマーク:\n"
-#. Write the jumplist with -'
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3378,9 +3381,8 @@
msgid "E843: Error while updating swap file crypt"
msgstr "E843: スワップファイルの暗号を更新中にエラーが発生しました"
-#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: おっと, スワップファイルが失われました!!!"
+msgstr "E301: おっと、スワップファイルが失われました!!!"
msgid "E302: Could not rename swap file"
msgstr "E302: スワップファイルの名前を変えられません"
@@ -3465,7 +3467,7 @@
"If you entered a new crypt key but did not write the text file,"
msgstr ""
"\n"
-"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は,"
+"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は、"
msgid ""
"\n"
@@ -3479,7 +3481,7 @@
"If you wrote the text file after changing the crypt key press enter"
msgstr ""
"\n"
-"暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと"
+"暗号キーを変えたあとにテキストファイルを保存した場合は、テキストファイルと"
msgid ""
"\n"
@@ -3539,7 +3541,7 @@
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(変更をチェックするために, このファイルを別の名前で保存した上で\n"
+"(変更をチェックするために、このファイルを別の名前で保存した上で\n"
msgid "and run diff with the original file to check for changes)"
msgstr "原本ファイルとの diff を実行すると良いでしょう)"
@@ -3559,7 +3561,6 @@
msgid "Using crypt key from swap file for the text file.\n"
msgstr "スワップファイルから取得した暗号キーをテキストファイルに使います.\n"
-#. use msg() to start the scrolling properly
msgid "Swap files found:"
msgstr "スワップファイルが複数見つかりました:"
@@ -3729,8 +3730,6 @@
msgid " NEWER than swap file!\n"
msgstr " スワップファイルよりも新しいです!\n"
-#. Some of these messages are long to allow translation to
-#. * other languages.
msgid ""
"\n"
"(1) Another program may be editing the same file. If this is the case,\n"
@@ -3739,9 +3738,9 @@
msgstr ""
"\n"
"(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
-" この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
-" インスタンスができてしまうので, そうしないように気をつけてください.\n"
-" 終了するか, 注意しながら続けてください.\n"
+" この場合には、変更をしてしまうと1つのファイルに対して異なる2つの\n"
+" インスタンスができてしまうので、そうしないように気をつけてください.\n"
+" 終了するか、注意しながら続けてください.\n"
msgid "(2) An edit session for this file crashed.\n"
msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
@@ -3757,7 +3756,7 @@
" を使用して変更をリカバーします(\":help recovery\" を参照).\n"
msgid " If you did this already, delete the swap file \""
-msgstr " 既にこれを行なったのならば, スワップファイル \""
+msgstr " 既にこれを行なったのならば、スワップファイル \""
msgid ""
"\"\n"
@@ -3819,7 +3818,6 @@
msgid "E329: No menu \"%s\""
msgstr "E329: \"%s\" というメニューはありません"
-#. Only a mnemonic or accelerator is not valid.
msgid "E792: Empty menu name"
msgstr "E792: メニュー名が空です"
@@ -3832,8 +3830,6 @@
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: 区切りはメニューパスの一部ではありません"
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
msgid ""
"\n"
"--- Menus ---"
@@ -3844,6 +3840,10 @@
msgid "Tear off this menu"
msgstr "このメニューを切り取る"
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: %s にはメニューが定義されていません"
+
msgid "E333: Menu path must lead to a menu item"
msgstr "E333: メニューパスはメニューアイテムを生じなければいけません"
@@ -3851,10 +3851,6 @@
msgid "E334: Menu not found: %s"
msgstr "E334: メニューが見つかりません: %s"
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s にはメニューが定義されていません"
-
msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: メニューパスはサブメニューを生じなければいけません"
@@ -3924,9 +3920,8 @@
msgid "Open File dialog"
msgstr "ファイル読込ダイアログ"
-#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
+msgstr "E338: コンソールモードではファイルブラウザを使えません、ごめんなさい"
msgid "E766: Insufficient arguments for printf()"
msgstr "E766: printf() の引数が不十分です"
@@ -4124,7 +4119,6 @@
msgid "E748: No previously used register"
msgstr "E748: まだレジスタを使用していません"
-#. must display the prompt
msgid "cannot yank; delete anyway"
msgstr "ヤンクできません; とにかく消去"
@@ -4139,25 +4133,30 @@
msgid "freeing %ld lines"
msgstr "%ld 行を解放中"
-msgid "block of 1 line yanked"
-msgstr "1 行のブロックがヤンクされました"
-
-msgid "1 line yanked"
-msgstr "1 行がヤンクされました"
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c に"
#, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld 行のブロックがヤンクされました"
+msgid "block of 1 line yanked%s"
+msgstr "1 行のブロックが%sヤンクされました"
#, c-format
-msgid "%ld lines yanked"
-msgstr "%ld 行がヤンクされました"
+msgid "1 line yanked%s"
+msgstr "1 行が%sヤンクされました"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "%ld 行のブロックが%sヤンクされました"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld 行が%sヤンクされました"
#, c-format
msgid "E353: Nothing in register %s"
msgstr "E353: レジスタ %s には何もありません"
-#. Highlight title
msgid ""
"\n"
"--- Registers ---"
@@ -4212,11 +4211,8 @@
"%lld"
#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=%N ページ"
+msgid "(+%lld for BOM)"
+msgstr "(+%lld for BOM)"
msgid "Thanks for flying Vim"
msgstr "Vim を使ってくれてありがとう"
@@ -4268,6 +4264,10 @@
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+2 GUIでは変更できません"
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: %s と %s の間で変換できません"
+
msgid "E524: Missing colon"
msgstr "E524: コロンがありません"
@@ -4325,12 +4325,18 @@
msgid "E542: unbalanced groups"
msgstr "E542: グループが釣合いません"
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: 実行中のジョブがある端末は変更可能にできません"
+
msgid "E590: A preview window already exists"
msgstr "E590: プレビューウィンドウが既に存在します"
msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
msgstr ""
-"W17: アラビア文字にはUTF-8が必要なので, ':set encoding=utf-8' してください"
+"W17: アラビア文字にはUTF-8が必要なので、':set encoding=utf-8' してください"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bit色はこの環境ではサポートされていません"
#, c-format
msgid "E593: Need at least %d lines"
@@ -4344,9 +4350,6 @@
msgid "E355: Unknown option: %s"
msgstr "E355: 未知のオプションです: %s"
-#. There's another character after zeros or the string
-#. * is empty. In both cases, we are trying to set a
-#. * num option using a string.
#, c-format
msgid "E521: Number required: &%s = '%s'"
msgstr "E521: 数字が必要です: &%s = '%s'"
@@ -4419,7 +4422,6 @@
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: コンソールではない??\n"
-#. if Vim opened a window: Executing a shell may cause crashes
msgid "E360: Cannot execute shell with -f option"
msgstr "E360: -f オプションでシェルを実行できません"
@@ -4620,6 +4622,9 @@
msgid "shell returned %d"
msgstr "シェルがコード %d で終了しました"
+msgid "E926: Current location list was changed"
+msgstr "E926: 現在のロケーションリストが変更されました"
+
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
@@ -4643,7 +4648,6 @@
msgid "E377: Invalid %%%c in format string"
msgstr "E377: フォーマット文字列に無効な %%%c があります"
-#. nothing found
msgid "E378: 'errorformat' contains no pattern"
msgstr "E378: 'errorformat' にパターンが指定されていません"
@@ -4659,9 +4663,6 @@
msgid "E925: Current quickfix was changed"
msgstr "E925: 現在の quickfix が変更されました"
-msgid "E926: Current location list was changed"
-msgstr "E926: 現在のロケーションリストが変更されました"
-
#, c-format
msgid "(%d of %d)%s%s: "
msgstr "(%d of %d)%s%s: "
@@ -4682,9 +4683,6 @@
msgid "No entries"
msgstr "エントリがありません"
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 'buftype' オプションが設定されているので書込みません"
-
msgid "Error file"
msgstr "エラーファイル"
@@ -4837,11 +4835,13 @@
msgid "E867: (NFA) Unknown operator '\\z%c'"
msgstr "E867: (NFA) 未知のオペレータです: '\\z%c'"
+msgid "E951: \\% value too large"
+msgstr "E951: \\% 値が長過ぎます"
+
#, 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構築に失敗しました!"
@@ -4852,11 +4852,9 @@
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 正規表現) '(' が多過ぎます"
@@ -4964,7 +4962,6 @@
msgid " (includes previously listed match)"
msgstr " (前に列挙した該当箇所を含む)"
-#. cursor at status line
msgid "--- Included files "
msgstr "--- インクルードされたファイル "
@@ -5037,14 +5034,12 @@
msgstr "警告9: %s という範囲はサポートされていません"
msgid "Sorry, no suggestions"
-msgstr "残念ですが, 修正候補はありません"
+msgstr "残念ですが、修正候補はありません"
#, c-format
msgid "Sorry, only %ld suggestions"
-msgstr "残念ですが, 修正候補は %ld 個しかありません"
+msgstr "残念ですが、修正候補は %ld 個しかありません"
-#. for when 'cmdheight' > 1
-#. avoid more prompt
#, c-format
msgid "Change \"%.*s\" to:"
msgstr "\"%.*s\" を次へ変換:"
@@ -5089,7 +5084,7 @@
msgstr "E757: スペルファイルではないようです"
msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: 古いスペルファイルなので, アップデートしてください"
+msgstr "E771: 古いスペルファイルなので、アップデートしてください"
msgid "E772: Spell file is for newer version of Vim"
msgstr "E772: より新しいバージョンの Vim 用のスペルファイルです"
@@ -5103,7 +5098,7 @@
#, c-format
msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
+msgstr "E779: 古い .sug ファイルなので、アップデートしてください: %s"
#, c-format
msgid "E780: .sug file is for newer version of Vim: %s"
@@ -5263,8 +5258,8 @@
msgstr "E760: %s には単語数がありません"
#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "行 %6d, 単語 %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr "行 %6d, 単語 %6ld - %s"
#, c-format
msgid "Duplicate word in %s line %d: %s"
@@ -5300,7 +5295,7 @@
#, c-format
msgid "Too many regions in %s line %d: %s"
-msgstr "%s の %d 行目, 範囲指定が多過ぎます: %s"
+msgstr "%s の %d 行目、範囲指定が多過ぎます: %s"
#, c-format
msgid "/ line ignored in %s line %d: %s"
@@ -5328,10 +5323,6 @@
msgid "Reading back spell file..."
msgstr "スペルファイルを逆読込中"
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
msgid "Performing soundfolding..."
msgstr "音声畳込みを実行中..."
@@ -5354,8 +5345,9 @@
msgid "E751: Output file name must not have region name"
msgstr "E751: 出力ファイル名には範囲名を含められません"
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: 範囲は 8 個までしかサポートされていません"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: 範囲は %ld 個までしかサポートされていません"
#, c-format
msgid "E755: Invalid region in %s"
@@ -5386,8 +5378,6 @@
msgid "E763: Word characters differ between spell files"
msgstr "E763: 単語の文字がスペルファイルと異なります"
-#. This should have been checked when generating the .spl
-#. * file.
msgid "E783: duplicate char in MAP entry"
msgstr "E783: MAP エントリに重複文字が存在します"
@@ -5653,7 +5643,6 @@
msgid "File \"%s\" does not exist"
msgstr "ファイル \"%s\" がありません"
-#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
msgstr "タグ %d (全%d%s)"
@@ -5668,7 +5657,6 @@
msgid "E429: File \"%s\" does not exist"
msgstr "E429: ファイル \"%s\" がありません"
-#. Highlight title
msgid ""
"\n"
" # TO tag FROM line in file/text"
@@ -5699,7 +5687,6 @@
msgid "E432: Tags file not sorted: %s"
msgstr "E432: タグファイルがソートされていません: %s"
-#. never opened any tags file
msgid "E433: No tags file"
msgstr "E433: タグファイルがありません"
@@ -5735,7 +5722,6 @@
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: 端末に \"cm\" 機能が必要です"
-#. Highlight title
msgid ""
"\n"
"--- Terminal keys ---"
@@ -5746,6 +5732,32 @@
msgid "Cannot open $VIMRUNTIME/rgb.txt"
msgstr "$VIMRUNTIME/rgb.txtを開けません"
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "\"%s\" 内のジョブを終了しますか?"
+
+msgid "Terminal"
+msgstr "端末"
+
+msgid "Terminal-finished"
+msgstr "端末 (終了)"
+
+msgid "active"
+msgstr "アクティブ"
+
+msgid "running"
+msgstr "実行中"
+
+msgid "finished"
+msgstr "終了"
+
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953: ファイルは既に存在します: %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: 端末バッファではありません"
+
msgid "new shell started\n"
msgstr "新しいシェルを起動します\n"
@@ -5755,12 +5767,9 @@
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
msgid "E881: Line count changed unexpectedly"
msgstr "E881: 予期せず行カウントが変わりました"
-#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr "可能なアンドゥはありません: とりあえず続けます"
@@ -5895,7 +5904,7 @@
#, c-format
msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+msgstr "E122: 関数 %s は定義済です、再定義するには ! を追加してください"
msgid "E717: Dictionary entry already exists"
msgstr "E717: 辞書型内にエントリが既に存在します"
@@ -6054,24 +6063,17 @@
msgid ""
"\n"
-"MacOS X (unix) version"
+"macOS version"
msgstr ""
"\n"
-"MacOS X (unix) 版"
+"macOS 版"
msgid ""
"\n"
-"MacOS X version"
+"macOS version w/o darwin feat."
msgstr ""
"\n"
-"MacOS X 版"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"MacOS 版"
+"macOS 版 (darwin 無し)"
msgid ""
"\n"
@@ -6175,9 +6177,6 @@
msgid "with Cocoa GUI."
msgstr "with Cocoa GUI."
-msgid "with (classic) GUI."
-msgstr "with (クラシック) GUI."
-
msgid " Features included (+) or not (-):\n"
msgstr " 機能の一覧 有効(+)/無効(-)\n"
@@ -6275,7 +6274,7 @@
msgstr "詳細はメニューの ヘルプ->孤児 を参照して下さい "
msgid "Running modeless, typed text is inserted"
-msgstr "モード無で実行中, タイプした文字が挿入されます"
+msgstr "モード無で実行中。タイプした文字が挿入されます"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "メニューの 編集->全体設定->挿入(初心者)モード切替 "
@@ -6360,7 +6359,7 @@
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
-"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
+"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
@@ -6379,7 +6378,6 @@
msgid "Edit with &Vim"
msgstr "Vimで編集する (&V)"
-#. Now concatenate
msgid "Edit with existing Vim - "
msgstr "起動済のVimで編集する - "
@@ -6398,10 +6396,6 @@
msgid "--No lines in buffer--"
msgstr "--バッファに行がありません--"
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
msgid "E470: Command aborted"
msgstr "E470: コマンドが中断されました"
@@ -6475,6 +6469,14 @@
msgstr "E475: 無効な引数です: %s"
#, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: 引数 %s に対して無効な値です"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: 引数 %s に対して無効な値です: %s"
+
+#, c-format
msgid "E15: Invalid expression: %s"
msgstr "E15: 無効な式です: %s"
@@ -6492,6 +6494,9 @@
msgid "E364: Library call failed for \"%s()\""
msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
+msgid "E667: Fsync failed"
+msgstr "E667: fsync に失敗しました"
+
#, c-format
msgid "E448: Could not load library function %s"
msgstr "E448: ライブラリの関数 %s をロードできませんでした"
@@ -6503,7 +6508,7 @@
msgstr "E20: マークは設定されていません"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' がオフなので, 変更できません"
+msgstr "E21: 'modifiable' がオフなので、変更できません"
msgid "E22: Scripts nested too deep"
msgstr "E22: スクリプトの入れ子が深過ぎます"
@@ -6586,12 +6591,6 @@
msgid "E485: Can't read file %s"
msgstr "E485: ファイル %s を読込めません"
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
-
-msgid "E37: No write since last change"
-msgstr "E37: 最後の変更が保存されていません"
-
msgid "E38: Null argument"
msgstr "E38: 引数が空です"
@@ -6736,7 +6735,7 @@
msgstr "E449: 無効な式を受け取りました"
msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: 領域が保護されているので, 変更できません"
+msgstr "E463: 領域が保護されているので、変更できません"
msgid "E744: NetBeans does not allow changes in read-only files"
msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
@@ -6768,6 +6767,9 @@
msgid "E919: Directory not found in '%s': \"%s\""
msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Autocommandが再帰を引き起こしました"
+
msgid "search hit TOP, continuing at BOTTOM"
msgstr "上まで検索したので下に戻ります"
@@ -6871,7 +6873,6 @@
msgid "list index out of range"
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 の取得に失敗しました"
@@ -7031,3 +7032,47 @@
msgstr ""
"パスの設定に失敗しました: sys.path がリストではありません\n"
"すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vimマクロファイル (*.vim)\t*.vim\n"
+"すべてのファイル (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "すべてのファイル (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"すべてのファイル (*.*)\t*.*\n"
+"Cソース (*.c, *.h)\t*.c;*.h\n"
+"C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VBコード (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim マクロファイル (*.vim)\t*.vim\n"
+"すべてのファイル (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "すべてのファイル (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"すべてのファイル (*)\t*\n"
+"Cソース (*.c, *.h)\t*.c;*.h\n"
+"C++ソース (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vimファイル (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 1bbbf85..02fff41 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,7 +3,7 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
#
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -12,10 +12,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 8.0\n"
+"Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 23:05+0900\n"
-"PO-Revision-Date: 2017-07-12 20:45+0900\n"
+"POT-Creation-Date: 2018-05-01 10:46+0900\n"
+"PO-Revision-Date: 2017-05-18 00:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n"
@@ -49,10 +49,10 @@
msgstr "E855: autocommandªR}hÌâ~ðø«N±µÜµ½"
msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: obt@ð1Âàì¬Å«È¢ÌÅ, I¹µÜ·..."
+msgstr "E82: obt@ð1Âàì¬Å«È¢ÌÅAI¹µÜ·..."
msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: obt@ðì¬Å«È¢ÌÅ, ¼ÌðgpµÜ·..."
+msgstr "E83: obt@ðì¬Å«È¢ÌÅA¼ÌðgpµÜ·..."
msgid "E931: Buffer cannot be registered"
msgstr "E931: obt@ðo^ūܹñ"
@@ -96,7 +96,6 @@
msgid "E84: No modified buffer found"
msgstr "E84: ÏX³ê½obt@Í èܹñ"
-#. back where we started, didn't find anything.
msgid "E85: There is no listed buffer"
msgstr "E85: Xg\\¦³êéobt@Í èܹñ"
@@ -110,6 +109,18 @@
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: obt@ %ld ÌÏXÍÛ¶³êĢܹñ (! ÅÏXðjü)"
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: WuÍܾÀsÅ· (! ðÇÁÅWuðI¹)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ (! ðÇÁÅÏXðjü)"
+
+msgid "E948: Job still running"
+msgstr "E948: WuÍܾÀsÅ·"
+
+msgid "E37: No write since last change"
+msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ"
+
msgid "W14: Warning: List of file names overflow"
msgstr "W14: x: t@C¼ÌXgª·ß¬Ü·"
@@ -165,7 +176,6 @@
msgid "[No Name]"
msgstr "[³¼]"
-#. must be a help buffer
msgid "help"
msgstr "wv"
@@ -191,6 +201,9 @@
"\n"
"# obt@Xg:\n"
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: 'buftype' IvVªÝè³êÄ¢éÌÅßܹñ"
+
msgid "[Scratch]"
msgstr "[º«]"
@@ -359,7 +372,6 @@
msgid " Keyword completion (^N^P)"
msgstr " L[[hâ® (^N^P)"
-#. ctrl_x_mode == 0, ^P/^N compl.
msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
msgstr " ^X [h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
@@ -437,10 +449,6 @@
msgid " Adding"
msgstr " ÇÁ"
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed. -- Acevedo.
-#.
msgid "-- Searching..."
msgstr "-- õ..."
@@ -461,7 +469,6 @@
msgid "match %d"
msgstr "%d ÔÚÌY"
-#. maximum nesting of lists and dicts
msgid "E18: Unexpected characters in :let"
msgstr "E18: \\ú¹Ê¶ª :let É èܵ½"
@@ -522,8 +529,6 @@
msgid "E108: No such variable: \"%s\""
msgstr "E108: »ÌÏÍ èܹñ: \"%s\""
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
#, c-format
msgid "E940: Cannot lock or unlock variable %s"
msgstr "E940: Ï %s ÍbNܽÍAbNūܹñ"
@@ -534,21 +539,6 @@
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ÌãÉ ':' ª èܹñ"
-msgid "E691: Can only compare List with List"
-msgstr "E691: Xg^ÍXg^Ƶ©ärūܹñ"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: Xg^ÉͳøÈìÅ·"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: «^Í«^Ƶ©ärūܹñ"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: «^ÉͳøÈìÅ·"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: ÖQÆ^ÉͳøÈìÅ·"
-
msgid "E804: Cannot use '%' with Float"
msgstr "E804: '%' ð®¬_ÆgÝí¹ÄÍg¦Ü¹ñ"
@@ -588,7 +578,7 @@
msgstr "E805: ®¬_ðlƵĵÁĢܷ"
msgid "E703: Using a Funcref as a Number"
-msgstr "E703: ÖQÆ^ðlƵĵÁĢܷB"
+msgstr "E703: ÖQÆ^ðlƵĵÁĢܷ"
msgid "E745: Using a List as a Number"
msgstr "E745: Xg^ðlƵĵÁĢܷ"
@@ -600,10 +590,10 @@
msgstr "E910: WuðlƵĵÁĢܷ"
msgid "E913: Using a Channel as a Number"
-msgstr "E913: `lðlƵĵÁĢܷB"
+msgstr "E913: `lðlƵĵÁĢܷ"
msgid "E891: Using a Funcref as a Float"
-msgstr "E891: ÖQÆ^ð®¬_ƵĵÁĢܷB"
+msgstr "E891: ÖQÆ^ð®¬_ƵĵÁĢܷ"
msgid "E892: Using a String as a Float"
msgstr "E892: ¶ñð®¬_ƵĵÁĢܷ"
@@ -621,7 +611,7 @@
msgstr "E911: Wuð®¬_ƵĵÁĢܷ"
msgid "E914: Using a Channel as a Float"
-msgstr "E914: `lð®¬_ƵĵÁĢܷB"
+msgstr "E914: `lð®¬_ƵĵÁĢܷ"
msgid "E729: using Funcref as a String"
msgstr "E729: ÖQÆ^ð¶ñƵĵÁĢܷ"
@@ -675,6 +665,21 @@
"\n"
"\tÅãÉZbgµ½XNvg: "
+msgid "E691: Can only compare List with List"
+msgstr "E691: Xg^ÍXg^Ƶ©ärūܹñ"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: Xg^ÉͳøÈìÅ·"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: «^Í«^Ƶ©ärūܹñ"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: «^ÉͳøÈìÅ·"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ÖQÆ^ÉͳøÈìÅ·"
+
msgid "map() argument"
msgstr "map() Ìø"
@@ -697,15 +702,15 @@
msgid "E785: complete() can only be used in Insert mode"
msgstr "E785: complete() Í}ü[hŵ©pūܹñ"
-#.
-#. * Yes this is ugly, I don't particularly like it either. But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all. See below what 'ok' and 'ync' are used for.
-#.
msgid "&Ok"
msgstr "&Ok"
#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld s: "
+
+#, c-format
msgid "E700: Unknown function: %s"
msgstr "E700: ¢mÌÖÅ·: %s"
@@ -809,10 +814,22 @@
msgstr "E921: ³øÈR[obNøÅ·"
#, c-format
+msgid "<%s>%s%s %d, Hex %02x, Oct %03o, Digr %s"
+msgstr "<%s>%s%s %d, 16i %02x, 8i %03o, _COt %s"
+
+#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16i %02x, 8i %03o"
#, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d, 16i %04x, 8i %o, _COt %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d, 16i %08x, 8i %o, _COt %s"
+
+#, c-format
msgid "> %d, Hex %04x, Octal %o"
msgstr "> %d, 16i %04x, 8i %o"
@@ -845,7 +862,7 @@
msgstr "%sviminfo: %s sÚ: "
msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: G[ª½ß¬éÌÅ, È~ÍXLbvµÜ·"
+msgstr "E136: viminfo: G[ª½ß¬éÌÅAÈ~ÍXLbvµÜ·"
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -863,7 +880,6 @@
msgid " FAILED"
msgstr " ¸s"
-#. avoid a wait_return for this message, it's annoying
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfot@CªÝūܹñ: %s"
@@ -884,7 +900,6 @@
msgid "E886: Can't rename viminfo file to %s!"
msgstr "E886: viminfot@Cð %s Ö¼OÏXūܹñ!"
-#. Write the info:
#, c-format
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# ±Ì viminfo t@CÍ Vim %s ÉæÁĶ¬³êܵ½.\n"
@@ -1003,7 +1018,6 @@
msgid " on %ld lines"
msgstr " (v %ld sà)"
-#. will increment global_busy to break out of the loop
msgid "E147: Cannot do :global recursive with a range"
msgstr "E147: :global ðÍÍt«ÅÄAIÉÍg¦Ü¹ñ"
@@ -1120,6 +1134,14 @@
msgstr "fobO[hÉüèÜ·. ±¯éÉÍ \"cont\" Æü͵ľ³¢."
#, c-format
+msgid "Oldval = \"%s\""
+msgstr "âl = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Vµ¢l = \"%s\""
+
+#, c-format
msgid "line %ld: %s"
msgstr "s %ld: %s"
@@ -1149,6 +1171,10 @@
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s s %ld"
+#, c-format
+msgid "%3d expr %s"
+msgstr "%3d expr %s"
+
msgid "E750: First use \":profile start {fname}\""
msgstr "E750: ßÉ \":profile start {fname}\" ðÀsµÄ¾³¢"
@@ -1156,8 +1182,9 @@
msgid "Save changes to \"%s\"?"
msgstr "ÏXð \"%s\" ÉÛ¶µÜ·©?"
-msgid "Untitled"
-msgstr "³è"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: WuÍobt@ \"%s\" ÅܾÀsÅ·"
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
@@ -1292,7 +1319,7 @@
msgstr "E493: t³ÜÌÍͪwè³êܵ½"
msgid "Backwards range given, OK to swap"
-msgstr "t³ÜÌÍͪwè³êܵ½, ü֦ܷ©?"
+msgstr "t³ÜÌÍͪwè³êܵ½Aü֦ܷ©?"
msgid "E494: Use w or w>>"
msgstr "E494: w àµÍ w>> ðgpµÄ¾³¢"
@@ -1303,17 +1330,14 @@
"³¢"
msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ±Ìo[WÅͱÌR}hÍpūܹñ, ²ßñȳ¢"
-
-msgid "E172: Only one file name allowed"
-msgstr "E172: t@C¼Í 1 Âɵľ³¢"
+msgstr "E319: ±Ìo[WÅͱÌR}hÍpūܹñA²ßñȳ¢"
msgid "1 more file to edit. Quit anyway?"
-msgstr "ÒW·×«t@Cª 1  èÜ·ª, I¹µÜ·©?"
+msgstr "ÒW·×«t@Cª 1  èÜ·ªAI¹µÜ·©?"
#, c-format
msgid "%d more files to edit. Quit anyway?"
-msgstr "ÒW·×«t@Cª Æ %d  èÜ·ª, I¹µÜ·©?"
+msgstr "ÒW·×«t@Cª Æ %d  èÜ·ªAI¹µÜ·©?"
msgid "E173: 1 more file to edit"
msgstr "E173: ÒW·×«t@Cª 1  èÜ·"
@@ -1364,7 +1388,7 @@
msgstr "E183: [U[è`R}hÍpå¶ÅnÜçȯêÎÈèܹñ"
msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: \\ñ¼ÈÌÅ, [U[è`R}hÉpūܹñ"
+msgstr "E841: \\ñ¼ÈÌÅA[U[è`R}hÉpūܹñ"
#, c-format
msgid "E184: No such user-defined command: %s"
@@ -1415,7 +1439,7 @@
msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
msgstr ""
-"E747: obt@ªC³³êÄ¢éÌÅ, fBNgðÏXūܹñ (! ðÇÁÅ"
+"E747: obt@ªC³³êÄ¢éÌÅAfBNgðÏXūܹñ (! ðÇÁÅ"
"ã)"
msgid "E186: No previous directory"
@@ -1465,7 +1489,6 @@
msgid "E190: Cannot open \"%s\" for writing"
msgstr "E190: \"%s\" ðÝpƵÄJ¯Ü¹ñ"
-#. set mark
msgid "E191: Argument must be a letter or forward/backward quote"
msgstr "E191: øÍ1¶Ìp©øp (' © `) Åȯê΢¯Ü¹ñ"
@@ -1504,13 +1527,15 @@
msgid "E195: Cannot open viminfo file for reading"
msgstr "E195: viminfot@CðÇpƵÄJ¯Ü¹ñ"
+msgid "Untitled"
+msgstr "³è"
+
msgid "E196: No digraphs in this version"
msgstr "E196: ±Ìo[WÉÍ èܹñ"
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: 'Vim' ÅnÜéáOÍ :throw ūܹñ"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception thrown: %s"
msgstr "áOª¶µÜµ½: %s"
@@ -1527,7 +1552,6 @@
msgid "%s, line %ld"
msgstr "%s, s %ld"
-#. always scroll up, don't overwrite
#, c-format
msgid "Exception caught: %s"
msgstr "áOªß¨³êܵ½: %s"
@@ -1553,7 +1577,6 @@
msgid "Error"
msgstr "G["
-#. if (pending & CSTP_INTERRUPT)
msgid "Interrupt"
msgstr "Ý"
@@ -1596,15 +1619,12 @@
msgid "E603: :catch without :try"
msgstr "E603: :try ÌÈ¢ :catch ª èÜ·"
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
msgid "E604: :catch after :finally"
msgstr "E604: :finally ÌãÉ :catch ª èÜ·"
msgid "E606: :finally without :try"
msgstr "E606: :try ÌÈ¢ :finally ª èÜ·"
-#. Give up for a multiple ":finally" and ignore it.
msgid "E607: multiple :finally"
msgstr "E607: ¡Ì :finally ª èÜ·"
@@ -1697,7 +1717,6 @@
msgid "Reading from stdin..."
msgstr "WüÍ©çÇÝ..."
-#. Re-opening the original file failed!
msgid "E202: Conversion made file unreadable!"
msgstr "E202: Ï·ªt@CðÇsÂɵܵ½"
@@ -1786,9 +1805,6 @@
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: obNAbvt@Cðìêܹñ (! ðÇÁŧì¬)"
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: \\[XtH[Nª¸íêé©àµêܹñ (! ðÇÁŧ)"
-
msgid "E214: Can't find temp file for writing"
msgstr "E214: Û¶pêt@Cª©Â©èܹñ"
@@ -1801,25 +1817,25 @@
msgid "E212: Can't open file for writing"
msgstr "E212: ÝpÉt@CðJ¯Ü¹ñ"
-msgid "E667: Fsync failed"
-msgstr "E667: fsync ɸsµÜµ½"
+msgid "E949: File changed while writing"
+msgstr "E949: ÝÉt@CªÏX³êܵ½"
msgid "E512: Close failed"
msgstr "E512: ¶é±Æɸs"
msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ÝG[, Ï·¸s (ã·éÉÍ 'fenc' ðóɵľ³¢)"
+msgstr "E513: ÝG[AÏ·¸s (ã·éÉÍ 'fenc' ðóɵľ³¢)"
#, c-format
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
msgstr ""
-"E513: ÝG[, Ï·¸s, s %ld (ã·éÉÍ 'fenc' ðóɵľ³"
+"E513: ÝG[AÏ·¸sAs %ld (ã·éÉÍ 'fenc' ðóɵľ³"
"¢)"
msgid "E514: write error (file system full?)"
-msgstr "E514: ÝG[, (t@CVXeªt?)"
+msgstr "E514: ÝG[ (t@CVXeªt?)"
msgid " CONVERSION ERROR"
msgstr " Ï·G["
@@ -1903,9 +1919,6 @@
msgid "[Incomplete last line]"
msgstr "[ÅIsªs®S]"
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
msgid "WARNING: The file has been changed since reading it!!!"
msgstr "x: Çñ¾ãÉt@CÉÏXª èܵ½!!!"
@@ -1983,7 +1996,6 @@
msgid "auto-removing autocommand: %s <buffer=%d>"
msgstr "autocommand: %s <obt@=%d> ª©®IÉí³êÜ·"
-#. the group doesn't exist
#, c-format
msgid "E367: No such group: \"%s\""
msgstr "E367: »ÌO[vÍ èܹñ: \"%s\""
@@ -2006,7 +2018,6 @@
msgid "E216: No such group or event: %s"
msgstr "E216: »Ìæ¤ÈO[vàµÍCxgÍ èܹñ: %s"
-#. Highlight title
msgid ""
"\n"
"--- Auto-Commands ---"
@@ -2054,6 +2065,11 @@
msgid "E351: Cannot delete fold with current 'foldmethod'"
msgstr "E351: »ÝÌ 'foldmethod' ÅÍÜôÝðíūܹñ"
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld sªÜôÜêܵ½"
+
msgid "E222: Add to read buffer"
msgstr "E222: Çobt@ÖÇÁ"
@@ -2099,7 +2115,7 @@
msgstr "E230: \"%s\"©çÇޱƪūܹñ"
msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: LøÈtHgª©Â©çÈ¢ÌÅ, GUIðJnūܹñ"
+msgstr "E665: LøÈtHgª©Â©çÈ¢ÌÅAGUIðJnūܹñ"
msgid "E231: 'guifontwide' invalid"
msgstr "E231: 'guifontwide' ª³øÅ·"
@@ -2112,7 +2128,7 @@
msgstr "E254: %s ÌFðèÄçêܹñ"
msgid "No match at cursor, finding next"
-msgstr "J[\\ÌÊuÉ}b`Í èܹñ, ðõµÄ¢Ü·"
+msgstr "J[\\ÌÊuÉ}b`Í èܹñAðõµÄ¢Ü·"
msgid "<cannot open> "
msgstr "<J¯Ü¹ñ> "
@@ -2187,18 +2203,15 @@
msgid "Replace with:"
msgstr "uᦖ:"
-#. whole word only button
msgid "Match whole word only"
msgstr "³mÉY·éà̾¯"
-#. match case button
msgid "Match case"
msgstr "å¶/¬¶ðæÊ·é"
msgid "Direction"
msgstr "ûü"
-#. 'Up' and 'Down' buttons
msgid "Up"
msgstr "ã"
@@ -2277,8 +2290,6 @@
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "õEu· ('\\' ðõ·éÉÍ '\\\\')"
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
msgid "Not Used"
msgstr "gíêܹñ"
@@ -2350,7 +2361,6 @@
msgid "Name:"
msgstr "¼O:"
-#. create toggle button
msgid "Show size in Points"
msgstr "TCYð|CgÅ\\¦·é"
@@ -2596,7 +2606,6 @@
msgid "cscope connection %s closed"
msgstr "cscopeÚ± %s ªÂ¶çêܵ½"
-#. should not reach here
msgid "E570: fatal error in cs_manage_matches"
msgstr "E570: cs_manage_matches Åv½IÈG[Å·"
@@ -2642,8 +2651,8 @@
"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
"could not be loaded."
msgstr ""
-"E895: ±ÌR}hͳøÅ·,²ßñȳ¢. MzScheme Ì racket/base W
["
-"ª[hūܹñŵ½."
+"E895: ±ÌR}hͳøÅ·A²ßñȳ¢. MzScheme Ì racket/base W
["
+"ª[hūܹñŵ½."
msgid "invalid expression"
msgstr "³øȮŷ"
@@ -2703,14 +2712,14 @@
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
msgstr ""
-"E263: ±ÌR}hͳøÅ·,²ßñȳ¢: PythonCuð[hūܹñ"
-"ŵ½."
+"E263: ±ÌR}hͳøÅ·A²ßñȳ¢: PythonCuð[hūܹ"
+"ñŵ½."
msgid ""
"E887: Sorry, this command is disabled, the Python's site module could not be "
"loaded."
msgstr ""
-"E887: ±ÌR}hͳøÅ·,²ßñȳ¢. Python Ì site W
[ð[h"
+"E887: ±ÌR}hͳøÅ·A²ßñȳ¢. Python Ì site W
[ð[h"
"ūܹñŵ½."
# Added at 07-Feb-2004.
@@ -2726,8 +2735,8 @@
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
-"E266: ±ÌR}hͳøÅ·,²ßñȳ¢: RubyCuð[hūܹñÅ"
-"µ½."
+"E266: ±ÌR}hͳøÅ·A²ßñȳ¢: RubyCuð[hūܹñ"
+"ŵ½."
msgid "E267: unexpected return"
msgstr "E267: \\ú¹Ê return Å·"
@@ -2757,7 +2766,6 @@
msgid "not implemented yet"
msgstr "ܾÀ³êĢܹñ"
-#. ???
msgid "cannot set line(s)"
msgstr "sðÝèūܹñ"
@@ -2799,7 +2807,6 @@
msgstr ""
"R[obNR}hðo^ūܹñ: obt@/EBhEªùÉÁ³êܵ½"
-#. This should never happen. Famous last word?
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
"org"
@@ -2814,7 +2821,7 @@
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
-"E571: ±ÌR}hͳøÅ·,²ßñȳ¢: TclCuð[hūܹñÅ"
+"E571: ±ÌR}hͳøÅ·A²ßñȳ¢: TclCuð[hūܹñÅ"
"µ½."
#, c-format
@@ -2901,7 +2908,6 @@
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: x: [©çÌüÍÅÍ èܹñ\n"
-#. just in case..
msgid "pre-vimrc command line"
msgstr "vimrcOÌR}hC"
@@ -2997,7 +3003,7 @@
msgstr "-d\t\t\t·ª[h (\"vidiff\" Ư¶)"
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tC[W[[h (\"evim\" Ư¶, [h³)"
+msgstr "-y\t\t\tC[W[[h (\"evim\" Ư¶A[h³)"
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\tÇêp[h (\"view\" Ư¶)"
@@ -3120,7 +3126,7 @@
msgstr "--remote <files>\tÂ\\ÈçÎVimT[o[Å <files> ðÒW·é"
msgid "--remote-silent <files> Same, don't complain if there is no server"
-msgstr "--remote-silent <files> ¯ã, T[o[ª³Äàx¶ðo͵Ȣ"
+msgstr "--remote-silent <files> ¯ãAT[o[ª³Äàx¶ðo͵Ȣ"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
@@ -3129,7 +3135,7 @@
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr ""
-"--remote-wait-silent <files> ¯ã, T[o[ª³Äàx¶ðo͵Ȣ"
+"--remote-wait-silent <files> ¯ãAT[o[ª³Äàx¶ðo͵Ȣ"
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
@@ -3155,8 +3161,11 @@
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfoÌãíèÉ <viminfo> ðg¤"
+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible'AVimÌùèAvOCȵAviminfoȵ"
+
msgid "-h or --help\tPrint Help (this message) and exit"
-msgstr "-h or --help\twv(±ÌbZ[W)ð\\¦µI¹·é"
+msgstr "-h or --help\twv(±ÌbZ[W)ð\\¦µI¹·é"
msgid "--version\t\tPrint version information and exit"
msgstr "--version\t\to[Wîñð\\¦µI¹·é"
@@ -3253,11 +3262,9 @@
msgid "No display"
msgstr "fBXvCª©Â©èܹñ"
-#. Failed to send, abort.
msgid ": Send failed.\n"
msgstr ": MɸsµÜµ½.\n"
-#. Let vim start normally.
msgid ": Send failed. Trying to execute locally\n"
msgstr ": MɸsµÜµ½. [JÅÌÀsðÝĢܷ\n"
@@ -3278,7 +3285,6 @@
msgid "E283: No marks matching \"%s\""
msgstr "E283: \"%s\" ÉY·é}[Nª èܹñ"
-#. Highlight title
msgid ""
"\n"
"mark line col file/text"
@@ -3286,7 +3292,6 @@
"\n"
"mark s ñ t@C/eLXg"
-#. Highlight title
msgid ""
"\n"
" jump line col file/text"
@@ -3294,7 +3299,6 @@
"\n"
" jump s ñ t@C/eLXg"
-#. Highlight title
msgid ""
"\n"
"change line col text"
@@ -3309,7 +3313,6 @@
"\n"
"# t@C}[N:\n"
-#. Write the jumplist with -'
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3378,9 +3381,8 @@
msgid "E843: Error while updating swap file crypt"
msgstr "E843: Xbvt@CÌÃðXVÉG[ª¶µÜµ½"
-#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ¨ÁÆ, Xbvt@Cª¸íêܵ½!!!"
+msgstr "E301: ¨ÁÆAXbvt@Cª¸íêܵ½!!!"
msgid "E302: Could not rename swap file"
msgstr "E302: Xbvt@C̼OðϦçêܹñ"
@@ -3465,7 +3467,7 @@
"If you entered a new crypt key but did not write the text file,"
msgstr ""
"\n"
-"Vµ¢ÃL[ðü͵½ ÆÉeLXgt@CðÛ¶µÄ¢È¢êÍ,"
+"Vµ¢ÃL[ðü͵½ ÆÉeLXgt@CðÛ¶µÄ¢È¢êÍA"
msgid ""
"\n"
@@ -3479,7 +3481,7 @@
"If you wrote the text file after changing the crypt key press enter"
msgstr ""
"\n"
-"ÃL[ðϦ½ ÆÉeLXgt@CðÛ¶µ½êÍ, eLXgt@CÆ"
+"ÃL[ðϦ½ ÆÉeLXgt@CðÛ¶µ½êÍAeLXgt@CÆ"
msgid ""
"\n"
@@ -3539,7 +3541,7 @@
"(You might want to write out this file under another name\n"
msgstr ""
"\n"
-"(ÏXð`FbN·é½ßÉ, ±Ìt@CðÊ̼OÅÛ¶µ½ãÅ\n"
+"(ÏXð`FbN·é½ßÉA±Ìt@CðÊ̼OÅÛ¶µ½ãÅ\n"
msgid "and run diff with the original file to check for changes)"
msgstr "´{t@CÆÌ diff ðÀs·éÆǢŵå¤)"
@@ -3559,7 +3561,6 @@
msgid "Using crypt key from swap file for the text file.\n"
msgstr "Xbvt@C©çæ¾µ½ÃL[ðeLXgt@CÉg¢Ü·.\n"
-#. use msg() to start the scrolling properly
msgid "Swap files found:"
msgstr "Xbvt@Cª¡©Â©èܵ½:"
@@ -3729,8 +3730,6 @@
msgid " NEWER than swap file!\n"
msgstr " Xbvt@CæèàVµ¢Å·!\n"
-#. Some of these messages are long to allow translation to
-#. * other languages.
msgid ""
"\n"
"(1) Another program may be editing the same file. If this is the case,\n"
@@ -3739,9 +3738,9 @@
msgstr ""
"\n"
"(1) ÊÌvOª¯¶t@CðÒWµÄ¢é©àµêܹñ.\n"
-" ±ÌêÉÍ, ÏXðµÄµÜ¤Æ1ÂÌt@CÉεÄÙÈé2ÂÌ\n"
-" CX^XªÅ«ÄµÜ¤ÌÅ, »¤µÈ¢æ¤ÉCð¯ľ³¢.\n"
-" I¹·é©, ӵȪ籯ľ³¢.\n"
+" ±ÌêÉÍAÏXðµÄµÜ¤Æ1ÂÌt@CÉεÄÙÈé2ÂÌ\n"
+" CX^XªÅ«ÄµÜ¤ÌÅA»¤µÈ¢æ¤ÉCð¯ľ³¢.\n"
+" I¹·é©AӵȪ籯ľ³¢.\n"
msgid "(2) An edit session for this file crashed.\n"
msgstr "(2) ±Ìt@CÌÒWZbVªNbV
µ½.\n"
@@ -3757,7 +3756,7 @@
" ðgpµÄÏXðJo[µÜ·(\":help recovery\" ðQÆ).\n"
msgid " If you did this already, delete the swap file \""
-msgstr " ùɱêðsÈÁ½ÌÈçÎ, Xbvt@C \""
+msgstr " ùɱêðsÈÁ½ÌÈçÎAXbvt@C \""
msgid ""
"\"\n"
@@ -3819,7 +3818,6 @@
msgid "E329: No menu \"%s\""
msgstr "E329: \"%s\" Æ¢¤j
[Í èܹñ"
-#. Only a mnemonic or accelerator is not valid.
msgid "E792: Empty menu name"
msgstr "E792: j
[¼ªóÅ·"
@@ -3832,8 +3830,6 @@
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: æØèÍj
[pXÌêÅÍ èܹñ"
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
msgid ""
"\n"
"--- Menus ---"
@@ -3844,6 +3840,10 @@
msgid "Tear off this menu"
msgstr "±Ìj
[ðØèæé"
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: %s ÉÍj
[ªè`³êĢܹñ"
+
msgid "E333: Menu path must lead to a menu item"
msgstr "E333: j
[pXÍj
[ACeð¶¶È¯ê΢¯Ü¹ñ"
@@ -3851,10 +3851,6 @@
msgid "E334: Menu not found: %s"
msgstr "E334: j
[ª©Â©èܹñ: %s"
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ÉÍj
[ªè`³êĢܹñ"
-
msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: j
[pXÍTuj
[ð¶¶È¯ê΢¯Ü¹ñ"
@@ -3924,9 +3920,8 @@
msgid "Open File dialog"
msgstr "t@CÇ_CAO"
-#. TODO: non-GUI file selector here
msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: R\\[[hÅÍt@CuEUðg¦Ü¹ñ, ²ßñȳ¢"
+msgstr "E338: R\\[[hÅÍt@CuEUðg¦Ü¹ñA²ßñȳ¢"
msgid "E766: Insufficient arguments for printf()"
msgstr "E766: printf() Ìøªs\\ªÅ·"
@@ -4124,7 +4119,6 @@
msgid "E748: No previously used register"
msgstr "E748: ܾWX^ðgpµÄ¢Ü¹ñ"
-#. must display the prompt
msgid "cannot yank; delete anyway"
msgstr "Nūܹñ; ÆÉ©Á"
@@ -4139,25 +4133,30 @@
msgid "freeing %ld lines"
msgstr "%ld sððú"
-msgid "block of 1 line yanked"
-msgstr "1 sÌubNªN³êܵ½"
-
-msgid "1 line yanked"
-msgstr "1 sªN³êܵ½"
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c É"
#, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld sÌubNªN³êܵ½"
+msgid "block of 1 line yanked%s"
+msgstr "1 sÌubNª%sN³êܵ½"
#, c-format
-msgid "%ld lines yanked"
-msgstr "%ld sªN³êܵ½"
+msgid "1 line yanked%s"
+msgstr "1 sª%sN³êܵ½"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "%ld sÌubNª%sN³êܵ½"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld sª%sN³êܵ½"
#, c-format
msgid "E353: Nothing in register %s"
msgstr "E353: WX^ %s Éͽà èܹñ"
-#. Highlight title
msgid ""
"\n"
"--- Registers ---"
@@ -4212,11 +4211,8 @@
"%lld"
#, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=%N y[W"
+msgid "(+%lld for BOM)"
+msgstr "(+%lld for BOM)"
msgid "Thanks for flying Vim"
msgstr "Vim ðgÁÄêÄ èªÆ¤"
@@ -4268,6 +4264,10 @@
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+2 GUIÅÍÏXūܹñ"
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: %s Æ %s ÌÔÅϷūܹñ"
+
msgid "E524: Missing colon"
msgstr "E524: Rª èܹñ"
@@ -4325,12 +4325,18 @@
msgid "E542: unbalanced groups"
msgstr "E542: O[vªÞ¢Ü¹ñ"
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: ÀsÌWuª é[ÍÏXÂ\\Éūܹñ"
+
msgid "E590: A preview window already exists"
msgstr "E590: vr
[EBhEªùɶݵܷ"
msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
msgstr ""
-"W17: ArA¶ÉÍUTF-8ªKvÈÌÅ, ':set encoding=utf-8' µÄ¾³¢"
+"W17: ArA¶ÉÍUTF-8ªKvÈÌÅA':set encoding=utf-8' µÄ¾³¢"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bitFͱÌ«ÅÍT|[g³êĢܹñ"
#, c-format
msgid "E593: Need at least %d lines"
@@ -4344,9 +4350,6 @@
msgid "E355: Unknown option: %s"
msgstr "E355: ¢mÌIvVÅ·: %s"
-#. There's another character after zeros or the string
-#. * is empty. In both cases, we are trying to set a
-#. * num option using a string.
#, c-format
msgid "E521: Number required: &%s = '%s'"
msgstr "E521: ªKvÅ·: &%s = '%s'"
@@ -4419,7 +4422,6 @@
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: R\\[ÅÍÈ¢??\n"
-#. if Vim opened a window: Executing a shell may cause crashes
msgid "E360: Cannot execute shell with -f option"
msgstr "E360: -f IvVÅVFðÀsūܹñ"
@@ -4620,6 +4622,9 @@
msgid "shell returned %d"
msgstr "VFªR[h %d ÅI¹µÜµ½"
+msgid "E926: Current location list was changed"
+msgstr "E926: »ÝÌP[VXgªÏX³êܵ½"
+
#, c-format
msgid "E372: Too many %%%c in format string"
msgstr "E372: tH[}bg¶ñÉ %%%c ª½ß¬Ü·"
@@ -4643,7 +4648,6 @@
msgid "E377: Invalid %%%c in format string"
msgstr "E377: tH[}bg¶ñɳøÈ %%%c ª èÜ·"
-#. nothing found
msgid "E378: 'errorformat' contains no pattern"
msgstr "E378: 'errorformat' Ép^[ªwè³êĢܹñ"
@@ -4659,9 +4663,6 @@
msgid "E925: Current quickfix was changed"
msgstr "E925: »ÝÌ quickfix ªÏX³êܵ½"
-msgid "E926: Current location list was changed"
-msgstr "E926: »ÝÌP[VXgªÏX³êܵ½"
-
#, c-format
msgid "(%d of %d)%s%s: "
msgstr "(%d of %d)%s%s: "
@@ -4682,9 +4683,6 @@
msgid "No entries"
msgstr "Ggª èܹñ"
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 'buftype' IvVªÝè³êÄ¢éÌÅÝܹñ"
-
msgid "Error file"
msgstr "G[t@C"
@@ -4837,11 +4835,13 @@
msgid "E867: (NFA) Unknown operator '\\z%c'"
msgstr "E867: (NFA) ¢mÌIy[^Å·: '\\z%c'"
+msgid "E951: \\% value too large"
+msgstr "E951: \\% lª·ß¬Ü·"
+
#, c-format
msgid "E867: (NFA) Unknown operator '\\%%%c'"
msgstr "E867: (NFA) ¢mÌIy[^Å·: '\\%%%c'"
-#. should never happen
msgid "E868: Error building NFA with equivalence class!"
msgstr "E868: ¿NXðÜÞNFA\\zɸsµÜµ½!"
@@ -4852,11 +4852,9 @@
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\\») '(' ª½ß¬Ü·"
@@ -4964,7 +4962,6 @@
msgid " (includes previously listed match)"
msgstr " (OÉñµ½YÓðÜÞ)"
-#. cursor at status line
msgid "--- Included files "
msgstr "--- CN[h³ê½t@C "
@@ -5037,14 +5034,12 @@
msgstr "x9: %s Æ¢¤ÍÍÍT|[g³êĢܹñ"
msgid "Sorry, no suggestions"
-msgstr "cOÅ·ª, C³óâÍ èܹñ"
+msgstr "cOÅ·ªAC³óâÍ èܹñ"
#, c-format
msgid "Sorry, only %ld suggestions"
-msgstr "cOÅ·ª, C³óâÍ %ld µ© èܹñ"
+msgstr "cOÅ·ªAC³óâÍ %ld µ© èܹñ"
-#. for when 'cmdheight' > 1
-#. avoid more prompt
#, c-format
msgid "Change \"%.*s\" to:"
msgstr "\"%.*s\" ðÖÏ·:"
@@ -5089,7 +5084,7 @@
msgstr "E757: Xyt@CÅÍÈ¢æ¤Å·"
msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: âXyt@CÈÌÅ, Abvf[gµÄ¾³¢"
+msgstr "E771: âXyt@CÈÌÅAAbvf[gµÄ¾³¢"
msgid "E772: Spell file is for newer version of Vim"
msgstr "E772: æèVµ¢o[WÌ Vim pÌXyt@CÅ·"
@@ -5103,7 +5098,7 @@
#, c-format
msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: â .sug t@CÈÌÅ, Abvf[gµÄ¾³¢: %s"
+msgstr "E779: â .sug t@CÈÌÅAAbvf[gµÄ¾³¢: %s"
#, c-format
msgid "E780: .sug file is for newer version of Vim: %s"
@@ -5263,8 +5258,8 @@
msgstr "E760: %s ÉÍPêª èܹñ"
#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "s %6d, Pê %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr "s %6d, Pê %6ld - %s"
#, c-format
msgid "Duplicate word in %s line %d: %s"
@@ -5300,7 +5295,7 @@
#, c-format
msgid "Too many regions in %s line %d: %s"
-msgstr "%s Ì %d sÚ, ÍÍw誽ܷ߬: %s"
+msgstr "%s Ì %d sÚAÍÍw誽ܷ߬: %s"
#, c-format
msgid "/ line ignored in %s line %d: %s"
@@ -5328,10 +5323,6 @@
msgid "Reading back spell file..."
msgstr "Xyt@CðtÇ"
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
msgid "Performing soundfolding..."
msgstr "¹ºôÝðÀs..."
@@ -5354,8 +5345,9 @@
msgid "E751: Output file name must not have region name"
msgstr "E751: oÍt@C¼ÉÍÍͼðÜßçêܹñ"
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ÍÍÍ 8 ÂÜŵ©T|[g³êĢܹñ"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: ÍÍÍ %ld ÂÜŵ©T|[g³êĢܹñ"
#, c-format
msgid "E755: Invalid region in %s"
@@ -5386,8 +5378,6 @@
msgid "E763: Word characters differ between spell files"
msgstr "E763: Pê̶ªXyt@CÆÙÈèÜ·"
-#. This should have been checked when generating the .spl
-#. * file.
msgid "E783: duplicate char in MAP entry"
msgstr "E783: MAP GgÉd¡¶ª¶ÝµÜ·"
@@ -5653,7 +5643,6 @@
msgid "File \"%s\" does not exist"
msgstr "t@C \"%s\" ª èܹñ"
-#. Give an indication of the number of matching tags
#, c-format
msgid "tag %d of %d%s"
msgstr "^O %d (S%d%s)"
@@ -5668,7 +5657,6 @@
msgid "E429: File \"%s\" does not exist"
msgstr "E429: t@C \"%s\" ª èܹñ"
-#. Highlight title
msgid ""
"\n"
" # TO tag FROM line in file/text"
@@ -5699,7 +5687,6 @@
msgid "E432: Tags file not sorted: %s"
msgstr "E432: ^Ot@Cª\\[g³êĢܹñ: %s"
-#. never opened any tags file
msgid "E433: No tags file"
msgstr "E433: ^Ot@Cª èܹñ"
@@ -5735,7 +5722,6 @@
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: [É \"cm\" @\\ªKvÅ·"
-#. Highlight title
msgid ""
"\n"
"--- Terminal keys ---"
@@ -5746,6 +5732,32 @@
msgid "Cannot open $VIMRUNTIME/rgb.txt"
msgstr "$VIMRUNTIME/rgb.txtðJ¯Ü¹ñ"
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "\"%s\" àÌWuðI¹µÜ·©?"
+
+msgid "Terminal"
+msgstr "["
+
+msgid "Terminal-finished"
+msgstr "[ (I¹)"
+
+msgid "active"
+msgstr "ANeBu"
+
+msgid "running"
+msgstr "Às"
+
+msgid "finished"
+msgstr "I¹"
+
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953: t@CÍùɶݵܷ: %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: [obt@ÅÍ èܹñ"
+
msgid "new shell started\n"
msgstr "Vµ¢VFðN®µÜ·\n"
@@ -5755,12 +5767,9 @@
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "óÌIðÌæÌ©íèÉCUT_BUFFER0ªgp³êܵ½"
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
msgid "E881: Line count changed unexpectedly"
msgstr "E881: \\ú¹¸sJEgªÏíèܵ½"
-#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr "Â\\ÈAhDÍ èܹñ: Æè ¦¸±¯Ü·"
@@ -5895,7 +5904,7 @@
#, c-format
msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: Ö %s Íè`ÏÅ·, Äè`·éÉÍ ! ðÇÁµÄ¾³¢"
+msgstr "E122: Ö %s Íè`ÏÅ·AÄè`·éÉÍ ! ðÇÁµÄ¾³¢"
msgid "E717: Dictionary entry already exists"
msgstr "E717: «^àÉGgªùɶݵܷ"
@@ -6054,24 +6063,17 @@
msgid ""
"\n"
-"MacOS X (unix) version"
+"macOS version"
msgstr ""
"\n"
-"MacOS X (unix) Å"
+"macOS Å"
msgid ""
"\n"
-"MacOS X version"
+"macOS version w/o darwin feat."
msgstr ""
"\n"
-"MacOS X Å"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"MacOS Å"
+"macOS Å (darwin ³µ)"
msgid ""
"\n"
@@ -6175,9 +6177,6 @@
msgid "with Cocoa GUI."
msgstr "with Cocoa GUI."
-msgid "with (classic) GUI."
-msgstr "with (NVbN) GUI."
-
msgid " Features included (+) or not (-):\n"
msgstr " @\\Ìê Lø(+)/³ø(-)\n"
@@ -6275,7 +6274,7 @@
msgstr "Ú×Íj
[Ì wv->Ç ðQƵĺ³¢ "
msgid "Running modeless, typed text is inserted"
-msgstr "[h³ÅÀs, ^Cvµ½¶ª}ü³êÜ·"
+msgstr "[h³ÅÀsB^Cvµ½¶ª}ü³êÜ·"
msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "j
[Ì ÒW->SÌÝè->}ü(SÒ)[hØÖ "
@@ -6360,7 +6359,7 @@
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
-"±ÌR}hͳøÅ·, ²ßñȳ¢: PerlCuð[hūܹñŵ½."
+"±ÌR}hͳøÅ·A²ßñȳ¢: PerlCuð[hūܹñŵ½."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
@@ -6379,7 +6378,6 @@
msgid "Edit with &Vim"
msgstr "VimÅÒW·é (&V)"
-#. Now concatenate
msgid "Edit with existing Vim - "
msgstr "N®ÏÌVimÅÒW·é - "
@@ -6398,10 +6396,6 @@
msgid "--No lines in buffer--"
msgstr "--obt@Ésª èܹñ--"
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
msgid "E470: Command aborted"
msgstr "E470: R}hªf³êܵ½"
@@ -6475,6 +6469,14 @@
msgstr "E475: ³øÈøÅ·: %s"
#, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: ø %s ÉεijøÈlÅ·"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: ø %s ÉεijøÈlÅ·: %s"
+
+#, c-format
msgid "E15: Invalid expression: %s"
msgstr "E15: ³øȮŷ: %s"
@@ -6492,6 +6494,9 @@
msgid "E364: Library call failed for \"%s()\""
msgstr "E364: \"%s\"() ÌCuÄoɸsµÜµ½"
+msgid "E667: Fsync failed"
+msgstr "E667: fsync ɸsµÜµ½"
+
#, c-format
msgid "E448: Could not load library function %s"
msgstr "E448: CuÌÖ %s ð[hūܹñŵ½"
@@ -6503,7 +6508,7 @@
msgstr "E20: }[NÍÝè³êĢܹñ"
msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' ªItÈÌÅ, ÏXūܹñ"
+msgstr "E21: 'modifiable' ªItÈÌÅAÏXūܹñ"
msgid "E22: Scripts nested too deep"
msgstr "E22: XNvgÌüêqª[ܷ߬"
@@ -6586,12 +6591,6 @@
msgid "E485: Can't read file %s"
msgstr "E485: t@C %s ðÇßܹñ"
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ (! ðÇÁÅÏXðjü)"
-
-msgid "E37: No write since last change"
-msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ"
-
msgid "E38: Null argument"
msgstr "E38: øªóÅ·"
@@ -6736,7 +6735,7 @@
msgstr "E449: ³øÈ®ðó¯æèܵ½"
msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: ÌæªÛì³êÄ¢éÌÅ, ÏXūܹñ"
+msgstr "E463: ÌæªÛì³êÄ¢éÌÅAÏXūܹñ"
msgid "E744: NetBeans does not allow changes in read-only files"
msgstr "E744: NetBeans ÍÇêpt@CðÏX·é±ÆðµÜ¹ñ"
@@ -6768,6 +6767,9 @@
msgid "E919: Directory not found in '%s': \"%s\""
msgstr "E919: fBNgª '%s' ÌÉ èܹñ: \"%s\""
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: AutocommandªÄAðø«N±µÜµ½"
+
msgid "search hit TOP, continuing at BOTTOM"
msgstr "ãÜÅõµ½ÌźÉßèÜ·"
@@ -6871,7 +6873,6 @@
msgid "list index out of range"
msgstr "XgÍÍOÌCfbNXÅ·"
-#. No more suitable format specifications in python-2.3
#, c-format
msgid "internal error: failed to get vim list item %d"
msgstr "àG[: vimÌXgvf %d Ìæ¾É¸sµÜµ½"
@@ -7031,3 +7032,47 @@
msgstr ""
"pXÌÝèɸsµÜµ½: sys.path ªXgÅÍ èܹñ\n"
"·®É vim.VIM_SPECIAL_PATH ð sys.path ÉÇÁµÄ¾³¢"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim}Nt@C (*.vim)\t*.vim\n"
+"·×ÄÌt@C (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "·×ÄÌt@C (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"·×ÄÌt@C (*.*)\t*.*\n"
+"C\\[X (*.c, *.h)\t*.c;*.h\n"
+"C++\\[X (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VBR[h (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vimt@C (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim }Nt@C (*.vim)\t*.vim\n"
+"·×ÄÌt@C (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "·×ÄÌt@C (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"·×ÄÌt@C (*)\t*\n"
+"C\\[X (*.c, *.h)\t*.c;*.h\n"
+"C++\\[X (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vimt@C (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"