summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-02-25 14:42:19 +0100
committerBram Moolenaar <Bram@vim.org>2011-02-25 14:42:19 +0100
commit0065402f9a7e1317a58884f4e3588cdc6a8d3b92 (patch)
tree253048de056029ae93335f1c3273c14ea968b50f
parentc30846f525a7aace2999e83126b0847254ddaa8b (diff)
downloadvim-git-0065402f9a7e1317a58884f4e3588cdc6a8d3b92.tar.gz
Runtime file updates.
Diffstat
-rw-r--r--runtime/doc/cmdline.txt4
-rw-r--r--runtime/doc/eval.txt6
-rw-r--r--runtime/doc/options.txt14
-rw-r--r--runtime/doc/term.txt3
-rw-r--r--runtime/doc/todo.txt52
-rw-r--r--runtime/doc/usr_41.txt14
-rw-r--r--runtime/filetype.vim6
-rw-r--r--runtime/syntax/sudoers.vim86
-rw-r--r--src/po/ko.UTF-8.po421
-rw-r--r--src/po/ko.po421
10 files changed, 730 insertions, 297 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 1368dbfcb..39893d78d 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt* For Vim version 7.3. Last change: 2010 Nov 28
+*cmdline.txt* For Vim version 7.3. Last change: 2011 Feb 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -782,7 +782,7 @@ it, no matter how many backslashes.
*:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
*:<sfile>* *<sfile>* *:<afile>* *<afile>*
*:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
- *E495* *E496* *E497* *E499* *E500*
+ *<slnum>* *E495* *E496* *E497* *E499* *E500*
Note: these are typed literally, they are not special keys!
<cword> is replaced with the word under the cursor (like |star|)
<cWORD> is replaced with the WORD under the cursor (see |WORD|)
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1a44a6800..c599e8a93 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2011 Feb 07
+*eval.txt* For Vim version 7.3. Last change: 2011 Feb 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1286,7 +1286,9 @@ v:beval_text The text under or after the mouse pointer. Usually a word as
*v:beval_winnr* *beval_winnr-variable*
v:beval_winnr The number of the window, over which the mouse pointer is. Only
- valid while evaluating the 'balloonexpr' option.
+ valid while evaluating the 'balloonexpr' option. The first
+ window has number zero (unlike most other places where a
+ window gets a number).
*v:char* *char-variable*
v:char Argument for evaluating 'formatexpr' and used for the typed
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 983cf5b34..939a81d00 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2011 Jan 30
+*options.txt* For Vim version 7.3. Last change: 2011 Feb 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3078,8 +3078,10 @@ A jump table for the options with a short description can be found at |Q_op|.
{not in Vi}
{not available when compiled without the |+folding|
feature}
- Sets the minimum number of screen lines for a fold to be displayed
- closed. Also for manually closed folds.
+ Sets the number of screen lines above which a fold can be displayed
+ closed. Also for manually closed folds. With the default value of
+ one a fold can only be closed if it takes up two or more screen lines.
+ Set to zero to be able to close folds of just one screen line.
Note that this only has an effect of what is displayed. After using
"zc" to close a fold, which is displayed open because it's smaller
than 'foldminlines', a following "zc" may close a containing fold.
@@ -6488,7 +6490,7 @@ A jump table for the options with a short description can be found at |Q_op|.
where it was the last time the buffer was edited.
NOTE: This option is set when 'compatible' is set.
- *'statusline'* *'stl'* *E540* *E541* *E542*
+ *'statusline'* *'stl'* *E540* *E542*
'statusline' 'stl' string (default empty)
global or local to window |global-local|
{not in Vi}
@@ -6501,7 +6503,7 @@ A jump table for the options with a short description can be found at |Q_op|.
normal text. Each status line item is of the form:
%-0{minwid}.{maxwid}{item}
All fields except the {item} is optional. A single percent sign can
- be given as "%%". Up to 80 items can be specified.
+ be given as "%%". Up to 80 items can be specified. *E541*
When the option starts with "%!" then it is used as an expression,
evaluated and the result is used as the option value. Example: >
@@ -6554,7 +6556,7 @@ A jump table for the options with a short description can be found at |Q_op|.
k S Value of "b:keymap_name" or 'keymap' when |:lmap| mappings are
being used: "<keymap>"
n N Buffer number.
- b N Value of byte under cursor.
+ b N Value of character under cursor.
B N As above, in hexadecimal.
o N Byte number in file of byte under cursor, first byte is 1.
Mnemonic: Offset from start of file (with one added)
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 8dc977395..362a18944 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt* For Vim version 7.3. Last change: 2009 Nov 05
+*term.txt* For Vim version 7.3. Last change: 2011 Feb 16
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -665,6 +665,7 @@ When the X-server clipboard is available, the command server described in
*xterm-copy-paste*
NOTE: In some (older) xterms, it's not possible to move the cursor past column
95. This is an xterm problem, not Vim's. Get a newer xterm |color-xterm|.
+Now the limit is 223 columns.
Copy/paste in xterm with (current mode NOT included in 'mouse'):
1. Press left mouse button on first letter of text, move mouse pointer to last
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b6d039673..df2176deb 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2011 Feb 09
+*todo.txt* For Vim version 7.3. Last change: 2011 Feb 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,18 +30,11 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Still crash with 'statusline'. (Christian Brabandt, 2011 Feb 2)
-Can't reproduce it.
+New r and rhelp syntax files. (Jakson Alves de Aquino, 2011 Feb 20)
-Problems with building after 7.3.050, -as-needed does not work for gcc 4.4.1?
-(Charles Campbell, 2010 Nov 7) Or is the problem that we should use -ltinfo,
-because nothing is used from ncurses?
+In file message show "blowfish" instead of "crypted" when using blowfish.
-Patch for 'changedtick' in getbufvar(). (Christian Brabandt, 2011 Jan 16)
-
-Patch to avoid exiting for VTALRM. (Dominique Pelle, 2011 Jan 16)
-
-Documentation patches. (Javier Rojas, 2011 Feb 2)
+Patch to fix drag-n-drop in KDE. (Florian Degner, 2011 Feb 23)
Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
@@ -49,6 +42,8 @@ only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)
+Crash with big .xpm file. (Yukihiro Nakadaira, 2011 Feb 18)
+
Windows keys not set properly on Windows 7? (cncyber, 2010 Aug 26)
This line hangs Vim, because of syntax HL:
@@ -57,6 +52,9 @@ call append(line, "INFO ....12....18....24....30....36....42....48....54....60.
Building the MingW version without clipboard but with multi-byte doesn't
work. (Bill Lam, 2010 Sep 18)
+When using a Vim server, a # in the path causes an error message.
+(Jeff Lanzarotta, 2011 Feb 17)
+
Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
Using ":break" or something else that stops executing commands inside a
@@ -75,9 +73,6 @@ Needs tests.
string() can't parse back "inf" and "nan". Fix documentation or fix code?
(ZyX, 2010 Aug 23)
-Patch to fix wront eol handling when writing a file. (Kevin Goodsell, 2011 Jan
-12)
-
maparg() does not show the <script> flag. When temporarily changing a
mapping, how to restore the script ID?
@@ -96,8 +91,6 @@ Bug in try/catch: return with invalid compare throws error that isn't caught.
Highlighting stops working after changing it many times. Script to reproduce
it: Pablo Contreras, 2010 Oct 12 Windows XP and 7. Font is never freed?
-Patch to fix quoting in MingW makefile. (Weasley, 2011 Jan 10)
-
After patch 7.3.097 still get E15. (Yukihiro Nakadaira, 2011 Jan 18)
Also for another example (ZyX, 2011 Jan 24)
@@ -113,8 +106,9 @@ Problem with "syn sync gouphere". (Gustavo Niemeyer, 2011 Jan 27)
Loading autoload script even when usage is inside "if 0". (Christian Brabandt,
2010 Dec 18)
-When 'cursorcolumn' is set locally to a window, ":new" opens a window with the
-same highlighting but 'cursorcolumn' is empty. (Tyru, 2010 Nov 15)
+When 'colorcolumn' is set locally to a window, ":new" opens a window with the
+same highlighting but 'colorcolumn' is empty. (Tyru, 2010 Nov 15)
+Patch by Christian Brabandt, 2011 Feb 13 (but move further down).
In the sandbox it's not allowed to do many things, but it's possible to change
or set variables. Add a way to prevent variables from being changed in the
@@ -173,6 +167,8 @@ Method to reproduce it: Jan 16.
Patch to improve optwin.vim. (ZyX, 2011 Jan 29)
+Patch for Python 3 support. (lilydjwg, 2011 Feb 24)
+
New esperanto spell file can't be processed. (Dominique Pelle, 2011 Jan 30)
- move compflags to separate growarray?
- instead of a regexp use a hashtable. Expand '?', '*", '+'. What would be
@@ -283,6 +279,8 @@ Patch to make more characters work in dialogs. (Yankwei Jia, 2010 Aug 4)
Patch for VisVim, pass file name to VimOpenFile. (Jiri Sedlak, 2010 Nov 12)
+":com" changes the multi-byte text of :echo. (Dimitar Dimitrov, 2011 Feb 11)
+
When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines
instead of one. (Constantin Pan, 2010 Sep 10)
@@ -368,6 +366,10 @@ Only with "vim -u NONE".
Problem with editing file in binary mode. (Ingo Krabbe, 2009 Oct 8)
+With 'wildmode' set to "longest:full,full" and pressing Tab once the first
+entry in wildmenu is highlighted, that shouldn't happen. (Yuki Watanabe, 2011
+Feb 12)
+
Display error when 'tabline' that includes a file name with double-width
characters. (2010 Aug 14, bootleq)
@@ -379,7 +381,8 @@ Break undo when CTRL-R = changes the text? Or save more lines?
Patch for static code analysis errors in riscOS. (Dominique Pelle, 2010 Dec 3)
-Better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan 20)
+Patch for better #if 0 syntax highlighting for C code. (Ben Schmidt, 2011 Jan
+20)
Change to C syntax folding to make it work much faster, but a bit less
reliable. (Lech Lorens, 2009 Nov 9) Enable with an option?
@@ -520,6 +523,9 @@ Ignore window options when not in the right window?
Perhaps we need to use a hidden window for applying autocommands to a buffer
that doesn't have a window.
+When "b" is a symlink to directory "a", resolve("b/") doesn't result in "a/".
+(ZyX, 2011 Feb 12)
+
When using "ab foo bar" and mapping <Tab> to <Esc>, pressing <Tab> after foo
doesn't trigger the abbreviation like <Esc> would. (Ramana Kumar, 2009 Sep 6)
@@ -1276,6 +1282,9 @@ check the result of has("patch13").
Cursor line at bottom of window instead of halfway after saving view and
restoring. Only with 'nowrap'. (Robert Webb, 2008 Aug 25)
+Netrw has trouble executing autocommands only for a directory. Add <isdir>
+and <notisdir> to autocommand patterns? Also <isfile>?
+
Add command modifier that skips wildcard expansion, so that you don't need to
put backslashes before special chars, only for white space.
@@ -1390,6 +1399,11 @@ Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
2010 Jun 30)
+At next release:
+- Rename src/Makefile and create a new one like toplevel Makefile that
+ creates auto/config.mk when it's not there? (Ben Schmidt, 2011 Feb 11)
+
+
More patches:
- Another patch for Javascript indenting. (Hari Kumar, 2010 Jul 11)
Needs a few tests.
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index c990ba15b..8342f76a2 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt* For Vim version 7.3. Last change: 2011 Feb 01
+*usr_41.txt* For Vim version 7.3. Last change: 2011 Feb 15
VIM USER MANUAL - by Bram Moolenaar
@@ -313,7 +313,7 @@ The usual precedence is used. Example: >
:echo 10 + 5 * 2
< 20 ~
-Grouping is done with braces. No surprises here. Example: >
+Grouping is done with parentheses. No surprises here. Example: >
:echo (10 + 5) * 2
< 30 ~
@@ -537,7 +537,7 @@ way. A few examples will be given in this section. You can find the whole
list here: |functions|.
A function is called with the ":call" command. The parameters are passed in
-between braces, separated by commas. Example: >
+between parentheses separated by commas. Example: >
:call search("Date: ", "W")
@@ -1017,7 +1017,7 @@ so on. The variable "a:0" contains the number of extra arguments.
:function Show(start, ...)
: echohl Title
- : echo "Show is " . a:start
+ : echo "start is " . a:start
: echohl None
: let index = 1
: while index <= a:0
@@ -1285,7 +1285,7 @@ local variable will then refer to that Dictionary.
split(a:line)
-The split() function takes a string, chops it into white separated words
+The split() function takes a string, chops it into whitespace separated words
and returns a list with these words. Thus in the example it returns: >
:echo split('three two five one')
@@ -1402,7 +1402,7 @@ Let's start with an example: >
The ":read" command will fail if the file does not exist. Instead of
generating an error message, this code catches the error and gives the user a
-nice message instead.
+nice message.
For the commands in between ":try" and ":endtry" errors are turned into
exceptions. An exception is a string. In the case of an error the string
@@ -1479,7 +1479,7 @@ escaped by a "\" (backslash) as in the following example: >
:set tags=my\ nice\ file
-The same example written as >
+The same example written as: >
:set tags=my nice file
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ef1318088..3b01aaf42 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2010 Dec 17
+" Last Change: 2011 Feb 23
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1100,8 +1100,8 @@ au BufNewFile,BufRead *.mel setf mel
" Mercurial config (looks like generic config file)
au BufNewFile,BufRead *.hgrc,*hgrc setf cfg
-" Messages
-au BufNewFile,BufRead /var/log/messages,/var/log/messages.*[0-9] setf messages
+" Messages (logs mostly)
+autocmd BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.*[0-9]*} setf messages
" Metafont
au BufNewFile,BufRead *.mf setf mf
diff --git a/runtime/syntax/sudoers.vim b/runtime/syntax/sudoers.vim
index 1bcd03f95..fffc1cf8b 100644
--- a/runtime/syntax/sudoers.vim
+++ b/runtime/syntax/sudoers.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sudoers(5) configuration files
" Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2007-08-02
+" Latest Revision: 2011-02-24
if exists("b:current_syntax")
finish
@@ -149,10 +149,86 @@ syn match sudoersDefaultTypeGreaterThan contained '>' nextgroup=@sudoersUser s
" TODO: could also deal with special characters here
syn match sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl
-syn keyword sudoersBooleanParameter contained long_opt_prompt ignore_dot mail_always mail_badpass mail_no_user mail_no_perms tty_tickets lecture authenticate root_sudo log_host log_year shell_noargs set_home always_set_home path_info preserve_groups fqdn insults requiretty env_editor rootpw runaspw targetpw set_logname stay_setuid env_reset use_loginclass nextgroup=sudoersParameterListComma skipwhite skipnl
-syn keyword sudoersIntegerParameter contained passwd_tries loglinelen timestamp_timeout passwd_timeout umask nextgroup=sudoersIntegerParameterEquals skipwhite skipnl
-syn keyword sudoersStringParameter contained mailsub badpass_message timestampdir timestampowner passprompt runas_default syslog_goodpri syslog_badpri editor logfile syslog mailerpath mailerflags mailto exempt_group verifypw listpw nextgroup=sudoersStringParameterEquals skipwhite skipnl
-syn keyword sudoersListParameter contained env_check env_delete env_keep nextgroup=sudoersListParameterEquals skipwhite skipnl
+syn keyword sudoersBooleanParameter contained skipwhite skipnl
+ \ always_set_home
+ \ authenticate
+ \ closefrom_override
+ \ env_editor
+ \ env_reset
+ \ fqdn
+ \ ignore_dot
+ \ ignore_local_sudoers
+ \ insults
+ \ log_host
+ \ log_year
+ \ long_otp_prompt
+ \ mail_always
+ \ mail_badpass
+ \ mail_no_host
+ \ mail_no_perms
+ \ mail_no_user
+ \ noexec
+ \ path_info
+ \ passprompt_override
+ \ preserve_groups
+ \ requiretty
+ \ root_sudo
+ \ rootpw
+ \ runaspw
+ \ set_home
+ \ set_logname
+ \ setenv
+ \ shell_noargs
+ \ stay_setuid
+ \ targetpw
+ \ tty_tickets
+ \ visiblepw
+
+syn keyword sudoersIntegerParameter contained
+ \ nextgroup=sudoersIntegerParameterEquals
+ \ skipwhite skipnl
+ \ closefrom
+ \ passwd_tries
+ \ loglinelen
+ \ passwd_timeout
+ \ timestamp_timeout
+ \ umask
+
+syn keyword sudoersStringParameter contained
+ \ nextgroup=sudoersStringParameterEquals
+ \ skipwhite skipnl
+ \ badpass_message
+ \ editor
+ \ mailsub
+ \ noexec_file
+ \ passprompt
+ \ runas_default
+ \ syslog_badpri
+ \ syslog_goodpri
+ \ sudoers_locale
+ \ timestampdir
+ \ timestampowner
+ \ askpass
+ \ env_file
+ \ exempt_group
+ \ lecture
+ \ lecture_file
+ \ listpw
+ \ logfile
+ \ mailerflags
+ \ mailerpath
+ \ mailfrom
+ \ mailto
+ \ secure_path
+ \ syslog
+ \ verifypw
+
+syn keyword sudoersListParameter contained
+ \ nextgroup=sudoersListParameterEquals
+ \ skipwhite skipnl
+ \ env_check
+ \ env_delete
+ \ env_keep
syn match sudoersParameterListComma contained ',' nextgroup=@sudoersParameter skipwhite skipnl
diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po
index 3a3e1005c..ce72947de 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -1,12 +1,12 @@
# Korean translation for Vim
#
-# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2010
+# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2011
#
msgid ""
msgstr ""
-"Project-Id-Version: vim 7.2\n"
+"Project-Id-Version: vim 7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 09:43+0900\n"
+"POT-Creation-Date: 2011-02-16 16:18+0900\n"
"PO-Revision-Date: 2010-02-18 09:49+0900\n"
"Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
"Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -14,6 +14,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: 빈 비밀번호로 bf_key_init() 함수가 불려졌습니다"
+
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish big/little endian use wrong"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256 시험이 실패했습니다."
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish 시험이 실패했습니다."
+
+msgid "[Location List]"
+msgstr "[위치 목록]"
+
+msgid "[Quickfix List]"
+msgstr "[Quickfix 목록]"
+
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: 버퍼를 할당할 수 없어서 끝냅니다..."
@@ -147,7 +168,6 @@ msgstr "바닥"
msgid "Top"
msgstr "꼭대기"
-#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -155,12 +175,6 @@ msgstr ""
"\n"
"# 버퍼 목록:\n"
-msgid "[Location List]"
-msgstr "[위치 목록]"
-
-msgid "[Quickfix List]"
-msgstr "[Quickfix 목록]"
-
msgid "[Scratch]"
msgstr "[Scratch]"
@@ -280,6 +294,12 @@ msgstr " 낱말 로컬 완성 (^N^P)"
msgid "Hit end of paragraph"
msgstr "단락의 마지막 만남"
+msgid "E839: Completion function changed window"
+msgstr "E839: Completion 기능이 창을 바꾸었습니다"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Completion 기능이 문자열을 지웠습니다"
+
msgid "'dictionary' option is empty"
msgstr "'dictionary' 옵션이 비었습니다"
@@ -730,7 +750,6 @@ msgstr "%s에서 계속"
msgid "E133: :return not inside a function"
msgstr "E133: :return이 함수 안에 있지 않습니다"
-#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -821,7 +840,6 @@ msgstr "Viminfo 파일 \"%s\"을(를) 쓰는 중"
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# 이 viminfo 파일은 빔이 만든 것입니다 Vim %s.\n"
-#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -829,7 +847,6 @@ msgstr ""
"# 조심만 한다면 고칠 수도 있습니다!\n"
"\n"
-#, c-format
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# 이 파일이 저장되었을 때의 'encoding'의 값\n"
@@ -940,7 +957,6 @@ msgstr "E148: global에서 정규표현식이 빠졌습니다"
msgid "Pattern found in every line: %s"
msgstr "여러 줄에서 패턴을 찾았습니다: %s"
-#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1049,8 +1065,8 @@ msgstr "중지점이 정의되어 있지 않습니다"
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s %ld 줄"
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: 먼저 ':profile start <fname>'을 사용하세요"
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: 먼저 \":profile start {fname}\"을 사용하세요"
#, c-format
msgid "Save changes to \"%s\"?"
@@ -1121,11 +1137,11 @@ msgstr "%s 불러들이기 끝"
#~ msgid "modeline"
#~ msgstr ""
-#~ msgid "--cmd argument"
-#~ msgstr ""
+msgid "--cmd argument"
+msgstr "--cmd 인자"
-#~ msgid "-c argument"
-#~ msgstr ""
+msgid "-c argument"
+msgstr "-c 인자"
msgid "environment variable"
msgstr "환경 변수"
@@ -1242,6 +1258,9 @@ msgstr "E182: 잘못된 명령 이름"
msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: 사용자 정의 명령은 대문자로 시작해야 합니다"
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: 예약된 이름, 사용자 정의 명령으로 사용될 수 없습니다"
+
#, c-format
msgid "E184: No such user-defined command: %s"
msgstr "E184: 그런 사용자 정의 명령 없음: %s"
@@ -1256,6 +1275,9 @@ msgstr "E468: 완성 인자는 사용자 완성에서만 허용됩니다"
msgid "E467: Custom completion requires a function argument"
msgstr "E467: 사용자 완성은 함수 인자가 필요합니다"
+msgid "unknown"
+msgstr "모름"
+
#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: 색 스킴 %s을(를) 찾을 수 없습니다"
@@ -1353,6 +1375,9 @@ msgstr "E497: \"<amatch>\"에 대해 치환할 자동명령 매치 이름이 없
msgid "E498: no :source file name to substitute for \"<sfile>\""
msgstr "E498: \"<sfile>\"에 대해 치환할 :source 파일 이름이 없습니다"
+msgid "E842: no line number to use for \"<slnum>\""
+msgstr "E842: \"<slnum>\"에 사용될 줄 번호가 없습니다"
+
#, no-c-format
msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
msgstr "E499: '%'나 '#'에 대한 빈 파일 이름, 오로지 \":p:h\"와만 동작합니다"
@@ -1607,6 +1632,9 @@ msgstr "'charconvert'를 사용한 변환이 실패했습니다"
msgid "can't read output of 'charconvert'"
msgstr "'charconvert'의 출력결과를 읽을 수 없습니다"
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: 파일이 모르는 방법으로 암호화되어 있습니다"
+
msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: acwrite 버퍼에 대한 autocommand를 찾을 수 없습니다"
@@ -1674,9 +1702,7 @@ msgstr "E513: 쓰기 에러, 변환 실패 (무시하려면 'fenc'를 비우면
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
-msgstr ""
-"E513: 쓰기 에러, %ld 줄에서 변환 실패 (무시하려면 'fenc'를 비우면 "
-"됨)"
+msgstr "E513: 쓰기 에러, %ld 줄에서 변환 실패 (무시하려면 'fenc'를 비우면 됨)"
msgid "E514: write error (file system full?)"
msgstr "E514: 쓰기 에러 (파일 시스템이 꽉찼나요?)"
@@ -1754,6 +1780,11 @@ msgid "1 character"
msgstr "1 글자"
#, c-format
+msgid "%lld characters"
+msgstr "%lld 글자"
+
+#. Explicit typecast avoids warning on Mac OS X 10.6
+#, c-format
msgid "%ld characters"
msgstr "%ld 글자"
@@ -1998,9 +2029,6 @@ msgstr "빔 대화상자"
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: 메시지와 콜백 모두를 사용해서는 BalloonEval을 만들 수 없습니다"
-msgid "Vim dialog..."
-msgstr "빔 대화상자..."
-
msgid ""
"&Yes\n"
"&No\n"
@@ -2043,12 +2071,15 @@ msgstr "위로"
msgid "Down"
msgstr "아래로"
+#. 'Find Next' button
msgid "Find Next"
msgstr "다음 찾기"
+#. 'Replace' button
msgid "Replace"
msgstr "바꾸기"
+#. 'Replace All' button
msgid "Replace All"
msgstr "모두 바꾸기"
@@ -2067,9 +2098,6 @@ msgstr "탭 열기..."
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr "빔: 메인 창이 죽게 될 것입니다\n"
-msgid "Font Selection"
-msgstr "글꼴 고르기"
-
msgid "&Filter"
msgstr "거르개(&F)"
@@ -2398,11 +2426,11 @@ msgid "E567: no cscope connections"
msgstr "E567: cscope 연결이 없습니다"
#, c-format
-#~ msgid "E259: no matches found for cscope query %s of %s"
+#~ msgid "E469: invalid cscopequickfix flag %c for %c"
#~ msgstr ""
#, c-format
-#~ msgid "E469: invalid cscopequickfix flag %c for %c"
+#~ msgid "E259: no matches found for cscope query %s of %s"
#~ msgstr ""
msgid "cscope commands:\n"
@@ -2421,7 +2449,7 @@ msgid ""
" g: Find this definition\n"
" i: Find files #including this file\n"
" s: Find this C symbol\n"
-" t: Find assignments to\n"
+" t: Find this text string\n"
msgstr ""
"\n"
" c: 이 함수를 부르는 함수들 찾기\n"
@@ -2431,7 +2459,7 @@ msgstr ""
" g: 이 정의 찾기\n"
" i: 이 파일을 포함하는 파일들 찾기\n"
" s: 이 C 심볼 찾기\n"
-" t: Find assignments to\n"
+" t: 이 문자열 찾기\n"
#, c-format
msgid "E625: cannot open cscope database: %s"
@@ -2482,12 +2510,18 @@ msgstr "cscope 연결이 없습니다\n"
msgid " # pid database name prepend path\n"
msgstr " # pid 데이터베이스 이름 prepend path\n"
+#~ msgid "Lua library cannot be loaded."
+#~ msgstr ""
+
+msgid "cannot save undo information"
+msgstr "undo 정보를 저장할 수 없습니다"
+
msgid ""
"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
"loaded."
msgstr ""
-"E815: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme 라이브러리를 로딩할 수 없"
-"습니다."
+"E815: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme 라이브러리를 로딩할 "
+"수 없습니다."
msgid "invalid expression"
msgstr "잘못된 표현식"
@@ -2507,9 +2541,6 @@ msgstr "창 번호가 범위를 벗어났습니다"
msgid "couldn't open buffer"
msgstr "버퍼를 열 수 없었습니다"
-msgid "cannot save undo information"
-msgstr "undo 정보를 저장할 수 없습니다"
-
msgid "cannot delete line"
msgstr "줄을 지울 수 없습니다"
@@ -2540,6 +2571,9 @@ msgstr "줄 번호가 범위를 벗어났습니다"
msgid "not allowed in the Vim sandbox"
msgstr "Vim sandbox에서는 허용되지 않습니다"
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: 이 Vim은 :py3을 사용한 후에 :python을 사용할 수 없습니다"
+
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2559,51 +2593,12 @@ msgstr "softspace는 정수여야만 합니다"
msgid "invalid attribute"
msgstr "잘못된 속성"
-msgid "writelines() requires list of strings"
-msgstr "writelines()는 문자열 목록이 필요합니다"
-
-msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: 파이썬: I/O 객체 초기화중 에러가 생겼습니다"
-
-msgid "attempt to refer to deleted buffer"
-msgstr "지워진 버퍼를 참조하려고 하였습니다"
-
-msgid "line number out of range"
-msgstr "줄 번호가 범위를 벗어났습니다"
-
#, c-format
msgid "<buffer object (deleted) at %p>"
msgstr "<%p에 버퍼 객체 (삭제됨)>"
-msgid "invalid mark name"
-msgstr "잘못된 마크 이름"
-
-msgid "no such buffer"
-msgstr "그런 버퍼는 없습니다"
-
-msgid "attempt to refer to deleted window"
-msgstr "지워진 창을 참조하려고 하였습니다"
-
-msgid "readonly attribute"
-msgstr "읽기 전용 속성"
-
-msgid "cursor position outside buffer"
-msgstr "퍼서 위치가 버퍼 밖에 있습니다"
-
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<%p에 창 객체 (삭제됨)>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<%p에 창 객체 (모름)>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<창 %d>"
-
-msgid "no such window"
-msgstr "그런 창은 없습니다"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: 이 Vim은 :python을 사용한 후에 :py3을 사용할 수 없습니다"
#~ msgid "E265: $_ must be an instance of String"
#~ msgstr ""
@@ -2735,6 +2730,9 @@ msgstr "아직 구현되지 않았습니다"
msgid "cannot set line(s)"
msgstr "줄을 설정할 수 없습니다"
+msgid "invalid mark name"
+msgstr "잘못된 마크 이름"
+
msgid "mark not set"
msgstr "마크가 설정되지 않았습니다"
@@ -2745,6 +2743,9 @@ msgstr "행 %d 열 %d"
msgid "cannot insert/append line"
msgstr "줄을 끼워넣거나 더할 수 없습니다"
+msgid "line number out of range"
+msgstr "줄 번호가 범위를 벗어났습니다"
+
msgid "unknown flag: "
msgstr "모르는 플래그: "
@@ -2829,6 +2830,9 @@ msgstr "너무 많은 \"+command\" \"-c command\" 혹은 \"--cmd command\" 인
msgid "%d files to edit\n"
msgstr "%d 파일을 고치기\n"
+msgid "netbeans is not supported with this GUI\n"
+msgstr "이 GUI는 netbeans를 지원하지 않습니다\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr "이 빔은 diff 기능 없이 컴파일 되었습니다."
@@ -3074,7 +3078,8 @@ msgstr "--remote-wait-silent <files> 같음, 서버가 없다고 불평하지
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
msgstr ""
-"--remote-tab[-wait][-silent] <files> --remote와 같지만 파일별로 탭 페이지 사용"
+"--remote-tab[-wait][-silent] <files> --remote와 같지만 파일별로 탭 페이지 사"
+"용"
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\t빔 서버로 <keys>를 보내고 끝내기"
@@ -3127,12 +3132,6 @@ msgstr "-display <display>\t빔을 <display>에서 실행"
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\t아이콘 상태로 빔 시작"
-msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t빔이 <name>인 것처럼 리소스 사용"
-
-msgid "\t\t\t (Unimplemented)\n"
-msgstr "\t\t\t (구현되지 않음)\n"
-
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr "-background <color>\t바탕 색으로 <color> 사용 (also: -bg)"
@@ -3254,7 +3253,6 @@ msgstr ""
#~ "change line col text"
#~ msgstr ""
-#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -3263,7 +3261,6 @@ msgstr ""
"# 파일 마크:\n"
#. Write the jumplist with -'
-#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3271,7 +3268,6 @@ msgstr ""
"\n"
"# 점프목록 (새것이 먼저):\n"
-#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -3303,15 +3299,6 @@ msgstr "E288: 입력 방식이 어떤 형식도 지원하지 않습니다"
msgid "E289: input method doesn't support my preedit type"
msgstr "E289: 입력 방식이 내 preedit 형식을 지원하지 않습니다"
-msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot 형식은 fontset이 사용되어야 합니다"
-
-msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: GTK+가 1.2.3 이전 판입니다. 상태 영역을 사용할 수 없습니다"
-
-msgid "E292: Input Method Server is not running"
-msgstr "E292: 입력 서버가 실행되지 않고 있습니다"
-
msgid "E293: block was not locked"
msgstr "E293: 구역이 잠궈지지 않았습니다"
@@ -3339,6 +3326,9 @@ msgstr "E298: 구역 번호 1을 얻지 못했나요?"
msgid "E298: Didn't get block nr 2?"
msgstr "E298: 구역 번호 2를 얻지 못했나요?"
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: 스왑 파일을 암호화할 수 없습니다"
+
#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
msgstr "E301: 으윽, 스왑 파일을 잃어버렸습니다!!!"
@@ -3395,6 +3385,12 @@ msgstr " 이 컴퓨터에서는 사용될 수 없습니다.\n"
#~ "or the file has been damaged."
#~ msgstr ""
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s이(가) 암호화되어 있는 데, 이 Vim은 암호화를 지원하지 않습니다"
+
#~ msgid " has been damaged (page size is smaller than minimum value).\n"
#~ msgstr ""
@@ -3410,6 +3406,38 @@ msgid "E308: Warning: Original file may have been changed"
msgstr "E308: 경고: 원래 파일이 바뀌었습니다"
#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "스왑 파일이 암호화됨: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"새로운 암호 키를 입력했는 데, 파일을 저장하지 않았었다면,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"새로운 암호 키를 입력하세요."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"암호 키를 바꾼 후에 파일을 저장했었다면 같은 키로 텍스트 파일과"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"스왑파일을 저장하려면 엔터를 누르세요"
+
+#, c-format
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: %s의 구역 1을 읽을 수 없습니다"
@@ -3461,15 +3489,23 @@ msgstr ""
"\n"
"(어쩌면 다른 이름으로 저장하고 싶으실 지도 모르겠습니다\n"
-msgid "and run diff with the original file to check for changes)\n"
-msgstr "그리고 바뀐 내용을 확인하려면 diff를 이용하십시오)\n"
+msgid "and run diff with the original file to check for changes)"
+msgstr "그리고 바뀐 내용을 확인하려면 원래 파일에 대해 diff를 실행하세요)"
+
+msgid "Recovery completed. Buffer contents equals file contents."
+msgstr "복구가 끝났습니다. 버퍼의 내용이 파일 내용과 같습니다."
msgid ""
-"Delete the .swp file afterwards.\n"
+"\n"
+"You may want to delete the .swp file now.\n"
"\n"
msgstr ""
-"나중에 .swp 파일을 지우십시오.\n"
"\n"
+"이제 .swp 파일을 지우셔도 됩니다.\n"
+"\n"
+
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "텍스트 파일에 스왑파일에서 가져온 암호 키를 사용합니다.\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
@@ -3677,10 +3713,12 @@ msgstr ""
msgid " If you did this already, delete the swap file \""
msgstr " 이미 복구하셨었다면 스왑파일 \""
-#~ msgid ""
-#~ "\"\n"
-#~ " to avoid this message.\n"
-#~ msgstr ""
+msgid ""
+"\"\n"
+" to avoid this message.\n"
+msgstr ""
+"\"\n"
+" 을(를) 지우셔야 이 메시지가 사라집니다.\n"
msgid "Swap file \""
msgstr "스왑 파일 \""
@@ -3889,7 +3927,6 @@ msgstr "빔: 파일 보존중...\n"
msgid "Vim: Finished.\n"
msgstr "빔: 끌났습니다.\n"
-#, c-format
msgid "ERROR: "
msgstr "에러: "
@@ -3985,8 +4022,14 @@ msgstr "Netbeans 소켓에서 읽기"
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: 버퍼 %ld에 대한 NetBeans 연결을 잃어버렸습니다"
-#~ msgid "E505: "
-#~ msgstr ""
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: 이 GUI는 netbeans를 지원하지 않습니다"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: netbeans가 이미 연결되어 있습니다"
+
+msgid "E505: "
+msgstr "E505: "
msgid "E349: No identifier under cursor"
msgstr "E349: 커서 밑에 식별자가 없습니다"
@@ -4092,7 +4135,6 @@ msgstr ""
msgid "Illegal register name"
msgstr "이상한 레지스터 이름"
-#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -4117,8 +4159,8 @@ msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
msgstr ""
-"Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 문자; %ld of %ld "
-"바이트"
+"Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 문자; %ld of %ld 바이"
+"트"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -4129,8 +4171,8 @@ msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-"Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 문자 %ld of %ld; 바이트 %ld of "
-"%ld"
+"Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 문자 %ld of %ld; 바이트 %ld "
+"of %ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -4173,6 +4215,12 @@ msgstr "E531: GUI를 시작하려면 \":gui\"를 사용하십시오"
msgid "E589: 'backupext' and 'patchmode' are equal"
msgstr "E589: 'backupext'와 'patchmode'가 동일합니다"
+msgid "E834: Conflicts with value of 'listchars'"
+msgstr "E834: 'listchars' 값과 충돌이 발생합니다"
+
+msgid "E835: Conflicts with value of 'fillchars'"
+msgstr "E835: 'fillchars' 값과 충돌이 발생합니다"
+
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+ 2 GUI에서는 바뀔 수 없습니다"
@@ -4584,6 +4632,9 @@ msgstr "error list %d of %d; %d errors"
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 쓸 수 없음, 'buftype' 옵션이 설정되어 있습니다"
+msgid "Error file"
+msgstr "에러 파일"
+
msgid "E683: File name missing or invalid pattern"
msgstr "E683: 파일명 누락 혹은 잘못된 패턴"
@@ -4839,6 +4890,10 @@ msgid "E756: Spell checking is not enabled"
msgstr "E756: 맞춤법 검사가 활성화되어 있지 않습니다"
#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "경고: 단어 목록 \"%s_%s.spl\" 혹은 \"%s_ascii.spl\"을 찾을 수 없습니다"
+
+#, c-format
msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
msgstr "경고: 단어 목록 \"%s.%s.spl\" 혹은 \"%s.ascii.spl\"을 찾을 수 없습니다"
@@ -5062,6 +5117,9 @@ msgstr "%s 라인 %d에 모르는 플래그: %s"
msgid "Ignored %d words with non-ASCII characters"
msgstr "아스키 문자열이 아닌 %d개의 단어가 무시되었습니다"
+#~ msgid "E845: Insufficient memory, word list will be incomplete"
+#~ msgstr ""
+
#, c-format
msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
msgstr "%d/%d 노드가 압축됨; %d (%d%%)가 남음"
@@ -5239,8 +5297,8 @@ msgstr " line breaks"
msgid "E395: contains argument not accepted here"
msgstr "E395: contains 인자는 여기에 쓸 수 없습니다"
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: containedin 인자는 여기에 쓸 수 없습니다"
+msgid "E844: invalid cchar value"
+msgstr "E844: 잘못된 cchar 값"
msgid "E393: group[t]here not accepted here"
msgstr "E393: group[t]here는 여기에서 사용될 수 없습니다"
@@ -5452,6 +5510,10 @@ msgstr "E434: 태그 패턴을 찾을 수 없습니다"
msgid "E435: Couldn't find tag, just guessing!"
msgstr "E435: 태그를 찾을 수 없지만 이거 같습니다!"
+#, c-format
+msgid "Duplicate field name: %s"
+msgstr "중복된 필드 명: %s"
+
msgid "' not known. Available builtin terminals are:"
msgstr "' not known. Available builtin terminals are:"
@@ -5491,10 +5553,84 @@ msgstr "빔: 입력 읽는 중 에러, 끝내는중...\n"
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr "빈 고르기 대신 CUT_BUFFER0을 사용했습니다"
+#. This happens when the FileChangedRO autocommand changes the
+#. * file in a way it becomes shorter.
+msgid "E834: Line count changed unexpectedly"
+msgstr "E834: 줄 갯수가 모르는 사이에 바뀌었습니다"
+
#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr "취소 불가능; 어쨌든 계속합니다"
+#, c-format
+msgid "E828: Cannot open undo file for writing: %s"
+msgstr "E828: 쓰기 위해 undo을 열 수 없습니다: %s"
+
+#, c-format
+msgid "E825: Corrupted undo file (%s): %s"
+msgstr "E825: 깨진 undo 파일 (%s): %s"
+
+msgid "Cannot write undo file in any directory in 'undodir'"
+msgstr "'undodir'에 있는 어떤 디렉토리에도 undo 파일을 쓸 수 없습니다"
+
+#, c-format
+msgid "Will not overwrite with undo file, cannot read: %s"
+msgstr "읽을 수가 없어서 undo 파일에 덮어쓸 수 없습니다: %s"
+
+#, c-format
+msgid "Will not overwrite, this is not an undo file: %s"
+msgstr "undo 파일이 아니어서 덮어쓸 수 없습니다: %s"
+
+msgid "Skipping undo file write, nothing to undo"
+msgstr "undo할 내용이 없어서 undo 파일 저장을 건너뜁니다"
+
+#, c-format
+msgid "Writing undo file: %s"
+msgstr "undo 파일 쓰는 중: %s"
+
+#, c-format
+msgid "E829: write error in undo file: %s"
+msgstr "E829: undo 파일 쓰기 에러: %s"
+
+#, c-format
+msgid "Not reading undo file, owner differs: %s"
+msgstr "소유자가 달라서 undo 파일을 읽지 않습니다: %s"
+
+#, c-format
+msgid "Reading undo file: %s"
+msgstr "undo 파일 읽는 중: %s"
+
+#, c-format
+msgid "E822: Cannot open undo file for reading: %s"
+msgstr "E822: 읽기 위해 undo 파일을 열 수 없습니다: %s"
+
+#, c-format
+msgid "E823: Not an undo file: %s"
+msgstr "E823: undo 파일이 아닙니다: %s"
+
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: 암호화되지 않은 파일이 암호화된 undo 파일을 가지고 있습니다: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: Undo 파일을 해독할 수 없습니다: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Undo 파일이 암호화되었습니다: %s"
+
+#, c-format
+msgid "E824: Incompatible undo file: %s"
+msgstr "E824: 호환되지 않는 undo 파일: %s"
+
+msgid "File contents changed, cannot use undo info"
+msgstr "파일 내용이 바뀌어서, undo 정보를 사용할 수 없습니다"
+
+#, c-format
+msgid "Finished reading undo file %s"
+msgstr "undo 파일 %s을(를) 읽어들였습니다"
+
msgid "Already at oldest change"
msgstr "더 이상의 수정이 없었습니다"
@@ -5502,8 +5638,8 @@ msgid "Already at newest change"
msgstr "더 이상의 수정은 없었습니다"
#, c-format
-msgid "Undo number %ld not found"
-msgstr "취소 번호 %ld를 찾을 수 없습니다"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Undo 번호 %ld를 찾을 수 없습니다"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: 잘못된 줄 번호"
@@ -5539,8 +5675,8 @@ msgstr "after"
msgid "Nothing to undo"
msgstr "취소할 게 없습니다"
-msgid "number changes time"
-msgstr "number changes time"
+#~ msgid "number changes when saved"
+#~ msgstr ""
#, c-format
msgid "%ld seconds ago"
@@ -5721,15 +5857,9 @@ msgstr "GUI 없음."
msgid "with GTK2-GNOME GUI."
msgstr "GTK2-GNOME GUI."
-msgid "with GTK-GNOME GUI."
-msgstr "GTK-GNOME GUI."
-
msgid "with GTK2 GUI."
msgstr "GTK2 GUI."
-msgid "with GTK GUI."
-msgstr "GTK GUI."
-
msgid "with X11-Motif GUI."
msgstr "X11-Motif GUI."
@@ -6294,3 +6424,42 @@ msgstr "처음까지 찾았음, 끝에서 계속"
msgid "search hit BOTTOM, continuing at TOP"
msgstr "끝까지 찾았음, 처음부터 계속"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "\"%s\"에 대한 암호 키가 필요합니다"
+
+msgid "writelines() requires list of strings"
+msgstr "writelines()는 문자열 목록이 필요합니다"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: 파이썬: I/O 객체 초기화중 에러가 생겼습니다"
+
+msgid "no such buffer"
+msgstr "그런 버퍼는 없습니다"
+
+msgid "attempt to refer to deleted window"
+msgstr "지워진 창을 참조하려고 하였습니다"
+
+msgid "readonly attribute"
+msgstr "읽기 전용 속성"
+
+msgid "cursor position outside buffer"
+msgstr "퍼서 위치가 버퍼 밖에 있습니다"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<%p에 창 객체 (삭제됨)>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<%p에 창 객체 (모름)>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<창 %d>"
+
+msgid "no such window"
+msgstr "그런 창은 없습니다"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "지워진 버퍼를 참조하려고 하였습니다"
diff --git a/src/po/ko.po b/src/po/ko.po
index ed6d42bba..b12e73b66 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -1,12 +1,12 @@
# Generated from ko.UTF-8.po, DO NOT EDIT
#
-# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2010
+# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2011
#
msgid ""
msgstr ""
-"Project-Id-Version: vim 7.2\n"
+"Project-Id-Version: vim 7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 09:43+0900\n"
+"POT-Creation-Date: 2011-02-16 16:18+0900\n"
"PO-Revision-Date: 2010-02-18 09:49+0900\n"
"Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
"Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -14,6 +14,27 @@ msgstr ""
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: йȣ bf_key_init() Լ ҷϴ"
+
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish big/little endian use wrong"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256 ߽ϴ."
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish ߽ϴ."
+
+msgid "[Location List]"
+msgstr "[ġ ]"
+
+msgid "[Quickfix List]"
+msgstr "[Quickfix ]"
+
msgid "E82: Cannot allocate any buffer, exiting..."
msgstr "E82: ۸ Ҵ  ϴ..."
@@ -147,7 +168,6 @@ msgstr "ٴ"
msgid "Top"
msgstr ""
-#, c-format
msgid ""
"\n"
"# Buffer list:\n"
@@ -155,12 +175,6 @@ msgstr ""
"\n"
"# :\n"
-msgid "[Location List]"
-msgstr "[ġ ]"
-
-msgid "[Quickfix List]"
-msgstr "[Quickfix ]"
-
msgid "[Scratch]"
msgstr "[Scratch]"
@@ -280,6 +294,12 @@ msgstr " ϼ (^N^P)"
msgid "Hit end of paragraph"
msgstr "ܶ "
+msgid "E839: Completion function changed window"
+msgstr "E839: Completion â ٲپϴ"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Completion ڿ ϴ"
+
msgid "'dictionary' option is empty"
msgstr "'dictionary' ɼ ϴ"
@@ -730,7 +750,6 @@ msgstr "%s "
msgid "E133: :return not inside a function"
msgstr "E133: :return Լ ȿ ʽϴ"
-#, c-format
msgid ""
"\n"
"# global variables:\n"
@@ -821,7 +840,6 @@ msgstr "Viminfo \"%s\"() "
msgid "# This viminfo file was generated by Vim %s.\n"
msgstr "# viminfo Դϴ Vim %s.\n"
-#, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -829,7 +847,6 @@ msgstr ""
"# ɸ Ѵٸ ĥ ֽϴ!\n"
"\n"
-#, c-format
msgid "# Value of 'encoding' when this file was written\n"
msgstr "# Ǿ 'encoding' \n"
@@ -940,7 +957,6 @@ msgstr "E148: global ǥ ϴ"
msgid "Pattern found in every line: %s"
msgstr " ٿ ãҽϴ: %s"
-#, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1049,8 +1065,8 @@ msgstr " ǵǾ ʽϴ"
msgid "%3d %s %s line %ld"
msgstr "%3d %s %s %ld "
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: ':profile start <fname>' ϼ"
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: \":profile start {fname}\" ϼ"
#, c-format
msgid "Save changes to \"%s\"?"
@@ -1121,11 +1137,11 @@ msgstr "%s ҷ̱ "
#~ msgid "modeline"
#~ msgstr ""
-#~ msgid "--cmd argument"
-#~ msgstr ""
+msgid "--cmd argument"
+msgstr "--cmd "
-#~ msgid "-c argument"
-#~ msgstr ""
+msgid "-c argument"
+msgstr "-c "
msgid "environment variable"
msgstr "ȯ "
@@ -1242,6 +1258,9 @@ msgstr "E182: ߸ ̸"
msgid "E183: User defined commands must start with an uppercase letter"
msgstr "E183: 빮ڷ ؾ մϴ"
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: ̸, ϴ"
+
#, c-format
msgid "E184: No such user-defined command: %s"
msgstr "E184: ׷ : %s"
@@ -1256,6 +1275,9 @@ msgstr "E468: ϼ ڴ ϼ ˴ϴ"
msgid "E467: Custom completion requires a function argument"
msgstr "E467: ϼ Լ ڰ ʿմϴ"
+msgid "unknown"
+msgstr ""
+
#, c-format
msgid "E185: Cannot find color scheme %s"
msgstr "E185: Ŵ %s() ã ϴ"
@@ -1353,6 +1375,9 @@ msgstr "E497: \"<amatch>\" ġȯ ڵ ġ ̸ ϴ"
msgid "E498: no :source file name to substitute for \"<sfile>\""
msgstr "E498: \"<sfile>\" ġȯ :source ̸ ϴ"
+msgid "E842: no line number to use for \"<slnum>\""
+msgstr "E842: \"<slnum>\" ȣ ϴ"
+
#, no-c-format
msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
msgstr "E499: '%' '#' ̸, \":p:h\"͸ մϴ"
@@ -1607,6 +1632,9 @@ msgstr "'charconvert' ȯ ߽ϴ"
msgid "can't read output of 'charconvert'"
msgstr "'charconvert' ° ϴ"
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: 𸣴 ȣȭǾ ֽϴ"
+
msgid "E676: No matching autocommands for acwrite buffer"
msgstr "E676: acwrite ۿ autocommand ã ϴ"
@@ -1674,9 +1702,7 @@ msgstr "E513: , ȯ (Ϸ 'fenc' )"
msgid ""
"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
"override)"
-msgstr ""
-"E513: , %ld ٿ ȯ (Ϸ 'fenc' "
-")"
+msgstr "E513: , %ld ٿ ȯ (Ϸ 'fenc' )"
msgid "E514: write error (file system full?)"
msgstr "E514: ( ý á?)"
@@ -1754,6 +1780,11 @@ msgid "1 character"
msgstr "1 "
#, c-format
+msgid "%lld characters"
+msgstr "%lld "
+
+#. Explicit typecast avoids warning on Mac OS X 10.6
+#, c-format
msgid "%ld characters"
msgstr "%ld "
@@ -1998,9 +2029,6 @@ msgstr " ȭ"
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: ޽ ݹ θ ؼ BalloonEval ϴ"
-msgid "Vim dialog..."
-msgstr " ȭ..."
-
msgid ""
"&Yes\n"
"&No\n"
@@ -2043,12 +2071,15 @@ msgstr ""
msgid "Down"
msgstr "Ʒ"
+#. 'Find Next' button
msgid "Find Next"
msgstr " ã"
+#. 'Replace' button
msgid "Replace"
msgstr "ٲٱ"
+#. 'Replace All' button
msgid "Replace All"
msgstr " ٲٱ"
@@ -2067,9 +2098,6 @@ msgstr " ..."
msgid "Vim: Main window unexpectedly destroyed\n"
msgstr ": â װ Դϴ\n"
-msgid "Font Selection"
-msgstr "۲ "
-
msgid "&Filter"
msgstr "Ÿ(&F)"
@@ -2398,11 +2426,11 @@ msgid "E567: no cscope connections"
msgstr "E567: cscope ϴ"
#, c-format
-#~ msgid "E259: no matches found for cscope query %s of %s"
+#~ msgid "E469: invalid cscopequickfix flag %c for %c"
#~ msgstr ""
#, c-format
-#~ msgid "E469: invalid cscopequickfix flag %c for %c"
+#~ msgid "E259: no matches found for cscope query %s of %s"
#~ msgstr ""
msgid "cscope commands:\n"
@@ -2421,7 +2449,7 @@ msgid ""
" g: Find this definition\n"
" i: Find files #including this file\n"
" s: Find this C symbol\n"
-" t: Find assignments to\n"
+" t: Find this text string\n"
msgstr ""
"\n"
" c: Լ θ Լ ã\n"
@@ -2431,7 +2459,7 @@ msgstr ""
" g: ã\n"
" i: ϴ ϵ ã\n"
" s: C ɺ ã\n"
-" t: Find assignments to\n"
+" t: ڿ ã\n"
#, c-format
msgid "E625: cannot open cscope database: %s"
@@ -2482,12 +2510,18 @@ msgstr "cscope ϴ\n"
msgid " # pid database name prepend path\n"
msgstr " # pid ͺ̽ ̸ prepend path\n"
+#~ msgid "Lua library cannot be loaded."
+#~ msgstr ""
+
+msgid "cannot save undo information"
+msgstr "undo ϴ"
+
msgid ""
"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
"loaded."
msgstr ""
-"E815: ̾մϴ, ϴ, MzScheme ̺귯 ε "
-"ϴ."
+"E815: ̾մϴ, ϴ, MzScheme ̺귯 ε "
+" ϴ."
msgid "invalid expression"
msgstr "߸ ǥ"
@@ -2507,9 +2541,6 @@ msgstr "â ȣ ϴ"
msgid "couldn't open buffer"
msgstr "۸ ϴ"
-msgid "cannot save undo information"
-msgstr "undo ϴ"
-
msgid "cannot delete line"
msgstr " ϴ"
@@ -2540,6 +2571,9 @@ msgstr " ȣ ϴ"
msgid "not allowed in the Vim sandbox"
msgstr "Vim sandbox ʽϴ"
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Vim :py3 Ŀ :python ϴ"
+
msgid ""
"E263: Sorry, this command is disabled, the Python library could not be "
"loaded."
@@ -2559,51 +2593,12 @@ msgstr "softspace ߸ մϴ"
msgid "invalid attribute"
msgstr "߸ Ӽ"
-msgid "writelines() requires list of strings"
-msgstr "writelines() ڿ ʿմϴ"
-
-msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: ̽: I/O ü ʱȭ ϴ"
-
-msgid "attempt to refer to deleted buffer"
-msgstr " ۸ Ϸ Ͽϴ"
-
-msgid "line number out of range"
-msgstr " ȣ ϴ"
-
#, c-format
msgid "<buffer object (deleted) at %p>"
msgstr "<%p ü ()>"
-msgid "invalid mark name"
-msgstr "߸ ũ ̸"
-
-msgid "no such buffer"
-msgstr "׷ ۴ ϴ"
-
-msgid "attempt to refer to deleted window"
-msgstr " â Ϸ Ͽϴ"
-
-msgid "readonly attribute"
-msgstr "б Ӽ"
-
-msgid "cursor position outside buffer"
-msgstr "ۼ ġ ۿ ֽϴ"
-
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<%p â ü ()>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<%p â ü ()>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<â %d>"
-
-msgid "no such window"
-msgstr "׷ â ϴ"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim :python Ŀ :py3 ϴ"
#~ msgid "E265: $_ must be an instance of String"
#~ msgstr ""
@@ -2735,6 +2730,9 @@ msgstr " ʾҽϴ"
msgid "cannot set line(s)"
msgstr " ϴ"
+msgid "invalid mark name"
+msgstr "߸ ũ ̸"
+
msgid "mark not set"
msgstr "ũ ʾҽϴ"
@@ -2745,6 +2743,9 @@ msgstr " %d %d"
msgid "cannot insert/append line"
msgstr " ְų ϴ"
+msgid "line number out of range"
+msgstr " ȣ ϴ"
+
msgid "unknown flag: "
msgstr "𸣴 ÷: "
@@ -2829,6 +2830,9 @@ msgstr "ʹ \"+command\" \"-c command\" Ȥ \"--cmd command\" "
msgid "%d files to edit\n"
msgstr "%d ġ\n"
+msgid "netbeans is not supported with this GUI\n"
+msgstr " GUI netbeans ʽϴ\n"
+
msgid "This Vim was not compiled with the diff feature."
msgstr " diff Ǿϴ."
@@ -3074,7 +3078,8 @@ msgstr "--remote-wait-silent <files> , ٰ "
msgid ""
"--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"
msgstr ""
-"--remote-tab[-wait][-silent] <files> --remote Ϻ "
+"--remote-tab[-wait][-silent] <files> --remote Ϻ "
+""
msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
msgstr "--remote-send <keys>\t <keys> "
@@ -3127,12 +3132,6 @@ msgstr "-display <display>\t <display> "
msgid "-iconic\t\tStart vim iconified"
msgstr "-iconic\t\t · "
-msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t <name> ó ҽ "
-
-msgid "\t\t\t (Unimplemented)\n"
-msgstr "\t\t\t ( )\n"
-
msgid "-background <color>\tUse <color> for the background (also: -bg)"
msgstr "-background <color>\t <color> (also: -bg)"
@@ -3254,7 +3253,6 @@ msgstr ""
#~ "change line col text"
#~ msgstr ""
-#, c-format
msgid ""
"\n"
"# File marks:\n"
@@ -3263,7 +3261,6 @@ msgstr ""
"# ũ:\n"
#. Write the jumplist with -'
-#, c-format
msgid ""
"\n"
"# Jumplist (newest first):\n"
@@ -3271,7 +3268,6 @@ msgstr ""
"\n"
"# ( ):\n"
-#, c-format
msgid ""
"\n"
"# History of marks within files (newest to oldest):\n"
@@ -3303,15 +3299,6 @@ msgstr "E288: Է  ĵ ʽϴ"
msgid "E289: input method doesn't support my preedit type"
msgstr "E289: Է preedit ʽϴ"
-msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot fontset Ǿ մϴ"
-
-msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: GTK+ 1.2.3 Դϴ. ϴ"
-
-msgid "E292: Input Method Server is not running"
-msgstr "E292: Է ʰ ֽϴ"
-
msgid "E293: block was not locked"
msgstr "E293: ʾҽϴ"
@@ -3339,6 +3326,9 @@ msgstr "E298: ȣ 1 ߳?"
msgid "E298: Didn't get block nr 2?"
msgstr "E298: ȣ 2 ߳?"
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: ȣȭ ϴ"
+
#. could not (re)open the swap file, what can we do????
msgid "E301: Oops, lost the swap file!!!"
msgstr "E301: , ҾȽϴ!!!"
@@ -3395,6 +3385,12 @@ msgstr " ǻͿ ϴ.\n"
#~ "or the file has been damaged."
#~ msgstr ""
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s() ȣȭǾ ִ , Vim ȣȭ ʽϴ"
+
#~ msgid " has been damaged (page size is smaller than minimum value).\n"
#~ msgstr ""
@@ -3410,6 +3406,38 @@ msgid "E308: Warning: Original file may have been changed"
msgstr "E308: : ٲϴ"
#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr " ȣȭ: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"ο ȣ Ű Էߴ , ʾҾٸ,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"ο ȣ Ű Էϼ."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"ȣ Ű ٲ Ŀ ߾ٸ Ű ؽƮ ϰ"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+" Ϸ ͸ "
+
+#, c-format
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: %s 1 ϴ"
@@ -3461,15 +3489,23 @@ msgstr ""
"\n"
"(¼ ٸ ̸ ϰ 𸣰ڽϴ\n"
-msgid "and run diff with the original file to check for changes)\n"
-msgstr "׸ ٲ ȮϷ diff ̿Ͻʽÿ)\n"
+msgid "and run diff with the original file to check for changes)"
+msgstr "׸ ٲ ȮϷ Ͽ diff ϼ)"
+
+msgid "Recovery completed. Buffer contents equals file contents."
+msgstr " ϴ. ϴ."
msgid ""
-"Delete the .swp file afterwards.\n"
+"\n"
+"You may want to delete the .swp file now.\n"
"\n"
msgstr ""
-"߿ .swp ʽÿ.\n"
"\n"
+" .swp ŵ ˴ϴ.\n"
+"\n"
+
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "ؽƮ Ͽ Ͽ ȣ Ű մϴ.\n"
#. use msg() to start the scrolling properly
msgid "Swap files found:"
@@ -3677,10 +3713,12 @@ msgstr ""
msgid " If you did this already, delete the swap file \""
msgstr " ̹ ϼ̾ٸ \""
-#~ msgid ""
-#~ "\"\n"
-#~ " to avoid this message.\n"
-#~ msgstr ""
+msgid ""
+"\"\n"
+" to avoid this message.\n"
+msgstr ""
+"\"\n"
+" () ž ޽ ϴ.\n"
msgid "Swap file \""
msgstr " \""
@@ -3889,7 +3927,6 @@ msgstr ": ...\n"
msgid "Vim: Finished.\n"
msgstr ": ϴ.\n"
-#, c-format
msgid "ERROR: "
msgstr ": "
@@ -3985,8 +4022,14 @@ msgstr "Netbeans Ͽ б"
msgid "E658: NetBeans connection lost for buffer %ld"
msgstr "E658: %ld NetBeans ҾȽϴ"
-#~ msgid "E505: "
-#~ msgstr ""
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: GUI netbeans ʽϴ"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: netbeans ̹ Ǿ ֽϴ"
+
+msgid "E505: "
+msgstr "E505: "
msgid "E349: No identifier under cursor"
msgstr "E349: Ŀ ؿ ĺڰ ϴ"
@@ -4092,7 +4135,6 @@ msgstr ""
msgid "Illegal register name"
msgstr "̻ ̸"
-#, c-format
msgid ""
"\n"
"# Registers:\n"
@@ -4117,8 +4159,8 @@ msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
msgstr ""
-"Selected %s%ld of %ld ; %ld of %ld ܾ; %ld of %ld ; %ld of %ld "
-"Ʈ"
+"Selected %s%ld of %ld ; %ld of %ld ܾ; %ld of %ld ; %ld of %ld "
+"Ʈ"
#, c-format
msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -4129,8 +4171,8 @@ msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-"Col %s of %s; %ld of %ld; ܾ %ld of %ld; %ld of %ld; Ʈ %ld of "
-"%ld"
+"Col %s of %s; %ld of %ld; ܾ %ld of %ld; %ld of %ld; Ʈ %ld "
+"of %ld"
#, c-format
msgid "(+%ld for BOM)"
@@ -4173,6 +4215,12 @@ msgstr "E531: GUI Ϸ \":gui\" Ͻʽÿ"
msgid "E589: 'backupext' and 'patchmode' are equal"
msgstr "E589: 'backupext' 'patchmode' մϴ"
+msgid "E834: Conflicts with value of 'listchars'"
+msgstr "E834: 'listchars' 浹 ߻մϴ"
+
+msgid "E835: Conflicts with value of 'fillchars'"
+msgstr "E835: 'fillchars' 浹 ߻մϴ"
+
msgid "E617: Cannot be changed in the GTK+ 2 GUI"
msgstr "E617: GTK+ 2 GUI ٲ ϴ"
@@ -4584,6 +4632,9 @@ msgstr "error list %d of %d; %d errors"
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: , 'buftype' ɼ Ǿ ֽϴ"
+msgid "Error file"
+msgstr " "
+
msgid "E683: File name missing or invalid pattern"
msgstr "E683: ϸ Ȥ ߸ "
@@ -4839,6 +4890,10 @@ msgid "E756: Spell checking is not enabled"
msgstr "E756: ˻簡 ȰȭǾ ʽϴ"
#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ": ܾ \"%s_%s.spl\" Ȥ \"%s_ascii.spl\" ã ϴ"
+
+#, c-format
msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
msgstr ": ܾ \"%s.%s.spl\" Ȥ \"%s.ascii.spl\" ã ϴ"
@@ -5062,6 +5117,9 @@ msgstr "%s %d 𸣴 ÷: %s"
msgid "Ignored %d words with non-ASCII characters"
msgstr "ƽŰ ڿ ƴ %d ܾ õǾϴ"
+#~ msgid "E845: Insufficient memory, word list will be incomplete"
+#~ msgstr ""
+
#, c-format
msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
msgstr "%d/%d 尡 ; %d (%d%%) "
@@ -5239,8 +5297,8 @@ msgstr " line breaks"
msgid "E395: contains argument not accepted here"
msgstr "E395: contains ڴ ⿡ ϴ"
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: containedin ڴ ⿡ ϴ"
+msgid "E844: invalid cchar value"
+msgstr "E844: ߸ cchar "
msgid "E393: group[t]here not accepted here"
msgstr "E393: group[t]here ⿡ ϴ"
@@ -5452,6 +5510,10 @@ msgstr "E434: ± ã ϴ"
msgid "E435: Couldn't find tag, just guessing!"
msgstr "E435: ±׸ ã ̰ ϴ!"
+#, c-format
+msgid "Duplicate field name: %s"
+msgstr "ߺ ʵ : %s"
+
msgid "' not known. Available builtin terminals are:"
msgstr "' not known. Available builtin terminals are:"
@@ -5491,10 +5553,84 @@ msgstr ": Է д , ...\n"
msgid "Used CUT_BUFFER0 instead of empty selection"
msgstr " CUT_BUFFER0 ߽ϴ"
+#. This happens when the FileChangedRO autocommand changes the
+#. * file in a way it becomes shorter.
+msgid "E834: Line count changed unexpectedly"
+msgstr "E834: 𸣴 ̿ ٲϴ"
+
#. must display the prompt
msgid "No undo possible; continue anyway"
msgstr " Ұ; · մϴ"
+#, c-format
+msgid "E828: Cannot open undo file for writing: %s"
+msgstr "E828: undo ϴ: %s"
+
+#, c-format
+msgid "E825: Corrupted undo file (%s): %s"
+msgstr "E825: undo (%s): %s"
+
+msgid "Cannot write undo file in any directory in 'undodir'"
+msgstr "'undodir' ִ  丮 undo ϴ"
+
+#, c-format
+msgid "Will not overwrite with undo file, cannot read: %s"
+msgstr "  undo Ͽ  ϴ: %s"
+
+#, c-format
+msgid "Will not overwrite, this is not an undo file: %s"
+msgstr "undo ƴϾ  ϴ: %s"
+
+msgid "Skipping undo file write, nothing to undo"
+msgstr "undo  undo dzʶݴϴ"
+
+#, c-format
+msgid "Writing undo file: %s"
+msgstr "undo : %s"
+
+#, c-format
+msgid "E829: write error in undo file: %s"
+msgstr "E829: undo : %s"
+
+#, c-format
+msgid "Not reading undo file, owner differs: %s"
+msgstr "ڰ ޶ undo ʽϴ: %s"
+
+#, c-format
+msgid "Reading undo file: %s"
+msgstr "undo д : %s"
+
+#, c-format
+msgid "E822: Cannot open undo file for reading: %s"
+msgstr "E822: б undo ϴ: %s"
+
+#, c-format
+msgid "E823: Not an undo file: %s"
+msgstr "E823: undo ƴմϴ: %s"
+
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: ȣȭ ȣȭ undo ֽϴ: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: Undo ص ϴ: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Undo ȣȭǾϴ: %s"
+
+#, c-format
+msgid "E824: Incompatible undo file: %s"
+msgstr "E824: ȣȯ ʴ undo : %s"
+
+msgid "File contents changed, cannot use undo info"
+msgstr " ٲ, undo ϴ"
+
+#, c-format
+msgid "Finished reading undo file %s"
+msgstr "undo %s() о鿴ϴ"
+
msgid "Already at oldest change"
msgstr " ̻ ϴ"
@@ -5502,8 +5638,8 @@ msgid "Already at newest change"
msgstr " ̻ ϴ"
#, c-format
-msgid "Undo number %ld not found"
-msgstr " ȣ %ld ã ϴ"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Undo ȣ %ld ã ϴ"
msgid "E438: u_undo: line numbers wrong"
msgstr "E438: u_undo: ߸ ȣ"
@@ -5539,8 +5675,8 @@ msgstr "after"
msgid "Nothing to undo"
msgstr " ϴ"
-msgid "number changes time"
-msgstr "number changes time"
+#~ msgid "number changes when saved"
+#~ msgstr ""
#, c-format
msgid "%ld seconds ago"
@@ -5721,15 +5857,9 @@ msgstr "GUI ."
msgid "with GTK2-GNOME GUI."
msgstr "GTK2-GNOME GUI."
-msgid "with GTK-GNOME GUI."
-msgstr "GTK-GNOME GUI."
-
msgid "with GTK2 GUI."
msgstr "GTK2 GUI."
-msgid "with GTK GUI."
-msgstr "GTK GUI."
-
msgid "with X11-Motif GUI."
msgstr "X11-Motif GUI."
@@ -6294,3 +6424,42 @@ msgstr "ó ã, "
msgid "search hit BOTTOM, continuing at TOP"
msgstr " ã, ó "
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "\"%s\" ȣ Ű ʿմϴ"
+
+msgid "writelines() requires list of strings"
+msgstr "writelines() ڿ ʿմϴ"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: ̽: I/O ü ʱȭ ϴ"
+
+msgid "no such buffer"
+msgstr "׷ ۴ ϴ"
+
+msgid "attempt to refer to deleted window"
+msgstr " â Ϸ Ͽϴ"
+
+msgid "readonly attribute"
+msgstr "б Ӽ"
+
+msgid "cursor position outside buffer"
+msgstr "ۼ ġ ۿ ֽϴ"
+
+#, c-format
+msgid "<window object (deleted) at %p>"
+msgstr "<%p â ü ()>"
+
+#, c-format
+msgid "<window object (unknown) at %p>"
+msgstr "<%p â ü ()>"
+
+#, c-format
+msgid "<window %d>"
+msgstr "<â %d>"
+
+msgid "no such window"
+msgstr "׷ â ϴ"
+
+msgid "attempt to refer to deleted buffer"
+msgstr " ۸ Ϸ Ͽϴ"
View Lorry Controller Status