updated for version 7.0046
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index 0514639..b190e88 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -20,6 +20,7 @@
 5. Using Mingw
 6. Cross compiling for Win32 from a Linux machine
 7. Building with Python support
+8. Building with MzScheme support
 
 
 1. MS-DOS
@@ -310,3 +311,38 @@
    make -f Make_ming.mak gvim.exe
 
 and you will end up with a Python-enabled, Win32 version.  Enjoy!
+
+8. Building with MzScheme support
+=================================================
+
+(written by Sergey Khorev <sergey.khorev@gmail.com>)
+
+Vim with MzScheme (http://www.plt-scheme.org/software/mzscheme) support can
+be built with either MSVC, or MinGW, or Cygwin. Supported versions are 205 and
+above (including 299 and 30x series).
+
+The MSVC build is quite straightforward. Simply invoke (in one line)
+nmake -fMake_mvc.mak MZSCHEME=<Path-to-MzScheme>
+    [MZSCHEME_VER=<MzScheme-version>] [DYNAMIC_MZSCHEME=<yes or no>]
+where <MzScheme-version> is the last seven characters from MzScheme dll name
+(libmzschXXXXXXX.dll).
+If DYNAMIC_MZSCHEME=yes, resulting executable will not depend on MzScheme
+DLL's, but will load them in runtime on demand.
+
+Building dynamic MzScheme support on MinGW and Cygwin is similar. Take into
+account that <Path-to-MzScheme> should contain slashes rather than backslashes
+(e.g. d:/Develop/MzScheme)
+
+"Static" MzScheme support (Vim executable will depend on MzScheme DLLs
+explicitly) on MinGW and Cygwin requires additional step.
+
+libmzschXXXXXXX.dll and libmzgcXXXXXXX.dll should be copied from
+%WINDOWS%\System32 to other location (either build directory, some temporary
+dir or even MzScheme home).
+
+Pass that path as MZSCHEME_DLLS parameter for Make. E.g.,
+make -fMake_cyg.mak MZSCHEME=d:/Develop/MzScheme MZSCHEME_VER=209_000
+    MZSCHEME_DLLS=c:/Temp DYNAMIC_MZSCHEME=no
+
+After successful build these dlls can be freely removed, leaving them in
+%WINDOWS%\System32 only.
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 5319994..da98b50 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -1,6 +1,8 @@
 #
 # Makefile for VIM on Win32, using Cygnus gcc
-# Last updated by Dan Sharp.  Last Change: 2005 Jan 19
+# Last updated by Dan Sharp.  Last Change: 2005 Jan 29
+#
+# Also read INSTALLpc.txt!
 #
 # This compiles Vim as a Windows application.  If you want Vim to run as a
 # Cygwin application use the Makefile (just like on Unix).
@@ -21,13 +23,7 @@
 # MZSCHEME	define to path to MzScheme dir to get MZSCHEME support (not defined)
 #   MZSCHEME_VER      define to version of MzScheme being used (209_000)
 #   DYNAMIC_MZSCHEME  no or yes: use yes to load the MzScheme DLLs dynamically (yes)
-#   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch).
-#                     Is used for DYNAMIC_MZSCHEME=no only.
-#   		      c:/windows/system32 isn't a good idea, copy them to some
-#   		      dir and point MZSCHEME_DLLS to this dir.
-#   		      By default $(MZSCHEME) will be used. You can remove
-#   		      these DLLs from $(MZSCHEME_DLLS) after you
-#   		      built Vim (they are used for dll "static" linking only)
+#   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.
 # GETTEXT	no or yes: set to yes for dynamic gettext support (yes)
 # ICONV		no or yes: set to yes for dynamic iconv support (yes)
 # MBYTE		no or yes: set to yes to include multibyte support (yes)
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5fbb2c2..57012a4 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -19,7 +19,10 @@
 #	  DYNAMIC_IME=[yes or no]  (to load the imm32.dll dynamically, default
 #	  is yes)
 #	Global IME support: GIME=yes (requires GUI=yes)
-#	MzScheme interface: MZSCHEME=[Path to MzScheme directory], MZSCHEME_VER=[version, 205_000, ...]
+#	MzScheme interface:
+#	  MZSCHEME=[Path to MzScheme directory]
+#	  DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically)
+#	  MZSCHEME_VER=[version, 205_000, ...]
 #	Perl interface:
 #	  PERL=[Path to Perl directory]
 #	  DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2b912d6..5319449 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -336,6 +336,8 @@
 # define ex_endfunction		ex_ni
 # define ex_let			ex_ni
 # define ex_unlet		ex_ni
+# define ex_lockvar		ex_ni
+# define ex_unlockvar		ex_ni
 # define ex_function		ex_ni
 # define ex_delfunction		ex_ni
 # define ex_return		ex_ni
diff --git a/src/globals.h b/src/globals.h
index 7580dd0..555c19e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1397,7 +1397,7 @@
 #endif
 #ifdef FEAT_NETBEANS_INTG
 EXTERN char_u e_guarded[]	INIT(=N_("E463: Region is guarded, cannot modify"));
-EXTERN char_u e_nbreadonly[]	INIT(=N_("E680: NetBeans does not allow changes in read-only files"));
+EXTERN char_u e_nbreadonly[]	INIT(=N_("E744: NetBeans does not allow changes in read-only files"));
 #endif
 #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL)
 EXTERN char_u e_intern2[]	INIT(=N_("E685: Internal error: %s"));
diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po
index c318e63..bfbc44f 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -6,199 +6,220 @@
 # FIRST AUTHOR  Francis S.Lin <piaip@csie.ntu.edu.tw>, 2000
 # FIRST RELEASE Thu Jun 14 14:24:17 CST 2001
 #
-# Last update: Thu Apr 24 13:09:07 CST 2003 (6.2a)
+# Last update: 2005/01/27 07:03 (6.3)
 #
 # To update, search pattern:		/fuzzy\|^msgstr ""\(\n"\)\@!
 #
 # DO NOT USE WORDS WITH BACKSLASH ('\') AS SECOND BYTE OF BIG5 CHARS
 # EG: '¥\', # ³\¥\»\
-# À\¬\¾\¯\½\¶\²\Æ\°\Â\¿\Á\Å\§\ª\«\
-# ¼\®\±\Ã\Ä\´\µ\·\¸\¹\º\¢\¤\¦\¨\©\­\á\ä\
+# [blacklist: À\¬\¾\¯\½\¶\²\Æ\°\Â\¿\Á\Å\§\ª\«\]
+# [blacklist: ®\±\Ã\Ä\´\µ\·\¹\º\¤\¦\­\á\ä\]
 # you can replace these characters with alternative words.
 # THIS WILL CAUSE INCOMPATIBLE ON gettext 0.10.36+
 #
+# Note (2005.01.27):
+#  A bug was found for UTF8 mode.
+#   > msgid "%ld fewer lines" "on %ld lines"
+#   If you don't put more (at least 2) spaces after %ld
+#   gvim/win32 will crash (no reason).
+#   So please change [¦æ"] to [¦æ "]
+#
+# Q. How to use UTF8 mode on Win32?
+# A. A simple configuration: 
+#   set encoding=utf-8; let $LANG='zh_TW.UTF-8'; 
+#   (set langmenu=none or ..)
+#   set termencoding=utf-8
+#   set fileencodings=ucs-bom,utf-8,japan,taiwan,prc
+#   set fileencoding=taiwan (or utf-8)
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Traditional Chinese)\n"
-"POT-Creation-Date: 2003-04-24 13:06+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-27 19:00+0800\n"
 "PO-Revision-Date: Mon Feb 19 22:49:21 CST 2001\n"
-"Last-Translator: Francis S.Lin <piaip@csie.ntu.edu.tw>\n"
-"Language-Team: Francis S.Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng "
+"Last-Translator: Hung-Te Lin <piaip@csie.ntu.edu.tw>\n"
+"Language-Team: Hung-Te Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng "
 "<b7506022@csie.ntu.edu.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:97
+#: buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: µLªk°t¸m¥ô¦ó½w½Ä°Ï¡AÂ÷¶}µ{¦¡..."
 
-#: buffer.c:100
+#: buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: µLªk°t¸m½w½Ä°Ï¡A¨Ï¥Î¥t¤@­Ó½w½Ä°Ï...."
 
-#: buffer.c:797
+#: buffer.c:808
+#, c-format
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ¨S¦³ÄÀ©ñ¥ô¦ó½w½Ä°Ï"
 
-#: buffer.c:799
+#: buffer.c:810
+#, c-format
 msgid "E516: No buffers were deleted"
 msgstr "E516: ¨S¦³§R°£¥ô¦ó½w½Ä°Ï"
 
-#: buffer.c:801
+#: buffer.c:812
+#, c-format
 msgid "E517: No buffers were wiped out"
 msgstr "E517: ¨S¦³²M°£¥ô¦ó½w½Ä°Ï"
 
-#: buffer.c:809
+#: buffer.c:820
 msgid "1 buffer unloaded"
 msgstr "¤wÄÀ©ñ¤@­Ó½w½Ä°Ï"
 
-#: buffer.c:811
+#: buffer.c:822
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "¤wÄÀ©ñ %d ­Ó½w½Ä°Ï"
 
-#: buffer.c:816
+#: buffer.c:827
 msgid "1 buffer deleted"
 msgstr "¤w§R°£¤@­Ó½w½Ä°Ï"
 
-#: buffer.c:818
+#: buffer.c:829
 #, c-format
 msgid "%d buffers deleted"
 msgstr "¤w§R°£ %d ­Ó½w½Ä°Ï"
 
-#: buffer.c:823
+#: buffer.c:834
 msgid "1 buffer wiped out"
 msgstr "¤w§R°£¤@­Ó½w½Ä°Ï"
 
-#: buffer.c:825
+#: buffer.c:836
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "¤w§R°£ %d ­Ó½w½Ä°Ï"
 
-#: buffer.c:886
+#: buffer.c:897
 msgid "E84: No modified buffer found"
 msgstr "E84: ¨S¦³­×§ï¹Lªº½w½Ä°Ï"
 
 #. back where we started, didn't find anything.
-#: buffer.c:925
+#: buffer.c:936
 msgid "E85: There is no listed buffer"
 msgstr "E85: ¨S¦³¦C¥Xªº½w½Ä°Ï"
 
-#: buffer.c:937
+#: buffer.c:948
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: µLªk¤Á´«¨ì²Ä %ld ­Ó½w½Ä°Ï"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: ½w½Ä°Ï %ld ¤£¦s¦b"
 
-#: buffer.c:940
+#: buffer.c:951
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: µLªk¤Á´«¨ì§ó«á­±ªº½w½Ä°Ï"
 
-#: buffer.c:942
+#: buffer.c:953
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: µLªk¤Á´«¨ì§ó«e­±ªº½w½Ä°Ï"
 
-#: buffer.c:966
+#: buffer.c:991
+#, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: ¤w§ó§ï¹L½w½Ä°Ï %ld ¦ý©|¥¼¦sÀÉ (¥i¥Î ! ±j¨î°õ¦æ)"
 
-#: buffer.c:982
+#: buffer.c:1008
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: µLªkÄÀ©ñ³Ì«á¤@­Ó½w½Ä°Ï"
 
-#: buffer.c:1494
+#: buffer.c:1544
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: ĵ§i: ÀɦW¹L¦h"
 
-#: buffer.c:1664
+#: buffer.c:1716
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: §ä¤£¨ì²Ä %ld ­Ó½w½Ä°Ï"
 
-#: buffer.c:1890
+#: buffer.c:1947
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: §ä¨ì¤@­Ó¥H¤Wªº %s"
 
-#: buffer.c:1892
+#: buffer.c:1949
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: §ä¤£¨ì %s"
 
-#: buffer.c:2297 ex_docmd.c:6479
+#: buffer.c:2344
 #, c-format
 msgid "line %ld"
 msgstr "¦æ %ld"
 
-#: buffer.c:2380
+#: buffer.c:2429
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: ¤w¦³½w½Ä°Ï¨Ï¥Î³o­Ó¦W¦r"
 
-#: buffer.c:2673
+#: buffer.c:2724
 msgid " [Modified]"
 msgstr " [¤w­×§ï]"
 
-#: buffer.c:2678
+#: buffer.c:2729
 msgid "[Not edited]"
 msgstr "[¥¼½s¿è]"
 
-#: buffer.c:2683
+#: buffer.c:2734
 msgid "[New file]"
 msgstr "[·sÀÉ®×]"
 
-#: buffer.c:2684
+#: buffer.c:2735
 msgid "[Read errors]"
 msgstr "[Ū¨ú¿ù»~]"
 
-#: buffer.c:2686 fileio.c:1914
+#: buffer.c:2737 fileio.c:2124
 msgid "[readonly]"
 msgstr "[°ßŪ]"
 
-#: buffer.c:2701
+#: buffer.c:2758
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "¦æ¼Æ 1 --%d%%--"
 
-#: buffer.c:2703
+#: buffer.c:2760
 #, c-format
 msgid "%ld lines --%d%%--"
 msgstr "¦æ¼Æ %ld --%d%%--"
 
-#: buffer.c:2710
+#: buffer.c:2767
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "¦æ %ld/%ld --%d%%-- Äæ "
 
-#: buffer.c:2811
+#: buffer.c:2875
 msgid "[No file]"
 msgstr "[¥¼©R¦W]"
 
 #. must be a help buffer
-#: buffer.c:2851
+#: buffer.c:2915
 msgid "help"
 msgstr "[»²§U»¡©ú]"
 
-#: buffer.c:3405 screen.c:4943
+#: buffer.c:3474 screen.c:5079
 msgid "[help]"
 msgstr "[»²§U»¡©ú]"
 
-#: buffer.c:3437 screen.c:4949
+#: buffer.c:3506 screen.c:5085
 msgid "[Preview]"
 msgstr "[¹wÄý]"
 
-#: buffer.c:3708
+#: buffer.c:3786
 msgid "All"
 msgstr "¥þ³¡"
 
-#: buffer.c:3708
+#: buffer.c:3786
 msgid "Bot"
 msgstr "©³ºÝ"
 
-#: buffer.c:3710
+#: buffer.c:3788
 msgid "Top"
 msgstr "³»ºÝ"
 
-#: buffer.c:4454
+#: buffer.c:4536
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -206,15 +227,15 @@
 "\n"
 "# ½w½Ä°Ï¦Cªí:\n"
 
-#: buffer.c:4487
+#: buffer.c:4569
 msgid "[Error List]"
 msgstr "[¿ù»~¦Cªí]"
 
-#: buffer.c:4500 memline.c:1501
+#: buffer.c:4582 memline.c:1521
 msgid "[No File]"
 msgstr "[¥¼©R¦W]"
 
-#: buffer.c:4803
+#: buffer.c:4895
 msgid ""
 "\n"
 "--- Signs ---"
@@ -222,149 +243,150 @@
 "\n"
 "--- ²Å¸¹ ---"
 
-#: buffer.c:4813
+#: buffer.c:4914
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s ªº²Å¸¹:"
 
-#: buffer.c:4819
+#: buffer.c:4920
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    ¦æ=%ld  id=%d  ¦WºÙ=%s"
 
-#: diff.c:133
+#: diff.c:139
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: µLªk¤ñ¸û(diff) %ld­Ó¥H¤Wªº½w½Ä°Ï"
 
-#: diff.c:651
+#: diff.c:713
 msgid "E97: Cannot create diffs"
 msgstr "E97: ¤£¯à«Ø¥ß "
 
-#: diff.c:750
+#: diff.c:818
 msgid "Patch file"
 msgstr "Patch ÀÉ®×"
 
-#: diff.c:1001
+#: diff.c:1069
 msgid "E98: Cannot read diff output"
 msgstr "E98: µLªkŪ¨ú diff ªº¿é¥X"
 
-#: diff.c:1742
+#: diff.c:1819
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ¥Ø«eªº½w½Ä°Ï¤£¬O¦b diff ¼Ò¦¡"
 
-#: diff.c:1754
+#: diff.c:1831
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: ¨S¦³½w½Ä°Ï¦b diff ¼Ò¦¡"
 
-#: diff.c:1762
+#: diff.c:1839
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: ¦³¨â­Ó¥H¤Wªº½w½Ä°Ï¦b diff ¼Ò¦¡¡AµLªk¨M©w­n¥Î­þ¤@­Ó"
 
-#: diff.c:1785
+#: diff.c:1862
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: §ä¤£¨ì½w½Ä°Ï: \"%s\""
 
-#: diff.c:1791
+#: diff.c:1868
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: ½w½Ä°Ï \"%s\" ¤£¬O¦b diff ¼Ò¦¡"
 
-#: digraph.c:2172
+#: digraph.c:2199
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ½Æ¦X¦r¤¸(digraph)¤¤¤£¯à¨Ï¥Î Escape"
 
-#: digraph.c:2344
+#: digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: §ä¤£¨ì keymap ÀÉ"
 
-#: digraph.c:2371
+#: digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: ¨Ï¥Î :loadkeymap "
 
 #: edit.c:40
-msgid " Keyword completion (^N/^P)"
-msgstr " ÃöÁä¦r¦Û°Ê§¹¦¨ (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " ÃöÁä¦r¦Û°Ê§¹¦¨ (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
 #: edit.c:41
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X ¼Ò¦¡ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
+msgstr " ^X ¼Ò¦¡ (^E^Y^L^]^F^I^K^D^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 #: edit.c:44
-msgid " Keyword Local completion (^N/^P)"
-msgstr " °Ï°ìÃöÁä¦r¦Û°Ê§¹¦¨ (^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " °Ï°ìÃöÁä¦r¦Û°Ê§¹¦¨ (^N^P)"
 
 #: edit.c:45
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " ¾ã¦æ¦Û°Ê§¹¦¨ (^L/^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " ¾ã¦æ¦Û°Ê§¹¦¨ (^L^N^P)"
 
 #: edit.c:46
-msgid " File name completion (^F/^N/^P)"
-msgstr " ÀɦW¦Û°Ê§¹¦¨ (^F/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " ÀɦW¦Û°Ê§¹¦¨ (^F^N^P)"
 
 #: edit.c:47
-msgid " Tag completion (^]/^N/^P)"
-msgstr " ¼ÐÅҦ۰ʧ¹¦¨ (^]/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " ¼ÐÅҦ۰ʧ¹¦¨ (^]^N^P)"
 
 #: edit.c:48
-msgid " Path pattern completion (^N/^P)"
-msgstr " ¸ô®|¦Û°Ê§¹¦¨ (^N/^P)"
+msgid " Path pattern completion (^N^P)"
+msgstr " ¸ô®|¦Û°Ê§¹¦¨ (^N^P)"
 
 #: edit.c:49
