diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-18 18:12:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-18 18:12:06 +0200 |
| commit | 2f01889055f14842c1d4f9abd91139fc6bd95f15 (patch) | |
| tree | 20bc06b776e528965746a06b82fd02609de35e2d | |
| parent | 00e45563384de01949b9c4df9155424604887b33 (diff) | |
| download | vim-git-2f01889055f14842c1d4f9abd91139fc6bd95f15.tar.gz | |
Runtime file and translation updates.
| -rw-r--r-- | runtime/doc/eval.txt | 24 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/version8.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/vim-ja.UTF-8.1 | 2 | ||||
| -rw-r--r-- | runtime/doc/xxd-ja.UTF-8.1 | 3 | ||||
| -rw-r--r-- | runtime/lang/menu_ja.euc-jp.vim | 2 | ||||
| -rw-r--r-- | runtime/lang/menu_ja.utf-8.vim | 2 | ||||
| -rw-r--r-- | runtime/lang/menu_ja_jp.euc-jp.vim | 25 | ||||
| -rw-r--r-- | runtime/lang/menu_ja_jp.utf-8.vim | 25 | ||||
| -rw-r--r-- | runtime/lang/menu_japanese_japan.932.vim | 25 | ||||
| -rw-r--r-- | runtime/tutor/tutor.ja.euc | 7 | ||||
| -rw-r--r-- | runtime/tutor/tutor.ja.sjis | 7 | ||||
| -rw-r--r-- | runtime/tutor/tutor.ja.utf-8 | 7 | ||||
| -rw-r--r-- | src/po/ja.euc-jp.po | 471 | ||||
| -rw-r--r-- | src/po/ja.po | 471 | ||||
| -rw-r--r-- | src/po/ja.sjis.po | 471 |
16 files changed, 848 insertions, 707 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0a142e452..de4bb0260 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -9121,22 +9121,16 @@ There are four types of features: 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 eda14bc73..13ab3551a 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -39,9 +39,10 @@ browser use: https://github.com/vim/vim/issues/1234 -------------------- 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 @@ Patch to refactor efm_to_regpat(). (Yegappan Lakshmanan, 2018 May 16, #2924) 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 8634c2842..c0910634d 100644 --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -22104,7 +22104,7 @@ Files: src/Makefile, src/option.c, src/testdir/test_alot.vim, 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 @@ Solution: Remove bogus typedef. 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 774235674..5b7798b54 100644 --- a/runtime/doc/vim-ja.UTF-8.1 +++ b/runtime/doc/vim-ja.UTF-8.1 @@ -280,7 +280,7 @@ N を省略した場合は、引数のファイルを個別のタブページで ぐことができます。 ファイルを保存したい場合は、":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 a4cc583ba..47688f87a 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 0eff4d99c..4dcd60c18 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 105a19941..a47cdbe45 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 3448e0d24..6e81f8f7d 100644 --- a/runtime/lang/menu_ja_jp.euc-jp.vim +++ b/runtime/lang/menu_ja_jp.euc-jp.vim @@ -73,9 +73,9 @@ menutrans Startup\ &Settings ư(&S) 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 Block\ and\ Insert ֥å/⡼ɻ 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 @@ let g:menutrans_tags_dialog = "ե̾ϤƤ:\n̾ϥ 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_textwidth_dialog = "ƥȤ('textwidth')ꤷƤ 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 &Open<Tab>:copen (&O)<Tab>:copen 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 @@ endif " 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 af15c0bbc..9dbc47cb9 100644 --- a/runtime/lang/menu_ja_jp.utf-8.vim +++ b/runtime/lang/menu_ja_jp.utf-8.vim @@ -73,9 +73,9 @@ menutrans Startup\ &Settings 起動時の設定(&S) 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 Block\ and\ Insert ブロック/挿入モード時 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 @@ let g:menutrans_tags_dialog = "タグファイルの名前を入力してくだ 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_textwidth_dialog = "テキストの幅('textwidth')を設定し 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 &Open<Tab>:copen 開く(&O)<Tab>:copen 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 @@ endif " 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 66c81661c..a39d7da3c 100644 --- a/runtime/lang/menu_japanese_japan.932.vim +++ b/runtime/lang/menu_japanese_japan.932.vim @@ -73,9 +73,9 @@ menutrans Startup\ &Settings N̐ݒ(&S) 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 Block\ and\ Insert ubN/}[h 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 @@ let g:menutrans_tags_dialog = "^Ot@C̖O͂Ă:\nO̓J 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_textwidth_dialog = "eLXg̕('textwidth')ݒ肵Ă let g:menutrans_fileformat_dialog = "t@Co͂̍ۂ̉sĽ`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[}bvj[ɕ\(&K) menutrans &Keymap L[}bv(&K) menutrans None Ȃ @@ -153,7 +155,8 @@ menutrans &Open<Tab>:copen J(&O)<Tab>:copen menutrans &Close<Tab>:cclose (&C)<Tab>:cclose menutrans &Convert\ to\ HEX<Tab>:%!xxd HEX֕ϊ(&C)<Tab>:%!xxd menutrans Conve&rt\ back<Tab>:%!xxd\ -r HEXtϊ(&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 @@ endif " 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 b932303ef..8cb63f2d1 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 @@ NOTE: ƤΥå̤ơФ褦ȤΤǤϤʤºݤˤäƤߤޤ礦 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 cc0347202..1e70cbc08 100644 --- a/runtime/tutor/tutor.ja.sjis +++ b/runtime/tutor/tutor.ja.sjis @@ -18,9 +18,8 @@ ĂȂȂ܂BwKɂ̓R}hۂɎȂ ȂȂ̂łB͂ǂȂAƖYĂ܂܂! - ACapsbN(Shift-Lock)L[ĂȂƂmFAʂ - bX1.1 S\Ƃ܂ŁAj L[ăJ[\ړ - 傤B + ACapsbNL[ĂȂƂmFAʂɃbX1.1 + S\Ƃ܂ŁAj L[ăJ[\ړ܂傤B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ bX 1.1: J[\̈ړ @@ -155,7 +154,7 @@ NOTE: SẴbXʂāAo悤Ƃ̂ł͂ȂۂɂĂ݂܂傤B 4. ύXt@Cɕۑ܂: :wq <ENTER> - 5. Xebv 1 vimtutuor Iꍇ vimtutor ēxNAȉ + 5. Xebv 1 vimtutor Iꍇ vimtutor ēxNAȉ vi݂܂傤B 6. ȏ̃Xebvǂŗłs܂傤B diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8 index aca6cf79e..fdca0eb36 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 @@ NOTE: 全てのレッスンを通じて、覚えようとするのではなく 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 eb1e8a263..0a92f04fb 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 @@ msgid "E855: Autocommands caused command to abort" 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 @@ msgstr "E90: ǸΥХåեϲǤޤ" 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 @@ msgstr "E88: ǽΥХåեؤϰưǤޤ" 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 @@ msgstr " %ld ( %ld) --%d%%-- col " msgid "[No Name]" msgstr "[̵̾]" -#. must be a help buffer msgid "help" msgstr "إ" @@ -191,6 +201,9 @@ msgstr "" "\n" "# Хåեꥹ:\n" +msgid "E382: Cannot write, 'buftype' option is set" +msgstr "E382: 'buftype' ץꤵƤΤǽޤ" + msgid "[Scratch]" msgstr "[]" @@ -359,7 +372,6 @@ msgstr "E791: Υޥåץȥ" 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 @@ msgstr "եΥޥå" 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 @@ msgstr "%d ܤγ ( %d )" msgid "match %d" msgstr "%d ܤγ" -#. maximum nesting of lists and dicts msgid "E18: Unexpected characters in :let" msgstr "E18: ͽʸ :let ˤޤ" @@ -522,8 +529,6 @@ msgstr "E690: :for θ \"in\" ޤ" 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 @@ msgstr "E743: ()åˤѿҤޤ" 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 @@ msgid "E805: Using a Float as a Number" 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 @@ msgid "E910: Using a Job as a Number" 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 @@ msgid "E911: Using a Job as a Float" 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 @@ msgstr "" "\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 @@ msgstr "add() ΰ" 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 @@ msgid "E921: Invalid callback argument" 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 @@ msgid "%sviminfo: %s in line: " 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 @@ msgstr " ե뷲" 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 @@ msgstr "viminfoե \"%s\" " 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 @@ msgstr " ( 1 )" 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 @@ msgid "Entering Debug mode. Type \"cont\" to continue." 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 @@ msgstr "֥졼ݥȤƤޤ" 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 @@ msgstr "E750: \":profile start {fname}\" ¹ԤƤ" 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 @@ msgid "E493: Backwards range given" 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 @@ msgstr "" "" 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 @@ msgid "E183: User defined commands must start with an uppercase letter" 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 @@ msgstr "ɲåե" msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" -"E747: ХåեƤΤ, ǥ쥯ȥѹǤޤ (! ɲä" +"E747: ХåեƤΤǡǥ쥯ȥѹǤޤ (! ɲä" ")" msgid "E186: No previous directory" @@ -1465,7 +1489,6 @@ msgstr "E189: \"%s\" ¸ߤޤ (ˤ ! ɲäƤ)" 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 @@ msgstr "E500: ʸȤɾޤ" 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 @@ msgstr "㳰˴ޤ: %s" 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 @@ msgstr "顼ȳ" msgid "Error" msgstr "顼" -#. if (pending & CSTP_INTERRUPT) msgid "Interrupt" msgstr "" @@ -1596,15 +1619,12 @@ msgstr "E601: :try Ҥޤ" 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 @@ msgstr "Vim: ɸϤɹ...\n" msgid "Reading from stdin..." msgstr "ɸϤɹ..." -#. Re-opening the original file failed! msgid "E202: Conversion made file unreadable!" msgstr "E202: ѴեɹԲĤˤޤ" @@ -1786,9 +1805,6 @@ msgstr "E509: Хååץեޤ (! ɲäǶ)" 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 @@ msgstr "E166: 줿ե˽ޤ" 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 @@ msgstr "[noeol]" 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 @@ msgstr "----" 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 @@ msgstr "E216: Τ褦ʥ٥ȤϤޤ: %s" msgid "E216: No such group or event: %s" msgstr "E216: Τ褦ʥ롼פ⤷ϥ٥ȤϤޤ: %s" -#. Highlight title msgid "" "\n" "--- Auto-Commands ---" @@ -2054,6 +2065,11 @@ msgstr "E350: ߤ 'foldmethod' ǤߤǤޤ" 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 @@ msgid "E230: Cannot read from \"%s\"" 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 @@ msgid "E254: Cannot allocate color %s" msgstr "E254: %s οƤޤ" msgid "No match at cursor, finding next" -msgstr "ΰ֤˥ޥåϤޤ, Ƥޤ" +msgstr "ΰ֤˥ޥåϤޤƤޤ" msgid "<cannot open> " msgstr "<ޤ> " @@ -2187,18 +2203,15 @@ msgstr "ʸ:" 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 @@ msgstr "ʸ ('\\' ˤ '\\\\')" 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 @@ msgstr "Vim - ե" msgid "Name:" msgstr "̾:" -#. create toggle button msgid "Show size in Points" msgstr "ݥȤɽ" @@ -2596,7 +2606,6 @@ msgstr "E261: cscope³ %s ĤޤǤ" 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 @@ msgid "" "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 @@ msgid "" "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 @@ msgstr "E265: $_ ʸΥǤʤФʤޤ" 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 @@ msgstr "̵ʥХåեֹǤ" msgid "not implemented yet" msgstr "ޤƤޤ" -#. ??? msgid "cannot set line(s)" msgstr "ԤǤޤ" @@ -2799,7 +2807,6 @@ msgid "" 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 @@ msgstr "" 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 @@ msgstr "Vim: ٹ: üؤνϤǤϤޤ\n" 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 @@ msgid "-d\t\t\tDiff mode (like \"vimdiff\")" 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 @@ msgid "--remote <files>\tEdit <files> in a Vim server if possible" 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 @@ msgstr "--remote-wait <files>\t--remote եԽΤԤ" 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 @@ msgstr "--startuptime <file>\tưˤä֤ξܺ٤ <file> ؽϤ" 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 @@ msgstr "--windowid <HWND>\tۤʤWin32 widgetVim" 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 @@ msgstr "ޡꤵƤޤ" msgid "E283: No marks matching \"%s\"" msgstr "E283: \"%s\" ˳ޡޤ" -#. Highlight title msgid "" "\n" "mark line col file/text" @@ -3286,7 +3292,6 @@ msgstr "" "\n" "mark ե/ƥ" -#. Highlight title msgid "" "\n" " jump line col file/text" @@ -3294,7 +3299,6 @@ msgstr "" "\n" " jump ե/ƥ" -#. Highlight title msgid "" "\n" "change line col text" @@ -3309,7 +3313,6 @@ msgstr "" "\n" "# եޡ:\n" -#. Write the jumplist with -' msgid "" "\n" "# Jumplist (newest first):\n" @@ -3378,9 +3381,8 @@ msgstr "E298: ֥å 2 Ǥޤ?" 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 @@ msgid "" "If you entered a new crypt key but did not write the text file," msgstr "" "\n" -"Ź業ϤȤ˥ƥȥե¸Ƥʤ," +"Ź業ϤȤ˥ƥȥե¸Ƥʤϡ" msgid "" "\n" @@ -3479,7 +3481,7 @@ msgid "" "If you wrote the text file after changing the crypt key press enter" msgstr "" "\n" -"Ź業ѤȤ˥ƥȥե¸, ƥȥե" +"Ź業ѤȤ˥ƥȥե¸ϡƥȥե" msgid "" "\n" @@ -3539,7 +3541,7 @@ msgid "" "(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 @@ msgstr "" 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 @@ msgstr "ΥեƤ \"" 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 @@ msgid "" 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 @@ msgstr "" " ѤѹꥫСޤ(\":help recovery\" ).\n" msgid " If you did this already, delete the swap file \"" -msgstr " ˤԤʤäΤʤ, åץե \"" +msgstr " ˤԤʤäΤʤСåץե \"" msgid "" "\"\n" @@ -3819,7 +3818,6 @@ msgstr "E328: ˥塼¾Υ⡼ɤˤޤ" 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 @@ msgstr "E331: ˥塼Сˤľܥ˥塼ƥɲäǤޤ" 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 @@ msgstr "" 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 @@ msgstr "E333: ˥塼ѥϥ˥塼ƥʤФޤ" 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 @@ msgstr "ե¸" 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 @@ msgstr "%ld ԤǥȤޤ " msgid "E748: No previously used register" msgstr "E748: ޤ쥸ѤƤޤ" -#. must display the prompt msgid "cannot yank; delete anyway" msgstr "Ǥޤ; Ȥˤõ" @@ -4139,25 +4133,30 @@ msgstr "%ld Ԥѹޤ" msgid "freeing %ld lines" msgstr "%ld Ԥ" -msgid "block of 1 line yanked" -msgstr "1 ԤΥ֥åޤ" +#, c-format +msgid " into \"%c" +msgstr " \"%c " + +#, c-format +msgid "block of 1 line yanked%s" +msgstr "1 ԤΥ֥å%sޤ" -msgid "1 line yanked" -msgstr "1 Ԥޤ" +#, c-format +msgid "1 line yanked%s" +msgstr "1 Ԥ%sޤ" #, c-format -msgid "block of %ld lines yanked" -msgstr "%ld ԤΥ֥åޤ" +msgid "block of %ld lines yanked%s" +msgstr "%ld ԤΥ֥å%sޤ" #, c-format -msgid "%ld lines yanked" -msgstr "%ld Ԥޤ" +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 @@ msgstr "" "%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 @@ msgstr "E835: 'fillchars'̷ͤ⤬ޤ" 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 @@ msgstr "E541: Ǥ¿ޤ" 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 @@ msgstr "E594: %d ΥɬפǤ" 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 @@ msgstr "⡼ɤѹǤޤ?!\n" 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 @@ msgstr "Vimηٹ" 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 @@ msgstr "E376: եޥåʸ̵֤ %%%c ޤ" 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 @@ msgstr "E924: ߤΥɥĤޤ" 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 @@ msgstr "E381: quickfix åƬǤ" msgid "No entries" msgstr "ȥ꤬ޤ" -msgid "E382: Cannot write, 'buftype' option is set" -msgstr "E382: 'buftype' ץꤵƤΤǽߤޤ" - msgid "Error file" msgstr "顼ե" @@ -4837,11 +4835,13 @@ msgstr "E877: (NFA ɽ) ̵ʸ饹: %ld" 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 @@ msgstr "E869: (NFA) ̤ΤΥڥ졼Ǥ: '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFA ɽ) ֤²ɹ˥顼" -#. Can't have a multi follow a multi. msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "E871: (NFA ɽ) ֤ θ ֤ ϤǤޤ!" -#. Too many `(' msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA ɽ) '(' ¿ޤ" @@ -4964,7 +4962,6 @@ msgstr "E386: ';' ΤȤˤ '?' '/' ԤƤ" msgid " (includes previously listed match)" msgstr " (սޤ)" -#. cursor at status line msgid "--- Included files " msgstr "--- 롼ɤ줿ե " @@ -5037,14 +5034,12 @@ msgid "Warning: region %s not supported" 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 @@ msgid "E757: This does not look like a spell file" 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 @@ msgstr "E778: .sug եǤϤʤ褦Ǥ: %s" #, 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 @@ msgid "E760: No word count in %s" 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 @@ msgstr "%s %d ܤ ʣ /regions= Ԥ̵뤷ޤ: %s" #, 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 @@ msgstr "Ρ %d ( %d ) ̤ޤ; Ĥ %d (%d%%)" 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 @@ msgstr ": %d Х" 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 @@ msgstr "ñ '%.*s' %s ɲäޤ" 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 @@ msgstr "E428: ǸγۤƿʤळȤϤǤޤ" 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 @@ msgstr " ۤʤcaseǻѤޤ!" 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 @@ msgstr "ľ %ld Х" 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 @@ msgstr "E436: termcap \"%s\" Υȥ꤬ޤ" msgid "E437: terminal capability \"cm\" required" msgstr "E437: ü \"cm\" ǽɬפǤ" -#. Highlight title msgid "" "\n" "--- Terminal keys ---" @@ -5746,6 +5732,32 @@ msgstr "" 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 @@ msgstr "Vim: ϤɹΥ顼ˤ꽪λޤ...\n" 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 @@ msgstr "E440: ɥԤޤ" #, 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 @@ msgstr "" 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 @@ msgstr "with Carbon GUI." 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 @@ msgid "menu Help->Orphans for information " msgstr "ܺ٤ϥ˥塼 إ->ɻ ȤƲ " msgid "Running modeless, typed text is inserted" -msgstr "⡼̵Ǽ¹, פʸޤ" +msgstr "⡼̵Ǽ¹档פʸޤ" msgid "menu Edit->Global Settings->Toggle Insert Mode " msgstr "˥塼 Խ->->(鿴)⡼ " @@ -6360,7 +6359,7 @@ msgstr "E370: 饤֥ %s ɤǤޤǤ" 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 @@ msgstr "VimǺʬɽ" msgid "Edit with &Vim" msgstr "VimԽ (&V)" -#. Now concatenate msgid "Edit with existing Vim - " msgstr "ưѤVimԽ - " @@ -6398,10 +6396,6 @@ msgstr "ѥĹޤ!" msgid "--No lines in buffer--" msgstr "--Хåե˹Ԥޤ--" -#. -#. * The error messages that can be shared are included here. -#. * Excluded are errors that are only used once and debugging messages. -#. msgid "E470: Command aborted" msgstr "E470: ޥɤǤޤ" @@ -6475,6 +6469,14 @@ msgid "E475: Invalid argument: %s" 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 @@ msgstr "E17: \"%s\" ϥǥ쥯ȥǤ" 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 @@ msgid "E20: Mark not set" 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 @@ msgstr "E484: ե \"%s\" ޤ" 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 @@ msgid "E449: Invalid expression received" 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 @@ msgstr "E850: ̵ʥ쥸̾Ǥ" 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 "ޤǸΤDzޤ" @@ -6871,7 +6873,6 @@ msgstr "ꥹȤΥȥ饯ϥɰդޤ" 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 @@ msgid "" 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 45a7b0cee..99c468317 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 @@ msgid "E855: Autocommands caused command to abort" 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 @@ msgstr "E90: 最後のバッファは解放できません" 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 @@ msgstr "E88: 最初のバッファより前へは移動できません" 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 @@ msgstr "行 %ld (全体 %ld) --%d%%-- col " msgid "[No Name]" msgstr "[無名]" -#. must be a help buffer msgid "help" msgstr "ヘルプ" @@ -191,6 +201,9 @@ msgstr "" "\n" "# バッファリスト:\n" +msgid "E382: Cannot write, 'buftype' option is set" +msgstr "E382: 'buftype' オプションが設定されているので書込めません" + msgid "[Scratch]" msgstr "[下書き]" @@ -359,7 +372,6 @@ msgstr "E791: 空のキーマップエントリ" 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 @@ msgstr "ファイル内のマッチ" 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 @@ msgstr "%d 番目の該当 (全該当 %d 個中)" msgid "match %d" msgstr "%d 番目の該当" -#. maximum nesting of lists and dicts msgid "E18: Unexpected characters in :let" msgstr "E18: 予期せぬ文字が :let にありました" @@ -522,8 +529,6 @@ msgstr "E690: :for の後に \"in\" がありません" 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 @@ msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます" 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 @@ msgid "E805: Using a Float as a Number" 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 @@ msgid "E910: Using a Job as a Number" 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 @@ msgid "E911: Using a Job as a Float" 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 @@ msgstr "" "\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 @@ msgstr "add() の引数" 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 @@ msgid "E921: Invalid callback argument" 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 @@ msgid "%sviminfo: %s in line: " 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 @@ msgstr " 旧ファイル群" 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 @@ msgstr "viminfoファイル \"%s\" を書込み中" 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 @@ msgstr " (計 1 行内)" 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 @@ msgid "Entering Debug mode. Type \"cont\" to continue." 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 @@ msgstr "ブレークポイントが定義されていません" 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 @@ msgstr "E750: 初めに \":profile start {fname}\" を実行してください" 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 @@ msgid "E493: Backwards range given" 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 @@ msgstr "" "さい" 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 @@ msgid "E183: User defined commands must start with an uppercase letter" 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 @@ msgstr "追加ファイル" msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" -"E747: バッファが修正されているので, ディレクトリを変更できません (! を追加で" +"E747: バッファが修正されているので、ディレクトリを変更できません (! を追加で" "上書)" msgid "E186: No previous directory" @@ -1465,7 +1489,6 @@ msgstr "E189: \"%s\" が存在します (上書するには ! を追加してく 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 @@ msgstr "E500: 空文字列として評価されました" 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 @@ msgstr "例外が破棄されました: %s" 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 @@ msgstr "エラーと割込み" msgid "Error" msgstr "エラー" -#. if (pending & CSTP_INTERRUPT) msgid "Interrupt" msgstr "割込み" @@ -1596,15 +1619,12 @@ msgstr "E601: :try の入れ子が深過ぎます" 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 @@ msgstr "Vim: 標準入力から読込中...\n" msgid "Reading from stdin..." msgstr "標準入力から読込み中..." -#. Re-opening the original file failed! msgid "E202: Conversion made file unreadable!" msgstr "E202: 変換がファイルを読込不可にしました" @@ -1786,9 +1805,6 @@ msgstr "E509: バックアップファイルを作れません (! を追加で 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 @@ msgstr "E166: リンクされたファイルに書込めません" 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 @@ msgstr "[noeol]" 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 @@ msgstr "--削除済--" 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 @@ msgstr "E216: そのようなイベントはありません: %s" msgid "E216: No such group or event: %s" msgstr "E216: そのようなグループもしくはイベントはありません: %s" -#. Highlight title msgid "" "\n" "--- Auto-Commands ---" @@ -2054,6 +2065,11 @@ msgstr "E350: 現在の 'foldmethod' では折畳みを作成できません" 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 @@ msgid "E230: Cannot read from \"%s\"" 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 @@ msgid "E254: Cannot allocate color %s" msgstr "E254: %s の色を割り当てられません" msgid "No match at cursor, finding next" -msgstr "カーソルの位置にマッチはありません, 次を検索しています" +msgstr "カーソルの位置にマッチはありません、次を検索しています" msgid "<cannot open> " msgstr "<開けません> " @@ -2187,18 +2203,15 @@ msgstr "検索文字列:" 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 @@ msgstr "検索文字列 ('\\' を検索するには '\\\\')" 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 @@ msgstr "Vim - フォント選択" msgid "Name:" msgstr "名前:" -#. create toggle button msgid "Show size in Points" msgstr "サイズをポイントで表示する" @@ -2596,7 +2606,6 @@ msgstr "E261: cscope接続 %s が見つかりませんでした" 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 @@ msgid "" "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 @@ msgid "" "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 @@ msgstr "E265: $_ は文字列のインスタンスでなければなりません 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 @@ msgstr "無効なバッファ番号です" msgid "not implemented yet" msgstr "まだ実装されていません" -#. ??? msgid "cannot set line(s)" msgstr "行を設定できません" @@ -2799,7 +2807,6 @@ msgid "" 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 @@ msgstr "" 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 @@ msgstr "Vim: 警告: 端末への出力ではありません\n" 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 @@ msgid "-d\t\t\tDiff mode (like \"vimdiff\")" 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 @@ msgid "--remote <files>\tEdit <files> in a Vim server if possible" 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 @@ msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるの 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 @@ msgstr "--startuptime <file>\t起動にかかった時間の詳細を <file> へ 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 @@ msgstr "--windowid <HWND>\t異なるWin32 widgetの内部にVimを開く" 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 @@ msgstr "マークが設定されていません" msgid "E283: No marks matching \"%s\"" msgstr "E283: \"%s\" に該当するマークがありません" -#. Highlight title msgid "" "\n" "mark line col file/text" @@ -3286,7 +3292,6 @@ msgstr "" "\n" "mark 行 列 ファイル/テキスト" -#. Highlight title msgid "" "\n" " jump line col file/text" @@ -3294,7 +3299,6 @@ msgstr "" "\n" " jump 行 列 ファイル/テキスト" -#. Highlight title msgid "" "\n" "change line col text" @@ -3309,7 +3313,6 @@ msgstr "" "\n" "# ファイルマーク:\n" -#. Write the jumplist with -' msgid "" "\n" "# Jumplist (newest first):\n" @@ -3378,9 +3381,8 @@ msgstr "E298: ブロック 2 を取得できません?" 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 @@ msgid "" "If you entered a new crypt key but did not write the text file," msgstr "" "\n" -"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は," +"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は、" msgid "" "\n" @@ -3479,7 +3481,7 @@ msgid "" "If you wrote the text file after changing the crypt key press enter" msgstr "" "\n" -"暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと" +"暗号キーを変えたあとにテキストファイルを保存した場合は、テキストファイルと" msgid "" "\n" @@ -3539,7 +3541,7 @@ msgid "" "(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 @@ msgstr "" 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 @@ msgstr "次のファイルを開いている最中 \"" 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 @@ msgid "" 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 @@ msgstr "" " を使用して変更をリカバーします(\":help recovery\" を参照).\n" msgid " If you did this already, delete the swap file \"" -msgstr " 既にこれを行なったのならば, スワップファイル \"" +msgstr " 既にこれを行なったのならば、スワップファイル \"" msgid "" "\"\n" @@ -3819,7 +3818,6 @@ msgstr "E328: メニューは他のモードにだけあります" 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 @@ msgstr "E331: メニューバーには直接メニューアイテムを追加で 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 @@ msgstr "" 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 @@ msgstr "E333: メニューパスはメニューアイテムを生じなければ 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 @@ msgstr "ファイル保存ダイアログ" 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 @@ msgstr "%ld 行をインデントしました " msgid "E748: No previously used register" msgstr "E748: まだレジスタを使用していません" -#. must display the prompt msgid "cannot yank; delete anyway" msgstr "ヤンクできません; とにかく消去" @@ -4139,25 +4133,30 @@ msgstr "%ld 行が変更されました" msgid "freeing %ld lines" msgstr "%ld 行を解放中" -msgid "block of 1 line yanked" -msgstr "1 行のブロックがヤンクされました" +#, c-format +msgid " into \"%c" +msgstr " \"%c に" + +#, c-format +msgid "block of 1 line yanked%s" +msgstr "1 行のブロックが%sヤンクされました" -msgid "1 line yanked" -msgstr "1 行がヤンクされました" +#, c-format +msgid "1 line yanked%s" +msgstr "1 行が%sヤンクされました" #, c-format -msgid "block of %ld lines yanked" -msgstr "%ld 行のブロックがヤンクされました" +msgid "block of %ld lines yanked%s" +msgstr "%ld 行のブロックが%sヤンクされました" #, c-format -msgid "%ld lines yanked" -msgstr "%ld 行がヤンクされました" +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 @@ msgstr "" "%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 @@ msgstr "E835: 'fillchars'の値に矛盾があります" 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 @@ msgstr "E541: 要素が多過ぎます" 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 @@ msgstr "E594: 最低 %d のカラム幅が必要です" 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 @@ msgstr "コンソールモードを変更できません?!\n" 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 @@ msgstr "Vimの警告" 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 @@ msgstr "E376: フォーマット文字列の前置に無効な %%%c がありま 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 @@ msgstr "E924: 現在のウィンドウが閉じられました" 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 @@ msgstr "E381: quickfix スタックの先頭です" msgid "No entries" msgstr "エントリがありません" -msgid "E382: Cannot write, 'buftype' option is set" -msgstr "E382: 'buftype' オプションが設定されているので書込みません" - msgid "Error file" msgstr "エラーファイル" @@ -4837,11 +4835,13 @@ msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld" 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 @@ msgstr "E869: (NFA) 未知のオペレータです: '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFA 正規表現) 繰り返しの制限回数を読込中にエラー" -#. Can't have a multi follow a multi. msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません!" -#. Too many `(' msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA 正規表現) '(' が多過ぎます" @@ -4964,7 +4962,6 @@ msgstr "E386: ';' のあとには '?' か '/' が期待されている" msgid " (includes previously listed match)" msgstr " (前に列挙した該当箇所を含む)" -#. cursor at status line msgid "--- Included files " msgstr "--- インクルードされたファイル " @@ -5037,14 +5034,12 @@ msgid "Warning: region %s not supported" 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 @@ msgid "E757: This does not look like a spell file" 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 @@ msgstr "E778: .sug ファイルではないようです: %s" #, 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 @@ msgid "E760: No word count in %s" 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 @@ msgstr "%s の %d 行目の 重複した /regions= 行を無視しました: %s" #, 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 @@ msgstr "ノード %d 個(全 %d 個中) を圧縮しました; 残り %d (%d%%)" 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 @@ msgstr "推定メモリ使用量: %d バイト" 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 @@ msgstr "単語 '%.*s' が %s へ追加されました" 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 @@ msgstr "E428: 最後の該当タグを越えて進むことはできません" 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 @@ msgstr " タグを異なるcaseで使用します!" 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 @@ msgstr "直前の %ld バイト" 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 @@ msgstr "E436: termcapに \"%s\" のエントリがありません" msgid "E437: terminal capability \"cm\" required" msgstr "E437: 端末に \"cm\" 機能が必要です" -#. Highlight title msgid "" "\n" "--- Terminal keys ---" @@ -5746,6 +5732,32 @@ msgstr "" 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 @@ msgstr "Vim: 入力を読込み中のエラーにより終了します...\n" 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 @@ msgstr "E440: アンドゥ行がありません" #, 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 @@ msgstr "" 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 @@ msgstr "with Carbon GUI." 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 @@ msgid "menu Help->Orphans for information " msgstr "詳細はメニューの ヘルプ->孤児 を参照して下さい " msgid "Running modeless, typed text is inserted" -msgstr "モード無で実行中, タイプした文字が挿入されます" +msgstr "モード無で実行中。タイプした文字が挿入されます" msgid "menu Edit->Global Settings->Toggle Insert Mode " msgstr "メニューの 編集->全体設定->挿入(初心者)モード切替 " @@ -6360,7 +6359,7 @@ msgstr "E370: ライブラリ %s をロードできませんでした" 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 @@ msgstr "Vimで差分を表示する" msgid "Edit with &Vim" msgstr "Vimで編集する (&V)" -#. Now concatenate msgid "Edit with existing Vim - " msgstr "起動済のVimで編集する - " @@ -6398,10 +6396,6 @@ msgstr "パスが長過ぎます!" msgid "--No lines in buffer--" msgstr "--バッファに行がありません--" -#. -#. * The error messages that can be shared are included here. -#. * Excluded are errors that are only used once and debugging messages. -#. msgid "E470: Command aborted" msgstr "E470: コマンドが中断されました" @@ -6475,6 +6469,14 @@ msgid "E475: Invalid argument: %s" 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 @@ msgstr "E17: \"%s\" はディレクトリです" 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 @@ msgid "E20: Mark not set" 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 @@ msgstr "E484: ファイル \"%s\" を開けません" 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 @@ msgid "E449: Invalid expression received" 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 @@ msgstr "E850: 無効なレジスタ名です" 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 @@ msgstr "リストのコンストラクタはキーワード引数を受け付け 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 @@ msgid "" 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 1bbbf85e4..02fff4184 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 @@ msgid "E855: Autocommands caused command to abort" msgstr "E855: autocommandR}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@쐬łȂ̂ŁÂgp܂..." msgid "E931: Buffer cannot be registered" msgstr "E931: obt@o^ł܂" @@ -96,7 +96,6 @@ msgstr "E90: Ō̃obt@͉ł܂" 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 @@ msgstr "E88: ŏ̃obt@Oւ͈ړł܂" msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: obt@ %ld ̕ύX͕ۑĂ܂ (! ŕύXj)" +msgid "E948: Job still running (add ! to end the job)" +msgstr "E948: Wu͂܂sł (! ljŃWuI)" + +msgid "E37: No write since last change (add ! to override)" +msgstr "E37: Ō̕ύXۑĂ܂ (! ljŕύXj)" + +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 @@ msgstr "s %ld (S %ld) --%d%%-- col " msgid "[No Name]" msgstr "[]" -#. must be a help buffer msgid "help" msgstr "wv" @@ -191,6 +201,9 @@ msgstr "" "\n" "# obt@Xg:\n" +msgid "E382: Cannot write, 'buftype' option is set" +msgstr "E382: 'buftype' IvVݒ肳Ă̂ŏ߂܂" + msgid "[Scratch]" msgstr "[]" @@ -359,7 +372,6 @@ msgstr "E791: ̃L[}bvGg" 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 @@ msgstr "t@C̃}b`" msgid " Adding" msgstr " lj" -#. 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 @@ msgstr "%d Ԗڂ̊Y (SY %d )" 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 @@ msgstr "E690: :for ̌ \"in\" ܂" 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 @@ msgstr "E743: (A)bNɂ͕ϐ̓q[߂܂" 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 @@ msgid "E805: Using a Float as a Number" 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 @@ msgid "E910: Using a Job as a Number" 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 @@ msgid "E911: Using a Job as a Float" 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 @@ msgstr "" "\n" "\tŌɃZbgXNvg: " +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 @@ msgstr "add() ̈" 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 @@ msgid "E921: Invalid callback argument" 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 @@ msgid "%sviminfo: %s in line: " 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 @@ msgstr " t@CQ" 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 @@ msgstr "viminfot@C \"%s\" ݒ" 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 @@ msgstr " (v 1 s)" 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 @@ msgid "Entering Debug mode. Type \"cont\" to continue." msgstr "fobO[hɓ܂. ɂ \"cont\" Ɠ͂Ă." #, c-format +msgid "Oldval = \"%s\"" +msgstr "Âl = \"%s\"" + +#, c-format +msgid "Newval = \"%s\"" +msgstr "Vl = \"%s\"" + +#, c-format msgid "line %ld: %s" msgstr "s %ld: %s" @@ -1149,6 +1171,10 @@ msgstr "u[N|Cg`Ă܂" 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 @@ msgstr "E750: ߂ \":profile start {fname}\" sĂ" 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 @@ msgid "E493: Backwards range given" 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 @@ msgstr "" "" 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 @@ msgid "E183: User defined commands must start with an uppercase letter" 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 @@ msgstr "ljt@C" msgid "E747: Cannot change directory, buffer is modified (add ! to override)" msgstr "" -"E747: obt@CĂ̂, fBNgύXł܂ (! lj" +"E747: obt@CĂ̂ŁAfBNgύXł܂ (! lj" "㏑)" msgid "E186: No previous directory" @@ -1465,7 +1489,6 @@ msgstr "E189: \"%s\" ݂܂ (㏑ɂ ! ljĂ)" 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̉pp (' `) łȂ܂" @@ -1504,13 +1527,15 @@ msgstr "E500: Ƃĕ]܂" 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 @@ msgstr "Oj܂: %s" 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 @@ msgstr "G[Ɗ" msgid "Error" msgstr "G[" -#. if (pending & CSTP_INTERRUPT) msgid "Interrupt" msgstr "" @@ -1596,15 +1619,12 @@ msgstr "E601: :try ̓q[߂܂" 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 @@ msgstr "Vim: W͂Ǎ...\n" 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 @@ msgstr "E509: obNAbvt@C܂ (! ljŋ쐬)" msgid "E510: Can't make backup file (add ! to override)" msgstr "E510: obNAbvt@C܂ (! ljŋ쐬)" -msgid "E460: The resource fork would be lost (add ! to override)" -msgstr "E460: \\[XtH[N邩܂ (! ljŋ)" - msgid "E214: Can't find temp file for writing" msgstr "E214: ۑpꎞt@C܂" @@ -1801,25 +1817,25 @@ msgstr "E166: Nꂽt@Cɏ߂܂" msgid "E212: Can't open file for writing" msgstr "E212: ݗpɃt@CJ܂" -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@CVXet?)" +msgstr "E514: ݃G[ (t@CVXet?)" msgid " CONVERSION ERROR" msgstr " ϊG[" @@ -1903,9 +1919,6 @@ msgstr "[noeol]" msgid "[Incomplete last line]" msgstr "[ŏIssS]" -#. 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 @@ msgstr "--폜--" 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 @@ msgstr "E216: ̂悤ȃCxg͂܂: %s" msgid "E216: No such group or event: %s" msgstr "E216: ̂悤ȃO[v̓Cxg͂܂: %s" -#. Highlight title msgid "" "\n" "--- Auto-Commands ---" @@ -2054,6 +2065,11 @@ msgstr "E350: ݂ 'foldmethod' ł݂͐쐬ł܂" 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@֒lj" @@ -2099,7 +2115,7 @@ msgid "E230: Cannot read from \"%s\"" msgstr "E230: \"%s\"ǍނƂł܂" msgid "E665: Cannot start GUI, no valid font found" -msgstr "E665: LȃtHgȂ̂, GUIJnł܂" +msgstr "E665: LȃtHgȂ̂ŁAGUIJnł܂" msgid "E231: 'guifontwide' invalid" msgstr "E231: 'guifontwide' ł" @@ -2112,7 +2128,7 @@ msgid "E254: Cannot allocate color %s" 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 @@ msgstr ":" msgid "Replace with:" msgstr "u:" -#. whole word only button msgid "Match whole word only" msgstr "mɊŶ" -#. match case button msgid "Match case" msgstr "啶/ʂ" msgid "Direction" msgstr "" -#. 'Up' and 'Down' buttons msgid "Up" msgstr "" @@ -2277,8 +2290,6 @@ msgstr " ('\\' ɂ '\\\\')" 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 @@ msgstr "Vim - tHgI" msgid "Name:" msgstr "O:" -#. create toggle button msgid "Show size in Points" msgstr "TCY|Cgŕ\\" @@ -2596,7 +2606,6 @@ msgstr "E261: cscopeڑ %s ܂ł" 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 ŒvIȃG[ł" @@ -2642,8 +2651,8 @@ msgid "" "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 @@ msgid "" "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 @@ msgstr "E265: $_ ͕̃CX^XłȂȂ܂" 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 @@ msgstr "ȃobt@ԍł" msgid "not implemented yet" msgstr "܂Ă܂" -#. ??? msgid "cannot set line(s)" msgstr "sݒł܂" @@ -2799,7 +2807,6 @@ msgid "" msgstr "" "R[obNR}ho^ł܂: 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 @@ msgstr "" 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 @@ msgstr "Vim: x: [ւ̏o͂ł͂܂\n" msgid "Vim: Warning: Input is not from a terminal\n" msgstr "Vim: x: [̓͂ł͂܂\n" -#. just in case.. msgid "pre-vimrc command line" msgstr "vimrcÕR}hC" @@ -2997,7 +3003,7 @@ msgid "-d\t\t\tDiff mode (like \"vimdiff\")" 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 @@ msgid "--remote <files>\tEdit <files> in a Vim server if possible" 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[Ăxo͂Ȃ" +msgstr "--remote-silent <files> AT[o[Ăxo͂Ȃ" msgid "" "--remote-wait <files> As --remote but wait for files to have been edited" @@ -3129,7 +3135,7 @@ msgstr "--remote-wait <files>\t--remote t@C̕ҏWÎ҂" msgid "" "--remote-wait-silent <files> Same, don't complain if there is no server" msgstr "" -"--remote-wait-silent <files> , T[o[Ăxo͂Ȃ" +"--remote-wait-silent <files> AT[o[Ăxo͂Ȃ" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" @@ -3155,8 +3161,11 @@ msgstr "--startuptime <file>\tNɂԂ̏ڍׂ <file> ֏o͂" msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo" msgstr "-i <viminfo>\t\t.viminfȏ <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 @@ msgstr "--windowid <HWND>\tقȂWin32 widget̓VimJ" 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 @@ msgstr "}[Nݒ肳Ă܂" msgid "E283: No marks matching \"%s\"" msgstr "E283: \"%s\" ɊY}[N܂" -#. Highlight title msgid "" "\n" "mark line col file/text" @@ -3286,7 +3292,6 @@ msgstr "" "\n" "mark s t@C/eLXg" -#. Highlight title msgid "" "\n" " jump line col file/text" @@ -3294,7 +3299,6 @@ msgstr "" "\n" " jump s t@C/eLXg" -#. Highlight title msgid "" "\n" "change line col text" @@ -3309,7 +3313,6 @@ msgstr "" "\n" "# t@C}[N:\n" -#. Write the jumplist with -' msgid "" "\n" "# Jumplist (newest first):\n" @@ -3378,9 +3381,8 @@ msgstr "E298: ubN 2 擾ł܂?" 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 @@ msgid "" "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 @@ msgid "" "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 @@ msgid "" "(You might want to write out this file under another name\n" msgstr "" "\n" -"(ύX`FbN邽߂, ̃t@Cʂ̖Oŕۑ\n" +"(ύX`FbN邽߂ɁÃ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 @@ msgstr "" 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 @@ msgstr "̃t@CJĂŒ \"" msgid " NEWER than swap file!\n" msgstr " Xbvt@CVł!\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 @@ msgid "" msgstr "" "\n" "(1) ʂ̃vOt@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̕ҏWZbVNbV.\n" @@ -3757,7 +3756,7 @@ msgstr "" " gpĕύXJo[܂(\":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 @@ msgstr "E328: j[͑̃[hɂ܂" 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 @@ msgstr "E331: j[o[ɂ͒ڃj[ACeljł܂" msgid "E332: Separator cannot be part of a menu path" msgstr "E332: ̓j[pẌꕔł͂܂" -#. Now we have found the matching menu, and we list the mappings -#. Highlight title msgid "" "\n" "--- Menus ---" @@ -3844,6 +3840,10 @@ msgstr "" 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 @@ msgstr "E333: j[pX̓j[ACeȂ܂" 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 @@ msgstr "t@Cۑ_CAO" 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@CuEUg܂, ߂Ȃ" +msgstr "E338: R\\[[hł̓t@CuEUg܂A߂Ȃ" msgid "E766: Insufficient arguments for printf()" msgstr "E766: printf() ̈s\\ł" @@ -4124,7 +4119,6 @@ msgstr "%ld sCfg܂ " 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 @@ msgstr "%ld sύX܂" msgid "freeing %ld lines" msgstr "%ld s" -msgid "block of 1 line yanked" -msgstr "1 s̃ubNN܂" +#, c-format +msgid " into \"%c" +msgstr " \"%c " + +#, c-format +msgid "block of 1 line yanked%s" +msgstr "1 s̃ubN%sN܂" -msgid "1 line yanked" -msgstr "1 sN܂" +#, c-format +msgid "1 line yanked%s" +msgstr "1 s%sN܂" #, c-format -msgid "block of %ld lines yanked" -msgstr "%ld s̃ubNN܂" +msgid "block of %ld lines yanked%s" +msgstr "%ld s̃ubN%sN܂" #, c-format -msgid "%ld lines yanked" -msgstr "%ld sN܂" +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 @@ msgstr "" "%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 @@ msgstr "E835: 'fillchars'̒lɖ܂" 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 @@ msgstr "E541: vf߂܂" 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-8KvȂ̂, ':set encoding=utf-8' Ă" +"W17: ArAɂUTF-8KvȂ̂Ł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 @@ msgstr "E594: Œ %d ̃JKvł" 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 @@ msgstr "R\\[[hύXł܂?!\n" 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ŃVFsł܂" @@ -4620,6 +4622,9 @@ msgstr "Vim̌x" msgid "shell returned %d" msgstr "VFR[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 @@ msgstr "E376: tH[}bg̑Ouɖ %%%c ܂" 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 @@ msgstr "E924: ݂̃EBhE܂" 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 @@ msgstr "E381: quickfix X^bN̐擪ł" 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 @@ msgstr "E877: (NFA K\\) ȕNX: %ld" 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 @@ msgstr "E869: (NFA) m̃Iy[^ł: '\\@%c'" msgid "E870: (NFA regexp) Error reading repetition limits" msgstr "E870: (NFA K\\) JԂ̐ǍɃG[" -#. Can't have a multi follow a multi. msgid "E871: (NFA regexp) Can't have a multi follow a multi !" msgstr "E871: (NFA K\\) JԂ ̌ JԂ ͂ł܂!" -#. Too many `(' msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA K\\) '(' ߂܂" @@ -4964,7 +4962,6 @@ msgstr "E386: ';' ̂Ƃɂ '?' '/' ҂Ă" msgid " (includes previously listed match)" msgstr " (OɗYӏ܂)" -#. cursor at status line msgid "--- Included files " msgstr "--- CN[hꂽt@C " @@ -5037,14 +5034,12 @@ msgid "Warning: region %s not supported" 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 @@ msgid "E757: This does not look like a spell file" 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: Vo[W Vim p̃Xyt@Cł" @@ -5103,7 +5098,7 @@ msgstr "E778: .sug t@Cł͂Ȃ悤ł: %s" #, 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 @@ msgid "E760: No word count in %s" 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 @@ msgstr "%s %d sڂ d /regions= s܂: %s" #, 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 @@ msgstr "m[h %d (S %d ) k܂; c %d (%d%%)" msgid "Reading back spell file..." msgstr "Xyt@CtǍ" -#. -#. * 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 @@ msgstr "胁gp: %d oCg" 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 @@ msgstr "P '%.*s' %s ֒lj܂" 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 @@ msgstr "E428: Ō̊Y^OzĐiނƂ͂ł܂" 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 @@ msgstr " ^OقȂcaseŎgp܂!" 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 @@ msgstr "O %ld oCg" 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 @@ msgstr "E436: termcap \"%s\" ̃Gg܂" msgid "E437: terminal capability \"cm\" required" msgstr "E437: [ \"cm\" @\\Kvł" -#. Highlight title msgid "" "\n" "--- Terminal keys ---" @@ -5746,6 +5732,32 @@ msgstr "" msgid "Cannot open $VIMRUNTIME/rgb.txt" msgstr "$VIMRUNTIME/rgb.txtJ܂" +#, c-format +msgid "Kill job in \"%s\"?" +msgstr "\"%s\" ̃WuI܂?" + +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 "VVFN܂\n" @@ -5755,12 +5767,9 @@ msgstr "Vim: ͂Ǎݒ̃G[ɂI܂...\n" msgid "Used CUT_BUFFER0 instead of empty selection" msgstr "̑Ï̂CUT_BUFFER0gp܂" -#. 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 @@ msgstr "E440: AhDs܂" #, c-format msgid "E122: Function %s already exists, add ! to replace it" -msgstr "E122: %s ͒`ςł, Ē`ɂ ! ljĂ" +msgstr "E122: %s ͒`ςłAĒ`ɂ ! ljĂ" msgid "E717: Dictionary entry already exists" msgstr "E717: ^ɃGgɑ݂܂" @@ -6054,24 +6063,17 @@ msgstr "" 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 @@ msgstr "with Carbon GUI." 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 @@ msgid "menu Help->Orphans for information " 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 @@ msgstr "E370: Cu %s [hł܂ł" 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 @@ msgstr "Vimō\\" msgid "Edit with &Vim" msgstr "VimŕҏW (&V)" -#. Now concatenate msgid "Edit with existing Vim - " msgstr "NςVimŕҏW - " @@ -6398,10 +6396,6 @@ msgstr "pX߂܂!" 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}hf܂" @@ -6475,6 +6469,14 @@ msgid "E475: Invalid argument: %s" msgstr "E475: Ȉł: %s" #, c-format +msgid "E475: Invalid value for argument %s" +msgstr "E475: %s ɑĖȒlł" + +#, c-format +msgid "E475: Invalid value for argument %s: %s" +msgstr "E475: %s ɑĖȒlł: %s" + +#, c-format msgid "E15: Invalid expression: %s" msgstr "E15: Ȏł: %s" @@ -6492,6 +6494,9 @@ msgstr "E17: \"%s\" ̓fBNgł" 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: Ců %s [hł܂ł" @@ -6503,7 +6508,7 @@ msgid "E20: Mark not set" 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 @@ msgstr "E484: t@C \"%s\" J܂" msgid "E485: Can't read file %s" msgstr "E485: t@C %s Ǎ߂܂" -msgid "E37: No write since last change (add ! to override)" -msgstr "E37: Ō̕ύXۑĂ܂ (! ljŕύXj)" - -msgid "E37: No write since last change" -msgstr "E37: Ō̕ύXۑĂ܂" - msgid "E38: Null argument" msgstr "E38: ł" @@ -6736,7 +6735,7 @@ msgid "E449: Invalid expression received" 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 @@ msgstr "E850: ȃWX^ł" msgid "E919: Directory not found in '%s': \"%s\"" msgstr "E919: fBNg '%s' ̒ɂ܂: \"%s\"" +msgid "E952: Autocommand caused recursive behavior" +msgstr "E952: AutocommandċAN܂" + msgid "search hit TOP, continuing at BOTTOM" msgstr "܂Ō̂ʼnɖ߂܂" @@ -6871,7 +6873,6 @@ msgstr "Xg̃RXgN^̓L[[ht܂" msgid "list index out of range" msgstr "Xg͈͊Õ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 @@ msgid "" msgstr "" "pX̐ݒɎs܂: sys.path Xgł͂܂\n" " vim.VIM_SPECIAL_PATH sys.path ɒljĂ" + +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" |