Mercurial > vim
changeset 7876:93f747af7b58
commit https://github.com/vim/vim/commit/5e9b2fa9bb0e6061cf18457c173cd141a5dc9c92
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 1 22:37:05 2016 +0100
Updated runtime files and translations.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 01 Feb 2016 22:45:06 +0100 |
| parents | 12cae879b674 |
| children | 7fbd2de703a9 |
| files | runtime/autoload/sqlcomplete.vim runtime/doc/change.txt runtime/doc/develop.txt runtime/doc/editing.txt runtime/doc/eval.txt runtime/doc/insert.txt runtime/doc/netbeans.txt runtime/doc/options.txt runtime/doc/tags runtime/doc/todo.txt runtime/doc/various.txt runtime/doc/vim-ja.UTF-8.1 runtime/doc/xxd-ja.UTF-8.1 runtime/lang/menu_ja_jp.euc-jp.vim runtime/lang/menu_ja_jp.utf-8.vim runtime/lang/menu_japanese_japan.932.vim src/po/ja.euc-jp.po src/po/ja.po src/po/ja.sjis.po |
| diffstat | 19 files changed, 948 insertions(+), 530 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/autoload/sqlcomplete.vim +++ b/runtime/autoload/sqlcomplete.vim @@ -1,8 +1,8 @@ " Vim OMNI completion script for SQL " Language: SQL " Maintainer: David Fishburn <dfishburn dot vim at gmail dot com> -" Version: 15.0 -" Last Change: 2013 May 13 +" Version: 16.0 +" Last Change: 2015 Dec 29 " Homepage: http://www.vim.org/scripts/script.php?script_id=1572 " Usage: For detailed help " ":help sql.txt" @@ -16,6 +16,12 @@ " look backwards to a FROM clause and find the first table " and complete it. " +" Version 16.0 (Dec 2015) +" - NF: If reseting the cache and table, procedure or view completion +" had been used via dbext, have dbext delete or recreate the +" dictionary so that new objects are picked up for the +" next completion. +" " Version 15.0 (May 2013) " - NF: Changed the SQL precached syntax items, omni_sql_precache_syntax_groups, " to use regular expressions to pick up extended syntax group names. @@ -103,7 +109,7 @@ endif if exists('g:loaded_sql_completion') finish endif -let g:loaded_sql_completion = 150 +let g:loaded_sql_completion = 160 let s:keepcpo= &cpo set cpo&vim @@ -459,6 +465,29 @@ function! sqlcomplete#Complete(findstart let s:tbl_cols = [] let s:syn_list = [] let s:syn_value = [] + + if s:sql_file_table != "" + if g:loaded_dbext >= 2300 + call DB_DictionaryDelete("table") + else + DBCompleteTables! + endif + endif + if s:sql_file_procedure != "" + if g:loaded_dbext >= 2300 + call DB_DictionaryDelete("procedure") + else + DBCompleteProcedures! + endif + endif + if s:sql_file_view != "" + if g:loaded_dbext >= 2300 + call DB_DictionaryDelete("view") + else + DBCompleteViews! + endif + endif + let s:sql_file_table = "" let s:sql_file_procedure = "" let s:sql_file_view = ""
--- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.4. Last change: 2016 Jan 19 +*change.txt* For Vim version 7.4. Last change: 2016 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -977,8 +977,6 @@ 4.4 Changing tabs *change-tabs* `:retab!` may also change a sequence of spaces by <Tab> characters, which can mess up a printf(). {not in Vi} - Not available when |+ex_extra| feature was disabled at - compile time. *retab-example* Example for using autocommands and ":retab" to edit a file which is stored @@ -1354,22 +1352,16 @@ 6. Formatting text *formatting* Center lines in [range] between [width] columns (default 'textwidth' or 80 when 'textwidth' is 0). {not in Vi} - Not available when |+ex_extra| feature was disabled at - compile time. :[range]ri[ght] [width] *:ri* *:right* Right-align lines in [range] at [width] columns (default 'textwidth' or 80 when 'textwidth' is 0). {not in Vi} - Not available when |+ex_extra| feature was disabled at - compile time. *:le* *:left* :[range]le[ft] [indent] Left-align lines in [range]. Sets the indent in the lines to [indent] (default 0). {not in Vi} - Not available when |+ex_extra| feature was disabled at - compile time. *gq* gq{motion} Format the lines that {motion} moves over.
--- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.4. Last change: 2016 Jan 19 +*develop.txt* For Vim version 7.4. Last change: 2016 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -322,7 +322,8 @@ OK: if (cond) cmd; } -Functions start with: +Use ANSI (new style) function declarations with the return type on a separate +indented line. Wrong: int function_name(int arg1, int arg2) @@ -340,8 +341,6 @@ OK: /* local = arg1 * arg2; -NOTE: Don't use ANSI style function declarations. A few people still have to -use a compiler that doesn't support it. SPACES AND PUNCTUATION *style-spaces*
--- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2016 Jan 17 +*editing.txt* For Vim version 7.4. Last change: 2016 Feb 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1468,6 +1468,8 @@ test for blowfish with: > v:version >= 703 And for blowfish2 with: > v:version > 704 || (v:version == 704 && has('patch401')) +If you are sure Vim includes patch 7.4.237 a simpler check is: > + has('patch-7.4.401') < *E817* *E818* *E819* *E820* When encryption does not work properly, you would be able to write your text
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 Jan 28 +*eval.txt* For Vim version 7.4. Last change: 2016 Feb 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2668,6 +2668,8 @@ confirm({msg} [, {choices} [, {default} connect({address}, {mode} [, {callback}]) *connect()* Open a channel to {address}. See |channel|. + Returns the channel handle on success. Returns a negative + number for failure. {address} has the form "hostname:port", e.g., "localhost:8765". @@ -7053,7 +7055,7 @@ ebcdic Compiled on a machine with ebcd emacs_tags Compiled with support for Emacs tags. eval Compiled with expression evaluation support. Always true, of course! -ex_extra Compiled with extra Ex commands |+ex_extra|. +ex_extra |+ex_extra|, always true now extra_search Compiled with support for |'incsearch'| and |'hlsearch'| farsi Compiled with Farsi support |farsi|.
--- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.4. Last change: 2015 Sep 15 +*insert.txt* For Vim version 7.4. Last change: 2016 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1872,8 +1872,6 @@ NOTE: These commands cannot be used with or script is finished. This command does not work from |:normal|. {not in Vi} - {not available when compiled without the |+ex_extra| - feature} *:stopi* *:stopinsert* :stopi[nsert] Stop Insert mode as soon as possible. Works like @@ -1891,15 +1889,11 @@ NOTE: These commands cannot be used with script that the replacement will only start after the function or script is finished. {not in Vi} - {not available when compiled without the |+ex_extra| - feature} *:startgreplace* :startg[replace][!] Just like |:startreplace|, but use Virtual Replace mode, like with |gR|. {not in Vi} - {not available when compiled without the |+ex_extra| - feature} ============================================================================== 10. Inserting a file *inserting-file*
--- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.4. Last change: 2016 Jan 27 +*netbeans.txt* For Vim version 7.4. Last change: 2016 Jan 31 VIM REFERENCE MANUAL by Gordon Prieur et al. @@ -823,7 +823,7 @@ REJECT Not used. 6.7 Protocol errors *nb-protocol_errors* These errors occur when a message violates the protocol: -*E627* *E628* *E629* *E630* *E631* *E632* *E633* *E634* *E635* *E636* +*E627* *E628* *E629* *E632* *E633* *E634* *E635* *E636* *E637* *E638* *E639* *E640* *E641* *E642* *E643* *E644* *E645* *E646* *E647* *E648* *E649* *E650* *E651* *E652* *E653* *E654*
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2016 Jan 19 +*options.txt* For Vim version 7.4. Last change: 2016 Feb 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2295,7 +2295,7 @@ A jump table for the options with a shor the encrypted bytes will be different. *blowfish2* blowfish2 Blowfish method. Medium strong encryption. Requires - Vim 7.4.399 or later, files can NOT be read by Vim 7.3 + Vim 7.4.401 or later, files can NOT be read by Vim 7.3 and older. This adds a "seed" to the file, every time you write the file the encrypted bytes will be different. The whole undo file is encrypted, not just @@ -6983,7 +6983,7 @@ A jump table for the options with a shor The option consists of printf style '%' items interspersed with normal text. Each status line item is of the form: %-0{minwid}.{maxwid}{item} - All fields except the {item} is optional. A single percent sign can + All fields except the {item} are optional. A single percent sign can be given as "%%". Up to 80 items can be specified. *E541* When the option starts with "%!" then it is used as an expression,
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4135,8 +4135,8 @@ E627 netbeans.txt /*E627* E628 netbeans.txt /*E628* E629 netbeans.txt /*E629* E63 pattern.txt /*E63* -E630 netbeans.txt /*E630* -E631 netbeans.txt /*E631* +E630 channel.txt /*E630* +E631 channel.txt /*E631* E632 netbeans.txt /*E632* E633 netbeans.txt /*E633* E634 netbeans.txt /*E634* @@ -4424,7 +4424,17 @@ E892 eval.txt /*E892* E893 eval.txt /*E893* E894 eval.txt /*E894* E895 if_mzsch.txt /*E895* +E896 channel.txt /*E896* +E897 channel.txt /*E897* +E898 channel.txt /*E898* +E899 channel.txt /*E899* E90 message.txt /*E90* +E900 channel.txt /*E900* +E901 channel.txt /*E901* +E902 channel.txt /*E902* +E903 channel.txt /*E903* +E904 channel.txt /*E904* +E905 channel.txt /*E905* E91 options.txt /*E91* E92 message.txt /*E92* E93 windows.txt /*E93* @@ -8521,6 +8531,7 @@ timestamps editing.txt /*timestamps* tips tips.txt /*tips* tips.txt tips.txt /*tips.txt* todo todo.txt /*todo* +todo.txt todo.txt /*todo.txt* toggle options.txt /*toggle* toggle-revins version4.txt /*toggle-revins* tolower() eval.txt /*tolower()*
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -todo.txt* For Vim version 7.4. Last change: 2016 Jan 27 +*todo.txt* For Vim version 7.4. Last change: 2016 Feb 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -75,18 +75,24 @@ Regexp problems: - The pattern "\1" with the old engine gives E65, with the new engine it matches the empty string. (Dominique Pelle, 2015 Oct 2, Nov 24) - Search for \\~ causes error E874. + - "\%1l^#.*" does not match on a line starting with "#". The zero-width match clears the start-of-line flag. + Patch by Christian, 2016 Jan 29. +channel: +- implement wait for receiving end of Json. +- implement only reading up to end of Json. - cleanup on exit? in mch_getout() and getout(). -- more contents in channel.txt - -C89: remove __ARGS in more places -- /tmp/noargs.vim -- /tmp/eliminate__ARGS.vim -- Script: Hirohito Higashi, Jan 25, 2nd one. -- Assume HAVE_STDARG_H is always defined. +- Add more contents to channel.txt +- implement debug log +- implement job control +- Add a test with a server that can send canned responses. +- make sure errors lead to a useful error msg. ["ex","foobar"] +- use a timeout for connect() Patch from Yasuhiro Matsumoto, Feb 1 +- set timeout for channel. +- implement check for ID in response. +- json: implement UTF-16 surrogate pair. This difference is unexpected: echo v:true == 1 @@ -95,7 +101,13 @@ This difference is unexpected: 0 It's because tv_equal() works different. -Do we need to roll-back patch 1165, that put libintl-8.dll before libintl.dll? +Allow for an empty dictionary key. + +Patch to put undo options together in undo window. +(Gary Johnson, 2016 Jan 28) + +Patch for clearing history. (Yegappan Lakshmanan, 2016 Jan 31, second message +has tests) Need to try out instructions in INSSTALLpc.txt about how to install all interfaces and how to build Vim with them. @@ -106,6 +118,9 @@ result: https://ci.appveyor.com/project/ Still using freed memory after using setloclist(). (lcd, 2014 Jul 23) More info Jul 24. Not clear why. +Duplication of completion suggestions for ":!hom". Issue 539. +Patch by Christian, 2016 Jan 29 +> Problem that a previous silent ":throw" causes a following try/catch not to work. (ZyX, 2013 Sep 28) With examples: (Malcolm Rowe, 2015 Dec 24) @@ -132,17 +147,23 @@ Should use /usr/local/share/applications Or use $XDG_DATA_DIRS. Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4) +Move the README files that are for including in archives to a subdirectory. +"readmedir/" ? + Access to uninitialized memory in match_backref() regexp_nda.c:4882 (Dominique Pelle, 2015 Nov 6) ":cd C:\Windows\System32\drivers\etc*" does not work, even though the directory exists. (Sergio Gallelli, 2013 Dec 29) +Patch to avoid redrawing tabline when the popup menu is visible. +(Christian Brabandt, 2016 Jan 28) + Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12) More tests May 14. Update May 29. Update Aug 10. Now part of large file patches. (Ken Takata, 2016 Jan 19, second one) Updated patches with ordering: Jan 20. -And another update: Jan 24 +And another update: Jan 24, then Jan 29, 30, Feb 1. 7 Add a watchpoint in the debug mode: An expression that breaks execution when evaluating to non-zero. Add the "watchadd expr" command, stop when @@ -150,6 +171,9 @@ 7 Add a watchpoint in the debug mode: ":watchlist" lists the items. (Charles Campbell) Patch by Christian Brabandt, 2016 Jan 27. +Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6) +Update Sep 7. Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1. + Using ":windo" to set options in all windows has the side effect that it changes the window layout and the current window. Make a variant that saves and restores. Use in the matchparen plugin. @@ -158,6 +182,10 @@ Patch to add <restore> to :windo, :bufdo 6, 2nd message) Alternative: ":keeppos" command modifier: ":keeppos windo {cmd}". +Patch to fix display of listchars on the cursorline. (Nayuri Aohime, 2013) +Update suggested by Yasuhiro Matsumoto, 2014 Nov 25: +https://gist.github.com/presuku/d3d6b230b9b6dcfc0477 + Illegal memory access, requires ASAN to see. (Dominique Pelle, 2015 Jul 28) Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab. @@ -172,8 +200,6 @@ github with a URL like this: https://github.com/vim/vim/compare/v7.4.920%5E...v7.4.920.diff Diff for version.c contains more context, can't skip a patch. -Duplication of completion suggestions for ":!hom". Issue 539. -> When t_Co is changed from termresponse, the OptionSet autocmmand event isn't triggered. Use the code from the end of set_num_option() in set_color_count(). @@ -225,6 +251,9 @@ is Vi compatible, the completion fails. Test 44 fails when [[=A=]] is changed to [[=À=]]. Caused by getcmdline() not handling the 0x80 as a second byte correctly? (Dominique Pelle, 2015 Jun 10) +Patch to use two highlight groups for relative numbers. (Shaun Brady, 2016 Jan +30) + Weird encryption problems on Windows. (Ben Fritz, 2015 Feb 13) Goes away when disabling the swap file. (might1, Feb 16) @@ -262,9 +291,6 @@ 26, update 2013 Dec 14, another 2014 Nov Patch for problem with restoring screen on Windows. (Nobuhiro Takasaki, 2015 Sep 10) -Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6) -Update Sep 7. Update by Christian Brabandt, 2015 Sep 8. - Patch to improve I/O for Perl. (Damien, 2015 Jan 9, update Jan 22 2nd one) Patch to set antialiasing style on Windows. (Ondrej Balaz, 2013 Mar 14) @@ -409,7 +435,7 @@ Patch: On MS-Windows shellescape() may h (Ingo Karkat, 2015 Jan 16) Patch for variable tabstops. On github (Christian Brabandt, 2014 May 15) -Update 2015 Jul 25 (email). +Update 2016 Jan 31 (email). Redo only remembers the last change. Could use "{count}g." to redo an older change. How does the user know which change? At least have a way to list @@ -456,6 +482,8 @@ compatible with Vim spell files. The ol Patch to make FocusGained and FocusLost work in modern terminals. (Hayaki Saito, 2013 Apr 24) Has a problem (email 2015 Jan 7). Update 2015 Jan 10. +Also see issue #609. +We could add the enable/disable sequences to t_ti/t_te or t_ks/t_ke. Idea: For a window in the middle (has window above and below it), use right-mouse-drag on the status line to move a window up/down without changing @@ -543,10 +571,6 @@ Yasuhiro Matsumoto, 2013 May 31. Or should we add a more general mechanism, like a lambda() function? Patch by Yasuhiro Matsumoto, 2014 Sep 16. -Patch to fix display of listchars on the cursorline. (Nayuri Aohime, 2013) -Update suggested by Yasuhiro Matsumoto, 2014 Nov 25: -https://gist.github.com/presuku/d3d6b230b9b6dcfc0477 - VMS: Select() doesn't work properly, typing ESC may hang Vim. Use sys$qiow instead. (Samuel Ferencik, 2013 Sep 28)
--- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.4. Last change: 2016 Jan 27 +*various.txt* For Vim version 7.4. Last change: 2016 Jan 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -208,8 +208,6 @@ 8g8 Find an illegal UTF-8 byte sequenc Example: > :exe "normal \<c-w>\<c-w>" < {not in Vi, of course} - {not available when the |+ex_extra| feature was - disabled at compile time} :{range}norm[al][!] {commands} *:normal-range* Execute Normal mode commands {commands} for each line @@ -218,8 +216,6 @@ 8g8 Find an illegal UTF-8 byte sequenc for each line. Otherwise it's the same as the ":normal" command without a range. {not in Vi} - {not available when |+ex_extra| feature was disabled - at compile time} *:sh* *:shell* *E371* :sh[ell] This command starts a shell. When the shell exits @@ -342,8 +338,7 @@ m *+directx* Win32 GUI only: DirectX a *+dnd* Support for DnD into the "~ register |quote_~|. B *+emacs_tags* |emacs-tags| files N *+eval* expression evaluation |eval.txt| -N *+ex_extra* Vim's extra Ex commands: |:center|, |:left|, - |:normal|, |:retab| and |:right| +N *+ex_extra* always on now, used to be for Vim's extra Ex commands N *+extra_search* |'hlsearch'| and |'incsearch'| options. B *+farsi* |farsi| language N *+file_in_path* |gf|, |CTRL-W_f| and |<cfile>|
--- a/runtime/doc/vim-ja.UTF-8.1 +++ b/runtime/doc/vim-ja.UTF-8.1 @@ -159,7 +159,7 @@ Note: "+" と "\-c" は合わせて 10 個まで指定できます。 .TP \-b バイナリモード。 -バイナリファイルを編集ためのオプションがいくつか設定されます。 +バイナリファイルを編集するためのオプションがいくつか設定されます。 .TP \-C 互換モード。'compatible' オプションがオンになります。
--- a/runtime/doc/xxd-ja.UTF-8.1 +++ b/runtime/doc/xxd-ja.UTF-8.1 @@ -61,6 +61,16 @@ 1 オクテットが "1" と "0" の 8 文字で出力されます。 行末には ascii (または ebcdic) で表した場合の文字が表示されます。 このモードでは \-r、\-p、\-i は機能しません。 .TP +.IR \-e +リトルエンディアンの 16 進ダンプに切り替える。 +このオプションは、バイトのグループをリトルエンディアンのバイト順のワードとして +扱います。標準のグルーピングは 4 バイトですが、 +.RI "" \-g +を使うことで変更可能です。 +このオプションは 16 進ダンプのみに適用され、ASCII (あるいは EBCDIC) 表示は +変更されません。 +このモードでは \-r、\-p、\-i は機能しません。 +.TP .IR "\-c cols " | " \-cols cols" 一行 .RI < cols > @@ -80,7 +90,8 @@ 16 進ダンプの出力形式は変更されません。 .I \-g 0 を指定してください。 .RI < Bytes > -の標準設定は \fI2\fP です。2 進ダンプの場合は \fI1\fP です。 +の標準設定は \fI2\fP で、リトルエンディアンモードの場合は \fI4\fP 、 +2 進ダンプの場合は \fI1\fP です。 ポストスクリプト形式やインクルード形式で出力するときは、このオプションは使わ れません。 .TP @@ -95,6 +106,11 @@ C インクルードファイル形式で出力します。入力ファイルの名前が付けられた静的配 .RI < len > オクテットだけ出力する。 .TP +.I \-o offset +表示されるファイル位置に +.RI < offset > +を加算する。 +.TP .IR \-p " | " \-ps " | " \-postscript " | " \-plain ポストスクリプト形式の 16 進ダンプを出力する。別名 プレーン 16 進ダンプ。 .TP
--- a/runtime/lang/menu_ja_jp.euc-jp.vim +++ b/runtime/lang/menu_ja_jp.euc-jp.vim @@ -1,10 +1,12 @@ " vi:set ts=8 sts=8 sw=8 tw=0: " " Menu Translations: Japanese (EUC-JP) -" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com> -" Last Change: 12-May-2013. +" Last Translator: MURAOKA Taro <koron.kaoriya@gmail.com> +" Last Change: 28-Jan-2016. " -" Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> +" Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +" vim-jp (http://vim-jp.org/) +" " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. " Quit when menu translations have already been done. @@ -20,7 +22,7 @@ scriptencoding euc-jp " Help menu menutrans &Help إ(&H) menutrans &Overview<Tab><F1> ά(&O)<Tab><F1> -menutrans &User\ Manual 桼ޥ˥奢(&U) +menutrans &User\ Manual 桼ޥ˥奢(&U) menutrans &How-to\ links &How-to menutrans &Credits 쥸å(&C) menutrans Co&pying (&P) @@ -138,7 +140,7 @@ menutrans &Tools ġ(&T) menutrans &Jump\ to\ this\ tag<Tab>g^] (&J)<Tab>g^] menutrans Jump\ &back<Tab>^T (&B)<Tab>^T menutrans Build\ &Tags\ File ե(&T) -menutrans &Make<Tab>:make ᥤ(&M)<Tab>:make +menutrans &Make<Tab>:make ӥ(&M)<Tab>:make menutrans &List\ Errors<Tab>:cl 顼ꥹ(&L)<Tab>:cl menutrans L&ist\ Messages<Tab>:cl! åꥹ(&I)<Tab>:cl! menutrans &Next\ Error<Tab>:cn Υ顼(&N)<Tab>:cn
--- a/runtime/lang/menu_ja_jp.utf-8.vim +++ b/runtime/lang/menu_ja_jp.utf-8.vim @@ -1,10 +1,12 @@ " vi:set ts=8 sts=8 sw=8 tw=0: " " Menu Translations: Japanese (UTF-8) -" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com> -" Last Change: 12-May-2013. +" Last Translator: MURAOKA Taro <koron.kaoriya@gmail.com> +" Last Change: 28-Jan-2016. " -" Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> +" Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +" vim-jp (http://vim-jp.org/) +" " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. " Quit when menu translations have already been done. @@ -20,7 +22,7 @@ scriptencoding utf-8 " Help menu menutrans &Help ヘルプ(&H) menutrans &Overview<Tab><F1> 概略(&O)<Tab><F1> -menutrans &User\ Manual ユーザマニュアル(&U) +menutrans &User\ Manual ユーザーマニュアル(&U) menutrans &How-to\ links &How-toリンク menutrans &Credits クレジット(&C) menutrans Co&pying 著作権情報(&P) @@ -138,7 +140,7 @@ menutrans &Tools ツール(&T) menutrans &Jump\ to\ this\ tag<Tab>g^] タグジャンプ(&J)<Tab>g^] menutrans Jump\ &back<Tab>^T 戻る(&B)<Tab>^T menutrans Build\ &Tags\ File タグファイル作成(&T) -menutrans &Make<Tab>:make メイク(&M)<Tab>:make +menutrans &Make<Tab>:make ビルド(&M)<Tab>:make menutrans &List\ Errors<Tab>:cl エラーリスト(&L)<Tab>:cl menutrans L&ist\ Messages<Tab>:cl! メッセージリスト(&I)<Tab>:cl! menutrans &Next\ Error<Tab>:cn 次のエラーへ(&N)<Tab>:cn
--- a/runtime/lang/menu_japanese_japan.932.vim +++ b/runtime/lang/menu_japanese_japan.932.vim @@ -1,10 +1,12 @@ " vi:set ts=8 sts=8 sw=8 tw=0: " " Menu Translations: Japanese (CP932) -" Translated By: MURAOKA Taro <koron.kaoriya@gmail.com> -" Last Change: 12-May-2013. +" Last Translator: MURAOKA Taro <koron.kaoriya@gmail.com> +" Last Change: 28-Jan-2016. " -" Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> +" Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +" vim-jp (http://vim-jp.org/) +" " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. " Quit when menu translations have already been done. @@ -20,7 +22,7 @@ scriptencoding cp932 " Help menu menutrans &Help wv(&H) menutrans &Overview<Tab><F1> T(&O)<Tab><F1> -menutrans &User\ Manual [U}jA(&U) +menutrans &User\ Manual [U[}jA(&U) menutrans &How-to\ links &How-toN menutrans &Credits NWbg(&C) menutrans Co&pying 쌠(&P) @@ -138,7 +140,7 @@ menutrans &Tools c[(&T) menutrans &Jump\ to\ this\ tag<Tab>g^] ^OWv(&J)<Tab>g^] menutrans Jump\ &back<Tab>^T ߂(&B)<Tab>^T menutrans Build\ &Tags\ File ^Ot@C쐬(&T) -menutrans &Make<Tab>:make CN(&M)<Tab>:make +menutrans &Make<Tab>:make rh(&M)<Tab>:make menutrans &List\ Errors<Tab>:cl G[Xg(&L)<Tab>:cl menutrans L&ist\ Messages<Tab>:cl! bZ[WXg(&I)<Tab>:cl! menutrans &Next\ Error<Tab>:cn ̃G[(&N)<Tab>:cn
--- a/src/po/ja.euc-jp.po +++ b/src/po/ja.euc-jp.po @@ -1,11 +1,11 @@ -# Japanese translation for Vim vim:set foldmethod=marker: +# Japanese translation for Vim # # Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help credits" in Vim to see a list of people who contributed. # -# Last Change: 2014 May 13 +# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +# vim-jp (http://vim-jp.org/) # -# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # # Generated from ja.po, DO NOT EDIT. @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 13:50+0900\n" -"PO-Revision-Date: 2013-07-06 15:00+0900\n" +"POT-Creation-Date: 2016-02-01 09:02+0900\n" +"PO-Revision-Date: 2016-02-01-09:08+0900\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" -"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" +"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=euc-jp\n" @@ -39,7 +39,7 @@ msgid "E819: Blowfish test failed" msgstr "E819: BlowfishŹΥƥȤ˼Ԥޤ" msgid "[Location List]" -msgstr "[ꥹ]" +msgstr "[ꥹ]" msgid "[Quickfix List]" msgstr "[Quickfixꥹ]" @@ -83,6 +83,9 @@ msgstr "1 ĤΥХåե˴ޤ" msgid "%d buffers wiped out" msgstr "%d ĤΥХåե˴ޤ" +msgid "E90: Cannot unload last buffer" +msgstr "E90: ǸΥХåեϲǤޤ" + msgid "E84: No modified buffer found" msgstr "E84: ѹ줿ХåեϤޤ" @@ -90,10 +93,6 @@ msgstr "E84: ѹ줿ХåեϤޤ" msgid "E85: There is no listed buffer" msgstr "E85: ꥹɽХåեϤޤ" -#, c-format -msgid "E86: Buffer %ld does not exist" -msgstr "E86: Хåե %ld Ϥޤ" - msgid "E87: Cannot go beyond last buffer" msgstr "E87: ǸΥХåեۤưưϤǤޤ" @@ -104,9 +103,6 @@ msgstr "E88: ǽΥХåեؤϰưǤޤ" msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: Хåե %ld ѹ¸Ƥޤ (! ѹ˴)" -msgid "E90: Cannot unload last buffer" -msgstr "E90: ǸΥХåեϲǤޤ" - msgid "W14: Warning: List of file names overflow" msgstr "W14: ٹ: ե̾ΥꥹȤĹޤ" @@ -206,6 +202,36 @@ msgstr "%s Υ:" msgid " line=%ld id=%d name=%s" msgstr " =%ld ̻=%d ̾=%s" +msgid "E897: All channels are in use" +msgstr "E897: ͥ뤬Ǥ" + +msgid "E899: Cannot connect to port after retry2" +msgstr "E899: 2Υȥ饤ƤݡȤ³Ǥޤ" + +msgid "E902: Cannot connect to port" +msgstr "E902: ݡȤ³Ǥޤ" + +msgid "E896: read from channel" +msgstr "E896: ͥ뤫ɤ߹" + +msgid "E821: File is encrypted with unknown method" +msgstr "E821: ե뤬̤ΤˡǰŹ沽Ƥޤ" + +msgid "Warning: Using a weak encryption method; see :help 'cm'" +msgstr "ٹ: 夤ŹˡȤäƤޤ; :help 'cm' ȤƤ" + +msgid "Enter encryption key: " +msgstr "Ź沽ѤΥϤƤ: " + +msgid "Enter same key again: " +msgstr "⤦ƱϤƤ: " + +msgid "Keys don't match!" +msgstr "פޤ" + +msgid "[crypted]" +msgstr "[Ź沽]" + #, c-format msgid "E96: Can not diff more than %ld buffers" msgstr "E96: %ld ʾΥХåեdiffǤޤ" @@ -214,7 +240,7 @@ msgid "E810: Cannot read or write temp f msgstr "E810: եɹ⤷ϽǤޤ" msgid "E97: Cannot create diffs" -msgstr "E97: ʬǤޤ " +msgstr "E97: ʬǤޤ" msgid "Patch file" msgstr "ѥåե" @@ -229,7 +255,7 @@ msgid "E99: Current buffer is not in dif msgstr "E99: ߤΥХåեϺʬ⡼ɤǤϤޤ" msgid "E793: No other buffer in diff mode is modifiable" -msgstr "E793: ʬ⡼ɤǤ¾ΥХåեѹǽǤ" +msgstr "E793: ʬ⡼ɤǤ¾ΥХåեѹǤޤ" msgid "E100: No other buffer in diff mode" msgstr "E100: ʬ⡼ɤǤ¾ΥХåեϤޤ" @@ -272,7 +298,7 @@ msgid " Whole line completion (^L^N^P)" msgstr " ()䴰 (^L^N^P)" msgid " File name completion (^F^N^P)" -msgstr "ե̾䴰 (^F^N^P)" +msgstr " ե̾䴰 (^F^N^P)" msgid " Tag completion (^]^N^P)" msgstr " 䴰 (^]^N^P)" @@ -293,7 +319,7 @@ msgid " Command-line completion (^V^N^P) msgstr " ޥɥ饤䴰 (^V^N^P)" msgid " User defined completion (^U^N^P)" -msgstr " 桼䴰 (^U^N^P)" +msgstr " 桼䴰 (^U^N^P)" msgid " Omni completion (^O^N^P)" msgstr " 䴰 (^O^N^P)" @@ -385,9 +411,6 @@ msgstr "E686: %s ΰϥꥹȷǤʤФʤޤ" msgid "E712: Argument of %s must be a List or Dictionary" msgstr "E712: %s ΰϥꥹȷޤϼǤʤФʤޤ" -msgid "E713: Cannot use empty key for Dictionary" -msgstr "E713: ˶ΥȤȤϤǤޤ" - msgid "E714: List required" msgstr "E714: ꥹȷɬפǤ" @@ -527,6 +550,10 @@ msgstr "E696: ꥹȷ˥ޤޤ: %s" msgid "E697: Missing end of List ']': %s" msgstr "E697: ꥹȷκǸ ']' ޤ: %s" +msgid "Not enough memory to set references, garbage collection aborted!" +msgstr "" +"٥å쥯ߤޤ! ȤΤ˥꤬ޤ" + #, c-format msgid "E720: Missing colon in Dictionary: %s" msgstr "E720: ˥ޤ: %s" @@ -560,7 +587,7 @@ msgstr "E117: ̤ΤδؿǤ: %s" #, c-format msgid "E119: Not enough arguments for function: %s" -msgstr "E119: ؿΰʲޤ: %s" +msgstr "E119: ؿΰޤ: %s" #, c-format msgid "E120: Using <SID> not in a script context: %s" @@ -590,13 +617,19 @@ msgstr "E785: complete() ⡼ɤǤѤǤޤ" msgid "&Ok" msgstr "&Ok" +msgid "E999: Invalid callback argument" +msgstr "E999: ̵ʥХåǤ" + +msgid "E999: not an open channel" +msgstr "E999: ƤʤͥǤ" + +msgid "extend() argument" +msgstr "extend() ΰ" + #, c-format msgid "E737: Key already exists: %s" msgstr "E737: ϴ¸ߤޤ: %s" -msgid "extend() argument" -msgstr "extend() ΰ" - msgid "map() argument" msgstr "map() ΰ" @@ -640,14 +673,14 @@ msgid "<empty>" msgstr "<>" msgid "E240: No connection to Vim server" -msgstr "E240: Vim Фؤ³ޤ" +msgstr "E240: Vim Сؤ³ޤ" #, c-format msgid "E241: Unable to send to %s" msgstr "E241: %s 뤳ȤǤޤ" msgid "E277: Unable to read a server reply" -msgstr "E277: Фαޤ" +msgstr "E277: Сαޤ" msgid "remove() argument" msgstr "remove() ΰ" @@ -665,9 +698,15 @@ msgstr "E258: 饤Ȥ뤳ȤǤޤ" msgid "sort() argument" msgstr "sort() ΰ" +msgid "uniq() argument" +msgstr "uniq() ΰ" + msgid "E702: Sort compare function failed" msgstr "E702: ȤӴؿԤޤ" +msgid "E882: Uniq compare function failed" +msgstr "E882: Uniq ӴؿԤޤ" + msgid "(Invalid)" msgstr "(̵)" @@ -686,6 +725,18 @@ msgstr "E745: ꥹȷͤȤưäƤޤ" msgid "E728: Using a Dictionary as a Number" msgstr "E728: ͤȤưäƤޤ" +msgid "E891: Using a Funcref as a Float" +msgstr "E891: ؿȷưȤưäƤޤ" + +msgid "E892: Using a String as a Float" +msgstr "E892: ʸưȤưäƤޤ" + +msgid "E893: Using a List as a Float" +msgstr "E893: ꥹȷưȤưäƤޤ" + +msgid "E894: Using a Dictionary as a Float" +msgstr "E894: ưȤưäƤޤ" + msgid "E729: using Funcref as a String" msgstr "E729: ؿȷʸȤưäƤޤ" @@ -763,8 +814,12 @@ msgid "E129: Function name required" msgstr "E129: ؿ̾ᤵޤ" #, c-format -msgid "E128: Function name must start with a capital or contain a colon: %s" -msgstr "E128: ؿ̾ʸǻϤޤ뤫ޤޤʤФʤޤ: %s" +msgid "E128: Function name must start with a capital or \"s:\": %s" +msgstr "E128: ؿ̾ʸ \"s:\" ǻϤޤʤФʤޤ: %s" + +#, c-format +msgid "E884: Function name cannot contain a colon: %s" +msgstr "E884: ؿ̾ˤϥϴޤޤ: %s" #, c-format msgid "E131: Cannot delete function %s: It is in use" @@ -854,7 +909,7 @@ msgstr "E136: viminfo: 顼¿Τ, ʹߤϥåפޤ" #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" -msgstr "viminfoե \"%s\"%s%s%s ɹ " +msgstr "viminfoե \"%s\"%s%s%s ɹ" msgid " info" msgstr " " @@ -881,6 +936,10 @@ msgstr "E138: viminfoե %s ¸Ǥޤ!" msgid "Writing viminfo file \"%s\"" msgstr "viminfoե \"%s\" " +#, c-format +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" @@ -899,6 +958,13 @@ msgstr "# Υե뤬줿 'encoding' \n" msgid "Illegal starting char" msgstr "ƬʸǤ" +msgid "" +"\n" +"# Bar lines, copied verbatim:\n" +msgstr "" +"\n" +"# '|' ǻϤޤԤΡʸ̤Υԡ:\n" + msgid "Save As" msgstr "̾¸" @@ -1081,9 +1147,13 @@ msgstr "E158: ̵ʥХåե̾Ǥ: %s" msgid "E157: Invalid sign ID: %ld" msgstr "E157: ̵sign̻ҤǤ: %ld" +#, c-format +msgid "E885: Not possible to change sign %s" +msgstr "E885: ѹǤʤ sign Ǥ: %s" + # Added at 27-Jan-2004. msgid " (NOT FOUND)" -msgstr " (Ĥޤ)" +msgstr " (Ĥޤ)" msgid " (not supported)" msgstr " (ݡ)" @@ -1102,6 +1172,13 @@ msgstr " %ld: %s" msgid "cmd: %s" msgstr "ޥ: %s" +msgid "frame is zero" +msgstr "ե졼ब 0 Ǥ" + +#, c-format +msgid "frame at highest level: %d" +msgstr "ǹ٥Υե졼: %d" + #, c-format msgid "Breakpoint in \"%s%s\" line %ld" msgstr "֥졼ݥ \"%s%s\" %ld" @@ -1219,7 +1296,8 @@ msgid "E197: Cannot set language to \"%s msgstr "E197: \"%s\" Ǥޤ" msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." -msgstr "Ex⡼ɤޤ. Ρޥˤ\"visual\"ϤƤ." +msgstr "" +"Ex⡼ɤޤ. Ρޥ⡼ɤˤ\"visual\"ϤƤ." msgid "E501: At end-of-file" msgstr "E501: եνλ" @@ -1238,7 +1316,7 @@ msgid "End of function" msgstr "ؿκǸǤ" msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: 桼ޥɤΤޤʻѤǤ" +msgstr "E464: 桼ޥɤΤޤʻѤǤ" msgid "E492: Not an editor command" msgstr "E492: ǥΥޥɤǤϤޤ" @@ -1277,13 +1355,13 @@ msgstr "E174: ޥɤˤޤ: ˤ ! ɲäƤ" msgid "" "\n" -" Name Args Range Complete Definition" -msgstr "" -"\n" -" ̾ ϰ 䴰 " +" Name Args Address Complete Definition" +msgstr "" +"\n" +" ̾ ɥ쥹 䴰 " msgid "No user-defined commands found" -msgstr "桼ޥɤĤޤǤ" +msgstr "桼ޥɤĤޤǤ" msgid "E175: No attribute specified" msgstr "E175: °Ƥޤ" @@ -1298,7 +1376,10 @@ msgid "E178: Invalid default value for c msgstr "E178: Ȥξά̵ͤǤ" msgid "E179: argument required for -complete" -msgstr "E179: -䴰ΤΰɬפǤ" +msgstr "E179: -complete ˤϰɬפǤ" + +msgid "E179: argument required for -addr" +msgstr "E179: -addr ˤϰɬפǤ" #, c-format msgid "E181: Invalid attribute: %s" @@ -1308,14 +1389,18 @@ msgid "E182: Invalid command name" msgstr "E182: ̵ʥޥ̾Ǥ" msgid "E183: User defined commands must start with an uppercase letter" -msgstr "E183: 桼ޥɤϱʸǻϤޤʤФʤޤ" +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" -msgstr "E184: Υ桼ޥɤϤޤ: %s" +msgstr "E184: Υ桼ޥɤϤޤ: %s" + +#, c-format +msgid "E180: Invalid address type value: %s" +msgstr "E180: ̵ʥɥ쥹ͤǤ: %s" #, c-format msgid "E180: Invalid complete value: %s" @@ -1602,13 +1687,13 @@ msgid "Illegal file name" msgstr "ʥե̾" msgid "is a directory" -msgstr " ϥǥ쥯ȥǤ" +msgstr "ϥǥ쥯ȥǤ" msgid "is not a file" -msgstr " ϥեǤϤޤ" +msgstr "ϥեǤϤޤ" msgid "is a device (disabled with 'opendevice' option)" -msgstr " ϥǥХǤ ('opendevice' ץDzǤޤ)" +msgstr "ϥǥХǤ ('opendevice' ץDzǤޤ)" msgid "[New File]" msgstr "[ե]" @@ -1620,7 +1705,7 @@ msgid "[File too big]" msgstr "[ե]" msgid "[Permission Denied]" -msgstr "[ǧĤޤ]" +msgstr "[¤ޤ]" msgid "E200: *ReadPre autocommands made the file unreadable" msgstr "E200: *ReadPre autocommand եɹԲĤˤޤ" @@ -1662,12 +1747,6 @@ msgstr "[̤Ѵ]" msgid "[converted]" msgstr "[Ѵ]" -msgid "[blowfish]" -msgstr "[blowfishŹ沽]" - -msgid "[crypted]" -msgstr "[Ź沽]" - #, c-format msgid "[CONVERSION ERROR in line %ld]" msgstr "[%ld ܤѴ顼]" @@ -1688,9 +1767,6 @@ msgstr "'charconvert' ˤѴԤޤ" msgid "can't read output of 'charconvert'" msgstr "'charconvert' νϤɹޤǤ" -msgid "E821: File is encrypted with unknown method" -msgstr "E821: ե뤬̤ΤˡǰŹ沽Ƥޤ" - msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: acwriteХåեγautocommand¸ߤޤ" @@ -1772,7 +1848,7 @@ msgstr " Ѵ顼" #, c-format msgid " in line %ld;" -msgstr " %ld;" +msgstr " %ld;" msgid "[Device]" msgstr "[ǥХ]" @@ -2151,8 +2227,8 @@ msgstr "ִ" msgid "Vim: Received \"die\" request from session manager\n" msgstr "Vim: åޥ͡㤫 \"die\" ޤ\n" -msgid "Close" -msgstr "Ĥ" +msgid "Close tab" +msgstr "֥ڡĤ" msgid "New tab" msgstr "֥ڡ" @@ -2210,9 +2286,6 @@ msgstr "E243: ϥݡȤޤ: \"-%s\"; OLEǤѤƤ." msgid "E672: Unable to open window inside MDI application" msgstr "E672: MDIץǤϥɥޤ" -msgid "Close tab" -msgstr "֥ڡĤ" - msgid "Open tab..." msgstr "֥ڡ" @@ -2570,6 +2643,13 @@ msgid "" "loaded." msgstr "E815: Υޥɤ̵Ǥ. MzScheme 饤֥ɤǤޤ." +msgid "" +"E895: Sorry, this command is disabled, the MzScheme's racket/base module " +"could not be loaded." +msgstr "" +"E895: Υޥɤ̵Ǥ,ʤ. MzScheme racket/base ⥸塼" +"ɤǤޤǤ." + msgid "invalid expression" msgstr "̵ʼǤ" @@ -2644,6 +2724,13 @@ msgstr "" "E263: Υޥɤ̵Ǥ,ʤ: Python饤֥ɤǤޤ" "Ǥ." +msgid "" +"E887: Sorry, this command is disabled, the Python's site module could not be " +"loaded." +msgstr "" +"E887: Υޥɤ̵Ǥ,ʤ. Python site ⥸塼" +"ǤޤǤ." + # Added at 07-Feb-2004. msgid "E659: Cannot invoke Python recursively" msgstr "E659: Python ƵŪ˼¹Ԥ뤳ȤϤǤޤ" @@ -2845,14 +2932,14 @@ msgid "cannot get line" msgstr "ԤǤޤ" msgid "Unable to register a command server name" -msgstr "̿Ф̾ϿǤޤ" +msgstr "̿С̾ϿǤޤ" msgid "E248: Failed to send command to the destination program" msgstr "E248: ŪΥץؤΥޥ˼Ԥޤ" #, c-format msgid "E573: Invalid server id used: %s" -msgstr "E573: ̵ʥIDȤޤ: %s" +msgstr "E573: ̵ʥСIDȤޤ: %s" msgid "E251: VIM instance registry property is badly formed. Deleted!" msgstr "E251: VIM ΤϿץѥƥǤ. õޤ!" @@ -3110,16 +3197,16 @@ msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tŹ沽줿եԽ" msgid "-display <display>\tConnect vim to this particular X-server" -msgstr "-display <display>\tvimꤷ X Ф³" +msgstr "-display <display>\tvimꤷ X С³" msgid "-X\t\t\tDo not connect to X server" -msgstr "-X\t\t\tXФ³ʤ" +msgstr "-X\t\t\tXС³ʤ" msgid "--remote <files>\tEdit <files> in a Vim server if possible" -msgstr "--remote <files>\tǽʤVimФ <files> Խ" +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" @@ -3127,7 +3214,8 @@ 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> Ʊ, Ф̵ƤٹʸϤʤ" +msgstr "" +"--remote-wait-silent <files> Ʊ, С̵ƤٹʸϤʤ" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" @@ -3136,16 +3224,16 @@ msgstr "" "ڡ" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" -msgstr "--remote-send <keys>\tVimФ <keys> ƽλ" +msgstr "--remote-send <keys>\tVimС <keys> ƽλ" msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result" -msgstr "--remote-expr <expr>\tФ <expr> ¹ԤƷ̤ɽ" +msgstr "--remote-expr <expr>\tС <expr> ¹ԤƷ̤ɽ" msgid "--serverlist\t\tList available Vim server names and exit" -msgstr "--serverlist\t\tVim̾ΰɽƽλ" +msgstr "--serverlist\t\tVimС̾ΰɽƽλ" msgid "--servername <name>\tSend to/become the Vim server <name>" -msgstr "--servername <name>\tVim <name> /̾ꤹ" +msgstr "--servername <name>\tVimС <name> /̾ꤹ" msgid "--startuptime <file>\tWrite startup timing messages to <file>" msgstr "--startuptime <file>\tưˤä֤ξܺ٤ <file> ؽϤ" @@ -3551,7 +3639,7 @@ msgid "" "\n" msgstr "" "\n" -"줫.swpեƤ\n" +".swpեϺƤޤ\n" "\n" msgid "Using crypt key from swap file for the text file.\n" @@ -3565,7 +3653,7 @@ msgid " In current directory:\n" msgstr " ߤΥǥ쥯ȥ:\n" msgid " Using specified name:\n" -msgstr " ̾:\n" +msgstr " ʲ̾:\n" msgid " In directory " msgstr " ǥ쥯ȥ " @@ -3609,7 +3697,7 @@ msgid "" " user name: " msgstr "" "\n" -" 桼̾: " +" 桼̾: " msgid " host name: " msgstr " ۥ̾: " @@ -3737,11 +3825,11 @@ msgid "" msgstr "" "\n" "(1) ̤ΥץबƱեԽƤ뤫⤷ޤ.\n" -" ξˤ, ѹݤ˺ǽŪ, Ʊեΰۤʤ\n" -" 2ĤΥǤƤޤȤդƤ." +" ξˤ, ѹƤޤ1ĤΥեФưۤʤ2Ĥ\n" +" ǤƤޤΤ, ʤ褦˵ĤƤ." msgid " Quit, or continue with caution.\n" -msgstr " λ뤫, դʤ³Ƥ.\n" +msgstr " λ뤫, դʤ³Ƥ.\n" msgid "(2) An edit session for this file crashed.\n" msgstr "(2) ΥեԽåå夷.\n" @@ -3967,13 +4055,6 @@ msgstr " (ޤޤ)" msgid "Beep!" msgstr "ӡ!" -msgid "Vim: preserving files...\n" -msgstr "Vim: ե¸...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: λޤ.\n" - msgid "ERROR: " msgstr "顼: " @@ -4023,15 +4104,6 @@ msgstr "E548: ͤɬפǤ" msgid "E549: Illegal percentage" msgstr "E549: ʥѡơǤ" -msgid "Enter encryption key: " -msgstr "Ź沽ѤΥϤƤ: " - -msgid "Enter same key again: " -msgstr "⤦ƱϤƤ: " - -msgid "Keys don't match!" -msgstr "פޤ" - msgid "E854: path too long for completion" msgstr "E854: ѥĹ䴰Ǥޤ" @@ -4059,20 +4131,11 @@ msgstr "E346: cdpathˤϤʾ \"%s\" Ȥե뤬ޤ" msgid "E347: No more file \"%s\" found in path" msgstr "E347: ѥˤϤʾ \"%s\" Ȥե뤬ޤ" -msgid "Cannot connect to Netbeans #2" -msgstr "Netbeans #2 ³Ǥޤ" - -msgid "Cannot connect to Netbeans" -msgstr "Netbeans ³Ǥޤ" - #, c-format msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" msgstr "" "E668: NetBeans³եΥ⡼ɤ꤬ޤ: \"%s\"" -msgid "read from Netbeans socket" -msgstr "Netbeans ΥåȤɹ" - #, c-format msgid "E658: NetBeans connection lost for buffer %ld" msgstr "E658: Хåե %ld NetBeans ³ޤ" @@ -4202,6 +4265,11 @@ msgstr "" msgid "E574: Unknown register type %d" msgstr "E574: ̤ΤΥ쥸 %d Ǥ" +msgid "" +"E883: search pattern and expression register may not contain two or more " +"lines" +msgstr "E883: ѥȼ쥸ˤ2ʾޤޤ" + #, c-format msgid "%ld Cols; " msgstr "%ld ; " @@ -4259,6 +4327,10 @@ msgstr "E522: termcap ˸Ĥޤ" msgid "E539: Illegal character <%s>" msgstr "E539: ʸǤ <%s>" +#, c-format +msgid "For option %s" +msgstr "ץ: %s" + msgid "E529: Cannot set 'term' to empty string" msgstr "E529: 'term' ˤ϶ʸǤޤ" @@ -4483,20 +4555,9 @@ msgstr "E244: ʸå̾ \"%s\" Ǥ (ե̾ \"%s\")" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: '%c' ʸǤ (ե̾ \"%s\")" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: 2ŤΥʥΤ, λޤ\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: ̿Ūʥ %s Τޤ\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: ̿ŪʥΤޤ\n" - #, c-format msgid "Opening the X display took %ld msec" -msgstr "XФؤ³ %ld ߥäޤ" +msgstr "XСؤ³ %ld ߥäޤ" msgid "" "\n" @@ -4525,6 +4586,14 @@ msgstr "" "\n" "ƥƥȤǤޤ " +#, c-format +msgid "Could not set security context %s for %s" +msgstr "ƥƥ %s %s Ǥޤ" + +#, c-format +msgid "Could not get security context %s for %s. Removing it!" +msgstr "ƥƥ %s %s Ǥޤ. ޤ!" + msgid "" "\n" "Cannot execute shell " @@ -4802,19 +4871,31 @@ msgstr "E554: %s{...} ʸˡ顼ޤ" msgid "External submatches:\n" msgstr "ʬ:\n" +#, c-format +msgid "E888: (NFA regexp) cannot repeat %s" +msgstr "E888: (NFA ɽ) ֤ޤ %s" + msgid "" "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "used " msgstr "" -"E864: \\%#= ˤ 0, 1 ⤷ 2 Τߤ³ޤ" -"ɽϼưޤ" +"E864: \\%#= ˤ 0, 1 ⤷ 2 Τߤ³ޤɽϼư" +"ޤ" + +msgid "Switching to backtracking RE engine for pattern: " +msgstr "Υѥ˥Хåȥå RE ŬѤޤ: " + +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (NFA) Ԥɽνüãޤ" #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA ɽ) ֤äƤޤ: %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: (NFA) Ԥɽνüãޤ" +# +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (NFA ɽ) ̵ʸ饹: %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" @@ -4856,8 +4937,8 @@ msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " "left on stack" msgstr "" -"E875: (NFA ɽ) (ʸNFAѴ) " -"å˻Ĥ줿ơȤ¿ޤ" +"E875: (NFA ɽ) (ʸNFAѴ) å˻Ĥ줿ơȤ" +"¿ޤ" msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (NFA ɽ) NFAΤ¸ˤ϶ڡޤ" @@ -4867,8 +4948,9 @@ msgstr "E878: (NFA) ߲Υ֥˽ʬʥƤޤ!" msgid "" "Could not open temporary log file for writing, displaying on stderr ... " -msgstr "NFAɽѤΥեѤȤƳޤ" -"ɸϤ˽Ϥޤ" +msgstr "" +"NFAɽѤΥեѤȤƳޤɸϤ" +"Ϥޤ" #, c-format msgid "(NFA) COULD NOT OPEN %s !" @@ -5317,12 +5399,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' ˤ %ld ĤΥȥϤޤ" #, c-format -msgid "Word removed from %s" -msgstr "%s ñ줬ޤ" - -#, c-format -msgid "Word added to %s" -msgstr "%s ñ줬ɲäޤ" +msgid "Word '%.*s' removed from %s" +msgstr "ñ '%.*s' %s ޤ" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr "ñ '%.*s' %s ɲäޤ" msgid "E763: Word characters differ between spell files" msgstr "E763: ñʸڥեȰۤʤޤ" @@ -5383,6 +5465,9 @@ msgstr "ΥХåե줿ʸǤϤޤ" msgid "E390: Illegal argument: %s" msgstr "E390: ʰǤ: %s" +msgid "syntax iskeyword " +msgstr "å iskeyword " + #, c-format msgid "E391: No such syntax cluster: %s" msgstr "E391: Τ褦ʹʸ饹Ϥޤ: %s" @@ -5460,6 +5545,10 @@ msgid "E789: Missing ']': %s" msgstr "E789: ']' ޤ: %s" #, c-format +msgid "E890: trailing char after ']': %s]%s" +msgstr "E890: ']' θ;ʬʸޤ: %s]%s" + +#, c-format msgid "E398: Missing '=': %s" msgstr "E398: '=' ޤ: %s" @@ -5541,7 +5630,7 @@ msgstr "E415: ͽǤ: %s" #, c-format msgid "E416: missing equal sign: %s" -msgstr "E416: 椬ޤ: %s" +msgstr "E416: 椬ޤ: %s" #, c-format msgid "E417: missing argument: %s" @@ -5711,8 +5800,8 @@ msgstr "ΰΤCUT_BUFFER0Ѥޤ" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: ͽԥȤѤޤ" +msgid "E881: Line count changed unexpectedly" +msgstr "E881: ͽԥȤѤޤ" #. must display the prompt msgid "No undo possible; continue anyway" @@ -6040,31 +6129,31 @@ msgid " system vimrc file: \"" msgstr " ƥ vimrc: \"" msgid " user vimrc file: \"" -msgstr " 桼 vimrc: \"" +msgstr " 桼 vimrc: \"" msgid " 2nd user vimrc file: \"" -msgstr " 2桼 vimrc: \"" +msgstr " 2桼 vimrc: \"" msgid " 3rd user vimrc file: \"" -msgstr " 3桼 vimrc: \"" +msgstr " 3桼 vimrc: \"" msgid " user exrc file: \"" -msgstr " 桼 exrc: \"" +msgstr " 桼 exrc: \"" msgid " 2nd user exrc file: \"" -msgstr " 2桼 exrc: \"" +msgstr " 2桼 exrc: \"" msgid " system gvimrc file: \"" msgstr " ƥ gvimrc: \"" msgid " user gvimrc file: \"" -msgstr " 桼 gvimrc: \"" +msgstr " 桼 gvimrc: \"" msgid "2nd user gvimrc file: \"" -msgstr " 2桼 gvimrc: \"" +msgstr " 2桼 gvimrc: \"" msgid "3rd user gvimrc file: \"" -msgstr " 3桼 gvimrc: \"" +msgstr " 3桼 gvimrc: \"" msgid " system menu file: \"" msgstr " ƥ˥塼: \"" @@ -6124,19 +6213,19 @@ msgid "type :help cp-default<Enter> for msgstr "ܺ٤ʾ :help cp-default<Enter>" msgid "menu Help->Orphans for information " -msgstr "ܺ٤ϥ˥塼 إעɻ ȤƲ " +msgstr "ܺ٤ϥ˥塼 إ->ɻ ȤƲ " msgid "Running modeless, typed text is inserted" msgstr "⡼̵Ǽ¹, פʸޤ" msgid "menu Edit->Global Settings->Toggle Insert Mode " -msgstr "˥塼 Խꢪ(鿴)⡼ " +msgstr "˥塼 Խ->->(鿴)⡼ " msgid " for two modes " msgstr " ǥ⡼ͭ " msgid "menu Edit->Global Settings->Toggle Vi Compatible" -msgstr "˥塼 ԽꢪViߴ⡼ " +msgstr "˥塼 Խ->->Viߴ⡼ " msgid " for Vim defaults " msgstr " VimȤư " @@ -6145,7 +6234,7 @@ msgid "Sponsor Vim development!" msgstr "Vimγȯ礷Ƥ!" msgid "Become a registered Vim user!" -msgstr "VimϿ桼ˤʤäƤ!" +msgstr "VimϿ桼ˤʤäƤ!" msgid "type :help sponsor<Enter> for information " msgstr "ܺ٤ʾ :help sponsor<Enter> " @@ -6154,7 +6243,7 @@ msgid "type :help register<Enter> for msgstr "ܺ٤ʾ :help register<Enter> " msgid "menu Help->Sponsor/Register for information " -msgstr "ܺ٤ϥ˥塼 إעݥ/Ͽ ȤƲ " +msgstr "ܺ٤ϥ˥塼 إ->ݥ/Ͽ ȤƲ" msgid "WARNING: Windows 95/98/ME detected" msgstr " ٹ: Windows 95/98/Me " @@ -6193,6 +6282,9 @@ msgstr "E446: β˥ե̾ޤ" msgid "E447: Can't find file \"%s\" in path" msgstr "E447: pathˤ \"%s\" Ȥե뤬ޤ" +msgid "List or number required" +msgstr "ꥹȤͤɬפǤ" + msgid "Edit with &multiple Vims" msgstr "ʣVimԽ (&M)" @@ -6219,7 +6311,7 @@ msgid "gvimext.dll error" msgstr "gvimext.dll 顼" msgid "Path length too long!" -msgstr "ѥĹޤ!" +msgstr "ѥĹޤ!" msgid "--No lines in buffer--" msgstr "--Хåե˹Ԥޤ--" @@ -6391,7 +6483,7 @@ msgstr "E36: ɥ˽ʬʹ⤵⤷ޤ" #, c-format msgid "E247: no registered server named \"%s\"" -msgstr "E247: %s Ȥ̾Ͽ줿ФϤޤ" +msgstr "E247: %s Ȥ̾Ͽ줿СϤޤ" #, c-format msgid "E482: Can't create file %s" @@ -6411,6 +6503,9 @@ 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: Ǥ" @@ -6444,7 +6539,7 @@ msgid "E42: No Errors" msgstr "E42: 顼Ϥޤ" msgid "E776: No location list" -msgstr "E776: ꥹȤϤޤ" +msgstr "E776: ꥹȤϤޤ" msgid "E43: Damaged match string" msgstr "E43: ʸ»Ƥޤ" @@ -6463,6 +6558,9 @@ msgstr "E46: ɼѿ \"%s\" ˤͤǤޤ" msgid "E794: Cannot set variable in the sandbox: \"%s\"" msgstr "E794: ɥܥåǤѿ \"%s\" ͤǤޤ" +msgid "E713: Cannot use empty key for Dictionary" +msgstr "E713: ˶ΥȤȤϤǤޤ" + msgid "E47: Error while reading errorfile" msgstr "E47: 顼եɹ˥顼ȯޤ" @@ -6545,6 +6643,10 @@ msgstr "E363: ѥ 'maxmempattern' ʾΥѤޤ" msgid "E749: empty buffer" msgstr "E749: ХåեǤ" +#, c-format +msgid "E86: Buffer %ld does not exist" +msgstr "E86: Хåե %ld Ϥޤ" + msgid "E682: Invalid search pattern or delimiter" msgstr "E682: ѥڤ국椬Ǥ" @@ -6608,7 +6710,7 @@ msgstr "C int ȤƤͤ礭ޤ" msgid "value is too small to fit into C int type" msgstr "C int ȤƤͤޤ" -msgid "number must be greater then zero" +msgid "number must be greater than zero" msgstr "ͤ 0 礭ʤФʤޤ" msgid "number must be greater or equal to zero" @@ -6666,16 +6768,30 @@ msgstr "ꥹϰϳΥǥåǤ" msgid "internal error: failed to get vim list item %d" msgstr "顼: vimΥꥹ %d μ˼Ԥޤ" -msgid "failed to add item to list" -msgstr "ꥹȤؤɲä˼Ԥޤ" +msgid "slice step cannot be zero" +msgstr "饤Υƥåפ 0 ϻǤޤ" + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr "Ĺ %d γĥ饤ˡĹ饤Ƥ褦Ȥޤ" #, c-format msgid "internal error: no vim list item %d" msgstr "顼: vimΥꥹ %d Ϥޤ" +msgid "internal error: not enough list items" +msgstr "顼: ꥹȤ˽ʬǤޤ" + msgid "internal error: failed to add item to list" msgstr "顼: ꥹȤؤɲä˼Ԥޤ" +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr "Ĺ %d Υ饤 %d γĥ饤˳Ƥ褦Ȥޤ" + +msgid "failed to add item to list" +msgstr "ꥹȤؤɲä˼Ԥޤ" + msgid "cannot delete vim.List attributes" msgstr "vim.List °Ͼäޤ"
--- a/src/po/ja.po +++ b/src/po/ja.po @@ -1,11 +1,11 @@ -# Japanese translation for Vim vim:set foldmethod=marker: +# Japanese translation for Vim # # Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help credits" in Vim to see a list of people who contributed. # -# Last Change: 2014 May 13 +# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +# vim-jp (http://vim-jp.org/) # -# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # # Original translations. @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 13:50+0900\n" -"PO-Revision-Date: 2013-07-06 15:00+0900\n" +"POT-Creation-Date: 2016-02-01 09:02+0900\n" +"PO-Revision-Date: 2016-02-01-09:08+0900\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" -"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" +"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -39,7 +39,7 @@ msgid "E819: Blowfish test failed" msgstr "E819: Blowfish暗号のテストに失敗しました" msgid "[Location List]" -msgstr "[場所リスト]" +msgstr "[ロケーションリスト]" msgid "[Quickfix List]" msgstr "[Quickfixリスト]" @@ -83,6 +83,9 @@ msgstr "1 個のバッファが破棄されました" msgid "%d buffers wiped out" msgstr "%d 個のバッファが破棄されました" +msgid "E90: Cannot unload last buffer" +msgstr "E90: 最後のバッファは解放できません" + msgid "E84: No modified buffer found" msgstr "E84: 変更されたバッファはありません" @@ -90,10 +93,6 @@ msgstr "E84: 変更されたバッファはありません" msgid "E85: There is no listed buffer" msgstr "E85: リスト表示されるバッファはありません" -#, c-format -msgid "E86: Buffer %ld does not exist" -msgstr "E86: バッファ %ld はありません" - msgid "E87: Cannot go beyond last buffer" msgstr "E87: 最後のバッファを越えて移動はできません" @@ -104,9 +103,6 @@ msgstr "E88: 最初のバッファより前へは移動できません" msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)" -msgid "E90: Cannot unload last buffer" -msgstr "E90: 最後のバッファは解放できません" - msgid "W14: Warning: List of file names overflow" msgstr "W14: 警告: ファイル名のリストが長過ぎます" @@ -206,6 +202,36 @@ msgstr "%s のサイン:" msgid " line=%ld id=%d name=%s" msgstr " 行=%ld 識別子=%d 名前=%s" +msgid "E897: All channels are in use" +msgstr "E897: 全チャンネルが使用中です" + +msgid "E899: Cannot connect to port after retry2" +msgstr "E899: 2回のリトライをしてもポートに接続できません" + +msgid "E902: Cannot connect to port" +msgstr "E902: ポートに接続できません" + +msgid "E896: read from channel" +msgstr "E896: チャンネルから読み込み" + +msgid "E821: File is encrypted with unknown method" +msgstr "E821: ファイルが未知の方法で暗号化されています" + +msgid "Warning: Using a weak encryption method; see :help 'cm'" +msgstr "警告: 弱い暗号方法を使っています; :help 'cm' を参照してください" + +msgid "Enter encryption key: " +msgstr "暗号化用のキーを入力してください: " + +msgid "Enter same key again: " +msgstr "もう一度同じキーを入力してください: " + +msgid "Keys don't match!" +msgstr "キーが一致しません" + +msgid "[crypted]" +msgstr "[暗号化]" + #, c-format msgid "E96: Can not diff more than %ld buffers" msgstr "E96: %ld 以上のバッファはdiffできません" @@ -214,7 +240,7 @@ msgid "E810: Cannot read or write temp f msgstr "E810: 一時ファイルの読込もしくは書込ができません" msgid "E97: Cannot create diffs" -msgstr "E97: 差分を作成できません " +msgstr "E97: 差分を作成できません" msgid "Patch file" msgstr "パッチファイル" @@ -229,7 +255,7 @@ msgid "E99: Current buffer is not in dif msgstr "E99: 現在のバッファは差分モードではありません" msgid "E793: No other buffer in diff mode is modifiable" -msgstr "E793: 差分モードである他のバッファは変更可能です" +msgstr "E793: 差分モードである他のバッファは変更できません" msgid "E100: No other buffer in diff mode" msgstr "E100: 差分モードである他のバッファはありません" @@ -272,7 +298,7 @@ msgid " Whole line completion (^L^N^P)" msgstr " 行(全体)補完 (^L^N^P)" msgid " File name completion (^F^N^P)" -msgstr "ファイル名補完 (^F^N^P)" +msgstr " ファイル名補完 (^F^N^P)" msgid " Tag completion (^]^N^P)" msgstr " タグ補完 (^]^N^P)" @@ -293,7 +319,7 @@ msgid " Command-line completion (^V^N^P) msgstr " コマンドライン補完 (^V^N^P)" msgid " User defined completion (^U^N^P)" -msgstr " ユーザ定義補完 (^U^N^P)" +msgstr " ユーザー定義補完 (^U^N^P)" msgid " Omni completion (^O^N^P)" msgstr " オムニ補完 (^O^N^P)" @@ -385,9 +411,6 @@ msgstr "E686: %s の引数はリスト型でなければなりません" msgid "E712: Argument of %s must be a List or Dictionary" msgstr "E712: %s の引数はリスト型または辞書型でなければなりません" -msgid "E713: Cannot use empty key for Dictionary" -msgstr "E713: 辞書型に空のキーを使うことはできません" - msgid "E714: List required" msgstr "E714: リスト型が必要です" @@ -527,6 +550,10 @@ msgstr "E696: リスト型にカンマがありません: %s" msgid "E697: Missing end of List ']': %s" msgstr "E697: リスト型の最後に ']' がありません: %s" +msgid "Not enough memory to set references, garbage collection aborted!" +msgstr "" +"ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました" + #, c-format msgid "E720: Missing colon in Dictionary: %s" msgstr "E720: 辞書型にコロンがありません: %s" @@ -560,7 +587,7 @@ msgstr "E117: 未知の関数です: %s" #, c-format msgid "E119: Not enough arguments for function: %s" -msgstr "E119: 関数の引数が少な過ぎます: %s" +msgstr "E119: 関数の引数が足りません: %s" #, c-format msgid "E120: Using <SID> not in a script context: %s" @@ -590,13 +617,19 @@ msgstr "E785: complete() は挿入モードでしか利用できません" msgid "&Ok" msgstr "&Ok" +msgid "E999: Invalid callback argument" +msgstr "E999: 無効なコールバック引数です" + +msgid "E999: not an open channel" +msgstr "E999: 開いていないチャンネルです" + +msgid "extend() argument" +msgstr "extend() の引数" + #, c-format msgid "E737: Key already exists: %s" msgstr "E737: キーは既に存在します: %s" -msgid "extend() argument" -msgstr "extend() の引数" - msgid "map() argument" msgstr "map() の引数" @@ -640,14 +673,14 @@ msgid "<empty>" msgstr "<空>" msgid "E240: No connection to Vim server" -msgstr "E240: Vim サーバへの接続がありません" +msgstr "E240: Vim サーバーへの接続がありません" #, c-format msgid "E241: Unable to send to %s" msgstr "E241: %s へ送ることができません" msgid "E277: Unable to read a server reply" -msgstr "E277: サーバの応答がありません" +msgstr "E277: サーバーの応答がありません" msgid "remove() argument" msgstr "remove() の引数" @@ -665,9 +698,15 @@ msgstr "E258: クライアントへ送ることができません" msgid "sort() argument" msgstr "sort() の引数" +msgid "uniq() argument" +msgstr "uniq() の引数" + msgid "E702: Sort compare function failed" msgstr "E702: ソートの比較関数が失敗しました" +msgid "E882: Uniq compare function failed" +msgstr "E882: Uniq の比較関数が失敗しました" + msgid "(Invalid)" msgstr "(無効)" @@ -686,6 +725,18 @@ msgstr "E745: リスト型を数値として扱っています" msgid "E728: Using a Dictionary as a Number" msgstr "E728: 辞書型を数値として扱っています" +msgid "E891: Using a Funcref as a Float" +msgstr "E891: 関数参照型を浮動小数点数として扱っています。" + +msgid "E892: Using a String as a Float" +msgstr "E892: 文字列を浮動小数点数として扱っています" + +msgid "E893: Using a List as a Float" +msgstr "E893: リスト型を浮動小数点数として扱っています" + +msgid "E894: Using a Dictionary as a Float" +msgstr "E894: 辞書型を浮動小数点数として扱っています" + msgid "E729: using Funcref as a String" msgstr "E729: 関数参照型を文字列として扱っています" @@ -763,8 +814,12 @@ msgid "E129: Function name required" msgstr "E129: 関数名が要求されます" #, c-format -msgid "E128: Function name must start with a capital or contain a colon: %s" -msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s" +msgid "E128: Function name must start with a capital or \"s:\": %s" +msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s" + +#, c-format +msgid "E884: Function name cannot contain a colon: %s" +msgstr "E884: 関数名にはコロンは含められません: %s" #, c-format msgid "E131: Cannot delete function %s: It is in use" @@ -854,7 +909,7 @@ msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします" #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" -msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 " +msgstr "viminfoファイル \"%s\"%s%s%s を読込み中" msgid " info" msgstr " 情報" @@ -881,6 +936,10 @@ msgstr "E138: viminfoファイル %s を保存できません!" msgid "Writing viminfo file \"%s\"" msgstr "viminfoファイル \"%s\" を書込み中" +#, c-format +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" @@ -899,6 +958,13 @@ msgstr "# このファイルが書かれた時の 'encoding' の値\n" msgid "Illegal starting char" msgstr "不正な先頭文字です" +msgid "" +"\n" +"# Bar lines, copied verbatim:\n" +msgstr "" +"\n" +"# '|' で始まる行の、文字通りのコピー:\n" + msgid "Save As" msgstr "別名で保存" @@ -1081,9 +1147,13 @@ msgstr "E158: 無効なバッファ名です: %s" msgid "E157: Invalid sign ID: %ld" msgstr "E157: 無効なsign識別子です: %ld" +#, c-format +msgid "E885: Not possible to change sign %s" +msgstr "E885: 変更できない sign です: %s" + # Added at 27-Jan-2004. msgid " (NOT FOUND)" -msgstr " (見つかりません)" +msgstr " (見つかりません)" msgid " (not supported)" msgstr " (非サポート)" @@ -1102,6 +1172,13 @@ msgstr "行 %ld: %s" msgid "cmd: %s" msgstr "コマンド: %s" +msgid "frame is zero" +msgstr "フレームが 0 です" + +#, c-format +msgid "frame at highest level: %d" +msgstr "最高レベルのフレーム: %d" + #, c-format msgid "Breakpoint in \"%s%s\" line %ld" msgstr "ブレークポイント \"%s%s\" 行 %ld" @@ -1219,7 +1296,8 @@ msgid "E197: Cannot set language to \"%s msgstr "E197: 言語を \"%s\" に設定できません" msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." -msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください." +msgstr "" +"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください." msgid "E501: At end-of-file" msgstr "E501: ファイルの終了位置" @@ -1238,7 +1316,7 @@ msgid "End of function" msgstr "関数の最後です" msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: ユーザ定義コマンドのあいまいな使用です" +msgstr "E464: ユーザー定義コマンドのあいまいな使用です" msgid "E492: Not an editor command" msgstr "E492: エディタのコマンドではありません" @@ -1277,13 +1355,13 @@ msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください" msgid "" "\n" -" Name Args Range Complete Definition" -msgstr "" -"\n" -" 名前 引数 範囲 補完 定義" +" Name Args Address Complete Definition" +msgstr "" +"\n" +" 名前 引数 アドレス 補完 定義" msgid "No user-defined commands found" -msgstr "ユーザ定義コマンドが見つかりませんでした" +msgstr "ユーザー定義コマンドが見つかりませんでした" msgid "E175: No attribute specified" msgstr "E175: 属性は定義されていません" @@ -1298,7 +1376,10 @@ msgid "E178: Invalid default value for c msgstr "E178: カウントの省略値が無効です" msgid "E179: argument required for -complete" -msgstr "E179: -補完のための引数が必要です" +msgstr "E179: -complete には引数が必要です" + +msgid "E179: argument required for -addr" +msgstr "E179: -addr には引数が必要です" #, c-format msgid "E181: Invalid attribute: %s" @@ -1308,14 +1389,18 @@ msgid "E182: Invalid command name" msgstr "E182: 無効なコマンド名です" msgid "E183: User defined commands must start with an uppercase letter" -msgstr "E183: ユーザ定義コマンドは英大文字で始まらなければなりません" +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" -msgstr "E184: そのユーザ定義コマンドはありません: %s" +msgstr "E184: そのユーザー定義コマンドはありません: %s" + +#, c-format +msgid "E180: Invalid address type value: %s" +msgstr "E180: 無効なアドレスタイプ値です: %s" #, c-format msgid "E180: Invalid complete value: %s" @@ -1602,13 +1687,13 @@ msgid "Illegal file name" msgstr "不正なファイル名" msgid "is a directory" -msgstr " はディレクトリです" +msgstr "はディレクトリです" msgid "is not a file" -msgstr " はファイルではありません" +msgstr "はファイルではありません" msgid "is a device (disabled with 'opendevice' option)" -msgstr " はデバイスです ('opendevice' オプションで回避できます)" +msgstr "はデバイスです ('opendevice' オプションで回避できます)" msgid "[New File]" msgstr "[新ファイル]" @@ -1620,7 +1705,7 @@ msgid "[File too big]" msgstr "[ファイル過大]" msgid "[Permission Denied]" -msgstr "[認可がありません]" +msgstr "[権限がありません]" msgid "E200: *ReadPre autocommands made the file unreadable" msgstr "E200: *ReadPre autocommand がファイルを読込不可にしました" @@ -1662,12 +1747,6 @@ msgstr "[未変換]" msgid "[converted]" msgstr "[変換済]" -msgid "[blowfish]" -msgstr "[blowfish暗号化]" - -msgid "[crypted]" -msgstr "[暗号化]" - #, c-format msgid "[CONVERSION ERROR in line %ld]" msgstr "[%ld 行目で変換エラー]" @@ -1688,9 +1767,6 @@ msgstr "'charconvert' による変換が失敗しました" msgid "can't read output of 'charconvert'" msgstr "'charconvert' の出力を読込めませんでした" -msgid "E821: File is encrypted with unknown method" -msgstr "E821: ファイルが未知の方法で暗号化されています" - msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: acwriteバッファの該当するautocommandは存在しません" @@ -1772,7 +1848,7 @@ msgstr " 変換エラー" #, c-format msgid " in line %ld;" -msgstr "行 %ld;" +msgstr " 行 %ld;" msgid "[Device]" msgstr "[デバイス]" @@ -2151,8 +2227,8 @@ msgstr "全て置換" msgid "Vim: Received \"die\" request from session manager\n" msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n" -msgid "Close" -msgstr "閉じる" +msgid "Close tab" +msgstr "タブページを閉じる" msgid "New tab" msgstr "新規タブページ" @@ -2210,9 +2286,6 @@ msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください." msgid "E672: Unable to open window inside MDI application" msgstr "E672: MDIアプリの中ではウィンドウを開けません" -msgid "Close tab" -msgstr "タブページを閉じる" - msgid "Open tab..." msgstr "タブページを開く" @@ -2570,6 +2643,13 @@ msgid "" "loaded." msgstr "E815: このコマンドは無効です. MzScheme ライブラリをロードできません." +msgid "" +"E895: Sorry, this command is disabled, the MzScheme's racket/base module " +"could not be loaded." +msgstr "" +"E895: このコマンドは無効です,ごめんなさい. MzScheme の racket/base モジュール" +"がロードできませんでした." + msgid "invalid expression" msgstr "無効な式です" @@ -2644,6 +2724,13 @@ msgstr "" "E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできません" "でした." +msgid "" +"E887: Sorry, this command is disabled, the Python's site module could not be " +"loaded." +msgstr "" +"E887: このコマンドは無効です,ごめんなさい. Python の site モジュールをロード" +"できませんでした." + # Added at 07-Feb-2004. msgid "E659: Cannot invoke Python recursively" msgstr "E659: Python を再帰的に実行することはできません" @@ -2845,14 +2932,14 @@ msgid "cannot get line" msgstr "行を取得できません" msgid "Unable to register a command server name" -msgstr "命令サーバの名前を登録できません" +msgstr "命令サーバーの名前を登録できません" msgid "E248: Failed to send command to the destination program" msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました" #, c-format msgid "E573: Invalid server id used: %s" -msgstr "E573: 無効なサーバIDが使われました: %s" +msgstr "E573: 無効なサーバーIDが使われました: %s" msgid "E251: VIM instance registry property is badly formed. Deleted!" msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!" @@ -3110,16 +3197,16 @@ msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\t暗号化されたファイルを編集する" msgid "-display <display>\tConnect vim to this particular X-server" -msgstr "-display <display>\tvimを指定した X サーバに接続する" +msgstr "-display <display>\tvimを指定した X サーバーに接続する" msgid "-X\t\t\tDo not connect to X server" -msgstr "-X\t\t\tXサーバに接続しない" +msgstr "-X\t\t\tXサーバーに接続しない" msgid "--remote <files>\tEdit <files> in a Vim server if possible" -msgstr "--remote <files>\t可能ならばVimサーバで <files> を編集する" +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" @@ -3127,7 +3214,8 @@ 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> 同上, サーバが無くても警告文を出力しない" +msgstr "" +"--remote-wait-silent <files> 同上, サーバーが無くても警告文を出力しない" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" @@ -3136,16 +3224,16 @@ msgstr "" "ページを開く" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" -msgstr "--remote-send <keys>\tVimサーバに <keys> を送信して終了する" +msgstr "--remote-send <keys>\tVimサーバーに <keys> を送信して終了する" msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result" -msgstr "--remote-expr <expr>\tサーバで <expr> を実行して結果を表示する" +msgstr "--remote-expr <expr>\tサーバーで <expr> を実行して結果を表示する" msgid "--serverlist\t\tList available Vim server names and exit" -msgstr "--serverlist\t\tVimサーバ名の一覧を表示して終了する" +msgstr "--serverlist\t\tVimサーバー名の一覧を表示して終了する" msgid "--servername <name>\tSend to/become the Vim server <name>" -msgstr "--servername <name>\tVimサーバ <name> に送信/名前設定する" +msgstr "--servername <name>\tVimサーバー <name> に送信/名前設定する" msgid "--startuptime <file>\tWrite startup timing messages to <file>" msgstr "--startuptime <file>\t起動にかかった時間の詳細を <file> へ出力する" @@ -3551,7 +3639,7 @@ msgid "" "\n" msgstr "" "\n" -"それから.swpファイルを削除してください\n" +"元の.swpファイルは削除しても構いません\n" "\n" msgid "Using crypt key from swap file for the text file.\n" @@ -3565,7 +3653,7 @@ msgid " In current directory:\n" msgstr " 現在のディレクトリ:\n" msgid " Using specified name:\n" -msgstr " ある名前を使用中:\n" +msgstr " 以下の名前を使用中:\n" msgid " In directory " msgstr " ディレクトリ " @@ -3609,7 +3697,7 @@ msgid "" " user name: " msgstr "" "\n" -" ユーザ名: " +" ユーザー名: " msgid " host name: " msgstr " ホスト名: " @@ -3737,11 +3825,11 @@ msgid "" msgstr "" "\n" "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n" -" この場合には, 変更をした際に最終的に, 同じファイルの異なる\n" -" 2つのインスタンスができてしまうことに注意してください." +" この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n" +" インスタンスができてしまうので, そうしないように気をつけてください." msgid " Quit, or continue with caution.\n" -msgstr " 終了するか, 注意しながら続けてください.\n" +msgstr " 終了するか, 注意しながら続けてください.\n" msgid "(2) An edit session for this file crashed.\n" msgstr "(2) このファイルの編集セッションがクラッシュした.\n" @@ -3967,13 +4055,6 @@ msgstr " (割込まれました)" msgid "Beep!" msgstr "ビーッ!" -msgid "Vim: preserving files...\n" -msgstr "Vim: ファイルを保存中...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: 終了しました.\n" - msgid "ERROR: " msgstr "エラー: " @@ -4023,15 +4104,6 @@ msgstr "E548: 数値が必要です" msgid "E549: Illegal percentage" msgstr "E549: 不正なパーセンテージです" -msgid "Enter encryption key: " -msgstr "暗号化用のキーを入力してください: " - -msgid "Enter same key again: " -msgstr "もう一度同じキーを入力してください: " - -msgid "Keys don't match!" -msgstr "キーが一致しません" - msgid "E854: path too long for completion" msgstr "E854: パスが長過ぎて補完できません" @@ -4059,20 +4131,11 @@ msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません" msgid "E347: No more file \"%s\" found in path" msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません" -msgid "Cannot connect to Netbeans #2" -msgstr "Netbeans #2 に接続できません" - -msgid "Cannot connect to Netbeans" -msgstr "Netbeans に接続できません" - #, c-format msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" msgstr "" "E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\"" -msgid "read from Netbeans socket" -msgstr "Netbeans のソケットを読込み" - #, c-format msgid "E658: NetBeans connection lost for buffer %ld" msgstr "E658: バッファ %ld の NetBeans 接続が失われました" @@ -4202,6 +4265,11 @@ msgstr "" msgid "E574: Unknown register type %d" msgstr "E574: 未知のレジスタ型 %d です" +msgid "" +"E883: search pattern and expression register may not contain two or more " +"lines" +msgstr "E883: 検索パターンと式レジスタには2行以上を含められません" + #, c-format msgid "%ld Cols; " msgstr "%ld 列; " @@ -4259,6 +4327,10 @@ msgstr "E522: termcap 内に見つかりません" msgid "E539: Illegal character <%s>" msgstr "E539: 不正な文字です <%s>" +#, c-format +msgid "For option %s" +msgstr "オプション: %s" + msgid "E529: Cannot set 'term' to empty string" msgstr "E529: 'term' には空文字列を設定できません" @@ -4483,20 +4555,9 @@ msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: 2重のシグナルのため, 終了します\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: 致命的シグナル %s を検知しました\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: 致命的シグナルを検知しました\n" - #, c-format msgid "Opening the X display took %ld msec" -msgstr "Xサーバへの接続に %ld ミリ秒かかりました" +msgstr "Xサーバーへの接続に %ld ミリ秒かかりました" msgid "" "\n" @@ -4525,6 +4586,14 @@ msgstr "" "\n" "セキュリティコンテキストを設定できません " +#, c-format +msgid "Could not set security context %s for %s" +msgstr "セキュリティコンテキスト %s を %s に設定できません" + +#, c-format +msgid "Could not get security context %s for %s. Removing it!" +msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!" + msgid "" "\n" "Cannot execute shell " @@ -4802,19 +4871,31 @@ msgstr "E554: %s{...} 内に文法エラーがあります" msgid "External submatches:\n" msgstr "外部の部分該当:\n" +#, c-format +msgid "E888: (NFA regexp) cannot repeat %s" +msgstr "E888: (NFA 正規表現) 繰り返せません %s" + msgid "" "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "used " msgstr "" -"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。" -"正規表現エンジンは自動選択されます。" +"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選" +"択されます。" + +msgid "Switching to backtracking RE engine for pattern: " +msgstr "次のパターンにバックトラッキング RE エンジンを適用します: " + +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました" #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA 正規表現) 位置が誤っています: %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました" +# +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" @@ -4856,8 +4937,8 @@ msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " "left on stack" msgstr "" -"E875: (NFA 正規表現) (後置文字列をNFAに変換中に) " -"スタックに残されたステートが多過ぎます" +"E875: (NFA 正規表現) (後置文字列をNFAに変換中に) スタックに残されたステートが" +"多過ぎます" msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペースが足りません" @@ -4867,8 +4948,9 @@ msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!" msgid "" "Could not open temporary log file for writing, displaying on stderr ... " -msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。" -"ログは標準出力に出力します。" +msgstr "" +"NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に" +"出力します。" #, c-format msgid "(NFA) COULD NOT OPEN %s !" @@ -5317,12 +5399,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' には %ld 個のエントリはありません" #, c-format -msgid "Word removed from %s" -msgstr "%s から単語が削除されました" - -#, c-format -msgid "Word added to %s" -msgstr "%s に単語が追加されました" +msgid "Word '%.*s' removed from %s" +msgstr "単語 '%.*s' が %s から削除されました" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr "単語 '%.*s' が %s へ追加されました" msgid "E763: Word characters differ between spell files" msgstr "E763: 単語の文字がスペルファイルと異なります" @@ -5383,6 +5465,9 @@ msgstr "このバッファに定義された構文要素はありません" msgid "E390: Illegal argument: %s" msgstr "E390: 不正な引数です: %s" +msgid "syntax iskeyword " +msgstr "シンタックス用 iskeyword " + #, c-format msgid "E391: No such syntax cluster: %s" msgstr "E391: そのような構文クラスタはありません: %s" @@ -5460,6 +5545,10 @@ msgid "E789: Missing ']': %s" msgstr "E789: ']' がありません: %s" #, c-format +msgid "E890: trailing char after ']': %s]%s" +msgstr "E890: ']' の後ろに余分な文字があります: %s]%s" + +#, c-format msgid "E398: Missing '=': %s" msgstr "E398: '=' がありません: %s" @@ -5541,7 +5630,7 @@ msgstr "E415: 予期せぬ等号です: %s" #, c-format msgid "E416: missing equal sign: %s" -msgstr "E416: 等号ががありません: %s" +msgstr "E416: 等号がありません: %s" #, c-format msgid "E417: missing argument: %s" @@ -5711,8 +5800,8 @@ msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: 予期せず行カウントが変わりました" +msgid "E881: Line count changed unexpectedly" +msgstr "E881: 予期せず行カウントが変わりました" #. must display the prompt msgid "No undo possible; continue anyway" @@ -6040,31 +6129,31 @@ msgid " system vimrc file: \"" msgstr " システム vimrc: \"" msgid " user vimrc file: \"" -msgstr " ユーザ vimrc: \"" +msgstr " ユーザー vimrc: \"" msgid " 2nd user vimrc file: \"" -msgstr " 第2ユーザ vimrc: \"" +msgstr " 第2ユーザー vimrc: \"" msgid " 3rd user vimrc file: \"" -msgstr " 第3ユーザ vimrc: \"" +msgstr " 第3ユーザー vimrc: \"" msgid " user exrc file: \"" -msgstr " ユーザ exrc: \"" +msgstr " ユーザー exrc: \"" msgid " 2nd user exrc file: \"" -msgstr " 第2ユーザ exrc: \"" +msgstr " 第2ユーザー exrc: \"" msgid " system gvimrc file: \"" msgstr " システム gvimrc: \"" msgid " user gvimrc file: \"" -msgstr " ユーザ gvimrc: \"" +msgstr " ユーザー gvimrc: \"" msgid "2nd user gvimrc file: \"" -msgstr " 第2ユーザ gvimrc: \"" +msgstr " 第2ユーザー gvimrc: \"" msgid "3rd user gvimrc file: \"" -msgstr " 第3ユーザ gvimrc: \"" +msgstr " 第3ユーザー gvimrc: \"" msgid " system menu file: \"" msgstr " システムメニュー: \"" @@ -6124,19 +6213,19 @@ msgid "type :help cp-default<Enter> for msgstr "詳細な情報は :help cp-default<Enter>" msgid "menu Help->Orphans for information " -msgstr "詳細はメニューの ヘルプ→孤児 を参照して下さい " +msgstr "詳細はメニューの ヘルプ->孤児 を参照して下さい " msgid "Running modeless, typed text is inserted" msgstr "モード無で実行中, タイプした文字が挿入されます" msgid "menu Edit->Global Settings->Toggle Insert Mode " -msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替 " +msgstr "メニューの 編集->全体設定->挿入(初心者)モード切替 " msgid " for two modes " msgstr " でモード有に " msgid "menu Edit->Global Settings->Toggle Vi Compatible" -msgstr "メニューの 編集→全体設定→Vi互換モード切替 " +msgstr "メニューの 編集->全体設定->Vi互換モード切替 " msgid " for Vim defaults " msgstr " でVimとして動作 " @@ -6145,7 +6234,7 @@ msgid "Sponsor Vim development!" msgstr "Vimの開発を応援してください!" msgid "Become a registered Vim user!" -msgstr "Vimの登録ユーザになってください!" +msgstr "Vimの登録ユーザーになってください!" msgid "type :help sponsor<Enter> for information " msgstr "詳細な情報は :help sponsor<Enter> " @@ -6154,7 +6243,7 @@ msgid "type :help register<Enter> for msgstr "詳細な情報は :help register<Enter> " msgid "menu Help->Sponsor/Register for information " -msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい " +msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい" msgid "WARNING: Windows 95/98/ME detected" msgstr " 警告: Windows 95/98/Me を検出 " @@ -6193,6 +6282,9 @@ msgstr "E446: カーソルの下にファイル名がありません" msgid "E447: Can't find file \"%s\" in path" msgstr "E447: pathには \"%s\" というファイルがありません" +msgid "List or number required" +msgstr "リストか数値が必要です" + msgid "Edit with &multiple Vims" msgstr "複数のVimで編集する (&M)" @@ -6219,7 +6311,7 @@ msgid "gvimext.dll error" msgstr "gvimext.dll エラー" msgid "Path length too long!" -msgstr "パスが長すぎます!" +msgstr "パスが長過ぎます!" msgid "--No lines in buffer--" msgstr "--バッファに行がありません--" @@ -6391,7 +6483,7 @@ msgstr "E36: ウィンドウに十分な高さもしくは幅がありません" #, c-format msgid "E247: no registered server named \"%s\"" -msgstr "E247: %s という名前の登録されたサーバはありません" +msgstr "E247: %s という名前の登録されたサーバーはありません" #, c-format msgid "E482: Can't create file %s" @@ -6411,6 +6503,9 @@ 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: 引数が空です" @@ -6444,7 +6539,7 @@ msgid "E42: No Errors" msgstr "E42: エラーはありません" msgid "E776: No location list" -msgstr "E776: 場所リストはありません" +msgstr "E776: ロケーションリストはありません" msgid "E43: Damaged match string" msgstr "E43: 該当文字列が破損しています" @@ -6463,6 +6558,9 @@ msgstr "E46: 読取専用変数 \"%s\" には値を設定できません" msgid "E794: Cannot set variable in the sandbox: \"%s\"" msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません" +msgid "E713: Cannot use empty key for Dictionary" +msgstr "E713: 辞書型に空のキーを使うことはできません" + msgid "E47: Error while reading errorfile" msgstr "E47: エラーファイルの読込中にエラーが発生しました" @@ -6545,6 +6643,10 @@ msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します" msgid "E749: empty buffer" msgstr "E749: バッファが空です" +#, c-format +msgid "E86: Buffer %ld does not exist" +msgstr "E86: バッファ %ld はありません" + msgid "E682: Invalid search pattern or delimiter" msgstr "E682: 検索パターンか区切り記号が不正です" @@ -6608,7 +6710,7 @@ msgstr "C言語の int 型としては値が大き過ぎます" msgid "value is too small to fit into C int type" msgstr "C言語の int 型としては値が小さ過ぎます" -msgid "number must be greater then zero" +msgid "number must be greater than zero" msgstr "数値は 0 より大きくなければなりません" msgid "number must be greater or equal to zero" @@ -6666,16 +6768,30 @@ msgstr "リスト範囲外のインデックスです" msgid "internal error: failed to get vim list item %d" msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました" -msgid "failed to add item to list" -msgstr "リストへの要素追加に失敗しました" +msgid "slice step cannot be zero" +msgstr "スライスのステップに 0 は指定できません" + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr "長さ %d の拡張スライスに、より長いスライスを割り当てようとしました" #, c-format msgid "internal error: no vim list item %d" msgstr "内部エラー: vimのリスト要素 %d はありません" +msgid "internal error: not enough list items" +msgstr "内部エラー: リストに十分な要素がありません" + msgid "internal error: failed to add item to list" msgstr "内部エラー: リストへの要素追加に失敗しました" +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr "長さ %d のスライスを %d の拡張スライスに割り当てようとしました" + +msgid "failed to add item to list" +msgstr "リストへの要素追加に失敗しました" + msgid "cannot delete vim.List attributes" msgstr "vim.List 属性は消せません"
--- a/src/po/ja.sjis.po +++ b/src/po/ja.sjis.po @@ -1,11 +1,11 @@ -# Japanese translation for Vim vim:set foldmethod=marker: +# Japanese translation for Vim # # Do ":help uganda" in Vim to read copying and usage conditions. # Do ":help credits" in Vim to see a list of people who contributed. # -# Last Change: 2014 May 13 +# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>, +# vim-jp (http://vim-jp.org/) # -# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com> # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. # # generated from ja.po, DO NOT EDIT @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-06 13:50+0900\n" -"PO-Revision-Date: 2013-07-06 15:00+0900\n" +"POT-Creation-Date: 2016-02-01 09:02+0900\n" +"PO-Revision-Date: 2016-02-01-09:08+0900\n" "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n" -"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n" +"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=cp932\n" @@ -39,7 +39,7 @@ msgid "E819: Blowfish test failed" msgstr "E819: BlowfishÍ̃eXgɎs܂" msgid "[Location List]" -msgstr "[ꏊXg]" +msgstr "[P[VXg]" msgid "[Quickfix List]" msgstr "[QuickfixXg]" @@ -83,6 +83,9 @@ msgstr "1 ̃obt@j܂" msgid "%d buffers wiped out" msgstr "%d ̃obt@j܂" +msgid "E90: Cannot unload last buffer" +msgstr "E90: Ō̃obt@͉ł܂" + msgid "E84: No modified buffer found" msgstr "E84: ύXꂽobt@͂܂" @@ -90,10 +93,6 @@ msgstr "E84: ύXꂽobt@͂܂" msgid "E85: There is no listed buffer" msgstr "E85: Xg\\obt@͂܂" -#, c-format -msgid "E86: Buffer %ld does not exist" -msgstr "E86: obt@ %ld ͂܂" - msgid "E87: Cannot go beyond last buffer" msgstr "E87: Ō̃obt@zĈړ͂ł܂" @@ -104,9 +103,6 @@ msgstr "E88: ŏ̃obt@Oւ͈ړł܂" msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: obt@ %ld ̕ύX͕ۑĂ܂ (! ŕύXj)" -msgid "E90: Cannot unload last buffer" -msgstr "E90: Ō̃obt@͉ł܂" - msgid "W14: Warning: List of file names overflow" msgstr "W14: x: t@C̃Xg߂܂" @@ -206,6 +202,36 @@ msgstr "%s ̃TC:" msgid " line=%ld id=%d name=%s" msgstr " s=%ld ʎq=%d O=%s" +msgid "E897: All channels are in use" +msgstr "E897: S`lgpł" + +msgid "E899: Cannot connect to port after retry2" +msgstr "E899: 2̃gCĂ|[gɐڑł܂" + +msgid "E902: Cannot connect to port" +msgstr "E902: |[gɐڑł܂" + +msgid "E896: read from channel" +msgstr "E896: `lǂݍ" + +msgid "E821: File is encrypted with unknown method" +msgstr "E821: t@Cm̕@ňÍĂ܂" + +msgid "Warning: Using a weak encryption method; see :help 'cm'" +msgstr "x: アÍ@gĂ܂; :help 'cm' QƂĂ" + +msgid "Enter encryption key: " +msgstr "Íp̃L[͂Ă: " + +msgid "Enter same key again: " +msgstr "xL[͂Ă: " + +msgid "Keys don't match!" +msgstr "L[v܂" + +msgid "[crypted]" +msgstr "[Í]" + #, c-format msgid "E96: Can not diff more than %ld buffers" msgstr "E96: %ld ȏ̃obt@diffł܂" @@ -214,7 +240,7 @@ msgid "E810: Cannot read or write temp f msgstr "E810: ꎞt@C̓Ǎ͏ł܂" msgid "E97: Cannot create diffs" -msgstr "E97: 쐬ł܂ " +msgstr "E97: 쐬ł܂" msgid "Patch file" msgstr "pb`t@C" @@ -229,7 +255,7 @@ msgid "E99: Current buffer is not in dif msgstr "E99: ݂̃obt@͍[hł͂܂" msgid "E793: No other buffer in diff mode is modifiable" -msgstr "E793: [hł鑼̃obt@͕ύX\\ł" +msgstr "E793: [hł鑼̃obt@͕ύXł܂" msgid "E100: No other buffer in diff mode" msgstr "E100: [hł鑼̃obt@͂܂" @@ -272,7 +298,7 @@ msgid " Whole line completion (^L^N^P)" msgstr " s(S)⊮ (^L^N^P)" msgid " File name completion (^F^N^P)" -msgstr "t@C⊮ (^F^N^P)" +msgstr " t@C⊮ (^F^N^P)" msgid " Tag completion (^]^N^P)" msgstr " ^O⊮ (^]^N^P)" @@ -293,7 +319,7 @@ msgid " Command-line completion (^V^N^P) msgstr " R}hC⊮ (^V^N^P)" msgid " User defined completion (^U^N^P)" -msgstr " [U`⊮ (^U^N^P)" +msgstr " [U[`⊮ (^U^N^P)" msgid " Omni completion (^O^N^P)" msgstr " Ij⊮ (^O^N^P)" @@ -385,9 +411,6 @@ msgstr "E686: %s ̈̓Xg^łȂȂ܂" msgid "E712: Argument of %s must be a List or Dictionary" msgstr "E712: %s ̈̓Xg^܂͎^łȂȂ܂" -msgid "E713: Cannot use empty key for Dictionary" -msgstr "E713: ^ɋ̃L[gƂ͂ł܂" - msgid "E714: List required" msgstr "E714: Xg^Kvł" @@ -527,6 +550,10 @@ msgstr "E696: Xg^ɃJ}܂: %s" msgid "E697: Missing end of List ']': %s" msgstr "E697: Xg^̍Ō ']' ܂: %s" +msgid "Not enough memory to set references, garbage collection aborted!" +msgstr "" +"K[xbWRNV𒆎~܂! QƂ쐬̂Ƀs܂" + #, c-format msgid "E720: Missing colon in Dictionary: %s" msgstr "E720: ^ɃR܂: %s" @@ -560,7 +587,7 @@ msgstr "E117: m̊ł: %s" #, c-format msgid "E119: Not enough arguments for function: %s" -msgstr "E119: ̈ȉ߂܂: %s" +msgstr "E119: ̈܂: %s" #, c-format msgid "E120: Using <SID> not in a script context: %s" @@ -590,13 +617,19 @@ msgstr "E785: complete() ͑}[hłpł܂" msgid "&Ok" msgstr "&Ok" +msgid "E999: Invalid callback argument" +msgstr "E999: ȃR[obNł" + +msgid "E999: not an open channel" +msgstr "E999: JĂȂ`lł" + +msgid "extend() argument" +msgstr "extend() ̈" + #, c-format msgid "E737: Key already exists: %s" msgstr "E737: L[͊ɑ݂܂: %s" -msgid "extend() argument" -msgstr "extend() ̈" - msgid "map() argument" msgstr "map() ̈" @@ -640,14 +673,14 @@ msgid "<empty>" msgstr "<>" msgid "E240: No connection to Vim server" -msgstr "E240: Vim T[oւ̐ڑ܂" +msgstr "E240: Vim T[o[ւ̐ڑ܂" #, c-format msgid "E241: Unable to send to %s" msgstr "E241: %s ֑邱Ƃł܂" msgid "E277: Unable to read a server reply" -msgstr "E277: T[ỏ܂" +msgstr "E277: T[o[̉܂" msgid "remove() argument" msgstr "remove() ̈" @@ -665,9 +698,15 @@ msgstr "E258: NCAg֑邱Ƃł܂" msgid "sort() argument" msgstr "sort() ̈" +msgid "uniq() argument" +msgstr "uniq() ̈" + msgid "E702: Sort compare function failed" msgstr "E702: \\[g̔rs܂" +msgid "E882: Uniq compare function failed" +msgstr "E882: Uniq ̔rs܂" + msgid "(Invalid)" msgstr "()" @@ -686,6 +725,18 @@ msgstr "E745: Xg^𐔒lƂĈĂ܂" msgid "E728: Using a Dictionary as a Number" msgstr "E728: ^𐔒lƂĈĂ܂" +msgid "E891: Using a Funcref as a Float" +msgstr "E891: Qƌ^_ƂĈĂ܂B" + +msgid "E892: Using a String as a Float" +msgstr "E892: _ƂĈĂ܂" + +msgid "E893: Using a List as a Float" +msgstr "E893: Xg^_ƂĈĂ܂" + +msgid "E894: Using a Dictionary as a Float" +msgstr "E894: ^_ƂĈĂ܂" + msgid "E729: using Funcref as a String" msgstr "E729: Qƌ^ƂĈĂ܂" @@ -763,8 +814,12 @@ msgid "E129: Function name required" msgstr "E129: v܂" #, c-format -msgid "E128: Function name must start with a capital or contain a colon: %s" -msgstr "E128: ͑啶Ŏn܂邩R܂܂ȂȂ܂: %s" +msgid "E128: Function name must start with a capital or \"s:\": %s" +msgstr "E128: ͑啶 \"s:\" Ŏn܂ȂȂ܂: %s" + +#, c-format +msgid "E884: Function name cannot contain a colon: %s" +msgstr "E884: ɂ̓R͊܂߂܂: %s" #, c-format msgid "E131: Cannot delete function %s: It is in use" @@ -854,7 +909,7 @@ msgstr "E136: viminfo: G[߂̂, ȍ~̓XLbv܂" #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" -msgstr "viminfot@C \"%s\"%s%s%s Ǎݒ " +msgstr "viminfot@C \"%s\"%s%s%s Ǎݒ" msgid " info" msgstr " " @@ -881,6 +936,10 @@ msgstr "E138: viminfot@C %s ۑł܂!" msgid "Writing viminfo file \"%s\"" msgstr "viminfot@C \"%s\" ݒ" +#, c-format +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" @@ -899,6 +958,13 @@ msgstr "# ̃t@Cꂽ 'encoding' ̒l\n" msgid "Illegal starting char" msgstr "sȐ擪ł" +msgid "" +"\n" +"# Bar lines, copied verbatim:\n" +msgstr "" +"\n" +"# '|' Ŏn܂śAʂ̃Rs[:\n" + msgid "Save As" msgstr "ʖŕۑ" @@ -1081,9 +1147,13 @@ msgstr "E158: ȃobt@ł: %s" msgid "E157: Invalid sign ID: %ld" msgstr "E157: signʎqł: %ld" +#, c-format +msgid "E885: Not possible to change sign %s" +msgstr "E885: ύXłȂ sign ł: %s" + # Added at 27-Jan-2004. msgid " (NOT FOUND)" -msgstr " (܂)" +msgstr " (܂)" msgid " (not supported)" msgstr " (T|[g)" @@ -1102,6 +1172,13 @@ msgstr "s %ld: %s" msgid "cmd: %s" msgstr "R}h: %s" +msgid "frame is zero" +msgstr "t[ 0 ł" + +#, c-format +msgid "frame at highest level: %d" +msgstr "ōx̃t[: %d" + #, c-format msgid "Breakpoint in \"%s%s\" line %ld" msgstr "u[N|Cg \"%s%s\" s %ld" @@ -1219,7 +1296,8 @@ msgid "E197: Cannot set language to \"%s msgstr "E197: \"%s\" ɐݒł܂" msgid "Entering Ex mode. Type \"visual\" to go to Normal mode." -msgstr "Ex[hɓ܂. m[}ɖ߂ɂ\"visual\"Ɠ͂Ă." +msgstr "" +"Ex[hɓ܂. m[}[hɖ߂ɂ\"visual\"Ɠ͂Ă." msgid "E501: At end-of-file" msgstr "E501: t@C̏Iʒu" @@ -1238,7 +1316,7 @@ msgid "End of function" msgstr "̍Ōł" msgid "E464: Ambiguous use of user-defined command" -msgstr "E464: [U`R}ĥ܂Ȏgpł" +msgstr "E464: [U[`R}ĥ܂Ȏgpł" msgid "E492: Not an editor command" msgstr "E492: GfB^̃R}hł͂܂" @@ -1277,13 +1355,13 @@ msgstr "E174: R}hɂ܂: Ē`ɂ ! ljĂ" msgid "" "\n" -" Name Args Range Complete Definition" -msgstr "" -"\n" -" O ͈ ⊮ `" +" Name Args Address Complete Definition" +msgstr "" +"\n" +" O AhX ⊮ `" msgid "No user-defined commands found" -msgstr "[U`R}h܂ł" +msgstr "[U[`R}h܂ł" msgid "E175: No attribute specified" msgstr "E175: ͒`Ă܂" @@ -1298,7 +1376,10 @@ msgid "E178: Invalid default value for c msgstr "E178: JEg̏ȗlł" msgid "E179: argument required for -complete" -msgstr "E179: -⊮̂߂̈Kvł" +msgstr "E179: -complete ɂ͈Kvł" + +msgid "E179: argument required for -addr" +msgstr "E179: -addr ɂ͈Kvł" #, c-format msgid "E181: Invalid attribute: %s" @@ -1308,14 +1389,18 @@ msgid "E182: Invalid command name" msgstr "E182: ȃR}hł" msgid "E183: User defined commands must start with an uppercase letter" -msgstr "E183: [U`R}h͉p啶Ŏn܂ȂȂ܂" +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: \\Ȃ̂, [U[`R}hɗpł܂" #, c-format msgid "E184: No such user-defined command: %s" -msgstr "E184: ̃[U`R}h͂܂: %s" +msgstr "E184: ̃[U[`R}h͂܂: %s" + +#, c-format +msgid "E180: Invalid address type value: %s" +msgstr "E180: ȃAhX^Cvlł: %s" #, c-format msgid "E180: Invalid complete value: %s" @@ -1602,13 +1687,13 @@ msgid "Illegal file name" msgstr "sȃt@C" msgid "is a directory" -msgstr " ̓fBNgł" +msgstr "̓fBNgł" msgid "is not a file" -msgstr " ̓t@Cł͂܂" +msgstr "̓t@Cł͂܂" msgid "is a device (disabled with 'opendevice' option)" -msgstr " ̓foCXł ('opendevice' IvVʼnł܂)" +msgstr "̓foCXł ('opendevice' IvVʼnł܂)" msgid "[New File]" msgstr "[Vt@C]" @@ -1620,7 +1705,7 @@ msgid "[File too big]" msgstr "[t@Cߑ]" msgid "[Permission Denied]" -msgstr "[F܂]" +msgstr "[܂]" msgid "E200: *ReadPre autocommands made the file unreadable" msgstr "E200: *ReadPre autocommand t@CǍsɂ܂" @@ -1662,12 +1747,6 @@ msgstr "[ϊ]" msgid "[converted]" msgstr "[ϊ]" -msgid "[blowfish]" -msgstr "[blowfishÍ]" - -msgid "[crypted]" -msgstr "[Í]" - #, c-format msgid "[CONVERSION ERROR in line %ld]" msgstr "[%ld sڂŕϊG[]" @@ -1688,9 +1767,6 @@ msgstr "'charconvert' ɂϊs܂" msgid "can't read output of 'charconvert'" msgstr "'charconvert' ̏o͂Ǎ߂܂ł" -msgid "E821: File is encrypted with unknown method" -msgstr "E821: t@Cm̕@ňÍĂ܂" - msgid "E676: No matching autocommands for acwrite buffer" msgstr "E676: acwriteobt@̊Yautocommand݂͑܂" @@ -1772,7 +1848,7 @@ msgstr " ϊG[" #, c-format msgid " in line %ld;" -msgstr "s %ld;" +msgstr " s %ld;" msgid "[Device]" msgstr "[foCX]" @@ -2151,8 +2227,8 @@ msgstr "SĒu" msgid "Vim: Received \"die\" request from session manager\n" msgstr "Vim: ZbV}l[W \"die\" v܂\n" -msgid "Close" -msgstr "" +msgid "Close tab" +msgstr "^uy[W" msgid "New tab" msgstr "VK^uy[W" @@ -2210,9 +2286,6 @@ msgstr "E243: ̓T|[g܂: \"-%s\"; OLEłgpĂ." msgid "E672: Unable to open window inside MDI application" msgstr "E672: MDIAv̒ł̓EBhEJ܂" -msgid "Close tab" -msgstr "^uy[W" - msgid "Open tab..." msgstr "^uy[WJ" @@ -2570,6 +2643,13 @@ msgid "" "loaded." msgstr "E815: ̃R}h͖ł. MzScheme Cu[hł܂." +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ł܂ł." + msgid "invalid expression" msgstr "Ȏł" @@ -2644,6 +2724,13 @@ msgstr "" "E263: ̃R}h͖ł,߂Ȃ: 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" +"ł܂ł." + # Added at 07-Feb-2004. msgid "E659: Cannot invoke Python recursively" msgstr "E659: Python ċAIɎs邱Ƃ͂ł܂" @@ -2845,14 +2932,14 @@ msgid "cannot get line" msgstr "s擾ł܂" msgid "Unable to register a command server name" -msgstr "߃T[o̖Oo^ł܂" +msgstr "߃T[o[̖Oo^ł܂" msgid "E248: Failed to send command to the destination program" msgstr "E248: ړĨvOւ̃R}hMɎs܂" #, c-format msgid "E573: Invalid server id used: %s" -msgstr "E573: ȃT[oIDg܂: %s" +msgstr "E573: ȃT[o[IDg܂: %s" msgid "E251: VIM instance registry property is badly formed. Deleted!" msgstr "E251: VIM ̂̓o^vpeBsł. ܂!" @@ -3110,16 +3197,16 @@ msgid "-x\t\t\tEdit encrypted files" msgstr "-x\t\t\tÍꂽt@CҏW" msgid "-display <display>\tConnect vim to this particular X-server" -msgstr "-display <display>\tvimw肵 X T[oɐڑ" +msgstr "-display <display>\tvimw肵 X T[o[ɐڑ" msgid "-X\t\t\tDo not connect to X server" -msgstr "-X\t\t\tXT[oɐڑȂ" +msgstr "-X\t\t\tXT[o[ɐڑȂ" msgid "--remote <files>\tEdit <files> in a Vim server if possible" -msgstr "--remote <files>\t\\ȂVimT[o <files> ҏW" +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> , T[o[Ăxo͂Ȃ" msgid "" "--remote-wait <files> As --remote but wait for files to have been edited" @@ -3127,7 +3214,8 @@ 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͂Ȃ" +msgstr "" +"--remote-wait-silent <files> , T[o[Ăxo͂Ȃ" msgid "" "--remote-tab[-wait][-silent] <files> As --remote but use tab page per file" @@ -3136,16 +3224,16 @@ msgstr "" "y[WJ" msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit" -msgstr "--remote-send <keys>\tVimT[o <keys> 𑗐MďI" +msgstr "--remote-send <keys>\tVimT[o[ <keys> 𑗐MďI" msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result" -msgstr "--remote-expr <expr>\tT[o <expr> sČʂ\\" +msgstr "--remote-expr <expr>\tT[o[ <expr> sČʂ\\" msgid "--serverlist\t\tList available Vim server names and exit" -msgstr "--serverlist\t\tVimT[öꗗ\\ďI" +msgstr "--serverlist\t\tVimT[o[̈ꗗ\\ďI" msgid "--servername <name>\tSend to/become the Vim server <name>" -msgstr "--servername <name>\tVimT[o <name> ɑM/Oݒ肷" +msgstr "--servername <name>\tVimT[o[ <name> ɑM/Oݒ肷" msgid "--startuptime <file>\tWrite startup timing messages to <file>" msgstr "--startuptime <file>\tNɂԂ̏ڍׂ <file> ֏o͂" @@ -3551,7 +3639,7 @@ msgid "" "\n" msgstr "" "\n" -"ꂩ.swpt@C폜Ă\n" +".swpt@C͍폜Ă\\܂\n" "\n" msgid "Using crypt key from swap file for the text file.\n" @@ -3565,7 +3653,7 @@ msgid " In current directory:\n" msgstr " ݂̃fBNg:\n" msgid " Using specified name:\n" -msgstr " 閼Ogp:\n" +msgstr " ȉ̖Ogp:\n" msgid " In directory " msgstr " fBNg " @@ -3609,7 +3697,7 @@ msgid "" " user name: " msgstr "" "\n" -" [U: " +" [U[: " msgid " host name: " msgstr " zXg: " @@ -3737,11 +3825,11 @@ msgid "" msgstr "" "\n" "(1) ʂ̃vOt@CҏWĂ邩܂.\n" -" ̏ꍇɂ, ύXۂɍŏII, t@C̈قȂ\n" -" 2̃CX^XłĂ܂ƂɒӂĂ." +" ̏ꍇɂ, ύXĂ܂1̃t@CɑĈقȂ2\n" +" CX^XłĂ܂̂, Ȃ悤ɋCĂ." msgid " Quit, or continue with caution.\n" -msgstr " I邩, ӂȂ瑱Ă.\n" +msgstr " I邩, ӂȂ瑱Ă.\n" msgid "(2) An edit session for this file crashed.\n" msgstr "(2) ̃t@C̕ҏWZbVNbV.\n" @@ -3967,13 +4055,6 @@ msgstr " (܂܂)" msgid "Beep!" msgstr "r[b!" -msgid "Vim: preserving files...\n" -msgstr "Vim: t@Cۑ...\n" - -#. close all memfiles, without deleting -msgid "Vim: Finished.\n" -msgstr "Vim: I܂.\n" - msgid "ERROR: " msgstr "G[: " @@ -4023,15 +4104,6 @@ msgstr "E548: lKvł" msgid "E549: Illegal percentage" msgstr "E549: sȃp[Ze[Wł" -msgid "Enter encryption key: " -msgstr "Íp̃L[͂Ă: " - -msgid "Enter same key again: " -msgstr "xL[͂Ă: " - -msgid "Keys don't match!" -msgstr "L[v܂" - msgid "E854: path too long for completion" msgstr "E854: pX߂ĕ⊮ł܂" @@ -4059,20 +4131,11 @@ msgstr "E346: cdpathɂ͂ȏ \"%s\" Ƃt@C܂" msgid "E347: No more file \"%s\" found in path" msgstr "E347: pXɂ͂ȏ \"%s\" Ƃt@C܂" -msgid "Cannot connect to Netbeans #2" -msgstr "Netbeans #2 ɐڑł܂" - -msgid "Cannot connect to Netbeans" -msgstr "Netbeans ɐڑł܂" - #, c-format msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\"" msgstr "" "E668: NetBeans̐ڑt@C̃ANZX[hɖ肪܂: \"%s\"" -msgid "read from Netbeans socket" -msgstr "Netbeans ̃\\PbgǍ" - #, c-format msgid "E658: NetBeans connection lost for buffer %ld" msgstr "E658: obt@ %ld NetBeans ڑ܂" @@ -4202,6 +4265,11 @@ msgstr "" msgid "E574: Unknown register type %d" msgstr "E574: m̃WX^^ %d ł" +msgid "" +"E883: search pattern and expression register may not contain two or more " +"lines" +msgstr "E883: p^[ƎWX^ɂ2sȏ܂߂܂" + #, c-format msgid "%ld Cols; " msgstr "%ld ; " @@ -4259,6 +4327,10 @@ msgstr "E522: termcap Ɍ܂" msgid "E539: Illegal character <%s>" msgstr "E539: sȕł <%s>" +#, c-format +msgid "For option %s" +msgstr "IvV: %s" + msgid "E529: Cannot set 'term' to empty string" msgstr "E529: 'term' ɂ͋ݒł܂" @@ -4483,20 +4555,9 @@ msgstr "E244: Zbg \"%s\" ͕sł (tHg \"%s\")" msgid "E245: Illegal char '%c' in font name \"%s\"" msgstr "E245: '%c' ͕sȕł (tHg \"%s\")" -msgid "Vim: Double signal, exiting\n" -msgstr "Vim: 2d̃VOî, I܂\n" - -#, c-format -msgid "Vim: Caught deadly signal %s\n" -msgstr "Vim: vIVOi %s m܂\n" - -#, c-format -msgid "Vim: Caught deadly signal\n" -msgstr "Vim: vIVOim܂\n" - #, c-format msgid "Opening the X display took %ld msec" -msgstr "XT[oւ̐ڑ %ld ~b܂" +msgstr "XT[o[ւ̐ڑ %ld ~b܂" msgid "" "\n" @@ -4525,6 +4586,14 @@ msgstr "" "\n" "ZLeBReLXgݒł܂ " +#, c-format +msgid "Could not set security context %s for %s" +msgstr "ZLeBReLXg %s %s ɐݒł܂" + +#, c-format +msgid "Could not get security context %s for %s. Removing it!" +msgstr "ZLeBReLXg %s %s 擾ł܂. 폜܂!" + msgid "" "\n" "Cannot execute shell " @@ -4802,19 +4871,31 @@ msgstr "E554: %s{...} ɕ@G[܂" msgid "External submatches:\n" msgstr "O̕Y:\n" +#, c-format +msgid "E888: (NFA regexp) cannot repeat %s" +msgstr "E888: (NFA K\\) JԂ܂ %s" + msgid "" "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be " "used " msgstr "" -"E864: \\%#= ɂ 0, 1 2 ݂̂܂B" -"K\\GW͎I܂B" +"E864: \\%#= ɂ 0, 1 2 ݂̂܂BK\\GW͎I" +"܂B" + +msgid "Switching to backtracking RE engine for pattern: " +msgstr "̃p^[ɃobNgbLO RE GWKp܂: " + +msgid "E865: (NFA) Regexp end encountered prematurely" +msgstr "E865: (NFA) ҂葁K\\̏I[ɓB܂" #, c-format msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA K\\) ʒuĂ܂: %c" -msgid "E865: (NFA) Regexp end encountered prematurely" -msgstr "E865: (NFA) ҂葁K\\̏I[ɓB܂" +# +#, c-format +msgid "E877: (NFA regexp) Invalid character class: %ld" +msgstr "E877: (NFA K\\) ȕNX: %ld" #, c-format msgid "E867: (NFA) Unknown operator '\\z%c'" @@ -4856,8 +4937,8 @@ msgid "" "E875: (NFA regexp) (While converting from postfix to NFA), too many states " "left on stack" msgstr "" -"E875: (NFA K\\) (uNFAɕϊ) " -"X^bNɎcꂽXe[g߂܂" +"E875: (NFA K\\) (uNFAɕϊ) X^bNɎcꂽXe[g" +"߂܂" msgid "E876: (NFA regexp) Not enough space to store the whole NFA " msgstr "E876: (NFA K\\) NFAŜۑɂ͋Xy[X܂" @@ -4867,8 +4948,9 @@ msgstr "E878: (NFA) ݉f̃u`ɏ\\ȃ蓖Ă܂!" msgid "" "Could not open temporary log file for writing, displaying on stderr ... " -msgstr "NFAK\\GWp̃Ot@CpƂĊJ܂B" -"O͕Wo͂ɏo͂܂B" +msgstr "" +"NFAK\\GWp̃Ot@CpƂĊJ܂BO͕Wo͂" +"o͂܂B" #, c-format msgid "(NFA) COULD NOT OPEN %s !" @@ -5317,12 +5399,12 @@ msgid "E765: 'spellfile' does not have % msgstr "E765: 'spellfile' ɂ %ld ̃Gg͂܂" #, c-format -msgid "Word removed from %s" -msgstr "%s Pꂪ폜܂" - -#, c-format -msgid "Word added to %s" -msgstr "%s ɒPꂪlj܂" +msgid "Word '%.*s' removed from %s" +msgstr "P '%.*s' %s 폜܂" + +#, c-format +msgid "Word '%.*s' added to %s" +msgstr "P '%.*s' %s ֒lj܂" msgid "E763: Word characters differ between spell files" msgstr "E763: P̕Xyt@CƈقȂ܂" @@ -5383,6 +5465,9 @@ msgstr "̃obt@ɒ`ꂽ\\vf͂܂" msgid "E390: Illegal argument: %s" msgstr "E390: sȈł: %s" +msgid "syntax iskeyword " +msgstr "V^bNXp iskeyword " + #, c-format msgid "E391: No such syntax cluster: %s" msgstr "E391: ̂悤ȍ\\NX^͂܂: %s" @@ -5460,6 +5545,10 @@ msgid "E789: Missing ']': %s" msgstr "E789: ']' ܂: %s" #, c-format +msgid "E890: trailing char after ']': %s]%s" +msgstr "E890: ']' ̌ɗ]ȕ܂: %s]%s" + +#, c-format msgid "E398: Missing '=': %s" msgstr "E398: '=' ܂: %s" @@ -5541,7 +5630,7 @@ msgstr "E415: \\ʓł: %s" #, c-format msgid "E416: missing equal sign: %s" -msgstr "E416: ܂: %s" +msgstr "E416: ܂: %s" #, c-format msgid "E417: missing argument: %s" @@ -5711,8 +5800,8 @@ msgstr "̑Ï̂CUT_BUFFER0gp܂" #. This happens when the FileChangedRO autocommand changes the #. * file in a way it becomes shorter. -msgid "E834: Line count changed unexpectedly" -msgstr "E834: \\sJEgς܂" +msgid "E881: Line count changed unexpectedly" +msgstr "E881: \\sJEgς܂" #. must display the prompt msgid "No undo possible; continue anyway" @@ -6040,31 +6129,31 @@ msgid " system vimrc file: \"" msgstr " VXe vimrc: \"" msgid " user vimrc file: \"" -msgstr " [U vimrc: \"" +msgstr " [U[ vimrc: \"" msgid " 2nd user vimrc file: \"" -msgstr " 2[U vimrc: \"" +msgstr " 2[U[ vimrc: \"" msgid " 3rd user vimrc file: \"" -msgstr " 3[U vimrc: \"" +msgstr " 3[U[ vimrc: \"" msgid " user exrc file: \"" -msgstr " [U exrc: \"" +msgstr " [U[ exrc: \"" msgid " 2nd user exrc file: \"" -msgstr " 2[U exrc: \"" +msgstr " 2[U[ exrc: \"" msgid " system gvimrc file: \"" msgstr " VXe gvimrc: \"" msgid " user gvimrc file: \"" -msgstr " [U gvimrc: \"" +msgstr " [U[ gvimrc: \"" msgid "2nd user gvimrc file: \"" -msgstr " 2[U gvimrc: \"" +msgstr " 2[U[ gvimrc: \"" msgid "3rd user gvimrc file: \"" -msgstr " 3[U gvimrc: \"" +msgstr " 3[U[ gvimrc: \"" msgid " system menu file: \"" msgstr " VXej[: \"" @@ -6124,19 +6213,19 @@ msgid "type :help cp-default<Enter> for msgstr "ڍׂȏ :help cp-default<Enter>" msgid "menu Help->Orphans for information " -msgstr "ڍׂ̓j[ wvǎ QƂĉ " +msgstr "ڍׂ̓j[ wv->ǎ QƂĉ " msgid "Running modeless, typed text is inserted" msgstr "[hŎs, ^Cv}܂" msgid "menu Edit->Global Settings->Toggle Insert Mode " -msgstr "j[ ҏWS̐ݒ聨}(S)[hؑ " +msgstr "j[ ҏW->S̐ݒ->}(S)[hؑ " msgid " for two modes " msgstr " Ń[hL " msgid "menu Edit->Global Settings->Toggle Vi Compatible" -msgstr "j[ ҏWS̐ݒ聨Vi݊[hؑ " +msgstr "j[ ҏW->S̐ݒ->Vi݊[hؑ " msgid " for Vim defaults " msgstr " VimƂē " @@ -6145,7 +6234,7 @@ msgid "Sponsor Vim development!" msgstr "Vim̊JĂ!" msgid "Become a registered Vim user!" -msgstr "Vim̓o^[UɂȂĂ!" +msgstr "Vim̓o^[U[ɂȂĂ!" msgid "type :help sponsor<Enter> for information " msgstr "ڍׂȏ :help sponsor<Enter> " @@ -6154,7 +6243,7 @@ msgid "type :help register<Enter> for msgstr "ڍׂȏ :help register<Enter> " msgid "menu Help->Sponsor/Register for information " -msgstr "ڍׂ̓j[ wvX|T[/o^ QƂĉ " +msgstr "ڍׂ̓j[ wv->X|T[/o^ QƂĉ" msgid "WARNING: Windows 95/98/ME detected" msgstr " x: Windows 95/98/Me o " @@ -6193,6 +6282,9 @@ msgstr "E446: J[\\̉Ƀt@C܂" msgid "E447: Can't find file \"%s\" in path" msgstr "E447: pathɂ \"%s\" Ƃt@C܂" +msgid "List or number required" +msgstr "XglKvł" + msgid "Edit with &multiple Vims" msgstr "VimŕҏW (&M)" @@ -6219,7 +6311,7 @@ msgid "gvimext.dll error" msgstr "gvimext.dll G[" msgid "Path length too long!" -msgstr "pX܂!" +msgstr "pX߂܂!" msgid "--No lines in buffer--" msgstr "--obt@ɍs܂--" @@ -6391,7 +6483,7 @@ msgstr "E36: EBhEɏ\\ȍ͕܂" #, c-format msgid "E247: no registered server named \"%s\"" -msgstr "E247: %s ƂO̓o^ꂽT[o͂܂" +msgstr "E247: %s ƂO̓o^ꂽT[o[͂܂" #, c-format msgid "E482: Can't create file %s" @@ -6411,6 +6503,9 @@ 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: ł" @@ -6444,7 +6539,7 @@ msgid "E42: No Errors" msgstr "E42: G[͂܂" msgid "E776: No location list" -msgstr "E776: ꏊXg͂܂" +msgstr "E776: P[VXg͂܂" msgid "E43: Damaged match string" msgstr "E43: YjĂ܂" @@ -6463,6 +6558,9 @@ msgstr "E46: ǎpϐ \"%s\" ɂ͒lݒł܂" msgid "E794: Cannot set variable in the sandbox: \"%s\"" msgstr "E794: Th{bNXł͕ϐ \"%s\" ɒlݒł܂" +msgid "E713: Cannot use empty key for Dictionary" +msgstr "E713: ^ɋ̃L[gƂ͂ł܂" + msgid "E47: Error while reading errorfile" msgstr "E47: G[t@C̓ǍɃG[܂" @@ -6545,6 +6643,10 @@ msgstr "E363: p^[ 'maxmempattern' ȏ̃gp܂" msgid "E749: empty buffer" msgstr "E749: obt@ł" +#, c-format +msgid "E86: Buffer %ld does not exist" +msgstr "E86: obt@ %ld ͂܂" + msgid "E682: Invalid search pattern or delimiter" msgstr "E682: p^[Lsł" @@ -6608,7 +6710,7 @@ msgstr "C int ^ƂĂ͒l傫߂܂" msgid "value is too small to fit into C int type" msgstr "C int ^ƂĂ͒l߂܂" -msgid "number must be greater then zero" +msgid "number must be greater than zero" msgstr "l 0 傫ȂȂ܂" msgid "number must be greater or equal to zero" @@ -6666,16 +6768,30 @@ msgstr "Xg͈͊ÕCfbNXł" msgid "internal error: failed to get vim list item %d" msgstr "G[: vim̃Xgvf %d ̎擾Ɏs܂" -msgid "failed to add item to list" -msgstr "Xgւ̗vfljɎs܂" +msgid "slice step cannot be zero" +msgstr "XCX̃Xebv 0 ͎wł܂" + +#, c-format +msgid "attempt to assign sequence of size greater than %d to extended slice" +msgstr " %d ̊gXCXɁA蒷XCX蓖Ă悤Ƃ܂" #, c-format msgid "internal error: no vim list item %d" msgstr "G[: vim̃Xgvf %d ͂܂" +msgid "internal error: not enough list items" +msgstr "G[: Xgɏ\\ȗvf܂" + msgid "internal error: failed to add item to list" msgstr "G[: Xgւ̗vfljɎs܂" +#, c-format +msgid "attempt to assign sequence of size %d to extended slice of size %d" +msgstr " %d ̃XCX %d ̊gXCXɊ蓖Ă悤Ƃ܂" + +msgid "failed to add item to list" +msgstr "Xgւ̗vfljɎs܂" + msgid "cannot delete vim.List attributes" msgstr "vim.List ͏܂"