updated for version 7.0e05

commit: 57657d85c6c3d812e99b5e5d5161c07c66ac7dc7 [log] [tgz]
author: Bram Moolenaar <Bram@vim.org> Fri Apr 21 22:12:41 2006 +0000
committer: Bram Moolenaar <Bram@vim.org> Fri Apr 21 22:12:41 2006 +0000
tree: 35b6845dc38717148718ac5cf70553b8c2cb96d8
parent: fc1421eb53b17aa58b01a9c07ba2007eb4a1aa4f [diff]
diff --git a/src/auto/configure b/src/auto/configure
index 7a308a7..319fd4e 100755
--- a/src/auto/configure
+++ b/src/auto/configure

@@ -9197,7 +9197,7 @@
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   else
     cat >>confdefs.h <<\_ACEOF
-#define XPMATTRIBUTES_TYPE XpmAttributes_21
+#define XPMATTRIBUTES_TYPE XpmAttributes
 _ACEOF
 
   fi

diff --git a/src/configure.in b/src/configure.in
index 6a1a56f..5c6dd51 100644
--- a/src/configure.in
+++ b/src/configure.in

@@ -1911,7 +1911,7 @@
 	AC_MSG_RESULT(no); AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
 	)
   else
-    AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes_21)
+    AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
   fi
   CPPFLAGS=$cppflags_save
 fi

diff --git a/src/digraph.c b/src/digraph.c
index 892a3ed..667ff07 100644
--- a/src/digraph.c
+++ b/src/digraph.c

@@ -2439,8 +2439,11 @@
 	    kp->to = vim_strnsave(p, (int)(s - p));
 
 	    if (kp->from == NULL || kp->to == NULL
-		    || STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN)
+		    || STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN
+		    || *kp->from == NUL || *kp->to == NUL)
 	    {
+		if (kp->to != NULL && *kp->to == NUL)
+		    EMSG(_("E791: Empty keymap entry"));
 		vim_free(kp->from);
 		vim_free(kp->to);
 	    }

diff --git a/src/ex_eval.c b/src/ex_eval.c
index 1da7f1b..c89cb2b 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c

@@ -155,22 +155,22 @@
     struct msglist **plist;
 
     /*
-     * Do nothing when displaying the interrupt message or reporting an uncaught
-     * exception (which has already been discarded then) at the top level.  Also
-     * when no exception can be thrown.  The message will be displayed by
-     * emsg().
+     * Do nothing when displaying the interrupt message or reporting an
+     * uncaught exception (which has already been discarded then) at the top
+     * level.  Also when no exception can be thrown.  The message will be
+     * displayed by emsg().
      */
     if (suppress_errthrow)
 	return FALSE;
 
     /*
-     * If emsg() has not been called previously, temporarily reset "force_abort"
-     * until the throw point for error messages has been reached.  This ensures
-     * that aborting() returns the same value for all errors that appear in the
-     * same command.  This means particularly that for parsing errors during
-     * expression evaluation emsg() will be called multiply, even when the
-     * expression is evaluated from a finally clause that was activated due to
-     * an aborting error, interrupt, or exception.
+     * If emsg() has not been called previously, temporarily reset
+     * "force_abort" until the throw point for error messages has been
+     * reached.  This ensures that aborting() returns the same value for all
+     * errors that appear in the same command.  This means particularly that
+     * for parsing errors during expression evaluation emsg() will be called
+     * multiply, even when the expression is evaluated from a finally clause
+     * that was activated due to an aborting error, interrupt, or exception.
      */
     if (!did_emsg)
     {
@@ -181,18 +181,18 @@
     /*
      * If no try conditional is active and no exception is being thrown and
      * there has not been an error in a try conditional or a throw so far, do
-     * nothing (for compatibility of non-EH scripts).  The message will then be
-     * displayed by emsg().  When ":silent!" was used and we are not currently
-     * throwing an exception, do nothing.  The message text will then be stored
-     * to v:errmsg by emsg() without displaying it.
+     * nothing (for compatibility of non-EH scripts).  The message will then
+     * be displayed by emsg().  When ":silent!" was used and we are not
+     * currently throwing an exception, do nothing.  The message text will
+     * then be stored to v:errmsg by emsg() without displaying it.
      */
     if (((trylevel == 0 && !cause_abort) || emsg_silent) && !did_throw)
 	return FALSE;
 
     /*
      * Ignore an interrupt message when inside a try conditional or when an
-     * exception is being thrown or when an error in a try conditional or throw
-     * has been detected previously.  This is important in order that an
+     * exception is being thrown or when an error in a try conditional or
+     * throw has been detected previously.  This is important in order that an
      * interrupt exception is catchable by the innermost try conditional and
      * not replaced by an interrupt message error exception.
      */

diff --git a/src/gui.c b/src/gui.c
index 755c20c..0fdcabe 100644
--- a/src/gui.c
+++ b/src/gui.c

@@ -3407,31 +3407,36 @@
 }
 
 /*
- * Get the label for tab page "tp" into NameBuff[].
+ * Get the label or tooltip for tab page "tp" into NameBuff[].
  */
     void
-get_tabline_label(tp)
+get_tabline_label(tp, tooltip)
     tabpage_T	*tp;
