diff options
-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 0a142e4523..de4bb0260d 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 eda14bc73e..13ab3551a8 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 8634c28421..c0910634d5 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 774235674d..5b7798b544 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 a4cc583ba2..47688f87aa 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 0eff4d99c3..4dcd60c187 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 105a199417..a47cdbe455 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 3448e0d245..6e81f8f7da 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 af15c0bbc0..9dbc47cb97 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 66c81661c7..a39d7da3c8 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 b932303eff..8cb63f2d14 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 cc03472022..1e70cbc081 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 aca6cf79ea..fdca0eb36e 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 eb1e8a263c..0a92f04fb0 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: ΥСǤϤΥޥɤѤǤޤʤ" |