-msgid " Definition completion (^D/^N/^P)"
-msgstr " ©w¸q¦Û°Ê§¹¦¨ (^D/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " ©w¸q¦Û°Ê§¹¦¨ (^D^N^P)"
 
 #: edit.c:51
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " ¦r¨å¦Û°Ê§¹¦¨ (^K/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " ¦r¨å¦Û°Ê§¹¦¨ (^K^N^P)"
 
 #: edit.c:52
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus ¦Û°Ê§¹¦¨ (^T/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus ¦Û°Ê§¹¦¨ (^T^N^P)"
 
 #: edit.c:53
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " ©R¥O¦C¦Û°Ê§¹¦¨ (^V/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " ©R¥O¦C¦Û°Ê§¹¦¨ (^V^N^P)"
 
 #: edit.c:56
 msgid "Hit end of paragraph"
 msgstr "¤w¨ì¬q¸¨µ²§À"
 
-#: edit.c:941
+#: edit.c:962
 msgid "'thesaurus' option is empty"
 msgstr "¿ï¶µ 'thesaurus' ¥¼³]©w"
 
-#: edit.c:1145
+#: edit.c:1166
 msgid "'dictionary' option is empty"
 msgstr "¿ï¶µ 'dictionary' ¥¼³]©w"
 
-#: edit.c:2130
+#: edit.c:2162
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "±½ºË¦r¨å: %s"
 
-#: edit.c:2336
+#: edit.c:2368
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (´¡¤J) Scroll (^E/^Y)"
 
-#: edit.c:2338
+#: edit.c:2370
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (¨ú¥N) Scroll (^E/^Y)"
 
-#: edit.c:2652
+#: edit.c:2684
 #, c-format
 msgid "Scanning: %s"
 msgstr "±½ºË¤¤: %s"
 
-#: edit.c:2687
+#: edit.c:2719
+#, c-format
 msgid "Scanning tags."
 msgstr "±½ºË¼ÐÅÒ."
 
-#: edit.c:3349
+#: edit.c:3381
 msgid " Adding"
 msgstr " ¼W¥["
 
@@ -372,102 +394,102 @@
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3398
+#: edit.c:3430
 msgid "-- Searching..."
 msgstr "-- ·j´M¤¤..."
 
-#: edit.c:3454
+#: edit.c:3486
 msgid "Back at original"
 msgstr "¦^¨ì°_ÂI"
 
-#: edit.c:3459
+#: edit.c:3491
 msgid "Word from other line"
 msgstr "±q§O¦æ¶}©lªº¦r (?)"
 
-#: edit.c:3464
+#: edit.c:3496
 msgid "The only match"
 msgstr "¥u¦³¦¹¶µ²Å¦X"
 
-#: edit.c:3523
+#: edit.c:3555
 #, c-format
 msgid "match %d of %d"
 msgstr "§ä¨ì %d / %d"
 
-#: edit.c:3526
+#: edit.c:3558
 #, c-format
 msgid "match %d"
 msgstr "²Å¦X %d"
 
 #. Skip further arguments but do continue to
 #. * search for a trailing command.
-#: eval.c:889
+#: eval.c:1024
 #, c-format
 msgid "E106: Unknown variable: \"%s\""
 msgstr "E106: ¥¼©w¸qªºÅܼÆ: \"%s\""
 
-#: eval.c:1185
+#: eval.c:1320
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: ¯Ê¤Ö¹ïÀ³ªº¬A¸¹: %s"
 
-#: eval.c:1290 eval.c:1304
+#: eval.c:1435 eval.c:1449
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: µL¦¹ÅܼÆ: \"%s\""
 
-#: eval.c:1560
+#: eval.c:1705
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' «á¯Ê¤Ö ':'"
 
-#: eval.c:2176
+#: eval.c:2327
 msgid "E110: Missing ')'"
 msgstr "E110: ¯Ê¤Ö¹ïÀ³ªº \")\""
 
-#: eval.c:2233
+#: eval.c:2389
 msgid "E111: Missing ']'"
 msgstr "E111: ¯Ê¤Ö¹ïÀ³ªº \"]\""
 
-#: eval.c:2309
+#: eval.c:2466
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ¯Ê¤Ö¿ï¶µ¦WºÙ: %s"
 
-#: eval.c:2327
+#: eval.c:2484
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ¤£¥¿½Tªº¿ï¶µ: %s"
 
-#: eval.c:2391
+#: eval.c:2555
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ¯Ê¤Ö¤Þ¸¹: %s"
 
-#: eval.c:2523
+#: eval.c:2698
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ¯Ê¤Ö¤Þ¸¹: %s"
 
-#: eval.c:2843
+#: eval.c:3054
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: ¨ç¦¡ %s ªº¤Þ¼Æ¤£¥¿½T"
 
-#: eval.c:2844
+#: eval.c:3083
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: ¥¼©w¸qªº¨ç¦¡: %s"
 
-#: eval.c:2845
+#: eval.c:3084
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: ¨ç¦¡ %s ªº¤Þ¼Æ¹L¦h"
 
-#: eval.c:2846
+#: eval.c:3085
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: ¨ç¦¡ %s ªº¤Þ¼Æ¤Ó¤Ö"
 
-#: eval.c:2847
+#: eval.c:3086
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> ¤£¯à¦b script ¥»¤å¥~¨Ï¥Î: %s"
@@ -477,16 +499,16 @@
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3465 gui.c:4238 gui_gtk.c:1991
+#: eval.c:3687 gui.c:4385 gui_gtk.c:2059
 msgid "&Ok"
 msgstr "½T©w(&O)"
 
-#: eval.c:4000
+#: eval.c:4226
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld ¦æ: "
 
-#: eval.c:5149
+#: eval.c:5477
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -494,125 +516,130 @@
 "½T©w(&O)\n"
 "¨ú®ø(&C)"
 
-#: eval.c:5182
+#: eval.c:5517
 msgid "called inputrestore() more often than inputsave()"
 msgstr "©I¥s inputrestore() ªº¦¸¼Æ¤ñ inputsave() ÁÙ¦h"
 
-#: eval.c:6036
+#: eval.c:5977
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ¤Ó¦h¼hªº²Å¸¹Ãìµ²(symlink) (´`Àô?)"
+
+#: eval.c:6626
 msgid "E240: No connection to Vim server"
 msgstr "E240: ¨S¦³»P Vim Server «Ø¥ß³s½u"
 
-#: eval.c:6133
+#: eval.c:6724
 msgid "E277: Unable to read a server reply"
 msgstr "E277: µLªkŪ¨ú¦øªA¾¹ªº¦^À³"
 
-#: eval.c:6161
+#: eval.c:6752
 msgid "E258: Unable to send to client"
 msgstr "E258: µLªk¶Ç°e¨ì client"
 
-#: eval.c:6209
+#: eval.c:6800
 #, c-format
 msgid "E241: Unable to send to %s"
 msgstr "E241: µLªk¶Ç°e¨ì %s"
 
-#: eval.c:6309
+#: eval.c:6900
 msgid "(Invalid)"
 msgstr "(¤£¥¿½T)"
 
-#: eval.c:7402
+#: eval.c:8078
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ÅÜ¼Æ %s ©|¥¼©w¸q"
 
-#: eval.c:7834
+#: eval.c:8510
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: ¤£¦XªkªºÅܼƦWºÙ: %s"
 
-#: eval.c:8121
+#: eval.c:8802
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: ¨ç¦¡ %s ¤w¸g¦s¦b, ½Ð¨Ï¥Î ! ±j¨î¨ú¥N"
 
-#: eval.c:8188
+#: eval.c:8875
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: ¨ç¦¡ %s ©|¥¼©w¸q"
 
-#: eval.c:8201
+#: eval.c:8888
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: ¯Ê¤Ö \"(\": %s"
 
-#: eval.c:8234
+#: eval.c:8921
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: °Ñ¼Æ¤£¥¿½T: %s"
 
-#: eval.c:8313
+#: eval.c:9000
 msgid "E126: Missing :endfunction"
 msgstr "E126: ¯Ê¤Ö :endfunction"
 
-#: eval.c:8396
+#: eval.c:9107
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: ¨ç¦¡ %s ¥¿¦b¨Ï¥Î¤¤¡AµLªk­«·s©w¸q"
 
-#: eval.c:8464
+#: eval.c:9177
 msgid "E129: Function name required"
 msgstr "E129: »Ý­n¨ç¦¡¦WºÙ"
 
-#: eval.c:8515
+#: eval.c:9228
 #, c-format
 msgid "E128: Function name must start with a capital: %s"
 msgstr "E128: ¨ç¦¡¦WºÙ²Ä¤@­Ó¦r¥À¥²¶·¤j¼g: %s"
 
-#: eval.c:8707
+#: eval.c:9420
 #, c-format
 msgid "E130: Undefined function: %s"
 msgstr "E130: ¨ç¦¡ %s ©|¥¼©w¸q"
 
-#: eval.c:8712
+#: eval.c:9425
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: ¨ç¦¡ %s ¥¿¦b¨Ï¥Î¤¤¡AµLªk§R°£"
 
-#: eval.c:8760
+#: eval.c:9473
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: ¨ç¦¡»¼°j©I¥s¼h¼Æ¶W¹L 'maxfuncdepth'"
 
 #. always scroll up, don't overwrite
-#: eval.c:8813
+#: eval.c:9526
 #, c-format
 msgid "calling %s"
 msgstr "©I¥s %s"
 
-#: eval.c:8867
+#: eval.c:9588
 #, c-format
 msgid "%s aborted"
-msgstr "%s ³Q±j¨î¤¤Â_°õ¦æ"
+msgstr "%s ³Q±j¨î¤¤Â_°õ¦æ "
 
-#: eval.c:8869
+#: eval.c:9590
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s ¶Ç¦^­È #%ld "
 
-#: eval.c:8872
+#: eval.c:9597
 #, c-format
 msgid "%s returning \"%s\""
 msgstr "%s ¶Ç¦^­È \"%s\""
 
 #. always scroll up, don't overwrite
-#: eval.c:8888 ex_cmds2.c:2231
+#: eval.c:9613 ex_cmds2.c:2370
 #, c-format
 msgid "continuing in %s"
 msgstr "Ä~Äò: %s"
 
-#: eval.c:8935
+#: eval.c:9639
 msgid "E133: :return not inside a function"
 msgstr "E133: :return ¥²¶·¦b¨ç¦¡¸Ì¨Ï¥Î"
 
-#: eval.c:9266
+#: eval.c:9970
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -625,80 +652,91 @@
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  ¤Q¤»¶i¦ì %02x,  ¤K¶i¦ì %03o"
 
-#: ex_cmds.c:433
+#: ex_cmds.c:118
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, ¤Q¤»¶i¦ì %04x, ¤K¶i¦ì %o"
+
+#: ex_cmds.c:119
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, ¤Q¤»¶i¦ì %08x,  ¤K¶i¦ì %o"
+
+#: ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: µLªk§â¦æ²¾¨ì¥¦¦Û¤w¤º"
 
-#: ex_cmds.c:502
+#: ex_cmds.c:499
 msgid "1 line moved"
-msgstr "¤w·h²¾ 1 ¦æ"
+msgstr "¤w·h²¾ 1 ¦æ "
 
-#: ex_cmds.c:504
+#: ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
-msgstr "¤w·h²¾ %ld ¦æ"
+msgstr "¤w·h²¾ %ld ¦æ "
 
-#: ex_cmds.c:909
+#: ex_cmds.c:924
 #, c-format
 msgid "%ld lines filtered"
-msgstr "¤w³B²z %ld ¦æ"
+msgstr "¤w³B²z %ld ¦æ "
 
-#: ex_cmds.c:937
+#: ex_cmds.c:952
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autocommand ¤£¥i¥H§ó§ï½w½Ä°Ïªº¤º®e"
 
-#: ex_cmds.c:1022
+#: ex_cmds.c:1037
 msgid "[No write since last change]\n"
 msgstr "[§ó·s«á©|¥¼Àx¦s]\n"
 
-#: ex_cmds.c:1268
+#: ex_cmds.c:1283
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s ¦b¦æ¤¤: "
 
-#: ex_cmds.c:1273
+#: ex_cmds.c:1288
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: ¹L¦h¿ù»~, ©¿²¤Àɮרä¾l³¡¤À"
 
-#: ex_cmds.c:1302
+#: ex_cmds.c:1323
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Ū¨ú viminfo ÀÉ®× \"%s\"%s%s%s"
 
-#: ex_cmds.c:1303
+#: ex_cmds.c:1324
 msgid " info"
 msgstr " °T®§"
 
-#: ex_cmds.c:1304
+#: ex_cmds.c:1325
 msgid " marks"
 msgstr " ¼Ð°O"
 
-#: ex_cmds.c:1305
+#: ex_cmds.c:1326
 msgid " FAILED"
 msgstr " ¥¢±Ñ"
 
-#: ex_cmds.c:1396
+#: ex_cmds.c:1418
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Viminfo ÀÉ®×µLªk¼g¤J: %s"
 
-#: ex_cmds.c:1521
+#: ex_cmds.c:1543
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: µLªk¼g¤J viminfo ÀÉ®× %s !"
 
-#: ex_cmds.c:1529
+#: ex_cmds.c:1551
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "¼g¤J viminfo ÀÉ®× \"%s\" ¤¤"
 
 #. Write the info:
-#: ex_cmds.c:1627
+#: ex_cmds.c:1649
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ¥» viminfo Àɮ׬O¥Ñ Vim %s ©Ò²£¥Í.\n"
 
-#: ex_cmds.c:1629
+#: ex_cmds.c:1651
+#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -706,47 +744,48 @@
 "# ¦pªG·Q­n¦Û¦æ­×§ï½Ð¯S§O¤p¤ß¡I\n"
 "\n"
 
-#: ex_cmds.c:1631
+#: ex_cmds.c:1653
+#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# 'encoding' ¦b¦¹Àɫإ߮ɪº­È\n"
 
-#: ex_cmds.c:1730
+#: ex_cmds.c:1752
 msgid "Illegal starting char"
 msgstr "µL®Äªº°_©l¦r¤¸"
 
-#: ex_cmds.c:2075 ex_cmds.c:2340 ex_cmds2.c:744
+#: ex_cmds.c:2097 ex_cmds2.c:761
 msgid "Save As"
 msgstr "¥t¦s·sÀÉ"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2118
+#: ex_cmds.c:2140
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: ±z¦b¥t¤@­Ó½w½Ä°Ï¤]¸ü¤J¤F³o­ÓÀÉ®×"
 
-#: ex_cmds.c:2152
+#: ex_cmds.c:2174
 msgid "Write partial file?"
 msgstr "­n¼g¤J³¡¤ÀÀÉ®×¶Ü¡H"
 
-#: ex_cmds.c:2159
+#: ex_cmds.c:2181
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: ½Ð¨Ï¥Î ! ¥H¼g¤J³¡¤À½w½Ä°Ï"
 
-#: ex_cmds.c:2274
+#: ex_cmds.c:2296
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "­nÂмg¤w¦s¦bªºÀÉ®× \"%.*s\"¡H"
 
-#: ex_cmds.c:2345
+#: ex_cmds.c:2367
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: ½w½Ä°Ï %ld ¨S¦³ÀɮצWºÙ"
 
-#: ex_cmds.c:2383
+#: ex_cmds.c:2406
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ÀÉ®×¥¼¼g¤J¡A¦]¬° 'write' ¿ï¶µ³QÃö³¬"
 
-#: ex_cmds.c:2403
+#: ex_cmds.c:2426
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -755,68 +794,69 @@
 "\"%.*s\" ¤w³]©w 'readonly' ¿ï¶µ.\n"
 "½T©w­nÂмg¶Ü¡H"
 
-#: ex_cmds.c:2568
+#: ex_cmds.c:2599
 msgid "Edit File"
 msgstr "½s¿èÀÉ®×"
 
-#: ex_cmds.c:3137
+#: ex_cmds.c:3206
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Autocommands ·N¥~¦a§R°£·s½w½Ä°Ï %s"
 
-#: ex_cmds.c:3269
+#: ex_cmds.c:3340
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z ¤£±µ¨ü«D¼Æ¦rªº°Ñ¼Æ"
 
-#: ex_cmds.c:3354
+#: ex_cmds.c:3425
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim ¤¤¸T¤î¨Ï¥Î shell ©R¥O"
 
-#: ex_cmds.c:3461
+#: ex_cmds.c:3532
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Regular expression µLªk¥Î¦r¥À¤À¹j (?)"
 
-#: ex_cmds.c:3807
+#: ex_cmds.c:3878
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "¨ú¥N¬° %s (y/n/a/q/^E/^Y)?"
 
-#: ex_cmds.c:4172
+#: ex_cmds.c:4271
 msgid "(Interrupted) "
 msgstr "(¤w¤¤Â_) "
 
-#: ex_cmds.c:4176
+#: ex_cmds.c:4275
 msgid "1 substitution"
-msgstr "¨ú¥N¤@²Õ"
+msgstr "¨ú¥N¤@²Õ "
 
-#: ex_cmds.c:4178
+#: ex_cmds.c:4277
 #, c-format
 msgid "%ld substitutions"
-msgstr "¨ú¥N %ld ²Õ"
+msgstr "¨ú¥N %ld ²Õ "
 
-#: ex_cmds.c:4181
+#: ex_cmds.c:4280
 msgid " on 1 line"
-msgstr " ¤@¦æ¤¤"
+msgstr "¡A½d³ò¡G¤@¦æ "
 
-#: ex_cmds.c:4183
+#: ex_cmds.c:4282
 #, c-format
 msgid " on %ld lines"
-msgstr " %ld ¦æ¤¤"
+msgstr "¡A½d³ò¡G %ld ¦æ "
 
-#: ex_cmds.c:4234
+#: ex_cmds.c:4333
 msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global µLªk»¼°j°õ¦æ"
+msgstr "E147: :global µLªk»¼°j°õ¦æ "
 
-#: ex_cmds.c:4269
+#: ex_cmds.c:4368
 msgid "E148: Regular expression missing from global"
 msgstr "E148: ¨S¦³¨Ï¥Î¹L Regular expression (?)"
 
-#: ex_cmds.c:4318
+#: ex_cmds.c:4417
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "¨C¤@¦æ³£§ä¤£¨ì: %s"
 
-#: ex_cmds.c:4399
+#: ex_cmds.c:4498
+#, c-format
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -826,342 +866,408 @@
 "# «e¤@²Õ´À¥N¦r¦ê:\n"
 "$"
 
-#: ex_cmds.c:4503
+#: ex_cmds.c:4599
+msgid "E478: Don't panic!"
+msgstr "E478: ¤£­nÅå·W!"
+
+#: ex_cmds.c:4651
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E149: ©êºp, ¨S¦³Ãö©ó %s-%s ªº»¡©ú"
+
+#: ex_cmds.c:4654
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: ©êºp, ¨S¦³ %s ªº»¡©ú"
 
-#: ex_cmds.c:4537
+#: ex_cmds.c:4688
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "©êºp, §ä¤£¨ì»¡©úÀÉ \"%s\""
 
-#: ex_cmds.c:5012
+#: ex_cmds.c:5191
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s ¤£¬O¥Ø¿ý"
 
-#: ex_cmds.c:5040
+#: ex_cmds.c:5330
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: µLªk¥H¼g¤J¼Ò¦¡¶}±Ò \"%s\""
 
-#: ex_cmds.c:5075
+#: ex_cmds.c:5366
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: µLªkŪ¨úÀÉ®×: %s"
 
-#: ex_cmds.c:5154
+#: ex_cmds.c:5388
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ¦P¤@»y¨¥ (%s) ¤¤¦³²V¦X¤£¦P¦r¤¸½s½Xªº»¡©úÀÉ"
+
+#: ex_cmds.c:5466
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s"
 msgstr "E154: ¼ÐÅÒ(tag) \"%s\" ¦bÀÉ®× %s ¸Ì­«½Æ¥X²{¦h¦¸"
 
-#: ex_cmds.c:5261
+#: ex_cmds.c:5578
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ¥¼©w¸qªº sign command: %s"
 
-#: ex_cmds.c:5281
+#: ex_cmds.c:5598
 msgid "E156: Missing sign name"
 msgstr "E156: ¯Ê¤Ö sign ¦WºÙ"
 
-#: ex_cmds.c:5327
+#: ex_cmds.c:5644
 msgid "E612: Too many signs defined"
 msgstr "E612: ¤w©w¸q¤Ó¦h signs"
 
-#: ex_cmds.c:5394
+#: ex_cmds.c:5712
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ¤£¥¿½Tªº sign ¤å¦r: %s"
 
-#: ex_cmds.c:5425 ex_cmds.c:5611
+#: ex_cmds.c:5743 ex_cmds.c:5934
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ¤£¥¿½Tªº sign: %s"
 
-#: ex_cmds.c:5471
+#: ex_cmds.c:5792
 msgid "E159: Missing sign number"
 msgstr "E159: ¯Ê¤Ö sign number"
 
-#: ex_cmds.c:5551
+#: ex_cmds.c:5874
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ½w½Ä°Ï¦WºÙ¿ù»~: %s"
 
-#: ex_cmds.c:5590
+#: ex_cmds.c:5913
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: Sign ID ¿ù»~: %ld"
 
-#: ex_cmds.c:5761
+#: ex_cmds.c:5983
+msgid " (NOT FOUND)"
+msgstr " (§ä¤£¨ì) "
+
+#: ex_cmds.c:5985
+msgid " (not supported)"
+msgstr " (¤£¤ä´©) "
+
+#: ex_cmds.c:6084
 msgid "[Deleted]"
 msgstr "[¤w§R°£]"
 
-#: ex_cmds2.c:82
+#: ex_cmds2.c:92
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "¶i¤J°£¿ù¼Ò¦¡. ¿é¤J \"cont\" ¥H¦^¨ì¥¿±`¼Ò¦¡."
 
-#: ex_cmds2.c:86 ex_docmd.c:850
+#: ex_cmds2.c:96 ex_docmd.c:968
 #, c-format
 msgid "line %ld: %s"
 msgstr "¦æ %ld: %s"
 
-#: ex_cmds2.c:88
+#: ex_cmds2.c:98
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
-#: ex_cmds2.c:271
+#: ex_cmds2.c:290
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" ¤¤Â_ÂI: ²Ä %ld ¦æ"
+msgstr "\"%s%s\" ¤¤Â_ÂI: ²Ä %ld ¦æ "
 
-#: ex_cmds2.c:521
+#: ex_cmds2.c:540
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: §ä¤£¨ì¤¤Â_ÂI: %s"
 
-#: ex_cmds2.c:547
+#: ex_cmds2.c:566
 msgid "No breakpoints defined"
 msgstr "¨S¦³©w¸q¤¤Â_ÂI"
 
-#: ex_cmds2.c:552
+#: ex_cmds2.c:571
 #, c-format
 msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  ²Ä %ld ¦æ"
+msgstr "%3d  %s %s  ²Ä %ld ¦æ "
 
-#: ex_cmds2.c:767
+#: ex_cmds2.c:786
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "±NÅܰʦsÀx¦Ü \"%.*s\"?"
 
-#: ex_cmds2.c:769 ex_docmd.c:8820
+#: ex_cmds2.c:788 ex_docmd.c:9398
 msgid "Untitled"
 msgstr "¥¼©R¦W"
 
-#: ex_cmds2.c:905
+#: ex_cmds2.c:915
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: ¤w§ó§ï¹L½w½Ä°Ï \"%s\" ¦ý©|¥¼¦sÀÉ (¥i¥Î ! ±j¨î°õ¦æ)"
 
-#: ex_cmds2.c:974
+#: ex_cmds2.c:984
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "ª`·N: ¤w¤Á´«¨ì¨ä¥¦½w½Ä°Ï (½ÐÀˬd Autocommands ¦³µL¿ù»~)"
 
-#: ex_cmds2.c:1377
+#: ex_cmds2.c:1387
 msgid "E163: There is only one file to edit"
 msgstr "E163: ¥u¦³¤@­ÓÀÉ®×¥i½s¿è"
 
-#: ex_cmds2.c:1379
+#: ex_cmds2.c:1389
 msgid "E164: Cannot go before first file"
 msgstr "E164: ¤w¸g¦b²Ä¤@­ÓÀɮפF"
 
-#: ex_cmds2.c:1381
+#: ex_cmds2.c:1391
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: ¤w¸g¦b³Ì«á¤@­ÓÀɮפF"
 
-#: ex_cmds2.c:1828
+#: ex_cmds2.c:1804
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ½s;¹¤£¤ä´©: %s"
+
+#: ex_cmds2.c:1901
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "·j´M¤¤: \"%s\" -- \"%s\""
 
-#: ex_cmds2.c:1850
+#: ex_cmds2.c:1923
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "·j´M¤¤: \"%s\""
 
-#: ex_cmds2.c:1871
+#: ex_cmds2.c:1945
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "¦b 'runtimepath' ¸Ì§ä¤£¨ì \"%s\""
 
-#: ex_cmds2.c:1905
+#: ex_cmds2.c:1979
 msgid "Source Vim script"
 msgstr "°õ¦æ Vim script"
 
-#: ex_cmds2.c:2056
+#: ex_cmds2.c:2169
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "µLªk°õ¦æ¥Ø¿ý¡G \"%s\""
 
-#: ex_cmds2.c:2086
+#: ex_cmds2.c:2207
 #, c-format
 msgid "could not source \"%s\""
 msgstr "µLªk°õ¦æ \"%s\""
 
-#: ex_cmds2.c:2088
+#: ex_cmds2.c:2209
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "²Ä %ld ¦æ: µLªk°õ¦æ \"%s\""
 
-#: ex_cmds2.c:2102
+#: ex_cmds2.c:2223
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "°õ¦æ \"%s\" ¤¤"
 
-#: ex_cmds2.c:2104
+#: ex_cmds2.c:2225
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "²Ä %ld ¦æ: µ²§ô°õ¦æ %s"
 
-#: ex_cmds2.c:2229
+#: ex_cmds2.c:2368
 #, c-format
 msgid "finished sourcing %s"
 msgstr "µ²§ô°õ¦æ %s"
 
-#: ex_cmds2.c:2528
+#: ex_cmds2.c:2712
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: ª`·N: ¿ù»~ªº¦æ¤À¹j¦r¤¸¡A¥i¯à¬O¤Ö¤F ^M"
 
-#: ex_cmds2.c:2577
+#: ex_cmds2.c:2761
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: ¦b°õ¦æ script ÀÉ®×¥~¤£¥i¨Ï¥Î :scriptencoding"
 
-#: ex_cmds2.c:2610
+#: ex_cmds2.c:2794
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: ¦b°õ¦æ script ÀÉ®×¥~¤£¥i¨Ï¥Î :finish"
 
-#: ex_cmds2.c:3004
+#: ex_cmds2.c:3243
 #, c-format
 msgid "Page %d"
 msgstr "²Ä %d ­¶"
 
-#: ex_cmds2.c:3116
+#: ex_cmds2.c:3399
 msgid "No text to be printed"
 msgstr "¨S¦³­n¦C¦Lªº¤å¦r"
 
-#: ex_cmds2.c:3194
+#: ex_cmds2.c:3477
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "¦C¦L¤¤: ²Ä %d ­¶ (%d%%)"
 
-#: ex_cmds2.c:3203
+#: ex_cmds2.c:3489
 #, c-format
 msgid " Copy %d of %d"
 msgstr "½Æ»s %d / %d"
 
-#: ex_cmds2.c:3255
+#: ex_cmds2.c:3547
 #, c-format
 msgid "Printed: %s"
 msgstr "¤w¦C¦L: %s"
 
-#: ex_cmds2.c:3262
+#: ex_cmds2.c:3554
+#, c-format
 msgid "Printing aborted"
 msgstr "¤w¨ú®ø¦C¦L"
 
-#: ex_cmds2.c:3645
+#: ex_cmds2.c:3919
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: µLªk¼g¤J PostScript ¿é¥XÀÉ"
 
-#: ex_cmds2.c:4320
+#: ex_cmds2.c:4194
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: µLªk¶}±ÒÀÉ®× \"%s\""
+
+#: ex_cmds2.c:4204 ex_cmds2.c:4829
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: µLªkŪ¨ú PostScript ¸ê·½ÀÉ \"%s\""
+
+#: ex_cmds2.c:4212
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: ÀÉ®× \"%s\" ¤£¬O PostScript ¸ê·½ÀÉ "
+
+#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: ¤£¤ä´© PostScript ¸ê·½ÀÉ \"%s\""
+
+#: ex_cmds2.c:4314
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" ¸ê·½Àɪ©¥»¿ù»~"
+
+#: ex_cmds2.c:4781
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: µLªk¶}±Ò PostScript ¿é¥XÀÉ"
 
-#: ex_cmds2.c:4362
+#: ex_cmds2.c:4814
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: µLªk¶}±ÒÀÉ®× \"%s\""
 
-#: ex_cmds2.c:4373
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: µLªkŪ¨ú PostScript resource ÀÉ \"%s\""
+#: ex_cmds2.c:4933
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: µLªkŪ¨ú PostScript ¸ê·½ÀÉ \"prolog.ps\""
 
-#: ex_cmds2.c:4576
+#: ex_cmds2.c:4964
+#, c-format
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: µLªkŪ¨ú PostScript ¸ê·½ÀÉ \"%s.ps\""
+
+#: ex_cmds2.c:4982
+#, c-format
+msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
+msgstr "E620:µLªkÂà´«¦Ü \"%s\" ¦r¤¸½s½X"
+
+#: ex_cmds2.c:5107
 msgid "Sending to printer..."
 msgstr "¶Ç°e¸ê®Æ¨ì¦Lªí¾÷..."
 
-#: ex_cmds2.c:4580
+#: ex_cmds2.c:5111
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: µLªk¦C¦L PostScript ÀÉ®×"
 
-#: ex_cmds2.c:4582
+#: ex_cmds2.c:5113
 msgid "Print job sent."
 msgstr "¤w°e¥X¦C¦L¤u§@¡C"
 
-#: ex_cmds2.c:4978
+#: ex_cmds2.c:5623
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "¥Ø«eªº %s»y¨¥: \"%s\""
 
-#: ex_cmds2.c:4989
+#: ex_cmds2.c:5634
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ¤£¯à³]©w»y¨¥¦¨ \"%s\""
 
-#: ex_docmd.c:486
+#: ex_docmd.c:525
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "¶i¤J Ex ¼Ò¦¡. ¿é¤J \"visua\" ¥H¦^¨ì¥¿±`¼Ò¦¡."
 
 #. must be at EOF
-#: ex_docmd.c:522
+#: ex_docmd.c:561
 msgid "E501: At end-of-file"
 msgstr "E501: ¤w¨ìÀÉ®×µ²§À"
 
-#: ex_docmd.c:624
+#: ex_docmd.c:670
 msgid "E169: Command too recursive"
 msgstr "E169: ©R¥O»¼°j¼h¼Æ¹L¦h"
 
-#: ex_docmd.c:1090
+#: ex_docmd.c:1232
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: ¥¼ÄdºIªº¨Ò¥~¡G %s"
 
-#: ex_docmd.c:1176
+#: ex_docmd.c:1320
 msgid "End of sourced file"
 msgstr "©R¥OÀɵ²§ô"
 
-#: ex_docmd.c:1177
+#: ex_docmd.c:1321
 msgid "End of function"
 msgstr "¨ç¦¡µ²§À"
 
-#: ex_docmd.c:1628
+#: ex_docmd.c:1910
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ¨Ï¥ÎªÌ©w¸qªº©R¥O·|²V²c"
 
-#: ex_docmd.c:1642
+#: ex_docmd.c:1924
 msgid "E492: Not an editor command"
 msgstr "E492: ¤£¬O½s¿è¾¹ªº©R¥O"
 
-#: ex_docmd.c:1725
-msgid "E478: Don't panic!"
-msgstr "E478: ¤£­nÅå·W!"
-
-#: ex_docmd.c:1744
+#: ex_docmd.c:2031
 msgid "E493: Backwards range given"
 msgstr "E493: «ü©w¤F¦V«e°Ñ¦Òªº½d³ò"
 
-#: ex_docmd.c:1753
+#: ex_docmd.c:2040
 msgid "Backwards range given, OK to swap"
 msgstr "«ü©w¤F¦V«e°Ñ¦Òªº½d³ò¡AOK to swap"
 
-#: ex_docmd.c:1864
+#: ex_docmd.c:2163
 msgid "E494: Use w or w>>"
 msgstr "E494: ½Ð¨Ï¥Î w ©Î w>>"
 
-#: ex_docmd.c:3446
+#: ex_docmd.c:3789
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ©êºp, ¥»©R¥O¦b¦¹ª©¥»¤¤¨S¦³¹ê§@"
 
-#: ex_docmd.c:3624
+#: ex_docmd.c:3992
 msgid "E172: Only one file name allowed"
 msgstr "E172: ¥u¯à¦³¤@­ÓÀÉ"
 
-#: ex_docmd.c:4191
+#: ex_docmd.c:4572
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "ÁÙ¦³¤@­ÓÀÉ®×¥¼½s¿è. ½T©w­nÂ÷¶}¡H"
+
+#: ex_docmd.c:4575
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "ÁÙ¦³ %d ­ÓÀÉ®×¥¼½s¿è. ½T©w­nÂ÷¶}¡H"
 
-#: ex_docmd.c:4198
+#: ex_docmd.c:4582
+msgid "E173: 1 more file to edit"
+msgstr "E173: ÁÙ¦³¤@­ÓÀÉ®×¥¼½s¿è "
+
+#: ex_docmd.c:4584
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ÁÙ¦³ %ld ­ÓÀÉ®×¥¼½s¿è"
 
-#: ex_docmd.c:4292
+#: ex_docmd.c:4679
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: ©R¥O¤w¸g¦s¦b, ½Ð¨Ï¥Î ! ±j¨î­«·s©w¸q"
 
-#: ex_docmd.c:4397
+#: ex_docmd.c:4790
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1169,314 +1275,322 @@
 "\n"
 "    ¦WºÙ        °Ñ¼Æ ½d³ò  §¹¾ã      ©w¸q      "
 
-#: ex_docmd.c:4486
+#: ex_docmd.c:4879
 msgid "No user-defined commands found"
 msgstr "§ä¤£¨ì¨Ï¥ÎªÌ©w¸qªº©R¥O"
 
-#: ex_docmd.c:4517
+#: ex_docmd.c:4911
 msgid "E175: No attribute specified"
 msgstr "E175: ¨S¦³«ü©wªºÄÝ©Ê"
 
-#: ex_docmd.c:4569
+#: ex_docmd.c:4963
 msgid "E176: Invalid number of arguments"
 msgstr "E176: ¤£¥¿½Tªº°Ñ¼Æ¼Æ¥Ø"
 
-#: ex_docmd.c:4584
+#: ex_docmd.c:4978
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: ¤£¯à«ü©w¨â¦¸¼Æ¥Ø"
 
-#: ex_docmd.c:4594
+#: ex_docmd.c:4988
 msgid "E178: Invalid default value for count"
 msgstr "E178: ¼Æ¥Øªº¹w³]°Ñ¼Æ¤£¥¿½T"
 
-#: ex_docmd.c:4622
+#: ex_docmd.c:5019
 msgid "E179: argument required for complete"
 msgstr "E179: «ü¥O»Ý­n°Ñ¼Æ¤~¯à§¹¦¨"
 
-#: ex_docmd.c:4641
+#: ex_docmd.c:5051
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: ¤£§¹¾ãªº­È: '%s'"
 
-#: ex_docmd.c:4649
+#: ex_docmd.c:5060
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: ¦Û­q¸É§¹®É¤~¥i¸É§¹°Ñ¼Æ"
+
+#: ex_docmd.c:5066
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: ¦Û­q¸É§¹»Ý­n¨ç¦¡¬°°Ñ¼Æ"
+
+#: ex_docmd.c:5077
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ¤£¥¿½TªºÄÝ©Ê: %s"
 
-#: ex_docmd.c:4690
+#: ex_docmd.c:5120
 msgid "E182: Invalid command name"
 msgstr "E182: «ü¥O¦WºÙ¤£¥¿½T"
 
-#: ex_docmd.c:4705
+#: ex_docmd.c:5135
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ¨Ï¥ÎªÌ¦Û©w«ü¥O¥²¶·¥H¤j¼g¦r¥À¶}©l"
 
-#: ex_docmd.c:4774
+#: ex_docmd.c:5206
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: ¨S¦³¨Ï¥ÎªÌ¦Û©wªº©R¥O¡G %s"
 
-#: ex_docmd.c:5230
+#: ex_docmd.c:5667
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: §ä¤£¨ìÃC¦â¼Ë¦¡ %s"
 
-#: ex_docmd.c:5238
+#: ex_docmd.c:5675
 msgid "Greetings, Vim user!"
 msgstr "¶Ù, Vim ¨Ï¥ÎªÌ¡I"
 
-#: ex_docmd.c:5946
+#: ex_docmd.c:6393
 msgid "Edit File in new window"
 msgstr "¦b·sµøµ¡½s¿èÀÉ®×"
 
-#: ex_docmd.c:6219
+#: ex_docmd.c:6688
 msgid "No swap file"
 msgstr "µL¼È¦sÀÉ"
 
-#: ex_docmd.c:6323
+#: ex_docmd.c:6792
 msgid "Append File"
 msgstr "ªþ¥[ÀÉ®×"
 
-#: ex_docmd.c:6387
+#: ex_docmd.c:6856
 msgid "E186: No previous directory"
 msgstr "E186: ¨S¦³«e¤@­Ó¥Ø¿ý"
 
-#: ex_docmd.c:6469
+#: ex_docmd.c:6938
 msgid "E187: Unknown"
 msgstr "E187: µLªk¿ìÃѪº¼Ð°O"
 
-#: ex_docmd.c:6554
+#: ex_docmd.c:7023
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize »Ý­n¨â­Ó°Ñ¼Æ"
 
-#: ex_docmd.c:6605
+#: ex_docmd.c:7079
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "µøµ¡¦ì¸m: X %d, Y %d"
 
-#: ex_docmd.c:6610
+#: ex_docmd.c:7084
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr "E188: ¦b±zªº¥­¥x¤WµLªkÀò±oµøµ¡¦ì¸m"
 
-#: ex_docmd.c:6620
+#: ex_docmd.c:7094
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos »Ý­n¨â­Ó°Ñ¼Æ"
 
-#: ex_docmd.c:6899
+#: ex_docmd.c:7372
 msgid "Save Redirection"
 msgstr "Àx¦s Redirection"
 
-#: ex_docmd.c:7046
+#: ex_docmd.c:7562
 msgid "Save View"
 msgstr "Àx¦s View"
 
-#: ex_docmd.c:7047
+#: ex_docmd.c:7563
 msgid "Save Session"
 msgstr "Àx¦s Session"
 
-#: ex_docmd.c:7049
+#: ex_docmd.c:7565
 msgid "Save Setup"
 msgstr "Àx¦s³]©w"
 
-#: ex_docmd.c:7200
+#: ex_docmd.c:7717
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ¤w¦s¦b (½Ð¥Î ! ±j¨î°õ¦æ)"
 
-#: ex_docmd.c:7205
+#: ex_docmd.c:7722
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: µLªk¥H¼g¤J¼Ò¦¡¶}±Ò \"%s\""
 
 #. set mark
-#: ex_docmd.c:7229
+#: ex_docmd.c:7746
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: °Ñ¼Æ¥²¶·¬O­^¤å¦r¥À©Î¦V«e/«áªº¤Þ¸¹"
 