+    int		tooltip;	/* TRUE: get tooltip */
 {
     int		modified = FALSE;
     char_u	buf[40];
     int		wincount;
     win_T	*wp;
+    char_u	*opt;
 
-    /* Use 'guitablabel' if it's set. */
-    if (*p_gtl != NUL)
+    /* Use 'guitablabel' or 'guitabtooltip' if it's set. */
+    opt = (tooltip ? p_gtt : p_gtl);
+    if (*opt != NUL)
     {
 	int	use_sandbox = FALSE;
 	int	save_called_emsg = called_emsg;
 	char_u	res[MAXPATHL];
 	tabpage_T *save_curtab;
+	char_u	*opt_name = (char_u *)(tooltip ? "guitabtooltip"
+							     : "guitablabel");
 
 	called_emsg = FALSE;
 
 	printer_page_num = tabpage_index(tp);
 # ifdef FEAT_EVAL
 	set_vim_var_nr(VV_LNUM, printer_page_num);
-	use_sandbox = was_set_insecurely((char_u *)"guitablabel", 0);
+	use_sandbox = was_set_insecurely(opt_name, 0);
 # endif
 	/* It's almost as going to the tabpage, but without autocommands. */
 	curtab->tp_firstwin = firstwin;
@@ -3446,7 +3451,7 @@
 	curbuf = curwin->w_buffer;
 
 	/* Can't use NameBuff directly, build_stl_str_hl() uses it. */
-	build_stl_str_hl(curwin, res, MAXPATHL, p_gtl, use_sandbox,
+	build_stl_str_hl(curwin, res, MAXPATHL, opt, use_sandbox,
 						 0, (int)Columns, NULL, NULL);
 	STRCPY(NameBuff, res);
 
@@ -3459,7 +3464,7 @@
 	curbuf = curwin->w_buffer;
 
 	if (called_emsg)
-	    set_string_option_direct((char_u *)"guitablabel", -1,
+	    set_string_option_direct(opt_name, -1,
 					   (char_u *)"", OPT_FREE, SID_ERROR);
 	called_emsg |= save_called_emsg;
     }
@@ -3467,7 +3472,8 @@
     {
 	/* Get the buffer name into NameBuff[] and shorten it. */
 	get_trans_bufname(tp == curtab ? curbuf : tp->tp_curwin->w_buffer);
-	shorten_dir(NameBuff);
+	if (!tooltip)
+	    shorten_dir(NameBuff);
 
 	wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
 	for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 23318bb..79557a8 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c

@@ -3320,7 +3320,7 @@
 		    nr++);
 	}
 
-	get_tabline_label(tp);
+	get_tabline_label(tp, FALSE);
 	labeltext = CONVERT_TO_UTF8(NameBuff);
 	gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(gui.tabline), page,
 						     (const gchar *)labeltext);

diff --git a/src/gui_motif.c b/src/gui_motif.c
index 9e28be2..ccc9778 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c

@@ -3359,8 +3359,9 @@
 	XtVaGetValues(tab, XmNlabelString, &label_str, NULL);
 	if (XmStringGetLtoR(label_str, XmSTRING_DEFAULT_CHARSET, &label_cstr))
 	{
-	    get_tabline_label(tp);
-	    if (STRCMP(label_cstr, NameBuff) != 0) {
+	    get_tabline_label(tp, FALSE);
+	    if (STRCMP(label_cstr, NameBuff) != 0)
+	    {
 		XtVaSetValues(tab, XtVaTypedArg, XmNlabelString, XmRString,
 			      NameBuff, STRLEN(NameBuff) + 1, NULL);
 		/*

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 6e4ec1a..2e43557 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c

@@ -2334,7 +2334,7 @@
 	    TabCtrl_InsertItem(s_tabhwnd, nr, &tie);
 	}
 
-	get_tabline_label(tp);
+	get_tabline_label(tp, FALSE);
 	tie.pszText = NameBuff;
 #ifdef FEAT_MBYTE
 	wstr = NULL;

diff --git a/src/message.c b/src/message.c
index 69b194d..c0146c9 100644
--- a/src/message.c
+++ b/src/message.c

@@ -561,17 +561,18 @@
 
     /*
      * If "emsg_off" is set: no error messages at the moment.
-     * If 'debug' is set: do error message anyway, but without side effects.
+     * If "msg" is in 'debug': do error message but without side effects.
      * If "emsg_skip" is set: never do error messages.
      */
-    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+					  && vim_strchr(p_debug, 't') == NULL)
 #ifdef FEAT_EVAL
 	    || emsg_skip > 0
 #endif
 	    )
 	return TRUE;
 
-    if (!emsg_off)
+    if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
     {
 #ifdef FEAT_EVAL
 	/*

diff --git a/src/misc2.c b/src/misc2.c
index f8a583b..4667a56 100644
--- a/src/misc2.c
+++ b/src/misc2.c

@@ -5816,7 +5816,8 @@
 emsg3(s, a1, a2)
     char_u *s, *a1, *a2;
 {
-    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+					  && vim_strchr(p_debug, 't') == NULL)
 #ifdef FEAT_EVAL
 	    || emsg_skip > 0
 #endif
@@ -5835,7 +5836,8 @@
     char_u	*s;
     long	n;
 {
-    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+    if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+					  && vim_strchr(p_debug, 't') == NULL)
 #ifdef FEAT_EVAL
 	    || emsg_skip > 0
 #endif

diff --git a/src/option.c b/src/option.c
index cfca188..c1fc7dc 100644
--- a/src/option.c
+++ b/src/option.c

@@ -1267,6 +1267,15 @@
 			    {(char_u *)NULL, (char_u *)0L}
 #endif
 				    },
+    {"guitabtooltip",  "gtl", P_STRING|P_VI_DEF|P_RWIN,
+#if defined(FEAT_GUI_TABLINE)
+			    (char_u *)&p_gtt, PV_NONE,
+			    {(char_u *)"", (char_u *)0L}
+#else
+			    (char_u *)NULL, PV_NONE,
+			    {(char_u *)NULL, (char_u *)0L}
+#endif
+				    },
     {"hardtabs",    "ht",   P_NUM|P_VI_DEF,
 			    (char_u *)NULL, PV_NONE,
 			    {(char_u *)0L, (char_u *)0L}},
@@ -2812,7 +2821,7 @@
 static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
 #endif
 static char *(p_swb_values[]) = {"useopen", "usetab", "split", NULL};
-static char *(p_debug_values[]) = {"msg", "beep", NULL};
+static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL};
 #ifdef FEAT_VERTSPLIT
 static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
 #endif
@@ -6188,7 +6197,7 @@
     /* 'debug' */
     else if (varp == &p_debug)
     {
-	if (check_opt_strings(p_debug, p_debug_values, FALSE) != OK)
+	if (check_opt_strings(p_debug, p_debug_values, TRUE) != OK)
 	    errmsg = e_invarg;
     }
 

diff --git a/src/option.h b/src/option.h
index 39c03e1..d512a20 100644
--- a/src/option.h
+++ b/src/option.h

@@ -508,6 +508,7 @@
 #endif
 #if defined(FEAT_GUI_TABLINE)
 EXTERN char_u	*p_gtl;		/* 'guitablabel' */
+EXTERN char_u	*p_gtt;		/* 'guitabtooltip' */
 #endif
 EXTERN char_u	*p_hf;		/* 'helpfile' */
 #ifdef FEAT_WINDOWS

diff --git a/src/po/it.po b/src/po/it.po
index 2673c63..22584cd 100644
--- a/src/po/it.po
+++ b/src/po/it.po

@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.0\n"
-"POT-Creation-Date: 2006-04-08 09:01+0200\n"
-"PO-Revision-Date:  2006-04-08 09:01+0200\n"
+"POT-Creation-Date: 2006-04-21 09:26+0200\n"
+"PO-Revision-Date:  2006-04-21 09:26+0200\n"
 "Last-Translator:   Vlad Sandrini   <vlad.gently@gmail.com>\n"
 "Language-Team:     Italian"
 "                   Antonio Colombo <azc100@gmail.com>"
@@ -494,6 +494,22 @@
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variabile troppo nidificata per la visualizzazione"
 
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Funzione sconosciuta: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: La funzione: %s richiede più argomenti"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: Uso di <SID> fuori dal contesto di uno script: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s"
+
 msgid "E699: Too many arguments"
 msgstr "E699: Troppi argomenti"
 
@@ -2517,12 +2533,33 @@
 msgid "no such window"
 msgstr "finestra inesistente"
 
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ deve essere un'istanza di String"
+
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: Spiacente, comando non disponibile, non riesco a caricare libreria "
 "programmi Ruby."
 
+msgid "E267: unexpected return"
+msgstr "E267: return imprevisto"
+
+msgid "E268: unexpected next"
+msgstr "E268: next imprevisto"
+
+msgid "E269: unexpected break"
+msgstr "E269: break imprevisto"
+
+msgid "E270: unexpected redo"
+msgstr "E270: redo imprevisto"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: retry fuori da clausola rescue"
+
+msgid "E272: unhandled exception"
+msgstr "E272: eccezione non gestita"
+
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: tipo sconosciuto di salto nel programma %d"
@@ -4232,9 +4269,6 @@
 msgid "I/O ERROR"
 msgstr "ERRORE I/O"
 
-msgid "...(truncated)"
-msgstr "...(troncato)"
-
 msgid "Message"
 msgstr "Messaggio"
 
@@ -4660,6 +4694,16 @@
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Non sono riuscito a trovare il modello"
 
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Ult. %sEspressione di Ricerca:\n"
+"~"
+
 msgid "E759: Format error in spell file"
 msgstr "E759: Errore di formato nel file ortografico"
 
@@ -4739,7 +4783,7 @@
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
 "%d"
 msgstr ""
-"Definire COMPOUNDFORBIDFLAG dop l'elemento PFX potrebbe dare risultati "
+"Definire COMPOUNDFORBIDFLAG dopo l'elemento PFX potrebbe dare risultati "
 "errati in %s linea %d"
 
 #, c-format
@@ -4747,7 +4791,7 @@
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
 "%d"
 msgstr ""
-"Definire COMPOUNDPERMITFLAG dop l'elemento PFX potrebbe dare risultati "
+"Definire COMPOUNDPERMITFLAG dopo l'elemento PFX potrebbe dare risultati "
 "errati in %s linea %d"
 
 #, c-format
@@ -5380,6 +5424,10 @@
 msgid "number changes  time"
 msgstr "numero modif.   ora"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld secondi fa"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: lista 'undo' non valida"
 
@@ -5686,6 +5734,9 @@
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "batti :help windows95<Enter>  per info al riguardo"
 
+msgid "Already only one window"
+msgstr "C'è già una finestra sola"
+
 msgid "E441: There is no preview window"
 msgstr "E441: Non c'è una finestra di pre-visualizzazione"
 
@@ -5698,9 +5749,6 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: Non riesco a chiudere l'ultima finestra"
 
-msgid "Already only one window"
-msgstr "C'è già una finestra sola"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: Altre finestre contengono modifiche"
 

diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index de60cda..cb516e6 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po

@@ -4,6 +4,10 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # FIRST AUTHOR  Wang Jun <junw@turbolinux.com.cn>
+# 
+# TRANSLATORS
+#   Edyfox <edyfox@gmail.com>
+#   Yuheng Xie <elephant@linux.net.cn>
 #
 # Original translations.
 #
@@ -11,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: 缓冲区 \"%s\" 不在 diff 模式"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: 意外地改变了缓冲区"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 复合字符(digraph)中不能使用 Escape"
 
@@ -222,8 +229,8 @@
 msgstr " 关键字补全 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-msgstr " ^X 模式 (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X 模式 (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " 整行补全 (^L^N^P)"
@@ -256,8 +263,8 @@
 msgid " Omni completion (^O^N^P)"
 msgstr " 全能补全 (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " 拼写建议 (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " 拼写建议 (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " 关键字局部补全 (^N^P)"
@@ -489,9 +496,8 @@
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Dictionary 缺少结束符 '}': %s"
 
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: 变量嵌套过深"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: 变量嵌套过深无法显示"
 
 msgid "E699: Too many arguments"
 msgstr "E699: 参数过多"
@@ -529,8 +535,8 @@
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() 的调用次数多于 inputsave()"
 
-msgid "E745: Range not allowed"
-msgstr "E745: 不允许的范围"
+msgid "E786: Range not allowed"
+msgstr "E786: 不允许的范围"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() 的类型无效"
@@ -560,9 +566,8 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: 无法发送到客户端"
 
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort 比较函数失败"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort 比较函数失败"
 
 msgid "(Invalid)"
 msgstr "(无效)"
@@ -611,9 +616,8 @@
 msgid "E742: Cannot change value of %s"
 msgstr "E742: 无法改变 %s 的值"
 
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: 变量嵌套过深"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: 变量嵌套过深无法复制"
 
 #, c-format
 msgid "E124: Missing '(': %s"
@@ -682,6 +686,268 @@
 "\n"
 "\t最近修改于 "
 
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
+msgstr "<%s>%s%s  %d,  十六进制 %02x,  八进制 %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, 十六进制 %04x, 八进制 %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, 十六进制 %08x, 八进制 %o"
+
+msgid "E134: Move lines into themselves"
+msgstr "E134: 把行移动到自已中"
+
+msgid "1 line moved"
+msgstr "移动了 1 行"
+
+#, c-format
+msgid "%ld lines moved"
+msgstr "移动了 %ld 行"
+
+#, c-format
+msgid "%ld lines filtered"
+msgstr "过滤了 %ld 行"
+
+msgid "E135: *Filter* Autocommands must not change current buffer"
+msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
+
+msgid "[No write since last change]\n"
+msgstr "[已修改但尚未保存]\n"
+
+# bad to translate
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s 位于行: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "读取 viminfo 文件 \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " 信息"
+
+msgid " marks"
+msgstr " 标记"
+
+msgid " FAILED"
+msgstr " 失败"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: Viminfo 文件不可写入: %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: 无法写入 viminfo 文件 %s！"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "写入 viminfo 文件 \"%s\""
+
+# do not translate to avoid writing Chinese in files
+#. Write the info:
+#, fuzzy, c-format
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# 这个 viminfo 文件是由 Vim %s 生成的。\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# 如果要自行修改请特别小心！\n"
+"\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' 在此文件建立时的值\n"
+
+msgid "Illegal starting char"
+msgstr "无效的启动字符"
+
+msgid "Save As"
+msgstr "另存为"
+
+msgid "Write partial file?"
+msgstr "要写入部分文件吗？"
+
+msgid "E140: Use ! to write partial buffer"
+msgstr "E140: 请使用 ! 来写入部分缓冲区"
+
+#, c-format
+msgid "Overwrite existing file \"%s\"?"
+msgstr "覆盖已存在的文件 \"%s\" 吗？"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "交换文件 \"%s\" 已存在，确实要覆盖吗？"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: 交换文件已存在: %s (:silent! 强制执行)"
+
+#, c-format
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: 缓冲区 %ld 没有文件名"
+
+msgid "E142: File not written: Writing is disabled by 'write' option"
+msgstr "E142: 文件未写入: 写入被 'write' 选项禁用"
+
+#, c-format
+msgid ""
+"'readonly' option is set for \"%s\".\n"
+"Do you wish to write anyway?"
+msgstr ""
+"\"%s\" 已设定 'readonly' 选项。\n"
+"确实要覆盖吗？"
+
+msgid "Edit File"
+msgstr "编辑文件"
+
+#, c-format
+msgid "E143: Autocommands unexpectedly deleted new buffer %s"
+msgstr "E143: 自动命令意外地删除了新缓冲区 %s"
+
+msgid "E144: non-numeric argument to :z"
+msgstr "E144: :z 不接受非数字的参数"
+
+msgid "E145: Shell commands not allowed in rvim"
+msgstr "E145: rvim 中禁止使用 shell 命令"
+
+msgid "E146: Regular expressions can't be delimited by letters"
+msgstr "E146: 正则表达式不能用字母作分界"
+
+#, c-format
+msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
+msgstr "替换为 %s (y/n/a/q/l/^E/^Y)？"
+
+msgid "(Interrupted) "
+msgstr "(已中断) "
+
+msgid "1 match"
+msgstr "1 个匹配，"
+
+msgid "1 substitution"
+msgstr "1 次替换，"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld 个匹配，"
+
+#, c-format
+msgid "%ld substitutions"
+msgstr "%ld 次替换，"
+
+msgid " on 1 line"
+msgstr "共 1 行"
+
+#, c-format
+msgid " on %ld lines"
+msgstr "共 %ld 行"
+
+msgid "E147: Cannot do :global recursive"
+msgstr "E147: :global 不能递归执行"
+
+msgid "E148: Regular expression missing from global"
+msgstr "E148: global 缺少正则表达式"
+
+#, c-format
+msgid "Pattern found in every line: %s"
+msgstr "每行都匹配表达式: %s"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# 最近的替换字符串:\n"
+"$"
+
+msgid "E478: Don't panic!"
+msgstr "E478: 不要慌！"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: 抱歉，没有 '%s' 的 %s 的说明"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: 抱歉，没有 %s 的说明"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "抱歉，找不到帮助文件 \"%s\""
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: 不是目录: %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: 无法打开并写入 %s"
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: 无法打开并读取 %s"
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: 在一种语言中混合了多种帮助文件编码: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" 在文件 %s/%s 中重复出现"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: 未知的 sign 命令: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: 缺少 sign 名称"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs 定义过多"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: 无效的 sign 文字: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: 未知的 sign: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: 缺少 sign 号"
+
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: 无效的缓冲区名: %s"
+
+#, c-format
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: 无效的 sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (找不到)"
+
+msgid " (not supported)"
+msgstr " (不支持)"
+
+msgid "[Deleted]"
+msgstr "[已删除]"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "进入调试模式。输入 \"cont\" 继续运行。"
 
@@ -711,9 +977,6 @@
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: 请先使用 :profile start <fname>"
 
-msgid "Save As"
-msgstr "另存为"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "将改变保存到 \"%s\" 吗？"
@@ -812,265 +1075,6 @@
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 不能设定语言为 \"%s\""
 
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  十六进制 %02x,  八进制 %03o"
-
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, 十六进制 %04x, 八进制 %o"
-
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, 十六进制 %08x, 八进制 %o"
-
-msgid "E134: Move lines into themselves"
-msgstr "E134: 把行移动到自已中"
-
-msgid "1 line moved"
-msgstr "移动了 1 行"
-
-#, c-format
-msgid "%ld lines moved"
-msgstr "移动了 %ld 行"
-
-#, c-format
-msgid "%ld lines filtered"
-msgstr "过滤了 %ld 行"
-
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
-
-msgid "[No write since last change]\n"
-msgstr "[已修改但尚未保存]\n"
-
-#, c-format
-# bad to translate
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s 位于行: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "读取 viminfo 文件 \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " 信息"
-
-msgid " marks"
-msgstr " 标记"
-
-msgid " FAILED"
-msgstr " 失败"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo 文件不可写入: %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: 无法写入 viminfo 文件 %s！"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "写入 viminfo 文件 \"%s\""
-
-#. Write the info:
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# 这个 viminfo 文件是由 vim %s 生成的。\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# 如果要自行修改请特别小心！\n"
-"\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' 在此文件建立时的值\n"
-
-msgid "Illegal starting char"
-msgstr "无效的启动字符"
-
-msgid "Write partial file?"
-msgstr "要写入部分文件吗？"
-
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: 请使用 ! 来写入部分缓冲区"
-
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "覆盖已存在的文件 \"%s\" 吗？"
-
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "交换文件 \"%s\" 已存在，确实要覆盖吗？"
-
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: 交换文件已存在: %s (:silent! 强制执行)"
-
-#, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: 缓冲区 %ld 没有文件名"
-
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: 文件未写入: 写入被 'write' 选项禁用"
-
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" 已设定 'readonly' 选项。\n"
-"确实要覆盖吗？"
-
-msgid "Edit File"
-msgstr "编辑文件"
-
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: 自动命令意外地删除了新缓冲区 %s"
-
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z 不接受非数字的参数"
-
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim 中禁止使用 shell 命令"
-
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: 正则表达式不能用字母作分界"
-
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "替换为 %s (y/n/a/q/l/^E/^Y)？"
-
-msgid "(Interrupted) "
-msgstr "(已中断) "
-
-msgid "1 match"
-msgstr "1 个匹配，"
-
-msgid "1 substitution"
-msgstr "1 次替换，"
-
-#, c-format
-msgid "%ld matches"
-msgstr "%ld 个匹配，"
-
-#, c-format
-msgid "%ld substitutions"
-msgstr "%ld 次替换，"
-
-msgid " on 1 line"
-msgstr "共 1 行"
-
-#, c-format
-msgid " on %ld lines"
-msgstr "共 %ld 行"
-
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global 不能递归执行"
-
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global 缺少正则表达式"
-
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "每行都匹配表达式: %s"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# 最近的替换字符串:\n"
-"$"
-
-msgid "E478: Don't panic!"
-msgstr "E478: 不要慌！"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: 抱歉，没有 '%s' 的 %s 的说明"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: 抱歉，没有 %s 的说明"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "抱歉，找不到帮助文件 \"%s\""
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: 不是目录: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: 无法打开并写入 %s"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: 无法打开并读取 %s"
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: 在一种语言中混合了多种帮助文件编码: %s"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Tag \"%s\" 在文件 %s/%s 中重复出现"
-
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: 未知的 sign 命令: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: 缺少 sign 名称"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: Signs 定义过多"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: 无效的 sign 文字: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: 未知的 sign: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: 缺少 sign 号"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: 无效的缓冲区名: %s"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 无效的 sign ID: %ld"
-
-msgid " (NOT FOUND)"
-msgstr " (找不到)"
-
-msgid " (not supported)"
-msgstr " (不支持)"
-
-msgid "[Deleted]"
-msgstr "[已删除]"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
 
@@ -1179,7 +1183,7 @@
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: 找不到颜色主题 %s"
+msgstr "E185: 找不到配色方案 %s"
 
 msgid "Greetings, Vim user!"
 msgstr "您好，Vim 用户！"
@@ -1391,6 +1395,9 @@
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction 不在函数内"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: 目前不允许编辑别的缓冲区"
+
 msgid "tagname"
 msgstr "tag 名"
 
@@ -1400,8 +1407,8 @@
 msgid "'history' option is zero"
 msgstr "选项 'history' 为零"
 
-#, fuzzy, c-format
 # do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@
 "\n"
 "# %s 历史记录 (从新到旧):\n"
 
-msgid "Command Line"
-msgstr "命令行"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr "命令行"
 
-msgid "Search String"
-msgstr "查找字符串"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "查找字符串"
 
-msgid "Expression"
-msgstr "表达式"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "表达式"
 
-msgid "Input Line"
-msgstr "输入行"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr "输入行"
 
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar 超过命令长度"
@@ -1550,9 +1565,8 @@
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
 
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork 会消失 (请加 ! 强制执行)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork 会丢失 (请加 ! 强制执行)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 找不到用于写入的临时文件"
@@ -1836,6 +1850,29 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 无效的模式"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: 无法启动图形界面"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: 无法读取文件 \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: 无法启动图形界面，找不到有效的字体"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 无效的 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: 无法分配颜色 %s"
+
+msgid "No match at cursor, finding next"
+msgstr "在光标处没有匹配，查找下一个"
+
 msgid "<cannot open> "
 msgstr "<无法打开>"
 
@@ -1858,38 +1895,15 @@
 msgid "Cancel"
 msgstr "取消"
 
-msgid "Vim dialog"
-msgstr "Vim 对话框"
-
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "滚动条部件: 无法获取滑块图像的几何大小"
 
+msgid "Vim dialog"
+msgstr "Vim 对话框"
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: 不能同时使用消息和回调函数来创建 BalloonEval"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: 无法启动图形界面"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: 不能读取文件 \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: 无法启动图形界面，找不到有效的字体"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 无效的 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' 的值无效"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 无法分配颜色 %s"
-
-msgid "No match at cursor, finding next"
-msgstr "在光标处没有匹配，查找下一个"
-
 msgid "Vim dialog..."
 msgstr "Vim 对话框..."
 
@@ -2027,6 +2041,12 @@
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: 无法在 MDI 应用程序中打开窗口"
 
+msgid "Close tab"
+msgstr "关闭标签"
+
+msgid "Open tab..."
+msgstr "打开标签..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "查找字符串 (使用 '\\\\' 来查找 '\\')"
 
@@ -2084,40 +2104,36 @@
 "字体1的宽度: %ld\n"
 "\n"
 
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "不正确的字体集(Fontset)"
+msgid "Invalid font specification"
+msgstr "指定了无效的字体"
 
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "取消(&D)"
 
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "找不到匹配的项"
 
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "字体选择"
+msgid "Vim - Font Selector"
+msgstr "Vim - 字体选择器"
 
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr "名称:"
 
 #. create toggle button
 #~ msgid "Show size in Points"
 #~ msgstr ""
 
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "记录中"
+msgid "Encoding:"
+msgstr "编码:"
 
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "字体1: %s\n"
+msgid "Font:"
+msgstr "字体:"
 
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr "风格:"
 
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "尺寸:"
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata 错误"
@@ -3021,8 +3037,8 @@
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
 
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\t设置用于区分主窗口的窗口角色名"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t在另一个 GTK 部件中打开 Vim"
@@ -3030,8 +3046,8 @@
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <parent title>\t在父应用程序中打开 Vim"
 
-#~ msgid "No display"
-#~ msgstr ""
+msgid "No display"
+msgstr "没有 display"
 
 #. Failed to send, abort.
 msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@
 msgid "%d of %d edited"
 msgstr "%d 中 %d 已编辑"
 
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "发送表达式失败。\n"
+msgid "No display: Send expression failed.\n"
+msgstr "没有 display: 发送表达式失败。\n"
 
 msgid ": Send expression failed.\n"
 msgstr ": 发送表达式失败。\n"
@@ -3241,49 +3256,49 @@
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: 无法从 %s 读取块 1"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???缺少了太多行"
+#, fuzzy
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???缺少了太多行"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???行数错误"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???行数错误"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???空的块"
+#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???空的块"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???缺少了一些行"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???缺少了一些行"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: 块 1 ID 错误 (%s 不是交换文件？)"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???缺少块"
+#, fuzzy
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???缺少块"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? 从这里到 ???END 的行可能已混乱"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? 从这里到 ???END 的行可能已混乱"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
 msgstr "E311: 恢复已被中断"
@@ -3810,18 +3825,18 @@
 msgstr "E347: 在路径中找不到更多的文件 \"%s\""
 
 #. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "无法连接到 Netbeans #2"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "无法连接到 Netbeans"
 
 #, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans 连接信息文件中错误的访问模式: \"%s\""
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr "从 Netbeans 套接字读取"
 
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@
 msgid "%ld Cols; "
 msgstr "%ld 列; "
 
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字节"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
 "Bytes"
-msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Chars); %ld/%ld"
+msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字符; %ld/%ld 个字节"
 
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr "列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr "第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字节"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Char) %ld/%ld; 字符(Byte) %ld/%ld"
+"第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字符; 第 %ld/%ld 个"
+"字节"
 
 #, c-format
 #~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@
 msgid "I/O ERROR"
 msgstr "I/O 错误"
 
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "消息"
 
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' 不是 80, 不能执行外部命令"
 
 msgid "E237: Printer selection failed"
-msgstr "E237: 不能选择此打印机"
+msgstr "E237: 选择打印机失败"
 
 #, c-format
 msgid "to %s on %s"
@@ -4203,7 +4216,7 @@
 
 #, c-format
 msgid "Printing '%s'"
-msgstr "已打印: '%s'"
+msgstr "打印 '%s'"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@
 msgstr "E245: 不正确的字符 '%c' 出现在字体名称 \"%s\" 内"
 
 msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: 不正确的 'filetype' 选项 - 使用纯文字模式"
+msgstr "E366: 不正确的 'osfiletype' 选项 - 使用纯文字模式"
 
 msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: 双重信号, 退出中\n"
+msgstr "Vim: 双重信号，退出中\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: 拦截到信号(signal) %s\n"
+msgstr "Vim: 拦截到致命信号(deadly signal) %s\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: 拦截到致命的信号(deadly signale)\n"
+msgstr "Vim: 拦截到致命信号(deadly signal)\n"
 
 #, c-format
 msgid "Opening the X display took %ld msec"
-msgstr "打开 X Window 用时 %ld 秒"
+msgstr "打开 X display 用时 %ld 秒"
 
 msgid ""
 "\n"
@@ -4239,24 +4252,24 @@
 "Vim: X 错误\n"
 
 msgid "Testing the X display failed"
-msgstr "测试 X Window 失败"
+msgstr "测试 X display 失败"
 
 msgid "Opening the X display timed out"
-msgstr "打开 X Window 超时"
+msgstr "打开 X display 超时"
 
 msgid ""
 "\n"
 "Cannot execute shell "
 msgstr ""
 "\n"
-"不能执行 shell"
+"无法执行 shell"
 
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
-"不能执行 shell sh\n"
+"无法执行 shell sh\n"
 
 msgid ""
 "\n"
@@ -4270,14 +4283,14 @@
 "Cannot create pipes\n"
 msgstr ""
 "\n"
-"不能建立管道\n"
+"无法建立管道\n"
 
 msgid ""
 "\n"
 "Cannot fork\n"
 msgstr ""
 "\n"
-"不能 fork\n"
+"无法 fork\n"
 
 msgid ""
 "\n"
@@ -4286,46 +4299,45 @@
 "\n"
 "命令已结束\n"
 
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "显示连接"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP 丢失了到 ICE 的连接"
 
+# do not translate
 #, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
 
 msgid "Opening the X display failed"
-msgstr "打开 X Window 失败"
+msgstr "打开 X display 失败"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP 处理 save-yourself 请求"
 
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "没有 cscope 连接"
+msgid "XSMP opening connection"
+msgstr "XSMP 打开连接"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE 连接监视失败"
 
 #, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection 调用失败: %s"
 
 msgid "At line"
 msgstr "在行号 "
 
 msgid "Could not load vim32.dll!"
-msgstr "不能加载 vim32.dll！"
+msgstr "无法加载 vim32.dll！"
 
 msgid "VIM Error"
 msgstr "VIM 错误"
 
 msgid "Could not fix up function pointers to the DLL!"
-msgstr "不能修正函数指针到 DLL!"
+msgstr "无法修正到 DLL 的函数指针!"
 
 #, c-format
 msgid "shell returned %d"
-msgstr "Shell 返回值 %d"
+msgstr "Shell 返回 %d"
 
 #, c-format
 msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"在你的 $PATH 中找不到 VIMRUN.EXE.\n"
-"外部命令执行完毕后将不会暂停.\n"
+"在你的 $PATH 中找不到 VIMRUN.EXE。\n"
+"外部命令执行完毕后将不会暂停。\n"
 "进一步说明请见 :help win32-vimrun"
 
 msgid "Vim Warning"
@@ -4407,8 +4419,8 @@
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 无法写入，已设定选项 'buftype'"
 
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: 缺少文件名或模式无效"
 
 #, c-format
 msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@
 msgid "Scanning included file: %s"
 msgstr "查找包含文件: %s"
 
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "查找包含文件: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "查找包含的文件 %s"
 
 msgid "E387: Match is on current line"
 msgstr "E387: 当前行匹配"
@@ -4622,339 +4634,339 @@
 msgid "E389: Couldn't find pattern"
 msgstr "E389: 找不到 pattern"
 
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: 交换文件写入错误"
+msgid "E759: Format error in spell file"
+msgstr "E759: 拼写文件格式错误"
 
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: 不能选择此打印机"
-
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+msgid "E758: Truncated spell file"
+msgstr "E758: 已截断的拼写文件"
 
 #, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag 文件 \"%s\" 格式错误"
-
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
-
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
-
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s 第 %d 行，多余的后续字符: %s"
 
 #, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s 第 %d 行，附加项名字太长: %s"
 
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "使用交换文件 \"%s\""
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: 附加文件 FOL、LOW 或 UPP 中格式错误"
 
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL、LOW 或 UPP 中字符超出范围"
 
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: 还有 %ld 个文件未编辑"
+msgid "Compressing word tree..."
+msgstr "压缩单词树……"
 
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: 交换文件写入错误"
-
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "不支持该选项"
-
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr "查找 tag 文件 \"%s\""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: 拼写检查未启用"
 
 #, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "警告: 找不到单词列表 \"%s.%s.spl\" or \"%s.ascii.spl\""
 
 #, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Reading spell file \"%s\""
+msgstr "读取拼写文件 \"%s\""
 
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "不支持该选项"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: 这看起来不像是拼写文件"
 
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "不正确的服务器 id : %s"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: 旧版本的拼写文件，需要更新"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: 为更高版本的 Vim 所用的拼写文件"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: 拼写文件中存在不支持的节"
 
 #, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: region %s not supported"
+msgstr "警告: 区域 %s 不支持"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Reading affix file %s ..."
+msgstr "读取附加文件 %s ……"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "单词 %s 转换失败，第 %d 行: %s"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "不支持 %s 中的转换: 从 %s 到 %s"
 
 #, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported"
+msgstr "不支持 %s 中的转换"
 
 #, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s 第 %d 行，FLAG 的值无效: %s"
 
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s 第 %d 行，在使用标志后出现 FLAG: %s"
 
 #, c-format
 #~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
-
-#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDWORDMAX 值: %s"
 
 #, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDMIN 值: %s"
 
 #, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDSYLMAX 值: %s"
 
 #, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 CHECKCOMPOUNDPATTERN 值: %s"
 
 #, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
-
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "太多编辑参数"
-
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "太多编辑参数"
-
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s 第 %d 行，在连续的附加块中出现不同的组合标志: %s"
 
 #, c-format
-#~ msgid "Missing SOFO%s line in %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的附加项: %s"
 
 #, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s 第 %d 行，附加项被 BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST 使"
+"用: %s"
 
 #, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s 第 %d 行，此处需要 Y 或 N: %s"
 
 #, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的条件: %s"
 
 #, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "扫描字典: %s"
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s 第 %d 行，此处需要 REP(SAL) 计数"
 
 #, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s 第 %d 行，此处需要 MAP 计数"
 
 #, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "每一行都找不到模式: %s"
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s 第 %d 行，MAP 中存在重复的字符"
 
 #, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s 第 %d 行，无法识别或重复的项: %s"
 
 #, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s 中缺少 FOL/LOW/UPP 行"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "在没有 SYLLABLE 的情况下使用了 COMPOUNDSYLMAX"
+
+msgid "Too many postponed prefixes"
+msgstr "太多延迟前缀"
+
+msgid "Too many compound flags"
+msgstr "太多组合标志"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "太多延迟前缀和/或组合标志"
 
 #, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s 中缺少 SOFO%s 行"
 
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "从标准输入读..."
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s 同时出现 SQL 和 SOFO 行"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s 第 %d 行，标志不是数字: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s 第 %d 行，无效的标志: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s 的值与另一个 .aff 文件中使用的值不相同"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "读取字典文件 %s ……"
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: %s 中没有单词计数"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "第 %6d 行，第 %6d 个单词 - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的单词: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s 第 %d 行，首次重复的单词: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "存在 %d 个重复的单词，在 %s 中"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "忽略了含有非 ASCII 字符的 %d 个单词，在 %s 中"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "读取单词文件 %s ……"
 
 #, c-format
 #~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，单词后的 /encoding= 行已被忽略: %s"
 
 #, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的 /regions= 行已被忽略: %s"
 
 #, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s 第 %d 行，太多区域: %s"
 
 #, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "不正确的服务器 id : %s"
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，/ 行已被忽略: %s"
 
 #, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s 第 %d 行，无效的区域号: %s"
 
 #, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s 第 %d 行，不可识别的标志: %s"
 
 #, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "忽略了含有非 ASCII 字符的 %d 个单词"
 
-#~ msgid "Reading back spell file..."
-#~ msgstr ""
+#, c-format
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "压缩了 %d/%d 个节点；剩余 %d (%d%%)"
+
+msgid "Reading back spell file..."
+msgstr "读取拼写文件……"
 
 #.
 #. * Go through the trie of good words, soundfold each word and add it to
 #. * the soundfold trie.
 #.
-#~ msgid "Performing soundfolding..."
-#~ msgstr ""
+msgid "Performing soundfolding..."
+msgstr "正在 soundfolding……"
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding 后的单词数: %ld"
 
 #, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+msgid "Total number of words: %d"
+msgstr "单词总数: %d"
 
 #, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
-
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
-
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: 不正确的表达式: %s"
-
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "写入 viminfo 文件 \"%s\" 中"
-
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr "向下"
+msgid "Writing suggestion file %s ..."
+msgstr "写入建议文件 %s ……"
 
 #, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "估计运行时内存用量: %d 字节"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: 输出文件名不能含有区域名"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: 最多只支持 8 个区域"
 
 #, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s 出现无效的范围"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "警告: 同时指定了 compounding 和 NOBREAK"
 
 #, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Writing spell file %s ..."
+msgstr "写入拼写文件 %s ……"
 
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
-
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Done!"
+msgstr "完成！"
 
 #, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' 没有 %ld 项"
+
+#, c-format
+msgid "Word removed from %s"
+msgstr "从 %s 中删除了单词"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "向 %s 中添加了单词"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: 拼写文件之间的字符不相同"
+
+msgid "Sorry, no suggestions"
+msgstr "抱歉，没有建议"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "抱歉，只有 %ld 条建议"
 
 #. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "将改变保存到 \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "将 \"%.*s\" 改为："
 
 #, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
 
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: 没有前一个查找命令"
+msgid "E752: No previous spell replacement"
+msgstr "E752: 之前没有拼写替换"
 
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [菜单] 找不到 %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 找不到: %s"
 
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: 看起来不像是 .sug 文件: %s"
 
 #, c-format
 #~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@
 msgstr "E397: 需要文件名称"
 
 #, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: 缺少 ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: 缺少 ']': %s"
 
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 不正确的 :syntax 子命令: %s"
 
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: 加载 syncolor.vim 时出现嵌套循环"
 
 #, c-format
 msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: 使用了太多不同的高亮度属性"
 
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: 组名中存在不可显示字符"
 
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: 命令名称不正确"
+msgid "W18: Invalid character in group name"
+msgstr "W18: 组名中含有无效字符"
 
 msgid "E555: at bottom of tag stack"
 msgstr "E555: 已在 tag 堆栈底部"
@@ -5648,6 +5659,9 @@
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "输入  :help windows95<Enter>  查看相关说明    "
 
+msgid "Already only one window"
+msgstr "已经只剩一个窗口了"
+
 msgid "E441: There is no preview window"
 msgstr "E441: 没有预览窗口"
 
@@ -5660,9 +5674,6 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: 不能关闭最后一个窗口"
 
-msgid "Already only one window"
-msgstr "已经只剩一个窗口了"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: 其它窗口有改变的内容"
 
@@ -6050,6 +6061,9 @@
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "已查找到文件结尾，再从开头继续查找"
 
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s 第 %d 行，使用 PFXPOSTPONE 时附加标志被忽略: %s"
+
 #~ msgid "[No file]"
 #~ msgstr "[未命名]"
 

diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index dd4df46..591839f 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po

@@ -4,6 +4,10 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # FIRST AUTHOR  Wang Jun <junw@turbolinux.com.cn>
+# 
+# TRANSLATORS
+#   Edyfox <edyfox@gmail.com>
+#   Yuheng Xie <elephant@linux.net.cn>
 #
 # Generated from zh_CN.po, DO NOT EDIT.
 #
@@ -11,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: »º³åÇø \"%s\" ²»ÔÚ diff Ä£Ê½"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ÒâÍâµØ¸Ä±äÁË»º³åÇø"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ¸´ºÏ×Ö·û(digraph)ÖÐ²»ÄÜÊ¹ÓÃ Escape"
 
@@ -222,8 +229,8 @@
 msgstr " ¹Ø¼ü×Ö²¹È« (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " ÕûÐÐ²¹È« (^L^N^P)"
@@ -256,8 +263,8 @@
 msgid " Omni completion (^O^N^P)"
 msgstr " È«ÄÜ²¹È« (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " Æ´Ð´½¨Òé (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Æ´Ð´½¨Òé (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " ¹Ø¼ü×Ö¾Ö²¿²¹È« (^N^P)"
@@ -489,9 +496,8 @@
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Dictionary È±ÉÙ½áÊø·û '}': %s"
 
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉî"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉîÎÞ·¨ÏÔÊ¾"
 
 msgid "E699: Too many arguments"
 msgstr "E699: ²ÎÊý¹ý¶à"
@@ -529,8 +535,8 @@
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() µÄµ÷ÓÃ´ÎÊý¶àÓÚ inputsave()"
 
-msgid "E745: Range not allowed"
-msgstr "E745: ²»ÔÊÐíµÄ·¶Î§"
+msgid "E786: Range not allowed"
+msgstr "E786: ²»ÔÊÐíµÄ·¶Î§"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() µÄÀàÐÍÎÞÐ§"
@@ -560,9 +566,8 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: ÎÞ·¨·¢ËÍµ½¿Í»§¶Ë"
 
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort ±È½Ïº¯ÊýÊ§°Ü"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort ±È½Ïº¯ÊýÊ§°Ü"
 
 msgid "(Invalid)"
 msgstr "(ÎÞÐ§)"
@@ -611,9 +616,8 @@
 msgid "E742: Cannot change value of %s"
 msgstr "E742: ÎÞ·¨¸Ä±ä %s µÄÖµ"
 
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉî"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉîÎÞ·¨¸´ÖÆ"
 
 #, c-format
 msgid "E124: Missing '(': %s"
@@ -682,6 +686,268 @@
 "\n"
 "\t×î½üÐÞ¸ÄÓÚ "
 
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
+msgstr "<%s>%s%s  %d,  Ê®Áù½øÖÆ %02x,  °Ë½øÖÆ %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
+
+msgid "E134: Move lines into themselves"
+msgstr "E134: °ÑÐÐÒÆ¶¯µ½×ÔÒÑÖÐ"
+
+msgid "1 line moved"
+msgstr "ÒÆ¶¯ÁË 1 ÐÐ"
+
+#, c-format
+msgid "%ld lines moved"
+msgstr "ÒÆ¶¯ÁË %ld ÐÐ"
+
+#, c-format
+msgid "%ld lines filtered"
+msgstr "¹ýÂËÁË %ld ÐÐ"
+
+msgid "E135: *Filter* Autocommands must not change current buffer"
+msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒÔ¸Ä±äµ±Ç°»º³åÇø"
+
+msgid "[No write since last change]\n"
+msgstr "[ÒÑÐÞ¸Äµ«ÉÐÎ´±£´æ]\n"
+
+# bad to translate
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s Î»ÓÚÐÐ: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎÄ¼þµÄÊ£Óà²¿·Ö"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "¶ÁÈ¡ viminfo ÎÄ¼þ \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " ÐÅÏ¢"
+
+msgid " marks"
+msgstr " ±ê¼Ç"
+
+msgid " FAILED"
+msgstr " Ê§°Ü"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: Viminfo ÎÄ¼þ²»¿ÉÐ´Èë: %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: ÎÞ·¨Ð´Èë viminfo ÎÄ¼þ %s£¡"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\""
+
+# do not translate to avoid writing Chinese in files
+#. Write the info:
+#, fuzzy, c-format
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# Õâ¸ö viminfo ÎÄ¼þÊÇÓÉ Vim %s Éú³ÉµÄ¡£\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌØ±ðÐ¡ÐÄ£¡\n"
+"\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' ÔÚ´ËÎÄ¼þ½¨Á¢Ê±µÄÖµ\n"
+
+msgid "Illegal starting char"
+msgstr "ÎÞÐ§µÄÆô¶¯×Ö·û"
+
+msgid "Save As"
+msgstr "Áí´æÎª"
+
+msgid "Write partial file?"
+msgstr "ÒªÐ´Èë²¿·ÖÎÄ¼þÂð£¿"
+
+msgid "E140: Use ! to write partial buffer"
+msgstr "E140: ÇëÊ¹ÓÃ ! À´Ð´Èë²¿·Ö»º³åÇø"
+
+#, c-format
+msgid "Overwrite existing file \"%s\"?"
+msgstr "¸²¸ÇÒÑ´æÔÚµÄÎÄ¼þ \"%s\" Âð£¿"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "½»»»ÎÄ¼þ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: ½»»»ÎÄ¼þÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
+
+#, c-format
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: »º³åÇø %ld Ã»ÓÐÎÄ¼þÃû"
+
+msgid "E142: File not written: Writing is disabled by 'write' option"
+msgstr "E142: ÎÄ¼þÎ´Ð´Èë: Ð´Èë±» 'write' Ñ¡Ïî½ûÓÃ"
+
+#, c-format
+msgid ""
+"'readonly' option is set for \"%s\".\n"
+"Do you wish to write anyway?"
+msgstr ""
+"\"%s\" ÒÑÉè¶¨ 'readonly' Ñ¡Ïî¡£\n"
+"È·ÊµÒª¸²¸ÇÂð£¿"
+
+msgid "Edit File"
+msgstr "±à¼ÎÄ¼þ"
+
+#, c-format
+msgid "E143: Autocommands unexpectedly deleted new buffer %s"
+msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØÉ¾³ýÁËÐÂ»º³åÇø %s"
+
+msgid "E144: non-numeric argument to :z"
+msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ÖµÄ²ÎÊý"
+
+msgid "E145: Shell commands not allowed in rvim"
+msgstr "E145: rvim ÖÐ½ûÖ¹Ê¹ÓÃ shell ÃüÁî"
+
+msgid "E146: Regular expressions can't be delimited by letters"
+msgstr "E146: ÕýÔò±í´ïÊ½²»ÄÜÓÃ×ÖÄ¸×÷·Ö½ç"
+
+#, c-format
+msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
+msgstr "Ìæ»»Îª %s (y/n/a/q/l/^E/^Y)£¿"
+
+msgid "(Interrupted) "
+msgstr "(ÒÑÖÐ¶Ï) "
+
+msgid "1 match"
+msgstr "1 ¸öÆ¥Åä£¬"
+
+msgid "1 substitution"
+msgstr "1 ´ÎÌæ»»£¬"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ¸öÆ¥Åä£¬"
+
+#, c-format
+msgid "%ld substitutions"
+msgstr "%ld ´ÎÌæ»»£¬"
+
+msgid " on 1 line"
+msgstr "¹² 1 ÐÐ"
+
+#, c-format
+msgid " on %ld lines"
+msgstr "¹² %ld ÐÐ"
+
+msgid "E147: Cannot do :global recursive"
+msgstr "E147: :global ²»ÄÜµÝ¹éÖ´ÐÐ"
+
+msgid "E148: Regular expression missing from global"
+msgstr "E148: global È±ÉÙÕýÔò±í´ïÊ½"
+
+#, c-format
+msgid "Pattern found in every line: %s"
+msgstr "Ã¿ÐÐ¶¼Æ¥Åä±í´ïÊ½: %s"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# ×î½üµÄÌæ»»×Ö·û´®:\n"
+"$"
+
+msgid "E478: Don't panic!"
+msgstr "E478: ²»Òª»Å£¡"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄËµÃ÷"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄËµÃ÷"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎÄ¼þ \"%s\""
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ²»ÊÇÄ¿Â¼: %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖÐ»ìºÏÁË¶àÖÖ°ïÖúÎÄ¼þ±àÂë: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" ÔÚÎÄ¼þ %s/%s ÖÐÖØ¸´³öÏÖ"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: Î´ÖªµÄ sign ÃüÁî: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: È±ÉÙ sign Ãû³Æ"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs ¶¨Òå¹ý¶à"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: ÎÞÐ§µÄ sign ÎÄ×Ö: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: Î´ÖªµÄ sign: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: È±ÉÙ sign ºÅ"
+
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: ÎÞÐ§µÄ»º³åÇøÃû: %s"
+
+#, c-format
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: ÎÞÐ§µÄ sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (ÕÒ²»µ½)"
+
+msgid " (not supported)"
+msgstr " (²»Ö§³Ö)"
+
+msgid "[Deleted]"
+msgstr "[ÒÑÉ¾³ý]"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "½øÈëµ÷ÊÔÄ£Ê½¡£ÊäÈë \"cont\" ¼ÌÐøÔËÐÐ¡£"
 
@@ -711,9 +977,6 @@
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: ÇëÏÈÊ¹ÓÃ :profile start <fname>"
 
-msgid "Save As"
-msgstr "Áí´æÎª"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "½«¸Ä±ä±£´æµ½ \"%s\" Âð£¿"
@@ -812,265 +1075,6 @@
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ²»ÄÜÉè¶¨ÓïÑÔÎª \"%s\""
 
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  Ê®Áù½øÖÆ %02x,  °Ë½øÖÆ %03o"
-
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
-
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
-
-msgid "E134: Move lines into themselves"
-msgstr "E134: °ÑÐÐÒÆ¶¯µ½×ÔÒÑÖÐ"
-
-msgid "1 line moved"
-msgstr "ÒÆ¶¯ÁË 1 ÐÐ"
-
-#, c-format
-msgid "%ld lines moved"
-msgstr "ÒÆ¶¯ÁË %ld ÐÐ"
-
-#, c-format
-msgid "%ld lines filtered"
-msgstr "¹ýÂËÁË %ld ÐÐ"
-
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒÔ¸Ä±äµ±Ç°»º³åÇø"
-
-msgid "[No write since last change]\n"
-msgstr "[ÒÑÐÞ¸Äµ«ÉÐÎ´±£´æ]\n"
-
-#, c-format
-# bad to translate
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s Î»ÓÚÐÐ: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎÄ¼þµÄÊ£Óà²¿·Ö"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "¶ÁÈ¡ viminfo ÎÄ¼þ \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " ÐÅÏ¢"
-
-msgid " marks"
-msgstr " ±ê¼Ç"
-
-msgid " FAILED"
-msgstr " Ê§°Ü"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo ÎÄ¼þ²»¿ÉÐ´Èë: %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ÎÞ·¨Ð´Èë viminfo ÎÄ¼þ %s£¡"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\""
-
-#. Write the info:
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Õâ¸ö viminfo ÎÄ¼þÊÇÓÉ vim %s Éú³ÉµÄ¡£\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌØ±ðÐ¡ÐÄ£¡\n"
-"\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' ÔÚ´ËÎÄ¼þ½¨Á¢Ê±µÄÖµ\n"
-
-msgid "Illegal starting char"
-msgstr "ÎÞÐ§µÄÆô¶¯×Ö·û"
-
-msgid "Write partial file?"
-msgstr "ÒªÐ´Èë²¿·ÖÎÄ¼þÂð£¿"
-
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ÇëÊ¹ÓÃ ! À´Ð´Èë²¿·Ö»º³åÇø"
-
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "¸²¸ÇÒÑ´æÔÚµÄÎÄ¼þ \"%s\" Âð£¿"
-
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "½»»»ÎÄ¼þ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
-
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ½»»»ÎÄ¼þÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
-
-#, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: »º³åÇø %ld Ã»ÓÐÎÄ¼þÃû"
-
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ÎÄ¼þÎ´Ð´Èë: Ð´Èë±» 'write' Ñ¡Ïî½ûÓÃ"
-
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" ÒÑÉè¶¨ 'readonly' Ñ¡Ïî¡£\n"
-"È·ÊµÒª¸²¸ÇÂð£¿"
-
-msgid "Edit File"
-msgstr "±à¼ÎÄ¼þ"
-
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØÉ¾³ýÁËÐÂ»º³åÇø %s"
-
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ÖµÄ²ÎÊý"
-
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim ÖÐ½ûÖ¹Ê¹ÓÃ shell ÃüÁî"
-
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ÕýÔò±í´ïÊ½²»ÄÜÓÃ×ÖÄ¸×÷·Ö½ç"
-
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Ìæ»»Îª %s (y/n/a/q/l/^E/^Y)£¿"
-
-msgid "(Interrupted) "
-msgstr "(ÒÑÖÐ¶Ï) "
-
-msgid "1 match"
-msgstr "1 ¸öÆ¥Åä£¬"
-
-msgid "1 substitution"
-msgstr "1 ´ÎÌæ»»£¬"
-
-#, c-format
-msgid "%ld matches"
-msgstr "%ld ¸öÆ¥Åä£¬"
-
-#, c-format
-msgid "%ld substitutions"
-msgstr "%ld ´ÎÌæ»»£¬"
-
-msgid " on 1 line"
-msgstr "¹² 1 ÐÐ"
-
-#, c-format
-msgid " on %ld lines"
-msgstr "¹² %ld ÐÐ"
-
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ²»ÄÜµÝ¹éÖ´ÐÐ"
-
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global È±ÉÙÕýÔò±í´ïÊ½"
-
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "Ã¿ÐÐ¶¼Æ¥Åä±í´ïÊ½: %s"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ×î½üµÄÌæ»»×Ö·û´®:\n"
-"$"
-
-msgid "E478: Don't panic!"
-msgstr "E478: ²»Òª»Å£¡"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄËµÃ÷"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄËµÃ÷"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎÄ¼þ \"%s\""
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ²»ÊÇÄ¿Â¼: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖÐ»ìºÏÁË¶àÖÖ°ïÖúÎÄ¼þ±àÂë: %s"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Tag \"%s\" ÔÚÎÄ¼þ %s/%s ÖÐÖØ¸´³öÏÖ"
-
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Î´ÖªµÄ sign ÃüÁî: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: È±ÉÙ sign Ãû³Æ"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: Signs ¶¨Òå¹ý¶à"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ÎÞÐ§µÄ sign ÎÄ×Ö: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Î´ÖªµÄ sign: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: È±ÉÙ sign ºÅ"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ÎÞÐ§µÄ»º³åÇøÃû: %s"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ÎÞÐ§µÄ sign ID: %ld"
-
-msgid " (NOT FOUND)"
-msgstr " (ÕÒ²»µ½)"
-
-msgid " (not supported)"
-msgstr " (²»Ö§³Ö)"
-
-msgid "[Deleted]"
-msgstr "[ÒÑÉ¾³ý]"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "½øÈë Ex Ä£Ê½¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
 
@@ -1179,7 +1183,7 @@
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ö÷Ìâ %s"
+msgstr "E185: ÕÒ²»µ½ÅäÉ«·½°¸ %s"
 
 msgid "Greetings, Vim user!"
 msgstr "ÄúºÃ£¬Vim ÓÃ»§£¡"
@@ -1391,6 +1395,9 @@
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction ²»ÔÚº¯ÊýÄÚ"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: Ä¿Ç°²»ÔÊÐí±à¼±ðµÄ»º³åÇø"
+
 msgid "tagname"
 msgstr "tag Ãû"
 
@@ -1400,8 +1407,8 @@
 msgid "'history' option is zero"
 msgstr "Ñ¡Ïî 'history' ÎªÁã"
 
-#, fuzzy, c-format
 # do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@
 "\n"
 "# %s ÀúÊ·¼ÇÂ¼ (´ÓÐÂµ½¾É):\n"
 
-msgid "Command Line"
-msgstr "ÃüÁîÐÐ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr "ÃüÁîÐÐ"
 
-msgid "Search String"
-msgstr "²éÕÒ×Ö·û´®"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "²éÕÒ×Ö·û´®"
 
-msgid "Expression"
-msgstr "±í´ïÊ½"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "±í´ïÊ½"
 
-msgid "Input Line"
-msgstr "ÊäÈëÐÐ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr "ÊäÈëÐÐ"
 
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ³¬¹ýÃüÁî³¤¶È"
@@ -1550,9 +1565,8 @@
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: ÎÞ·¨Éú³É±¸·ÝÎÄ¼þ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
 
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork »áÏûÊ§ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork »á¶ªÊ§ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ÕÒ²»µ½ÓÃÓÚÐ´ÈëµÄÁÙÊ±ÎÄ¼þ"
@@ -1836,6 +1850,29 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ÎÞÐ§µÄÄ£Ê½"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: ÎÞ·¨¶ÁÈ¡ÎÄ¼þ \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ£¬ÕÒ²»µ½ÓÐÐ§µÄ×ÖÌå"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: ÎÞÐ§µÄ 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' µÄÖµÎÞÐ§"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Åä£¬²éÕÒÏÂÒ»¸ö"
+
 msgid "<cannot open> "
 msgstr "<ÎÞ·¨´ò¿ª>"
 
@@ -1858,38 +1895,15 @@
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-msgid "Vim dialog"
-msgstr "Vim ¶Ô»°¿ò"
-
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "¹ö¶¯Ìõ²¿¼þ: ÎÞ·¨»ñÈ¡»¬¿éÍ¼ÏñµÄ¼¸ºÎ´óÐ¡"
 
+msgid "Vim dialog"
+msgstr "Vim ¶Ô»°¿ò"
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ²»ÄÜÍ¬Ê±Ê¹ÓÃÏûÏ¢ºÍ»Øµ÷º¯ÊýÀ´´´½¨ BalloonEval"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: ²»ÄÜ¶ÁÈ¡ÎÄ¼þ \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ£¬ÕÒ²»µ½ÓÐÐ§µÄ×ÖÌå"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: ÎÞÐ§µÄ 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' µÄÖµÎÞÐ§"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
-
-msgid "No match at cursor, finding next"
-msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Åä£¬²éÕÒÏÂÒ»¸ö"
-
 msgid "Vim dialog..."
 msgstr "Vim ¶Ô»°¿ò..."
 
@@ -2027,6 +2041,12 @@
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: ÎÞ·¨ÔÚ MDI Ó¦ÓÃ³ÌÐòÖÐ´ò¿ª´°¿Ú"
 
+msgid "Close tab"
+msgstr "¹Ø±Õ±êÇ©"
+
+msgid "Open tab..."
+msgstr "´ò¿ª±êÇ©..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "²éÕÒ×Ö·û´® (Ê¹ÓÃ '\\\\' À´²éÕÒ '\\')"
 
@@ -2084,40 +2104,36 @@
 "×ÖÌå1µÄ¿í¶È: %ld\n"
 "\n"
 
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "²»ÕýÈ·µÄ×ÖÌå¼¯(Fontset)"
+msgid "Invalid font specification"
+msgstr "Ö¸¶¨ÁËÎÞÐ§µÄ×ÖÌå"
 
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "È¡Ïû(&D)"
 
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "ÕÒ²»µ½Æ¥ÅäµÄÏî"
 
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "×ÖÌåÑ¡Ôñ"
+msgid "Vim - Font Selector"
+msgstr "Vim - ×ÖÌåÑ¡ÔñÆ÷"
 
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr "Ãû³Æ:"
 
 #. create toggle button
 #~ msgid "Show size in Points"
 #~ msgstr ""
 
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "¼ÇÂ¼ÖÐ"
+msgid "Encoding:"
+msgstr "±àÂë:"
 
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "×ÖÌå1: %s\n"
+msgid "Font:"
+msgstr "×ÖÌå:"
 
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr "·ç¸ñ:"
 
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "³ß´ç:"
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata ´íÎó"
@@ -3021,8 +3037,8 @@
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim (Ò²¿ÉÓÃ --display)"
 
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tÉèÖÃÓÃÓÚÇø·ÖÖ÷´°¿ÚµÄ´°¿Ú½ÇÉ«Ãû"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ²¿¼þÖÐ´ò¿ª Vim"
@@ -3030,8 +3046,8 @@
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <parent title>\tÔÚ¸¸Ó¦ÓÃ³ÌÐòÖÐ´ò¿ª Vim"
 
-#~ msgid "No display"
-#~ msgstr ""
+msgid "No display"
+msgstr "Ã»ÓÐ display"
 
 #. Failed to send, abort.
 msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@
 msgid "%d of %d edited"
 msgstr "%d ÖÐ %d ÒÑ±à¼"
 
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
+msgid "No display: Send expression failed.\n"
+msgstr "Ã»ÓÐ display: ·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
 
 msgid ": Send expression failed.\n"
 msgstr ": ·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
@@ -3241,49 +3256,49 @@
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: ÎÞ·¨´Ó %s ¶ÁÈ¡¿é 1"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???È±ÉÙÁËÌ«¶àÐÐ"
+#, fuzzy
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???È±ÉÙÁËÌ«¶àÐÐ"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???ÐÐÊý´íÎó"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???ÐÐÊý´íÎó"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???¿ÕµÄ¿é"
+#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???¿ÕµÄ¿é"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???È±ÉÙÁËÒ»Ð©ÐÐ"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???È±ÉÙÁËÒ»Ð©ÐÐ"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ¿é 1 ID ´íÎó (%s ²»ÊÇ½»»»ÎÄ¼þ£¿)"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???È±ÉÙ¿é"
+#, fuzzy
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???È±ÉÙ¿é"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ»ìÂÒ"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ»ìÂÒ"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ±»²åÈë/É¾³ý¹ý"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ±»²åÈë/É¾³ý¹ý"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
 msgstr "E311: »Ö¸´ÒÑ±»ÖÐ¶Ï"
@@ -3810,18 +3825,18 @@
 msgstr "E347: ÔÚÂ·¾¶ÖÐÕÒ²»µ½¸ü¶àµÄÎÄ¼þ \"%s\""
 
 #. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "ÎÞ·¨Á¬½Óµ½ Netbeans #2"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "ÎÞ·¨Á¬½Óµ½ Netbeans"
 
 #, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans Á¬½ÓÐÅÏ¢ÎÄ¼þÖÐ´íÎóµÄ·ÃÎÊÄ£Ê½: \"%s\""
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr "´Ó Netbeans Ì×½Ó×Ö¶ÁÈ¡"
 
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@
 msgid "%ld Cols; "
 msgstr "%ld ÁÐ; "
 
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ¸ö´Ê; %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
 "Bytes"
-msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Chars); %ld/%ld"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ¸ö´Ê; %ld/%ld ¸ö×Ö·û; %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr "µÚ %s/%s ÁÐ; µÚ %ld/%ld ÐÐ; µÚ %ld/%ld ¸ö´Ê; µÚ %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Char) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+"µÚ %s/%s ÁÐ; µÚ %ld/%ld ÐÐ; µÚ %ld/%ld ¸ö´Ê; µÚ %ld/%ld ¸ö×Ö·û; µÚ %ld/%ld ¸ö"
+"×Ö½Ú"
 
 #, c-format
 #~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@
 msgid "I/O ERROR"
 msgstr "I/O ´íÎó"
 
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "ÏûÏ¢"
 
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ²»ÊÇ 80, ²»ÄÜÖ´ÐÐÍâ²¿ÃüÁî"
 
 msgid "E237: Printer selection failed"
-msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
+msgstr "E237: Ñ¡Ôñ´òÓ¡»úÊ§°Ü"
 
 #, c-format
 msgid "to %s on %s"
@@ -4203,7 +4216,7 @@
 
 #, c-format
 msgid "Printing '%s'"
-msgstr "ÒÑ´òÓ¡: '%s'"
+msgstr "´òÓ¡ '%s'"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@
 msgstr "E245: ²»ÕýÈ·µÄ×Ö·û '%c' ³öÏÖÔÚ×ÖÌåÃû³Æ \"%s\" ÄÚ"
 
 msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: ²»ÕýÈ·µÄ 'filetype' Ñ¡Ïî - Ê¹ÓÃ´¿ÎÄ×ÖÄ£Ê½"
+msgstr "E366: ²»ÕýÈ·µÄ 'osfiletype' Ñ¡Ïî - Ê¹ÓÃ´¿ÎÄ×ÖÄ£Ê½"
 
 msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: Ë«ÖØÐÅºÅ, ÍË³öÖÐ\n"
+msgstr "Vim: Ë«ÖØÐÅºÅ£¬ÍË³öÖÐ\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: À¹½Øµ½ÐÅºÅ(signal) %s\n"
+msgstr "Vim: À¹½Øµ½ÖÂÃüÐÅºÅ(deadly signal) %s\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: À¹½Øµ½ÖÂÃüµÄÐÅºÅ(deadly signale)\n"
+msgstr "Vim: À¹½Øµ½ÖÂÃüÐÅºÅ(deadly signal)\n"
 
 #, c-format
 msgid "Opening the X display took %ld msec"
-msgstr "´ò¿ª X Window ÓÃÊ± %ld Ãë"
+msgstr "´ò¿ª X display ÓÃÊ± %ld Ãë"
 
 msgid ""
 "\n"
@@ -4239,24 +4252,24 @@
 "Vim: X ´íÎó\n"
 
 msgid "Testing the X display failed"
-msgstr "²âÊÔ X Window Ê§°Ü"
+msgstr "²âÊÔ X display Ê§°Ü"
 
 msgid "Opening the X display timed out"
-msgstr "´ò¿ª X Window ³¬Ê±"
+msgstr "´ò¿ª X display ³¬Ê±"
 
 msgid ""
 "\n"
 "Cannot execute shell "
 msgstr ""
 "\n"
-"²»ÄÜÖ´ÐÐ shell"
+"ÎÞ·¨Ö´ÐÐ shell"
 
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
-"²»ÄÜÖ´ÐÐ shell sh\n"
+"ÎÞ·¨Ö´ÐÐ shell sh\n"
 
 msgid ""
 "\n"
@@ -4270,14 +4283,14 @@
 "Cannot create pipes\n"
 msgstr ""
 "\n"
-"²»ÄÜ½¨Á¢¹ÜµÀ\n"
+"ÎÞ·¨½¨Á¢¹ÜµÀ\n"
 
 msgid ""
 "\n"
 "Cannot fork\n"
 msgstr ""
 "\n"
-"²»ÄÜ fork\n"
+"ÎÞ·¨ fork\n"
 
 msgid ""
 "\n"
@@ -4286,46 +4299,45 @@
 "\n"
 "ÃüÁîÒÑ½áÊø\n"
 
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "ÏÔÊ¾Á¬½Ó"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ¶ªÊ§ÁËµ½ ICE µÄÁ¬½Ó"
 
+# do not translate
 #, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
 
 msgid "Opening the X display failed"
-msgstr "´ò¿ª X Window Ê§°Ü"
+msgstr "´ò¿ª X display Ê§°Ü"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP ´¦Àí save-yourself ÇëÇó"
 
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "Ã»ÓÐ cscope Á¬½Ó"
+msgid "XSMP opening connection"
+msgstr "XSMP ´ò¿ªÁ¬½Ó"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE Á¬½Ó¼àÊÓÊ§°Ü"
 
 #, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection µ÷ÓÃÊ§°Ü: %s"
 
 msgid "At line"
 msgstr "ÔÚÐÐºÅ "
 
 msgid "Could not load vim32.dll!"
-msgstr "²»ÄÜ¼ÓÔØ vim32.dll£¡"
+msgstr "ÎÞ·¨¼ÓÔØ vim32.dll£¡"
 
 msgid "VIM Error"
 msgstr "VIM ´íÎó"
 
 msgid "Could not fix up function pointers to the DLL!"
-msgstr "²»ÄÜÐÞÕýº¯ÊýÖ¸Õëµ½ DLL!"
+msgstr "ÎÞ·¨ÐÞÕýµ½ DLL µÄº¯ÊýÖ¸Õë!"
 
 #, c-format
 msgid "shell returned %d"
-msgstr "Shell ·µ»ØÖµ %d"
+msgstr "Shell ·µ»Ø %d"
 
 #, c-format
 msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE.\n"
-"Íâ²¿ÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£.\n"
+"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE¡£\n"
+"Íâ²¿ÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£¡£\n"
 "½øÒ»²½ËµÃ÷Çë¼û :help win32-vimrun"
 
 msgid "Vim Warning"
@@ -4407,8 +4419,8 @@
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: ÎÞ·¨Ð´Èë£¬ÒÑÉè¶¨Ñ¡Ïî 'buftype'"
 
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: È±ÉÙÎÄ¼þÃû»òÄ£Ê½ÎÞÐ§"
 
 #, c-format
 msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@
 msgid "Scanning included file: %s"
 msgstr "²éÕÒ°üº¬ÎÄ¼þ: %s"
 
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "²éÕÒ°üº¬ÎÄ¼þ: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "²éÕÒ°üº¬µÄÎÄ¼þ %s"
 
 msgid "E387: Match is on current line"
 msgstr "E387: µ±Ç°ÐÐÆ¥Åä"
@@ -4622,339 +4634,339 @@
 msgid "E389: Couldn't find pattern"
 msgstr "E389: ÕÒ²»µ½ pattern"
 
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: ½»»»ÎÄ¼þÐ´Èë´íÎó"
+msgid "E759: Format error in spell file"
+msgstr "E759: Æ´Ð´ÎÄ¼þ¸ñÊ½´íÎó"
 
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
-
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" ÖÐ¶Ïµã: µÚ %ld ÐÐ"
+msgid "E758: Truncated spell file"
+msgstr "E758: ÒÑ½Ø¶ÏµÄÆ´Ð´ÎÄ¼þ"
 
 #, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag ÎÄ¼þ \"%s\" ¸ñÊ½´íÎó"
-
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
-
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
-
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬¶àÓàµÄºóÐø×Ö·û: %s"
 
 #, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬¸½¼ÓÏîÃû×ÖÌ«³¤: %s"
 
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "Ê¹ÓÃ½»»»ÎÄ¼þ \"%s\""
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: ¸½¼ÓÎÄ¼þ FOL¡¢LOW »ò UPP ÖÐ¸ñÊ½´íÎó"
 
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»ÎÄ¼þ"
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL¡¢LOW »ò UPP ÖÐ×Ö·û³¬³ö·¶Î§"
 
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: »¹ÓÐ %ld ¸öÎÄ¼þÎ´±à¼"
+msgid "Compressing word tree..."
+msgstr "Ñ¹Ëõµ¥´ÊÊ÷¡¡"
 
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: ½»»»ÎÄ¼þÐ´Èë´íÎó"
-
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
-
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr "²éÕÒ tag ÎÄ¼þ \"%s\""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Æ´Ð´¼ì²éÎ´ÆôÓÃ"
 
 #, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "¾¯¸æ: ÕÒ²»µ½µ¥´ÊÁÐ±í \"%s.%s.spl\" or \"%s.ascii.spl\""
 
 #, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Reading spell file \"%s\""
+msgstr "¶ÁÈ¡Æ´Ð´ÎÄ¼þ \"%s\""
 
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Õâ¿´ÆðÀ´²»ÏñÊÇÆ´Ð´ÎÄ¼þ"
 
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: ¾É°æ±¾µÄÆ´Ð´ÎÄ¼þ£¬ÐèÒª¸üÐÂ"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Îª¸ü¸ß°æ±¾µÄ Vim ËùÓÃµÄÆ´Ð´ÎÄ¼þ"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Æ´Ð´ÎÄ¼þÖÐ´æÔÚ²»Ö§³ÖµÄ½Ú"
 
 #, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: region %s not supported"
+msgstr "¾¯¸æ: ÇøÓò %s ²»Ö§³Ö"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Reading affix file %s ..."
+msgstr "¶ÁÈ¡¸½¼ÓÎÄ¼þ %s ¡¡"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "µ¥´Ê %s ×ª»»Ê§°Ü£¬µÚ %d ÐÐ: %s"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "²»Ö§³Ö %s ÖÐµÄ×ª»»: ´Ó %s µ½ %s"
 
 #, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported"
+msgstr "²»Ö§³Ö %s ÖÐµÄ×ª»»"
 
 #, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬FLAG µÄÖµÎÞÐ§: %s"
 
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎÄ¼þ %s ÀïÖØ¸´³öÏÖ¶à´Î"
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÔÚÊ¹ÓÃ±êÖ¾ºó³öÏÖ FLAG: %s"
 
 #, c-format
 #~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" ÖÐ¶Ïµã: µÚ %ld ÐÐ"
-
-#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDWORDMAX Öµ: %s"
 
 #, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDMIN Öµ: %s"
 
 #, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDSYLMAX Öµ: %s"
 
 #, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ CHECKCOMPOUNDPATTERN Öµ: %s"
 
 #, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
-
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "Ì«¶à±à¼²ÎÊý"
-
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "Ì«¶à±à¼²ÎÊý"
-
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÔÚÁ¬ÐøµÄ¸½¼Ó¿éÖÐ³öÏÖ²»Í¬µÄ×éºÏ±êÖ¾: %s"
 
 #, c-format
-#~ msgid "Missing SOFO%s line in %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄ¸½¼ÓÏî: %s"
 
 #, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s µÚ %d ÐÐ£¬¸½¼ÓÏî±» BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST Ê¹"
+"ÓÃ: %s"
 
 #, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª Y »ò N: %s"
 
 #, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄÌõ¼þ: %s"
 
 #, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "É¨Ãè×Öµä: %s"
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª REP(SAL) ¼ÆÊý"
 
 #, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª MAP ¼ÆÊý"
 
 #, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "Ã¿Ò»ÐÐ¶¼ÕÒ²»µ½Ä£Ê½: %s"
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬MAP ÖÐ´æÔÚÖØ¸´µÄ×Ö·û"
 
 #, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞ·¨Ê¶±ð»òÖØ¸´µÄÏî: %s"
 
 #, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s ÖÐÈ±ÉÙ FOL/LOW/UPP ÐÐ"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "ÔÚÃ»ÓÐ SYLLABLE µÄÇé¿öÏÂÊ¹ÓÃÁË COMPOUNDSYLMAX"
+
+msgid "Too many postponed prefixes"
+msgstr "Ì«¶àÑÓ³ÙÇ°×º"
+
+msgid "Too many compound flags"
+msgstr "Ì«¶à×éºÏ±êÖ¾"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Ì«¶àÑÓ³ÙÇ°×ººÍ/»ò×éºÏ±êÖ¾"
 
 #, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s ÖÐÈ±ÉÙ SOFO%s ÐÐ"
 
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s Í¬Ê±³öÏÖ SQL ºÍ SOFO ÐÐ"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬±êÖ¾²»ÊÇÊý×Ö: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞÐ§µÄ±êÖ¾: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s µÄÖµÓëÁíÒ»¸ö .aff ÎÄ¼þÖÐÊ¹ÓÃµÄÖµ²»ÏàÍ¬"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "¶ÁÈ¡×ÖµäÎÄ¼þ %s ¡¡"
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: %s ÖÐÃ»ÓÐµ¥´Ê¼ÆÊý"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "µÚ %6d ÐÐ£¬µÚ %6d ¸öµ¥´Ê - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄµ¥´Ê: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬Ê×´ÎÖØ¸´µÄµ¥´Ê: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "´æÔÚ %d ¸öÖØ¸´µÄµ¥´Ê£¬ÔÚ %s ÖÐ"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "ºöÂÔÁËº¬ÓÐ·Ç ASCII ×Ö·ûµÄ %d ¸öµ¥´Ê£¬ÔÚ %s ÖÐ"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "¶ÁÈ¡µ¥´ÊÎÄ¼þ %s ¡¡"
 
 #, c-format
 #~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬µ¥´ÊºóµÄ /encoding= ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄ /regions= ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬Ì«¶àÇøÓò: %s"
 
 #, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬/ ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞÐ§µÄÇøÓòºÅ: %s"
 
 #, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬²»¿ÉÊ¶±ðµÄ±êÖ¾: %s"
 
 #, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "ºöÂÔÁËº¬ÓÐ·Ç ASCII ×Ö·ûµÄ %d ¸öµ¥´Ê"
 
-#~ msgid "Reading back spell file..."
-#~ msgstr ""
+#, c-format
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "Ñ¹ËõÁË %d/%d ¸ö½Úµã£»Ê£Óà %d (%d%%)"
+
+msgid "Reading back spell file..."
+msgstr "¶ÁÈ¡Æ´Ð´ÎÄ¼þ¡¡"
 
 #.
 #. * Go through the trie of good words, soundfold each word and add it to
 #. * the soundfold trie.
 #.
-#~ msgid "Performing soundfolding..."
-#~ msgstr ""
+msgid "Performing soundfolding..."
+msgstr "ÕýÔÚ soundfolding¡¡"
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding ºóµÄµ¥´ÊÊý: %ld"
 
 #, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\" ÖÐ"
+msgid "Total number of words: %d"
+msgstr "µ¥´Ê×ÜÊý: %d"
 
 #, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
-
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
-
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: ²»ÕýÈ·µÄ±í´ïÊ½: %s"
-
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\" ÖÐ"
-
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr "ÏòÏÂ"
+msgid "Writing suggestion file %s ..."
+msgstr "Ð´Èë½¨ÒéÎÄ¼þ %s ¡¡"
 
 #, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "¹À¼ÆÔËÐÐÊ±ÄÚ´æÓÃÁ¿: %d ×Ö½Ú"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: Êä³öÎÄ¼þÃû²»ÄÜº¬ÓÐÇøÓòÃû"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: ×î¶àÖ»Ö§³Ö 8 ¸öÇøÓò"
 
 #, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s ³öÏÖÎÞÐ§µÄ·¶Î§"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "¾¯¸æ: Í¬Ê±Ö¸¶¨ÁË compounding ºÍ NOBREAK"
 
 #, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Writing spell file %s ..."
+msgstr "Ð´ÈëÆ´Ð´ÎÄ¼þ %s ¡¡"
 
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
-
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Done!"
+msgstr "Íê³É£¡"
 
 #, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' Ã»ÓÐ %ld Ïî"
+
+#, c-format
+msgid "Word removed from %s"
+msgstr "´Ó %s ÖÐÉ¾³ýÁËµ¥´Ê"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "Ïò %s ÖÐÌí¼ÓÁËµ¥´Ê"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Æ´Ð´ÎÄ¼þÖ®¼äµÄ×Ö·û²»ÏàÍ¬"
+
+msgid "Sorry, no suggestions"
+msgstr "±§Ç¸£¬Ã»ÓÐ½¨Òé"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "±§Ç¸£¬Ö»ÓÐ %ld Ìõ½¨Òé"
 
 #. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "½« \"%.*s\" ¸ÄÎª£º"
 
 #, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
 
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: Ã»ÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+msgid "E752: No previous spell replacement"
+msgstr "E752: Ö®Ç°Ã»ÓÐÆ´Ð´Ìæ»»"
 
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ÕÒ²»µ½: %s"
 
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»ÎÄ¼þ"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: ¿´ÆðÀ´²»ÏñÊÇ .sug ÎÄ¼þ: %s"
 
 #, c-format
 #~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@
 msgstr "E397: ÐèÒªÎÄ¼þÃû³Æ"
 
 #, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: È±ÉÙ ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: È±ÉÙ ']': %s"
 
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ²»ÕýÈ·µÄ :syntax ×ÓÃüÁî: %s"
 
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: ¼ÓÔØ syncolor.vim Ê±³öÏÖÇ¶Ì×Ñ»·"
 
 #, c-format
 msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Ê¹ÓÃÁËÌ«¶à²»Í¬µÄ¸ßÁÁ¶ÈÊôÐÔ"
 
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: ×éÃûÖÐ´æÔÚ²»¿ÉÏÔÊ¾×Ö·û"
 
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+msgid "W18: Invalid character in group name"
+msgstr "W18: ×éÃûÖÐº¬ÓÐÎÞÐ§×Ö·û"
 
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ÒÑÔÚ tag ¶ÑÕ»µ×²¿"
@@ -5648,6 +5659,9 @@
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "ÊäÈë  :help windows95<Enter>  ²é¿´Ïà¹ØËµÃ÷    "
 
+msgid "Already only one window"
+msgstr "ÒÑ¾Ö»Ê£Ò»¸ö´°¿ÚÁË"
+
 msgid "E441: There is no preview window"
 msgstr "E441: Ã»ÓÐÔ¤ÀÀ´°¿Ú"
 
@@ -5660,9 +5674,6 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: ²»ÄÜ¹Ø±Õ×îºóÒ»¸ö´°¿Ú"
 
-msgid "Already only one window"
-msgstr "ÒÑ¾Ö»Ê£Ò»¸ö´°¿ÚÁË"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: ÆäËü´°¿ÚÓÐ¸Ä±äµÄÄÚÈÝ"
 
@@ -6050,6 +6061,9 @@
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "ÒÑ²éÕÒµ½ÎÄ¼þ½áÎ²£¬ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
 
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s µÚ %d ÐÐ£¬Ê¹ÓÃ PFXPOSTPONE Ê±¸½¼Ó±êÖ¾±»ºöÂÔ: %s"
+
 #~ msgid "[No file]"
 #~ msgstr "[Î´ÃüÃû]"
 

diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index b77b45e..3d3ab62 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po

@@ -4,6 +4,10 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # FIRST AUTHOR  Wang Jun <junw@turbolinux.com.cn>
+# 
+# TRANSLATORS
+#   Edyfox <edyfox@gmail.com>
+#   Yuheng Xie <elephant@linux.net.cn>
 #
 # Original translations.
 #
@@ -11,8 +15,8 @@
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: »º³åÇø \"%s\" ²»ÔÚ diff Ä£Ê½"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ÒâÍâµØ¸Ä±äÁË»º³åÇø"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ¸´ºÏ×Ö·û(digraph)ÖÐ²»ÄÜÊ¹ÓÃ Escape"
 
@@ -222,8 +229,8 @@
 msgstr " ¹Ø¼ü×Ö²¹È« (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
-msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^P^S^U^V^Y)"
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " ÕûÐÐ²¹È« (^L^N^P)"
@@ -256,8 +263,8 @@
 msgid " Omni completion (^O^N^P)"
 msgstr " È«ÄÜ²¹È« (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " Æ´Ð´½¨Òé (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Æ´Ð´½¨Òé (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " ¹Ø¼ü×Ö¾Ö²¿²¹È« (^N^P)"
@@ -489,9 +496,8 @@
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Dictionary È±ÉÙ½áÊø·û '}': %s"
 
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉî"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: ±äÁ¿Ç¶Ì×¹ýÉîÎÞ·¨ÏÔÊ¾"
 
 msgid "E699: Too many arguments"
 msgstr "E699: ²ÎÊý¹ý¶à"
@@ -529,8 +535,8 @@
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() µÄµ÷ÓÃ´ÎÊý¶àÓÚ inputsave()"
 
-msgid "E745: Range not allowed"
-msgstr "E745: ²»ÔÊÐíµÄ·¶Î§"
+msgid "E786: Range not allowed"
+msgstr "E786: ²»ÔÊÐíµÄ·¶Î§"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() µÄÀàÐÍÎÞÐ§"
@@ -560,9 +566,8 @@
 msgid "E258: Unable to send to client"
 msgstr "E258: ÎÞ·¨·¢ËÍµ½¿Í»§¶Ë"
 
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort ±È½Ïº¯ÊýÊ§°Ü"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort ±È½Ïº¯ÊýÊ§°Ü"
 
 msgid "(Invalid)"
 msgstr "(ÎÞÐ§)"
@@ -611,9 +616,8 @@
 msgid "E742: Cannot change value of %s"
 msgstr "E742: ÎÞ·¨¸Ä±ä %s µÄÖµ"
 
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉî"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ±äÁ¿Ç¶Ì×¹ýÉîÎÞ·¨¸´ÖÆ"
 
 #, c-format
 msgid "E124: Missing '(': %s"
@@ -682,6 +686,268 @@
 "\n"
 "\t×î½üÐÞ¸ÄÓÚ "
 
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
+msgstr "<%s>%s%s  %d,  Ê®Áù½øÖÆ %02x,  °Ë½øÖÆ %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
+
+msgid "E134: Move lines into themselves"
+msgstr "E134: °ÑÐÐÒÆ¶¯µ½×ÔÒÑÖÐ"
+
+msgid "1 line moved"
+msgstr "ÒÆ¶¯ÁË 1 ÐÐ"
+
+#, c-format
+msgid "%ld lines moved"
+msgstr "ÒÆ¶¯ÁË %ld ÐÐ"
+
+#, c-format
+msgid "%ld lines filtered"
+msgstr "¹ýÂËÁË %ld ÐÐ"
+
+msgid "E135: *Filter* Autocommands must not change current buffer"
+msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒÔ¸Ä±äµ±Ç°»º³åÇø"
+
+msgid "[No write since last change]\n"
+msgstr "[ÒÑÐÞ¸Äµ«ÉÐÎ´±£´æ]\n"
+
+# bad to translate
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s Î»ÓÚÐÐ: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎÄ¼þµÄÊ£Óà²¿·Ö"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "¶ÁÈ¡ viminfo ÎÄ¼þ \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " ÐÅÏ¢"
+
+msgid " marks"
+msgstr " ±ê¼Ç"
+
+msgid " FAILED"
+msgstr " Ê§°Ü"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: Viminfo ÎÄ¼þ²»¿ÉÐ´Èë: %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: ÎÞ·¨Ð´Èë viminfo ÎÄ¼þ %s£¡"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\""
+
+# do not translate to avoid writing Chinese in files
+#. Write the info:
+#, fuzzy, c-format
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# Õâ¸ö viminfo ÎÄ¼þÊÇÓÉ Vim %s Éú³ÉµÄ¡£\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌØ±ðÐ¡ÐÄ£¡\n"
+"\n"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' ÔÚ´ËÎÄ¼þ½¨Á¢Ê±µÄÖµ\n"
+
+msgid "Illegal starting char"
+msgstr "ÎÞÐ§µÄÆô¶¯×Ö·û"
+
+msgid "Save As"
+msgstr "Áí´æÎª"
+
+msgid "Write partial file?"
+msgstr "ÒªÐ´Èë²¿·ÖÎÄ¼þÂð£¿"
+
+msgid "E140: Use ! to write partial buffer"
+msgstr "E140: ÇëÊ¹ÓÃ ! À´Ð´Èë²¿·Ö»º³åÇø"
+
+#, c-format
+msgid "Overwrite existing file \"%s\"?"
+msgstr "¸²¸ÇÒÑ´æÔÚµÄÎÄ¼þ \"%s\" Âð£¿"
+
+#, c-format
+msgid "Swap file \"%s\" exists, overwrite anyway?"
+msgstr "½»»»ÎÄ¼þ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
+
+#, c-format
+msgid "E768: Swap file exists: %s (:silent! overrides)"
+msgstr "E768: ½»»»ÎÄ¼þÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
+
+#, c-format
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: »º³åÇø %ld Ã»ÓÐÎÄ¼þÃû"
+
+msgid "E142: File not written: Writing is disabled by 'write' option"
+msgstr "E142: ÎÄ¼þÎ´Ð´Èë: Ð´Èë±» 'write' Ñ¡Ïî½ûÓÃ"
+
+#, c-format
+msgid ""
+"'readonly' option is set for \"%s\".\n"
+"Do you wish to write anyway?"
+msgstr ""
+"\"%s\" ÒÑÉè¶¨ 'readonly' Ñ¡Ïî¡£\n"
+"È·ÊµÒª¸²¸ÇÂð£¿"
+
+msgid "Edit File"
+msgstr "±à¼ÎÄ¼þ"
+
+#, c-format
+msgid "E143: Autocommands unexpectedly deleted new buffer %s"
+msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØÉ¾³ýÁËÐÂ»º³åÇø %s"
+
+msgid "E144: non-numeric argument to :z"
+msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ÖµÄ²ÎÊý"
+
+msgid "E145: Shell commands not allowed in rvim"
+msgstr "E145: rvim ÖÐ½ûÖ¹Ê¹ÓÃ shell ÃüÁî"
+
+msgid "E146: Regular expressions can't be delimited by letters"
+msgstr "E146: ÕýÔò±í´ïÊ½²»ÄÜÓÃ×ÖÄ¸×÷·Ö½ç"
+
+#, c-format
+msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
+msgstr "Ìæ»»Îª %s (y/n/a/q/l/^E/^Y)£¿"
+
+msgid "(Interrupted) "
+msgstr "(ÒÑÖÐ¶Ï) "
+
+msgid "1 match"
+msgstr "1 ¸öÆ¥Åä£¬"
+
+msgid "1 substitution"
+msgstr "1 ´ÎÌæ»»£¬"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ¸öÆ¥Åä£¬"
+
+#, c-format
+msgid "%ld substitutions"
+msgstr "%ld ´ÎÌæ»»£¬"
+
+msgid " on 1 line"
+msgstr "¹² 1 ÐÐ"
+
+#, c-format
+msgid " on %ld lines"
+msgstr "¹² %ld ÐÐ"
+
+msgid "E147: Cannot do :global recursive"
+msgstr "E147: :global ²»ÄÜµÝ¹éÖ´ÐÐ"
+
+msgid "E148: Regular expression missing from global"
+msgstr "E148: global È±ÉÙÕýÔò±í´ïÊ½"
+
+#, c-format
+msgid "Pattern found in every line: %s"
+msgstr "Ã¿ÐÐ¶¼Æ¥Åä±í´ïÊ½: %s"
+
+# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# ×î½üµÄÌæ»»×Ö·û´®:\n"
+"$"
+
+msgid "E478: Don't panic!"
+msgstr "E478: ²»Òª»Å£¡"
+
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄËµÃ÷"
+
+#, c-format
+msgid "E149: Sorry, no help for %s"
+msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄËµÃ÷"
+
+#, c-format
+msgid "Sorry, help file \"%s\" not found"
+msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎÄ¼þ \"%s\""
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ²»ÊÇÄ¿Â¼: %s"
+
+#, c-format
+msgid "E152: Cannot open %s for writing"
+msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
+
+#, c-format
+msgid "E153: Unable to open %s for reading"
+msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
+
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖÐ»ìºÏÁË¶àÖÖ°ïÖúÎÄ¼þ±àÂë: %s"
+
+#, c-format
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: Tag \"%s\" ÔÚÎÄ¼þ %s/%s ÖÐÖØ¸´³öÏÖ"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: Î´ÖªµÄ sign ÃüÁî: %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: È±ÉÙ sign Ãû³Æ"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs ¶¨Òå¹ý¶à"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: ÎÞÐ§µÄ sign ÎÄ×Ö: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: Î´ÖªµÄ sign: %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: È±ÉÙ sign ºÅ"
+
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: ÎÞÐ§µÄ»º³åÇøÃû: %s"
+
+#, c-format
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: ÎÞÐ§µÄ sign ID: %ld"
+
+msgid " (NOT FOUND)"
+msgstr " (ÕÒ²»µ½)"
+
+msgid " (not supported)"
+msgstr " (²»Ö§³Ö)"
+
+msgid "[Deleted]"
+msgstr "[ÒÑÉ¾³ý]"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "½øÈëµ÷ÊÔÄ£Ê½¡£ÊäÈë \"cont\" ¼ÌÐøÔËÐÐ¡£"
 
@@ -711,9 +977,6 @@
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: ÇëÏÈÊ¹ÓÃ :profile start <fname>"
 
-msgid "Save As"
-msgstr "Áí´æÎª"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "½«¸Ä±ä±£´æµ½ \"%s\" Âð£¿"
@@ -812,265 +1075,6 @@
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ²»ÄÜÉè¶¨ÓïÑÔÎª \"%s\""
 
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  Ê®Áù½øÖÆ %02x,  °Ë½øÖÆ %03o"
-
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, Ê®Áù½øÖÆ %04x, °Ë½øÖÆ %o"
-
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Ê®Áù½øÖÆ %08x, °Ë½øÖÆ %o"
-
-msgid "E134: Move lines into themselves"
-msgstr "E134: °ÑÐÐÒÆ¶¯µ½×ÔÒÑÖÐ"
-
-msgid "1 line moved"
-msgstr "ÒÆ¶¯ÁË 1 ÐÐ"
-
-#, c-format
-msgid "%ld lines moved"
-msgstr "ÒÆ¶¯ÁË %ld ÐÐ"
-
-#, c-format
-msgid "%ld lines filtered"
-msgstr "¹ýÂËÁË %ld ÐÐ"
-
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* ×Ô¶¯ÃüÁî²»¿ÉÒÔ¸Ä±äµ±Ç°»º³åÇø"
-
-msgid "[No write since last change]\n"
-msgstr "[ÒÑÐÞ¸Äµ«ÉÐÎ´±£´æ]\n"
-
-#, c-format
-# bad to translate
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s Î»ÓÚÐÐ: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ´íÎó¹ý¶à£¬ºöÂÔÎÄ¼þµÄÊ£Óà²¿·Ö"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "¶ÁÈ¡ viminfo ÎÄ¼þ \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " ÐÅÏ¢"
-
-msgid " marks"
-msgstr " ±ê¼Ç"
-
-msgid " FAILED"
-msgstr " Ê§°Ü"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo ÎÄ¼þ²»¿ÉÐ´Èë: %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ÎÞ·¨Ð´Èë viminfo ÎÄ¼þ %s£¡"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\""
-
-#. Write the info:
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Õâ¸ö viminfo ÎÄ¼þÊÇÓÉ vim %s Éú³ÉµÄ¡£\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Èç¹ûÒª×ÔÐÐÐÞ¸ÄÇëÌØ±ðÐ¡ÐÄ£¡\n"
-"\n"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' ÔÚ´ËÎÄ¼þ½¨Á¢Ê±µÄÖµ\n"
-
-msgid "Illegal starting char"
-msgstr "ÎÞÐ§µÄÆô¶¯×Ö·û"
-
-msgid "Write partial file?"
-msgstr "ÒªÐ´Èë²¿·ÖÎÄ¼þÂð£¿"
-
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ÇëÊ¹ÓÃ ! À´Ð´Èë²¿·Ö»º³åÇø"
-
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "¸²¸ÇÒÑ´æÔÚµÄÎÄ¼þ \"%s\" Âð£¿"
-
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "½»»»ÎÄ¼þ \"%s\" ÒÑ´æÔÚ£¬È·ÊµÒª¸²¸ÇÂð£¿"
-
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ½»»»ÎÄ¼þÒÑ´æÔÚ: %s (:silent! Ç¿ÖÆÖ´ÐÐ)"
-
-#, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: »º³åÇø %ld Ã»ÓÐÎÄ¼þÃû"
-
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ÎÄ¼þÎ´Ð´Èë: Ð´Èë±» 'write' Ñ¡Ïî½ûÓÃ"
-
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" ÒÑÉè¶¨ 'readonly' Ñ¡Ïî¡£\n"
-"È·ÊµÒª¸²¸ÇÂð£¿"
-
-msgid "Edit File"
-msgstr "±à¼ÎÄ¼þ"
-
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: ×Ô¶¯ÃüÁîÒâÍâµØÉ¾³ýÁËÐÂ»º³åÇø %s"
-
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z ²»½ÓÊÜ·ÇÊý×ÖµÄ²ÎÊý"
-
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim ÖÐ½ûÖ¹Ê¹ÓÃ shell ÃüÁî"
-
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ÕýÔò±í´ïÊ½²»ÄÜÓÃ×ÖÄ¸×÷·Ö½ç"
-
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "Ìæ»»Îª %s (y/n/a/q/l/^E/^Y)£¿"
-
-msgid "(Interrupted) "
-msgstr "(ÒÑÖÐ¶Ï) "
-
-msgid "1 match"
-msgstr "1 ¸öÆ¥Åä£¬"
-
-msgid "1 substitution"
-msgstr "1 ´ÎÌæ»»£¬"
-
-#, c-format
-msgid "%ld matches"
-msgstr "%ld ¸öÆ¥Åä£¬"
-
-#, c-format
-msgid "%ld substitutions"
-msgstr "%ld ´ÎÌæ»»£¬"
-
-msgid " on 1 line"
-msgstr "¹² 1 ÐÐ"
-
-#, c-format
-msgid " on %ld lines"
-msgstr "¹² %ld ÐÐ"
-
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ²»ÄÜµÝ¹éÖ´ÐÐ"
-
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global È±ÉÙÕýÔò±í´ïÊ½"
-
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "Ã¿ÐÐ¶¼Æ¥Åä±í´ïÊ½: %s"
-
-#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ×î½üµÄÌæ»»×Ö·û´®:\n"
-"$"
-
-msgid "E478: Don't panic!"
-msgstr "E478: ²»Òª»Å£¡"
-
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ±§Ç¸£¬Ã»ÓÐ '%s' µÄ %s µÄËµÃ÷"
-
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: ±§Ç¸£¬Ã»ÓÐ %s µÄËµÃ÷"
-
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "±§Ç¸£¬ÕÒ²»µ½°ïÖúÎÄ¼þ \"%s\""
-
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ²»ÊÇÄ¿Â¼: %s"
-
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: ÎÞ·¨´ò¿ª²¢Ð´Èë %s"
-
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: ÎÞ·¨´ò¿ª²¢¶ÁÈ¡ %s"
-
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ÔÚÒ»ÖÖÓïÑÔÖÐ»ìºÏÁË¶àÖÖ°ïÖúÎÄ¼þ±àÂë: %s"
-
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Tag \"%s\" ÔÚÎÄ¼þ %s/%s ÖÐÖØ¸´³öÏÖ"
-
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Î´ÖªµÄ sign ÃüÁî: %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: È±ÉÙ sign Ãû³Æ"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: Signs ¶¨Òå¹ý¶à"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ÎÞÐ§µÄ sign ÎÄ×Ö: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Î´ÖªµÄ sign: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: È±ÉÙ sign ºÅ"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ÎÞÐ§µÄ»º³åÇøÃû: %s"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ÎÞÐ§µÄ sign ID: %ld"
-
-msgid " (NOT FOUND)"
-msgstr " (ÕÒ²»µ½)"
-
-msgid " (not supported)"
-msgstr " (²»Ö§³Ö)"
-
-msgid "[Deleted]"
-msgstr "[ÒÑÉ¾³ý]"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "½øÈë Ex Ä£Ê½¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
 
@@ -1179,7 +1183,7 @@
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ÕÒ²»µ½ÑÕÉ«Ö÷Ìâ %s"
+msgstr "E185: ÕÒ²»µ½ÅäÉ«·½°¸ %s"
 
 msgid "Greetings, Vim user!"
 msgstr "ÄúºÃ£¬Vim ÓÃ»§£¡"
@@ -1391,6 +1395,9 @@
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction ²»ÔÚº¯ÊýÄÚ"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: Ä¿Ç°²»ÔÊÐí±à¼±ðµÄ»º³åÇø"
+
 msgid "tagname"
 msgstr "tag Ãû"
 
@@ -1400,8 +1407,8 @@
 msgid "'history' option is zero"
 msgstr "Ñ¡Ïî 'history' ÎªÁã"
 
-#, fuzzy, c-format
 # do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@
 "\n"
 "# %s ÀúÊ·¼ÇÂ¼ (´ÓÐÂµ½¾É):\n"
 
-msgid "Command Line"
-msgstr "ÃüÁîÐÐ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr "ÃüÁîÐÐ"
 
-msgid "Search String"
-msgstr "²éÕÒ×Ö·û´®"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "²éÕÒ×Ö·û´®"
 
-msgid "Expression"
-msgstr "±í´ïÊ½"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "±í´ïÊ½"
 
-msgid "Input Line"
-msgstr "ÊäÈëÐÐ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr "ÊäÈëÐÐ"
 
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ³¬¹ýÃüÁî³¤¶È"
@@ -1550,9 +1565,8 @@
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: ÎÞ·¨Éú³É±¸·ÝÎÄ¼þ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
 
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork »áÏûÊ§ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork »á¶ªÊ§ (Çë¼Ó ! Ç¿ÖÆÖ´ÐÐ)"
 
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ÕÒ²»µ½ÓÃÓÚÐ´ÈëµÄÁÙÊ±ÎÄ¼þ"
@@ -1836,6 +1850,29 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ÎÞÐ§µÄÄ£Ê½"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: ÎÞ·¨¶ÁÈ¡ÎÄ¼þ \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ£¬ÕÒ²»µ½ÓÐÐ§µÄ×ÖÌå"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: ÎÞÐ§µÄ 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' µÄÖµÎÞÐ§"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Åä£¬²éÕÒÏÂÒ»¸ö"
+
 msgid "<cannot open> "
 msgstr "<ÎÞ·¨´ò¿ª>"
 
@@ -1858,38 +1895,15 @@
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-msgid "Vim dialog"
-msgstr "Vim ¶Ô»°¿ò"
-
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "¹ö¶¯Ìõ²¿¼þ: ÎÞ·¨»ñÈ¡»¬¿éÍ¼ÏñµÄ¼¸ºÎ´óÐ¡"
 
+msgid "Vim dialog"
+msgstr "Vim ¶Ô»°¿ò"
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ²»ÄÜÍ¬Ê±Ê¹ÓÃÏûÏ¢ºÍ»Øµ÷º¯ÊýÀ´´´½¨ BalloonEval"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: ²»ÄÜ¶ÁÈ¡ÎÄ¼þ \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: ÎÞ·¨Æô¶¯Í¼ÐÎ½çÃæ£¬ÕÒ²»µ½ÓÐÐ§µÄ×ÖÌå"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: ÎÞÐ§µÄ 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' µÄÖµÎÞÐ§"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ÎÞ·¨·ÖÅäÑÕÉ« %s"
-
-msgid "No match at cursor, finding next"
-msgstr "ÔÚ¹â±ê´¦Ã»ÓÐÆ¥Åä£¬²éÕÒÏÂÒ»¸ö"
-
 msgid "Vim dialog..."
 msgstr "Vim ¶Ô»°¿ò..."
 
@@ -2027,6 +2041,12 @@
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: ÎÞ·¨ÔÚ MDI Ó¦ÓÃ³ÌÐòÖÐ´ò¿ª´°¿Ú"
 
+msgid "Close tab"
+msgstr "¹Ø±Õ±êÇ©"
+
+msgid "Open tab..."
+msgstr "´ò¿ª±êÇ©..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "²éÕÒ×Ö·û´® (Ê¹ÓÃ '\\\\' À´²éÕÒ '\\')"
 
@@ -2084,40 +2104,36 @@
 "×ÖÌå1µÄ¿í¶È: %ld\n"
 "\n"
 
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "²»ÕýÈ·µÄ×ÖÌå¼¯(Fontset)"
+msgid "Invalid font specification"
+msgstr "Ö¸¶¨ÁËÎÞÐ§µÄ×ÖÌå"
 
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "È¡Ïû(&D)"
 
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "ÕÒ²»µ½Æ¥ÅäµÄÏî"
 
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "×ÖÌåÑ¡Ôñ"
+msgid "Vim - Font Selector"
+msgstr "Vim - ×ÖÌåÑ¡ÔñÆ÷"
 
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr "Ãû³Æ:"
 
 #. create toggle button
 #~ msgid "Show size in Points"
 #~ msgstr ""
 
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "¼ÇÂ¼ÖÐ"
+msgid "Encoding:"
+msgstr "±àÂë:"
 
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "×ÖÌå1: %s\n"
+msgid "Font:"
+msgstr "×ÖÌå:"
 
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr "·ç¸ñ:"
 
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "³ß´ç:"
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata ´íÎó"
@@ -3021,8 +3037,8 @@
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\tÔÚ <display> ÉÏÔËÐÐ vim (Ò²¿ÉÓÃ --display)"
 
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tÉèÖÃÓÃÓÚÇø·ÖÖ÷´°¿ÚµÄ´°¿Ú½ÇÉ«Ãû"
 
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tÔÚÁíÒ»¸ö GTK ²¿¼þÖÐ´ò¿ª Vim"
@@ -3030,8 +3046,8 @@
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <parent title>\tÔÚ¸¸Ó¦ÓÃ³ÌÐòÖÐ´ò¿ª Vim"
 
-#~ msgid "No display"
-#~ msgstr ""
+msgid "No display"
+msgstr "Ã»ÓÐ display"
 
 #. Failed to send, abort.
 msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@
 msgid "%d of %d edited"
 msgstr "%d ÖÐ %d ÒÑ±à¼"
 
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
+msgid "No display: Send expression failed.\n"
+msgstr "Ã»ÓÐ display: ·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
 
 msgid ": Send expression failed.\n"
 msgstr ": ·¢ËÍ±í´ïÊ½Ê§°Ü¡£\n"
@@ -3241,49 +3256,49 @@
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: ÎÞ·¨´Ó %s ¶ÁÈ¡¿é 1"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???È±ÉÙÁËÌ«¶àÐÐ"
+#, fuzzy
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???È±ÉÙÁËÌ«¶àÐÐ"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???ÐÐÊý´íÎó"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???ÐÐÊý´íÎó"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???¿ÕµÄ¿é"
+#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???¿ÕµÄ¿é"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???È±ÉÙÁËÒ»Ð©ÐÐ"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???È±ÉÙÁËÒ»Ð©ÐÐ"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ¿é 1 ID ´íÎó (%s ²»ÊÇ½»»»ÎÄ¼þ£¿)"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???È±ÉÙ¿é"
+#, fuzzy
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???È±ÉÙ¿é"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ»ìÂÒ"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ»ìÂÒ"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ±»²åÈë/É¾³ý¹ý"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? ´ÓÕâÀïµ½ ???END µÄÐÐ¿ÉÄÜÒÑ±»²åÈë/É¾³ý¹ý"
 
-#, fuzzy
 # do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
 msgstr "E311: »Ö¸´ÒÑ±»ÖÐ¶Ï"
@@ -3810,18 +3825,18 @@
 msgstr "E347: ÔÚÂ·¾¶ÖÐÕÒ²»µ½¸ü¶àµÄÎÄ¼þ \"%s\""
 
 #. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "ÎÞ·¨Á¬½Óµ½ Netbeans #2"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "ÎÞ·¨Á¬½Óµ½ Netbeans"
 
 #, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans Á¬½ÓÐÅÏ¢ÎÄ¼þÖÐ´íÎóµÄ·ÃÎÊÄ£Ê½: \"%s\""
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr "´Ó Netbeans Ì×½Ó×Ö¶ÁÈ¡"
 
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@
 msgid "%ld Cols; "
 msgstr "%ld ÁÐ; "
 
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ¸ö´Ê; %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
 "Bytes"
-msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ×Ö(Word); %ld/%ld ×Ö·û(Chars); %ld/%ld"
+msgstr "Ñ¡ÔñÁË %s%ld/%ld ÐÐ; %ld/%ld ¸ö´Ê; %ld/%ld ¸ö×Ö·û; %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr "ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr "µÚ %s/%s ÁÐ; µÚ %ld/%ld ÐÐ; µÚ %ld/%ld ¸ö´Ê; µÚ %ld/%ld ¸ö×Ö½Ú"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"ÁÐ %s/%s; ÐÐ %ld/%ld; ×Ö(Word) %ld/%ld; ×Ö·û(Char) %ld/%ld; ×Ö·û(Byte) %ld/%ld"
+"µÚ %s/%s ÁÐ; µÚ %ld/%ld ÐÐ; µÚ %ld/%ld ¸ö´Ê; µÚ %ld/%ld ¸ö×Ö·û; µÚ %ld/%ld ¸ö"
+"×Ö½Ú"
 
 #, c-format
 #~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@
 msgid "I/O ERROR"
 msgstr "I/O ´íÎó"
 
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "ÏûÏ¢"
 
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ²»ÊÇ 80, ²»ÄÜÖ´ÐÐÍâ²¿ÃüÁî"
 
 msgid "E237: Printer selection failed"
-msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
+msgstr "E237: Ñ¡Ôñ´òÓ¡»úÊ§°Ü"
 
 #, c-format
 msgid "to %s on %s"
@@ -4203,7 +4216,7 @@
 
 #, c-format
 msgid "Printing '%s'"
-msgstr "ÒÑ´òÓ¡: '%s'"
+msgstr "´òÓ¡ '%s'"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@
 msgstr "E245: ²»ÕýÈ·µÄ×Ö·û '%c' ³öÏÖÔÚ×ÖÌåÃû³Æ \"%s\" ÄÚ"
 
 msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: ²»ÕýÈ·µÄ 'filetype' Ñ¡Ïî - Ê¹ÓÃ´¿ÎÄ×ÖÄ£Ê½"
+msgstr "E366: ²»ÕýÈ·µÄ 'osfiletype' Ñ¡Ïî - Ê¹ÓÃ´¿ÎÄ×ÖÄ£Ê½"
 
 msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: Ë«ÖØÐÅºÅ, ÍË³öÖÐ\n"
+msgstr "Vim: Ë«ÖØÐÅºÅ£¬ÍË³öÖÐ\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: À¹½Øµ½ÐÅºÅ(signal) %s\n"
+msgstr "Vim: À¹½Øµ½ÖÂÃüÐÅºÅ(deadly signal) %s\n"
 
 #, c-format
 msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: À¹½Øµ½ÖÂÃüµÄÐÅºÅ(deadly signale)\n"
+msgstr "Vim: À¹½Øµ½ÖÂÃüÐÅºÅ(deadly signal)\n"
 
 #, c-format
 msgid "Opening the X display took %ld msec"
-msgstr "´ò¿ª X Window ÓÃÊ± %ld Ãë"
+msgstr "´ò¿ª X display ÓÃÊ± %ld Ãë"
 
 msgid ""
 "\n"
@@ -4239,24 +4252,24 @@
 "Vim: X ´íÎó\n"
 
 msgid "Testing the X display failed"
-msgstr "²âÊÔ X Window Ê§°Ü"
+msgstr "²âÊÔ X display Ê§°Ü"
 
 msgid "Opening the X display timed out"
-msgstr "´ò¿ª X Window ³¬Ê±"
+msgstr "´ò¿ª X display ³¬Ê±"
 
 msgid ""
 "\n"
 "Cannot execute shell "
 msgstr ""
 "\n"
-"²»ÄÜÖ´ÐÐ shell"
+"ÎÞ·¨Ö´ÐÐ shell"
 
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
-"²»ÄÜÖ´ÐÐ shell sh\n"
+"ÎÞ·¨Ö´ÐÐ shell sh\n"
 
 msgid ""
 "\n"
@@ -4270,14 +4283,14 @@
 "Cannot create pipes\n"
 msgstr ""
 "\n"
-"²»ÄÜ½¨Á¢¹ÜµÀ\n"
+"ÎÞ·¨½¨Á¢¹ÜµÀ\n"
 
 msgid ""
 "\n"
 "Cannot fork\n"
 msgstr ""
 "\n"
-"²»ÄÜ fork\n"
+"ÎÞ·¨ fork\n"
 
 msgid ""
 "\n"
@@ -4286,46 +4299,45 @@
 "\n"
 "ÃüÁîÒÑ½áÊø\n"
 
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "ÏÔÊ¾Á¬½Ó"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ¶ªÊ§ÁËµ½ ICE µÄÁ¬½Ó"
 
+# do not translate
 #, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
 
 msgid "Opening the X display failed"
-msgstr "´ò¿ª X Window Ê§°Ü"
+msgstr "´ò¿ª X display Ê§°Ü"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP ´¦Àí save-yourself ÇëÇó"
 
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "Ã»ÓÐ cscope Á¬½Ó"
+msgid "XSMP opening connection"
+msgstr "XSMP ´ò¿ªÁ¬½Ó"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE Á¬½Ó¼àÊÓÊ§°Ü"
 
 #, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection µ÷ÓÃÊ§°Ü: %s"
 
 msgid "At line"
 msgstr "ÔÚÐÐºÅ "
 
 msgid "Could not load vim32.dll!"
-msgstr "²»ÄÜ¼ÓÔØ vim32.dll£¡"
+msgstr "ÎÞ·¨¼ÓÔØ vim32.dll£¡"
 
 msgid "VIM Error"
 msgstr "VIM ´íÎó"
 
 msgid "Could not fix up function pointers to the DLL!"
-msgstr "²»ÄÜÐÞÕýº¯ÊýÖ¸Õëµ½ DLL!"
+msgstr "ÎÞ·¨ÐÞÕýµ½ DLL µÄº¯ÊýÖ¸Õë!"
 
 #, c-format
 msgid "shell returned %d"
-msgstr "Shell ·µ»ØÖµ %d"
+msgstr "Shell ·µ»Ø %d"
 
 #, c-format
 msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE.\n"
-"Íâ²¿ÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£.\n"
+"ÔÚÄãµÄ $PATH ÖÐÕÒ²»µ½ VIMRUN.EXE¡£\n"
+"Íâ²¿ÃüÁîÖ´ÐÐÍê±Ïºó½«²»»áÔÝÍ£¡£\n"
 "½øÒ»²½ËµÃ÷Çë¼û :help win32-vimrun"
 
 msgid "Vim Warning"
@@ -4407,8 +4419,8 @@
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: ÎÞ·¨Ð´Èë£¬ÒÑÉè¶¨Ñ¡Ïî 'buftype'"
 
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: È±ÉÙÎÄ¼þÃû»òÄ£Ê½ÎÞÐ§"
 
 #, c-format
 msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@
 msgid "Scanning included file: %s"
 msgstr "²éÕÒ°üº¬ÎÄ¼þ: %s"
 
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "²éÕÒ°üº¬ÎÄ¼þ: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "²éÕÒ°üº¬µÄÎÄ¼þ %s"
 
 msgid "E387: Match is on current line"
 msgstr "E387: µ±Ç°ÐÐÆ¥Åä"
@@ -4622,339 +4634,339 @@
 msgid "E389: Couldn't find pattern"
 msgstr "E389: ÕÒ²»µ½ pattern"
 
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: ½»»»ÎÄ¼þÐ´Èë´íÎó"
+msgid "E759: Format error in spell file"
+msgstr "E759: Æ´Ð´ÎÄ¼þ¸ñÊ½´íÎó"
 
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: ²»ÄÜÑ¡Ôñ´Ë´òÓ¡»ú"
-
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" ÖÐ¶Ïµã: µÚ %ld ÐÐ"
+msgid "E758: Truncated spell file"
+msgstr "E758: ÒÑ½Ø¶ÏµÄÆ´Ð´ÎÄ¼þ"
 
 #, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag ÎÄ¼þ \"%s\" ¸ñÊ½´íÎó"
-
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
-
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
-
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬¶àÓàµÄºóÐø×Ö·û: %s"
 
 #, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬¸½¼ÓÏîÃû×ÖÌ«³¤: %s"
 
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "Ê¹ÓÃ½»»»ÎÄ¼þ \"%s\""
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: ¸½¼ÓÎÄ¼þ FOL¡¢LOW »ò UPP ÖÐ¸ñÊ½´íÎó"
 
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»ÎÄ¼þ"
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL¡¢LOW »ò UPP ÖÐ×Ö·û³¬³ö·¶Î§"
 
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: »¹ÓÐ %ld ¸öÎÄ¼þÎ´±à¼"
+msgid "Compressing word tree..."
+msgstr "Ñ¹Ëõµ¥´ÊÊ÷¡¡"
 
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: ½»»»ÎÄ¼þÐ´Èë´íÎó"
-
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
-
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr "²éÕÒ tag ÎÄ¼þ \"%s\""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Æ´Ð´¼ì²éÎ´ÆôÓÃ"
 
 #, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "¾¯¸æ: ÕÒ²»µ½µ¥´ÊÁÐ±í \"%s.%s.spl\" or \"%s.ascii.spl\""
 
 #, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Reading spell file \"%s\""
+msgstr "¶ÁÈ¡Æ´Ð´ÎÄ¼þ \"%s\""
 
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "²»Ö§³Ö¸ÃÑ¡Ïî"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Õâ¿´ÆðÀ´²»ÏñÊÇÆ´Ð´ÎÄ¼þ"
 
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: ¾É°æ±¾µÄÆ´Ð´ÎÄ¼þ£¬ÐèÒª¸üÐÂ"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Îª¸ü¸ß°æ±¾µÄ Vim ËùÓÃµÄÆ´Ð´ÎÄ¼þ"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Æ´Ð´ÎÄ¼þÖÐ´æÔÚ²»Ö§³ÖµÄ½Ú"
 
 #, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Warning: region %s not supported"
+msgstr "¾¯¸æ: ÇøÓò %s ²»Ö§³Ö"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Reading affix file %s ..."
+msgstr "¶ÁÈ¡¸½¼ÓÎÄ¼þ %s ¡¡"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "µ¥´Ê %s ×ª»»Ê§°Ü£¬µÚ %d ÐÐ: %s"
 
 #, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "²»Ö§³Ö %s ÖÐµÄ×ª»»: ´Ó %s µ½ %s"
 
 #, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported"
+msgstr "²»Ö§³Ö %s ÖÐµÄ×ª»»"
 
 #, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬FLAG µÄÖµÎÞÐ§: %s"
 
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: ±êÇ©(tag) \"%s\" ÔÚÎÄ¼þ %s ÀïÖØ¸´³öÏÖ¶à´Î"
+#, c-format
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÔÚÊ¹ÓÃ±êÖ¾ºó³öÏÖ FLAG: %s"
 
 #, c-format
 #~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" ÖÐ¶Ïµã: µÚ %ld ÐÐ"
-
-#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDWORDMAX Öµ: %s"
 
 #, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDMIN Öµ: %s"
 
 #, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ COMPOUNDSYLMAX Öµ: %s"
 
 #, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄ CHECKCOMPOUNDPATTERN Öµ: %s"
 
 #, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
-
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
-
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "Ì«¶à±à¼²ÎÊý"
-
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "Ì«¶à±à¼²ÎÊý"
-
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÔÚÁ¬ÐøµÄ¸½¼Ó¿éÖÐ³öÏÖ²»Í¬µÄ×éºÏ±êÖ¾: %s"
 
 #, c-format
-#~ msgid "Missing SOFO%s line in %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄ¸½¼ÓÏî: %s"
 
 #, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s µÚ %d ÐÐ£¬¸½¼ÓÏî±» BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST Ê¹"
+"ÓÃ: %s"
 
 #, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª Y »ò N: %s"
 
 #, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬´íÎóµÄÌõ¼þ: %s"
 
 #, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "É¨Ãè×Öµä: %s"
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª REP(SAL) ¼ÆÊý"
 
 #, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬´Ë´¦ÐèÒª MAP ¼ÆÊý"
 
 #, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "Ã¿Ò»ÐÐ¶¼ÕÒ²»µ½Ä£Ê½: %s"
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s µÚ %d ÐÐ£¬MAP ÖÐ´æÔÚÖØ¸´µÄ×Ö·û"
 
 #, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞ·¨Ê¶±ð»òÖØ¸´µÄÏî: %s"
 
 #, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s ÖÐÈ±ÉÙ FOL/LOW/UPP ÐÐ"
+
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "ÔÚÃ»ÓÐ SYLLABLE µÄÇé¿öÏÂÊ¹ÓÃÁË COMPOUNDSYLMAX"
+
+msgid "Too many postponed prefixes"
+msgstr "Ì«¶àÑÓ³ÙÇ°×º"
+
+msgid "Too many compound flags"
+msgstr "Ì«¶à×éºÏ±êÖ¾"
+
+msgid "Too many posponed prefixes and/or compound flags"
+msgstr "Ì«¶àÑÓ³ÙÇ°×ººÍ/»ò×éºÏ±êÖ¾"
 
 #, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s ÖÐÈ±ÉÙ SOFO%s ÐÐ"
 
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "´Ó±ê×¼ÊäÈë¶Á..."
+#, c-format
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s Í¬Ê±³öÏÖ SQL ºÍ SOFO ÐÐ"
+
+#, c-format
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬±êÖ¾²»ÊÇÊý×Ö: %s"
+
+#, c-format
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞÐ§µÄ±êÖ¾: %s"
+
+#, c-format
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s µÄÖµÓëÁíÒ»¸ö .aff ÎÄ¼þÖÐÊ¹ÓÃµÄÖµ²»ÏàÍ¬"
+
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "¶ÁÈ¡×ÖµäÎÄ¼þ %s ¡¡"
+
+#, c-format
+msgid "E760: No word count in %s"
+msgstr "E760: %s ÖÐÃ»ÓÐµ¥´Ê¼ÆÊý"
+
+#, c-format
+msgid "line %6d, word %6d - %s"
+msgstr "µÚ %6d ÐÐ£¬µÚ %6d ¸öµ¥´Ê - %s"
+
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄµ¥´Ê: %s"
+
+#, c-format
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬Ê×´ÎÖØ¸´µÄµ¥´Ê: %s"
+
+#, c-format
+msgid "%d duplicate word(s) in %s"
+msgstr "´æÔÚ %d ¸öÖØ¸´µÄµ¥´Ê£¬ÔÚ %s ÖÐ"
+
+#, c-format
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "ºöÂÔÁËº¬ÓÐ·Ç ASCII ×Ö·ûµÄ %d ¸öµ¥´Ê£¬ÔÚ %s ÖÐ"
+
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "¶ÁÈ¡µ¥´ÊÎÄ¼þ %s ¡¡"
 
 #, c-format
 #~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬µ¥´ÊºóµÄ /encoding= ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÖØ¸´µÄ /regions= ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬Ì«¶àÇøÓò: %s"
 
 #, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "²»ÕýÈ·µÄ·þÎñÆ÷ id : %s"
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬/ ÐÐÒÑ±»ºöÂÔ: %s"
 
 #, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬ÎÞÐ§µÄÇøÓòºÅ: %s"
 
 #, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s µÚ %d ÐÐ£¬²»¿ÉÊ¶±ðµÄ±êÖ¾: %s"
 
 #, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "ºöÂÔÁËº¬ÓÐ·Ç ASCII ×Ö·ûµÄ %d ¸öµ¥´Ê"
 
-#~ msgid "Reading back spell file..."
-#~ msgstr ""
+#, c-format
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "Ñ¹ËõÁË %d/%d ¸ö½Úµã£»Ê£Óà %d (%d%%)"
+
+msgid "Reading back spell file..."
+msgstr "¶ÁÈ¡Æ´Ð´ÎÄ¼þ¡¡"
 
 #.
 #. * Go through the trie of good words, soundfold each word and add it to
 #. * the soundfold trie.
 #.
-#~ msgid "Performing soundfolding..."
-#~ msgstr ""
+msgid "Performing soundfolding..."
+msgstr "ÕýÔÚ soundfolding¡¡"
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding ºóµÄµ¥´ÊÊý: %ld"
 
 #, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\" ÖÐ"
+msgid "Total number of words: %d"
+msgstr "µ¥´Ê×ÜÊý: %d"
 
 #, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
-
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
-
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: ²»ÕýÈ·µÄ±í´ïÊ½: %s"
-
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "Ð´Èë viminfo ÎÄ¼þ \"%s\" ÖÐ"
-
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr "ÏòÏÂ"
+msgid "Writing suggestion file %s ..."
+msgstr "Ð´Èë½¨ÒéÎÄ¼þ %s ¡¡"
 
 #, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "¹À¼ÆÔËÐÐÊ±ÄÚ´æÓÃÁ¿: %d ×Ö½Ú"
+
+msgid "E751: Output file name must not have region name"
+msgstr "E751: Êä³öÎÄ¼þÃû²»ÄÜº¬ÓÐÇøÓòÃû"
+
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: ×î¶àÖ»Ö§³Ö 8 ¸öÇøÓò"
 
 #, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s ³öÏÖÎÞÐ§µÄ·¶Î§"
+
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "¾¯¸æ: Í¬Ê±Ö¸¶¨ÁË compounding ºÍ NOBREAK"
 
 #, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Writing spell file %s ..."
+msgstr "Ð´ÈëÆ´Ð´ÎÄ¼þ %s ¡¡"
 
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
-
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Done!"
+msgstr "Íê³É£¡"
 
 #, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' Ã»ÓÐ %ld Ïî"
+
+#, c-format
+msgid "Word removed from %s"
+msgstr "´Ó %s ÖÐÉ¾³ýÁËµ¥´Ê"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "Ïò %s ÖÐÌí¼ÓÁËµ¥´Ê"
+
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Æ´Ð´ÎÄ¼þÖ®¼äµÄ×Ö·û²»ÏàÍ¬"
+
+msgid "Sorry, no suggestions"
+msgstr "±§Ç¸£¬Ã»ÓÐ½¨Òé"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "±§Ç¸£¬Ö»ÓÐ %ld Ìõ½¨Òé"
 
 #. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "½«¸Ä±ä±£´æµ½ \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "½« \"%.*s\" ¸ÄÎª£º"
 
 #, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
 
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: Ã»ÓÐÇ°Ò»¸ö²éÕÒÃüÁî"
+msgid "E752: No previous spell replacement"
+msgstr "E752: Ö®Ç°Ã»ÓÐÆ´Ð´Ìæ»»"
 
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [²Ëµ¥] ÕÒ²»µ½ %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ÕÒ²»µ½: %s"
 
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s ¿´ÆðÀ´²»ÏñÊÇ Vim ½»»»ÎÄ¼þ"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: ¿´ÆðÀ´²»ÏñÊÇ .sug ÎÄ¼þ: %s"
 
 #, c-format
 #~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@
 msgstr "E397: ÐèÒªÎÄ¼þÃû³Æ"
 
 #, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: È±ÉÙ ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: È±ÉÙ ']': %s"
 
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ²»ÕýÈ·µÄ :syntax ×ÓÃüÁî: %s"
 
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: ¼ÓÔØ syncolor.vim Ê±³öÏÖÇ¶Ì×Ñ»·"
 
 #, c-format
 msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Ê¹ÓÃÁËÌ«¶à²»Í¬µÄ¸ßÁÁ¶ÈÊôÐÔ"
 
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: ×éÃûÖÐ´æÔÚ²»¿ÉÏÔÊ¾×Ö·û"
 
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: ÃüÁîÃû³Æ²»ÕýÈ·"
+msgid "W18: Invalid character in group name"
+msgstr "W18: ×éÃûÖÐº¬ÓÐÎÞÐ§×Ö·û"
 
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ÒÑÔÚ tag ¶ÑÕ»µ×²¿"
@@ -5648,6 +5659,9 @@
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "ÊäÈë  :help windows95<Enter>  ²é¿´Ïà¹ØËµÃ÷    "
 
+msgid "Already only one window"
+msgstr "ÒÑ¾Ö»Ê£Ò»¸ö´°¿ÚÁË"
+
 msgid "E441: There is no preview window"
 msgstr "E441: Ã»ÓÐÔ¤ÀÀ´°¿Ú"
 
@@ -5660,9 +5674,6 @@
 msgid "E444: Cannot close last window"
 msgstr "E444: ²»ÄÜ¹Ø±Õ×îºóÒ»¸ö´°¿Ú"
 
-msgid "Already only one window"
-msgstr "ÒÑ¾Ö»Ê£Ò»¸ö´°¿ÚÁË"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: ÆäËü´°¿ÚÓÐ¸Ä±äµÄÄÚÈÝ"
 
@@ -6050,6 +6061,9 @@
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "ÒÑ²éÕÒµ½ÎÄ¼þ½áÎ²£¬ÔÙ´Ó¿ªÍ·¼ÌÐø²éÕÒ"
 
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s µÚ %d ÐÐ£¬Ê¹ÓÃ PFXPOSTPONE Ê±¸½¼Ó±êÖ¾±»ºöÂÔ: %s"
+
 #~ msgid "[No file]"
 #~ msgstr "[Î´ÃüÃû]"
 

diff --git a/src/proto/gui.pro b/src/proto/gui.pro
index 7105a6f..322dc79 100644
--- a/src/proto/gui.pro
+++ b/src/proto/gui.pro

@@ -1,65 +1,65 @@
 /* gui.c */
-extern void gui_start __ARGS((void));
-extern void gui_prepare __ARGS((int *argc, char **argv));
-extern int gui_init_check __ARGS((void));
-extern void gui_init __ARGS((void));
-extern void gui_exit __ARGS((int rc));
-extern void gui_shell_closed __ARGS((void));
-extern int gui_init_font __ARGS((char_u *font_list, int fontset));
-extern int gui_get_wide_font __ARGS((void));
-extern void gui_set_cursor __ARGS((int row, int col));
-extern void gui_update_cursor __ARGS((int force, int clear_selection));
-extern void gui_position_menu __ARGS((void));
-extern int gui_get_base_width __ARGS((void));
-extern int gui_get_base_height __ARGS((void));
-extern void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
-extern void gui_may_resize_shell __ARGS((void));
-extern int gui_get_shellsize __ARGS((void));
-extern void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
-extern void gui_new_shellsize __ARGS((void));
-extern void gui_reset_scroll_region __ARGS((void));
-extern void gui_start_highlight __ARGS((int mask));
-extern void gui_stop_highlight __ARGS((int mask));
-extern void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
-extern void gui_update_cursor_later __ARGS((void));
-extern void gui_write __ARGS((char_u *s, int len));
-extern void gui_dont_update_cursor __ARGS((void));
-extern void gui_can_update_cursor __ARGS((void));
-extern int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
-extern void gui_undraw_cursor __ARGS((void));
-extern void gui_redraw __ARGS((int x, int y, int w, int h));
-extern int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
-extern int gui_wait_for_chars __ARGS((long wtime));
-extern void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
-extern int gui_xy2colrow __ARGS((int x, int y, int *colp));
-extern void gui_menu_cb __ARGS((vimmenu_T *menu));
-extern void gui_init_which_components __ARGS((char_u *oldval));
-extern int gui_use_tabline __ARGS((void));
-extern void gui_update_tabline __ARGS((void));
-extern void get_tabline_label __ARGS((tabpage_T *tp));
-extern int send_tabline_event __ARGS((int nr));
-extern void send_tabline_menu_event __ARGS((int tabidx, int event));
-extern void gui_remove_scrollbars __ARGS((void));
-extern void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
-extern scrollbar_T *gui_find_scrollbar __ARGS((long ident));
-extern void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
-extern void gui_update_scrollbars __ARGS((int force));
-extern int gui_do_scroll __ARGS((void));
-extern int gui_do_horiz_scroll __ARGS((void));
-extern void gui_check_colors __ARGS((void));
-extern guicolor_T gui_get_color __ARGS((char_u *name));
-extern int gui_get_lightness __ARGS((guicolor_T pixel));
-extern void gui_new_scrollbar_colors __ARGS((void));
-extern void gui_focus_change __ARGS((int in_focus));
-extern void gui_mouse_moved __ARGS((int x, int y));
-extern void gui_mouse_correct __ARGS((void));
-extern void ex_gui __ARGS((exarg_T *eap));
-extern int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
-extern void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
-extern void display_errors __ARGS((void));
-extern int no_console_input __ARGS((void));
-extern void gui_update_screen __ARGS((void));
-extern char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
-extern int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
-extern void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
+void gui_start __ARGS((void));
+void gui_prepare __ARGS((int *argc, char **argv));
+int gui_init_check __ARGS((void));
+void gui_init __ARGS((void));
+void gui_exit __ARGS((int rc));
+void gui_shell_closed __ARGS((void));
+int gui_init_font __ARGS((char_u *font_list, int fontset));
+int gui_get_wide_font __ARGS((void));
+void gui_set_cursor __ARGS((int row, int col));
+void gui_update_cursor __ARGS((int force, int clear_selection));
+void gui_position_menu __ARGS((void));
+int gui_get_base_width __ARGS((void));
+int gui_get_base_height __ARGS((void));
+void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
+void gui_may_resize_shell __ARGS((void));
+int gui_get_shellsize __ARGS((void));
+void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
+void gui_new_shellsize __ARGS((void));
+void gui_reset_scroll_region __ARGS((void));
+void gui_start_highlight __ARGS((int mask));
+void gui_stop_highlight __ARGS((int mask));
+void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
+void gui_update_cursor_later __ARGS((void));
+void gui_write __ARGS((char_u *s, int len));
+void gui_dont_update_cursor __ARGS((void));
+void gui_can_update_cursor __ARGS((void));
+int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
+void gui_undraw_cursor __ARGS((void));
+void gui_redraw __ARGS((int x, int y, int w, int h));
+int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
+int gui_wait_for_chars __ARGS((long wtime));
+void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
+int gui_xy2colrow __ARGS((int x, int y, int *colp));
+void gui_menu_cb __ARGS((vimmenu_T *menu));
+void gui_init_which_components __ARGS((char_u *oldval));
+int gui_use_tabline __ARGS((void));
+void gui_update_tabline __ARGS((void));
+void get_tabline_label __ARGS((tabpage_T *tp, int tooltip));
+int send_tabline_event __ARGS((int nr));
+void send_tabline_menu_event __ARGS((int tabidx, int event));
+void gui_remove_scrollbars __ARGS((void));
+void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
+scrollbar_T *gui_find_scrollbar __ARGS((long ident));
+void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
+void gui_update_scrollbars __ARGS((int force));
+int gui_do_scroll __ARGS((void));
+int gui_do_horiz_scroll __ARGS((void));
+void gui_check_colors __ARGS((void));
+guicolor_T gui_get_color __ARGS((char_u *name));
+int gui_get_lightness __ARGS((guicolor_T pixel));
+void gui_new_scrollbar_colors __ARGS((void));
+void gui_focus_change __ARGS((int in_focus));
+void gui_mouse_moved __ARGS((int x, int y));
+void gui_mouse_correct __ARGS((void));
+void ex_gui __ARGS((exarg_T *eap));
+int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
+void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
+void display_errors __ARGS((void));
+int no_console_input __ARGS((void));
+void gui_update_screen __ARGS((void));
+char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
+int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
+void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
 /* vim: set ft=c : */

diff --git a/src/undo.c b/src/undo.c
index f9e735a..fd1bcc7 100644
--- a/src/undo.c
+++ b/src/undo.c

@@ -1405,10 +1405,15 @@
 ex_undojoin(eap)
     exarg_T *eap;
 {
-    if (!curbuf->b_u_synced)
-	return;		    /* already unsynced */
     if (curbuf->b_u_newhead == NULL)
 	return;		    /* nothing changed before */
+    if (curbuf->b_u_curhead != NULL)
+    {
+	EMSG(_("E790: undojoin is not allowed after undo"));
+	return;
+    }
+    if (!curbuf->b_u_synced)
+	return;		    /* already unsynced */
     if (p_ul < 0)
 	return;		    /* no entries, nothing to do */
     else

diff --git a/src/version.h b/src/version.h
index d2a14fe..bb77f87 100644
--- a/src/version.h
+++ b/src/version.h

@@ -35,6 +35,6 @@
  */
 #define VIM_VERSION_NODOT	"vim70e"
 #define VIM_VERSION_SHORT	"7.0e"
-#define VIM_VERSION_MEDIUM	"7.0e04 BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20, compiled "
+#define VIM_VERSION_MEDIUM	"7.0e05 BETA"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21, compiled "

diff --git a/src/window.c b/src/window.c
index dabfe2d..d9d5bca 100644
--- a/src/window.c
+++ b/src/window.c

@@ -621,7 +621,9 @@
 
 #ifdef FEAT_SEARCHPATH
 		    case 'f':	    /* CTRL-W gf: "gf" in a new tab page */
+		    case 'F':	    /* CTRL-W gF: "gF" in a new tab page */
 			cmdmod.tab = TRUE;
+			nchar = xchar;
 			goto wingotofile;
 #endif
 		    default:
commit	57657d85c6c3d812e99b5e5d5161c07c66ac7dc7	[log] [tgz]
author	Bram Moolenaar <Bram@vim.org>	Fri Apr 21 22:12:41 2006 +0000
committer	Bram Moolenaar <Bram@vim.org>	Fri Apr 21 22:12:41 2006 +0000
tree	35b6845dc38717148718ac5cf70553b8c2cb96d8
parent	fc1421eb53b17aa58b01a9c07ba2007eb4a1aa4f [diff]