summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-03-04 23:39:37 +0000
committerBram Moolenaar <Bram@vim.org>2005-03-04 23:39:37 +0000
commit19a09a189379659b917cf5ccff78f3e5ec061015 (patch)
tree806d594bf7af04ef956c0c96ad64adfcd96325dc
parent7383034c0ab657158c4c69146254beffdea4859e (diff)
downloadvim-git-19a09a189379659b917cf5ccff78f3e5ec061015.tar.gz
updated for version 7.0055v7.0055
-rw-r--r--Filelist2
-rw-r--r--runtime/doc/autocmd.txt7
-rw-r--r--runtime/doc/eval.txt28
-rw-r--r--runtime/doc/options.txt8
-rw-r--r--runtime/doc/tags7
-rw-r--r--runtime/doc/term.txt16
-rw-r--r--runtime/doc/todo.txt36
-rw-r--r--runtime/doc/various.txt3
-rw-r--r--runtime/doc/version7.txt16
-rw-r--r--runtime/keymap/canfr-win.vim91
-rw-r--r--runtime/scripts.vim6
-rw-r--r--runtime/syntax/prescribe.vim69
-rw-r--r--runtime/syntax/vim.vim4
-rw-r--r--src/VisVim/Res/ToolbarL.bmpbin0 -> 2678 bytes
-rw-r--r--src/VisVim/Res/ToolbarM.bmpbin0 -> 758 bytes
-rw-r--r--src/eval.c47
-rw-r--r--src/fileio.c60
-rw-r--r--src/getchar.c4
-rw-r--r--src/gui_gtk_x11.c89
-rw-r--r--src/gui_w32.c22
-rw-r--r--src/gui_x11.c2
-rw-r--r--src/keymap.h15
-rw-r--r--src/misc2.c1
-rw-r--r--src/normal.c3
-rw-r--r--src/option.c4
-rw-r--r--src/os_mac_conv.c8
-rw-r--r--src/os_mswin.c7
-rw-r--r--src/po/ja.po3778
-rw-r--r--src/po/ja.sjis.po3778
-rw-r--r--src/proto/eval.pro1
-rw-r--r--src/proto/tag.pro1
-rw-r--r--src/regexp.c28
-rw-r--r--src/tag.c125
-rw-r--r--src/term.c198
-rw-r--r--src/testdir/test24.inbin890 -> 975 bytes
-rw-r--r--src/testdir/test24.ok3
-rw-r--r--src/undo.c4
-rw-r--r--src/version.h4
-rw-r--r--src/vim.h4
39 files changed, 5024 insertions, 3455 deletions
diff --git a/Filelist b/Filelist
index bdd33c162..57edbe981 100644
--- a/Filelist
+++ b/Filelist
@@ -325,7 +325,7 @@ SRC_DOS = \
# source files for DOS without CR/LF translation (also in the extra archive)
SRC_DOS_BIN = \
- src/VisVim/Res \
+ src/VisVim/Res/*.bmp \
src/tearoff.bmp \
src/tools.bmp \
src/tools16.bmp \
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e994df886..44608a0bf 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Feb 21
+*autocmd.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -286,7 +286,7 @@ FileChangedShell When Vim notices that the modification time of
change. |timestamp|
Mostly triggered after executing a shell
command, but also with a |:checktime| command
- or when Vim regains input focus.
+ or when Gvim regains input focus.
This autocommand is triggered for each changed
file. It is not used when 'autoread' is set
and the buffer was not changed. If a
@@ -294,6 +294,9 @@ FileChangedShell When Vim notices that the modification time of
warning message and prompt is not given.
This is useful for reloading related buffers
which are affected by a single command.
+ The |v:fcs_reason| variable is set to indicate
+ what happened and |v:fcs_choice| can be used
+ to tell Vim what to do next.
NOTE: When this autocommand is executed, the
current buffer "%" may be different from the
buffer that was changed "<afile>".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1838a8225..1cfa7b0fc 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2005 Feb 26
+*eval.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1183,6 +1183,32 @@ v:exception The value of the exception most recently caught and not
:endtry
< Output: "caught oops".
+ *v:fcs_reason* *fcs_reason-variable*
+v:fcs_reason The reason why the |FileChangedShell| event was triggered.
+ Can be used in an autocommand to decide what to do and/or what
+ to set v:fcs_choice to. Possible values:
+ deleted file no longer exists
+ conflict file contents, mode or timestamp was
+ changed and buffer is modified
+ changed file contents has changed
+ mode mode of file changed
+ time only file timestamp changed
+
+ *v:fcs_choice* *fcs_choice-variable*
+v:fcs_choice What should happen after a |FileChangedShell| event was
+ triggered. Can be used in an autocommand to tell Vim what to
+ do with the affected buffer:
+ reload Reload the buffer (does not work if
+ the file was deleted).
+ ask Ask the user what to do, as if there
+ was no autocommand. Except that when
+ only the timestamp changed nothing
+ will happen.
+ <empty> Nothing, the autocommand should do
+ everything that needs to be done.
+ The default is empty. If another (invalid) value is used then
+ Vim behaves like it is empty, there is no warning message.
+
*v:fname_in* *fname_in-variable*
v:fname_in The name of the input file. Only valid while evaluating:
option used for ~
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4bf27f66d..d0b5abf74 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2005 Feb 23
+*options.txt* For Vim version 7.0aa. Last change: 2005 Mar 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -6833,9 +6833,9 @@ A jump table for the options with a short description can be found at |Q_op|.
global
Window height. Do not confuse this with the height of the Vim window,
use 'lines' for that.
- Used for |CTRL-F| and |CTRL-B| when the value is smaller than 'lines'
- minus one. The screen will scroll 'window' minus two lines, with a
- minimum of one.
+ Used for |CTRL-F| and |CTRL-B| when there is only one window and the
+ value is smaller than 'lines' minus one. The screen will scroll
+ 'window' minus two lines, with a minimum of one.
When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll
in a much smarter way, taking care of wrapping lines.
When resizing the Vim window, the value is smaller than 1 or more than
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 4f73e69b2..c4cdbbb92 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4782,6 +4782,8 @@ faq intro.txt /*faq*
farsi farsi.txt /*farsi*
farsi.txt farsi.txt /*farsi.txt*
fasm.vim syntax.txt /*fasm.vim*
+fcs_choice-variable eval.txt /*fcs_choice-variable*
+fcs_reason-variable eval.txt /*fcs_reason-variable*
feature-list eval.txt /*feature-list*
fetch pi_netrw.txt /*fetch*
file-browser-5.2 version5.txt /*file-browser-5.2*
@@ -5078,6 +5080,7 @@ hebrew hebrew.txt /*hebrew*
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
+help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*
@@ -5901,6 +5904,7 @@ printing print.txt /*printing*
printing-formfeed print.txt /*printing-formfeed*
profile repeat.txt /*profile*
profiling repeat.txt /*profiling*
+profiling-variable eval.txt /*profiling-variable*
progname-variable eval.txt /*progname-variable*
progress-syntax syntax.txt /*progress-syntax*
progress.vim syntax.txt /*progress.vim*
@@ -6620,6 +6624,8 @@ v:ctype eval.txt /*v:ctype*
v:dying eval.txt /*v:dying*
v:errmsg eval.txt /*v:errmsg*
v:exception eval.txt /*v:exception*
+v:fcs_choice eval.txt /*v:fcs_choice*
+v:fcs_reason eval.txt /*v:fcs_reason*
v:fname_diff eval.txt /*v:fname_diff*
v:fname_in eval.txt /*v:fname_in*
v:fname_new eval.txt /*v:fname_new*
@@ -6634,6 +6640,7 @@ v:lang eval.txt /*v:lang*
v:lc_time eval.txt /*v:lc_time*
v:lnum eval.txt /*v:lnum*
v:prevcount eval.txt /*v:prevcount*
+v:profiling eval.txt /*v:profiling*
v:progname eval.txt /*v:progname*
v:register eval.txt /*v:register*
v:servername eval.txt /*v:servername*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index b9252a93d..fba493c70 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt* For Vim version 7.0aa. Last change: 2004 Dec 07
+*term.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -146,7 +146,7 @@ sequence of bytes.
*vt100-function-keys* *xterm-function-keys*
An xterm can send function keys F1 to F4 in two modes: vt100 compatible or
-not. Because Vim cannot know what the xterm is sending, both types of keys
+not. Because Vim may not know what the xterm is sending, both types of keys
are recognized. The same happens for the <Home> and <End> keys.
normal vt100 ~
<F1> t_k1 <Esc>[11~ <xF1> <Esc>OP *<xF1>-xterm*
@@ -167,6 +167,18 @@ recognizes most of them. Use ":set termcap" to check which are supported and
what the codes are. Mostly these are not in a termcap, they are only
supported by the builtin_xterm termcap.
+ *xterm-modifier-keys*
+Newer versions of xterm support Alt and Ctrl for most function keys. To avoid
+having to add all combinations of Alt, Ctrl and Shift for every key a special
+sequence is recognized at the end of a termcap entry: ";*X". The "X" can be
+any character, often '~' is used. The ";*" stands for an optional modifier
+argument. ";2" is Shift, ";3" is Alt, ";5" is Ctrl and ";9" is Meta (when
+it's different from Alt). They can be combined. Examples: >
+ :set <F8>=^[[19;*~
+ :set <Home>=^[[1;*H
+Another speciality about these codes is that they are not overwritten by
+another code. That is to avoid that the codes obtained from xterm directly
+|t_RV| overwrite them.
*xterm-scroll-region*
The default termcap entry for xterm on Sun and other platforms does not
contain the entry for scroll regions. Add ":cs=\E[%i%d;%dr:" to the xterm
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a1c487de2..833b6aa71 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2005 Feb 28
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,17 +30,25 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
+- Steve Wall has a patch (2005 Mar 3) for adding function keys up to 37,
+ with modifiers.
+ Still need to recognize modifiers in "ESC O 5 F". "ESC O * F"?
+":map <C-S-End> lll" has no effect.
+
Mingw code to catch out-of-stack error doesn't work. See MINGW_TRY in
regexp.c. Try with example from Michaelis.
-Russian helpfile doesn't show up correctly when 'encoding' is koi8-r.
-(Vassily Ragosin 2005 Feb 16)
-
Mac unicode patch (Da Woon Jung):
-- typing doesn't work
- selecting proportional font breaks display
+- UTF-8 text causes display problems. Character width wrong?
Patch for gettags(). Yegappan Lakshmanan Feb 27
+- docs: use of ^ and $ in pattern, refer to |tag-regexp|
+ explain what the fields mean.
+ use of 'tags' option
+
+- Patch from Steve Wall (2005 Mar 3) for xterm mouse positioning above
+ column 223.
autoload:
- Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -55,6 +63,8 @@ autoload:
Patch for 'balloonexpr' option. Sergey Khorev, Feb 26. Addition Feb 27.
+Patch for "paranoid mode" by Kevin Collins, March 3.
+
Awaiting response:
- Patch for mch_FullName() also in Vim 6.3? os_mswin.c
- Win32: tearoff menu window should have a scrollbar when it's taller than
@@ -181,10 +191,6 @@ PLANNED FOR VERSION 7.0:
screen has not yet been allocated with the new size.
- Running a shell command from the GUI still has limitations. Look into how
the Vim shell project can help: http://vimshell.wana.at
-8 When a file is change outside of Vim and unmodified in Vim there is no
- simple way to automatically reload the file. Either add an option for
- this or make it simple to have the FileChangedShell invoke the normal
- action, telling it what to do.
- Displaying size of Visual area: use 24-33 column display.
When selecting multiple lines, up to about a screenfull, also count the
characters.
@@ -258,12 +264,6 @@ Updated Ruby interface. (Ryan Paul)
Awaiting updated patches:
--- awaiting updated patch ---
- 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
- 'flipcase' variable: upper/lowercase pairs.
- Insert comma's between pairs and allow a range, make it look like
- 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to
- separate the from and to part is optional.
- Resp: no time now.
8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar
15, but it doesn't use "initdir" or "dflt". (will update patch)
8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
@@ -323,12 +323,6 @@ Awaiting updated patches:
done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1.
7 Add a "-@ filelist" argument: read file names from a file. (David
Kotchan has a patch for it)
- 8 Add term entries for function keys on xterm with alt and ctrl (new in
- pl 94). E.g., Control adds ";5" in "<Esc>[20;5~". Find a generic way
- to prepend a modifier in console mode, to avoid having to specify each
- individual modified key.
- Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37,
- with modifiers.
8 Include a connection to an external program through a pipe? See
patches from Felbinger for a mathematica interface.
Or use emacs server kind of thing?
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 31aa8af34..7c0e74d04 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.0aa. Last change: 2005 Feb 21
+*various.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -324,6 +324,7 @@ N *+path_extra* Up/downwards search in 'path' and 'tags'
m *+perl* Perl interface |perl|, may have |/dyn|
*+postscript* |:hardcopy| writes a PostScript file
N *+printer* |:hardcopy| command
+H *+profile* |:profile| command
m *+python* Python interface |python|, may have |/dyn|
N *+quickfix* |:make| and |quickfix| commands
B *+rightleft* Right to left typing |'rightleft'|
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 2ac2ceac2..5fb35644e 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2005 Feb 27
+*version7.txt* For Vim version 7.0aa. Last change: 2005 Mar 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -412,6 +412,9 @@ Autocommands can be defined local to a buffer. This means they will also work
when the buffer does not have a name or no specific name. See
|autocmd-buflocal|. (Yakov Lerner)
+For xterm most combinations of modifiers with function keys are recognized.
+|xterm-modifier-keys|
+
==============================================================================
IMPROVEMENTS *improvements-7*
@@ -539,7 +542,11 @@ To count items (pattern matches) without changing the buffer the 'n' flag has
been added to |:substitute|. See |count-items|.
The "screen.linux" $TERM name is recognized to set the default for
-'background' to "dark". (Ciaran McCreesh)
+'background' to "dark". (Ciaran McCreesh) Also for "cygwin".
+
+The |FileChangedShell| autocommand event can now use the |v:fcs_reason|
+variable that specifies what triggered the event. |v:fcs_choice| can be used
+to reload the buffer or ask the user what to do.
==============================================================================
COMPILE TIME CHANGES *compile-changes-7*
@@ -897,4 +904,9 @@ from the terminal we actually get 3 lines for the cmdline in gvim.
When setting $HOME allocated memory would leak.
+Win32: bold characters may sometimes write in another character cell. Use
+unicodepdy[] as for UTF-8. (Taro Muraoka)
+
+":w fname" didn't work for files with 'buftype' set to "nofile".
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/keymap/canfr-win.vim b/runtime/keymap/canfr-win.vim
new file mode 100644
index 000000000..7a405bf0b
--- /dev/null
+++ b/runtime/keymap/canfr-win.vim
@@ -0,0 +1,91 @@
+" Vim Keymap file for the normalized Canadian multilingual keyboard
+" CAN/CSA Z243.200-92 using the latin1 encoding.
+" This mapping is limited in scope, as it assumes that the AltGr
+" key works as it typically does in a Windows system with a multilingual
+" English keyboard. It probably won't work with the US keyboard on US
+" English versions of Windows, because those don't provide the AltGr keys.
+" The mapping was tested with Win2k and WinXP.
+
+" Maintainer: Eric Joanis <joanis@cs.toronto.edu>
+" Last Change: 2004 Jan 13
+
+" 2003 Dec 04
+" Initial Revision
+
+" 2004 Jan 13
+" Added the upper case accented characters, forgotten in the initial version.
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding latin1
+
+" Use this short name in the status line.
+let b:keymap_name = "canfr"
+
+loadkeymap
+< '
+> "
+/ é
+? É
+' è
+\" È
+\\ à
+| À
+[a â
+[e ê
+[i î
+[o ô
+[u û
+[A Â
+[E Ê
+[I Î
+[O Ô
+[U Û
+[[ ^
+{a ä
+{e ë
+{i ï
+{o ö
+{u ü
+{y ÿ
+{A Ä
+{E Ë
+{I Ï
+{O Ö
+{U Ü
+] ç
+} Ç
+` /
+~ \\
+^ ?
+ú «
+ø »
+¬ <
+® >
+» °
+Ûa à
+Ûe è
+Ûi ì
+Ûo ò
+Ûu ù
+ÛA À
+ÛE È
+ÛI Ì
+ÛO Ò
+ÛU Ù
+ÛÛ `
+Ýa ã
+Ýo õ
+Ýn ñ
+Ýs ß
+ÝA Ã
+ÝO Õ
+ÝN Ñ
+ÝS ß
+ÝÝ ~
+à |
+· {
+¸ }
+¹ [
+° ]
+½ ¬
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 69bee3aaf..e25da8717 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types in scripts
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last change: 2004 Oct 02
+" Last change: 2005 Mar 04
" This file is called by an autocommand for every file that has just been
" loaded into a buffer. It checks if the type of file can be recognized by
@@ -222,6 +222,10 @@ else
elseif s:line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
set ft=cvs
+ " Prescribe
+ elseif s:line1 =~ '^!R!'
+ set ft=prescribe
+
" Send-pr
elseif s:line1 =~ '^SEND-PR:'
set ft=sendpr
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
new file mode 100644
index 000000000..d89ee3525
--- /dev/null
+++ b/runtime/syntax/prescribe.vim
@@ -0,0 +1,69 @@
+" Vim syntax file
+" Language: Kyocera PreScribe2e
+" Maintainer: Klaus Muth <klaus@hampft.de>
+" URL: http://www.hampft.de/vim/syntax/prescribe.vim
+" Last Change: 2005 Mar 04
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+syn match prescribeSpecial "!R!"
+
+" all prescribe commands
+syn keyword prescribeStatement ALTF AMCR ARC ASFN ASTK BARC BLK BOX CALL
+syn keyword prescribeStatement CASS CIR CLIP CLPR CLSP COPY CPTH CSET CSTK
+syn keyword prescribeStatement CTXT DAF DAM DAP DELF DELM DPAT DRP DRPA DUPX
+syn keyword prescribeStatement DXPG DXSD DZP ENDD ENDM ENDR EPL EPRM EXIT
+syn keyword prescribeStatement FDIR FILL FLAT FLST FONT FPAT FRPO FSET FTMD
+syn keyword prescribeStatement GPAT ICCD INTL JOG LDFC MAP MCRO MDAT MID
+syn keyword prescribeStatement MLST MRP MRPA MSTK MTYP MZP NEWP PAGE PARC PAT
+syn keyword prescribeStatement PCRP PCZP PDIR RDRP PDZP PELP PIE PMRA PMRP PMZP
+syn keyword prescribeStatement PRBX PRRC PSRC PXPL RDMP RES RSL RGST RPCS RPF
+syn keyword prescribeStatement RPG RPP RPU RTTX RTXT RVCD RVRD SBM SCAP SCCS
+syn keyword prescribeStatement SCF SCG SCP SCPI SCRC SCS SCU SDP SEM SETF SFA
+syn keyword prescribeStatement SFNT SIMG SIR SLJN SLM SLPI SLPP SLS SMLT SPD
+syn keyword prescribeStatement SPL SPLT SPO SPSZ SPW SRM SRO SROP SSTK STAT STRK
+syn keyword prescribeStatement SULP SVCP TATR TEXT TPRS UNIT UOM WIDE WRED XPAT
+syn match prescribeStatement "\<ALTB\s\+[ACDEGRST]\>"
+syn match prescribeStatement "\<CPPY\s\+[DE]\>"
+syn match prescribeStatement "\<EMCR\s\+[DE]\>"
+syn match prescribeStatement "\<FRPO\s\+INIT\>"
+syn match prescribeStatement "\<JOB[DLOPST]\>"
+syn match prescribeStatement "\<LDFC\s\+[CFS]\>"
+syn match prescribeStatement "\<RWER\s\+[DFILRSTW]\>"
+
+syn match prescribeCSETArg "[0-9]\{1,3}[A-Z]"
+syn match prescribeFRPOArg "[A-Z][0-9]\{1,2}"
+syn match prescribeNumber "[0-9]\+"
+syn region prescribeString start=+'+ end=+'+ skip=+\\'+
+syn region prescribeComment start=+CMNT+ end=+;+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_prescribe_syn_inits")
+ if version < 508
+ let did_prescribe_syn_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink prescribeSpecial PreProc
+ HiLink prescribeStatement Statement
+ HiLink prescribeNumber Number
+ HiLink prescribeCSETArg String
+ HiLink prescribeFRPOArg String
+ HiLink prescribeComment Comment
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "prescribe"
+
+" vim: ts=8
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index b9af06416..29575c7ac 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
" Language: Vim 7.0 script
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
" Last Change: February 22, 2005
-" Version: 7.0-07
+" Version: 7.0-08
" Automatically generated keyword lists: {{{1
" Quit when a syntax file was already loaded {{{2
@@ -245,7 +245,7 @@ syn match vimFilter contained "^!.\{-}\(|\|$\)" contains=vimSpecFile
syn match vimFilter contained "\A!.\{-}\(|\|$\)"ms=s+1 contains=vimSpecFile
" Complex repeats (:h complex-repeat) {{{2
-syn match vimCmplxRepeat '[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
+"syn match vimCmplxRepeat '[^a-zA-Z_/\\()]q[0-9a-zA-Z"]'lc=1
syn match vimCmplxRepeat '@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\)'
" Set command and associated set-options (vimOptions) with comment {{{2
diff --git a/src/VisVim/Res/ToolbarL.bmp b/src/VisVim/Res/ToolbarL.bmp
new file mode 100644
index 000000000..e11c66fc6
--- /dev/null
+++ b/src/VisVim/Res/ToolbarL.bmp
Binary files differ
diff --git a/src/VisVim/Res/ToolbarM.bmp b/src/VisVim/Res/ToolbarM.bmp
new file mode 100644
index 000000000..22e15f489
--- /dev/null
+++ b/src/VisVim/Res/ToolbarM.bmp
Binary files differ
diff --git a/src/eval.c b/src/eval.c
index bde12e56e..c7aba5145 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -316,6 +316,8 @@ static struct vimvar
{VV_NAME("val", VAR_UNKNOWN), VV_RO},
{VV_NAME("key", VAR_UNKNOWN), VV_RO},
{VV_NAME("profiling", VAR_NUMBER), VV_RO},
+ {VV_NAME("fcs_reason", VAR_STRING), VV_RO},
+ {VV_NAME("fcs_choice", VAR_STRING), 0},
};
/* shorthand */
@@ -549,6 +551,7 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv));
static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv));
static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv));
static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv));
static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv));
static void f_tolower __ARGS((typval_T *argvars, typval_T *rettv));
static void f_toupper __ARGS((typval_T *argvars, typval_T *rettv));
@@ -6196,6 +6199,7 @@ static struct fst
{"synIDattr", 2, 3, f_synIDattr},
{"synIDtrans", 1, 1, f_synIDtrans},
{"system", 1, 2, f_system},
+ {"taglist", 1, 1, f_taglist},
{"tempname", 0, 0, f_tempname},
{"tolower", 1, 1, f_tolower},
{"toupper", 1, 1, f_toupper},
@@ -13134,6 +13138,35 @@ done:
}
/*
+ * "gettags()" function
+ */
+ static void
+f_taglist(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+{
+ char_u *tag_pattern;
+ list_T *l;
+
+ tag_pattern = get_tv_string(&argvars[0]);
+
+ rettv->vval.v_number = FALSE;
+
+ l = list_alloc();
+ if (l != NULL)
+ {
+ if (get_tags(l, tag_pattern) != FAIL)
+ {
+ rettv->vval.v_list = l;
+ rettv->v_type = VAR_LIST;
+ ++l->lv_refcount;
+ }
+ else
+ list_free(l);
+ }
+}
+
+/*
* "tempname()" function
*/
/*ARGSUSED*/
@@ -14010,7 +14043,7 @@ set_vim_var_nr(idx, val)
}
/*
- * Get number v: variable value;
+ * Get number v: variable value.
*/
long
get_vim_var_nr(idx)
@@ -14019,6 +14052,18 @@ get_vim_var_nr(idx)
return vimvars[idx].vv_nr;
}
+#if defined(FEAT_AUTOCMD) || defined(PROTO)
+/*
+ * Get string v: variable value. Uses a static buffer, can only be used once.
+ */
+ char_u *
+get_vim_var_str(idx)
+ int idx;
+{
+ return get_tv_string(&vimvars[idx].vv_tv);
+}
+#endif
+
/*
* Set v:count, v:count1 and v:prevcount.
*/
diff --git a/src/fileio.c b/src/fileio.c
index c3aef90a1..1edf0ae79 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1331,7 +1331,8 @@ retry:
/*
* If there is conversion error or not enough room try using
- * another conversion.
+ * another conversion. Except for when there is no
+ * alternative (help files).
*/
while ((iconv(iconv_fd, (void *)&fromp, &from_size,
&top, &to_size)
@@ -2753,7 +2754,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
sfname, sfname, FALSE, curbuf, eap)))
{
- if (bt_nofile(curbuf))
+ if (overwriting && bt_nofile(curbuf))
nofile_err = TRUE;
else
apply_autocmds_exarg(EVENT_BUFWRITEPRE,
@@ -2765,7 +2766,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
sfname, sfname, FALSE, curbuf, eap)))
{
- if (bt_nofile(curbuf))
+ if (overwriting && bt_nofile(curbuf))
nofile_err = TRUE;
else
apply_autocmds_exarg(EVENT_FILEWRITEPRE,
@@ -5917,7 +5918,10 @@ buf_check_timestamp(buf, focus)
#endif
#ifdef FEAT_AUTOCMD
static int busy = FALSE;
+ int n;
+ char_u *s;
#endif
+ char *reason;
/* If there is no file name, the buffer is not loaded, 'buftype' is
* set, we are in the middle of a save or being called recursively: ignore
@@ -5975,15 +5979,26 @@ buf_check_timestamp(buf, focus)
reload = TRUE;
else
{
-#ifdef FEAT_AUTOCMD
- int n;
+ if (stat_res < 0)
+ reason = "deleted";
+ else if (bufIsChanged(buf))
+ reason = "conflict";
+ else if (orig_size != buf->b_orig_size || buf_contents_changed(buf))
+ reason = "changed";
+ else if (orig_mode != buf->b_orig_mode)
+ reason = "mode";
+ else
+ reason = "time";
+#ifdef FEAT_AUTOCMD
/*
* Only give the warning if there are no FileChangedShell
* autocommands.
* Avoid being called recursively by setting "busy".
*/
busy = TRUE;
+ set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+ set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
n = apply_autocmds(EVENT_FILECHANGEDSHELL,
buf->b_fname, buf->b_fname, FALSE, buf);
busy = FALSE;
@@ -5991,13 +6006,19 @@ buf_check_timestamp(buf, focus)
{
if (!buf_valid(buf))
EMSG(_("E246: FileChangedShell autocommand deleted buffer"));
- return 2;
+ s = get_vim_var_str(VV_FCS_CHOICE);
+ if (STRCMP(s, "reload") == 0 && *reason != 'd')
+ reload = TRUE;
+ else if (STRCMP(s, "ask") == 0)
+ n = FALSE;
+ else
+ return 2;
}
- else
+ if (!n)
#endif
{
- if (stat_res < 0)
- mesg = _("E211: Warning: File \"%s\" no longer available");
+ if (*reason == 'd')
+ mesg = _("E211: File \"%s\" no longer available");
else
{
helpmesg = TRUE;
@@ -6010,13 +6031,22 @@ buf_check_timestamp(buf, focus)
* checked out of CVS). Always warn when the buffer was
* changed.
*/
- if (bufIsChanged(buf))
+ if (reason[2] == 'n')
+ {
mesg = _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
- else if (orig_size != buf->b_orig_size
- || buf_contents_changed(buf))
+ mesg2 = _("See \":help W12\" for more info.");
+ }
+ else if (reason[1] == 'h')
+ {
mesg = _("W11: Warning: File \"%s\" has changed since editing started");
- else if (orig_mode != buf->b_orig_mode)
+ mesg2 = _("See \":help W11\" for more info.");
+ }
+ else if (*reason == 'm')
+ {
mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+ mesg2 = _("See \":help W16\" for more info.");
+ }
+ /* Else: only timestamp changed, ignored */
}
}
}
@@ -6038,9 +6068,7 @@ buf_check_timestamp(buf, focus)
path = home_replace_save(buf, buf->b_fname);
if (path != NULL)
{
- if (helpmesg)
- mesg2 = _("See \":help W11\" for more info.");
- else
+ if (!helpmesg)
mesg2 = "";
tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
+ STRLEN(mesg2) + 2));
diff --git a/src/getchar.c b/src/getchar.c
index 8328e19a1..e93ce0529 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1483,10 +1483,14 @@ vgetc()
#endif
)
{
+ int save_allow_keys = allow_keys;
+
++no_mapping;
+ allow_keys = 0; /* make sure BS is not found */
c2 = vgetorpeek(TRUE); /* no mapping for these chars */
c = vgetorpeek(TRUE);
--no_mapping;
+ allow_keys = save_allow_keys;
if (c2 == KS_MODIFIER)
{
mod_mask = c;
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8abdf8613..debc11bc4 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -896,6 +896,38 @@ keyval_to_string(unsigned int keyval, unsigned int state, char_u *string)
}
#endif /* HAVE_GTK2 */
+ static int
+modifiers_gdk2vim(guint state)
+{
+ int modifiers = 0;
+
+ if (state & GDK_SHIFT_MASK)
+ modifiers |= MOD_MASK_SHIFT;
+ if (state & GDK_CONTROL_MASK)
+ modifiers |= MOD_MASK_CTRL;
+ if (state & GDK_MOD1_MASK)
+ modifiers |= MOD_MASK_ALT;
+ if (state & GDK_MOD4_MASK)
+ modifiers |= MOD_MASK_META;
+
+ return modifiers;
+}
+
+ static int
+modifiers_gdk2mouse(guint state)
+{
+ int modifiers = 0;
+
+ if (state & GDK_SHIFT_MASK)
+ modifiers |= MOUSE_SHIFT;
+ if (state & GDK_CONTROL_MASK)
+ modifiers |= MOUSE_CTRL;
+ if (state & GDK_MOD1_MASK)
+ modifiers |= MOUSE_ALT;
+
+ return modifiers;
+}
+
/*
* Main keyboard handler:
*/
@@ -1112,13 +1144,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
#endif
)
{
- modifiers = 0;
- if (state & GDK_SHIFT_MASK)
- modifiers |= MOD_MASK_SHIFT;
- if (state & GDK_CONTROL_MASK)
- modifiers |= MOD_MASK_CTRL;
- if (state & GDK_MOD1_MASK)
- modifiers |= MOD_MASK_ALT;
+ modifiers = modifiers_gdk2vim(state);
/*
* For some keys a shift modifier is translated into another key
@@ -1598,13 +1624,7 @@ process_motion_notify(int x, int y, GdkModifierType state)
}
/* translate modifier coding between the main engine and GTK */
- vim_modifiers = 0x0;
- if (state & GDK_SHIFT_MASK)
- vim_modifiers |= MOUSE_SHIFT;
- if (state & GDK_CONTROL_MASK)
- vim_modifiers |= MOUSE_CTRL;
- if (state & GDK_MOD1_MASK)
- vim_modifiers |= MOUSE_ALT;
+ vim_modifiers = modifiers_gdk2mouse(state);
/* inform the editor engine about the occurence of this event */
gui_send_mouse_event(button, x, y, FALSE, vim_modifiers);
@@ -1796,13 +1816,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
xim_reset();
#endif
- vim_modifiers = 0x0;
- if (event->state & GDK_SHIFT_MASK)
- vim_modifiers |= MOUSE_SHIFT;
- if (event->state & GDK_CONTROL_MASK)
- vim_modifiers |= MOUSE_CTRL;
- if (event->state & GDK_MOD1_MASK)
- vim_modifiers |= MOUSE_ALT;
+ vim_modifiers = modifiers_gdk2mouse(event->state);
gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
if (gtk_main_level() > 0)
@@ -1821,7 +1835,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
{
int button;
- int_u vim_modifiers = 0;
+ int_u vim_modifiers;
if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
gtk_widget_grab_focus(widget);
@@ -1844,12 +1858,7 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
xim_reset();
# endif
- if (event->state & GDK_SHIFT_MASK)
- vim_modifiers |= MOUSE_SHIFT;
- if (event->state & GDK_CONTROL_MASK)
- vim_modifiers |= MOUSE_CTRL;
- if (event->state & GDK_MOD1_MASK)
- vim_modifiers |= MOUSE_ALT;
+ vim_modifiers = modifiers_gdk2mouse(event->state);
gui_send_mouse_event(button, (int)event->x, (int)event->y,
FALSE, vim_modifiers);
@@ -1881,13 +1890,7 @@ button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
x = event->x;
y = event->y;
- vim_modifiers = 0x0;
- if (event->state & GDK_SHIFT_MASK)
- vim_modifiers |= MOUSE_SHIFT;
- if (event->state & GDK_CONTROL_MASK)
- vim_modifiers |= MOUSE_CTRL;
- if (event->state & GDK_MOD1_MASK)
- vim_modifiers |= MOUSE_ALT;
+ vim_modifiers = modifiers_gdk2mouse(event->state);
gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers);
if (gtk_main_level() > 0)
@@ -2001,16 +2004,11 @@ drag_handle_uri_list(GdkDragContext *context,
if (fnames != NULL && nfiles > 0)
{
- int_u modifiers = 0;
+ int_u modifiers;
gtk_drag_finish(context, TRUE, FALSE, time_); /* accept */
- if (state & GDK_SHIFT_MASK)
- modifiers |= MOUSE_SHIFT;
- if (state & GDK_CONTROL_MASK)
- modifiers |= MOUSE_CTRL;
- if (state & GDK_MOD1_MASK)
- modifiers |= MOUSE_ALT;
+ modifiers = modifiers_gdk2mouse(state);
gui_handle_drop(x, y, modifiers, fnames, nfiles);
}
@@ -2061,12 +2059,7 @@ drag_handle_text(GdkDragContext *context,
vim_free(tmpbuf);
# endif
- if (state & GDK_SHIFT_MASK)
- dropkey[2] |= MOD_MASK_SHIFT;
- if (state & GDK_CONTROL_MASK)
- dropkey[2] |= MOD_MASK_CTRL;
- if (state & GDK_MOD1_MASK)
- dropkey[2] |= MOD_MASK_ALT;
+ dropkey[2] = modifiers_gdk2vim(state);
if (dropkey[2] != 0)
add_to_input_buf(dropkey, (int)sizeof(dropkey));
diff --git a/src/gui_w32.c b/src/gui_w32.c
index d6d37c4d1..230836247 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1958,7 +1958,7 @@ gui_mch_draw_string(
++clen;
}
ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
- foptions, pcliprect, unicodebuf, clen, unicodepdy);
+ foptions, pcliprect, unicodebuf, clen, unicodepdy);
len = cells; /* used for underlining */
}
else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9)
@@ -1975,8 +1975,26 @@ gui_mch_draw_string(
(char *)text, len,
(LPWSTR)unicodebuf, unibuflen);
if (len != 0)
+ {
+ /* Use unicodepdy to make characters fit as we expect, even
+ * when the font uses different widths (e.g., bold character
+ * is wider). */
+ if (unicodepdy != NULL)
+ {
+ int i;
+ int cw;
+
+ for (i = 0; i < len; ++i)
+ {
+ cw = utf_char2cells(unicodebuf[i]);
+ if (cw > 2)
+ cw = 1;
+ unicodepdy[i] = cw * gui.char_width;
+ }
+ }
ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
- foptions, pcliprect, unicodebuf, len, NULL);
+ foptions, pcliprect, unicodebuf, len, unicodepdy);
+ }
}
}
else
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 6d990c5d1..809054f0f 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -998,6 +998,8 @@ gui_x11_key_hit_cb(w, dud, event, dum)
modifiers |= MOD_MASK_CTRL;
if (ev_press->state & Mod1Mask)
modifiers |= MOD_MASK_ALT;
+ if (ev_press->state & Mod4Mask)
+ modifiers |= MOD_MASK_META;
/*
* For some keys a shift modifier is translated into another key
diff --git a/src/keymap.h b/src/keymap.h
index cb79ad1e1..5babdf4af 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -458,23 +458,24 @@ enum key_extra
#define MOD_MASK_SHIFT 0x02
#define MOD_MASK_CTRL 0x04
#define MOD_MASK_ALT 0x08 /* aka META */
-#define MOD_MASK_2CLICK 0x10 /* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_3CLICK 0x20 /* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_4CLICK 0x30 /* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_META 0x10 /* META when it's different from ALT */
+#define MOD_MASK_2CLICK 0x20 /* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_3CLICK 0x40 /* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_4CLICK 0x60 /* use MOD_MASK_MULTI_CLICK */
#ifdef MACOS
-# define MOD_MASK_CMD 0x80
+# define MOD_MASK_CMD 0x80
#endif
#define MOD_MASK_MULTI_CLICK (MOD_MASK_2CLICK|MOD_MASK_3CLICK|MOD_MASK_4CLICK)
/*
* The length of the longest special key name, including modifiers.
- * Current longest is <M-C-S-4-MiddleRelease> (length includes '<' and '>').
+ * Current longest is <M-C-S-T-4-MiddleRelease> (length includes '<' and '>').
*/
-#define MAX_KEY_NAME_LEN 23
+#define MAX_KEY_NAME_LEN 25
/* Maximum length of a special key event as tokens. This includes modifiers.
- * The longest event is something like <M-C-S-4-LeftDrag> which would be the
+ * The longest event is something like <M-C-S-T-4-LeftDrag> which would be the
* following string of tokens:
*
* <K_SPECIAL> <KS_MODIFIER> bitmask <K_SPECIAL> <KS_EXTRA> <KT_LEFTDRAG>.
diff --git a/src/misc2.c b/src/misc2.c
index d5a80929b..9b21168d8 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1644,6 +1644,7 @@ static struct modmasktable
} mod_mask_table[] =
{
{MOD_MASK_ALT, MOD_MASK_ALT, (char_u)'M'},
+ {MOD_MASK_META, MOD_MASK_META, (char_u)'T'},
{MOD_MASK_CTRL, MOD_MASK_CTRL, (char_u)'C'},
{MOD_MASK_SHIFT, MOD_MASK_SHIFT, (char_u)'S'},
{MOD_MASK_MULTI_CLICK, MOD_MASK_2CLICK, (char_u)'2'},
diff --git a/src/normal.c b/src/normal.c
index 2d2efc2f3..9bf2e66b7 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2257,7 +2257,8 @@ do_mouse(oap, c, dir, count, fixindent)
* multiple clicks and the middle mouse button.
* Accept shift-leftmouse drags when 'mousemodel' is "popup.*".
*/
- if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT))
+ if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT
+ | MOD_MASK_META))
&& (!is_click
|| (mod_mask & MOD_MASK_MULTI_CLICK)
|| which_button == MOUSE_MIDDLE)
diff --git a/src/option.c b/src/option.c
index 5cf1b4620..e7210b3f9 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3149,11 +3149,13 @@ set_init_2()
* with a dark background, that can handle color. Recognized are:
* "linux" Linux console
* "screen.linux" Linux console with screen
+ * "cygwin" Cygwin shell
*/
idx = findoption((char_u *)"bg");
if (!(options[idx].flags & P_WAS_SET)
&& (STRCMP(T_NAME, "linux") == 0
- || STRCMP(T_NAME, "screen.linux") == 0))
+ || STRCMP(T_NAME, "screen.linux") == 0
+ || STRCMP(T_NAME, "cygwin") == 0))
{
set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
/* don't mark it as set, when starting the GUI it may be changed
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 68d46c0f2..eed0ebbe9 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -292,7 +292,13 @@ mac_conv_init()
if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
utf8_canon_encoding) != noErr)
- gUTF16ToUTF8Converter = NULL;
+ {
+ /* On pre-10.3, Unicode normalization is not available so
+ * fall back to non-normalizing converter */
+ if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
+ utf8_encoding) != noErr)
+ gUTF16ToUTF8Converter = NULL;
+ }
}
/*
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 4f3a49bef..5e96da8af 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -385,6 +385,7 @@ mch_FullName(
else
#endif
{
+#ifdef FEAT_MBYTE
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
# ifdef __BORLANDC__
/* Wide functions of Borland C 5.5 do not work on Windows 98. */
@@ -415,7 +416,6 @@ mch_FullName(
vim_free(wname);
vim_free(cname);
}
-#ifdef FEAT_MBYTE
if (nResult == FAIL) /* fall back to non-wide function */
#endif
{
@@ -2487,8 +2487,13 @@ serverSendEnc(HWND target)
COPYDATASTRUCT data;
data.dwData = COPYDATA_ENCODING;
+#ifdef FEAT_MBYTE
data.cbData = STRLEN(p_enc) + 1;
data.lpData = p_enc;
+#else
+ data.cbData = STRLEN("latin1") + 1;
+ data.lpData = "latin1";
+#endif
(void)SendMessage(target, WM_COPYDATA, (WPARAM)message_window,
(LPARAM)(&data));
}
diff --git a/src/po/ja.po b/src/po/ja.po
index 17d94d516..8b8559efc 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,188 +3,188 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: buffer.c:102
+#: ../buffer.c:102
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: ¥Ð¥Ã¥Õ¥¡¤ò1¤Ä¤âºîÀ®¤Ç¤­¤Ê¤¤¤Î¤Ç, ½ªÎ»¤·¤Þ¤¹..."
-#: buffer.c:105
+#: ../buffer.c:105
msgid "E83: Cannot allocate buffer, using other one..."
msgstr "E83: ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤­¤Ê¤¤¤Î¤Ç, ¾¤Î¤ò»ÈÍѤ·¤Þ¤¹..."
-#: buffer.c:805
+#: ../buffer.c:857
msgid "E515: No buffers were unloaded"
msgstr "E515: ²òÊü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: buffer.c:807
+#: ../buffer.c:859
msgid "E516: No buffers were deleted"
msgstr "E516: ºï½ü¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: buffer.c:809
+#: ../buffer.c:861
msgid "E517: No buffers were wiped out"
msgstr "E517: ÇË´þ¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: buffer.c:817
+#: ../buffer.c:869
msgid "1 buffer unloaded"
msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬²òÊü¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:819
+#: ../buffer.c:871
#, c-format
msgid "%d buffers unloaded"
msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬²òÊü¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:824
+#: ../buffer.c:876
msgid "1 buffer deleted"
msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:826
+#: ../buffer.c:878
#, c-format
msgid "%d buffers deleted"
msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:831
+#: ../buffer.c:883
msgid "1 buffer wiped out"
msgstr "1 ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:833
+#: ../buffer.c:885
#, c-format
msgid "%d buffers wiped out"
msgstr "%d ¸Ä¤Î¥Ð¥Ã¥Õ¥¡¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿"
-#: buffer.c:894
+#: ../buffer.c:946
msgid "E84: No modified buffer found"
msgstr "E84: Êѹ¹¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
#. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
msgid "E85: There is no listed buffer"
msgstr "E85: ¥ê¥¹¥Èɽ¼¨¤µ¤ì¤ë¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: buffer.c:945
+#: ../buffer.c:997
#, c-format
msgid "E86: Buffer %ld does not exist"
msgstr "E86: ¥Ð¥Ã¥Õ¥¡ %ld ¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: buffer.c:948
+#: ../buffer.c:1000
msgid "E87: Cannot go beyond last buffer"
msgstr "E87: ºÇ¸å¤Î¥Ð¥Ã¥Õ¥¡¤ò±Û¤¨¤Æ°ÜÆ°¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: buffer.c:950
+#: ../buffer.c:1002
msgid "E88: Cannot go before first buffer"
msgstr "E88: ºÇ½é¤Î¥Ð¥Ã¥Õ¥¡¤è¤êÁ°¤Ø¤Ï°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
-#: buffer.c:988
+#: ../buffer.c:1044
#, c-format
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: ¥Ð¥Ã¥Õ¥¡ %ld ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤ÇÊѹ¹¤òÇË´þ)"
-#: buffer.c:1005
+#: ../buffer.c:1061
msgid "E90: Cannot unload last buffer"
msgstr "E90: ºÇ¸å¤Î¥Ð¥Ã¥Õ¥¡¤Ï²òÊü¤Ç¤­¤Þ¤»¤ó"
-#: buffer.c:1538
+#: ../buffer.c:1611
msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹¤¹¤®¤Þ¤¹"
+msgstr "W14: ·Ù¹ð: ¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È¤¬Ä¹²á¤®¤Þ¤¹"
-#: buffer.c:1709
+#: ../buffer.c:1795
#, c-format
msgid "E92: Buffer %ld not found"
msgstr "E92: ¥Ð¥Ã¥Õ¥¡ %ld ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: buffer.c:1940
+#: ../buffer.c:2058
#, c-format
msgid "E93: More than one match for %s"
msgstr "E93: %s ¤ËÊ£¿ô¤Î³ºÅö¤¬¤¢¤ê¤Þ¤·¤¿"
-#: buffer.c:1942
+#: ../buffer.c:2060
#, c-format
msgid "E94: No matching buffer for %s"
msgstr "E94: %s ¤Ë³ºÅö¤¹¤ë¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: buffer.c:2337
+#: ../buffer.c:2473
#, c-format
msgid "line %ld"
msgstr "¹Ô %ld"
-#: buffer.c:2420
+#: ../buffer.c:2561
msgid "E95: Buffer with this name already exists"
msgstr "E95: ¤³¤Î̾Á°¤Î¥Ð¥Ã¥Õ¥¡¤Ï´û¤Ë¤¢¤ê¤Þ¤¹"
-#: buffer.c:2713
+#: ../buffer.c:2878
msgid " [Modified]"
msgstr " [Êѹ¹¤¢¤ê]"
-#: buffer.c:2718
+#: ../buffer.c:2883
msgid "[Not edited]"
msgstr "[̤ÊÔ½¸]"
-#: buffer.c:2723
+#: ../buffer.c:2888
msgid "[New file]"
msgstr "[¿·¥Õ¥¡¥¤¥ë]"
-#: buffer.c:2724
+#: ../buffer.c:2889
msgid "[Read errors]"
msgstr "[Æɹþ¥¨¥é¡¼]"
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
msgid "[readonly]"
msgstr "[ÆɹþÀìÍÑ]"
-#: buffer.c:2747
+#: ../buffer.c:2912
msgid "1 line --%d%%--"
msgstr "1 ¹Ô --%d%%--"
-#: buffer.c:2749
+#: ../buffer.c:2914
msgid "%ld lines --%d%%--"
msgstr "%ld ¹Ô --%d%%--"
-#: buffer.c:2756
+#: ../buffer.c:2921
msgid "line %ld of %ld --%d%%-- col "
msgstr "¹Ô %ld (Á´ÂÎ %ld) --%d%%-- col "
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[̵Âê]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[̵̾]"
#. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
msgid "help"
msgstr "¥Ø¥ë¥×"
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
msgid "[help]"
msgstr "[¥Ø¥ë¥×]"
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
msgid "[Preview]"
msgstr "[¥×¥ì¥Ó¥å¡¼]"
-#: buffer.c:3775
+#: ../buffer.c:3931
msgid "All"
msgstr "Á´¤Æ"
-#: buffer.c:3775
+#: ../buffer.c:3931
msgid "Bot"
msgstr "ËöÈø"
-#: buffer.c:3777
+#: ../buffer.c:3933
msgid "Top"
msgstr "ÀèƬ"
-#: buffer.c:4523
+#: ../buffer.c:4702
msgid ""
"\n"
"# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
"\n"
"# ¥Ð¥Ã¥Õ¥¡¥ê¥¹¥È:\n"
-#: buffer.c:4556
+#: ../buffer.c:4737
msgid "[Error List]"
msgstr "[¥¨¥é¡¼¥ê¥¹¥È]"
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[̵Âê]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
msgid ""
"\n"
"--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
"\n"
"--- ¥µ¥¤¥ó ---"
-#: buffer.c:4901
+#: ../buffer.c:5082
#, c-format
msgid "Signs for %s:"
msgstr "%s ¤Î¥µ¥¤¥ó:"
-#: buffer.c:4907
+#: ../buffer.c:5088
#, c-format
msgid " line=%ld id=%d name=%s"
msgstr " ¹Ô=%ld ¼±ÊÌ»Ò=%d ̾Á°=%s"
-#: diff.c:139
+#: ../diff.c:163
#, c-format
msgid "E96: Can not diff more than %ld buffers"
msgstr "E96: %ld °Ê¾å¤Î¥Ð¥Ã¥Õ¥¡¤Ïdiff¤Ç¤­¤Þ¤»¤ó"
-#: diff.c:709
+#: ../diff.c:737
msgid "E97: Cannot create diffs"
msgstr "E97: º¹Ê¬¤òºîÀ®¤Ç¤­¤Þ¤»¤ó "
-#: diff.c:814
+#: ../diff.c:843
msgid "Patch file"
msgstr "¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë"
-#: diff.c:1065
+#: ../diff.c:1146
msgid "E98: Cannot read diff output"
msgstr "E98: diff¤Î½ÐÎϤòÆɹþ¤á¤Þ¤»¤ó"
-#: diff.c:1815
+#: ../diff.c:1896
msgid "E99: Current buffer is not in diff mode"
msgstr "E99: ¸½ºß¤Î¥Ð¥Ã¥Õ¥¡¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: diff.c:1827
+#: ../diff.c:1908
msgid "E100: No other buffer in diff mode"
msgstr "E100: º¹Ê¬¥â¡¼¥É¤Ç¤¢¤ë¾¤Î¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: diff.c:1835
+#: ../diff.c:1916
msgid "E101: More than two buffers in diff mode, don't know which one to use"
msgstr ""
"E101: º¹Ê¬¥â¡¼¥É¤Î¥Ð¥Ã¥Õ¥¡¤¬2¸Ä°Ê¾å¤¢¤ë¤Î¤Ç¡¢¤É¤ì¤ò»È¤¦¤«ÆÃÄê¤Ç¤­¤Þ¤»¤ó"
-#: diff.c:1858
+#: ../diff.c:1939
#, c-format
msgid "E102: Can't find buffer \"%s\""
msgstr "E102: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: diff.c:1864
+#: ../diff.c:1945
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤Ïº¹Ê¬¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: digraph.c:2199
+#: ../digraph.c:2200
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ¹ç»ú¤ËEscape¤Ï»ÈÍѤǤ­¤Þ¤»¤ó"
-#: digraph.c:2384
+#: ../digraph.c:2384
msgid "E544: Keymap file not found"
msgstr "E544: ¥­¡¼¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: digraph.c:2411
+#: ../digraph.c:2411
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :source ¤Ç¼è¹þ¤à¥Õ¥¡¥¤¥ë°Ê³°¤Ç¤Ï :loadkeymap ¤ò»È¤¨¤Þ¤»¤ó"
-#: edit.c:40
+#: ../edit.c:41
msgid " Keyword completion (^N^P)"
msgstr " ¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-#: edit.c:41
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " ^X ¥â¡¼¥É (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X ¥â¡¼¥É (^E^Y^L^]^F^I^K^D^U^V^N^P)"
#. Scroll has it's own msgs, in it's place there is the msg for local
#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-#: edit.c:44
+#: ../edit.c:45
msgid " Keyword Local completion (^N^P)"
msgstr " ¶É½ê¥­¡¼¥ï¡¼¥ÉÊä´° (^N^P)"
-#: edit.c:45
+#: ../edit.c:46
msgid " Whole line completion (^L^N^P)"
msgstr " ¹Ô(Á´ÂÎ)Êä´° (^L^N^P)"
-#: edit.c:46
+#: ../edit.c:47
msgid " File name completion (^F^N^P)"
msgstr "¥Õ¥¡¥¤¥ë̾Êä´° (^F^N^P)"
-#: edit.c:47
+#: ../edit.c:48
msgid " Tag completion (^]^N^P)"
msgstr " ¥¿¥°Êä´° (^]^N^P)"
-#: edit.c:48
+#: ../edit.c:49
msgid " Path pattern completion (^N^P)"
msgstr " ¥Ñ¥¹¥Ñ¥¿¡¼¥óÊä´° (^N^P)"
-#: edit.c:49
+#: ../edit.c:50
msgid " Definition completion (^D^N^P)"
msgstr " ÄêµÁÊä´° (^D^N^P)"
-#: edit.c:51
+#: ../edit.c:52
msgid " Dictionary completion (^K^N^P)"
msgstr " ¼­½ñÊä´° (^K^N^P)"
-#: edit.c:52
+#: ../edit.c:53
msgid " Thesaurus completion (^T^N^P)"
msgstr " ¥·¥½¡¼¥é¥¹Êä´° (^T^N^P)"
-#: edit.c:53
+#: ../edit.c:54
msgid " Command-line completion (^V^N^P)"
msgstr " ¥³¥Þ¥ó¥É¥é¥¤¥óÊä´° (^V^N^P)"
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ¥æ¡¼¥¶ÄêµÁÊä´° (^U^N^P)"
+
+#: ../edit.c:58
msgid "Hit end of paragraph"
msgstr "ÃÊÍî¤ÎºÇ¸å¤Ë¥Ò¥Ã¥È"
-#: edit.c:962
+#: ../edit.c:994
msgid "'thesaurus' option is empty"
msgstr "'thesaurus' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-#: edit.c:1166
+#: ../edit.c:1204
msgid "'dictionary' option is empty"
msgstr "'dictionary' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-#: edit.c:2162
+#: ../edit.c:2204
#, c-format
msgid "Scanning dictionary: %s"
msgstr "¼­½ñ¤ò¥¹¥­¥ã¥óÃæ: %s"
-#: edit.c:2368
+#: ../edit.c:2410
msgid " (insert) Scroll (^E/^Y)"
msgstr " (ÁÞÆþ) ¥¹¥¯¥í¡¼¥ë(^E/^Y)"
-#: edit.c:2370
+#: ../edit.c:2412
msgid " (replace) Scroll (^E/^Y)"
msgstr " (ÃÖ´¹) ¥¹¥¯¥í¡¼¥ë (^E/^Y)"
-#: edit.c:2684
+#: ../edit.c:2813
#, c-format
msgid "Scanning: %s"
msgstr "¥¹¥­¥ã¥óÃæ: %s"
-#: edit.c:2719
+#: ../edit.c:2848
msgid "Scanning tags."
msgstr "¥¿¥°¤ò¥¹¥­¥ã¥óÃæ."
-#: edit.c:3381
+#: ../edit.c:3549
msgid " Adding"
msgstr " ÄɲÃÃæ"
@@ -359,121 +359,283 @@ msgstr " ÄɲÃÃæ"
#. * be called before line = ml_get(), or when this address is no
#. * longer needed. -- Acevedo.
#.
-#: edit.c:3430
+#: ../edit.c:3598
msgid "-- Searching..."
msgstr "-- ¸¡º÷Ãæ..."
-#: edit.c:3486
+#: ../edit.c:3654
msgid "Back at original"
msgstr "»Ï¤á¤ËÌá¤ë"
-#: edit.c:3491
+#: ../edit.c:3659
msgid "Word from other line"
msgstr "¾¤Î¹Ô¤Îñ¸ì"
-#: edit.c:3496
+#: ../edit.c:3664
msgid "The only match"
msgstr "Í£°ì¤Î³ºÅö"
-#: edit.c:3555
+#: ../edit.c:3723
#, c-format
msgid "match %d of %d"
msgstr "%d ÈÖÌܤγºÅö (Á´³ºÅö %d ¸ÄÃæ)"
-#: edit.c:3558
+#: ../edit.c:3726
#, c-format
msgid "match %d"
msgstr "%d ÈÖÌܤγºÅö"
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ :let ¤Ë¤¢¤ê¤Þ¤·¤¿"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ¥ê¥¹¥È¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬Èϰϳ°¤Ç¤¹: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#: ../eval.c:97
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: ̤ÃΤÎÊÑ¿ô: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s ¤Î°ú¿ô¤Ï¥ê¥¹¥È·¿¤Þ¤¿¤Ï¼­½ñ·¿¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: ¼­½ñ·¿¤Ë¶õ¤Î¥­¡¼¤ò»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: ¥ê¥¹¥È·¿¤¬É¬ÍפǤ¹"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: ¼­½ñ·¿¤¬É¬ÍפǤ¹"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ¼­½ñ·¿¤Ë¥­¡¼¤¬Â¸ºß¤·¤Þ¤»¤ó: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ¼­½ñ·¿Æâ¤Ë¥¨¥ó¥È¥ê¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: ´Ø¿ô»²¾È·¿¤¬Í׵ᤵ¤ì¤Þ¤¹"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] ¤ò¼­½ñ·¿¤ÈÁȤ߹ç¤ï¤»¤Æ¤Ï»È¤¨¤Þ¤»¤ó"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: °Û¤Ê¤Ã¤¿·¿¤ÎÊÑ¿ô¤Ç¤¹ %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤ÃΤδؿô¤Ç¤¹: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¾¯¤Ê¤¤¤Ç¤¹"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: ¥¿¡¼¥²¥Ã¥È¤¬¥ê¥¹¥È·¿Æâ¤ÎÍ×ÁǤè¤ê¤â¿¤¤¤Ç¤¹"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "¥ê¥¹¥È·¿¤ÎÃͤË2¤Ä°Ê¾å¤Î ; ¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ¤ÎÃͤò°ìÍ÷ɽ¼¨¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ¥ê¥¹¥È·¿¤È¼­½ñ·¿°Ê³°¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹»ØÄê¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ¤ÏºÇ¸å¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ¤Ë¤Ï¥ê¥¹¥È·¿¤ÎÃͤ¬É¬ÍפǤ¹"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë¥¿¡¼¥²¥Ã¥È¤è¤ê¤â¿¤¤Í×ÁǤ¬¤¢¤ê¤Þ¤¹"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë½½Ê¬¤Ê¿ô¤ÎÍ×ÁǤ¬¤¢¤ê¤Þ¤»¤ó"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ¤Î¸å¤Ë \"in\" ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: eval.c:1320
+#: ../eval.c:2721
#, c-format
msgid "E107: Missing braces: %s"
msgstr "E107: ¥«¥Ã¥³ '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: ¤½¤ÎÊÑ¿ô¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (¥¢¥ó¥Á)¥í¥Ã¥¯¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+#: ../eval.c:3336
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ¤Î¸å¤Ë ':' ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: ¥ê¥¹¥È·¿¤Ï¥ê¥¹¥È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ¥ê¥¹¥È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ¼­½ñ·¿¤Ï¼­½ñ·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ¼­½ñ·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: ´Ø¿ô»²¾È·¿¤Ï´Ø¿ô»²¾È·¿¤È¤·¤«Èæ³Ó¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ´Ø¿ô»²¾È·¿¤Ë¤Ï̵¸ú¤ÊÁàºî¤Ç¤¹"
+
+#: ../eval.c:4086
msgid "E110: Missing ')'"
msgstr "E110: ')' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ´Ø¿ô»²¾È·¿¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ç¤­¤Þ¤»¤ó"
-#: eval.c:2466
+#: ../eval.c:4432
#, c-format
msgid "E112: Option name missing: %s"
msgstr "E112: ¥ª¥×¥·¥ç¥ó̾¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:2484
+#: ../eval.c:4450
#, c-format
msgid "E113: Unknown option: %s"
msgstr "E113: ̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹: %s"
-#: eval.c:2555
+#: ../eval.c:4516
#, c-format
msgid "E114: Missing quote: %s"
msgstr "E114: °úÍÑÉä (\") ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:2698
+#: ../eval.c:4652
#, c-format
msgid "E115: Missing quote: %s"
msgstr "E115: °úÍÑÉä (') ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:3054
+#: ../eval.c:4731
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ´Ø¿ô %s ¤Ë¤Ï̵¸ú¤Ê°ú¿ô¤Ç¤¹"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ¥ê¥¹¥È·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:3083
+#: ../eval.c:4739
#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤ÃΤδؿô¤Ç¤¹: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ¥ê¥¹¥È·¿¤ÎºÇ¸å¤Ë ']' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:3084
+#: ../eval.c:5768
#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ´Ø¿ô¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ¼­½ñ·¿¤Ë¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: ¼­½ñ·¿¤Ë½ÅÊ£¥­¡¼¤¬¤½¤ó¤¶¤¤¤·¤Þ¤¹"
-#: eval.c:3085
+#: ../eval.c:5811
#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ´Ø¿ô¤Î°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ¼­½ñ·¿¤Ë¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:3086
+#: ../eval.c:5819
#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ¼­½ñ·¿¤ÎºÇ¸å¤Ë '}' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: ɽ¼¨¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: ¤¬Â¿²á¤®¤Þ¤¹"
#.
#. * Yes this is ugly, I don't particularly like it either. But doing it
#. * this way has the compelling advantage that translations need not to
#. * be touched at all. See below what 'ok' and 'ync' are used for.
#.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
msgid "&Ok"
msgstr "&Ok"
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s ¤È¤¤¤¦¥­¡¼¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
+
+#: ../eval.c:8339
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld ¹Ô:"
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ̤ÃΤδؿô¤Ç¤¹: %s"
+
+#: ../eval.c:9966
msgid ""
"&OK\n"
"&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
"·èÄê(&O)\n"
"¥­¥ã¥ó¥»¥ë(&C)"
-#: eval.c:5517
+#: ../eval.c:10005
msgid "called inputrestore() more often than inputsave()"
msgstr "inputrestore() ¤¬ inputsave() ¤è¤ê¤â¿¤¯¸Æ¤Ð¤ì¤Þ¤·¤¿"
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬Â¿²á¤®¤Þ¤¹ (½Û´Ä¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() ¤Ë¤Ï̵¸ú¤Ê·¿¤Ç¤¹"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: ¥¹¥È¥é¥¤¥É(Á°¿ÊÎÌ)¤¬ 0 ¤Ç¤¹"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: ³«»Ï°ÌÃÖ¤¬½ªÎ»°ÌÃÖ¤ò±Û¤¨¤Þ¤·¤¿"
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<¶õ>"
+
+#: ../eval.c:11287
msgid "E240: No connection to Vim server"
msgstr "E240: Vim ¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s ¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:11465
msgid "E277: Unable to read a server reply"
msgstr "E277: ¥µ¡¼¥Ð¤Î±þÅú¤¬¤¢¤ê¤Þ¤»¤ó"
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬Â¿²á¤®¤Þ¤¹ (½Û´Ä¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)"
+
+#: ../eval.c:12144
msgid "E258: Unable to send to client"
msgstr "E258: ¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s ¤ØÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: ¥½¡¼¥È¤ÎÈæ³Ó´Ø¿ô¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: eval.c:6882
+#: ../eval.c:12670
msgid "(Invalid)"
msgstr "(̵¸ú)"
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: °ì»þ¥Õ¥¡¥¤¥ë½ñ¹þÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: ´Ø¿ô»²¾È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: ¥ê¥¹¥È·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: ¼­½ñ·¿¤ò¿ôÃͤȤ·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: ¥ê¥¹¥È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: ÊÑ¿ô·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹"
+
+#: ../eval.c:14826
#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ̤ÄêµÁ¤ÎÊÑ¿ô¤Ç¤¹: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: ´Ø¿ô»²¾È·¿ÊÑ¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: ÊÑ¿ô̾¤¬´û¸¤Î´Ø¿ô̾¤È¾×Æͤ·¤Þ¤¹: %s"
-#: eval.c:8492
+#: ../eval.c:14840
#, c-format
msgid "E461: Illegal variable name: %s"
msgstr "E461: ÉÔÀµ¤ÊÊÑ¿ô̾¤Ç¤¹: %s"
-#: eval.c:8784
+#: ../eval.c:14857
#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ´Ø¿ô %s ¤ÏÄêµÁºÑ¤Ç¤¹, ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: ÊÑ¿ô¤Î·¿¤¬°ìÃפ·¤Þ¤»¤ó: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: Ãͤ¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "ÉÔÌÀ"
-#: eval.c:8857
+#: ../eval.c:14952
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤ÄêµÁ¤Î´Ø¿ô¤Ç¤¹: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ¤ÎÃͤòÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ¥³¥Ô¡¼¤ò¼è¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-#: eval.c:8870
+#: ../eval.c:15458
#, c-format
msgid "E124: Missing '(': %s"
msgstr "E124: '(' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: eval.c:8903
+#: ../eval.c:15491
#, c-format
msgid "E125: Illegal argument: %s"
msgstr "E125: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
-#: eval.c:8982
+#: ../eval.c:15579
msgid "E126: Missing :endfunction"
msgstr "E126: :endfunction ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: eval.c:9089
+#: ../eval.c:15765
#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ´Ø¿ô %s ¤òºÆÄêµÁ¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ´Ø¿ô̾¤¬¥¹¥¯¥ê¥×¥È¤Î¥Õ¥¡¥¤¥ë̾¤È°ìÃפ·¤Þ¤»¤ó: %s"
-#: eval.c:9159
+#: ../eval.c:15878
msgid "E129: Function name required"
msgstr "E129: ´Ø¿ô̾¤¬Í׵ᤵ¤ì¤Þ¤¹"
-#: eval.c:9210
+#: ../eval.c:15963
#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: ´Ø¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: ´Ø¿ô̾¤ÏÂçʸ»ú¤Ç»Ï¤Þ¤ë¤«¥³¥í¥ó¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: %s"
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: ̤ÄêµÁ¤Î´Ø¿ô¤Ç¤¹: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
msgstr "E131: ´Ø¿ô %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó: »ÈÍÑÃæ¤Ç¤¹"
-#: eval.c:9455
+#: ../eval.c:16561
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: ´Ø¿ô¸Æ½Ð¤ÎÆþ¤ì»Ò¿ô¤¬ 'maxfuncdepth' ¤òĶ¤¨¤Þ¤·¤¿"
#. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
#, c-format
msgid "calling %s"
msgstr "%s ¤ò¼Â¹ÔÃæ¤Ç¤¹"
-#: eval.c:9570
+#: ../eval.c:16785
#, c-format
msgid "%s aborted"
msgstr "%s ¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
-#: eval.c:9572
+#: ../eval.c:16787
#, c-format
msgid "%s returning #%ld"
msgstr "%s ¤¬ #%ld ¤òÊÖ¤·¤Þ¤·¤¿"
-#: eval.c:9579
+#: ../eval.c:16797
#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ¤¬ \"%s\" ¤òÊÖ¤·¤Þ¤·¤¿"
+msgid "%s returning %s"
+msgstr "%s ¤¬ %s ¤òÊÖ¤·¤Þ¤·¤¿"
#. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
#, c-format
msgid "continuing in %s"
msgstr "%s ¤Î¼Â¹Ô¤ò·Ñ³Ãæ¤Ç¤¹"
-#: eval.c:9621
+#: ../eval.c:16866
msgid "E133: :return not inside a function"
msgstr "E133: ´Ø¿ô³°¤Ë :return ¤¬¤¢¤ê¤Þ¤·¤¿"
-#: eval.c:9952
+#: ../eval.c:17266
msgid ""
"\n"
"# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
"\n"
"# ¥°¥í¡¼¥Ð¥ëÊÑ¿ô:\n"
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16¿Ê¿ô %02x, 8¿Ê¿ô %03o"
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
#, c-format
msgid "> %d, Hex %04x, Octal %o"
msgstr "> %d, 16¿Ê¿ô %04x, 8¿Ê¿ô %o"
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
#, c-format
msgid "> %d, Hex %08x, Octal %o"
msgstr "> %d, 16¿Ê¿ô %08x, 8¿Ê¿ô %o"
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
msgid "E134: Move lines into themselves"
msgstr "E134: ¹Ô¤ò¤½¤ì¼«¿È¤Ë¤Ï°ÜÆ°¤Ç¤­¤Þ¤»¤ó"
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
msgid "1 line moved"
msgstr "1 ¹Ô¤¬°ÜÆ°¤µ¤ì¤Þ¤·¤¿"
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
#, c-format
msgid "%ld lines moved"
msgstr "%ld ¹Ô¤¬°ÜÆ°¤µ¤ì¤Þ¤·¤¿"
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
#, c-format
msgid "%ld lines filtered"
msgstr "%ld ¹Ô¤¬¥Õ¥£¥ë¥¿½èÍý¤µ¤ì¤Þ¤·¤¿"
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
msgid "E135: *Filter* Autocommands must not change current buffer"
msgstr "E135: *¥Õ¥£¥ë¥¿* autocommand¤Ï¸½ºß¤Î¥Ð¥Ã¥Õ¥¡¤òÊѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó"
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
msgid "[No write since last change]\n"
msgstr "[ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó]\n"
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s ¹ÔÌÜ: "
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
msgid "E136: viminfo: Too many errors, skipping rest of file"
msgstr "E136: viminfo: ¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, °Ê¹ß¤Ï¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
msgstr "viminfo¥Õ¥¡¥¤¥ë \"%s\"%s%s%s ¤òÆɹþ¤ßÃæ "
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
msgid " info"
msgstr " ¾ðÊó"
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
msgid " marks"
msgstr " ¥Þ¡¼¥¯"
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
msgid " FAILED"
msgstr " ¼ºÇÔ"
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfo¥Õ¥¡¥¤¥ë¤¬½ñ¹þ¤ß¤Ç¤­¤Þ¤»¤ó: %s"
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
#, c-format
msgid "E138: Can't write viminfo file %s!"
msgstr "E138: viminfo¥Õ¥¡¥¤¥ë %s ¤òÊݸ¤Ç¤­¤Þ¤»¤ó!"
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
#, c-format
msgid "Writing viminfo file \"%s\""
msgstr "viminfo¥Õ¥¡¥¤¥ë \"%s\" ¤ò½ñ¹þ¤ßÃæ"
#. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
#, c-format
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# ¤³¤Î viminfo ¥Õ¥¡¥¤¥ë¤Ï Vim %s ¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤Þ¤·¤¿.\n"
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -708,47 +935,47 @@ msgstr ""
"# Êѹ¹¤¹¤ëºÝ¤Ë¤Ï½½Ê¬Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤!\n"
"\n"
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# ¤³¤Î¥Õ¥¡¥¤¥ë¤¬½ñ¤«¤ì¤¿»þ¤Î 'encoding' ¤ÎÃÍ\n"
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
msgid "Illegal starting char"
msgstr "ÉÔÀµ¤ÊÀèƬʸ»ú¤Ç¤¹"
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
msgid "Save As"
msgstr "ÊÌ̾¤ÇÊݸ"
#. Overwriting a file that is loaded in another buffer is not a
#. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
msgid "E139: File is loaded in another buffer"
msgstr "E139: Ʊ¤¸Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬Â¾¤Î¥Ð¥Ã¥Õ¥¡¤ÇÆɹþ¤Þ¤ì¤Æ¤¤¤Þ¤¹"
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
msgid "Write partial file?"
msgstr "¥Õ¥¡¥¤¥ë¤òÉôʬŪ¤ËÊݸ¤·¤Þ¤¹¤«?"
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
msgid "E140: Use ! to write partial buffer"
msgstr "E140: ¥Ð¥Ã¥Õ¥¡¤òÉôʬŪ¤ËÊݸ¤¹¤ë¤Ë¤Ï ! ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
#, c-format
msgid "Overwrite existing file \"%.*s\"?"
msgstr "´û¸¤Î¥Õ¥¡¥¤¥ë \"%.*s\" ¤ò¾å½ñ¤­¤·¤Þ¤¹¤«?"
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: ¥Ð¥Ã¥Õ¥¡ %ld ¤Ë¤Ï̾Á°¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
msgid "E142: File not written: Writing is disabled by 'write' option"
msgstr "E142: ¥Õ¥¡¥¤¥ë¤ÏÊݸ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿: 'write' ¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê̵¸ú¤Ç¤¹"
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
#, c-format
msgid ""
"'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
"\"%.*s\" ¤Ë¤Ï 'readonly' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
"¶¯À©Åª¤Ë¾å½ñ¤­¤·¤Þ¤¹¤«?"
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
msgid "Edit File"
msgstr "¥Õ¥¡¥¤¥ë¤òÊÔ½¸"
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
#, c-format
msgid "E143: Autocommands unexpectedly deleted new buffer %s"
msgstr "E143: autocommand¤¬Í½´ü¤»¤º¿·¤·¤¤¥Ð¥Ã¥Õ¥¡ %s ¤òºï½ü¤·¤Þ¤·¤¿"
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
msgid "E144: non-numeric argument to :z"
msgstr "E144: ¿ô¤Ç¤Ï¤Ê¤¤°ú¿ô¤¬ :z ¤ËÅϤµ¤ì¤Þ¤·¤¿"
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
msgid "E145: Shell commands not allowed in rvim"
msgstr "E145: rvim¤Ç¤Ï¥·¥§¥ë¥³¥Þ¥ó¥É¤ò»È¤¨¤Þ¤»¤ó"
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
msgid "E146: Regular expressions can't be delimited by letters"
msgstr "E146: Àµµ¬É½¸½¤Ïʸ»ú¤Ç¶èÀڤ뤳¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
msgstr "%s ¤ËÃÖ´¹¤·¤Þ¤¹¤«? (y/n/a/q/l/^E/^Y)"
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
msgid "(Interrupted) "
msgstr "(³ä¹þ¤Þ¤ì¤Þ¤·¤¿)"
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 ²Õ½ê³ºÅö¤·¤Þ¤·¤¿"
+
+#: ../ex_cmds.c:4547
msgid "1 substitution"
msgstr "1 ²Õ½êÃÖ´¹¤·¤Þ¤·¤¿"
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ²Õ½ê³ºÅö¤·¤Þ¤·¤¿"
+
+#: ../ex_cmds.c:4550
#, c-format
msgid "%ld substitutions"
msgstr "%ld ²Õ½êÃÖ´¹¤·¤Þ¤·¤¿"
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
msgid " on 1 line"
msgstr " (·× 1 ¹ÔÆâ)"
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
#, c-format
msgid " on %ld lines"
msgstr " (·× %ld ¹ÔÆâ)"
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
msgid "E147: Cannot do :global recursive"
msgstr "E147: :global ¤òºÆµ¢Åª¤Ë¤Ï»È¤¨¤Þ¤»¤ó"
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
msgid "E148: Regular expression missing from global"
msgstr "E148: global¥³¥Þ¥ó¥É¤ËÀµµ¬É½¸½¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
#, c-format
msgid "Pattern found in every line: %s"
msgstr "¥Ñ¥¿¡¼¥ó¤¬Á´¤Æ¤Î¹Ô¤Ç¤ß¤Ä¤«¤ê¤Þ¤·¤¿: %s"
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
"# ºÇ¸å¤ËÃÖ´¹¤µ¤ì¤¿Ê¸»úÎó:\n"
"$"
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
msgid "E478: Don't panic!"
msgstr "E478: ¹²¤Æ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤"
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
#, c-format
msgid "E661: Sorry, no '%s' help for %s"
msgstr "E661: »ÄÇ°¤Ç¤¹¤¬ '%s' ¤Î¥Ø¥ë¥×¤¬ %s ¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
#, c-format
msgid "E149: Sorry, no help for %s"
msgstr "E149: »ÄÇ°¤Ç¤¹¤¬ %s ¤Ë¤Ï¥Ø¥ë¥×¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
#, c-format
msgid "Sorry, help file \"%s\" not found"
msgstr "»ÄÇ°¤Ç¤¹¤¬¥Ø¥ë¥×¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
#, c-format
msgid "E150: Not a directory: %s"
msgstr "E150: ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
#, c-format
msgid "E152: Cannot open %s for writing"
msgstr "E152: ½ñ¹þ¤ßÍÑ¤Ë %s ¤ò³«¤±¤Þ¤»¤ó"
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
#, c-format
msgid "E153: Unable to open %s for reading"
msgstr "E153: ÆɹþÍÑ¤Ë %s ¤ò³«¤±¤Þ¤»¤ó"
# Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
#, c-format
msgid "E670: Mix of help file encodings within a language: %s"
msgstr "E670: 1¤Ä¤Î¸À¸ì¤Î¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î¥¨¥ó¥³¡¼¥É¤¬º®ºß¤·¤Æ¤¤¤Þ¤¹: %s"
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ¥¿¥° \"%s\" ¤¬¥Õ¥¡¥¤¥ë %s ¤Ë½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: ¥¿¥° \"%s\" ¤¬¥Õ¥¡¥¤¥ë %s/%s ¤Ë½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
#, c-format
msgid "E160: Unknown sign command: %s"
msgstr "E160: ̤ÃΤÎsign¥³¥Þ¥ó¥É¤Ç¤¹: %s"
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
msgid "E156: Missing sign name"
msgstr "E156: sign̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
msgid "E612: Too many signs defined"
msgstr "E612: sign¤ÎÄêµÁ¤¬Â¿¿ô¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
#, c-format
msgid "E239: Invalid sign text: %s"
msgstr "E239: ̵¸ú¤Êsign¤Î¥Æ¥­¥¹¥È¤Ç¤¹: %s"
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
#, c-format
msgid "E155: Unknown sign: %s"
msgstr "E155: ̤ÃΤÎsign¤Ç¤¹: %s"
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
msgid "E159: Missing sign number"
msgstr "E159: sign¤ÎÈֹ椬¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
#, c-format
msgid "E158: Invalid buffer name: %s"
msgstr "E158: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡Ì¾¤Ç¤¹: %s"
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
#, c-format
msgid "E157: Invalid sign ID: %ld"
msgstr "E157: ̵¸ú¤Êsign¼±Ê̻ҤǤ¹: %ld"
# Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
msgid " (NOT FOUND)"
msgstr " (¤ß¤Ä¤«¤ê¤Þ¤»¤ó)"
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
msgid " (not supported)"
msgstr " (È󥵥ݡ¼¥È)"
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
msgid "[Deleted]"
msgstr "[ºï½üºÑ]"
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ³¤±¤ë¤Ë¤Ï \"cont\" ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
#, c-format
msgid "line %ld: %s"
msgstr "¹Ô %ld: %s"
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
#, c-format
msgid "cmd: %s"
msgstr "¥³¥Þ¥ó¥É: %s"
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
#, c-format
msgid "Breakpoint in \"%s%s\" line %ld"
msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È \"%s%s\" ¹Ô %ld"
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
#, c-format
msgid "E161: Breakpoint not found: %s"
msgstr "E161: ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
msgid "No breakpoints defined"
msgstr "¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
#, c-format
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s ¹Ô %ld"
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ½é¤á¤Ë :profile start <fname> ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: ../ex_cmds2.c:1305
#, c-format
msgid "Save changes to \"%.*s\"?"
msgstr "Êѹ¹¤ò \"%.*s\" ¤ËÊݸ¤·¤Þ¤¹¤«?"
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
msgid "Untitled"
msgstr "̵Âê"
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
msgstr "E162: ¥Ð¥Ã¥Õ¥¡ \"%s\" ¤ÎÊѹ¹¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
msgstr "·Ù¹ð: ͽ´ü¤»¤ºÂ¾¥Ð¥Ã¥Õ¥¡¤Ø°ÜÆ°¤·¤Þ¤·¤¿ (autocommands ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤)"
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
msgid "E163: There is only one file to edit"
msgstr "E163: ÊÔ½¸¤¹¤ë¥Õ¥¡¥¤¥ë¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
msgid "E164: Cannot go before first file"
msgstr "E164: ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤è¤êÁ°¤Ë¤Ï¹Ô¤±¤Þ¤»¤ó"
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
msgid "E165: Cannot go beyond last file"
msgstr "E165: ºÇ¸å¤Î¥Õ¥¡¥¤¥ë¤ò±Û¤¨¤Æ¸å¤Ë¤Ï¹Ô¤±¤Þ¤»¤ó"
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
#, c-format
msgid "E666: compiler not supported: %s"
msgstr "E666: ¤½¤Î¥³¥ó¥Ñ¥¤¥é¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó: %s"
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
#, c-format
msgid "Searching for \"%s\" in \"%s\""
msgstr "\"%s\" ¤ò \"%s\" ¤«¤é¸¡º÷Ãæ"
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
#, c-format
msgid "Searching for \"%s\""
msgstr "\"%s\" ¤ò¸¡º÷Ãæ"
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
#, c-format
msgid "not found in 'runtimepath': \"%s\""
msgstr "'runtimepath' ¤ÎÃæ¤Ë¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó: \"%s\""
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
msgid "Source Vim script"
msgstr "Vim¥¹¥¯¥ê¥×¥È¤Î¼è¹þ¤ß"
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
#, c-format
msgid "Cannot source a directory: \"%s\""
msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Ï¼è¹þ¤á¤Þ¤»¤ó: \"%s\""
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
#, c-format
msgid "could not source \"%s\""
msgstr "\"%s\" ¤ò¼è¹þ¤á¤Þ¤»¤ó"
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
#, c-format
msgid "line %ld: could not source \"%s\""
msgstr "¹Ô %ld: \"%s\" ¤ò¼è¹þ¤á¤Þ¤»¤ó"
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
#, c-format
msgid "sourcing \"%s\""
msgstr "\"%s\" ¤ò¼è¹þÃæ"
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
#, c-format
msgid "line %ld: sourcing \"%s\""
msgstr "¹Ô %ld: %s ¤ò¼è¹þÃæ"
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
#, c-format
msgid "finished sourcing %s"
msgstr "%s ¤Î¼è¹þ¤ò´°Î»"
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
msgid "W15: Warning: Wrong line separator, ^M may be missing"
msgstr "W15: ·Ù¹ð: ¹Ô¶èÀÚ¤¬ÉÔÀµ¤Ç¤¹. ^M ¤¬¤Ê¤¤¤Î¤Ç¤·¤ç¤¦"
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
msgid "E167: :scriptencoding used outside of a sourced file"
msgstr "E167: :scriptencoding ¤¬¼è¹þ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
msgid "E168: :finish used outside of a sourced file"
msgstr "E168: :finish ¤¬¼è¹þ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç»ÈÍѤµ¤ì¤Þ¤·¤¿"
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
#, c-format
msgid "Page %d"
msgstr "%d ¥Ú¡¼¥¸"
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
msgid "No text to be printed"
msgstr "°õºþ¤¹¤ë¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
msgid "Printing page %d (%d%%)"
msgstr "°õºþÃæ: ¥Ú¡¼¥¸ %d (%d%%)"
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
#, c-format
msgid " Copy %d of %d"
msgstr " ¥³¥Ô¡¼ %d (Á´ %d Ãæ)"
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
#, c-format
msgid "Printed: %s"
msgstr "°õºþ¤·¤Þ¤·¤¿: %s"
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
msgid "Printing aborted"
msgstr "°õºþ¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿"
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
msgid "E455: Error writing to PostScript output file"
msgstr "E455: PostScript½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î½ñ¹þ¤ß¥¨¥é¡¼¤Ç¤¹"
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
#, c-format
msgid "E624: Can't open file \"%s\""
msgstr "E624: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
#, c-format
msgid "E457: Can't read PostScript resource file \"%s\""
msgstr "E457: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"%s\" ¤òÆɹþ¤á¤Þ¤»¤ó"
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
#, c-format
msgid "E618: file \"%s\" is not a PostScript resource file"
msgstr "E618: ¥Õ¥¡¥¤¥ë \"%s\" ¤Ï PostScript ¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
#, c-format
msgid "E619: file \"%s\" is not a supported PostScript resource file"
msgstr "E619: ¥Õ¥¡¥¤¥ë \"%s\" ¤ÏÂбþ¤·¤Æ¤¤¤Ê¤¤ PostScript ¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤¹"
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
#, c-format
msgid "E621: \"%s\" resource file has wrong version"
msgstr "E621: ¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"%s\" ¤Ï¥Ð¡¼¥¸¥ç¥ó¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: ¸ß´¹À­¤Î̵¤¤¥Þ¥ë¥Á¥Ð¥¤¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Èʸ»ú¥»¥Ã¥È¤Ç¤¹"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: ¥Þ¥ë¥Á¥Ð¥¤¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤Ï printmbcharset ¤ò¶õ¤Ë¤Ç¤­¤Þ¤»¤ó"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú¤ò°õºþ¤¹¤ë¤¿¤á¤Î¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#: ../ex_cmds2.c:6175
msgid "E324: Can't open PostScript output file"
msgstr "E324: PostScript½ÐÎÏÍѤΥե¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
#, c-format
msgid "E456: Can't open file \"%s\""
msgstr "E456: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
msgid "E456: Can't find PostScript resource file \"prolog.ps\""
msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"prolog.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"cidfont.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
#, c-format
msgid "E456: Can't find PostScript resource file \"%s.ps\""
msgstr "E456: PostScript¤Î¥ê¥½¡¼¥¹¥Õ¥¡¥¤¥ë \"%s.ps\" ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
#, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú¤ò¥¨¥ó¥³¡¼¥É \"%s\" ¤ØÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: °õºþ¥¨¥ó¥³¡¼¥É \"%s\" ¤ØÊÑ´¹¤Ç¤­¤Þ¤»¤ó"
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
msgid "Sending to printer..."
msgstr "¥×¥ê¥ó¥¿¤ËÁ÷¿®Ãæ..."
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
msgid "E365: Failed to print PostScript file"
msgstr "E365: PostScript¥Õ¥¡¥¤¥ë¤Î°õºþ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
msgid "Print job sent."
msgstr "°õºþ¥¸¥ç¥Ö¤òÁ÷¿®¤·¤Þ¤·¤¿."
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
#, c-format
msgid "Current %slanguage: \"%s\""
msgstr "¸½ºß¤Î %s¸À¸ì: \"%s\""
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
#, c-format
msgid "E197: Cannot set language to \"%s\""
msgstr "E197: ¸À¸ì¤ò \"%s\" ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Ex¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹. ¥Î¡¼¥Þ¥ë¤ËÌá¤ë¤Ë¤Ï\"visual\"¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤."
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
msgid "E501: At end-of-file"
msgstr "E501: ¥Õ¥¡¥¤¥ë¤Î½ªÎ»°ÌÃÖ"
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
msgid "E169: Command too recursive"
msgstr "E169: ¥³¥Þ¥ó¥É¤¬ºÆµ¢Åª²á¤®¤Þ¤¹"
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
#, c-format
msgid "E605: Exception not caught: %s"
msgstr "E605: Îã³°¤¬Ê᪤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
msgid "End of sourced file"
msgstr "¼è¹þ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ç¤¹"
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
msgid "End of function"
msgstr "´Ø¿ô¤ÎºÇ¸å¤Ç¤¹"
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: ¥æ¡¼¥¶ÄêµÁ¥³¥Þ¥ó¥É¤Î¤¢¤¤¤Þ¤¤¤Ê»ÈÍѤǤ¹"
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
msgid "E492: Not an editor command"
msgstr "E492: ¥¨¥Ç¥£¥¿¤Î¥³¥Þ¥ó¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
msgid "E493: Backwards range given"
msgstr "E493: µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿"
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
msgid "Backwards range given, OK to swap"
msgstr "µÕ¤µ¤Þ¤ÎÈϰϤ¬»ØÄꤵ¤ì¤Þ¤·¤¿, ÆþÂؤ¨¤Þ¤¹¤«?"
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
msgid "E494: Use w or w>>"
msgstr "E494: w ¤â¤·¤¯¤Ï w>> ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤"
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
msgid "E319: Sorry, the command is not available in this version"
msgstr "E319: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ÏÍøÍѤǤ­¤Þ¤»¤ó, ¤´¤á¤ó¤Ê¤µ¤¤"
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
msgid "E172: Only one file name allowed"
msgstr "E172: ¥Õ¥¡¥¤¥ë̾¤Ï 1 ¤Ä¤Ë¤·¤Æ¤¯¤À¤µ¤¤"
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
msgid "1 more file to edit. Quit anyway?"
msgstr "ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹¤¬, ½ªÎ»¤·¤Þ¤¹¤«?"
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
#, c-format
msgid "%d more files to edit. Quit anyway?"
msgstr "ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %d ¸Ä¤¢¤ê¤Þ¤¹¤¬, ½ªÎ»¤·¤Þ¤¹¤«?"
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
msgid "E173: 1 more file to edit"
msgstr "E173: ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬ 1 ¸Ä¤¢¤ê¤Þ¤¹"
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: ÊÔ½¸¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤È %ld ¸Ä¤¢¤ê¤Þ¤¹"
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: ¥³¥Þ¥ó¥É¤¬´û¤Ë¤¢¤ê¤Þ¤¹: ºÆÄêµÁ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤"
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
msgid ""
"\n"
" Name Args Range Complete Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
"\n"
" ̾Á° °ú¿ô ÈÏ°Ï Êä´° ÄêµÁ"
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
msgid "No user-defined commands found"
msgstr "¥æ¡¼¥¶ÄêµÁ¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
msgid "E175: No attribute specified"
msgstr "E175: °À­¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
msgid "E176: Invalid number of arguments"
msgstr "E176: °ú¿ô¤Î¿ô¤¬Ìµ¸ú¤Ç¤¹"
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
msgid "E177: Count cannot be specified twice"
msgstr "E177: ¥«¥¦¥ó¥È¤ò2½Å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
msgid "E178: Invalid default value for count"
msgstr "E178: ¥«¥¦¥ó¥È¤Î¾ÊάÃͤ¬Ìµ¸ú¤Ç¤¹"
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
msgid "E179: argument required for complete"
msgstr "E179: Êä´°¤Î¤¿¤á¤Î°ú¿ô¤¬É¬ÍפǤ¹"
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
#, c-format
msgid "E180: Invalid complete value: %s"
msgstr "E180: ̵¸ú¤ÊÊä´°»ØÄê¤Ç¤¹: %s"
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
msgid "E468: Completion argument only allowed for custom completion"
msgstr "E468: Êä´°°ú¿ô¤Ï¥«¥¹¥¿¥àÊä´°¤Ç¤·¤«»ÈÍѤǤ­¤Þ¤»¤ó"
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
msgid "E467: Custom completion requires a function argument"
msgstr "E467: ¥«¥¹¥¿¥àÊä´°¤Ë¤Ï°ú¿ô¤È¤·¤Æ´Ø¿ô¤¬É¬ÍפǤ¹"
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
#, c-format
msgid "E181: Invalid attribute: %s"
msgstr "E181: ̵¸ú¤Ê°À­¤Ç¤¹: %s"
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
msgid "E182: Invalid command name"
msgstr "E182: ̵¸ú¤Ê¥³¥Þ¥ó¥É̾¤Ç¤¹"
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: ¥æ¡¼¥¶ÄêµÁ¥³¥Þ¥ó¥É¤Ï±ÑÂçʸ»ú¤Ç»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
#, c-format
msgid "E184: No such user-defined command: %s"
msgstr "E184: ¤½¤Î¥æ¡¼¥¶ÄêµÁ¥³¥Þ¥ó¥É¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: ¥«¥é¡¼¥¹¥­¡¼¥à %s ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
msgid "Greetings, Vim user!"
msgstr "Vim »È¤¤¤µ¤ó¡¢¤ä¤¢!"
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
msgid "Edit File in new window"
msgstr "¿·¤·¤¤¥¦¥£¥ó¥É¥¦¤Ç¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹"
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
msgid "No swap file"
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
msgid "Append File"
msgstr "Äɲåե¡¥¤¥ë"
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: ¥Ð¥Ã¥Õ¥¡¤¬½¤Àµ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç, ¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó (! "
+"¤òÄɲäǾå½ñ)"
+
+#: ../ex_docmd.c:7248
msgid "E186: No previous directory"
msgstr "E186: Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
msgid "E187: Unknown"
msgstr "E187: ̤ÃÎ"
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
msgid "E465: :winsize requires two number arguments"
msgstr "E465: "
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
#, c-format
msgid "Window position: X %d, Y %d"
msgstr "¥¦¥£¥ó¥É¥¦°ÌÃÖ: X %d, Y %d"
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
msgid "E188: Obtaining window position not implemented for this platform"
msgstr ""
"E188: ¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ë¤Ï¥¦¥£¥ó¥É¥¦°ÌÃ֤μèÆÀµ¡Ç½¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
msgid "E466: :winpos requires two number arguments"
msgstr "E466: :winpos ¤Ë¤Ï2¤Ä¤Î¿ôÃͤΰú¿ô¤¬É¬ÍפǤ¹"
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
msgid "Save Redirection"
msgstr "¥ê¥À¥¤¥ì¥¯¥È¤òÊݸ¤·¤Þ¤¹"
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
msgid "Save View"
msgstr "¥Ó¥å¡¼¤òÊݸ¤·¤Þ¤¹"
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
msgid "Save Session"
msgstr "¥»¥Ã¥·¥ç¥ó¾ðÊó¤òÊݸ¤·¤Þ¤¹"
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
msgid "Save Setup"
msgstr "ÀßÄê¤òÊݸ¤·¤Þ¤¹"
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: ¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
+
+#: ../ex_docmd.c:8185
#, c-format
msgid "E189: \"%s\" exists (add ! to override)"
msgstr "E189: \"%s\" ¤¬Â¸ºß¤·¤Þ¤¹ (¾å½ñ¤¹¤ë¤Ë¤Ï ! ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤)"
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
msgstr "E190: \"%s\" ¤ò½ñ¹þ¤ßÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
#. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
msgid "E191: Argument must be a letter or forward/backward quote"
msgstr "E191: °ú¿ô¤Ïʸ»ú¤«Á°¿Ê/¸åÂ९¥©¡¼¥È¤Ç¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal ¤ÎºÆµ¢ÍøÍѤ¬¿¼¤¯¤Ê¤ê¤¹¤®¤Þ¤·¤¿"
+msgstr "E192: :normal ¤ÎºÆµ¢ÍøÍѤ¬¿¼¤¯¤Ê¤ê²á¤®¤Þ¤·¤¿"
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
msgid "E194: No alternate file name to substitute for '#'"
msgstr "E194: '#'¤òÃÖ¤­´¹¤¨¤ëÉû¥Õ¥¡¥¤¥ë¤Î̾Á°¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
msgid "E495: no autocommand file name to substitute for \"<afile>\""
msgstr "E495: \"<afile>\"¤òÃÖ¤­´¹¤¨¤ëautocommand¤Î¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
msgstr "E496: \"<abuf>\"¤òÃÖ¤­´¹¤¨¤ëautocommand¥Ð¥Ã¥Õ¥¡Èֹ椬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
msgid "E497: no autocommand match name to substitute for \"<amatch>\""
msgstr "E497: \"<amatch>\"¤òÃÖ¤­´¹¤¨¤ëautocommand¤Î³ºÅö̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
msgid "E498: no :source file name to substitute for \"<sfile>\""
msgstr "E498: \"<sfile>\"¤òÃÖ¤­´¹¤¨¤ë :source Âоݥե¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
#, no-c-format
msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
msgstr ""
"E499: '%' ¤ä '#' ¤¬ÌµÌ¾¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç \":p:h\" ¤òȼ¤ï¤Ê¤¤»È¤¤Êý¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
msgid "E500: Evaluates to an empty string"
msgstr "E500: ¶õʸ»úÎó¤È¤·¤Æɾ²Á¤µ¤ì¤Þ¤·¤¿"
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
msgid "E195: Cannot open viminfo file for reading"
msgstr "E195: viminfo¥Õ¥¡¥¤¥ë¤òÆɹþÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
msgid "E196: No digraphs in this version"
msgstr "E196: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¹ç»ú¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: ex_eval.c:440
+#: ../ex_eval.c:439
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: 'Vim' ¤Ç»Ï¤Þ¤ëÎã³°¤Ï :throw ¤Ç¤­¤Þ¤»¤ó"
#. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
#, c-format
msgid "Exception thrown: %s"
msgstr "Îã³°¤¬È¯À¸¤·¤Þ¤·¤¿: %s"
-#: ex_eval.c:576
+#: ../ex_eval.c:575
#, c-format
msgid "Exception finished: %s"
msgstr "Îã³°¤¬¼ý«¤·¤Þ¤·¤¿: %s"
-#: ex_eval.c:577
+#: ../ex_eval.c:576
#, c-format
msgid "Exception discarded: %s"
msgstr "Îã³°¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿: %s"
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
#, c-format
msgid "%s, line %ld"
msgstr "%s, ¹Ô %ld"
#. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
#, c-format
msgid "Exception caught: %s"
msgstr "Îã³°¤¬Ê᪤µ¤ì¤Þ¤·¤¿: %s"
-#: ex_eval.c:713
+#: ../ex_eval.c:712
#, c-format
msgid "%s made pending"
msgstr "%s ¤Ë¤è¤ê̤·èÄê¾õÂÖ¤¬À¸¤¸¤Þ¤·¤¿"
-#: ex_eval.c:716
+#: ../ex_eval.c:715
#, c-format
msgid "%s resumed"
msgstr "%s ¤¬ºÆ³«¤·¤Þ¤·¤¿"
-#: ex_eval.c:720
+#: ../ex_eval.c:719
#, c-format
msgid "%s discarded"
msgstr "%s ¤¬ÇË´þ¤µ¤ì¤Þ¤·¤¿"
-#: ex_eval.c:746
+#: ../ex_eval.c:745
msgid "Exception"
msgstr "Îã³°"
-#: ex_eval.c:752
+#: ../ex_eval.c:751
msgid "Error and interrupt"
msgstr "¥¨¥é¡¼¤È³ä¹þ¤ß"
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
msgid "Error"
msgstr "¥¨¥é¡¼"
#. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
msgid "Interrupt"
msgstr "³ä¹þ¤ß"
-#: ex_eval.c:830
+#: ../ex_eval.c:829
msgid "E579: :if nesting too deep"
msgstr "E579: :if ¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-#: ex_eval.c:867
+#: ../ex_eval.c:866
msgid "E580: :endif without :if"
msgstr "E580: :if ¤Î¤Ê¤¤ :endif ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:911
+#: ../ex_eval.c:911
msgid "E581: :else without :if"
msgstr "E581: :if ¤Î¤Ê¤¤ :else ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:914
+#: ../ex_eval.c:914
msgid "E582: :elseif without :if"
msgstr "E582: :if ¤Î¤Ê¤¤ :elseif ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:921
+#: ../ex_eval.c:921
msgid "E583: multiple :else"
msgstr "E583: Ê£¿ô¤Î :else ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:924
+#: ../ex_eval.c:924
msgid "E584: :elseif after :else"
msgstr "E584: :else ¤Î¸å¤Ë :elseif ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while ¤ÎÆþ¤ì»Ò¤¬¿¼¤¯²á¤®¤Þ¤¹"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while ¤ä :for ¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while ¤ä :for ¤Î¤Ê¤¤ :continue ¤¬¤¢¤ê¤Þ¤¹"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while ¤ä :for ¤Î¤Ê¤¤ :break ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while ¤Î¤Ê¤¤ :continue ¤¬¤¢¤ê¤Þ¤¹"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor ¤ò :while ¤ÈÁȤ߹ç¤ï¤»¤Æ¤¤¤Þ¤¹"
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while ¤Î¤Ê¤¤ :break ¤¬¤¢¤ê¤Þ¤¹"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile ¤ò :for ¤ÈÁȤ߹ç¤ï¤»¤Æ¤¤¤Þ¤¹"
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
msgid "E601: :try nesting too deep"
msgstr "E601: :try ¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
msgid "E603: :catch without :try"
msgstr "E603: :try ¤Î¤Ê¤¤ :catch ¤¬¤¢¤ê¤Þ¤¹"
#. Give up for a ":catch" after ":finally" and ignore it.
#. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
msgid "E604: :catch after :finally"
msgstr "E604: :finally ¤Î¸å¤Ë :catch ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
msgid "E606: :finally without :try"
msgstr "E606: :try ¤Î¤Ê¤¤ :finally ¤¬¤¢¤ê¤Þ¤¹"
#. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
msgid "E607: multiple :finally"
msgstr "E607: Ê£¿ô¤Î :finalyy ¤¬¤¢¤ê¤Þ¤¹"
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
msgid "E602: :endtry without :try"
msgstr "E602: :try ¤Î¤Ê¤¤ :endtry ¤Ç¤¹"
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
msgid "E193: :endfunction not inside a function"
msgstr "E193: ´Ø¿ô¤Î³°¤Ë :endfunction ¤¬¤¢¤ê¤Þ¤·¤¿"
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
msgid "tagname"
msgstr "¥¿¥°Ì¾"
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
msgid " kind file\n"
msgstr " ¥Õ¥¡¥¤¥ë¼ïÎà\n"
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
msgid "'history' option is zero"
msgstr "¥ª¥×¥·¥ç¥ó 'history' ¤¬¥¼¥í¤Ç¤¹"
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
#, c-format
msgid ""
"\n"
@@ -1563,259 +1839,263 @@ msgstr ""
"\n"
"# %s ¹àÌܤÎÍúÎò (¿·¤·¤¤¤â¤Î¤«¤é¸Å¤¤¤â¤Î¤Ø):\n"
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
msgid "Command Line"
msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó"
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
msgid "Search String"
msgstr "¸¡º÷ʸ»úÎó"
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
msgid "Expression"
msgstr "¼°"
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
msgid "Input Line"
msgstr "ÆþÎϹÔ"
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar ¤¬¥³¥Þ¥ó¥ÉŤòĶ¤¨¤Þ¤·¤¿"
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
msgid "E199: Active window or buffer deleted"
msgstr "E199: ¥¢¥¯¥Æ¥£¥Ö¤Ê¥¦¥£¥ó¥É¥¦¤«¥Ð¥Ã¥Õ¥¡¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿"
-#: fileio.c:371
+#: ../fileio.c:374
msgid "Illegal file name"
msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë̾"
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
msgid "is a directory"
msgstr " ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹"
-#: fileio.c:397
+#: ../fileio.c:401
msgid "is not a file"
msgstr " ¤Ï¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
msgid "[New File]"
msgstr "[¿·¥Õ¥¡¥¤¥ë]"
-#: fileio.c:584
+#: ../fileio.c:594
msgid "[Permission Denied]"
msgstr "[ǧ²Ä¤¬¤¢¤ê¤Þ¤»¤ó]"
-#: fileio.c:688
+#: ../fileio.c:705
msgid "E200: *ReadPre autocommands made the file unreadable"
msgstr "E200: *ReadPre autocommand ¤¬¥Õ¥¡¥¤¥ë¤òÆɹþÉԲĤˤ·¤Þ¤·¤¿"
-#: fileio.c:690
+#: ../fileio.c:707
msgid "E201: *ReadPre autocommands must not change current buffer"
msgstr "E201: *ReadPre autocommand ¤Ï¸½ºß¤Î¥Ð¥Ã¥Õ¥¡¤òÊѤ¨¤é¤ì¤Þ¤»¤ó"
-#: fileio.c:711
+#: ../fileio.c:728
msgid "Vim: Reading from stdin...\n"
msgstr "Vim: ɸ½àÆþÎϤ«¤éÆɹþÃæ...\n"
-#: fileio.c:717
+#: ../fileio.c:734
msgid "Reading from stdin..."
msgstr "ɸ½àÆþÎϤ«¤éÆɹþ¤ßÃæ..."
#. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
msgid "E202: Conversion made file unreadable!"
msgstr "E202: ÊÑ´¹¤¬¥Õ¥¡¥¤¥ë¤òÆɹþÉԲĤˤ·¤Þ¤·¤¿"
-#: fileio.c:2027
+#: ../fileio.c:2084
msgid "[fifo/socket]"
msgstr "[FIFO/¥½¥±¥Ã¥È]"
-#: fileio.c:2034
+#: ../fileio.c:2091
msgid "[fifo]"
msgstr "[FIFO]"
-#: fileio.c:2041
+#: ../fileio.c:2098
msgid "[socket]"
msgstr "[¥½¥±¥Ã¥È]"
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
msgid "[RO]"
msgstr "[ÆÉÀì]"
-#: fileio.c:2059
+#: ../fileio.c:2116
msgid "[CR missing]"
msgstr "[CR̵]"
-#: fileio.c:2064
+#: ../fileio.c:2121
msgid "[NL found]"
msgstr "[NLÍ­]"
-#: fileio.c:2069
+#: ../fileio.c:2126
msgid "[long lines split]"
msgstr "[Ĺ¹Ôʬ³ä]"
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
msgid "[NOT converted]"
msgstr "[̤ÊÑ´¹]"
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
msgid "[converted]"
msgstr "[ÊÑ´¹ºÑ]"
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
msgid "[crypted]"
msgstr "[°Å¹æ²½]"
-#: fileio.c:2094
+#: ../fileio.c:2151
msgid "[CONVERSION ERROR]"
msgstr "[ÊÑ´¹¥¨¥é¡¼]"
-#: fileio.c:2100
+#: ../fileio.c:2157
#, c-format
msgid "[ILLEGAL BYTE in line %ld]"
msgstr "[%ld ¹ÔÌܤÎÉÔÀµ¤Ê¥Ð¥¤¥È]"
-#: fileio.c:2107
+#: ../fileio.c:2164
msgid "[READ ERRORS]"
msgstr "[Æɹþ¥¨¥é¡¼]"
-#: fileio.c:2323
+#: ../fileio.c:2380
msgid "Can't find temp file for conversion"
msgstr "ÊÑ´¹¤ËɬÍפʰì»þ¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: fileio.c:2330
+#: ../fileio.c:2387
msgid "Conversion with 'charconvert' failed"
msgstr "'charconvert' ¤Ë¤è¤ëÊÑ´¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: fileio.c:2333
+#: ../fileio.c:2390
msgid "can't read output of 'charconvert'"
msgstr "'charconvert' ¤Î½ÐÎϤòÆɹþ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwrite¥Ð¥Ã¥Õ¥¡¤Î³ºÅö¤¹¤ëautocommand¤Ï¸ºß¤·¤Þ¤»¤ó"
+
+#: ../fileio.c:2821
msgid "E203: Autocommands deleted or unloaded buffer to be written"
msgstr "E203: Êݸ¤¹¤ë¥Ð¥Ã¥Õ¥¡¤òautocommand¤¬ºï½ü¤«²òÊü¤·¤Þ¤·¤¿"
-#: fileio.c:2756
+#: ../fileio.c:2844
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: autocommand¤¬Í½´ü¤»¤ÌÊýË¡¤Ç¹Ô¿ô¤òÊѹ¹¤·¤Þ¤·¤¿"
# Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
msgid "NetBeans dissallows writes of unmodified buffers"
msgstr "NetBeans¤Ï̤Êѹ¹¤Î¥Ð¥Ã¥Õ¥¡¤ò¾å½ñ¤¹¤ë¤³¤È¤Ïµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó"
-#: fileio.c:2802
+#: ../fileio.c:2892
msgid "Partial writes disallowed for NetBeans buffers"
msgstr "NetBeans¥Ð¥Ã¥Õ¥¡¤Î°ìÉô¤ò½ñ¤­½Ð¤¹¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
msgid "is not a file or writable device"
msgstr "¤Ï¥Õ¥¡¥¤¥ë¤Ç¤â½ñ¹þ¤ß²Äǽ¥Ç¥Ð¥¤¥¹¤Ç¤â¤¢¤ê¤Þ¤»¤ó"
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
msgid "is read-only (add ! to override)"
msgstr "¤ÏÆɹþÀìÍѤǤ¹ (¶¯À©½ñ¹þ¤Ë¤Ï ! ¤òÄɲÃ)"
-#: fileio.c:3272
+#: ../fileio.c:3362
msgid "E506: Can't write to backup file (add ! to override)"
msgstr "E506: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©Êݸ)"
-#: fileio.c:3284
+#: ../fileio.c:3374
msgid "E507: Close error for backup file (add ! to override)"
msgstr ""
"E507: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ëºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ (! ¤òÄɲäǶ¯À©)"
-#: fileio.c:3286
+#: ../fileio.c:3376
msgid "E508: Can't read file for backup (add ! to override)"
msgstr "E508: ¥Ð¥Ã¥¯¥¢¥Ã¥×ÍÑ¥Õ¥¡¥¤¥ë¤òÆɹþ¤á¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©Æɹþ)"
-#: fileio.c:3302
+#: ../fileio.c:3392
msgid "E509: Cannot create backup file (add ! to override)"
msgstr "E509: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ºîÀ®)"
-#: fileio.c:3405
+#: ../fileio.c:3495
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òºî¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©ºîÀ®)"
-#: fileio.c:3467
+#: ../fileio.c:3557
msgid "E460: The resource fork would be lost (add ! to override)"
msgstr "E460: ¥ê¥½¡¼¥¹¥Õ¥©¡¼¥¯¤¬¼º¤ï¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó (! ¤òÄɲäǶ¯À©)"
-#: fileio.c:3566
+#: ../fileio.c:3667
msgid "E214: Can't find temp file for writing"
msgstr "E214: ÊݸÍÑ°ì»þ¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: fileio.c:3584
+#: ../fileio.c:3685
msgid "E213: Cannot convert (add ! to write without conversion)"
msgstr "E213: ÊÑ´¹¤Ç¤­¤Þ¤»¤ó (! ¤òÄɲäÇÊÑ´¹¤»¤º¤ËÊݸ)"
-#: fileio.c:3619
+#: ../fileio.c:3720
msgid "E166: Can't open linked file for writing"
msgstr "E166: ¥ê¥ó¥¯¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë½ñ¹þ¤á¤Þ¤»¤ó"
-#: fileio.c:3623
+#: ../fileio.c:3724
msgid "E212: Can't open file for writing"
msgstr "E212: ½ñ¹þ¤ßÍѤ˥ե¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-#: fileio.c:3885
+#: ../fileio.c:4000
msgid "E667: Fsync failed"
msgstr "E667: fsync ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: fileio.c:3892
+#: ../fileio.c:4007
msgid "E512: Close failed"
msgstr "E512: ÊĤ¸¤ë¤³¤È¤Ë¼ºÇÔ"
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: ½ñ¹þ¤ß¥¨¥é¡¼, ÊÑ´¹¼ºÇÔ"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: ½ñ¹þ¤ß¥¨¥é¡¼, ÊÑ´¹¼ºÇÔ (¾å½ñ¤¹¤ë¤Ë¤Ï 'fenc' ¤ò¶õ¤Ë¤·¤Æ¤¯¤À¤µ¤¤)"
-#: fileio.c:3969
+#: ../fileio.c:4084
msgid "E514: write error (file system full?)"
msgstr "E514: ½ñ¹þ¤ß¥¨¥é¡¼, (¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬ËþÇÕ?)"
-#: fileio.c:4036
+#: ../fileio.c:4151
msgid " CONVERSION ERROR"
msgstr " ÊÑ´¹¥¨¥é¡¼"
-#: fileio.c:4052
+#: ../fileio.c:4167
msgid "[Device]"
msgstr "[¥Ç¥Ð¥¤¥¹]"
-#: fileio.c:4057
+#: ../fileio.c:4172
msgid "[New]"
msgstr "[¿·]"
-#: fileio.c:4079
+#: ../fileio.c:4194
msgid " [a]"
msgstr " [a]"
-#: fileio.c:4079
+#: ../fileio.c:4194
msgid " appended"
msgstr " ÄɲÃ"
-#: fileio.c:4081
+#: ../fileio.c:4196
msgid " [w]"
msgstr " [w]"
-#: fileio.c:4081
+#: ../fileio.c:4196
msgid " written"
msgstr " ½ñ¹þ¤ß"
-#: fileio.c:4131
+#: ../fileio.c:4249
msgid "E205: Patchmode: can't save original file"
msgstr "E205: patchmode: ¸¶ËÜ¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó"
-#: fileio.c:4153
+#: ../fileio.c:4271
msgid "E206: patchmode: can't touch empty original file"
msgstr "E206: patchmode: ¶õ¤Î¸¶ËÜ¥Õ¥¡¥¤¥ë¤òtouch¤Ç¤­¤Þ¤»¤ó"
-#: fileio.c:4168
+#: ../fileio.c:4286
msgid "E207: Can't delete backup file"
msgstr "E207: ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò¾Ã¤»¤Þ¤»¤ó"
-#: fileio.c:4232
+#: ../fileio.c:4350
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
"\n"
"·Ù¹ð: ¸¶ËÜ¥Õ¥¡¥¤¥ë¤¬¼º¤ï¤ì¤¿¤«Êѹ¹¤µ¤ì¤Þ¤·¤¿\n"
-#: fileio.c:4234
+#: ../fileio.c:4352
msgid "don't quit the editor until the file is successfully written!"
msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ¤ËÀ®¸ù¤¹¤ë¤Þ¤Ç¥¨¥Ç¥£¥¿¤ò½ªÎ»¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤!"
-#: fileio.c:4323
+#: ../fileio.c:4441
msgid "[dos]"
msgstr "[dos]"
-#: fileio.c:4323
+#: ../fileio.c:4441
msgid "[dos format]"
msgstr "[dos¥Õ¥©¡¼¥Þ¥Ã¥È]"
-#: fileio.c:4330
+#: ../fileio.c:4448
msgid "[mac]"
msgstr "[mac]"
-#: fileio.c:4330
+#: ../fileio.c:4448
msgid "[mac format]"
msgstr "[mac¥Õ¥©¡¼¥Þ¥Ã¥È]"
-#: fileio.c:4337
+#: ../fileio.c:4455
msgid "[unix]"
msgstr "[unix]"
-#: fileio.c:4337
+#: ../fileio.c:4455
msgid "[unix format]"
msgstr "[unix¥Õ¥©¡¼¥Þ¥Ã¥È]"
-#: fileio.c:4364
+#: ../fileio.c:4482
msgid "1 line, "
msgstr "1 ¹Ô, "
-#: fileio.c:4366
+#: ../fileio.c:4484
#, c-format
msgid "%ld lines, "
msgstr "%ld ¹Ô, "
-#: fileio.c:4369
+#: ../fileio.c:4487
msgid "1 character"
msgstr "1 ʸ»ú"
-#: fileio.c:4371
+#: ../fileio.c:4489
#, c-format
msgid "%ld characters"
msgstr "%ld ʸ»ú"
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
msgid "[noeol]"
msgstr "[noeol]"
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
msgid "[Incomplete last line]"
msgstr "[ºÇ½ª¹Ô¤¬ÉÔ´°Á´]"
#. don't overwrite messages here
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4400
+#: ../fileio.c:4518
msgid "WARNING: The file has been changed since reading it!!!"
msgstr "·Ù¹ð: Æɹþ¤ó¤À¸å¤Ë¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤¬¤¢¤ê¤Þ¤·¤¿!!!"
-#: fileio.c:4402
+#: ../fileio.c:4520
msgid "Do you really want to write to it"
msgstr "ËÜÅö¤Ë¾å½ñ¤­¤·¤Þ¤¹¤«"
-#: fileio.c:5566
+#: ../fileio.c:5746
#, c-format
msgid "E208: Error writing to \"%s\""
msgstr "E208: \"%s\" ¤ò½ñ¹þ¤ßÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
-#: fileio.c:5573
+#: ../fileio.c:5753
#, c-format
msgid "E209: Error closing \"%s\""
msgstr "E209: \"%s\" ¤òÊĤ¸¤ë»þ¤Ë¥¨¥é¡¼¤Ç¤¹"
-#: fileio.c:5576
+#: ../fileio.c:5756
#, c-format
msgid "E210: Error reading \"%s\""
msgstr "E210: \"%s\" ¤òÆɹþÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
-#: fileio.c:5810
+#: ../fileio.c:5993
msgid "E246: FileChangedShell autocommand deleted buffer"
msgstr "E246: autocommand ¤Î FileChangedShell ¤¬¥Ð¥Ã¥Õ¥¡¤òºï½ü¤·¤Þ¤·¤¿"
-#: fileio.c:5817
+#: ../fileio.c:6000
#, c-format
msgid "E211: Warning: File \"%s\" no longer available"
msgstr "E211: ·Ù¹ð: ¥Õ¥¡¥¤¥ë \"%s\" ¤Ï´û¤Ë¸ºß¤·¤Þ¤»¤ó"
-#: fileio.c:5831
+#: ../fileio.c:6014
#, c-format
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
msgstr "W12: ·Ù¹ð: ¥Õ¥¡¥¤¥ë \"%s\" ¤¬Êѹ¹¤µ¤ìVim¤Î¥Ð¥Ã¥Õ¥¡¤âÊѹ¹¤µ¤ì¤Þ¤·¤¿"
-#: fileio.c:5834
+#: ../fileio.c:6017
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: ·Ù¹ð: ¥Õ¥¡¥¤¥ë \"%s\" ¤ÏÊÔ½¸³«»Ï¸å¤ËÊѹ¹¤µ¤ì¤Þ¤·¤¿"
-#: fileio.c:5836
+#: ../fileio.c:6019
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
msgstr "W16: ·Ù¹ð: ¥Õ¥¡¥¤¥ë \"%s\" ¤Î¥â¡¼¥É¤¬ÊÔ½¸³«»Ï¸å¤ËÊѹ¹¤µ¤ì¤Þ¤·¤¿"
-#: fileio.c:5846
+#: ../fileio.c:6029
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
msgstr "W13: ·Ù¹ð: ¥Õ¥¡¥¤¥ë \"%s\" ¤ÏÊÔ½¸³«»Ï¸å¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿"
-#: fileio.c:5859
+#: ../fileio.c:6042
msgid "See \":help W11\" for more info."
msgstr "¾ÜºÙ¤Ï \":help W11\" ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤"
-#: fileio.c:5873
+#: ../fileio.c:6056
msgid "Warning"
msgstr "·Ù¹ð"
-#: fileio.c:5874
+#: ../fileio.c:6057
msgid ""
"&OK\n"
"&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
"&OK\n"
"¥Õ¥¡¥¤¥ëÆɹþ(&L)"
-#: fileio.c:5980
+#: ../fileio.c:6159
#, c-format
msgid "E462: Could not prepare for reloading \"%s\""
msgstr "E462: \"%s\" ¤ò¥ê¥í¡¼¥É¤¹¤ë½àÈ÷¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: fileio.c:5999
+#: ../fileio.c:6178
#, c-format
msgid "E321: Could not reload \"%s\""
msgstr "E321: \"%s\" ¤Ï¥ê¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: fileio.c:6580
+#: ../fileio.c:6773
msgid "--Deleted--"
msgstr "--ºï½üºÑ--"
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <¥Ð¥Ã¥Õ¥¡=%d> ¤¬¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹"
+
#. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
#, c-format
msgid "E367: No such group: \"%s\""
msgstr "E367: ¤½¤Î¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: \"%s\""
-#: fileio.c:6866
+#: ../fileio.c:7090
#, c-format
msgid "E215: Illegal character after *: %s"
msgstr "E215: * ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿: %s"
-#: fileio.c:6878
+#: ../fileio.c:7102
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: fileio.c:6880
+#: ../fileio.c:7104
#, c-format
msgid "E216: No such group or event: %s"
msgstr "E216: ¤½¤Î¤è¤¦¤Ê¥°¥ë¡¼¥×¤â¤·¤¯¤Ï¥¤¥Ù¥ó¥È¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
#. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
msgid ""
"\n"
"--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
"\n"
"--- Auto-Commands ---"
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <¥Ð¥Ã¥Õ¥¡=%d>: ̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹"
+
+#: ../fileio.c:7635
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: Á´¤Æ¤Î¥¤¥Ù¥ó¥È¤ËÂФ·¤Æ¤Îautocommand¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-#: fileio.c:7332
+#: ../fileio.c:7658
msgid "No matching autocommands"
msgstr "³ºÅö¤¹¤ëautocommand¤Ï¸ºß¤·¤Þ¤»¤ó"
-#: fileio.c:7653
+#: ../fileio.c:7982
msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand¤ÎÆþ¤ì»Ò¤¬¿¼¤¹¤®¤Þ¤¹"
+msgstr "E218: autocommand¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-#: fileio.c:7928
+#: ../fileio.c:8290
#, c-format
msgid "%s Auto commands for \"%s\""
msgstr "%s Auto commands for \"%s\""
-#: fileio.c:7936
+#: ../fileio.c:8298
#, c-format
msgid "Executing %s"
msgstr "%s ¤ò¼Â¹Ô¤·¤Æ¤¤¤Þ¤¹"
#. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
#, c-format
msgid "autocommand %s"
msgstr "autocommand %s"
-#: fileio.c:8571
+#: ../fileio.c:8961
msgid "E219: Missing {."
msgstr "E219: { ¤¬¤¢¤ê¤Þ¤»¤ó."
-#: fileio.c:8573
+#: ../fileio.c:8963
msgid "E220: Missing }."
msgstr "E220: } ¤¬¤¢¤ê¤Þ¤»¤ó."
-#: fold.c:68
+#: ../fold.c:68
msgid "E490: No fold found"
msgstr "E490: ÀÞ¾ö¤ß¤¬¤¢¤ê¤Þ¤»¤ó"
-#: fold.c:593
+#: ../fold.c:593
msgid "E350: Cannot create fold with current 'foldmethod'"
msgstr "E350: ¸½ºß¤Î 'foldmethod' ¤Ç¤ÏÀÞ¾ö¤ß¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
-#: fold.c:595
+#: ../fold.c:595
msgid "E351: Cannot delete fold with current 'foldmethod'"
msgstr "E351: ¸½ºß¤Î 'foldmethod' ¤Ç¤ÏÀÞ¾ö¤ß¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿"
+
+#: ../getchar.c:249
msgid "E222: Add to read buffer"
msgstr "E222: Æɹþ¥Ð¥Ã¥Õ¥¡¤ØÄɲÃ"
-#: getchar.c:2198
+#: ../getchar.c:2234
msgid "E223: recursive mapping"
msgstr "E223: ºÆµ¢Åª¥Þ¥Ã¥Ô¥ó¥°"
-#: getchar.c:3077
+#: ../getchar.c:3114
#, c-format
msgid "E224: global abbreviation already exists for %s"
msgstr "E224: %s ¤È¤¤¤¦¥°¥í¡¼¥Ð¥ëû½ÌÆþÎϤϴû¤Ë¸ºß¤·¤Þ¤¹"
-#: getchar.c:3080
+#: ../getchar.c:3117
#, c-format
msgid "E225: global mapping already exists for %s"
msgstr "E225: %s ¤È¤¤¤¦¥°¥í¡¼¥Ð¥ë¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
-#: getchar.c:3212
+#: ../getchar.c:3249
#, c-format
msgid "E226: abbreviation already exists for %s"
msgstr "E226: %s ¤È¤¤¤¦Ã»½ÌÆþÎϤϴû¤Ë¸ºß¤·¤Þ¤¹"
-#: getchar.c:3215
+#: ../getchar.c:3252
#, c-format
msgid "E227: mapping already exists for %s"
msgstr "E227: %s ¤È¤¤¤¦¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
-#: getchar.c:3279
+#: ../getchar.c:3316
msgid "No abbreviation found"
msgstr "û½ÌÆþÎϤϤߤĤ«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: getchar.c:3281
+#: ../getchar.c:3318
msgid "No mapping found"
msgstr "¥Þ¥Ã¥Ô¥ó¥°¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: getchar.c:4173
+#: ../getchar.c:4210
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: ÉÔÀµ¤Ê¥â¡¼¥É"
-#: gui.c:220
+#: ../gui.c:220
msgid "E229: Cannot start the GUI"
msgstr "E229: GUI¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó"
-#: gui.c:349
+#: ../gui.c:355
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: \"%s\"¤«¤éÆɹþ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: gui.c:472
+#: ../gui.c:478
msgid "E665: Cannot start GUI, no valid font found"
msgstr "E665: Í­¸ú¤Ê¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤¤¤Î¤Ç, GUI¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó"
-#: gui.c:477
+#: ../gui.c:483
msgid "E231: 'guifontwide' invalid"
msgstr "E231: 'guifontwide' ¤¬Ìµ¸ú¤Ç¤¹"
-#: gui.c:547
+#: ../gui.c:553
msgid "E599: Value of 'imactivatekey' is invalid"
msgstr "E599: 'imactivatekey' ¤ËÀßÄꤵ¤ì¤¿Ãͤ¬Ìµ¸ú¤Ç¤¹"
-#: gui.c:4061
+#: ../gui.c:4070
#, c-format
msgid "E254: Cannot allocate color %s"
msgstr "E254: %s ¤Î¿§¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó"
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "¥«¡¼¥½¥ë¤Î°ÌÃ֤˥ޥåÁ¤Ï¤¢¤ê¤Þ¤»¤ó, ¼¡¤ò¸¡º÷¤·¤Æ¤¤¤Þ¤¹"
+
+#: ../gui_at_fs.c:300
msgid "<cannot open> "
msgstr "<³«¤±¤Þ¤»¤ó>"
-#: gui_at_fs.c:1136
+#: ../gui_at_fs.c:1136
#, c-format
msgid "E616: vim_SelFile: can't get font %s"
msgstr "E616: vim_SelFile: ¥Õ¥©¥ó¥È %s ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-#: gui_at_fs.c:2781
+#: ../gui_at_fs.c:2781
msgid "E614: vim_SelFile: can't return to current directory"
msgstr "E614: vim_SelFile: ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ì¤Þ¤»¤ó"
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
msgid "Pathname:"
msgstr "¥Ñ¥¹Ì¾:"
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
msgid "E615: vim_SelFile: can't get current directory"
msgstr "E615: vim_SelFile: ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
msgid "OK"
msgstr "OK"
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
msgid "Cancel"
msgstr "¥­¥ã¥ó¥»¥ë"
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
msgstr "¥¹¥¯¥í¡¼¥ë¥Ð¡¼: ²èÁü¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
msgid "Vim dialog"
msgstr "Vim ¥À¥¤¥¢¥í¥°"
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: ¥á¥Ã¥»¡¼¥¸¤È¥³¡¼¥ë¥Ð¥Ã¥¯¤Î¤¢¤ë BalloonEval ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
msgid "Vim dialog..."
msgstr "Vim ¥À¥¤¥¢¥í¥°..."
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
msgid ""
"&Yes\n"
"&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
"¤¤¤¤¤¨(&N)\n"
"¥­¥ã¥ó¥»¥ë(&C)"
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
msgid "Input _Methods"
msgstr "¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É"
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
msgid "VIM - Search and Replace..."
msgstr "VIM - ¸¡º÷¤ÈÃÖ´¹..."
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
msgid "VIM - Search..."
msgstr "VIM - ¸¡º÷..."
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
msgid "Find what:"
msgstr "¸¡º÷ʸ»úÎó:"
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
msgid "Replace with:"
msgstr "ÃÖ´¹Ê¸»úÎó:"
#. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
msgid "Match whole word only"
msgstr "Àµ³Î¤Ë³ºÅö¤¹¤ë¤â¤Î¤À¤±"
#. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
msgid "Match case"
msgstr "Âçʸ»ú/¾®Ê¸»ú¤ò¶èÊ̤¹¤ë"
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
msgid "Direction"
msgstr "Êý¸þ"
#. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
msgid "Up"
msgstr "¾å"
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
msgid "Down"
msgstr "²¼"
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
msgid "Find Next"
msgstr "¼¡¤ò¸¡º÷"
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
msgid "Replace"
msgstr "ÃÖ´¹"
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
msgid "Replace All"
msgstr "Á´¤ÆÃÖ´¹"
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
msgid "Vim: Received \"die\" request from session manager\n"
msgstr "Vim: ¥»¥Ã¥·¥ç¥ó¥Þ¥Í¡¼¥¸¥ã¤«¤é \"die\" Í×µá¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿\n"
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr "Vim: ¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤¬ÉÔ°Õ¤ËÇ˲õ¤µ¤ì¤Þ¤·¤¿\n"
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
msgid "Font Selection"
msgstr "¥Õ¥©¥ó¥ÈÁªÂò"
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "¶õ¤ÎÁªÂòÎΰè¤Î¤«¤ï¤ê¤ËCUT_BUFFER0¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿"
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "¥Õ¥£¥ë¥¿"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "¥Õ¥£¥ë¥¿(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "¥­¥ã¥ó¥»¥ë(&C)"
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
msgid "Directories"
msgstr "¥Ç¥£¥ì¥¯¥È¥ê"
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "¥Ø¥ë¥×"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "¥Õ¥£¥ë¥¿"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "¥Ø¥ë¥×(&H)"
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
msgid "Files"
msgstr "¥Õ¥¡¥¤¥ë"
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
msgid "Selection"
msgstr "ÁªÂò"
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "¥¢¥ó¥É¥¥"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "¼¡¤ò¸¡º÷(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "ÃÖ´¹(&R)"
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "Á´¤ÆÃÖ´¹(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "¥¢¥ó¥É¥¥(&U)"
+
+#: ../gui_riscos.c:952
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: Zap¥Õ¥©¥ó¥È '%s' ¤òÆɹþ¤á¤Þ¤»¤ó"
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: ¥Õ¥©¥ó¥È %s ¤ò»ÈÍѤǤ­¤Þ¤»¤ó"
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
msgid ""
"\n"
"Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
"\n"
"»Ò¥×¥í¥»¥¹¤ØÄä»ß¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®Ãæ¤Ç¤¹.\n"
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ¥¿¥¤¥È¥ë¤¬ \"%s\" ¤Î¥¦¥£¥ó¥É¥¦¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#: ../gui_w32.c:848
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
msgstr "E243: °ú¿ô¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó: \"-%s\"; OLEÈǤò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤."
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI¥¢¥×¥ê¤ÎÃæ¤Ç¤Ï¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó"
+
+#: ../gui_w48.c:2213
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "¸¡º÷ʸ»úÎó ('\\' ¤ò¸¡º÷¤¹¤ë¤Ë¤Ï '\\\\')"
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "¸¡º÷¡¦ÃÖ´¹ ('\\' ¤ò¸¡º÷¤¹¤ë¤Ë¤Ï '\\\\')"
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "»È¤ï¤ì¤Þ¤»¤ó"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê\t*.nothing\n"
+
+#: ../gui_x11.c:1537
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr "Vim E458: ¿§»ØÄ꤬Àµ¤·¤¯¤Ê¤¤¤Î¤Ç¥¨¥ó¥È¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó"
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
#, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:"
msgstr "E250: °Ê²¼¤Îʸ»ú¥»¥Ã¥È¤Î¥Õ¥©¥ó¥È¤¬¤¢¤ê¤Þ¤»¤ó %s:"
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
#, c-format
msgid "E252: Fontset name: %s"
msgstr "E252: ¥Õ¥©¥ó¥È¥»¥Ã¥È̾: %s"
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
#, c-format
msgid "Font '%s' is not fixed-width"
msgstr "¥Õ¥©¥ó¥È '%s' ¤Ï¸ÇÄêÉý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
#, c-format
msgid "E253: Fontset name: %s\n"
msgstr "E253: ¥Õ¥©¥ó¥È¥»¥Ã¥È̾: %s\n"
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
#, c-format
msgid "Font0: %s\n"
msgstr "¥Õ¥©¥ó¥È0: %s\n"
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
#, c-format
msgid "Font1: %s\n"
msgstr "¥Õ¥©¥ó¥È1: %s\n"
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "¥Õ¥©¥ó¥È%d ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤ÎÇܤǤϤ¢¤ê¤Þ¤»¤ó\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "¥Õ¥©¥ó¥È%ld ¤ÎÉý¤¬¥Õ¥©¥ó¥È0¤Î2ÇܤǤϤ¢¤ê¤Þ¤»¤ó\n"
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
#, c-format
msgid "Font0 width: %ld\n"
msgstr "¥Õ¥©¥ó¥È0¤ÎÉý: %ld\n"
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
#, c-format
msgid ""
"Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
"¥Õ¥©¥ó¥È1¤ÎÉý: %ld\n"
"\n"
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "̵¸ú¤Ê¥Õ¥©¥ó¥È»ØÄê¤Ç¤¹"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "µÑ²¼¤¹¤ë(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - ¥Õ¥©¥ó¥ÈÁªÂò"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "̾Á°:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "¥µ¥¤¥º¤ò¥Ý¥¤¥ó¥È¤Çɽ¼¨¤¹¤ë"
+
+# msgid " BLOCK"
+# msgstr " ¥Ö¥í¥Ã¥¯"
+# msgid " LINE"
+# msgstr " ¹Ô"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "¥¨¥ó¥³¡¼¥É:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "¥Õ¥©¥ó¥È:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "¥¹¥¿¥¤¥ë:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "¥µ¥¤¥º:"
+
+#: ../hangulin.c:610
msgid "E256: Hangul automata ERROR"
msgstr "E256: ¥Ï¥ó¥°¥ë¥ª¡¼¥È¥Þ¥È¥ó¥¨¥é¡¼"
-#: if_cscope.c:77
+#: ../if_cscope.c:77
msgid "Add a new database"
msgstr "¿·¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÄɲÃ"
-#: if_cscope.c:79
+#: ../if_cscope.c:79
msgid "Query for a pattern"
msgstr "¥Ñ¥¿¡¼¥ó¤Î¥¯¥¨¥ê¡¼¤òÄɲÃ"
-#: if_cscope.c:81
+#: ../if_cscope.c:81
msgid "Show this message"
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë"
-#: if_cscope.c:83
+#: ../if_cscope.c:83
msgid "Kill a connection"
msgstr "Àܳ¤ò½ªÎ»¤¹¤ë"
-#: if_cscope.c:85
+#: ../if_cscope.c:85
msgid "Reinit all connections"
msgstr "Á´¤Æ¤ÎÀܳ¤òºÆ½é´ü²½¤¹¤ë"
-#: if_cscope.c:87
+#: ../if_cscope.c:87
msgid "Show connections"
msgstr "Àܳ¤òɽ¼¨¤¹¤ë"
-#: if_cscope.c:95
+#: ../if_cscope.c:95
#, c-format
msgid "E560: Usage: cs[cope] %s"
msgstr "E560: »ÈÍÑÊýË¡: cs[cope] %s"
-#: if_cscope.c:124
+#: ../if_cscope.c:124
msgid "This cscope command does not support splitting the window.\n"
msgstr "¤³¤Îcscope¥³¥Þ¥ó¥É¤Ïʬ³ä¥¦¥£¥ó¥É¥¦¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó.\n"
-#: if_cscope.c:175
+#: ../if_cscope.c:175
msgid "E562: Usage: cstag <ident>"
msgstr "E562: »ÈÍÑË¡: cstag <ident>"
-#: if_cscope.c:231
+#: ../if_cscope.c:231
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: ¥¿¥°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: if_cscope.c:409
+#: ../if_cscope.c:409
#, c-format
msgid "E563: stat(%s) error: %d"
msgstr "E563: stat(%s) ¥¨¥é¡¼: %d"
-#: if_cscope.c:419
+#: ../if_cscope.c:419
msgid "E563: stat error"
msgstr "E563: stat ¥¨¥é¡¼"
-#: if_cscope.c:516
+#: ../if_cscope.c:516
#, c-format
msgid "E564: %s is not a directory or a valid cscope database"
msgstr "E564: %s ¤Ï¥Ç¥£¥ì¥¯¥È¥êµÚ¤ÓÍ­¸ú¤Êcscope¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: if_cscope.c:534
+#: ../if_cscope.c:534
#, c-format
msgid "Added cscope database %s"
msgstr "cscope¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤òÄɲÃ"
-#: if_cscope.c:589
+#: ../if_cscope.c:589
#, c-format
msgid "E262: error reading cscope connection %ld"
msgstr "E262: cscope¤ÎÀܳ %ld ¤òÆɹþ¤ßÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
-#: if_cscope.c:694
+#: ../if_cscope.c:694
msgid "E561: unknown cscope search type"
msgstr "E561: ̤ÃΤÎcscope¸¡º÷·¿¤Ç¤¹"
-#: if_cscope.c:736
+#: ../if_cscope.c:736
msgid "E566: Could not create cscope pipes"
msgstr "E566: cscope¥Ñ¥¤¥×¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: if_cscope.c:753
+#: ../if_cscope.c:753
msgid "E622: Could not fork for cscope"
msgstr "E622: cscope¤Îµ¯Æ°½àÈ÷(fork)¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection ¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_cscope.c:898
+#: ../if_cscope.c:898
msgid "E623: Could not spawn cscope process"
msgstr "E623: cscope¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: if_cscope.c:911
+#: ../if_cscope.c:911
msgid "cs_create_connection: fdopen for to_fp failed"
msgstr "cs_create_connection: to_fp ¤Î fdopen ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_cscope.c:913
+#: ../if_cscope.c:913
msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: fr_fp ¤Î fdopen ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_cscope.c:951
+#: ../if_cscope.c:951
msgid "E567: no cscope connections"
msgstr "E567: cscopeÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
msgstr "E259: cscope¥¯¥¨¥ê¡¼ %s of %s ¤Ë³ºÅö¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
#, c-format
msgid "E469: invalid cscopequickfix flag %c for %c"
msgstr "E469: ̵¸ú¤Ê cscopequickfix ¥Õ¥é¥° %c ¤Î %c ¤Ç¤¹"
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
msgid "cscope commands:\n"
msgstr "cscope¥³¥Þ¥ó¥É:\n"
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
#, c-format
msgid "%-5s: %-30s (Usage: %s)"
msgstr "%-5s: %-30s (»ÈÍÑË¡: %s)"
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
#, c-format
msgid "E625: cannot open cscope database: %s"
msgstr "E625: cscope¥Ç¡¼¥¿¥Ù¡¼¥¹: %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
msgid "E626: cannot get cscope database information"
msgstr "E626: cscope¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ðÊó¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
msgid "E568: duplicate cscope database not added"
msgstr "E568: ½ÅÊ£¤¹¤ëcscope¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÏÄɲ䵤ì¤Þ¤»¤ó¤Ç¤·¤¿"
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
msgid "E569: maximum number of cscope connections reached"
msgstr "E569: cscopeÀܳ¤ÎºÇÂç¿ô¤Ë㤷¤Þ¤·¤¿"
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: cscopeÀܳ %s ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
#, c-format
msgid "cscope connection %s closed"
msgstr "cscopeÀܳ %s ¤¬ÊĤ¸¤é¤ì¤Þ¤·¤¿"
#. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
msgid "E570: fatal error in cs_manage_matches"
msgstr "E570: cs_manage_matches ¤ÇÃ×̿Ū¤Ê¥¨¥é¡¼¤Ç¤¹"
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
#, c-format
msgid "Cscope tag: %s"
msgstr "Cscope ¥¿¥°: %s"
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
msgid ""
"\n"
" # line"
@@ -2507,28 +2894,123 @@ msgstr ""
"\n"
" # ¹ÔÈÖ¹æ"
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
msgid "filename / context / line\n"
msgstr "¥Õ¥¡¥¤¥ë̾ / ʸ̮ / ¹Ô\n"
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
#, c-format
msgid "E609: Cscope error: %s"
msgstr "E609: cscope¥¨¥é¡¼: %s"
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
msgid "All cscope databases reset"
msgstr "Á´¤Æ¤Îcscope¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥ê¥»¥Ã¥È¤·¤Þ¤¹"
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
msgid "no cscope connections\n"
msgstr "cscopeÀܳ¤¬¤¢¤ê¤Þ¤»¤ó\n"
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
msgid " # pid database name prepend path\n"
msgstr " # pid ¥Ç¡¼¥¿¥Ù¡¼¥¹Ì¾ prepend ¥Ñ¥¹\n"
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹, ¤´¤á¤ó¤Ê¤µ¤¤: MzScheme "
+"¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "̵¸ú¤Ê¼°¤Ç¤¹"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "¼°¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "±£¤·¥ª¥×¥·¥ç¥ó"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "Èϰϳ°¤Î¥¦¥£¥ó¥É¥¦ÈÖ¹æ¤Ç¤¹"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "¥Ð¥Ã¥Õ¥¡¤ò³«¤±¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "¥¢¥ó¥É¥¥¾ðÊó¤¬Êݸ¤Ç¤­¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "¹Ô¤ò¾Ã¤»¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "¹Ô¤òÃÖ´¹¤Ç¤­¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "¹Ô¤òÁÞÆþ¤Ç¤­¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "ʸ»úÎó¤Ë¤Ï²þ¹Ôʸ»ú¤ò´Þ¤á¤é¤ì¤Þ¤»¤ó"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim ¥¨¥é¡¼: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim ¥¨¥é¡¼"
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "¥Ð¥Ã¥Õ¥¡¤Ï̵¸ú¤Ç¤¹"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "¥¦¥£¥ó¥É¥¦¤Ï̵¸ú¤Ç¤¹"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "Èϰϳ°¤Î¹ÔÈÖ¹æ¤Ç¤¹"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ¥é¥¤¥Ö¥é¥ê %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹, ¤´¤á¤ó¤Ê¤µ¤¤: Perl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ï Safe "
+"¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ·¤Ê¤¤Perl¥¹¥¯¥ê¥×¥È¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹"
+
+#: ../if_python.c:438
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
"Python¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
# Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Python ¤òºÆµ¢Åª¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: if_python.c:701
+#: ../if_python.c:705
msgid "can't delete OutputObject attributes"
msgstr "OutputObject°À­¤ò¾Ã¤»¤Þ¤»¤ó"
-#: if_python.c:708
+#: ../if_python.c:712
msgid "softspace must be an integer"
msgstr "softspace ¤Ï integer ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: if_python.c:716
+#: ../if_python.c:720
msgid "invalid attribute"
msgstr "̵¸ú¤Ê°À­¤Ç¤¹"
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
msgid "writelines() requires list of strings"
msgstr "writelines() ¤Ë¤Ïʸ»úÎó¤Î¥ê¥¹¥È¤¬É¬ÍפǤ¹"
-#: if_python.c:895
+#: ../if_python.c:899
msgid "E264: Python: Error initialising I/O objects"
msgstr "E264: Python: I/O¥ª¥Ö¥¸¥§¥¯¥È¤Î½é´ü²½Ãæ¤Ë¥¨¥é¡¼¤Ç¤¹"
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "̵¸ú¤Ê¼°¤Ç¤¹"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "¼°¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
msgid "attempt to refer to deleted buffer"
msgstr "¾Ã¤µ¤ì¤¿¥Ð¥Ã¥Õ¥¡¤¬»²¾È¤µ¤ì¤Þ¤·¤¿"
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
msgid "line number out of range"
msgstr "Èϰϳ°¤Î¹ÔÈÖ¹æ¤Ç¤¹"
-#: if_python.c:1362
+#: ../if_python.c:1366
#, c-format
msgid "<buffer object (deleted) at %8lX>"
msgstr "<¥Ð¥Ã¥Õ¥¡¥ª¥Ö¥¸¥§¥¯¥È (¾ÃµîºÑ¤ß) %8lX>"
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
msgid "invalid mark name"
msgstr "̵¸ú¤Ê¥Þ¡¼¥¯Ì¾¤Ç¤¹"
-#: if_python.c:1733
+#: ../if_python.c:1737
msgid "no such buffer"
msgstr "¤½¤Î¤è¤¦¤Ê¥Ð¥Ã¥Õ¥¡¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: if_python.c:1821
+#: ../if_python.c:1825
msgid "attempt to refer to deleted window"
msgstr "¾Ã¤µ¤ì¤¿¥¦¥£¥ó¥É¥¦¤¬»²¾È¤µ¤ì¤Þ¤·¤¿"
-#: if_python.c:1866
+#: ../if_python.c:1870
msgid "readonly attribute"
msgstr "ÆɹþÀìÍÑ°À­"
-#: if_python.c:1879
+#: ../if_python.c:1883
msgid "cursor position outside buffer"
msgstr "¥«¡¼¥½¥ë¤¬¥Ð¥Ã¥Õ¥¡¤Î³°¤Ë¤¢¤ê¤Þ¤¹"
-#: if_python.c:1956
+#: ../if_python.c:1960
#, c-format
msgid "<window object (deleted) at %.8lX>"
msgstr "<¥¦¥£¥ó¥É¥¦¥ª¥Ö¥¸¥§¥¯¥È (¾ÃµîºÑ) %.8lX>"
-#: if_python.c:1968
+#: ../if_python.c:1972
#, c-format
msgid "<window object (unknown) at %.8lX>"
msgstr "<¥¦¥£¥ó¥É¥¦¥ª¥Ö¥¸¥§¥¯¥È (̤ÃÎ) %.8lX>"
-#: if_python.c:1970
+#: ../if_python.c:1974
#, c-format
msgid "<window %d>"
msgstr "<¥¦¥£¥ó¥É¥¦ %d>"
-#: if_python.c:2046
+#: ../if_python.c:2050
msgid "no such window"
msgstr "¤½¤Î¤è¤¦¤Ê¥¦¥£¥ó¥É¥¦¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
-#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1999
-msgid "cannot save undo information"
-msgstr "¥¢¥ó¥É¥¥¾ðÊó¤¬Êݸ¤Ç¤­¤Þ¤»¤ó"
-
-#: if_python.c:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "¹Ô¤ò¾Ã¤»¤Þ¤»¤ó"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "¹Ô¤òÃÖ´¹¤Ç¤­¤Þ¤»¤ó"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "¹Ô¤òÁÞÆþ¤Ç¤­¤Þ¤»¤ó"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "ʸ»úÎó¤Ë¤Ï²þ¹Ôʸ»ú¤ò´Þ¤á¤é¤ì¤Þ¤»¤ó"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: "
"Ruby¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
-#: if_ruby.c:485
+#: ../if_ruby.c:485
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: ̤ÃΤÎlongjmp¾õÂÖ: %d"
-#: if_sniff.c:67
+#: ../if_sniff.c:67
msgid "Toggle implementation/definition"
msgstr "¼ÂÁõ¤ÈÄêµÁ¤òÀÚ¤êÂؤ¨¤ë"
-#: if_sniff.c:68
+#: ../if_sniff.c:68
msgid "Show base class of"
msgstr "¼¡¤Î¥¯¥é¥¹¤Î´ðÄì¤òɽ¼¨"
-#: if_sniff.c:69
+#: ../if_sniff.c:69
msgid "Show overridden member function"
msgstr "¥ª¡¼¥Ð¡¼¥é¥¤¥É¤µ¤ì¤¿¥á¥ó¥Ð´Ø¿ô¤òɽ¼¨"
-#: if_sniff.c:70
+#: ../if_sniff.c:70
msgid "Retrieve from file"
msgstr "¥Õ¥¡¥¤¥ë¤«¤é²óÉü¤¹¤ë"
-#: if_sniff.c:71
+#: ../if_sniff.c:71
msgid "Retrieve from project"
msgstr "¥×¥í¥¸¥§¥¯¥È¤«¤é²óÉü¤¹¤ë"
-#: if_sniff.c:73
+#: ../if_sniff.c:73
msgid "Retrieve from all projects"
msgstr "Á´¤Æ¤Î¥×¥í¥¸¥§¥¯¥È¤«¤é²óÉü¤¹¤ë"
-#: if_sniff.c:74
+#: ../if_sniff.c:74
msgid "Retrieve"
msgstr "²óÉü"
-#: if_sniff.c:75
+#: ../if_sniff.c:75
msgid "Show source of"
msgstr "¼¡¤Î¥½¡¼¥¹¤òɽ¼¨¤¹¤ë"
-#: if_sniff.c:76
+#: ../if_sniff.c:76
msgid "Find symbol"
msgstr "¤ß¤Ä¤±¤¿¥·¥ó¥Ü¥ë"
-#: if_sniff.c:77
+#: ../if_sniff.c:77
msgid "Browse class"
msgstr "¥¯¥é¥¹¤ò»²¾È"
-#: if_sniff.c:78
+#: ../if_sniff.c:78
msgid "Show class in hierarchy"
msgstr "³¬Áؤǥ¯¥é¥¹¤òɽ¼¨"
-#: if_sniff.c:79
+#: ../if_sniff.c:79
msgid "Show class in restricted hierarchy"
msgstr "¸ÂÄꤵ¤ì¤¿³¬Áؤǥ¯¥é¥¹¤òɽ¼¨"
-#: if_sniff.c:80
+#: ../if_sniff.c:80
msgid "Xref refers to"
msgstr "Xref ¤Î»²¾ÈÀè"
-#: if_sniff.c:81
+#: ../if_sniff.c:81
msgid "Xref referred by"
msgstr "Xref ¤¬»²¾È¤µ¤ì¤ë"
-#: if_sniff.c:82
+#: ../if_sniff.c:82
msgid "Xref has a"
msgstr "Xref ¤¬¼¡¤Î¤â¤Î¤ò¤â¤Ã¤Æ¤¤¤Þ¤¹"
-#: if_sniff.c:83
+#: ../if_sniff.c:83
msgid "Xref used by"
msgstr "Xref ¤¬»ÈÍѤµ¤ì¤ë"
-#: if_sniff.c:84
+#: ../if_sniff.c:84
msgid "Show docu of"
msgstr "¼¡¤Îʸ¾Ï¤òɽ¼¨"
-#: if_sniff.c:85
+#: ../if_sniff.c:85
msgid "Generate docu for"
msgstr "¼¡¤Îʸ¾Ï¤òÀ¸À®"
-#: if_sniff.c:97
+#: ../if_sniff.c:97
msgid ""
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
"SNiFF+¤ËÀܳ¤Ç¤­¤Þ¤»¤ó. ´Ä¶­¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤(sniffemacs ¤¬ $PATH "
"¤Ë¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó).\n"
-#: if_sniff.c:425
+#: ../if_sniff.c:425
msgid "E274: Sniff: Error during read. Disconnected"
msgstr "E274: Sniff: ÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿. ÀÚÃǤ·¤Þ¤·¤¿"
-#: if_sniff.c:553
+#: ../if_sniff.c:553
msgid "SNiFF+ is currently "
msgstr "¸½ºßSNiFF+ ¤Î¾õÂ֤ϡÖ"
-#: if_sniff.c:555
+#: ../if_sniff.c:555
msgid "not "
msgstr "̤"
-#: if_sniff.c:556
+#: ../if_sniff.c:556
msgid "connected"
msgstr "Àܳ¡×¤Ç¤¹"
-#: if_sniff.c:592
+#: ../if_sniff.c:592
#, c-format
msgid "E275: Unknown SNiFF+ request: %s"
msgstr "E275: ̤ÃΤΠSNiFF+ ¥ê¥¯¥¨¥¹¥È¤Ç¤¹: %s"
-#: if_sniff.c:605
+#: ../if_sniff.c:605
msgid "E276: Error connecting to SNiFF+"
msgstr "E276: SNiFF+ ¤Ø¤ÎÀܳÃæ¤Î¥¨¥é¡¼¤Ç¤¹"
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
msgid "E278: SNiFF+ not connected"
msgstr "E278: SNiFF+ ¤ËÀܳ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
msgid "E279: Not a SNiFF+ buffer"
msgstr "E279: SNiFF+ ¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó"
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
msgid "Sniff: Error during write. Disconnected"
msgstr "Sniff: ½ñ¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤Î¤ÇÀÚÃǤ·¤Þ¤·¤¿"
-#: if_tcl.c:418
+#: ../if_tcl.c:422
msgid "invalid buffer number"
msgstr "̵¸ú¤Ê¥Ð¥Ã¥Õ¥¡ÈÖ¹æ¤Ç¤¹"
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
msgid "not implemented yet"
msgstr "¤Þ¤À¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹"
-
#. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
msgid "cannot set line(s)"
msgstr "¹Ô¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
-#: if_tcl.c:845
+#: ../if_tcl.c:849
msgid "mark not set"
msgstr "¥Þ¡¼¥¯¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
#, c-format
msgid "row %d column %d"
msgstr "¹Ô %d Îó %d"
-#: if_tcl.c:881
+#: ../if_tcl.c:885
msgid "cannot insert/append line"
msgstr "¹Ô¤ÎÁÞÆþ/Äɲäò¤Ç¤­¤Þ¤»¤ó"
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
msgid "unknown flag: "
msgstr "̤ÃΤΥե饰:"
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
msgid "unknown vimOption"
msgstr "̤ÃΤΠvimOption ¤Ç¤¹"
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
msgid "keyboard interrupt"
msgstr "¥­¡¼¥Ü¡¼¥É³ä¹þ¤ß"
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
msgid "vim error"
msgstr "vim ¥¨¥é¡¼"
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
msgid "cannot create buffer/window command: object is being deleted"
msgstr ""
"¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦ºîÀ®¥³¥Þ¥ó¥É¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: "
"¥ª¥Ö¥¸¥§¥¯¥È¤¬¾Ãµî¤µ¤ì¤Æ¤¤¤Þ¤·¤¿"
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
msgid ""
"cannot register callback command: buffer/window is already being deleted"
msgstr ""
"¥³¡¼¥ë¥Ð¥Ã¥¯¥³¥Þ¥ó¥É¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó: ¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦¤¬´û¤Ë¾Ãµî¤µ¤ì¤Þ¤·¤¿"
#. This should never happen. Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
"vim-dev@vim.org"
msgstr ""
"E280: TCL Ã×̿Ū¥¨¥é¡¼: reflist ±øÀ÷!? vim-dev@vim.org ¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤"
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
"¥³¡¼¥ë¥Ð¥Ã¥¯¥³¥Þ¥ó¥É¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó: "
"¥Ð¥Ã¥Õ¥¡/¥¦¥£¥ó¥É¥¦¤Î»²¾È¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
"E571: ¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹,¤´¤á¤ó¤Ê¤µ¤¤: "
"Tcl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
msgstr ""
"E281: TCL ¥¨¥é¡¼: ½ªÎ»¥³¡¼¥É¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó!? vim-dev@vim.org "
"¤ËÊó¹ð¤·¤Æ¤¯¤À¤µ¤¤"
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
msgid "cannot get line"
msgstr "¹Ô¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
msgid "Unable to register a command server name"
msgstr "Ì¿Î᥵¡¼¥Ð¤Î̾Á°¤òÅÐÏ¿¤Ç¤­¤Þ¤»¤ó"
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
msgid "E248: Failed to send command to the destination program"
msgstr "E248: ÌÜŪ¤Î¥×¥í¥°¥é¥à¤Ø¤Î¥³¥Þ¥ó¥ÉÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
#, c-format
msgid "E573: Invalid server id used: %s"
msgstr "E573: ̵¸ú¤Ê¥µ¡¼¥ÐID¤¬»È¤ï¤ì¤Þ¤·¤¿: %s"
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: VIM ¼ÂÂΤÎÅÐÏ¿¥×¥í¥Ñ¥Æ¥£¤¬ÉÔÀµ¤Ç¤¹. ¾Ãµî¤·¤Þ¤·¤¿!"
-#: main.c:60
+#: ../main.c:60
msgid "Unknown option"
msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹"
-#: main.c:62
+#: ../main.c:62
msgid "Too many edit arguments"
-msgstr "ÊÔ½¸°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "ÊÔ½¸°ú¿ô¤¬Â¿²á¤®¤Þ¤¹"
-#: main.c:64
+#: ../main.c:64
msgid "Argument missing after"
msgstr "°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: main.c:66
+#: ../main.c:66
msgid "Garbage after option"
msgstr "¥ª¥×¥·¥ç¥ó¤Î¸å¤Ë¥´¥ß¤¬¤¢¤ê¤Þ¤¹"
-#: main.c:68
+#: ../main.c:68
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" ¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" ¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹"
-#: main.c:70
+#: ../main.c:70
msgid "Invalid argument for"
msgstr "̵¸ú¤Ê°ú¿ô¤Ç¤¹: "
-#: main.c:466
+#: ../main.c:481
msgid "This Vim was not compiled with the diff feature."
msgstr "¤³¤ÎVim¤Ë¤Ïdiffµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó(¥³¥ó¥Ñ¥¤¥ë»þÀßÄê)."
-#: main.c:932
+#: ../main.c:958
msgid "Attempt to open script file again: \""
msgstr "¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤òºÆ¤Ó³«¤¤¤Æ¤ß¤Þ¤¹: \""
# msgid "\"\n"
# msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
msgid "Cannot open for reading: \""
msgstr "ÆɹþÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
-#: main.c:985
+#: ../main.c:1021
msgid "Cannot open for script output: \""
msgstr "¥¹¥¯¥ê¥×¥È½ÐÎÏÍѤò³«¤±¤Þ¤»¤ó"
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬ÊÔ½¸¤ò¹µ¤¨¤Æ¤¤¤Þ¤¹\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ¥¨¥é¡¼: NetBeans¤«¤égvim¤ò¥¹¥¿¡¼¥È¤Ç¤­¤Þ¤»¤ó\n"
-#: main.c:1233
+#: ../main.c:1302
msgid "Vim: Warning: Output is not to a terminal\n"
msgstr "Vim: ·Ù¹ð: üËö¤Ø¤Î½ÐÎϤǤϤ¢¤ê¤Þ¤»¤ó\n"
-#: main.c:1235
+#: ../main.c:1304
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: ·Ù¹ð: üËö¤«¤é¤ÎÆþÎϤǤϤ¢¤ê¤Þ¤»¤ó\n"
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d ¸Ä¤Î¥Õ¥¡¥¤¥ë¤¬ÊÔ½¸¤ò¹µ¤¨¤Æ¤¤¤Þ¤¹\n"
+
#. just in case..
-#: main.c:1297
+#: ../main.c:1377
msgid "pre-vimrc command line"
msgstr "vimrcÁ°¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó"
-#: main.c:1338
+#: ../main.c:1418
#, c-format
msgid "E282: Cannot read from \"%s\""
msgstr "E282: \"%s\"¤«¤éÆɹþ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
-#: main.c:2411
+#: ../main.c:2521
msgid ""
"\n"
"More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
"\n"
"¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ï: \"vim -h\"\n"
-#: main.c:2444
+#: ../main.c:2554
msgid "[file ..] edit specified file(s)"
msgstr "[¥Õ¥¡¥¤¥ë..] ¤¢¤ë¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë"
-#: main.c:2445
+#: ../main.c:2555
msgid "- read text from stdin"
msgstr "- ɸ½àÆþÎϤ«¤é¥Æ¥­¥¹¥È¤òÆɹþ¤à"
-#: main.c:2446
+#: ../main.c:2556
msgid "-t tag edit file where tag is defined"
msgstr "-t ¥¿¥° ¥¿¥°¤¬ÄêµÁ¤µ¤ì¤¿¤È¤³¤í¤«¤éÊÔ½¸¤¹¤ë"
-#: main.c:2448
+#: ../main.c:2558
msgid "-q [errorfile] edit file with first error"
msgstr "-q [errorfile] ºÇ½é¤Î¥¨¥é¡¼¤ÇÊÔ½¸¤¹¤ë"
-#: main.c:2457
+#: ../main.c:2567
msgid ""
"\n"
"\n"
@@ -2978,11 +3431,11 @@ msgstr ""
"\n"
"»ÈÍÑË¡:"
-#: main.c:2460
+#: ../main.c:2570
msgid " vim [arguments] "
msgstr " vim [°ú¿ô]"
-#: main.c:2464
+#: ../main.c:2574
msgid ""
"\n"
" or:"
@@ -2990,7 +3443,11 @@ msgstr ""
"\n"
" ¤â¤·¤¯¤Ï:"
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "Âçʸ»ú¾®Ê¸»ú¤Ï̵»ë¤µ¤ì¤Þ¤¹ / ¥Õ¥é¥°¤ÏÂçʸ»ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: ../main.c:2580
msgid ""
"\n"
"\n"
@@ -3000,241 +3457,241 @@ msgstr ""
"\n"
"°ú¿ô:\n"
-#: main.c:2468
+#: ../main.c:2581
msgid "--\t\t\tOnly file names after this"
msgstr "--\t\t\t¤³¤Î¤¢¤È¤Ë¤Ï¥Õ¥¡¥¤¥ë̾¤À¤±"
-#: main.c:2470
+#: ../main.c:2583
msgid "--literal\t\tDon't expand wildcards"
msgstr "--literal\t\t¥ï¥¤¥ë¥É¥«¡¼¥É¤òŸ³«¤·¤Ê¤¤"
-#: main.c:2473
+#: ../main.c:2586
msgid "-register\t\tRegister this gvim for OLE"
msgstr "-register\t\t¤³¤Îgvim¤òOLE¤È¤·¤ÆÅÐÏ¿¤¹¤ë"
-#: main.c:2474
+#: ../main.c:2587
msgid "-unregister\t\tUnregister gvim for OLE"
msgstr "-unregister\t\tgvim¤ÎOLEÅÐÏ¿¤ò²ò½ü¤¹¤ë"
-#: main.c:2477
+#: ../main.c:2590
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\tGUI¤Çµ¯Æ°¤¹¤ë (\"gvim\" ¤ÈƱ¤¸)"
-#: main.c:2478
+#: ../main.c:2591
msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
msgstr "-f or --nofork\t¥Õ¥©¥¢¥°¥é¥¦¥ó¥É: GUI¤ò»Ï¤á¤ë¤È¤­¤Ëfork¤·¤Ê¤¤"
-#: main.c:2480
+#: ../main.c:2593
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tVi¥â¡¼¥É (\"vi\" ¤ÈƱ¤¸)"
-#: main.c:2481
+#: ../main.c:2594
msgid "-e\t\t\tEx mode (like \"ex\")"
msgstr "-e\t\t\tEx¥â¡¼¥É (\"ex\" ¤ÈƱ¤¸)"
-#: main.c:2482
+#: ../main.c:2595
msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
msgstr "-s\t\t\t¥µ¥¤¥ì¥ó¥È(¥Ð¥Ã¥Á)¥â¡¼¥É (\"ex\" ÀìÍÑ)"
-#: main.c:2484
+#: ../main.c:2597
msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
msgstr "-d\t\t\tº¹Ê¬¥â¡¼¥É (\"vidiff\" ¤ÈƱ¤¸)"
-#: main.c:2486
+#: ../main.c:2599
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
msgstr "-y\t\t\t¥¤¡¼¥¸¡¼¥â¡¼¥É (\"evim\" ¤ÈƱ¤¸, ¥â¡¼¥É̵)"
-#: main.c:2487
+#: ../main.c:2600
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\tÆɹþÀìÍѥ⡼¥É (\"view\" ¤ÈƱ¤¸)"
-#: main.c:2488
+#: ../main.c:2601
msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
msgstr "-Z\t\t\tÀ©¸Â¥â¡¼¥É (\"rvim\" ¤ÈƱ¤¸)"
-#: main.c:2489
+#: ../main.c:2602
msgid "-m\t\t\tModifications (writing files) not allowed"
msgstr "-m\t\t\tÊѹ¹ (¥Õ¥¡¥¤¥ëÊݸ»þ) ¤ò¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤¹¤ë"
-#: main.c:2490
+#: ../main.c:2603
msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\t¥Æ¥­¥¹¥È¤ÎÊÔ½¸¤ò¹Ô¤Ê¤¨¤Ê¤¤¤è¤¦¤Ë¤¹¤ë"
-#: main.c:2491
+#: ../main.c:2604
msgid "-b\t\t\tBinary mode"
msgstr "-b\t\t\t¥Ð¥¤¥Ê¥ê¥â¡¼¥É"
-#: main.c:2493
+#: ../main.c:2606
msgid "-l\t\t\tLisp mode"
msgstr "-l\t\t\tLisp¥â¡¼¥É"
-#: main.c:2495
+#: ../main.c:2608
msgid "-C\t\t\tCompatible with Vi: 'compatible'"
msgstr "-C\t\t\tVi¸ß´¹¥â¡¼¥É: 'compatible'"
-#: main.c:2496
+#: ../main.c:2609
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
msgstr "-N\t\t\tViÈó¸ß´¹¥â¡¼¥É: 'nocompatible"
-#: main.c:2497
+#: ../main.c:2610
msgid "-V[N]\t\tVerbose level"
msgstr "-V[N]\t\tVerbose ¥ì¥Ù¥ë"
-#: main.c:2498
+#: ../main.c:2611
msgid "-D\t\t\tDebugging mode"
msgstr "-D\t\t\t¥Ç¥Ð¥Ã¥°¥â¡¼¥É"
-#: main.c:2499
+#: ../main.c:2612
msgid "-n\t\t\tNo swap file, use memory only"
msgstr "-n\t\t\t¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ»¤º¥á¥â¥ê¤À¤±"
-#: main.c:2500
+#: ../main.c:2613
msgid "-r\t\t\tList swap files and exit"
msgstr "-r\t\t\t¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤òÎóµó¤·½ªÎ»"
-#: main.c:2501
+#: ../main.c:2614
msgid "-r (with file name)\tRecover crashed session"
msgstr "-r (¥Õ¥¡¥¤¥ë̾)\t¥¯¥é¥Ã¥·¥å¤·¤¿¥»¥Ã¥·¥ç¥ó¤òÉüµ¢"
-#: main.c:2502
+#: ../main.c:2615
msgid "-L\t\t\tSame as -r"
msgstr "-L\t\t\t-r¤ÈƱ¤¸"
-#: main.c:2504
+#: ../main.c:2617
msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\t¥¦¥£¥ó¥É¥¦¤ò³«¤¯¤Î¤Ë newcli ¤ò»ÈÍѤ·¤Ê¤¤"
-#: main.c:2505
+#: ../main.c:2618
msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <device>\t\tI/O¤Ë <device> ¤ò»ÈÍѤ¹¤ë"
-#: main.c:2508
+#: ../main.c:2621
msgid "-A\t\t\tstart in Arabic mode"
msgstr "-A\t\t\t¥¢¥é¥Ó¥¢¸ì¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë"
-#: main.c:2511
+#: ../main.c:2624
msgid "-H\t\t\tStart in Hebrew mode"
msgstr "-H\t\t\t¥Ø¥Ö¥é¥¤¸ì¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë"
-#: main.c:2514
+#: ../main.c:2627
msgid "-F\t\t\tStart in Farsi mode"
msgstr "-F\t\t\t¥Ú¥ë¥·¥¢¸ì¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë"
-#: main.c:2516
+#: ../main.c:2629
msgid "-T <terminal>\tSet terminal type to <terminal>"
msgstr "-T <terminal>\tüËö¤ò <terminal> ¤ËÀßÄꤹ¤ë"
-#: main.c:2517
+#: ../main.c:2630
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
msgstr "-u <vimrc>\t\t.vimrc¤ÎÂå¤ï¤ê¤Ë <vimrc> ¤ò»È¤¦"
-#: main.c:2519
+#: ../main.c:2632
msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
msgstr "-U <gvimrc>\t\t.gvimrc¤ÎÂå¤ï¤ê¤Ë <gvimrc> ¤ò»È¤¦"
-#: main.c:2521
+#: ../main.c:2634
msgid "--noplugin\t\tDon't load plugin scripts"
msgstr "--noplugin\t\t¥×¥é¥°¥¤¥ó¥¹¥¯¥ê¥×¥È¤ò¥í¡¼¥É¤·¤Ê¤¤"
-#: main.c:2522
+#: ../main.c:2635
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "-o[N]\t\tN ¸Ä¥¦¥£¥ó¥É¥¦¤ò³«¤¯(¾ÊάÃÍ: ¥Õ¥¡¥¤¥ë¤Ë¤Ä¤­1¸Ä)"
-#: main.c:2523
+#: ../main.c:2636
msgid "-O[N]\t\tLike -o but split vertically"
msgstr "-O[N]\t\t-o¤ÈƱ¤¸¤À¤¬¿âľʬ³ä"
-#: main.c:2524
+#: ../main.c:2637
msgid "+\t\t\tStart at end of file"
msgstr "+\t\t\t¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤«¤é¤Ï¤¸¤á¤ë"
-#: main.c:2525
+#: ../main.c:2638
msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "+<lnum>\t\t<lnum> ¹Ô¤«¤é¤Ï¤¸¤á¤ë"
-#: main.c:2527
+#: ../main.c:2640
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
msgstr "--cmd <command>\tvimrc¤ò¥í¡¼¥É¤¹¤ëÁ°¤Ë <command> ¤ò¼Â¹Ô¤¹¤ë"
-#: main.c:2529
+#: ../main.c:2642
msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <command>\t\tºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¸å <command> ¤ò¼Â¹Ô¤¹¤ë"
-#: main.c:2530
+#: ../main.c:2643
msgid "-S <session>\t\tSource file <session> after loading the first file"
msgstr "-S <session>\t\tºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¸å¥Õ¥¡¥¤¥ë <session> ¤ò¼è¹þ¤à"
-#: main.c:2531
+#: ../main.c:2644
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
msgstr "-s <scriptin>\t¥Õ¥¡¥¤¥ë <scriptin> ¤«¤é¥Î¡¼¥Þ¥ë¥³¥Þ¥ó¥É¤òÆɹþ¤à"
-#: main.c:2532
+#: ../main.c:2645
msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
msgstr "-w <scriptout>\tÆþÎϤ·¤¿Á´¥³¥Þ¥ó¥É¤ò¥Õ¥¡¥¤¥ë <scriptout> ¤ËÄɲ乤ë"
-#: main.c:2533
+#: ../main.c:2646
msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
msgstr "-W <scriptout>\tÆþÎϤ·¤¿Á´¥³¥Þ¥ó¥É¤ò¥Õ¥¡¥¤¥ë <scriptout> ¤ËÊݸ¤¹¤ë"
-#: main.c:2535
+#: ../main.c:2648
msgid "-x\t\t\tEdit encrypted files"
msgstr "-x\t\t\t°Å¹æ²½¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë"
-#: main.c:2539
+#: ../main.c:2652
msgid "-display <display>\tConnect vim to this particular X-server"
msgstr "-display <display>\tvim¤ò»ØÄꤷ¤¿ X ¥µ¡¼¥Ð¤ËÀܳ¤¹¤ë"
-#: main.c:2541
+#: ../main.c:2654
msgid "-X\t\t\tDo not connect to X server"
msgstr "-X\t\t\tX¥µ¡¼¥Ð¤ËÀܳ¤·¤Ê¤¤"
-#: main.c:2544
+#: ../main.c:2657
msgid "--remote <files>\tEdit <files> in a Vim server if possible"
msgstr "--remote <files>\t²Äǽ¤Ê¤é¤ÐVim¥µ¡¼¥Ð¤Ç <files> ¤òÊÔ½¸¤¹¤ë"
-#: main.c:2545
+#: ../main.c:2658
msgid "--remote-silent <files> Same, don't complain if there is no server"
msgstr "--remote-silnet <files> Ʊ¾å, ¥µ¡¼¥Ð¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
-#: main.c:2546
+#: ../main.c:2659
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
msgstr "--remote-wait <files>\t--remote¸å ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¤¬½ª¤ï¤ë¤Î¤òÂÔ¤Ä"
-#: main.c:2547
+#: ../main.c:2660
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr "--remote-wait-silent <files> Ʊ¾å, ¥µ¡¼¥Ð¤¬Ìµ¤¯¤Æ¤â·Ù¹ðʸ¤ò½ÐÎϤ·¤Ê¤¤"
-#: main.c:2548
+#: ../main.c:2661
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\tVim¥µ¡¼¥Ð¤Ë <keys> ¤òÁ÷¿®¤·¤Æ½ªÎ»¤¹¤ë"
-#: main.c:2549
+#: ../main.c:2662
msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
msgstr "--remote-expr <expr>\t¥µ¡¼¥Ð¤Ç <expr> ¤ò¼Â¹Ô¤·¤Æ·ë²Ì¤òɽ¼¨¤¹¤ë"
-#: main.c:2550
+#: ../main.c:2663
msgid "--serverlist\t\tList available Vim server names and exit"
msgstr "--serverlist\t\tVim¥µ¡¼¥Ð̾¤Î°ìÍ÷¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë"
-#: main.c:2551
+#: ../main.c:2664
msgid "--servername <name>\tSend to/become the Vim server <name>"
msgstr "--servename <name>\t\tVim¥µ¡¼¥Ð <name> ¤ËÁ÷¿®/̾Á°ÀßÄꤹ¤ë"
-#: main.c:2554
+#: ../main.c:2667
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfo¤ÎÂå¤ï¤ê¤Ë <viminfo> ¤ò»È¤¦"
-#: main.c:2556
+#: ../main.c:2669
msgid "-h or --help\tPrint Help (this message) and exit"
msgstr "-h or --help\t¥Ø¥ë¥×(¤³¤Î¥á¥Ã¥»¡¼¥¸)¤òɽ¼¨¤·½ªÎ»¤¹¤ë"
-#: main.c:2557
+#: ../main.c:2670
msgid "--version\t\tPrint version information and exit"
msgstr "--version\t\t¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·½ªÎ»¤¹¤ë"
-#: main.c:2561
+#: ../main.c:2674
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
"\n"
"gvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(Motif¥Ð¡¼¥¸¥ç¥ó):\n"
-#: main.c:2565
+#: ../main.c:2678
msgid ""
"\n"
"Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
"\n"
"gvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(neXtaw¥Ð¡¼¥¸¥ç¥ó):\n"
-#: main.c:2567
+#: ../main.c:2680
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
"\n"
"gvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(Athena¥Ð¡¼¥¸¥ç¥ó):\n"
-#: main.c:2571
+#: ../main.c:2684
msgid "-display <display>\tRun vim on <display>"
msgstr "-display <display>\t<display> ¤Çvim¤ò¼Â¹Ô¤¹¤ë"
-#: main.c:2572
+#: ../main.c:2685
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\tºÇ¾®²½¤·¤¿¾õÂÖ¤Çvim¤òµ¯Æ°¤¹¤ë"
-#: main.c:2574
+#: ../main.c:2687
msgid "-name <name>\t\tUse resource as if vim was <name>"
msgstr "-name <name>\t\tvim¤Î̾¤¬ <name> ¤Ç¤¢¤ë¤È¤·¤Æ¥ê¥½¡¼¥¹¤ò»È¤¦"
-#: main.c:2575
+#: ../main.c:2688
msgid "\t\t\t (Unimplemented)\n"
msgstr "\t\t\t (¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤)\n"
-#: main.c:2577
+#: ../main.c:2690
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr "-background <color>\tÇØ·Ê¿§¤Ë <color> ¤ò»È¤¦(ƱµÁ: -bg)"
-#: main.c:2578
+#: ../main.c:2691
msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
msgstr "-foreground <color>\tÁ°·Ê¿§¤Ë <color> ¤ò»È¤¦(ƱµÁ: -fg)"
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
msgstr "-font <font>\t\t¥Æ¥­¥¹¥Èɽ¼¨¤Ë <font> ¤ò»È¤¦(ƱµÁ: -fn)"
-#: main.c:2580
+#: ../main.c:2693
msgid "-boldfont <font>\tUse <font> for bold text"
msgstr "-boldfont <font>\tÂÀ»ú¤Ë <font> ¤ò»È¤¦"
-#: main.c:2581
+#: ../main.c:2694
msgid "-italicfont <font>\tUse <font> for italic text"
msgstr "-italicfont <for>\t¼ÐÂλú¤Ë <font> ¤ò»È¤¦"
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
msgstr "-geometry <geom>\t½é´üÇÛÃÖ¤Ë <geom> ¤ò»È¤¦(ƱµÁ: -geom)"
-#: main.c:2583
+#: ../main.c:2696
msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
msgstr "-borderwidth <width>\t¶­³¦¤ÎÉý¤ò <width> ¤Ë¤¹¤ë(ƱµÁ: -bw)"
-#: main.c:2584
+#: ../main.c:2697
msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
msgstr ""
"-scrollbarwidth <width> ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ÎÉý¤ò <width> ¤Ë¤¹¤ë(ƱµÁ: -sw)"
-#: main.c:2586
+#: ../main.c:2699
msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
msgstr "-menuheight <height>\t¥á¥Ë¥å¡¼¥Ð¡¼¤Î¹â¤µ¤ò <height> ¤Ë¤¹¤ë(ƱµÁ: -mh)"
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
msgid "-reverse\t\tUse reverse video (also: -rv)"
msgstr "-reverse\t\tȿž±ÇÁü¤ò»ÈÍѤ¹¤ë(ƱµÁ: -rv)"
-#: main.c:2589
+#: ../main.c:2702
msgid "+reverse\t\tDon't use reverse video (also: +rv)"
msgstr "+reverse\t\tȿž±ÇÁü¤ò»ÈÍѤ·¤Ê¤¤(ƱµÁ: +rv)"
-#: main.c:2590
+#: ../main.c:2703
msgid "-xrm <resource>\tSet the specified resource"
msgstr "-xrm <resource>\tÆÃÄê¤Î¥ê¥½¡¼¥¹¤ò»ÈÍѤ¹¤ë"
-#: main.c:2593
+#: ../main.c:2706
msgid ""
"\n"
"Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
"\n"
"gvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(RISC OS¥Ð¡¼¥¸¥ç¥ó):\n"
-#: main.c:2594
+#: ../main.c:2707
msgid "--columns <number>\tInitial width of window in columns"
msgstr "--columns <number>\t½é´ü¤Î¥¦¥£¥ó¥É¥¦¤Î¥³¥é¥àñ°Ì¤ÎÉý"
-#: main.c:2595
+#: ../main.c:2708
msgid "--rows <number>\tInitial height of window in rows"
msgstr "--rows <number>\t½é´ü¤Î¥¦¥£¥ó¥É¥¦¤Î¹Ôñ°Ì¤Î¹â¤µ"
-#: main.c:2598
+#: ../main.c:2711
msgid ""
"\n"
"Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
"\n"
"gvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(GTK+¥Ð¡¼¥¸¥ç¥ó):\n"
-#: main.c:2602
+#: ../main.c:2715
msgid "-display <display>\tRun vim on <display> (also: --display)"
msgstr "-display <display>\t<display> ¤Çvim¤ò¼Â¹Ô¤¹¤ë(ƱµÁ: --display)"
-#: main.c:2604
+#: ../main.c:2717
msgid "--role <role>\tSet a unique role to identify the main window"
msgstr "--role <role>\t¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤ò¼±Ê̤¹¤ë°ì°Õ¤ÊÌò³ä(role)¤òÀßÄꤹ¤ë"
-#: main.c:2606
+#: ../main.c:2719
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\t°Û¤Ê¤ëGTK widget¤ÇVim¤ò³«¤¯"
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvim¤Ë¤è¤Ã¤Æ²ò¼á¤µ¤ì¤ë°ú¿ô(KDE¥Ð¡¼¥¸¥ç¥ó):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\tȿž²èÌ̤ò»ÈÍѤ¹¤ë"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\tµ¯Æ°»þ¤Ë¥Á¥Ã¥×¥À¥¤¥¢¥í¥°¤òɽ¼¨¤¹¤ë"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\t¥Á¥Ã¥×¥À¥¤¥¢¥í¥°¤ò̵¸ú¤Ë¤¹¤ë"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> ¤Çvim¤ò¼Â¹Ô¤¹¤ë"
+
+#: ../main.c:2733
msgid "-P <parent title>\tOpen Vim inside parent application"
msgstr "-P <¿Æ¤Î¥¿¥¤¥È¥ë>\tVim¤ò¿Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÃæ¤Çµ¯Æ°¤¹¤ë"
# msgid "--help\t\tShow Gnome arguments"
# msgstr "--help\t\tGNOME¤Î°ú¿ô¤ò¸«¤»¤ë"
-#: main.c:2847
+#: ../main.c:2971
msgid "No display"
msgstr "¥Ç¥£¥¹¥×¥ì¥¤¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
#. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
msgid ": Send failed.\n"
msgstr ": Á÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿.\n"
#. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
msgid ": Send failed. Trying to execute locally\n"
msgstr ": Á÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿. ¥í¡¼¥«¥ë¤Ç¤Î¼Â¹Ô¤ò»î¤ß¤Æ¤¤¤Þ¤¹\n"
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
#, c-format
msgid "%d of %d edited"
msgstr "%d ¸Ä (%d ¸ÄÃæ) ¤Î¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤·¤¿"
-#: main.c:2949
+#: ../main.c:3073
msgid "No display: Send expression failed.\n"
msgstr "¥Ç¥£¥¹¥×¥ì¥¤¤¬¤¢¤ê¤Þ¤»¤ó: ¼°¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿.\n"
-#: main.c:2961
+#: ../main.c:3085
msgid ": Send expression failed.\n"
msgstr ": ¼°¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿.\n"
-#: mark.c:709
+#: ../mark.c:705
msgid "No marks set"
msgstr "¥Þ¡¼¥¯¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: mark.c:711
+#: ../mark.c:707
#, c-format
msgid "E283: No marks matching \"%s\""
msgstr "E283: \"%s\" ¤Ë³ºÅö¤¹¤ë¥Þ¡¼¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
#. Highlight title
-#: mark.c:722
+#: ../mark.c:718
msgid ""
"\n"
"mark line col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
"mark ¹Ô Îó ¥Õ¥¡¥¤¥ë/¥Æ¥­¥¹¥È"
#. Highlight title
-#: mark.c:760
+#: ../mark.c:841
msgid ""
"\n"
" jump line col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
" jump ¹Ô Îó ¥Õ¥¡¥¤¥ë/¥Æ¥­¥¹¥È"
#. Highlight title
-#: mark.c:805
+#: ../mark.c:886
msgid ""
"\n"
"change line col text"
@@ -3428,7 +3909,7 @@ msgstr ""
"\n"
"Êѹ¹ ¹Ô Îó ¥Æ¥­¥¹¥È"
-#: mark.c:1281
+#: ../mark.c:1362
msgid ""
"\n"
"# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
"# ¥Õ¥¡¥¤¥ë¥Þ¡¼¥¯:\n"
#. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
"\n"
"# ¥¸¥ã¥ó¥×¥ê¥¹¥È (¿·¤·¤¤¤â¤Î¤¬Àè):\n"
-#: mark.c:1412
+#: ../mark.c:1493
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
"\n"
"# ¥Õ¥¡¥¤¥ëÆâ¥Þ¡¼¥¯¤ÎÍúÎò (¿·¤·¤¤¤â¤Î¤«¤é¸Å¤¤¤â¤Î):\n"
-#: mark.c:1501
+#: ../mark.c:1582
msgid "Missing '>'"
msgstr "'>' ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: mbyte.c:467
+#: ../mbyte.c:470
msgid "E543: Not a valid codepage"
msgstr "E543: ̵¸ú¤Ê¥³¡¼¥É¥Ú¡¼¥¸¤Ç¤¹"
-#: mbyte.c:4431
+#: ../mbyte.c:4513
msgid "E284: Cannot set IC values"
msgstr "E284: IC¤ÎÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
-#: mbyte.c:4583
+#: ../mbyte.c:4669
msgid "E285: Failed to create input context"
msgstr "E285: ¥¤¥ó¥×¥Ã¥È¥³¥ó¥Æ¥­¥¹¥È¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: mbyte.c:4741
+#: ../mbyte.c:4827
msgid "E286: Failed to open input method"
msgstr "E286: ¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: mbyte.c:4752
+#: ../mbyte.c:4838
msgid "E287: Warning: Could not set destroy callback to IM"
msgstr "E287: ·Ù¹ð: IM¤ÎÇ˲õ¥³¡¼¥ë¥Ð¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: mbyte.c:4758
+#: ../mbyte.c:4844
msgid "E288: input method doesn't support any style"
msgstr "E288: ¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¤Ï¤É¤ó¤Ê¥¹¥¿¥¤¥ë¤â¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó"
-#: mbyte.c:4815
+#: ../mbyte.c:4901
msgid "E289: input method doesn't support my preedit type"
msgstr "E289: ¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¤Ï my preedit type ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó"
-#: mbyte.c:4889
+#: ../mbyte.c:4975
msgid "E290: over-the-spot style requires fontset"
msgstr "E290: over-the-spot ¥¹¥¿¥¤¥ë¤Ë¤Ïfontset¤¬É¬ÍפǤ¹"
-#: mbyte.c:4925
+#: ../mbyte.c:5011
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
msgstr "E291: GTK+¤¬1.2.3¤è¤ê¤â¸Å¤¤¤Î¤Ç¥¹¥Æ¡¼¥¿¥¹¥¨¥ê¥¢¤¬Ìµ¸ú¤Ç¤¹"
-#: mbyte.c:5232
+#: ../mbyte.c:5318
msgid "E292: Input Method Server is not running"
msgstr "E292: ¥¤¥ó¥×¥Ã¥È¥á¥½¥Ã¥É¥µ¡¼¥Ð ¤¬Æ°ºî¤·¤Æ¤¤¤Þ¤»¤ó"
-#: memfile.c:488
+#: ../memfile.c:488
msgid "E293: block was not locked"
msgstr "E293: ¥Ö¥í¥Ã¥¯¤¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: memfile.c:1005
+#: ../memfile.c:1010
msgid "E294: Seek error in swap file read"
msgstr "E294: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ëÆɹþ»þ¤Ë¥·¡¼¥¯¥¨¥é¡¼¤Ç¤¹"
-#: memfile.c:1010
+#: ../memfile.c:1015
msgid "E295: Read error in swap file"
msgstr "E295: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÆɹþ¤ß¥¨¥é¡¼¤Ç¤¹"
-#: memfile.c:1062
+#: ../memfile.c:1067
msgid "E296: Seek error in swap file write"
msgstr "E296: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë½ñ¹þ¤ß»þ¤Ë¥·¡¼¥¯¥¨¥é¡¼¤Ç¤¹"
-#: memfile.c:1080
+#: ../memfile.c:1085
msgid "E297: Write error in swap file"
msgstr "E297: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î½ñ¹þ¤ß¥¨¥é¡¼¤Ç¤¹"
-#: memfile.c:1277
+#: ../memfile.c:1282
msgid "E300: Swap file already exists (symlink attack?)"
msgstr "E300: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬´û¤Ë¸ºß¤·¤Þ¤¹ (symlink¤Ë¤è¤ë¹¶·â?)"
-#: memline.c:275
+#: ../memline.c:310
msgid "E298: Didn't get block nr 0?"
msgstr "E298: ¥Ö¥í¥Ã¥¯ 0 ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó?"
-#: memline.c:315
+#: ../memline.c:351
msgid "E298: Didn't get block nr 1?"
msgstr "E298: ¥Ö¥í¥Ã¥¯ 1 ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó?"
-#: memline.c:333
+#: ../memline.c:369
msgid "E298: Didn't get block nr 2?"
msgstr "E298: ¥Ö¥í¥Ã¥¯ 2 ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó?"
#. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: ../memline.c:482
msgid "E301: Oops, lost the swap file!!!"
msgstr "E301: ¤ª¤Ã¤È, ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¼º¤ï¤ì¤Þ¤·¤¿!!!"
-#: memline.c:448
+#: ../memline.c:487
msgid "E302: Could not rename swap file"
msgstr "E302: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÊѤ¨¤é¤ì¤Þ¤»¤ó"
-#: memline.c:518
+#: ../memline.c:559
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
msgstr "E303: \"%s\" ¤Î¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ò³«¤±¤Ê¤¤¤Î¤Ç¥ê¥«¥Ð¥ê¤ÏÉÔ²Äǽ¤Ç¤¹"
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: ¥Ö¥í¥Ã¥¯ 0 ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): ¥Ö¥í¥Ã¥¯ 0 ¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿??"
-#: memline.c:757
+#: ../memline.c:872
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: %s ¤Ë¤Ï¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: memline.c:767
+#: ../memline.c:882
msgid "Enter number of swap file to use (0 to quit): "
msgstr "»ÈÍѤ¹¤ë¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(0 ¤Ç½ªÎ»): "
-#: memline.c:812
+#: ../memline.c:927
#, c-format
msgid "E306: Cannot open %s"
msgstr "E306: %s ¤ò³«¤±¤Þ¤»¤ó"
-#: memline.c:834
+#: ../memline.c:949
msgid "Unable to read block 0 from "
msgstr "¥Ö¥í¥Ã¥¯ 0 ¤òÆɹþ¤á¤Þ¤»¤ó "
-#: memline.c:837
+#: ../memline.c:952
msgid ""
"\n"
"Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
"\n"
"¶²¤é¤¯Êѹ¹¤¬¤µ¤ì¤Æ¤¤¤Ê¤¤¤«Vim¤¬¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Æ¤¤¤Þ¤»¤ó."
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
msgid " cannot be used with this version of Vim.\n"
msgstr " Vim¤Î¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó.\n"
-#: memline.c:849
+#: ../memline.c:964
msgid "Use Vim version 3.0.\n"
msgstr "Vim¤Î¥Ð¡¼¥¸¥ç¥ó3.0¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤.\n"
-#: memline.c:855
+#: ../memline.c:970
#, c-format
msgid "E307: %s does not look like a Vim swap file"
msgstr "E307: %s ¤ÏVim¤Î¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹"
-#: memline.c:868
+#: ../memline.c:983
msgid " cannot be used on this computer.\n"
msgstr " ¤³¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó.\n"
-#: memline.c:870
+#: ../memline.c:985
msgid "The file was created on "
msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¼¡¤Î¾ì½ê¤Çºî¤é¤ì¤Þ¤·¤¿ "
-#: memline.c:874
+#: ../memline.c:989
msgid ""
",\n"
"or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
",\n"
"¤â¤·¤¯¤Ï¥Õ¥¡¥¤¥ë¤¬Â»½ý¤·¤Æ¤¤¤Þ¤¹."
-#: memline.c:903
+#: ../memline.c:1018
#, c-format
msgid "Using swap file \"%s\""
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \"%s\" ¤ò»ÈÍÑÃæ"
-#: memline.c:909
+#: ../memline.c:1024
#, c-format
msgid "Original file \"%s\""
msgstr "¸¶ËÜ¥Õ¥¡¥¤¥ë \"%s\""
-#: memline.c:922
+#: ../memline.c:1037
msgid "E308: Warning: Original file may have been changed"
msgstr "E308: ·Ù¹ð: ¸¶ËÜ¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: memline.c:975
+#: ../memline.c:1111
#, c-format
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: %s ¤«¤é¥Ö¥í¥Ã¥¯ 1 ¤òÆɹþ¤á¤Þ¤»¤ó"
-#: memline.c:979
+#: ../memline.c:1115
msgid "???MANY LINES MISSING"
msgstr "???¿¤¯¤Î¹Ô¤¬¼º¤ï¤ì¤Æ¤¤¤Þ¤¹"
-#: memline.c:995
+#: ../memline.c:1131
msgid "???LINE COUNT WRONG"
msgstr "???¹Ô¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: memline.c:1002
+#: ../memline.c:1138
msgid "???EMPTY BLOCK"
msgstr "???¥Ö¥í¥Ã¥¯¤¬¶õ¤Ç¤¹"
-#: memline.c:1028
+#: ../memline.c:1164
msgid "???LINES MISSING"
msgstr "???¹Ô¤¬¼º¤ï¤ì¤Æ¤¤¤Þ¤¹"
-#: memline.c:1060
+#: ../memline.c:1196
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
msgstr "E310: ¥Ö¥í¥Ã¥¯ 1 ¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹(%s ¤¬.swp¥Õ¥¡¥¤¥ë¤Ç¤Ê¤¤?)"
-#: memline.c:1065
+#: ../memline.c:1201
msgid "???BLOCK MISSING"
msgstr "???¥Ö¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
-#: memline.c:1081
+#: ../memline.c:1217
msgid "??? from here until ???END lines may be messed up"
msgstr "??? ¤³¤³¤«¤é???END¤Þ¤Ç¤Î¹Ô¤¬Ç˲õ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ç¤¹"
-#: memline.c:1097
+#: ../memline.c:1233
msgid "??? from here until ???END lines may have been inserted/deleted"
msgstr "??? ¤³¤³¤«¤é??END¤Þ¤Ç¤Î¹Ô¤¬ÁÞÆþ¤«ºï½ü¤µ¤ì¤¿¤è¤¦¤Ç¤¹"
-#: memline.c:1117
+#: ../memline.c:1253
msgid "???END"
msgstr "???END"
-#: memline.c:1143
+#: ../memline.c:1279
msgid "E311: Recovery Interrupted"
msgstr "E311: ¥ê¥«¥Ð¥ê¤¬³ä¹þ¤Þ¤ì¤Þ¤·¤¿"
-#: memline.c:1148
+#: ../memline.c:1284
msgid ""
"E312: Errors detected while recovering; look for lines starting with ???"
msgstr ""
"E312: ¥ê¥«¥Ð¥ê¤ÎºÇÃæ¤Ë¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿; ???¤Ç»Ï¤Þ¤ë¹Ô¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤"
-#: memline.c:1150
+#: ../memline.c:1286
msgid "See \":help E312\" for more information."
msgstr "¾ÜºÙ¤Ï \":help E312\" ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤"
-#: memline.c:1155
+#: ../memline.c:1291
msgid "Recovery completed. You should check if everything is OK."
msgstr "¥ê¥«¥Ð¥ê¤¬½ªÎ»¤·¤Þ¤·¤¿. Á´¤Æ¤¬Àµ¤·¤¤¤«¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤."
-#: memline.c:1156
+#: ../memline.c:1292
msgid ""
"\n"
"(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
"\n"
"(Êѹ¹¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë, ¤³¤Î¥Õ¥¡¥¤¥ë¤òÊ̤Î̾Á°¤ÇÊݸ¤·¤¿¾å¤Ç\n"
-#: memline.c:1157
+#: ../memline.c:1293
msgid "and run diff with the original file to check for changes)\n"
msgstr "¸¶ËÜ¥Õ¥¡¥¤¥ë¤È¤Î diff ¤ò¼Â¹Ô¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦)\n"
-#: memline.c:1158
+#: ../memline.c:1294
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
@@ -3701,51 +4182,51 @@ msgstr ""
"\n"
#. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
msgid "Swap files found:"
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬Ê£¿ô¸«¤Ä¤«¤ê¤Þ¤·¤¿:"
-#: memline.c:1392
+#: ../memline.c:1528
msgid " In current directory:\n"
msgstr " ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê:\n"
-#: memline.c:1394
+#: ../memline.c:1530
msgid " Using specified name:\n"
msgstr " ¤¢¤ë̾Á°¤ò»ÈÍÑÃæ:\n"
-#: memline.c:1398
+#: ../memline.c:1534
msgid " In directory "
msgstr " ¥Ç¥£¥ì¥¯¥È¥ê "
-#: memline.c:1416
+#: ../memline.c:1552
msgid " -- none --\n"
msgstr " -- ¤Ê¤· --\n"
-#: memline.c:1488
+#: ../memline.c:1625
msgid " owned by: "
msgstr " ½êÍ­¼Ô: "
-#: memline.c:1490
+#: ../memline.c:1627
msgid " dated: "
msgstr " ÆüÉÕ: "
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
msgid " dated: "
msgstr " ÆüÉÕ: "
-#: memline.c:1510
+#: ../memline.c:1647
msgid " [from Vim version 3.0]"
msgstr " [from Vim version 3.0]"
-#: memline.c:1514
+#: ../memline.c:1651
msgid " [does not look like a Vim swap file]"
msgstr " [Vim¤Î¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹]"
-#: memline.c:1518
+#: ../memline.c:1655
msgid " file name: "
msgstr " ¥Õ¥¡¥¤¥ë̾: "
-#: memline.c:1524
+#: ../memline.c:1661
msgid ""
"\n"
" modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
"\n"
" Êѹ¹¾õÂÖ: "
-#: memline.c:1525
+#: ../memline.c:1662
msgid "YES"
msgstr "¤¢¤ê"
-#: memline.c:1525
+#: ../memline.c:1662
msgid "no"
msgstr "¤Ê¤·"
-#: memline.c:1529
+#: ../memline.c:1666
msgid ""
"\n"
" user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
"\n"
" ¥æ¡¼¥¶Ì¾: "
-#: memline.c:1536
+#: ../memline.c:1673
msgid " host name: "
msgstr " ¥Û¥¹¥È̾: "
-#: memline.c:1538
+#: ../memline.c:1675
msgid ""
"\n"
" host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
"\n"
" ¥Û¥¹¥È̾: "
-#: memline.c:1544
+#: ../memline.c:1681
msgid ""
"\n"
" process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
"\n"
" ¥×¥í¥»¥¹ID: "
-#: memline.c:1550
+#: ../memline.c:1687
msgid " (still running)"
msgstr " (¤Þ¤À¼Â¹ÔÃæ)"
-#: memline.c:1562
+#: ../memline.c:1699
msgid ""
"\n"
" [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
"\n"
" [¤³¤ÎVim¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó]"
-#: memline.c:1565
+#: ../memline.c:1702
msgid ""
"\n"
" [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
"\n"
" [¤³¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó]"
-#: memline.c:1570
+#: ../memline.c:1707
msgid " [cannot be read]"
msgstr " [Æɹþ¤á¤Þ¤»¤ó]"
-#: memline.c:1574
+#: ../memline.c:1711
msgid " [cannot be opened]"
msgstr " [³«¤±¤Þ¤»¤ó]"
-#: memline.c:1764
+#: ../memline.c:1901
msgid "E313: Cannot preserve, there is no swap file"
msgstr "E313: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬Ìµ¤¤¤Î¤Ç°Ý»ý¤Ç¤­¤Þ¤»¤ó"
-#: memline.c:1817
+#: ../memline.c:1954
msgid "File preserved"
msgstr "¥Õ¥¡¥¤¥ë¤¬°Ý»ý¤µ¤ì¤Þ¤¹"
-#: memline.c:1819
+#: ../memline.c:1956
msgid "E314: Preserve failed"
msgstr "E314: °Ý»ý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: memline.c:1890
+#: ../memline.c:2027
#, c-format
msgid "E315: ml_get: invalid lnum: %ld"
msgstr "E315: ml_get: ̵¸ú¤Êlnum¤Ç¤¹: %ld"
-#: memline.c:1916
+#: ../memline.c:2053
#, c-format
msgid "E316: ml_get: cannot find line %ld"
msgstr "E316: ml_get: ¹Ô %ld ¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: memline.c:2306
+#: ../memline.c:2443
msgid "E317: pointer block id wrong 3"
msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ 3"
-#: memline.c:2386
+#: ../memline.c:2523
msgid "stack_idx should be 0"
msgstr "stack_idx ¤Ï 0 ¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹"
-#: memline.c:2448
+#: ../memline.c:2585
msgid "E318: Updated too many blocks?"
-msgstr "E318: ¹¹¿·¤µ¤ì¤¿¥Ö¥í¥Ã¥¯¤¬Â¿¤¹¤®¤ë¤«¤â?"
+msgstr "E318: ¹¹¿·¤µ¤ì¤¿¥Ö¥í¥Ã¥¯¤¬Â¿²á¤®¤ë¤«¤â?"
-#: memline.c:2630
+#: ../memline.c:2767
msgid "E317: pointer block id wrong 4"
msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ 4"
-#: memline.c:2657
+#: ../memline.c:2794
msgid "deleted block 1?"
msgstr "¥Ö¥í¥Ã¥¯ 1 ¤Ï¾Ã¤µ¤ì¤¿?"
-#: memline.c:2857
+#: ../memline.c:2994
#, c-format
msgid "E320: Cannot find line %ld"
msgstr "E320: ¹Ô %ld ¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: memline.c:3100
+#: ../memline.c:3237
msgid "E317: pointer block id wrong"
msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: memline.c:3116
+#: ../memline.c:3253
msgid "pe_line_count is zero"
msgstr "pe_line_count ¤¬¥¼¥í¤Ç¤¹"
-#: memline.c:3145
+#: ../memline.c:3282
#, c-format
msgid "E322: line number out of range: %ld past the end"
msgstr "E322: ¹ÔÈֹ椬Èϰϳ°¤Ç¤¹: %ld Ķ¤¨¤Æ¤¤¤Þ¤¹"
-#: memline.c:3149
+#: ../memline.c:3286
#, c-format
msgid "E323: line count wrong in block %ld"
msgstr "E323: ¥Ö¥í¥Ã¥¯ %ld ¤Î¹Ô¥«¥¦¥ó¥È¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: memline.c:3198
+#: ../memline.c:3335
msgid "Stack size increases"
msgstr "¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤¬Áý¤¨¤Þ¤¹"
-#: memline.c:3244
+#: ../memline.c:3381
msgid "E317: pointer block id wrong 2"
msgstr "E317: ¥Ý¥¤¥ó¥¿¥Ö¥í¥Ã¥¯¤ÎID¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ 2"
-#: memline.c:3674
+#: ../memline.c:3827
msgid "E325: ATTENTION"
msgstr "E325: Ãí°Õ"
-#: memline.c:3675
+#: ../memline.c:3828
msgid ""
"\n"
"Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
"\n"
"¼¡¤Î̾Á°¤Ç¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤Þ¤·¤¿ \""
-#: memline.c:3679
+#: ../memline.c:3832
msgid "While opening file \""
msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë¤ò³«¤¤¤Æ¤¤¤ëºÇÃæ \""
-#: memline.c:3688
+#: ../memline.c:3841
msgid " NEWER than swap file!\n"
msgstr " ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤è¤ê¤â¿·¤·¤¤¤Ç¤¹!\n"
#. Some of these messages are long to allow translation to
#. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
msgid ""
"\n"
"(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
" ¤³¤Î¾ì¹ç¤Ë¤Ï, Êѹ¹¤ò¤·¤¿ºÝ¤ËºÇ½ªÅª¤Ë, Ʊ¤¸¥Õ¥¡¥¤¥ë¤Î°Û¤Ê¤ë\n"
" 2¤Ä¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤¬¤Ç¤­¤Æ¤·¤Þ¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤.\n"
-#: memline.c:3693
+#: ../memline.c:3846
msgid " Quit, or continue with caution.\n"
msgstr " ½ªÎ»¤¹¤ë¤«, Ãí°Õ¤·¤Ê¤¬¤é³¤±¤Þ¤¹.\n"
-#: memline.c:3694
+#: ../memline.c:3847
msgid ""
"\n"
"(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
"\n"
"(2) ¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸¥»¥Ã¥·¥ç¥ó¤¬¥¯¥é¥Ã¥·¥å¤·¤¿.\n"
-#: memline.c:3695
+#: ../memline.c:3848
msgid " If this is the case, use \":recover\" or \"vim -r "
msgstr " ¤³¤Î¾ì¹ç¤Ë¤Ï \":recover\" ¤« \"vim -r "
-#: memline.c:3697
+#: ../memline.c:3850
msgid ""
"\"\n"
" to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
"\"\n"
" ¤ò»ÈÍѤ·¤ÆÊѹ¹¤ò¥ê¥«¥Ð¡¼¤·¤Þ¤¹(\":help recover\" ¤ò»²¾È).\n"
-#: memline.c:3698
+#: ../memline.c:3851
msgid " If you did this already, delete the swap file \""
msgstr " ´û¤Ë¤³¤ì¤ò¹Ô¤Ê¤Ã¤¿¤Î¤Ê¤é¤Ð, ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \""
-#: memline.c:3700
+#: ../memline.c:3853
msgid ""
"\"\n"
" to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
"\"\n"
" ¤ò¾Ã¤»¤Ð¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò²óÈò¤Ç¤­¤Þ¤¹.\n"
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
msgid "Swap file \""
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë \""
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
msgid "\" already exists!"
msgstr "\" ¤¬´û¤Ë¤¢¤ê¤Þ¤¹!"
-#: memline.c:3724
+#: ../memline.c:3877
msgid "VIM - ATTENTION"
msgstr "VIM - Ãí°Õ"
-#: memline.c:3726
+#: ../memline.c:3879
msgid "Swap file already exists!"
msgstr "¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬´û¤Ë¸ºß¤·¤Þ¤¹!"
-#: memline.c:3730
+#: ../memline.c:3883
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
"½ªÎ»¤¹¤ë(&Q)\n"
"Ãæ»ß¤¹¤ë(&A)"
-#: memline.c:3732
+#: ../memline.c:3885
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
"Ãæ»ß¤¹¤ë(&A)\n"
"¾Ãµî¤¹¤ë(&D)"
-#: memline.c:3789
+#: ../memline.c:3942
msgid "E326: Too many swap files found"
msgstr "E326: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤¬Â¿¿ô¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-#: menu.c:64
+#: ../menu.c:64
msgid "E327: Part of menu-item path is not sub-menu"
msgstr "E327: ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î¥Ñ¥¹¤ÎÉôʬ¤¬¥µ¥Ö¥á¥Ë¥å¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: menu.c:65
+#: ../menu.c:65
msgid "E328: Menu only exists in another mode"
msgstr "E328: ¥á¥Ë¥å¡¼¤Ï¾¤Î¥â¡¼¥É¤Ë¤À¤±¤¢¤ê¤Þ¤¹"
-#: menu.c:66
+#: ../menu.c:66
msgid "E329: No menu of that name"
msgstr "E329: ¤½¤Î̾Á°¤Î¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: menu.c:525
+#: ../menu.c:522
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥µ¥Ö¥á¥Ë¥å¡¼¤òÀ¸¤¸¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: menu.c:564
+#: ../menu.c:561
msgid "E331: Must not add menu items directly to menu bar"
msgstr "E331: ¥á¥Ë¥å¡¼¥Ð¡¼¤Ë¤ÏľÀÜ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÄɲäǤ­¤Þ¤»¤ó"
-#: menu.c:570
+#: ../menu.c:567
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: ¶èÀÚ¤ê¤Ï¥á¥Ë¥å¡¼¥Ñ¥¹¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
#. Now we have found the matching menu, and we list the mappings
#. Highlight title
-#: menu.c:1097
+#: ../menu.c:1093
msgid ""
"\n"
"--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
"\n"
"--- ¥á¥Ë¥å¡¼ ---"
-#: menu.c:2019
+#: ../menu.c:2011
msgid "Tear off this menu"
msgstr "¤³¤Î¥á¥Ë¥å¡¼¤òÀÚ¤ê¼è¤ë"
-#: menu.c:2084
+#: ../menu.c:2076
msgid "E333: Menu path must lead to a menu item"
msgstr "E333: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÀ¸¤¸¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
-#: menu.c:2104
+#: ../menu.c:2096
#, c-format
msgid "E334: Menu not found: %s"
msgstr "E334: ¥á¥Ë¥å¡¼¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#: menu.c:2173
+#: ../menu.c:2169
#, c-format
msgid "E335: Menu not defined for %s mode"
msgstr "E335: %s ¤Ë¤Ï¥á¥Ë¥å¡¼¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: menu.c:2211
+#: ../menu.c:2208
msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: ¥á¥Ë¥å¡¼¥Ñ¥¹¤Ï¥µ¥Ö¥á¥Ë¥å¡¼¤òÀ¸¤¸¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
-#: menu.c:2232
+#: ../menu.c:2229
msgid "E337: Menu not found - check menu names"
msgstr "E337: ¥á¥Ë¥å¡¼¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó - ¥á¥Ë¥å¡¼Ì¾¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤"
-#: message.c:414
+#: ../message.c:429
#, c-format
msgid "Error detected while processing %s:"
msgstr "%s ¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿:"
-#: message.c:440
+#: ../message.c:454
#, c-format
msgid "line %4ld:"
msgstr "¹Ô %4ld:"
-#: message.c:647
+#: ../message.c:657
msgid "[string too long]"
-msgstr "[ʸ»úÎó¤¬Ä¹¤¹¤®¤Þ¤¹]"
+msgstr "[ʸ»úÎó¤¬Ä¹²á¤®¤Þ¤¹]"
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ̵¸ú¤Ê¥ì¥¸¥¹¥¿Ì¾: '%s'"
+
+#: ../message.c:814
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
msgstr "ÆüËܸì¥á¥Ã¥»¡¼¥¸ËÝÌõ/´Æ½¤: ¼²¬ ÂÀϺ <koron@tka.att.ne.jp>"
-#: message.c:1025
+#: ../message.c:1040
msgid "Interrupt: "
msgstr "³ä¹þ¤ß: "
-#: message.c:1028
+#: ../message.c:1043
msgid "Hit ENTER to continue"
msgstr "³¤±¤ë¤Ë¤ÏENTER¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤"
-#: message.c:1030
+#: ../message.c:1045
msgid "Hit ENTER or type command to continue"
msgstr "³¤±¤ë¤Ë¤ÏENTER¤ò²¡¤¹¤«¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-#: message.c:2351
+#: ../message.c:2370
msgid "-- More --"
msgstr "-- ·Ñ³ --"
-#: message.c:2354
+#: ../message.c:2373
msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
msgstr " (RET/BS: ¹ÔÁ÷¤ê, SPACE/b: ¥Ú¡¼¥¸Á÷¤ê, d/u: Ⱦ¥Ú¡¼¥¸Á÷¤ê, q: ½ªÎ»)"
-#: message.c:2355
+#: ../message.c:2374
msgid " (RET: line, SPACE: page, d: half page, q: quit)"
msgstr " (RET: ¹ÔÁ÷¤ê, SPACE: ¥Ú¡¼¥¸Á÷¤ê, d: Ⱦ¥Ú¡¼¥¸Á÷¤ê, q: ½ªÎ»)"
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
msgid "Question"
msgstr "¼ÁÌä"
-#: message.c:2978
+#: ../message.c:3001
msgid ""
"&Yes\n"
"&No"
@@ -4124,7 +4610,7 @@ msgstr ""
"¤Ï¤¤(&Y)\n"
"¤¤¤¤¤¨(&N)"
-#: message.c:3011
+#: ../message.c:3034
msgid ""
"&Yes\n"
"&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
"Á´¤ÆÊü´þ(&D)\n"
"¥­¥ã¥ó¥»¥ë(&C)"
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "¥Ç¥£¥ì¥¯¥È¥êÁªÂò¥À¥¤¥¢¥í¥°"
+
+#: ../message.c:3077
msgid "Save File dialog"
msgstr "¥Õ¥¡¥¤¥ëÊݸ¥À¥¤¥¢¥í¥°"
-#: message.c:3054
+#: ../message.c:3079
msgid "Open File dialog"
msgstr "¥Õ¥¡¥¤¥ëÆɹþ¥À¥¤¥¢¥í¥°"
#. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: ¥³¥ó¥½¡¼¥ë¥â¡¼¥É¤Ç¤Ï¥Õ¥¡¥¤¥ë¥Ö¥é¥¦¥¶¤ò»È¤¨¤Þ¤»¤ó, ¤´¤á¤ó¤Ê¤µ¤¤"
-#: misc1.c:2773
+#: ../misc1.c:2860
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: ·Ù¹ð: ÆɹþÀìÍÑ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Þ¤¹"
-#: misc1.c:3021
+#: ../misc1.c:3113
msgid "1 more line"
msgstr "1 ¹Ô Äɲä·¤Þ¤·¤¿"
-#: misc1.c:3023
+#: ../misc1.c:3115
msgid "1 line less"
msgstr "1 ¹Ô ºï½ü¤·¤Þ¤·¤¿"
-#: misc1.c:3028
+#: ../misc1.c:3120
#, c-format
msgid "%ld more lines"
msgstr "%ld ¹Ô Äɲä·¤Þ¤·¤¿"
-#: misc1.c:3030
+#: ../misc1.c:3122
#, c-format
msgid "%ld fewer lines"
msgstr "%ld ¹Ô ºï½ü¤·¤Þ¤·¤¿"
-#: misc1.c:3033
+#: ../misc1.c:3125
msgid " (Interrupted)"
msgstr " (³ä¹þ¤Þ¤ì¤Þ¤·¤¿)"
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "¥Ó¡¼¥Ã!"
+
+#: ../misc1.c:7814
msgid "Vim: preserving files...\n"
msgstr "Vim: ¥Õ¥¡¥¤¥ë¤òÊݸÃæ...\n"
#. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
msgid "Vim: Finished.\n"
msgstr "Vim: ½ªÎ»¤·¤Þ¤·¤¿.\n"
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
msgid "ERROR: "
msgstr "¥¨¥é¡¼: "
-#: misc2.c:715
+#: ../misc2.c:710
#, c-format
msgid ""
"\n"
@@ -4199,7 +4693,7 @@ msgstr ""
"\n"
"[¥á¥â¥ê(¥Ð¥¤¥È)] Áí³äÅö-²òÊüÎÌ %lu-%lu, »ÈÍÑÎÌ %lu, ¥Ô¡¼¥¯»þ %lu\n"
-#: misc2.c:717
+#: ../misc2.c:712
#, c-format
msgid ""
"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
"[¸Æ½Ð] Áí re/malloc() ²ó¿ô %lu, Áí free() ²ó¿ô %lu\n"
"\n"
-#: misc2.c:772
+#: ../misc2.c:767
msgid "E340: Line is becoming too long"
-msgstr "E340: ¹Ô¤¬Ä¹¤¯¤Ê¤ê¤¹¤®¤Þ¤·¤¿"
+msgstr "E340: ¹Ô¤¬Ä¹¤¯¤Ê¤ê²á¤®¤Þ¤·¤¿"
-#: misc2.c:816
+#: ../misc2.c:811
#, c-format
msgid "E341: Internal error: lalloc(%ld, )"
msgstr "E341: ÆâÉô¥¨¥é¡¼: lalloc(%ld,)"
-#: misc2.c:924
+#: ../misc2.c:919
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
msgstr "E342: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó! (%lu ¥Ð¥¤¥È¤ò³äÅöÍ×µá)"
-#: misc2.c:2593
+#: ../misc2.c:2580
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "¼Â¹Ô¤Î¤¿¤á¤Ë¥·¥§¥ë¤ò¸Æ½Ð¤·Ãæ: \"%s\""
-#: misc2.c:2815
+#: ../misc2.c:2845
msgid "E545: Missing colon"
msgstr "E545: ¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
msgid "E546: Illegal mode"
msgstr "E546: ÉÔÀµ¤Ê¥â¡¼¥É¤Ç¤¹"
-#: misc2.c:2883
+#: ../misc2.c:2913
msgid "E547: Illegal mouseshape"
msgstr "E547: ÉÔÀµ¤Ê 'mouseshape' ¤Ç¤¹"
-#: misc2.c:2923
+#: ../misc2.c:2953
msgid "E548: digit expected"
msgstr "E548: ¿ôÃͤ¬É¬ÍפǤ¹"
-#: misc2.c:2928
+#: ../misc2.c:2958
msgid "E549: Illegal percentage"
msgstr "E549: ÉÔÀµ¤Ê¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸¤Ç¤¹"
-#: misc2.c:3238
+#: ../misc2.c:3270
msgid "Enter encryption key: "
msgstr "°Å¹æ²½ÍѤΥ­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: misc2.c:3239
+#: ../misc2.c:3271
msgid "Enter same key again: "
msgstr "¤â¤¦°ìÅÙƱ¤¸¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
-#: misc2.c:3249
+#: ../misc2.c:3281
msgid "Keys don't match!"
msgstr "¥­¡¼¤¬°ìÃפ·¤Þ¤»¤ó"
-#: misc2.c:3798
+#: ../misc2.c:3825
#, c-format
msgid ""
"E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
"E343: ̵¸ú¤Ê¥Ñ¥¹¤Ç¤¹: '**[¿ôÃÍ]' ¤Ïpath¤ÎºÇ¸å¤« '%s' "
"¤¬Â³¤¤¤Æ¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó."
-#: misc2.c:5077
+#: ../misc2.c:5104
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
msgstr "E344: cdpath¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:5080
+#: ../misc2.c:5107
#, c-format
msgid "E345: Can't find file \"%s\" in path"
msgstr "E345: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:5086
+#: ../misc2.c:5113
#, c-format
msgid "E346: No more directory \"%s\" found in cdpath"
msgstr "E346: cdpath¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:5089
+#: ../misc2.c:5116
#, c-format
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ¥Ñ¥¹¤Ë¤Ï¤³¤ì°Ê¾å \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:5323
+#: ../misc2.c:5356
msgid "E550: Missing colon"
msgstr "E550: ¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó"
-#: misc2.c:5335
+#: ../misc2.c:5368
msgid "E551: Illegal component"
msgstr "E551: ÉÔÀµ¤Ê¹½Ê¸Í×ÁǤǤ¹"
-#: misc2.c:5343
+#: ../misc2.c:5376
msgid "E552: digit expected"
msgstr "E552: ¿ôÃͤ¬É¬ÍפǤ¹"
#. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
msgid "Cannot connect to Netbeans #2"
msgstr "Netbeans #2 ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
-#: netbeans.c:404
+#: ../netbeans.c:417
msgid "Cannot connect to Netbeans"
msgstr "Netbeans ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
-#: netbeans.c:450
+#: ../netbeans.c:461
#, c-format
msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
msgstr ""
"E668: NetBeans¤ÎÀܳ¾ðÊó¥Õ¥¡¥¤¥ë¤Î¥¢¥¯¥»¥¹¥â¡¼¥É¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹: \"%s\""
-#: netbeans.c:749
+#: ../netbeans.c:760
msgid "read from Netbeans socket"
msgstr "Netbeans ¤Î¥½¥±¥Ã¥È¤òÆɹþ¤ß"
-#: netbeans.c:1638
+#: ../netbeans.c:1680
#, c-format
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: ¥Ð¥Ã¥Õ¥¡ %ld ¤Î NetBeans Àܳ¤¬¼º¤ï¤ì¤Þ¤·¤¿"
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
msgid "Warning: terminal cannot highlight"
msgstr "·Ù¹ð: »ÈÍѤ·¤Æ¤¤¤ëüËö¤Ï¥Ï¥¤¥é¥¤¥È¤Ç¤­¤Þ¤»¤ó"
-#: normal.c:3276
+#: ../normal.c:3293
msgid "E348: No string under cursor"
msgstr "E348: ¥«¡¼¥½¥ë¤Î°ÌÃ֤ˤÏʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó"
-#: normal.c:3278
+#: ../normal.c:3295
msgid "E349: No identifier under cursor"
msgstr "E349: ¥«¡¼¥½¥ë¤Î°ÌÃ֤ˤϼ±Ê̻Ҥ¬¤¢¤ê¤Þ¤»¤ó"
-#: normal.c:4519
+#: ../normal.c:4537
msgid "E352: Cannot erase folds with current 'foldmethod'"
msgstr "E352: ¸½ºß¤Î 'foldmethod' ¤Ç¤ÏÀÞ¾ö¤ß¤ò¾Ãµî¤Ç¤­¤Þ¤»¤ó"
-#: normal.c:6708
+#: ../normal.c:6808
msgid "E664: changelist is empty"
msgstr "E664: Êѹ¹¥ê¥¹¥È¤¬¶õ¤Ç¤¹"
-#: normal.c:6710
+#: ../normal.c:6810
msgid "E662: At start of changelist"
msgstr "E662: Êѹ¹¥ê¥¹¥È¤ÎÀèƬ"
-#: normal.c:6712
+#: ../normal.c:6812
msgid "E663: At end of changelist"
msgstr "E663: Êѹ¹¥ê¥¹¥È¤ÎËöÈø"
-#: normal.c:7973
+#: ../normal.c:8085
msgid "Type :quit<Enter> to exit Vim"
msgstr "Vim¤ò½ªÎ»¤¹¤ë¤Ë¤Ï :quit<Enter> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
-#: ops.c:294
+#: ../ops.c:291
#, c-format
msgid "1 line %sed 1 time"
msgstr "1 ¹Ô¤¬ %s ¤Ç 1 ²ó½èÍý¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:296
+#: ../ops.c:293
#, c-format
msgid "1 line %sed %d times"
msgstr "1 ¹Ô¤¬ %s ¤Ç %d ²ó½èÍý¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:301
+#: ../ops.c:298
#, c-format
msgid "%ld lines %sed 1 time"
msgstr "%ld ¹Ô¤¬ %s ¤Ç 1 ²ó½èÍý¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:304
+#: ../ops.c:301
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld ¹Ô¤¬ %s ¤Ç %d ²ó½èÍý¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:662
+#: ../ops.c:659
#, c-format
msgid "%ld lines to indent... "
msgstr "%ld ¹Ô¤¬¥¤¥ó¥Ç¥ó¥È¤µ¤ì¤Þ¤¹... "
-#: ops.c:712
+#: ../ops.c:709
msgid "1 line indented "
msgstr "1 ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿"
-#: ops.c:714
+#: ../ops.c:711
#, c-format
msgid "%ld lines indented "
msgstr "%ld ¹Ô¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Þ¤·¤¿"
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: ¤Þ¤À¥ì¥¸¥¹¥¿¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤»¤ó"
+
#. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
msgid "cannot yank; delete anyway"
msgstr "¥ä¥ó¥¯¤Ç¤­¤Þ¤»¤ó; ¤È¤Ë¤«¤¯¾Ãµî"
-#: ops.c:2185
+#: ../ops.c:2223
msgid "1 line changed"
msgstr "1 ¹Ô¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:2187
+#: ../ops.c:2225
#, c-format
msgid "%ld lines changed"
msgstr "%ld ¹Ô¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:2571
+#: ../ops.c:2609
#, c-format
msgid "freeing %ld lines"
msgstr "%ld ¹Ô¤ò³«ÊüÃæ"
-#: ops.c:2852
+#: ../ops.c:2891
msgid "1 line yanked"
msgstr "1 ¹Ô¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:2854
+#: ../ops.c:2893
#, c-format
msgid "%ld lines yanked"
msgstr "%ld ¹Ô¤¬¥ä¥ó¥¯¤µ¤ì¤Þ¤·¤¿"
-#: ops.c:3139
+#: ../ops.c:3188
#, c-format
msgid "E353: Nothing in register %s"
msgstr "E353: ¥ì¥¸¥¹¥¿ %s ¤Ë¤Ï²¿¤â¤¢¤ê¤Þ¤»¤ó"
#. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
msgid ""
"\n"
"--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
"\n"
"--- ¥ì¥¸¥¹¥¿ ---"
-#: ops.c:4997
+#: ../ops.c:5066
msgid "Illegal register name"
msgstr "ÉÔÀµ¤Ê¥ì¥¸¥¹¥¿Ì¾"
-#: ops.c:5085
+#: ../ops.c:5154
msgid ""
"\n"
"# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
"\n"
"# ¥ì¥¸¥¹¥¿:\n"
-#: ops.c:5135
+#: ../ops.c:5210
#, c-format
msgid "E574: Unknown register type %d"
msgstr "E574: ̤ÃΤΥ쥸¥¹¥¿·¿ %d ¤Ç¤¹"
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ̵¸ú¤Ê¥ì¥¸¥¹¥¿Ì¾: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
#, c-format
msgid "%ld Cols; "
msgstr "%ld Îó; "
-#: ops.c:5987
+#: ../ops.c:6092
#, c-format
msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
msgstr "ÁªÂò %s%ld / %ld ¹Ô; %ld / %ld ñ¸ì; %ld / %ld ʸ»ú"
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "ÁªÂò %s%ld / %ld ¹Ô; %ld / %ld ñ¸ì; %ld / %ld ʸ»ú; %ld / %ld ¥Ð¥¤¥È"
+
+#: ../ops.c:6116
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
msgstr "Îó %s / %s; ¹Ô %ld of %ld; ñ¸ì %ld / %ld; ʸ»ú %ld / %ld"
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"Îó %s / %s; ¹Ô %ld / %ld; ñ¸ì %ld / %ld; ʸ»ú %ld / %ld; ¥Ð¥¤¥È %ld of %ld"
+
+#: ../ops.c:6135
#, c-format
msgid "(+%ld for BOM)"
msgstr "(+%ld for BOM)"
-#: option.c:1643
+#: ../option.c:1692
msgid "%<%f%h%m%=Page %N"
msgstr "%<%f%h%m%=%N ¥Ú¡¼¥¸"
-#: option.c:2092
+#: ../option.c:2171
msgid "Thanks for flying Vim"
msgstr "Vim ¤ò»È¤Ã¤Æ¤¯¤ì¤Æ¤¢¤ê¤¬¤È¤¦"
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
msgid "E518: Unknown option"
msgstr "E518: ̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹"
-#: option.c:3432
+#: ../option.c:3607
msgid "E519: Option not supported"
msgstr "E519: ¥ª¥×¥·¥ç¥ó¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: option.c:3457
+#: ../option.c:3632
msgid "E520: Not allowed in a modeline"
msgstr "E520: modeline ¤Ç¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-#: option.c:3522
+#: ../option.c:3703
msgid ""
"\n"
"\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
"\n"
"\tLast set from "
-#: option.c:3661
+#: ../option.c:3842
msgid "E521: Number required after ="
msgstr "E521: = ¤Î¸å¤Ë¤Ï¿ô»ú¤¬É¬ÍפǤ¹"
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
msgid "E522: Not found in termcap"
msgstr "E522: termcap Æâ¤Ë¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: option.c:4064
+#: ../option.c:4258
#, c-format
msgid "E539: Illegal character <%s>"
msgstr "E539: ÉÔÀµ¤Êʸ»ú¤Ç¤¹ <%s>"
-#: option.c:4611
+#: ../option.c:4823
msgid "E529: Cannot set 'term' to empty string"
msgstr "E529: 'term' ¤Ë¤Ï¶õʸ»úÎó¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
-#: option.c:4614
+#: ../option.c:4826
msgid "E530: Cannot change term in GUI"
msgstr "E530: GUI¤Ç¤Ï 'term' ¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó"
-#: option.c:4616
+#: ../option.c:4828
msgid "E531: Use \":gui\" to start the GUI"
msgstr "E531: GUI¤ò¥¹¥¿¡¼¥È¤¹¤ë¤Ë¤Ï \":gui\" ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤"
-#: option.c:4645
+#: ../option.c:4857
msgid "E589: 'backupext' and 'patchmode' are equal"
msgstr "E589: 'backupext' ¤È 'patchmode' ¤¬Æ±¤¸¤Ç¤¹"
-#: option.c:4860
+#: ../option.c:5085
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+2 GUI¤Ç¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó"
-#: option.c:5016
+#: ../option.c:5249
msgid "E524: Missing colon"
msgstr "E524: ¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó"
-#: option.c:5018
+#: ../option.c:5251
msgid "E525: Zero length string"
msgstr "E525: ʸ»úÎó¤ÎŤµ¤¬¥¼¥í¤Ç¤¹"
-#: option.c:5086
+#: ../option.c:5326
#, c-format
msgid "E526: Missing number after <%s>"
msgstr "E526: <%s> ¤Î¸å¤Ë¿ô»ú¤¬¤¢¤ê¤Þ¤»¤ó"
-#: option.c:5100
+#: ../option.c:5340
msgid "E527: Missing comma"
msgstr "E527: ¥«¥ó¥Þ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: option.c:5107
+#: ../option.c:5347
msgid "E528: Must specify a ' value"
msgstr "E528: ' ¤ÎÃͤò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: option.c:5148
+#: ../option.c:5388
msgid "E595: contains unprintable or wide character"
msgstr "E595: ɽ¼¨¤Ç¤­¤Ê¤¤Ê¸»ú¤«¥ï¥¤¥Éʸ»ú¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
-#: option.c:5197
+#: ../option.c:5432
msgid "E596: Invalid font(s)"
msgstr "E596: ̵¸ú¤Ê¥Õ¥©¥ó¥È¤Ç¤¹"
-#: option.c:5205
+#: ../option.c:5440
msgid "E597: can't select fontset"
msgstr "E597: ¥Õ¥©¥ó¥È¥»¥Ã¥È¤òÁªÂò¤Ç¤­¤Þ¤»¤ó"
-#: option.c:5207
+#: ../option.c:5442
msgid "E598: Invalid fontset"
msgstr "E598: ̵¸ú¤Ê¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ç¤¹"
-#: option.c:5214
+#: ../option.c:5449
msgid "E533: can't select wide font"
msgstr "E533: ¥ï¥¤¥É¥Õ¥©¥ó¥È¤òÁªÂò¤Ç¤­¤Þ¤»¤ó"
-#: option.c:5216
+#: ../option.c:5451
msgid "E534: Invalid wide font"
msgstr "E534: ̵¸ú¤Ê¥ï¥¤¥É¥Õ¥©¥ó¥È¤Ç¤¹"
-#: option.c:5486
+#: ../option.c:5728
#, c-format
msgid "E535: Illegal character after <%c>"
msgstr "E535: <%c> ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹"
-#: option.c:5597
+#: ../option.c:5839
msgid "E536: comma required"
msgstr "E536: ¥«¥ó¥Þ¤¬É¬ÍפǤ¹"
-#: option.c:5607
+#: ../option.c:5849
#, c-format
msgid "E537: 'commentstring' must be empty or contain %s"
msgstr "E537: 'commentstring' ¤Ï¶õ¤Ç¤¢¤ë¤« %s ¤ò´Þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹"
-#: option.c:5679
+#: ../option.c:5924
msgid "E538: No mouse support"
msgstr "E538: ¥Þ¥¦¥¹¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
-#: option.c:5947
+#: ../option.c:6195
msgid "E540: Unclosed expression sequence"
msgstr "E540: ¼°¤¬½ªÎ»¤·¤Æ¤¤¤Þ¤»¤ó"
-#: option.c:5951
+#: ../option.c:6199
msgid "E541: too many items"
-msgstr "E541: Í×ÁǤ¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E541: Í×ÁǤ¬Â¿²á¤®¤Þ¤¹"
-#: option.c:5953
+#: ../option.c:6201
msgid "E542: unbalanced groups"
msgstr "E542: ¥°¥ë¡¼¥×¤¬Äà¹ç¤¤¤Þ¤»¤ó"
-#: option.c:6193
+#: ../option.c:6441
msgid "E590: A preview window already exists"
msgstr "E590: ¥×¥ì¥Ó¥å¡¼¥¦¥£¥ó¥É¥¦¤¬´û¤Ë¸ºß¤·¤Þ¤¹"
-#: option.c:6450
+#: ../option.c:6688
msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
msgstr ""
"W17: ¥¢¥é¥Ó¥¢Ê¸»ú¤Ë¤ÏUTF-8¤¬É¬ÍפʤΤÇ, ':set encoding=utf-8' ¤·¤Æ¤¯¤À¤µ¤¤"
-#: option.c:6776
+#: ../option.c:7052
#, c-format
msgid "E593: Need at least %d lines"
msgstr "E593: ºÇÄã %d ¤Î¹Ô¿ô¤¬É¬ÍפǤ¹"
-#: option.c:6786
+#: ../option.c:7062
#, c-format
msgid "E594: Need at least %d columns"
msgstr "E594: ºÇÄã %d ¤Î¥«¥é¥àÉý¤¬É¬ÍפǤ¹"
-#: option.c:7093
+#: ../option.c:7371
#, c-format
msgid "E355: Unknown option: %s"
msgstr "E355: ̤ÃΤΥª¥×¥·¥ç¥ó¤Ç¤¹: %s"
-#: option.c:7213
+#: ../option.c:7504
msgid ""
"\n"
"--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
"\n"
"--- üËö¥³¡¼¥É ---"
-#: option.c:7215
+#: ../option.c:7506
msgid ""
"\n"
"--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
"\n"
"--- ¥°¥í¡¼¥Ð¥ë¥ª¥×¥·¥ç¥óÃÍ ---"
-#: option.c:7217
+#: ../option.c:7508
msgid ""
"\n"
"--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
"\n"
"--- ¥í¡¼¥«¥ë¥ª¥×¥·¥ç¥óÃÍ ---"
-#: option.c:7219
+#: ../option.c:7510
msgid ""
"\n"
"--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
"\n"
"--- ¥ª¥×¥·¥ç¥ó ---"
-#: option.c:7925
+#: ../option.c:8240
msgid "E356: get_varp ERROR"
msgstr "E356: get_varp ¥¨¥é¡¼"
-#: option.c:8896
+#: ../option.c:9217
#, c-format
msgid "E357: 'langmap': Matching character missing for %s"
msgstr "E357: 'langmap': %s ¤ËÂбþ¤¹¤ëʸ»ú¤¬¤¢¤ê¤Þ¤»¤ó"
-#: option.c:8930
+#: ../option.c:9243
#, c-format
msgid "E358: 'langmap': Extra characters after semicolon: %s"
msgstr "E358: 'langmap': ¥»¥ß¥³¥í¥ó¤Î¸å¤Ë;ʬ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹: %s"
-#: os_amiga.c:280
+#: ../os_amiga.c:280
msgid "cannot open "
msgstr "³«¤±¤Þ¤»¤ó "
-#: os_amiga.c:314
+#: ../os_amiga.c:314
msgid "VIM: Can't open window!\n"
msgstr "VIM: ¥¦¥£¥ó¥É¥¦¤ò³«¤±¤Þ¤»¤ó!\n"
-#: os_amiga.c:338
+#: ../os_amiga.c:338
msgid "Need Amigados version 2.04 or later\n"
msgstr "Amigados¤Î¥Ð¡¼¥¸¥ç¥ó 2.04¤«¤½¤ì°Ê¹ß¤¬É¬ÍפǤ¹\n"
-#: os_amiga.c:344
+#: ../os_amiga.c:344
#, c-format
msgid "Need %s version %ld\n"
msgstr "%s ¤Î¥Ð¡¼¥¸¥ç¥ó %ld ¤¬É¬ÍפǤ¹\n"
-#: os_amiga.c:416
+#: ../os_amiga.c:416
msgid "Cannot open NIL:\n"
msgstr "NIL¤ò³«¤±¤Þ¤»¤ó:\n"
-#: os_amiga.c:427
+#: ../os_amiga.c:427
msgid "Cannot create "
msgstr "ºîÀ®¤Ç¤­¤Þ¤»¤ó "
-#: os_amiga.c:905
+#: ../os_amiga.c:905
#, c-format
msgid "Vim exiting with %d\n"
msgstr "Vim¤Ï %d ¤Ç½ªÎ»¤·¤Þ¤¹\n"
-#: os_amiga.c:937
+#: ../os_amiga.c:941
msgid "cannot change console mode ?!\n"
msgstr "¥³¥ó¥½¡¼¥ë¥â¡¼¥É¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó?!\n"
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: ¥³¥ó¥½¡¼¥ë¤Ç¤Ï¤Ê¤¤??\n"
#. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
msgid "E360: Cannot execute shell with -f option"
msgstr "E360: -f ¥ª¥×¥·¥ç¥ó¤Ç¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
msgid "Cannot execute "
msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó "
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
msgid "shell "
msgstr "¥·¥§¥ë "
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
msgid " returned\n"
msgstr " Ìá¤ê¤Þ¤·¤¿\n"
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE ¤¬¾®¤µ¤¹¤®¤Þ¤¹."
+msgstr "ANCHOR_BUF_SIZE ¤¬¾®¤µ²á¤®¤Þ¤¹."
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
msgid "I/O ERROR"
msgstr "Æþ½ÐÎÏ¥¨¥é¡¼"
-#: os_mswin.c:539
+#: ../os_mswin.c:597
msgid "...(truncated)"
msgstr "...(¾Êά)"
-#: os_mswin.c:641
+#: ../os_mswin.c:714
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' ¤¬80¤Ç¤Ï¤Ê¤¤¤¿¤á, ³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
msgid "E237: Printer selection failed"
msgstr "E237: ¥×¥ê¥ó¥¿¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
#, c-format
msgid "to %s on %s"
msgstr "%s ¤Ø (%s ¾å¤Î)"
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
#, c-format
msgid "E613: Unknown printer font: %s"
msgstr "E613: ̤ÃΤΥץê¥ó¥¿¥ª¥×¥·¥ç¥ó¤Ç¤¹: %s"
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
#, c-format
msgid "E238: Print error: %s"
msgstr "E238: °õºþ¥¨¥é¡¼: %s"
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "ÉÔÌÀ"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
#, c-format
msgid "Printing '%s'"
msgstr "°õºþ¤·¤Æ¤¤¤Þ¤¹: '%s'"
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
#, c-format
msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
msgstr "E244: ʸ»ú¥»¥Ã¥È̾ \"%s\" ¤ÏÉÔÀµ¤Ç¤¹ (¥Õ¥©¥ó¥È̾ \"%s\")"
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
#, c-format
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: '%c' ¤ÏÉÔÀµ¤Êʸ»ú¤Ç¤¹ (¥Õ¥©¥ó¥È̾ \"%s\")"
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: ̵¸ú¤Ê 'osfiletype' ¥ª¥×¥·¥ç¥ó - \"Text\" ¤ò»È¤¤¤Þ¤¹"
-#: os_unix.c:927
+#: ../os_unix.c:989
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 2½Å¤Î¥·¥°¥Ê¥ë¤Î¤¿¤á, ½ªÎ»¤·¤Þ¤¹\n"
-#: os_unix.c:933
+#: ../os_unix.c:995
#, c-format
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: Ã×̿Ū¥·¥°¥Ê¥ë %s ¤ò¸¡ÃΤ·¤Þ¤·¤¿\n"
-#: os_unix.c:936
+#: ../os_unix.c:998
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: Ã×̿Ū¥·¥°¥Ê¥ë¤ò¸¡ÃΤ·¤Þ¤·¤¿\n"
-#: os_unix.c:1199
+#: ../os_unix.c:1318
#, c-format
msgid "Opening the X display took %ld msec"
msgstr "X¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë %ld ¥ß¥êÉ䫤«¤ê¤Þ¤·¤¿"
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X ¤Î¥¨¥é¡¼¤ò¸¡½Ð¤·¤Þ¤·¤¿¤¬Â³¹Ô¤·¤Þ¤¹...\n"
+
+#: ../os_unix.c:1351
msgid ""
"\n"
"Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
"\n"
"Vim: X ¤Î¥¨¥é¡¼¤ò¸¡½Ð¤·¤Þ¤·¤¿r\n"
-#: os_unix.c:1334
+#: ../os_unix.c:1464
msgid "Testing the X display failed"
msgstr "X display ¤Î¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: os_unix.c:1473
+#: ../os_unix.c:1603
msgid "Opening the X display timed out"
msgstr "X display ¤Î open ¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿"
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
msgid ""
"\n"
"Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
"\n"
"¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó "
-#: os_unix.c:3275
+#: ../os_unix.c:3432
msgid ""
"\n"
"Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
"\n"
"sh ¥·¥§¥ë¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
msgid ""
"\n"
"shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
"\n"
"¥·¥§¥ë¤¬ÃͤòÊÖ¤·¤Þ¤·¤¿ "
-#: os_unix.c:3414
+#: ../os_unix.c:3578
msgid ""
"\n"
"Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
"\n"
"¥Ñ¥¤¥×¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n"
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
msgid ""
"\n"
"Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
"\n"
"fork ¤Ç¤­¤Þ¤»¤ó\n"
-#: os_unix.c:3920
+#: ../os_unix.c:4233
msgid ""
"\n"
"Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
"\n"
"¥³¥Þ¥ó¥É¤òÃæÃǤ·¤Þ¤·¤¿\n"
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
msgid "XSMP lost ICE connection"
msgstr "XSMP ¤¬ICEÀܳ¤ò¼º¤¤¤Þ¤·¤¿"
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
msgid "Opening the X display failed"
msgstr "X display ¤Î open ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: os_unix.c:5880
+#: ../os_unix.c:6297
msgid "XSMP handling save-yourself request"
msgstr "XSMP ¤¬save-yourselfÍ×µá¤ò½èÍý¤·¤Æ¤¤¤Þ¤¹"
-#: os_unix.c:5999
+#: ../os_unix.c:6416
msgid "XSMP opening connection"
msgstr "XSMP ¤¬Àܳ¤ò³«»Ï¤·¤Æ¤¤¤Þ¤¹"
-#: os_unix.c:6018
+#: ../os_unix.c:6435
msgid "XSMP ICE connection watch failed"
msgstr "XSMP ICEÀܳ¤¬¼ºÇÔ¤·¤¿¤è¤¦¤Ç¤¹"
-#: os_unix.c:6038
+#: ../os_unix.c:6455
#, c-format
msgid "XSMP SmcOpenConnection failed: %s"
msgstr "XSMP SmcOpenConnection¤¬¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
msgid "At line"
msgstr "¹Ô"
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Þ¤»¤ó"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
msgid "VIM Error"
msgstr "VIM¥¨¥é¡¼"
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
msgid "Could not fix up function pointers to the DLL!"
msgstr "DLL¤«¤é´Ø¿ô¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
#, c-format
msgid "shell returned %d"
msgstr "¥·¥§¥ë¤¬¥³¡¼¥É %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿"
-#: os_win32.c:2655
+#: ../os_win32.c:2776
#, c-format
msgid "Vim: Caught %s event\n"
msgstr "Vim: ¥¤¥Ù¥ó¥È %s ¤ò¸¡ÃÎ\n"
-#: os_win32.c:2657
+#: ../os_win32.c:2778
msgid "close"
msgstr "ÊĤ¸¤ë"
-#: os_win32.c:2659
+#: ../os_win32.c:2780
msgid "logoff"
msgstr "¥í¥°¥ª¥Õ"
-#: os_win32.c:2660
+#: ../os_win32.c:2781
msgid "shutdown"
msgstr "¥·¥ã¥Ã¥È¥À¥¦¥ó"
-#: os_win32.c:3150
+#: ../os_win32.c:3270
msgid "E371: Command not found"
msgstr "E371: ¥³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤»¤ó"
-#: os_win32.c:3163
+#: ../os_win32.c:3283
msgid ""
"VIMRUN.EXE not found in your $PATH.\n"
"External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
"³°Éô¥³¥Þ¥ó¥É¤Î½ªÎ»¸å¤Ë°ì»þÄä»ß¤ò¤·¤Þ¤»¤ó.\n"
"¾ÜºÙ¤Ï :help win32-vimrun ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤."
-#: os_win32.c:3166
+#: ../os_win32.c:3286
msgid "Vim Warning"
msgstr "Vim¤Î·Ù¹ð"
-#: quickfix.c:258
+#: ../quickfix.c:284
msgid "E372: Too many %%%c in format string"
-msgstr "E372: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë %%%c ¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E372: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë %%%c ¤¬Â¿²á¤®¤Þ¤¹"
-#: quickfix.c:271
+#: ../quickfix.c:297
msgid "E373: Unexpected %%%c in format string"
msgstr "E373: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ëͽ´ü¤»¤Ì %%%c ¤¬¤¢¤ê¤Þ¤·¤¿"
-#: quickfix.c:325
+#: ../quickfix.c:351
msgid "E374: Missing ] in format string"
msgstr "E374: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: quickfix.c:339
+#: ../quickfix.c:365
msgid "E375: Unsupported %%%c in format string"
msgstr "E375: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ç¤Ï %%%c ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
-#: quickfix.c:357
+#: ../quickfix.c:383
msgid "E376: Invalid %%%c in format string prefix"
msgstr "E376: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ÎÁ°ÃÖ¤Ë̵¸ú¤Ê %%%c ¤¬¤¢¤ê¤Þ¤¹"
-#: quickfix.c:365
+#: ../quickfix.c:391
msgid "E377: Invalid %%%c in format string"
msgstr "E377: ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë̵¸ú¤Ê %%%c ¤¬¤¢¤ê¤Þ¤¹"
-#: quickfix.c:391
+#: ../quickfix.c:417
msgid "E378: 'errorformat' contains no pattern"
msgstr "E378: 'errorformat' ¤Ë¥Ñ¥¿¡¼¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: quickfix.c:501
+#: ../quickfix.c:537
msgid "E379: Missing or empty directory name"
msgstr "E379: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Ìµ¤¤¤«¶õ¤Ç¤¹"
-#: quickfix.c:990
+#: ../quickfix.c:1027
msgid "E553: No more items"
msgstr "E553: Í×ÁǤ¬¤â¤¦¤¢¤ê¤Þ¤»¤ó"
-#: quickfix.c:1229
+#: ../quickfix.c:1324
#, c-format
msgid "(%d of %d)%s%s: "
msgstr "(%d of %d)%s%s: "
-#: quickfix.c:1231
+#: ../quickfix.c:1326
msgid " (line deleted)"
msgstr " (¹Ô¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿)"
-#: quickfix.c:1444
+#: ../quickfix.c:1539
msgid "E380: At bottom of quickfix stack"
msgstr "E380: quickfix ¥¹¥¿¥Ã¥¯¤ÎËöÈø¤Ç¤¹"
-#: quickfix.c:1453
+#: ../quickfix.c:1548
msgid "E381: At top of quickfix stack"
msgstr "E381: quickfix ¥¹¥¿¥Ã¥¯¤ÎÀèƬ¤Ç¤¹"
-#: quickfix.c:1465
+#: ../quickfix.c:1560
#, c-format
msgid "error list %d of %d; %d errors"
msgstr "¥¨¥é¡¼°ìÍ÷ %d of %d; %d ¸Ä¥¨¥é¡¼"
-#: quickfix.c:1943
+#: ../quickfix.c:2042
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 'buftype' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç½ñ¹þ¤ß¤Þ¤»¤ó"
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ¸¡º÷¥Ñ¥¿¡¼¥ó¤«¶èÀڤ국¹æ¤¬ÉÔÀµ¤Ç¤¹"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: ¥Õ¥¡¥¤¥ë̾¤¬Ìµ¤¤¤«Ìµ¸ú¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤¹"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: ¥Ð¥Ã¥Õ¥¡¤ÏÆɤ߹þ¤Þ¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: ../regexp.c:1006
msgid "E339: Pattern too long"
-msgstr "E339: ¥Ñ¥¿¡¼¥ó¤¬Ä¹¤¹¤®¤Þ¤¹"
+msgstr "E339: ¥Ñ¥¿¡¼¥ó¤¬Ä¹²á¤®¤Þ¤¹"
-#: regexp.c:1009
+#: ../regexp.c:1177
msgid "E50: Too many \\z("
-msgstr "E50: \\z( ¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E50: \\z( ¤¬Â¿²á¤®¤Þ¤¹"
-#: regexp.c:1020
+#: ../regexp.c:1188
#, c-format
msgid "E51: Too many %s("
-msgstr "E51: %s( ¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E51: %s( ¤¬Â¿²á¤®¤Þ¤¹"
-#: regexp.c:1077
+#: ../regexp.c:1245
msgid "E52: Unmatched \\z("
msgstr "E52: \\z( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
-#: regexp.c:1081
+#: ../regexp.c:1249
msgid "E53: Unmatched %s%%("
msgstr "E53: %s%%( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
-#: regexp.c:1083
+#: ../regexp.c:1251
#, c-format
msgid "E54: Unmatched %s("
msgstr "E54: %s( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
-#: regexp.c:1088
+#: ../regexp.c:1256
#, c-format
msgid "E55: Unmatched %s)"
msgstr "E55: %s) ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* ¤¬¶õʸ»úÎó¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ ¤¬¶õʸ»úÎó¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
#, c-format
msgid "E59: invalid character after %s@"
msgstr "E59: %s@ ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ ¤¬¶õʸ»úÎó¤Ë¤Ê¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
#, c-format
msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Ê£»¨¤Ê %s{...} ¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E60: Ê£»¨¤Ê %s{...} ¤¬Â¿²á¤®¤Þ¤¹"
-#: regexp.c:1370
+#: ../regexp.c:1524
#, c-format
msgid "E61: Nested %s*"
msgstr "E61:%s* ¤¬Æþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
-#: regexp.c:1373
+#: ../regexp.c:1527
#, c-format
msgid "E62: Nested %s%c"
msgstr "E62:%s%c ¤¬Æþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
#
-#: regexp.c:1491
+#: ../regexp.c:1647
msgid "E63: invalid use of \\_"
msgstr "E63: \\_ ¤Î̵¸ú¤Ê»ÈÍÑÊýË¡¤Ç¤¹"
-#: regexp.c:1536
+#: ../regexp.c:1692
#, c-format
msgid "E64: %s%c follows nothing"
msgstr "E64:%s%c ¤Î¸å¤Ë¤Ê¤Ë¤â¤¢¤ê¤Þ¤»¤ó"
#
-#: regexp.c:1592
+#: ../regexp.c:1748
msgid "E65: Illegal back reference"
msgstr "E65: ÉÔÀµ¤Ê¸åÊý»²¾È¤Ç¤¹"
#
-#: regexp.c:1605
+#: ../regexp.c:1761
msgid "E66: \\z( not allowed here"
msgstr "E66: \\z( ¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
#
-#: regexp.c:1624
+#: ../regexp.c:1780
msgid "E67: \\z1 et al. not allowed here"
msgstr "E67: \\z1 ¤½¤Î¾¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
#
-#: regexp.c:1635
+#: ../regexp.c:1791
msgid "E68: Invalid character after \\z"
msgstr "E68: \\z ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
#
-#: regexp.c:1684
+#: ../regexp.c:1840
msgid "E69: Missing ] after %s%%["
msgstr "E69: %s%%[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: regexp.c:1700
+#: ../regexp.c:1856
msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] ¤¬¶õ¤Ç¤¹"
#
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
+
+#
+#: ../regexp.c:1952
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
-#: regexp.c:2557
+#: ../regexp.c:2922
#, c-format
msgid "E554: Syntax error in %s{...}"
msgstr "E554: %s{...} Æâ¤Ëʸˡ¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹"
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ¥¯¥é¥Ã¥·¥å¤Ë¤è¤êÃæÃÇ; Àµµ¬É½¸½¤¬Ê£»¨²á¤®¤ë¤«¤â?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: ¥Ñ¥¿¡¼¥ó¤Ë¤è¤ë¥¹¥¿¥Ã¥¯ÉÔ­¥¨¥é¡¼¤Ç¤¹"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
msgid "External submatches:\n"
msgstr "³°Éô¤ÎÉôʬ³ºÅö:\n"
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld ¹Ô¤¬ÀÞ¾ö¤Þ¤ì¤Þ¤·¤¿"
-
-#: screen.c:7959
+#: ../screen.c:7969
msgid " VREPLACE"
msgstr " ²¾ÁÛÃÖ´¹"
-#: screen.c:7963
+#: ../screen.c:7973
msgid " REPLACE"
msgstr " ÃÖ´¹"
-#: screen.c:7968
+#: ../screen.c:7978
msgid " REVERSE"
msgstr " ȿž"
-#: screen.c:7970
+#: ../screen.c:7980
msgid " INSERT"
msgstr " ÁÞÆþ"
-#: screen.c:7973
+#: ../screen.c:7983
msgid " (insert)"
msgstr " (ÁÞÆþ)"
-#: screen.c:7975
+#: ../screen.c:7985
msgid " (replace)"
msgstr " (ÃÖ´¹)"
-#: screen.c:7977
+#: ../screen.c:7987
msgid " (vreplace)"
msgstr " (²¾ÁÛÃÖ´¹)"
-#: screen.c:7980
+#: ../screen.c:7990
msgid " Hebrew"
msgstr " ¥Ø¥Ö¥é¥¤"
-#: screen.c:7991
+#: ../screen.c:8001
msgid " Arabic"
msgstr " ¥¢¥é¥Ó¥¢"
-#: screen.c:7994
+#: ../screen.c:8004
msgid " (lang)"
msgstr " (¸À¸ì)"
-#: screen.c:7998
+#: ../screen.c:8008
msgid " (paste)"
msgstr " (Ž¤êÉÕ¤±)"
-#: screen.c:8011
+#: ../screen.c:8021
msgid " VISUAL"
msgstr " ¥Ó¥¸¥å¥¢¥ë"
-#: screen.c:8012
+#: ../screen.c:8022
msgid " VISUAL LINE"
msgstr " ¥Ó¥¸¥å¥¢¥ë ¹Ô"
-#: screen.c:8013
+#: ../screen.c:8023
msgid " VISUAL BLOCK"
msgstr " ¥Ó¥¸¥å¥¢¥ë ¶ë·Á"
-#: screen.c:8014
+#: ../screen.c:8024
msgid " SELECT"
msgstr " ¥»¥ì¥¯¥È"
-#: screen.c:8015
+#: ../screen.c:8025
msgid " SELECT LINE"
msgstr " ¹Ô»Ø¸þÁªÂò"
-#: screen.c:8016
+#: ../screen.c:8026
msgid " SELECT BLOCK"
msgstr " ¶ë·ÁÁªÂò"
@@ -5226,118 +5739,118 @@ msgstr " ¶ë·ÁÁªÂò"
# msgstr " ¥Ö¥í¥Ã¥¯"
# msgid " LINE"
# msgstr " ¹Ô"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
msgid "recording"
msgstr "µ­Ï¿Ãæ"
-#: search.c:37
+#: ../search.c:37
msgid "search hit TOP, continuing at BOTTOM"
msgstr "¾å¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç²¼¤ËÌá¤ê¤Þ¤¹"
-#: search.c:38
+#: ../search.c:38
msgid "search hit BOTTOM, continuing at TOP"
msgstr "²¼¤Þ¤Ç¸¡º÷¤·¤¿¤Î¤Ç¾å¤ËÌá¤ê¤Þ¤¹"
-#: search.c:526
+#: ../search.c:525
#, c-format
msgid "E383: Invalid search string: %s"
msgstr "E383: ̵¸ú¤Ê¸¡º÷ʸ»úÎó¤Ç¤¹: %s"
-#: search.c:853
+#: ../search.c:868
#, c-format
msgid "E384: search hit TOP without match for: %s"
msgstr "E384: ¾å¤Þ¤Ç¸¡º÷¤·¤¿¤±¤ì¤É³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: search.c:856
+#: ../search.c:871
#, c-format
msgid "E385: search hit BOTTOM without match for: %s"
msgstr "E385: ²¼¤Þ¤Ç¸¡º÷¤·¤¿¤±¤ì¤É³ºÅö²Õ½ê¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: search.c:1249
+#: ../search.c:1265
msgid "E386: Expected '?' or '/' after ';'"
msgstr "E386: ';' ¤Î¤¢¤È¤Ë¤Ï '?' ¤« '/' ¤¬´üÂÔ¤µ¤ì¤Æ¤¤¤ë"
-#: search.c:3758
+#: ../search.c:4147
msgid " (includes previously listed match)"
msgstr " (Á°¤ËÎóµó¤·¤¿³ºÅö²Õ½ê¤ò´Þ¤à)"
#. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
msgid "--- Included files "
msgstr "--- ¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë"
-#: search.c:3780
+#: ../search.c:4169
msgid "not found "
msgstr "¤ß¤Ä¤«¤ê¤Þ¤»¤ó "
-#: search.c:3781
+#: ../search.c:4170
msgid "in path ---\n"
msgstr "¥Ñ¥¹¤Ë ----\n"
-#: search.c:3820
+#: ../search.c:4227
msgid " (Already listed)"
msgstr " (´û¤ËÎóµó)"
-#: search.c:3822
+#: ../search.c:4229
msgid " NOT FOUND"
msgstr " ¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: search.c:3874
+#: ../search.c:4281
#, c-format
msgid "Scanning included file: %s"
msgstr "¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥ã¥óÃæ: %s"
-#: search.c:4092
+#: ../search.c:4499
msgid "E387: Match is on current line"
msgstr "E387: ¸½ºß¹Ô¤Ë³ºÅö¤¬¤¢¤ê¤Þ¤¹"
-#: search.c:4235
+#: ../search.c:4642
msgid "All included files were found"
msgstr "Á´¤Æ¤Î¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤ê¤Þ¤·¤¿"
-#: search.c:4237
+#: ../search.c:4644
msgid "No included files"
msgstr "¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: search.c:4253
+#: ../search.c:4660
msgid "E388: Couldn't find definition"
msgstr "E388: ÄêµÁ¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: search.c:4255
+#: ../search.c:4662
msgid "E389: Couldn't find pattern"
msgstr "E389: ¥Ñ¥¿¡¼¥ó¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: syntax.c:3050
+#: ../syntax.c:3070
#, c-format
msgid "E390: Illegal argument: %s"
msgstr "E390: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
-#: syntax.c:3230
+#: ../syntax.c:3247
#, c-format
msgid "E391: No such syntax cluster: %s"
msgstr "E391: ¤½¤Î¤è¤¦¤Ê¹½Ê¸¥¯¥é¥¹¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:3394
+#: ../syntax.c:3411
msgid "No Syntax items defined for this buffer"
msgstr "¤³¤Î¥Ð¥Ã¥Õ¥¡¤ËÄêµÁ¤µ¤ì¤¿¹½Ê¸Í×ÁǤϤ¢¤ê¤Þ¤»¤ó"
-#: syntax.c:3402
+#: ../syntax.c:3419
msgid "syncing on C-style comments"
msgstr "C¸À¸ìÉ÷¥³¥á¥ó¥È¤«¤éƱ´üÃæ"
-#: syntax.c:3410
+#: ../syntax.c:3427
msgid "no syncing"
msgstr "ÈóƱ´ü"
-#: syntax.c:3413
+#: ../syntax.c:3430
msgid "syncing starts "
msgstr "Ʊ´ü³«»Ï "
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
msgid " lines before top line"
msgstr " ¹ÔÁ°(¥È¥Ã¥×¹Ô¤è¤ê¤â)"
-#: syntax.c:3420
+#: ../syntax.c:3437
msgid ""
"\n"
"--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
"\n"
"--- ¹½Ê¸Æ±´üÍ×ÁÇ ---"
-#: syntax.c:3425
+#: ../syntax.c:3442
msgid ""
"\n"
"syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
"\n"
"Í×ÁǾå¤ÇƱ´üÃæ"
-#: syntax.c:3431
+#: ../syntax.c:3448
msgid ""
"\n"
"--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
"\n"
"--- ¹½Ê¸Í×ÁÇ ---"
-#: syntax.c:3454
+#: ../syntax.c:3471
#, c-format
msgid "E392: No such syntax cluster: %s"
msgstr "E392: ¤½¤Î¤è¤¦¤Ê¹½Ê¸¥¯¥é¥¹¥¿¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:3480
+#: ../syntax.c:3497
msgid "minimal "
msgstr "minimal"
-#: syntax.c:3487
+#: ../syntax.c:3504
msgid "maximal "
msgstr "maximal"
-#: syntax.c:3499
+#: ../syntax.c:3516
msgid "; match "
msgstr "; ³ºÅö "
-#: syntax.c:3501
+#: ../syntax.c:3518
msgid " line breaks"
msgstr " ¸Ä¤Î²þ¹Ô"
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: ¤³¤Î¾ì½ê¤Ç¤Ï°ú¿ôcontains¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: ¤³¤Î¾ì½ê¤Ç¤Ï°ú¿ôcontainedin¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#: ../syntax.c:4179
msgid "E393: group[t]here not accepted here"
msgstr "E393: ¤³¤³¤Ç¤Ï¥°¥ë¡¼¥×¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-#: syntax.c:4159
+#: ../syntax.c:4203
#, c-format
msgid "E394: Didn't find region item for %s"
msgstr "E394: %s ¤ÎÈÏ°ÏÍ×ÁǤ¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ¤³¤Î¾ì½ê¤Ç¤Ï°ú¿ôcontains¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: ¤³¤Î¾ì½ê¤Ç¤Ï°ú¿ôcontainedin¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
msgid "E397: Filename required"
msgstr "E397: ¥Õ¥¡¥¤¥ë̾¤¬É¬ÍפǤ¹"
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
+
+#: ../syntax.c:4644
#, c-format
msgid "E398: Missing '=': %s"
msgstr "E398: '=' ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:4772
+#: ../syntax.c:4803
#, c-format
msgid "E399: Not enough arguments: syntax region %s"
msgstr "E399: °ú¿ô¤¬Â­¤ê¤Þ¤»¤ó: ¹½Ê¸ÈÏ°Ï %s"
-#: syntax.c:5103
+#: ../syntax.c:5133
msgid "E400: No cluster specified"
msgstr "E400: ¥¯¥é¥¹¥¿¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: syntax.c:5140
+#: ../syntax.c:5170
#, c-format
msgid "E401: Pattern delimiter not found: %s"
msgstr "E401: ¥Ñ¥¿¡¼¥ó¶èÀڤ꤬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:5215
+#: ../syntax.c:5245
#, c-format
msgid "E402: Garbage after pattern: %s"
msgstr "E402: ¥Ñ¥¿¡¼¥ó¤Î¤¢¤È¤Ë¥´¥ß¤¬¤¢¤ê¤Þ¤¹: %s"
-#: syntax.c:5305
+#: ../syntax.c:5335
msgid "E403: syntax sync: line continuations pattern specified twice"
msgstr "E403: ¹½Ê¸Æ±´ü: Ϣ³¹Ô¥Ñ¥¿¡¼¥ó¤¬2ÅÙ»ØÄꤵ¤ì¤Þ¤·¤¿"
-#: syntax.c:5362
+#: ../syntax.c:5392
#, c-format
msgid "E404: Illegal arguments: %s"
msgstr "E404: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
-#: syntax.c:5412
+#: ../syntax.c:5442
#, c-format
msgid "E405: Missing equal sign: %s"
msgstr "E405: Åù¤·¤¤ sign ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:5418
+#: ../syntax.c:5448
#, c-format
msgid "E406: Empty argument: %s"
msgstr "E406: ¶õ¤Î°ú¿ô: %s"
-#: syntax.c:5445
+#: ../syntax.c:5475
#, c-format
msgid "E407: %s not allowed here"
msgstr "E407: %s ¤Ï¥³¥³¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: syntax.c:5452
+#: ../syntax.c:5482
#, c-format
msgid "E408: %s must be first in contains list"
msgstr "E408: %s ¤ÏÆâÍƥꥹ¥È¤ÎÀèƬ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤"
-#: syntax.c:5522
+#: ../syntax.c:5552
#, c-format
msgid "E409: Unknown group name: %s"
msgstr "E409: ̤ÃΤΥ°¥ë¡¼¥×̾: %s"
-#: syntax.c:5755
+#: ../syntax.c:5786
#, c-format
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: ̵¸ú¤Ê :syntax ¤Î¥µ¥Ö¥³¥Þ¥ó¥É: %s"
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim ¤ÎºÆµ¢¸Æ¤Ó½Ð¤·¤ò¸¡½Ð¤·¤Þ¤·¤¿"
+
+#: ../syntax.c:6181
#, c-format
msgid "E411: highlight group not found: %s"
msgstr "E411: ¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:6158
+#: ../syntax.c:6205
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
msgstr "E412: °ú¿ô¤¬½¼Ê¬¤Ç¤Ï¤Ê¤¤: \":highlight link %s\""
-#: syntax.c:6165
+#: ../syntax.c:6212
#, c-format
msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: °ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹: \":highlight link %s\""
+msgstr "E413: °ú¿ô¤¬Â¿²á¤®¤Þ¤¹: \":highlight link %s\""
-#: syntax.c:6185
+#: ../syntax.c:6232
msgid "E414: group has settings, highlight link ignored"
msgstr "E414: ¥°¥ë¡¼¥×¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç¥Ï¥¤¥é¥¤¥È¥ê¥ó¥¯¤Ï̵»ë¤µ¤ì¤Þ¤¹"
-#: syntax.c:6314
+#: ../syntax.c:6361
#, c-format
msgid "E415: unexpected equal sign: %s"
msgstr "E415: ͽ´ü¤»¤ÌƱ¤¸ sign ¤Ç¤¹: %s"
-#: syntax.c:6350
+#: ../syntax.c:6397
#, c-format
msgid "E416: missing equal sign: %s"
msgstr "E416: Ʊ¤¸ sign ¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:6378
+#: ../syntax.c:6425
#, c-format
msgid "E417: missing argument: %s"
msgstr "E417: °ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó: %s"
-#: syntax.c:6415
+#: ../syntax.c:6462
#, c-format
msgid "E418: Illegal value: %s"
msgstr "E418: ÉÔÀµ¤ÊÃͤǤ¹: %s"
-#: syntax.c:6534
+#: ../syntax.c:6581
msgid "E419: FG color unknown"
msgstr "E419: ̤ÃΤÎÁ°·Ê¿§¤Ç¤¹"
-#: syntax.c:6545
+#: ../syntax.c:6592
msgid "E420: BG color unknown"
msgstr "E420: ̤ÃΤÎÇØ·Ê¿§¤Ç¤¹"
-#: syntax.c:6606
+#: ../syntax.c:6653
#, c-format
msgid "E421: Color name or number not recognized: %s"
msgstr "E421: ¥«¥é¡¼Ì¾¤äÈÖ¹æ¤òǧ¼±¤Ç¤­¤Þ¤»¤ó: %s"
-#: syntax.c:6812
+#: ../syntax.c:6859
#, c-format
msgid "E422: terminal code too long: %s"
-msgstr "E422: ½ªÃ¼¥³¡¼¥É¤¬Ä¹¤¹¤®¤Þ¤¹: %s"
+msgstr "E422: ½ªÃ¼¥³¡¼¥É¤¬Ä¹²á¤®¤Þ¤¹: %s"
-#: syntax.c:6859
+#: ../syntax.c:6906
#, c-format
msgid "E423: Illegal argument: %s"
msgstr "E423: ÉÔÀµ¤Ê°ú¿ô¤Ç¤¹: %s"
-#: syntax.c:7388
+#: ../syntax.c:7435
msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ¿¤¯¤Î°Û¤Ê¤ë¥Ï¥¤¥é¥¤¥È°À­¤¬»È¤ï¤ì¤¹¤®¤Æ¤¤¤Þ¤¹"
+msgstr "E424: ¿¤¯¤Î°Û¤Ê¤ë¥Ï¥¤¥é¥¤¥È°À­¤¬»È¤ï¤ì²á¤®¤Æ¤¤¤Þ¤¹"
-#: syntax.c:7909
+#: ../syntax.c:7955
msgid "E669: Unprintable character in group name"
msgstr "E669: ¥°¥ë¡¼¥×̾¤Ë°õºþÉÔ²Äǽ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹"
-#. This is an error, but since there previously was no check only
-#. * give a warning.
-#: syntax.c:7916
+#: ../syntax.c:7963
msgid "W18: Invalid character in group name"
msgstr "W18: ¥°¥ë¡¼¥×̾¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹"
-#: tag.c:90
+#: ../tag.c:90
msgid "E555: at bottom of tag stack"
msgstr "E555: ¥¿¥°¥¹¥¿¥Ã¥¯¤ÎËöÈø¤Ç¤¹"
-#: tag.c:91
+#: ../tag.c:91
msgid "E556: at top of tag stack"
msgstr "E556: ¥¿¥°¥¹¥¿¥Ã¥¯¤ÎÀèƬ¤Ç¤¹"
-#: tag.c:412
+#: ../tag.c:412
msgid "E425: Cannot go before first matching tag"
msgstr "E425: ºÇ½é¤Î³ºÅö¥¿¥°¤òĶ¤¨¤ÆÌá¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: tag.c:550
+#: ../tag.c:550
#, c-format
msgid "E426: tag not found: %s"
msgstr "E426: ¥¿¥°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó: %s"
-#: tag.c:583
+#: ../tag.c:583
msgid " # pri kind tag"
msgstr " # pri kind tag"
-#: tag.c:586
+#: ../tag.c:586
msgid "file\n"
msgstr "¥Õ¥¡¥¤¥ë\n"
@@ -5571,44 +6091,44 @@ msgstr "¥Õ¥¡¥¤¥ë\n"
#. * Ask to select a tag from the list.
#. * When using ":silent" assume that <CR> was entered.
#.
-#: tag.c:744
+#: ../tag.c:744
msgid "Enter nr of choice (<CR> to abort): "
msgstr "ÁªÂò¤¹¤ëÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (<CR>¤ÇÃæ»ß): "
-#: tag.c:784
+#: ../tag.c:784
msgid "E427: There is only one matching tag"
msgstr "E427: ³ºÅö¥¿¥°¤¬1¤Ä¤À¤±¤·¤«¤¢¤ê¤Þ¤»¤ó"
-#: tag.c:786
+#: ../tag.c:786
msgid "E428: Cannot go beyond last matching tag"
msgstr "E428: ºÇ¸å¤Ë³ºÅö¤¹¤ë¥¿¥°¤òĶ¤¨¤Æ¿Ê¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: tag.c:810
+#: ../tag.c:810
#, c-format
msgid "File \"%s\" does not exist"
msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤¢¤ê¤Þ¤»¤ó"
#. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
#, c-format
msgid "tag %d of %d%s"
msgstr "¥¿¥° %d (Á´%d%s)"
-#: tag.c:826
+#: ../tag.c:826
msgid " or more"
msgstr " ¤«¤½¤ì°Ê¾å"
-#: tag.c:828
+#: ../tag.c:828
msgid " Using tag with different case!"
msgstr " ¥¿¥°¤ò°Û¤Ê¤ëcase¤Ç»ÈÍѤ·¤Þ¤¹!"
-#: tag.c:872
+#: ../tag.c:872
#, c-format
msgid "E429: File \"%s\" does not exist"
msgstr "E429: ¥Õ¥¡¥¤¥ë \"%s\" ¤¬¤¢¤ê¤Þ¤»¤ó"
#. Highlight title
-#: tag.c:941
+#: ../tag.c:941
msgid ""
"\n"
" # TO tag FROM line in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
"\n"
" # TO ¥¿¥° FROM ¹Ô in file/text"
-#: tag.c:1363
+#: ../tag.c:1363
#, c-format
msgid "Searching tags file %s"
msgstr "¥¿¥°¥Õ¥¡¥¤¥ë %s ¤ò¸¡º÷Ãæ"
-#: tag.c:1550
+#: ../tag.c:1550
#, c-format
msgid "E430: Tag file path truncated for %s\n"
msgstr "E430: ¥¿¥°¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤¬ %s ¤ËÀÚ¤ê¼Î¤Æ¤é¤ì¤Þ¤·¤¿\n"
-#: tag.c:2203
+#: ../tag.c:2202
#, c-format
msgid "E431: Format error in tags file \"%s\""
msgstr "E431: ¥¿¥°¥Õ¥¡¥¤¥ë \"%s\" ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹"
-#: tag.c:2207
+#: ../tag.c:2206
#, c-format
msgid "Before byte %ld"
msgstr "ľÁ°¤Î %ld ¥Ð¥¤¥È"
-#: tag.c:2240
+#: ../tag.c:2239
#, c-format
msgid "E432: Tags file not sorted: %s"
msgstr "E432: ¥¿¥°¥Õ¥¡¥¤¥ë¤¬¥½¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s"
#. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
msgid "E433: No tags file"
msgstr "E433: ¥¿¥°¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: tag.c:3016
+#: ../tag.c:3020
msgid "E434: Can't find tag pattern"
msgstr "E434: ¥¿¥°¥Ñ¥¿¡¼¥ó¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: tag.c:3027
+#: ../tag.c:3031
msgid "E435: Couldn't find tag, just guessing!"
msgstr "E435: ¥¿¥°¤ò¤ß¤Ä¤±¤é¤ì¤Ê¤¤¤Î¤Çñ¤Ë¿ä¬¤·¤Þ¤¹!"
-#: term.c:1759
+#: ../term.c:1776
msgid "' not known. Available builtin terminals are:"
msgstr "' ¤Ï̤ÃΤǤ¹. ¸½¹Ô¤ÎÁȤ߹þ¤ßüËö¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹:"
-#: term.c:1783
+#: ../term.c:1800
msgid "defaulting to '"
msgstr "¾ÊάÃͤò¼¡¤Î¤è¤¦¤ËÀßÄꤷ¤Þ¤¹ '"
-#: term.c:2141
+#: ../term.c:2158
msgid "E557: Cannot open termcap file"
msgstr "E557: termcap¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó"
-#: term.c:2145
+#: ../term.c:2162
msgid "E558: Terminal entry not found in terminfo"
msgstr "E558: terminfo¤ËüËö¥¨¥ó¥È¥ê¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: term.c:2147
+#: ../term.c:2164
msgid "E559: Terminal entry not found in termcap"
msgstr "E559: termcap¤ËüËö¥¨¥ó¥È¥ê¤ò¤ß¤Ä¤±¤é¤ì¤Þ¤»¤ó"
-#: term.c:2306
+#: ../term.c:2323
#, c-format
msgid "E436: No \"%s\" entry in termcap"
msgstr "E436: termcap¤Ë \"%s\" ¤Î¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
-#: term.c:2780
+#: ../term.c:2797
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: üËö¤Ë \"cm\" µ¡Ç½¤¬É¬ÍפǤ¹"
#. Highlight title
-#: term.c:4990
+#: ../term.c:5039
msgid ""
"\n"
"--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
"\n"
"--- üËö¥­¡¼ ---"
-#: ui.c:258
+#: ../ui.c:276
msgid "new shell started\n"
msgstr "¿·¤·¤¤¥·¥§¥ë¤òµ¯Æ°¤·¤Þ¤¹\n"
-#: ui.c:1841
+#: ../ui.c:1860
msgid "Vim: Error reading input, exiting...\n"
msgstr "Vim: ÆþÎϤòÆɹþ¤ßÃæ¤Î¥¨¥é¡¼¤Ë¤è¤ê½ªÎ»¤·¤Þ¤¹...\n"
#. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
msgid "No undo possible; continue anyway"
msgstr "²Äǽ¤Ê¥¢¥ó¥É¥¥¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤ê¤¢¤¨¤ºÂ³¤±¤Þ¤¹"
-#: undo.c:561
+#: ../undo.c:578
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: ¹ÔÈֹ椬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
-#: undo.c:757
+#: ../undo.c:778
msgid "1 change"
msgstr "1 ²Õ½êÊѹ¹¤·¤Þ¤·¤¿"
-#: undo.c:759
+#: ../undo.c:780
#, c-format
msgid "%ld changes"
msgstr "%ld ²Õ½êÊѹ¹¤·¤Þ¤·¤¿"
-#: undo.c:812
+#: ../undo.c:833
msgid "E439: undo list corrupt"
msgstr "E439: ¥¢¥ó¥É¥¥¥ê¥¹¥È¤¬²õ¤ì¤Æ¤¤¤Þ¤¹"
-#: undo.c:844
+#: ../undo.c:865
msgid "E440: undo line missing"
msgstr "E440: ¥¢¥ó¥É¥¥¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
#. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
msgid ""
"\n"
"MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
"\n"
"MS-Windows 16/32 ¥Ó¥Ã¥È GUI ÈÇ"
-#: version.c:1733
+#: ../version.c:724
msgid ""
"\n"
"MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
"\n"
"MS-Windows 32 ¥Ó¥Ã¥È GUI ÈÇ"
-#: version.c:1736
+#: ../version.c:727
msgid " in Win32s mode"
msgstr " in Win32s ¥â¡¼¥É"
-#: version.c:1738
+#: ../version.c:729
msgid " with OLE support"
msgstr " with OLE ¥µ¥Ý¡¼¥È"
-#: version.c:1741
+#: ../version.c:732
msgid ""
"\n"
"MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
"\n"
"MS-Windows 32 ¥Ó¥Ã¥È ¥³¥ó¥½¡¼¥ë ÈÇ"
-#: version.c:1745
+#: ../version.c:736
msgid ""
"\n"
"MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
"\n"
"MS-Windows 16 ¥Ó¥Ã¥È ÈÇ"
-#: version.c:1749
+#: ../version.c:740
msgid ""
"\n"
"32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
"\n"
"32 ¥Ó¥Ã¥È MS-DOS ÈÇ"
-#: version.c:1751
+#: ../version.c:742
msgid ""
"\n"
"16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
"\n"
"16 ¥Ó¥Ã¥È MS-DOS ÈÇ"
-#: version.c:1757
+#: ../version.c:748
msgid ""
"\n"
"MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
"\n"
"MacOS X (unix) ÈÇ"
-#: version.c:1759
+#: ../version.c:750
msgid ""
"\n"
"MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
"\n"
"MacOS X ÈÇ"
-#: version.c:1762
+#: ../version.c:753
msgid ""
"\n"
"MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
"\n"
"MacOS ÈÇ"
-#: version.c:1767
+#: ../version.c:758
msgid ""
"\n"
"RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
"\n"
"RISC OS ÈÇ"
-#: version.c:1777
+#: ../version.c:768
msgid ""
"\n"
"Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
"\n"
"ŬÍѺѥѥåÁ: "
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
msgid "Modified by "
msgstr "Modified by "
-#: version.c:1810
+#: ../version.c:801
msgid ""
"\n"
"Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
"\n"
"Compiled "
-#: version.c:1813
+#: ../version.c:804
msgid "by "
msgstr "by "
-#: version.c:1825
+#: ../version.c:816
msgid ""
"\n"
"Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
"\n"
"Huge ÈÇ "
-#: version.c:1828
+#: ../version.c:819
msgid ""
"\n"
"Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
"\n"
"Big ÈÇ "
-#: version.c:1831
+#: ../version.c:822
msgid ""
"\n"
"Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
"\n"
"Ä̾ï ÈÇ "
-#: version.c:1834
+#: ../version.c:825
msgid ""
"\n"
"Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
"\n"
"Small ÈÇ "
-#: version.c:1836
+#: ../version.c:827
msgid ""
"\n"
"Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
"\n"
"Tiny ÈÇ "
-#: version.c:1842
+#: ../version.c:833
msgid "without GUI."
msgstr "without GUI."
-#: version.c:1847
+#: ../version.c:838
msgid "with GTK2-GNOME GUI."
msgstr "with GTK2-GNOME GUI."
-#: version.c:1849
+#: ../version.c:840
msgid "with GTK-GNOME GUI."
msgstr "with GTK-GNOME GUI."
-#: version.c:1853
+#: ../version.c:844
msgid "with GTK2 GUI."
msgstr "with GTK2 GUI."
-#: version.c:1855
+#: ../version.c:846
msgid "with GTK GUI."
msgstr "with GTK GUI."
-#: version.c:1860
+#: ../version.c:851
msgid "with X11-Motif GUI."
msgstr "with X11-Motif GUI."
-#: version.c:1864
+#: ../version.c:855
msgid "with X11-neXtaw GUI."
msgstr "with X11-neXtaw GUI."
-#: version.c:1866
+#: ../version.c:857
msgid "with X11-Athena GUI."
msgstr "with X11-Athena GUI."
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
msgid "with Photon GUI."
msgstr "with Photon GUI."
-#: version.c:1876
+#: ../version.c:864
msgid "with GUI."
msgstr "with GUI."
-#: version.c:1879
+#: ../version.c:867
msgid "with Carbon GUI."
msgstr "with Carbon GUI."
-#: version.c:1882
+#: ../version.c:870
msgid "with Cocoa GUI."
msgstr "with Cocoa GUI."
-#: version.c:1885
+#: ../version.c:873
msgid "with (classic) GUI."
msgstr "with (¥¯¥é¥·¥Ã¥¯) GUI."
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
msgid " Features included (+) or not (-):\n"
msgstr " µ¡Ç½¤Î°ìÍ÷ Í­¸ú(+)/̵¸ú(-)\n"
-#: version.c:1908
+#: ../version.c:899
msgid " system vimrc file: \""
msgstr " ¥·¥¹¥Æ¥à vimrc: \""
-#: version.c:1913
+#: ../version.c:904
msgid " user vimrc file: \""
msgstr " ¥æ¡¼¥¶ vimrc: \""
-#: version.c:1918
+#: ../version.c:909
msgid " 2nd user vimrc file: \""
msgstr " Âè2¥æ¡¼¥¶ vimrc: \""
-#: version.c:1923
+#: ../version.c:914
msgid " 3rd user vimrc file: \""
msgstr " Âè3¥æ¡¼¥¶ vimrc: \""
-#: version.c:1928
+#: ../version.c:919
msgid " user exrc file: \""
msgstr " ¥æ¡¼¥¶ exrc: \""
-#: version.c:1933
+#: ../version.c:924
msgid " 2nd user exrc file: \""
msgstr " Âè2¥æ¡¼¥¶ exrc: \""
-#: version.c:1939
+#: ../version.c:930
msgid " system gvimrc file: \""
msgstr " ¥·¥¹¥Æ¥à gvimrc: \""
-#: version.c:1943
+#: ../version.c:934
msgid " user gvimrc file: \""
msgstr " ¥æ¡¼¥¶ gvimrc: \""
-#: version.c:1947
+#: ../version.c:938
msgid "2nd user gvimrc file: \""
msgstr " Âè2¥æ¡¼¥¶ gvimrc: \""
-#: version.c:1952
+#: ../version.c:943
msgid "3rd user gvimrc file: \""
msgstr " Âè3¥æ¡¼¥¶ gvimrc: \""
-#: version.c:1959
+#: ../version.c:950
msgid " system menu file: \""
msgstr " ¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼: \""
-#: version.c:1967
+#: ../version.c:958
msgid " fall-back for $VIM: \""
msgstr " ¾Êά»þ¤Î $VIM: \""
-#: version.c:1973
+#: ../version.c:964
msgid " f-b for $VIMRUNTIME: \""
msgstr "¾Êά»þ¤Î $VIMRUNTIME: \""
-#: version.c:1977
+#: ../version.c:968
msgid "Compilation: "
msgstr "¥³¥ó¥Ñ¥¤¥ë: "
-#: version.c:1983
+#: ../version.c:974
msgid "Compiler: "
msgstr "¥³¥ó¥Ñ¥¤¥é: "
-#: version.c:1988
+#: ../version.c:979
msgid "Linking: "
msgstr "¥ê¥ó¥¯: "
-#: version.c:1993
+#: ../version.c:984
msgid " DEBUG BUILD"
msgstr "¥Ç¥Ð¥Ã¥°¥Ó¥ë¥É"
-#: version.c:2032
+#: ../version.c:1023
msgid "VIM - Vi IMproved"
msgstr "VIM - Vi IMproved"
-#: version.c:2034
+#: ../version.c:1025
msgid "version "
msgstr "version "
-#: version.c:2035
+#: ../version.c:1026
msgid "by Bram Moolenaar et al."
msgstr "by Bram Moolenaar ¾."
-#: version.c:2039
+#: ../version.c:1030
msgid "Vim is open source and freely distributable"
msgstr "Vim ¤Ï¥ª¡¼¥×¥ó¥½¡¼¥¹¤Ç¤¢¤ê¼«Í³¤ËÇÛÉÛ²Äǽ¤Ç¤¹"
-#: version.c:2041
+#: ../version.c:1032
msgid "Help poor children in Uganda!"
msgstr "¥¦¥¬¥ó¥À¤Î·Ã¤Þ¤ì¤Ê¤¤»Ò¶¡¤¿¤Á¤Ë±ç½õ¤ò!"
-#: version.c:2042
+#: ../version.c:1033
msgid "type :help iccf<Enter> for information "
msgstr "¾ÜºÙ¤Ê¾ðÊó¤Ï :help iccf<Enter> "
-#: version.c:2044
+#: ../version.c:1035
msgid "type :q<Enter> to exit "
msgstr "½ªÎ»¤¹¤ë¤Ë¤Ï :q<Enter> "
-#: version.c:2045
+#: ../version.c:1036
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤Ï :help<Enter> ¤« <F1> "
-#: version.c:2046
-msgid "type :help version6<Enter> for version info"
-msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï :help version6<Enter> "
+#: ../version.c:1037
+msgid "type :help version7<Enter> for version info"
+msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï :help version7<Enter> "
-#: version.c:2049
+#: ../version.c:1040
msgid "Running in Vi compatible mode"
msgstr "Vi¸ß´¹¥â¡¼¥É¤ÇÆ°ºîÃæ"
-#: version.c:2050
+#: ../version.c:1041
msgid "type :set nocp<Enter> for Vim defaults"
msgstr "Vim¿ä¾©Ãͤˤ¹¤ë¤Ë¤Ï :set nocp<Enter> "
-#: version.c:2051
+#: ../version.c:1042
msgid "type :help cp-default<Enter> for info on this"
msgstr "¾ÜºÙ¤Ê¾ðÊó¤Ï :help cp-default<Enter>"
-#: version.c:2066
+#: ../version.c:1057
msgid "menu Help->Orphans for information "
msgstr "¾ÜºÙ¤Ï¥á¥Ë¥å¡¼¤Î ¥Ø¥ë¥×¢ª¸É»ù ¤ò»²¾È¤·¤Æ²¼¤µ¤¤ "
-#: version.c:2068
+#: ../version.c:1059
msgid "Running modeless, typed text is inserted"
msgstr "¥â¡¼¥É̵¤Ç¼Â¹ÔÃæ, ¥¿¥¤¥×¤·¤¿Ê¸»ú¤¬ÁÞÆþ¤µ¤ì¤Þ¤¹"
-#: version.c:2069
+#: ../version.c:1060
msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "¥á¥Ë¥å¡¼¤Î ÊÔ½¸¢ªÁ´ÂÎÀßÄꢪÁÞÆþ(½é¿´¼Ô)¥â¡¼¥ÉÀÚÂØ"
-#: version.c:2070
+#: ../version.c:1061
msgid " for two modes "
msgstr " ¤Ç¥â¡¼¥ÉÍ­¤Ë "
-#: version.c:2074
+#: ../version.c:1065
msgid "menu Edit->Global Settings->Toggle Vi Compatible"
msgstr "¥á¥Ë¥å¡¼¤Î ÊÔ½¸¢ªÁ´ÂÎÀßÄꢪVi¸ß´¹¥â¡¼¥ÉÀÚÂØ "
-#: version.c:2075
+#: ../version.c:1066
msgid " for Vim defaults "
msgstr " ¤ÇVim¤È¤·¤ÆÆ°ºî "
-#: version.c:2122
+#: ../version.c:1113
msgid "Sponsor Vim development!"
msgstr "Vim¤Î³«È¯¤ò±þ±ç¤·¤Æ¤¯¤À¤µ¤¤!"
-#: version.c:2123
+#: ../version.c:1114
msgid "Become a registered Vim user!"
msgstr "Vim¤ÎÅÐÏ¿¥æ¡¼¥¶¤Ë¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤!"
-#: version.c:2126
+#: ../version.c:1117
msgid "type :help sponsor<Enter> for information "
msgstr "¾ÜºÙ¤Ê¾ðÊó¤Ï :help sponsor<Enter> "
-#: version.c:2127
+#: ../version.c:1118
msgid "type :help register<Enter> for information "
msgstr "¾ÜºÙ¤Ê¾ðÊó¤Ï :help register<Enter> "
-#: version.c:2129
+#: ../version.c:1120
msgid "menu Help->Sponsor/Register for information "
msgstr "¾ÜºÙ¤Ï¥á¥Ë¥å¡¼¤Î ¥Ø¥ë¥×¢ª¥¹¥Ý¥ó¥µ¡¼/ÅÐÏ¿ ¤ò»²¾È¤·¤Æ²¼¤µ¤¤ "
-#: version.c:2139
+#: ../version.c:1130
msgid "WARNING: Windows 95/98/ME detected"
msgstr " ·Ù¹ð: Windows 95/98/Me ¤ò¸¡½Ð "
-#: version.c:2142
+#: ../version.c:1133
msgid "type :help windows95<Enter> for info on this"
msgstr " ¾ÜºÙ¤Ê¾ðÊó¤Ï :help windows95<Enter> "
-#: window.c:203
+#: ../window.c:208
msgid "E441: There is no preview window"
msgstr "E441: ¥×¥ì¥Ó¥å¡¼¥¦¥£¥ó¥É¥¦¤¬¤¢¤ê¤Þ¤»¤ó"
-#: window.c:581
+#: ../window.c:603
msgid "E442: Can't split topleft and botright at the same time"
msgstr "E442: º¸¾å¤È±¦²¼¤òƱ»þ¤Ëʬ³ä¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: window.c:1340
+#: ../window.c:1362
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: ¾¤Î¥¦¥£¥ó¥É¥¦¤¬Ê¬³ä¤µ¤ì¤Æ¤¤¤ë»þ¤Ë¤Ï½ç²ó¤Ç¤­¤Þ¤»¤ó"
-#: window.c:1836
+#: ../window.c:1858
msgid "E444: Cannot close last window"
msgstr "E444: ºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
-#: window.c:2567
+#: ../window.c:2593
msgid "Already only one window"
msgstr "´û¤Ë¥¦¥£¥ó¥É¥¦¤Ï1¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
-#: window.c:2614
+#: ../window.c:2640
msgid "E445: Other window contains changes"
msgstr "E445: ¾¤Î¥¦¥£¥ó¥É¥¦¤Ë¤ÏÊѹ¹¤¬¤¢¤ê¤Þ¤¹"
-#: window.c:4480
+#: ../window.c:4564
msgid "E446: No file name under cursor"
msgstr "E446: ¥«¡¼¥½¥ë¤Î²¼¤Ë¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: window.c:4599
+#: ../window.c:4683
#, c-format
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: path¤Ë¤Ï \"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1232 if_perl.xs:326
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ¥é¥¤¥Ö¥é¥ê %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-
-#: if_perl.xs:554
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"¤³¤Î¥³¥Þ¥ó¥É¤Ï̵¸ú¤Ç¤¹, ¤´¤á¤ó¤Ê¤µ¤¤: Perl¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ï Safe "
-"¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ·¤Ê¤¤Perl¥¹¥¯¥ê¥×¥È¤Ï¶Ø¤¸¤é¤ì¤Æ¤¤¤Þ¤¹"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "³Æ¥Õ¥¡¥¤¥ë¤òÊÌ¡¹¤Î Vim ¤ÇÊÔ½¸(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "Á´¥Õ¥¡¥¤¥ë¤ò1¤Ä¤Î Vim ¤ÇÊÔ½¸(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim ¤Çº¹Ê¬ÊÔ½¸(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim ¤ÇÊÔ½¸(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "´û¸¤Î Vim ¤ÇÊÔ½¸ - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò Vim ¤ÇÊÔ½¸"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "µ¯Æ°¥¨¥é¡¼: gvim ¤Ë¥Ñ¥¹¤¬Ä̤äƤ¤¤ë¤«³Î¤«¤á¤Æ¤¯¤À¤µ¤¤!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll ¥¨¥é¡¼"
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "¥Ñ¥¹¤¬Ä¹¤¹¤®¤Þ¤¹!"
-
-#: globals.h:1022
+#: ../globals.h:1056
msgid "--No lines in buffer--"
msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
@@ -6200,388 +6668,418 @@ msgstr "--¥Ð¥Ã¥Õ¥¡¤Ë¹Ô¤¬¤¢¤ê¤Þ¤»¤ó--"
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-#: globals.h:1185
+#: ../globals.h:1247
msgid "E470: Command aborted"
msgstr "E470: ¥³¥Þ¥ó¥É¤¬ÃæÃǤµ¤ì¤Þ¤·¤¿"
-#: globals.h:1186
+#: ../globals.h:1248
msgid "E471: Argument required"
msgstr "E471: °ú¿ô¤¬É¬ÍפǤ¹"
-#: globals.h:1187
+#: ../globals.h:1249
msgid "E10: \\ should be followed by /, ? or &"
msgstr "E10: \\ ¤Î¸å¤Ï / ¤« ? ¤« & ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: globals.h:1189
+#: ../globals.h:1251
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
msgstr "E11: ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤Ï̵¸ú¤Ç¤¹; <CR>¤Ç¼Â¹Ô, CTRL-C¤Ç¤ä¤á¤ë"
-#: globals.h:1191
+#: ../globals.h:1253
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
msgstr ""
"E12: ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥¿¥°¸¡º÷¤Ç¤Ïexrc/vimrc¤Î¥³¥Þ¥ó¥É¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-#: globals.h:1193
+#: ../globals.h:1255
msgid "E171: Missing :endif"
msgstr "E171: :endif ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1194
+#: ../globals.h:1256
msgid "E600: Missing :endtry"
msgstr "E600: :endtry ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1195
+#: ../globals.h:1257
msgid "E170: Missing :endwhile"
msgstr "E170: :endwhile ¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: ../globals.h:1259
msgid "E588: :endwhile without :while"
msgstr "E588: :while ¤Î¤Ê¤¤ :endwhile ¤¬¤¢¤ê¤Þ¤¹"
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ¤Î¤Ê¤¤ :for ¤¬¤¢¤ê¤Þ¤¹"
+
+#: ../globals.h:1262
msgid "E13: File exists (add ! to override)"
msgstr "E13: ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹ (! ¤òÄɲäǾå½ñ)"
-#: globals.h:1199
+#: ../globals.h:1263
msgid "E472: Command failed"
msgstr "E472: ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
-#: globals.h:1201
+#: ../globals.h:1265
#, c-format
msgid "E234: Unknown fontset: %s"
msgstr "E234: ̤ÃΤΥե©¥ó¥È¥»¥Ã¥È: %s"
-#: globals.h:1205
+#: ../globals.h:1269
#, c-format
msgid "E235: Unknown font: %s"
msgstr "E235: ̤ÃΤΥե©¥ó¥È: %s"
-#: globals.h:1208
+#: ../globals.h:1272
#, c-format
msgid "E236: Font \"%s\" is not fixed-width"
msgstr "E236: ¥Õ¥©¥ó¥È \"%s\" ¤Ï¸ÇÄêÉý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1210
+#: ../globals.h:1274
msgid "E473: Internal error"
msgstr "E473: ÆâÉô¥¨¥é¡¼¤Ç¤¹"
-#: globals.h:1211
+#: ../globals.h:1275
msgid "Interrupted"
msgstr "³ä¹þ¤Þ¤ì¤Þ¤·¤¿"
-#: globals.h:1212
+#: ../globals.h:1276
msgid "E14: Invalid address"
msgstr "E14: ̵¸ú¤Ê¥¢¥É¥ì¥¹¤Ç¤¹"
-#: globals.h:1213
+#: ../globals.h:1277
msgid "E474: Invalid argument"
msgstr "E474: ̵¸ú¤Ê°ú¿ô¤Ç¤¹"
-#: globals.h:1214
+#: ../globals.h:1278
#, c-format
msgid "E475: Invalid argument: %s"
msgstr "E475: ̵¸ú¤Ê°ú¿ô¤Ç¤¹: %s"
-#: globals.h:1216
+#: ../globals.h:1280
#, c-format
msgid "E15: Invalid expression: %s"
msgstr "E15: ̵¸ú¤Ê¼°¤Ç¤¹: %s"
-#: globals.h:1218
+#: ../globals.h:1282
msgid "E16: Invalid range"
msgstr "E16: ̵¸ú¤ÊÈϰϤǤ¹"
-#: globals.h:1219
+#: ../globals.h:1283
msgid "E476: Invalid command"
msgstr "E476: ̵¸ú¤Ê¥³¥Þ¥ó¥É¤Ç¤¹"
-#: globals.h:1221
+#: ../globals.h:1285
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹"
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: ͽ´ü¤»¤Ìʸ»ú¤¬ '=' ¤ÎÁ°¤Ë¤¢¤ê¤Þ¤·¤¿"
-
-#: globals.h:1227
+#: ../globals.h:1288
#, c-format
msgid "E364: Library call failed for \"%s()\""
msgstr "E364: \"%s\"() ¤Î¥é¥¤¥Ö¥é¥ê¸Æ½Ð¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: globals.h:1233
+#: ../globals.h:1294
#, c-format
msgid "E448: Could not load library function %s"
msgstr "E448: ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô %s ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
-#: globals.h:1235
+#: ../globals.h:1296
msgid "E19: Mark has invalid line number"
msgstr "E19: ¥Þ¡¼¥¯¤Ë̵¸ú¤Ê¹ÔÈֹ椬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤·¤¿"
-#: globals.h:1236
+#: ../globals.h:1297
msgid "E20: Mark not set"
msgstr "E20: ¥Þ¡¼¥¯¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1237
+#: ../globals.h:1298
msgid "E21: Cannot make changes, 'modifiable' is off"
msgstr "E21: 'modifiable' ¤¬¥ª¥Õ¤Ê¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1238
+#: ../globals.h:1299
msgid "E22: Scripts nested too deep"
-msgstr "E22: ¥¹¥¯¥ê¥×¥È¤ÎÆþ¤ì»Ò¤¬¿¼¤¹¤®¤Þ¤¹"
+msgstr "E22: ¥¹¥¯¥ê¥×¥È¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
-#: globals.h:1239
+#: ../globals.h:1300
msgid "E23: No alternate file"
msgstr "E23: Éû¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1240
+#: ../globals.h:1301
msgid "E24: No such abbreviation"
msgstr "E24: ¤½¤Î¤è¤¦¤Êû½ÌÆþÎϤϤ¢¤ê¤Þ¤»¤ó"
-#: globals.h:1241
+#: ../globals.h:1302
msgid "E477: No ! allowed"
msgstr "E477: ! ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1243
+#: ../globals.h:1304
msgid "E25: GUI cannot be used: Not enabled at compile time"
msgstr "E25: GUI¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
-#: globals.h:1246
+#: ../globals.h:1307
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
msgstr "E26: ¥Ø¥Ö¥é¥¤¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-#: globals.h:1249
+#: ../globals.h:1310
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
msgstr "E27: ¥Ú¥ë¥·¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-#: globals.h:1252
+#: ../globals.h:1313
msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
msgstr "E800: ¥¢¥é¥Ó¥¢¸ì¤Ï»ÈÍÑÉÔ²Äǽ¤Ç¤¹: ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
-#: globals.h:1255
+#: ../globals.h:1316
#, c-format
msgid "E28: No such highlight group name: %s"
msgstr "E28: ¤½¤Î¤è¤¦¤Ê̾¤Î¥Ï¥¤¥é¥¤¥È¥°¥ë¡¼¥×¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: globals.h:1257
+#: ../globals.h:1318
msgid "E29: No inserted text yet"
msgstr "E29: ¤Þ¤À¥Æ¥­¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1258
+#: ../globals.h:1319
msgid "E30: No previous command line"
msgstr "E30: °ÊÁ°¤Ë¥³¥Þ¥ó¥É¹Ô¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1259
+#: ../globals.h:1320
msgid "E31: No such mapping"
msgstr "E31: ¤½¤Î¤è¤¦¤Ê¥Þ¥Ã¥Ô¥ó¥°¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1260
+#: ../globals.h:1321
msgid "E479: No match"
msgstr "E479: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1261
+#: ../globals.h:1322
#, c-format
msgid "E480: No match: %s"
msgstr "E480: ³ºÅö¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
-#: globals.h:1262
+#: ../globals.h:1323
msgid "E32: No file name"
msgstr "E32: ¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1263
+#: ../globals.h:1324
msgid "E33: No previous substitute regular expression"
msgstr "E33: Àµµ¬É½¸½ÃÖ´¹¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1264
+#: ../globals.h:1325
msgid "E34: No previous command"
msgstr "E34: ¥³¥Þ¥ó¥É¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1265
+#: ../globals.h:1326
msgid "E35: No previous regular expression"
msgstr "E35: Àµµ¬É½¸½¤¬¤Þ¤À¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1266
+#: ../globals.h:1327
msgid "E481: No range allowed"
msgstr "E481: ÈÏ°Ï»ØÄê¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1268
+#: ../globals.h:1329
msgid "E36: Not enough room"
msgstr "E36: ½¼Ê¬¤ÊÍÆÎ̤¬¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1271
+#: ../globals.h:1332
#, c-format
msgid "E247: no registered server named \"%s\""
msgstr "E247: %s ¤È¤¤¤¦Ì¾Á°¤ÎÅÐÏ¿¤µ¤ì¤¿¥µ¡¼¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1273
+#: ../globals.h:1334
#, c-format
msgid "E482: Can't create file %s"
msgstr "E482: ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1274
+#: ../globals.h:1335
msgid "E483: Can't get temp file name"
msgstr "E483: °ì»þ¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1275
+#: ../globals.h:1336
#, c-format
msgid "E484: Can't open file %s"
msgstr "E484: ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó"
-#: globals.h:1276
+#: ../globals.h:1337
#, c-format
msgid "E485: Can't read file %s"
msgstr "E485: ¥Õ¥¡¥¤¥ë %s ¤òÆɹþ¤á¤Þ¤»¤ó"
-#: globals.h:1277
+#: ../globals.h:1338
msgid "E37: No write since last change (add ! to override)"
msgstr "E37: ºÇ¸å¤ÎÊѹ¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó (! ¤òÄɲäÇÊѹ¹¤òÇË´þ)"
-#: globals.h:1278
+#: ../globals.h:1339
msgid "E38: Null argument"
msgstr "E38: °ú¿ô¤¬¶õ¤Ç¤¹"
-#: globals.h:1280
+#: ../globals.h:1341
msgid "E39: Number expected"
msgstr "E39: ¿ôÃͤ¬Í׵ᤵ¤ì¤Æ¤¤¤Þ¤¹"
-#: globals.h:1283
+#: ../globals.h:1344
#, c-format
msgid "E40: Can't open errorfile %s"
msgstr "E40: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë %s ¤ò³«¤±¤Þ¤»¤ó"
-#: globals.h:1286
+#: ../globals.h:1347
msgid "E233: cannot open display"
msgstr "E233: ¥Ç¥£¥¹¥×¥ì¥¤¤ò³«¤±¤Þ¤»¤ó"
-#: globals.h:1288
+#: ../globals.h:1349
msgid "E41: Out of memory!"
msgstr "E41: ¥á¥â¥ê¤¬¿Ô¤­²Ì¤Æ¤Þ¤·¤¿!"
-#: globals.h:1290
+#: ../globals.h:1351
msgid "Pattern not found"
msgstr "¥Ñ¥¿¡¼¥ó¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
-#: globals.h:1292
+#: ../globals.h:1353
#, c-format
msgid "E486: Pattern not found: %s"
msgstr "E486: ¥Ñ¥¿¡¼¥ó¤Ï¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿: %s"
-#: globals.h:1293
+#: ../globals.h:1354
msgid "E487: Argument must be positive"
msgstr "E487: °ú¿ô¤ÏÀµ¤ÎÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-#: globals.h:1295
+#: ../globals.h:1356
msgid "E459: Cannot go back to previous directory"
msgstr "E459: Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ì¤Þ¤»¤ó"
-#: globals.h:1299
+#: ../globals.h:1360
msgid "E42: No Errors"
msgstr "E42: ¥¨¥é¡¼¤Ï¤¢¤ê¤Þ¤»¤ó"
-#: globals.h:1301
+#: ../globals.h:1362
msgid "E43: Damaged match string"
msgstr "E43: ³ºÅöʸ»úÎó¤¬ÇË»¤·¤Æ¤¤¤Þ¤¹"
-#: globals.h:1302
+#: ../globals.h:1363
msgid "E44: Corrupted regexp program"
msgstr "E44: ÉÔÀµ¤ÊÀµµ¬É½¸½¥×¥í¥°¥é¥à¤Ç¤¹"
-#: globals.h:1303
+#: ../globals.h:1364
msgid "E45: 'readonly' option is set (add ! to override)"
msgstr "E45: 'readonly' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ (! ¤òÄɲäǾå½ñ¤­)"
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ÆɼèÀìÍÑÊÑ¿ô \"%s\" ¤Ë¤ÏÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
+
+#: ../globals.h:1367
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: ÆɼèÀìÍÑÊÑ¿ô \"%s\" ¤ËÀßÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊÑ¿ô \"%s\" ¤ËÃͤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1308
+#: ../globals.h:1370
msgid "E47: Error while reading errorfile"
msgstr "E47: ¥¨¥é¡¼¥Õ¥¡¥¤¥ë¤ÎÆɹþÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
-#: globals.h:1311
+#: ../globals.h:1373
msgid "E48: Not allowed in sandbox"
msgstr "E48: ¥µ¥ó¥É¥Ü¥Ã¥¯¥¹¤Ç¤Ïµö¤µ¤ì¤Þ¤»¤ó"
-#: globals.h:1313
+#: ../globals.h:1375
msgid "E523: Not allowed here"
msgstr "E523: ¤³¤³¤Ç¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó"
-#: globals.h:1316
+#: ../globals.h:1378
msgid "E359: Screen mode setting not supported"
msgstr "E359: ¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤ÎÀßÄê¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó"
-#: globals.h:1318
+#: ../globals.h:1380
msgid "E49: Invalid scroll size"
msgstr "E49: ̵¸ú¤Ê¥¹¥¯¥í¡¼¥ëÎ̤Ǥ¹"
-#: globals.h:1319
+#: ../globals.h:1381
msgid "E91: 'shell' option is empty"
msgstr "E91: 'shell' ¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
-#: globals.h:1321
+#: ../globals.h:1383
msgid "E255: Couldn't read in sign data!"
msgstr "E255: sign ¤Î¥Ç¡¼¥¿¤òÆɹþ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
-#: globals.h:1323
+#: ../globals.h:1385
msgid "E72: Close error on swap file"
msgstr "E72: ¥¹¥ï¥Ã¥×¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º»þ¥¨¥é¡¼¤Ç¤¹"
-#: globals.h:1324
+#: ../globals.h:1386
msgid "E73: tag stack empty"
msgstr "E73: ¥¿¥°¥¹¥¿¥Ã¥¯¤¬¶õ¤Ç¤¹"
-#: globals.h:1325
+#: ../globals.h:1387
msgid "E74: Command too complex"
-msgstr "E74: ¥³¥Þ¥ó¥É¤¬Ê£»¨¤¹¤®¤Þ¤¹"
+msgstr "E74: ¥³¥Þ¥ó¥É¤¬Ê£»¨²á¤®¤Þ¤¹"
-#: globals.h:1326
+#: ../globals.h:1388
msgid "E75: Name too long"
-msgstr "E75: ̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹"
+msgstr "E75: ̾Á°¤¬Ä¹²á¤®¤Þ¤¹"
-#: globals.h:1327
+#: ../globals.h:1389
msgid "E76: Too many ["
-msgstr "E76: [ ¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E76: [ ¤¬Â¿²á¤®¤Þ¤¹"
-#: globals.h:1328
+#: ../globals.h:1390
msgid "E77: Too many file names"
-msgstr "E77: ¥Õ¥¡¥¤¥ë̾¤¬Â¿¤¹¤®¤Þ¤¹"
+msgstr "E77: ¥Õ¥¡¥¤¥ë̾¤¬Â¿²á¤®¤Þ¤¹"
-#: globals.h:1329
+#: ../globals.h:1391
msgid "E488: Trailing characters"
msgstr "E488: ;ʬ¤Êʸ»ú¤¬¸å¤í¤Ë¤¢¤ê¤Þ¤¹"
-#: globals.h:1330
+#: ../globals.h:1392
msgid "E78: Unknown mark"
msgstr "E78: ̤ÃΤΥޡ¼¥¯"
-#: globals.h:1331
+#: ../globals.h:1393
msgid "E79: Cannot expand wildcards"
msgstr "E79: ¥ï¥¤¥ë¥É¥«¡¼¥É¤òŸ³«¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1333
+#: ../globals.h:1395
msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
msgstr "E591: 'winheight' ¤Ï 'winminheight' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1335
+#: ../globals.h:1397
msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
msgstr "E592: 'winwidth' ¤Ï 'winminwidth' ¤è¤ê¾®¤µ¤¯¤Ç¤­¤Þ¤»¤ó"
-#: globals.h:1338
+#: ../globals.h:1400
msgid "E80: Error while writing"
msgstr "E80: ½ñ¹þ¤ßÃæ¤Î¥¨¥é¡¼"
-#: globals.h:1339
+#: ../globals.h:1401
msgid "Zero count"
msgstr "¥¼¥í¥«¥¦¥ó¥È"
-#: globals.h:1341
+#: ../globals.h:1403
msgid "E81: Using <SID> not in a script context"
msgstr "E81: ¥¹¥¯¥ê¥×¥È°Ê³°¤Ç<SID>¤¬»È¤ï¤ì¤Þ¤·¤¿"
-#: globals.h:1344
+#: ../globals.h:1406
msgid "E449: Invalid expression received"
msgstr "E449: ̵¸ú¤Ê¼°¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
-#: globals.h:1347
+#: ../globals.h:1409
msgid "E463: Region is guarded, cannot modify"
msgstr "E463: Îΰ褬Êݸ¤ì¤Æ¤¤¤ë¤Î¤Ç, Êѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ¤ÏÆɹþÀìÍÑ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ë¤³¤È¤òµö¤·¤Þ¤»¤ó"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ÆâÉô¥¨¥é¡¼¤Ç¤¹: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: ¥¯¥é¥Ã¥·¥å¤Ë¤è¤êÃæÃÇ; Àµµ¬É½¸½¤¬Ê£»¨²á¤®¤ë¤«¤â?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: ¥Ñ¥¿¡¼¥ó¤Ë¤è¤ë¥¹¥¿¥Ã¥¯ÉÔ­¥¨¥é¡¼¤Ç¤¹"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¤¹"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index ae5c110c3..a7c6e3406 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,188 +3,188 @@
# Do ":help uganda" in Vim to read copying and usage conditions.
# Do ":help credits" in Vim to see a list of people who contributed.
#
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
#
msgid ""
msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
"Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=cp932\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: buffer.c:102
+#: ../buffer.c:102
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: ƒoƒbƒtƒ@‚ð1‚‚à쬂ł«‚È‚¢‚Ì‚Å, I—¹‚µ‚Ü‚·..."
-#: buffer.c:105
+#: ../buffer.c:105
msgid "E83: Cannot allocate buffer, using other one..."
msgstr "E83: ƒoƒbƒtƒ@‚ð쬂ł«‚È‚¢‚Ì‚Å, ‘¼‚Ì‚ðŽg—p‚µ‚Ü‚·..."
-#: buffer.c:805
+#: ../buffer.c:857
msgid "E515: No buffers were unloaded"
msgstr "E515: ‰ð•ú‚³‚ꂽƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: buffer.c:807
+#: ../buffer.c:859
msgid "E516: No buffers were deleted"
msgstr "E516: 휂³‚ꂽƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: buffer.c:809
+#: ../buffer.c:861
msgid "E517: No buffers were wiped out"
msgstr "E517: ”jŠü‚³‚ꂽƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: buffer.c:817
+#: ../buffer.c:869
msgid "1 buffer unloaded"
msgstr "1 ŒÂ‚̃oƒbƒtƒ@‚ª‰ð•ú‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:819
+#: ../buffer.c:871
#, c-format
msgid "%d buffers unloaded"
msgstr "%d ŒÂ‚̃oƒbƒtƒ@‚ª‰ð•ú‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:824
+#: ../buffer.c:876
msgid "1 buffer deleted"
msgstr "1 ŒÂ‚̃oƒbƒtƒ@‚ªíœ‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:826
+#: ../buffer.c:878
#, c-format
msgid "%d buffers deleted"
msgstr "%d ŒÂ‚̃oƒbƒtƒ@‚ªíœ‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:831
+#: ../buffer.c:883
msgid "1 buffer wiped out"
msgstr "1 ŒÂ‚̃oƒbƒtƒ@‚ª”jŠü‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:833
+#: ../buffer.c:885
#, c-format
msgid "%d buffers wiped out"
msgstr "%d ŒÂ‚̃oƒbƒtƒ@‚ª”jŠü‚³‚ê‚Ü‚µ‚½"
-#: buffer.c:894
+#: ../buffer.c:946
msgid "E84: No modified buffer found"
msgstr "E84: •ÏX‚³‚ꂽƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
#. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
msgid "E85: There is no listed buffer"
msgstr "E85: ƒŠƒXƒg•\\Ž¦‚³‚ê‚éƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: buffer.c:945
+#: ../buffer.c:997
#, c-format
msgid "E86: Buffer %ld does not exist"
msgstr "E86: ƒoƒbƒtƒ@ %ld ‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: buffer.c:948
+#: ../buffer.c:1000
msgid "E87: Cannot go beyond last buffer"
msgstr "E87: ÅŒã‚̃oƒbƒtƒ@‚ð‰z‚¦‚Ĉړ®‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: buffer.c:950
+#: ../buffer.c:1002
msgid "E88: Cannot go before first buffer"
msgstr "E88: ʼn‚̃oƒbƒtƒ@‚æ‚è‘O‚ւ͈ړ®‚Å‚«‚Ü‚¹‚ñ"
-#: buffer.c:988
+#: ../buffer.c:1044
#, c-format
msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: ƒoƒbƒtƒ@ %ld ‚Ì•ÏX‚Í•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚Å•ÏX‚ð”jŠü)"
-#: buffer.c:1005
+#: ../buffer.c:1061
msgid "E90: Cannot unload last buffer"
msgstr "E90: ÅŒã‚̃oƒbƒtƒ@‚͉ð•ú‚Å‚«‚Ü‚¹‚ñ"
-#: buffer.c:1538
+#: ../buffer.c:1611
msgid "W14: Warning: List of file names overflow"
-msgstr "W14: Œx: ƒtƒ@ƒCƒ‹–¼‚̃ŠƒXƒg‚ª’·‚·‚¬‚Ü‚·"
+msgstr "W14: Œx: ƒtƒ@ƒCƒ‹–¼‚̃ŠƒXƒg‚ª’·‰ß‚¬‚Ü‚·"
-#: buffer.c:1709
+#: ../buffer.c:1795
#, c-format
msgid "E92: Buffer %ld not found"
msgstr "E92: ƒoƒbƒtƒ@ %ld ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: buffer.c:1940
+#: ../buffer.c:2058
#, c-format
msgid "E93: More than one match for %s"
msgstr "E93: %s ‚É•¡”‚ÌŠY“–‚ª‚ ‚è‚Ü‚µ‚½"
-#: buffer.c:1942
+#: ../buffer.c:2060
#, c-format
msgid "E94: No matching buffer for %s"
msgstr "E94: %s ‚ÉŠY“–‚·‚éƒoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: buffer.c:2337
+#: ../buffer.c:2473
#, c-format
msgid "line %ld"
msgstr "s %ld"
-#: buffer.c:2420
+#: ../buffer.c:2561
msgid "E95: Buffer with this name already exists"
msgstr "E95: ‚±‚Ì–¼‘O‚̃oƒbƒtƒ@‚ÍŠù‚É‚ ‚è‚Ü‚·"
-#: buffer.c:2713
+#: ../buffer.c:2878
msgid " [Modified]"
msgstr " [•ÏX‚ ‚è]"
-#: buffer.c:2718
+#: ../buffer.c:2883
msgid "[Not edited]"
msgstr "[–¢•ÒW]"
-#: buffer.c:2723
+#: ../buffer.c:2888
msgid "[New file]"
msgstr "[Vƒtƒ@ƒCƒ‹]"
-#: buffer.c:2724
+#: ../buffer.c:2889
msgid "[Read errors]"
msgstr "[“ÇžƒGƒ‰[]"
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
msgid "[readonly]"
msgstr "[“Çžê—p]"
-#: buffer.c:2747
+#: ../buffer.c:2912
msgid "1 line --%d%%--"
msgstr "1 s --%d%%--"
-#: buffer.c:2749
+#: ../buffer.c:2914
msgid "%ld lines --%d%%--"
msgstr "%ld s --%d%%--"
-#: buffer.c:2756
+#: ../buffer.c:2921
msgid "line %ld of %ld --%d%%-- col "
msgstr "s %ld (‘S‘Ì %ld) --%d%%-- col "
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[–³‘è]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[–³–¼]"
#. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
msgid "help"
msgstr "ƒwƒ‹ƒv"
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
msgid "[help]"
msgstr "[ƒwƒ‹ƒv]"
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
msgid "[Preview]"
msgstr "[ƒvƒŒƒrƒ…[]"
-#: buffer.c:3775
+#: ../buffer.c:3931
msgid "All"
msgstr "‘S‚Ä"
-#: buffer.c:3775
+#: ../buffer.c:3931
msgid "Bot"
msgstr "––”ö"
-#: buffer.c:3777
+#: ../buffer.c:3933
msgid "Top"
msgstr "擪"
-#: buffer.c:4523
+#: ../buffer.c:4702
msgid ""
"\n"
"# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
"\n"
"# ƒoƒbƒtƒ@ƒŠƒXƒg:\n"
-#: buffer.c:4556
+#: ../buffer.c:4737
msgid "[Error List]"
msgstr "[ƒGƒ‰[ƒŠƒXƒg]"
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[–³‘è]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
msgid ""
"\n"
"--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
"\n"
"--- ƒTƒCƒ“ ---"
-#: buffer.c:4901
+#: ../buffer.c:5082
#, c-format
msgid "Signs for %s:"
msgstr "%s ‚̃TƒCƒ“:"
-#: buffer.c:4907
+#: ../buffer.c:5088
#, c-format
msgid " line=%ld id=%d name=%s"
msgstr " s=%ld Ž¯•ÊŽq=%d –¼‘O=%s"
-#: diff.c:139
+#: ../diff.c:163
#, c-format
msgid "E96: Can not diff more than %ld buffers"
msgstr "E96: %ld ˆÈã‚̃oƒbƒtƒ@‚Ídiff‚Å‚«‚Ü‚¹‚ñ"
-#: diff.c:709
+#: ../diff.c:737
msgid "E97: Cannot create diffs"
msgstr "E97: ·•ª‚ð쬂ł«‚Ü‚¹‚ñ "
-#: diff.c:814
+#: ../diff.c:843
msgid "Patch file"
msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹"
-#: diff.c:1065
+#: ../diff.c:1146
msgid "E98: Cannot read diff output"
msgstr "E98: diff‚Ìo—Í‚ð“Çž‚ß‚Ü‚¹‚ñ"
-#: diff.c:1815
+#: ../diff.c:1896
msgid "E99: Current buffer is not in diff mode"
msgstr "E99: Œ»Ý‚̃oƒbƒtƒ@‚Í·•ªƒ‚[ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: diff.c:1827
+#: ../diff.c:1908
msgid "E100: No other buffer in diff mode"
msgstr "E100: ·•ªƒ‚[ƒh‚Å‚ ‚鑼‚̃oƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: diff.c:1835
+#: ../diff.c:1916
msgid "E101: More than two buffers in diff mode, don't know which one to use"
msgstr ""
"E101: ·•ªƒ‚[ƒh‚̃oƒbƒtƒ@‚ª2ŒÂˆÈã‚ ‚é‚Ì‚ÅA‚Ç‚ê‚ðŽg‚¤‚©“Á’è‚Å‚«‚Ü‚¹‚ñ"
-#: diff.c:1858
+#: ../diff.c:1939
#, c-format
msgid "E102: Can't find buffer \"%s\""
msgstr "E102: ƒoƒbƒtƒ@ \"%s\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: diff.c:1864
+#: ../diff.c:1945
#, c-format
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: ƒoƒbƒtƒ@ \"%s\" ‚Í·•ªƒ‚[ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: digraph.c:2199
+#: ../digraph.c:2200
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ‡Žš‚ÉEscape‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ"
-#: digraph.c:2384
+#: ../digraph.c:2384
msgid "E544: Keymap file not found"
msgstr "E544: ƒL[ƒ}ƒbƒvƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: digraph.c:2411
+#: ../digraph.c:2411
msgid "E105: Using :loadkeymap not in a sourced file"
msgstr "E105: :source ‚ÅŽæž‚Þƒtƒ@ƒCƒ‹ˆÈŠO‚Å‚Í :loadkeymap ‚ðŽg‚¦‚Ü‚¹‚ñ"
-#: edit.c:40
+#: ../edit.c:41
msgid " Keyword completion (^N^P)"
msgstr " ƒL[ƒ[ƒh•âŠ® (^N^P)"
#. ctrl_x_mode == 0, ^P/^N compl.
-#: edit.c:41
-msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " ^X ƒ‚[ƒh (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X ƒ‚[ƒh (^E^Y^L^]^F^I^K^D^U^V^N^P)"
#. Scroll has it's own msgs, in it's place there is the msg for local
#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo
-#: edit.c:44
+#: ../edit.c:45
msgid " Keyword Local completion (^N^P)"
msgstr " ‹ÇŠƒL[ƒ[ƒh•âŠ® (^N^P)"
-#: edit.c:45
+#: ../edit.c:46
msgid " Whole line completion (^L^N^P)"
msgstr " s(‘S‘Ì)•âŠ® (^L^N^P)"
-#: edit.c:46
+#: ../edit.c:47
msgid " File name completion (^F^N^P)"
msgstr "ƒtƒ@ƒCƒ‹–¼•âŠ® (^F^N^P)"
-#: edit.c:47
+#: ../edit.c:48
msgid " Tag completion (^]^N^P)"
msgstr " ƒ^ƒO•âŠ® (^]^N^P)"
-#: edit.c:48
+#: ../edit.c:49
msgid " Path pattern completion (^N^P)"
msgstr " ƒpƒXƒpƒ^[ƒ“•âŠ® (^N^P)"
-#: edit.c:49
+#: ../edit.c:50
msgid " Definition completion (^D^N^P)"
msgstr " ’è‹`•âŠ® (^D^N^P)"
-#: edit.c:51
+#: ../edit.c:52
msgid " Dictionary completion (^K^N^P)"
msgstr " Ž«‘•âŠ® (^K^N^P)"
-#: edit.c:52
+#: ../edit.c:53
msgid " Thesaurus completion (^T^N^P)"
msgstr " ƒVƒ\\[ƒ‰ƒX•âŠ® (^T^N^P)"
-#: edit.c:53
+#: ../edit.c:54
msgid " Command-line completion (^V^N^P)"
msgstr " ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“•âŠ® (^V^N^P)"
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ƒ†[ƒU’è‹`•âŠ® (^U^N^P)"
+
+#: ../edit.c:58
msgid "Hit end of paragraph"
msgstr "’i—Ž‚ÌÅŒã‚Ƀqƒbƒg"
-#: edit.c:962
+#: ../edit.c:994
msgid "'thesaurus' option is empty"
msgstr "'thesaurus' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-#: edit.c:1166
+#: ../edit.c:1204
msgid "'dictionary' option is empty"
msgstr "'dictionary' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-#: edit.c:2162
+#: ../edit.c:2204
#, c-format
msgid "Scanning dictionary: %s"
msgstr "Ž«‘‚ðƒXƒLƒƒƒ“’†: %s"
-#: edit.c:2368
+#: ../edit.c:2410
msgid " (insert) Scroll (^E/^Y)"
msgstr " (‘}“ü) ƒXƒNƒ[ƒ‹(^E/^Y)"
-#: edit.c:2370
+#: ../edit.c:2412
msgid " (replace) Scroll (^E/^Y)"
msgstr " (’uŠ·) ƒXƒNƒ[ƒ‹ (^E/^Y)"
-#: edit.c:2684
+#: ../edit.c:2813
#, c-format
msgid "Scanning: %s"
msgstr "ƒXƒLƒƒƒ“’†: %s"
-#: edit.c:2719
+#: ../edit.c:2848
msgid "Scanning tags."
msgstr "ƒ^ƒO‚ðƒXƒLƒƒƒ“’†."
-#: edit.c:3381
+#: ../edit.c:3549
msgid " Adding"
msgstr " ’ljÁ’†"
@@ -359,121 +359,283 @@ msgstr " ’ljÁ’†"
#. * be called before line = ml_get(), or when this address is no
#. * longer needed. -- Acevedo.
#.
-#: edit.c:3430
+#: ../edit.c:3598
msgid "-- Searching..."
msgstr "-- ŒŸõ’†..."
-#: edit.c:3486
+#: ../edit.c:3654
msgid "Back at original"
msgstr "Žn‚ß‚É–ß‚é"
-#: edit.c:3491
+#: ../edit.c:3659
msgid "Word from other line"
msgstr "‘¼‚Ìs‚Ì’PŒê"
-#: edit.c:3496
+#: ../edit.c:3664
msgid "The only match"
msgstr "—Bˆê‚ÌŠY“–"
-#: edit.c:3555
+#: ../edit.c:3723
#, c-format
msgid "match %d of %d"
msgstr "%d ”Ô–Ú‚ÌŠY“– (‘SŠY“– %d ŒÂ’†)"
-#: edit.c:3558
+#: ../edit.c:3726
#, c-format
msgid "match %d"
msgstr "%d ”Ô–Ú‚ÌŠY“–"
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: —\\Šú‚¹‚Ê•¶Žš‚ª :let ‚É‚ ‚è‚Ü‚µ‚½"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ƒŠƒXƒg‚̃Cƒ“ƒfƒbƒNƒX‚ª”͈͊O‚Å‚·: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: –¢’è‹`‚Ì•Ï”‚Å‚·: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+
+#: ../eval.c:97
#, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: –¢’m‚Ì•Ï”: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s ‚̈ø”‚̓ŠƒXƒgŒ^‚Ü‚½‚ÍŽ«‘Œ^‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Ž«‘Œ^‚É‹ó‚̃L[‚ðŽg‚¤‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: ƒŠƒXƒgŒ^‚ª•K—v‚Å‚·"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: Ž«‘Œ^‚ª•K—v‚Å‚·"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ŠÖ”‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Ž«‘Œ^‚ɃL[‚ª‘¶Ý‚µ‚Ü‚¹‚ñ: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ŠÖ” %s ‚Í’è‹`Ï‚Å‚·, Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Ž«‘Œ^“à‚ɃGƒ“ƒgƒŠ‚ªŠù‚É‘¶Ý‚µ‚Ü‚·"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: ŠÖ”ŽQÆŒ^‚ª—v‹‚³‚ê‚Ü‚·"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] ‚ðŽ«‘Œ^‚Æ‘g‚݇‚킹‚Ä‚ÍŽg‚¦‚Ü‚¹‚ñ"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: ˆÙ‚È‚Á‚½Œ^‚Ì•Ï”‚Å‚· %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: –¢’m‚ÌŠÖ”‚Å‚·: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: ƒ^[ƒQƒbƒg‚ªƒŠƒXƒgŒ^“à‚Ì—v‘f‚æ‚è‚à­‚È‚¢‚Å‚·"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: ƒ^[ƒQƒbƒg‚ªƒŠƒXƒgŒ^“à‚Ì—v‘f‚æ‚è‚à‘½‚¢‚Å‚·"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "ƒŠƒXƒgŒ^‚Ì’l‚É2‚ˆÈã‚Ì ; ‚ªŒŸo‚³‚ê‚Ü‚µ‚½"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ‚Ì’l‚ðˆê——•\\Ž¦‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ƒŠƒXƒgŒ^‚ÆŽ«‘Œ^ˆÈŠO‚̓Cƒ“ƒfƒbƒNƒXŽw’è‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ‚ÍÅŒã‚Å‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ‚ɂ̓ŠƒXƒgŒ^‚Ì’l‚ª•K—v‚Å‚·"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: ƒŠƒXƒgŒ^•Ï”‚Ƀ^[ƒQƒbƒg‚æ‚è‚à‘½‚¢—v‘f‚ª‚ ‚è‚Ü‚·"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: ƒŠƒXƒgŒ^•Ï”‚É\\•ª‚È”‚Ì—v‘f‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ‚ÌŒã‚É \"in\" ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: eval.c:1320
+#: ../eval.c:2721
#, c-format
msgid "E107: Missing braces: %s"
msgstr "E107: ƒJƒbƒR '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
#, c-format
msgid "E108: No such variable: \"%s\""
msgstr "E108: ‚»‚Ì•Ï”‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (ƒAƒ“ƒ`)ƒƒbƒN‚·‚é‚É‚Í•Ï”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+#: ../eval.c:3336
msgid "E109: Missing ':' after '?'"
msgstr "E109: '?' ‚ÌŒã‚É ':' ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: ƒŠƒXƒgŒ^‚̓ŠƒXƒgŒ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ƒŠƒXƒgŒ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Ž«‘Œ^‚ÍŽ«‘Œ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Ž«‘Œ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: ŠÖ”ŽQÆŒ^‚ÍŠÖ”ŽQÆŒ^‚Æ‚µ‚©”äŠr‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: ŠÖ”ŽQÆŒ^‚É‚Í–³Œø‚È‘€ì‚Å‚·"
+
+#: ../eval.c:4086
msgid "E110: Missing ')'"
msgstr "E110: ')' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ŠÖ”ŽQÆŒ^‚̓Cƒ“ƒfƒbƒNƒX‚Å‚«‚Ü‚¹‚ñ"
-#: eval.c:2466
+#: ../eval.c:4432
#, c-format
msgid "E112: Option name missing: %s"
msgstr "E112: ƒIƒvƒVƒ‡ƒ“–¼‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:2484
+#: ../eval.c:4450
#, c-format
msgid "E113: Unknown option: %s"
msgstr "E113: –¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·: %s"
-#: eval.c:2555
+#: ../eval.c:4516
#, c-format
msgid "E114: Missing quote: %s"
msgstr "E114: ˆø—p•„ (\") ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:2698
+#: ../eval.c:4652
#, c-format
msgid "E115: Missing quote: %s"
msgstr "E115: ˆø—p•„ (') ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:3054
+#: ../eval.c:4731
#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ŠÖ” %s ‚É‚Í–³Œø‚Ȉø”‚Å‚·"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ƒŠƒXƒgŒ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:3083
+#: ../eval.c:4739
#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: –¢’m‚ÌŠÖ”‚Å‚·: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ƒŠƒXƒgŒ^‚ÌÅŒã‚É ']' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:3084
+#: ../eval.c:5768
#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ŠÖ”‚̈ø”‚ª‘½‚·‚¬‚Ü‚·: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Ž«‘Œ^‚ɃRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: Ž«‘Œ^‚Éd•¡ƒL[‚ª‚»‚ñ‚´‚¢‚µ‚Ü‚·"
-#: eval.c:3085
+#: ../eval.c:5811
#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ŠÖ”‚̈ø”‚ª‘«‚è‚Ü‚¹‚ñ: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Ž«‘Œ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:3086
+#: ../eval.c:5819
#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Ž«‘Œ^‚ÌÅŒã‚É '}' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: •\\Ž¦‚·‚é‚É‚Í•Ï”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: ‚ª‘½‰ß‚¬‚Ü‚·"
#.
#. * Yes this is ugly, I don't particularly like it either. But doing it
#. * this way has the compelling advantage that translations need not to
#. * be touched at all. See below what 'ok' and 'ync' are used for.
#.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
msgid "&Ok"
msgstr "&Ok"
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s ‚Æ‚¢‚¤ƒL[‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
+
+#: ../eval.c:8339
#, c-format
msgid "+-%s%3ld lines: "
msgstr "+-%s%3ld s:"
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: –¢’m‚ÌŠÖ”‚Å‚·: %s"
+
+#: ../eval.c:9966
msgid ""
"&OK\n"
"&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
"Œˆ’è(&O)\n"
"ƒLƒƒƒ“ƒZƒ‹(&C)"
-#: eval.c:5517
+#: ../eval.c:10005
msgid "called inputrestore() more often than inputsave()"
msgstr "inputrestore() ‚ª inputsave() ‚æ‚è‚à‘½‚­ŒÄ‚΂ê‚Ü‚µ‚½"
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ƒVƒ“ƒ{ƒŠƒbƒNƒŠƒ“ƒN‚ª‘½‰ß‚¬‚Ü‚· (zŠÂ‚µ‚Ä‚¢‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: ”͈͎w’è‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() ‚É‚Í–³Œø‚ÈŒ^‚Å‚·"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: ƒXƒgƒ‰ƒCƒh(‘Oi—Ê)‚ª 0 ‚Å‚·"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: ŠJŽnˆÊ’u‚ªI—¹ˆÊ’u‚ð‰z‚¦‚Ü‚µ‚½"
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<‹ó>"
+
+#: ../eval.c:11287
msgid "E240: No connection to Vim server"
msgstr "E240: Vim ƒT[ƒo‚Ö‚ÌÚ‘±‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s ‚Ö‘—‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:11465
msgid "E277: Unable to read a server reply"
msgstr "E277: ƒT[ƒo‚̉ž“š‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ƒVƒ“ƒ{ƒŠƒbƒNƒŠƒ“ƒN‚ª‘½‰ß‚¬‚Ü‚· (zŠÂ‚µ‚Ä‚¢‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·)"
+
+#: ../eval.c:12144
msgid "E258: Unable to send to client"
msgstr "E258: ƒNƒ‰ƒCƒAƒ“ƒg‚Ö‘—‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s ‚Ö‘—‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: ƒ\\[ƒg‚Ì”äŠrŠÖ”‚ªŽ¸”s‚µ‚Ü‚µ‚½"
-#: eval.c:6882
+#: ../eval.c:12670
msgid "(Invalid)"
msgstr "(–³Œø)"
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: ˆêŽžƒtƒ@ƒCƒ‹‘ž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: ŠÖ”ŽQÆŒ^‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·B"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: ƒŠƒXƒgŒ^‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: Ž«‘Œ^‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: ŠÖ”ŽQÆŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: ƒŠƒXƒgŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: •Ï”Œ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·"
+
+#: ../eval.c:14826
#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: –¢’è‹`‚Ì•Ï”‚Å‚·: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: ŠÖ”ŽQÆŒ^•Ï”–¼‚͑啶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: •Ï”–¼‚ªŠù‘¶‚ÌŠÖ”–¼‚ÆÕ“Ë‚µ‚Ü‚·: %s"
-#: eval.c:8492
+#: ../eval.c:14840
#, c-format
msgid "E461: Illegal variable name: %s"
msgstr "E461: •s³‚È•Ï”–¼‚Å‚·: %s"
-#: eval.c:8784
+#: ../eval.c:14857
#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ŠÖ” %s ‚Í’è‹`Ï‚Å‚·, Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: •Ï”‚ÌŒ^‚ªˆê’v‚µ‚Ü‚¹‚ñ: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ’l‚ªƒƒbƒN‚³‚ê‚Ä‚¢‚Ü‚·: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "•s–¾"
-#: eval.c:8857
+#: ../eval.c:14952
#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: –¢’è‹`‚ÌŠÖ”‚Å‚·: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ‚Ì’l‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ƒRƒs[‚ðŽæ‚é‚É‚Í•Ï”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-#: eval.c:8870
+#: ../eval.c:15458
#, c-format
msgid "E124: Missing '(': %s"
msgstr "E124: '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: eval.c:8903
+#: ../eval.c:15491
#, c-format
msgid "E125: Illegal argument: %s"
msgstr "E125: •s³‚Ȉø”‚Å‚·: %s"
-#: eval.c:8982
+#: ../eval.c:15579
msgid "E126: Missing :endfunction"
msgstr "E126: :endfunction ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: eval.c:9089
+#: ../eval.c:15765
#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ŠÖ” %s ‚ðÄ’è‹`‚Å‚«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ŠÖ”–¼‚ªƒXƒNƒŠƒvƒg‚̃tƒ@ƒCƒ‹–¼‚ƈê’v‚µ‚Ü‚¹‚ñ: %s"
-#: eval.c:9159
+#: ../eval.c:15878
msgid "E129: Function name required"
msgstr "E129: ŠÖ”–¼‚ª—v‹‚³‚ê‚Ü‚·"
-#: eval.c:9210
+#: ../eval.c:15963
#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: ŠÖ”–¼‚͑啶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: ŠÖ”–¼‚͑啶Žš‚ÅŽn‚Ü‚é‚©ƒRƒƒ“‚ðŠÜ‚Ü‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ: %s"
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: –¢’è‹`‚ÌŠÖ”‚Å‚·: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
#, c-format
msgid "E131: Cannot delete function %s: It is in use"
msgstr "E131: ŠÖ” %s ‚ð휂ł«‚Ü‚¹‚ñ: Žg—p’†‚Å‚·"
-#: eval.c:9455
+#: ../eval.c:16561
msgid "E132: Function call depth is higher than 'maxfuncdepth'"
msgstr "E132: ŠÖ”ŒÄo‚Ì“ü‚êŽq”‚ª 'maxfuncdepth' ‚ð’´‚¦‚Ü‚µ‚½"
#. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
#, c-format
msgid "calling %s"
msgstr "%s ‚ðŽÀs’†‚Å‚·"
-#: eval.c:9570
+#: ../eval.c:16785
#, c-format
msgid "%s aborted"
msgstr "%s ‚ª’†’f‚³‚ê‚Ü‚µ‚½"
-#: eval.c:9572
+#: ../eval.c:16787
#, c-format
msgid "%s returning #%ld"
msgstr "%s ‚ª #%ld ‚ð•Ô‚µ‚Ü‚µ‚½"
-#: eval.c:9579
+#: ../eval.c:16797
#, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ‚ª \"%s\" ‚ð•Ô‚µ‚Ü‚µ‚½"
+msgid "%s returning %s"
+msgstr "%s ‚ª %s ‚ð•Ô‚µ‚Ü‚µ‚½"
#. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
#, c-format
msgid "continuing in %s"
msgstr "%s ‚ÌŽÀs‚ðŒp‘±’†‚Å‚·"
-#: eval.c:9621
+#: ../eval.c:16866
msgid "E133: :return not inside a function"
msgstr "E133: ŠÖ”ŠO‚É :return ‚ª‚ ‚è‚Ü‚µ‚½"
-#: eval.c:9952
+#: ../eval.c:17266
msgid ""
"\n"
"# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
"\n"
"# ƒOƒ[ƒoƒ‹•Ï”:\n"
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 16i” %02x, 8i” %03o"
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
#, c-format
msgid "> %d, Hex %04x, Octal %o"
msgstr "> %d, 16i” %04x, 8i” %o"
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
#, c-format
msgid "> %d, Hex %08x, Octal %o"
msgstr "> %d, 16i” %08x, 8i” %o"
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
msgid "E134: Move lines into themselves"
msgstr "E134: s‚ð‚»‚êŽ©g‚ɂ͈ړ®‚Å‚«‚Ü‚¹‚ñ"
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
msgid "1 line moved"
msgstr "1 s‚ªˆÚ“®‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
#, c-format
msgid "%ld lines moved"
msgstr "%ld s‚ªˆÚ“®‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
#, c-format
msgid "%ld lines filtered"
msgstr "%ld s‚ªƒtƒBƒ‹ƒ^ˆ—‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
msgid "E135: *Filter* Autocommands must not change current buffer"
msgstr "E135: *ƒtƒBƒ‹ƒ^* autocommand‚ÍŒ»Ý‚̃oƒbƒtƒ@‚ð•ÏX‚µ‚Ä‚Í‚¢‚¯‚Ü‚¹‚ñ"
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
msgid "[No write since last change]\n"
msgstr "[ÅŒã‚Ì•ÏX‚ª•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ]\n"
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s s–Ú: "
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
msgid "E136: viminfo: Too many errors, skipping rest of file"
msgstr "E136: viminfo: ƒGƒ‰[‚ª‘½‰ß‚¬‚é‚Ì‚Å, ˆÈ~‚̓XƒLƒbƒv‚µ‚Ü‚·"
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
#, c-format
msgid "Reading viminfo file \"%s\"%s%s%s"
msgstr "viminfoƒtƒ@ƒCƒ‹ \"%s\"%s%s%s ‚ð“Çž‚Ý’† "
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
msgid " info"
msgstr " î•ñ"
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
msgid " marks"
msgstr " ƒ}[ƒN"
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
msgid " FAILED"
msgstr " Ž¸”s"
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
#, c-format
msgid "E137: Viminfo file is not writable: %s"
msgstr "E137: viminfoƒtƒ@ƒCƒ‹‚ª‘ž‚Ý‚Å‚«‚Ü‚¹‚ñ: %s"
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
#, c-format
msgid "E138: Can't write viminfo file %s!"
msgstr "E138: viminfoƒtƒ@ƒCƒ‹ %s ‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ!"
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
#, c-format
msgid "Writing viminfo file \"%s\""
msgstr "viminfoƒtƒ@ƒCƒ‹ \"%s\" ‚ð‘ž‚Ý’†"
#. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
#, c-format
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# ‚±‚Ì viminfo ƒtƒ@ƒCƒ‹‚Í Vim %s ‚É‚æ‚Á‚Ķ¬‚³‚ê‚Ü‚µ‚½.\n"
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -708,47 +935,47 @@ msgstr ""
"# •ÏX‚·‚éÛ‚É‚Í\\•ª’ˆÓ‚µ‚Ä‚­‚¾‚³‚¢!\n"
"\n"
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# ‚±‚̃tƒ@ƒCƒ‹‚ª‘‚©‚ꂽŽž‚Ì 'encoding' ‚Ì’l\n"
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
msgid "Illegal starting char"
msgstr "•s³‚È擪•¶Žš‚Å‚·"
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
msgid "Save As"
msgstr "•Ê–¼‚Å•Û‘¶"
#. Overwriting a file that is loaded in another buffer is not a
#. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
msgid "E139: File is loaded in another buffer"
msgstr "E139: “¯‚¶–¼‘O‚̃tƒ@ƒCƒ‹‚ª‘¼‚̃oƒbƒtƒ@‚Å“Çž‚Ü‚ê‚Ä‚¢‚Ü‚·"
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
msgid "Write partial file?"
msgstr "ƒtƒ@ƒCƒ‹‚ð•”•ª“I‚É•Û‘¶‚µ‚Ü‚·‚©?"
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
msgid "E140: Use ! to write partial buffer"
msgstr "E140: ƒoƒbƒtƒ@‚ð•”•ª“I‚É•Û‘¶‚·‚é‚É‚Í ! ‚ðŽg‚Á‚Ä‚­‚¾‚³‚¢"
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
#, c-format
msgid "Overwrite existing file \"%.*s\"?"
msgstr "Šù‘¶‚̃tƒ@ƒCƒ‹ \"%.*s\" ‚ðã‘‚«‚µ‚Ü‚·‚©?"
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
#, c-format
msgid "E141: No file name for buffer %ld"
msgstr "E141: ƒoƒbƒtƒ@ %ld ‚É‚Í–¼‘O‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
msgid "E142: File not written: Writing is disabled by 'write' option"
msgstr "E142: ƒtƒ@ƒCƒ‹‚Í•Û‘¶‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½: 'write' ƒIƒvƒVƒ‡ƒ“‚É‚æ‚è–³Œø‚Å‚·"
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
#, c-format
msgid ""
"'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
"\"%.*s\" ‚É‚Í 'readonly' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚·\n"
"‹­§“I‚Éã‘‚«‚µ‚Ü‚·‚©?"
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
msgid "Edit File"
msgstr "ƒtƒ@ƒCƒ‹‚ð•ÒW"
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
#, c-format
msgid "E143: Autocommands unexpectedly deleted new buffer %s"
msgstr "E143: autocommand‚ª—\\Šú‚¹‚¸V‚µ‚¢ƒoƒbƒtƒ@ %s ‚ð휂µ‚Ü‚µ‚½"
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
msgid "E144: non-numeric argument to :z"
msgstr "E144: ”‚Å‚Í‚È‚¢ˆø”‚ª :z ‚É“n‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
msgid "E145: Shell commands not allowed in rvim"
msgstr "E145: rvim‚ł̓VƒFƒ‹ƒRƒ}ƒ“ƒh‚ðŽg‚¦‚Ü‚¹‚ñ"
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
msgid "E146: Regular expressions can't be delimited by letters"
msgstr "E146: ³‹K•\\Œ»‚Í•¶Žš‚Å‹æ؂邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
#, c-format
msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
msgstr "%s ‚É’uŠ·‚µ‚Ü‚·‚©? (y/n/a/q/l/^E/^Y)"
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
msgid "(Interrupted) "
msgstr "(Š„ž‚Ü‚ê‚Ü‚µ‚½)"
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 ‰ÓŠŠY“–‚µ‚Ü‚µ‚½"
+
+#: ../ex_cmds.c:4547
msgid "1 substitution"
msgstr "1 ‰ÓŠ’uŠ·‚µ‚Ü‚µ‚½"
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ‰ÓŠŠY“–‚µ‚Ü‚µ‚½"
+
+#: ../ex_cmds.c:4550
#, c-format
msgid "%ld substitutions"
msgstr "%ld ‰ÓŠ’uŠ·‚µ‚Ü‚µ‚½"
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
msgid " on 1 line"
msgstr " (Œv 1 s“à)"
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
#, c-format
msgid " on %ld lines"
msgstr " (Œv %ld s“à)"
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
msgid "E147: Cannot do :global recursive"
msgstr "E147: :global ‚ðÄ‹A“I‚É‚ÍŽg‚¦‚Ü‚¹‚ñ"
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
msgid "E148: Regular expression missing from global"
msgstr "E148: globalƒRƒ}ƒ“ƒh‚ɳ‹K•\\Œ»‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
#, c-format
msgid "Pattern found in every line: %s"
msgstr "ƒpƒ^[ƒ“‚ª‘S‚Ä‚Ìs‚ł݂‚©‚è‚Ü‚µ‚½: %s"
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
"# ÅŒã‚É’uŠ·‚³‚ꂽ•¶Žš—ñ:\n"
"$"
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
msgid "E478: Don't panic!"
msgstr "E478: Q‚Ä‚È‚¢‚Å‚­‚¾‚³‚¢"
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
#, c-format
msgid "E661: Sorry, no '%s' help for %s"
msgstr "E661: Žc”O‚Å‚·‚ª '%s' ‚̃wƒ‹ƒv‚ª %s ‚É‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
#, c-format
msgid "E149: Sorry, no help for %s"
msgstr "E149: Žc”O‚Å‚·‚ª %s ‚ɂ̓wƒ‹ƒv‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
#, c-format
msgid "Sorry, help file \"%s\" not found"
msgstr "Žc”O‚Å‚·‚ªƒwƒ‹ƒvƒtƒ@ƒCƒ‹ \"%s\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
#, c-format
msgid "E150: Not a directory: %s"
msgstr "E150: ƒfƒBƒŒƒNƒgƒŠ‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
#, c-format
msgid "E152: Cannot open %s for writing"
msgstr "E152: ‘ž‚Ý—p‚É %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
#, c-format
msgid "E153: Unable to open %s for reading"
msgstr "E153: “Çž—p‚É %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
# Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
#, c-format
msgid "E670: Mix of help file encodings within a language: %s"
msgstr "E670: 1‚‚̌¾Œê‚̃wƒ‹ƒvƒtƒ@ƒCƒ‹‚É•¡”‚̃Gƒ“ƒR[ƒh‚ª¬Ý‚µ‚Ä‚¢‚Ü‚·: %s"
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ƒ^ƒO \"%s\" ‚ªƒtƒ@ƒCƒ‹ %s ‚Éd•¡‚µ‚Ä‚¢‚Ü‚·"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: ƒ^ƒO \"%s\" ‚ªƒtƒ@ƒCƒ‹ %s/%s ‚Éd•¡‚µ‚Ä‚¢‚Ü‚·"
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
#, c-format
msgid "E160: Unknown sign command: %s"
msgstr "E160: –¢’m‚ÌsignƒRƒ}ƒ“ƒh‚Å‚·: %s"
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
msgid "E156: Missing sign name"
msgstr "E156: sign–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
msgid "E612: Too many signs defined"
msgstr "E612: sign‚Ì’è‹`‚ª‘½”Œ©‚‚©‚è‚Ü‚µ‚½"
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
#, c-format
msgid "E239: Invalid sign text: %s"
msgstr "E239: –³Œø‚Èsign‚̃eƒLƒXƒg‚Å‚·: %s"
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
#, c-format
msgid "E155: Unknown sign: %s"
msgstr "E155: –¢’m‚Ìsign‚Å‚·: %s"
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
msgid "E159: Missing sign number"
msgstr "E159: sign‚̔Ԇ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
#, c-format
msgid "E158: Invalid buffer name: %s"
msgstr "E158: –³Œø‚ȃoƒbƒtƒ@–¼‚Å‚·: %s"
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
#, c-format
msgid "E157: Invalid sign ID: %ld"
msgstr "E157: –³Œø‚ÈsignŽ¯•ÊŽq‚Å‚·: %ld"
# Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
msgid " (NOT FOUND)"
msgstr " (‚݂‚©‚è‚Ü‚¹‚ñ)"
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
msgid " (not supported)"
msgstr " (”ñƒTƒ|[ƒg)"
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
msgid "[Deleted]"
msgstr "[íœÏ]"
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
msgid "Entering Debug mode. Type \"cont\" to continue."
msgstr "ƒfƒoƒbƒOƒ‚[ƒh‚É“ü‚è‚Ü‚·. ‘±‚¯‚é‚É‚Í \"cont\" ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢."
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
#, c-format
msgid "line %ld: %s"
msgstr "s %ld: %s"
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
#, c-format
msgid "cmd: %s"
msgstr "ƒRƒ}ƒ“ƒh: %s"
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
#, c-format
msgid "Breakpoint in \"%s%s\" line %ld"
msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg \"%s%s\" s %ld"
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
#, c-format
msgid "E161: Breakpoint not found: %s"
msgstr "E161: ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
msgid "No breakpoints defined"
msgstr "ƒuƒŒ[ƒNƒ|ƒCƒ“ƒg‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
#, c-format
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s s %ld"
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ‰‚ß‚É :profile start <fname> ‚ðŽÀs‚µ‚Ä‚­‚¾‚³‚¢"
+
+#: ../ex_cmds2.c:1305
#, c-format
msgid "Save changes to \"%.*s\"?"
msgstr "•ÏX‚ð \"%.*s\" ‚É•Û‘¶‚µ‚Ü‚·‚©?"
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
msgid "Untitled"
msgstr "–³‘è"
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
#, c-format
msgid "E162: No write since last change for buffer \"%s\""
msgstr "E162: ƒoƒbƒtƒ@ \"%s\" ‚Ì•ÏX‚Í•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
msgstr "Œx: —\\Šú‚¹‚¸‘¼ƒoƒbƒtƒ@‚ÖˆÚ“®‚µ‚Ü‚µ‚½ (autocommands ‚𒲂ׂĂ­‚¾‚³‚¢)"
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
msgid "E163: There is only one file to edit"
msgstr "E163: •ÒW‚·‚éƒtƒ@ƒCƒ‹‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
msgid "E164: Cannot go before first file"
msgstr "E164: ʼn‚̃tƒ@ƒCƒ‹‚æ‚è‘O‚É‚Ís‚¯‚Ü‚¹‚ñ"
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
msgid "E165: Cannot go beyond last file"
msgstr "E165: ÅŒã‚̃tƒ@ƒCƒ‹‚ð‰z‚¦‚ÄŒã‚É‚Ís‚¯‚Ü‚¹‚ñ"
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
#, c-format
msgid "E666: compiler not supported: %s"
msgstr "E666: ‚»‚̃Rƒ“ƒpƒCƒ‰‚ɂ͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ: %s"
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
#, c-format
msgid "Searching for \"%s\" in \"%s\""
msgstr "\"%s\" ‚ð \"%s\" ‚©‚猟õ’†"
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
#, c-format
msgid "Searching for \"%s\""
msgstr "\"%s\" ‚ðŒŸõ’†"
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
#, c-format
msgid "not found in 'runtimepath': \"%s\""
msgstr "'runtimepath' ‚Ì’†‚ɂ݂͂‚©‚è‚Ü‚¹‚ñ: \"%s\""
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
msgid "Source Vim script"
msgstr "VimƒXƒNƒŠƒvƒg‚ÌŽæž‚Ý"
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
#, c-format
msgid "Cannot source a directory: \"%s\""
msgstr "ƒfƒBƒŒƒNƒgƒŠ‚ÍŽæž‚ß‚Ü‚¹‚ñ: \"%s\""
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
#, c-format
msgid "could not source \"%s\""
msgstr "\"%s\" ‚ðŽæž‚ß‚Ü‚¹‚ñ"
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
#, c-format
msgid "line %ld: could not source \"%s\""
msgstr "s %ld: \"%s\" ‚ðŽæž‚ß‚Ü‚¹‚ñ"
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
#, c-format
msgid "sourcing \"%s\""
msgstr "\"%s\" ‚ðŽæž’†"
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
#, c-format
msgid "line %ld: sourcing \"%s\""
msgstr "s %ld: %s ‚ðŽæž’†"
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
#, c-format
msgid "finished sourcing %s"
msgstr "%s ‚ÌŽæž‚ðŠ®—¹"
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
msgid "W15: Warning: Wrong line separator, ^M may be missing"
msgstr "W15: Œx: s‹æØ‚ª•s³‚Å‚·. ^M ‚ª‚È‚¢‚Ì‚Å‚µ‚傤"
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
msgid "E167: :scriptencoding used outside of a sourced file"
msgstr "E167: :scriptencoding ‚ªŽæžƒXƒNƒŠƒvƒgˆÈŠO‚ÅŽg—p‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
msgid "E168: :finish used outside of a sourced file"
msgstr "E168: :finish ‚ªŽæžƒXƒNƒŠƒvƒgˆÈŠO‚ÅŽg—p‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
#, c-format
msgid "Page %d"
msgstr "%d ƒy[ƒW"
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
msgid "No text to be printed"
msgstr "ˆóü‚·‚éƒeƒLƒXƒg‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
msgid "Printing page %d (%d%%)"
msgstr "ˆóü’†: ƒy[ƒW %d (%d%%)"
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
#, c-format
msgid " Copy %d of %d"
msgstr " ƒRƒs[ %d (‘S %d ’†)"
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
#, c-format
msgid "Printed: %s"
msgstr "ˆóü‚µ‚Ü‚µ‚½: %s"
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
msgid "Printing aborted"
msgstr "ˆóü‚ª’†Ž~‚³‚ê‚Ü‚µ‚½"
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
msgid "E455: Error writing to PostScript output file"
msgstr "E455: PostScripto—̓tƒ@ƒCƒ‹‚Ì‘ž‚݃Gƒ‰[‚Å‚·"
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
#, c-format
msgid "E624: Can't open file \"%s\""
msgstr "E624: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
#, c-format
msgid "E457: Can't read PostScript resource file \"%s\""
msgstr "E457: PostScript‚̃Šƒ\\[ƒXƒtƒ@ƒCƒ‹ \"%s\" ‚ð“Çž‚ß‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
#, c-format
msgid "E618: file \"%s\" is not a PostScript resource file"
msgstr "E618: ƒtƒ@ƒCƒ‹ \"%s\" ‚Í PostScript ƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
#, c-format
msgid "E619: file \"%s\" is not a supported PostScript resource file"
msgstr "E619: ƒtƒ@ƒCƒ‹ \"%s\" ‚͑Ήž‚µ‚Ä‚¢‚È‚¢ PostScript ƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹‚Å‚·"
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
#, c-format
msgid "E621: \"%s\" resource file has wrong version"
msgstr "E621: ƒŠƒ\\[ƒXƒtƒ@ƒCƒ‹ \"%s\" ‚̓o[ƒWƒ‡ƒ“‚ªˆÙ‚È‚è‚Ü‚·"
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: ŒÝŠ·«‚Ì–³‚¢ƒ}ƒ‹ƒ`ƒoƒCƒgƒGƒ“ƒR[ƒfƒBƒ“ƒO‚Æ•¶ŽšƒZƒbƒg‚Å‚·"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: ƒ}ƒ‹ƒ`ƒoƒCƒgƒGƒ“ƒR[ƒfƒBƒ“ƒO‚Å‚Í printmbcharset ‚ð‹ó‚É‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: ƒ}ƒ‹ƒ`ƒoƒCƒg•¶Žš‚ðˆóü‚·‚邽‚߂̃fƒtƒHƒ‹ƒgƒtƒHƒ“ƒg‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#: ../ex_cmds2.c:6175
msgid "E324: Can't open PostScript output file"
msgstr "E324: PostScripto—Í—p‚̃tƒ@ƒCƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
#, c-format
msgid "E456: Can't open file \"%s\""
msgstr "E456: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
msgid "E456: Can't find PostScript resource file \"prolog.ps\""
msgstr "E456: PostScript‚̃Šƒ\\[ƒXƒtƒ@ƒCƒ‹ \"prolog.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScript‚̃Šƒ\\[ƒXƒtƒ@ƒCƒ‹ \"cidfont.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
#, c-format
msgid "E456: Can't find PostScript resource file \"%s.ps\""
msgstr "E456: PostScript‚̃Šƒ\\[ƒXƒtƒ@ƒCƒ‹ \"%s.ps\" ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
#, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: ƒ}ƒ‹ƒ`ƒoƒCƒg•¶Žš‚ðƒGƒ“ƒR[ƒh \"%s\" ‚Ö•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: ˆóüƒGƒ“ƒR[ƒh \"%s\" ‚Ö•ÏŠ·‚Å‚«‚Ü‚¹‚ñ"
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
msgid "Sending to printer..."
msgstr "ƒvƒŠƒ“ƒ^‚É‘—M’†..."
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
msgid "E365: Failed to print PostScript file"
msgstr "E365: PostScriptƒtƒ@ƒCƒ‹‚̈óü‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
msgid "Print job sent."
msgstr "ˆóüƒWƒ‡ƒu‚ð‘—M‚µ‚Ü‚µ‚½."
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
#, c-format
msgid "Current %slanguage: \"%s\""
msgstr "Œ»Ý‚Ì %sŒ¾Œê: \"%s\""
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
#, c-format
msgid "E197: Cannot set language to \"%s\""
msgstr "E197: Œ¾Œê‚ð \"%s\" ‚ÉÝ’è‚Å‚«‚Ü‚¹‚ñ"
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "Exƒ‚[ƒh‚É“ü‚è‚Ü‚·. ƒm[ƒ}ƒ‹‚É–ß‚é‚É‚Í\"visual\"‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢."
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
msgid "E501: At end-of-file"
msgstr "E501: ƒtƒ@ƒCƒ‹‚ÌI—¹ˆÊ’u"
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
msgid "E169: Command too recursive"
msgstr "E169: ƒRƒ}ƒ“ƒh‚ªÄ‹A“I‰ß‚¬‚Ü‚·"
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
#, c-format
msgid "E605: Exception not caught: %s"
msgstr "E605: —áŠO‚ª•ß‘¨‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
msgid "End of sourced file"
msgstr "Žæžƒtƒ@ƒCƒ‹‚ÌÅŒã‚Å‚·"
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
msgid "End of function"
msgstr "ŠÖ”‚ÌÅŒã‚Å‚·"
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
msgid "E464: Ambiguous use of user-defined command"
msgstr "E464: ƒ†[ƒU’è‹`ƒRƒ}ƒ“ƒh‚Ì‚ ‚¢‚Ü‚¢‚ÈŽg—p‚Å‚·"
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
msgid "E492: Not an editor command"
msgstr "E492: ƒGƒfƒBƒ^‚̃Rƒ}ƒ“ƒh‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
msgid "E493: Backwards range given"
msgstr "E493: ‹t‚³‚܂͈̔͂ªŽw’肳‚ê‚Ü‚µ‚½"
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
msgid "Backwards range given, OK to swap"
msgstr "‹t‚³‚܂͈̔͂ªŽw’肳‚ê‚Ü‚µ‚½, “ü‘Ö‚¦‚Ü‚·‚©?"
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
msgid "E494: Use w or w>>"
msgstr "E494: w ‚à‚µ‚­‚Í w>> ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢"
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
msgid "E319: Sorry, the command is not available in this version"
msgstr "E319: ‚±‚̃o[ƒWƒ‡ƒ“‚Å‚Í‚±‚̃Rƒ}ƒ“ƒh‚Í—˜—p‚Å‚«‚Ü‚¹‚ñ, ‚²‚ß‚ñ‚È‚³‚¢"
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
msgid "E172: Only one file name allowed"
msgstr "E172: ƒtƒ@ƒCƒ‹–¼‚Í 1 ‚‚ɂµ‚Ä‚­‚¾‚³‚¢"
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
msgid "1 more file to edit. Quit anyway?"
msgstr "•ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª 1 ŒÂ‚ ‚è‚Ü‚·‚ª, I—¹‚µ‚Ü‚·‚©?"
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
#, c-format
msgid "%d more files to edit. Quit anyway?"
msgstr "•ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %d ŒÂ‚ ‚è‚Ü‚·‚ª, I—¹‚µ‚Ü‚·‚©?"
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
msgid "E173: 1 more file to edit"
msgstr "E173: •ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª 1 ŒÂ‚ ‚è‚Ü‚·"
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: •ÒW‚·‚ׂ«ƒtƒ@ƒCƒ‹‚ª‚ ‚Æ %ld ŒÂ‚ ‚è‚Ü‚·"
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: ƒRƒ}ƒ“ƒh‚ªŠù‚É‚ ‚è‚Ü‚·: Ä’è‹`‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢"
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
msgid ""
"\n"
" Name Args Range Complete Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
"\n"
" –¼‘O ˆø” ”ÍˆÍ •âŠ® ’è‹`"
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
msgid "No user-defined commands found"
msgstr "ƒ†[ƒU’è‹`ƒRƒ}ƒ“ƒh‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
msgid "E175: No attribute specified"
msgstr "E175: ‘®«‚Í’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
msgid "E176: Invalid number of arguments"
msgstr "E176: ˆø”‚Ì”‚ª–³Œø‚Å‚·"
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
msgid "E177: Count cannot be specified twice"
msgstr "E177: ƒJƒEƒ“ƒg‚ð2dŽw’è‚·‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
msgid "E178: Invalid default value for count"
msgstr "E178: ƒJƒEƒ“ƒg‚ÌÈ—ª’l‚ª–³Œø‚Å‚·"
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
msgid "E179: argument required for complete"
msgstr "E179: •âŠ®‚Ì‚½‚߂̈ø”‚ª•K—v‚Å‚·"
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
#, c-format
msgid "E180: Invalid complete value: %s"
msgstr "E180: –³Œø‚ȕ⊮Žw’è‚Å‚·: %s"
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
msgid "E468: Completion argument only allowed for custom completion"
msgstr "E468: •âŠ®ˆø”‚̓JƒXƒ^ƒ€•âŠ®‚Å‚µ‚©Žg—p‚Å‚«‚Ü‚¹‚ñ"
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
msgid "E467: Custom completion requires a function argument"
msgstr "E467: ƒJƒXƒ^ƒ€•âŠ®‚ɂ͈ø”‚Æ‚µ‚ÄŠÖ”‚ª•K—v‚Å‚·"
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
#, c-format
msgid "E181: Invalid attribute: %s"
msgstr "E181: –³Œø‚È‘®«‚Å‚·: %s"
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
msgid "E182: Invalid command name"
msgstr "E182: –³Œø‚ȃRƒ}ƒ“ƒh–¼‚Å‚·"
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: ƒ†[ƒU’è‹`ƒRƒ}ƒ“ƒh‚͉p‘啶Žš‚ÅŽn‚Ü‚ç‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
#, c-format
msgid "E184: No such user-defined command: %s"
msgstr "E184: ‚»‚̃†[ƒU’è‹`ƒRƒ}ƒ“ƒh‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: ƒJƒ‰[ƒXƒL[ƒ€ %s ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
msgid "Greetings, Vim user!"
msgstr "Vim Žg‚¢‚³‚ñA‚â‚ !"
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
msgid "Edit File in new window"
msgstr "V‚µ‚¢ƒEƒBƒ“ƒhƒE‚Ńtƒ@ƒCƒ‹‚ð•ÒW‚µ‚Ü‚·"
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
msgid "No swap file"
msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
msgid "Append File"
msgstr "’ljÁƒtƒ@ƒCƒ‹"
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: ƒoƒbƒtƒ@‚ªC³‚³‚ê‚Ä‚¢‚é‚Ì‚Å, ƒfƒBƒŒƒNƒgƒŠ‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ (! "
+"‚ð’ljÁ‚Åã‘)"
+
+#: ../ex_docmd.c:7248
msgid "E186: No previous directory"
msgstr "E186: ‘O‚̃fƒBƒŒƒNƒgƒŠ‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
msgid "E187: Unknown"
msgstr "E187: –¢’m"
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
msgid "E465: :winsize requires two number arguments"
msgstr "E465: "
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
#, c-format
msgid "Window position: X %d, Y %d"
msgstr "ƒEƒBƒ“ƒhƒEˆÊ’u: X %d, Y %d"
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
msgid "E188: Obtaining window position not implemented for this platform"
msgstr ""
"E188: ‚±‚̃vƒ‰ƒbƒgƒz[ƒ€‚ɂ̓EƒBƒ“ƒhƒEˆÊ’u‚̎擾‹@”\\‚ÍŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
msgid "E466: :winpos requires two number arguments"
msgstr "E466: :winpos ‚É‚Í2‚‚̔’l‚̈ø”‚ª•K—v‚Å‚·"
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
msgid "Save Redirection"
msgstr "ƒŠƒ_ƒCƒŒƒNƒg‚ð•Û‘¶‚µ‚Ü‚·"
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
msgid "Save View"
msgstr "ƒrƒ…[‚ð•Û‘¶‚µ‚Ü‚·"
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
msgid "Save Session"
msgstr "ƒZƒbƒVƒ‡ƒ“î•ñ‚ð•Û‘¶‚µ‚Ü‚·"
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
msgid "Save Setup"
msgstr "Ý’è‚ð•Û‘¶‚µ‚Ü‚·"
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: ƒfƒBƒŒƒNƒgƒŠ‚ð쬂ł«‚Ü‚¹‚ñ: %s"
+
+#: ../ex_docmd.c:8185
#, c-format
msgid "E189: \"%s\" exists (add ! to override)"
msgstr "E189: \"%s\" ‚ª‘¶Ý‚µ‚Ü‚· (ã‘‚·‚é‚É‚Í ! ‚ð’ljÁ‚µ‚Ä‚­‚¾‚³‚¢)"
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
#, c-format
msgid "E190: Cannot open \"%s\" for writing"
msgstr "E190: \"%s\" ‚ð‘ž‚Ý—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñ"
#. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
msgid "E191: Argument must be a letter or forward/backward quote"
msgstr "E191: ˆø”‚Í•¶Žš‚©‘Oi/Œã‘ÞƒNƒH[ƒg‚Å‚µ‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal ‚ÌÄ‹A—˜—p‚ª[‚­‚È‚è‚·‚¬‚Ü‚µ‚½"
+msgstr "E192: :normal ‚ÌÄ‹A—˜—p‚ª[‚­‚È‚è‰ß‚¬‚Ü‚µ‚½"
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
msgid "E194: No alternate file name to substitute for '#'"
msgstr "E194: '#'‚ð’u‚«Š·‚¦‚é•›ƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
msgid "E495: no autocommand file name to substitute for \"<afile>\""
msgstr "E495: \"<afile>\"‚ð’u‚«Š·‚¦‚éautocommand‚̃tƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
msgstr "E496: \"<abuf>\"‚ð’u‚«Š·‚¦‚éautocommandƒoƒbƒtƒ@”Ô†‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
msgid "E497: no autocommand match name to substitute for \"<amatch>\""
msgstr "E497: \"<amatch>\"‚ð’u‚«Š·‚¦‚éautocommand‚ÌŠY“––¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
msgid "E498: no :source file name to substitute for \"<sfile>\""
msgstr "E498: \"<sfile>\"‚ð’u‚«Š·‚¦‚é :source ‘ÎÛƒtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
#, no-c-format
msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
msgstr ""
"E499: '%' ‚â '#' ‚ª–³–¼ƒtƒ@ƒCƒ‹‚È‚Ì‚Å \":p:h\" ‚𔺂í‚È‚¢Žg‚¢•û‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
msgid "E500: Evaluates to an empty string"
msgstr "E500: ‹ó•¶Žš—ñ‚Æ‚µ‚Ä•]‰¿‚³‚ê‚Ü‚µ‚½"
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
msgid "E195: Cannot open viminfo file for reading"
msgstr "E195: viminfoƒtƒ@ƒCƒ‹‚ð“Çž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñ"
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
msgid "E196: No digraphs in this version"
msgstr "E196: ‚±‚̃o[ƒWƒ‡ƒ“‚ɇŽš‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: ex_eval.c:440
+#: ../ex_eval.c:439
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: 'Vim' ‚ÅŽn‚Ü‚é—áŠO‚Í :throw ‚Å‚«‚Ü‚¹‚ñ"
#. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
#, c-format
msgid "Exception thrown: %s"
msgstr "—áŠO‚ª”­¶‚µ‚Ü‚µ‚½: %s"
-#: ex_eval.c:576
+#: ../ex_eval.c:575
#, c-format
msgid "Exception finished: %s"
msgstr "—áŠO‚ªŽû‘©‚µ‚Ü‚µ‚½: %s"
-#: ex_eval.c:577
+#: ../ex_eval.c:576
#, c-format
msgid "Exception discarded: %s"
msgstr "—áŠO‚ª”jŠü‚³‚ê‚Ü‚µ‚½: %s"
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
#, c-format
msgid "%s, line %ld"
msgstr "%s, s %ld"
#. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
#, c-format
msgid "Exception caught: %s"
msgstr "—áŠO‚ª•ß‘¨‚³‚ê‚Ü‚µ‚½: %s"
-#: ex_eval.c:713
+#: ../ex_eval.c:712
#, c-format
msgid "%s made pending"
msgstr "%s ‚É‚æ‚è–¢Œˆ’èó‘Ô‚ª¶‚¶‚Ü‚µ‚½"
-#: ex_eval.c:716
+#: ../ex_eval.c:715
#, c-format
msgid "%s resumed"
msgstr "%s ‚ªÄŠJ‚µ‚Ü‚µ‚½"
-#: ex_eval.c:720
+#: ../ex_eval.c:719
#, c-format
msgid "%s discarded"
msgstr "%s ‚ª”jŠü‚³‚ê‚Ü‚µ‚½"
-#: ex_eval.c:746
+#: ../ex_eval.c:745
msgid "Exception"
msgstr "—áŠO"
-#: ex_eval.c:752
+#: ../ex_eval.c:751
msgid "Error and interrupt"
msgstr "ƒGƒ‰[‚ÆŠ„ž‚Ý"
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
msgid "Error"
msgstr "ƒGƒ‰["
#. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
msgid "Interrupt"
msgstr "Š„ž‚Ý"
-#: ex_eval.c:830
+#: ../ex_eval.c:829
msgid "E579: :if nesting too deep"
msgstr "E579: :if ‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-#: ex_eval.c:867
+#: ../ex_eval.c:866
msgid "E580: :endif without :if"
msgstr "E580: :if ‚Ì‚È‚¢ :endif ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:911
+#: ../ex_eval.c:911
msgid "E581: :else without :if"
msgstr "E581: :if ‚Ì‚È‚¢ :else ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:914
+#: ../ex_eval.c:914
msgid "E582: :elseif without :if"
msgstr "E582: :if ‚Ì‚È‚¢ :elseif ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:921
+#: ../ex_eval.c:921
msgid "E583: multiple :else"
msgstr "E583: •¡”‚Ì :else ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:924
+#: ../ex_eval.c:924
msgid "E584: :elseif after :else"
msgstr "E584: :else ‚ÌŒã‚É :elseif ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while ‚Ì“ü‚êŽq‚ª[‚­‰ß‚¬‚Ü‚·"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while ‚â :for ‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while ‚â :for ‚Ì‚È‚¢ :continue ‚ª‚ ‚è‚Ü‚·"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while ‚â :for ‚Ì‚È‚¢ :break ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while ‚Ì‚È‚¢ :continue ‚ª‚ ‚è‚Ü‚·"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor ‚ð :while ‚Æ‘g‚݇‚킹‚Ä‚¢‚Ü‚·"
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while ‚Ì‚È‚¢ :break ‚ª‚ ‚è‚Ü‚·"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile ‚ð :for ‚Æ‘g‚݇‚킹‚Ä‚¢‚Ü‚·"
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
msgid "E601: :try nesting too deep"
msgstr "E601: :try ‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
msgid "E603: :catch without :try"
msgstr "E603: :try ‚Ì‚È‚¢ :catch ‚ª‚ ‚è‚Ü‚·"
#. Give up for a ":catch" after ":finally" and ignore it.
#. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
msgid "E604: :catch after :finally"
msgstr "E604: :finally ‚ÌŒã‚É :catch ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
msgid "E606: :finally without :try"
msgstr "E606: :try ‚Ì‚È‚¢ :finally ‚ª‚ ‚è‚Ü‚·"
#. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
msgid "E607: multiple :finally"
msgstr "E607: •¡”‚Ì :finalyy ‚ª‚ ‚è‚Ü‚·"
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
msgid "E602: :endtry without :try"
msgstr "E602: :try ‚Ì‚È‚¢ :endtry ‚Å‚·"
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
msgid "E193: :endfunction not inside a function"
msgstr "E193: ŠÖ”‚ÌŠO‚É :endfunction ‚ª‚ ‚è‚Ü‚µ‚½"
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
msgid "tagname"
msgstr "ƒ^ƒO–¼"
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
msgid " kind file\n"
msgstr " ƒtƒ@ƒCƒ‹Ží—Þ\n"
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
msgid "'history' option is zero"
msgstr "ƒIƒvƒVƒ‡ƒ“ 'history' ‚ªƒ[ƒ‚Å‚·"
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
#, c-format
msgid ""
"\n"
@@ -1563,259 +1839,263 @@ msgstr ""
"\n"
"# %s €–Ú‚Ì—š—ð (V‚µ‚¢‚à‚Ì‚©‚çŒÃ‚¢‚à‚Ì‚Ö):\n"
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
msgid "Command Line"
msgstr "ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“"
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
msgid "Search String"
msgstr "ŒŸõ•¶Žš—ñ"
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
msgid "Expression"
msgstr "Ž®"
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
msgid "Input Line"
msgstr "“ü—Ís"
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar ‚ªƒRƒ}ƒ“ƒh’·‚ð’´‚¦‚Ü‚µ‚½"
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
msgid "E199: Active window or buffer deleted"
msgstr "E199: ƒAƒNƒeƒBƒu‚ȃEƒBƒ“ƒhƒE‚©ƒoƒbƒtƒ@‚ªíœ‚³‚ê‚Ü‚µ‚½"
-#: fileio.c:371
+#: ../fileio.c:374
msgid "Illegal file name"
msgstr "•s³‚ȃtƒ@ƒCƒ‹–¼"
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
msgid "is a directory"
msgstr " ‚̓fƒBƒŒƒNƒgƒŠ‚Å‚·"
-#: fileio.c:397
+#: ../fileio.c:401
msgid "is not a file"
msgstr " ‚̓tƒ@ƒCƒ‹‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
msgid "[New File]"
msgstr "[Vƒtƒ@ƒCƒ‹]"
-#: fileio.c:584
+#: ../fileio.c:594
msgid "[Permission Denied]"
msgstr "[”F‰Â‚ª‚ ‚è‚Ü‚¹‚ñ]"
-#: fileio.c:688
+#: ../fileio.c:705
msgid "E200: *ReadPre autocommands made the file unreadable"
msgstr "E200: *ReadPre autocommand ‚ªƒtƒ@ƒCƒ‹‚ð“Çž•s‰Â‚É‚µ‚Ü‚µ‚½"
-#: fileio.c:690
+#: ../fileio.c:707
msgid "E201: *ReadPre autocommands must not change current buffer"
msgstr "E201: *ReadPre autocommand ‚ÍŒ»Ý‚̃oƒbƒtƒ@‚ð•Ï‚¦‚ç‚ê‚Ü‚¹‚ñ"
-#: fileio.c:711
+#: ../fileio.c:728
msgid "Vim: Reading from stdin...\n"
msgstr "Vim: •W€“ü—Í‚©‚ç“Çž’†...\n"
-#: fileio.c:717
+#: ../fileio.c:734
msgid "Reading from stdin..."
msgstr "•W€“ü—Í‚©‚ç“Çž‚Ý’†..."
#. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
msgid "E202: Conversion made file unreadable!"
msgstr "E202: •ÏŠ·‚ªƒtƒ@ƒCƒ‹‚ð“Çž•s‰Â‚É‚µ‚Ü‚µ‚½"
-#: fileio.c:2027
+#: ../fileio.c:2084
msgid "[fifo/socket]"
msgstr "[FIFO/ƒ\\ƒPƒbƒg]"
-#: fileio.c:2034
+#: ../fileio.c:2091
msgid "[fifo]"
msgstr "[FIFO]"
-#: fileio.c:2041
+#: ../fileio.c:2098
msgid "[socket]"
msgstr "[ƒ\\ƒPƒbƒg]"
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
msgid "[RO]"
msgstr "[“Çê]"
-#: fileio.c:2059
+#: ../fileio.c:2116
msgid "[CR missing]"
msgstr "[CR–³]"
-#: fileio.c:2064
+#: ../fileio.c:2121
msgid "[NL found]"
msgstr "[NL—L]"
-#: fileio.c:2069
+#: ../fileio.c:2126
msgid "[long lines split]"
msgstr "[’·s•ªŠ„]"
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
msgid "[NOT converted]"
msgstr "[–¢•ÏŠ·]"
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
msgid "[converted]"
msgstr "[•ÏŠ·Ï]"
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
msgid "[crypted]"
msgstr "[ˆÃ†‰»]"
-#: fileio.c:2094
+#: ../fileio.c:2151
msgid "[CONVERSION ERROR]"
msgstr "[•ÏŠ·ƒGƒ‰[]"
-#: fileio.c:2100
+#: ../fileio.c:2157
#, c-format
msgid "[ILLEGAL BYTE in line %ld]"
msgstr "[%ld s–Ú‚Ì•s³‚ȃoƒCƒg]"
-#: fileio.c:2107
+#: ../fileio.c:2164
msgid "[READ ERRORS]"
msgstr "[“ÇžƒGƒ‰[]"
-#: fileio.c:2323
+#: ../fileio.c:2380
msgid "Can't find temp file for conversion"
msgstr "•ÏŠ·‚É•K—v‚Ȉꎞƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: fileio.c:2330
+#: ../fileio.c:2387
msgid "Conversion with 'charconvert' failed"
msgstr "'charconvert' ‚É‚æ‚é•ÏŠ·‚ªŽ¸”s‚µ‚Ü‚µ‚½"
-#: fileio.c:2333
+#: ../fileio.c:2390
msgid "can't read output of 'charconvert'"
msgstr "'charconvert' ‚Ìo—Í‚ð“Çž‚ß‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwriteƒoƒbƒtƒ@‚ÌŠY“–‚·‚éautocommand‚Í‘¶Ý‚µ‚Ü‚¹‚ñ"
+
+#: ../fileio.c:2821
msgid "E203: Autocommands deleted or unloaded buffer to be written"
msgstr "E203: •Û‘¶‚·‚éƒoƒbƒtƒ@‚ðautocommand‚ªíœ‚©‰ð•ú‚µ‚Ü‚µ‚½"
-#: fileio.c:2756
+#: ../fileio.c:2844
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: autocommand‚ª—\\Šú‚¹‚Ê•û–@‚Ås”‚ð•ÏX‚µ‚Ü‚µ‚½"
# Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
msgid "NetBeans dissallows writes of unmodified buffers"
msgstr "NetBeans‚Í–¢•ÏX‚̃oƒbƒtƒ@‚ðã‘‚·‚邱‚Æ‚Í‹–‰Â‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: fileio.c:2802
+#: ../fileio.c:2892
msgid "Partial writes disallowed for NetBeans buffers"
msgstr "NetBeansƒoƒbƒtƒ@‚̈ꕔ‚ð‘‚«o‚·‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
msgid "is not a file or writable device"
msgstr "‚̓tƒ@ƒCƒ‹‚Å‚à‘ž‚݉”\\ƒfƒoƒCƒX‚Å‚à‚ ‚è‚Ü‚¹‚ñ"
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
msgid "is read-only (add ! to override)"
msgstr "‚Í“Çžê—p‚Å‚· (‹­§‘ž‚É‚Í ! ‚ð’ljÁ)"
-#: fileio.c:3272
+#: ../fileio.c:3362
msgid "E506: Can't write to backup file (add ! to override)"
msgstr "E506: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§•Û‘¶)"
-#: fileio.c:3284
+#: ../fileio.c:3374
msgid "E507: Close error for backup file (add ! to override)"
msgstr ""
"E507: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ð•Â‚¶‚éۂɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½ (! ‚ð’ljÁ‚Å‹­§)"
-#: fileio.c:3286
+#: ../fileio.c:3376
msgid "E508: Can't read file for backup (add ! to override)"
msgstr "E508: ƒoƒbƒNƒAƒbƒv—pƒtƒ@ƒCƒ‹‚ð“Çž‚ß‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§“Çž)"
-#: fileio.c:3302
+#: ../fileio.c:3392
msgid "E509: Cannot create backup file (add ! to override)"
msgstr "E509: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§ì¬)"
-#: fileio.c:3405
+#: ../fileio.c:3495
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðì‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§ì¬)"
-#: fileio.c:3467
+#: ../fileio.c:3557
msgid "E460: The resource fork would be lost (add ! to override)"
msgstr "E460: ƒŠƒ\\[ƒXƒtƒH[ƒN‚ªŽ¸‚í‚ê‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å‹­§)"
-#: fileio.c:3566
+#: ../fileio.c:3667
msgid "E214: Can't find temp file for writing"
msgstr "E214: •Û‘¶—pˆêŽžƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: fileio.c:3584
+#: ../fileio.c:3685
msgid "E213: Cannot convert (add ! to write without conversion)"
msgstr "E213: •ÏŠ·‚Å‚«‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å•ÏŠ·‚¹‚¸‚É•Û‘¶)"
-#: fileio.c:3619
+#: ../fileio.c:3720
msgid "E166: Can't open linked file for writing"
msgstr "E166: ƒŠƒ“ƒN‚³‚ꂽƒtƒ@ƒCƒ‹‚É‘ž‚ß‚Ü‚¹‚ñ"
-#: fileio.c:3623
+#: ../fileio.c:3724
msgid "E212: Can't open file for writing"
msgstr "E212: ‘ž‚Ý—p‚Ƀtƒ@ƒCƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: fileio.c:3885
+#: ../fileio.c:4000
msgid "E667: Fsync failed"
msgstr "E667: fsync ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: fileio.c:3892
+#: ../fileio.c:4007
msgid "E512: Close failed"
msgstr "E512: •Â‚¶‚邱‚Æ‚ÉŽ¸”s"
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: ‘ž‚݃Gƒ‰[, •ÏŠ·Ž¸”s"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: ‘ž‚݃Gƒ‰[, •ÏŠ·Ž¸”s (ã‘‚·‚é‚É‚Í 'fenc' ‚ð‹ó‚É‚µ‚Ä‚­‚¾‚³‚¢)"
-#: fileio.c:3969
+#: ../fileio.c:4084
msgid "E514: write error (file system full?)"
msgstr "E514: ‘ž‚݃Gƒ‰[, (ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€‚ª–ž”t?)"
-#: fileio.c:4036
+#: ../fileio.c:4151
msgid " CONVERSION ERROR"
msgstr " •ÏŠ·ƒGƒ‰["
-#: fileio.c:4052
+#: ../fileio.c:4167
msgid "[Device]"
msgstr "[ƒfƒoƒCƒX]"
-#: fileio.c:4057
+#: ../fileio.c:4172
msgid "[New]"
msgstr "[V]"
-#: fileio.c:4079
+#: ../fileio.c:4194
msgid " [a]"
msgstr " [a]"
-#: fileio.c:4079
+#: ../fileio.c:4194
msgid " appended"
msgstr " ’ljÁ"
-#: fileio.c:4081
+#: ../fileio.c:4196
msgid " [w]"
msgstr " [w]"
-#: fileio.c:4081
+#: ../fileio.c:4196
msgid " written"
msgstr " ‘ž‚Ý"
-#: fileio.c:4131
+#: ../fileio.c:4249
msgid "E205: Patchmode: can't save original file"
msgstr "E205: patchmode: Œ´–{ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ"
-#: fileio.c:4153
+#: ../fileio.c:4271
msgid "E206: patchmode: can't touch empty original file"
msgstr "E206: patchmode: ‹ó‚ÌŒ´–{ƒtƒ@ƒCƒ‹‚ðtouch‚Å‚«‚Ü‚¹‚ñ"
-#: fileio.c:4168
+#: ../fileio.c:4286
msgid "E207: Can't delete backup file"
msgstr "E207: ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹‚ðÁ‚¹‚Ü‚¹‚ñ"
-#: fileio.c:4232
+#: ../fileio.c:4350
msgid ""
"\n"
"WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
"\n"
"Œx: Œ´–{ƒtƒ@ƒCƒ‹‚ªŽ¸‚í‚ꂽ‚©•ÏX‚³‚ê‚Ü‚µ‚½\n"
-#: fileio.c:4234
+#: ../fileio.c:4352
msgid "don't quit the editor until the file is successfully written!"
msgstr "ƒtƒ@ƒCƒ‹‚Ì•Û‘¶‚ɬŒ÷‚·‚é‚܂ŃGƒfƒBƒ^‚ðI—¹‚µ‚È‚¢‚Å‚­‚¾‚³‚¢!"
-#: fileio.c:4323
+#: ../fileio.c:4441
msgid "[dos]"
msgstr "[dos]"
-#: fileio.c:4323
+#: ../fileio.c:4441
msgid "[dos format]"
msgstr "[dosƒtƒH[ƒ}ƒbƒg]"
-#: fileio.c:4330
+#: ../fileio.c:4448
msgid "[mac]"
msgstr "[mac]"
-#: fileio.c:4330
+#: ../fileio.c:4448
msgid "[mac format]"
msgstr "[macƒtƒH[ƒ}ƒbƒg]"
-#: fileio.c:4337
+#: ../fileio.c:4455
msgid "[unix]"
msgstr "[unix]"
-#: fileio.c:4337
+#: ../fileio.c:4455
msgid "[unix format]"
msgstr "[unixƒtƒH[ƒ}ƒbƒg]"
-#: fileio.c:4364
+#: ../fileio.c:4482
msgid "1 line, "
msgstr "1 s, "
-#: fileio.c:4366
+#: ../fileio.c:4484
#, c-format
msgid "%ld lines, "
msgstr "%ld s, "
-#: fileio.c:4369
+#: ../fileio.c:4487
msgid "1 character"
msgstr "1 •¶Žš"
-#: fileio.c:4371
+#: ../fileio.c:4489
#, c-format
msgid "%ld characters"
msgstr "%ld •¶Žš"
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
msgid "[noeol]"
msgstr "[noeol]"
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
msgid "[Incomplete last line]"
msgstr "[ÅIs‚ª•sŠ®‘S]"
#. don't overwrite messages here
#. must give this prompt
#. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4400
+#: ../fileio.c:4518
msgid "WARNING: The file has been changed since reading it!!!"
msgstr "Œx: “Çž‚ñ‚¾Œã‚Ƀtƒ@ƒCƒ‹‚É•ÏX‚ª‚ ‚è‚Ü‚µ‚½!!!"
-#: fileio.c:4402
+#: ../fileio.c:4520
msgid "Do you really want to write to it"
msgstr "–{“–‚Éã‘‚«‚µ‚Ü‚·‚©"
-#: fileio.c:5566
+#: ../fileio.c:5746
#, c-format
msgid "E208: Error writing to \"%s\""
msgstr "E208: \"%s\" ‚ð‘ž‚Ý’†‚̃Gƒ‰[‚Å‚·"
-#: fileio.c:5573
+#: ../fileio.c:5753
#, c-format
msgid "E209: Error closing \"%s\""
msgstr "E209: \"%s\" ‚ð•Â‚¶‚鎞‚ɃGƒ‰[‚Å‚·"
-#: fileio.c:5576
+#: ../fileio.c:5756
#, c-format
msgid "E210: Error reading \"%s\""
msgstr "E210: \"%s\" ‚ð“Çž’†‚̃Gƒ‰[‚Å‚·"
-#: fileio.c:5810
+#: ../fileio.c:5993
msgid "E246: FileChangedShell autocommand deleted buffer"
msgstr "E246: autocommand ‚Ì FileChangedShell ‚ªƒoƒbƒtƒ@‚ð휂µ‚Ü‚µ‚½"
-#: fileio.c:5817
+#: ../fileio.c:6000
#, c-format
msgid "E211: Warning: File \"%s\" no longer available"
msgstr "E211: Œx: ƒtƒ@ƒCƒ‹ \"%s\" ‚ÍŠù‚É‘¶Ý‚µ‚Ü‚¹‚ñ"
-#: fileio.c:5831
+#: ../fileio.c:6014
#, c-format
msgid ""
"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
"well"
msgstr "W12: Œx: ƒtƒ@ƒCƒ‹ \"%s\" ‚ª•ÏX‚³‚êVim‚̃oƒbƒtƒ@‚à•ÏX‚³‚ê‚Ü‚µ‚½"
-#: fileio.c:5834
+#: ../fileio.c:6017
#, c-format
msgid "W11: Warning: File \"%s\" has changed since editing started"
msgstr "W11: Œx: ƒtƒ@ƒCƒ‹ \"%s\" ‚Í•ÒWŠJŽnŒã‚É•ÏX‚³‚ê‚Ü‚µ‚½"
-#: fileio.c:5836
+#: ../fileio.c:6019
#, c-format
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
msgstr "W16: Œx: ƒtƒ@ƒCƒ‹ \"%s\" ‚̃‚[ƒh‚ª•ÒWŠJŽnŒã‚É•ÏX‚³‚ê‚Ü‚µ‚½"
-#: fileio.c:5846
+#: ../fileio.c:6029
#, c-format
msgid "W13: Warning: File \"%s\" has been created after editing started"
msgstr "W13: Œx: ƒtƒ@ƒCƒ‹ \"%s\" ‚Í•ÒWŠJŽnŒã‚É쬂³‚ê‚Ü‚µ‚½"
-#: fileio.c:5859
+#: ../fileio.c:6042
msgid "See \":help W11\" for more info."
msgstr "Ú×‚Í \":help W11\" ‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢"
-#: fileio.c:5873
+#: ../fileio.c:6056
msgid "Warning"
msgstr "Œx"
-#: fileio.c:5874
+#: ../fileio.c:6057
msgid ""
"&OK\n"
"&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
"&OK\n"
"ƒtƒ@ƒCƒ‹“Çž(&L)"
-#: fileio.c:5980
+#: ../fileio.c:6159
#, c-format
msgid "E462: Could not prepare for reloading \"%s\""
msgstr "E462: \"%s\" ‚ðƒŠƒ[ƒh‚·‚途õ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: fileio.c:5999
+#: ../fileio.c:6178
#, c-format
msgid "E321: Could not reload \"%s\""
msgstr "E321: \"%s\" ‚̓Šƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: fileio.c:6580
+#: ../fileio.c:6773
msgid "--Deleted--"
msgstr "--íœÏ--"
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <ƒoƒbƒtƒ@=%d> ‚ªŽ©“®“I‚É휂³‚ê‚Ü‚·"
+
#. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
#, c-format
msgid "E367: No such group: \"%s\""
msgstr "E367: ‚»‚̃Oƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: \"%s\""
-#: fileio.c:6866
+#: ../fileio.c:7090
#, c-format
msgid "E215: Illegal character after *: %s"
msgstr "E215: * ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½: %s"
-#: fileio.c:6878
+#: ../fileio.c:7102
#, c-format
msgid "E216: No such event: %s"
msgstr "E216: ‚»‚̂悤‚ȃCƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: fileio.c:6880
+#: ../fileio.c:7104
#, c-format
msgid "E216: No such group or event: %s"
msgstr "E216: ‚»‚̂悤‚ȃOƒ‹[ƒv‚à‚µ‚­‚̓Cƒxƒ“ƒg‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
#. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
msgid ""
"\n"
"--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
"\n"
"--- Auto-Commands ---"
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <ƒoƒbƒtƒ@=%d>: –³Œø‚ȃoƒbƒtƒ@”Ô†‚Å‚·"
+
+#: ../fileio.c:7635
msgid "E217: Can't execute autocommands for ALL events"
msgstr "E217: ‘S‚ẴCƒxƒ“ƒg‚ɑ΂µ‚Ä‚Ìautocommand‚ÍŽÀs‚Å‚«‚Ü‚¹‚ñ"
-#: fileio.c:7332
+#: ../fileio.c:7658
msgid "No matching autocommands"
msgstr "ŠY“–‚·‚éautocommand‚Í‘¶Ý‚µ‚Ü‚¹‚ñ"
-#: fileio.c:7653
+#: ../fileio.c:7982
msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand‚Ì“ü‚êŽq‚ª[‚·‚¬‚Ü‚·"
+msgstr "E218: autocommand‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-#: fileio.c:7928
+#: ../fileio.c:8290
#, c-format
msgid "%s Auto commands for \"%s\""
msgstr "%s Auto commands for \"%s\""
-#: fileio.c:7936
+#: ../fileio.c:8298
#, c-format
msgid "Executing %s"
msgstr "%s ‚ðŽÀs‚µ‚Ä‚¢‚Ü‚·"
#. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
#, c-format
msgid "autocommand %s"
msgstr "autocommand %s"
-#: fileio.c:8571
+#: ../fileio.c:8961
msgid "E219: Missing {."
msgstr "E219: { ‚ª‚ ‚è‚Ü‚¹‚ñ."
-#: fileio.c:8573
+#: ../fileio.c:8963
msgid "E220: Missing }."
msgstr "E220: } ‚ª‚ ‚è‚Ü‚¹‚ñ."
-#: fold.c:68
+#: ../fold.c:68
msgid "E490: No fold found"
msgstr "E490: Üô‚Ý‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: fold.c:593
+#: ../fold.c:593
msgid "E350: Cannot create fold with current 'foldmethod'"
msgstr "E350: Œ»Ý‚Ì 'foldmethod' ‚Å‚ÍÜô‚Ý‚ð쬂ł«‚Ü‚¹‚ñ"
-#: fold.c:595
+#: ../fold.c:595
msgid "E351: Cannot delete fold with current 'foldmethod'"
msgstr "E351: Œ»Ý‚Ì 'foldmethod' ‚Å‚ÍÜô‚Ý‚ð휂ł«‚Ü‚¹‚ñ"
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½"
+
+#: ../getchar.c:249
msgid "E222: Add to read buffer"
msgstr "E222: “Çžƒoƒbƒtƒ@‚֒ljÁ"
-#: getchar.c:2198
+#: ../getchar.c:2234
msgid "E223: recursive mapping"
msgstr "E223: Ä‹A“Iƒ}ƒbƒsƒ“ƒO"
-#: getchar.c:3077
+#: ../getchar.c:3114
#, c-format
msgid "E224: global abbreviation already exists for %s"
msgstr "E224: %s ‚Æ‚¢‚¤ƒOƒ[ƒoƒ‹’Zk“ü—Í‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
-#: getchar.c:3080
+#: ../getchar.c:3117
#, c-format
msgid "E225: global mapping already exists for %s"
msgstr "E225: %s ‚Æ‚¢‚¤ƒOƒ[ƒoƒ‹ƒ}ƒbƒsƒ“ƒO‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
-#: getchar.c:3212
+#: ../getchar.c:3249
#, c-format
msgid "E226: abbreviation already exists for %s"
msgstr "E226: %s ‚Æ‚¢‚¤’Zk“ü—Í‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
-#: getchar.c:3215
+#: ../getchar.c:3252
#, c-format
msgid "E227: mapping already exists for %s"
msgstr "E227: %s ‚Æ‚¢‚¤ƒ}ƒbƒsƒ“ƒO‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·"
-#: getchar.c:3279
+#: ../getchar.c:3316
msgid "No abbreviation found"
msgstr "’Zk“ü—݂͂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: getchar.c:3281
+#: ../getchar.c:3318
msgid "No mapping found"
msgstr "ƒ}ƒbƒsƒ“ƒO‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: getchar.c:4173
+#: ../getchar.c:4210
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: •s³‚ȃ‚[ƒh"
-#: gui.c:220
+#: ../gui.c:220
msgid "E229: Cannot start the GUI"
msgstr "E229: GUI‚ðŠJŽn‚Å‚«‚Ü‚¹‚ñ"
-#: gui.c:349
+#: ../gui.c:355
#, c-format
msgid "E230: Cannot read from \"%s\""
msgstr "E230: \"%s\"‚©‚ç“Çž‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: gui.c:472
+#: ../gui.c:478
msgid "E665: Cannot start GUI, no valid font found"
msgstr "E665: —LŒø‚ȃtƒHƒ“ƒg‚ªŒ©‚‚©‚ç‚È‚¢‚Ì‚Å, GUI‚ðŠJŽn‚Å‚«‚Ü‚¹‚ñ"
-#: gui.c:477
+#: ../gui.c:483
msgid "E231: 'guifontwide' invalid"
msgstr "E231: 'guifontwide' ‚ª–³Œø‚Å‚·"
-#: gui.c:547
+#: ../gui.c:553
msgid "E599: Value of 'imactivatekey' is invalid"
msgstr "E599: 'imactivatekey' ‚Éݒ肳‚ꂽ’l‚ª–³Œø‚Å‚·"
-#: gui.c:4061
+#: ../gui.c:4070
#, c-format
msgid "E254: Cannot allocate color %s"
msgstr "E254: %s ‚ÌF‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ"
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "ƒJ[ƒ\\ƒ‹‚̈ʒu‚Ƀ}ƒbƒ`‚Í‚ ‚è‚Ü‚¹‚ñ, ŽŸ‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·"
+
+#: ../gui_at_fs.c:300
msgid "<cannot open> "
msgstr "<ŠJ‚¯‚Ü‚¹‚ñ>"
-#: gui_at_fs.c:1136
+#: ../gui_at_fs.c:1136
#, c-format
msgid "E616: vim_SelFile: can't get font %s"
msgstr "E616: vim_SelFile: ƒtƒHƒ“ƒg %s ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-#: gui_at_fs.c:2781
+#: ../gui_at_fs.c:2781
msgid "E614: vim_SelFile: can't return to current directory"
msgstr "E614: vim_SelFile: Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ‚É–ß‚ê‚Ü‚¹‚ñ"
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
msgid "Pathname:"
msgstr "ƒpƒX–¼:"
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
msgid "E615: vim_SelFile: can't get current directory"
msgstr "E615: vim_SelFile: Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
msgid "OK"
msgstr "OK"
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
msgid "Cancel"
msgstr "ƒLƒƒƒ“ƒZƒ‹"
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
msgstr "ƒXƒNƒ[ƒ‹ƒo[: ‰æ‘œ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
msgid "Vim dialog"
msgstr "Vim ƒ_ƒCƒAƒƒO"
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: ƒƒbƒZ[ƒW‚ƃR[ƒ‹ƒoƒbƒN‚Ì‚ ‚é BalloonEval ‚ð쬂ł«‚Ü‚¹‚ñ"
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
msgid "Vim dialog..."
msgstr "Vim ƒ_ƒCƒAƒƒO..."
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
msgid ""
"&Yes\n"
"&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
"‚¢‚¢‚¦(&N)\n"
"ƒLƒƒƒ“ƒZƒ‹(&C)"
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
msgid "Input _Methods"
msgstr "ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒh"
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
msgid "VIM - Search and Replace..."
msgstr "VIM - ŒŸõ‚Æ’uŠ·..."
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
msgid "VIM - Search..."
msgstr "VIM - ŒŸõ..."
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
msgid "Find what:"
msgstr "ŒŸõ•¶Žš—ñ:"
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
msgid "Replace with:"
msgstr "’uŠ·•¶Žš—ñ:"
#. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
msgid "Match whole word only"
msgstr "³Šm‚ÉŠY“–‚·‚é‚à‚Ì‚¾‚¯"
#. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
msgid "Match case"
msgstr "‘啶Žš/¬•¶Žš‚ð‹æ•Ê‚·‚é"
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
msgid "Direction"
msgstr "•ûŒü"
#. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
msgid "Up"
msgstr "ã"
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
msgid "Down"
msgstr "‰º"
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
msgid "Find Next"
msgstr "ŽŸ‚ðŒŸõ"
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
msgid "Replace"
msgstr "’uŠ·"
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
msgid "Replace All"
msgstr "‘S‚Ä’uŠ·"
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
msgid "Vim: Received \"die\" request from session manager\n"
msgstr "Vim: ƒZƒbƒVƒ‡ƒ“ƒ}ƒl[ƒWƒƒ‚©‚ç \"die\" —v‹‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½\n"
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr "Vim: ƒƒCƒ“ƒEƒBƒ“ƒhƒE‚ª•sˆÓ‚É”j‰ó‚³‚ê‚Ü‚µ‚½\n"
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
msgid "Font Selection"
msgstr "ƒtƒHƒ“ƒg‘I‘ð"
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "‹ó‚Ì‘I‘ð—̈æ‚Ì‚©‚í‚è‚ÉCUT_BUFFER0‚ªŽg—p‚³‚ê‚Ü‚µ‚½"
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "ƒtƒBƒ‹ƒ^"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "ƒtƒBƒ‹ƒ^(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)"
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
msgid "Directories"
msgstr "ƒfƒBƒŒƒNƒgƒŠ"
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "ƒwƒ‹ƒv"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "ƒtƒBƒ‹ƒ^"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "ƒwƒ‹ƒv(&H)"
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
msgid "Files"
msgstr "ƒtƒ@ƒCƒ‹"
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
msgid "Selection"
msgstr "‘I‘ð"
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "ƒAƒ“ƒhƒD"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "ŽŸ‚ðŒŸõ(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "’uŠ·(&R)"
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "‘S‚Ä’uŠ·(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "ƒAƒ“ƒhƒD(&U)"
+
+#: ../gui_riscos.c:952
#, c-format
msgid "E610: Can't load Zap font '%s'"
msgstr "E610: ZapƒtƒHƒ“ƒg '%s' ‚ð“Çž‚ß‚Ü‚¹‚ñ"
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
#, c-format
msgid "E611: Can't use font %s"
msgstr "E611: ƒtƒHƒ“ƒg %s ‚ðŽg—p‚Å‚«‚Ü‚¹‚ñ"
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
msgid ""
"\n"
"Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
"\n"
"ŽqƒvƒƒZƒX‚Ö’âŽ~ƒƒbƒZ[ƒW‚ð‘—M’†‚Å‚·.\n"
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: ƒ^ƒCƒgƒ‹‚ª \"%s\" ‚̃EƒBƒ“ƒhƒE‚݂͂‚©‚è‚Ü‚¹‚ñ"
+
+#: ../gui_w32.c:848
#, c-format
msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
msgstr "E243: ˆø”‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ: \"-%s\"; OLE”Å‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢."
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIƒAƒvƒŠ‚Ì’†‚ł̓EƒBƒ“ƒhƒE‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+#: ../gui_w48.c:2213
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "ŒŸõ•¶Žš—ñ ('\\' ‚ðŒŸõ‚·‚é‚É‚Í '\\\\')"
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "ŒŸõE’uŠ· ('\\' ‚ðŒŸõ‚·‚é‚É‚Í '\\\\')"
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "Žg‚í‚ê‚Ü‚¹‚ñ"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "ƒfƒBƒŒƒNƒgƒŠ\t*.nothing\n"
+
+#: ../gui_x11.c:1537
msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
msgstr "Vim E458: FŽw’肪³‚µ‚­‚È‚¢‚̂ŃGƒ“ƒgƒŠ‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ"
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
#, c-format
msgid "E250: Fonts for the following charsets are missing in fontset %s:"
msgstr "E250: ˆÈ‰º‚Ì•¶ŽšƒZƒbƒg‚̃tƒHƒ“ƒg‚ª‚ ‚è‚Ü‚¹‚ñ %s:"
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
#, c-format
msgid "E252: Fontset name: %s"
msgstr "E252: ƒtƒHƒ“ƒgƒZƒbƒg–¼: %s"
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
#, c-format
msgid "Font '%s' is not fixed-width"
msgstr "ƒtƒHƒ“ƒg '%s' ‚͌Œ蕂ł͂ ‚è‚Ü‚¹‚ñ"
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
#, c-format
msgid "E253: Fontset name: %s\n"
msgstr "E253: ƒtƒHƒ“ƒgƒZƒbƒg–¼: %s\n"
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
#, c-format
msgid "Font0: %s\n"
msgstr "ƒtƒHƒ“ƒg0: %s\n"
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
#, c-format
msgid "Font1: %s\n"
msgstr "ƒtƒHƒ“ƒg1: %s\n"
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
#, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "ƒtƒHƒ“ƒg%d ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "ƒtƒHƒ“ƒg%ld ‚Ì•‚ªƒtƒHƒ“ƒg0‚Ì2”{‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
#, c-format
msgid "Font0 width: %ld\n"
msgstr "ƒtƒHƒ“ƒg0‚Ì•: %ld\n"
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
#, c-format
msgid ""
"Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
"ƒtƒHƒ“ƒg1‚Ì•: %ld\n"
"\n"
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "–³Œø‚ȃtƒHƒ“ƒgŽw’è‚Å‚·"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "‹p‰º‚·‚é(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "ƒ}ƒbƒ`‚·‚é‚à‚Ì‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - ƒtƒHƒ“ƒg‘I‘ð"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "–¼‘O:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "ƒTƒCƒY‚ðƒ|ƒCƒ“ƒg‚Å•\\Ž¦‚·‚é"
+
+# msgid " BLOCK"
+# msgstr " ƒuƒƒbƒN"
+# msgid " LINE"
+# msgstr " s"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "ƒGƒ“ƒR[ƒh:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "ƒtƒHƒ“ƒg:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "ƒXƒ^ƒCƒ‹:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "ƒTƒCƒY:"
+
+#: ../hangulin.c:610
msgid "E256: Hangul automata ERROR"
msgstr "E256: ƒnƒ“ƒOƒ‹ƒI[ƒgƒ}ƒgƒ“ƒGƒ‰["
-#: if_cscope.c:77
+#: ../if_cscope.c:77
msgid "Add a new database"
msgstr "Vƒf[ƒ^ƒx[ƒX‚ð’ljÁ"
-#: if_cscope.c:79
+#: ../if_cscope.c:79
msgid "Query for a pattern"
msgstr "ƒpƒ^[ƒ“‚̃NƒGƒŠ[‚ð’ljÁ"
-#: if_cscope.c:81
+#: ../if_cscope.c:81
msgid "Show this message"
msgstr "‚±‚̃ƒbƒZ[ƒW‚ð•\\Ž¦‚·‚é"
-#: if_cscope.c:83
+#: ../if_cscope.c:83
msgid "Kill a connection"
msgstr "Ú‘±‚ðI—¹‚·‚é"
-#: if_cscope.c:85
+#: ../if_cscope.c:85
msgid "Reinit all connections"
msgstr "‘S‚Ä‚ÌÚ‘±‚ðĉŠú‰»‚·‚é"
-#: if_cscope.c:87
+#: ../if_cscope.c:87
msgid "Show connections"
msgstr "Ú‘±‚ð•\\Ž¦‚·‚é"
-#: if_cscope.c:95
+#: ../if_cscope.c:95
#, c-format
msgid "E560: Usage: cs[cope] %s"
msgstr "E560: Žg—p•û–@: cs[cope] %s"
-#: if_cscope.c:124
+#: ../if_cscope.c:124
msgid "This cscope command does not support splitting the window.\n"
msgstr "‚±‚ÌcscopeƒRƒ}ƒ“ƒh‚Í•ªŠ„ƒEƒBƒ“ƒhƒE‚ł̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ.\n"
-#: if_cscope.c:175
+#: ../if_cscope.c:175
msgid "E562: Usage: cstag <ident>"
msgstr "E562: Žg—p–@: cstag <ident>"
-#: if_cscope.c:231
+#: ../if_cscope.c:231
msgid "E257: cstag: tag not found"
msgstr "E257: cstag: ƒ^ƒO‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: if_cscope.c:409
+#: ../if_cscope.c:409
#, c-format
msgid "E563: stat(%s) error: %d"
msgstr "E563: stat(%s) ƒGƒ‰[: %d"
-#: if_cscope.c:419
+#: ../if_cscope.c:419
msgid "E563: stat error"
msgstr "E563: stat ƒGƒ‰["
-#: if_cscope.c:516
+#: ../if_cscope.c:516
#, c-format
msgid "E564: %s is not a directory or a valid cscope database"
msgstr "E564: %s ‚̓fƒBƒŒƒNƒgƒŠ‹y‚Ñ—LŒø‚Ècscope‚̃f[ƒ^ƒx[ƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: if_cscope.c:534
+#: ../if_cscope.c:534
#, c-format
msgid "Added cscope database %s"
msgstr "cscopeƒf[ƒ^ƒx[ƒX %s ‚ð’ljÁ"
-#: if_cscope.c:589
+#: ../if_cscope.c:589
#, c-format
msgid "E262: error reading cscope connection %ld"
msgstr "E262: cscope‚ÌÚ‘± %ld ‚ð“Çž‚Ý’†‚̃Gƒ‰[‚Å‚·"
-#: if_cscope.c:694
+#: ../if_cscope.c:694
msgid "E561: unknown cscope search type"
msgstr "E561: –¢’m‚ÌcscopeŒŸõŒ^‚Å‚·"
-#: if_cscope.c:736
+#: ../if_cscope.c:736
msgid "E566: Could not create cscope pipes"
msgstr "E566: cscopeƒpƒCƒv‚ð쬂ł«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: if_cscope.c:753
+#: ../if_cscope.c:753
msgid "E622: Could not fork for cscope"
msgstr "E622: cscope‚Ì‹N“®€”õ(fork)‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
msgid "cs_create_connection exec failed"
msgstr "cs_create_connection ‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_cscope.c:898
+#: ../if_cscope.c:898
msgid "E623: Could not spawn cscope process"
msgstr "E623: cscopeƒvƒƒZƒX‚ð‹N“®‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: if_cscope.c:911
+#: ../if_cscope.c:911
msgid "cs_create_connection: fdopen for to_fp failed"
msgstr "cs_create_connection: to_fp ‚Ì fdopen ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_cscope.c:913
+#: ../if_cscope.c:913
msgid "cs_create_connection: fdopen for fr_fp failed"
msgstr "cs_create_connection: fr_fp ‚Ì fdopen ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_cscope.c:951
+#: ../if_cscope.c:951
msgid "E567: no cscope connections"
msgstr "E567: cscopeÚ‘±‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
msgstr "E259: cscopeƒNƒGƒŠ[ %s of %s ‚ÉŠY“–‚ª‚ ‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
#, c-format
msgid "E469: invalid cscopequickfix flag %c for %c"
msgstr "E469: –³Œø‚È cscopequickfix ƒtƒ‰ƒO %c ‚Ì %c ‚Å‚·"
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
msgid "cscope commands:\n"
msgstr "cscopeƒRƒ}ƒ“ƒh:\n"
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
#, c-format
msgid "%-5s: %-30s (Usage: %s)"
msgstr "%-5s: %-30s (Žg—p–@: %s)"
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
#, c-format
msgid "E625: cannot open cscope database: %s"
msgstr "E625: cscopeƒf[ƒ^ƒx[ƒX: %s ‚ðŠJ‚­‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
msgid "E626: cannot get cscope database information"
msgstr "E626: cscopeƒf[ƒ^ƒx[ƒX‚Ìî•ñ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
msgid "E568: duplicate cscope database not added"
msgstr "E568: d•¡‚·‚écscopeƒf[ƒ^ƒx[ƒX‚͒ljÁ‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
msgid "E569: maximum number of cscope connections reached"
msgstr "E569: cscopeÚ‘±‚Ìő唂ɒB‚µ‚Ü‚µ‚½"
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
#, c-format
msgid "E261: cscope connection %s not found"
msgstr "E261: cscopeÚ‘± %s ‚ª‚݂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
#, c-format
msgid "cscope connection %s closed"
msgstr "cscopeÚ‘± %s ‚ª•Â‚¶‚ç‚ê‚Ü‚µ‚½"
#. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
msgid "E570: fatal error in cs_manage_matches"
msgstr "E570: cs_manage_matches ‚Å’v–½“I‚ȃGƒ‰[‚Å‚·"
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
#, c-format
msgid "Cscope tag: %s"
msgstr "Cscope ƒ^ƒO: %s"
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
msgid ""
"\n"
" # line"
@@ -2507,28 +2894,123 @@ msgstr ""
"\n"
" # s”Ô†"
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
msgid "filename / context / line\n"
msgstr "ƒtƒ@ƒCƒ‹–¼ / •¶–¬ / s\n"
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
#, c-format
msgid "E609: Cscope error: %s"
msgstr "E609: cscopeƒGƒ‰[: %s"
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
msgid "All cscope databases reset"
msgstr "‘S‚Ä‚Ìcscopeƒf[ƒ^ƒx[ƒX‚ðƒŠƒZƒbƒg‚µ‚Ü‚·"
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
msgid "no cscope connections\n"
msgstr "cscopeÚ‘±‚ª‚ ‚è‚Ü‚¹‚ñ\n"
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
msgid " # pid database name prepend path\n"
msgstr " # pid ƒf[ƒ^ƒx[ƒX–¼ prepend ƒpƒX\n"
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: ‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: MzScheme "
+"ƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "–³Œø‚ÈŽ®‚Å‚·"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "Ž®‚̓Rƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "‰B‚µƒIƒvƒVƒ‡ƒ“"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "–¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "”͈͊O‚̃EƒBƒ“ƒhƒE”Ô†‚Å‚·"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "ƒoƒbƒtƒ@‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "ƒAƒ“ƒhƒDî•ñ‚ª•Û‘¶‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "s‚ðÁ‚¹‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "s‚ð’uŠ·‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "s‚ð‘}“ü‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "•¶Žš—ñ‚ɂ͉üs•¶Žš‚ðŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim ƒGƒ‰[: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim ƒGƒ‰["
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "ƒoƒbƒtƒ@‚Í–³Œø‚Å‚·"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "ƒEƒBƒ“ƒhƒE‚Í–³Œø‚Å‚·"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "”͈͊O‚Ìs”Ô†‚Å‚·"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: Perlƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í Safe "
+"ƒ‚ƒWƒ…[ƒ‹‚ðŽg—p‚µ‚È‚¢PerlƒXƒNƒŠƒvƒg‚Í‹Ö‚¶‚ç‚ê‚Ä‚¢‚Ü‚·"
+
+#: ../if_python.c:438
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
"Pythonƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
# Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
msgid "E659: Cannot invoke Python recursively"
msgstr "E659: Python ‚ðÄ‹A“I‚ÉŽÀs‚·‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: if_python.c:701
+#: ../if_python.c:705
msgid "can't delete OutputObject attributes"
msgstr "OutputObject‘®«‚ðÁ‚¹‚Ü‚¹‚ñ"
-#: if_python.c:708
+#: ../if_python.c:712
msgid "softspace must be an integer"
msgstr "softspace ‚Í integer ‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-#: if_python.c:716
+#: ../if_python.c:720
msgid "invalid attribute"
msgstr "–³Œø‚È‘®«‚Å‚·"
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
msgid "writelines() requires list of strings"
msgstr "writelines() ‚É‚Í•¶Žš—ñ‚̃ŠƒXƒg‚ª•K—v‚Å‚·"
-#: if_python.c:895
+#: ../if_python.c:899
msgid "E264: Python: Error initialising I/O objects"
msgstr "E264: Python: I/OƒIƒuƒWƒFƒNƒg‚̉Šú‰»’†‚ɃGƒ‰[‚Å‚·"
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "–³Œø‚ÈŽ®‚Å‚·"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "Ž®‚̓Rƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
msgid "attempt to refer to deleted buffer"
msgstr "Á‚³‚ꂽƒoƒbƒtƒ@‚ªŽQÆ‚³‚ê‚Ü‚µ‚½"
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
msgid "line number out of range"
msgstr "”͈͊O‚Ìs”Ô†‚Å‚·"
-#: if_python.c:1362
+#: ../if_python.c:1366
#, c-format
msgid "<buffer object (deleted) at %8lX>"
msgstr "<ƒoƒbƒtƒ@ƒIƒuƒWƒFƒNƒg (Á‹ŽÏ‚Ý) %8lX>"
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
msgid "invalid mark name"
msgstr "–³Œø‚ȃ}[ƒN–¼‚Å‚·"
-#: if_python.c:1733
+#: ../if_python.c:1737
msgid "no such buffer"
msgstr "‚»‚̂悤‚ȃoƒbƒtƒ@‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: if_python.c:1821
+#: ../if_python.c:1825
msgid "attempt to refer to deleted window"
msgstr "Á‚³‚ꂽƒEƒBƒ“ƒhƒE‚ªŽQÆ‚³‚ê‚Ü‚µ‚½"
-#: if_python.c:1866
+#: ../if_python.c:1870
msgid "readonly attribute"
msgstr "“Çžê—p‘®«"
-#: if_python.c:1879
+#: ../if_python.c:1883
msgid "cursor position outside buffer"
msgstr "ƒJ[ƒ\\ƒ‹‚ªƒoƒbƒtƒ@‚ÌŠO‚É‚ ‚è‚Ü‚·"
-#: if_python.c:1956
+#: ../if_python.c:1960
#, c-format
msgid "<window object (deleted) at %.8lX>"
msgstr "<ƒEƒBƒ“ƒhƒEƒIƒuƒWƒFƒNƒg (Á‹ŽÏ) %.8lX>"
-#: if_python.c:1968
+#: ../if_python.c:1972
#, c-format
msgid "<window object (unknown) at %.8lX>"
msgstr "<ƒEƒBƒ“ƒhƒEƒIƒuƒWƒFƒNƒg (–¢’m) %.8lX>"
-#: if_python.c:1970
+#: ../if_python.c:1974
#, c-format
msgid "<window %d>"
msgstr "<ƒEƒBƒ“ƒhƒE %d>"
-#: if_python.c:2046
+#: ../if_python.c:2050
msgid "no such window"
msgstr "‚»‚̂悤‚ȃEƒBƒ“ƒhƒE‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
-#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1999
-msgid "cannot save undo information"
-msgstr "ƒAƒ“ƒhƒDî•ñ‚ª•Û‘¶‚Å‚«‚Ü‚¹‚ñ"
-
-#: if_python.c:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "s‚ðÁ‚¹‚Ü‚¹‚ñ"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "s‚ð’uŠ·‚Å‚«‚Ü‚¹‚ñ"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "s‚ð‘}“ü‚Å‚«‚Ü‚¹‚ñ"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "•¶Žš—ñ‚ɂ͉üs•¶Žš‚ðŠÜ‚ß‚ç‚ê‚Ü‚¹‚ñ"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: ‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·,‚²‚ß‚ñ‚È‚³‚¢: "
"Rubyƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
-#: if_ruby.c:485
+#: ../if_ruby.c:485
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: –¢’m‚Ìlongjmpó‘Ô: %d"
-#: if_sniff.c:67
+#: ../if_sniff.c:67
msgid "Toggle implementation/definition"
msgstr "ŽÀ‘•‚Æ’è‹`‚ðØ‚è‘Ö‚¦‚é"
-#: if_sniff.c:68
+#: ../if_sniff.c:68
msgid "Show base class of"
msgstr "ŽŸ‚̃Nƒ‰ƒX‚ÌŠî’ê‚ð•\\Ž¦"
-#: if_sniff.c:69
+#: ../if_sniff.c:69
msgid "Show overridden member function"
msgstr "ƒI[ƒo[ƒ‰ƒCƒh‚³‚ꂽƒƒ“ƒoŠÖ”‚ð•\\Ž¦"
-#: if_sniff.c:70
+#: ../if_sniff.c:70
msgid "Retrieve from file"
msgstr "ƒtƒ@ƒCƒ‹‚©‚ç‰ñ•œ‚·‚é"
-#: if_sniff.c:71
+#: ../if_sniff.c:71
msgid "Retrieve from project"
msgstr "ƒvƒƒWƒFƒNƒg‚©‚ç‰ñ•œ‚·‚é"
-#: if_sniff.c:73
+#: ../if_sniff.c:73
msgid "Retrieve from all projects"
msgstr "‘S‚ẴvƒƒWƒFƒNƒg‚©‚ç‰ñ•œ‚·‚é"
-#: if_sniff.c:74
+#: ../if_sniff.c:74
msgid "Retrieve"
msgstr "‰ñ•œ"
-#: if_sniff.c:75
+#: ../if_sniff.c:75
msgid "Show source of"
msgstr "ŽŸ‚̃\\[ƒX‚ð•\\Ž¦‚·‚é"
-#: if_sniff.c:76
+#: ../if_sniff.c:76
msgid "Find symbol"
msgstr "‚݂‚¯‚½ƒVƒ“ƒ{ƒ‹"
-#: if_sniff.c:77
+#: ../if_sniff.c:77
msgid "Browse class"
msgstr "ƒNƒ‰ƒX‚ðŽQÆ"
-#: if_sniff.c:78
+#: ../if_sniff.c:78
msgid "Show class in hierarchy"
msgstr "ŠK‘w‚ŃNƒ‰ƒX‚ð•\\Ž¦"
-#: if_sniff.c:79
+#: ../if_sniff.c:79
msgid "Show class in restricted hierarchy"
msgstr "ŒÀ’肳‚ꂽŠK‘w‚ŃNƒ‰ƒX‚ð•\\Ž¦"
-#: if_sniff.c:80
+#: ../if_sniff.c:80
msgid "Xref refers to"
msgstr "Xref ‚ÌŽQÆæ"
-#: if_sniff.c:81
+#: ../if_sniff.c:81
msgid "Xref referred by"
msgstr "Xref ‚ªŽQÆ‚³‚ê‚é"
-#: if_sniff.c:82
+#: ../if_sniff.c:82
msgid "Xref has a"
msgstr "Xref ‚ªŽŸ‚Ì‚à‚Ì‚ð‚à‚Á‚Ä‚¢‚Ü‚·"
-#: if_sniff.c:83
+#: ../if_sniff.c:83
msgid "Xref used by"
msgstr "Xref ‚ªŽg—p‚³‚ê‚é"
-#: if_sniff.c:84
+#: ../if_sniff.c:84
msgid "Show docu of"
msgstr "ŽŸ‚Ì•¶Í‚ð•\\Ž¦"
-#: if_sniff.c:85
+#: ../if_sniff.c:85
msgid "Generate docu for"
msgstr "ŽŸ‚Ì•¶Í‚ð¶¬"
-#: if_sniff.c:97
+#: ../if_sniff.c:97
msgid ""
"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
"$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
"SNiFF+‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñ. ŠÂ‹«‚ðƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢(sniffemacs ‚ª $PATH "
"‚É‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ).\n"
-#: if_sniff.c:425
+#: ../if_sniff.c:425
msgid "E274: Sniff: Error during read. Disconnected"
msgstr "E274: Sniff: “Çž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½. Ø’f‚µ‚Ü‚µ‚½"
-#: if_sniff.c:553
+#: ../if_sniff.c:553
msgid "SNiFF+ is currently "
msgstr "Œ»ÝSNiFF+ ‚Ìó‘Ô‚Íu"
-#: if_sniff.c:555
+#: ../if_sniff.c:555
msgid "not "
msgstr "–¢"
-#: if_sniff.c:556
+#: ../if_sniff.c:556
msgid "connected"
msgstr "Ú‘±v‚Å‚·"
-#: if_sniff.c:592
+#: ../if_sniff.c:592
#, c-format
msgid "E275: Unknown SNiFF+ request: %s"
msgstr "E275: –¢’m‚Ì SNiFF+ ƒŠƒNƒGƒXƒg‚Å‚·: %s"
-#: if_sniff.c:605
+#: ../if_sniff.c:605
msgid "E276: Error connecting to SNiFF+"
msgstr "E276: SNiFF+ ‚Ö‚ÌÚ‘±’†‚̃Gƒ‰[‚Å‚·"
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
msgid "E278: SNiFF+ not connected"
msgstr "E278: SNiFF+ ‚ÉÚ‘±‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
msgid "E279: Not a SNiFF+ buffer"
msgstr "E279: SNiFF+ ƒoƒbƒtƒ@‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
msgid "Sniff: Error during write. Disconnected"
msgstr "Sniff: ‘ž‚Ý’†‚ɃGƒ‰[‚ª”­¶‚µ‚½‚Ì‚ÅØ’f‚µ‚Ü‚µ‚½"
-#: if_tcl.c:418
+#: ../if_tcl.c:422
msgid "invalid buffer number"
msgstr "–³Œø‚ȃoƒbƒtƒ@”Ô†‚Å‚·"
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
msgid "not implemented yet"
msgstr "‚Ü‚¾ŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "–¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·"
-
#. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
msgid "cannot set line(s)"
msgstr "s‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-#: if_tcl.c:845
+#: ../if_tcl.c:849
msgid "mark not set"
msgstr "ƒ}[ƒN‚Íݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
#, c-format
msgid "row %d column %d"
msgstr "s %d —ñ %d"
-#: if_tcl.c:881
+#: ../if_tcl.c:885
msgid "cannot insert/append line"
msgstr "s‚Ì‘}“ü/’ljÁ‚ð‚Å‚«‚Ü‚¹‚ñ"
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
msgid "unknown flag: "
msgstr "–¢’m‚̃tƒ‰ƒO:"
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
msgid "unknown vimOption"
msgstr "–¢’m‚Ì vimOption ‚Å‚·"
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
msgid "keyboard interrupt"
msgstr "ƒL[ƒ{[ƒhŠ„ž‚Ý"
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
msgid "vim error"
msgstr "vim ƒGƒ‰["
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
msgid "cannot create buffer/window command: object is being deleted"
msgstr ""
"ƒoƒbƒtƒ@/ƒEƒBƒ“ƒhƒE쬃Rƒ}ƒ“ƒh‚ð쬂ł«‚Ü‚¹‚ñ: "
"ƒIƒuƒWƒFƒNƒg‚ªÁ‹Ž‚³‚ê‚Ä‚¢‚Ü‚µ‚½"
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
msgid ""
"cannot register callback command: buffer/window is already being deleted"
msgstr ""
"ƒR[ƒ‹ƒoƒbƒNƒRƒ}ƒ“ƒh‚ð“o˜^‚Å‚«‚Ü‚¹‚ñ: ƒoƒbƒtƒ@/ƒEƒBƒ“ƒhƒE‚ªŠù‚ÉÁ‹Ž‚³‚ê‚Ü‚µ‚½"
#. This should never happen. Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
msgid ""
"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
"vim-dev@vim.org"
msgstr ""
"E280: TCL ’v–½“IƒGƒ‰[: reflist ‰˜õ!? vim-dev@vim.org ‚É•ñ‚µ‚Ä‚­‚¾‚³‚¢"
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
msgid "cannot register callback command: buffer/window reference not found"
msgstr ""
"ƒR[ƒ‹ƒoƒbƒNƒRƒ}ƒ“ƒh‚ð“o˜^‚Å‚«‚Ü‚¹‚ñ: "
"ƒoƒbƒtƒ@/ƒEƒBƒ“ƒhƒE‚ÌŽQÆ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
msgid ""
"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
msgstr ""
"E571: ‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·,‚²‚ß‚ñ‚È‚³‚¢: "
"Tclƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
msgid ""
"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
msgstr ""
"E281: TCL ƒGƒ‰[: I—¹ƒR[ƒh‚ª®”’l‚Å‚Í‚ ‚è‚Ü‚¹‚ñ!? vim-dev@vim.org "
"‚É•ñ‚µ‚Ä‚­‚¾‚³‚¢"
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
msgid "cannot get line"
msgstr "s‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
msgid "Unable to register a command server name"
msgstr "–½—߃T[ƒo‚Ì–¼‘O‚ð“o˜^‚Å‚«‚Ü‚¹‚ñ"
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
msgid "E248: Failed to send command to the destination program"
msgstr "E248: –Ú“I‚̃vƒƒOƒ‰ƒ€‚ւ̃Rƒ}ƒ“ƒh‘—M‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
#, c-format
msgid "E573: Invalid server id used: %s"
msgstr "E573: –³Œø‚ȃT[ƒoID‚ªŽg‚í‚ê‚Ü‚µ‚½: %s"
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
msgid "E251: VIM instance registry property is badly formed. Deleted!"
msgstr "E251: VIM ŽÀ‘Ì‚Ì“o˜^ƒvƒƒpƒeƒB‚ª•s³‚Å‚·. Á‹Ž‚µ‚Ü‚µ‚½!"
-#: main.c:60
+#: ../main.c:60
msgid "Unknown option"
msgstr "–¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·"
-#: main.c:62
+#: ../main.c:62
msgid "Too many edit arguments"
-msgstr "•ÒWˆø”‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "•ÒWˆø”‚ª‘½‰ß‚¬‚Ü‚·"
-#: main.c:64
+#: ../main.c:64
msgid "Argument missing after"
msgstr "ˆø”‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: main.c:66
+#: ../main.c:66
msgid "Garbage after option"
msgstr "ƒIƒvƒVƒ‡ƒ“‚ÌŒã‚ɃSƒ~‚ª‚ ‚è‚Ü‚·"
-#: main.c:68
+#: ../main.c:68
msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" ‚̈ø”‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" ‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·"
-#: main.c:70
+#: ../main.c:70
msgid "Invalid argument for"
msgstr "–³Œø‚Ȉø”‚Å‚·: "
-#: main.c:466
+#: ../main.c:481
msgid "This Vim was not compiled with the diff feature."
msgstr "‚±‚ÌVim‚É‚Ídiff‹@”\\‚ª‚ ‚è‚Ü‚¹‚ñ(ƒRƒ“ƒpƒCƒ‹ŽžÝ’è)."
-#: main.c:932
+#: ../main.c:958
msgid "Attempt to open script file again: \""
msgstr "ƒXƒNƒŠƒvƒgƒtƒ@ƒCƒ‹‚ðÄ‚ÑŠJ‚¢‚Ä‚Ý‚Ü‚·: \""
# msgid "\"\n"
# msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
msgid "Cannot open for reading: \""
msgstr "“Çž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñ"
-#: main.c:985
+#: ../main.c:1021
msgid "Cannot open for script output: \""
msgstr "ƒXƒNƒŠƒvƒgo—Í—p‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d ŒÂ‚̃tƒ@ƒCƒ‹‚ª•ÒW‚ðT‚¦‚Ä‚¢‚Ü‚·\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ƒGƒ‰[: NetBeans‚©‚çgvim‚ðƒXƒ^[ƒg‚Å‚«‚Ü‚¹‚ñ\n"
-#: main.c:1233
+#: ../main.c:1302
msgid "Vim: Warning: Output is not to a terminal\n"
msgstr "Vim: Œx: ’[––‚Ö‚Ìo—Í‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
-#: main.c:1235
+#: ../main.c:1304
msgid "Vim: Warning: Input is not from a terminal\n"
msgstr "Vim: Œx: ’[––‚©‚ç‚Ì“ü—Í‚Å‚Í‚ ‚è‚Ü‚¹‚ñ\n"
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d ŒÂ‚̃tƒ@ƒCƒ‹‚ª•ÒW‚ðT‚¦‚Ä‚¢‚Ü‚·\n"
+
#. just in case..
-#: main.c:1297
+#: ../main.c:1377
msgid "pre-vimrc command line"
msgstr "vimrc‘O‚̃Rƒ}ƒ“ƒhƒ‰ƒCƒ“"
-#: main.c:1338
+#: ../main.c:1418
#, c-format
msgid "E282: Cannot read from \"%s\""
msgstr "E282: \"%s\"‚©‚ç“Çž‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ"
-#: main.c:2411
+#: ../main.c:2521
msgid ""
"\n"
"More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
"\n"
"‚æ‚èÚׂÈî•ñ‚Í: \"vim -h\"\n"
-#: main.c:2444
+#: ../main.c:2554
msgid "[file ..] edit specified file(s)"
msgstr "[ƒtƒ@ƒCƒ‹..] ‚ ‚éƒtƒ@ƒCƒ‹‚ð•ÒW‚·‚é"
-#: main.c:2445
+#: ../main.c:2555
msgid "- read text from stdin"
msgstr "- •W€“ü—Í‚©‚çƒeƒLƒXƒg‚ð“Çž‚Þ"
-#: main.c:2446
+#: ../main.c:2556
msgid "-t tag edit file where tag is defined"
msgstr "-t ƒ^ƒO ƒ^ƒO‚ª’è‹`‚³‚ꂽ‚Æ‚±‚ë‚©‚ç•ÒW‚·‚é"
-#: main.c:2448
+#: ../main.c:2558
msgid "-q [errorfile] edit file with first error"
msgstr "-q [errorfile] ʼn‚̃Gƒ‰[‚Å•ÒW‚·‚é"
-#: main.c:2457
+#: ../main.c:2567
msgid ""
"\n"
"\n"
@@ -2978,11 +3431,11 @@ msgstr ""
"\n"
"Žg—p–@:"
-#: main.c:2460
+#: ../main.c:2570
msgid " vim [arguments] "
msgstr " vim [ˆø”]"
-#: main.c:2464
+#: ../main.c:2574
msgid ""
"\n"
" or:"
@@ -2990,7 +3443,11 @@ msgstr ""
"\n"
" ‚à‚µ‚­‚Í:"
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "‘啶Žš¬•¶Žš‚Í–³Ž‹‚³‚ê‚Ü‚· / ƒtƒ‰ƒO‚͑啶Žš‚É‚µ‚Ä‚­‚¾‚³‚¢"
+
+#: ../main.c:2580
msgid ""
"\n"
"\n"
@@ -3000,241 +3457,241 @@ msgstr ""
"\n"
"ˆø”:\n"
-#: main.c:2468
+#: ../main.c:2581
msgid "--\t\t\tOnly file names after this"
msgstr "--\t\t\t‚±‚Ì‚ ‚Ƃɂ̓tƒ@ƒCƒ‹–¼‚¾‚¯"
-#: main.c:2470
+#: ../main.c:2583
msgid "--literal\t\tDon't expand wildcards"
msgstr "--literal\t\tƒƒCƒ‹ƒhƒJ[ƒh‚ð“WŠJ‚µ‚È‚¢"
-#: main.c:2473
+#: ../main.c:2586
msgid "-register\t\tRegister this gvim for OLE"
msgstr "-register\t\t‚±‚Ìgvim‚ðOLE‚Æ‚µ‚Ä“o˜^‚·‚é"
-#: main.c:2474
+#: ../main.c:2587
msgid "-unregister\t\tUnregister gvim for OLE"
msgstr "-unregister\t\tgvim‚ÌOLE“o˜^‚ð‰ðœ‚·‚é"
-#: main.c:2477
+#: ../main.c:2590
msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\tGUI‚Å‹N“®‚·‚é (\"gvim\" ‚Æ“¯‚¶)"
-#: main.c:2478
+#: ../main.c:2591
msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
msgstr "-f or --nofork\tƒtƒHƒAƒOƒ‰ƒEƒ“ƒh: GUI‚ðŽn‚ß‚é‚Æ‚«‚Éfork‚µ‚È‚¢"
-#: main.c:2480
+#: ../main.c:2593
msgid "-v\t\t\tVi mode (like \"vi\")"
msgstr "-v\t\t\tViƒ‚[ƒh (\"vi\" ‚Æ“¯‚¶)"
-#: main.c:2481
+#: ../main.c:2594
msgid "-e\t\t\tEx mode (like \"ex\")"
msgstr "-e\t\t\tExƒ‚[ƒh (\"ex\" ‚Æ“¯‚¶)"
-#: main.c:2482
+#: ../main.c:2595
msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
msgstr "-s\t\t\tƒTƒCƒŒƒ“ƒg(ƒoƒbƒ`)ƒ‚[ƒh (\"ex\" ê—p)"
-#: main.c:2484
+#: ../main.c:2597
msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
msgstr "-d\t\t\t·•ªƒ‚[ƒh (\"vidiff\" ‚Æ“¯‚¶)"
-#: main.c:2486
+#: ../main.c:2599
msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
msgstr "-y\t\t\tƒC[ƒW[ƒ‚[ƒh (\"evim\" ‚Æ“¯‚¶, ƒ‚[ƒh–³)"
-#: main.c:2487
+#: ../main.c:2600
msgid "-R\t\t\tReadonly mode (like \"view\")"
msgstr "-R\t\t\t“Çžê—pƒ‚[ƒh (\"view\" ‚Æ“¯‚¶)"
-#: main.c:2488
+#: ../main.c:2601
msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
msgstr "-Z\t\t\t§ŒÀƒ‚[ƒh (\"rvim\" ‚Æ“¯‚¶)"
-#: main.c:2489
+#: ../main.c:2602
msgid "-m\t\t\tModifications (writing files) not allowed"
msgstr "-m\t\t\t•ÏX (ƒtƒ@ƒCƒ‹•Û‘¶Žž) ‚ð‚Å‚«‚È‚¢‚悤‚É‚·‚é"
-#: main.c:2490
+#: ../main.c:2603
msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\tƒeƒLƒXƒg‚Ì•ÒW‚ðs‚È‚¦‚È‚¢‚悤‚É‚·‚é"
-#: main.c:2491
+#: ../main.c:2604
msgid "-b\t\t\tBinary mode"
msgstr "-b\t\t\tƒoƒCƒiƒŠƒ‚[ƒh"
-#: main.c:2493
+#: ../main.c:2606
msgid "-l\t\t\tLisp mode"
msgstr "-l\t\t\tLispƒ‚[ƒh"
-#: main.c:2495
+#: ../main.c:2608
msgid "-C\t\t\tCompatible with Vi: 'compatible'"
msgstr "-C\t\t\tViŒÝŠ·ƒ‚[ƒh: 'compatible'"
-#: main.c:2496
+#: ../main.c:2609
msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
msgstr "-N\t\t\tVi”ñŒÝŠ·ƒ‚[ƒh: 'nocompatible"
-#: main.c:2497
+#: ../main.c:2610
msgid "-V[N]\t\tVerbose level"
msgstr "-V[N]\t\tVerbose ƒŒƒxƒ‹"
-#: main.c:2498
+#: ../main.c:2611
msgid "-D\t\t\tDebugging mode"
msgstr "-D\t\t\tƒfƒoƒbƒOƒ‚[ƒh"
-#: main.c:2499
+#: ../main.c:2612
msgid "-n\t\t\tNo swap file, use memory only"
msgstr "-n\t\t\tƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ðŽg—p‚¹‚¸ƒƒ‚ƒŠ‚¾‚¯"
-#: main.c:2500
+#: ../main.c:2613
msgid "-r\t\t\tList swap files and exit"
msgstr "-r\t\t\tƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ð—ñ‹“‚µI—¹"
-#: main.c:2501
+#: ../main.c:2614
msgid "-r (with file name)\tRecover crashed session"
msgstr "-r (ƒtƒ@ƒCƒ‹–¼)\tƒNƒ‰ƒbƒVƒ…‚µ‚½ƒZƒbƒVƒ‡ƒ“‚𕜋A"
-#: main.c:2502
+#: ../main.c:2615
msgid "-L\t\t\tSame as -r"
msgstr "-L\t\t\t-r‚Æ“¯‚¶"
-#: main.c:2504
+#: ../main.c:2617
msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\tƒEƒBƒ“ƒhƒE‚ðŠJ‚­‚Ì‚É newcli ‚ðŽg—p‚µ‚È‚¢"
-#: main.c:2505
+#: ../main.c:2618
msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <device>\t\tI/O‚É <device> ‚ðŽg—p‚·‚é"
-#: main.c:2508
+#: ../main.c:2621
msgid "-A\t\t\tstart in Arabic mode"
msgstr "-A\t\t\tƒAƒ‰ƒrƒAŒêƒ‚[ƒh‚Å‹N“®‚·‚é"
-#: main.c:2511
+#: ../main.c:2624
msgid "-H\t\t\tStart in Hebrew mode"
msgstr "-H\t\t\tƒwƒuƒ‰ƒCŒêƒ‚[ƒh‚Å‹N“®‚·‚é"
-#: main.c:2514
+#: ../main.c:2627
msgid "-F\t\t\tStart in Farsi mode"
msgstr "-F\t\t\tƒyƒ‹ƒVƒAŒêƒ‚[ƒh‚Å‹N“®‚·‚é"
-#: main.c:2516
+#: ../main.c:2629
msgid "-T <terminal>\tSet terminal type to <terminal>"
msgstr "-T <terminal>\t’[––‚ð <terminal> ‚ÉÝ’è‚·‚é"
-#: main.c:2517
+#: ../main.c:2630
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
msgstr "-u <vimrc>\t\t.vimrc‚Ì‘ã‚í‚è‚É <vimrc> ‚ðŽg‚¤"
-#: main.c:2519
+#: ../main.c:2632
msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
msgstr "-U <gvimrc>\t\t.gvimrc‚Ì‘ã‚í‚è‚É <gvimrc> ‚ðŽg‚¤"
-#: main.c:2521
+#: ../main.c:2634
msgid "--noplugin\t\tDon't load plugin scripts"
msgstr "--noplugin\t\tƒvƒ‰ƒOƒCƒ“ƒXƒNƒŠƒvƒg‚ðƒ[ƒh‚µ‚È‚¢"
-#: main.c:2522
+#: ../main.c:2635
msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "-o[N]\t\tN ŒÂƒEƒBƒ“ƒhƒE‚ðŠJ‚­(È—ª’l: ƒtƒ@ƒCƒ‹‚ɂ‚«1ŒÂ)"
-#: main.c:2523
+#: ../main.c:2636
msgid "-O[N]\t\tLike -o but split vertically"
msgstr "-O[N]\t\t-o‚Æ“¯‚¶‚¾‚ª‚’¼•ªŠ„"
-#: main.c:2524
+#: ../main.c:2637
msgid "+\t\t\tStart at end of file"
msgstr "+\t\t\tƒtƒ@ƒCƒ‹‚ÌŌォ‚ç‚Í‚¶‚ß‚é"
-#: main.c:2525
+#: ../main.c:2638
msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "+<lnum>\t\t<lnum> s‚©‚ç‚Í‚¶‚ß‚é"
-#: main.c:2527
+#: ../main.c:2640
msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
msgstr "--cmd <command>\tvimrc‚ðƒ[ƒh‚·‚é‘O‚É <command> ‚ðŽÀs‚·‚é"
-#: main.c:2529
+#: ../main.c:2642
msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "-c <command>\t\tʼn‚̃tƒ@ƒCƒ‹‚ðƒ[ƒhŒã <command> ‚ðŽÀs‚·‚é"
-#: main.c:2530
+#: ../main.c:2643
msgid "-S <session>\t\tSource file <session> after loading the first file"
msgstr "-S <session>\t\tʼn‚̃tƒ@ƒCƒ‹‚ðƒ[ƒhŒãƒtƒ@ƒCƒ‹ <session> ‚ðŽæž‚Þ"
-#: main.c:2531
+#: ../main.c:2644
msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
msgstr "-s <scriptin>\tƒtƒ@ƒCƒ‹ <scriptin> ‚©‚çƒm[ƒ}ƒ‹ƒRƒ}ƒ“ƒh‚ð“Çž‚Þ"
-#: main.c:2532
+#: ../main.c:2645
msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
msgstr "-w <scriptout>\t“ü—Í‚µ‚½‘SƒRƒ}ƒ“ƒh‚ðƒtƒ@ƒCƒ‹ <scriptout> ‚ɒljÁ‚·‚é"
-#: main.c:2533
+#: ../main.c:2646
msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
msgstr "-W <scriptout>\t“ü—Í‚µ‚½‘SƒRƒ}ƒ“ƒh‚ðƒtƒ@ƒCƒ‹ <scriptout> ‚É•Û‘¶‚·‚é"
-#: main.c:2535
+#: ../main.c:2648
msgid "-x\t\t\tEdit encrypted files"
msgstr "-x\t\t\tˆÃ†‰»‚³‚ꂽƒtƒ@ƒCƒ‹‚ð•ÒW‚·‚é"
-#: main.c:2539
+#: ../main.c:2652
msgid "-display <display>\tConnect vim to this particular X-server"
msgstr "-display <display>\tvim‚ðŽw’肵‚½ X ƒT[ƒo‚ÉÚ‘±‚·‚é"
-#: main.c:2541
+#: ../main.c:2654
msgid "-X\t\t\tDo not connect to X server"
msgstr "-X\t\t\tXƒT[ƒo‚ÉÚ‘±‚µ‚È‚¢"
-#: main.c:2544
+#: ../main.c:2657
msgid "--remote <files>\tEdit <files> in a Vim server if possible"
msgstr "--remote <files>\t‰Â”\\‚È‚ç‚ÎVimƒT[ƒo‚Å <files> ‚ð•ÒW‚·‚é"
-#: main.c:2545
+#: ../main.c:2658
msgid "--remote-silent <files> Same, don't complain if there is no server"
msgstr "--remote-silnet <files> “¯ã, ƒT[ƒo‚ª–³‚­‚Ä‚àŒx•¶‚ðo—Í‚µ‚È‚¢"
-#: main.c:2546
+#: ../main.c:2659
msgid ""
"--remote-wait <files> As --remote but wait for files to have been edited"
msgstr "--remote-wait <files>\t--remoteŒã ƒtƒ@ƒCƒ‹‚Ì•ÒW‚ªI‚í‚é‚Ì‚ð‘Ò‚Â"
-#: main.c:2547
+#: ../main.c:2660
msgid ""
"--remote-wait-silent <files> Same, don't complain if there is no server"
msgstr "--remote-wait-silent <files> “¯ã, ƒT[ƒo‚ª–³‚­‚Ä‚àŒx•¶‚ðo—Í‚µ‚È‚¢"
-#: main.c:2548
+#: ../main.c:2661
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\tVimƒT[ƒo‚É <keys> ‚ð‘—M‚µ‚ÄI—¹‚·‚é"
-#: main.c:2549
+#: ../main.c:2662
msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
msgstr "--remote-expr <expr>\tƒT[ƒo‚Å <expr> ‚ðŽÀs‚µ‚ÄŒ‹‰Ê‚ð•\\Ž¦‚·‚é"
-#: main.c:2550
+#: ../main.c:2663
msgid "--serverlist\t\tList available Vim server names and exit"
msgstr "--serverlist\t\tVimƒT[ƒo–¼‚̈ꗗ‚ð•\\Ž¦‚µ‚ÄI—¹‚·‚é"
-#: main.c:2551
+#: ../main.c:2664
msgid "--servername <name>\tSend to/become the Vim server <name>"
msgstr "--servename <name>\t\tVimƒT[ƒo <name> ‚É‘—M/–¼‘OÝ’è‚·‚é"
-#: main.c:2554
+#: ../main.c:2667
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfo‚Ì‘ã‚í‚è‚É <viminfo> ‚ðŽg‚¤"
-#: main.c:2556
+#: ../main.c:2669
msgid "-h or --help\tPrint Help (this message) and exit"
msgstr "-h or --help\tƒwƒ‹ƒv(‚±‚̃ƒbƒZ[ƒW)‚ð•\\Ž¦‚µI—¹‚·‚é"
-#: main.c:2557
+#: ../main.c:2670
msgid "--version\t\tPrint version information and exit"
msgstr "--version\t\tƒo[ƒWƒ‡ƒ“î•ñ‚ð•\\Ž¦‚µI—¹‚·‚é"
-#: main.c:2561
+#: ../main.c:2674
msgid ""
"\n"
"Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
"\n"
"gvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(Motifƒo[ƒWƒ‡ƒ“):\n"
-#: main.c:2565
+#: ../main.c:2678
msgid ""
"\n"
"Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
"\n"
"gvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(neXtawƒo[ƒWƒ‡ƒ“):\n"
-#: main.c:2567
+#: ../main.c:2680
msgid ""
"\n"
"Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
"\n"
"gvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(Athenaƒo[ƒWƒ‡ƒ“):\n"
-#: main.c:2571
+#: ../main.c:2684
msgid "-display <display>\tRun vim on <display>"
msgstr "-display <display>\t<display> ‚Åvim‚ðŽÀs‚·‚é"
-#: main.c:2572
+#: ../main.c:2685
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\tŬ‰»‚µ‚½ó‘Ô‚Åvim‚ð‹N“®‚·‚é"
-#: main.c:2574
+#: ../main.c:2687
msgid "-name <name>\t\tUse resource as if vim was <name>"
msgstr "-name <name>\t\tvim‚Ì–¼‚ª <name> ‚Å‚ ‚é‚Æ‚µ‚ăŠƒ\\[ƒX‚ðŽg‚¤"
-#: main.c:2575
+#: ../main.c:2688
msgid "\t\t\t (Unimplemented)\n"
msgstr "\t\t\t (ŽÀ‘•‚³‚ê‚Ä‚¢‚È‚¢)\n"
-#: main.c:2577
+#: ../main.c:2690
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr "-background <color>\t”wŒiF‚É <color> ‚ðŽg‚¤(“¯‹`: -bg)"
-#: main.c:2578
+#: ../main.c:2691
msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
msgstr "-foreground <color>\t‘OŒiF‚É <color> ‚ðŽg‚¤(“¯‹`: -fg)"
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
msgstr "-font <font>\t\tƒeƒLƒXƒg•\\Ž¦‚É <font> ‚ðŽg‚¤(“¯‹`: -fn)"
-#: main.c:2580
+#: ../main.c:2693
msgid "-boldfont <font>\tUse <font> for bold text"
msgstr "-boldfont <font>\t‘¾Žš‚É <font> ‚ðŽg‚¤"
-#: main.c:2581
+#: ../main.c:2694
msgid "-italicfont <font>\tUse <font> for italic text"
msgstr "-italicfont <for>\tŽÎ‘ÌŽš‚É <font> ‚ðŽg‚¤"
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
msgstr "-geometry <geom>\t‰Šú”z’u‚É <geom> ‚ðŽg‚¤(“¯‹`: -geom)"
-#: main.c:2583
+#: ../main.c:2696
msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
msgstr "-borderwidth <width>\t‹«ŠE‚Ì•‚ð <width> ‚É‚·‚é(“¯‹`: -bw)"
-#: main.c:2584
+#: ../main.c:2697
msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
msgstr ""
"-scrollbarwidth <width> ƒXƒNƒ[ƒ‹ƒo[‚Ì•‚ð <width> ‚É‚·‚é(“¯‹`: -sw)"
-#: main.c:2586
+#: ../main.c:2699
msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
msgstr "-menuheight <height>\tƒƒjƒ…[ƒo[‚Ì‚‚³‚ð <height> ‚É‚·‚é(“¯‹`: -mh)"
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
msgid "-reverse\t\tUse reverse video (also: -rv)"
msgstr "-reverse\t\t”½“]‰f‘œ‚ðŽg—p‚·‚é(“¯‹`: -rv)"
-#: main.c:2589
+#: ../main.c:2702
msgid "+reverse\t\tDon't use reverse video (also: +rv)"
msgstr "+reverse\t\t”½“]‰f‘œ‚ðŽg—p‚µ‚È‚¢(“¯‹`: +rv)"
-#: main.c:2590
+#: ../main.c:2703
msgid "-xrm <resource>\tSet the specified resource"
msgstr "-xrm <resource>\t“Á’è‚̃Šƒ\\[ƒX‚ðŽg—p‚·‚é"
-#: main.c:2593
+#: ../main.c:2706
msgid ""
"\n"
"Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
"\n"
"gvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(RISC OSƒo[ƒWƒ‡ƒ“):\n"
-#: main.c:2594
+#: ../main.c:2707
msgid "--columns <number>\tInitial width of window in columns"
msgstr "--columns <number>\t‰Šú‚̃EƒBƒ“ƒhƒE‚̃Rƒ‰ƒ€’PˆÊ‚Ì•"
-#: main.c:2595
+#: ../main.c:2708
msgid "--rows <number>\tInitial height of window in rows"
msgstr "--rows <number>\t‰Šú‚̃EƒBƒ“ƒhƒE‚Ìs’PˆÊ‚Ì‚‚³"
-#: main.c:2598
+#: ../main.c:2711
msgid ""
"\n"
"Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
"\n"
"gvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(GTK+ƒo[ƒWƒ‡ƒ“):\n"
-#: main.c:2602
+#: ../main.c:2715
msgid "-display <display>\tRun vim on <display> (also: --display)"
msgstr "-display <display>\t<display> ‚Åvim‚ðŽÀs‚·‚é(“¯‹`: --display)"
-#: main.c:2604
+#: ../main.c:2717
msgid "--role <role>\tSet a unique role to identify the main window"
msgstr "--role <role>\tƒƒCƒ“ƒEƒBƒ“ƒhƒE‚ðŽ¯•Ê‚·‚éˆêˆÓ‚È–ðŠ„(role)‚ðÝ’è‚·‚é"
-#: main.c:2606
+#: ../main.c:2719
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\tˆÙ‚È‚éGTK widget‚ÅVim‚ðŠJ‚­"
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvim‚É‚æ‚Á‚ĉðŽß‚³‚ê‚éˆø”(KDEƒo[ƒWƒ‡ƒ“):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\t”½“]‰æ–Ê‚ðŽg—p‚·‚é"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\t‹N“®Žž‚Ƀ`ƒbƒvƒ_ƒCƒAƒƒO‚ð•\\Ž¦‚·‚é"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\tƒ`ƒbƒvƒ_ƒCƒAƒƒO‚𖳌ø‚É‚·‚é"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> ‚Åvim‚ðŽÀs‚·‚é"
+
+#: ../main.c:2733
msgid "-P <parent title>\tOpen Vim inside parent application"
msgstr "-P <e‚̃^ƒCƒgƒ‹>\tVim‚ðeƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Ì’†‚Å‹N“®‚·‚é"
# msgid "--help\t\tShow Gnome arguments"
# msgstr "--help\t\tGNOME‚̈ø”‚ðŒ©‚¹‚é"
-#: main.c:2847
+#: ../main.c:2971
msgid "No display"
msgstr "ƒfƒBƒXƒvƒŒƒC‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
#. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
msgid ": Send failed.\n"
msgstr ": ‘—M‚ÉŽ¸”s‚µ‚Ü‚µ‚½.\n"
#. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
msgid ": Send failed. Trying to execute locally\n"
msgstr ": ‘—M‚ÉŽ¸”s‚µ‚Ü‚µ‚½. ƒ[ƒJƒ‹‚Å‚ÌŽÀs‚ðŽŽ‚Ý‚Ä‚¢‚Ü‚·\n"
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
#, c-format
msgid "%d of %d edited"
msgstr "%d ŒÂ (%d ŒÂ’†) ‚̃tƒ@ƒCƒ‹‚ð•ÒW‚µ‚Ü‚µ‚½"
-#: main.c:2949
+#: ../main.c:3073
msgid "No display: Send expression failed.\n"
msgstr "ƒfƒBƒXƒvƒŒƒC‚ª‚ ‚è‚Ü‚¹‚ñ: Ž®‚Ì‘—M‚ÉŽ¸”s‚µ‚Ü‚µ‚½.\n"
-#: main.c:2961
+#: ../main.c:3085
msgid ": Send expression failed.\n"
msgstr ": Ž®‚Ì‘—M‚ÉŽ¸”s‚µ‚Ü‚µ‚½.\n"
-#: mark.c:709
+#: ../mark.c:705
msgid "No marks set"
msgstr "ƒ}[ƒN‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: mark.c:711
+#: ../mark.c:707
#, c-format
msgid "E283: No marks matching \"%s\""
msgstr "E283: \"%s\" ‚ÉŠY“–‚·‚éƒ}[ƒN‚ª‚ ‚è‚Ü‚¹‚ñ"
#. Highlight title
-#: mark.c:722
+#: ../mark.c:718
msgid ""
"\n"
"mark line col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
"mark s —ñ ƒtƒ@ƒCƒ‹/ƒeƒLƒXƒg"
#. Highlight title
-#: mark.c:760
+#: ../mark.c:841
msgid ""
"\n"
" jump line col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
" jump s —ñ ƒtƒ@ƒCƒ‹/ƒeƒLƒXƒg"
#. Highlight title
-#: mark.c:805
+#: ../mark.c:886
msgid ""
"\n"
"change line col text"
@@ -3428,7 +3909,7 @@ msgstr ""
"\n"
"•ÏX s —ñ ƒeƒLƒXƒg"
-#: mark.c:1281
+#: ../mark.c:1362
msgid ""
"\n"
"# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
"# ƒtƒ@ƒCƒ‹ƒ}[ƒN:\n"
#. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
"\n"
"# ƒWƒƒƒ“ƒvƒŠƒXƒg (V‚µ‚¢‚à‚Ì‚ªæ):\n"
-#: mark.c:1412
+#: ../mark.c:1493
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
"\n"
"# ƒtƒ@ƒCƒ‹“àƒ}[ƒN‚Ì—š—ð (V‚µ‚¢‚à‚Ì‚©‚çŒÃ‚¢‚à‚Ì):\n"
-#: mark.c:1501
+#: ../mark.c:1582
msgid "Missing '>'"
msgstr "'>' ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: mbyte.c:467
+#: ../mbyte.c:470
msgid "E543: Not a valid codepage"
msgstr "E543: –³Œø‚ȃR[ƒhƒy[ƒW‚Å‚·"
-#: mbyte.c:4431
+#: ../mbyte.c:4513
msgid "E284: Cannot set IC values"
msgstr "E284: IC‚Ì’l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-#: mbyte.c:4583
+#: ../mbyte.c:4669
msgid "E285: Failed to create input context"
msgstr "E285: ƒCƒ“ƒvƒbƒgƒRƒ“ƒeƒLƒXƒg‚Ì쬂Ɏ¸”s‚µ‚Ü‚µ‚½"
-#: mbyte.c:4741
+#: ../mbyte.c:4827
msgid "E286: Failed to open input method"
msgstr "E286: ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒh‚̃I[ƒvƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: mbyte.c:4752
+#: ../mbyte.c:4838
msgid "E287: Warning: Could not set destroy callback to IM"
msgstr "E287: Œx: IM‚Ì”j‰óƒR[ƒ‹ƒoƒbƒN‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: mbyte.c:4758
+#: ../mbyte.c:4844
msgid "E288: input method doesn't support any style"
msgstr "E288: ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒh‚Í‚Ç‚ñ‚ȃXƒ^ƒCƒ‹‚àƒTƒ|[ƒg‚µ‚Ü‚¹‚ñ"
-#: mbyte.c:4815
+#: ../mbyte.c:4901
msgid "E289: input method doesn't support my preedit type"
msgstr "E289: ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒh‚Í my preedit type ‚ðƒTƒ|[ƒg‚µ‚Ü‚¹‚ñ"
-#: mbyte.c:4889
+#: ../mbyte.c:4975
msgid "E290: over-the-spot style requires fontset"
msgstr "E290: over-the-spot ƒXƒ^ƒCƒ‹‚É‚Ífontset‚ª•K—v‚Å‚·"
-#: mbyte.c:4925
+#: ../mbyte.c:5011
msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
msgstr "E291: GTK+‚ª1.2.3‚æ‚è‚àŒÃ‚¢‚̂ŃXƒe[ƒ^ƒXƒGƒŠƒA‚ª–³Œø‚Å‚·"
-#: mbyte.c:5232
+#: ../mbyte.c:5318
msgid "E292: Input Method Server is not running"
msgstr "E292: ƒCƒ“ƒvƒbƒgƒƒ\\ƒbƒhƒT[ƒo ‚ª“®ì‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: memfile.c:488
+#: ../memfile.c:488
msgid "E293: block was not locked"
msgstr "E293: ƒuƒƒbƒN‚ªƒƒbƒN‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: memfile.c:1005
+#: ../memfile.c:1010
msgid "E294: Seek error in swap file read"
msgstr "E294: ƒXƒƒbƒvƒtƒ@ƒCƒ‹“ÇžŽž‚ɃV[ƒNƒGƒ‰[‚Å‚·"
-#: memfile.c:1010
+#: ../memfile.c:1015
msgid "E295: Read error in swap file"
msgstr "E295: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚Ì“Çž‚݃Gƒ‰[‚Å‚·"
-#: memfile.c:1062
+#: ../memfile.c:1067
msgid "E296: Seek error in swap file write"
msgstr "E296: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‘ž‚ÝŽž‚ɃV[ƒNƒGƒ‰[‚Å‚·"
-#: memfile.c:1080
+#: ../memfile.c:1085
msgid "E297: Write error in swap file"
msgstr "E297: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚Ì‘ž‚݃Gƒ‰[‚Å‚·"
-#: memfile.c:1277
+#: ../memfile.c:1282
msgid "E300: Swap file already exists (symlink attack?)"
msgstr "E300: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ªŠù‚É‘¶Ý‚µ‚Ü‚· (symlink‚É‚æ‚éUŒ‚?)"
-#: memline.c:275
+#: ../memline.c:310
msgid "E298: Didn't get block nr 0?"
msgstr "E298: ƒuƒƒbƒN 0 ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ?"
-#: memline.c:315
+#: ../memline.c:351
msgid "E298: Didn't get block nr 1?"
msgstr "E298: ƒuƒƒbƒN 1 ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ?"
-#: memline.c:333
+#: ../memline.c:369
msgid "E298: Didn't get block nr 2?"
msgstr "E298: ƒuƒƒbƒN 2 ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ?"
#. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: ../memline.c:482
msgid "E301: Oops, lost the swap file!!!"
msgstr "E301: ‚¨‚Á‚Æ, ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ªŽ¸‚í‚ê‚Ü‚µ‚½!!!"
-#: memline.c:448
+#: ../memline.c:487
msgid "E302: Could not rename swap file"
msgstr "E302: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ð•Ï‚¦‚ç‚ê‚Ü‚¹‚ñ"
-#: memline.c:518
+#: ../memline.c:559
#, c-format
msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
msgstr "E303: \"%s\" ‚̃Xƒƒbƒvƒtƒ@ƒCƒ‹‚ðŠJ‚¯‚È‚¢‚̂ŃŠƒJƒoƒŠ‚Í•s‰Â”\\‚Å‚·"
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: ƒuƒƒbƒN 0 ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): ƒuƒƒbƒN 0 ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½??"
-#: memline.c:757
+#: ../memline.c:872
#, c-format
msgid "E305: No swap file found for %s"
msgstr "E305: %s ‚ɂ̓Xƒƒbƒvƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: memline.c:767
+#: ../memline.c:882
msgid "Enter number of swap file to use (0 to quit): "
msgstr "Žg—p‚·‚éƒXƒƒbƒvƒtƒ@ƒCƒ‹‚̔Ԇ‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢(0 ‚ÅI—¹): "
-#: memline.c:812
+#: ../memline.c:927
#, c-format
msgid "E306: Cannot open %s"
msgstr "E306: %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: memline.c:834
+#: ../memline.c:949
msgid "Unable to read block 0 from "
msgstr "ƒuƒƒbƒN 0 ‚ð“Çž‚ß‚Ü‚¹‚ñ "
-#: memline.c:837
+#: ../memline.c:952
msgid ""
"\n"
"Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
"\n"
"‹°‚ç‚­•ÏX‚ª‚³‚ê‚Ä‚¢‚È‚¢‚©Vim‚ªƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ðXV‚µ‚Ä‚¢‚Ü‚¹‚ñ."
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
msgid " cannot be used with this version of Vim.\n"
msgstr " Vim‚Ì‚±‚̃o[ƒWƒ‡ƒ“‚Å‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ.\n"
-#: memline.c:849
+#: ../memline.c:964
msgid "Use Vim version 3.0.\n"
msgstr "Vim‚̃o[ƒWƒ‡ƒ“3.0‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢.\n"
-#: memline.c:855
+#: ../memline.c:970
#, c-format
msgid "E307: %s does not look like a Vim swap file"
msgstr "E307: %s ‚ÍVim‚̃Xƒƒbƒvƒtƒ@ƒCƒ‹‚Å‚Í‚È‚¢‚悤‚Å‚·"
-#: memline.c:868
+#: ../memline.c:983
msgid " cannot be used on this computer.\n"
msgstr " ‚±‚̃Rƒ“ƒsƒ…[ƒ^‚Å‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ.\n"
-#: memline.c:870
+#: ../memline.c:985
msgid "The file was created on "
msgstr "‚±‚̃tƒ@ƒCƒ‹‚ÍŽŸ‚ÌꊂÅì‚ç‚ê‚Ü‚µ‚½ "
-#: memline.c:874
+#: ../memline.c:989
msgid ""
",\n"
"or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
",\n"
"‚à‚µ‚­‚̓tƒ@ƒCƒ‹‚ª‘¹‚µ‚Ä‚¢‚Ü‚·."
-#: memline.c:903
+#: ../memline.c:1018
#, c-format
msgid "Using swap file \"%s\""
msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹ \"%s\" ‚ðŽg—p’†"
-#: memline.c:909
+#: ../memline.c:1024
#, c-format
msgid "Original file \"%s\""
msgstr "Œ´–{ƒtƒ@ƒCƒ‹ \"%s\""
-#: memline.c:922
+#: ../memline.c:1037
msgid "E308: Warning: Original file may have been changed"
msgstr "E308: Œx: Œ´–{ƒtƒ@ƒCƒ‹‚ª•ÏX‚³‚ê‚Ä‚¢‚Ü‚·"
-#: memline.c:975
+#: ../memline.c:1111
#, c-format
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: %s ‚©‚çƒuƒƒbƒN 1 ‚ð“Çž‚ß‚Ü‚¹‚ñ"
-#: memline.c:979
+#: ../memline.c:1115
msgid "???MANY LINES MISSING"
msgstr "???‘½‚­‚Ìs‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·"
-#: memline.c:995
+#: ../memline.c:1131
msgid "???LINE COUNT WRONG"
msgstr "???s”‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
-#: memline.c:1002
+#: ../memline.c:1138
msgid "???EMPTY BLOCK"
msgstr "???ƒuƒƒbƒN‚ª‹ó‚Å‚·"
-#: memline.c:1028
+#: ../memline.c:1164
msgid "???LINES MISSING"
msgstr "???s‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·"
-#: memline.c:1060
+#: ../memline.c:1196
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
msgstr "E310: ƒuƒƒbƒN 1 ‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·(%s ‚ª.swpƒtƒ@ƒCƒ‹‚Å‚È‚¢?)"
-#: memline.c:1065
+#: ../memline.c:1201
msgid "???BLOCK MISSING"
msgstr "???ƒuƒƒbƒN‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: memline.c:1081
+#: ../memline.c:1217
msgid "??? from here until ???END lines may be messed up"
msgstr "??? ‚±‚±‚©‚ç???END‚Ü‚Å‚Ìs‚ª”j‰ó‚³‚ê‚Ä‚¢‚é‚悤‚Å‚·"
-#: memline.c:1097
+#: ../memline.c:1233
msgid "??? from here until ???END lines may have been inserted/deleted"
msgstr "??? ‚±‚±‚©‚ç??END‚Ü‚Å‚Ìs‚ª‘}“ü‚©íœ‚³‚ꂽ‚悤‚Å‚·"
-#: memline.c:1117
+#: ../memline.c:1253
msgid "???END"
msgstr "???END"
-#: memline.c:1143
+#: ../memline.c:1279
msgid "E311: Recovery Interrupted"
msgstr "E311: ƒŠƒJƒoƒŠ‚ªŠ„ž‚Ü‚ê‚Ü‚µ‚½"
-#: memline.c:1148
+#: ../memline.c:1284
msgid ""
"E312: Errors detected while recovering; look for lines starting with ???"
msgstr ""
"E312: ƒŠƒJƒoƒŠ‚ÌÅ’†‚ɃGƒ‰[‚ªŒŸo‚³‚ê‚Ü‚µ‚½; ???‚ÅŽn‚Ü‚és‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢"
-#: memline.c:1150
+#: ../memline.c:1286
msgid "See \":help E312\" for more information."
msgstr "Ú×‚Í \":help E312\" ‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢"
-#: memline.c:1155
+#: ../memline.c:1291
msgid "Recovery completed. You should check if everything is OK."
msgstr "ƒŠƒJƒoƒŠ‚ªI—¹‚µ‚Ü‚µ‚½. ‘S‚Ä‚ª³‚µ‚¢‚©ƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢."
-#: memline.c:1156
+#: ../memline.c:1292
msgid ""
"\n"
"(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
"\n"
"(•ÏX‚ðƒ`ƒFƒbƒN‚·‚邽‚ß‚É, ‚±‚̃tƒ@ƒCƒ‹‚ð•Ê‚Ì–¼‘O‚Å•Û‘¶‚µ‚½ã‚Å\n"
-#: memline.c:1157
+#: ../memline.c:1293
msgid "and run diff with the original file to check for changes)\n"
msgstr "Œ´–{ƒtƒ@ƒCƒ‹‚Æ‚Ì diff ‚ðŽÀs‚·‚é‚Æ—Ç‚¢‚Å‚µ‚傤)\n"
-#: memline.c:1158
+#: ../memline.c:1294
msgid ""
"Delete the .swp file afterwards.\n"
"\n"
@@ -3701,51 +4182,51 @@ msgstr ""
"\n"
#. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
msgid "Swap files found:"
msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ª•¡”Œ©‚‚©‚è‚Ü‚µ‚½:"
-#: memline.c:1392
+#: ../memline.c:1528
msgid " In current directory:\n"
msgstr " Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ:\n"
-#: memline.c:1394
+#: ../memline.c:1530
msgid " Using specified name:\n"
msgstr " ‚ ‚é–¼‘O‚ðŽg—p’†:\n"
-#: memline.c:1398
+#: ../memline.c:1534
msgid " In directory "
msgstr " ƒfƒBƒŒƒNƒgƒŠ "
-#: memline.c:1416
+#: ../memline.c:1552
msgid " -- none --\n"
msgstr " -- ‚È‚µ --\n"
-#: memline.c:1488
+#: ../memline.c:1625
msgid " owned by: "
msgstr " Š—LŽÒ: "
-#: memline.c:1490
+#: ../memline.c:1627
msgid " dated: "
msgstr " “ú•t: "
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
msgid " dated: "
msgstr " “ú•t: "
-#: memline.c:1510
+#: ../memline.c:1647
msgid " [from Vim version 3.0]"
msgstr " [from Vim version 3.0]"
-#: memline.c:1514
+#: ../memline.c:1651
msgid " [does not look like a Vim swap file]"
msgstr " [Vim‚̃Xƒƒbƒvƒtƒ@ƒCƒ‹‚Å‚Í‚È‚¢‚悤‚Å‚·]"
-#: memline.c:1518
+#: ../memline.c:1655
msgid " file name: "
msgstr " ƒtƒ@ƒCƒ‹–¼: "
-#: memline.c:1524
+#: ../memline.c:1661
msgid ""
"\n"
" modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
"\n"
" •ÏXó‘Ô: "
-#: memline.c:1525
+#: ../memline.c:1662
msgid "YES"
msgstr "‚ ‚è"
-#: memline.c:1525
+#: ../memline.c:1662
msgid "no"
msgstr "‚È‚µ"
-#: memline.c:1529
+#: ../memline.c:1666
msgid ""
"\n"
" user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
"\n"
" ƒ†[ƒU–¼: "
-#: memline.c:1536
+#: ../memline.c:1673
msgid " host name: "
msgstr " ƒzƒXƒg–¼: "
-#: memline.c:1538
+#: ../memline.c:1675
msgid ""
"\n"
" host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
"\n"
" ƒzƒXƒg–¼: "
-#: memline.c:1544
+#: ../memline.c:1681
msgid ""
"\n"
" process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
"\n"
" ƒvƒƒZƒXID: "
-#: memline.c:1550
+#: ../memline.c:1687
msgid " (still running)"
msgstr " (‚Ü‚¾ŽÀs’†)"
-#: memline.c:1562
+#: ../memline.c:1699
msgid ""
"\n"
" [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
"\n"
" [‚±‚ÌVimƒo[ƒWƒ‡ƒ“‚Å‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ]"
-#: memline.c:1565
+#: ../memline.c:1702
msgid ""
"\n"
" [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
"\n"
" [‚±‚̃Rƒ“ƒsƒ…[ƒ^‚Å‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñ]"
-#: memline.c:1570
+#: ../memline.c:1707
msgid " [cannot be read]"
msgstr " [“Çž‚ß‚Ü‚¹‚ñ]"
-#: memline.c:1574
+#: ../memline.c:1711
msgid " [cannot be opened]"
msgstr " [ŠJ‚¯‚Ü‚¹‚ñ]"
-#: memline.c:1764
+#: ../memline.c:1901
msgid "E313: Cannot preserve, there is no swap file"
msgstr "E313: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ª–³‚¢‚̂ňێ‚Å‚«‚Ü‚¹‚ñ"
-#: memline.c:1817
+#: ../memline.c:1954
msgid "File preserved"
msgstr "ƒtƒ@ƒCƒ‹‚ªˆÛŽ‚³‚ê‚Ü‚·"
-#: memline.c:1819
+#: ../memline.c:1956
msgid "E314: Preserve failed"
msgstr "E314: ˆÛŽ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: memline.c:1890
+#: ../memline.c:2027
#, c-format
msgid "E315: ml_get: invalid lnum: %ld"
msgstr "E315: ml_get: –³Œø‚Èlnum‚Å‚·: %ld"
-#: memline.c:1916
+#: ../memline.c:2053
#, c-format
msgid "E316: ml_get: cannot find line %ld"
msgstr "E316: ml_get: s %ld ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: memline.c:2306
+#: ../memline.c:2443
msgid "E317: pointer block id wrong 3"
msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚· 3"
-#: memline.c:2386
+#: ../memline.c:2523
msgid "stack_idx should be 0"
msgstr "stack_idx ‚Í 0 ‚Å‚ ‚é‚ׂ«‚Å‚·"
-#: memline.c:2448
+#: ../memline.c:2585
msgid "E318: Updated too many blocks?"
-msgstr "E318: XV‚³‚ꂽƒuƒƒbƒN‚ª‘½‚·‚¬‚é‚©‚à?"
+msgstr "E318: XV‚³‚ꂽƒuƒƒbƒN‚ª‘½‰ß‚¬‚é‚©‚à?"
-#: memline.c:2630
+#: ../memline.c:2767
msgid "E317: pointer block id wrong 4"
msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚· 4"
-#: memline.c:2657
+#: ../memline.c:2794
msgid "deleted block 1?"
msgstr "ƒuƒƒbƒN 1 ‚ÍÁ‚³‚ꂽ?"
-#: memline.c:2857
+#: ../memline.c:2994
#, c-format
msgid "E320: Cannot find line %ld"
msgstr "E320: s %ld ‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: memline.c:3100
+#: ../memline.c:3237
msgid "E317: pointer block id wrong"
msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
-#: memline.c:3116
+#: ../memline.c:3253
msgid "pe_line_count is zero"
msgstr "pe_line_count ‚ªƒ[ƒ‚Å‚·"
-#: memline.c:3145
+#: ../memline.c:3282
#, c-format
msgid "E322: line number out of range: %ld past the end"
msgstr "E322: s”Ô†‚ª”͈͊O‚Å‚·: %ld ’´‚¦‚Ä‚¢‚Ü‚·"
-#: memline.c:3149
+#: ../memline.c:3286
#, c-format
msgid "E323: line count wrong in block %ld"
msgstr "E323: ƒuƒƒbƒN %ld ‚ÌsƒJƒEƒ“ƒg‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
-#: memline.c:3198
+#: ../memline.c:3335
msgid "Stack size increases"
msgstr "ƒXƒ^ƒbƒNƒTƒCƒY‚ª‘‚¦‚Ü‚·"
-#: memline.c:3244
+#: ../memline.c:3381
msgid "E317: pointer block id wrong 2"
msgstr "E317: ƒ|ƒCƒ“ƒ^ƒuƒƒbƒN‚ÌID‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚· 2"
-#: memline.c:3674
+#: ../memline.c:3827
msgid "E325: ATTENTION"
msgstr "E325: ’ˆÓ"
-#: memline.c:3675
+#: ../memline.c:3828
msgid ""
"\n"
"Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
"\n"
"ŽŸ‚Ì–¼‘O‚ŃXƒƒbƒvƒtƒ@ƒCƒ‹‚ðŒ©‚Â‚¯‚Ü‚µ‚½ \""
-#: memline.c:3679
+#: ../memline.c:3832
msgid "While opening file \""
msgstr "ŽŸ‚̃tƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‚¢‚éÅ’† \""
-#: memline.c:3688
+#: ../memline.c:3841
msgid " NEWER than swap file!\n"
msgstr " ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚æ‚è‚àV‚µ‚¢‚Å‚·!\n"
#. Some of these messages are long to allow translation to
#. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
msgid ""
"\n"
"(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
" ‚±‚ÌꇂɂÍ, •ÏX‚ð‚µ‚½Û‚ÉÅI“I‚É, “¯‚¶ƒtƒ@ƒCƒ‹‚̈قȂé\n"
" 2‚‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ª‚Å‚«‚Ä‚µ‚Ü‚¤‚±‚Æ‚É’ˆÓ‚µ‚Ä‚­‚¾‚³‚¢.\n"
-#: memline.c:3693
+#: ../memline.c:3846
msgid " Quit, or continue with caution.\n"
msgstr " I—¹‚·‚é‚©, ’ˆÓ‚µ‚È‚ª‚瑱‚¯‚Ü‚·.\n"
-#: memline.c:3694
+#: ../memline.c:3847
msgid ""
"\n"
"(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
"\n"
"(2) ‚±‚̃tƒ@ƒCƒ‹‚Ì•ÒWƒZƒbƒVƒ‡ƒ“‚ªƒNƒ‰ƒbƒVƒ…‚µ‚½.\n"
-#: memline.c:3695
+#: ../memline.c:3848
msgid " If this is the case, use \":recover\" or \"vim -r "
msgstr " ‚±‚Ìê‡‚É‚Í \":recover\" ‚© \"vim -r "
-#: memline.c:3697
+#: ../memline.c:3850
msgid ""
"\"\n"
" to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
"\"\n"
" ‚ðŽg—p‚µ‚Ä•ÏX‚ðƒŠƒJƒo[‚µ‚Ü‚·(\":help recover\" ‚ðŽQÆ).\n"
-#: memline.c:3698
+#: ../memline.c:3851
msgid " If you did this already, delete the swap file \""
msgstr " Šù‚É‚±‚ê‚ðs‚È‚Á‚½‚Ì‚È‚ç‚Î, ƒXƒƒbƒvƒtƒ@ƒCƒ‹ \""
-#: memline.c:3700
+#: ../memline.c:3853
msgid ""
"\"\n"
" to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
"\"\n"
" ‚ðÁ‚¹‚΂±‚̃ƒbƒZ[ƒW‚ð‰ñ”ð‚Å‚«‚Ü‚·.\n"
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
msgid "Swap file \""
msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹ \""
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
msgid "\" already exists!"
msgstr "\" ‚ªŠù‚É‚ ‚è‚Ü‚·!"
-#: memline.c:3724
+#: ../memline.c:3877
msgid "VIM - ATTENTION"
msgstr "VIM - ’ˆÓ"
-#: memline.c:3726
+#: ../memline.c:3879
msgid "Swap file already exists!"
msgstr "ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ªŠù‚É‘¶Ý‚µ‚Ü‚·!"
-#: memline.c:3730
+#: ../memline.c:3883
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
"I—¹‚·‚é(&Q)\n"
"’†Ž~‚·‚é(&A)"
-#: memline.c:3732
+#: ../memline.c:3885
msgid ""
"&Open Read-Only\n"
"&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
"’†Ž~‚·‚é(&A)\n"
"Á‹Ž‚·‚é(&D)"
-#: memline.c:3789
+#: ../memline.c:3942
msgid "E326: Too many swap files found"
msgstr "E326: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚ª‘½”Œ©‚‚©‚è‚Ü‚µ‚½"
-#: menu.c:64
+#: ../menu.c:64
msgid "E327: Part of menu-item path is not sub-menu"
msgstr "E327: ƒƒjƒ…[ƒAƒCƒeƒ€‚̃pƒX‚Ì•”•ª‚ªƒTƒuƒƒjƒ…[‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: menu.c:65
+#: ../menu.c:65
msgid "E328: Menu only exists in another mode"
msgstr "E328: ƒƒjƒ…[‚Í‘¼‚̃‚[ƒh‚É‚¾‚¯‚ ‚è‚Ü‚·"
-#: menu.c:66
+#: ../menu.c:66
msgid "E329: No menu of that name"
msgstr "E329: ‚»‚Ì–¼‘O‚̃ƒjƒ…[‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: menu.c:525
+#: ../menu.c:522
msgid "E330: Menu path must not lead to a sub-menu"
msgstr "E330: ƒƒjƒ…[ƒpƒX‚̓Tƒuƒƒjƒ…[‚𶂶‚é‚ׂ«‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: menu.c:564
+#: ../menu.c:561
msgid "E331: Must not add menu items directly to menu bar"
msgstr "E331: ƒƒjƒ…[ƒo[‚É‚Í’¼Úƒƒjƒ…[ƒAƒCƒeƒ€‚ð’ljÁ‚Å‚«‚Ü‚¹‚ñ"
-#: menu.c:570
+#: ../menu.c:567
msgid "E332: Separator cannot be part of a menu path"
msgstr "E332: ‹æØ‚è‚̓ƒjƒ…[ƒpƒX‚̈ꕔ‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
#. Now we have found the matching menu, and we list the mappings
#. Highlight title
-#: menu.c:1097
+#: ../menu.c:1093
msgid ""
"\n"
"--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
"\n"
"--- ƒƒjƒ…[ ---"
-#: menu.c:2019
+#: ../menu.c:2011
msgid "Tear off this menu"
msgstr "‚±‚̃ƒjƒ…[‚ðØ‚èŽæ‚é"
-#: menu.c:2084
+#: ../menu.c:2076
msgid "E333: Menu path must lead to a menu item"
msgstr "E333: ƒƒjƒ…[ƒpƒX‚̓ƒjƒ…[ƒAƒCƒeƒ€‚𶂶‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
-#: menu.c:2104
+#: ../menu.c:2096
#, c-format
msgid "E334: Menu not found: %s"
msgstr "E334: ƒƒjƒ…[‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
-#: menu.c:2173
+#: ../menu.c:2169
#, c-format
msgid "E335: Menu not defined for %s mode"
msgstr "E335: %s ‚ɂ̓ƒjƒ…[‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: menu.c:2211
+#: ../menu.c:2208
msgid "E336: Menu path must lead to a sub-menu"
msgstr "E336: ƒƒjƒ…[ƒpƒX‚̓Tƒuƒƒjƒ…[‚𶂶‚È‚¯‚ê‚΂¢‚¯‚Ü‚¹‚ñ"
-#: menu.c:2232
+#: ../menu.c:2229
msgid "E337: Menu not found - check menu names"
msgstr "E337: ƒƒjƒ…[‚ª‚݂‚©‚è‚Ü‚¹‚ñ - ƒƒjƒ…[–¼‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢"
-#: message.c:414
+#: ../message.c:429
#, c-format
msgid "Error detected while processing %s:"
msgstr "%s ‚̈—’†‚ɃGƒ‰[‚ªŒŸo‚³‚ê‚Ü‚µ‚½:"
-#: message.c:440
+#: ../message.c:454
#, c-format
msgid "line %4ld:"
msgstr "s %4ld:"
-#: message.c:647
+#: ../message.c:657
msgid "[string too long]"
-msgstr "[•¶Žš—ñ‚ª’·‚·‚¬‚Ü‚·]"
+msgstr "[•¶Žš—ñ‚ª’·‰ß‚¬‚Ü‚·]"
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: –³Œø‚ȃŒƒWƒXƒ^–¼: '%s'"
+
+#: ../message.c:814
msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
msgstr "“ú–{ŒêƒƒbƒZ[ƒW–|–ó/ŠÄC: ‘º‰ª ‘¾˜Y <koron@tka.att.ne.jp>"
-#: message.c:1025
+#: ../message.c:1040
msgid "Interrupt: "
msgstr "Š„ž‚Ý: "
-#: message.c:1028
+#: ../message.c:1043
msgid "Hit ENTER to continue"
msgstr "‘±‚¯‚é‚É‚ÍENTER‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢"
-#: message.c:1030
+#: ../message.c:1045
msgid "Hit ENTER or type command to continue"
msgstr "‘±‚¯‚é‚É‚ÍENTER‚ð‰Ÿ‚·‚©ƒRƒ}ƒ“ƒh‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢"
-#: message.c:2351
+#: ../message.c:2370
msgid "-- More --"
msgstr "-- Œp‘± --"
-#: message.c:2354
+#: ../message.c:2373
msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
msgstr " (RET/BS: s‘—‚è, SPACE/b: ƒy[ƒW‘—‚è, d/u: ”¼ƒy[ƒW‘—‚è, q: I—¹)"
-#: message.c:2355
+#: ../message.c:2374
msgid " (RET: line, SPACE: page, d: half page, q: quit)"
msgstr " (RET: s‘—‚è, SPACE: ƒy[ƒW‘—‚è, d: ”¼ƒy[ƒW‘—‚è, q: I—¹)"
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
msgid "Question"
msgstr "Ž¿–â"
-#: message.c:2978
+#: ../message.c:3001
msgid ""
"&Yes\n"
"&No"
@@ -4124,7 +4610,7 @@ msgstr ""
"‚Í‚¢(&Y)\n"
"‚¢‚¢‚¦(&N)"
-#: message.c:3011
+#: ../message.c:3034
msgid ""
"&Yes\n"
"&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
"‘S‚Ä•úŠü(&D)\n"
"ƒLƒƒƒ“ƒZƒ‹(&C)"
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "ƒfƒBƒŒƒNƒgƒŠ‘I‘ðƒ_ƒCƒAƒƒO"
+
+#: ../message.c:3077
msgid "Save File dialog"
msgstr "ƒtƒ@ƒCƒ‹•Û‘¶ƒ_ƒCƒAƒƒO"
-#: message.c:3054
+#: ../message.c:3079
msgid "Open File dialog"
msgstr "ƒtƒ@ƒCƒ‹“Çžƒ_ƒCƒAƒƒO"
#. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
msgid "E338: Sorry, no file browser in console mode"
msgstr "E338: ƒRƒ“ƒ\\[ƒ‹ƒ‚[ƒh‚ł̓tƒ@ƒCƒ‹ƒuƒ‰ƒEƒU‚ðŽg‚¦‚Ü‚¹‚ñ, ‚²‚ß‚ñ‚È‚³‚¢"
-#: misc1.c:2773
+#: ../misc1.c:2860
msgid "W10: Warning: Changing a readonly file"
msgstr "W10: Œx: “Çžê—pƒtƒ@ƒCƒ‹‚ð•ÏX‚µ‚Ü‚·"
-#: misc1.c:3021
+#: ../misc1.c:3113
msgid "1 more line"
msgstr "1 s ’ljÁ‚µ‚Ü‚µ‚½"
-#: misc1.c:3023
+#: ../misc1.c:3115
msgid "1 line less"
msgstr "1 s 휂µ‚Ü‚µ‚½"
-#: misc1.c:3028
+#: ../misc1.c:3120
#, c-format
msgid "%ld more lines"
msgstr "%ld s ’ljÁ‚µ‚Ü‚µ‚½"
-#: misc1.c:3030
+#: ../misc1.c:3122
#, c-format
msgid "%ld fewer lines"
msgstr "%ld s 휂µ‚Ü‚µ‚½"
-#: misc1.c:3033
+#: ../misc1.c:3125
msgid " (Interrupted)"
msgstr " (Š„ž‚Ü‚ê‚Ü‚µ‚½)"
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "ƒr[ƒb!"
+
+#: ../misc1.c:7814
msgid "Vim: preserving files...\n"
msgstr "Vim: ƒtƒ@ƒCƒ‹‚ð•Û‘¶’†...\n"
#. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
msgid "Vim: Finished.\n"
msgstr "Vim: I—¹‚µ‚Ü‚µ‚½.\n"
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
msgid "ERROR: "
msgstr "ƒGƒ‰[: "
-#: misc2.c:715
+#: ../misc2.c:710
#, c-format
msgid ""
"\n"
@@ -4199,7 +4693,7 @@ msgstr ""
"\n"
"[ƒƒ‚ƒŠ(ƒoƒCƒg)] ‘Š„“–-‰ð•ú—Ê %lu-%lu, Žg—p—Ê %lu, ƒs[ƒNŽž %lu\n"
-#: misc2.c:717
+#: ../misc2.c:712
#, c-format
msgid ""
"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
"[ŒÄo] ‘ re/malloc() ‰ñ” %lu, ‘ free() ‰ñ” %lu\n"
"\n"
-#: misc2.c:772
+#: ../misc2.c:767
msgid "E340: Line is becoming too long"
-msgstr "E340: s‚ª’·‚­‚È‚è‚·‚¬‚Ü‚µ‚½"
+msgstr "E340: s‚ª’·‚­‚È‚è‰ß‚¬‚Ü‚µ‚½"
-#: misc2.c:816
+#: ../misc2.c:811
#, c-format
msgid "E341: Internal error: lalloc(%ld, )"
msgstr "E341: “à•”ƒGƒ‰[: lalloc(%ld,)"
-#: misc2.c:924
+#: ../misc2.c:919
#, c-format
msgid "E342: Out of memory! (allocating %lu bytes)"
msgstr "E342: ƒƒ‚ƒŠ‚ª‘«‚è‚Ü‚¹‚ñ! (%lu ƒoƒCƒg‚ðŠ„“–—v‹)"
-#: misc2.c:2593
+#: ../misc2.c:2580
#, c-format
msgid "Calling shell to execute: \"%s\""
msgstr "ŽÀs‚Ì‚½‚߂ɃVƒFƒ‹‚ðŒÄo‚µ’†: \"%s\""
-#: misc2.c:2815
+#: ../misc2.c:2845
msgid "E545: Missing colon"
msgstr "E545: ƒRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
msgid "E546: Illegal mode"
msgstr "E546: •s³‚ȃ‚[ƒh‚Å‚·"
-#: misc2.c:2883
+#: ../misc2.c:2913
msgid "E547: Illegal mouseshape"
msgstr "E547: •s³‚È 'mouseshape' ‚Å‚·"
-#: misc2.c:2923
+#: ../misc2.c:2953
msgid "E548: digit expected"
msgstr "E548: ”’l‚ª•K—v‚Å‚·"
-#: misc2.c:2928
+#: ../misc2.c:2958
msgid "E549: Illegal percentage"
msgstr "E549: •s³‚ȃp[ƒZƒ“ƒe[ƒW‚Å‚·"
-#: misc2.c:3238
+#: ../misc2.c:3270
msgid "Enter encryption key: "
msgstr "ˆÃ†‰»—p‚̃L[‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢: "
-#: misc2.c:3239
+#: ../misc2.c:3271
msgid "Enter same key again: "
msgstr "‚à‚¤ˆê“x“¯‚¶ƒL[‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢: "
-#: misc2.c:3249
+#: ../misc2.c:3281
msgid "Keys don't match!"
msgstr "ƒL[‚ªˆê’v‚µ‚Ü‚¹‚ñ"
-#: misc2.c:3798
+#: ../misc2.c:3825
#, c-format
msgid ""
"E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
"E343: –³Œø‚ȃpƒX‚Å‚·: '**[”’l]' ‚Ípath‚ÌŌォ '%s' "
"‚ª‘±‚¢‚Ä‚È‚¢‚Æ‚¢‚¯‚Ü‚¹‚ñ."
-#: misc2.c:5077
+#: ../misc2.c:5104
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
msgstr "E344: cdpath‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:5080
+#: ../misc2.c:5107
#, c-format
msgid "E345: Can't find file \"%s\" in path"
msgstr "E345: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:5086
+#: ../misc2.c:5113
#, c-format
msgid "E346: No more directory \"%s\" found in cdpath"
msgstr "E346: cdpath‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:5089
+#: ../misc2.c:5116
#, c-format
msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ƒpƒX‚É‚Í‚±‚êˆÈã \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:5323
+#: ../misc2.c:5356
msgid "E550: Missing colon"
msgstr "E550: ƒRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: misc2.c:5335
+#: ../misc2.c:5368
msgid "E551: Illegal component"
msgstr "E551: •s³‚È\\•¶—v‘f‚Å‚·"
-#: misc2.c:5343
+#: ../misc2.c:5376
msgid "E552: digit expected"
msgstr "E552: ”’l‚ª•K—v‚Å‚·"
#. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
msgid "Cannot connect to Netbeans #2"
msgstr "Netbeans #2 ‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñ"
-#: netbeans.c:404
+#: ../netbeans.c:417
msgid "Cannot connect to Netbeans"
msgstr "Netbeans ‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñ"
-#: netbeans.c:450
+#: ../netbeans.c:461
#, c-format
msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
msgstr ""
"E668: NetBeans‚ÌÚ‘±î•ñƒtƒ@ƒCƒ‹‚̃AƒNƒZƒXƒ‚[ƒh‚É–â‘肪‚ ‚è‚Ü‚·: \"%s\""
-#: netbeans.c:749
+#: ../netbeans.c:760
msgid "read from Netbeans socket"
msgstr "Netbeans ‚̃\\ƒPƒbƒg‚ð“Çž‚Ý"
-#: netbeans.c:1638
+#: ../netbeans.c:1680
#, c-format
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: ƒoƒbƒtƒ@ %ld ‚Ì NetBeans Ú‘±‚ªŽ¸‚í‚ê‚Ü‚µ‚½"
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
msgid "Warning: terminal cannot highlight"
msgstr "Œx: Žg—p‚µ‚Ä‚¢‚é’[––‚̓nƒCƒ‰ƒCƒg‚Å‚«‚Ü‚¹‚ñ"
-#: normal.c:3276
+#: ../normal.c:3293
msgid "E348: No string under cursor"
msgstr "E348: ƒJ[ƒ\\ƒ‹‚̈ʒu‚É‚Í•¶Žš—ñ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: normal.c:3278
+#: ../normal.c:3295
msgid "E349: No identifier under cursor"
msgstr "E349: ƒJ[ƒ\\ƒ‹‚̈ʒu‚É‚ÍŽ¯•ÊŽq‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: normal.c:4519
+#: ../normal.c:4537
msgid "E352: Cannot erase folds with current 'foldmethod'"
msgstr "E352: Œ»Ý‚Ì 'foldmethod' ‚Å‚ÍÜô‚Ý‚ðÁ‹Ž‚Å‚«‚Ü‚¹‚ñ"
-#: normal.c:6708
+#: ../normal.c:6808
msgid "E664: changelist is empty"
msgstr "E664: •ÏXƒŠƒXƒg‚ª‹ó‚Å‚·"
-#: normal.c:6710
+#: ../normal.c:6810
msgid "E662: At start of changelist"
msgstr "E662: •ÏXƒŠƒXƒg‚Ì擪"
-#: normal.c:6712
+#: ../normal.c:6812
msgid "E663: At end of changelist"
msgstr "E663: •ÏXƒŠƒXƒg‚Ì––”ö"
-#: normal.c:7973
+#: ../normal.c:8085
msgid "Type :quit<Enter> to exit Vim"
msgstr "Vim‚ðI—¹‚·‚é‚É‚Í :quit<Enter> ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢"
-#: ops.c:294
+#: ../ops.c:291
#, c-format
msgid "1 line %sed 1 time"
msgstr "1 s‚ª %s ‚Å 1 ‰ñˆ—‚³‚ê‚Ü‚µ‚½"
-#: ops.c:296
+#: ../ops.c:293
#, c-format
msgid "1 line %sed %d times"
msgstr "1 s‚ª %s ‚Å %d ‰ñˆ—‚³‚ê‚Ü‚µ‚½"
-#: ops.c:301
+#: ../ops.c:298
#, c-format
msgid "%ld lines %sed 1 time"
msgstr "%ld s‚ª %s ‚Å 1 ‰ñˆ—‚³‚ê‚Ü‚µ‚½"
-#: ops.c:304
+#: ../ops.c:301
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld s‚ª %s ‚Å %d ‰ñˆ—‚³‚ê‚Ü‚µ‚½"
-#: ops.c:662
+#: ../ops.c:659
#, c-format
msgid "%ld lines to indent... "
msgstr "%ld s‚ªƒCƒ“ƒfƒ“ƒg‚³‚ê‚Ü‚·... "
-#: ops.c:712
+#: ../ops.c:709
msgid "1 line indented "
msgstr "1 s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½"
-#: ops.c:714
+#: ../ops.c:711
#, c-format
msgid "%ld lines indented "
msgstr "%ld s‚ðƒCƒ“ƒfƒ“ƒg‚µ‚Ü‚µ‚½"
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: ‚Ü‚¾ƒŒƒWƒXƒ^‚ðŽg—p‚µ‚Ä‚¢‚Ü‚¹‚ñ"
+
#. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
msgid "cannot yank; delete anyway"
msgstr "ƒ„ƒ“ƒN‚Å‚«‚Ü‚¹‚ñ; ‚Æ‚É‚©‚­Á‹Ž"
-#: ops.c:2185
+#: ../ops.c:2223
msgid "1 line changed"
msgstr "1 s‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
-#: ops.c:2187
+#: ../ops.c:2225
#, c-format
msgid "%ld lines changed"
msgstr "%ld s‚ª•ÏX‚³‚ê‚Ü‚µ‚½"
-#: ops.c:2571
+#: ../ops.c:2609
#, c-format
msgid "freeing %ld lines"
msgstr "%ld s‚ðŠJ•ú’†"
-#: ops.c:2852
+#: ../ops.c:2891
msgid "1 line yanked"
msgstr "1 s‚ªƒ„ƒ“ƒN‚³‚ê‚Ü‚µ‚½"
-#: ops.c:2854
+#: ../ops.c:2893
#, c-format
msgid "%ld lines yanked"
msgstr "%ld s‚ªƒ„ƒ“ƒN‚³‚ê‚Ü‚µ‚½"
-#: ops.c:3139
+#: ../ops.c:3188
#, c-format
msgid "E353: Nothing in register %s"
msgstr "E353: ƒŒƒWƒXƒ^ %s ‚ɂ͉½‚à‚ ‚è‚Ü‚¹‚ñ"
#. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
msgid ""
"\n"
"--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
"\n"
"--- ƒŒƒWƒXƒ^ ---"
-#: ops.c:4997
+#: ../ops.c:5066
msgid "Illegal register name"
msgstr "•s³‚ȃŒƒWƒXƒ^–¼"
-#: ops.c:5085
+#: ../ops.c:5154
msgid ""
"\n"
"# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
"\n"
"# ƒŒƒWƒXƒ^:\n"
-#: ops.c:5135
+#: ../ops.c:5210
#, c-format
msgid "E574: Unknown register type %d"
msgstr "E574: –¢’m‚̃ŒƒWƒXƒ^Œ^ %d ‚Å‚·"
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: –³Œø‚ȃŒƒWƒXƒ^–¼: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
#, c-format
msgid "%ld Cols; "
msgstr "%ld —ñ; "
-#: ops.c:5987
+#: ../ops.c:6092
#, c-format
msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
msgstr "‘I‘ð %s%ld / %ld s; %ld / %ld ’PŒê; %ld / %ld •¶Žš"
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "‘I‘ð %s%ld / %ld s; %ld / %ld ’PŒê; %ld / %ld •¶Žš; %ld / %ld ƒoƒCƒg"
+
+#: ../ops.c:6116
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
msgstr "—ñ %s / %s; s %ld of %ld; ’PŒê %ld / %ld; •¶Žš %ld / %ld"
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"—ñ %s / %s; s %ld / %ld; ’PŒê %ld / %ld; •¶Žš %ld / %ld; ƒoƒCƒg %ld of %ld"
+
+#: ../ops.c:6135
#, c-format
msgid "(+%ld for BOM)"
msgstr "(+%ld for BOM)"
-#: option.c:1643
+#: ../option.c:1692
msgid "%<%f%h%m%=Page %N"
msgstr "%<%f%h%m%=%N ƒy[ƒW"
-#: option.c:2092
+#: ../option.c:2171
msgid "Thanks for flying Vim"
msgstr "Vim ‚ðŽg‚Á‚Ä‚­‚ê‚Ä‚ ‚肪‚Æ‚¤"
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
msgid "E518: Unknown option"
msgstr "E518: –¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·"
-#: option.c:3432
+#: ../option.c:3607
msgid "E519: Option not supported"
msgstr "E519: ƒIƒvƒVƒ‡ƒ“‚̓Tƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: option.c:3457
+#: ../option.c:3632
msgid "E520: Not allowed in a modeline"
msgstr "E520: modeline ‚Å‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
-#: option.c:3522
+#: ../option.c:3703
msgid ""
"\n"
"\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
"\n"
"\tLast set from "
-#: option.c:3661
+#: ../option.c:3842
msgid "E521: Number required after ="
msgstr "E521: = ‚ÌŒã‚É‚Í”Žš‚ª•K—v‚Å‚·"
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
msgid "E522: Not found in termcap"
msgstr "E522: termcap “à‚ɂ݂‚©‚è‚Ü‚¹‚ñ"
-#: option.c:4064
+#: ../option.c:4258
#, c-format
msgid "E539: Illegal character <%s>"
msgstr "E539: •s³‚È•¶Žš‚Å‚· <%s>"
-#: option.c:4611
+#: ../option.c:4823
msgid "E529: Cannot set 'term' to empty string"
msgstr "E529: 'term' ‚ɂ͋󕶎š—ñ‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-#: option.c:4614
+#: ../option.c:4826
msgid "E530: Cannot change term in GUI"
msgstr "E530: GUI‚Å‚Í 'term' ‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ"
-#: option.c:4616
+#: ../option.c:4828
msgid "E531: Use \":gui\" to start the GUI"
msgstr "E531: GUI‚ðƒXƒ^[ƒg‚·‚é‚É‚Í \":gui\" ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢"
-#: option.c:4645
+#: ../option.c:4857
msgid "E589: 'backupext' and 'patchmode' are equal"
msgstr "E589: 'backupext' ‚Æ 'patchmode' ‚ª“¯‚¶‚Å‚·"
-#: option.c:4860
+#: ../option.c:5085
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+2 GUI‚Å‚Í•ÏX‚Å‚«‚Ü‚¹‚ñ"
-#: option.c:5016
+#: ../option.c:5249
msgid "E524: Missing colon"
msgstr "E524: ƒRƒƒ“‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: option.c:5018
+#: ../option.c:5251
msgid "E525: Zero length string"
msgstr "E525: •¶Žš—ñ‚Ì’·‚³‚ªƒ[ƒ‚Å‚·"
-#: option.c:5086
+#: ../option.c:5326
#, c-format
msgid "E526: Missing number after <%s>"
msgstr "E526: <%s> ‚ÌŒã‚É”Žš‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: option.c:5100
+#: ../option.c:5340
msgid "E527: Missing comma"
msgstr "E527: ƒJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: option.c:5107
+#: ../option.c:5347
msgid "E528: Must specify a ' value"
msgstr "E528: ' ‚Ì’l‚ðŽw’肵‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-#: option.c:5148
+#: ../option.c:5388
msgid "E595: contains unprintable or wide character"
msgstr "E595: •\\Ž¦‚Å‚«‚È‚¢•¶Žš‚©ƒƒCƒh•¶Žš‚ðŠÜ‚ñ‚Å‚¢‚Ü‚·"
-#: option.c:5197
+#: ../option.c:5432
msgid "E596: Invalid font(s)"
msgstr "E596: –³Œø‚ȃtƒHƒ“ƒg‚Å‚·"
-#: option.c:5205
+#: ../option.c:5440
msgid "E597: can't select fontset"
msgstr "E597: ƒtƒHƒ“ƒgƒZƒbƒg‚ð‘I‘ð‚Å‚«‚Ü‚¹‚ñ"
-#: option.c:5207
+#: ../option.c:5442
msgid "E598: Invalid fontset"
msgstr "E598: –³Œø‚ȃtƒHƒ“ƒgƒZƒbƒg‚Å‚·"
-#: option.c:5214
+#: ../option.c:5449
msgid "E533: can't select wide font"
msgstr "E533: ƒƒCƒhƒtƒHƒ“ƒg‚ð‘I‘ð‚Å‚«‚Ü‚¹‚ñ"
-#: option.c:5216
+#: ../option.c:5451
msgid "E534: Invalid wide font"
msgstr "E534: –³Œø‚ȃƒCƒhƒtƒHƒ“ƒg‚Å‚·"
-#: option.c:5486
+#: ../option.c:5728
#, c-format
msgid "E535: Illegal character after <%c>"
msgstr "E535: <%c> ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚·"
-#: option.c:5597
+#: ../option.c:5839
msgid "E536: comma required"
msgstr "E536: ƒJƒ“ƒ}‚ª•K—v‚Å‚·"
-#: option.c:5607
+#: ../option.c:5849
#, c-format
msgid "E537: 'commentstring' must be empty or contain %s"
msgstr "E537: 'commentstring' ‚Í‹ó‚Å‚ ‚é‚© %s ‚ðŠÜ‚Þ•K—v‚ª‚ ‚è‚Ü‚·"
-#: option.c:5679
+#: ../option.c:5924
msgid "E538: No mouse support"
msgstr "E538: ƒ}ƒEƒX‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ"
-#: option.c:5947
+#: ../option.c:6195
msgid "E540: Unclosed expression sequence"
msgstr "E540: Ž®‚ªI—¹‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: option.c:5951
+#: ../option.c:6199
msgid "E541: too many items"
-msgstr "E541: —v‘f‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E541: —v‘f‚ª‘½‰ß‚¬‚Ü‚·"
-#: option.c:5953
+#: ../option.c:6201
msgid "E542: unbalanced groups"
msgstr "E542: ƒOƒ‹[ƒv‚ª’Þ‡‚¢‚Ü‚¹‚ñ"
-#: option.c:6193
+#: ../option.c:6441
msgid "E590: A preview window already exists"
msgstr "E590: ƒvƒŒƒrƒ…[ƒEƒBƒ“ƒhƒE‚ªŠù‚É‘¶Ý‚µ‚Ü‚·"
-#: option.c:6450
+#: ../option.c:6688
msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
msgstr ""
"W17: ƒAƒ‰ƒrƒA•¶Žš‚É‚ÍUTF-8‚ª•K—v‚È‚Ì‚Å, ':set encoding=utf-8' ‚µ‚Ä‚­‚¾‚³‚¢"
-#: option.c:6776
+#: ../option.c:7052
#, c-format
msgid "E593: Need at least %d lines"
msgstr "E593: Å’á %d ‚Ìs”‚ª•K—v‚Å‚·"
-#: option.c:6786
+#: ../option.c:7062
#, c-format
msgid "E594: Need at least %d columns"
msgstr "E594: Å’á %d ‚̃Jƒ‰ƒ€•‚ª•K—v‚Å‚·"
-#: option.c:7093
+#: ../option.c:7371
#, c-format
msgid "E355: Unknown option: %s"
msgstr "E355: –¢’m‚̃IƒvƒVƒ‡ƒ“‚Å‚·: %s"
-#: option.c:7213
+#: ../option.c:7504
msgid ""
"\n"
"--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
"\n"
"--- ’[––ƒR[ƒh ---"
-#: option.c:7215
+#: ../option.c:7506
msgid ""
"\n"
"--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
"\n"
"--- ƒOƒ[ƒoƒ‹ƒIƒvƒVƒ‡ƒ“’l ---"
-#: option.c:7217
+#: ../option.c:7508
msgid ""
"\n"
"--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
"\n"
"--- ƒ[ƒJƒ‹ƒIƒvƒVƒ‡ƒ“’l ---"
-#: option.c:7219
+#: ../option.c:7510
msgid ""
"\n"
"--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
"\n"
"--- ƒIƒvƒVƒ‡ƒ“ ---"
-#: option.c:7925
+#: ../option.c:8240
msgid "E356: get_varp ERROR"
msgstr "E356: get_varp ƒGƒ‰["
-#: option.c:8896
+#: ../option.c:9217
#, c-format
msgid "E357: 'langmap': Matching character missing for %s"
msgstr "E357: 'langmap': %s ‚ɑΉž‚·‚镶Žš‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: option.c:8930
+#: ../option.c:9243
#, c-format
msgid "E358: 'langmap': Extra characters after semicolon: %s"
msgstr "E358: 'langmap': ƒZƒ~ƒRƒƒ“‚ÌŒã‚É—]•ª‚È•¶Žš‚ª‚ ‚è‚Ü‚·: %s"
-#: os_amiga.c:280
+#: ../os_amiga.c:280
msgid "cannot open "
msgstr "ŠJ‚¯‚Ü‚¹‚ñ "
-#: os_amiga.c:314
+#: ../os_amiga.c:314
msgid "VIM: Can't open window!\n"
msgstr "VIM: ƒEƒBƒ“ƒhƒE‚ðŠJ‚¯‚Ü‚¹‚ñ!\n"
-#: os_amiga.c:338
+#: ../os_amiga.c:338
msgid "Need Amigados version 2.04 or later\n"
msgstr "Amigados‚̃o[ƒWƒ‡ƒ“ 2.04‚©‚»‚êˆÈ~‚ª•K—v‚Å‚·\n"
-#: os_amiga.c:344
+#: ../os_amiga.c:344
#, c-format
msgid "Need %s version %ld\n"
msgstr "%s ‚̃o[ƒWƒ‡ƒ“ %ld ‚ª•K—v‚Å‚·\n"
-#: os_amiga.c:416
+#: ../os_amiga.c:416
msgid "Cannot open NIL:\n"
msgstr "NIL‚ðŠJ‚¯‚Ü‚¹‚ñ:\n"
-#: os_amiga.c:427
+#: ../os_amiga.c:427
msgid "Cannot create "
msgstr "쬂ł«‚Ü‚¹‚ñ "
-#: os_amiga.c:905
+#: ../os_amiga.c:905
#, c-format
msgid "Vim exiting with %d\n"
msgstr "Vim‚Í %d ‚ÅI—¹‚µ‚Ü‚·\n"
-#: os_amiga.c:937
+#: ../os_amiga.c:941
msgid "cannot change console mode ?!\n"
msgstr "ƒRƒ“ƒ\\[ƒ‹ƒ‚[ƒh‚ð•ÏX‚Å‚«‚Ü‚¹‚ñ?!\n"
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
msgid "mch_get_shellsize: not a console??\n"
msgstr "mch_get_shellsize: ƒRƒ“ƒ\\[ƒ‹‚Å‚Í‚È‚¢??\n"
#. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
msgid "E360: Cannot execute shell with -f option"
msgstr "E360: -f ƒIƒvƒVƒ‡ƒ“‚ŃVƒFƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ"
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
msgid "Cannot execute "
msgstr "ŽÀs‚Å‚«‚Ü‚¹‚ñ "
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
msgid "shell "
msgstr "ƒVƒFƒ‹ "
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
msgid " returned\n"
msgstr " –ß‚è‚Ü‚µ‚½\n"
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE ‚ª¬‚³‚·‚¬‚Ü‚·."
+msgstr "ANCHOR_BUF_SIZE ‚ª¬‚³‰ß‚¬‚Ü‚·."
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
msgid "I/O ERROR"
msgstr "“üo—̓Gƒ‰["
-#: os_mswin.c:539
+#: ../os_mswin.c:597
msgid "...(truncated)"
msgstr "...(È—ª)"
-#: os_mswin.c:641
+#: ../os_mswin.c:714
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' ‚ª80‚Å‚Í‚È‚¢‚½‚ß, ŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ"
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
msgid "E237: Printer selection failed"
msgstr "E237: ƒvƒŠƒ“ƒ^‚Ì‘I‘ð‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
#, c-format
msgid "to %s on %s"
msgstr "%s ‚Ö (%s ã‚Ì)"
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
#, c-format
msgid "E613: Unknown printer font: %s"
msgstr "E613: –¢’m‚̃vƒŠƒ“ƒ^ƒIƒvƒVƒ‡ƒ“‚Å‚·: %s"
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
#, c-format
msgid "E238: Print error: %s"
msgstr "E238: ˆóüƒGƒ‰[: %s"
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "•s–¾"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
#, c-format
msgid "Printing '%s'"
msgstr "ˆóü‚µ‚Ä‚¢‚Ü‚·: '%s'"
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
#, c-format
msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
msgstr "E244: •¶ŽšƒZƒbƒg–¼ \"%s\" ‚Í•s³‚Å‚· (ƒtƒHƒ“ƒg–¼ \"%s\")"
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
#, c-format
msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: '%c' ‚Í•s³‚È•¶Žš‚Å‚· (ƒtƒHƒ“ƒg–¼ \"%s\")"
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
msgid "E366: Invalid 'osfiletype' option - using Text"
msgstr "E366: –³Œø‚È 'osfiletype' ƒIƒvƒVƒ‡ƒ“ - \"Text\" ‚ðŽg‚¢‚Ü‚·"
-#: os_unix.c:927
+#: ../os_unix.c:989
msgid "Vim: Double signal, exiting\n"
msgstr "Vim: 2d‚̃VƒOƒiƒ‹‚Ì‚½‚ß, I—¹‚µ‚Ü‚·\n"
-#: os_unix.c:933
+#: ../os_unix.c:995
#, c-format
msgid "Vim: Caught deadly signal %s\n"
msgstr "Vim: ’v–½“IƒVƒOƒiƒ‹ %s ‚ðŒŸ’m‚µ‚Ü‚µ‚½\n"
-#: os_unix.c:936
+#: ../os_unix.c:998
msgid "Vim: Caught deadly signal\n"
msgstr "Vim: ’v–½“IƒVƒOƒiƒ‹‚ðŒŸ’m‚µ‚Ü‚µ‚½\n"
-#: os_unix.c:1199
+#: ../os_unix.c:1318
#, c-format
msgid "Opening the X display took %ld msec"
msgstr "XƒT[ƒo‚Ö‚ÌÚ‘±‚É %ld ƒ~ƒŠ•b‚©‚©‚è‚Ü‚µ‚½"
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X ‚̃Gƒ‰[‚ðŒŸo‚µ‚Ü‚µ‚½‚ª‘±s‚µ‚Ü‚·...\n"
+
+#: ../os_unix.c:1351
msgid ""
"\n"
"Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
"\n"
"Vim: X ‚̃Gƒ‰[‚ðŒŸo‚µ‚Ü‚µ‚½r\n"
-#: os_unix.c:1334
+#: ../os_unix.c:1464
msgid "Testing the X display failed"
msgstr "X display ‚̃`ƒFƒbƒN‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: os_unix.c:1473
+#: ../os_unix.c:1603
msgid "Opening the X display timed out"
msgstr "X display ‚Ì open ‚ªƒ^ƒCƒ€ƒAƒEƒg‚µ‚Ü‚µ‚½"
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
msgid ""
"\n"
"Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
"\n"
"ƒVƒFƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ "
-#: os_unix.c:3275
+#: ../os_unix.c:3432
msgid ""
"\n"
"Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
"\n"
"sh ƒVƒFƒ‹‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ\n"
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
msgid ""
"\n"
"shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
"\n"
"ƒVƒFƒ‹‚ª’l‚ð•Ô‚µ‚Ü‚µ‚½ "
-#: os_unix.c:3414
+#: ../os_unix.c:3578
msgid ""
"\n"
"Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
"\n"
"ƒpƒCƒv‚ð쬂ł«‚Ü‚¹‚ñ\n"
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
msgid ""
"\n"
"Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
"\n"
"fork ‚Å‚«‚Ü‚¹‚ñ\n"
-#: os_unix.c:3920
+#: ../os_unix.c:4233
msgid ""
"\n"
"Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
"\n"
"ƒRƒ}ƒ“ƒh‚ð’†’f‚µ‚Ü‚µ‚½\n"
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
msgid "XSMP lost ICE connection"
msgstr "XSMP ‚ªICEÚ‘±‚ðŽ¸‚¢‚Ü‚µ‚½"
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
msgid "Opening the X display failed"
msgstr "X display ‚Ì open ‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: os_unix.c:5880
+#: ../os_unix.c:6297
msgid "XSMP handling save-yourself request"
msgstr "XSMP ‚ªsave-yourself—v‹‚ðˆ—‚µ‚Ä‚¢‚Ü‚·"
-#: os_unix.c:5999
+#: ../os_unix.c:6416
msgid "XSMP opening connection"
msgstr "XSMP ‚ªÚ‘±‚ðŠJŽn‚µ‚Ä‚¢‚Ü‚·"
-#: os_unix.c:6018
+#: ../os_unix.c:6435
msgid "XSMP ICE connection watch failed"
msgstr "XSMP ICEÚ‘±‚ªŽ¸”s‚µ‚½‚悤‚Å‚·"
-#: os_unix.c:6038
+#: ../os_unix.c:6455
#, c-format
msgid "XSMP SmcOpenConnection failed: %s"
msgstr "XSMP SmcOpenConnection‚ªŽ¸”s‚µ‚Ü‚µ‚½: %s"
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
msgid "At line"
msgstr "s"
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚Ƀƒ‚ƒŠ‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
msgid "VIM Error"
msgstr "VIMƒGƒ‰["
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
msgid "Could not fix up function pointers to the DLL!"
msgstr "DLL‚©‚çŠÖ”ƒ|ƒCƒ“ƒ^‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
#, c-format
msgid "shell returned %d"
msgstr "ƒVƒFƒ‹‚ªƒR[ƒh %d ‚ÅI—¹‚µ‚Ü‚µ‚½"
-#: os_win32.c:2655
+#: ../os_win32.c:2776
#, c-format
msgid "Vim: Caught %s event\n"
msgstr "Vim: ƒCƒxƒ“ƒg %s ‚ðŒŸ’m\n"
-#: os_win32.c:2657
+#: ../os_win32.c:2778
msgid "close"
msgstr "•Â‚¶‚é"
-#: os_win32.c:2659
+#: ../os_win32.c:2780
msgid "logoff"
msgstr "ƒƒOƒIƒt"
-#: os_win32.c:2660
+#: ../os_win32.c:2781
msgid "shutdown"
msgstr "ƒVƒƒƒbƒgƒ_ƒEƒ“"
-#: os_win32.c:3150
+#: ../os_win32.c:3270
msgid "E371: Command not found"
msgstr "E371: ƒRƒ}ƒ“ƒh‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: os_win32.c:3163
+#: ../os_win32.c:3283
msgid ""
"VIMRUN.EXE not found in your $PATH.\n"
"External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
"ŠO•”ƒRƒ}ƒ“ƒh‚ÌI—¹Œã‚Ɉꎞ’âŽ~‚ð‚µ‚Ü‚¹‚ñ.\n"
"Ú×‚Í :help win32-vimrun ‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢."
-#: os_win32.c:3166
+#: ../os_win32.c:3286
msgid "Vim Warning"
msgstr "Vim‚ÌŒx"
-#: quickfix.c:258
+#: ../quickfix.c:284
msgid "E372: Too many %%%c in format string"
-msgstr "E372: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É %%%c ‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E372: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É %%%c ‚ª‘½‰ß‚¬‚Ü‚·"
-#: quickfix.c:271
+#: ../quickfix.c:297
msgid "E373: Unexpected %%%c in format string"
msgstr "E373: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É—\\Šú‚¹‚Ê %%%c ‚ª‚ ‚è‚Ü‚µ‚½"
-#: quickfix.c:325
+#: ../quickfix.c:351
msgid "E374: Missing ] in format string"
msgstr "E374: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: quickfix.c:339
+#: ../quickfix.c:365
msgid "E375: Unsupported %%%c in format string"
msgstr "E375: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚Å‚Í %%%c ‚̓Tƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ"
-#: quickfix.c:357
+#: ../quickfix.c:383
msgid "E376: Invalid %%%c in format string prefix"
msgstr "E376: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚Ì‘O’u‚É–³Œø‚È %%%c ‚ª‚ ‚è‚Ü‚·"
-#: quickfix.c:365
+#: ../quickfix.c:391
msgid "E377: Invalid %%%c in format string"
msgstr "E377: ƒtƒH[ƒ}ƒbƒg•¶Žš—ñ‚É–³Œø‚È %%%c ‚ª‚ ‚è‚Ü‚·"
-#: quickfix.c:391
+#: ../quickfix.c:417
msgid "E378: 'errorformat' contains no pattern"
msgstr "E378: 'errorformat' ‚Ƀpƒ^[ƒ“‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: quickfix.c:501
+#: ../quickfix.c:537
msgid "E379: Missing or empty directory name"
msgstr "E379: ƒfƒBƒŒƒNƒgƒŠ–¼‚ª–³‚¢‚©‹ó‚Å‚·"
-#: quickfix.c:990
+#: ../quickfix.c:1027
msgid "E553: No more items"
msgstr "E553: —v‘f‚ª‚à‚¤‚ ‚è‚Ü‚¹‚ñ"
-#: quickfix.c:1229
+#: ../quickfix.c:1324
#, c-format
msgid "(%d of %d)%s%s: "
msgstr "(%d of %d)%s%s: "
-#: quickfix.c:1231
+#: ../quickfix.c:1326
msgid " (line deleted)"
msgstr " (s‚ªíœ‚³‚ê‚Ü‚µ‚½)"
-#: quickfix.c:1444
+#: ../quickfix.c:1539
msgid "E380: At bottom of quickfix stack"
msgstr "E380: quickfix ƒXƒ^ƒbƒN‚Ì––”ö‚Å‚·"
-#: quickfix.c:1453
+#: ../quickfix.c:1548
msgid "E381: At top of quickfix stack"
msgstr "E381: quickfix ƒXƒ^ƒbƒN‚Ì擪‚Å‚·"
-#: quickfix.c:1465
+#: ../quickfix.c:1560
#, c-format
msgid "error list %d of %d; %d errors"
msgstr "ƒGƒ‰[ˆê—— %d of %d; %d ŒÂƒGƒ‰["
-#: quickfix.c:1943
+#: ../quickfix.c:2042
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 'buftype' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚é‚Ì‚Å‘ž‚Ý‚Ü‚¹‚ñ"
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ŒŸõƒpƒ^[ƒ“‚©‹æØ‚è‹L†‚ª•s³‚Å‚·"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: ƒtƒ@ƒCƒ‹–¼‚ª–³‚¢‚©–³Œø‚ȃpƒ^[ƒ“‚Å‚·"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: ƒoƒbƒtƒ@‚Í“Ç‚Ýž‚Ü‚ê‚Ü‚¹‚ñ‚Å‚µ‚½"
+
+#: ../regexp.c:1006
msgid "E339: Pattern too long"
-msgstr "E339: ƒpƒ^[ƒ“‚ª’·‚·‚¬‚Ü‚·"
+msgstr "E339: ƒpƒ^[ƒ“‚ª’·‰ß‚¬‚Ü‚·"
-#: regexp.c:1009
+#: ../regexp.c:1177
msgid "E50: Too many \\z("
-msgstr "E50: \\z( ‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E50: \\z( ‚ª‘½‰ß‚¬‚Ü‚·"
-#: regexp.c:1020
+#: ../regexp.c:1188
#, c-format
msgid "E51: Too many %s("
-msgstr "E51: %s( ‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E51: %s( ‚ª‘½‰ß‚¬‚Ü‚·"
-#: regexp.c:1077
+#: ../regexp.c:1245
msgid "E52: Unmatched \\z("
msgstr "E52: \\z( ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ"
-#: regexp.c:1081
+#: ../regexp.c:1249
msgid "E53: Unmatched %s%%("
msgstr "E53: %s%%( ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ"
-#: regexp.c:1083
+#: ../regexp.c:1251
#, c-format
msgid "E54: Unmatched %s("
msgstr "E54: %s( ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ"
-#: regexp.c:1088
+#: ../regexp.c:1256
#, c-format
msgid "E55: Unmatched %s)"
msgstr "E55: %s) ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ"
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* ‚ª‹ó•¶Žš—ñ‚É‚È‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ ‚ª‹ó•¶Žš—ñ‚É‚È‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
#, c-format
msgid "E59: invalid character after %s@"
msgstr "E59: %s@ ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ ‚ª‹ó•¶Žš—ñ‚É‚È‚é‰Â”\\«‚ª‚ ‚è‚Ü‚·"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
#, c-format
msgid "E60: Too many complex %s{...}s"
-msgstr "E60: •¡ŽG‚È %s{...} ‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E60: •¡ŽG‚È %s{...} ‚ª‘½‰ß‚¬‚Ü‚·"
-#: regexp.c:1370
+#: ../regexp.c:1524
#, c-format
msgid "E61: Nested %s*"
msgstr "E61:%s* ‚ª“ü‚êŽq‚É‚È‚Á‚Ä‚¢‚Ü‚·"
-#: regexp.c:1373
+#: ../regexp.c:1527
#, c-format
msgid "E62: Nested %s%c"
msgstr "E62:%s%c ‚ª“ü‚êŽq‚É‚È‚Á‚Ä‚¢‚Ü‚·"
#
-#: regexp.c:1491
+#: ../regexp.c:1647
msgid "E63: invalid use of \\_"
msgstr "E63: \\_ ‚Ì–³Œø‚ÈŽg—p•û–@‚Å‚·"
-#: regexp.c:1536
+#: ../regexp.c:1692
#, c-format
msgid "E64: %s%c follows nothing"
msgstr "E64:%s%c ‚ÌŒã‚É‚È‚É‚à‚ ‚è‚Ü‚¹‚ñ"
#
-#: regexp.c:1592
+#: ../regexp.c:1748
msgid "E65: Illegal back reference"
msgstr "E65: •s³‚ÈŒã•ûŽQÆ‚Å‚·"
#
-#: regexp.c:1605
+#: ../regexp.c:1761
msgid "E66: \\z( not allowed here"
msgstr "E66: \\z( ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
#
-#: regexp.c:1624
+#: ../regexp.c:1780
msgid "E67: \\z1 et al. not allowed here"
msgstr "E67: \\z1 ‚»‚Ì‘¼‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
#
-#: regexp.c:1635
+#: ../regexp.c:1791
msgid "E68: Invalid character after \\z"
msgstr "E68: \\z ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
#
-#: regexp.c:1684
+#: ../regexp.c:1840
msgid "E69: Missing ] after %s%%["
msgstr "E69: %s%%[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: regexp.c:1700
+#: ../regexp.c:1856
msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] ‚ª‹ó‚Å‚·"
#
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
+
+#
+#: ../regexp.c:1952
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
-#: regexp.c:2557
+#: ../regexp.c:2922
#, c-format
msgid "E554: Syntax error in %s{...}"
msgstr "E554: %s{...} “à‚É•¶–@ƒGƒ‰[‚ª‚ ‚è‚Ü‚·"
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ƒNƒ‰ƒbƒVƒ…‚É‚æ‚è’†’f; ³‹K•\\Œ»‚ª•¡ŽG‰ß‚¬‚é‚©‚à?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: ƒpƒ^[ƒ“‚É‚æ‚éƒXƒ^ƒbƒN•s‘«ƒGƒ‰[‚Å‚·"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
msgid "External submatches:\n"
msgstr "ŠO•”‚Ì•”•ªŠY“–:\n"
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld s‚ªÜô‚Ü‚ê‚Ü‚µ‚½"
-
-#: screen.c:7959
+#: ../screen.c:7969
msgid " VREPLACE"
msgstr " ‰¼‘z’uŠ·"
-#: screen.c:7963
+#: ../screen.c:7973
msgid " REPLACE"
msgstr " ’uŠ·"
-#: screen.c:7968
+#: ../screen.c:7978
msgid " REVERSE"
msgstr " ”½“]"
-#: screen.c:7970
+#: ../screen.c:7980
msgid " INSERT"
msgstr " ‘}“ü"
-#: screen.c:7973
+#: ../screen.c:7983
msgid " (insert)"
msgstr " (‘}“ü)"
-#: screen.c:7975
+#: ../screen.c:7985
msgid " (replace)"
msgstr " (’uŠ·)"
-#: screen.c:7977
+#: ../screen.c:7987
msgid " (vreplace)"
msgstr " (‰¼‘z’uŠ·)"
-#: screen.c:7980
+#: ../screen.c:7990
msgid " Hebrew"
msgstr " ƒwƒuƒ‰ƒC"
-#: screen.c:7991
+#: ../screen.c:8001
msgid " Arabic"
msgstr " ƒAƒ‰ƒrƒA"
-#: screen.c:7994
+#: ../screen.c:8004
msgid " (lang)"
msgstr " (Œ¾Œê)"
-#: screen.c:7998
+#: ../screen.c:8008
msgid " (paste)"
msgstr " (“\\‚è•t‚¯)"
-#: screen.c:8011
+#: ../screen.c:8021
msgid " VISUAL"
msgstr " ƒrƒWƒ…ƒAƒ‹"
-#: screen.c:8012
+#: ../screen.c:8022
msgid " VISUAL LINE"
msgstr " ƒrƒWƒ…ƒAƒ‹ s"
-#: screen.c:8013
+#: ../screen.c:8023
msgid " VISUAL BLOCK"
msgstr " ƒrƒWƒ…ƒAƒ‹ ‹éŒ`"
-#: screen.c:8014
+#: ../screen.c:8024
msgid " SELECT"
msgstr " ƒZƒŒƒNƒg"
-#: screen.c:8015
+#: ../screen.c:8025
msgid " SELECT LINE"
msgstr " sŽwŒü‘I‘ð"
-#: screen.c:8016
+#: ../screen.c:8026
msgid " SELECT BLOCK"
msgstr " ‹éŒ`‘I‘ð"
@@ -5226,118 +5739,118 @@ msgstr " ‹éŒ`‘I‘ð"
# msgstr " ƒuƒƒbƒN"
# msgid " LINE"
# msgstr " s"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
msgid "recording"
msgstr "‹L˜^’†"
-#: search.c:37
+#: ../search.c:37
msgid "search hit TOP, continuing at BOTTOM"
msgstr "ã‚Ü‚ÅŒŸõ‚µ‚½‚̂ʼnº‚É–ß‚è‚Ü‚·"
-#: search.c:38
+#: ../search.c:38
msgid "search hit BOTTOM, continuing at TOP"
msgstr "‰º‚Ü‚ÅŒŸõ‚µ‚½‚Ì‚Åã‚É–ß‚è‚Ü‚·"
-#: search.c:526
+#: ../search.c:525
#, c-format
msgid "E383: Invalid search string: %s"
msgstr "E383: –³Œø‚ÈŒŸõ•¶Žš—ñ‚Å‚·: %s"
-#: search.c:853
+#: ../search.c:868
#, c-format
msgid "E384: search hit TOP without match for: %s"
msgstr "E384: ã‚Ü‚ÅŒŸõ‚µ‚½‚¯‚ê‚ÇŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: search.c:856
+#: ../search.c:871
#, c-format
msgid "E385: search hit BOTTOM without match for: %s"
msgstr "E385: ‰º‚Ü‚ÅŒŸõ‚µ‚½‚¯‚ê‚ÇŠY“–‰ÓŠ‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: search.c:1249
+#: ../search.c:1265
msgid "E386: Expected '?' or '/' after ';'"
msgstr "E386: ';' ‚Ì‚ ‚Æ‚É‚Í '?' ‚© '/' ‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚é"
-#: search.c:3758
+#: ../search.c:4147
msgid " (includes previously listed match)"
msgstr " (‘O‚É—ñ‹“‚µ‚½ŠY“–‰ÓŠ‚ðŠÜ‚Þ)"
#. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
msgid "--- Included files "
msgstr "--- ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹"
-#: search.c:3780
+#: ../search.c:4169
msgid "not found "
msgstr "‚݂‚©‚è‚Ü‚¹‚ñ "
-#: search.c:3781
+#: ../search.c:4170
msgid "in path ---\n"
msgstr "ƒpƒX‚É ----\n"
-#: search.c:3820
+#: ../search.c:4227
msgid " (Already listed)"
msgstr " (Šù‚É—ñ‹“)"
-#: search.c:3822
+#: ../search.c:4229
msgid " NOT FOUND"
msgstr " ‚݂‚©‚è‚Ü‚¹‚ñ"
-#: search.c:3874
+#: ../search.c:4281
#, c-format
msgid "Scanning included file: %s"
msgstr "ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“’†: %s"
-#: search.c:4092
+#: ../search.c:4499
msgid "E387: Match is on current line"
msgstr "E387: Œ»Ýs‚ÉŠY“–‚ª‚ ‚è‚Ü‚·"
-#: search.c:4235
+#: ../search.c:4642
msgid "All included files were found"
msgstr "‘S‚ẴCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ª‚݂‚©‚è‚Ü‚µ‚½"
-#: search.c:4237
+#: ../search.c:4644
msgid "No included files"
msgstr "ƒCƒ“ƒNƒ‹[ƒhƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: search.c:4253
+#: ../search.c:4660
msgid "E388: Couldn't find definition"
msgstr "E388: ’è‹`‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: search.c:4255
+#: ../search.c:4662
msgid "E389: Couldn't find pattern"
msgstr "E389: ƒpƒ^[ƒ“‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: syntax.c:3050
+#: ../syntax.c:3070
#, c-format
msgid "E390: Illegal argument: %s"
msgstr "E390: •s³‚Ȉø”‚Å‚·: %s"
-#: syntax.c:3230
+#: ../syntax.c:3247
#, c-format
msgid "E391: No such syntax cluster: %s"
msgstr "E391: ‚»‚̂悤‚È\\•¶ƒNƒ‰ƒXƒ^‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:3394
+#: ../syntax.c:3411
msgid "No Syntax items defined for this buffer"
msgstr "‚±‚̃oƒbƒtƒ@‚É’è‹`‚³‚ꂽ\\•¶—v‘f‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: syntax.c:3402
+#: ../syntax.c:3419
msgid "syncing on C-style comments"
msgstr "CŒ¾Œê•—ƒRƒƒ“ƒg‚©‚瓯Šú’†"
-#: syntax.c:3410
+#: ../syntax.c:3427
msgid "no syncing"
msgstr "”ñ“¯Šú"
-#: syntax.c:3413
+#: ../syntax.c:3430
msgid "syncing starts "
msgstr "“¯ŠúŠJŽn "
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
msgid " lines before top line"
msgstr " s‘O(ƒgƒbƒvs‚æ‚è‚à)"
-#: syntax.c:3420
+#: ../syntax.c:3437
msgid ""
"\n"
"--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
"\n"
"--- \\•¶“¯Šú—v‘f ---"
-#: syntax.c:3425
+#: ../syntax.c:3442
msgid ""
"\n"
"syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
"\n"
"—v‘fã‚Å“¯Šú’†"
-#: syntax.c:3431
+#: ../syntax.c:3448
msgid ""
"\n"
"--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
"\n"
"--- \\•¶—v‘f ---"
-#: syntax.c:3454
+#: ../syntax.c:3471
#, c-format
msgid "E392: No such syntax cluster: %s"
msgstr "E392: ‚»‚̂悤‚È\\•¶ƒNƒ‰ƒXƒ^‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:3480
+#: ../syntax.c:3497
msgid "minimal "
msgstr "minimal"
-#: syntax.c:3487
+#: ../syntax.c:3504
msgid "maximal "
msgstr "maximal"
-#: syntax.c:3499
+#: ../syntax.c:3516
msgid "; match "
msgstr "; ŠY“– "
-#: syntax.c:3501
+#: ../syntax.c:3518
msgid " line breaks"
msgstr " ŒÂ‚̉üs"
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: ‚±‚Ìꊂł͈ø”contains‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: ‚±‚Ìꊂł͈ø”containedin‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#: ../syntax.c:4179
msgid "E393: group[t]here not accepted here"
msgstr "E393: ‚±‚±‚ł̓Oƒ‹[ƒv‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
-#: syntax.c:4159
+#: ../syntax.c:4203
#, c-format
msgid "E394: Didn't find region item for %s"
msgstr "E394: %s ‚͈̔͗v‘f‚ª‚݂‚©‚è‚Ü‚¹‚ñ"
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ‚±‚Ìꊂł͈ø”contains‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: ‚±‚Ìꊂł͈ø”containedin‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
msgid "E397: Filename required"
msgstr "E397: ƒtƒ@ƒCƒ‹–¼‚ª•K—v‚Å‚·"
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
+
+#: ../syntax.c:4644
#, c-format
msgid "E398: Missing '=': %s"
msgstr "E398: '=' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:4772
+#: ../syntax.c:4803
#, c-format
msgid "E399: Not enough arguments: syntax region %s"
msgstr "E399: ˆø”‚ª‘«‚è‚Ü‚¹‚ñ: \\•¶”ÍˆÍ %s"
-#: syntax.c:5103
+#: ../syntax.c:5133
msgid "E400: No cluster specified"
msgstr "E400: ƒNƒ‰ƒXƒ^‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: syntax.c:5140
+#: ../syntax.c:5170
#, c-format
msgid "E401: Pattern delimiter not found: %s"
msgstr "E401: ƒpƒ^[ƒ“‹æ؂肪‚݂‚©‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:5215
+#: ../syntax.c:5245
#, c-format
msgid "E402: Garbage after pattern: %s"
msgstr "E402: ƒpƒ^[ƒ“‚Ì‚ ‚ƂɃSƒ~‚ª‚ ‚è‚Ü‚·: %s"
-#: syntax.c:5305
+#: ../syntax.c:5335
msgid "E403: syntax sync: line continuations pattern specified twice"
msgstr "E403: \\•¶“¯Šú: ˜A‘±sƒpƒ^[ƒ“‚ª2“xŽw’肳‚ê‚Ü‚µ‚½"
-#: syntax.c:5362
+#: ../syntax.c:5392
#, c-format
msgid "E404: Illegal arguments: %s"
msgstr "E404: •s³‚Ȉø”‚Å‚·: %s"
-#: syntax.c:5412
+#: ../syntax.c:5442
#, c-format
msgid "E405: Missing equal sign: %s"
msgstr "E405: “™‚µ‚¢ sign ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:5418
+#: ../syntax.c:5448
#, c-format
msgid "E406: Empty argument: %s"
msgstr "E406: ‹ó‚̈ø”: %s"
-#: syntax.c:5445
+#: ../syntax.c:5475
#, c-format
msgid "E407: %s not allowed here"
msgstr "E407: %s ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: syntax.c:5452
+#: ../syntax.c:5482
#, c-format
msgid "E408: %s must be first in contains list"
msgstr "E408: %s ‚Í“à—eƒŠƒXƒg‚Ì擪‚Å‚È‚¯‚ê‚΂Ȃç‚È‚¢"
-#: syntax.c:5522
+#: ../syntax.c:5552
#, c-format
msgid "E409: Unknown group name: %s"
msgstr "E409: –¢’m‚̃Oƒ‹[ƒv–¼: %s"
-#: syntax.c:5755
+#: ../syntax.c:5786
#, c-format
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: –³Œø‚È :syntax ‚̃TƒuƒRƒ}ƒ“ƒh: %s"
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim ‚ÌÄ‹AŒÄ‚Ño‚µ‚ðŒŸo‚µ‚Ü‚µ‚½"
+
+#: ../syntax.c:6181
#, c-format
msgid "E411: highlight group not found: %s"
msgstr "E411: ƒnƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:6158
+#: ../syntax.c:6205
#, c-format
msgid "E412: Not enough arguments: \":highlight link %s\""
msgstr "E412: ˆø”‚ª[•ª‚Å‚Í‚È‚¢: \":highlight link %s\""
-#: syntax.c:6165
+#: ../syntax.c:6212
#, c-format
msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ˆø”‚ª‘½‚·‚¬‚Ü‚·: \":highlight link %s\""
+msgstr "E413: ˆø”‚ª‘½‰ß‚¬‚Ü‚·: \":highlight link %s\""
-#: syntax.c:6185
+#: ../syntax.c:6232
msgid "E414: group has settings, highlight link ignored"
msgstr "E414: ƒOƒ‹[ƒv‚ªÝ’肳‚ê‚Ä‚¢‚é‚̂ŃnƒCƒ‰ƒCƒgƒŠƒ“ƒN‚Í–³Ž‹‚³‚ê‚Ü‚·"
-#: syntax.c:6314
+#: ../syntax.c:6361
#, c-format
msgid "E415: unexpected equal sign: %s"
msgstr "E415: —\\Šú‚¹‚Ê“¯‚¶ sign ‚Å‚·: %s"
-#: syntax.c:6350
+#: ../syntax.c:6397
#, c-format
msgid "E416: missing equal sign: %s"
msgstr "E416: “¯‚¶ sign ‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:6378
+#: ../syntax.c:6425
#, c-format
msgid "E417: missing argument: %s"
msgstr "E417: ˆø”‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
-#: syntax.c:6415
+#: ../syntax.c:6462
#, c-format
msgid "E418: Illegal value: %s"
msgstr "E418: •s³‚È’l‚Å‚·: %s"
-#: syntax.c:6534
+#: ../syntax.c:6581
msgid "E419: FG color unknown"
msgstr "E419: –¢’m‚Ì‘OŒiF‚Å‚·"
-#: syntax.c:6545
+#: ../syntax.c:6592
msgid "E420: BG color unknown"
msgstr "E420: –¢’m‚Ì”wŒiF‚Å‚·"
-#: syntax.c:6606
+#: ../syntax.c:6653
#, c-format
msgid "E421: Color name or number not recognized: %s"
msgstr "E421: ƒJƒ‰[–¼‚â”Ô†‚ð”FŽ¯‚Å‚«‚Ü‚¹‚ñ: %s"
-#: syntax.c:6812
+#: ../syntax.c:6859
#, c-format
msgid "E422: terminal code too long: %s"
-msgstr "E422: I’[ƒR[ƒh‚ª’·‚·‚¬‚Ü‚·: %s"
+msgstr "E422: I’[ƒR[ƒh‚ª’·‰ß‚¬‚Ü‚·: %s"
-#: syntax.c:6859
+#: ../syntax.c:6906
#, c-format
msgid "E423: Illegal argument: %s"
msgstr "E423: •s³‚Ȉø”‚Å‚·: %s"
-#: syntax.c:7388
+#: ../syntax.c:7435
msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ‘½‚­‚̈قȂéƒnƒCƒ‰ƒCƒg‘®«‚ªŽg‚í‚ê‚·‚¬‚Ä‚¢‚Ü‚·"
+msgstr "E424: ‘½‚­‚̈قȂéƒnƒCƒ‰ƒCƒg‘®«‚ªŽg‚í‚ê‰ß‚¬‚Ä‚¢‚Ü‚·"
-#: syntax.c:7909
+#: ../syntax.c:7955
msgid "E669: Unprintable character in group name"
msgstr "E669: ƒOƒ‹[ƒv–¼‚Ɉóü•s‰Â”\\‚È•¶Žš‚ª‚ ‚è‚Ü‚·"
-#. This is an error, but since there previously was no check only
-#. * give a warning.
-#: syntax.c:7916
+#: ../syntax.c:7963
msgid "W18: Invalid character in group name"
msgstr "W18: ƒOƒ‹[ƒv–¼‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚·"
-#: tag.c:90
+#: ../tag.c:90
msgid "E555: at bottom of tag stack"
msgstr "E555: ƒ^ƒOƒXƒ^ƒbƒN‚Ì––”ö‚Å‚·"
-#: tag.c:91
+#: ../tag.c:91
msgid "E556: at top of tag stack"
msgstr "E556: ƒ^ƒOƒXƒ^ƒbƒN‚Ì擪‚Å‚·"
-#: tag.c:412
+#: ../tag.c:412
msgid "E425: Cannot go before first matching tag"
msgstr "E425: ʼn‚ÌŠY“–ƒ^ƒO‚ð’´‚¦‚Ė߂邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: tag.c:550
+#: ../tag.c:550
#, c-format
msgid "E426: tag not found: %s"
msgstr "E426: ƒ^ƒO‚ª‚݂‚©‚è‚Ü‚¹‚ñ: %s"
-#: tag.c:583
+#: ../tag.c:583
msgid " # pri kind tag"
msgstr " # pri kind tag"
-#: tag.c:586
+#: ../tag.c:586
msgid "file\n"
msgstr "ƒtƒ@ƒCƒ‹\n"
@@ -5571,44 +6091,44 @@ msgstr "ƒtƒ@ƒCƒ‹\n"
#. * Ask to select a tag from the list.
#. * When using ":silent" assume that <CR> was entered.
#.
-#: tag.c:744
+#: ../tag.c:744
msgid "Enter nr of choice (<CR> to abort): "
msgstr "‘I‘ð‚·‚é”Ô†‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢ (<CR>‚Å’†Ž~): "
-#: tag.c:784
+#: ../tag.c:784
msgid "E427: There is only one matching tag"
msgstr "E427: ŠY“–ƒ^ƒO‚ª1‚‚¾‚¯‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
-#: tag.c:786
+#: ../tag.c:786
msgid "E428: Cannot go beyond last matching tag"
msgstr "E428: ÅŒã‚ÉŠY“–‚·‚éƒ^ƒO‚ð’´‚¦‚Äi‚Þ‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: tag.c:810
+#: ../tag.c:810
#, c-format
msgid "File \"%s\" does not exist"
msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚ª‚ ‚è‚Ü‚¹‚ñ"
#. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
#, c-format
msgid "tag %d of %d%s"
msgstr "ƒ^ƒO %d (‘S%d%s)"
-#: tag.c:826
+#: ../tag.c:826
msgid " or more"
msgstr " ‚©‚»‚êˆÈã"
-#: tag.c:828
+#: ../tag.c:828
msgid " Using tag with different case!"
msgstr " ƒ^ƒO‚ðˆÙ‚È‚écase‚ÅŽg—p‚µ‚Ü‚·!"
-#: tag.c:872
+#: ../tag.c:872
#, c-format
msgid "E429: File \"%s\" does not exist"
msgstr "E429: ƒtƒ@ƒCƒ‹ \"%s\" ‚ª‚ ‚è‚Ü‚¹‚ñ"
#. Highlight title
-#: tag.c:941
+#: ../tag.c:941
msgid ""
"\n"
" # TO tag FROM line in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
"\n"
" # TO ƒ^ƒO FROM s in file/text"
-#: tag.c:1363
+#: ../tag.c:1363
#, c-format
msgid "Searching tags file %s"
msgstr "ƒ^ƒOƒtƒ@ƒCƒ‹ %s ‚ðŒŸõ’†"
-#: tag.c:1550
+#: ../tag.c:1550
#, c-format
msgid "E430: Tag file path truncated for %s\n"
msgstr "E430: ƒ^ƒOƒtƒ@ƒCƒ‹‚̃pƒX‚ª %s ‚ÉØ‚èŽÌ‚Ä‚ç‚ê‚Ü‚µ‚½\n"
-#: tag.c:2203
+#: ../tag.c:2202
#, c-format
msgid "E431: Format error in tags file \"%s\""
msgstr "E431: ƒ^ƒOƒtƒ@ƒCƒ‹ \"%s\" ‚̃tƒH[ƒ}ƒbƒg‚ɃGƒ‰[‚ª‚ ‚è‚Ü‚·"
-#: tag.c:2207
+#: ../tag.c:2206
#, c-format
msgid "Before byte %ld"
msgstr "’¼‘O‚Ì %ld ƒoƒCƒg"
-#: tag.c:2240
+#: ../tag.c:2239
#, c-format
msgid "E432: Tags file not sorted: %s"
msgstr "E432: ƒ^ƒOƒtƒ@ƒCƒ‹‚ªƒ\\[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %s"
#. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
msgid "E433: No tags file"
msgstr "E433: ƒ^ƒOƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: tag.c:3016
+#: ../tag.c:3020
msgid "E434: Can't find tag pattern"
msgstr "E434: ƒ^ƒOƒpƒ^[ƒ“‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: tag.c:3027
+#: ../tag.c:3031
msgid "E435: Couldn't find tag, just guessing!"
msgstr "E435: ƒ^ƒO‚ð‚݂‚¯‚ç‚ê‚È‚¢‚Ì‚Å’P‚É„‘ª‚µ‚Ü‚·!"
-#: term.c:1759
+#: ../term.c:1776
msgid "' not known. Available builtin terminals are:"
msgstr "' ‚Í–¢’m‚Å‚·. Œ»s‚Ì‘g‚Ýž‚Ý’[––‚ÍŽŸ‚Ì‚Æ‚¨‚è‚Å‚·:"
-#: term.c:1783
+#: ../term.c:1800
msgid "defaulting to '"
msgstr "È—ª’l‚ðŽŸ‚Ì‚æ‚¤‚Éݒ肵‚Ü‚· '"
-#: term.c:2141
+#: ../term.c:2158
msgid "E557: Cannot open termcap file"
msgstr "E557: termcapƒtƒ@ƒCƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: term.c:2145
+#: ../term.c:2162
msgid "E558: Terminal entry not found in terminfo"
msgstr "E558: terminfo‚É’[––ƒGƒ“ƒgƒŠ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: term.c:2147
+#: ../term.c:2164
msgid "E559: Terminal entry not found in termcap"
msgstr "E559: termcap‚É’[––ƒGƒ“ƒgƒŠ‚ð‚݂‚¯‚ç‚ê‚Ü‚¹‚ñ"
-#: term.c:2306
+#: ../term.c:2323
#, c-format
msgid "E436: No \"%s\" entry in termcap"
msgstr "E436: termcap‚É \"%s\" ‚̃Gƒ“ƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: term.c:2780
+#: ../term.c:2797
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: ’[––‚É \"cm\" ‹@”\\‚ª•K—v‚Å‚·"
#. Highlight title
-#: term.c:4990
+#: ../term.c:5039
msgid ""
"\n"
"--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
"\n"
"--- ’[––ƒL[ ---"
-#: ui.c:258
+#: ../ui.c:276
msgid "new shell started\n"
msgstr "V‚µ‚¢ƒVƒFƒ‹‚ð‹N“®‚µ‚Ü‚·\n"
-#: ui.c:1841
+#: ../ui.c:1860
msgid "Vim: Error reading input, exiting...\n"
msgstr "Vim: “ü—Í‚ð“Çž‚Ý’†‚̃Gƒ‰[‚É‚æ‚èI—¹‚µ‚Ü‚·...\n"
#. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
msgid "No undo possible; continue anyway"
msgstr "‰Â”\\‚ȃAƒ“ƒhƒD‚Í‚ ‚è‚Ü‚¹‚ñ: ‚Æ‚è‚ ‚¦‚¸‘±‚¯‚Ü‚·"
-#: undo.c:561
+#: ../undo.c:578
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: s”Ô†‚ªŠÔˆá‚Á‚Ä‚¢‚Ü‚·"
-#: undo.c:757
+#: ../undo.c:778
msgid "1 change"
msgstr "1 ‰ÓŠ•ÏX‚µ‚Ü‚µ‚½"
-#: undo.c:759
+#: ../undo.c:780
#, c-format
msgid "%ld changes"
msgstr "%ld ‰ÓŠ•ÏX‚µ‚Ü‚µ‚½"
-#: undo.c:812
+#: ../undo.c:833
msgid "E439: undo list corrupt"
msgstr "E439: ƒAƒ“ƒhƒDƒŠƒXƒg‚ª‰ó‚ê‚Ä‚¢‚Ü‚·"
-#: undo.c:844
+#: ../undo.c:865
msgid "E440: undo line missing"
msgstr "E440: ƒAƒ“ƒhƒDs‚ª‚ ‚è‚Ü‚¹‚ñ"
#. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
msgid ""
"\n"
"MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
"\n"
"MS-Windows 16/32 ƒrƒbƒg GUI ”Å"
-#: version.c:1733
+#: ../version.c:724
msgid ""
"\n"
"MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
"\n"
"MS-Windows 32 ƒrƒbƒg GUI ”Å"
-#: version.c:1736
+#: ../version.c:727
msgid " in Win32s mode"
msgstr " in Win32s ƒ‚[ƒh"
-#: version.c:1738
+#: ../version.c:729
msgid " with OLE support"
msgstr " with OLE ƒTƒ|[ƒg"
-#: version.c:1741
+#: ../version.c:732
msgid ""
"\n"
"MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
"\n"
"MS-Windows 32 ƒrƒbƒg ƒRƒ“ƒ\\[ƒ‹ ”Å"
-#: version.c:1745
+#: ../version.c:736
msgid ""
"\n"
"MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
"\n"
"MS-Windows 16 ƒrƒbƒg ”Å"
-#: version.c:1749
+#: ../version.c:740
msgid ""
"\n"
"32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
"\n"
"32 ƒrƒbƒg MS-DOS ”Å"
-#: version.c:1751
+#: ../version.c:742
msgid ""
"\n"
"16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
"\n"
"16 ƒrƒbƒg MS-DOS ”Å"
-#: version.c:1757
+#: ../version.c:748
msgid ""
"\n"
"MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
"\n"
"MacOS X (unix) Ӂ"
-#: version.c:1759
+#: ../version.c:750
msgid ""
"\n"
"MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
"\n"
"MacOS X Ӂ"
-#: version.c:1762
+#: ../version.c:753
msgid ""
"\n"
"MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
"\n"
"MacOS Ӂ"
-#: version.c:1767
+#: ../version.c:758
msgid ""
"\n"
"RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
"\n"
"RISC OS Ӂ"
-#: version.c:1777
+#: ../version.c:768
msgid ""
"\n"
"Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
"\n"
"“K—pσpƒbƒ`: "
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
msgid "Modified by "
msgstr "Modified by "
-#: version.c:1810
+#: ../version.c:801
msgid ""
"\n"
"Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
"\n"
"Compiled "
-#: version.c:1813
+#: ../version.c:804
msgid "by "
msgstr "by "
-#: version.c:1825
+#: ../version.c:816
msgid ""
"\n"
"Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
"\n"
"Huge Ӂ "
-#: version.c:1828
+#: ../version.c:819
msgid ""
"\n"
"Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
"\n"
"Big Ӂ "
-#: version.c:1831
+#: ../version.c:822
msgid ""
"\n"
"Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
"\n"
"’Êí ”Å "
-#: version.c:1834
+#: ../version.c:825
msgid ""
"\n"
"Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
"\n"
"Small Ӂ "
-#: version.c:1836
+#: ../version.c:827
msgid ""
"\n"
"Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
"\n"
"Tiny Ӂ "
-#: version.c:1842
+#: ../version.c:833
msgid "without GUI."
msgstr "without GUI."
-#: version.c:1847
+#: ../version.c:838
msgid "with GTK2-GNOME GUI."
msgstr "with GTK2-GNOME GUI."
-#: version.c:1849
+#: ../version.c:840
msgid "with GTK-GNOME GUI."
msgstr "with GTK-GNOME GUI."
-#: version.c:1853
+#: ../version.c:844
msgid "with GTK2 GUI."
msgstr "with GTK2 GUI."
-#: version.c:1855
+#: ../version.c:846
msgid "with GTK GUI."
msgstr "with GTK GUI."
-#: version.c:1860
+#: ../version.c:851
msgid "with X11-Motif GUI."
msgstr "with X11-Motif GUI."
-#: version.c:1864
+#: ../version.c:855
msgid "with X11-neXtaw GUI."
msgstr "with X11-neXtaw GUI."
-#: version.c:1866
+#: ../version.c:857
msgid "with X11-Athena GUI."
msgstr "with X11-Athena GUI."
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
msgid "with Photon GUI."
msgstr "with Photon GUI."
-#: version.c:1876
+#: ../version.c:864
msgid "with GUI."
msgstr "with GUI."
-#: version.c:1879
+#: ../version.c:867
msgid "with Carbon GUI."
msgstr "with Carbon GUI."
-#: version.c:1882
+#: ../version.c:870
msgid "with Cocoa GUI."
msgstr "with Cocoa GUI."
-#: version.c:1885
+#: ../version.c:873
msgid "with (classic) GUI."
msgstr "with (ƒNƒ‰ƒVƒbƒN) GUI."
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
msgid " Features included (+) or not (-):\n"
msgstr " ‹@”\\‚̈ꗗ —LŒø(+)/–³Œø(-)\n"
-#: version.c:1908
+#: ../version.c:899
msgid " system vimrc file: \""
msgstr " ƒVƒXƒeƒ€ vimrc: \""
-#: version.c:1913
+#: ../version.c:904
msgid " user vimrc file: \""
msgstr " ƒ†[ƒU vimrc: \""
-#: version.c:1918
+#: ../version.c:909
msgid " 2nd user vimrc file: \""
msgstr " ‘æ2ƒ†[ƒU vimrc: \""
-#: version.c:1923
+#: ../version.c:914
msgid " 3rd user vimrc file: \""
msgstr " ‘æ3ƒ†[ƒU vimrc: \""
-#: version.c:1928
+#: ../version.c:919
msgid " user exrc file: \""
msgstr " ƒ†[ƒU exrc: \""
-#: version.c:1933
+#: ../version.c:924
msgid " 2nd user exrc file: \""
msgstr " ‘æ2ƒ†[ƒU exrc: \""
-#: version.c:1939
+#: ../version.c:930
msgid " system gvimrc file: \""
msgstr " ƒVƒXƒeƒ€ gvimrc: \""
-#: version.c:1943
+#: ../version.c:934
msgid " user gvimrc file: \""
msgstr " ƒ†[ƒU gvimrc: \""
-#: version.c:1947
+#: ../version.c:938
msgid "2nd user gvimrc file: \""
msgstr " ‘æ2ƒ†[ƒU gvimrc: \""
-#: version.c:1952
+#: ../version.c:943
msgid "3rd user gvimrc file: \""
msgstr " ‘æ3ƒ†[ƒU gvimrc: \""
-#: version.c:1959
+#: ../version.c:950
msgid " system menu file: \""
msgstr " ƒVƒXƒeƒ€ƒƒjƒ…[: \""
-#: version.c:1967
+#: ../version.c:958
msgid " fall-back for $VIM: \""
msgstr " È—ªŽž‚Ì $VIM: \""
-#: version.c:1973
+#: ../version.c:964
msgid " f-b for $VIMRUNTIME: \""
msgstr "È—ªŽž‚Ì $VIMRUNTIME: \""
-#: version.c:1977
+#: ../version.c:968
msgid "Compilation: "
msgstr "ƒRƒ“ƒpƒCƒ‹: "
-#: version.c:1983
+#: ../version.c:974
msgid "Compiler: "
msgstr "ƒRƒ“ƒpƒCƒ‰: "
-#: version.c:1988
+#: ../version.c:979
msgid "Linking: "
msgstr "ƒŠƒ“ƒN: "
-#: version.c:1993
+#: ../version.c:984
msgid " DEBUG BUILD"
msgstr "ƒfƒoƒbƒOƒrƒ‹ƒh"
-#: version.c:2032
+#: ../version.c:1023
msgid "VIM - Vi IMproved"
msgstr "VIM - Vi IMproved"
-#: version.c:2034
+#: ../version.c:1025
msgid "version "
msgstr "version "
-#: version.c:2035
+#: ../version.c:1026
msgid "by Bram Moolenaar et al."
msgstr "by Bram Moolenaar ‘¼."
-#: version.c:2039
+#: ../version.c:1030
msgid "Vim is open source and freely distributable"
msgstr "Vim ‚̓I[ƒvƒ“ƒ\\[ƒX‚Å‚ ‚莩—R‚É”z•z‰Â”\\‚Å‚·"
-#: version.c:2041
+#: ../version.c:1032
msgid "Help poor children in Uganda!"
msgstr "ƒEƒKƒ“ƒ_‚ÌŒb‚Ü‚ê‚È‚¢Žq‹Ÿ‚½‚¿‚ɉ‡•‚ð!"
-#: version.c:2042
+#: ../version.c:1033
msgid "type :help iccf<Enter> for information "
msgstr "ÚׂÈî•ñ‚Í :help iccf<Enter> "
-#: version.c:2044
+#: ../version.c:1035
msgid "type :q<Enter> to exit "
msgstr "I—¹‚·‚é‚É‚Í :q<Enter> "
-#: version.c:2045
+#: ../version.c:1036
msgid "type :help<Enter> or <F1> for on-line help"
msgstr "ƒIƒ“ƒ‰ƒCƒ“ƒwƒ‹ƒv‚Í :help<Enter> ‚© <F1> "
-#: version.c:2046
-msgid "type :help version6<Enter> for version info"
-msgstr "ƒo[ƒWƒ‡ƒ“î•ñ‚Í :help version6<Enter> "
+#: ../version.c:1037
+msgid "type :help version7<Enter> for version info"
+msgstr "ƒo[ƒWƒ‡ƒ“î•ñ‚Í :help version7<Enter> "
-#: version.c:2049
+#: ../version.c:1040
msgid "Running in Vi compatible mode"
msgstr "ViŒÝŠ·ƒ‚[ƒh‚Å“®ì’†"
-#: version.c:2050
+#: ../version.c:1041
msgid "type :set nocp<Enter> for Vim defaults"
msgstr "Vim„§’l‚É‚·‚é‚É‚Í :set nocp<Enter> "
-#: version.c:2051
+#: ../version.c:1042
msgid "type :help cp-default<Enter> for info on this"
msgstr "ÚׂÈî•ñ‚Í :help cp-default<Enter>"
-#: version.c:2066
+#: ../version.c:1057
msgid "menu Help->Orphans for information "
msgstr "Úׂ̓ƒjƒ…[‚Ì ƒwƒ‹ƒv¨ŒÇŽ™ ‚ðŽQÆ‚µ‚ĉº‚³‚¢ "
-#: version.c:2068
+#: ../version.c:1059
msgid "Running modeless, typed text is inserted"
msgstr "ƒ‚[ƒh–³‚ÅŽÀs’†, ƒ^ƒCƒv‚µ‚½•¶Žš‚ª‘}“ü‚³‚ê‚Ü‚·"
-#: version.c:2069
+#: ../version.c:1060
msgid "menu Edit->Global Settings->Toggle Insert Mode "
msgstr "ƒƒjƒ…[‚Ì •ÒW¨‘S‘Ìݒ訑}“ü(‰SŽÒ)ƒ‚[ƒhØ‘Ö"
-#: version.c:2070
+#: ../version.c:1061
msgid " for two modes "
msgstr " ‚Ń‚[ƒh—L‚É "
-#: version.c:2074
+#: ../version.c:1065
msgid "menu Edit->Global Settings->Toggle Vi Compatible"
msgstr "ƒƒjƒ…[‚Ì •ÒW¨‘S‘ÌÝ’è¨ViŒÝŠ·ƒ‚[ƒhØ‘Ö "
-#: version.c:2075
+#: ../version.c:1066
msgid " for Vim defaults "
msgstr " ‚ÅVim‚Æ‚µ‚Ä“®ì "
-#: version.c:2122
+#: ../version.c:1113
msgid "Sponsor Vim development!"
msgstr "Vim‚ÌŠJ”­‚ð‰ž‰‡‚µ‚Ä‚­‚¾‚³‚¢!"
-#: version.c:2123
+#: ../version.c:1114
msgid "Become a registered Vim user!"
msgstr "Vim‚Ì“o˜^ƒ†[ƒU‚É‚È‚Á‚Ä‚­‚¾‚³‚¢!"
-#: version.c:2126
+#: ../version.c:1117
msgid "type :help sponsor<Enter> for information "
msgstr "ÚׂÈî•ñ‚Í :help sponsor<Enter> "
-#: version.c:2127
+#: ../version.c:1118
msgid "type :help register<Enter> for information "
msgstr "ÚׂÈî•ñ‚Í :help register<Enter> "
-#: version.c:2129
+#: ../version.c:1120
msgid "menu Help->Sponsor/Register for information "
msgstr "Úׂ̓ƒjƒ…[‚Ì ƒwƒ‹ƒv¨ƒXƒ|ƒ“ƒT[/“o˜^ ‚ðŽQÆ‚µ‚ĉº‚³‚¢ "
-#: version.c:2139
+#: ../version.c:1130
msgid "WARNING: Windows 95/98/ME detected"
msgstr " Œx: Windows 95/98/Me ‚ðŒŸo "
-#: version.c:2142
+#: ../version.c:1133
msgid "type :help windows95<Enter> for info on this"
msgstr " ÚׂÈî•ñ‚Í :help windows95<Enter> "
-#: window.c:203
+#: ../window.c:208
msgid "E441: There is no preview window"
msgstr "E441: ƒvƒŒƒrƒ…[ƒEƒBƒ“ƒhƒE‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: window.c:581
+#: ../window.c:603
msgid "E442: Can't split topleft and botright at the same time"
msgstr "E442: ¶ã‚ƉE‰º‚𓯎ž‚É•ªŠ„‚·‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: window.c:1340
+#: ../window.c:1362
msgid "E443: Cannot rotate when another window is split"
msgstr "E443: ‘¼‚̃EƒBƒ“ƒhƒE‚ª•ªŠ„‚³‚ê‚Ä‚¢‚鎞‚ɂ͇‰ñ‚Å‚«‚Ü‚¹‚ñ"
-#: window.c:1836
+#: ../window.c:1858
msgid "E444: Cannot close last window"
msgstr "E444: ÅŒã‚̃EƒBƒ“ƒhƒE‚ð•Â‚¶‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: window.c:2567
+#: ../window.c:2593
msgid "Already only one window"
msgstr "Šù‚ɃEƒBƒ“ƒhƒE‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
-#: window.c:2614
+#: ../window.c:2640
msgid "E445: Other window contains changes"
msgstr "E445: ‘¼‚̃EƒBƒ“ƒhƒE‚É‚Í•ÏX‚ª‚ ‚è‚Ü‚·"
-#: window.c:4480
+#: ../window.c:4564
msgid "E446: No file name under cursor"
msgstr "E446: ƒJ[ƒ\\ƒ‹‚̉º‚Ƀtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: window.c:4599
+#: ../window.c:4683
#, c-format
msgid "E447: Can't find file \"%s\" in path"
msgstr "E447: path‚É‚Í \"%s\" ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1232 if_perl.xs:326
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-
-#: if_perl.xs:554
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·, ‚²‚ß‚ñ‚È‚³‚¢: Perlƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í Safe "
-"ƒ‚ƒWƒ…[ƒ‹‚ðŽg—p‚µ‚È‚¢PerlƒXƒNƒŠƒvƒg‚Í‹Ö‚¶‚ç‚ê‚Ä‚¢‚Ü‚·"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "Šeƒtƒ@ƒCƒ‹‚ð•ÊX‚Ì Vim ‚Å•ÒW(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "‘Sƒtƒ@ƒCƒ‹‚ð1‚Â‚Ì Vim ‚Å•ÒW(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim ‚Å·•ª•ÒW(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim ‚Å•ÒW(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "Šù‘¶‚Ì Vim ‚Å•ÒW - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ð Vim ‚Å•ÒW"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "‹N“®ƒGƒ‰[: gvim ‚ɃpƒX‚ª’Ê‚Á‚Ä‚¢‚é‚©Šm‚©‚ß‚Ä‚­‚¾‚³‚¢!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll ƒGƒ‰["
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "ƒpƒX‚ª’·‚·‚¬‚Ü‚·!"
-
-#: globals.h:1022
+#: ../globals.h:1056
msgid "--No lines in buffer--"
msgstr "--ƒoƒbƒtƒ@‚És‚ª‚ ‚è‚Ü‚¹‚ñ--"
@@ -6200,388 +6668,418 @@ msgstr "--ƒoƒbƒtƒ@‚És‚ª‚ ‚è‚Ü‚¹‚ñ--"
#. * The error messages that can be shared are included here.
#. * Excluded are errors that are only used once and debugging messages.
#.
-#: globals.h:1185
+#: ../globals.h:1247
msgid "E470: Command aborted"
msgstr "E470: ƒRƒ}ƒ“ƒh‚ª’†’f‚³‚ê‚Ü‚µ‚½"
-#: globals.h:1186
+#: ../globals.h:1248
msgid "E471: Argument required"
msgstr "E471: ˆø”‚ª•K—v‚Å‚·"
-#: globals.h:1187
+#: ../globals.h:1249
msgid "E10: \\ should be followed by /, ? or &"
msgstr "E10: \\ ‚ÌŒã‚Í / ‚© ? ‚© & ‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-#: globals.h:1189
+#: ../globals.h:1251
msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
msgstr "E11: ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“‚Å‚Í–³Œø‚Å‚·; <CR>‚ÅŽÀs, CTRL-C‚Å‚â‚ß‚é"
-#: globals.h:1191
+#: ../globals.h:1253
msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
msgstr ""
"E12: Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ‚âƒ^ƒOŒŸõ‚Å‚Íexrc/vimrc‚̃Rƒ}ƒ“ƒh‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
-#: globals.h:1193
+#: ../globals.h:1255
msgid "E171: Missing :endif"
msgstr "E171: :endif ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1194
+#: ../globals.h:1256
msgid "E600: Missing :endtry"
msgstr "E600: :endtry ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1195
+#: ../globals.h:1257
msgid "E170: Missing :endwhile"
msgstr "E170: :endwhile ‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#: ../globals.h:1259
msgid "E588: :endwhile without :while"
msgstr "E588: :while ‚Ì‚È‚¢ :endwhile ‚ª‚ ‚è‚Ü‚·"
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ‚Ì‚È‚¢ :for ‚ª‚ ‚è‚Ü‚·"
+
+#: ../globals.h:1262
msgid "E13: File exists (add ! to override)"
msgstr "E13: ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚· (! ‚ð’ljÁ‚Åã‘)"
-#: globals.h:1199
+#: ../globals.h:1263
msgid "E472: Command failed"
msgstr "E472: ƒRƒ}ƒ“ƒh‚ªŽ¸”s‚µ‚Ü‚µ‚½"
-#: globals.h:1201
+#: ../globals.h:1265
#, c-format
msgid "E234: Unknown fontset: %s"
msgstr "E234: –¢’m‚̃tƒHƒ“ƒgƒZƒbƒg: %s"
-#: globals.h:1205
+#: ../globals.h:1269
#, c-format
msgid "E235: Unknown font: %s"
msgstr "E235: –¢’m‚̃tƒHƒ“ƒg: %s"
-#: globals.h:1208
+#: ../globals.h:1272
#, c-format
msgid "E236: Font \"%s\" is not fixed-width"
msgstr "E236: ƒtƒHƒ“ƒg \"%s\" ‚͌Œ蕂ł͂ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1210
+#: ../globals.h:1274
msgid "E473: Internal error"
msgstr "E473: “à•”ƒGƒ‰[‚Å‚·"
-#: globals.h:1211
+#: ../globals.h:1275
msgid "Interrupted"
msgstr "Š„ž‚Ü‚ê‚Ü‚µ‚½"
-#: globals.h:1212
+#: ../globals.h:1276
msgid "E14: Invalid address"
msgstr "E14: –³Œø‚ȃAƒhƒŒƒX‚Å‚·"
-#: globals.h:1213
+#: ../globals.h:1277
msgid "E474: Invalid argument"
msgstr "E474: –³Œø‚Ȉø”‚Å‚·"
-#: globals.h:1214
+#: ../globals.h:1278
#, c-format
msgid "E475: Invalid argument: %s"
msgstr "E475: –³Œø‚Ȉø”‚Å‚·: %s"
-#: globals.h:1216
+#: ../globals.h:1280
#, c-format
msgid "E15: Invalid expression: %s"
msgstr "E15: –³Œø‚ÈŽ®‚Å‚·: %s"
-#: globals.h:1218
+#: ../globals.h:1282
msgid "E16: Invalid range"
msgstr "E16: –³Œø‚Ȕ͈͂ł·"
-#: globals.h:1219
+#: ../globals.h:1283
msgid "E476: Invalid command"
msgstr "E476: –³Œø‚ȃRƒ}ƒ“ƒh‚Å‚·"
-#: globals.h:1221
+#: ../globals.h:1285
#, c-format
msgid "E17: \"%s\" is a directory"
msgstr "E17: \"%s\" ‚̓fƒBƒŒƒNƒgƒŠ‚Å‚·"
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: —\\Šú‚¹‚Ê•¶Žš‚ª '=' ‚Ì‘O‚É‚ ‚è‚Ü‚µ‚½"
-
-#: globals.h:1227
+#: ../globals.h:1288
#, c-format
msgid "E364: Library call failed for \"%s()\""
msgstr "E364: \"%s\"() ‚̃‰ƒCƒuƒ‰ƒŠŒÄo‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
-#: globals.h:1233
+#: ../globals.h:1294
#, c-format
msgid "E448: Could not load library function %s"
msgstr "E448: ƒ‰ƒCƒuƒ‰ƒŠ‚ÌŠÖ” %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: globals.h:1235
+#: ../globals.h:1296
msgid "E19: Mark has invalid line number"
msgstr "E19: ƒ}[ƒN‚É–³Œø‚Ès”Ô†‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚µ‚½"
-#: globals.h:1236
+#: ../globals.h:1297
msgid "E20: Mark not set"
msgstr "E20: ƒ}[ƒN‚Íݒ肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1237
+#: ../globals.h:1298
msgid "E21: Cannot make changes, 'modifiable' is off"
msgstr "E21: 'modifiable' ‚ªƒIƒt‚È‚Ì‚Å, •ÏX‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1238
+#: ../globals.h:1299
msgid "E22: Scripts nested too deep"
-msgstr "E22: ƒXƒNƒŠƒvƒg‚Ì“ü‚êŽq‚ª[‚·‚¬‚Ü‚·"
+msgstr "E22: ƒXƒNƒŠƒvƒg‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
-#: globals.h:1239
+#: ../globals.h:1300
msgid "E23: No alternate file"
msgstr "E23: •›ƒtƒ@ƒCƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1240
+#: ../globals.h:1301
msgid "E24: No such abbreviation"
msgstr "E24: ‚»‚̂悤‚È’Zk“ü—Í‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1241
+#: ../globals.h:1302
msgid "E477: No ! allowed"
msgstr "E477: ! ‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1243
+#: ../globals.h:1304
msgid "E25: GUI cannot be used: Not enabled at compile time"
msgstr "E25: GUI‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·"
-#: globals.h:1246
+#: ../globals.h:1307
msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
msgstr "E26: ƒwƒuƒ‰ƒCŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-#: globals.h:1249
+#: ../globals.h:1310
msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
msgstr "E27: ƒyƒ‹ƒVƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-#: globals.h:1252
+#: ../globals.h:1313
msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
msgstr "E800: ƒAƒ‰ƒrƒAŒê‚ÍŽg—p•s‰Â”\\‚Å‚·: ƒRƒ“ƒpƒCƒ‹Žž‚É–³Œø‚É‚³‚ê‚Ä‚¢‚Ü‚·\n"
-#: globals.h:1255
+#: ../globals.h:1316
#, c-format
msgid "E28: No such highlight group name: %s"
msgstr "E28: ‚»‚̂悤‚È–¼‚̃nƒCƒ‰ƒCƒgƒOƒ‹[ƒv‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: globals.h:1257
+#: ../globals.h:1318
msgid "E29: No inserted text yet"
msgstr "E29: ‚Ü‚¾ƒeƒLƒXƒg‚ª‘}“ü‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1258
+#: ../globals.h:1319
msgid "E30: No previous command line"
msgstr "E30: ˆÈ‘O‚ɃRƒ}ƒ“ƒhs‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1259
+#: ../globals.h:1320
msgid "E31: No such mapping"
msgstr "E31: ‚»‚̂悤‚ȃ}ƒbƒsƒ“ƒO‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1260
+#: ../globals.h:1321
msgid "E479: No match"
msgstr "E479: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1261
+#: ../globals.h:1322
#, c-format
msgid "E480: No match: %s"
msgstr "E480: ŠY“–‚Í‚ ‚è‚Ü‚¹‚ñ: %s"
-#: globals.h:1262
+#: ../globals.h:1323
msgid "E32: No file name"
msgstr "E32: ƒtƒ@ƒCƒ‹–¼‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1263
+#: ../globals.h:1324
msgid "E33: No previous substitute regular expression"
msgstr "E33: ³‹K•\\Œ»’uŠ·‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1264
+#: ../globals.h:1325
msgid "E34: No previous command"
msgstr "E34: ƒRƒ}ƒ“ƒh‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1265
+#: ../globals.h:1326
msgid "E35: No previous regular expression"
msgstr "E35: ³‹K•\\Œ»‚ª‚Ü‚¾ŽÀs‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1266
+#: ../globals.h:1327
msgid "E481: No range allowed"
msgstr "E481: ”͈͎w’è‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1268
+#: ../globals.h:1329
msgid "E36: Not enough room"
msgstr "E36: [•ª‚È—e—Ê‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1271
+#: ../globals.h:1332
#, c-format
msgid "E247: no registered server named \"%s\""
msgstr "E247: %s ‚Æ‚¢‚¤–¼‘O‚Ì“o˜^‚³‚ꂽƒT[ƒo‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1273
+#: ../globals.h:1334
#, c-format
msgid "E482: Can't create file %s"
msgstr "E482: ƒtƒ@ƒCƒ‹ %s ‚ð쬂ł«‚Ü‚¹‚ñ"
-#: globals.h:1274
+#: ../globals.h:1335
msgid "E483: Can't get temp file name"
msgstr "E483: ˆêŽžƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1275
+#: ../globals.h:1336
#, c-format
msgid "E484: Can't open file %s"
msgstr "E484: ƒtƒ@ƒCƒ‹ \"%s\" ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: globals.h:1276
+#: ../globals.h:1337
#, c-format
msgid "E485: Can't read file %s"
msgstr "E485: ƒtƒ@ƒCƒ‹ %s ‚ð“Çž‚ß‚Ü‚¹‚ñ"
-#: globals.h:1277
+#: ../globals.h:1338
msgid "E37: No write since last change (add ! to override)"
msgstr "E37: ÅŒã‚Ì•ÏX‚ª•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ (! ‚ð’ljÁ‚Å•ÏX‚ð”jŠü)"
-#: globals.h:1278
+#: ../globals.h:1339
msgid "E38: Null argument"
msgstr "E38: ˆø”‚ª‹ó‚Å‚·"
-#: globals.h:1280
+#: ../globals.h:1341
msgid "E39: Number expected"
msgstr "E39: ”’l‚ª—v‹‚³‚ê‚Ä‚¢‚Ü‚·"
-#: globals.h:1283
+#: ../globals.h:1344
#, c-format
msgid "E40: Can't open errorfile %s"
msgstr "E40: ƒGƒ‰[ƒtƒ@ƒCƒ‹ %s ‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: globals.h:1286
+#: ../globals.h:1347
msgid "E233: cannot open display"
msgstr "E233: ƒfƒBƒXƒvƒŒƒC‚ðŠJ‚¯‚Ü‚¹‚ñ"
-#: globals.h:1288
+#: ../globals.h:1349
msgid "E41: Out of memory!"
msgstr "E41: ƒƒ‚ƒŠ‚ªs‚«‰Ê‚Ä‚Ü‚µ‚½!"
-#: globals.h:1290
+#: ../globals.h:1351
msgid "Pattern not found"
msgstr "ƒpƒ^[ƒ“‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: globals.h:1292
+#: ../globals.h:1353
#, c-format
msgid "E486: Pattern not found: %s"
msgstr "E486: ƒpƒ^[ƒ“‚݂͂‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½: %s"
-#: globals.h:1293
+#: ../globals.h:1354
msgid "E487: Argument must be positive"
msgstr "E487: ˆø”‚ͳ‚Ì’l‚Å‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ"
-#: globals.h:1295
+#: ../globals.h:1356
msgid "E459: Cannot go back to previous directory"
msgstr "E459: ‘O‚̃fƒBƒŒƒNƒgƒŠ‚É–ß‚ê‚Ü‚¹‚ñ"
-#: globals.h:1299
+#: ../globals.h:1360
msgid "E42: No Errors"
msgstr "E42: ƒGƒ‰[‚Í‚ ‚è‚Ü‚¹‚ñ"
-#: globals.h:1301
+#: ../globals.h:1362
msgid "E43: Damaged match string"
msgstr "E43: ŠY“–•¶Žš—ñ‚ª”j‘¹‚µ‚Ä‚¢‚Ü‚·"
-#: globals.h:1302
+#: ../globals.h:1363
msgid "E44: Corrupted regexp program"
msgstr "E44: •s³‚ȳ‹K•\\Œ»ƒvƒƒOƒ‰ƒ€‚Å‚·"
-#: globals.h:1303
+#: ../globals.h:1364
msgid "E45: 'readonly' option is set (add ! to override)"
msgstr "E45: 'readonly' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚· (! ‚ð’ljÁ‚Åã‘‚«)"
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: “ÇŽæê—p•Ï” \"%s\" ‚É‚Í’l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../globals.h:1367
#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: “ÇŽæê—p•Ï” \"%s\" ‚ÉÝ’è‚·‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í•Ï” \"%s\" ‚É’l‚ðÝ’è‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1308
+#: ../globals.h:1370
msgid "E47: Error while reading errorfile"
msgstr "E47: ƒGƒ‰[ƒtƒ@ƒCƒ‹‚Ì“Çž’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½"
-#: globals.h:1311
+#: ../globals.h:1373
msgid "E48: Not allowed in sandbox"
msgstr "E48: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í‹–‚³‚ê‚Ü‚¹‚ñ"
-#: globals.h:1313
+#: ../globals.h:1375
msgid "E523: Not allowed here"
msgstr "E523: ‚±‚±‚Å‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñ"
-#: globals.h:1316
+#: ../globals.h:1378
msgid "E359: Screen mode setting not supported"
msgstr "E359: ƒXƒNƒŠ[ƒ“ƒ‚[ƒh‚ÌÝ’è‚ɂ͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: globals.h:1318
+#: ../globals.h:1380
msgid "E49: Invalid scroll size"
msgstr "E49: –³Œø‚ȃXƒNƒ[ƒ‹—Ê‚Å‚·"
-#: globals.h:1319
+#: ../globals.h:1381
msgid "E91: 'shell' option is empty"
msgstr "E91: 'shell' ƒIƒvƒVƒ‡ƒ“‚ª‹ó‚Å‚·"
-#: globals.h:1321
+#: ../globals.h:1383
msgid "E255: Couldn't read in sign data!"
msgstr "E255: sign ‚̃f[ƒ^‚ð“Çž‚ß‚Ü‚¹‚ñ‚Å‚µ‚½"
-#: globals.h:1323
+#: ../globals.h:1385
msgid "E72: Close error on swap file"
msgstr "E72: ƒXƒƒbƒvƒtƒ@ƒCƒ‹‚̃Nƒ[ƒYŽžƒGƒ‰[‚Å‚·"
-#: globals.h:1324
+#: ../globals.h:1386
msgid "E73: tag stack empty"
msgstr "E73: ƒ^ƒOƒXƒ^ƒbƒN‚ª‹ó‚Å‚·"
-#: globals.h:1325
+#: ../globals.h:1387
msgid "E74: Command too complex"
-msgstr "E74: ƒRƒ}ƒ“ƒh‚ª•¡ŽG‚·‚¬‚Ü‚·"
+msgstr "E74: ƒRƒ}ƒ“ƒh‚ª•¡ŽG‰ß‚¬‚Ü‚·"
-#: globals.h:1326
+#: ../globals.h:1388
msgid "E75: Name too long"
-msgstr "E75: –¼‘O‚ª’·‚·‚¬‚Ü‚·"
+msgstr "E75: –¼‘O‚ª’·‰ß‚¬‚Ü‚·"
-#: globals.h:1327
+#: ../globals.h:1389
msgid "E76: Too many ["
-msgstr "E76: [ ‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E76: [ ‚ª‘½‰ß‚¬‚Ü‚·"
-#: globals.h:1328
+#: ../globals.h:1390
msgid "E77: Too many file names"
-msgstr "E77: ƒtƒ@ƒCƒ‹–¼‚ª‘½‚·‚¬‚Ü‚·"
+msgstr "E77: ƒtƒ@ƒCƒ‹–¼‚ª‘½‰ß‚¬‚Ü‚·"
-#: globals.h:1329
+#: ../globals.h:1391
msgid "E488: Trailing characters"
msgstr "E488: —]•ª‚È•¶Žš‚ªŒã‚ë‚É‚ ‚è‚Ü‚·"
-#: globals.h:1330
+#: ../globals.h:1392
msgid "E78: Unknown mark"
msgstr "E78: –¢’m‚̃}[ƒN"
-#: globals.h:1331
+#: ../globals.h:1393
msgid "E79: Cannot expand wildcards"
msgstr "E79: ƒƒCƒ‹ƒhƒJ[ƒh‚ð“WŠJ‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1333
+#: ../globals.h:1395
msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
msgstr "E591: 'winheight' ‚Í 'winminheight' ‚æ‚謂³‚­‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1335
+#: ../globals.h:1397
msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
msgstr "E592: 'winwidth' ‚Í 'winminwidth' ‚æ‚謂³‚­‚Å‚«‚Ü‚¹‚ñ"
-#: globals.h:1338
+#: ../globals.h:1400
msgid "E80: Error while writing"
msgstr "E80: ‘ž‚Ý’†‚̃Gƒ‰["
-#: globals.h:1339
+#: ../globals.h:1401
msgid "Zero count"
msgstr "ƒ[ƒƒJƒEƒ“ƒg"
-#: globals.h:1341
+#: ../globals.h:1403
msgid "E81: Using <SID> not in a script context"
msgstr "E81: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½"
-#: globals.h:1344
+#: ../globals.h:1406
msgid "E449: Invalid expression received"
msgstr "E449: –³Œø‚ÈŽ®‚ðŽó‚¯Žæ‚è‚Ü‚µ‚½"
-#: globals.h:1347
+#: ../globals.h:1409
msgid "E463: Region is guarded, cannot modify"
msgstr "E463: —̈悪•ÛŒì‚³‚ê‚Ä‚¢‚é‚Ì‚Å, •ÏX‚Å‚«‚Ü‚¹‚ñ"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ‚Í“Çžê—pƒtƒ@ƒCƒ‹‚ð•ÏX‚·‚邱‚Æ‚ð‹–‚µ‚Ü‚¹‚ñ"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: “à•”ƒGƒ‰[‚Å‚·: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: ƒNƒ‰ƒbƒVƒ…‚É‚æ‚è’†’f; ³‹K•\\Œ»‚ª•¡ŽG‰ß‚¬‚é‚©‚à?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: ƒpƒ^[ƒ“‚É‚æ‚éƒXƒ^ƒbƒN•s‘«ƒGƒ‰[‚Å‚·"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: ƒoƒbƒtƒ@‚ª‹ó‚Å‚·"
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 2a6f12e27..023f422c1 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -43,6 +43,7 @@ char_u *get_function_name __ARGS((expand_T *xp, int idx));
char_u *get_expr_name __ARGS((expand_T *xp, int idx));
void set_vim_var_nr __ARGS((int idx, long val));
long get_vim_var_nr __ARGS((int idx));
+char_u *get_vim_var_str __ARGS((int idx));
void set_vcount __ARGS((long count, long count1));
void set_vim_var_string __ARGS((int idx, char_u *val, int len));
void set_reg_var __ARGS((int c));
diff --git a/src/proto/tag.pro b/src/proto/tag.pro
index f8c236f56..5df6c30f7 100644
--- a/src/proto/tag.pro
+++ b/src/proto/tag.pro
@@ -5,4 +5,5 @@ void do_tags __ARGS((exarg_T *eap));
int find_tags __ARGS((char_u *pat, int *num_matches, char_u ***matchesp, int flags, int mincount, char_u *buf_ffname));
void simplify_filename __ARGS((char_u *filename));
int expand_tags __ARGS((int tagnames, char_u *pat, int *num_file, char_u ***file));
+int get_tags __ARGS((list_T *list, char_u *pat));
/* vim: set ft=c : */
diff --git a/src/regexp.c b/src/regexp.c
index bf5f7afd1..36f5bb456 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -100,10 +100,10 @@
*
* +----------------------+
* V |
- * <aa>\+ BRANCH <aa> --> BRANCH --> BACK BRANCH --> NOTHING --> END
- * | | ^ ^
- * | +----------+ |
- * +-------------------------------------------------+
+ * <aa>\+ BRANCH <aa> --> BRANCH --> BACKP BRANCH --> NOTHING --> END
+ * | | ^ ^
+ * | +-----------+ |
+ * +--------------------------------------------------+
*
*
* +-------------------------+
@@ -229,6 +229,8 @@
#define RE_COL 205 /* nr cmp Match column number */
#define RE_VCOL 206 /* nr cmp Match virtual column number */
+#define BACKP 207 /* Like BACK but for \+ */
+
/*
* Magic characters have a special meaning, they don't match literally.
* Magic characters are negative. This separates them from literal characters
@@ -281,6 +283,8 @@ toggle_Magic(x)
* BACK Normal "next" pointers all implicitly point forward; BACK
* exists to make loop structures possible.
*
+ * BACKP Like BACK, but used for \+. Doesn't check for an empty match.
+ *
* STAR,PLUS '=', and complex '*' and '+', are implemented as circular
* BRANCH structures using BACK. Simple cases (one character
* per match) are implemented with STAR and PLUS for speed
@@ -1448,7 +1452,7 @@ regpiece(flagp)
/* Emit x+ as x(&|), where & means "self". */
next = regnode(BRANCH); /* Either */
regtail(ret, next);
- regtail(regnode(BACK), ret); /* loop back */
+ regtail(regnode(BACKP), ret); /* loop back */
regtail(next, regnode(BRANCH)); /* or */
regtail(ret, regnode(NOTHING)); /* null. */
}
@@ -2483,7 +2487,7 @@ regtail(p, val)
scan = temp;
}
- if (OP(scan) == BACK)
+ if (OP(scan) == BACK || OP(scan) == BACKP)
offset = (int)(scan - val);
else
offset = (int)(val - scan);
@@ -4092,6 +4096,9 @@ regmatch(scan, startp)
return FALSE;
break;
+ case BACKP:
+ break;
+
case MOPEN + 0: /* Match start: \zs */
case MOPEN + 1: /* \( */
case MOPEN + 2:
@@ -4356,6 +4363,10 @@ regmatch(scan, startp)
{
if (OP(next) != BRANCH) /* No choice. */
next = OPERAND(scan); /* Avoid recursion. */
+ else if (startp != NULL && OP(OPERAND(scan)) == BACKP
+ && reg_save_equal(startp))
+ /* \+ with something empty before it */
+ return FALSE;
else
{
regsave_T save;
@@ -5134,7 +5145,7 @@ regnext(p)
if (offset == 0)
return NULL;
- if (OP(p) == BACK)
+ if (OP(p) == BACK || OP(p) == BACKP)
return p - offset;
else
return p + offset;
@@ -5604,6 +5615,9 @@ regprop(op)
case BACK:
p = "BACK";
break;
+ case BACKP:
+ p = "BACKP";
+ break;
case END:
p = "END";
break;
diff --git a/src/tag.c b/src/tag.c
index a3bed7a80..e2c5238b3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3536,3 +3536,128 @@ expand_tags(tagnames, pat, num_file, file)
return ret;
}
#endif
+
+#if defined(FEAT_EVAL) || defined(PROTO)
+static int add_tag_field __ARGS((dict_T *dict, char *field_name, char_u *start, char_u *end));
+
+/*
+ * Add a tag field to the dictionary "dict"
+ */
+ static int
+add_tag_field(dict, field_name, start, end)
+ dict_T *dict;
+ char *field_name;
+ char_u *start;
+ char_u *end;
+{
+ char_u buf[MAXPATHL];
+ int len;
+
+ len = end - start;
+ if (len > sizeof(buf) - 1)
+ len = sizeof(buf) - 1;
+ STRNCPY(buf, start, len);
+ buf[len] = NUL;
+ return dict_add_nr_str(dict, field_name, 0L, buf);
+}
+
+/*
+ * Add the tags matching the specified pattern to the list "list"
+ * as a dictionary
+ */
+ int
+get_tags(list, pat)
+ list_T *list;
+ char_u *pat;
+{
+ int num_matches, i, ret;
+ char_u **matches, *p;
+ dict_T *dict;
+ tagptrs_T tp;
+ long is_static;
+ char_u buf[200];
+ char_u *bp;
+
+ ret = find_tags(pat, &num_matches, &matches,
+ TAG_REGEXP | TAG_NOIC, (int)MAXCOL, NULL);
+ if (ret == OK && num_matches > 0)
+ {
+ for (i = 0; i < num_matches; ++i)
+ {
+ if ((dict = dict_alloc()) == NULL)
+ ret = FAIL;
+ if (list_append_dict(list, dict) == FAIL)
+ ret = FAIL;
+
+ parse_match(matches[i], &tp);
+ is_static = test_for_static(&tp);
+
+ if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
+ || add_tag_field(dict, "filename", tp.fname,
+ tp.fname_end) == FAIL
+ || add_tag_field(dict, "cmd", tp.command,
+ tp.command_end) == FAIL
+ || add_tag_field(dict, "kind", tp.tagkind,
+ tp.tagkind_end) == FAIL
+ || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
+ ret = FAIL;
+
+ bp = buf;
+
+ if (tp.command_end != NULL)
+ {
+ for (p = tp.command_end + 3;
+ *p != NUL && *p != '\n' && *p != '\r'; ++p)
+ {
+ if (p == tp.tagkind || (p + 5 == tp.tagkind
+ && STRNCMP(p, "kind:", 5) == 0))
+ /* skip "kind:<kind>" and "<kind>" */
+ p = tp.tagkind_end - 1;
+ else if (STRNCMP(p, "file:", 5) == 0)
+ /* skip "file:" (static tag) */
+ p += 4;
+ else if (STRNCMP(p, "struct:", 7) == 0
+ || STRNCMP(p, "enum:", 5) == 0
+ || STRNCMP(p, "class:", 6) == 0)
+ {
+ char_u *s, *n;
+
+ /* Field we recognize, add as a dict entry. */
+ n = p;
+ if (*n == 's')
+ p += 7;
+ else if (*n == 'e')
+ p += 5;
+ else
+ p += 6;
+ s = p;
+ while (*p != NUL && *p != '\n' && *p != '\r')
+ ++p;
+ if (add_tag_field(dict,
+ *n == 's' ? "struct"
+ : *n == 'e' ? "enum" : "class",
+ s, p) == FAIL)
+ ret = FAIL;
+ --p;
+ }
+ else if ((bp - buf) < sizeof(buf) - 1
+ && (bp > buf || !vim_iswhite(*p)))
+ /* Field not recognized, add to "extra" dict entry. */
+ *bp++ = *p;
+ }
+
+ if (bp > buf)
+ {
+ *bp = NUL;
+ if (dict_add_nr_str(dict, "extra", 0L, buf) == FAIL)
+ ret = FAIL;
+ }
+ }
+
+ vim_free(matches[i]);
+ }
+ vim_free(matches);
+ }
+ return ret;
+}
+#endif
diff --git a/src/term.c b/src/term.c
index 12c506ab2..3097cc324 100644
--- a/src/term.c
+++ b/src/term.c
@@ -931,10 +931,6 @@ struct builtin_term builtin_termcaps[] =
# endif
# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
-/*
- * The xterm termcap is missing F14 and F15, because they send the same
- * codes as the undo and help key, although they don't work on all keyboards.
- */
{(int)KS_NAME, "xterm"},
{(int)KS_CE, IF_EB("\033[K", ESC_STR "[K")},
{(int)KS_AL, IF_EB("\033[L", ESC_STR "[L")},
@@ -1013,65 +1009,75 @@ struct builtin_term builtin_termcaps[] =
{K_XF2, IF_EB("\033OQ", ESC_STR "OQ")},
{K_XF3, IF_EB("\033OR", ESC_STR "OR")},
{K_XF4, IF_EB("\033OS", ESC_STR "OS")},
- {K_F1, IF_EB("\033[11~", ESC_STR "[11~")},
- {K_F2, IF_EB("\033[12~", ESC_STR "[12~")},
- {K_F3, IF_EB("\033[13~", ESC_STR "[13~")},
- {K_F4, IF_EB("\033[14~", ESC_STR "[14~")},
- {K_F5, IF_EB("\033[15~", ESC_STR "[15~")},
- {K_F6, IF_EB("\033[17~", ESC_STR "[17~")},
- {K_F7, IF_EB("\033[18~", ESC_STR "[18~")},
- {K_F8, IF_EB("\033[19~", ESC_STR "[19~")},
- {K_F9, IF_EB("\033[20~", ESC_STR "[20~")},
- {K_F10, IF_EB("\033[21~", ESC_STR "[21~")},
- {K_F11, IF_EB("\033[23~", ESC_STR "[23~")},
- {K_F12, IF_EB("\033[24~", ESC_STR "[24~")},
+ {K_F1, IF_EB("\033[11;*~", ESC_STR "[11;*~")},
+ {K_F2, IF_EB("\033[12;*~", ESC_STR "[12;*~")},
+ {K_F3, IF_EB("\033[13;*~", ESC_STR "[13;*~")},
+ {K_F4, IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+ {K_F5, IF_EB("\033[15;*~", ESC_STR "[15;*~")},
+ {K_F6, IF_EB("\033[17;*~", ESC_STR "[17;*~")},
+ {K_F7, IF_EB("\033[18;*~", ESC_STR "[18;*~")},
+ {K_F8, IF_EB("\033[19;*~", ESC_STR "[19;*~")},
+ {K_F9, IF_EB("\033[20;*~", ESC_STR "[20;*~")},
+ {K_F10, IF_EB("\033[21;*~", ESC_STR "[21;*~")},
+ {K_F11, IF_EB("\033[23;*~", ESC_STR "[23;*~")},
+ {K_F12, IF_EB("\033[24;*~", ESC_STR "[24;*~")},
{K_S_XF1, IF_EB("\033O2P", ESC_STR "O2P")},
{K_S_XF2, IF_EB("\033O2Q", ESC_STR "O2Q")},
{K_S_XF3, IF_EB("\033O2R", ESC_STR "O2R")},
{K_S_XF4, IF_EB("\033O2S", ESC_STR "O2S")},
- {K_S_F1, IF_EB("\033[11;2~", ESC_STR "[11;2~")},
- {K_S_F2, IF_EB("\033[12;2~", ESC_STR "[12;2~")},
- {K_S_F3, IF_EB("\033[13;2~", ESC_STR "[13;2~")},
- {K_S_F4, IF_EB("\033[14;2~", ESC_STR "[14;2~")},
- {K_S_F5, IF_EB("\033[15;2~", ESC_STR "[15;2~")},
- {K_S_F6, IF_EB("\033[17;2~", ESC_STR "[17;2~")},
- {K_S_F7, IF_EB("\033[18;2~", ESC_STR "[18;2~")},
- {K_S_F8, IF_EB("\033[19;2~", ESC_STR "[19;2~")},
- {K_S_F9, IF_EB("\033[20;2~", ESC_STR "[20;2~")},
- {K_S_F10, IF_EB("\033[21;2~", ESC_STR "[21;2~")},
- {K_S_F11, IF_EB("\033[23;2~", ESC_STR "[23;2~")},
- {K_S_F12, IF_EB("\033[24;2~", ESC_STR "[24;2~")},
{K_S_TAB, IF_EB("\033[Z", ESC_STR "[Z")},
- {K_HELP, IF_EB("\033[28~", ESC_STR "[28~")},
- {K_UNDO, IF_EB("\033[26~", ESC_STR "[26~")},
- {K_INS, IF_EB("\033[2~", ESC_STR "[2~")},
- {K_HOME, IF_EB("\033[7~", ESC_STR "[7~")},
+ {K_HELP, IF_EB("\033[28;*~", ESC_STR "[28;*~")},
+ {K_UNDO, IF_EB("\033[26;*~", ESC_STR "[26;*~")},
+ {K_INS, IF_EB("\033[2;*~", ESC_STR "[2;*~")},
+ {K_HOME, IF_EB("\033[1;*H", ESC_STR "[1;*H")},
{K_S_HOME, IF_EB("\033O2H", ESC_STR "O2H")},
{K_C_HOME, IF_EB("\033O5H", ESC_STR "O5H")},
- {K_KHOME, IF_EB("\033[1~", ESC_STR "[1~")},
+ {K_KHOME, IF_EB("\033[7;*~", ESC_STR "[7;*~")},
{K_XHOME, IF_EB("\033OH", ESC_STR "OH")}, /* alternate Home */
- {K_END, IF_EB("\033[8~", ESC_STR "[8~")},
+ {K_END, IF_EB("\033[1;*F", ESC_STR "[1;*F")},
{K_S_END, IF_EB("\033O2F", ESC_STR "O2F")},
{K_C_END, IF_EB("\033O5F", ESC_STR "O5F")},
- {K_KEND, IF_EB("\033[4~", ESC_STR "[4~")},
+ {K_KEND, IF_EB("\033[4;*~", ESC_STR "[4;*~")},
{K_XEND, IF_EB("\033OF", ESC_STR "OF")}, /* alternate End */
- {K_PAGEUP, IF_EB("\033[5~", ESC_STR "[5~")},
- {K_PAGEDOWN, IF_EB("\033[6~", ESC_STR "[6~")},
+ {K_PAGEUP, IF_EB("\033[5;*~", ESC_STR "[5;*~")},
+ {K_PAGEDOWN, IF_EB("\033[6;*~", ESC_STR "[6;*~")},
{K_KPLUS, IF_EB("\033Ok", ESC_STR "Ok")}, /* keypad plus */
{K_KMINUS, IF_EB("\033Om", ESC_STR "Om")}, /* keypad minus */
{K_KDIVIDE, IF_EB("\033Oo", ESC_STR "Oo")}, /* keypad / */
{K_KMULTIPLY, IF_EB("\033Oj", ESC_STR "Oj")}, /* keypad * */
{K_KENTER, IF_EB("\033OM", ESC_STR "OM")}, /* keypad Enter */
- {K_KDEL, IF_EB("\033[3~", ESC_STR "[3~")}, /* keypad Del */
+ {K_KPOINT, IF_EB("\033On", ESC_STR "On")}, /* keypad . */
+ {K_KDEL, IF_EB("\033[3;*~", ESC_STR "[3;*~")}, /* keypad Del */
{BT_EXTRA_KEYS, ""},
- {TERMCAP2KEY('k', '0'), IF_EB("\033[10~", ESC_STR "[10~")}, /* F0 */
- {TERMCAP2KEY('F', '3'), IF_EB("\033[25~", ESC_STR "[25~")}, /* F13 */
- {TERMCAP2KEY('F', '6'), IF_EB("\033[29~", ESC_STR "[29~")}, /* F16 */
- {TERMCAP2KEY('F', '7'), IF_EB("\033[31~", ESC_STR "[31~")}, /* F17 */
- {TERMCAP2KEY('F', '8'), IF_EB("\033[32~", ESC_STR "[32~")}, /* F18 */
- {TERMCAP2KEY('F', '9'), IF_EB("\033[33~", ESC_STR "[33~")}, /* F19 */
- {TERMCAP2KEY('F', 'A'), IF_EB("\033[34~", ESC_STR "[34~")}, /* F20 */
+ {TERMCAP2KEY('k', '0'), IF_EB("\033[10;*~", ESC_STR "[10;*~")}, /* F0 */
+ {TERMCAP2KEY('F', '3'), IF_EB("\033[25;*~", ESC_STR "[25;*~")}, /* F13 */
+ /* F14 and F15 are missing, because they send the same codes as the undo
+ * and help key, although they don't work on all keyboards. */
+ {TERMCAP2KEY('F', '6'), IF_EB("\033[29;*~", ESC_STR "[29;*~")}, /* F16 */
+ {TERMCAP2KEY('F', '7'), IF_EB("\033[31;*~", ESC_STR "[31;*~")}, /* F17 */
+ {TERMCAP2KEY('F', '8'), IF_EB("\033[32;*~", ESC_STR "[32;*~")}, /* F18 */
+ {TERMCAP2KEY('F', '9'), IF_EB("\033[33;*~", ESC_STR "[33;*~")}, /* F19 */
+ {TERMCAP2KEY('F', 'A'), IF_EB("\033[34;*~", ESC_STR "[34;*~")}, /* F20 */
+
+ {TERMCAP2KEY('F', 'B'), IF_EB("\033[42;*~", ESC_STR "[42;*~")}, /* F21 */
+ {TERMCAP2KEY('F', 'C'), IF_EB("\033[43;*~", ESC_STR "[43;*~")}, /* F22 */
+ {TERMCAP2KEY('F', 'D'), IF_EB("\033[44;*~", ESC_STR "[44;*~")}, /* F23 */
+ {TERMCAP2KEY('F', 'E'), IF_EB("\033[45;*~", ESC_STR "[45;*~")}, /* F24 */
+ {TERMCAP2KEY('F', 'F'), IF_EB("\033[46;*~", ESC_STR "[46;*~")}, /* F25 */
+ {TERMCAP2KEY('F', 'G'), IF_EB("\033[47;*~", ESC_STR "[47;*~")}, /* F26 */
+ {TERMCAP2KEY('F', 'H'), IF_EB("\033[48;*~", ESC_STR "[48;*~")}, /* F27 */
+ {TERMCAP2KEY('F', 'I'), IF_EB("\033[49;*~", ESC_STR "[49;*~")}, /* F28 */
+ {TERMCAP2KEY('F', 'J'), IF_EB("\033[50;*~", ESC_STR "[50;*~")}, /* F29 */
+ {TERMCAP2KEY('F', 'K'), IF_EB("\033[51;*~", ESC_STR "[51;*~")}, /* F30 */
+
+ {TERMCAP2KEY('F', 'L'), IF_EB("\033[52;*~", ESC_STR "[52;*~")}, /* F31 */
+ {TERMCAP2KEY('F', 'M'), IF_EB("\033[53;*~", ESC_STR "[53;*~")}, /* F32 */
+ {TERMCAP2KEY('F', 'N'), IF_EB("\033[54;*~", ESC_STR "[54;*~")}, /* F33 */
+ {TERMCAP2KEY('F', 'O'), IF_EB("\033[55;*~", ESC_STR "[55;*~")}, /* F34 */
+ {TERMCAP2KEY('F', 'P'), IF_EB("\033[56;*~", ESC_STR "[56;*~")}, /* F35 */
+ {TERMCAP2KEY('F', 'Q'), IF_EB("\033[57;*~", ESC_STR "[57;*~")}, /* F36 */
+ {TERMCAP2KEY('F', 'R'), IF_EB("\033[58;*~", ESC_STR "[58;*~")}, /* F37 */
# endif
# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
@@ -1564,6 +1570,10 @@ static char *(key_names[]) =
"#2", "#4", "%i", "*7",
"k1", "k2", "k3", "k4", "k5", "k6",
"k7", "k8", "k9", "k;", "F1", "F2",
+ "F3", "F4", "F5", "F6", "F7", "F8",
+ "F9", "FA", "FB", "FC", "FD", "FE",
+ "FF", "FG", "FH", "FI", "FJ", "FK",
+ "FL", "FM", "FN", "FO", "FP", "FQ", "FR",
"%1", "&8", "kb", "kI", "kD", "kh",
"@7", "kP", "kN", "K1", "K3", "K4", "K5", "kB",
NULL
@@ -2996,7 +3006,7 @@ win_new_shellsize()
if (old_Rows != Rows)
{
/* if 'window' uses the whole screen, keep it using that */
- if (p_window == old_Rows - 1)
+ if (p_window == old_Rows - 1 || old_Rows == 0)
p_window = Rows - 1;
old_Rows = Rows;
shell_new_rows(); /* update window sizes */
@@ -3481,6 +3491,7 @@ struct termcode
char_u name[2]; /* termcap name of entry */
char_u *code; /* terminal code (in allocated memory) */
int len; /* STRLEN(code) */
+ int modlen; /* length of part before ";*~". */
} *termcodes = NULL;
static int tc_max_len = 0; /* number of entries that termcodes[] can hold */
@@ -3518,6 +3529,7 @@ add_termcode(name, string, use_8bit)
struct termcode *new_tc;
int i, j;
char_u *s;
+ int len;
if (string == NULL || *string == NUL)
{
@@ -3535,6 +3547,7 @@ add_termcode(name, string, use_8bit)
mch_memmove(s, s + 1, STRLEN(s));
s[0] = term_7to8bit(string);
}
+ len = (int)STRLEN(s);
need_gather = TRUE; /* need to fill termleader[] */
@@ -3572,12 +3585,29 @@ add_termcode(name, string, use_8bit)
continue;
/*
* Exact match: Replace old code.
+ * But don't replace ESC[123;*X with another.
*/
if (termcodes[i].name[1] == name[1])
{
- vim_free(termcodes[i].code);
- --tc_len;
- break;
+ if (termcodes[i].len >= 4
+ && STRNCMP(termcodes[i].code + termcodes[i].len - 3,
+ ";*", 2) == 0)
+ {
+ /* if they are equal but for the ";*" don't add it */
+ if (len == termcodes[i].len - 2
+ && STRNCMP(s, termcodes[i].code, len - 1) == 0
+ && s[len - 1] == termcodes[i].code[len + 1])
+ {
+ vim_free(s);
+ return;
+ }
+ }
+ else
+ {
+ vim_free(termcodes[i].code);
+ --tc_len;
+ break;
+ }
}
}
/*
@@ -3591,7 +3621,12 @@ add_termcode(name, string, use_8bit)
termcodes[i].name[0] = name[0];
termcodes[i].name[1] = name[1];
termcodes[i].code = s;
- termcodes[i].len = (int)STRLEN(s);
+ termcodes[i].len = len;
+ /* recognize special code like "ESC[42;*X" that accepts modifiers */
+ if (len >= 5 && STRNCMP(s + len - 3, ";*", 2) == 0)
+ termcodes[i].modlen = len - 3;
+ else
+ termcodes[i].modlen = 0;
++tc_len;
}
@@ -3886,6 +3921,69 @@ check_termcode(max_offset, buf, buflen)
break;
}
+
+ /*
+ * Check for code with modifier, like xterm uses:
+ * ESC[123;2X (shift) ESC[123;3X (alt), etc.
+ */
+ if (termcodes[idx].modlen > 0)
+ {
+ slen = termcodes[idx].modlen;
+ if (cpo_koffset && offset && len < slen)
+ continue;
+ if (STRNCMP(termcodes[idx].code, tp,
+ (size_t)(slen > len ? len : slen)) == 0)
+ {
+ int n;
+ int mod;
+
+ if (len <= slen) /* got a partial sequence */
+ return -1; /* need to get more chars */
+
+ if (tp[slen] == termcodes[idx].code[slen + 2])
+ ++slen; /* no modifiers */
+ else if (tp[slen] != ';')
+ continue; /* no match */
+ else
+ {
+ /* Skip over the digits, the final char must
+ * follow. */
+ for (j = slen + 1; j < len && isdigit(tp[j]); ++j)
+ ;
+ ++j;
+ if (len < j) /* got a partial sequence */
+ return -1; /* need to get more chars */
+ if (tp[j - 1] != termcodes[idx].code[slen + 2])
+ continue;
+
+ /* Match! Convert modifier bits. */
+ n = atoi((char *)tp + slen + 1) - 1;
+ mod = 0x0;
+ if (n & 1)
+ mod |= MOD_MASK_SHIFT;
+ if (n & 2)
+ mod |= MOD_MASK_ALT;
+ if (n & 4)
+ mod |= MOD_MASK_CTRL;
+ if (n & 8)
+ mod |= MOD_MASK_META;
+
+ /* Add the modifier codes to our string */
+ if (mod != 0)
+ {
+ string[new_slen++] = K_SPECIAL;
+ string[new_slen++] = (int)KS_MODIFIER;
+ string[new_slen++] = mod;
+ }
+
+ slen = j;
+ }
+ key_name[0] = termcodes[idx].name[0];
+ key_name[1] = termcodes[idx].name[1];
+
+ break;
+ }
+ }
}
}
diff --git a/src/testdir/test24.in b/src/testdir/test24.in
index b7bbedf5f..d9640e5f2 100644
--- a/src/testdir/test24.in
+++ b/src/testdir/test24.in
Binary files differ
diff --git a/src/testdir/test24.ok b/src/testdir/test24.ok
index d5bc95623..752dad583 100644
--- a/src/testdir/test24.ok
+++ b/src/testdir/test24.ok
@@ -17,3 +17,6 @@ test text test text [\x00]
test text test text [\x00-\x10]
test text test text [\x-z]
test text test text [\u-z]
+xx xx a
+xx aaaaa xx a
+xx aaaaa xx a
diff --git a/src/undo.c b/src/undo.c
index 4675d9972..1abd41df4 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -492,6 +492,8 @@ u_doit(count)
u_newcount = 0;
u_oldcount = 0;
+ if (curbuf->b_ml.ml_flags & ML_EMPTY)
+ u_oldcount = -1;
while (count--)
{
if (undo_undoes)
@@ -525,6 +527,8 @@ u_doit(count)
curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev;
}
}
+ if (curbuf->b_ml.ml_flags & ML_EMPTY)
+ --u_newcount;
u_undo_end();
}
diff --git a/src/version.h b/src/version.h
index 9451a0e9f..b537d7208 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28, compiled "
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4, compiled "
diff --git a/src/vim.h b/src/vim.h
index 3fb9fa332..facb51a22 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1534,7 +1534,9 @@ int vim_memcmp __ARGS((void *, void *, size_t));
#define VV_VAL 34
#define VV_KEY 35
#define VV_PROFILING 36
-#define VV_LEN 37 /* number of v: vars */
+#define VV_FCS_REASON 37
+#define VV_FCS_CHOICE 38
+#define VV_LEN 39 /* number of v: vars */
#ifdef FEAT_CLIPBOARD