-#: ex_docmd.c:7271
+#: ex_docmd.c:7788
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal »¼°j¼h¼Æ¹L²`"
 
-#: ex_docmd.c:7772
+#: ex_docmd.c:8306
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: ¨S¦³ '#' ¥i´À¥NªºÀɦW"
 
-#: ex_docmd.c:7803
+#: ex_docmd.c:8337
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: ¨S¦³ Autocommand ÀɦW¥H¨ú¥N \"<afile>\""
 
-#: ex_docmd.c:7811
+#: ex_docmd.c:8345
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: ¨S¦³ Autocommand ½w½Ä°Ï¦WºÙ¥H¨ú¥N \"<abuf>\""
 
-#: ex_docmd.c:7822
+#: ex_docmd.c:8356
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: ¨S¦³ Autocommand ²Å¦X¦WºÙ¥H¨ú¥N \"<amatch>\""
 
-#: ex_docmd.c:7832
+#: ex_docmd.c:8366
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: ¨S¦³ :source ÀɦW¥H¨ú¥N \"<sfile>\""
 
-#: ex_docmd.c:7873
+#: ex_docmd.c:8407
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: '%' ©Î '#' «ü¦VªÅÀɦW¡A¥u¯à¥Î©ó \":p:h\""
 
-#: ex_docmd.c:7875
+#: ex_docmd.c:8409
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ¿é¤J¬°ªÅ¦r¦ê"
 
-#: ex_docmd.c:8802
+#: ex_docmd.c:9380
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: µLªkŪ¨ú viminfo"
 
-#: ex_docmd.c:8975
+#: ex_docmd.c:9553
 msgid "E196: No digraphs in this version"
 msgstr "E196: ¥»ª©¥»µL½Æ¦X¦r¤¸(digraph)"
 
-#: ex_eval.c:407
+#: ex_eval.c:440
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: ¤£¯à :throw ¥Î 'Vim' ¶}ÀYªº¨Ò¥~"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:488
+#: ex_eval.c:529
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "¥á¥X¨Ò¥~¡G %s"
 
-#: ex_eval.c:530
+#: ex_eval.c:576
 #, c-format
 msgid "Exception finished: %s"
 msgstr "¨Ò¥~µ²§ô¡G %s"
 
-#: ex_eval.c:531
+#: ex_eval.c:577
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "¤w¥á±ó¨Ò¥~¡G %s"
 
-#: ex_eval.c:582 ex_eval.c:620
+#: ex_eval.c:620 ex_eval.c:664
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, ¦æ %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:596
+#: ex_eval.c:638
 #, c-format
 msgid "Exception caught: %s"
 msgstr "µo¥Í¨Ò¥~¡G%s"
 
-#: ex_eval.c:667
+#: ex_eval.c:713
 #, c-format
 msgid "%s made pending"
 msgstr "%s ³y¦¨ pending"
 
-#: ex_eval.c:670
+#: ex_eval.c:716
 #, c-format
 msgid "%s resumed"
 msgstr "%s ¤w¦^´_"
 
-#: ex_eval.c:674
+#: ex_eval.c:720
 #, c-format
 msgid "%s discarded"
 msgstr "%s ¤w¥á±ó"
 
-#: ex_eval.c:700
+#: ex_eval.c:746
 msgid "Exception"
 msgstr "¨Ò¥~"
 
-#: ex_eval.c:706
+#: ex_eval.c:752
 msgid "Error and interrupt"
 msgstr "¿ù»~»P¤¤Â_"
 
-#: ex_eval.c:708 gui.c:4237
+#: ex_eval.c:754 gui.c:4384
 msgid "Error"
 msgstr "¿ù»~"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:710
+#: ex_eval.c:756
 msgid "Interrupt"
 msgstr "¤¤Â_"
 
-#: ex_eval.c:779
+#: ex_eval.c:830
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if ¼h¼Æ¹L²`"
 
-#: ex_eval.c:816
+#: ex_eval.c:867
 msgid "E580: :endif without :if"
 msgstr "E580: :endif ¯Ê¤Ö¹ïÀ³ªº :if"
 
-#: ex_eval.c:860
+#: ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :else ¯Ê¤Ö¹ïÀ³ªº :if"
 
-#: ex_eval.c:863
+#: ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif ¯Ê¤Ö¹ïÀ³ªº :if"
 
-#: ex_eval.c:870
+#: ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: ¦h­« :else"
 
-#: ex_eval.c:873
+#: ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :elseif ¦b :else ¤§«á"
 
-#: ex_eval.c:940
+#: ex_eval.c:991
 msgid "E585: :while nesting too deep"
 msgstr "E585: :while ¼h¼Æ¹L²`"
 
-#: ex_eval.c:996
+#: ex_eval.c:1047
 msgid "E586: :continue without :while"
 msgstr "E586: :continue ¯Ê¤Ö¹ïÀ³ªº :while"
 
-#: ex_eval.c:1036
+#: ex_eval.c:1087
 msgid "E587: :break without :while"
 msgstr "E587: :break ¯Ê¤Ö¹ïÀ³ªº :while"
 
-#: ex_eval.c:1235
+#: ex_eval.c:1286
 msgid "E601: :try nesting too deep"
 msgstr "E601: :if ¼h¼Æ¹L²`"
 
-#: ex_eval.c:1278
+#: ex_eval.c:1366
 msgid "E603: :catch without :try"
 msgstr "E603: :catch ¨S¦³ :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1300
+#: ex_eval.c:1388
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch ¦b :finally ¤§«á"
 
-#: ex_eval.c:1418
+#: ex_eval.c:1521
 msgid "E606: :finally without :try"
 msgstr "E606: :finally ¨S¦³ :try"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1442
+#: ex_eval.c:1545
 msgid "E607: multiple :finally"
 msgstr "E607: ¦h­« :finally"
 
-#: ex_eval.c:1551
+#: ex_eval.c:1654
 msgid "E602: :endtry without :try"
 msgstr "E602: :endif ¯Ê¤Ö¹ïÀ³ªº :if"
 
-#: ex_eval.c:1857
+#: ex_eval.c:1986
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction ¥²¶·¦b¨ç¦¡¤º³¡¨Ï¥Î"
 
-#: ex_getln.c:2967
+#: ex_getln.c:3299
 msgid "tagname"
 msgstr "¼ÐÅÒ¦WºÙ"
 
-#: ex_getln.c:2970
+#: ex_getln.c:3302
 msgid " kind file\n"
 msgstr "ÃþÀÉ®×\n"
 
-#: ex_getln.c:4176
+#: ex_getln.c:4768
 msgid "'history' option is zero"
 msgstr "¿ï¶µ 'history' ¬O¹s"
 
-#: ex_getln.c:4416
+#: ex_getln.c:5039
 #, c-format
 msgid ""
 "\n"
@@ -1485,245 +1599,257 @@
 "\n"
 "# %s ¾ú¥v°O¿ý (·s¨ìÂÂ):\n"
 
-#: ex_getln.c:4417
+#: ex_getln.c:5040
 msgid "Command Line"
 msgstr "©R¥O¦C"
 
-#: ex_getln.c:4418
+#: ex_getln.c:5041
 msgid "Search String"
 msgstr "·j´M¦r¦ê"
 
-#: ex_getln.c:4419
+#: ex_getln.c:5042
 msgid "Expression"
 msgstr "¹Bºâ¦¡"
 
-#: ex_getln.c:4420
+#: ex_getln.c:5043
 msgid "Input Line"
-msgstr "¿é¤J¦æ"
+msgstr "¿é¤J¦æ "
 
-#: ex_getln.c:4450
+#: ex_getln.c:5081
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ¶W¹L©R¥Oªø«×"
 
-#: ex_getln.c:4624
+#: ex_getln.c:5258
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: ¤w§R°£±¼§@¥Î¤¤ªºµøµ¡©Î¼È¦s°Ï"
 
-#: fileio.c:373
+#: fileio.c:378
 msgid "Illegal file name"
 msgstr "¤£¥¿½TªºÀɦW"
 
-#: fileio.c:397 fileio.c:522 fileio.c:2686 fileio.c:2727
+#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966
 msgid "is a directory"
 msgstr "¬O¥Ø¿ý"
 
-#: fileio.c:399
+#: fileio.c:404
 msgid "is not a file"
 msgstr "¤£¬OÀÉ®×"
 
-#: fileio.c:544 fileio.c:3833
+#: fileio.c:562 fileio.c:4143
 msgid "[New File]"
 msgstr "[¥¼©R¦W]"
 
-#: fileio.c:566
+#: fileio.c:595
 msgid "[Permission Denied]"
 msgstr "[Åv­­¤£¨¬]"
 
-#: fileio.c:670
+#: fileio.c:706
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre Autocommand ¨Ïµ{¦¡µLªkŪ¨ú¦¹ÀÉ"
 
-#: fileio.c:672
+#: fileio.c:708
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *Filter* Autocommand ¤£¥i¥H§ó§ï½w½Ä°Ïªº¤º®e"
 
-#: fileio.c:693
+#: fileio.c:729
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: ±q¼Ð·Ç¿é¤JŪ¨ú...\n"
 
-#: fileio.c:699
+#: fileio.c:735
 msgid "Reading from stdin..."
 msgstr "±q¼Ð·Ç¿é¤JŪ¨ú..."
 
 #. Re-opening the original file failed!
-#: fileio.c:944
+#: fileio.c:1012
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Âà´«¿ù»~"
 
-#: fileio.c:1892
+#: fileio.c:2102
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
-#: fileio.c:1899
+#: fileio.c:2109
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#: fileio.c:1906
+#: fileio.c:2116
 msgid "[socket]"
 msgstr "[socket]"
 
-#: fileio.c:1914
+#: fileio.c:2124
 msgid "[RO]"
 msgstr "[°ßŪ]"
 
-#: fileio.c:1924
+#: fileio.c:2134
 msgid "[CR missing]"
 msgstr "[¯Ê¤ÖCR]'"
 
-#: fileio.c:1929
+#: fileio.c:2139
 msgid "[NL found]"
 msgstr "[§ä¨ìNL]"
 
-#: fileio.c:1934
+#: fileio.c:2144
 msgid "[long lines split]"
 msgstr "[¤À³Î¹Lªø¦æ]"
 
-#: fileio.c:1940 fileio.c:3817
+#: fileio.c:2150 fileio.c:4127
 msgid "[NOT converted]"
 msgstr "[¥¼Âà´«]"
 
-#: fileio.c:1945 fileio.c:3822
+#: fileio.c:2155 fileio.c:4132
 msgid "[converted]"
 msgstr "[¤wÂà´«]"
 
-#: fileio.c:1952 fileio.c:3847
+#: fileio.c:2162 fileio.c:4157
 msgid "[crypted]"
 msgstr "[¤w¥[±K]"
 
-#: fileio.c:1959
+#: fileio.c:2169
 msgid "[CONVERSION ERROR]"
 msgstr "Âà´«¿ù»~"
 
-#: fileio.c:1965
+#: fileio.c:2175
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[¦æ %ld ¦³¤£¥¿½Tªº¦ì¤¸]"
 
-#: fileio.c:1972
+#: fileio.c:2182
 msgid "[READ ERRORS]"
 msgstr "[Ū¨ú¿ù»~]"
 
-#: fileio.c:2188
+#: fileio.c:2398
 msgid "Can't find temp file for conversion"
 msgstr "§ä¤£¨ìÂà´«¥Îªº¼È¦sÀÉ"
 
-#: fileio.c:2195
+#: fileio.c:2405
 msgid "Conversion with 'charconvert' failed"
 msgstr "¦r¤¸¶°Âà´«¿ù»~"
 
-#: fileio.c:2198
+#: fileio.c:2408
 msgid "can't read output of 'charconvert'"
 msgstr "µLªkŪ¨ú 'charconvert' ªº¿é¥X"
 
-#: fileio.c:2601
+#: fileio.c:2808
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Autocommand §R°£©ÎÄÀ©ñ¤F­n¼g¤Jªº½w½Ä°Ï"
 
-#: fileio.c:2624
+#: fileio.c:2831
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Autocommand ·N¥~¦a§ïÅܤF¦æ¸¹"
 
-#: fileio.c:2692 fileio.c:2710
+#: fileio.c:2869
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans ¤£¯à¼g¥X¥¼­×§ïªº½w½Ä°Ï"
+
+#: fileio.c:2877
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "³¡¥÷¤º®eµLªk¼g¤J Netbeans ½w½Ä°Ï"
+
+#: fileio.c:2931 fileio.c:2949
 msgid "is not a file or writable device"
 msgstr "¤£¬OÀɮשΥi¼g¤Jªº¸Ë¸m"
 
-#: fileio.c:2762
+#: fileio.c:3001
 msgid "is read-only (add ! to override)"
 msgstr "¬O°ßŪÀÉ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3065
+#: fileio.c:3347
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: µLªk¼g¤J³Æ¥÷ÀÉ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3077
+#: fileio.c:3359
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: µLªkÃö³¬³Æ¥÷ÀÉ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3079
+#: fileio.c:3361
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: µLªkŪ¨úÀÉ®×¥H¨Ñ³Æ¥÷ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3095
+#: fileio.c:3377
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: µLªk«Ø¥ß³Æ¥÷ÀÉ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3198
+#: fileio.c:3480
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: µLªk»s§@³Æ¥÷ÀÉ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3260
+#: fileio.c:3542
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: Resource fork ·|®ø¥¢ (½Ð¨Ï¥Î ! ±j¨î°õ¦æ)"
 
-#: fileio.c:3361
+#: fileio.c:3652
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: §ä¤£¨ì¼g¤J¥Îªº¼È¦sÀÉ"
 
-#: fileio.c:3379
+#: fileio.c:3670
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: µLªkÂà´« (½Ð¨Ï¥Î ! ±j¨î¤£Âà´«¼g¤J)"
 
-#: fileio.c:3414
+#: fileio.c:3705
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: µLªk¥H¼g¤J¼Ò¦¡¶}±Ò³sµ²ÀÉ®×"
 
-#: fileio.c:3418
+#: fileio.c:3709
 msgid "E212: Can't open file for writing"
 msgstr "E212: µLªk¥H¼g¤J¼Ò¦¡¶}±Ò"
 
-#: fileio.c:3668
+#: fileio.c:3971
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync ©R¥O°õ¦æ¥¢±Ñ"
+
+#: fileio.c:3978
 msgid "E512: Close failed"
 msgstr "E512: Ãö³¬¥¢±Ñ"
 
-#: fileio.c:3739
+#: fileio.c:4049
 msgid "E513: write error, conversion failed"
 msgstr "E513: µLªk¼g¤J -- Âà´«¥¢±Ñ"
 
-#: fileio.c:3745
+#: fileio.c:4055
 msgid "E514: write error (file system full?)"
 msgstr "E514: ¼g¤J¿ù»~ (Àɮרt²Î¤wº¡¡H)"
 
-#: fileio.c:3812
+#: fileio.c:4122
 msgid " CONVERSION ERROR"
 msgstr "Âà´«¿ù»~"
 
-#: fileio.c:3828
+#: fileio.c:4138
 msgid "[Device]"
 msgstr "[¸Ë¸m]"
 
-#: fileio.c:3833
+#: fileio.c:4143
 msgid "[New]"
 msgstr "[·s]"
 
-#: fileio.c:3855
+#: fileio.c:4165
 msgid " [a]"
 msgstr "[a]"
 
-#: fileio.c:3855
+#: fileio.c:4165
 msgid " appended"
 msgstr " ¤wªþ¥["
 
-#: fileio.c:3857
+#: fileio.c:4167
 msgid " [w]"
 msgstr "[w]"
 
-#: fileio.c:3857
+#: fileio.c:4167
 msgid " written"
 msgstr " ¤w¼g¤J"
 
-#: fileio.c:3910
+#: fileio.c:4217
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patch ¼Ò¦¡: µLªkÀx¦s­ì©lÀÉ®×"
 
-#: fileio.c:3932
+#: fileio.c:4239
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: Patch ¼Ò¦¡: µLªkÅܧóªÅªº­ì©lÀÉ®×"
 
-#: fileio.c:3947
+#: fileio.c:4254
 msgid "E207: Can't delete backup file"
 msgstr "E207: µLªk§R°£³Æ¥÷ÀÉ"
 
-#: fileio.c:4008
+#: fileio.c:4318
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1731,123 +1857,127 @@
 "\n"
 "ĵ§i: ­ì©lÀɮ׬y¥¢©Î·lÃa\n"
 
-#: fileio.c:4010
+#: fileio.c:4320
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "¦bÀÉ®×¥¿½T¼g¤J«e½Ð¤ÅÂ÷¶}½s¿è¾¹!"
 
-#: fileio.c:4099
+#: fileio.c:4409
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4099
+#: fileio.c:4409
 msgid "[dos format]"
 msgstr "[dos ®æ¦¡]"
 
-#: fileio.c:4106
+#: fileio.c:4416
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4106
+#: fileio.c:4416
 msgid "[mac format]"
 msgstr "[mac ®æ¦¡]"
 
-#: fileio.c:4113
+#: fileio.c:4423
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4113
+#: fileio.c:4423
 msgid "[unix format]"
 msgstr "[unix ®æ¦¡]"
 
-#: fileio.c:4140
+#: fileio.c:4450
 msgid "1 line, "
 msgstr "1 ¦æ, "
 
-#: fileio.c:4142
+#: fileio.c:4452
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld ¦æ, "
 
-#: fileio.c:4145
+#: fileio.c:4455
 msgid "1 character"
 msgstr "¤@­Ó¦r¤¸"
 
-#: fileio.c:4147
+#: fileio.c:4457
 #, c-format
 msgid "%ld characters"
 msgstr "%ld­Ó¦r¤¸"
 
-#: fileio.c:4157
+#: fileio.c:4467
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4157
+#: fileio.c:4467
 msgid "[Incomplete last line]"
 msgstr "[µ²§À¦æ¤£§¹¾ã]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4176
+#: fileio.c:4486
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ĵ§i: ¥»ÀɮצۤW¦¸Åª¤J«á¤wÅܰÊ!!!"
 
-#: fileio.c:4178
+#: fileio.c:4488
 msgid "Do you really want to write to it"
 msgstr "½T©w­n¼g¤J¶Ü"
 
-#: fileio.c:5219
+#: fileio.c:5738
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: ¼g¤JÀÉ®× \"%s\" ¿ù»~"
 
-#: fileio.c:5226
+#: fileio.c:5745
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Ãö³¬ÀÉ®× \"%s\" ¿ù»~"
 
-#: fileio.c:5229
+#: fileio.c:5748
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Ū¨úÀÉ®× \"%s\" ¿ù»~"
 
-#: fileio.c:5448
+#: fileio.c:5982
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: FileChangedShell autocommand §R°£½w½Ä°Ï"
 
-#: fileio.c:5456
+#: fileio.c:5989
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: ĵ§i: ÀÉ®× \"%s\" ¤w¸g¤£¦s¦b"
 
-#: fileio.c:5469
+#: fileio.c:6003
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: ĵ§i: ÀÉ®× \"%s\" ¦Û¤W¦¸Åª¤J«á¤wÅܰÊ, ¦Ó¥B½s¿è¤¤ªº½w½Ä°Ï¤]§ó°Ê¤F"
 
-#: fileio.c:5472
+#: fileio.c:6006
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: ĵ§i: ÀÉ®× \"%s\" ¦Û¤W¦¸Åª¤J«á¤wÅܰÊ"
 
-#: fileio.c:5474
+#: fileio.c:6008
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: ĵ§i: ÀÉ®× \"%s\" ªºÅv­­»P¤W¦¸Åª¤J®É¤£¤@¼Ë (¦³ÅܰʹL)"
 
 # 'mode' seems better as translated to 'permission'?
-#: fileio.c:5484
+#: fileio.c:6018
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: ĵ§i: ÀÉ®× \"%s\" ¦b¶}©l½s¿è«á¤S³Q«Ø¥ß¤F"
 
-#: fileio.c:5501
+#: fileio.c:6031
+msgid "See \":help W11\" for more info."
+msgstr "¶i¤@¨B»¡©ú½Ð¨£ \":help W11\"¡C"
+
+#: fileio.c:6045
 msgid "Warning"
 msgstr "ĵ§i"
 
-#: fileio.c:5502
+#: fileio.c:6046
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1855,38 +1985,43 @@
 "½T©w(&O)\n"
 "¸ü¤JÀÉ®×(&L)"
 
-#: fileio.c:5600
+#: fileio.c:6152
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: µLªk·Ç³Æ­«·s¸ü¤J \"%s\""
 
-#: fileio.c:5619
+#: fileio.c:6171
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: µLªk­«·s¸ü¤J \"%s\""
 
-#: fileio.c:6201
+#: fileio.c:6752
 msgid "--Deleted--"
 msgstr "--¤w§R°£--"
 
 #. the group doesn't exist
-#: fileio.c:6361
+#: fileio.c:6912
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: µL¦¹¸s²Õ: \"%s\""
 
-#: fileio.c:6486
+#: fileio.c:7038
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * «á­±¦³¤£¥¿½Tªº¦r¤¸: %s"
 
-#: fileio.c:6497
+#: fileio.c:7050
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: µL¦¹¨Æ¥ó: %s"
 
+#: fileio.c:7052
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: µL¦¹¸s²Õ©Î¨Æ¥ó: %s"
+
 #. Highlight title
-#: fileio.c:6646
+#: fileio.c:7210
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1894,138 +2029,146 @@
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:6917
+#: fileio.c:7481
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: µLªk¹ï©Ò¦³¨Æ¥ó°õ¦æ autocommand"
 
-#: fileio.c:6940
+#: fileio.c:7504
 msgid "No matching autocommands"
 msgstr "§ä¤£¨ì¹ïÀ³ªº autocommand"
 
