Updated runtime files and translations.
diff --git a/runtime/autoload/sqlcomplete.vim b/runtime/autoload/sqlcomplete.vim
index 9326c15..f7e86a9 100644
--- 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 @@
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 @@
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 = ""
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index ac1b8b6..ad80a37 100644
--- 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 @@
`: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 @@
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.
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 34ff38d..c58d35e 100644
--- 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 @@
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 @@
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*
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index a1d0e14..c8cb598 100644
--- 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 @@
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
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 959098a..5727918 100644
--- 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 @@
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 @@
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|.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 787d611..a8d1093 100644
--- 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 @@
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 @@
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*
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 7c549a9..f832870 100644
--- 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 @@
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*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a5e6fff..9afabed 100644
--- 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 @@
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 @@
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,
diff --git a/runtime/doc/tags b/runtime/doc/tags
index fc8a449..d7dcc04 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4135,8 +4135,8 @@
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 @@
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 @@
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()*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index daba2e6..9e52d5e 100644
--- 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 @@
- 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 @@
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 @@
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 @@
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 @@
":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 @@
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 @@
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 @@
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 @@
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 @@
(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 @@
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 @@
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)
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index d338d9b..7dbfb4a 100644
--- 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 @@
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 @@
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 @@
*+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>|
diff --git a/runtime/doc/vim-ja.UTF-8.1 b/runtime/doc/vim-ja.UTF-8.1
index a4788b3..7742356 100644
--- a/runtime/doc/vim-ja.UTF-8.1
+++ b/runtime/doc/vim-ja.UTF-8.1
@@ -159,7 +159,7 @@
.TP
\-b
バイナリモード。
-バイナリファイルを編集ためのオプションがいくつか設定されます。
+バイナリファイルを編集するためのオプションがいくつか設定されます。
.TP
\-C
互換モード。'compatible' オプションがオンになります。
diff --git a/runtime/doc/xxd-ja.UTF-8.1 b/runtime/doc/xxd-ja.UTF-8.1
index 8a8d54b..a4cc583 100644
--- a/runtime/doc/xxd-ja.UTF-8.1
+++ b/runtime/doc/xxd-ja.UTF-8.1
@@ -61,6 +61,16 @@
行末には 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 @@
.I \-g 0
を指定してください。
.RI < Bytes >
-の標準設定は \fI2\fP です。2 進ダンプの場合は \fI1\fP です。
+の標準設定は \fI2\fP で、リトルエンディアンモードの場合は \fI4\fP 、
+2 進ダンプの場合は \fI1\fP です。
ポストスクリプト形式やインクルード形式で出力するときは、このオプションは使わ
れません。
.TP
@@ -95,6 +106,11 @@
.RI < len >
オクテットだけ出力する。
.TP
+.I \-o offset
+表示されるファイル位置に
+.RI < offset >
+を加算する。
+.TP
.IR \-p " | " \-ps " | " \-postscript " | " \-plain
ポストスクリプト形式の 16 進ダンプを出力する。別名 プレーン 16 進ダンプ。
.TP
diff --git a/runtime/lang/menu_ja_jp.euc-jp.vim b/runtime/lang/menu_ja_jp.euc-jp.vim
index ba622a6..3448e0d 100644
--- 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 @@
" 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 &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
diff --git a/runtime/lang/menu_ja_jp.utf-8.vim b/runtime/lang/menu_ja_jp.utf-8.vim
index 7c3431d..af15c0b 100644
--- 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 @@
" 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 &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
diff --git a/runtime/lang/menu_japanese_japan.932.vim b/runtime/lang/menu_japanese_japan.932.vim
index 7b775cb..66c8166 100644
--- 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 @@
" Help menu
menutrans &Help wv(&H)
menutrans &Overview<Tab><F1> Tª(&O)<Tab><F1>
-menutrans &User\ Manual [U}j
A(&U)
+menutrans &User\ Manual [U[}j
A(&U)
menutrans &How-to\ links &How-toN
menutrans &Credits NWbg(&C)
menutrans Co&pying ì îñ(&P)
@@ -138,7 +140,7 @@
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
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index c97c838..c6edba4 100644
--- 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 @@
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 @@
msgstr "E819: Blowfish°Å¹æ¤Î¥Æ¥¹¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
msgid "[Location List]"
-msgstr "[¾ì½ê¥ê¥¹¥È]"
+msgstr "[¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È]"
msgid "[Quickfix List]"
msgstr "[Quickfix¥ê¥¹¥È]"
@@ -83,6 +83,9 @@
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 @@
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 @@
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 @@
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 @@
msgstr "E810: °ì»þ¥Õ¥¡¥¤¥ë¤ÎÆɹþ¤â¤·¤¯¤Ï½ñ¹þ¤¬¤Ç¤¤Þ¤»¤ó"
msgid "E97: Cannot create diffs"
-msgstr "E97: º¹Ê¬¤òºîÀ®¤Ç¤¤Þ¤»¤ó "
+msgstr "E97: º¹Ê¬¤òºîÀ®¤Ç¤¤Þ¤»¤ó"
msgid "Patch file"
msgstr "¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë"
@@ -229,7 +255,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
msgid "&Ok"
msgstr "&Ok"
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ¥¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹: %s"
+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 "map() argument"
msgstr "map() ¤Î°ú¿ô"
@@ -640,14 +673,14 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
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 @@
msgid "Illegal starting char"
msgstr "ÉÔÀµ¤ÊÀèƬʸ»ú¤Ç¤¹"
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' ¤Ç»Ï¤Þ¤ë¹Ô¤Î¡¢Ê¸»úÄ̤ê¤Î¥³¥Ô¡¼:\n"
+
msgid "Save As"
msgstr "ÊÌ̾¤ÇÊݸ"
@@ -1081,9 +1147,13 @@
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 @@
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 @@
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 @@
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 @@
msgid ""
"\n"
-" Name Args Range Complete Definition"
+" 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 @@
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 @@
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 @@
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 @@
msgstr "[¥Õ¥¡¥¤¥ë²áÂç]"
msgid "[Permission Denied]"
-msgstr "[ǧ²Ä¤¬¤¢¤ê¤Þ¤»¤ó]"
+msgstr "[¸¢¸Â¤¬¤¢¤ê¤Þ¤»¤ó]"
msgid "E200: *ReadPre autocommands made the file unreadable"
msgstr "E200: *ReadPre autocommand ¤¬¥Õ¥¡¥¤¥ë¤òÆɹþÉԲĤˤ·¤Þ¤·¤¿"
@@ -1662,12 +1747,6 @@
msgid "[converted]"
msgstr "[ÊÑ´¹ºÑ]"
-msgid "[blowfish]"
-msgstr "[blowfish°Å¹æ²½]"
-
-msgid "[crypted]"
-msgstr "[°Å¹æ²½]"
-
#, c-format
msgid "[CONVERSION ERROR in line %ld]"
msgstr "[%ld ¹ÔÌܤÇÊÑ´¹¥¨¥é¡¼]"
@@ -1688,9 +1767,6 @@
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 @@
#, c-format
msgid " in line %ld;"
-msgstr "¹Ô %ld;"
+msgstr " ¹Ô %ld;"
msgid "[Device]"
msgstr "[¥Ç¥Ð¥¤¥¹]"
@@ -2151,8 +2227,8 @@
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 @@
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: MDI¥¢¥×¥ê¤ÎÃæ¤Ç¤Ï¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó"
-msgid "Close tab"
-msgstr "¥¿¥Ö¥Ú¡¼¥¸¤òÊĤ¸¤ë"
-
msgid "Open tab..."
msgstr "¥¿¥Ö¥Ú¡¼¥¸¤ò³«¤¯"
@@ -2570,6 +2643,13 @@
"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 @@
"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 @@
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 @@
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 @@
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 @@
"¥Ú¡¼¥¸¤ò³«¤¯"
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 @@
"\n"
msgstr ""
"\n"
-"¤½¤ì¤«¤é.swp¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤\n"
+"¸µ¤Î.swp¥Õ¥¡¥¤¥ë¤Ïºï½ü¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó\n"
"\n"
msgid "Using crypt key from swap file for the text file.\n"
@@ -3565,7 +3653,7 @@
msgstr " ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê:\n"
msgid " Using specified name:\n"
-msgstr " ¤¢¤ë̾Á°¤ò»ÈÍÑÃæ:\n"
+msgstr " °Ê²¼¤Î̾Á°¤ò»ÈÍÑÃæ:\n"
msgid " In directory "
msgstr " ¥Ç¥£¥ì¥¯¥È¥ê "
@@ -3609,7 +3697,7 @@
" user name: "
msgstr ""
"\n"
-" ¥æ¡¼¥¶Ì¾: "
+" ¥æ¡¼¥¶¡¼Ì¾: "
msgid " host name: "
msgstr " ¥Û¥¹¥È̾: "
@@ -3737,11 +3825,11 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
"\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 @@
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 @@
"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 @@
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 @@
msgstr "E765: 'spellfile' ¤Ë¤Ï %ld ¸Ä¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó"
#, c-format
-msgid "Word removed from %s"
-msgstr "%s ¤«¤éñ¸ì¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿"
+msgid "Word '%.*s' removed from %s"
+msgstr "ñ¸ì '%.*s' ¤¬ %s ¤«¤éºï½ü¤µ¤ì¤Þ¤·¤¿"
#, c-format
-msgid "Word added to %s"
-msgstr "%s ¤Ëñ¸ì¤¬Äɲ䵤ì¤Þ¤·¤¿"
+msgid "Word '%.*s' added to %s"
+msgstr "ñ¸ì '%.*s' ¤¬ %s ¤ØÄɲ䵤ì¤Þ¤·¤¿"
msgid "E763: Word characters differ between spell files"
msgstr "E763: ñ¸ì¤Îʸ»ú¤¬¥¹¥Ú¥ë¥Õ¥¡¥¤¥ë¤È°Û¤Ê¤ê¤Þ¤¹"
@@ -5383,6 +5465,9 @@
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 @@
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 @@
#, 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 @@
#. 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
msgstr "gvimext.dll ¥¨¥é¡¼"
msgid "Path length too long!"
-msgstr "¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹!"
+msgstr "¥Ñ¥¹¤¬Ä¹²á¤®¤Þ¤¹!"
msgid "--No lines in buffer--"
msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
@@ -6391,7 +6483,7 @@
#, 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 @@
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 @@
msgstr "E42: ¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
msgid "E776: No location list"
-msgstr "E776: ¾ì½ê¥ê¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "E776: ¥í¥±¡¼¥·¥ç¥ó¥ê¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó"
msgid "E43: Damaged match string"
msgstr "E43: ³ºÅöʸ»úÎó¤¬ÇË»¤·¤Æ¤¤¤Þ¤¹"
@@ -6463,6 +6558,9 @@
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 @@
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 @@
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 @@
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 °À¤Ï¾Ã¤»¤Þ¤»¤ó"
diff --git a/src/po/ja.po b/src/po/ja.po
index 854df3b..e1f9b1d 100644
--- 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 @@
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 @@
msgstr "E819: Blowfish暗号のテストに失敗しました"
msgid "[Location List]"
-msgstr "[場所リスト]"
+msgstr "[ロケーションリスト]"
msgid "[Quickfix List]"
msgstr "[Quickfixリスト]"
@@ -83,6 +83,9 @@
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 @@
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 @@
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 @@
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 @@
msgstr "E810: 一時ファイルの読込もしくは書込ができません"
msgid "E97: Cannot create diffs"
-msgstr "E97: 差分を作成できません "
+msgstr "E97: 差分を作成できません"
msgid "Patch file"
msgstr "パッチファイル"
@@ -229,7 +255,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
msgid "&Ok"
msgstr "&Ok"
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: キーは既に存在します: %s"
+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 "map() argument"
msgstr "map() の引数"
@@ -640,14 +673,14 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
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 @@
msgid "Illegal starting char"
msgstr "不正な先頭文字です"
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' で始まる行の、文字通りのコピー:\n"
+
msgid "Save As"
msgstr "別名で保存"
@@ -1081,9 +1147,13 @@
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 @@
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 @@
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 @@
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 @@
msgid ""
"\n"
-" Name Args Range Complete Definition"
+" 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 @@
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 @@
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 @@
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 @@
msgstr "[ファイル過大]"
msgid "[Permission Denied]"
-msgstr "[認可がありません]"
+msgstr "[権限がありません]"
msgid "E200: *ReadPre autocommands made the file unreadable"
msgstr "E200: *ReadPre autocommand がファイルを読込不可にしました"
@@ -1662,12 +1747,6 @@
msgid "[converted]"
msgstr "[変換済]"
-msgid "[blowfish]"
-msgstr "[blowfish暗号化]"
-
-msgid "[crypted]"
-msgstr "[暗号化]"
-
#, c-format
msgid "[CONVERSION ERROR in line %ld]"
msgstr "[%ld 行目で変換エラー]"
@@ -1688,9 +1767,6 @@
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 @@
#, c-format
msgid " in line %ld;"
-msgstr "行 %ld;"
+msgstr " 行 %ld;"
msgid "[Device]"
msgstr "[デバイス]"
@@ -2151,8 +2227,8 @@
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 @@
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: MDIアプリの中ではウィンドウを開けません"
-msgid "Close tab"
-msgstr "タブページを閉じる"
-
msgid "Open tab..."
msgstr "タブページを開く"
@@ -2570,6 +2643,13 @@
"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 @@
"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 @@
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 @@
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 @@
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 @@
"ページを開く"
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 @@
"\n"
msgstr ""
"\n"
-"それから.swpファイルを削除してください\n"
+"元の.swpファイルは削除しても構いません\n"
"\n"
msgid "Using crypt key from swap file for the text file.\n"
@@ -3565,7 +3653,7 @@
msgstr " 現在のディレクトリ:\n"
msgid " Using specified name:\n"
-msgstr " ある名前を使用中:\n"
+msgstr " 以下の名前を使用中:\n"
msgid " In directory "
msgstr " ディレクトリ "
@@ -3609,7 +3697,7 @@
" user name: "
msgstr ""
"\n"
-" ユーザ名: "
+" ユーザー名: "
msgid " host name: "
msgstr " ホスト名: "
@@ -3737,11 +3825,11 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
"\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 @@
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 @@
"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 @@
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 @@
msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
#, c-format
-msgid "Word removed from %s"
-msgstr "%s から単語が削除されました"
+msgid "Word '%.*s' removed from %s"
+msgstr "単語 '%.*s' が %s から削除されました"
#, c-format
-msgid "Word added to %s"
-msgstr "%s に単語が追加されました"
+msgid "Word '%.*s' added to %s"
+msgstr "単語 '%.*s' が %s へ追加されました"
msgid "E763: Word characters differ between spell files"
msgstr "E763: 単語の文字がスペルファイルと異なります"
@@ -5383,6 +5465,9 @@
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 @@
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 @@
#, 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 @@
#. 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
msgstr "gvimext.dll エラー"
msgid "Path length too long!"
-msgstr "パスが長すぎます!"
+msgstr "パスが長過ぎます!"
msgid "--No lines in buffer--"
msgstr "--バッファに行がありません--"
@@ -6391,7 +6483,7 @@
#, 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 @@
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 @@
msgstr "E42: エラーはありません"
msgid "E776: No location list"
-msgstr "E776: 場所リストはありません"
+msgstr "E776: ロケーションリストはありません"
msgid "E43: Damaged match string"
msgstr "E43: 該当文字列が破損しています"
@@ -6463,6 +6558,9 @@
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 @@
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 @@
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 @@
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 属性は消せません"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 8d7e7cf..e69599d 100644
--- 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 @@
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 @@
msgstr "E819: BlowfishÃÌeXgɸsµÜµ½"
msgid "[Location List]"
-msgstr "[êXg]"
+msgstr "[P[VXg]"
msgid "[Quickfix List]"
msgstr "[QuickfixXg]"
@@ -83,6 +83,9 @@
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 @@
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 @@
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: obt@ %ld ÌÏXÍÛ¶³êĢܹñ (! ÅÏXðjü)"
-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 @@
msgid " line=%ld id=%d name=%s"
msgstr " s=%ld ¯Êq=%d ¼O=%s"
+msgid "E897: All channels are in use"
+msgstr "E897: S`lªgpÅ·"
+
+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@Cª¢mÌû@Åû³êĢܷ"
+
+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 "à¤êx¯¶L[ðü͵ľ³¢: "
+
+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 @@
msgstr "E810: êt@CÌÇàµÍªÅ«Ü¹ñ"
msgid "E97: Cannot create diffs"
-msgstr "E97: ·ªðì¬Å«Ü¹ñ "
+msgstr "E97: ·ªðì¬Å«Ü¹ñ"
msgid "Patch file"
msgstr "pb`t@C"
@@ -229,7 +255,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#, 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 @@
msgid "&Ok"
msgstr "&Ok"
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: L[Íùɶݵܷ: %s"
+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 "map() argument"
msgstr "map() Ìø"
@@ -640,14 +673,14 @@
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[o̪ èܹñ"
+msgstr "E277: T[o[̪ èܹñ"
msgid "remove() argument"
msgstr "remove() Ìø"
@@ -665,9 +698,15 @@
msgid "sort() argument"
msgstr "sort() Ìø"
+msgid "uniq() argument"
+msgstr "uniq() Ìø"
+
msgid "E702: Sort compare function failed"
msgstr "E702: \\[gÌärÖª¸sµÜµ½"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ÌärÖª¸sµÜµ½"
+
msgid "(Invalid)"
msgstr "(³ø)"
@@ -686,6 +725,18 @@
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 @@
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 @@
#, 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 @@
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 @@
msgid "Illegal starting char"
msgstr "s³È檶ŷ"
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' ÅnÜésÌA¶ÊèÌRs[:\n"
+
msgid "Save As"
msgstr "ʼÅÛ¶"
@@ -1081,9 +1147,13 @@
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 @@
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 @@
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 @@
msgstr "ÖÌÅãÅ·"
msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: [Uè`R}hÌ ¢Ü¢ÈgpÅ·"
+msgstr "E464: [U[è`R}hÌ ¢Ü¢ÈgpÅ·"
msgid "E492: Not an editor command"
msgstr "E492: GfB^ÌR}hÅÍ èܹñ"
@@ -1277,13 +1355,13 @@
msgid ""
"\n"
-" Name Args Range Complete Definition"
+" Name Args Address Complete Definition"
msgstr ""
"\n"
-" ¼O ø ÍÍ â® è`"
+" ¼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 @@
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 @@
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 @@
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ÅñðÅ«Ü·)"
+msgstr "ÍfoCXÅ· ('opendevice' IvVÅñðÅ«Ü·)"
msgid "[New File]"
msgstr "[Vt@C]"
@@ -1620,7 +1705,7 @@
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 @@
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 @@
msgid "can't read output of 'charconvert'"
msgstr "'charconvert' ÌoÍðÇßܹñŵ½"
-msgid "E821: File is encrypted with unknown method"
-msgstr "E821: t@Cª¢mÌû@Åû³êĢܷ"
-
msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: acwriteobt@ÌY·éautocommandͶݵܹñ"
@@ -1772,7 +1848,7 @@
#, c-format
msgid " in line %ld;"
-msgstr "s %ld;"
+msgstr " s %ld;"
msgid "[Device]"
msgstr "[foCX]"
@@ -2151,8 +2227,8 @@
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 @@
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: MDIAvÌÅÍEBhEðJ¯Ü¹ñ"
-msgid "Close tab"
-msgstr "^uy[Wð¶é"
-
msgid "Open tab..."
msgstr "^uy[WðJ"
@@ -2570,6 +2643,13 @@
"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 @@
"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 @@
msgstr "sðæ¾Å«Ü¹ñ"
msgid "Unable to register a command server name"
-msgstr "½ßT[o̼Oðo^ūܹñ"
+msgstr "½ßT[o[̼Oðo^ūܹñ"
msgid "E248: Failed to send command to the destination program"
msgstr "E248: ÚIÌvOÖÌR}hMɸsµÜµ½"
#, c-format
msgid "E573: Invalid server id used: %s"
-msgstr "E573: ³øÈT[oIDªgíêܵ½: %s"
+msgstr "E573: ³øÈT[o[IDªgíêܵ½: %s"
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: VIM ÀÌÌo^vpeBªs³Å·. ÁµÜµ½!"
@@ -3110,16 +3197,16 @@
msgstr "-x\t\t\tû³ê½t@CðÒW·é"
msgid "-display <display>\tConnect vim to this particular X-server"
-msgstr "-display <display>\tvimðwèµ½ X T[oÉÚ±·é"
+msgstr "-display <display>\tvimðwèµ½ 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ª³Äàx¶ðo͵Ȣ"
+msgstr "--remote-silent <files> ¯ã, T[o[ª³Äàx¶ðo͵Ȣ"
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
@@ -3127,7 +3214,8 @@
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
-msgstr "--remote-wait-silent <files> ¯ã, T[oª³Äàx¶ðo͵Ȣ"
+msgstr ""
+"--remote-wait-silent <files> ¯ã, T[o[ª³Äàx¶ðo͵Ȣ"
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
@@ -3136,16 +3224,16 @@
"y[WðJ"
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[o¼Ìêð\\¦µÄ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 @@
"\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 @@
msgstr " »ÝÌfBNg:\n"
msgid " Using specified name:\n"
-msgstr " é¼Oðgp:\n"
+msgstr " Ⱥ̼Oðgp:\n"
msgid " In directory "
msgstr " fBNg "
@@ -3609,7 +3697,7 @@
" user name: "
msgstr ""
"\n"
-" [U¼: "
+" [U[¼: "
msgid " host name: "
msgstr " zXg¼: "
@@ -3737,11 +3825,11 @@
msgstr ""
"\n"
"(1) ÊÌvOª¯¶t@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ÌÒWZbVªNbV
µ½.\n"
@@ -3967,13 +4055,6 @@
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 @@
msgid "E549: Illegal percentage"
msgstr "E549: s³Èp[Ze[WÅ·"
-msgid "Enter encryption key: "
-msgstr "ûpÌL[ðü͵ľ³¢: "
-
-msgid "Enter same key again: "
-msgstr "à¤êx¯¶L[ðü͵ľ³¢: "
-
-msgid "Keys don't match!"
-msgstr "L[ªêvµÜ¹ñ"
-
msgid "E854: path too long for completion"
msgstr "E854: pXª·ß¬Äâ®Å«Ü¹ñ"
@@ -4059,20 +4131,11 @@
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 @@
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 @@
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 @@
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: '%c' Ís³È¶Å· (tHg¼ \"%s\")"
-msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: 2dÌVOi̽ß, I¹µÜ·\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: v½IVOi %s ðmµÜµ½\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: v½IVOiðmµÜµ½\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 @@
"\n"
"ZL
eBReLXgðÝèūܹñ "
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "ZL
eBReLXg %s ð %s ÉÝèūܹñ"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "ZL
eBReLXg %s ð %s ©çæ¾Å«Ü¹ñ. íµÜ·!"
+
msgid ""
"\n"
"Cannot execute shell "
@@ -4802,19 +4871,31 @@
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 Ìݪ±¯çêÜ·B³K\\»GWÍ©®I"
+"ð³êÜ·B"
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Ìp^[ÉobNgbLO RE GWðKpµÜ·: "
+
+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 @@
"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
"left on stack"
msgstr ""
-"E875: (NFA ³K\\») (ãu¶ñðNFAÉÏ·É) "
-"X^bNÉc³ê½Xe[gª½ß¬Ü·"
+"E875: (NFA ³K\\») (ãu¶ñðNFAÉÏ·É) X^bNÉc³ê½Xe[gª"
+"½ß¬Ü·"
msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
msgstr "E876: (NFA ³K\\») NFASÌðÛ¶·éÉÍó«Xy[Xª«èܹñ"
@@ -4867,8 +4948,9 @@
msgid ""
"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr "NFA³K\\»GWpÌOt@CðpƵÄJ¯Ü¹ñB"
-"OÍWoÍÉo͵ܷB"
+msgstr ""
+"NFA³K\\»GWpÌOt@CðpƵÄJ¯Ü¹ñBOÍWoÍÉ"
+"o͵ܷB"
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
@@ -5317,12 +5399,12 @@
msgstr "E765: 'spellfile' ÉÍ %ld ÂÌGgÍ èܹñ"
#, c-format
-msgid "Word removed from %s"
-msgstr "%s ©çPêªí³êܵ½"
+msgid "Word '%.*s' removed from %s"
+msgstr "Pê '%.*s' ª %s ©çí³êܵ½"
#, c-format
-msgid "Word added to %s"
-msgstr "%s ÉPêªÇÁ³êܵ½"
+msgid "Word '%.*s' added to %s"
+msgstr "Pê '%.*s' ª %s ÖÇÁ³êܵ½"
msgid "E763: Word characters differ between spell files"
msgstr "E763: Pê̶ªXyt@CÆÙÈèÜ·"
@@ -5383,6 +5465,9 @@
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 @@
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 @@
#, 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 @@
#. 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 @@
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 @@
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
[Ì ÒW¨SÌÝè¨}ü(SÒ)[hØÖ "
+msgstr "j
[Ì ÒW->SÌÝè->}ü(SÒ)[hØÖ "
msgid " for two modes "
msgstr " Å[hLÉ "
msgid "menu Edit->Global Settings->Toggle Vi Compatible"
-msgstr "j
[Ì ÒW¨SÌÝè¨ViÝ·[hØÖ "
+msgstr "j
[Ì ÒW->SÌÝè->ViÝ·[hØÖ "
msgid " for Vim defaults "
msgstr " ÅVimƵĮì "
@@ -6145,7 +6234,7 @@
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 @@
msgstr "Ú×ÈîñÍ :help register<Enter> "
msgid "menu Help->Sponsor/Register for information "
-msgstr "Ú×Íj
[Ì wv¨X|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 @@
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: pathÉÍ \"%s\" Æ¢¤t@Cª èܹñ"
+msgid "List or number required"
+msgstr "Xg©lªKvÅ·"
+
msgid "Edit with &multiple Vims"
msgstr "¡ÌVimÅÒW·é (&M)"
@@ -6219,7 +6311,7 @@
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 @@
#, 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 @@
msgid "E37: No write since last change (add ! to override)"
msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ (! ðÇÁÅÏXðjü)"
+msgid "E37: No write since last change"
+msgstr "E37: ÅãÌÏXªÛ¶³êĢܹñ"
+
msgid "E38: Null argument"
msgstr "E38: øªóÅ·"
@@ -6444,7 +6539,7 @@
msgstr "E42: G[Í èܹñ"
msgid "E776: No location list"
-msgstr "E776: êXgÍ èܹñ"
+msgstr "E776: P[VXgÍ èܹñ"
msgid "E43: Damaged match string"
msgstr "E43: Y¶ñªj¹µÄ¢Ü·"
@@ -6463,6 +6558,9 @@
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 @@
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^[©æØèLªs³Å·"
@@ -6608,7 +6710,7 @@
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 @@
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ÖÌvfÇÁɸ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 Ìg£XCXÉ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ÖÌvfÇÁɸsµÜµ½"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "·³ %d ÌXCXð %d Ìg£XCXÉèÄæ¤ÆµÜµ½"
+
+msgid "failed to add item to list"
+msgstr "XgÖÌvfÇÁɸsµÜµ½"
+
msgid "cannot delete vim.List attributes"
msgstr "vim.List ®«ÍÁ¹Ü¹ñ"