Runtime file updates.

2 files changed, 590 insertions, 252 deletions

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 "������ ���۸� �����Ϸ��� �Ͽ����ϴ�"