-#: fileio.c:7260
+#: fileio.c:7825
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand ¼h¼Æ¹L²`"
 
-#: fileio.c:7528
+#: fileio.c:8100
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands: \"%s\""
 
-#: fileio.c:7536
+#: fileio.c:8108
 #, c-format
 msgid "Executing %s"
 msgstr "°õ¦æ %s"
 
 #. always scroll up, don't overwrite
-#: fileio.c:7604
+#: fileio.c:8176
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8171
+#: fileio.c:8743
 msgid "E219: Missing {."
 msgstr "E219: ¯Ê¤Ö {."
 
-#: fileio.c:8173
+#: fileio.c:8745
 msgid "E220: Missing }."
 msgstr "E220: ¯Ê¤Ö }."
 
-#: fold.c:66
+#: fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: §ä¤£¨ì¥ô¦ó fold"
 
-#: fold.c:553
+#: fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: µLªk¦b¥Ø«eªº 'foldmethod' ¤U«Ø¥ß fold"
 
-#: fold.c:555
+#: fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: µLªk¦b¥Ø«eªº 'foldmethod' ¤U§R°£ fold"
 
-#: getchar.c:246
+#: getchar.c:248
 msgid "E222: Add to read buffer"
 msgstr "E222: ¥[¤JŪ¨ú½w½Ä°Ï¤¤"
 
-#: getchar.c:2146
+#: getchar.c:2208
 msgid "E223: recursive mapping"
 msgstr "E223: »¼°j mapping"
 
-#: getchar.c:2994
+#: getchar.c:3087
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s ¤w¸g¦³¥þ°ì abbreviation ¤F"
 
-#: getchar.c:2997
+#: getchar.c:3090
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s ¤w¸g¦³¥þ°ì mapping ¤F"
 
-#: getchar.c:3124
+#: getchar.c:3222
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s ¤w¸g¦³ abbreviation ¤F"
 
-#: getchar.c:3127
+#: getchar.c:3225
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s ªº mapping ¤w¸g¦s¦b"
 
-#: getchar.c:3191
+#: getchar.c:3289
 msgid "No abbreviation found"
 msgstr "§ä¤£¨ì abbreviation"
 
-#: getchar.c:3193
+#: getchar.c:3291
 msgid "No mapping found"
 msgstr "¨S¦³³o­Ó mapping ¹ïÀ³"
 
-#: getchar.c:4083
+#: getchar.c:4183
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ¤£¥¿½Tªº¼Ò¦¡"
 
-#: gui.c:218
+#: gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: µLªk±Ò°Ê¹Ï«¬¬É­±"
 
-#: gui.c:347
+#: gui.c:349
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: µLªkŪ¨úÀÉ®× \"%s\""
 
 #: gui.c:472
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: µLªk±Ò°Ê¹Ï«¬¬É­±¡A§ä¤£¨ì¥i¥Îªº¦r«¬"
+
+#: gui.c:477
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: ¤£¥¿½Tªº 'guifontwide'"
 
-#: gui.c:3925
+#: gui.c:547
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E559: 'imactivatekey' ªº­È¤£¥¿½T"
+
+#: gui.c:4064
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: ¤£¯à°t¸mÃC¦â %s"
 
-#: gui_at_fs.c:290
+#: gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<¤£¯à¶}±Ò>"
 
-#: gui_at_fs.c:1115
+#: gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: ¤£¯à¨Ï¥Î %s ¦r«¬"
 
-#: gui_at_fs.c:2538
+#: gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: µLªk¦^¨ì¥Ø«e¥Ø¿ý"
 
-#: gui_at_fs.c:2557
+#: gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "¸ô®|:"
 
-#: gui_at_fs.c:2563
+#: gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: µLªk¨ú±o¥Ø«e¥Ø¿ý"
 
-#: gui_at_fs.c:2571 gui_motif.c:1619
+#: gui_at_fs.c:2815 gui_motif.c:1623
 msgid "OK"
 msgstr "½T©w"
 
-#: gui_at_fs.c:2571 gui_gtk.c:2625 gui_motif.c:1614 gui_motif.c:2844
+#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
 msgid "Cancel"
 msgstr "¨ú®ø"
 
@@ -2033,19 +2176,19 @@
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "±²°Ê¶b: ¤£¯à³]©w thumb pixmap ªº¦ì¸m"
 
-#: gui_athena.c:1956 gui_motif.c:1867
+#: gui_athena.c:2047 gui_motif.c:1871
 msgid "Vim dialog"
 msgstr "Vim ¹ï¸Ü²°"
 
-#: gui_beval.c:91
+#: gui_beval.c:101 gui_w32.c:3978
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ¤£¯à¹ï°T®§»P callback «Ø¥ß BallonEval"
 
-#: gui_gtk.c:1561
+#: gui_gtk.c:1607
 msgid "Vim dialog..."
 msgstr "Vim ¹ï¸Ü²°..."
 
-#: gui_gtk.c:1992 message.c:2525
+#: gui_gtk.c:2060 message.c:2999
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2055,98 +2198,98 @@
 "&N§_\n"
 "&C¨ú®ø"
 
-#: gui_gtk.c:2152
+#: gui_gtk.c:2268
 msgid "Input _Methods"
 msgstr "¿é¤Jªk"
 
-#: gui_gtk.c:2418 gui_motif.c:2763
+#: gui_gtk.c:2534 gui_motif.c:2768
 msgid "VIM - Search and Replace..."
 msgstr "VIM - ´M§ä»P¨ú¥N..."
 
-#: gui_gtk.c:2426 gui_motif.c:2765
+#: gui_gtk.c:2542 gui_motif.c:2770
 msgid "VIM - Search..."
 msgstr "VIM - ´M§ä..."
 
-#: gui_gtk.c:2458 gui_motif.c:2883
+#: gui_gtk.c:2574 gui_motif.c:2888
 msgid "Find what:"
 msgstr "·j´M:"
 
-#: gui_gtk.c:2478 gui_motif.c:2915
+#: gui_gtk.c:2592 gui_motif.c:2920
 msgid "Replace with:"
 msgstr "¨ú¥N¬°:"
 
 #. whole word only button
-#: gui_gtk.c:2510 gui_motif.c:3031
+#: gui_gtk.c:2624 gui_motif.c:3036
 msgid "Match whole word only"
 msgstr "¥u·j´M§¹¥þ¬Û¦Pªº¦r"
 
 #. match case button
-#: gui_gtk.c:2523 gui_motif.c:3043
+#: gui_gtk.c:2635 gui_motif.c:3048
 msgid "Match case"
 msgstr "²Å¦X¤j¤p¼g"
 
-#: gui_gtk.c:2535 gui_motif.c:2985
+#: gui_gtk.c:2645 gui_motif.c:2990
 msgid "Direction"
 msgstr "¤è¦V"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2547 gui_motif.c:2997
+#: gui_gtk.c:2657 gui_motif.c:3002
 msgid "Up"
 msgstr "¦V¤W"
 
-#: gui_gtk.c:2551 gui_motif.c:3005
+#: gui_gtk.c:2661 gui_motif.c:3010
 msgid "Down"
 msgstr "¦V¤U"
 
-#: gui_gtk.c:2577 gui_gtk.c:2579 gui_motif.c:2787
+#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
 msgid "Find Next"
 msgstr "§ä¤U¤@­Ó"
 
-#: gui_gtk.c:2596 gui_gtk.c:2598 gui_motif.c:2804
+#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
 msgid "Replace"
 msgstr "¨ú¥N"
 
-#: gui_gtk.c:2609 gui_gtk.c:2611 gui_motif.c:2817
+#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
 msgid "Replace All"
 msgstr "¨ú¥N¥þ³¡"
 
-#: gui_gtk_x11.c:2285
+#: gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: ¥Ñ Session ºÞ²z­û¦¬¨ì \"die\" ­n¨D\n"
 
-#: gui_gtk_x11.c:3424
+#: gui_gtk_x11.c:3519
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: ¥Dµøµ¡Äê±¼\n"
 
-#: gui_gtk_x11.c:4038
+#: gui_gtk_x11.c:4138
 msgid "Font Selection"
 msgstr "¦r«¬¿ï¾Ü"
 
-#: gui_gtk_x11.c:5890 ui.c:2009
+#: gui_gtk_x11.c:6035 ui.c:2120
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "¨Ï¥Î CUT_BUFFER0 ¨Ó¨ú¥NªÅ¿ï¾Ü"
 
-#: gui_motif.c:1613 gui_motif.c:1616
+#: gui_motif.c:1617 gui_motif.c:1620
 msgid "Filter"
 msgstr "¹LÂo¾¹"
 
-#: gui_motif.c:1615
+#: gui_motif.c:1619
 msgid "Directories"
 msgstr "¥Ø¿ý"
 
-#: gui_motif.c:1617
+#: gui_motif.c:1621
 msgid "Help"
 msgstr "»²§U»¡©ú"
 
-#: gui_motif.c:1618
+#: gui_motif.c:1622
 msgid "Files"
 msgstr "ÀÉ®×"
 
-#: gui_motif.c:1620
+#: gui_motif.c:1624
 msgid "Selection"
 msgstr "¿ï¾Ü"
 
-#: gui_motif.c:2830
+#: gui_motif.c:2835
 msgid "Undo"
 msgstr "´_­ì"
 
@@ -2160,7 +2303,7 @@
 msgid "E611: Can't use font %s"
 msgstr "E611: µLªk¨Ï¥Î¦r«¬ %s"
 
-#: gui_riscos.c:3269
+#: gui_riscos.c:3270
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2168,64 +2311,73 @@
 "\n"
 "°e¥X¤¤Â_¤lµ{¦¡ªº°T®§¤¤.\n"
 
-#: gui_w32.c:759
+#: gui_w32.c:839
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: §ä¤£¨ì¼ÐÃD¬° \"%s\" ªºµøµ¡"
+
+#: gui_w32.c:847
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: ¤£¤ä´©°Ñ¼Æ \"-%s\"¡C½Ð¥Î OLE ª©¥»¡C"
 
-#: gui_w48.c:2029
+#: gui_w32.c:1100
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: µLªk¦b MDI µ{¦¡¤¤¶}±Òµøµ¡"
+
+#: gui_w48.c:2163
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "·j´M¦r¦ê (¨Ï¥Î '\\\\' ¨Óªí¥Ü '\\')"
 
-#: gui_w48.c:2054
+#: gui_w48.c:2188
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "·j´M¤Î¨ú¥N¦r¦ê (¨Ï¥Î '\\\\' ¨Óªí¥Ü '\\')"
 
-#: gui_x11.c:1445
+#: gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: µLªk°t¸m color map ¶µ¥Ø¡A¦³¨ÇÃC¦â¬Ý°_¨Ó·|©Ç©Çªº"
 
-#: gui_x11.c:2019
+#: gui_x11.c:2118
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: Fontset %s ¨S¦³³]©w¥¿½Tªº¦r«¬¥H¨ÑÅã¥Ü³o¨Ç¦r¤¸¶°:"
 
-#: gui_x11.c:2062
+#: gui_x11.c:2161
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: ¦r«¬¶°(Fontset)¦WºÙ: %s"
 
-#: gui_x11.c:2063
+#: gui_x11.c:2162
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "'%s' ¤£¬O©T©w¼e«×¦r«¬"
 
-#: gui_x11.c:2082
+#: gui_x11.c:2181
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: ¦r«¬¶°(Fontset)¦WºÙ: %s\n"
 
-#: gui_x11.c:2083
+#: gui_x11.c:2182
 #, c-format
 msgid "Font0: %s\n"
 msgstr "Font0: %s\n"
 
-#: gui_x11.c:2084
+#: gui_x11.c:2183
 #, c-format
 msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
-#: gui_x11.c:2085
+#: gui_x11.c:2184
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "¦r«¬%d¼e«×¤£¬O¦r«¬0ªº¨â­¿\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "¦r«¬%ld ¼e«×¤£¬O ¦r«¬0 ªº¨â­¿\n"
 
-#: gui_x11.c:2086
+#: gui_x11.c:2185
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "¦r«¬0ªº¼e«×¡G%ld\n"
 
-#: gui_x11.c:2087
+#: gui_x11.c:2186
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2238,289 +2390,306 @@
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata ¿ù»~"
 
-#: if_cscope.c:26
+#: if_cscope.c:77
+msgid "Add a new database"
+msgstr "·s¼W¸ê®Æ®w"
+
+#: if_cscope.c:79
+msgid "Query for a pattern"
+msgstr "¿é¤J pattern"
+
+#: if_cscope.c:81
+msgid "Show this message"
+msgstr "Åã¥Ü¦¹°T®§"
+
+#: if_cscope.c:83
+msgid "Kill a connection"
+msgstr "µ²§ô³s½u"
+
+#: if_cscope.c:85
+msgid "Reinit all connections"
+msgstr "­«³]©Ò¦³³s½u"
+
+#: if_cscope.c:87
+msgid "Show connections"
+msgstr "Åã¥Ü³s½u"
+
+#: if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: ¥Îªk: cs[cope] %s"
 
-#: if_cscope.c:67
-msgid "Add a new database"
-msgstr "·s¼W¸ê®Æ®w"
-
-#: if_cscope.c:69
-msgid "Query for a pattern"
-msgstr "¿é¤J pattern"
-
-#: if_cscope.c:71
-msgid "Show this message"
-msgstr "Åã¥Ü¦¹°T®§"
-
-#: if_cscope.c:73
-msgid "Kill a connection"
-msgstr "µ²§ô³s½u"
-
-#: if_cscope.c:75
-msgid "Reinit all connections"
-msgstr "­«³]©Ò¦³³s½u"
-
-#: if_cscope.c:77
-msgid "Show connections"
-msgstr "Åã¥Ü³s½u"
-
-#: if_cscope.c:108
+#: if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "³o­Ó cscope ©R¥O¤£¤ä´©¤À³Î¿Ã¹õ\n"
 
-#: if_cscope.c:143
+#: if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: ¥Îªk: cstag <ÃѧO¦rident>"
 
-#: if_cscope.c:199
+#: if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: §ä¤£¨ì tag"
 
-#: if_cscope.c:407 if_cscope.c:451
+#: if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) ¿ù»~: %d"
 
-#: if_cscope.c:461 if_cscope.c:468
-#, c-format
-msgid "Added cscope database %s"
-msgstr "·s¼W cscope ¸ê®Æ®w %s"
+#: if_cscope.c:419
+msgid "E563: stat error"
+msgstr "E563: stat ¿ù»~"
 
-#: if_cscope.c:475
+#: if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ¤£¬O¥Ø¿ý©Î cscope ¸ê®Æ®w"
 
-#: if_cscope.c:559
+#: if_cscope.c:534
 #, c-format
-msgid "E565: error reading cscope connection %d"
-msgstr "E565: Ū¨ú cscope ³s½u %d ¿ù»~"
+msgid "Added cscope database %s"
+msgstr "·s¼W cscope ¸ê®Æ®w %s"
 
-#: if_cscope.c:636
+#: if_cscope.c:589
+#, c-format
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: Ū¨ú cscope ³s½u %ld ¿ù»~"
+
+#: if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: ¥¼ª¾ªº cscope ·j´M§ÎºA"
 
-#: if_cscope.c:683
+#: if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: µLªk«Ø¥ß»P cscope ªº pipe ³s½u"
 
-#: if_cscope.c:748
+#: if_cscope.c:753
+msgid "E622: Could not fork for cscope"
+msgstr "E622: µLªk fork ¥H°õ¦æ cscope "
+
+#: if_cscope.c:847 if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection °õ¦æ¥¢±Ñ"
 
-#: if_cscope.c:758
+#: if_cscope.c:898
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: µLªk°õ¦æ cscope "
+
+#: if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen ¥¢±Ñ (to_fp)"
 
-#: if_cscope.c:760
+#: if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fdopen ¥¢±Ñ (fr_fp)"
 
-#: if_cscope.c:788
+#: if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: ¨S¦³ cscope ³s½u"
 
-#: if_cscope.c:858
+#: if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: §ä¤£¨ì²Å¦X cscope ªº·j´M %s / %s"
 
-#: if_cscope.c:902
+#: if_cscope.c:1082
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix ªº flac %c (%c) ¤£¥¿½T"
+
+#: if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscope ©R¥O:\n"
 
-#: if_cscope.c:905
+#: if_cscope.c:1155
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (¥Îªk: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (¥Îªk: %s)"
 
-#: if_cscope.c:973
+#: if_cscope.c:1253
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: µLªk¶}±Ò cscope ¸ê®Æ®w %s"
+
+#: if_cscope.c:1271
+msgid "E626: cannot get cscope database information"
+msgstr "E626: µLªk¨ú±o cscope ¸ê®Æ®w¸ê°T"
+
+#: if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ­«½Æªº cscope ¸ê®Æ®w¥¼³Q¥[¤J"
 
-#: if_cscope.c:984
+#: if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: ¤w¹F¨ì cscope ³Ì¤j³s½u¼Æ¥Ø"
 
-#: if_cscope.c:1105
-msgid "E260: cscope connection not found"
-msgstr "E260: §ä¤£¨ì cscope ³s½u"
-
-#: if_cscope.c:1108
+#: if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: §ä¤£¨ì cscope ³s½u %s"
 
-#: if_cscope.c:1144
-msgid "cscope connection closed"
-msgstr "cscope ³s½u¤wÃö³¬"
-
-#: if_cscope.c:1152
+#: if_cscope.c:1458
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope ³s½u %s ¤wÃö³¬\n"
+msgid "cscope connection %s closed"
+msgstr "cscope ³s½u %s ¤wÃö³¬"
 
 #. should not reach here
-#: if_cscope.c:1293
+#: if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ÄY­«¿ù»~"
 
-#: if_cscope.c:1344
+#: if_cscope.c:1848
 #, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: Ū¨ú cscope ³s½u %d ¿ù»~"
+msgid "Cscope tag: %s"
+msgstr "Cscope ¼ÐÅÒ(tag): %s"
 
-#: if_cscope.c:1452
-msgid "couldn't malloc\n"
-msgstr "µLªk¨Ï¥Î malloc\n"
+#: if_cscope.c:1870
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   ¦æ  "
 
-#: if_cscope.c:1457
-#, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope ¼ÐÅÒ(tag): %s\n"
-
-#: if_cscope.c:1461
-msgid "   #   line"
-msgstr "   #   ¦æ  "
-
-#: if_cscope.c:1463
+#: if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "ÀɦW     / ¤º¤å    / ¦æ¸¹\n"
 
-#: if_cscope.c:1721
+#: if_cscope.c:1990
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Csope ¿ù»~: %s"
+
+#: if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "­«³]©Ò¦³ cscope ¸ê®Æ®w"
 
-#: if_cscope.c:1788
+#: if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "¨S¦³ cscope ³s½u\n"
 
-#: if_cscope.c:1792
+#: if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    ¸ê®Æ®w¦WºÙ                          prepend path\n"
 
-#: if_cscope.c:1803
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <µL>\n"
-
-#: if_python.c:394
+#: if_python.c:436
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
 msgstr "E263: ©êºp¡A³o­Ó©R¥OµLªk¨Ï¥Î¡APython µ{¦¡®w¨S¦³¸ü¤J¡C"
 
-#: if_python.c:596
+#: if_python.c:500
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: µLªk»¼°j°õ¦æ Python "
+
+#: if_python.c:701
 msgid "can't delete OutputObject attributes"
 msgstr "µLªk§R°£ OutputObject ÄÝ©Ê"
 
-#: if_python.c:603
+#: if_python.c:708
 msgid "softspace must be an integer"
 msgstr "softspace ¥²»Ý¬O¾ã¼Æ"
 
-#: if_python.c:611
+#: if_python.c:716
 msgid "invalid attribute"
 msgstr "¤£¥¿½TªºÄÝ©Ê"
 
-#: if_python.c:650 if_python.c:664
+#: if_python.c:755 if_python.c:769
 msgid "writelines() requires list of strings"
 msgstr "writelines() »Ý­n string list ·í°Ñ¼Æ"
 
-#: if_python.c:790
+#: if_python.c:895
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: µLªkªì©l I/O ª«¥ó"
 
-#: if_python.c:975 if_tcl.c:1402
+#: if_python.c:1080 if_tcl.c:1402
 msgid "invalid expression"
 msgstr "¤£¥¿½Tªº¹Bºâ¦¡"
 
-#: if_python.c:989 if_tcl.c:1407
+#: if_python.c:1094 if_tcl.c:1407
 msgid "expressions disabled at compile time"
 msgstr "¦]¬°½sͮɍS¦³¥[¤J¹Bºâ¦¡(expression)ªºµ{¦¡½X¡A©Ò¥HµLªk¨Ï¥Î¹Bºâ¦¡"
 
-#: if_python.c:1002
+#: if_python.c:1107
 msgid "attempt to refer to deleted buffer"
 msgstr "¸Õ¹Ï¨Ï¥Î¤w³Q§R°£ªº buffer"
 
-#: if_python.c:1017 if_python.c:1058 if_python.c:1122 if_tcl.c:1214
+#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
 msgid "line number out of range"
 msgstr "¦æ¸¹¶W¥X½d³ò"
 
-#: if_python.c:1257
+#: if_python.c:1362
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<buffer ª«¥ó (¤w§R°£): %8lX>"
 
-#: if_python.c:1348 if_tcl.c:836
+#: if_python.c:1453 if_tcl.c:836
 msgid "invalid mark name"
 msgstr "¼Ð°O¦WºÙ¤£¥¿½T"
 
-#: if_python.c:1623
+#: if_python.c:1733
 msgid "no such buffer"
 msgstr "µL¦¹ buffer"
 
-#: if_python.c:1711
+#: if_python.c:1821
 msgid "attempt to refer to deleted window"
 msgstr "¸Õ¹Ï¨Ï¥Î¤w³Q§R°£ªºµøµ¡"
 
-#: if_python.c:1756
+#: if_python.c:1866
 msgid "readonly attribute"
 msgstr "°ßŪÄÝ©Ê"
 
-#: if_python.c:1769
+#: if_python.c:1879
 msgid "cursor position outside buffer"
 msgstr "´å¼Ð©w¦ì¦b½w½Ä°Ï¤§¥~"
 
-#: if_python.c:1846
+#: if_python.c:1956
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<µøµ¡ª«¥ó(¤w§R°£): %.8lX>"
 
-#: if_python.c:1858
+#: if_python.c:1968
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<µøµ¡ª«¥ó(¥¼ª¾): %.8lX>"
 
-#: if_python.c:1860
+#: if_python.c:1970
 #, c-format
 msgid "<window %d>"
 msgstr "<µøµ¡ %d>"
 
-#: if_python.c:1936
+#: if_python.c:2046
 msgid "no such window"
 msgstr "µL¦¹µøµ¡"
 
-#: if_python.c:2193 if_python.c:2228 if_python.c:2278 if_python.c:2346
-#: if_python.c:2466 if_python.c:2518 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1998
+#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
+#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
+#: if_tcl.c:873 if_tcl.c:1999
 msgid "cannot save undo information"
 msgstr "µLªkÀx¦s´_­ì¸ê°T"
 
-#: if_python.c:2195 if_python.c:2285 if_python.c:2357
+#: if_python.c:2309 if_python.c:2403 if_python.c:2475
 msgid "cannot delete line"
-msgstr "¤£¯à§R°£¦¹¦æ"
+msgstr "¤£¯à§R°£¦¹¦æ "
 
-#: if_python.c:2230 if_python.c:2373 if_tcl.c:690 if_tcl.c:2020
+#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
 msgid "cannot replace line"
-msgstr "¤£¯à´À¥N¦¹¦æ"
+msgstr "¤£¯à´À¥N¦¹¦æ "
 
-#: if_python.c:2389 if_python.c:2468 if_python.c:2526
+#: if_python.c:2509 if_python.c:2588 if_python.c:2646
 msgid "cannot insert line"
-msgstr "¤£¯à´À¥N´¡¤J¦¹¦æ"
+msgstr "¤£¯à´À¥N´¡¤J¦¹¦æ "
 
-#: if_python.c:2630
+#: if_python.c:2750
 msgid "string cannot contain newlines"
-msgstr "¦r¦êµLªk¥]§t·s¦æ"
+msgstr "¦r¦êµLªk¥]§t·s¦æ "
 
-#: if_ruby.c:396
+#: if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr "E266: ¦¹©R¥OµLªk¨Ï¥Î¡AµLªk¸ü¤J Ruby µ{¦¡®w(Library)"
 
-#: if_ruby.c:459
+#: if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ¥¼ª¾ªº longjmp status %d"
@@ -2655,7 +2824,7 @@
 #. ???
 #: if_tcl.c:774
 msgid "cannot set line(s)"
-msgstr "¤£¯à³]©w¦æ"
+msgstr "¤£¯à³]©w¦æ "
 
 #: if_tcl.c:845
 msgid "mark not set"
@@ -2668,7 +2837,7 @@
 
 #: if_tcl.c:881
 msgid "cannot insert/append line"
-msgstr "¤£¯à´¡¤J©Îªþ¥[¦¹¦æ"
+msgstr "¤£¯à´¡¤J©Îªþ¥[¦¹¦æ "
 
 #: if_tcl.c:1268
 msgid "unknown flag: "
@@ -2709,32 +2878,31 @@
 #: if_tcl.c:1724
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr ""
-"E571: ¦¹©R¥OµLªk¨Ï¥Î, ¦]¬°µLªk¸ü¤J Tcl µ{¦¡®w(Library)"
+msgstr "E571: ¦¹©R¥OµLªk¨Ï¥Î, ¦]¬°µLªk¸ü¤J Tcl µ{¦¡®w(Library)"
 
 #: if_tcl.c:1886
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr "E281: TCL ¿ù»~: µ²§ô½X¤£¬O¾ã¼Æ!? ½Ð³ø§iµ¹ to vim-dev@vim.org"
 
-#: if_tcl.c:2006
+#: if_tcl.c:2007
 msgid "cannot get line"
-msgstr "¤£¯à¨ú±o¦¹¦æ"
+msgstr "¤£¯à¨ú±o¦¹¦æ "
 
-#: if_xcmdsrv.c:215
+#: if_xcmdsrv.c:225
 msgid "Unable to register a command server name"
 msgstr "µLªkµù¥U©R¥O¦øªA¾¹¦WºÙ"
 
-#: if_xcmdsrv.c:465
+#: if_xcmdsrv.c:473
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: µLªk°e¥X©R¥O¨ì¥Øªº¦aµ{¦¡"
 
-#: if_xcmdsrv.c:735
+#: if_xcmdsrv.c:747
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: ¤£¥¿½Tªº¦øªA¾¹ id : %s"
 
-#: if_xcmdsrv.c:1098
+#: if_xcmdsrv.c:1110
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ªº registry ³]©w¶µ¦³»~¡C¤w§R°£¡C"
 
@@ -2755,8 +2923,8 @@
 msgstr "µLªk¿ë»{¦¹¿ï¶µ«áªº©R¥O: "
 
 #: main.c:68
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "¤Ó¦h \"+command\" ©Î \"-c command\" °Ñ¼Æ"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "¤Ó¦h \"+command\" ¡B \"-c command\" ©Î \"--cmd command\" °Ñ¼Æ"
 
 #: main.c:70
 msgid "Invalid argument for"
@@ -2766,49 +2934,42 @@
 msgid "This Vim was not compiled with the diff feature."
 msgstr "±zªº Vim ½sͮɍS¦³¥[¤J diff ªº¯à¤O"
 
-#: main.c:917
+#: main.c:935
 msgid "Attempt to open script file again: \""
 msgstr "¸Õ¹Ï¦A¦¸¶}±Ò script ÀÉ: \""
 
-#: main.c:921 main.c:928 main.c:972 memline.c:3682 memline.c:3686
-#: version.c:857 version.c:862 version.c:867 version.c:872 version.c:877
-#: version.c:882 version.c:888 version.c:892 version.c:896 version.c:901
-#: version.c:908 version.c:916 version.c:922
-msgid "\"\n"
-msgstr "\"\n"
-
-#: main.c:926
+#: main.c:944
 msgid "Cannot open for reading: \""
 msgstr "µLªk¶}±Ò¥HŪ¨ú: \""
 
-#: main.c:970
+#: main.c:988
 msgid "Cannot open for script output: \""
 msgstr "µLªk¶}±Ò¬° script ¿é¥X: \""
 
-#: main.c:1104
+#: main.c:1135
 #, c-format
 msgid "%d files to edit\n"
 msgstr "ÁÙ¦³ %d ­ÓÀÉ®×µ¥«Ý½s¿è\n"
 
-#: main.c:1178
+#: main.c:1236
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: ª`·N: ¿é¥X¤£¬O²×ºÝ¾÷(¿Ã¹õ)\n"
 
-#: main.c:1180
+#: main.c:1238
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: ª`·N: ¿é¤J¤£¬O²×ºÝ¾÷(Áä½L)\n"
 
 #. just in case..
-#: main.c:1257
+#: main.c:1306
 msgid "pre-vimrc command line"
 msgstr "vimrc «e©R¥O¦C"
 
-#: main.c:1292
+#: main.c:1347
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: µLªkŪ¨úÀÉ®× \"%s\""
 
-#: main.c:2313
+#: main.c:2420
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2816,23 +2977,23 @@
 "\n"
 "¬d¸ß§ó¦h¸ê°T½Ð°õ¦æ: \"vim -h\"\n"
 
-#: main.c:2346
+#: main.c:2453
 msgid "[file ..]       edit specified file(s)"
 msgstr "[ÀÉ®× ..]       ½s¿è«ü©wªºÀÉ®×"
 
-#: main.c:2347
+#: main.c:2454
 msgid "-               read text from stdin"
 msgstr "-               ±q¼Ð·Ç¿é¤J(stdin)Ū¨úÀÉ®×"
 
-#: main.c:2348
+#: main.c:2455
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t tag          ½s¿è®É¨Ï¥Î«ü©wªº tag"
 
-#: main.c:2350
+#: main.c:2457
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  ½s¿è®É¸ü¤J²Ä¤@­Ó¿ù»~"
 
-#: main.c:2359
+#: main.c:2466
 msgid ""
 "\n"
 "\n"
@@ -2842,11 +3003,11 @@
 "\n"
 " ¥Îªk:"
 
-#: main.c:2362
+#: main.c:2469
 msgid " vim [arguments] "
 msgstr "vim [°Ñ¼Æ] "
 
-#: main.c:2366
+#: main.c:2473
 msgid ""
 "\n"
 "   or:"
@@ -2854,7 +3015,7 @@
 "\n"
 "   ©Î:"
 
-#: main.c:2369
+#: main.c:2476
 msgid ""
 "\n"
 "\n"
@@ -2864,238 +3025,241 @@
 "\n"
 "°Ñ¼Æ:\n"
 
-#: main.c:2370
+#: main.c:2477
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t¥u¦³¦b³o¤§«áªºÀÉ®×"
 
-#: main.c:2372
+#: main.c:2479
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t¤£®i¶}¸U¥Î¦r¤¸"
 
-#: main.c:2375
+#: main.c:2482
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\tµù¥U gvim ¨ì OLE"
 
-#: main.c:2376
+#: main.c:2483
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\t¨ú®ø OLE ¤¤ªº gvim µù¥U"
 
-#: main.c:2379
+#: main.c:2486
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\t¨Ï¥Î¹Ï§Î¬É­± (¦P \"gvim\")"
 
-#: main.c:2380
+#: main.c:2487
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  ©Î  --nofork\t«e´º: °_©l¹Ï§Î¬É­±®É¤£ fork"
 
-#: main.c:2382
+#: main.c:2489
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi ¼Ò¦¡ (¦P \"vi\")"
 
-#: main.c:2383
+#: main.c:2490
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx ¼Ò¦¡ (¦P \"ex\")"
 
-#: main.c:2384
+#: main.c:2491
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t¦wÀR (batch) ¼Ò¦¡ (¥u¯à»P \"ex\" ¤@°_¨Ï¥Î)"
 
-#: main.c:2386
+#: main.c:2493
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tDiff ¼Ò¦¡ (¦P \"vimdiff\", ¥i¨³³t¤ñ¸û¨âÀɮפ£¦P³B)"
 
-#: main.c:2388
+#: main.c:2495
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t²©ö¼Ò¦¡ (¦P \"evim\", modeless)"
 
-#: main.c:2389
+#: main.c:2496
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t°ßŪ¼Ò¦¡ (¦P \"view\")"
 
-#: main.c:2390
+#: main.c:2497
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t­­¨î¼Ò¦¡ (¦P \"rvim\")"
 
-#: main.c:2391
+#: main.c:2498
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t¤£¥i­×§ï (¼g¤JÀÉ®×)"
 
-#: main.c:2392
+#: main.c:2499
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t¤£¥i­×§ï¤å¦r"
 
-#: main.c:2393
+#: main.c:2500
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t¤G¶i¦ì¼Ò¦¡"
 
-#: main.c:2395
+#: main.c:2502
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp ¼Ò¦¡"
 
-#: main.c:2397
+#: main.c:2504
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\t'compatible' ¶Ç²Î Vi ¬Û®e¼Ò¦¡"
 
-#: main.c:2398
+#: main.c:2505
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\t'nocompatible' ¤£§¹¥þ»P¶Ç²Î Vi ¬Û®e¡A¥i¨Ï¥Î Vim ¥[±j¯à¤O"
 
-#: main.c:2399
+#: main.c:2506
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose µ¥¯Å"
 
-#: main.c:2400
+#: main.c:2507
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t°£¿ù¼Ò¦¡"
 
-#: main.c:2401
+#: main.c:2508
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t¤£¨Ï¥Î¼È¦sÀÉ, ¥u¨Ï¥Î°O¾ÐÅé"
 
-#: main.c:2402
+#: main.c:2509
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t¦C¥X¼È¦sÀÉ«áÂ÷¶}"
 
-#: main.c:2403
+#: main.c:2510
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (¥[ÀɦW)       \t­×´_¤W¦¸·l·´ªº¸ê®Æ(Recover crashed session)"
 
-#: main.c:2404
+#: main.c:2511
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t¦P -r"
 
-#: main.c:2406
+#: main.c:2513
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t¤£¨Ï¥Î newcli ¨Ó¶}±Òµøµ¡"
 
-#: main.c:2407
+#: main.c:2514
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t¨Ï¥Î <device> °µ¿é¥X¤J"
 
-#: main.c:2410
+#: main.c:2517
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t±Ò°Ê¬° Arabic ¼Ò¦¡"
+
+#: main.c:2520
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t±Ò°Ê¬° Hebrew ¼Ò¦¡"
 
-#: main.c:2413
+#: main.c:2523
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t±Ò°Ê¬° Farsi ¼Ò¦¡"
 
-#: main.c:2415
+#: main.c:2525
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t³]©w²×ºÝ¾÷¬° <terminal>"
 
-#: main.c:2416
+#: main.c:2526
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t¨Ï¥Î <vimrc> ¨ú¥N¥ô¦ó .vimrc"
 
-#: main.c:2418
+#: main.c:2528
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t¨Ï¥Î <gvimrc> ¨ú¥N¥ô¦ó .gvimrc"
 
-#: main.c:2420
+#: main.c:2530
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t¤£¸ü¤J¥ô¦ó plugin"
 
-#: main.c:2421
+#: main.c:2531
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\t¶}±Ò N ­Óµøµ¡ (¹w³]¬O¨C­ÓÀɮפ@­Ó)"
 
-#: main.c:2422
+#: main.c:2532
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t¦P -o ¦ý¨Ï¥Î««ª½¤À³Î"
 
-#: main.c:2423
+#: main.c:2533
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t±Ò°Ê«á¸õ¨ìÀÉ®×µ²§À"
 
-#: main.c:2424
+#: main.c:2534
 msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t±Ò°Ê«á¸õ¨ì²Ä <lnum> ¦æ"
+msgstr "+<lnum>\t\t±Ò°Ê«á¸õ¨ì²Ä <lnum> ¦æ "
 
-#: main.c:2426
+#: main.c:2536
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\t¸ü¤J¥ô¦ó vimrc «e°õ¦æ <command>"
 
-#: main.c:2428
+#: main.c:2538
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t¸ü¤J²Ä¤@­ÓÀɮ׫á°õ¦æ <command>"
 
-#: main.c:2429
+#: main.c:2539
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t¸ü¤J²Ä¤@­ÓÀɮ׫á¸ü¤J Session ÀÉ <session>"
 
-#: main.c:2430
+#: main.c:2540
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t±q <scriptin> Ū¤J¤@¯ë¼Ò¦¡©R¥O"
 
-#: main.c:2431
+#: main.c:2541
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t¹ïÀÉ®× <scriptout> ªþ¥[(append)©Ò¦³¿é¤Jªº©R¥O"
 
-#: main.c:2432
+#: main.c:2542
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t¹ïÀÉ®× <scriptout> ¼g¤J©Ò¦³¿é¤Jªº©R¥O"
 
-#: main.c:2434
+#: main.c:2544
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t½s¿è½s½X¹LªºÀÉ®×"
 
-#: main.c:2438
+#: main.c:2548
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\t±N vim »P«ü©wªº X-server ³s½u"
 
-#: main.c:2440
+#: main.c:2550
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\t¤£­n³s½u¨ì X Server"
 
-#: main.c:2443
+#: main.c:2553
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t½s¿è Vim ¦øªA¾¹¤Wªº <files> «áÂ÷¶}"
 
-#: main.c:2444
+#: main.c:2554
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silent <files>  ¬Û¦P¡A¦ý¨S¦³¦øªA¾¹®É¤£Äµ§i"
 
-#: main.c:2445
+#: main.c:2555
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>  ¦P --remote, ¦ý·|µ¥­ÔÀÉ®×§¹¦¨½s¿è"
 
-#: main.c:2446
+#: main.c:2556
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
-msgstr ""
-"--remote-wait-silent <files>  ¬Û¦P¡A¦ý¨S¦øªA¾¹®É¤£Äµ§i"
+msgstr "--remote-wait-silent <files>  ¬Û¦P¡A¦ý¨S¦øªA¾¹®É¤£Äµ§i"
 
-#: main.c:2447
+#: main.c:2557
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\t°e¥X <keys> ¨ì Vim ¦øªA¾¹¨ÃÂ÷¶}"
 
-#: main.c:2448
+#: main.c:2558
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\t¦b¦øªA¾¹¤W°õ¦æ <expr> ¨Ã¦L¥Xµ²ªG"
 
-#: main.c:2449
+#: main.c:2559
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\t¦C¥X¥i¥Îªº Vim ¦øªA¾¹¦WºÙ¨ÃÂ÷¶}"
 
-#: main.c:2450
+#: main.c:2560
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servername <name>\t°e¦Ü/¦¨¬° Vim ¦øªA¾¹ <name>"
 
-#: main.c:2453
+#: main.c:2563
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t¨Ï¥Î <viminfo> ¦Ó«D .viminfo"
 
-#: main.c:2455
+#: main.c:2565
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  ©Î  --help\t¦L¥X»¡©ú(¤]´N¬O¥»°T®§)«áÂ÷¶}"
 
-#: main.c:2456
+#: main.c:2566
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t¦L¥Xª©¥»¸ê°T«áÂ÷¶}"
 
-#: main.c:2460
+#: main.c:2570
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3103,7 +3267,15 @@
 "\n"
 "gvim »{±oªº°Ñ¼Æ (Motif ª©):\n"
 
-#: main.c:2463
+#: main.c:2574
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim »{±oªº°Ñ¼Æ (neXtaw ª©):\n"
+
+#: main.c:2576
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3111,71 +3283,71 @@
 "\n"
 "gvim »{±oªº°Ñ¼Æ (Athena ª©):\n"
 
-#: main.c:2466
+#: main.c:2580
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t¦bµøµ¡ <display> °õ¦æ vim"
 
-#: main.c:2467
+#: main.c:2581
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t±Ò°Ê«á¹Ï¥Ü¤Æ(iconified)"
 
-#: main.c:2469
+#: main.c:2583
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\tŪ¨ú Resource ®É§â vim ªº¦WºÙµø¬° <name>"
 
-#: main.c:2470
+#: main.c:2584
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (©|¥¼¹ê§@)\n"
 
-#: main.c:2472
+#: main.c:2586
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t³]©w <color> ¬°­I´º¦â (¤]¥i¥Î -bg)"
 
-#: main.c:2473
+#: main.c:2587
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t³]©w <color> ¬°¤@¯ë¤å¦rÃC¦â (¤]¥i¥Î -fg)"
 
-#: main.c:2474 main.c:2494
+#: main.c:2588 main.c:2608
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t¨Ï¥Î <font> ¬°¤@¯ë¦r«¬ (¤]¥i¥Î -fn)"
 
-#: main.c:2475
+#: main.c:2589
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t¨Ï¥Î <font> ¬°²ÊÅé¦r«¬"
 
-#: main.c:2476
+#: main.c:2590
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <font>\t¨Ï¥Î <font> ¬°±×Åé¦r«¬"
 
-#: main.c:2477 main.c:2495
+#: main.c:2591 main.c:2609
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t¨Ï¥Î<geom>¬°°_©l¦ì¸m (¤]¥i¥Î -geom)"
 
-#: main.c:2478
+#: main.c:2592
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t¨Ï¥Î¼e«×¬° <width> ªºÃ䮨 (¤]¥i¥Î -bw)"
 
-#: main.c:2479
+#: main.c:2593
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr "-scrollbarwidth <width>  ³]©w±²°Ê¶b¼e«×¬° <width> (¤]¥i¥Î -sw)"
 
-#: main.c:2481
+#: main.c:2595
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\t³]©w¿ï³æ¦Cªº°ª«×¬° <height> (¤]¥i¥Î -mh)"
 
-#: main.c:2483 main.c:2496
+#: main.c:2597 main.c:2610
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t¨Ï¥Î¤Ï¬ÛÅã¥Ü (¤]¥i¥Î -rv)"
 
-#: main.c:2484
+#: main.c:2598
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\t¤£¨Ï¥Î¤Ï¬ÛÅã¥Ü (¤]¥i¥Î +rv)"
 
-#: main.c:2485
+#: main.c:2599
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t³]©w«ü©wªº resource"
 
-#: main.c:2488
+#: main.c:2602
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3183,15 +3355,15 @@
 "\n"
 "gvim »{±oªº°Ñ¼Æ (RISC OS ª©):\n"
 
-#: main.c:2489
+#: main.c:2603
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\tµøµ¡ªì©l¤Æ¼e«×"
 
-#: main.c:2490
+#: main.c:2604
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\tµøµ¡ªì©l¤Æ°ª«×"
 
-#: main.c:2493
+#: main.c:2607
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3199,60 +3371,60 @@
 "\n"
 "gvim »{±oªº°Ñ¼Æ (GTK+ ª©):\n"
 
-#: main.c:2497
+#: main.c:2611
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t¦b <display> °õ¦æ vim (¤]¥i¥Î --display)"
 
-#: main.c:2499
+#: main.c:2613
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t³]©w¿W¯Sªº¨¤¦â(role)¥H°Ï¤À¥Dµøµ¡"
 
-#: main.c:2501
+#: main.c:2615
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t¦b¥t¤@­Ó GTK widget ¤º¶}±Ò Vim"
 
-#: main.c:2503
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\tÅã¥Ü Gnome ¬ÛÃö°Ñ¼Æ"
+#: main.c:2618
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t¦b¤÷µ{¦¡¤¤¶}±Ò Vim"
 
-#: main.c:2735
+#: main.c:2856
 msgid "No display"
 msgstr "µLÅã¥Ü"
 
 #. Failed to send, abort.
-#: main.c:2750
+#: main.c:2871
 msgid ": Send failed.\n"
 msgstr ": ¶Ç°e¥¢±Ñ¡C\n"
 
 #. Let vim start normally.
-#: main.c:2756
+#: main.c:2877
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": °e¥X¥¢±Ñ¡C¸Õ¹Ï¦b¥»¦a°õ¦æ\n"
 
-#: main.c:2794 main.c:2815
+#: main.c:2915 main.c:2936
 #, c-format
 msgid "%d of %d edited"
 msgstr "¤w½s¿è %d/%d ­ÓÀÉ®×"
 
-#: main.c:2837
+#: main.c:2958
 msgid "No display: Send expression failed.\n"
 msgstr "µL Display: µLªk¶Ç°e¹Bºâ¦¡¡C\n"
 
-#: main.c:2849
+#: main.c:2970
 msgid ": Send expression failed.\n"
 msgstr ": µLªk¶Ç°e¹Bºâ¦¡¡C\n"
 
-#: mark.c:656
+#: mark.c:709
 msgid "No marks set"
 msgstr "¨S¦³³]©w¼Ð°O (mark)"
 
-#: mark.c:658
+#: mark.c:711
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: §ä¤£¨ì²Å¦X \"%s\" ªº¼Ð°O(mark)"
 
 #. Highlight title
-#: mark.c:669
+#: mark.c:722
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3261,7 +3433,7 @@
 "¼Ð°O ¦æ¸¹  Äæ  ÀÉ®×/¤å¦r"
 
 #. Highlight title
-#: mark.c:707
+#: mark.c:760
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3269,7 +3441,17 @@
 "\n"
 " jump ¦æ¸¹  Äæ  ÀÉ®×/¤å¦r"
 
-#: mark.c:1072
+#. Highlight title
+#: mark.c:805
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"§ïÅÜ   ¦æ¸¹  Äæ  ¤å¦r"
+
+#: mark.c:1281
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3278,7 +3460,8 @@
 "# Àɮ׼аO:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1107
+#: mark.c:1316
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3286,7 +3469,8 @@
 "\n"
 "# Jumplist (¥Ñ·s¨ìÂÂ):\n"
 
-#: mark.c:1202
+#: mark.c:1412
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3294,47 +3478,47 @@
 "\n"
 "# Àɮפº Mark °O¿ý (¥Ñ·s¨ìÂÂ):\n"
 
-#: mark.c:1285
+#: mark.c:1501
 msgid "Missing '>'"
 msgstr "¯Ê¤Ö¹ïÀ³ªº '>'"
 
-#: mbyte.c:403
+#: mbyte.c:467
 msgid "E543: Not a valid codepage"
 msgstr "E543: ¤£¥¿½Tªº codepage"
 
-#: mbyte.c:3879
+#: mbyte.c:4431
 msgid "E284: Cannot set IC values"
 msgstr "E284: ¤£¯à³]©w IC ¼Æ­È"
 
-#: mbyte.c:4031
+#: mbyte.c:4583
 msgid "E285: Failed to create input context"
 msgstr "E285: µLªk«Ø¥ß input context"
 
-#: mbyte.c:4178
+#: mbyte.c:4741
 msgid "E286: Failed to open input method"
 msgstr "E286: µLªk¶}±Ò¿é¤Jªk"
 
-#: mbyte.c:4189
+#: mbyte.c:4752
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: ĵ§i: µLªk²¾°£ IM ªº callback"
 
-#: mbyte.c:4195
+#: mbyte.c:4758
 msgid "E288: input method doesn't support any style"
 msgstr "E288: ¿é¤Jªk¤£¤ä´©¥ô¦ó style"
 
-#: mbyte.c:4252
+#: mbyte.c:4815
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: ¿é¤Jªk¤£¤ä´©¥ô¦ó style"
 
-#: mbyte.c:4326
+#: mbyte.c:4889
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot »Ý­n¦r«¬¶°(Fontset)"
 
-#: mbyte.c:4358
+#: mbyte.c:4925
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: §Aªº GTK+ ¤ñ 1.2.3 ÁÙ¡CµLªk¨Ï¥Îª¬ºA°Ï¡C"
 
-#: mbyte.c:4637
+#: mbyte.c:5232
 msgid "E292: Input Method Server is not running"
 msgstr "E292: ¨S¦³°õ¦æ¤¤ªº¿é¤JªkºÞ²zµ{¦¡(Input Method Server)"
 
@@ -3342,23 +3526,23 @@
 msgid "E293: block was not locked"
 msgstr "E293: °Ï¶ô¥¼³QÂê©w"
 
-#: memfile.c:989
+#: memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: ¼È¦sÀÉŪ¨ú¿ù»~"
 
-#: memfile.c:994
+#: memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: ¼È¦sÀÉŪ¨ú¿ù»~"
 
-#: memfile.c:1046
+#: memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: ¼È¦sÀɼg¤J¿ù»~"
 
-#: memfile.c:1064
+#: memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: ¼È¦sÀɼg¤J¿ù»~"
 
-#: memfile.c:1261
+#: memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: ¼È¦sÀɤw¸g¦s¦b! (¤p¤ß²Å¸¹³sµ²ªº¦w¥þº|¬}!?)"
 
@@ -3375,42 +3559,42 @@
 msgstr "E298: §ä¤£¨ì°Ï¶ô 2?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: memline.c:444
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ¾¾¾¾, ¼È¦sÀɤ£¨£¤F!!!"
 
-#: memline.c:448
+#: memline.c:449
 msgid "E302: Could not rename swap file"
 msgstr "E302: µLªk§ïÅܼȦsÀɪº¦WºÙ"
 
-#: memline.c:518
+#: memline.c:519
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: µLªk¶}±Ò¼È¦sÀÉ \"%s\", ¤£¥i¯à­×´_¤F"
 
-#: memline.c:617
+#: memline.c:618
 msgid "E304: ml_timestamp: Didn't get block 0??"
 msgstr "E304: ml_timestamp: §ä¤£¨ì°Ï¶ô 0??"
 
-#: memline.c:757
+#: memline.c:758
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: §ä¤£¨ì %s ªº¼È¦sÀÉ"
 
-#: memline.c:767
+#: memline.c:768
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "½Ð¿ï¾Ü§A­n¨Ï¥Îªº¼È¦sÀÉ («ö0 Â÷¶}): "
 
-#: memline.c:812
+#: memline.c:813
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: µLªk¶}±Ò %s"
 
-#: memline.c:834
+#: memline.c:835
 msgid "Unable to read block 0 from "
 msgstr "µLªkŪ¨ú°Ï¶ô 0:"
 
-#: memline.c:837
+#: memline.c:838
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3418,28 +3602,28 @@
 "\n"
 "¥i¯à¬O§A¨S°µ¹L¥ô¦ó­×§ï©Î¬O Vim ÁÙ¨Ó¤£¤Î§ó·s¼È¦sÀÉ."
 
-#: memline.c:847 memline.c:864
+#: memline.c:848 memline.c:865
 msgid " cannot be used with this version of Vim.\n"
 msgstr " µLªk¦b¥»ª©¥»ªº Vim ¤¤¨Ï¥Î.\n"
 
-#: memline.c:849
+#: memline.c:850
 msgid "Use Vim version 3.0.\n"
 msgstr "¨Ï¥Î Vim 3.0¡C\n"
 
-#: memline.c:855
+#: memline.c:856
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ¬Ý°_¨Ó¤£¹³¬O Vim ¼È¦sÀÉ"
 
-#: memline.c:868
+#: memline.c:869
 msgid " cannot be used on this computer.\n"
 msgstr " µLªk¦b³o»O¹q¸£¤W¨Ï¥Î.\n"
 
-#: memline.c:870
+#: memline.c:871
 msgid "The file was created on "
 msgstr "¥»Àɮ׫إߩó "
 
-#: memline.c:874
+#: memline.c:875
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3447,77 +3631,81 @@
 ",\n"
 "©Î¬O³oÀɮפw¸g·l·´¡C"
 
-#: memline.c:903
+#: memline.c:904
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "¨Ï¥Î¼È¦sÀÉ \"%s\""
 
-#: memline.c:909
+#: memline.c:910
 #, c-format
 msgid "Original file \"%s\""
 msgstr "­ì©lÀÉ \"%s\""
 
-#: memline.c:922
+#: memline.c:923
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: ĵ§i: ­ì©lÀÉ®×¥i¯à¤w¸g­×§ï¹L¤F"
 
-#: memline.c:963
+#: memline.c:976
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: µLªk±q %s Ū¨ú°Ï¶ô 1"
 
-#: memline.c:967
+#: memline.c:980
 msgid "???MANY LINES MISSING"
-msgstr "???¯Ê¤Ö¤Ó¦h¦æ"
+msgstr "???¯Ê¤Ö¤Ó¦h¦æ "
 
-#: memline.c:983
+#: memline.c:996
 msgid "???LINE COUNT WRONG"
 msgstr "???¦æ¸¹¿ù»~"
 
-#: memline.c:990
+#: memline.c:1003
 msgid "???EMPTY BLOCK"
 msgstr "???ªÅªº BLOCK"
 
-#: memline.c:1016
+#: memline.c:1029
 msgid "???LINES MISSING"
-msgstr "???§ä¤£¨ì¤@¨Ç¦æ"
+msgstr "???§ä¤£¨ì¤@¨Ç¦æ "
 
-#: memline.c:1048
+#: memline.c:1061
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: °Ï¶ô 1 ID ¿ù»~ (%s ¤£¬O¼È¦sÀÉ?)"
 
-#: memline.c:1053
+#: memline.c:1066
 msgid "???BLOCK MISSING"
 msgstr "???§ä¤£¨ìBLOCK"
 
-#: memline.c:1069
+#: memline.c:1082
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ±q³o¸Ì¨ì ???END ªº¤º®e¥i¯à¦³°ÝÃD"
 
-#: memline.c:1085
+#: memline.c:1098
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ±q³o¸Ì¨ì ???END ªº¤º®e¥i¯à³Q§R°£/´¡¤J¹L"
 
 # do not translate
-#: memline.c:1105
+#: memline.c:1118
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1131
+#: memline.c:1144
 msgid "E311: Recovery Interrupted"
 msgstr "E311: ­×´_¤w¤¤Â_"
 
-#: memline.c:1133
+#: memline.c:1149
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: ­×´_®Éµo¥Í¿ù»~; ½Ðª`·N¶}ÀY¬° ??? ªº¦æ"
+msgstr "E312: ­×´_®Éµo¥Í¿ù»~; ½Ðª`·N¶}ÀY¬° ??? ªº¦æ "
 
-#: memline.c:1136
+#: memline.c:1151
+msgid "See \":help E312\" for more information."
+msgstr "¸Ô²Ó»¡©ú½Ð¨£ \":help E312\""
+
+#: memline.c:1156
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "´_­ì§¹¦¨. ½Ð½T©w¤@¤Á¥¿±`."
 
-#: memline.c:1137
+#: memline.c:1157
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3525,11 +3713,11 @@
 "\n"
 "(§A¥i¯à·|·Q­n§â³o­ÓÀÉ®×¥t¦s§OªºÀɦW¡A\n"
 
-#: memline.c:1138
+#: memline.c:1158
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "¦A°õ¦æ diff »P­ìÀɮפñ¸û¥HÀˬd¬O§_¦³§ïÅÜ)\n"
 
-#: memline.c:1139
+#: memline.c:1159
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3538,51 +3726,51 @@
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1195
+#: memline.c:1215
 msgid "Swap files found:"
 msgstr "§ä¨ì¥H¤Uªº¼È¦sÀÉ:"
 
-#: memline.c:1373
+#: memline.c:1393
 msgid "   In current directory:\n"
 msgstr "   ¦b¥Ø«eªº¥Ø¿ý:\n"
 
-#: memline.c:1375
+#: memline.c:1395
 msgid "   Using specified name:\n"
 msgstr "   Using specified name:\n"
 
-#: memline.c:1379
+#: memline.c:1399
 msgid "   In directory "
 msgstr "   ¦b¥Ø¿ý "
 
-#: memline.c:1397
+#: memline.c:1417
 msgid "      -- none --\n"
 msgstr "      -- µL --\n"
 
-#: memline.c:1469
+#: memline.c:1489
 msgid "          owned by: "
 msgstr "            ¾Ö¦³ªÌ: "
 
-#: memline.c:1471
+#: memline.c:1491
 msgid "   dated: "
 msgstr "    ¤é´Á: "
 
-#: memline.c:1475 memline.c:3689
+#: memline.c:1495 memline.c:3685
 msgid "             dated: "
 msgstr "              ¤é´Á: "
 
-#: memline.c:1491
+#: memline.c:1511
 msgid "         [from Vim version 3.0]"
 msgstr "              [±q Vim ª©¥» 3.0]"
 
-#: memline.c:1495
+#: memline.c:1515
 msgid "         [does not look like a Vim swap file]"
 msgstr "                          [¤£¹³ Vim ªº¼È¦sÀÉ]"
 
-#: memline.c:1499
+#: memline.c:1519
 msgid "         file name: "
 msgstr "              ÀɦW: "
 
-#: memline.c:1505
+#: memline.c:1525
 msgid ""
 "\n"
 "          modified: "
@@ -3590,15 +3778,15 @@
 "\n"
 "            ­×§ï¹L: "
 
-#: memline.c:1506
+#: memline.c:1526
 msgid "YES"
 msgstr "¬O"
 
-#: memline.c:1506
+#: memline.c:1526
 msgid "no"
 msgstr "§_"
 
-#: memline.c:1510
+#: memline.c:1530
 msgid ""
 "\n"
 "         user name: "
@@ -3606,11 +3794,11 @@
 "\n"
 "            ¨Ï¥ÎªÌ: "
 
-#: memline.c:1517
+#: memline.c:1537
 msgid "   host name: "
 msgstr "    ¥D¾÷¦WºÙ: "
 
-#: memline.c:1519
+#: memline.c:1539
 msgid ""
 "\n"
 "         host name: "
@@ -3618,7 +3806,7 @@
 "\n"
 "          ¥D¾÷¦WºÙ: "
 
-#: memline.c:1525
+#: memline.c:1545
 msgid ""
 "\n"
 "        process ID: "
@@ -3626,11 +3814,11 @@
 "\n"
 "        process ID: "
 
-#: memline.c:1531
+#: memline.c:1551
 msgid " (still running)"
 msgstr " (°õ¦æ¤¤)"
 
-#: memline.c:1543
+#: memline.c:1563
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3638,7 +3826,7 @@
 "\n"
 "         [µLªk¦b¥»ª©¥»ªº Vim ¤W¨Ï¥Î]"
 
-#: memline.c:1546
+#: memline.c:1566
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3646,92 +3834,92 @@
 "\n"
 "         [µLªk¦b¥»¹q¸£¤W¨Ï¥Î]"
 
-#: memline.c:1551
+#: memline.c:1571
 msgid "         [cannot be read]"
 msgstr "         [µLªkŪ¨ú]"
 
-#: memline.c:1555
+#: memline.c:1575
 msgid "         [cannot be opened]"
 msgstr "         [µLªk¶}±Ò]"
 
-#: memline.c:1745
+#: memline.c:1765
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: µLªk«O¯d, ¤£¨Ï¥Î¼È¦sÀÉ"
 
-#: memline.c:1798
+#: memline.c:1818
 msgid "File preserved"
 msgstr "Àɮפw«O¯d"
 
-#: memline.c:1800
+#: memline.c:1820
 msgid "E314: Preserve failed"
 msgstr "E314: «O¯d¥¢±Ñ"
 
-#: memline.c:1871
+#: memline.c:1891
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: ¿ù»~ªº lnum: %ld"
 
-#: memline.c:1897
+#: memline.c:1917
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: §ä¤£¨ì²Ä %ld ¦æ"
+msgstr "E316: ml_get: §ä¤£¨ì²Ä %ld ¦æ "
 
-#: memline.c:2287
+#: memline.c:2307
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: «ü¼Ð°Ï¶ô id ¿ù»~ 3"
 
-#: memline.c:2367
+#: memline.c:2387
 msgid "stack_idx should be 0"
 msgstr "stack_idx À³¸Ó¬O 0"
 
-#: memline.c:2429
+#: memline.c:2449
 msgid "E318: Updated too many blocks?"
 msgstr "E318: §ó·s¤Ó¦h°Ï¶ô?"
 
-#: memline.c:2611
+#: memline.c:2631
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: «ü¼Ð°Ï¶ô id ¿ù»~ 4"
 
-#: memline.c:2638
+#: memline.c:2658
 msgid "deleted block 1?"
 msgstr "§R°£°Ï¶ô 1?"
 
-#: memline.c:2838
+#: memline.c:2858
 #, c-format
 msgid "E320: Cannot find line %ld"
-msgstr "E320: §ä¤£¨ì²Ä %ld ¦æ"
+msgstr "E320: §ä¤£¨ì²Ä %ld ¦æ "
 
-#: memline.c:3081
+#: memline.c:3101
 msgid "E317: pointer block id wrong"
 msgstr "E317: «ü¼Ð°Ï¶ô id ¿ù»~"
 
-#: memline.c:3097
+#: memline.c:3117
 msgid "pe_line_count is zero"
 msgstr "pe_line_count ¬°¹s"
 
-#: memline.c:3126
+#: memline.c:3146
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: ¦æ¸¹¶W¥X½d³ò: %ld ¶W¹Lµ²§À"
 
-#: memline.c:3130
+#: memline.c:3150
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: °Ï¶ô %ld ¦æ¼Æ¿ù»~"
 
-#: memline.c:3179
+#: memline.c:3199
 msgid "Stack size increases"
 msgstr "°ïÅ|¤j¤p¼W¥["
 
-#: memline.c:3225
+#: memline.c:3245
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: «ü¼Ð°Ï¶ô id ¿ù 2"
 
-#: memline.c:3679
+#: memline.c:3675
 msgid "E325: ATTENTION"
 msgstr "E325: ª`·N"
 
-#: memline.c:3680
+#: memline.c:3676
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3739,17 +3927,17 @@
 "\n"
 "§ä¨ì¼È¦sÀÉ \""
 
-#: memline.c:3684
+#: memline.c:3680
 msgid "While opening file \""
 msgstr "¦b¶}±ÒÀÉ®× \""
 
-#: memline.c:3693
+#: memline.c:3689
 msgid "      NEWER than swap file!\n"
 msgstr "      ¤ñ¼È¦sÀɧó·s!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3697
+#: memline.c:3693
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3760,11 +3948,11 @@
 "(1) ¥i¯à¦³¥t¤@­Óµ{¦¡¤]¦b½s¿è¦P¤@­ÓÀÉ®×.\n"
 "    ¦pªG¬O³o¼Ë¡A½Ð¤p¤ß¤£­n¨âÃä¤@°_¼g¤J¡A¤£µM§Aªº§V¤O³£·|­t½Ñ¬y¤ô¡C\n"
 
-#: memline.c:3698
+#: memline.c:3694
 msgid "    Quit, or continue with caution.\n"
 msgstr "    Â÷¶}¡A©Î¬OÄ~Äò½s¿è¡C\n"
 
-#: memline.c:3699
+#: memline.c:3695
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3772,23 +3960,23 @@
 "\n"
 "(2) «e¦¸½s¿è¦¹Àɮɷí¾÷\n"
 
-#: memline.c:3700
+#: memline.c:3696
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ¦pªG¬O³o¼Ë, ½Ð¥Î \":recover\" ©Î \"vim -r"
 
-#: memline.c:3702
+#: memline.c:3698
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    ¨Ó±Ï¦^­×§ï¸ê®Æ (¶i¤@¨B»¡©ú½Ð¬Ý \":help recovery\").\n"
+"    ¨Ó±Ï¦^­×§ï¸ê®Æ (¸Ô²Ó»¡©ú½Ð¬Ý \":help recovery\").\n"
 
-#: memline.c:3703
+#: memline.c:3699
 msgid "    If you did this already, delete the swap file \""
 msgstr "    ¦pªG¸Ó±Ïªº³£¤w¸g±Ï¤F, ½Ðª½±µ§R°£¦¹¼È¦sÀÉ \""
 
-#: memline.c:3705
+#: memline.c:3701
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3796,46 +3984,50 @@
 "\"\n"
 "    ¥HÁ×§K¦A¬Ý¨ì¦¹°T®§.\n"
 
-#: memline.c:3719 memline.c:3723
+#: memline.c:3715 memline.c:3719
 msgid "Swap file \""
 msgstr "¼È¦sÀÉ \""
 
-#: memline.c:3720 memline.c:3726
+#: memline.c:3716 memline.c:3722
 msgid "\" already exists!"
 msgstr "\" ¤w¸g¦s¦b¤F!"
 
-#: memline.c:3729
+#: memline.c:3725
 msgid "VIM - ATTENTION"
 msgstr "VIM - ª`·N"
 
-#: memline.c:3731
+#: memline.c:3727
 msgid "Swap file already exists!"
 msgstr "¼È¦sÀɤw¸g¦s¦b!"
 
-#: memline.c:3735
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit"
-msgstr ""
-"¥H°ßŪ¤è¦¡¶}±Ò(&O)\n"
-"ª½±µ½s¿è(&E)\n"
-"­×´_(&R)\n"
-"Â÷¶}(&Q)"
-
-#: memline.c:3737
+#: memline.c:3731
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
 "&Quit\n"
+"&Abort"
+msgstr ""
+"¥H°ßŪ¤è¦¡¶}±Ò(&O)\n"
+"ª½±µ½s¿è(&E)\n"
+"­×´_(&R)\n"
+"Â÷¶}(&Q)\n"
+"¸õ¥X(&A)"
+
+#: memline.c:3733
+msgid ""
+"&Open Read-Only\n"
+"&Edit anyway\n"
+"&Recover\n"
+"&Quit\n"
+"&Abort\n"
 "&Delete it"
 msgstr ""
 "¥H°ßŪ¤è¦¡¶}±Ò(&O)\n"
 "ª½±µ½s¿è(&E)\n"
 "­×´_(&R)\n"
 "Â÷¶}(&Q)\n"
+"¸õ¥X(&A)\n"
 "§R°£¼È¦sÀÉ(&D)"
 
 #: memline.c:3790
@@ -3854,21 +4046,21 @@
 msgid "E329: No menu of that name"
 msgstr "E329: ¨S¦³¨º¼Ëªº¿ï³æ"
 
-#: menu.c:509
+#: menu.c:525
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ¿ï³æ¸ô®|¤£¯à«ü¦V¤l¿ï³æ"
 
-#: menu.c:548
+#: menu.c:564
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ¤£¯àª½±µ§â¿ï¶µ¥[¨ì¿ï³æ¦C¤¤"
 
-#: menu.c:554
+#: menu.c:570
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ¤À¹j½u¤£¯à¬O¿ï³æ¸ô®|ªº¤@³¡¥÷"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: menu.c:1079
+#: menu.c:1097
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3876,81 +4068,81 @@
 "\n"
 "--- ¿ï³æ ---"
 
-#: menu.c:1996
+#: menu.c:2019
 msgid "Tear off this menu"
 msgstr "¤Á¤U¦¹¿ï³æ"
 
-#: menu.c:2061
+#: menu.c:2084
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ¿ï³æ¸ô®|¥²»Ý«ü¦V¤@­Ó¿ï¶µ"
 
-#: menu.c:2081
+#: menu.c:2104
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: [¿ï³æ] §ä¤£¨ì %s"
 
-#: menu.c:2150
+#: menu.c:2173
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s ¼Ò¦¡¥¼©w¸q¿ï³æ"
 
-#: menu.c:2188
+#: menu.c:2211
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ¿ï³æ¸ô®|¥²»Ý«ü¦V¤l¿ï³æ"
 
-#: menu.c:2209
+#: menu.c:2232
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: §ä¤£¨ì¿ï³æ - ½ÐÀˬd¿ï³æ¦WºÙ"
 
-#: message.c:509
+#: message.c:414
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "³B²z %s ®Éµo¥Í¿ù»~:"
 
-#: message.c:525
+#: message.c:440
 #, c-format
 msgid "line %4ld:"
 msgstr "¦æ %4ld:"
 
-#: message.c:565
+#: message.c:647
 msgid "[string too long]"
 msgstr "[¦¹¦æ¹Lªø]"
 
-#: message.c:711
+#: message.c:797
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr ""
 "¥¿Å餤¤å°T®§ºûÅ@ªÌ: Francis S.Lin <piaip@csie.ntu.edu."
 "tw>,                                 Cecil Sheng   <b7506022@csie.ntu.edu.tw>"
 
-#: message.c:935
+#: message.c:1025
 msgid "Interrupt: "
 msgstr "¤w¤¤Â_: "
 
-#: message.c:938
+#: message.c:1028
 msgid "Hit ENTER to continue"
 msgstr "½Ð«ö ENTER Ä~Äò"
 
-#: message.c:940
+#: message.c:1030
 msgid "Hit ENTER or type command to continue"
 msgstr "½Ð«ö ENTER ©Î¨ä¥¦©R¥O¥HÄ~Äò"
 
-#: message.c:2028
+#: message.c:2351
 msgid "-- More --"
 msgstr "-- ©|¦³ --"
 
-#: message.c:2031
+#: message.c:2354
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: ¦V¤U/¦V¤W¤@¦æ, ªÅ¥ÕÁä/b: ¤@­¶, d/u: ¥b­¶, q: Â÷¶})"
 
-#: message.c:2032
+#: message.c:2355
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: ¦V¤U¤@¦æ, ªÅ¥ÕÁä: ¤@­¶, d: ¥b­¶, q: Â÷¶})"
 
-#: message.c:2508 message.c:2523
+#: message.c:2982 message.c:2997
 msgid "Question"
 msgstr "°ÝÃD"
 
-#: message.c:2510
+#: message.c:2984
 msgid ""
 "&Yes\n"
 "&No"
@@ -3958,7 +4150,7 @@
 "&Y¬O\n"
 "&N§_"
 
-#: message.c:2543
+#: message.c:3017
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -3972,59 +4164,60 @@
 "&D¥þ³¡¤£¦s\n"
 "&C¨ú®ø"
 
-#: message.c:2584
+#: message.c:3058
 msgid "Save File dialog"
 msgstr "¦sÀÉ"
 
-#: message.c:2586
+#: message.c:3060
 msgid "Open File dialog"
 msgstr "¶}ÀÉ"
 
 #. TODO: non-GUI file selector here
-#: message.c:2657
+#: message.c:3131
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: ¥D±±¥x(Console)¼Ò¦¡®É¨S¦³ÀÉ®×ÂsÄý¾¹(file browser)"
 
-#: misc1.c:2477
+#: misc1.c:2773
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: ª`·N: §A¥¿¦b­×§ï¤@­Ó°ßŪÀÉ"
 
-#: misc1.c:2712
+#: misc1.c:3021
 msgid "1 more line"
-msgstr "ÁÙ¦³¤@¦æ"
+msgstr "ÁÙ¦³¤@¦æ "
 
-#: misc1.c:2714
+#: misc1.c:3023
 msgid "1 line less"
-msgstr "¤Ö©ó¤@¦æ"
+msgstr "¤Ö©ó¤@¦æ "
 
-#: misc1.c:2719
+#: misc1.c:3028
 #, c-format
 msgid "%ld more lines"
-msgstr " ÁÙ¦³ %ld ¦æ"
+msgstr "ÁÙ¦³ %ld ¦æ "
 
-#: misc1.c:2721
+#: misc1.c:3030
 #, c-format
 msgid "%ld fewer lines"
-msgstr "¥u³Ñ %ld ¦æ"
+msgstr "¥u³Ñ %ld ¦æ "
 
-#: misc1.c:2724
+#: misc1.c:3033
 msgid " (Interrupted)"
 msgstr " (¤w¤¤Â_)"
 
-#: misc1.c:6348
+#: misc1.c:7588
 msgid "Vim: preserving files...\n"
 msgstr "Vim: «O¯dÀɮפ¤...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:6358
+#: misc1.c:7598
 msgid "Vim: Finished.\n"
 msgstr "Vim: µ²§ô.\n"
 
-#: misc2.c:670 misc2.c:686
+#: misc2.c:695 misc2.c:711
+#, c-format
 msgid "ERROR: "
 msgstr "¿ù»~: "
 
-#: misc2.c:690
+#: misc2.c:715
 #, c-format
 msgid ""
 "\n"
@@ -4033,7 +4226,7 @@
 "\n"
 "[bytes] ¥þ³¡ alloc-freed %lu-%lu, ¨Ï¥Î¤¤ %lu, peak ¨Ï¥Î %lu\n"
 
-#: misc2.c:692
+#: misc2.c:717
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4042,194 +4235,220 @@
 "[©I¥s] ¥þ³¡ re/malloc(): %lu, ¥þ³¡ free()': %lu\n"
 "\n"
 
-#: misc2.c:747
+#: misc2.c:772
 msgid "E340: Line is becoming too long"
 msgstr "E340: ¦¹¦æ¹Lªø"
 
-#: misc2.c:791
+#: misc2.c:816
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: ¤º³¡¿ù»~: lalloc(%ld, )"
 
-#: misc2.c:899
+#: misc2.c:924
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: °O¾ÐÅ餣¨¬! (¹Á¸Õ°t¸m %lu ¦ì¤¸²Õ)"
 
-#: misc2.c:2564
+#: misc2.c:2594
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "©I¥s shell °õ¦æ: \"%s\""
 
-#: misc2.c:2785
+#: misc2.c:2816
 msgid "E545: Missing colon"
 msgstr "E545: ¯Ê¤Ö colon"
 
-#: misc2.c:2787 misc2.c:2814
+#: misc2.c:2818 misc2.c:2845
 msgid "E546: Illegal mode"
 msgstr "E546: ¤£¥¿½Tªº¼Ò¦¡"
 
-#: misc2.c:2853
+#: misc2.c:2884
 msgid "E547: Illegal mouseshape"
 msgstr "E547: ¤£¥¿½Tªº·Æ¹«§Îª¬"
 
-#: misc2.c:2893
+#: misc2.c:2924
 msgid "E548: digit expected"
 msgstr "E548: À³¸Ó­n¦³¼Æ¦r"
 
-#: misc2.c:2898
+#: misc2.c:2929
 msgid "E549: Illegal percentage"
 msgstr "E549: ¤£¥¿½Tªº¦Ê¤À¤ñ"
 
-#: misc2.c:3208
+#: misc2.c:3239
 msgid "Enter encryption key: "
 msgstr "¿é¤J±K½X: "
 
-#: misc2.c:3209
+#: misc2.c:3240
 msgid "Enter same key again: "
 msgstr "½Ð¦A¿é¤J¤@¦¸: "
 
-#: misc2.c:3219
+#: misc2.c:3250
 msgid "Keys don't match!"
 msgstr "¨â¦¸¿é¤J±K½X¤£¬Û¦P!"
 
-#: misc2.c:3768
+#: misc2.c:3799
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr "E343: ¤£¥¿½Tªº¸ô®|: '**[number]' ¥²»Ý­n¦b¸ô®|µ²§À©Î­n±µµÛ '%s'"
 
-#: misc2.c:5044
+#: misc2.c:5078
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath ¤¤¨S¦³¥Ø¿ý \"%s\""
 
-#: misc2.c:5047
+#: misc2.c:5081
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: ¦b¸ô®|¤¤§ä¤£¨ìÀÉ®× \"%s\""
 
-#: misc2.c:5053
+#: misc2.c:5087
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: ¦b¸ô®|¤¤§ä¤£¨ì§ó¦hªºÀÉ®× \"%s\""
 
-#: misc2.c:5056
+#: misc2.c:5090
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: ¦b¸ô®|¤¤§ä¤£¨ì§ó¦hªºÀÉ®× \"%s\""
 
-#: misc2.c:5290
+#: misc2.c:5324
 msgid "E550: Missing colon"
 msgstr "E550: ¯Ê¤Ö colon"
 
-#: misc2.c:5302
+#: misc2.c:5336
 msgid "E551: Illegal component"
 msgstr "E551: ¤£¥¿½Tªº¼Ò¦¡"
 
-#: misc2.c:5310
+#: misc2.c:5344
 msgid "E552: digit expected"
 msgstr "E552: À³¸Ó­n¦³¼Æ¦r"
 
 #. Get here when the server can't be found.
-#: netbeans.c:283
+#: netbeans.c:396
 msgid "Cannot connect to Netbeans #2"
 msgstr "µLªk³s±µ¨ì Netbeans #2"
 
-#: netbeans.c:291
+#: netbeans.c:404
 msgid "Cannot connect to Netbeans"
 msgstr "µLªk³s±µ¨ì Netbeans"
 
-#: netbeans.c:565
+#: netbeans.c:450
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans ³s½u¸ê°TÀÉ®×: \"%s\" ¦s¨ú¼Ò¦¡¤£¥¿½T"
+
+#: netbeans.c:749
 msgid "read from Netbeans socket"
 msgstr "¥Ñ Netbeans socket Ū¨ú"
 
-#: normal.c:2913
+#: netbeans.c:1643
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: ½w½Ä°Ï %ld »P NetBeans ªº³s½u¤w¤¤Â_"
+
+#: normal.c:2983
 msgid "Warning: terminal cannot highlight"
 msgstr "ª`·N: §Aªº²×ºÝ¾÷µLªkÅã¥Ü°ª«G«×"
 
-#: normal.c:3128
+#: normal.c:3279
 msgid "E348: No string under cursor"
 msgstr "E348: ´å¼Ð³B¨S¦³¦r¦ê"
 
-#: normal.c:3130
+#: normal.c:3281
 msgid "E349: No identifier under cursor"
 msgstr "E349: ´å¼Ð³B¨S¦³ÃѧO¦r"
 
-#: normal.c:4348
+#: normal.c:4522
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: µLªk¦b¥Ø«eªº 'foldmethod' ¤U§R°£ fold"
 
-#: ops.c:295
+#: normal.c:6743
+msgid "E664: changelist is empty"
+msgstr "E664: Åܧó¦Cªí¬OªÅªº"
+
+#: normal.c:6745
+msgid "E662: At start of changelist"
+msgstr "E662: ¤w¦bÅܧó¦Cªíªº¶}ÀY"
+
+#: normal.c:6747
+msgid "E663: At end of changelist"
+msgstr "E663: ¤w¦bÅܧó¦Cªíªºµ²§À"
+
+#: normal.c:8009
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "­nÂ÷¶} Vim ½Ð¿é¤J :quit<Enter> "
+
+#: ops.c:294
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "¤@¦æ %s ¹L ¤@¦¸"
 
-#: ops.c:297
+#: ops.c:296
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "¤@¦æ %s ¹L %d ¦¸"
 
-#: ops.c:302
+#: ops.c:301
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld ¦æ %s ¹L ¤@¦¸"
 
-#: ops.c:305
+#: ops.c:304
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld ¦æ %s ¹L %d ¦¸"
 
-#: ops.c:663
+#: ops.c:662
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "ÁY±Æ %ld ¦æ..."
+msgstr "ÁY±Æ %ld ¦æ... "
 
-#: ops.c:713
+#: ops.c:712
 msgid "1 line indented "
 msgstr "¤@¦æ¤wÁY±Æ"
 
-#: ops.c:715
+#: ops.c:714
 #, c-format
 msgid "%ld lines indented "
-msgstr "¤wÁY±Æ %ld ¦æ"
+msgstr "¤wÁY±Æ %ld ¦æ "
 
 #. must display the prompt
-#: ops.c:1645
+#: ops.c:1688
 msgid "cannot yank; delete anyway"
 msgstr "µLªk°Å¤U; ª½±µ§R°£"
 
-#: ops.c:2152
+#: ops.c:2274
 msgid "1 line changed"
 msgstr " 1 ¦æ ~ed"
 
-#: ops.c:2154
+#: ops.c:2276
 #, c-format
 msgid "%ld lines changed"
-msgstr " %ld ¦æ ~ed"
+msgstr "¤w§ïÅÜ %ld ¦æ "
 
-#: ops.c:2538
+#: ops.c:2660
 #, c-format
 msgid "freeing %ld lines"
-msgstr "ÄÀ©ñ %ld ¦æ¤¤"
+msgstr "ÄÀ©ñ %ld ¦æ¤¤ "
 
-#: ops.c:2819
+#: ops.c:2941
 msgid "1 line yanked"
-msgstr "¤w½Æ»s 1 ¦æ"
+msgstr "¤w½Æ»s 1 ¦æ "
 
-#: ops.c:2821
+#: ops.c:2943
 #, c-format
 msgid "%ld lines yanked"
-msgstr "¤w½Æ»s %ld ¦æ"
+msgstr "¤w½Æ»s %ld ¦æ "
 
-#: ops.c:3106
+#: ops.c:3228
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: ¼È¦s¾¹ %s ¸Ì¨S¦³ªF¦è"
 
 #. Highlight title
-#: ops.c:3664
+#: ops.c:3779
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4237,11 +4456,12 @@
 "\n"
 "--- ¼È¦s¾¹ ---"
 
-#: ops.c:4873
+#: ops.c:5088
 msgid "Illegal register name"
 msgstr "¤£¥¿½Tªº¼È¦s¾¹¦WºÙ"
 
-#: ops.c:4959
+#: ops.c:5176
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4249,58 +4469,58 @@
 "\n"
 "# ¼È¦s¾¹:\n"
 
-#: ops.c:4992
+#: ops.c:5226
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ¥¼ª¾ªºµù¥U«¬ºA: %d"
 
-#: ops.c:5412
+#: ops.c:5711
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: ¼È¦s¾¹¦WºÙ¿ù»~: '%s'"
 
-#: ops.c:5750
+#: ops.c:6071
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld Äæ; "
 
-#: ops.c:5757
+#: ops.c:6078
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "¿ï¾Ü¤F %s%ld/%ld ¦æ; %ld/%ld ¦r(Word); %ld/%ld ¦r¤¸(Bytes)"
 
-#: ops.c:5773
+#: ops.c:6094
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "Äæ %s/%s; ¦æ %ld/%ld; ¦r(Word) %ld/%ld; ¦r¤¸(Byte) %ld/%ld"
 
-#: ops.c:5784
+#: ops.c:6105
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1579
+#: option.c:1643
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=²Ä %N ­¶"
 
 # ? what's this for?
-#: option.c:2012
+#: option.c:2092
 msgid "Thanks for flying Vim"
 msgstr "·PÁ±z·R¥Î Vim"
 
-#: option.c:3250 option.c:3357
+#: option.c:3419 option.c:3535
 msgid "E518: Unknown option"
 msgstr "E518: ¤£¥¿½Tªº¿ï¶µ"
 
-#: option.c:3263
+#: option.c:3432
 msgid "E519: Option not supported"
 msgstr "E519: ¤£¤ä´©¸Ó¿ï¶µ"
 
-#: option.c:3288
+#: option.c:3457
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: ¤£¯à¦b Modeline ¸Ì¥X²{"
 
-#: option.c:3344
+#: option.c:3522
 msgid ""
 "\n"
 "\tLast set from "
@@ -4308,134 +4528,138 @@
 "\n"
 "\t¤W¦¸³]©w: "
 
-#: option.c:3483
+#: option.c:3661
 msgid "E521: Number required after ="
 msgstr "E521: = «á»Ý­n¦³¼Æ¦r"
 
-#: option.c:3797 option.c:4413
+#: option.c:3989 option.c:4619
 msgid "E522: Not found in termcap"
 msgstr "E522: Termcap ¸Ì­±§ä¤£¨ì"
 
-#: option.c:3863
+#: option.c:4064
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ¤£¥¿½Tªº¦r¤¸ <%s>"
 
-#: option.c:4405
+#: option.c:4611
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: µLªk³]©w 'term' ¬°ªÅ¦r¦ê"
 
-#: option.c:4408
+#: option.c:4614
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: ¦b¹Ï«¬¬É­±¤¤µLªk¤Á´« term"
 
-#: option.c:4410
+#: option.c:4616
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: ¿é¤J \":gui\" ¨Ó±Ò°Ê¹Ï§Î¬É­±"
 
-#: option.c:4431
+#: option.c:4645
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' ¸ò 'patchmode' ¬O¤@¼Ëªº"
 
-#: option.c:4616
+#: option.c:4860
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: ¦b¹Ï«¬¬É­±¤¤µLªk¤Á´« term"
 
-#: option.c:4748
+#: option.c:5016
 msgid "E524: Missing colon"
 msgstr "E524: ¯Ê¤Ö colon"
 
-#: option.c:4750
+#: option.c:5018
 msgid "E525: Zero length string"
 msgstr "E525: ¹sªø«×¦r¦ê"
 
-#: option.c:4818
+#: option.c:5086
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> «á¯Ê¤Ö¼Æ¦r"
 
-#: option.c:4832
+#: option.c:5100
 msgid "E527: Missing comma"
 msgstr "E527: ¯Ê¤Ö³r¸¹"
 
-#: option.c:4839
+#: option.c:5107
 msgid "E528: Must specify a ' value"
 msgstr "E528: ¥²»Ý«ü©w¤@­Ó ' ­È"
 
-#: option.c:4880
+#: option.c:5148
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: ¤º§tµLªkÅã¥Üªº¦r¤¸"
 
-#: option.c:4929
+#: option.c:5197
 msgid "E596: Invalid font(s)"
 msgstr "E596: ¤£¥¿½Tªº¦r«¬"
 
-#: option.c:4937
+#: option.c:5205
 msgid "E597: can't select fontset"
 msgstr "E597: µLªk¨Ï¥Î¦r«¬¶°(Fontset)"
 
-#: option.c:4939
+#: option.c:5207
 msgid "E598: Invalid fontset"
 msgstr "E598: ¤£¥¿½Tªº¦r«¬¶°(Fontset)"
 
-#: option.c:4946
+#: option.c:5214
 msgid "E533: can't select wide font"
 msgstr "E533: µLªk¨Ï¥Î³]©wªº¤¤¤å¦r«¬(Widefont)"
 
-#: option.c:4948
+#: option.c:5216
 msgid "E534: Invalid wide font"
 msgstr "E534: ¤£¥¿½Tªº¦r«¬(Widefont)"
 
-#: option.c:5218
+#: option.c:5486
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> «á¦³¤£¥¿½Tªº¦r¤¸"
 
-#: option.c:5322
+#: option.c:5597
 msgid "E536: comma required"
 msgstr "E536: »Ý­n³r¸¹"
 
-#: option.c:5330
+#: option.c:5607
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' ¥²»Ý¬OªÅ¥Õ©Î¥]§t %s"
 
-#: option.c:5377
+#: option.c:5682
 msgid "E538: No mouse support"
 msgstr "E538: ¤£¤ä´©·Æ¹«"
 
-#: option.c:5645
+#: option.c:5950
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: ¨S¦³µ²§ôªº¹Bºâ¦¡: "
 
-#: option.c:5649
+#: option.c:5954
 msgid "E541: too many items"
 msgstr "E541: ¤Ó¦h¶µ¥Ø"
 
-#: option.c:5651
+#: option.c:5956
 msgid "E542: unbalanced groups"
 msgstr "E542: ¤£¹ïºÙªº group"
 
-#: option.c:5872
+#: option.c:6196
 msgid "E590: A preview window already exists"
 msgstr "E590: ¹wµøªºµøµ¡¤w¸g¦s¦b¤F"
 
-#: option.c:6346
+#: option.c:6453
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic »Ý­n UTF-8, ½Ð°õ¦æ ':set encoding=utf-8'"
+
+#: option.c:6786
 #, c-format
 msgid "E593: Need at least %d lines"
-msgstr "E593: ¦Ü¤Ö»Ý­n %d ¦æ"
+msgstr "E593: ¦Ü¤Ö»Ý­n %d ¦æ "
 
-#: option.c:6355
+#: option.c:6796
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: ¦Ü¤Ö»Ý­n %d Äæ"
 
-#: option.c:6660
+#: option.c:7103
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ¤£¥¿½Tªº¿ï¶µ: %s"
 
-#: option.c:6769
+#: option.c:7223
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4443,7 +4667,7 @@
 "\n"
 "--- ²×ºÝ¾÷½X ---"
 
-#: option.c:6771
+#: option.c:7225
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4451,7 +4675,7 @@
 "\n"
 "--- Global ¿ï¶µ­È ---"
 
-#: option.c:6773
+#: option.c:7227
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4459,7 +4683,7 @@
 "\n"
 "--- Local ¿ï¶µ­È ---"
 
-#: option.c:6775
+#: option.c:7229
 msgid ""
 "\n"
 "--- Options ---"
@@ -4467,152 +4691,153 @@
 "\n"
 "--- ¿ï¶µ ---"
 
-#: option.c:7467
+#: option.c:7935
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp ¿ù»~"
 
-#: option.c:8425
+#: option.c:8906
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': §ä¤£¨ì %s ¹ïÀ³ªº¦r¤¸"
 
-#: option.c:8459
+#: option.c:8940
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': ¤À¸¹«á¦³¦h¾lªº¦r¤¸: %s"
 
-#: os_amiga.c:273
+#: os_amiga.c:280
 msgid "cannot open "
 msgstr "¤£¯à¶}±Ò"
 
-#: os_amiga.c:307
+#: os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: µLªk¶}±Òµøµ¡!\n"
 
-#: os_amiga.c:329
+#: os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "»Ý­n Amigados ª©¥» 2.04 ¥H¤W\n"
 
-#: os_amiga.c:335
+#: os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "»Ý­n %s ª©¥» %ld\n"
 
-#: os_amiga.c:407
+#: os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "µLªk¶}±Ò NIL:\n"
 
-#: os_amiga.c:418
+#: os_amiga.c:427
 msgid "Cannot create "
 msgstr "¤£¯à«Ø¥ß "
 
-#: os_amiga.c:896
+#: os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim µ²§ô¶Ç¦^­È: %d\n"
 
-#: os_amiga.c:928
+#: os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "µLªk¤Á´«¥D±±¥x(console)¼Ò¦¡ !?\n"
 
-#: os_amiga.c:994
+#: os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ¤£¬O¥D±±¥x(console)??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1143
+#: os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: ¤£¯à¥Î -f ¿ï¶µ°õ¦æ shell"
 
-#: os_amiga.c:1184 os_amiga.c:1274
+#: os_amiga.c:1202 os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "¤£¯à°õ¦æ "
 
-#: os_amiga.c:1187 os_amiga.c:1284
+#: os_amiga.c:1205 os_amiga.c:1302
 msgid "shell "
 msgstr "shell "
 
-#: os_amiga.c:1207 os_amiga.c:1309
+#: os_amiga.c:1225 os_amiga.c:1327
 msgid " returned\n"
 msgstr " ¤wªð¦^\n"
 
-#: os_amiga.c:1450
+#: os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
 msgstr "ANCHOR_BUF_SIZE ¤Ó¤p"
 
-#: os_amiga.c:1454
+#: os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "I/O ¿ù»~"
 
-#: os_mswin.c:515
+#: os_mswin.c:548
 msgid "...(truncated)"
 msgstr "...(¤w¤Á±¼)"
 
-#: os_mswin.c:617
+#: os_mswin.c:650
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ¤£¬O 80, µLªk°õ¦æ¥~³¡©R¥O"
 
-#: os_mswin.c:1802
+#: os_mswin.c:1982
 msgid "E237: Printer selection failed"
 msgstr "E237: µLªk¿ï¾Ü¦¹¦Lªí¾÷"
 
-#: os_mswin.c:1842
+#: os_mswin.c:2022
 #, c-format
 msgid "to %s on %s"
 msgstr "¨ì %s on %s"
 
-#: os_mswin.c:1857
+#: os_mswin.c:2037
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: ¤£¥¿½Tªº¦Lªí¾÷¦r«¬: %s"
 
-#: os_mswin.c:1907 os_mswin.c:1917
+#: os_mswin.c:2086 os_mswin.c:2096
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: ¦C¦L¿ù»~: %s"
 
-#: os_mswin.c:1918
+#: os_mswin.c:2097
 msgid "Unknown"
 msgstr "¥¼ª¾"
 
-#: os_mswin.c:1945
+#: os_mswin.c:2124
 #, c-format
 msgid "Printing '%s'"
 msgstr "¦C¦L¤¤: '%s'"
 
-#: os_mswin.c:3033
+#: os_mswin.c:3213
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: ¦r¤¸¶° \"%s\" µLªk¹ïÀ³¦r«¬\"%s\""
 
-#: os_mswin.c:3041
+#: os_mswin.c:3221
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: ¤£¥¿½Tªº¦r¤¸ '%c' ¥X²{¦b¦r«¬¦WºÙ \"%s\" ¤º"
 
-#: os_riscos.c:1258
+#: os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: ¤£¥¿½Tªº 'filetype' ¿ï¶µ - ¨Ï¥Î¯Â¤å¦r¼Ò¦¡"
 
-#: os_unix.c:871
+#: os_unix.c:927
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: Âù­«signal, Â÷¶}¤¤\n"
 
-#: os_unix.c:877
+#: os_unix.c:933
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: CVim: ÄdºI¨ì«H¸¹(signal) %s\n"
 
-#: os_unix.c:880
+#: os_unix.c:936
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: ÄdºI¨ì­P©Rªº«H¸¹(deadly signale)\n"
 
-#: os_unix.c:1143
+#: os_unix.c:1199
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "¶}±Ò X Window ¯Ó®É %ld msec"
 
-#: os_unix.c:1170
+#: os_unix.c:1226
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4620,15 +4845,15 @@
 "\n"
 "Vim: X ¿ù»~\n"
 
-#: os_unix.c:1276
+#: os_unix.c:1338
 msgid "Testing the X display failed"
 msgstr "´ú¸Õ X Window ¥¢±Ñ"
 
-#: os_unix.c:1415
+#: os_unix.c:1477
 msgid "Opening the X display timed out"
 msgstr "¶}±Ò X Window ¹O®É"
 
-#: os_unix.c:3145 os_unix.c:3825
+#: os_unix.c:3234 os_unix.c:3914
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4636,7 +4861,7 @@
 "\n"
 "¤£¯à°õ¦æ shell"
 
-#: os_unix.c:3193
+#: os_unix.c:3282
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4644,7 +4869,7 @@
 "\n"
 "¤£¯à°õ¦æ shell sh\n"
 
-#: os_unix.c:3197 os_unix.c:3831
+#: os_unix.c:3286 os_unix.c:3920
 msgid ""
 "\n"
 "shell returned "
@@ -4652,7 +4877,7 @@
 "\n"
 "Shell ¤wªð¦^"
 
-#: os_unix.c:3332
+#: os_unix.c:3421
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4660,7 +4885,7 @@
 "\n"
 "¤£¯à«Ø¥ß pipe ºÞ½u\n"
 
-#: os_unix.c:3347
+#: os_unix.c:3436
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4668,7 +4893,7 @@
 "\n"
 "¤£¯à fork\n"
 
-#: os_unix.c:3838
+#: os_unix.c:3927
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4676,53 +4901,78 @@
 "\n"
 "©R¥O¤w²×µ²\n"
 
-#: os_unix.c:5398
+#: os_unix.c:4191 os_unix.c:4316 os_unix.c:5982
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ¥¢¥h ICE ³s½u"
+
+#: os_unix.c:5565
 msgid "Opening the X display failed"
 msgstr "¶}±Ò X Window ¥¢±Ñ"
 
+#: os_unix.c:5887
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP ¥¿¦b³B²z¦Û§ÚÀx¦s­n¨D"
+
+#: os_unix.c:6006
+msgid "XSMP opening connection"
+msgstr "¶}±Ò XSMP ³s½u¤¤"
+
+#: os_unix.c:6025
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE ³s½uºÊ¬Ý¥¢±Ñ"
+
+#: os_unix.c:6045
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection ¥¢±Ñ: %s"
+
 #: os_vms_mms.c:59
 msgid "At line"
 msgstr "¦b¦æ¸¹ "
 
-#: os_w32exe.c:169
-msgid "Could not load vim32.dll!"
-msgstr "µLªk¸ü¤J vim32.dll¡I"
+#: os_w32exe.c:65
+msgid "Could not allocate memory for command line."
+msgstr "µLªk¬°©R¥O¦C°t¸m°O¾ÐÅé¡C"
 
-#: os_w32exe.c:169 os_w32exe.c:179
+#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
 msgid "VIM Error"
 msgstr "VIM ¿ù»~"
 
-#: os_w32exe.c:179
+#: os_w32exe.c:89
+msgid "Could not load vim32.dll!"
+msgstr "µLªk¸ü¤J vim32.dll¡I"
+
+#: os_w32exe.c:99
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "¤£¯à­×¥¿¨ç¦¡«ü¼Ð¨ì DLL!"
 
-#: os_win16.c:583 os_win32.c:3047
+#: os_win16.c:342 os_win32.c:3248
 #, c-format
 msgid "shell returned %d"
 msgstr "Shell ¶Ç¦^­È %d"
 
-#: os_win32.c:2505
+#: os_win32.c:2706
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ÄdºI¨ì %s \n"
 
-#: os_win32.c:2507
+#: os_win32.c:2708
 msgid "close"
 msgstr "Ãö³¬"
 
-#: os_win32.c:2509
+#: os_win32.c:2710
 msgid "logoff"
 msgstr "µn¥X"
 
-#: os_win32.c:2510
+#: os_win32.c:2711
 msgid "shutdown"
 msgstr "Ãö¾÷"
 
-#: os_win32.c:3000
+#: os_win32.c:3201
 msgid "E371: Command not found"
 msgstr "E371: §ä¤£¨ì©R¥O"
 
-#: os_win32.c:3013
+#: os_win32.c:3214
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4732,7 +4982,7 @@
 "¥~³¡©R¥O°õ¦æ§¹²¦«á±N¤£·|¼È°±.\n"
 "¶i¤@¨B»¡©ú½Ð°õ¦æ :help win32-vimrun "
 
-#: os_win32.c:3016
+#: os_win32.c:3217
 msgid "Vim Warning"
 msgstr "Vim ĵ§i"
 
@@ -4769,37 +5019,37 @@
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ¥¼³]©w"
 
-#: quickfix.c:497
+#: quickfix.c:501
 msgid "E379: Missing or empty directory name"
 msgstr "E379: §ä¤£¨ì¥Ø¿ý¦WºÙ©Î¬OªÅªº¥Ø¿ý¦WºÙ"
 
-#: quickfix.c:979
+#: quickfix.c:990
 msgid "E553: No more items"
 msgstr "E553: ¨S¦³¨ä¥¦¶µ¥Ø"
 
-#: quickfix.c:1200
+#: quickfix.c:1229
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d / %d)%s%s: "
 
-#: quickfix.c:1202
+#: quickfix.c:1231
 msgid " (line deleted)"
 msgstr " (¦æ¤w§R°£)"
 
-#: quickfix.c:1412
+#: quickfix.c:1444
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Quickfix °ïÅ|µ²§À"
 
-#: quickfix.c:1421
+#: quickfix.c:1453
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Quickfix °ïÅ|³»ºÝ"
 
-#: quickfix.c:1433
+#: quickfix.c:1465
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "¿ù»~¦Cªí %d/%d; ¦@¦³ %d ¶µ¿ù»~"
 
-#: quickfix.c:1904
+#: quickfix.c:1943
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: µLªk¼g¤J¡A'buftype' ¿ï¶µ¤w³]©w"
 
@@ -4808,303 +5058,315 @@
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ¤£¥¿½Tªº¶µ¥Ø¡G %s%%[]"
 
-#: regexp.c:826
+#: regexp.c:838
 msgid "E339: Pattern too long"
 msgstr "E339: ¦W¦r¤Óªø"
 
-#: regexp.c:995
+#: regexp.c:1009
 msgid "E50: Too many \\z("
 msgstr "E50: ¤Ó¦h \\z("
 
-#: regexp.c:1006
+#: regexp.c:1020
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: ¤Ó¦h %s("
 
-#: regexp.c:1063
+#: regexp.c:1077
 msgid "E52: Unmatched \\z("
 msgstr "E52: µL¹ïÀ³ªº \\z("
 
-#: regexp.c:1067
+#: regexp.c:1081
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: µL¹ïÀ³ªº %s%%("
 
-#: regexp.c:1069
+#: regexp.c:1083
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: µL¹ïÀ³ªº %s("
 
-#: regexp.c:1074
+#: regexp.c:1088
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: µL¹ïÀ³ªº %s)"
 
-#: regexp.c:1237
+#: regexp.c:1258
 #, c-format
 msgid "E56: %s* operand could be empty"
 msgstr "E56: %s* ¹Bºâ¤¸¥i¥H¬OªÅªº"
 
-#: regexp.c:1240
+#: regexp.c:1261
 #, c-format
 msgid "E57: %s+ operand could be empty"
 msgstr "E56: %s+ ¹Bºâ¤¸¥i¥H¬OªÅªº"
 
-#: regexp.c:1294
+#: regexp.c:1316
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: «á­±¦³¤£¥¿½Tªº¦r¤¸: %s@"
 
-#: regexp.c:1319
+#: regexp.c:1344
 #, c-format
 msgid "E58: %s{ operand could be empty"
 msgstr "E58: %s{ ¹Bºâ¤¸¥i¥H¬OªÅªº"
 
-#: regexp.c:1329
+#: regexp.c:1354
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: ¤Ó¦h½ÆÂøªº %s{...}s"
 
-#: regexp.c:1345
+#: regexp.c:1370
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: ±_ª¬ %s*"
 
-#: regexp.c:1348
+#: regexp.c:1373
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: ±_ª¬ %s%c"
 
-#: regexp.c:1466
+#: regexp.c:1491
 msgid "E63: invalid use of \\_"
 msgstr "E63: ¤£¥¿½Tªº¨Ï¥Î \\_"
 
-#: regexp.c:1511
+#: regexp.c:1536
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c ¨S¦³±µªF¦è"
 
-#: regexp.c:1567
+#: regexp.c:1592
 msgid "E65: Illegal back reference"
 msgstr "E65: ¤£¥¿½Tªº¤Ï¦V°Ñ¦Ò"
 
-#: regexp.c:1580
+#: regexp.c:1605
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ¤£¯à¦b¦¹¥X²{"
 
-#: regexp.c:1599
+#: regexp.c:1624
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 et al. ¤£¯à¦b¦¹¥X²{"
 
-#: regexp.c:1610
+#: regexp.c:1635
 msgid "E68: Invalid character after \\z"
 msgstr "E68: «á­±¦³¤£¥¿½Tªº¦r¤¸: \\z"
 
-#: regexp.c:1659
+#: regexp.c:1684
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ «á¯Ê¤Ö ]"
 
-#: regexp.c:1675
+#: regexp.c:1700
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: ªÅªº %s%%[]"
 
-#: regexp.c:1735
+#: regexp.c:1760
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: «á­±¦³¤£¥¿½Tªº¦r¤¸: %s%%"
 
-#: regexp.c:2530
+#: regexp.c:2557
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: »yªk¿ù»~: %s{...}"
 
-#: regexp.c:2777
+#: regexp.c:2863 regexp.c:3016
 msgid "E361: Crash intercepted; regexp too complex?"
 msgstr "E361: µLªk°õ¦æ; regular expression ¤Ó½ÆÂø?"
 
-#: regexp.c:2912
+#: regexp.c:3004 regexp.c:3013
 msgid "E363: pattern caused out-of-stack error"
 msgstr "E363: regular expression ³y¦¨°ïÅ|¥Î¥úªº¿ù»~"
 
-#: regexp.c:3148
+#: regexp.c:3258
 msgid "External submatches:\n"
 msgstr "¥~³¡²Å¦X:\n"
 
-#: screen.c:2103
+#: screen.c:2184
 #, c-format
 msgid "+--%3ld lines folded "
-msgstr "+--¤w fold %3ld ¦æ"
+msgstr "+--¤w fold %3ld ¦æ "
 
-#: screen.c:7785
+#: screen.c:8000
 msgid " VREPLACE"
 msgstr " V-¨ú¥N"
 
-#: screen.c:7789
+#: screen.c:8004
 msgid " REPLACE"
 msgstr " ¨ú¥N"
 
-#: screen.c:7794
+#: screen.c:8009
 msgid " REVERSE"
 msgstr " ¤ÏÂà"
 
-#: screen.c:7796
+#: screen.c:8011
 msgid " INSERT"
 msgstr " ´¡¤J"
 
-#: screen.c:7799
+#: screen.c:8014
 msgid " (insert)"
 msgstr " (´¡¤J)"
 
-#: screen.c:7801
+#: screen.c:8016
 msgid " (replace)"
 msgstr " (¨ú¥N)"
 
-#: screen.c:7803
+#: screen.c:8018
 msgid " (vreplace)"
 msgstr " (v-¨ú¥N)"
 
-#: screen.c:7806
+#: screen.c:8021
 msgid " Hebrew"
 msgstr " Hebrew"
 
-#: screen.c:7814
+#: screen.c:8032
+msgid " Arabic"
+msgstr " Arabic"
+
+#: screen.c:8035
 msgid " (lang)"
 msgstr " (»y¨¥)"
 
-#: screen.c:7817
+#: screen.c:8039
 msgid " (paste)"
 msgstr " (¶K¤W)"
 
-#: screen.c:7823
-msgid " SELECT"
-msgstr " ¿ï¨ú"
-
-#: screen.c:7825
+#: screen.c:8052
 msgid " VISUAL"
 msgstr " ¿ï¨ú"
 
-#: screen.c:7827
-msgid " BLOCK"
-msgstr " °Ï¶ô"
+#: screen.c:8053
+msgid " VISUAL LINE"
+msgstr " [¦æ] "
 
-#: screen.c:7829
-msgid " LINE"
-msgstr " ¦æ¿ï¨ú"
+#: screen.c:8054
+msgid " VISUAL BLOCK"
+msgstr " [°Ï¶ô] "
 
-#: screen.c:7842 screen.c:7902
+#: screen.c:8055
+msgid " SELECT"
+msgstr " ¿ï¨ú"
+
+#: screen.c:8056
+msgid " SELECT LINE"
+msgstr " ¿ï¨ú¦æ "
+
+#: screen.c:8057
+msgid " SELECT BLOCK"
+msgstr " ¿ï¨ú°Ï¶ô"
+
+#: screen.c:8072 screen.c:8135
 msgid "recording"
 msgstr "°O¿ý¤¤"
 
-#: search.c:36
+#: search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "¤w·j´M¨ìÀÉ®×¶}ÀY¡F¦A±qµ²§ÀÄ~Äò·j´M"
 
-#: search.c:37
+#: search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "¤w·j´M¨ìÀÉ®×µ²§À¡F¦A±q¶}ÀYÄ~Äò·j´M"
 
-#: search.c:455
+#: search.c:526
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ¿ù»~ªº·j´M¦r¦ê: %s"
 
-#: search.c:782
+#: search.c:853
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ¤w·j´M¨ìÀÉ®×¶}ÀY¤´§ä¤£¨ì %s"
 
-#: search.c:784
+#: search.c:856
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ¤w·j´M¨ìÀÉ®×µ²§À¤´§ä¤£¨ì %s"
 
-#: search.c:1157
+#: search.c:1249
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ¦b ';' «á­±À³¸Ó¦³ '?' ©Î '/'"
 
-#: search.c:3567
+#: search.c:3768
 msgid " (includes previously listed match)"
 msgstr " (¥]¬A«e¦¸¦C¥X²Å¦X¶µ)"
 
 #. cursor at status line
-#: search.c:3587
+#: search.c:3788
 msgid "--- Included files "
 msgstr "--- ¤Þ¤JÀÉ®× "
 
-#: search.c:3589
+#: search.c:3790
 msgid "not found "
 msgstr "§ä¤£¨ì "
 
-#: search.c:3590
+#: search.c:3791
 msgid "in path ---\n"
 msgstr "---\n"
 
-#: search.c:3629
+#: search.c:3848
 msgid "  (Already listed)"
 msgstr "  (¤w¦C¥X)"
 
-#: search.c:3631
+#: search.c:3850
 msgid "  NOT FOUND"
 msgstr "  §ä¤£¨ì"
 
-#: search.c:3683
+#: search.c:3902
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "·j´M¤Þ¤JÀÉ®×: %s"
 
-#: search.c:3901
+#: search.c:4120
 msgid "E387: Match is on current line"
 msgstr "E387: ¥Ø«e©Ò¦b¦æ¤¤¦³¤@¤Ç°t"
 
-#: search.c:4041
+#: search.c:4263
 msgid "All included files were found"
 msgstr "©Ò¦³¤Þ¤JÀɮ׳£¤w§ä¨ì"
 
-#: search.c:4043
+#: search.c:4265
 msgid "No included files"
 msgstr "¨S¦³¤Þ¤JÀÉ®×"
 
-#: search.c:4059
+#: search.c:4281
 msgid "E388: Couldn't find definition"
 msgstr "E388: §ä¤£¨ì©w¸q"
 
-#: search.c:4061
+#: search.c:4283
 msgid "E389: Couldn't find pattern"
 msgstr "E389: §ä¤£¨ì pattern"
 
-#: syntax.c:3015
+#: syntax.c:3050
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: °Ñ¼Æ¤£¥¿½T: %s"
 
-#: syntax.c:3195
+#: syntax.c:3230
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: µL¦¹ syntax cluster: \"%s\""
 
-#: syntax.c:3359
+#: syntax.c:3394
 msgid "No Syntax items defined for this buffer"
 msgstr "³o­Ó½w½Ä°Ï¨S¦³©w¸q¥ô¦ó»yªk"
 
-#: syntax.c:3367
+#: syntax.c:3402
 msgid "syncing on C-style comments"
 msgstr "C»y¨¥¦¡µù¸Ñ¦P¨B¤Æ¤¤"
 
-#: syntax.c:3375
+#: syntax.c:3410
 msgid "no syncing"
 msgstr "¨S¦³¦P¨B¤Æ"
 
-#: syntax.c:3378
+#: syntax.c:3413
 msgid "syncing starts "
 msgstr "¦P¨B¤Æ¶}©l"
 
-#: syntax.c:3380 syntax.c:3455
+#: syntax.c:3415 syntax.c:3490
 msgid " lines before top line"
 msgstr "¦æ¸¹¶W¥X½d³ò"
 
-#: syntax.c:3385
+#: syntax.c:3420
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5112,7 +5374,7 @@
 "\n"
 "--- »yªk¦P¨Bª«¥ó (Syntax sync items) ---"
 
-#: syntax.c:3390
+#: syntax.c:3425
 msgid ""
 "\n"
 "syncing on items"
@@ -5120,7 +5382,7 @@
 "\n"
 "¦P¨B¤Æ¤¤:"
 
-#: syntax.c:3396
+#: syntax.c:3431
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5128,177 +5390,187 @@
 "\n"
 "--- »yªk¶µ¥Ø ---"
 
-#: syntax.c:3419
+#: syntax.c:3454
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: µL¦¹ syntax cluster: \"%s\""
 
-#: syntax.c:3445
+#: syntax.c:3480
 msgid "minimal "
 msgstr "³Ì¤p"
 
-#: syntax.c:3452
+#: syntax.c:3487
 msgid "maximal "
 msgstr "³Ì¤j"
 
-#: syntax.c:3464
+#: syntax.c:3499
 msgid "; match "
 msgstr "; ²Å¦X "
 
-#: syntax.c:3466
+#: syntax.c:3501
 msgid " line breaks"
-msgstr "Â_¦æ"
+msgstr "Â_¦æ "
 
-#: syntax.c:4100
+#: syntax.c:4135
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: ¨Ï¥Î¤F¤£¥¿½Tªº°Ñ¼Æ"
 
-#: syntax.c:4124
+#: syntax.c:4159
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: §ä¤£¨ì %s ªº region item"
 
-#: syntax.c:4152
+#: syntax.c:4187
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ¨Ï¥Î¤F¤£¥¿½Tªº°Ñ¼Æ"
 
-#: syntax.c:4163
+#: syntax.c:4198
 msgid "E396: containedin argument not accepted here"
 msgstr "E396: ¨Ï¥Î¤F¤£¥¿½Tªº°Ñ¼Æ"
 
-#: syntax.c:4241
+#: syntax.c:4276
 msgid "E397: Filename required"
 msgstr "E397: »Ý­nÀɮצWºÙ"
 
-#: syntax.c:4579
+#: syntax.c:4614
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: ¯Ê¤Ö \"=\": %s"
 
-#: syntax.c:4737
+#: syntax.c:4772
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: syntax region %s ªº¤Þ¼Æ¤Ó¤Ö"
 
-#: syntax.c:5068
+#: syntax.c:5103
 msgid "E400: No cluster specified"
 msgstr "E400: ¨S¦³«ü©wªºÄÝ©Ê"
 
-#: syntax.c:5105
+#: syntax.c:5140
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: §ä¤£¨ì¤À¹j²Å¸¹: %s"
 
-#: syntax.c:5180
+#: syntax.c:5215
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: '%s' «á­±ªºªF¦èµLªk¿ëÃÑ"
 
-#: syntax.c:5270
+#: syntax.c:5305
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: »yªk¦P¨B: ³s±µ¦æ²Å¸¹³Q«ü©w¤F¨â¦¸"
 
-#: syntax.c:5327
+#: syntax.c:5362
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: °Ñ¼Æ¤£¥¿½T: %s"
 
-#: syntax.c:5377
+#: syntax.c:5412
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ¯Ê¤Ö¬Ûµ¥²Å¸¹: %s"
 
-#: syntax.c:5383
+#: syntax.c:5418
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: ªÅ¥Õ°Ñ¼Æ: %s"
 
-#: syntax.c:5410
+#: syntax.c:5445
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s ¤£¯à¦b¦¹¥X²{"
 
-#: syntax.c:5417
+#: syntax.c:5452
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s ¥²¶·¬O¦Cªí¸Ìªº²Ä¤@­Ó"
 
-#: syntax.c:5487
+#: syntax.c:5522
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ¤£¥¿½Tªº¸s²Õ¦WºÙ: %s"
 
-#: syntax.c:5720
+#: syntax.c:5755
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ¤£¥¿½Tªº :syntax ¤l©R¥O: %s"
 
-#: syntax.c:6099
+#: syntax.c:6136
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: §ä¤£¨ì highlight group: %s"
 
-#: syntax.c:6123
+#: syntax.c:6160
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: °Ñ¼Æ¤Ó¤Ö: \":highlight link %s\""
 
-#: syntax.c:6130
+#: syntax.c:6167
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: °Ñ¼Æ¹L¦h: \":highlight link %s\""
 
-#: syntax.c:6150
+#: syntax.c:6187
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: ¤w³]©w¸s²Õ, ©¿²¤ highlight link"
 
-#: syntax.c:6279
+#: syntax.c:6316
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: ¤£¸Ó¦³ªºµ¥¸¹: %s"
 
-#: syntax.c:6315
+#: syntax.c:6352
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: ¯Ê¤Ö¬Ûµ¥²Å¸¹: %s"
 
-#: syntax.c:6337
+#: syntax.c:6380
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ¯Ê¤Ö°Ñ¼Æ: %s"
 
-#: syntax.c:6374
+#: syntax.c:6417
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: ¤£¦Xªkªº­È: %s"
 
-#: syntax.c:6493
+#: syntax.c:6536
 msgid "E419: FG color unknown"
 msgstr "E419: ¿ù»~ªº«e´ºÃC¦â"
 
-#: syntax.c:6504
+#: syntax.c:6547
 msgid "E420: BG color unknown"
 msgstr "E420: ¿ù»~ªº­I´ºÃC¦â"
 
-#: syntax.c:6565
+#: syntax.c:6608
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: ¿ù»~ªºÃC¦â¦WºÙ©Î¼Æ­È: %s"
 
-#: syntax.c:6771
+#: syntax.c:6814
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: ²×ºÝ¾÷½X¤Óªø: %s"
 
-#: syntax.c:6818
+#: syntax.c:6861
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: °Ñ¼Æ¤£¥¿½T: %s"
 
-#: syntax.c:7347
+#: syntax.c:7390
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: ¨Ï¥Î¤F¹L¦h¬Û²§ªº°ª«G«×ÄÝ©Ê"
 
+#: syntax.c:7911
+msgid "E669: Unprintable character in group name"
+msgstr "E669: ¸s²Õ¦WºÙ¤¤¦³µLªk¦C¦Lªº¦r¤¸"
+
+#. This is an error, but since there previously was no check only
+#. * give a warning.
+#: syntax.c:7918
+msgid "W18: Invalid character in group name"
+msgstr "W18: ¸s²Õ¦WºÙ¤¤¦³¤£¥¿½Tªº¦r¤¸"
+
 #: tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ¼ÐÅÒ(tag)°ïÅ|µ²§À"
@@ -5307,20 +5579,20 @@
 msgid "E556: at top of tag stack"
 msgstr "E556: ¼ÐÅÒ(tag)°ïÅ|¶}ÀY"
 
-#: tag.c:392
+#: tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: ¤w¸g¦b³Ì«e­±ªº¼ÐÅÒ(tag)¤F"
 
-#: tag.c:512
+#: tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: §ä¤£¨ì¼ÐÅÒ(tag): %s"
 
-#: tag.c:545
+#: tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:548
+#: tag.c:586
 msgid "file\n"
 msgstr "ÀÉ®×\n"
 
@@ -5328,44 +5600,44 @@
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:706
+#: tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "¿é¤J nr ©Î¿ï¾Ü (<CR> Â÷¶}): "
 
-#: tag.c:746
+#: tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: ¥u¦³¦¹¶µ²Å¦X"
 
-#: tag.c:748
+#: tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: ¤v¸g¦b³Ì«á¤@­Ó²Å¦Xªº tag ¤F"
 
-#: tag.c:768
+#: tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "ÀÉ®× \"%s\" ¤£¦s¦b"
 
 #. Give an indication of the number of matching tags
-#: tag.c:780
+#: tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "§ä¨ì tag: %d/%d%s"
 
-#: tag.c:783
+#: tag.c:826
 msgid " or more"
 msgstr " ©Î§ó¦h"
 
-#: tag.c:785
+#: tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  ¥H¤£¦P¤j¤p¼g¨Ó¨Ï¥Î tag!"
 
-#: tag.c:828
+#: tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ÀÉ®× \"%s\" ¤£¦s¦b"
 
 #. Highlight title
-#: tag.c:897
+#: tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5373,83 +5645,75 @@
 "\n"
 "  # ¨ì tag         ±q   ¦æ    ¦b ÀÉ®×/¤å¦r"
 
-#: tag.c:1144
-msgid "Linear tag search"
-msgstr "½u©Ê·j´M¼ÐÅÒ (Tags)"
-
-#: tag.c:1146
-msgid "Binary tag search"
-msgstr "¤G¤À·j´M(Binary search) ¼ÐÅÒ(Tags)"
-
-#: tag.c:1172
+#: tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "·j´M tag ÀÉ®× \"%s\""
 
-#: tag.c:1356
+#: tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Tag Àɮ׸ô®|³QºIÂ_¬° %s\n"
 
-#: tag.c:1858
+#: tag.c:2203
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag ÀÉ \"%s\" ®æ¦¡¿ù»~"
 
-#: tag.c:1862
+#: tag.c:2207
 #, c-format
 msgid "Before byte %ld"
 msgstr "¦b %ld ¦ì¤¸¤§«e"
 
-#: tag.c:1883
+#: tag.c:2240
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Tag ÀÉ®×¥¼±Æ§Ç: %s"
 
 #. never opened any tags file
-#: tag.c:1922
+#: tag.c:2280
 msgid "E433: No tags file"
 msgstr "E433: ¨S¦³ tag ÀÉ"
 
-#: tag.c:2600
+#: tag.c:3016
 msgid "E434: Can't find tag pattern"
 msgstr "E434: §ä¤£¨ì tag"
 
-#: tag.c:2611
+#: tag.c:3027
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: §ä¤£¨ì tag, ¥Î²qªº!"
 
-#: term.c:1745
+#: term.c:1759
 msgid "' not known. Available builtin terminals are:"
 msgstr "' µLªk¸ü¤J¡C¥i¥Îªº¤º«Ø²×ºÝ¾÷§Î¦¡¦³:"
 
-#: term.c:1769
+#: term.c:1783
 msgid "defaulting to '"
 msgstr "¹w³]: '"
 
-#: term.c:2127
+#: term.c:2141
 msgid "E557: Cannot open termcap file"
 msgstr "E557: µLªk¶}±Ò termcap ÀÉ®×"
 
-#: term.c:2131
+#: term.c:2145
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo ¤¤¨S¦³²×ºÝ¾÷¸ê®Æ¶µ"
 
-#: term.c:2133
+#: term.c:2147
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap ¤¤¨S¦³²×ºÝ¾÷¸ê®Æ¶µ"
 
-#: term.c:2292
+#: term.c:2306
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap ¨S¦³ \"%s\" entry"
 
-#: term.c:2766
+#: term.c:2780
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: ²×ºÝ¾÷»Ý­n \"cm\" ªº¯à¤O"
 
 #. Highlight title
-#: term.c:4927
+#: term.c:4990
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5457,42 +5721,42 @@
 "\n"
 "--- ²×ºÝ¾÷«öÁä ---"
 
-#: ui.c:252
+#: ui.c:258
 msgid "new shell started\n"
 msgstr "°_°Ê·s shell\n"
 
-#: ui.c:1784
+#: ui.c:1841
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Ū¨ú¿é¤J¿ù»~¡AÂ÷¶}¤¤...\n"
 
 #. must display the prompt
-#: undo.c:394
+#: undo.c:405
 msgid "No undo possible; continue anyway"
 msgstr "µLªkÁÙ­ì¡F½ÐÄ~Äò§V¤O"
 
-#: undo.c:549
+#: undo.c:561
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: ¦æ¸¹¿ù»~"
 
-#: undo.c:718
+#: undo.c:757
 msgid "1 change"
 msgstr "¤@¶µ§ïÅÜ"
 
-#: undo.c:720
+#: undo.c:759
 #, c-format
 msgid "%ld changes"
 msgstr "%ld ¶µ§ïÅÜ"
 
-#: undo.c:764
+#: undo.c:812
 msgid "E439: undo list corrupt"
 msgstr "E439: ´_­ì¦Cªí·lÃa"
 
-#: undo.c:796
+#: undo.c:844
 msgid "E440: undo line missing"
-msgstr "E440: §ä¤£¨ì­n undo ªº¦æ"
+msgstr "E440: §ä¤£¨ì­n undo ªº¦æ "
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:682
+#: version.c:707
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5500,7 +5764,7 @@
 "\n"
 "MS-Windows 16/32 Bit ¹Ï«¬¬É­±ª©¥»"
 
-#: version.c:684
+#: version.c:709
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5508,15 +5772,15 @@
 "\n"
 "MS-Windows 32 Bit ¹Ï«¬¬É­±ª©¥»"
 
-#: version.c:687
+#: version.c:712
 msgid " in Win32s mode"
 msgstr "Win32s ¼Ò¦¡"
 
-#: version.c:689
+#: version.c:714
 msgid " with OLE support"
 msgstr "¤ä´© OLE"
 
-#: version.c:692
+#: version.c:717
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5524,7 +5788,7 @@
 "\n"
 "MS-Windows 32 Bit console ª©¥»"
 
-#: version.c:696
+#: version.c:721
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5532,7 +5796,7 @@
 "\n"
 "MS-Windows 32 Bit console ª©¥»"
 
-#: version.c:700
+#: version.c:725
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5540,7 +5804,7 @@
 "\n"
 "32 Bit MS-DOS ª©¥»"
 
-#: version.c:702
+#: version.c:727
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5548,7 +5812,7 @@
 "\n"
 "16 Bit MS-DOS ª©¥»"
 
-#: version.c:708
+#: version.c:733
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5556,7 +5820,7 @@
 "\n"
 "MacOS X (unix) ª©¥»"
 
-#: version.c:710
+#: version.c:735
 msgid ""
 "\n"
 "MacOS X version"
@@ -5564,7 +5828,7 @@
 "\n"
 "MacOS X ª©¥»"
 
-#: version.c:713
+#: version.c:738
 msgid ""
 "\n"
 "MacOS version"
@@ -5572,7 +5836,7 @@
 "\n"
 "MacOS ª©¥»"
 
-#: version.c:718
+#: version.c:743
 msgid ""
 "\n"
 "RISC OS version"
@@ -5580,7 +5844,7 @@
 "\n"
 "RISC OS ª©¥»"
 
-#: version.c:728
+#: version.c:753
 msgid ""
 "\n"
 "Included patches: "
@@ -5588,11 +5852,11 @@
 "\n"
 "¤Þ¤J­×¥¿: "
 
-#: version.c:754 version.c:1097
+#: version.c:779 version.c:1147
 msgid "Modified by "
 msgstr "­×§ïªÌ¬°"
 
-#: version.c:761
+#: version.c:786
 msgid ""
 "\n"
 "Compiled "
@@ -5600,11 +5864,11 @@
 "\n"
 "½sĶ"
 
-#: version.c:764
+#: version.c:789
 msgid "by "
 msgstr "ªÌ:"
 
-#: version.c:776
+#: version.c:801
 msgid ""
 "\n"
 "Huge version "
@@ -5612,7 +5876,7 @@
 "\n"
 "¶W±jª©¥» "
 
-#: version.c:779
+#: version.c:804
 msgid ""
 "\n"
 "Big version "
@@ -5620,7 +5884,7 @@
 "\n"
 "¤j«¬ª©¥» "
 
-#: version.c:782
+#: version.c:807
 msgid ""
 "\n"
 "Normal version "
@@ -5628,7 +5892,7 @@
 "\n"
 "¤@¯ëª©¥» "
 
-#: version.c:785
+#: version.c:810
 msgid ""
 "\n"
 "Small version "
@@ -5636,7 +5900,7 @@
 "\n"
 "²©öª©¥» "
 
-#: version.c:787
+#: version.c:812
 msgid ""
 "\n"
 "Tiny version "
@@ -5644,282 +5908,318 @@
 "\n"
 "ºë²ª©¥» "
 
-#: version.c:793
+#: version.c:818
 msgid "without GUI."
 msgstr "¤£¨Ï¥Î¹Ï«¬¬É­±¡C"
 
-#: version.c:798
+#: version.c:823
 msgid "with GTK2-GNOME GUI."
 msgstr "¨Ï¥Î GTK2-GNOME ¹Ï«¬¬É­±¡C"
 
-#: version.c:800
+#: version.c:825
 msgid "with GTK-GNOME GUI."
 msgstr "¨Ï¥Î GTK-GNOME ¹Ï«¬¬É­±¡C"
 
-#: version.c:804
+#: version.c:829
 msgid "with GTK2 GUI."
 msgstr "¨Ï¥Î GTK2 ¹Ï«¬¬É­±¡C"
 
-#: version.c:806
+#: version.c:831
 msgid "with GTK GUI."
 msgstr "¨Ï¥Î GTK ¹Ï«¬¬É­±¡C"
 
-#: version.c:811
+#: version.c:836
 msgid "with X11-Motif GUI."
 msgstr "¨Ï¥Î X11-Motif ¹Ï«¬¬É­±¡C"
 
-#: version.c:814
+#: version.c:840
+msgid "with X11-neXtaw GUI."
+msgstr "¨Ï¥Î X11-neXtaw ¹Ï«¬¬É­±¡C"
+
+#: version.c:842
 msgid "with X11-Athena GUI."
 msgstr "¨Ï¥Î X11-Athena ¹Ï«¬¬É­±¡C"
 
-#: version.c:817
+#: version.c:846
 msgid "with BeOS GUI."
 msgstr "¨Ï¥Î BeOS ¹Ï«¬¬É­±¡C"
 
-#: version.c:820
+#: version.c:849
 msgid "with Photon GUI."
 msgstr "¨Ï¥ÎPhoton¹Ï«¬¬É­±¡C"
 
-#: version.c:823
+#: version.c:852
 msgid "with GUI."
 msgstr "¨Ï¥Î¹Ï«¬¬É­±¡C"
 
-#: version.c:826
+#: version.c:855
 msgid "with Carbon GUI."
 msgstr "¨Ï¥Î Carbon ¹Ï«¬¬É­±¡C"
 
-#: version.c:829
+#: version.c:858
 msgid "with Cocoa GUI."
 msgstr "¨Ï¥Î Cocoa ¹Ï«¬¬É­±¡C"
 
-#: version.c:832
+#: version.c:861
 msgid "with (classic) GUI."
 msgstr "¨Ï¥Î (¶Ç²Î) ¹Ï«¬¬É­±¡C"
 
-#: version.c:843
+#: version.c:872
 msgid "  Features included (+) or not (-):\n"
 msgstr " ¥Ø«e¥i¨Ï¥Î(+)»P¤£¥i¨Ï¥Î(-)ªº¼Ò²Õ¦Cªí:\n"
 
-#: version.c:855
+#: version.c:884
 msgid "   system vimrc file: \""
 msgstr "        ¨t²Î vimrc ³]©wÀÉ: \""
 
-#: version.c:860
+#: version.c:889
 msgid "     user vimrc file: \""
 msgstr "  ¨Ï¥ÎªÌ­Ó¤H vimrc ³]©wÀÉ: \""
 
-#: version.c:865
+#: version.c:894
 msgid " 2nd user vimrc file: \""
 msgstr "    ²Ä¤G²Õ­Ó¤H vimrc ÀÉ®×: \""
 
-#: version.c:870
+#: version.c:899
 msgid " 3rd user vimrc file: \""
 msgstr "    ²Ä¤T²Õ­Ó¤H vimrc ÀÉ®×: \""
 
-#: version.c:875
+#: version.c:904
 msgid "      user exrc file: \""
 msgstr "   ¨Ï¥ÎªÌ­Ó¤H exrc ³]©wÀÉ: \""
 
-#: version.c:880
+#: version.c:909
 msgid "  2nd user exrc file: \""
 msgstr "   ²Ä¤G²Õ¨Ï¥ÎªÌ exrc ÀÉ®×: \""
 
-#: version.c:886
+#: version.c:915
 msgid "  system gvimrc file: \""
 msgstr "         ¨t²Î gvimrc ÀÉ®×: \""
 
-#: version.c:890
+#: version.c:919
 msgid "    user gvimrc file: \""
 msgstr "     ¨Ï¥ÎªÌ­Ó¤H gvimrc ÀÉ: \""
 
-#: version.c:894
+#: version.c:923
 msgid "2nd user gvimrc file: \""
 msgstr "   ²Ä¤G²Õ­Ó¤H gvimrc ÀÉ®×: \""
 
-#: version.c:899
+#: version.c:928
 msgid "3rd user gvimrc file: \""
 msgstr "   ²Ä¤T²Õ­Ó¤H gvimrc ÀÉ®×: \""
 
-#: version.c:906
+#: version.c:935
 msgid "    system menu file: \""
 msgstr "           ¨t²Î¿ï³æ³]©wÀÉ: \""
 
-#: version.c:914
+#: version.c:943
 msgid "  fall-back for $VIM: \""
 msgstr "              $VIM ¹w³]­È: \""
 
-#: version.c:920
+#: version.c:949
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "       $VIMRUNTIME ¹w³]­È: \""
 
-#: version.c:924
+#: version.c:953
 msgid "Compilation: "
 msgstr "½sĶ¤è¦¡: "
 
-#: version.c:930
+#: version.c:959
 msgid "Compiler: "
 msgstr "½s;¹: "
 
-#: version.c:935
+#: version.c:964
 msgid "Linking: "
 msgstr "Ãìµ²¤è¦¡: "
 
-#: version.c:940
+#: version.c:969
 msgid "  DEBUG BUILD"
 msgstr "  °£¿ùª©¥»"
 
-#: version.c:976
+#: version.c:1008
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:978
+#: version.c:1010
 msgid "version "
 msgstr "ª©¥»   "
 
-#: version.c:979
+#: version.c:1011
 msgid "by Bram Moolenaar et al."
 msgstr "ºûÅ@ªÌ: Bram Moolenaar et al."
 
-#: version.c:983
+#: version.c:1015
 msgid "Vim is open source and freely distributable"
 msgstr "Vim ¬°¥i¦Û¥Ñ´²§Gªº¶}©ñ­ì©l½X³nÅé"
 
-#: version.c:985
+#: version.c:1017
 msgid "Help poor children in Uganda!"
 msgstr "½ÐÀ°§U¯Q¤z¹Fªº¥i¼¦«Äµ£!"
 
-#: version.c:986
+#: version.c:1018
 msgid "type  :help iccf<Enter>       for information "
 msgstr "¶i¤@¨B»¡©ú½Ð¿é¤J          :help iccf<Enter>"
 
-#: version.c:988
+#: version.c:1020
 msgid "type  :q<Enter>               to exit         "
 msgstr "­nÂ÷¶}½Ð¿é¤J                  :q<Enter>            "
 
-#: version.c:989
+#: version.c:1021
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "½u¤W»¡©ú½Ð¿é¤J                :help<Enter>         "
 
-#: version.c:990
+#: version.c:1022
 msgid "type  :help version6<Enter>   for version info"
 msgstr "·sª©¥»¸ê°T½Ð¿é¤J              :help version6<Enter>"
 
-#: version.c:993
+#: version.c:1025
 msgid "Running in Vi compatible mode"
 msgstr "Vi ¬Û®e¼Ò¦¡"
 
-#: version.c:994
+#: version.c:1026
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "¦pªG­n§¹¥þ¼ÒÀÀ¶Ç²Î Vi ½Ð¿é¤J :set nocp<Enter>"
 
-#: version.c:995
+#: version.c:1027
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "¦pªG»Ý­n¹ï Vi ¬Û®e¼Ò¦¡ªº¶i¤@¨B»¡©ú½Ð¿é¤J :help cp-default<Enter>"
 
-#: version.c:1010
+#: version.c:1042
 msgid "menu  Help->Orphans           for information    "
 msgstr "¶i¤@¨B»¡©ú½Ð¿ï¨ú¿ï³æªº »²§U»¡©ú->¬@±Ï©t¨à"
 
-#: version.c:1012
+#: version.c:1044
 msgid "Running modeless, typed text is inserted"
 msgstr "°õ¦æ Modeless ¼Ò¦¡¡A¿é¤Jªº¤å¦r·|¦Û°Ê´¡¤J"
 
-#: version.c:1013
+#: version.c:1045
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "¿ï¨ú¿ï³æªº¡u½s¿è¡v¡u¥þ°ì³]©w¡v¡u¤Á´«´¡¤J¼Ò¦¡¡v"
 
-#: version.c:1014
+#: version.c:1046
 msgid "                              for two modes      "
 msgstr "                              ¨âºØ¼Ò¦¡           "
 
-#: version.c:1018
+#: version.c:1050
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "¿ï¨ú¿ï³æªº¡u½s¿è¡v¡u¥þ°ì³]©w¡v¡u¤Á´«¶Ç²ÎVi¬Û®e¼Ò¦¡¡v"
 
-#: version.c:1019
+#: version.c:1051
 msgid "                              for Vim defaults   "
 msgstr "                              ¥H±o Vim ¹w³]­È    "
 
-#: version.c:1065
+#: version.c:1098
+msgid "Sponsor Vim development!"
+msgstr "ÃÙ§U Vim ªº¶}µo»P¦¨ªø¡I"
+
+#: version.c:1099
+msgid "Become a registered Vim user!"
+msgstr "¦¨¬° Vim ªºµù¥U¨Ï¥ÎªÌ¡I"
+
+#: version.c:1102
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "¸Ô²Ó»¡©ú½Ð¿é¤J          :help sponsor<Enter>"
+
+#: version.c:1103
+msgid "type  :help register<Enter>   for information "
+msgstr "¸Ô²Ó»¡©ú½Ð¿é¤J          :help register<Enter> "
+
+#: version.c:1105
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "¸Ô²Ó»¡©ú½Ð¿ï¨ú¿ï³æªº    »²§U»¡©ú->ÃÙ§U/µù¥U      "
+
+#: version.c:1115
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "ª`·N: °»´ú¨ì Windows 95/98/ME"
 
-#: version.c:1068
+#: version.c:1118
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "¦pªG»Ý­n¹ï Windows 95 ¤ä´©ªº§ó¦h¸ê°T½Ð¿é¤J :help windows95<Enter>"
 
-#: window.c:204
+#: window.c:203
 msgid "E441: There is no preview window"
 msgstr "E441: ¨S¦³¹wÄýµøµ¡"
 
-#: window.c:577
+#: window.c:581
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ¤£¯à¦P®É¤À³Îµøµ¡¬°¥ª¤W©M¥k¤U¨¤"
 
-#: window.c:1336
+#: window.c:1340
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ¦³¨ä¥¦¤À³Îµøµ¡®ÉµLªk±ÛÂà"
 
-#: window.c:1827
+#: window.c:1836
 msgid "E444: Cannot close last window"
 msgstr "E444: ¤£¯àÃö³¬³Ì«á¤@­Óµøµ¡"
 
-#: window.c:2557
+#: window.c:2567
 msgid "Already only one window"
 msgstr "¤w¸g¥u³Ñ¤@­Óµøµ¡¤F"
 
-#: window.c:2604
+#: window.c:2614
 msgid "E445: Other window contains changes"
 msgstr "E445: ¨ä¥¦µøµ¡¦³§ó°Ê¸ê®Æ"
 
-#: window.c:4449
+#: window.c:4480
 msgid "E446: No file name under cursor"
 msgstr "E446: ´å¼Ð³B¨S¦³ÀɦW"
 
-#: window.c:4568
+#: window.c:4599
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: ¦b¸ô®|¤¤§ä¤£¨ìÀÉ®× \"%s\""
 
-#: ../GvimExt/gvimext.cpp:586
+#: if_perl.xs:326 globals.h:1241
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: µLªk­«·s¸ü¤Jµ{¦¡®w %s"
+
+#: if_perl.xs:554
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "©êºp, ¦¹©R¥OµLªk¨Ï¥Î. ­ì¦]: µLªk¸ü¤J Perl µ{¦¡®w(Library)"
+
+#: if_perl.xs:607
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: ¦b sandbox ¤¤µL Safe ¼Ò²Õ®ÉµLªk°õ¦æ Perl"
+
+#: GvimExt/gvimext.cpp:583
 msgid "Edit with &multiple Vims"
 msgstr "¨Ï¥Î¦h­Ó Vim session ½s¿è(&M)"
 
-#: ../GvimExt/gvimext.cpp:592
+#: GvimExt/gvimext.cpp:589
 msgid "Edit with single &Vim"
 msgstr "¥u¨Ï¥Î¦P¤@­Ó Vim session ½s¿è(&V)"
 
-#: ../GvimExt/gvimext.cpp:601
+#: GvimExt/gvimext.cpp:598
 msgid "&Diff with Vim"
 msgstr "¨Ï¥Î Vim ¨Ó¤ñ¸û(&Diff)"
 
-#: ../GvimExt/gvimext.cpp:614
+#: GvimExt/gvimext.cpp:611
 msgid "Edit with &Vim"
 msgstr "¨Ï¥Î Vim ½s¿è¦¹ÀÉ(&V)"
 
 #. Now concatenate
-#: ../GvimExt/gvimext.cpp:636
+#: GvimExt/gvimext.cpp:633
 msgid "Edit with existing Vim - &"
 msgstr "¨Ï¥Î°õ¦æ¤¤ªº Vim session ½s¿è - &"
 
-#: ../GvimExt/gvimext.cpp:749
+#: GvimExt/gvimext.cpp:746
 msgid "Edits the selected file(s) with Vim"
 msgstr "¨Ï¥Î Vim ½s¿è¤w¿ï¨úªºÀÉ®×"
 
-#: ../GvimExt/gvimext.cpp:888 ../GvimExt/gvimext.cpp:969
+#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
 msgid "Error creating process: Check if gvim is in your path!"
 msgstr "µLªk°õ¦æµ{¦¡: ½ÐÀˬd gvim ¦³¨S¦³¦b§Aªº PATH ÅܼƸÌ!"
 
-#: ../GvimExt/gvimext.cpp:889 ../GvimExt/gvimext.cpp:903
-#: ../GvimExt/gvimext.cpp:970
+#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
 msgid "gvimext.dll error"
 msgstr "gvimext.dll ¿ù»~"
 
-#: ../GvimExt/gvimext.cpp:902
+#: GvimExt/gvimext.cpp:899
 msgid "Path length too long!"
 msgstr "¸ô®|ªø«×¤Óªø!"
 
-#: globals.h:990
+#: globals.h:1031
 msgid "--No lines in buffer--"
 msgstr "--½w½Ä°ÏµL¸ê®Æ--"
 
@@ -5927,392 +6227,424 @@
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1149
+#: globals.h:1194
 msgid "E470: Command aborted"
-msgstr "E470: ©R¥O³Q±j¨î¤¤Â_°õ¦æ"
+msgstr "E470: ©R¥O³Q±j¨î¤¤Â_°õ¦æ "
 
-#: globals.h:1150
+#: globals.h:1195
 msgid "E471: Argument required"
 msgstr "E471: »Ý­n«ü¥O°Ñ¼Æ"
 
-#: globals.h:1151
+#: globals.h:1196
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ «á­±À³¸Ó¦³ / ? ©Î &"
 
-#: globals.h:1153
+#: globals.h:1198
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: ¤£¯à¦b©R¥O¦Cµøµ¡¤¤¨Ï¥Î¡C<CR>°õ¦æ¡ACTRL-C Â÷¶}"
 
-#: globals.h:1155
+#: globals.h:1200
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc ¸Ìªº«ü¥OµLªk°õ¦æ"
+msgstr "E12: exrc/vimrc ¸Ìªº«ü¥OµLªk°õ¦æ "
 
-#: globals.h:1157
+#: globals.h:1202
 msgid "E171: Missing :endif"
 msgstr "E171: ¯Ê¤Ö :endif"
 
-#: globals.h:1158
+#: globals.h:1203
 msgid "E600: Missing :endtry"
 msgstr "E600: ¯Ê¤Ö :endtry"
 
-#: globals.h:1159
+#: globals.h:1204
 msgid "E170: Missing :endwhile"
 msgstr "E170: ¯Ê¤Ö :endwhile"
 
-#: globals.h:1160
+#: globals.h:1205
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile ¯Ê¤Ö¹ïÀ³ªº :while"
 
-#: globals.h:1162
+#: globals.h:1207
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Àɮפw¸g¦s¦b (¥i¥Î ! ±j¨î¨ú¥N)"
 
-#: globals.h:1163
+#: globals.h:1208
 msgid "E472: Command failed"
 msgstr "E472: ©R¥O°õ¦æ¥¢±Ñ"
 
-#: globals.h:1165
+#: globals.h:1210
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: ¤£¥¿½Tªº¦r¤¸¶° (Fontset): %s"
 
-#: globals.h:1169
+#: globals.h:1214
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "¤£¥¿½Tªº¦r«¬¦WºÙ: %s"
 
-#: globals.h:1172
+#: globals.h:1217
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: \"%s\" ¤£¬O©T©w¼e«×¦r«¬"
 
-#: globals.h:1174
+#: globals.h:1219
 msgid "E473: Internal error"
 msgstr "E473: ¤º³¡¿ù»~"
 
-#: globals.h:1175
+#: globals.h:1220
 msgid "Interrupted"
 msgstr "¤w¤¤Â_"
 
-#: globals.h:1176
+#: globals.h:1221
 msgid "E14: Invalid address"
 msgstr "E14: ¤£¥¿½Tªº¦ì§}"
 
-#: globals.h:1177
+#: globals.h:1222
 msgid "E474: Invalid argument"
 msgstr "E474: ¤£¥¿½Tªº°Ñ¼Æ"
 
-#: globals.h:1178
+#: globals.h:1223
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: ¤£¥¿½Tªº°Ñ¼Æ: %s"
 
-#: globals.h:1180
+#: globals.h:1225
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: ¤£¥¿½Tªº¹Bºâ¦¡: %s"
 
-#: globals.h:1182
+#: globals.h:1227
 msgid "E16: Invalid range"
 msgstr "E16: ¤£¥¿½Tªº½d³ò"
 
-#: globals.h:1183
+#: globals.h:1228
 msgid "E476: Invalid command"
 msgstr "E476: ¤£¥¿½Tªº©R¥O"
 
-#: globals.h:1185
+#: globals.h:1230
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" ¬O¥Ø¿ý"
 
-#: globals.h:1188
+#: globals.h:1233
 msgid "E18: Unexpected characters before '='"
 msgstr "E18: '=' «e­±¥X²{¤F¿ù»~ªº¦r¤¸"
 
-#: globals.h:1191
+#: globals.h:1236
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: ©I¥s¨ç¦¡®w \"%s\"() ¥¢±Ñ"
 
-#: globals.h:1196
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: µLªk­«·s¸ü¤Jµ{¦¡®w %s"
-
-#: globals.h:1197
+#: globals.h:1242
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: µLªk¸ü¤Jµ{¦¡®wªº¨ç¦¡ %s"
 
-#: globals.h:1199
+#: globals.h:1244
 msgid "E19: Mark has invalid line number"
 msgstr "E19: ¼Ð°Oªº¦æ¸¹¿ù»~"
 
-#: globals.h:1200
+#: globals.h:1245
 msgid "E20: Mark not set"
 msgstr "E20: ¨S¦³³]©w¼Ð°O"
 
-#: globals.h:1201
+#: globals.h:1246
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: ¦]¬° 'modifiable' ¿ï¶µ¬OÃö³¬ªº¡A©Ò¥H¤£¯à­×§ï"
 
-#: globals.h:1202
+#: globals.h:1247
 msgid "E22: Scripts nested too deep"
 msgstr "E22: ±_ª¬»¼°j©I¥s¤Ó¦h¼h"
 
-#: globals.h:1203
+#: globals.h:1248
 msgid "E23: No alternate file"
 msgstr "E23: ¨S¦³´À¥NªºÀÉ®×"
 
-#: globals.h:1204
+#: globals.h:1249
 msgid "E24: No such abbreviation"
 msgstr "E24: ¨S¦³³o­Ó abbreviation ¹ïÀ³"
 
-#: globals.h:1205
+#: globals.h:1250
 msgid "E477: No ! allowed"
 msgstr "E477: ¤£¥i¨Ï¥Î '!'"
 
-#: globals.h:1207
+#: globals.h:1252
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: ¦]¬°½sͮɍS¦³¥[¤J¹Ï«¬¬É­±ªºµ{¦¡½X¡A©Ò¥HµLªk¨Ï¥Î¹Ï«¬¬É­±"
 
-#: globals.h:1210
+#: globals.h:1255
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ¦]¬°½sͮɍS¦³¥[¤J Hebrew ªºµ{¦¡½X¡A©Ò¥HµLªk¨Ï¥Î Hebrew\n"
 
-#: globals.h:1213
+#: globals.h:1258
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: ¦]¬°½sͮɍS¦³¥[¤J Farsi ªºµ{¦¡½X¡A©Ò¥HµLªk¨Ï¥Î Farsi\n"
 
-#: globals.h:1216
+#: globals.h:1261
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ¦]¬°½sͮɍS¦³¥[¤J Arabic ªºµ{¦¡½X¡A©Ò¥HµLªk¨Ï¥Î\n"
+
+#: globals.h:1264
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: ¨S¦³¦W¬° '%s' ªº highlight group"
 
-#: globals.h:1218
+#: globals.h:1266
 msgid "E29: No inserted text yet"
 msgstr "E29: ÁÙ¨S¦³´¡¤J¤å¦r¹L"
 
-#: globals.h:1219
+#: globals.h:1267
 msgid "E30: No previous command line"
 msgstr "E30: ¨S¦³«e¤@¶µ©R¥O"
 
-#: globals.h:1220
+#: globals.h:1268
 msgid "E31: No such mapping"
 msgstr "E31: ¨S¦³³o­Ó mapping ¹ïÀ³"
 
-#: globals.h:1221
+#: globals.h:1269
 msgid "E479: No match"
 msgstr "E479: §ä¤£¨ì"
 
-#: globals.h:1222
+#: globals.h:1270
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: §ä¤£¨ì: %s"
 
-#: globals.h:1223
+#: globals.h:1271
 msgid "E32: No file name"
 msgstr "E32: ¨S¦³ÀɦW"
 
-#: globals.h:1224
+#: globals.h:1272
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: ¨S¦³«e¤@­Ó·j´M/¨ú¥Nªº©R¥O"
 
-#: globals.h:1225
+#: globals.h:1273
 msgid "E34: No previous command"
 msgstr "E34: ¨S¦³«e¤@­Ó©R¥O"
 
-#: globals.h:1226
+#: globals.h:1274
 msgid "E35: No previous regular expression"
 msgstr "E35: ¨S¦³«e¤@­Ó·j´M«ü¥O"
 
-#: globals.h:1227
+#: globals.h:1275
 msgid "E481: No range allowed"
 msgstr "E481: ¤£¥i¨Ï¥Î½d³ò«ü¥O"
 
-#: globals.h:1229
+#: globals.h:1277
 msgid "E36: Not enough room"
 msgstr "E36: ¨S¦³¨¬°÷ªºªÅ¶¡"
 
-#: globals.h:1232
+#: globals.h:1280
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: ¨S¦³µù¥U¬° \"%s\" ªº¦øªA¾¹"
 
-#: globals.h:1234
+#: globals.h:1282
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: ¤£¯à«Ø¥ßÀÉ®× %s"
 
-#: globals.h:1235
+#: globals.h:1283
 msgid "E483: Can't get temp file name"
 msgstr "E483: µLªk±oª¾¼È¦sÀɦW"
 
-#: globals.h:1236
+#: globals.h:1284
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: µLªk¶}±ÒÀÉ®× %s"
 
-#: globals.h:1237
+#: globals.h:1285
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: µLªkŪ¨úÀÉ®× %s"
 
-#: globals.h:1238
+#: globals.h:1286
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: ¤w§ó§ï¹LÀɮצý©|¥¼¦sÀÉ (¥i¥Î ! ±j¨î°õ¦æ)"
 
-#: globals.h:1239
+#: globals.h:1287
 msgid "E38: Null argument"
 msgstr "E38: ªÅªº (Null) °Ñ¼Æ"
 
-#: globals.h:1241
+#: globals.h:1289
 msgid "E39: Number expected"
 msgstr "E39: À³¸Ó­n¦³¼Æ¦r"
 
-#: globals.h:1244
+#: globals.h:1292
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: µLªk¶}±Ò¿ù»~ÀÉ®× %s"
 
-#: globals.h:1247
+#: globals.h:1295
 msgid "E233: cannot open display"
 msgstr "E233: <¤£¯à¶}±Ò X Server DISPLAY>"
 
-#: globals.h:1249
+#: globals.h:1297
 msgid "E41: Out of memory!"
 msgstr "E41: °O¾ÐÅ餣¨¬!"
 
-#: globals.h:1251
+#: globals.h:1299
 msgid "Pattern not found"
 msgstr "§ä¤£¨ì"
 
-#: globals.h:1253
+#: globals.h:1301
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: §ä¤£¨ì %s"
 
-#: globals.h:1254
+#: globals.h:1302
 msgid "E487: Argument must be positive"
 msgstr "E487: °Ñ¼ÆÀ³¸Ó¬O¥¿¼Æ"
 
-#: globals.h:1256
+#: globals.h:1304
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: µLªk¦^¨ì«e¤@­Ó¥Ø¿ý"
 
-#: globals.h:1260
+#: globals.h:1308
 msgid "E42: No Errors"
 msgstr "E42: ¨S¦³¿ù»~"
 
-#: globals.h:1262
+#: globals.h:1310
 msgid "E43: Damaged match string"
 msgstr "E43: ²Å¦X¦r¦ê¦³°ÝÃD"
 
-#: globals.h:1263
+#: globals.h:1311
 msgid "E44: Corrupted regexp program"
 msgstr "E44: regexp ¦³°ÝÃD"
 
-#: globals.h:1264
+#: globals.h:1312
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: ¦³³]©w 'readonly' ¿ï¶µ(°ßŪ) (¥i¥Î ! ±j¨î°õ¦æ)"
 
-#: globals.h:1266
+#: globals.h:1314
 #, c-format
 msgid "E46: Cannot set read-only variable \"%s\""
 msgstr "E46: µLªk³]©w°ßŪÅÜ¼Æ \"%s\""
 
-#: globals.h:1269
+#: globals.h:1317
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Ū¨ú¿ù»~ÀÉ®×¥¢±Ñ"
 
-#: globals.h:1272
+#: globals.h:1320
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: ¤£¯à¦b sandbox ¸Ì¥X²{"
 
-#: globals.h:1274
+#: globals.h:1322
 msgid "E523: Not allowed here"
 msgstr "E523: ³o¸Ì¤£¥i¨Ï¥Î"
 
-#: globals.h:1277
+#: globals.h:1325
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: ¤£¤ä´©³]©w¿Ã¹õ¼Ò¦¡"
 
-#: globals.h:1279
+#: globals.h:1327
 msgid "E49: Invalid scroll size"
 msgstr "E49: ¿ù»~ªº±²°Ê¤j¤p"
 
-#: globals.h:1280
+#: globals.h:1328
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'E71: ¿ï¶µ 'shell' ¥¼³]©w"
 
-#: globals.h:1282
+#: globals.h:1330
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: µLªkŪ¨ú sign data!"
 
-#: globals.h:1284
+#: globals.h:1332
 msgid "E72: Close error on swap file"
 msgstr "E72: ¼È¦sÀÉÃö³¬¿ù»~"
 
-#: globals.h:1285
+#: globals.h:1333
 msgid "E73: tag stack empty"
 msgstr "E73: ¼ÐÅÒ°ïÅ|¤wªÅ"
 
-#: globals.h:1286
+#: globals.h:1334
 msgid "E74: Command too complex"
 msgstr "E74: ©R¥O¤Ó½ÆÂø"
 
-#: globals.h:1287
+#: globals.h:1335
 msgid "E75: Name too long"
 msgstr "E75: ¦W¦r¤Óªø"
 
-#: globals.h:1288
+#: globals.h:1336
 msgid "E76: Too many ["
 msgstr "E76: ¤Ó¦h ["
 
-#: globals.h:1289
+#: globals.h:1337
 msgid "E77: Too many file names"
 msgstr "E77: ¤Ó¦hÀɦW"
 
-#: globals.h:1290
+#: globals.h:1338
 msgid "E488: Trailing characters"
 msgstr "E488: §A¿é¤J¤F¦h¾lªº¦r¤¸"
 
-#: globals.h:1291
+#: globals.h:1339
 msgid "E78: Unknown mark"
 msgstr "E78: µLªk¿ìÃѪº¼Ð°O"
 
-#: globals.h:1292
+#: globals.h:1340
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: µLªk®i¶}¸U¥Î¦r¤¸"
 
-#: globals.h:1294
+#: globals.h:1342
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' ¤£¯à¤ñ 'winminheight' §ó¤Ö"
 
-#: globals.h:1296
+#: globals.h:1344
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' ¤£¯à¤ñ 'winminwidth' §ó¤Ö"
 
-#: globals.h:1299
+#: globals.h:1347
 msgid "E80: Error while writing"
 msgstr "E80: ¼g¤J¿ù»~"
 
-#: globals.h:1300
+#: globals.h:1348
 msgid "Zero count"
 msgstr "¼Æ¨ì¹s (?)"
 
-#: globals.h:1302
+#: globals.h:1350
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> ¤£¯à¦b script ¥»¤å¥~¨Ï¥Î."
 
-#: globals.h:1305
+#: globals.h:1353
 msgid "E449: Invalid expression received"
 msgstr "E449: ¦¬¨ì¤£¥¿½Tªº¹Bºâ¦¡"
 
-#: globals.h:1308
+#: globals.h:1356
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: °Ï°ì³Q«OÅ@¡AµLªk­×§ï"
 
+#~ msgid "E565: error reading cscope connection %d"
+#~ msgstr "E565: Ū¨ú cscope ³s½u %d ¿ù»~"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: §ä¤£¨ì cscope ³s½u"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope ³s½u¤wÃö³¬"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "µLªk¨Ï¥Î malloc\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <µL>\n"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\tÅã¥Ü Gnome ¬ÛÃö°Ñ¼Æ"
+
+#~ msgid " BLOCK"
+#~ msgstr " °Ï¶ô"
+
+#~ msgid " LINE"
+#~ msgstr " ¦æ¿ï¨ú"
+
+#~ msgid "Linear tag search"
+#~ msgstr "½u©Ê·j´M¼ÐÅÒ (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "¤G¤À·j´M(Binary search) ¼ÐÅÒ(Tags)"
+
 #~ msgid "function "
 #~ msgstr "¨ç¦¡ "