updated for version 7.0e02v7.0e02

author: Bram Moolenaar <Bram@vim.org> 2006-04-18 21:55:01 +0000
committer: Bram Moolenaar <Bram@vim.org> 2006-04-18 21:55:01 +0000
commit: c1e37901fc8486c9960d7290e521ba51e292e94b (patch)
tree: 5367e8f83d9d313dd73c0499fd310f57df5e605f /src
parent: a93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (diff)
download: vim-git-c1e37901fc8486c9960d7290e521ba51e292e94b.tar.gz
19 files changed, 8941 insertions, 4092 deletions
diff --git a/src/edit.c b/src/edit.c
index c6287e056..ed416f30a 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -709,15 +709,20 @@ edit(cmdchar, startln, count)
 	{
 	    /* BS: Delete one character from "compl_leader". */
 	    if ((c == K_BS || c == Ctrl_H)
-			&& curwin->w_cursor.col > compl_col && ins_compl_bs())
+			&& curwin->w_cursor.col > compl_col
+			&& (c = ins_compl_bs()) == NUL)
 		continue;
 
 	    /* When no match was selected or it was edited. */
 	    if (!compl_used_match)
 	    {
 		/* CTRL-L: Add one character from the current match to
-		 * "compl_leader". */
-		if (c == Ctrl_L)
+		 * "compl_leader".  Except when at the original match and
+		 * there is nothing to add, CTRL-L works like CTRL-P then. */
+		if (c == Ctrl_L
+			&& (ctrl_x_mode != CTRL_X_WHOLE_LINE
+			    || STRLEN(compl_shown_match->cp_str)
+					  > curwin->w_cursor.col - compl_col))
 		{
 		    ins_compl_addfrommatch();
 		    continue;
@@ -2943,7 +2948,8 @@ ins_compl_active()
 /*
  * Delete one character before the cursor and show the subset of the matches
  * that match the word that is now before the cursor.
- * Returns TRUE if the work is done and another char to be got from the user.
+ * Returns the character to be used, NUL if the work is done and another char
+ * to be got from the user.
  */
     static int
 ins_compl_bs()
@@ -2951,6 +2957,14 @@ ins_compl_bs()
     char_u	*line;
     char_u	*p;
 
+    line = ml_get_curline();
+    p = line + curwin->w_cursor.col;
+    mb_ptr_back(line, p);
+
+    /* Stop completion when the whole word was deleted. */
+    if ((int)(p - line) - (int)compl_col <= 0)
+	return K_BS;
+
     if (curwin->w_cursor.col <= compl_col + compl_length)
     {
 	/* Deleted more than what was used to find matches, need to look for
@@ -2962,10 +2976,6 @@ ins_compl_bs()
 	compl_cont_mode = 0;
     }
 
-    line = ml_get_curline();
-    p = line + curwin->w_cursor.col;
-    mb_ptr_back(line, p);
-
     vim_free(compl_leader);
     compl_leader = vim_strnsave(line + compl_col, (int)(p - line) - compl_col);
     if (compl_leader != NULL)
@@ -3006,9 +3016,9 @@ ins_compl_bs()
 	compl_used_match = FALSE;
 	compl_enter_selects = FALSE;
 
-	return TRUE;
+	return NUL;
     }
-    return FALSE;
+    return K_BS;
 }
 
 /*
@@ -3255,26 +3265,34 @@ ins_compl_prep(c)
 	    /* Get here when we have finished typing a sequence of ^N and
 	     * ^P or other completion characters in CTRL-X mode.  Free up
 	     * memory that was used, and make sure we can redo the insert. */
-	    if (compl_curr_match != NULL)
+	    if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
 	    {
 		char_u	*p;
 
 		/*
-		 * If any of the original typed text has been changed,
-		 * eg when ignorecase is set, we must add back-spaces to
-		 * the redo buffer.  We add as few as necessary to delete
-		 * just the part of the original text that has changed.
+		 * If any of the original typed text has been changed, eg when
+		 * ignorecase is set, we must add back-spaces to the redo
+		 * buffer.  We add as few as necessary to delete just the part
+		 * of the original text that has changed.
+		 * When using the longest match, edited the match or used
+		 * CTRL-E then don't use the current match.
 		 */
-		ptr = compl_curr_match->cp_str;
+		if (compl_curr_match != NULL && compl_used_match && c != Ctrl_E)
+		    ptr = compl_curr_match->cp_str;
+		else if (compl_leader != NULL)
+		    ptr = compl_leader;
+		else
+		    ptr = compl_orig_text;
 		p = compl_orig_text;
-		while (*p && *p == *ptr)
-		{
-		    ++p;
-		    ++ptr;
-		}
-		for (temp = 0; p[temp]; ++temp)
+		for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
+		    ;
+#ifdef FEAT_MBYTE
+		if (temp > 0)
+		    temp -= (*mb_head_off)(compl_orig_text, p + temp);
+#endif
+		for (p += temp; *p != NUL; mb_ptr_adv(p))
 		    AppendCharToRedobuff(K_BS);
-		AppendToRedobuffLit(ptr, -1);
+		AppendToRedobuffLit(ptr + temp, -1);
 	    }
 
 #ifdef FEAT_CINDENT
@@ -3981,6 +3999,7 @@ ins_compl_next(allow_get_expansion, count, insert_match)
     int	    todo = count;
     compl_T *found_compl = NULL;
     int	    found_end = FALSE;
+    int	    advance;
 
     if (compl_leader != NULL
 			&& (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
@@ -3999,6 +4018,10 @@ ins_compl_next(allow_get_expansion, count, insert_match)
 	/* Delete old text to be replaced */
 	ins_compl_delete();
 
+    /* When finding the longest common text we stick at the original text,
+     * don't let CTRL-N or CTRL-P move to the first match. */
+    advance = count != 1 || !allow_get_expansion || !compl_get_longest;
+
     /* Repeat this for when <PageUp> or <PageDown> is typed.  But don't wrap
      * around. */
     while (--todo >= 0)
@@ -4023,15 +4046,19 @@ ins_compl_next(allow_get_expansion, count, insert_match)
 	}
 	else
 	{
-	    if (compl_shows_dir == BACKWARD)
-		--compl_pending;
-	    else
-		++compl_pending;
+	    if (advance)
+	    {
+		if (compl_shows_dir == BACKWARD)
+		    --compl_pending;
+		else
+		    ++compl_pending;
+	    }
 	    if (!allow_get_expansion)
 		return -1;
 
 	    num_matches = ins_compl_get_exp(&compl_startpos);
-	    if (compl_pending != 0 && compl_direction == compl_shows_dir)
+	    if (compl_pending != 0 && compl_direction == compl_shows_dir
+								   && advance)
 		compl_shown_match = compl_curr_match;
 	    found_end = FALSE;
 	}
diff --git a/src/fileio.c b/src/fileio.c
index 1c4cab829..34a53e63e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1113,7 +1113,7 @@ retry:
 		size = 0x7ff0L - linerest;	    /* limit buffer to 32K */
 #endif
 
-		for ( ; size >= 10; size = (long_u)size >> 1)
+		for ( ; size >= 10; size = (long)((long_u)size >> 1))
 		{
 		    if ((new_buffer = lalloc((long_u)(size + linerest + 1),
 							      FALSE)) != NULL)
diff --git a/src/getchar.c b/src/getchar.c
index 3d851653d..0ba97b406 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -128,6 +128,9 @@ static int	vgetorpeek __ARGS((int));
 static void	map_free __ARGS((mapblock_T **));
 static void	validate_maphash __ARGS((void));
 static void	showmap __ARGS((mapblock_T *mp, int local));
+#ifdef FEAT_EVAL
+static char_u	*eval_map_expr __ARGS((char_u *str));
+#endif
 
 /*
  * Free and clear a buffer.
@@ -2328,7 +2331,7 @@ vgetorpeek(advance)
 			    if (tabuf.typebuf_valid)
 			    {
 				vgetc_busy = 0;
-				s = eval_to_string(mp->m_str, NULL, FALSE);
+				s = eval_map_expr(mp->m_str);
 				vgetc_busy = save_vgetc_busy;
 			    }
 			    else
@@ -4251,7 +4254,7 @@ check_abbr(c, ptr, col, mincol)
 	    }
 #ifdef FEAT_EVAL
 	    if (mp->m_expr)
-		s = eval_to_string(mp->m_str, NULL, FALSE);
+		s = eval_map_expr(mp->m_str);
 	    else
 #endif
 		s = mp->m_str;
@@ -4281,6 +4284,36 @@ check_abbr(c, ptr, col, mincol)
     return FALSE;
 }
 
+#ifdef FEAT_EVAL
+/*
+ * Evaluate the RHS of a mapping or abbreviations and take care of escaping
+ * special characters.
+ */
+    static char_u *
+eval_map_expr(str)
+    char_u	*str;
+{
+    char_u	*res;
+    char_u	*s;
+    int		len;
+
+    s = eval_to_string(str, NULL, FALSE);
+    if (s == NULL)
+	return NULL;
+
+    /* Need a buffer to hold up to three times as much. */
+    len = (int)STRLEN(s);
+    res = alloc((unsigned)(len * 3) + 1);
+    if (res != NULL)
+    {
+	STRCPY(res, s);
+	(void)fix_input_buffer(res, len, TRUE);
+    }
+    vim_free(s);
+    return res;
+}
+#endif
+
 /*
  * Write map commands for the current mappings to an .exrc file.
  * Return FAIL on error, OK otherwise.
diff --git a/src/gui.h b/src/gui.h
index f221c2981..36156f9dd 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -504,3 +504,46 @@ typedef enum
 # define FRD_WHOLE_WORD	0x08	/* match whole word only */
 # define FRD_MATCH_CASE	0x10	/* match case */
 #endif
+
+#ifdef HAVE_GTK2
+/*
+ * Convenience macros to convert from 'encoding' to 'termencoding' and
+ * vice versa.	If no conversion is necessary the passed-in pointer is
+ * returned as is, without allocating any memory.  Thus additional _FREE()
+ * macros are provided.  The _FREE() macros also set the pointer to NULL,
+ * in order to avoid bugs due to illegal memory access only happening if
+ * 'encoding' != utf-8...
+ *
+ * Defining these macros as pure expressions looks a bit tricky but
+ * avoids depending on the context of the macro expansion.  One of the
+ * rare occasions where the comma operator comes in handy :)
+ *
+ * Note: Do NOT keep the result around when handling control back to
+ * the main Vim!  The user could change 'encoding' at any time.
+ */
+# define CONVERT_TO_UTF8(String)				\
+    ((output_conv.vc_type == CONV_NONE || (String) == NULL)	\
+	    ? (String)						\
+	    : string_convert(&output_conv, (String), NULL))
+
+# define CONVERT_TO_UTF8_FREE(String)				\
+    ((String) = ((output_conv.vc_type == CONV_NONE)		\
+			? (char_u *)NULL			\
+			: (vim_free(String), (char_u *)NULL)))
+
+# define CONVERT_FROM_UTF8(String)				\
+    ((input_conv.vc_type == CONV_NONE || (String) == NULL)	\
+	    ? (String)						\
+	    : string_convert(&input_conv, (String), NULL))
+
+# define CONVERT_FROM_UTF8_FREE(String)				\
+    ((String) = ((input_conv.vc_type == CONV_NONE)		\
+			? (char_u *)NULL			\
+			: (vim_free(String), (char_u *)NULL)))
+
+#else
+# define CONVERT_TO_UTF8(String) (String)
+# define CONVERT_TO_UTF8_FREE(String) ((String) = (char_u *)NULL)
+# define CONVERT_FROM_UTF8(String) (String)
+# define CONVERT_FROM_UTF8_FREE(String) ((String) = (char_u *)NULL)
+#endif /* HAVE_GTK2 */
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index a1c43751b..d9477d5b6 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -131,44 +131,6 @@ typedef int GtkWidget;
 # define CancelData int
 #endif
 
-#ifdef HAVE_GTK2
-/*
- * Convenience macros to convert from 'encoding' to 'termencoding' and
- * vice versa.	If no conversion is necessary the passed-in pointer is
- * returned as is, without allocating any memory.  Thus additional _FREE()
- * macros are provided.  The _FREE() macros also set the pointer to NULL,
- * in order to avoid bugs due to illegal memory access only happening if
- * 'encoding' != utf-8...
- *
- * Defining these macros as pure expressions looks a bit tricky but
- * avoids depending on the context of the macro expansion.  One of the
- * rare occasions where the comma operator comes in handy :)
- *
- * Note: Do NOT keep the result around when handling control back to
- * the main Vim!  The user could change 'encoding' at any time.
- */
-# define CONVERT_TO_UTF8(String)				\
-    ((output_conv.vc_type == CONV_NONE || (String) == NULL)	\
-	    ? (String)						\
-	    : string_convert(&output_conv, (String), NULL))
-
-# define CONVERT_TO_UTF8_FREE(String)				\
-    ((String) = ((output_conv.vc_type == CONV_NONE)		\
-			? (char_u *)NULL			\
-			: (vim_free(String), (char_u *)NULL)))
-
-# define CONVERT_FROM_UTF8(String)				\
-    ((input_conv.vc_type == CONV_NONE || (String) == NULL)	\
-	    ? (String)						\
-	    : string_convert(&input_conv, (String), NULL))
-
-# define CONVERT_FROM_UTF8_FREE(String)				\
-    ((String) = ((input_conv.vc_type == CONV_NONE)		\
-			? (char_u *)NULL			\
-			: (vim_free(String), (char_u *)NULL)))
-
-#endif /* HAVE_GTK2 */
-
 static void entry_activate_cb(GtkWidget *widget, gpointer data);
 static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
 static void find_replace_cb(GtkWidget *widget, gpointer data);
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 9eb85ce14..23318bb7a 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3293,6 +3293,7 @@ gui_mch_update_tabline(void)
     tabpage_T	    *tp;
     int		    nr = 0;
     int		    curtabidx = 0;
+    char_u	    *labeltext;
 
     if (gui.tabline == NULL)
 	return;
@@ -3320,8 +3321,10 @@ gui_mch_update_tabline(void)
 	}
 
 	get_tabline_label(tp);
+	labeltext = CONVERT_TO_UTF8(NameBuff);
 	gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(gui.tabline), page,
-						     (const gchar *)NameBuff);
+						     (const gchar *)labeltext);
+	CONVERT_TO_UTF8_FREE(labeltext);
     }
 
     /* Remove any old labels. */
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 81c7a6a1f..1eb3616e7 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -723,7 +723,7 @@ cs_create_connection(i)
     char *prog, *cmd, *ppath = NULL;
 #ifndef UNIX
     int in_save, out_save, err_save;
-    long ph;
+    long_i ph;
 # ifdef FEAT_GUI
     HWND activewnd = NULL;
     HWND consolewnd = NULL;
@@ -881,9 +881,9 @@ err_closing:
 	/* May be use &shell, &shellquote etc */
 # ifdef __BORLANDC__
 	/* BCC 5.5 uses a different function name for spawnlp */
-	ph = (long)spawnlp(P_NOWAIT, prog, cmd, NULL);
+	ph = (long_i)spawnlp(P_NOWAIT, prog, cmd, NULL);
 # else
-	ph = (long)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
+	ph = (long_i)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
 # endif
 	vim_free(prog);
 	vim_free(cmd);
diff --git a/src/netbeans.c b/src/netbeans.c
index 8928342d2..731b98b24 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -169,7 +169,7 @@ netbeans_gtk_connect(void)
 	 * Tell gdk we are interested in being called when there
 	 * is input on the editor connection socket
 	 */
-	inputHandler = gdk_input_add(sd, (GdkInputCondition)
+	inputHandler = gdk_input_add((gint)sd, (GdkInputCondition)
 		((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION),
 						   messageFromNetbeans, NULL);
     }
diff --git a/src/option.c b/src/option.c
index cb456bf7e..29ab1efe8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3496,7 +3496,7 @@ set_init_2()
      * 'scroll' defaults to half the window height. Note that this default is
      * wrong when the window height changes.
      */
-    set_number_default("scroll", (long_u)Rows >> 1);
+    set_number_default("scroll", (long)((long_u)Rows >> 1));
     idx = findoption((char_u *)"scroll");
     if (!(options[idx].flags & P_WAS_SET))
 	set_option_default(idx, OPT_LOCAL, p_cp);
@@ -3643,12 +3643,14 @@ set_init_3()
 	    if (       fnamecmp(p, "sh") == 0
 		    || fnamecmp(p, "ksh") == 0
 		    || fnamecmp(p, "zsh") == 0
+		    || fnamecmp(p, "zsh-beta") == 0
 		    || fnamecmp(p, "bash") == 0
 #  ifdef WIN3264
 		    || fnamecmp(p, "cmd") == 0
 		    || fnamecmp(p, "sh.exe") == 0
 		    || fnamecmp(p, "ksh.exe") == 0
 		    || fnamecmp(p, "zsh.exe") == 0
+		    || fnamecmp(p, "zsh-beta.exe") == 0
 		    || fnamecmp(p, "bash.exe") == 0
 		    || fnamecmp(p, "cmd.exe") == 0
 #  endif
diff --git a/src/po/ja.po b/src/po/ja.po
index db6bedd4b..67d877d47 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -4,13 +4,13 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 28-Mar-2006.
+# Last Change: 18-Apr-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-03-28 20:12+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+0900\n"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
+"PO-Revision-Date: 2006-04-18 11:30+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
@@ -204,6 +204,9 @@ msgstr "E102: �Хåե� \"%s\" ���ߤĤ���ޤ���"
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �Хåե� \"%s\" �Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ͽ�������Хåե����ѹ��ѹ�����ޤ���"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����Escape�ϻ��ѤǤ��ޤ���"
 
@@ -217,8 +220,8 @@ msgid " Keyword completion (^N^P)"
 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)"
@@ -250,8 +253,8 @@ msgstr " �桼������䴰 (^U^N^P)"
 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)"
@@ -486,6 +489,22 @@ msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ������ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �ؿ��ΰ��������ʲ᤮�ޤ�: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
+
 msgid "E699: Too many arguments"
 msgstr "E699: ��¿�᤮�ޤ�"
 
@@ -522,8 +541,8 @@ msgstr ""
 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() �ˤ�̵���ʷ��Ǥ�"
@@ -1380,6 +1399,9 @@ msgstr "E602: :try �Τʤ� :endtry �Ǥ�"
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �ؿ��γ��� :endfunction ������ޤ���"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: ���ߤ�¾�ΥХåե����Խ����뤳�Ȥϵ�����ޤ���"
+
 msgid "tagname"
 msgstr "����̾"
 
@@ -2484,12 +2506,33 @@ msgstr "<������ɥ� %d>"
 msgid "no such window"
 msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
 
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ ��ʸ����Υ��󥹥��󥹤Ǥʤ���Фʤ�ޤ���"
+
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: "
 "Ruby�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
+msgid "E267: unexpected return"
+msgstr "E265: ͽ������ return �Ǥ�"
+
+msgid "E268: unexpected next"
+msgstr "E268: ͽ������ next �Ǥ�"
+
+msgid "E269: unexpected break"
+msgstr "E269: ͽ������ break �Ǥ�"
+
+msgid "E270: unexpected redo"
+msgstr "E270: ͽ������ redo �Ǥ�"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue �γ��� retry �Ǥ�"
+
+msgid "E272: unhandled exception"
+msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
+
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ̤�Τ�longjmp����: %d"
@@ -4184,9 +4227,6 @@ msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
 msgid "I/O ERROR"
 msgstr "�����ϥ��顼"
 
-msgid "...(truncated)"
-msgstr "...(��ά)"
-
 msgid "Message"
 msgstr "��å�����"
 
@@ -4621,6 +4661,16 @@ msgstr "E388: �����ߤĤ����ޤ���"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �ѥ������ߤĤ����ޤ���"
 
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# �Ǹ�� %s�����ѥ�����:\n"
+"~"
+
 msgid "E759: Format error in spell file"
 msgstr "E759: ���ڥ�ե�����ν񼰥��顼�Ǥ�"
 
@@ -4646,7 +4696,7 @@ msgid "Compressing word tree..."
 msgstr "ñ��ĥ꡼�򰵽̤��Ƥ��ޤ�..."
 
 msgid "E756: Spell checking is not enabled"
-msgstr "E756: ���ڤ������å���̵��������Ƥ��ޤ�"
+msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
 
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4698,6 +4748,22 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s ��� %d ���ܤ˥ե饰����Ż��Ѥ�����ޤ�: %s"
 
 #, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDFORBIDFLAG "
+"������ϸ��ä���̤������뤳�Ȥ�����ޤ�"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDPERMITFLAG "
+"������ϸ��ä���̤������뤳�Ȥ�����ޤ�"
+
+#, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDWORDMAX ���ͤ˸��꤬����ޤ�: %s"
 
@@ -4739,10 +4805,6 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ���ϲ���Ƥ��ޤ�: %s"
 
 #, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONE�����ꤵ�줿�Τ� %s �� %d ���ܤ� affix �ե饰��̵�뤷�ޤ���: %s"
-
-#, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s �� %d ���ܤˤ� REP(SAL) �β����ɬ�פǤ�"
 
@@ -5299,7 +5361,7 @@ msgstr "E438: u_undo: ���ֹ椬�ְ�äƤ��ޤ�"
 msgid "more line"
 msgstr "�� �ɲä��ޤ���"
 
-msgid "�Ԥ���ޤ�"
+msgid "more lines"
 msgstr "�� �ɲä��ޤ���"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "����ɥ��оݤ�����ޤ���"
 msgid "number changes  time"
 msgstr "�ֹ�   �ѹ�     ����"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld �÷вᤷ�Ƥ��ޤ�"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 
@@ -5636,6 +5702,9 @@ msgstr "   �ٹ�: Windows 95/98/Me �򸡽�  "
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " �ܺ٤ʾ����          :help windows95<Enter> "
 
+msgid "Already only one window"
+msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
+
 msgid "E441: There is no preview window"
 msgstr "E441: �ץ�ӥ塼������ɥ�������ޤ���"
 
@@ -5648,9 +5717,6 @@ msgstr "E443: ¾�Υ�����ɥ���ʬ�䤵��Ƥ�����ˤϽ��Ǥ��ޤ���"
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ǹ�Υ�����ɥ����Ĥ��뤳�ȤϤǤ��ޤ���"
 
-msgid "Already only one window"
-msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾�Υ�����ɥ��ˤ��ѹ�������ޤ�"
 
@@ -5680,7 +5746,8 @@ msgid "Edits the selected file(s) with Vim"
 msgstr "���򤵤줿�ե������Vim���Խ�����"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "��ư�˼��Ԥ��ޤ���: gvim �ؤΥѥ������������ꤵ��Ƥ��뤫��ǧ���Ƥ�������!"
+msgstr ""
+"��ư�˼��Ԥ��ޤ���: gvim �ؤΥѥ������������ꤵ��Ƥ��뤫��ǧ���Ƥ�������!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll ���顼"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index f663ea29f..29592bb3c 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -4,13 +4,13 @@
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
 # MURAOKA Taro <koron@tka.att.ne.jp>, 2001-6.
-# Last Change: 28-Mar-2006.
+# Last Change: 18-Apr-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.0\n"
-"POT-Creation-Date: 2006-03-28 20:12+0900\n"
-"PO-Revision-Date: 2006-03-28 21:10+0900\n"
+"POT-Creation-Date: 2006-04-18 11:00+0900\n"
+"PO-Revision-Date: 2006-04-18 11:30+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
@@ -204,6 +204,9 @@ msgstr "E102: �o�b�t�@ \"%s\" ���݂���܂���"
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �o�b�t�@ \"%s\" �͍������[�h�ł͂���܂���"
 
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: �\\�������o�b�t�@���ύX�ύX����܂���"
+
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ������Escape�͎g�p�ł��܂���"
 
@@ -217,8 +220,8 @@ msgid " Keyword completion (^N^P)"
 msgstr " �L�[���[�h�⊮ (^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 ���[�h (^]^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 ���[�h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
 msgid " Whole line completion (^L^N^P)"
 msgstr " �s(�S��)�⊮ (^L^N^P)"
@@ -250,8 +253,8 @@ msgstr " ���[�U��`�⊮ (^U^N^P)"
 msgid " Omni completion (^O^N^P)"
 msgstr " �I���j�⊮ (^O^N^P)"
 
-msgid " Spelling suggestion (^S^N^P)"
-msgstr " �Ԃ�C����� (^S^N^P)"
+msgid " Spelling suggestion (s^N^P)"
+msgstr " �Ԃ�C����� (s^N^P)"
 
 msgid " Keyword Local completion (^N^P)"
 msgstr " �Ǐ��L�[���[�h�⊮ (^N^P)"
@@ -486,6 +489,22 @@ msgstr "E723: �����^�̍Ō�� '}' ������܂���: %s"
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: �\\������ɂ͕ϐ��̓���q���[�߂��܂�"
 
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ���m�̊֐��ł�: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �֐��̈��������ȉ߂��܂�: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: �X�N���v�g�ȊO��<SID>���g���܂���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����p�֐����Ă΂�܂���������������܂���: %s"
+
 msgid "E699: Too many arguments"
 msgstr "E699: �����߂��܂�"
 
@@ -522,8 +541,8 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() �� inputsave() ���������Ă΂�܂���"
 
-msgid "E745: Range not allowed"
-msgstr "E745: �͈͎w��͋�����Ă��܂���"
+msgid "E786: Range not allowed"
+msgstr "E786: �͈͎w��͋�����Ă��܂���"
 
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ɂ͖����Ȍ^�ł�"
@@ -1380,6 +1399,9 @@ msgstr "E602: :try �̂Ȃ� :endtry �ł�"
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �֐��̊O�� :endfunction ������܂���"
 
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: ���݂͑��̃o�b�t�@��ҏW���邱�Ƃ͋�����܂���"
+
 msgid "tagname"
 msgstr "�^�O��"
 
@@ -2484,12 +2506,33 @@ msgstr "<�E�B���h�E %d>"
 msgid "no such window"
 msgstr "���̂悤�ȃE�B���h�E�͂���܂���"
 
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ �͕�����̃C���X�^���X�łȂ���΂Ȃ�܂���"
+
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: ���̃R�}���h�͖����ł�,���߂�Ȃ���: "
 "Ruby���C�u���������[�h�ł��܂���ł���."
 
+msgid "E267: unexpected return"
+msgstr "E265: �\\������ return �ł�"
+
+msgid "E268: unexpected next"
+msgstr "E268: �\\������ next �ł�"
+
+msgid "E269: unexpected break"
+msgstr "E269: �\\������ break �ł�"
+
+msgid "E270: unexpected redo"
+msgstr "E270: �\\������ redo �ł�"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue �̊O�� retry �ł�"
+
+msgid "E272: unhandled exception"
+msgstr "E272: ��舵���Ȃ�������O������܂�"
+
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ���m��longjmp���: %d"
@@ -4184,9 +4227,6 @@ msgstr "ANCHOR_BUF_SIZE �������߂��܂�."
 msgid "I/O ERROR"
 msgstr "���o�̓G���["
 
-msgid "...(truncated)"
-msgstr "...(�ȗ�)"
-
 msgid "Message"
 msgstr "���b�Z�[�W"
 
@@ -4621,6 +4661,16 @@ msgstr "E388: ��`���݂����܂���"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �p�^�[�����݂����܂���"
 
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# �Ō�� %s�����p�^�[��:\n"
+"~"
+
 msgid "E759: Format error in spell file"
 msgstr "E759: �X�y���t�@�C���̏����G���[�ł�"
 
@@ -4646,7 +4696,7 @@ msgid "Compressing word tree..."
 msgstr "�P��c���[�����k���Ă��܂�..."
 
 msgid "E756: Spell checking is not enabled"
-msgstr "E756: ���؂��`�F�b�N�͖���������Ă��܂�"
+msgstr "E756: �X�y���`�F�b�N�͖���������Ă��܂�"
 
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
@@ -4698,6 +4748,22 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s ���� %d �s�ڂɃt���O�̓�d�g�p������܂�: %s"
 
 #, c-format
+msgid ""
+"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s �� %d �s�ڂ� PFX ���ڂ̌�� COMPOUNDFORBIDFLAG "
+"�̒�`�͌�������ʂ𐶂��邱�Ƃ�����܂�"
+
+#, c-format
+msgid ""
+"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+"%d"
+msgstr ""
+"%s �� %d �s�ڂ� PFX ���ڂ̌�� COMPOUNDPERMITFLAG "
+"�̒�`�͌�������ʂ𐶂��邱�Ƃ�����܂�"
+
+#, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s �� %d �s�ڂ� COMPOUNDWORDMAX �̒l�Ɍ�肪����܂�: %s"
 
@@ -4739,10 +4805,6 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "%s �� %d �s�ڂ� �����͉��Ă��܂�: %s"
 
 #, c-format
-msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-msgstr "PFXPOSTPONE���w�肳�ꂽ�̂� %s �� %d �s�ڂ� affix �t���O�𖳎����܂���: %s"
-
-#, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s �� %d �s�ڂɂ� REP(SAL) �̉񐔂��K�v�ł�"
 
@@ -5299,7 +5361,7 @@ msgstr "E438: u_undo: �s�ԍ����Ԉ���Ă��܂�"
 msgid "more line"
 msgstr "�s �ǉ����܂���"
 
-msgid "�s����܂�"
+msgid "more lines"
 msgstr "�s �ǉ����܂���"
 
 msgid "line less"
@@ -5330,6 +5392,10 @@ msgstr "�A���h�D�Ώۂ�����܂���"
 msgid "number changes  time"
 msgstr "�ԍ�   �ύX     ����"
 
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld �b�o�߂��Ă��܂�"
+
 msgid "E439: undo list corrupt"
 msgstr "E439: �A���h�D���X�g�����Ă��܂�"
 
@@ -5636,6 +5702,9 @@ msgstr "   �x��: Windows 95/98/Me �����o  "
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " �ڍׂȏ���          :help windows95<Enter> "
 
+msgid "Already only one window"
+msgstr "���ɃE�B���h�E��1��������܂���"
+
 msgid "E441: There is no preview window"
 msgstr "E441: �v���r���[�E�B���h�E������܂���"
 
@@ -5648,9 +5717,6 @@ msgstr "E443: ���̃E�B���h�E����������Ă��鎞�ɂ͏���ł��܂���"
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ō�̃E�B���h�E����邱�Ƃ͂ł��܂���"
 
-msgid "Already only one window"
-msgstr "���ɃE�B���h�E��1��������܂���"
-
 msgid "E445: Other window contains changes"
 msgstr "E445: ���̃E�B���h�E�ɂ͕ύX������܂�"
 
@@ -5680,7 +5746,8 @@ msgid "Edits the selected file(s) with Vim"
 msgstr "�I�����ꂽ�t�@�C����Vim�ŕҏW����"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "�N���Ɏ��s���܂���: gvim �ւ̃p�X���������ݒ肳��Ă��邩�m�F���Ă�������!"
+msgstr ""
+"�N���Ɏ��s���܂���: gvim �ւ̃p�X���������ݒ肳��Ă��邩�m�F���Ă�������!"
 
 msgid "gvimext.dll error"
 msgstr "gvimext.dll �G���["
diff --git a/src/po/sv.po b/src/po/sv.po
index 9697f91f4..e4a92df5e 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish translation for Vim.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
-# Johan Svedberg <johan@svedberg.com>, 2003-2005.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# Johan Svedberg <johan@svedberg.com>, 2003-2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-01 22:51+0100\n"
-"PO-Revision-Date: 2005-12-04 20:33+0100\n"
+"POT-Creation-Date: 2006-04-10 17:24+0200\n"
+"PO-Revision-Date: 2006-04-11 01:08+0200\n"
 "Last-Translator: Johan Svedberg <johan@svedberg.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -131,8 +131,8 @@ msgstr "[Inget Namn]"
 msgid "help"
 msgstr "hj�lp"
 
-msgid "[help]"
-msgstr "[hj�lp]"
+msgid "[Help]"
+msgstr "[Hj�lp]"
 
 msgid "[Preview]"
 msgstr "[F�rhandsvisning]"
@@ -154,8 +154,11 @@ msgstr ""
 "\n"
 "# Buffertlista:\n"
 
-msgid "[Error List]"
-msgstr "[Fellista]"
+msgid "[Location List]"
+msgstr "[Positionslista]"
+
+msgid "[Quickfix List]"
+msgstr "[Quickfix-lista]"
 
 msgid ""
 "\n"
@@ -488,6 +491,9 @@ msgstr "E724: variabel n�stlad f�r djupt f�r att visas"
 msgid "E699: Too many arguments"
 msgstr "E699: F�r m�nga argument"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() kan bara anv�ndas i infogningsl�ge"
+
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
@@ -670,6 +676,136 @@ msgstr ""
 "\n"
 "\tSenast satt fr�n "
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "G�r in i fels�kningsl�ge.  Skriv \"cont\" f�r att forts�tta."
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "rad %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "kommando: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Brytpunkt i \"%s%s\" rad %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Brytpunkt hittades inte: %s"
+
+msgid "No breakpoints defined"
+msgstr "Inga brytpunkter definierade"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  rad %ld"
+
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: Anv�nd :profile start <fnamn> f�rst"
+
+msgid "Save As"
+msgstr "Spara som"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "Spara �ndringar till \"%s\"?"
+
+msgid "Untitled"
+msgstr "Namnl�s"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: Ingen skrivning sedan senaste �ndring f�r buffert \"%s\""
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "Varning: Gick in i andra buffertar ov�ntat (kontrollera autokommandon)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: Det finns bara en fil att redigera"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Kan inte g� f�re f�rsta filen"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Kan inte g� bortom sista filen"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: kompilator st�ds inte: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "S�ker efter \"%s\" i \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "S�ker efter \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "hittades inte i 'runtimepath': \"%s\""
+
+msgid "Source Vim script"
+msgstr "L�s Vim-skript"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Kan inte l�sa en katalog: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "kunde inte l�sa \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "rad %ld: kunde inte l�sa \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "l�ser \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "rad %ld: l�ser \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "l�ste klart %s"
+
+msgid "modeline"
+msgstr "l�gesrad"
+
+msgid "--cmd argument"
+msgstr "--cmd argument"
+
+msgid "-c argument"
+msgstr "-c argument"
+
+msgid "environment variable"
+msgstr "milj�variabel"
+
+msgid "error handler"
+msgstr "felhanterare"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding anv�nds utanf�r en k�rd fil"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish anv�nds utanf�r en k�rd fil"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "Aktuellt %sspr�k: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: Kan inte s�tta spr�k till \"%s\""
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Hex %02x,  Oktalt %03o"
@@ -754,9 +890,6 @@ msgstr "# V�rde av 'encoding' n�r den h�r filen blev skriven\n"
 msgid "Illegal starting char"
 msgstr "Otill�tet starttecken"
 
-msgid "Save As"
-msgstr "Spara som"
-
 msgid "Write partial file?"
 msgstr "Skriv ofullst�ndig fil?"
 
@@ -927,118 +1060,6 @@ msgstr " (st�ds inte)"
 msgid "[Deleted]"
 msgstr "[Borttagen]"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "G�r in i fels�kningsl�ge.  Skriv \"cont\" f�r att forts�tta."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "rad %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "kommando: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Brytpunkt i \"%s%s\" rad %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Brytpunkt hittades inte: %s"
-
-msgid "No breakpoints defined"
-msgstr "Inga brytpunkter definierade"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  rad %ld"
-
-msgid "E750: First use :profile start <fname>"
-msgstr "E750: Anv�nd :profile start <fnamn> f�rst"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Spara �ndringar till \"%s\"?"
-
-msgid "Untitled"
-msgstr "Namnl�s"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Ingen skrivning sedan senaste �ndring f�r buffert \"%s\""
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Varning: Gick in i andra buffertar ov�ntat (kontrollera autokommandon)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: Det finns bara en fil att redigera"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Kan inte g� f�re f�rsta filen"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Kan inte g� bortom sista filen"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: kompilator st�ds inte: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "S�ker efter \"%s\" i \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "S�ker efter \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "hittades inte i 'runtimepath': \"%s\""
-
-msgid "Source Vim script"
-msgstr "L�s Vim-skript"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Kan inte l�sa en katalog: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "kunde inte l�sa \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rad %ld: kunde inte l�sa \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "l�ser \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rad %ld: l�ser \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "l�ste klart %s"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varning: Fel radavskiljare, ^M kan saknas"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding anv�nds utanf�r en k�rd fil"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish anv�nds utanf�r en k�rd fil"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Aktuellt %sspr�k: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kan inte s�tta spr�k till \"%s\""
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "G�r in i Ex-l�ge.  Skriv \"visual\" f�r att g� till Normal-l�ge."
 
@@ -1152,9 +1173,19 @@ msgstr "E185: Kan inte hitta f�rgschema %s"
 msgid "Greetings, Vim user!"
 msgstr "V�lkommen, Vim-anv�ndare!"
 
+msgid "E784: Cannot close last tab page"
+msgstr "E784: Kan inte st�nga senaste flik"
+
+msgid "Already only one tab page"
+msgstr "Redan bara en flik"
+
 msgid "Edit File in new window"
 msgstr "Redigera fil i nytt f�nster"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Flik %d"
+
 msgid "No swap file"
 msgstr "Ingen v�xlingsfil"
 
@@ -1399,6 +1430,9 @@ msgstr "�r inte en fil"
 msgid "[New File]"
 msgstr "[Ny fil]"
 
+msgid "[New DIRECTORY]"
+msgstr "[Ny KATALOG]"
+
 msgid "[File too big]"
 msgstr "[Fil f�r stor]"
 
@@ -1451,8 +1485,9 @@ msgstr "[konverterad]"
 msgid "[crypted]"
 msgstr "[krypterad]"
 
-msgid "[CONVERSION ERROR]"
-msgstr "[KONVERTERINGSFEL]"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[KONVERTERINGSFEL p� rad %ld]"
 
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
@@ -1798,29 +1833,6 @@ msgstr "Ingen mappning hittades"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Otill�tet l�ge"
 
-msgid "E229: Cannot start the GUI"
-msgstr "E229: Kan inte starta GUI"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Kan inte l�sa fr�n \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 'guifontwide' ogiltig"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: V�rdet av 'imactivatekey' �r ogiltigt"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: Kan inte allokera f�rg %s"
-
-msgid "No match at cursor, finding next"
-msgstr "Ingen matchning vid mark�r, s�ker n�sta"
-
 msgid "<cannot open> "
 msgstr "<kan inte �ppna> "
 
@@ -1843,15 +1855,38 @@ msgstr "OK"
 msgid "Cancel"
 msgstr "Avbryt"
 
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "Rullningslist: Kunde inte h�mta geometrin p� miniatyrbild."
-
 msgid "Vim dialog"
 msgstr "Vim-dialog"
 
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Rullningslist: Kunde inte h�mta geometrin p� miniatyrbild."
+
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Kan inte skapa BalloonEval med b�de meddelande och �terkallning"
 
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Kan inte starta GUI"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Kan inte l�sa fr�n \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: Kan inte starta GUI, ingen giltig font hittad"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ogiltig"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: V�rdet av 'imactivatekey' �r ogiltigt"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Kan inte allokera f�rg %s"
+
+msgid "No match at cursor, finding next"
+msgstr "Ingen matchning vid mark�r, s�ker n�sta"
+
 msgid "Vim dialog..."
 msgstr "Vim-dialog..."
 
@@ -1909,6 +1944,15 @@ msgstr "Ers�tt alla"
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: Tog emot \"die\"-beg�ran fr�n sessionshanteraren\n"
 
+msgid "Close"
+msgstr "St�ng"
+
+msgid "New tab"
+msgstr "Ny flik"
+
+msgid "Open Tab..."
+msgstr "�ppna flik..."
+
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Huvudf�nster ov�ntat f�rst�rt\n"
 
@@ -1980,6 +2024,12 @@ msgstr "E243: Argument st�ds inte: \"-%s\"; Anv�nds OLE-versionen."
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Kunde inte �ppna f�nster inuti MDI-applikation"
 
+msgid "Close tab"
+msgstr "St�ng flik"
+
+msgid "Open tab..."
+msgstr "�ppna flik..."
+
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "S�k str�ng (anv�nd '\\\\' f�r att hitta '\\')"
 
@@ -2819,6 +2869,9 @@ msgstr "-U <gvimrc>\t\tAnv�nd <gvimrc> ist�llet f�r n�gon .gvimrc"
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tL�s inte in insticksskript"
 
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-p[N]\t\t�ppna N flikar (standard: en f�r varje fil)"
+
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\t�ppna N f�nster (standard: ett f�r varje fil)"
 
@@ -2877,6 +2930,9 @@ msgstr ""
 "--remote-wait-silent <filer>\tSamma, klaga inte om det inte finns n�gon "
 "server"
 
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <filer>  Som --remote men �ppna flik f�r varje fil"
+
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr ""
 "--remote-send <nycklar>\tSkicka <nycklar> till en Vim-server och avsluta"
@@ -3001,25 +3057,6 @@ msgstr "--role <roll>\tSt�ll in en unik roll f�r att identifiera huvudf�nstret"
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t�ppna Vim innanf�r en annan GTK-widget"
 
-msgid ""
-"\n"
-"Arguments recognised by kvim (KDE version):\n"
-msgstr ""
-"\n"
-"Argument igenk�nda av kvim (KDE-version):\n"
-
-msgid "-black\t\tUse reverse video"
-msgstr "-black\t\tAnv�nd omv�nd video"
-
-msgid "-tip\t\t\tDisplay the tip dialog on startup"
-msgstr "-tip\t\tVisa tipsdialogen vid uppstart"
-
-msgid "-notip\t\tDisable the tip dialog"
-msgstr "-notip\t\tInaktivera tipsdialogen"
-
-msgid "--display <display>\tRun vim on <display>"
-msgstr "--display <display>\tK�r vim p� <display>"
-
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <f�r�lder f�nster>\t�ppna Vim inuti f�r�lderapplikation"
 
@@ -3444,6 +3481,10 @@ msgstr "Stackstorlek �kar"
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: pekarblock-id fel 2"
 
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: Symbolisk l�nk-loop f�r \"%s\""
+
 msgid "E325: ATTENTION"
 msgstr "E325: LYSTRING"
 
@@ -3532,16 +3573,16 @@ msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Abort\n"
-"&Delete it"
+"&Abort"
 msgstr ""
 "&�ppna skrivskyddad\n"
 "&Redigera �nd�\n"
 "&�terskapa\n"
+"&Ta bort den\n"
 "&Avsluta\n"
-"A&vbryt\n"
-"&Ta bort den"
+"A&vbryt"
 
 msgid "E326: Too many swap files found"
 msgstr "E326: F�r m�nga v�xlingsfiler hittade"
@@ -3808,6 +3849,12 @@ msgstr "E658: NetBeans-anslutning tappad f�r buffert %ld"
 msgid "E505: "
 msgstr "E505: "
 
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' �r tom"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval-funktionen inte tillg�nglig"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "Varning: terminal kan inte framh�va"
 
@@ -3930,8 +3977,9 @@ msgstr "Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld bitar"
 msgid ""
 "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
 "Bytes"
-msgstr "Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld tecken; %ld "
-"av %ld bitar"
+msgstr ""
+"Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld tecken; %ld av %ld "
+"bitar"
 
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
@@ -3941,8 +3989,9 @@ msgstr "Kol %s av %s; rad %ld av %ld; ord %ld av %ld; bit %ld av %ld"
 msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
-msgstr "Kol %s av %s; rad %ld av %ld; ord %ld av %ld; tecken %ld av %ld; bit "
-"%ld av %ld"
+msgstr ""
+"Kol %s av %s; rad %ld av %ld; ord %ld av %ld; tecken %ld av %ld; bit %ld av %"
+"ld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4153,6 +4202,9 @@ msgstr "I/O-FEL"
 msgid "...(truncated)"
 msgstr "...(trunkerade)"
 
+msgid "Message"
+msgstr "Meddelande"
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' �r inte 80, kan inte k�ra externa kommandon"
 
@@ -4201,14 +4253,6 @@ msgstr "Vim: F�ngade d�dlig signal\n"
 msgid "Opening the X display took %ld msec"
 msgstr "�ppning av X-display tog %ld ms"
 
-#. KDE sometimes produces X error that we want to ignore
-msgid ""
-"\n"
-"Vim: Got X error but we continue...\n"
-msgstr ""
-"\n"
-"Vim: Fick X-error men vi forts�tter...\n"
-
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4287,9 +4331,6 @@ msgstr "XSMP ICE-anslutning �vervakning misslyckades"
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection misslyckades: %s"
 
-msgid "At line"
-msgstr "P� rad"
-
 msgid "Could not load vim32.dll!"
 msgstr "Kunde inte l�sa in vim32.dll!"
 
@@ -4331,6 +4372,9 @@ msgstr ""
 msgid "Vim Warning"
 msgstr "Vim-varning"
 
+msgid "At line"
+msgstr "P� rad"
+
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: F�r m�nga %%%c i formatstr�ng"
@@ -4393,6 +4437,9 @@ msgstr "Kan inte �ppna fil \"%s\""
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Buffert �r inte laddad"
 
+msgid "E777: String or List expected"
+msgstr "E777: Str�ng eller Lista f�rv�ntades"
+
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ogiltigt f�rem�l i %s%%[]"
@@ -4576,6 +4623,10 @@ msgstr " INTE HITTADE"
 msgid "Scanning included file: %s"
 msgstr "S�ker igenom inkluderad fil: %s"
 
+#, c-format
+msgid "Searching included file %s"
+msgstr "S�ker igenom inkluderad fil %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: Matchning �r p� aktuell rad"
 
@@ -4666,12 +4717,8 @@ msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG efter anv�ndning av flags i %s rad %d: %s"
 
 #, c-format
-msgid "Character used for SLASH must be ASCII; in %s line %d: %s"
-msgstr "Tecken anv�nt f�r SLASH m�ste vara ASCII; i %s rad %d: %s"
-
-#, c-format
-msgid "Wrong COMPOUNDMAX value in %s line %d: %s"
-msgstr "Fel COMPOUNDMAX-v�rde i %s rad %d: %s"
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "Fel COMPOUNDWORDMAX-v�rde i %s rad %d: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
@@ -4682,6 +4729,10 @@ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Fel COMPOUNDSYLMAX-v�rde i %s rad %d: %s"
 
 #, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "Fel CHECKCOMPOUNDPATTERN-v�rde i %s rad %d: %s"
+
+#, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr "Annan kombinerande flagga i efterf�ljande affix-block i %s rad %d: %s"
 
@@ -4691,9 +4742,11 @@ msgstr "Duplicerad affix i %s rad %d: %s"
 
 #, c-format
 msgid ""
-"Affix also used for BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND in %s line %d: %s"
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
 msgstr ""
-"Affix ocks� anv�nd f�r BAD/RAR/KEP/NEEDAFFIX/NEEDCOMPOUND i %s rad %d: %s"
+"Affix ocks� anv�nd f�r BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST i "
+"%s rad %d: %s"
 
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
@@ -4704,8 +4757,12 @@ msgid "Broken condition in %s line %d: %s"
 msgstr "Trasigt villkor i %s rad %d: %s"
 
 #, c-format
-msgid "Expected REP count in %s line %d"
-msgstr "F�rv�ntade REP-antal i %s rad %d"
+msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+msgstr "Affix-flaggor ignorerade n�r PFXPOSTPONE anv�nds i %s rad %d: %s"
+
+#, c-format
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "F�rv�ntade REP(SAL)-antal i %s rad %d"
 
 #, c-format
 msgid "Expected MAP count in %s line %d"
@@ -4820,8 +4877,34 @@ msgid "Ignored %d words with non-ASCII characters"
 msgstr "Ignorerade %d ord med icke-ASCII tecken"
 
 #, c-format
-msgid "Compressed %d of %d nodes; %d%% remaining"
-msgstr "Komprimerade %d av %d noder; %d%% �terst�r"
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "Komprimerade %d av %d noder; %d (%d%%) �terst�r"
+
+msgid "Reading back spell file..."
+msgstr "L�ser tillbaka stavningsfil..."
+
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
+msgid "Performing soundfolding..."
+msgstr "Utf�r ljudvikning..."
+
+#, c-format
+msgid "Number of words after soundfolding: %ld"
+msgstr "Antal ord efter ljudvikning: %ld"
+
+#, c-format
+msgid "Total number of words: %d"
+msgstr "Totalt antal ord: %d"
+
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "Skriver f�rslagsfil %s ..."
+
+#, c-format
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "Ber�knat k�rtidsminne anv�nt: %d byte"
 
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Utmatningsfilnamn f�r inte ha regionnamn"
@@ -4844,13 +4927,17 @@ msgid "Done!"
 msgstr "Klar!"
 
 #, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Ber�knat k�rtidsminne anv�nt: %d byte"
-
-#, c-format
 msgid "E765: 'spellfile' does not have %ld entries"
 msgstr "E765: 'spellfile' har inte %ld poster"
 
+#, c-format
+msgid "Word removed from %s"
+msgstr "Ord borttaget fr�n %s"
+
+#, c-format
+msgid "Word added to %s"
+msgstr "Ord lagd till %s"
+
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Ordtecken skiljer sig mellan stavningsfiler"
 
@@ -4877,10 +4964,30 @@ msgstr "E752: Ingen tidigare stavningsers�ttning"
 msgid "E753: Not found: %s"
 msgstr "E753: Hittades inte: %s"
 
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Det h�r ser inte ut som en .sug-fil: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Gammal .sug-fil, beh�ver bli uppdaterad: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug-fil �r f�r nyare version av Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug-fil matchar inte .spl-fil: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: fel vid l�sning av .sug-fil: %s"
+
 #. This should have been checked when generating the .spl
 #. * file.
-msgid "E999: duplicate char in MAP entry"
-msgstr "E999: dubblerat tecken i MAP-post"
+msgid "E783: duplicate char in MAP entry"
+msgstr "E783: dubblerat tecken i MAP-post"
 
 #, c-format
 msgid "E390: Illegal argument: %s"
@@ -5195,15 +5302,52 @@ msgstr "Vim: Fel vid l�sning av inmatning, avslutar...\n"
 msgid "No undo possible; continue anyway"
 msgstr "Ingen �ngring m�jlig; forts�tter �nd�"
 
+msgid "Already at oldest change"
+msgstr "Redan vid �ldsta �ndring"
+
+msgid "Already at newest change"
+msgstr "Redan vid nyaste �ndring"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "�ngra-nummer %ld hittades inte"
+
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: radnummer fel"
 
-msgid "1 change"
-msgstr "1 �ndring"
+msgid "more line"
+msgstr "en rad till"
+
+msgid "more lines"
+msgstr "fler rader"
+
+msgid "line less"
+msgstr "en rad mindre"
+
+msgid "fewer lines"
+msgstr "f�rre rader"
+
+msgid "change"
+msgstr "�ndring"
+
+msgid "changes"
+msgstr "�ndringar"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld �ndringar"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
+
+msgid "before"
+msgstr "f�re"
+
+msgid "after"
+msgstr "efter"
+
+msgid "Nothing to undo"
+msgstr "Inget att �ngra"
+
+msgid "number changes  time"
+msgstr "antal �ndringar  tid"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: �ngra-lista trasig"
@@ -5382,9 +5526,6 @@ msgstr "med Cocoa-GUI."
 msgid "with (classic) GUI."
 msgstr "med (klassiskt) GUI."
 
-msgid "with KDE GUI."
-msgstr "med KDE-GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Funktioner inkluderade (+) eller inte (-):\n"
 
@@ -5803,6 +5944,9 @@ msgstr "E459: Kan inte g� tillbaka till tidigare katalog"
 msgid "E42: No Errors"
 msgstr "E42: Inga fel"
 
+msgid "E776: No location list"
+msgstr "E776: Ingen positionslista"
+
 msgid "E43: Damaged match string"
 msgstr "E43: Skadad tr�ffstr�ng"
 
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index df8722a15..83eaaf133 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -7,53 +7,53 @@
 #
 # Original translations.
 #
-#, no-wrap
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\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"
+"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"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: 不能分配任何缓冲区，退出程序..."
+msgstr "E82: 无法分配任何缓冲区，退出程序..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: 不能分配缓冲区，使用另一个缓冲区...."
+msgstr "E83: 无法分配缓冲区，使用另一个缓冲区..."
 
-msgid "No buffers were unloaded"
-msgstr "没有释放任何缓冲区"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: 没有释放任何缓冲区"
 
-msgid "No buffers were deleted"
-msgstr "没有删除任何缓冲区"
+msgid "E516: No buffers were deleted"
+msgstr "E516: 没有删除任何缓冲区"
 
-msgid "No buffers were wiped out"
-msgstr "没有删除任何缓冲区"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: 没有清除任何缓冲区"
 
 msgid "1 buffer unloaded"
-msgstr "已释放一个缓冲区"
+msgstr "释放了 1 个缓冲区"
 
 #, c-format
 msgid "%d buffers unloaded"
-msgstr "已释放 %d 个缓冲区"
+msgstr "释放了 %d 个缓冲区"
 
 msgid "1 buffer deleted"
-msgstr "已删除一个缓冲区"
+msgstr "删除了 1 个缓冲区"
 
 #, c-format
 msgid "%d buffers deleted"
-msgstr "已删除 %d 个缓冲区"
+msgstr "删除了 %d 个缓冲区"
 
 msgid "1 buffer wiped out"
-msgstr "已删除一个缓冲区"
+msgstr "清除了 1 个缓冲区"
 
 #, c-format
 msgid "%d buffers wiped out"
-msgstr "已删除 %d 个缓冲区"
+msgstr "清除了 %d 个缓冲区"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: 没有修改过的缓冲区"
@@ -63,43 +63,43 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: 没有可列出的缓冲区"
 
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: 不能切换到第 %ld 个缓冲区"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: 缓冲区 %ld 不存在"
 
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: 不能切换到更后面的缓冲区"
+msgstr "E87: 无法切换，已是最后一个缓冲区"
 
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: 不能切换到更前面的缓冲区"
+msgstr "E88: 无法切换，已是第一个缓冲区"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: 已更改过缓冲区 %ld 但尚未保存 (可用 ! 强制执行)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: 缓冲区 %ld 已修改但尚未保存 (请加 ! 强制执行)"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: 不能释放最后一个缓冲区"
+msgstr "E90: 无法释放最后一个缓冲区"
 
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: 文件名过多"
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: 找不到第 %ld 个缓冲区"
+msgstr "E92: 找不到缓冲区 %ld"
 
 #, c-format
 msgid "E93: More than one match for %s"
-msgstr "E93: 找到一个以上的 %s"
+msgstr "E93: 找到不止一个 %s"
 
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: 找不到 %s"
+msgstr "E94: 没有匹配的缓冲区 %s"
 
 #, c-format
 msgid "line %ld"
-msgstr "行 %ld"
+msgstr "第 %ld 行"
 
 msgid "E95: Buffer with this name already exists"
-msgstr "E95: 已有缓冲区使用这个名字"
+msgstr "E95: 已有缓冲区使用该名称"
 
 msgid " [Modified]"
 msgstr " [已修改]"
@@ -118,24 +118,24 @@ msgstr "[只读]"
 
 #, c-format
 msgid "1 line --%d%%--"
-msgstr "行数 1 --%d%%--"
+msgstr "1 行 --%d%%--"
 
 #, c-format
 msgid "%ld lines --%d%%--"
-msgstr "行数 %ld --%d%%--"
+msgstr "%ld 行 --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
-msgstr "行 %ld/%ld --%d%%-- 列 "
+msgstr "行 %ld / %ld --%d%%-- 列 "
 
-msgid "[No file]"
+msgid "[No Name]"
 msgstr "[未命名]"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[帮助]"
+msgstr "帮助"
 
-msgid "[help]"
+msgid "[Help]"
 msgstr "[帮助]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "底端"
 msgid "Top"
 msgstr "顶端"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# 缓冲区列表:\n"
 
-msgid "[Error List]"
-msgstr "[错误列表]"
+msgid "[Location List]"
+msgstr "[Location 列表]"
 
-msgid "[No File]"
-msgstr "[未命名]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix 列表]"
 
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
-"--- 符号 ---"
+"--- Signs ---"
 
 #, c-format
 msgid "Signs for %s:"
-msgstr "%s 的符号:"
+msgstr "%s 的 Signs:"
 
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
@@ -180,91 +181,99 @@ msgstr "    行=%ld  id=%d  名称=%s"
 
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: 不能比较(diff) %ld个以上的缓冲区"
+msgstr "E96: 不能比较(diff) %ld 个以上的缓冲区"
 
 msgid "E97: Cannot create diffs"
-msgstr "E97: 不能创建 diff "
+msgstr "E97: 无法创建 diff"
 
 msgid "Patch file"
 msgstr "Patch 文件"
 
 msgid "E98: Cannot read diff output"
-msgstr "E98: 不能读取 diff 的输出"
+msgstr "E98: 无法读取 diff 的输出"
 
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: 目前的缓冲区不是在 diff 模式"
+msgstr "E99: 当前缓冲区不在 diff 模式"
 
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: 没有缓冲区在 diff 模式"
+msgstr "E100: 没有其它处于 diff 模式的缓冲区"
 
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: 有两个以上的缓冲区在 diff 模式，不能决定要用哪一个"
+msgstr "E101: 有两个以上的缓冲区处于 diff 模式，不能决定用哪一个"
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: 找不到缓冲区: \"%s\""
+msgstr "E102: 找不到缓冲区 \"%s\""
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: 缓冲区 \"%s\" 不是在 diff 模式"
+msgstr "E103: 缓冲区 \"%s\" 不在 diff 模式"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 复合字符(digraph)中不能使用 Escape"
 
-msgid "Keymap file not found"
-msgstr "找不到 keymap 文件"
+msgid "E544: Keymap file not found"
+msgstr "E544: 找不到 Keymap 文件"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: 使用 :loadkeymap "
+msgstr "E105: 不是在脚本文件中使用 :loadkeymap "
 
-msgid " Keyword completion (^N/^P)"
-msgstr " 关键字自动完成 (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " 关键字补全 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X 模式 (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^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 " Whole line completion (^L^N^P)"
+msgstr " 整行补全 (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " 文件名补全 (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag 补全 (^]^N^P)"
 
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " 区域关键字自动完成 (^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " 路径模式补全 (^N^P)"
 
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " 整行自动完成 (^L/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " 定义补全 (^D^N^P)"
 
-msgid " File name completion (^F/^N/^P)"
-msgstr " 文件名自动完成 (^F/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary 补全 (^K^N^P)"
 
-msgid " Tag completion (^]/^N/^P)"
-msgstr " 标签自动完成 (^]/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus 补全 (^T^N^P)"
 
-msgid " Path pattern completion (^N/^P)"
-msgstr " 路径自动完成 (^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " 命令行补全 (^V^N^P)"
 
-msgid " Definition completion (^D/^N/^P)"
-msgstr " 定义自动完成 (^D/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " 用户自定义补全 (^U^N^P)"
 
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " 字典自动完成 (^K/^N/^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " 全能补全 (^O^N^P)"
 
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus 自动完成 (^T/^N/^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " 拼写建议 (^S^N^P)"
 
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " 命令自动完成 (^V/^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " 关键字局部补全 (^N^P)"
 
 msgid "Hit end of paragraph"
 msgstr "已到段落结尾"
 
-msgid "'thesaurus' option is empty"
-msgstr "选项 'thesaurus' 未设定"
-
 msgid "'dictionary' option is empty"
 msgstr "选项 'dictionary' 为空"
 
+msgid "'thesaurus' option is empty"
+msgstr "选项 'thesaurus' 为空"
+
 #, c-format
 msgid "Scanning dictionary: %s"
-msgstr "扫描字典: %s"
+msgstr "正在扫描 dictionary: %s"
 
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (插入) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@ msgstr " (替换) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "扫描中: %s"
+msgstr "正在扫描: %s"
 
+#, c-format
 msgid "Scanning tags."
 msgstr "扫描标签."
 
@@ -287,45 +297,157 @@ msgstr " 增加"
 #. * longer needed.  -- Acevedo.
 #.
 msgid "-- Searching..."
-msgstr "-- 搜寻中..."
+msgstr "-- 查找中..."
 
 msgid "Back at original"
 msgstr "回到起点"
 
 msgid "Word from other line"
-msgstr "从其它行开始的词 (?)"
+msgstr "另一行的词"
 
 msgid "The only match"
-msgstr "只有此项匹配"
+msgstr "唯一匹配"
 
 #, c-format
 msgid "match %d of %d"
-msgstr "找到 %d / %d"
+msgstr "匹配 %d / %d"
 
 #, c-format
 msgid "match %d"
 msgstr "匹配 %d"
 
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let 中出现异常字符"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List 索引超出范围: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 未定义的变量: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: 缺少 ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s 的参数必须是 List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s 的参数必须是 List 或者 Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary 的键不能为空"
+
+msgid "E714: List required"
+msgstr "E714: 需要 List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: 需要 Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 函数的参数过多: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary 中不存在键: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 函数 %s 已存在，请加 ! 强制替换"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary 项已存在"
+
+msgid "E718: Funcref required"
+msgstr "E718: 需要 Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: 不能对 Dictionary 使用 [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= 的变量类型不正确"
+
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未定义的变量: \"%s\""
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知的函数: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: 无效的变量名: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: 目标比 List 项数少"
+
+msgid "E688: More targets than List items"
+msgstr "E688: 目标比 List 项数多"
+
+msgid "Double ; in list of variables"
+msgstr "变量列表中出现两个 ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: 无法列出 %s 的变量"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: 只能索引 List 或 Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] 必须在最后"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] 需要一个 List 值"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List 值的项比目标多"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List 值没有足够多的项"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for 后缺少 \"in\""
 
 #, c-format
 msgid "E107: Missing braces: %s"
-msgstr "E107: 缺少对应的括号: %s"
+msgstr "E107: 缺少括号: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: 无此变量: \"%s\""
 
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock 的变量嵌套过深"
+
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' 后缺少 ':'"
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: 只能比较 List 和 List"
+
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: 对 List 无效的操作"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: 只能比较 Dictionary 和 Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: 对 Dictionary 无效的操作"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: 只能比较 Funcref 和 Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: 对 Funcrefs 无效的操作"
+
 msgid "E110: Missing ')'"
-msgstr "E110: 缺少对应的 \")\""
+msgstr "E110: 缺少 ')'"
 
-msgid "E111: Missing ']'"
-msgstr "E111: 缺少对应的 \"]\""
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 不能索引一个 Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: 缺少选项名称: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: 不正确的选项: %s"
+msgstr "E113: 未知的选项: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: 缺少引号: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 函数 %s 的参数不正确"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List 中缺少逗号: %s"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未定义的函数: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 缺少结束符 ']': %s"
 
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 函数 %s 的参数过多"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary 中缺少冒号: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 函数 %s 的参数太少"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary 中出现重复的键: \"%s\""
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> 不能在 script 上下文外使用: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary 中缺少逗号: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary 缺少结束符 '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: 变量嵌套过深"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 参数过多"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() 只能在插入模式中使用"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "确定(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: 键已存在: %s"
 
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld 行: "
 
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知的函数: %s"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -374,91 +526,148 @@ msgstr ""
 "确定(&O)\n"
 "取消(&C)"
 
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() 的调用次数多于 inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: 不允许的范围"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() 的类型无效"
+
+msgid "E726: Stride is zero"
+msgstr "E726: 步长为零"
+
+msgid "E727: Start past end"
+msgstr "E727: 起始值在终止值后"
+
+msgid "<empty>"
+msgstr "<空>"
+
 msgid "E240: No connection to Vim server"
-msgstr "E240: 没有与 Vim Server 创建连接"
+msgstr "E240: 没有到 Vim 服务器的连接"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: 无法发送到 %s"
 
 msgid "E277: Unable to read a server reply"
-msgstr "E277: 不能读取服务器的响应"
+msgstr "E277: 无法读取服务器响应"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: 符号连接过多(循环？)"
 
 msgid "E258: Unable to send to client"
-msgstr "E258: 不能传送到客户端"
+msgstr "E258: 无法发送到客户端"
 
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: 不能传送到 %s"
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort 比较函数失败"
 
 msgid "(Invalid)"
 msgstr "(无效)"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: 写临时文件出错"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: 将 Funcref 作数字使用"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: 将 List 作数字使用"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: 将 Dictionary 作数字使用"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: 将 Funcref 作 String 使用"
+
+msgid "E730: using List as a String"
+msgstr "E730: 将 List 作 String 使用"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 将 Dictionary 作 String 使用"
+
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: 变量 %s 尚未定义"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref 变量名必须以大写字母开头: %s"
 
 #, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: 函数 %s 已经存在, 请使用 ! 强制替换"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 变量名与已有函数名冲突: %s"
 
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 函数 %s 尚未定义"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: 变量类型不匹配: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 值已锁定: %s"
+
+msgid "Unknown"
+msgstr "未知"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: 无法改变 %s 的值"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: 变量嵌套过深"
 
 #, c-format
 msgid "E124: Missing '(': %s"
-msgstr "E124: 缺少 \"(\": %s"
+msgstr "E124: 缺少 '(': %s"
 
 #, c-format
 msgid "E125: Illegal argument: %s"
-msgstr "E125: 参数不正确: %s"
+msgstr "E125: 无效的参数: %s"
 
 msgid "E126: Missing :endfunction"
 msgstr "E126: 缺少 :endfunction"
 
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 函数 %s 正在使用中，不能重新定义"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: 函数名称第一个字母必须大写: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 函数名与脚本文件名不匹配: %s"
 
 msgid "E129: Function name required"
-msgstr "E129: 需要函数名称"
-
-msgid "function "
-msgstr "函数 "
+msgstr "E129: 需要函数名"
 
 #, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 函数 %s 尚未定义"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: 函数名必须以大写字母开头或者包含冒号: %s"
 
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 函数 %s 正在使用中，不能删除"
+msgstr "E131: 无法删除函数 %s: 正在使用中"
 
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 函数递归调用层数超过 'maxfuncdepth'"
+msgstr "E132: 函数调用深度超出 'maxfuncdepth'"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "calling %s"
 msgstr "调用 %s"
 
-#. always scroll up, don't overwrite
 #, c-format
-msgid "continuing in %s"
-msgstr "继续: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return 必须在函数里使用"
+msgid "%s aborted"
+msgstr "%s 已中止"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s 返回值 #%ld "
+msgstr "%s 返回 #%ld "
 
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s 返回值 \"%s\""
+msgid "%s returning %s"
+msgstr "%s 返回 %s"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "在 %s 中继续"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return 不在函数中"
+
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -466,76 +675,90 @@ msgstr ""
 "\n"
 "# 全局变量:\n"
 
-msgid "Entering Debug mode.  Type \"cont\" to leave."
-msgstr "进入调试模式. 输入 \"cont\" 以回到正常模式."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t最近修改于 "
+
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "进入调试模式。输入 \"cont\" 继续运行。"
 
 #, c-format
 msgid "line %ld: %s"
-msgstr "行 %ld: %s"
+msgstr "第 %ld 行: %s"
 
 #, c-format
 msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "命令: %s"
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" 中断点: 第 %ld 行"
+msgstr "断点 \"%s%s\" 第 %ld 行"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: 找不到中断点: %s"
+msgstr "E161: 找不到断点: %s"
 
 msgid "No breakpoints defined"
-msgstr "没有定义中断点"
+msgstr "没有定义断点"
 
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  第 %ld 行"
 
+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\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "将改变保存到 \"%s\" 吗？"
 
 msgid "Untitled"
 msgstr "未命名"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: 已更改过缓冲区 \"%s\" 但尚未保存 (可用 ! 强制执行)"
+msgstr "E162: 缓冲区 \"%s\" 已修改但尚未保存"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "注意: 已切换到其它缓冲区 (请检查 Autocommands 有无错误)"
+msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
 
 msgid "E163: There is only one file to edit"
 msgstr "E163: 只有一个文件可编辑"
 
 msgid "E164: Cannot go before first file"
-msgstr "E164: 已经在第一个文件了"
+msgstr "E164: 无法切换，已是第一个文件"
 
 msgid "E165: Cannot go beyond last file"
-msgstr "E165: 已经在最后一个文件了"
+msgstr "E165: 无法切换，已是最后一个文件"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: 不支持编译器: %s"
 
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "查找中: \"%s\" -- \"%s\""
+msgstr "正在查找 \"%s\"，在 \"%s\" 中"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "查找中: \"%s\""
+msgstr "正在查找 \"%s\""
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "在 'runtimepath' 里找不到 \"%s\""
+msgstr "在 'runtimepath' 中找不到 \"%s\""
 
-msgid "Run Macro"
-msgstr "执行宏"
+msgid "Source Vim script"
+msgstr "执行 Vim 脚本"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "不能执行目录： \"%s\""
+msgstr "不能执行目录: \"%s\""
 
 #, c-format
 msgid "could not source \"%s\""
@@ -547,69 +770,43 @@ msgstr "第 %ld 行: 不能执行 \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "执行 \"%s\" 中"
+msgstr "执行 \"%s\""
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "第 %ld 行: 结束执行 %s"
+msgstr "第 %ld 行: 执行 \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
 msgstr "结束执行 %s"
 
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: 注意: 错误的行分隔字符，可能是少了 ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: 在执行 script 文件外不可使用 :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: 在执行 script 文件外不可使用 :finish"
-
-msgid "No text to be printed"
-msgstr "没有要打印的文字"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "打印中: 第 %d 页 (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "复制 %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "已打印: %s"
-
-msgid "Printing aborted"
-msgstr "打印中断"
+msgid "modeline"
+msgstr "modeline"
 
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: 写入 PostScript 文件出错"
+msgid "--cmd argument"
+msgstr "--cmd 参数"
 
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: 不能打开 PostScript 输出文件"
+msgid "-c argument"
+msgstr "-c 参数"
 
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: 不能打开文件 \"%s\""
+msgid "environment variable"
+msgstr "环境变量"
 
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: 不能读 PostScript 资源文件 \"%s\""
+#~ msgid "error handler"
+#~ msgstr ""
 
-msgid "Sending to printer..."
-msgstr "发送到打印机..."
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: 警告: 错误的行分隔符，可能是少了 ^M"
 
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: 打印 PostScript 文件失败"
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: 在脚本文件外使用了 :scriptencoding"
 
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: 在脚本文件外使用了 :finish"
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "目前的 %s语言: \"%s\""
+msgstr "当前的 %s语言: \"%s\""
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@ msgstr "E197: 不能设定语言为 \"%s\""
 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: 不能把行移到它自已内"
+msgstr "E134: 把行移动到自已中"
 
 msgid "1 line moved"
-msgstr "已移动 1 行"
+msgstr "移动了 1 行"
 
 #, c-format
 msgid "%ld lines moved"
-msgstr "已搬移 %ld 行"
+msgstr "移动了 %ld 行"
 
 #, c-format
 msgid "%ld lines filtered"
-msgstr "已处理 %ld 行"
+msgstr "过滤了 %ld 行"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand 不可以更改缓冲区的内容"
+msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
 
 msgid "[No write since last change]\n"
-msgstr "[更新后尚未保存]\n"
+msgstr "[已修改但尚未保存]\n"
 
 #, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s 在行中: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s 位于行: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: 过多错误, 忽略文件其余部分"
+msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@ msgstr " 失败"
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo 文件不能写入: %s"
+msgstr "E137: Viminfo 文件不可写入: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: 不能写入 viminfo 文件 %s !"
+msgstr "E138: 无法写入 viminfo 文件 %s！"
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "写入 viminfo 文件 \"%s\" 中"
+msgstr "写入 viminfo 文件 \"%s\""
 
 #. Write the info:
-#, c-format
+#, 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"
+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"
 "\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 "无效的启动字符"
 
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: 您在另一个缓冲区也加载了这个文件"
-
 msgid "Write partial file?"
 msgstr "要写入部分文件吗？"
 
@@ -701,30 +907,38 @@ msgid "E140: Use ! to write partial buffer"
 msgstr "E140: 请使用 ! 来写入部分缓冲区"
 
 #, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "要覆盖已存在的文件 \"%.*s\"？"
+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' 选项关闭"
+msgstr "E142: 文件未写入: 写入被 'write' 选项禁用"
 
 #, c-format
 msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"\"%.*s\" 已设定 'readonly' 选项.\n"
-"确定要覆盖吗？"
+"\"%s\" 已设定 'readonly' 选项。\n"
+"确实要覆盖吗？"
 
 msgid "Edit File"
 msgstr "编辑文件"
 
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands 意外地删除新缓冲区 %s"
+msgstr "E143: 自动命令意外地删除了新缓冲区 %s"
 
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z 不接受非数字的参数"
@@ -733,232 +947,283 @@ msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim 中禁止使用 shell 命令"
 
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: 正则表达式不能用字母分隔 (?)"
+msgstr "E146: 正则表达式不能用字母作分界"
 
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "替换为 %s (y/n/a/q/^E/^Y)?"
+msgstr "替换为 %s (y/n/a/q/l/^E/^Y)？"
 
 msgid "(Interrupted) "
 msgstr "(已中断) "
 
+msgid "1 match"
+msgstr "1 个匹配，"
+
 msgid "1 substitution"
-msgstr "替换一组"
+msgstr "1 次替换，"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld 个匹配，"
 
 #, c-format
 msgid "%ld substitutions"
-msgstr "替换 %ld 组"
+msgstr "%ld 次替换，"
 
 msgid " on 1 line"
-msgstr " 一行中"
+msgstr "共 1 行"
 
 #, c-format
 msgid " on %ld lines"
-msgstr " %ld 行中"
+msgstr "共 %ld 行"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global 不能递归执行"
 
 msgid "E148: Regular expression missing from global"
-msgstr "E148: 没有使用过正则表达式 (?)"
+msgstr "E148: global 缺少正则表达式"
 
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "每一行都找不到模式: %s"
+msgstr "每行都匹配表达式: %s"
 
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# Last Substitute String:\n"
 "$"
 msgstr ""
 "\n"
-"# 前一组替代字符串:\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 的说明"
+msgstr "E149: 抱歉，没有 %s 的说明"
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "抱歉, 找不到帮助文件 \"%s\""
+msgstr "抱歉，找不到帮助文件 \"%s\""
 
 #, c-format
 msgid "E150: Not a directory: %s"
-msgstr "E150: %s 不是目录"
+msgstr "E150: 不是目录: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
-msgstr "E152: 不能以写入模式打开 \"%s\""
+msgstr "E152: 无法打开并写入 %s"
 
 #, c-format
 msgid "E153: Unable to open %s for reading"
-msgstr "E153: 不能读取文件: %s"
+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"
-msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+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 command: %s"
+msgstr "E160: 未知的 sign 命令: %s"
 
 msgid "E156: Missing sign name"
 msgstr "E156: 缺少 sign 名称"
 
-msgid "E255: Too many signs defined"
-msgstr "E326: 找到太多 signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs 定义过多"
 
 #, c-format
 msgid "E239: Invalid sign text: %s"
-msgstr "E239: 不正确的 sign 文字: %s"
+msgstr "E239: 无效的 sign 文字: %s"
 
 #, c-format
 msgid "E155: Unknown sign: %s"
-msgstr "E155: 不正确的 sign: %s"
+msgstr "E155: 未知的 sign: %s"
 
 msgid "E159: Missing sign number"
-msgstr "E159: 缺少 sign number"
+msgstr "E159: 缺少 sign 号"
 
 #, c-format
 msgid "E158: Invalid buffer name: %s"
-msgstr "E158: 缓冲区名称错误: %s"
+msgstr "E158: 无效的缓冲区名: %s"
 
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 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 模式. 输入 \"visua\" 以回到正常模式."
+msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
 
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "已到文件结尾"
+msgid "E501: At end-of-file"
+msgstr "E501: 已到文件末尾"
 
 msgid "E169: Command too recursive"
 msgstr "E169: 命令递归层数过多"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: 缺少 :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: 缺少 :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: 异常没有被捕获: %s"
 
 msgid "End of sourced file"
-msgstr "命令文件结束"
+msgstr "脚本文件结束"
 
 msgid "End of function"
-msgstr "函数结尾"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "用户定义的命令会混淆"
+msgstr "函数结束"
 
-msgid "Not an editor command"
-msgstr "不是编辑器的命令"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: 不确定的用户自定义命令"
 
-msgid "Don't panic!"
-msgstr "不要惊慌!"
+msgid "E492: Not an editor command"
+msgstr "E492: 不是编辑器的命令"
 
-msgid "Backwards range given"
-msgstr "指定了向前参考的范围"
+msgid "E493: Backwards range given"
+msgstr "E493: 使用了逆向的范围"
 
 msgid "Backwards range given, OK to swap"
-msgstr "指定了向前参考的范围，OK to swap"
+msgstr "使用了逆向的范围，确定交换吗"
 
-msgid "Use w or w>>"
-msgstr "请使用 w 或 w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: 请使用 w 或 w>>"
 
 msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: 抱歉, 本命令在此版本中未实现"
+msgstr "E319: 抱歉，命令在此版本中不可用"
 
 msgid "E172: Only one file name allowed"
-msgstr "E172: 只能有一个文件名"
+msgstr "E172: 只允许一个文件名"
+
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "还有 1 个文件未编辑。确实要退出吗？"
 
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
-msgstr "还有 %d 个文件未编辑. 确定要退出？"
+msgstr "还有 %d 个文件未编辑。确实要退出吗？"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: 还有 1 个文件未编辑"
 
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: 还有 %ld 个文件未编辑"
 
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: 命令已经存在, 请使用 ! 强制重新定义"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: 命令已存在: 请加 ! 强制替换"
 
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
 msgstr ""
 "\n"
-"    名称        参数 范围  完整      定义      "
+"    名称        参数 范围  补全      定义      "
 
 msgid "No user-defined commands found"
-msgstr "找不到用户自定义的命令"
+msgstr "找不到用户自定义命令"
 
 msgid "E175: No attribute specified"
-msgstr "E175: 没有指定的属性"
+msgstr "E175: 没有指定属性"
 
 msgid "E176: Invalid number of arguments"
-msgstr "E176: 不正确的参数个数"
+msgstr "E176: 无效的参数个数"
 
 msgid "E177: Count cannot be specified twice"
-msgstr "E177: 不能指定两次"
+msgstr "E177: 不能指定两次计数"
 
 msgid "E178: Invalid default value for count"
-msgstr "E178: 计数的缺省值不正确"
-
-msgid "E179: argument required for complete"
-msgstr "E179: 指令需要参数才能完成"
+msgstr "E178: 无效的计数默认值"
 
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: 不完整的值: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete 需要参数"
 
 #, c-format
 msgid "E181: Invalid attribute: %s"
-msgstr "E181: 不正确的属性: %s"
+msgstr "E181: 无效的属性: %s"
 
 msgid "E182: Invalid command name"
-msgstr "E182: 命令名称不正确"
+msgstr "E182: 无效的命令名"
 
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: 用户自定义命令必须以大写字母开始"
+msgstr "E183: 用户自定义命令必须以大写字母开头"
 
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: 没有用户自定义的命令： %s"
+msgstr "E184: 没有这个用户自定义命令: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: 无效的补全类型: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: 只有 custom 补全才允许参数"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom 补全需要一个函数参数"
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: 找不到颜色样式 %s"
+msgstr "E185: 找不到颜色主题 %s"
 
 msgid "Greetings, Vim user!"
-msgstr "你好, Vim 用户！"
+msgstr "您好，Vim 用户！"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: 不能关闭最后一个 tab 页"
+
+msgid "Already only one tab page"
+msgstr "已经只剩一个 tab 页了"
 
 msgid "Edit File in new window"
 msgstr "在新窗口编辑文件"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab 页 %d"
+
 msgid "No swap file"
 msgstr "无交换文件"
 
 msgid "Append File"
-msgstr "附加文件"
+msgstr "追加文件"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: 不能改变目录，缓冲区已修改 (请加 ! 强制执行)"
 
 msgid "E186: No previous directory"
 msgstr "E186: 前一个目录不存在"
 
 msgid "E187: Unknown"
-msgstr "E187: 不能识别的标记"
+msgstr "E187: 未知"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize 需要两个数字参数"
 
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "窗口位置: X %d, Y %d"
 
 msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: 在您的平台上不能获得窗口位置"
+msgstr "E188: 在此平台上不能获得窗口位置"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos 需要两个数字参数"
 
 msgid "Save Redirection"
 msgstr "保存重定向"
@@ -973,85 +1238,170 @@ msgid "Save Setup"
 msgstr "保存设定"
 
 #, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" 已存在 (请用 ! 强制执行)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: 无法创建目录: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" 已存在 (请加 ! 强制执行)"
 
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: 不能以写入模式打开 \"%s\""
+msgstr "E190: 无法打开并写入 \"%s\""
 
 #. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: 参数必须是英文字母或向前/后的引号"
+msgstr "E191: 参数必须是一个字母或者正/反引号"
 
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal 递归层数过深"
 
-msgid ":if nesting too deep"
-msgstr ":if 层数过深"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr "E194: 没有用于替换 '#' 的交替文件名"
 
-msgid ":endif without :if"
-msgstr ":endif 缺少对应的 :if"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: 没有用于替换 \"<afile>\" 的自动命令文件名"
 
-msgid ":else without :if"
-msgstr ":else 缺少对应的 :if"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: 没有用于替换 \"<abuf>\" 的自动命令缓冲区号"
 
-msgid ":elseif without :if"
-msgstr ":elseif 缺少对应的 :if"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: 没有用于替换 \"<amatch>\" 的自动命令匹配名"
 
-msgid ":while nesting too deep"
-msgstr ":while 层数过深"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: 没有用于替换 \"<sfile>\" 的 :source 文件名"
 
-msgid ":continue without :while"
-msgstr ":continue 缺少对应的 :while"
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' 或 '#' 为空文件名，只能用于 \":p:h\""
 
-msgid ":break without :while"
-msgstr ":break 缺少对应的 :while"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: 结果为空字符串"
 
-msgid ":endwhile without :while"
-msgstr ":endwhile 缺少对应的 :while"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: 无法打开并读取 viminfo 文件"
 
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction 必须在函数内部使用"
+msgid "E196: No digraphs in this version"
+msgstr "E196: 此版本无复合字符(digraph)"
 
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: 没有 '#' 可替代的文件名"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: 不能 :throw 前缀为 'Vim' 的异常"
 
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "没有 Autocommand 文件名以替换 \"<afile>\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "抛出异常: %s"
 
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "没有 Autocommand 缓冲区名称以替换 \"<abuf>\""
+#, c-format
+msgid "Exception finished: %s"
+msgstr "完成异常: %s"
 
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "没有 Autocommand Match name 以替换 \"<amatch>\""
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "丢弃异常: %s"
 
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "没有 :source 文件名以替换 \"<sfile>\""
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s，第 %ld 行"
 
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' 或 '#' 指向空文件名，只能用於 \":p:h\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "捕获异常: %s"
 
-msgid "Evaluates to an empty string"
-msgstr "输入为空字符串"
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: 不能读取 viminfo"
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " 已返回\n"
 
-msgid "E196: No digraphs in this version"
-msgstr "E196: 本版本无复合字符(digraph)"
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "异常"
+
+msgid "Error and interrupt"
+msgstr "错误和中断"
+
+msgid "Error"
+msgstr "错误"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "中断"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if 嵌套层数过深"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif 缺少对应的 :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else 缺少对应的 :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif 缺少对应的 :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: 多个 :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif 在 :else 后面"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for 嵌套层数过深"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue 缺少对应的 :while 或 :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break 缺少对应的 :while 或 :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while 以 :endfor 结尾"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for 以 :endwhile 结尾"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try 嵌套层数过深"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch 缺少对应的 :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch 在 :finally 后面"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally 缺少对应的 :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: 多个 :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry 缺少对应的 :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction 不在函数内"
 
 msgid "tagname"
-msgstr "标签名称"
+msgstr "tag 名"
 
 msgid " kind file\n"
-msgstr "类文件\n"
+msgstr " 类型 文件\n"
 
 msgid "'history' option is zero"
-msgstr "选项 'history' 是零"
+msgstr "选项 'history' 为零"
 
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@ msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar 超过命令长度"
 
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: 已删除活动窗口或缓存"
+msgstr "E199: 活动窗口或缓冲区已被删除"
 
 msgid "Illegal file name"
-msgstr "不正确的文件名"
+msgstr "无效的文件名"
 
 msgid "is a directory"
 msgstr "是目录"
@@ -1087,26 +1437,32 @@ msgid "is not a file"
 msgstr "不是文件"
 
 msgid "[New File]"
-msgstr "[未命名]"
+msgstr "[新文件]"
+
+msgid "[New DIRECTORY]"
+msgstr "[新目录]"
+
+msgid "[File too big]"
+msgstr "[文件过大]"
 
 msgid "[Permission Denied]"
 msgstr "[权限不足]"
 
 msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand 使程序不能读取此文件"
+msgstr "E200: *ReadPre 自动命令导致文件不可读"
 
 msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand 不可以更改缓冲区的内容"
+msgstr "E201: *ReadPre 自动命令不允许改变当前缓冲区"
 
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: 从标准输入读取...\n"
 
 msgid "Reading from stdin..."
-msgstr "从标准输入读..."
+msgstr "从标准输入读取..."
 
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
-msgstr "E202: 转换错误"
+msgstr "E202: 转换导致文件不可读"
 
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@ msgid "[RO]"
 msgstr "[只读]"
 
 msgid "[CR missing]"
-msgstr "[缺少CR]'"
+msgstr "[缺少 CR]'"
 
 msgid "[NL found]"
-msgstr "[找到NL]"
+msgstr "[找到 NL]"
 
 msgid "[long lines split]"
-msgstr "[分割过长行]"
+msgstr "[长行分割]"
 
 msgid "[NOT converted]"
 msgstr "[未转换]"
@@ -1138,74 +1494,92 @@ msgstr "[已转换]"
 msgid "[crypted]"
 msgstr "[已加密]"
 
-msgid "[CONVERSION ERROR]"
-msgstr "转换错误"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[第 %ld 行转换错误]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[第 %ld 行无效字符]"
 
 msgid "[READ ERRORS]"
 msgstr "[读错误]"
 
 msgid "Can't find temp file for conversion"
-msgstr "找不到转换用的临时文件"
+msgstr "找不到用于转换的临时文件"
 
 msgid "Conversion with 'charconvert' failed"
-msgstr "字符集转换错误"
+msgstr "'charconvert' 转换失败"
 
 msgid "can't read output of 'charconvert'"
-msgstr "不能读取 'charconvert' 的输出"
+msgstr "无法读取 'charconvert' 的输出"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: 找不到 acwrite 缓冲区对应的自动命令"
 
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand 删除或释放了要写入的缓冲区"
+msgstr "E203: 自动命令删除或释放了要写入的缓冲区"
 
 msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand 意外地改变了行号"
+msgstr "E204: 自动命令意外地改变了行数"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans 不允许未修改的缓冲区写入"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans 不允许缓冲区部分写入"
 
 msgid "is not a file or writable device"
 msgstr "不是文件或可写的设备"
 
-msgid "is read-only (use ! to override)"
-msgstr "是只读文件 (请使用 ! 强制执行)"
+msgid "is read-only (add ! to override)"
+msgstr "只读 (请加 ! 强制执行)"
 
-msgid "Can't write to backup file (use ! to override)"
-msgstr "不能写备份文件 (请使用 ! 强制执行)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: 无法写入备份文件 (请加 ! 强制执行)"
 
-msgid "Close error for backup file (use ! to override)"
-msgstr "关闭备份文件出错 (请使用 ! 强制执行)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: 关闭备份文件出错 (请加 ! 强制执行)"
 
-msgid "Can't read file for backup (use ! to override)"
-msgstr "不能读取文件以供备份 (请使用 ! 强制执行)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: 无法读取文件以供备份 (请加 ! 强制执行)"
 
-msgid "Cannot create backup file (use ! to override)"
-msgstr "不能创建备份文件 (请使用 ! 强制执行)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: 无法创建备份文件 (请加 ! 强制执行)"
 
-msgid "Can't make backup file (use ! to override)"
-msgstr "不能作备份文件 (请使用 ! 强制执行)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
 
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork 会消失 (请使用 ! 强制执行)"
+#, fuzzy
+#~ 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: 找不到写入用的交换文件"
+msgstr "E214: 找不到用于写入的临时文件"
 
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: 不能转换 (请使用 ! 强制不转换写入)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: 无法转换 (请加 ! 强制不转换写入)"
 
 msgid "E166: Can't open linked file for writing"
-msgstr "E166: 不能以写入模式打开链接文件"
+msgstr "E166: 无法打开并写入链接文件"
 
 msgid "E212: Can't open file for writing"
-msgstr "E212: 不能以写入模式打开"
+msgstr "E212: 无法打开并写入文件"
+
+msgid "E667: Fsync failed"
+msgstr "E667: 同步失败"
 
-msgid "Close failed"
-msgstr "关闭失败"
+msgid "E512: Close failed"
+msgstr "E512: 关闭失败"
 
-msgid "write error, conversion failed"
-msgstr "不能写入 -- 转换失败"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: 写入错误，转换失败 (请将 'fenc' 置空以强制执行)"
 
-msgid "write error (file system full?)"
-msgstr "写入错误 (文件系统已满？)"
+msgid "E514: write error (file system full?)"
+msgstr "E514: 写入错误 (文件系统已满？)"
 
 msgid " CONVERSION ERROR"
-msgstr "转换错误"
+msgstr " 转换错误"
 
 msgid "[Device]"
 msgstr "[设备]"
@@ -1214,35 +1588,35 @@ msgid "[New]"
 msgstr "[新]"
 
 msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
 
 msgid " appended"
-msgstr " 已附加"
+msgstr " 已追加"
 
 msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
 
 msgid " written"
 msgstr " 已写入"
 
 msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch 模式: 不能储存原始文件"
+msgstr "E205: Patchmode: 无法保存原始文件"
 
 msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch 模式: 不能改变空的原始文件"
+msgstr "E206: Patchmode: 无法生成空的原始文件"
 
 msgid "E207: Can't delete backup file"
-msgstr "E207: 不能删除备份文件"
+msgstr "E207: 无法删除备份文件"
 
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"警告: 原始文件丢失或损坏\n"
+"警告: 原始文件可能已丢失或损坏\n"
 
 msgid "don't quit the editor until the file is successfully written!"
-msgstr "在文件正确写入前请勿退出编辑器!"
+msgstr "在文件正确写入前请勿退出编辑器！"
 
 msgid "[dos]"
 msgstr "[dos]"
@@ -1263,18 +1637,18 @@ msgid "[unix format]"
 msgstr "[unix 格式]"
 
 msgid "1 line, "
-msgstr "1 行, "
+msgstr "1 行，"
 
 #, c-format
 msgid "%ld lines, "
-msgstr "%ld 行, "
+msgstr "%ld 行，"
 
 msgid "1 character"
-msgstr "一个字符"
+msgstr "1 个字符"
 
 #, c-format
 msgid "%ld characters"
-msgstr "%ld个字符"
+msgstr "%ld 个字符"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1286,47 +1660,56 @@ msgstr "[最后一行不完整]"
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "警告: 本文件自上次读入后已变动!!!"
+msgstr "警告: 此文件自读入后已发生变动！！！"
 
 msgid "Do you really want to write to it"
-msgstr "确定要写入吗"
+msgstr "确实要写入吗"
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: 写入文件 \"%s\" 错误"
+msgstr "E208: 写入文件 \"%s\" 出错"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: 关闭文件 \"%s\" 错误"
+msgstr "E209: 关闭文件 \"%s\" 出错"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: 读取文件 \"%s\" 错误"
+msgstr "E210: 读取文件 \"%s\" 出错"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand 删除缓冲区"
+msgstr "E246: FileChangedShell 自动命令删除了缓冲区"
 
 #, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: 警告: 文件 \"%s\" 已经不存在"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: 文件 \"%s\" 已经不存在"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: 警告: 文件 \"%s\" 自上次读入后已变动, 而且编辑中的缓冲区也更动了"
+msgstr "W12: 警告: 文件 \"%s\" 已变动，并且在 Vim 中的缓冲区也已变动"
+
+msgid "See \":help W12\" for more info."
+msgstr "进一步说明请见 \":help W12\""
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: 警告: 文件 \"%s\" 自上次读入后已改变"
+msgstr "W11: 警告: 编辑开始后，文件 \"%s\" 已变动"
+
+msgid "See \":help W11\" for more info."
+msgstr "进一步说明请见 \":help W11\""
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: 警告: 文件 \"%s\" 自上次读入后已改变"
+msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的模式已变动"
+
+msgid "See \":help W16\" for more info."
+msgstr "进一步说明请见 \":help W16\""
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: 警告: 文件 \"%s\" 在开始编辑后又被创建了"
+msgstr "W13: 警告: 编辑开始后，文件 \"%s\" 已被创建"
 
 msgid "Warning"
 msgstr "警告"
@@ -1339,124 +1722,139 @@ msgstr ""
 "加载文件(&L)"
 
 #, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: 无法为重新加载 \"%s\" 做准备"
+
+#, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: 不能重新加载 \"%s\""
+msgstr "E321: 无法重新加载 \"%s\""
 
 msgid "--Deleted--"
 msgstr "--已删除--"
 
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: 组不存在: \"%s\""
+msgstr "E367: 无此组: \"%s\""
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
-msgstr "E215: * 后面有不正确的字符: %s"
+msgstr "E215: * 后面有无效字符: %s"
 
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: 无此事件: %s"
 
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: 无此组或事件: %s"
+
 #. Highlight title
 msgid ""
 "\n"
 "--- Auto-Commands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- 自动命令 ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: 无效的缓冲区号 "
 
 msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: 不能对所有事件执行 autocommand"
+msgstr "E217: 不能对所有事件执行自动命令"
 
 msgid "No matching autocommands"
-msgstr "找不到对应的 autocommand"
+msgstr "没有匹配的自动命令"
 
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand 层数过深"
+msgstr "E218: 自动命令嵌套层数过深"
 
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s 自动命令 \"%s\""
 
 #, c-format
 msgid "Executing %s"
 msgstr "执行 %s"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "自动命令 %s"
 
 msgid "E219: Missing {."
-msgstr "E219: 缺少 {."
+msgstr "E219: 缺少 {。"
 
 msgid "E220: Missing }."
-msgstr "E220: 缺少 }."
+msgstr "E220: 缺少 }。"
 
-msgid "No fold found"
-msgstr "找不到任何 fold"
+msgid "E490: No fold found"
+msgstr "E490: 找不到折叠"
 
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: 不能在目前的 'foldmethod' 下创建 fold"
+msgstr "E350: 不能在当前的 'foldmethod' 下创建折叠"
 
 msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: 不能在目前的 'foldmethod' 下删除 fold"
+msgstr "E351: 不能在当前的 'foldmethod' 下删除折叠"
 
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: 选项 'commentstring' 未设定"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--已折叠 %3ld 行"
 
 msgid "E222: Add to read buffer"
-msgstr "E222: 加入读缓冲中"
+msgstr "E222: 添加到已读缓冲区中"
 
 msgid "E223: recursive mapping"
-msgstr "E223: 递归 mapping"
+msgstr "E223: 递归映射"
 
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s 已经有全局 abbreviation 了"
+msgstr "E224: 全局缩写 %s 已存在"
 
 #, c-format
 msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s 已经有全局 mapping 了"
+msgstr "E225: 全局映射 %s 已存在"
 
 #, c-format
 msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s 已经有 abbreviation 了"
+msgstr "E226: 缩写 %s 已存在"
 
 #, c-format
 msgid "E227: mapping already exists for %s"
-msgstr "E227: %s 的 mapping 已经存在"
+msgstr "E227: 映射 %s 已存在"
 
 msgid "No abbreviation found"
 msgstr "找不到缩写"
 
 msgid "No mapping found"
-msgstr "没有这个对应"
+msgstr "找不到映射"
 
 msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: 不正确的模式"
+msgstr "E228: makemap: 无效的模式"
 
 msgid "<cannot open> "
-msgstr "<不能打开>"
+msgstr "<无法打开>"
 
 #, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: 不能使用 %s 字体"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 无法获取字体 %s"
 
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: 不能回到目前目录"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: 无法返回当前目录"
 
 msgid "Pathname:"
 msgstr "路径:"
 
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: 不能取得目前目录"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: 无法获取当前目录"
 
 msgid "OK"
 msgstr "确定"
 
-#. 'Cancel' button
 msgid "Cancel"
 msgstr "取消"
 
@@ -1464,45 +1862,68 @@ msgid "Vim dialog"
 msgstr "Vim 对话框"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "滚动条: 不能设定 thumb pixmap 的位置"
+msgstr "滚动条部件: 无法获取滑块图像的几何大小"
 
 msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: 不能对信息与 callback 创建 BallonEval"
+msgstr "E232: 不能同时使用消息和回调函数来创建 BalloonEval"
 
 msgid "E229: Cannot start the GUI"
-msgstr "E229: 不能启动图型界面"
+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'"
+msgstr "E231: 无效的 'guifontwide'"
 
-msgid "Error"
-msgstr "错误"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
 
-msgid "&Ok"
-msgstr "确定(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: 无法分配颜色 %s"
+
+msgid "No match at cursor, finding next"
+msgstr "在光标处没有匹配，查找下一个"
 
 msgid "Vim dialog..."
 msgstr "Vim 对话框..."
 
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"是(&Y)\n"
+"否(&N)\n"
+"取消(&C)"
+
+msgid "Input _Methods"
+msgstr "输入法(_M)"
+
 msgid "VIM - Search and Replace..."
-msgstr "VIM - 查找与替换..."
+msgstr "VIM - 查找和替换..."
 
 msgid "VIM - Search..."
 msgstr "VIM - 查找..."
 
 msgid "Find what:"
-msgstr "查找:"
+msgstr "查找内容:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 
-#. exact match only button
-msgid "Match exact word only"
-msgstr "只匹配完全相同的字"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "匹配完整的词"
+
+#. match case button
+msgid "Match case"
+msgstr "匹配大小写"
 
 msgid "Direction"
 msgstr "方向"
@@ -1514,108 +1935,130 @@ msgstr "向上"
 msgid "Down"
 msgstr "向下"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "找下一个"
+msgstr "查找下一个"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "替换"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "替换全部"
+msgstr "全部替换"
 
-msgid "E233: cannot open display"
-msgstr "E233: <不能打开 X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: 从会话管理器收到 \"die\" 请求\n"
 
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: 不正确的字符集 (Fontset): %s"
+msgid "Close"
+msgstr "关闭"
 
-msgid "Font Selection"
-msgstr "字体选择"
+msgid "New tab"
+msgstr "新建标签"
 
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "不正确的字体名称: %s"
+msgid "Open Tab..."
+msgstr "打开标签..."
 
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" 不是固定宽度字体"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: 主窗口被意外地摧毁\n"
 
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s 为不能识别的颜色名称"
+msgid "Font Selection"
+msgstr "选择字体"
 
 msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "使用 CUT_BUFFER0 来替换空选择"
+msgstr "使用 CUT_BUFFER0 来取代空选择"
 
-msgid "Filter"
-msgstr "过滤器"
+msgid "&Filter"
+msgstr "过滤(&F)"
+
+msgid "&Cancel"
+msgstr "取消(&C)"
 
 msgid "Directories"
 msgstr "目录"
 
-msgid "Help"
-msgstr "帮助"
+msgid "Filter"
+msgstr "过滤器"
+
+msgid "&Help"
+msgstr "帮助(&H)"
 
 msgid "Files"
 msgstr "文件"
 
+msgid "&OK"
+msgstr "确定(&O)"
+
 msgid "Selection"
 msgstr "选择"
 
-msgid "Undo"
-msgstr "撤消"
+msgid "Find &Next"
+msgstr "查找下一个(&N)"
 
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: 不能打开 Zap 字体 '%s'"
+msgid "&Replace"
+msgstr "替换(&R)"
+
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+msgid "&Undo"
+msgstr "撤销(&U)"
 
 #, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: 不能使用字体 %s"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: 无法加载 Zap 字体 '%s'"
 
 #, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: 找不到颜色: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: 无法使用字体 %s"
 
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
 msgstr ""
 "\n"
-"正在发送中断子程序的信息.\n"
+"正在发送消息终止子进程。\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: 找不到窗口标题 \"%s\""
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 不支持参数 \"-%s\"。请用 OLE 版本。"
+msgstr "E243: 不支持的参数: \"-%s\"；请使用 OLE 版本。"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: 无法在 MDI 应用程序中打开窗口"
 
 msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "查找字符串 (使用 '\\\\' 来表示 '\\')"
+msgstr "查找字符串 (使用 '\\\\' 来查找 '\\')"
 
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "查找及替换字符串 (使用 '\\\\' 来表示 '\\')"
+msgstr "查找和替换字符串 (使用 '\\\\' 来查找 '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "未使用"
+
+msgid "Directory\t*.nothing\n"
+msgstr "目录\t*.nothing\n"
 
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: 不能配置 color map 对象，有些颜色看起来会怪怪的"
+msgstr "Vim E458: 无法分配颜色表项，某些颜色可能不正确"
 
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s 没有设定正确的字体以供显示这些字符集:"
+msgstr "E250: Fontset %s 缺少下列字符集的字体:"
 
 #, c-format
 msgid "E252: Fontset name: %s"
-msgstr "E252: 字体集(Fontset)名称: %s"
+msgstr "E252: Fontset 名称: %s"
 
 #, c-format
 msgid "Font '%s' is not fixed-width"
-msgstr "'%s' 不是固定宽度字体"
+msgstr "'%s' 不是固定宽度的字体"
 
 #, c-format
 msgid "E253: Fontset name: %s\n"
-msgstr "E253: 字体集(Fontset)名称: %s\n"
+msgstr "E253: Fontset 名称: %s\n"
 
 #, c-format
 msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@ msgid "Font1: %s\n"
 msgstr "字体1: %s\n"
 
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "字体%d宽度不是字体0的两倍\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "字体%ld的宽度不是字体0的两倍\n"
 
 #, c-format
 msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"字体1宽度: %ld\n"
+"字体1的宽度: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 不能配置颜色 %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "不正确的字体集(Fontset)"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: 不能读取 sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "字体选择"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "记录中"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "字体1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata 错误"
 
+msgid "E550: Missing colon"
+msgstr "E550: 缺少冒号"
+
+msgid "E551: Illegal component"
+msgstr "E551: 无效的部分"
+
+msgid "E552: digit expected"
+msgstr "E552: 应该要有数字"
+
+#, c-format
+msgid "Page %d"
+msgstr "第 %d 页"
+
+msgid "No text to be printed"
+msgstr "没有要打印的文字"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "正在打印第 %d 页 (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "复制 %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "已打印: %s"
+
+msgid "Printing aborted"
+msgstr "打印中止"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: 写入 PostScript 输出文件出错"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: 无法打开文件 \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: 无法读取 PostScript 资源文件 \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: 文件 \"%s\" 不是 PostScript 资源文件"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: 文件 \"%s\" 不是已支持的 PostScript 资源文件"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" 资源文件版本不正确"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: 不兼容的多字节编码和字符集。"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset 在多字节编码下不能为空。"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: 没有指定多字节打印的默认字体。"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: 无法打开 PostScript 输出文件"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: 无法打开文件 \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"cidfont.ps\""
+
 #, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: 找不到 PostScript 资源文件 \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: 无法转换至打印编码 \"%s\""
+
+msgid "Sending to printer..."
+msgstr "发送到打印机……"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: 无法打印 PostScript 文件"
+
+msgid "Print job sent."
+msgstr "打印任务已被发送。"
 
 msgid "Add a new database"
-msgstr "新增数据库"
+msgstr "添加一个新的数据库"
 
 msgid "Query for a pattern"
-msgstr "查询模式"
+msgstr "查询一个模式"
 
 msgid "Show this message"
 msgstr "显示此信息"
 
 msgid "Kill a connection"
-msgstr "结束连接"
+msgstr "结束一个连接"
 
 msgid "Reinit all connections"
-msgstr "重设所有连接"
+msgstr "重置所有连接"
 
 msgid "Show connections"
 msgstr "显示连接"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: 用法: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "这个 cscope 命令不支持分割屏幕\n"
+msgstr "这个 cscope 命令不支持分割窗口。\n"
 
-msgid "Usage: cstag <ident>"
-msgstr "用法: cstag <识别字>"
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: 用法: cstag <ident>"
 
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: 找不到 tag"
 
 #, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) 错误: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) 错误: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat 错误"
 
 #, c-format
-msgid "Added cscope database %s"
-msgstr "新增 cscope 数据库 %s"
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s 不是目录或有效的 cscope 数据库"
 
 #, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s 不是目录或 cscope 数据库"
+msgid "Added cscope database %s"
+msgstr "添加了 cscope 数据库 %s"
 
 #, c-format
-msgid "error reading cscope connection %d"
-msgstr "读取 cscope 连接 %d 时错误"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 读取 cscope 连接 %ld 出错"
 
-msgid "unknown cscope search type"
-msgstr "未知的 cscope 查找形态"
+msgid "E561: unknown cscope search type"
+msgstr "E561: 未知的 cscope 查找类型"
 
-msgid "Could not create cscope pipes"
-msgstr "不能创建与 cscope 连接的管道"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: 无法创建 cscope 管道"
+
+msgid "E622: Could not fork for cscope"
+msgstr "E622: 无法对 cscope 进行 fork"
 
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection 执行失败"
 
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: 无法生成 cscope 进程"
+
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen 失败 (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp 失败"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen 失败 (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp 失败"
 
-msgid "no cscope connections"
-msgstr "没有 cscope 连接"
+msgid "E567: no cscope connections"
+msgstr "E567: 没有 cscope 连接"
 
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: 找不到符合 cscope 的搜寻 %s / %s"
+msgstr "E259: cscope 查询 %s %s 没有找到匹配的结果"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix 标志 %c 对 %c 无效"
 
 msgid "cscope commands:\n"
 msgstr "cscope 命令:\n"
 
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (用法: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (用法: %s)"
 
-msgid "duplicate cscope database not added"
-msgstr "重复的 cscope 数据库未被加入"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: 无法打开 cscope 数据库: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: 无法获取 cscope 数据库信息"
 
-msgid "maximum number of cscope connections reached"
-msgstr "已达到 cscope 最大连接数目"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: 重复的 cscope 数据库未被加入"
 
-msgid "E260: cscope connection not found"
-msgstr "E260: 找不到 cscope 连接"
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: 已达到 cscope 的最大连接数"
 
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: 找不到 cscope 连接 %s"
 
-msgid "cscope connection closed"
-msgstr "cscope 连接已关闭"
-
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope 连接 %s 已关闭\n"
+msgid "cscope connection %s closed"
+msgstr "cscope 连接 %s 已关闭"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches 严重错误"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 读取 cscope 连接 %d 错误"
-
-msgid "couldn't malloc\n"
-msgstr "不能使用 malloc\n"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches 严重错误"
 
 #, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 标签(tag): %s\n"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
 
-msgid "   #   line"
-msgstr "   #   行  "
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   行  "
 
 msgid "filename / context / line\n"
-msgstr "文件名     / 上下文    / 行号\n"
+msgstr "文件名 / 上下文 / 行\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope 错误: %s"
 
 msgid "All cscope databases reset"
-msgstr "重设所有 cscope 数据库"
+msgstr "所有 cscope 数据库已被重置"
 
 msgid "no cscope connections\n"
 msgstr "没有 cscope 连接\n"
 
 msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    数据库名称                          prepend path\n"
+msgstr " # pid    数据库名                            prepend path\n"
 
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <无>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: 抱歉，此命令不可用，无法加载 MzScheme 库"
+
+msgid "invalid expression"
+msgstr "无效的表达式"
+
+msgid "expressions disabled at compile time"
+msgstr "编译时没有启用表达式"
+
+msgid "hidden option"
+msgstr "隐藏的选项"
+
+msgid "unknown option"
+msgstr "未知的选项"
+
+msgid "window index is out of range"
+msgstr "窗口索引超出范围"
+
+msgid "couldn't open buffer"
+msgstr "无法打开缓冲区"
+
+msgid "cannot save undo information"
+msgstr "无法保存撤销信息"
+
+msgid "cannot delete line"
+msgstr "无法删除行"
+
+msgid "cannot replace line"
+msgstr "无法替换行"
+
+msgid "cannot insert line"
+msgstr "无法插入行"
+
+msgid "string cannot contain newlines"
+msgstr "字符串不能包含换行(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim 错误: ~a"
+
+msgid "Vim error"
+msgstr "Vim 错误"
+
+msgid "buffer is invalid"
+msgstr "缓冲区无效"
+
+msgid "window is invalid"
+msgstr "窗口无效"
+
+msgid "linenr out of range"
+msgstr "行号超出范围"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "不允许在 sandbox 中使用"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
-msgstr "E263: 抱歉，这个命令不能使用，Python 程序库没有加载。"
+msgstr "E263: 抱歉，此命令不可用，无法加载 Python 库。"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: 不能递归调用 Python"
 
 msgid "can't delete OutputObject attributes"
 msgstr "不能删除 OutputObject 属性"
 
 msgid "softspace must be an integer"
-msgstr "softspace 必需是整数"
+msgstr "softspace 必须是整数"
 
 msgid "invalid attribute"
-msgstr "不正确的属性"
+msgstr "无效的属性"
 
 msgid "writelines() requires list of strings"
-msgstr "writelines() 需要 string list 当参数"
+msgstr "writelines() 需要字符串列表作参数"
 
 msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: 不能初始化 I/O 对象"
-
-msgid "invalid expression"
-msgstr "不正确的表达式"
-
-msgid "expressions disabled at compile time"
-msgstr "因为编译时没有加入表达式(expression)的程序代码，所以不能使用表达式"
+msgstr "E264: Python: 初始化 I/O 对象出错"
 
 msgid "attempt to refer to deleted buffer"
-msgstr "试图使用已被删除的缓冲区"
+msgstr "试图引用已被删除的缓冲区"
 
 msgid "line number out of range"
 msgstr "行号超出范围"
 
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer 对象 (已删除): %8lX>"
+msgstr "<缓冲区对象(已删除): %8lX>"
 
 msgid "invalid mark name"
-msgstr "标记名称不正确"
+msgstr "无效的标记名称"
 
 msgid "no such buffer"
 msgstr "无此缓冲区"
 
 msgid "attempt to refer to deleted window"
-msgstr "试图使用已被删除的窗口"
+msgstr "试图引用已被删除的窗口"
 
 msgid "readonly attribute"
 msgstr "只读属性"
 
 msgid "cursor position outside buffer"
-msgstr "光标定位在缓冲区之外"
+msgstr "光标位置在缓冲区外"
 
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@ msgstr "<窗口 %d>"
 msgid "no such window"
 msgstr "无此窗口"
 
-msgid "cannot save undo information"
-msgstr "不能保存复原信息"
-
-msgid "cannot delete line"
-msgstr "不能删除此行"
-
-msgid "cannot replace line"
-msgstr "不能替换此行"
-
-msgid "cannot insert line"
-msgstr "不能插入此行"
-
-msgid "string cannot contain newlines"
-msgstr "字符串不能包含新行"
-
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: 此命令不能使用，无法加载 Ruby 程序库(Library)"
+msgstr "E266: 抱歉，此命令不可用，无法加载 Ruby 库"
 
 #, c-format
 msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@ msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: 写入错误。结束连接"
 
 msgid "invalid buffer number"
-msgstr "不正确的缓冲区号"
+msgstr "无效的缓冲区号"
 
 msgid "not implemented yet"
 msgstr "尚未实现"
 
-msgid "unknown option"
-msgstr "不正确的选项"
-
 #. ???
 msgid "cannot set line(s)"
-msgstr "不能设定行"
+msgstr "无法设定行"
 
 msgid "mark not set"
 msgstr "没有设定标记"
 
 #, c-format
 msgid "row %d column %d"
-msgstr "列 %d 行 %d"
+msgstr "第 %d 行 第 %d 列"
 
 msgid "cannot insert/append line"
-msgstr "不能插入或添加此行"
+msgstr "无法插入/追加行"
 
 msgid "unknown flag: "
-msgstr "错误的标志: "
+msgstr "未知的标志: "
 
 msgid "unknown vimOption"
-msgstr "不正确的 VIM 选项"
+msgstr "未知的 vim 选项"
 
 msgid "keyboard interrupt"
 msgstr "键盘中断"
@@ -1993,93 +2603,91 @@ msgid "vim error"
 msgstr "vim 错误"
 
 msgid "cannot create buffer/window command: object is being deleted"
-msgstr "不能创建缓冲区/窗口命令: 对象将被删除"
+msgstr "无法创建缓冲区/窗口命令: 对象将被删除"
 
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
-msgstr "不能注册 callback 命令: 缓冲区/窗口已经被删除了"
+msgstr "无法注册回调命令: 缓冲区/窗口已被删除"
 
 #. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
-msgstr "E280: TCL 严重错误: reflist 不可靠!? 请报告给 to vim-dev@vim.org"
+msgstr "E280: TCL 严重错误: reflist 损坏！？请报告给 vim-dev@vim.org"
 
 msgid "cannot register callback command: buffer/window reference not found"
-msgstr "不能注册 callback 命令: 找不到缓冲区/窗口"
+msgstr "无法注册回调命令: 找不到缓冲区/窗口引用"
 
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "此命令不能使用, 因为无法加载 Tcl 程序库(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: 抱歉，此命令不可用，无法加载 Tcl 库"
 
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL 错误: 退出返回值不是整数!? 请报告给 to vim-dev@vim.org"
+msgstr "E281: TCL 错误: 退出返回值不是整数！？请报告给 vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: 退出返回值 %d"
 
 msgid "cannot get line"
-msgstr "不能取得此行"
+msgstr "无法获取行"
 
 msgid "Unable to register a command server name"
-msgstr "不能注册命令服务器名称"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: 没有注册为 \"%s\" 的服务器"
+msgstr "无法注册命令服务器名"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: 不能送出命令到目的地程序"
+msgstr "E248:  无法发送命令到目的程序"
 
 #, c-format
-msgid "Invalid server id used: %s"
-msgstr "不正确的服务器 id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: 不能读取 VIM 的 注册表属性"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 使用了无效的服务器 id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM 的注册表属性有误。已删除。"
+msgstr "E251: VIM 实例注册属性有误。已删除！"
 
-msgid "Unknown option"
-msgstr "不正确的选项"
+msgid "Unknown option argument"
+msgstr "未知的选项参数"
 
 msgid "Too many edit arguments"
-msgstr "太多编辑参数"
+msgstr "编辑参数过多"
 
 msgid "Argument missing after"
-msgstr "缺少必要的参数:"
+msgstr "缺少必要的参数"
 
-msgid "Garbage after option"
-msgstr "不能辨认此选项后的命令: "
+msgid "Garbage after option argument"
+msgstr "选项参数后的内容无效"
 
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "太多 \"+command\" 或 \"-c command\" 参数"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"、\"-c command\" 或 \"--cmd command\" 参数过多"
 
 msgid "Invalid argument for"
-msgstr "不正确的参数: "
+msgstr "无效的参数"
+
+#, c-format
+msgid "%d files to edit\n"
+msgstr "还有 %d 个文件等待编辑\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "您的 Vim 编译时没有加入 diff 的能力"
+msgstr "此 Vim 编译时没有加入 diff 功能"
 
 msgid "Attempt to open script file again: \""
-msgstr "试图再次打开 script 文件: \""
-
-msgid "\"\n"
-msgstr "\"\n"
+msgstr "试图再次打开脚本文件: \""
 
 msgid "Cannot open for reading: \""
-msgstr "不能为读而打开: \""
+msgstr "无法打开并读取: \""
 
 msgid "Cannot open for script output: \""
-msgstr "不能为 script 输出而打开: \""
+msgstr "无法打开并输出脚本: \""
 
-#, c-format
-msgid "%d files to edit\n"
-msgstr "还有 %d 个文件等待编辑\n"
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: 错误: 无法从 NetBeans 中启动 gvim\n"
 
 msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: 注意: 输出不是终端(屏幕)\n"
+msgstr "Vim: 警告: 输出不是到终端(屏幕)\n"
 
 msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: 注意: 输入不是终端(键盘)\n"
+msgstr "Vim: 警告: 输入不是来自终端(键盘)\n"
 
 #. just in case..
 msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@ msgstr "pre-vimrc 命令行"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: 不能读取文件 \"%s\""
+msgstr "E282: 无法读取 \"%s\""
 
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"查询更多信息请执行: \"vim -h\"\n"
+"更多信息请见: \"vim -h\"\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[文件 ..]       编辑指定的文件"
@@ -2103,10 +2711,10 @@ msgid "-               read text from stdin"
 msgstr "-               从标准输入(stdin)读取文本"
 
 msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          编辑时使用指定的 tag"
+msgstr "-t tag          编辑 tag 定义处的文件"
 
 msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  编辑时加载第一个错误"
+msgstr "-q [errorfile]  编辑第一个出错处的文件"
 
 msgid ""
 "\n"
@@ -2115,17 +2723,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" 用法:"
+"用法:"
 
 msgid " vim [arguments] "
-msgstr "vim [参数] "
+msgstr " vim [参数] "
 
 msgid ""
 "\n"
 "   or:"
 msgstr ""
 "\n"
-"   或:"
+"  或:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -2137,10 +2748,13 @@ msgstr ""
 "参数:\n"
 
 msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t只有在这之后的文件"
+msgstr "--\t\t\t在这以后只有文件名"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t不扩展通配符"
 
 msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\t注册 gvim 到 OLE"
+msgstr "-register\t\t注册此 gvim 到 OLE"
 
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\t取消 OLE 中的 gvim 注册"
@@ -2148,8 +2762,8 @@ msgstr "-unregister\t\t取消 OLE 中的 gvim 注册"
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\t使用图形界面 (同 \"gvim\")"
 
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\t前景: 启动图形界面时不 fork"
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  或  --nofork\t前台: 启动图形界面时不 fork"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi 模式 (同 \"vi\")"
@@ -2158,13 +2772,13 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx 模式 (同 \"ex\")"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t安静 (batch) 模式 (只能与 \"ex\" 一起使用)"
+msgstr "-s\t\t\t安静(批处理)模式 (只能与 \"ex\" 一起使用)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff 模式 (同 \"vimdiff\", 可迅速比较两文件不同处)"
+msgstr "-d\t\t\tDiff 模式 (同 \"vimdiff\")"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t简易模式 (同 \"evim\", modeless)"
+msgstr "-y\t\t\t容易模式 (同 \"evim\"，无模式)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t只读模式 (同 \"view\")"
@@ -2173,7 +2787,7 @@ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t限制模式 (同 \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t不可修改 (写入文件)"
+msgstr "-m\t\t\t不可修改(写入文件)"
 
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t文本不可修改"
@@ -2185,10 +2799,10 @@ msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp 模式"
 
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' 传统 Vi 兼容模式"
+msgstr "-C\t\t\t兼容传统的 Vi: 'compatible'"
 
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' 不完全与传统 Vi 兼容，可使用 Vim 加强能力"
+msgstr "-N\t\t\t不完全兼容传统的 Vi: 'nocompatible'"
 
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose 等级"
@@ -2197,163 +2811,183 @@ msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t调试模式"
 
 msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t不使用交换文件, 只使用内存"
+msgstr "-n\t\t\t不使用交换文件，只使用内存"
 
 msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t列出交换文件后退出"
+msgstr "-r\t\t\t列出交换文件并退出"
 
 msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (加文件名)       \t恢复上次崩溃的资料(Recover crashed session)"
+msgstr "-r (跟文件名)\t\t恢复崩溃的会话"
 
 msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t与 -r 一样"
+msgstr "-L\t\t\t同 -r"
 
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t不使用 newcli 来打开窗口"
 
 msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\t使用 <device> 做输入输出设备"
+msgstr "-dev <device>\t\t使用 <device> 进行输入输出"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t以 Arabic 模式启动"
 
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t启动为 希伯莱模式"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\t以 Hebrew 模式启动"
 
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t启动为 Farsi 模式"
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\t以 Farsi 模式启动"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t设定终端为 <terminal>"
+msgstr "-T <terminal>\t设定终端类型为 <terminal>"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t使用 <vimrc> 替换任何 .vimrc"
+msgstr "-u <vimrc>\t\t使用 <vimrc> 替代任何 .vimrc"
 
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\t使用 <gvimrc> 替换任何 .gvimrc"
+msgstr "-U <gvimrc>\t\t使用 <gvimrc> 替代任何 .gvimrc"
 
 msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t不加载任何 plugin"
+msgstr "--noplugin\t\t不加载 plugin 脚本"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t打开 N 个标签页 (默认值: 每个文件一个)"
 
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t打开 N 个窗口 (预设是每个文件一个)"
+msgstr "-o[N]\t\t打开 N 个窗口 (默认值: 每个文件一个)"
 
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\t同 -o 但使用垂直分割"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\t同 -o 但垂直分割"
 
 msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t启动后跳到文件结尾"
+msgstr "+\t\t\t启动后跳到文件末尾"
 
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t启动后跳到第 <lnum> 行"
 
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t加载任何 vimrc 前执行 <command>"
+msgstr "--cmd <command>\t加载任何 vimrc 文件前执行 <command>"
 
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t加载第一个文件后执行 <command>"
 
 msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t加载第一个文件后载入 Session 文件<session>"
+msgstr "-S <session>\t\t加载第一个文件后执行文件 <session>"
 
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t从 <scriptin> 读入一般模式命令"
+msgstr "-s <scriptin>\t从文件 <scriptin> 读入正常模式的命令"
 
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t对文件 <scriptout> 附加(append)所有输入的命令"
+msgstr "-w <scriptout>\t将所有输入的命令追加到文件 <scriptout>"
 
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t对文件 <scriptout> 写入所有输入的命令"
+msgstr "-W <scriptout>\t将所有输入的命令写入到文件 <scriptout>"
 
 msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t编辑编码过的文件"
+msgstr "-x\t\t\t编辑加密的文件"
 
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\t将 vim 与指定的 X-server 连接"
 
 msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t不要连接到 X Server"
+msgstr "-X\t\t\t不连接到 X Server"
 
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t在另一个 GTK 组件内打开 Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t如有可能，在 Vim 服务器上编辑文件 <files>"
 
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t编辑 Vim 服务器上的文件并退出"
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  同上，找不到服务器时不抱怨"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> 等效于 --remote, 但会等候文件完成编辑"
+msgstr "--remote-wait <files>  同 --remote 但会等待文件完成编辑"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files>  同上，找不到服务器时不抱怨"
+
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <files>  同 --remote 但对每个文件打开一个标签页"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\t送出 <keys> 到 Vim 服务器并退出"
 
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\t在服务器上求表达式的值并打印结果"
+msgstr "--remote-expr <expr>\t在 Vim 服务器上求 <expr> 的值并打印结果"
 
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\t列出可用的 Vim 服务器名称并退出"
 
 msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\t送至/成为 Vim 服务器 <name>"
+msgstr "--servername <name>\t发送到或成为 Vim 服务器 <name>"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t使用 <viminfo> 而非 .viminfo"
+msgstr "-i <viminfo>\t\t使用 <viminfo> 取代 .viminfo"
 
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t打印说明(也就是本信息)后退出"
+msgid "-h  or  --help\tPrint Help (this message) and exit"
+msgstr "-h  或  --help\t打印帮助(本信息)并退出"
 
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t打印版本信息后退出"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t打印版本信息并退出"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
 msgstr ""
 "\n"
-"gvim 可识别的参数 (Motif 版):\n"
+"gvim (Motif 版本) 可识别的参数:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw 版本) 可识别的参数:\n"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
 msgstr ""
 "\n"
-"gvim 可识别的参数 (Athena 版):\n"
+"gvim (Athena 版本) 可识别的参数:\n"
 
 msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\t在窗口 <display> 执行 vim"
+msgstr "-display <display>\t在 <display> 上运行 vim"
 
 msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\t启动后最小化(iconified)"
+msgstr "-iconic\t\t启动后最小化"
 
 msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t读取 Resource 时把 vim 的名称视为 <name>"
+msgstr "-name <name>\t\t读取 Resource 时把 vim 视为 <name>"
 
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (尚未实现)\n"
 
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\t设定 <color> 为背景色 (也可用 -bg)"
+msgstr "-background <color>\t使用 <color> 作为背景色 (也可用 -bg)"
 
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\t设定 <color> 为一般文字颜色 (也可用 -fg)"
+msgstr "-foreground <color>\t使用 <color> 作为一般文字颜色 (也可用 -fg)"
 
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\t使用 <font> 为一般字体 (也可用 -fn)"
+msgstr "-font <font>\t使用 <font> 作为一般字体 (也可用 -fn)"
 
 msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\t使用 <font> 为粗体字体"
+msgstr "-boldfont <font>\t使用 <font> 作为粗体字体"
 
 msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\t使用 <font> 为斜体字体"
+msgstr "-italicfont <font>\t使用 <font> 作为斜体字体"
 
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\t使用<geom>为初始位置 (也可用 -geom)"
+msgstr "-geometry <geom>\t使用 <geom> 作为初始位置 (也可用 -geom)"
 
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\t使用宽度为 <width> 的边框 (也可用 -bw)"
+msgstr "-borderwidth <width>\t设定边框宽度为 <width> (也可用 -bw)"
 
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr "-scrollbarwidth <width> 设定滚动条宽度为 <width> (也可用 -sw)"
 
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\t设定菜单列的高度为 <height> (也可用 -mh)"
+msgstr "-menuheight <height>\t设定菜单栏高度为 <height> (也可用 -mh)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t使用反显 (也可用 -rv)"
@@ -2369,7 +3003,7 @@ msgid ""
 "Arguments recognised by gvim (RISC OS version):\n"
 msgstr ""
 "\n"
-"gvim 可识别的参数 (RISC OS 版):\n"
+"gvim (RISC OS 版本) 可识别的参数:\n"
 
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t窗口初始宽度"
@@ -2382,43 +3016,48 @@ msgid ""
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
-"gvim 可识别的参数 (GTK+ 版):\n"
+"gvim (GTK+ 版本) 可识别的参数:\n"
 
 msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\t在 <display> 执行 vim (也可用 --display)"
+msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
 
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t显示 Gnome 相关参数"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t在另一个 GTK 部件中打开 Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t在父应用程序中打开 Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
 
 #. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"发送表达式失败。\n"
+msgid ": Send failed.\n"
+msgstr ": 发送失败。\n"
 
 #. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"送出失败。试图在本地执行\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": 发送失败。尝试本地执行\n"
 
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d 中 %d 已编辑"
 
-msgid "Send expression failed.\n"
-msgstr "发送表达式失败。\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "发送表达式失败。\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": 发送表达式失败。\n"
 
 msgid "No marks set"
-msgstr "没有设定标记 (mark)"
+msgstr "没有设定标记"
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: 找不到符合 \"%s\" 的标记(mark)"
+msgstr "E283: 没有匹配 \"%s\" 的标记"
 
 #. Highlight title
 msgid ""
@@ -2426,7 +3065,7 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"标记 行号  列  文件/文本"
+"标记   行   列 文件/文本"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " jump line  col file/text"
 msgstr ""
 "\n"
-" 跳到 行号  列  文件/文本"
+" 跳转   行   列 文件/文本"
+
+#. Highlight title
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"  改变   行   列 文本"
 
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -2444,117 +3092,119 @@ msgstr ""
 "# 文件标记:\n"
 
 #. Write the jumplist with -'
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
 msgstr ""
 "\n"
-"# Jumplist (从新到旧):\n"
+"# 跳转列表 (从新到旧):\n"
 
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
 msgstr ""
 "\n"
-"# 文件内历史记录 (从新到旧):\n"
+"# 文件内的标记历史记录 (从新到旧):\n"
 
 msgid "Missing '>'"
-msgstr "缺少对应的 '>'"
+msgstr "缺少 '>'"
 
-msgid "Not a valid codepage"
-msgstr "不正确的代码页"
+msgid "E543: Not a valid codepage"
+msgstr "E543: 无效的代码页"
 
 msgid "E284: Cannot set IC values"
-msgstr "E284: 不能设定 IC 数值"
+msgstr "E284: 不能设定 IC 值"
 
 msgid "E285: Failed to create input context"
-msgstr "E285: 不能创建输入上下文"
+msgstr "E285: 无法创建输入上下文"
 
 msgid "E286: Failed to open input method"
-msgstr "E286: 不能打开输入法"
+msgstr "E286: 无法打开输入法"
 
 msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: 警告: 不能移除 IM 的 callback"
+msgstr "E287: 警告: 无法设定输入法的释放回调函数"
 
 msgid "E288: input method doesn't support any style"
-msgstr "E288: 输入法不支持任何 style"
+msgstr "E288: 输入法不支持任何风格"
 
 msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: 输入法不支持任何 style"
+msgstr "E289: 输入法不支持我的预编辑类型"
 
 msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot 需要字体集(Fontset)"
+msgstr "E290: over-the-spot 风格需要 Fontset"
 
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: 你的 GTK+ 比 1.2.3 老。不能使用状态区。"
+msgstr "E291: 你的 GTK+ 比 1.2.3 旧。状态区不可用。"
 
 msgid "E292: Input Method Server is not running"
-msgstr "E292: 输入法管理程序(Input Method Server)未运行"
+msgstr "E292: 输入法服务器未运行"
 
 msgid "E293: block was not locked"
 msgstr "E293: 块未被锁定"
 
 msgid "E294: Seek error in swap file read"
-msgstr "E294: 交换文件读取错误"
+msgstr "E294: 交换文件读取定位错误"
 
 msgid "E295: Read error in swap file"
 msgstr "E295: 交换文件读取错误"
 
 msgid "E296: Seek error in swap file write"
-msgstr "E296: 交换文件写入错误"
+msgstr "E296: 交换文件写入定位错误"
 
 msgid "E297: Write error in swap file"
 msgstr "E297: 交换文件写入错误"
 
 msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: 交换文件已经存在! (小心符号连结的安全漏洞!?)"
+msgstr "E300: 交换文件已存在 (符号连接攻击？)"
 
 msgid "E298: Didn't get block nr 0?"
-msgstr "E298: 找不到块 0?"
+msgstr "E298: 找不到块 0？"
 
 msgid "E298: Didn't get block nr 1?"
-msgstr "E298: 找不到块 1?"
+msgstr "E298: 找不到块 1？"
 
 msgid "E298: Didn't get block nr 2?"
-msgstr "E298: 找不到块 2?"
+msgstr "E298: 找不到块 2？"
 
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: 噢噢, 交换文件不见了!!!"
+msgstr "E301: 噢，交换文件不见了！！！"
 
 msgid "E302: Could not rename swap file"
-msgstr "E302: 不能改变交换文件的名称"
+msgstr "E302: 无法重命名交换文件"
 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: 不能打开交换文件 \"%s\", 不可能恢复了"
+msgstr "E303: 无法打开 \"%s\" 的交换文件，恢复将不可能"
 
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: 找不到块 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): 找不到块 0？"
 
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: 找不到 %s 的交换文件"
 
 msgid "Enter number of swap file to use (0 to quit): "
-msgstr "请选择你要使用的交换文件 (按0 退出): "
+msgstr "请输入要使用的交换文件编号 (0 退出): "
 
 #, c-format
 msgid "E306: Cannot open %s"
-msgstr "E306: 不能打开 %s"
+msgstr "E306: 无法打开 %s"
 
 msgid "Unable to read block 0 from "
-msgstr "不能读取块 0:"
+msgstr "无法读取块 0: "
 
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"可能你没做过任何修改或是 Vim 还来不及更新交换文件."
+"可能你没做过任何修改或是 Vim 还来不及更新交换文件。"
 
 msgid " cannot be used with this version of Vim.\n"
-msgstr " 不能在本版本的 Vim 中使用.\n"
+msgstr " 不能在该版本的 Vim 中使用。\n"
 
 msgid "Use Vim version 3.0.\n"
 msgstr "使用 Vim 3.0。\n"
@@ -2564,17 +3214,17 @@ msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s 看起来不像是 Vim 交换文件"
 
 msgid " cannot be used on this computer.\n"
-msgstr " 不能在这台电脑上使用.\n"
+msgstr " 不能在这台电脑上使用。\n"
 
 msgid "The file was created on "
-msgstr "本文件创建于 "
+msgstr "此文件创建于 "
 
 msgid ""
 ",\n"
 "or the file has been damaged."
 msgstr ""
-",\n"
-"或是这文件已被破坏。"
+"，\n"
+"或是此文件已损坏。"
 
 #, c-format
 msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@ msgstr "使用交换文件 \"%s\""
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "原文件 \"%s\""
+msgstr "原始文件 \"%s\""
 
 msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: 警告: 原始文件可能已经修改过了"
+msgstr "E308: 警告: 原始文件可能已被修改"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: 不能从 %s 读取块 1"
+msgstr "E309: 无法从 %s 读取块 1"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???MANY LINES MISSING"
-msgstr "???缺少太多行"
+msgstr "???缺少了太多行"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINE COUNT WRONG"
-msgstr "???行号错误"
+msgstr "???行数错误"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???EMPTY BLOCK"
-msgstr "???空的 块"
+msgstr "???空的块"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINES MISSING"
-msgstr "???找不到一些行"
+msgstr "???缺少了一些行"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: 块 1 ID 错误 (%s 不是交换文件?)"
+msgstr "E310: 块 1 ID 错误 (%s 不是交换文件？)"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???BLOCK MISSING"
-msgstr "???找不到块"
+msgstr "???缺少块"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "??? from here until ???END lines may be messed up"
-msgstr "??? 从这里到 ???END 的内容可能有问题"
+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 的内容可能被删除/插入过"
+msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???END"
 msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
-msgstr "E311: 恢复已中断"
+msgstr "E311: 恢复已被中断"
 
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: 恢复时发生错误; 请注意开头为 ??? 的行"
+msgstr "E312: 恢复时发生错误；请注意开头为 ??? 的行"
+
+msgid "See \":help E312\" for more information."
+msgstr "更多信息请见 \":help E312\""
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "恢复完成. 请确定一切正常."
+msgstr "恢复完毕。请确定一切正常。"
 
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
 msgstr ""
 "\n"
-"(你可能想要把这个文件另存为别的文件名，\n"
+"(你可能想要将这个文件另存为别的文件名\n"
 
 msgid "and run diff with the original file to check for changes)\n"
-msgstr "再执行 diff 与原文件比较以检查是否有改变)\n"
+msgstr "再运行 diff 与原文件比较以检查是否有改变)\n"
 
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
 msgstr ""
-"(D)直接删除 .swp 交换文件\n"
+"然后把 .swp 文件删掉。\n"
 "\n"
 
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
-msgstr "找到以下的交换文件:"
+msgstr "找到交换文件:"
 
 msgid "   In current directory:\n"
-msgstr "   在目前目录:\n"
+msgstr "   位于当前目录:\n"
 
 msgid "   Using specified name:\n"
-msgstr "   Using specified name:\n"
+msgstr "   使用指定的名字:\n"
 
 msgid "   In directory "
-msgstr "   在目录 "
+msgstr "   位于目录 "
 
 msgid "      -- none --\n"
 msgstr "      -- 无 --\n"
@@ -2672,13 +3341,13 @@ msgid "             dated: "
 msgstr "              日期: "
 
 msgid "         [from Vim version 3.0]"
-msgstr "              [从 Vim 版本 3.0]"
+msgstr "         [来自 Vim 版本 3.0]"
 
 msgid "         [does not look like a Vim swap file]"
-msgstr "                          [不像 Vim 的交换文件]"
+msgstr "         [不像是 Vim 交换文件]"
 
 msgid "         file name: "
-msgstr "              文件名: "
+msgstr "            文件名: "
 
 msgid ""
 "\n"
@@ -2718,14 +3387,14 @@ msgstr ""
 "           进程 ID: "
 
 msgid " (still running)"
-msgstr " (正在执行)"
+msgstr " (仍在运行)"
 
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
 msgstr ""
 "\n"
-"         [不能在本版本的 Vim 上使用]"
+"         [不能在该版本的 Vim 上使用]"
 
 msgid ""
 "\n"
@@ -2735,13 +3404,13 @@ msgstr ""
 "         [不能在本机上使用]"
 
 msgid "         [cannot be read]"
-msgstr "         [不能读取]"
+msgstr "         [无法读取]"
 
 msgid "         [cannot be opened]"
-msgstr "         [不能打开]"
+msgstr "         [无法打开]"
 
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: 不能保留, 不使用交换文件"
+msgstr "E313: 无法保留，没有交换文件"
 
 msgid "File preserved"
 msgstr "文件已保留"
@@ -2751,7 +3420,7 @@ msgstr "E314: 保留失败"
 
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 错误的 lnum: %ld"
+msgstr "E315: ml_get: 无效的 lnum: %ld"
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@ msgid "stack_idx should be 0"
 msgstr "stack_idx 应该是 0"
 
 msgid "E318: Updated too many blocks?"
-msgstr "E318: 更新太多块?"
+msgstr "E318: 更新了太多的块？"
 
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: 指针块 id 错误 4"
 
 msgid "deleted block 1?"
-msgstr "删除块 1?"
+msgstr "删除了块 1？"
 
 #, c-format
 msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@ msgstr "pe_line_count 为零"
 
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 行号超出范围: %ld 超过结尾"
+msgstr "E322: 行号超出范围: %ld 超出结尾"
 
 #, c-format
 msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@ msgid "Stack size increases"
 msgstr "堆栈大小增加"
 
 msgid "E317: pointer block id wrong 2"
-msgstr "E317: 指针块 id 错 2"
+msgstr "E317: 指针块 id 错误 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" 符号连接出现循环"
 
 msgid "E325: ATTENTION"
 msgstr "E325: 注意"
@@ -2807,10 +3480,10 @@ msgstr ""
 "发现交换文件 \""
 
 msgid "While opening file \""
-msgstr "当打开文件时 \""
+msgstr "正在打开文件 \""
 
 msgid "      NEWER than swap file!\n"
-msgstr "      比交换文件新!\n"
+msgstr "      比交换文件新！\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
@@ -2821,95 +3494,101 @@ msgid ""
 "    different instances of the same file when making changes.\n"
 msgstr ""
 "\n"
-"(1) 可能有另一个程序也在编辑同一个文件.\n"
-"    如果是这样，请注意不要一起写入，不然你的努力都会付诸东流。\n"
+"(1) 另一个程序可能也在编辑同一个文件。\n"
+"    如果是这样，修改时请注意避免同一个文件产生两个不同的版本。\n"
+"\n"
 
 msgid "    Quit, or continue with caution.\n"
-msgstr "    退出，或是继续编辑。\n"
+msgstr "    退出，或小心地继续。\n"
 
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
 msgstr ""
 "\n"
-"(2) 上一次编辑此文件时崩溃\n"
+"(2) 上次编辑此文件时崩溃。\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    如果是这样, 请用 \":recover\" 或 \"vim -r"
+msgstr "    如果是这样，请用 \":recover\" 或 \"vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    恢复修改内容 (进一步说明请看 \":help recovery\").\n"
+"    恢复修改的内容 (请见 \":help recovery\")。\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    如果该恢复的都已经恢复了, 请直接删除此交换文件 \""
+msgstr "    如果你已经进行了恢复，请删除交换文件 \""
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
 "\"\n"
-"    以避免再看到此信息.\n"
+"    以避免再看到此消息。\n"
 
 msgid "Swap file \""
 msgstr "交换文件 \""
 
 msgid "\" already exists!"
-msgstr "\" 已经存在了!"
+msgstr "\" 已存在！"
 
 msgid "VIM - ATTENTION"
 msgstr "VIM - 注意"
 
 msgid "Swap file already exists!"
-msgstr "交换文件已经存在!"
+msgstr "交换文件已存在！"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
 msgstr ""
 "以只读方式打开(&O)\n"
 "直接编辑(&E)\n"
 "恢复(&R)\n"
-"退出(&Q)"
+"退出(&Q)\n"
+"中止(&A)"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Delete it"
+"&Abort"
 msgstr ""
 "以只读方式打开(&O)\n"
 "直接编辑(&E)\n"
 "恢复(&R)\n"
+"删除交换文件(&D)\n"
 "退出(&Q)\n"
-"删除交换文件(&D)"
+"中止(&A)"
 
 msgid "E326: Too many swap files found"
 msgstr "E326: 找到太多交换文件"
 
 msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: 部份菜单项不是子菜单"
+msgstr "E327: 菜单项的某部分路径不是子菜单"
 
 msgid "E328: Menu only exists in another mode"
-msgstr "E328: 菜单只能在其它模式中使用"
+msgstr "E328: 菜单只在其它模式中存在"
 
-msgid "E329: No menu of that name"
-msgstr "E329: 没有那样的菜单"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: 没有菜单 \"%s\""
 
 msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: 菜单不能指向子选单"
+msgstr "E330: 菜单路径不能指向子菜单"
 
 msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: 不能直接把菜单项加到菜单条中"
+msgstr "E331: 不能把菜单项直接加到菜单栏中"
 
 msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: 分隔线不能是菜单的一部分"
+msgstr "E332: 分隔线不能是菜单路径的一部分"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
@@ -2921,21 +3600,21 @@ msgstr ""
 "--- 菜单 ---"
 
 msgid "Tear off this menu"
-msgstr "切下此菜单"
+msgstr "撕下此菜单"
 
 msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: 菜单必需指向一个菜单项"
+msgstr "E333: 菜单路径必须指向菜单项"
 
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: [菜单] 找不到 %s"
+msgstr "E334: 找不到菜单: %s"
 
 #, c-format
 msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s 模式未定义菜单"
+msgstr "E335: %s 模式中菜单未定义"
 
 msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: 菜单必需指向子菜单"
+msgstr "E336: 菜单路径必须指向子菜单"
 
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: 找不到菜单 - 请检查菜单名称"
@@ -2946,31 +3625,30 @@ msgstr "处理 %s 时发生错误:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "行 %4ld:"
+msgstr "第 %4ld 行:"
 
-msgid "[string too long]"
-msgstr "[字符串太长]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: 无效的寄存器名: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "简体中文信息维护者: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "简体中文消息维护者: Yuheng Xie <elephant@linux.net.cn>"
 
 msgid "Interrupt: "
 msgstr "已中断: "
 
-msgid "Hit ENTER to continue"
-msgstr "请按 ENTER 继续"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
 msgstr "请按 ENTER 或其它命令继续"
 
+#, c-format
+msgid "%s line %ld"
+msgstr "%s 第 %ld 行"
+
 msgid "-- More --"
 msgstr "-- 更多 --"
 
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: 向下/向上一行, 空格/b: 一页, d/u: 半页, q: 退出)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: 向下一行, 空白键: 一页, d: 半页, q: 退出)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " 空格/d/j: 屏幕/页/行 下翻，b/u/k: 上翻，q: 退出"
 
 msgid "Question"
 msgstr "问题"
@@ -2979,17 +3657,8 @@ msgid ""
 "&Yes\n"
 "&No"
 msgstr ""
-"&Y是\n"
-"&N否"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y是\n"
-"&N否\n"
-"&C取消"
+"是(&Y)\n"
+"否(&N)"
 
 msgid ""
 "&Yes\n"
@@ -2998,11 +3667,14 @@ msgid ""
 "&Discard All\n"
 "&Cancel"
 msgstr ""
-"&Y是\n"
-"&N否\n"
-"&A全部保存\n"
-"&D全部不存\n"
-"&C取消"
+"是(&Y)\n"
+"否(&N)\n"
+"全部保存(&A)\n"
+"全部丢弃(&D)\n"
+"取消(&C)"
+
+msgid "Select Directory dialog"
+msgstr "选择目录对话框"
 
 msgid "Save File dialog"
 msgstr "保存文件对话框"
@@ -3012,35 +3684,51 @@ msgstr "打开文件对话框"
 
 #. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: 主控台(Console)模式时没有文件浏览器(file browser)"
+msgstr "E338: 抱歉，控制台模式下没有文件浏览器"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() 的参数不足"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() 的参数过多"
 
 msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: 注意: 你正在修改一个只读文件"
+msgstr "W10: 警告: 正在修改一个只读文件"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "请输入数字或点击鼠标 (<Enter> 取消): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "请选择数字 (<Enter> 取消): "
 
 msgid "1 more line"
-msgstr "还有一行"
+msgstr "多了 1 行"
 
 msgid "1 line less"
-msgstr "少于一行"
+msgstr "少了 1 行"
 
 #, c-format
 msgid "%ld more lines"
-msgstr " 还有 %ld 行"
+msgstr "多了 %ld 行"
 
 #, c-format
 msgid "%ld fewer lines"
-msgstr "只剩 %ld 行"
+msgstr "少了 %ld 行"
 
 msgid " (Interrupted)"
 msgstr " (已中断)"
 
+msgid "Beep!"
+msgstr "Beep!"
+
 msgid "Vim: preserving files...\n"
-msgstr "Vim: 保留文件中...\n"
+msgstr "Vim: 正在保留文件……\n"
 
 #. close all memfiles, without deleting
 msgid "Vim: Finished.\n"
-msgstr "Vim: 结束.\n"
+msgstr "Vim: 结束。\n"
 
+#, c-format
 msgid "ERROR: "
 msgstr "错误: "
 
@@ -3050,14 +3738,14 @@ msgid ""
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
 msgstr ""
 "\n"
-"[bytes] 全部 alloc-freed %lu-%lu, 使用中 %lu, peak 使用 %lu\n"
+"[字节] 总共 alloc-free %lu-%lu，使用中 %lu，高峰使用 %lu\n"
 
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
 "\n"
 msgstr ""
-"[调用] 全部 re/malloc(): %lu, 全部 free()': %lu\n"
+"[调用] 总共 re/malloc(): %lu，总共 free()': %lu\n"
 "\n"
 
 msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@ msgstr "E341: 内部错误: lalloc(%ld, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
-msgstr "E342: 内存不足! (尝试配置 %lu 字节组)"
+msgstr "E342: 内存不足！(分配 %lu 字节)"
 
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "调用 shell 执行: \"%s\""
 
-msgid "Missing colon"
-msgstr "缺少冒号"
+msgid "E545: Missing colon"
+msgstr "E545: 缺少冒号"
 
-msgid "Illegal mode"
-msgstr "不正确的模式"
+msgid "E546: Illegal mode"
+msgstr "E546: 无效的模式"
 
-msgid "Illegal mouseshape"
-msgstr "不正确的鼠标形状"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 无效的鼠标形状"
 
-msgid "digit expected"
-msgstr "应该为数字"
+msgid "E548: digit expected"
+msgstr "E548: 此处需要数字"
 
-msgid "Illegal percentage"
-msgstr "不正确的百分比"
+msgid "E549: Illegal percentage"
+msgstr "E549: 无效的百分比"
 
 msgid "Enter encryption key: "
 msgstr "输入密码: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 msgstr "请再输入一次: "
 
 msgid "Keys don't match!"
-msgstr "两次输入密码不同!"
+msgstr "两次密码不匹配！"
 
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
-msgstr "E343: 不正确的路径: '**[number]' 必需要在路径结尾或要接著 '%s'"
+msgstr "E343: 无效的路径: '**[number]' 必须在路径末尾或者后面接 '%s'。"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath 中没有目录 \"%s\""
+msgstr "E344: cdpath 中找不到目录 \"%s\""
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@ msgstr "E346: 在路径中找不到更多的文件 \"%s\""
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: 在路径中找不到更多的文件 \"%s\""
 
-msgid "Illegal component"
-msgstr "不正确的组件"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: 缓冲区 %ld 丢失 NetBeans 连接"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' 为空"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: 求值功能不可用"
 
 msgid "Warning: terminal cannot highlight"
-msgstr "注意: 你的终端不能显示高亮度"
+msgstr "警告: 你的终端不能显示高亮"
 
 msgid "E348: No string under cursor"
 msgstr "E348: 光标处没有字符串"
@@ -3134,56 +3846,78 @@ msgid "E349: No identifier under cursor"
 msgstr "E349: 光标处没有识别字"
 
 msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: 不能在目前的 'foldmethod' 下删除 fold"
+msgstr "E352: 不能在当前的 'foldmethod' 下删除 fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: 改变列表为空"
+
+msgid "E662: At start of changelist"
+msgstr "E662: 已在改变列表的开始处"
+
+msgid "E663: At end of changelist"
+msgstr "E663: 已在改变列表的末尾处"
+
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "输入  :quit<Enter>  退出 Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
-msgstr "一行 %s 过 一次"
+msgstr "1 行 %s 了 1 次"
 
 #, c-format
 msgid "1 line %sed %d times"
-msgstr "一行 %s 过 %d 次"
+msgstr "1 行 %s 了 %d 次"
 
 #, c-format
 msgid "%ld lines %sed 1 time"
-msgstr "%ld 行 %s 过 一次"
+msgstr "%ld 行 %s 了 1 次"
 
 #, c-format
 msgid "%ld lines %sed %d times"
-msgstr "%ld 行 %s 过 %d 次"
+msgstr "%ld 行 %s 了 %d 次"
 
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "识别 %ld 行..."
+msgstr "缩进 %ld 行…… "
 
 msgid "1 line indented "
-msgstr "一行已识别"
+msgstr "缩进了 1 行 "
 
 #, c-format
 msgid "%ld lines indented "
-msgstr "已识别 %ld 行"
+msgstr "缩进了 %ld 行 "
+
+msgid "E748: No previously used register"
+msgstr "E748: 没有前一个使用的寄存器"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
-msgstr "不能复制; 直接删除"
+msgstr "无法复制；改为删除"
 
 msgid "1 line changed"
-msgstr " 1 行 ~ed"
+msgstr "改变了 1 行"
 
 #, c-format
 msgid "%ld lines changed"
-msgstr " %ld 行 ~ed"
+msgstr "改变了 %ld 行"
 
 #, c-format
 msgid "freeing %ld lines"
-msgstr "释放 %ld 行中"
+msgstr "释放了 %ld 行"
+
+msgid "block of 1 line yanked"
+msgstr "复制了 1 行的块"
 
 msgid "1 line yanked"
-msgstr "已复制 1 行"
+msgstr "复制了 1 行"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "复制了 %ld 行的块"
 
 #, c-format
 msgid "%ld lines yanked"
-msgstr "已复制 %ld 行"
+msgstr "复制了 %ld 行"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@ msgstr ""
 "--- 寄存器 ---"
 
 msgid "Illegal register name"
-msgstr "不正确的寄存器名称"
+msgstr "无效的寄存器名"
 
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# 寄存器:\n"
 
 #, c-format
-msgid "Unknown register type %d"
-msgstr "未知的注册类型: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: 寄存器名称错误: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: 未知的寄存器类型 %d"
 
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld 列; "
 
-#, 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)"
+#, 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 "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"
+#, fuzzy, 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"
+
+#, 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"
+
+#, fuzzy, 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"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "感谢您选择 Vim"
 
-msgid "Option not supported"
-msgstr "不支持该选项"
+msgid "E518: Unknown option"
+msgstr "E518: 未知的选项"
 
-msgid "Not allowed in a modeline"
-msgstr "不能在模式行里出现"
+msgid "E519: Option not supported"
+msgstr "E519: 不支持该选项"
 
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t当前设置: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: 不允许在 modeline 中使用"
 
-msgid "Number required after ="
-msgstr "= 后需要有数字"
+msgid "E521: Number required after ="
+msgstr "E521: = 后面需要数字"
 
-msgid "Not found in termcap"
-msgstr "Termcap 里面找不到"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap 里面找不到"
 
 #, c-format
-msgid "Illegal character <%s>"
-msgstr "不正确的字符 <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: 无效的字符 <%s>"
 
-msgid "Not allowed here"
-msgstr "这里不可使用"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: 不能设定 'term' 为空字符串"
 
-msgid "Cannot set 'term' to empty string"
-msgstr "不能设定 'term' 为空字符串"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: 在图形界面中不能改变终端"
 
-msgid "Cannot change term in GUI"
-msgstr "在图型界面中不能切换终端"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: 请用 \":gui\" 启动图形界面"
 
-msgid "Use \":gui\" to start the GUI"
-msgstr "输入 \":gui\" 来启动图形界面"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' 和 'patchmode' 相等"
 
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' 跟 'patchmode' 是一样的"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: 在 GTK+ 2 图形界面中不能更改"
 
-msgid "Zero length string"
-msgstr "零长度字符串"
+msgid "E524: Missing colon"
+msgstr "E524: 缺少冒号"
+
+msgid "E525: Zero length string"
+msgstr "E525: 字符串长度为零"
 
 #, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> 后缺少数字"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> 后面缺少数字"
 
-msgid "Missing comma"
-msgstr "缺少逗号"
+msgid "E527: Missing comma"
+msgstr "E527: 缺少逗号"
 
-msgid "Must specify a ' value"
-msgstr "必需指定一个 ' 值"
+msgid "E528: Must specify a ' value"
+msgstr "E528: 必须指定一个 ' 值"
 
-msgid "contains unprintable character"
-msgstr "包含不能显示的字符"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: 包含不可显示字符或宽字符"
 
-msgid "Invalid font(s)"
-msgstr "不正确的字体"
+msgid "E596: Invalid font(s)"
+msgstr "E596: 无效的字体"
 
-msgid "can't select fontset"
-msgstr "不能使用字体集(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: 无法选择 Fontset"
 
-msgid "Invalid fontset"
-msgstr "不正确的字体集(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: 无效的 Fontset"
 
-msgid "can't select wide font"
-msgstr "不能使用设定的宽字体(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: 无法选择宽字体"
 
-msgid "Invalid wide font"
-msgstr "不正确的宽字体(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: 无效的宽字体"
 
 #, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> 后有不正确的字符"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> 后面有无效的字符"
 
-msgid "comma required"
-msgstr "需要逗号"
+msgid "E536: comma required"
+msgstr "E536: 需要逗号"
 
 #, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' 必需是空白或包含 %s"
-
-msgid "No mouse support"
-msgstr "不支持鼠标"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' 必须为空或包含 %s"
 
-msgid "Unclosed expression sequence"
-msgstr "没有结束的表达式: "
+msgid "E538: No mouse support"
+msgstr "E538: 不支持鼠标"
 
-msgid "too many items"
-msgstr "太多对象"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 没有结束的表达式序列"
 
-msgid "unbalanced groups"
-msgstr "不对称的组"
+msgid "E541: too many items"
+msgstr "E541: 项目过多"
 
-msgid "A preview window already exists"
-msgstr "预览窗口已经存在了"
+msgid "E542: unbalanced groups"
+msgstr "E542: 错乱的组"
 
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' 不能比 'winminheight' 更少"
+msgid "E590: A preview window already exists"
+msgstr "E590: 预览窗口已存在"
 
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' 不能比 'winminwidth' 更少"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic 需要 UTF-8，请执行 ':set encoding=utf-8'"
 
 #, c-format
-msgid "Need at least %d lines"
-msgstr "至少需要 %d 行"
+msgid "E593: Need at least %d lines"
+msgstr "E593: 至少需要 %d 行"
 
 #, c-format
-msgid "Need at least %d columns"
-msgstr "至少需要 %d 列"
+msgid "E594: Need at least %d columns"
+msgstr "E594: 至少需要 %d 列"
 
 #, c-format
 msgid "E355: Unknown option: %s"
-msgstr "E355: 不正确的选项: %s"
+msgstr "E355: 未知的选项: %s"
 
 msgid ""
 "\n"
@@ -3359,14 +4102,14 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- 全局 选项值 ---"
+"--- 全局选项值 ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- 本地 选项值 ---"
+"--- 局部选项值 ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim 返回值: %d\n"
 msgid "cannot change console mode ?!\n"
 msgstr "不能切换主控台(console)模式 !?\n"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: 不支持设定屏幕模式"
-
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: 不是主控台(console)??\n"
 
@@ -3440,13 +4180,12 @@ msgstr "I/O 错误"
 #~ msgid "...(truncated)"
 #~ msgstr ""
 
+#~ msgid "Message"
+#~ msgstr ""
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' 不是 80, 不能执行外部命令"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: 调用函数库 \"%s\"() 失败"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: 不能选择此打印机"
 
@@ -3455,12 +4194,13 @@ msgid "to %s on %s"
 msgstr "从 %s 到 %s"
 
 #, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: 未知的打印机字体: %s"
+
+#, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: 打印错误: %s"
 
-msgid "Unknown"
-msgstr "未知"
-
 #, c-format
 msgid "Printing '%s'"
 msgstr "已打印: '%s'"
@@ -3483,6 +4223,7 @@ msgstr "Vim: 双重信号, 退出中\n"
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: CVim: 拦截到信号(signal) %s\n"
 
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: 拦截到致命的信号(deadly signale)\n"
 
@@ -3545,9 +4286,31 @@ msgstr ""
 "\n"
 "命令已结束\n"
 
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "显示连接"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
 msgid "Opening the X display failed"
 msgstr "打开 X Window 失败"
 
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "没有 cscope 连接"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
 msgid "At line"
 msgstr "在行号 "
 
@@ -3587,7 +4350,7 @@ msgid ""
 msgstr ""
 "在你的 $PATH 中找不到 VIMRUN.EXE.\n"
 "外部命令执行完毕后将不会暂停.\n"
-"进一步说明请执行 :help win32-vimrun "
+"进一步说明请见 :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim 警告"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' 未设定"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: 找不到目录名称或是空的目录名称"
 
-msgid "No more items"
-msgstr "没有其它对象"
+msgid "E553: No more items"
+msgstr "E553: 没有更多的项"
 
 #, c-format
 msgid "(%d of %d)%s%s: "
@@ -3632,49 +4395,121 @@ msgid " (line deleted)"
 msgstr " (行已删除)"
 
 msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix 堆栈结尾"
+msgstr "E380: Quickfix 堆栈底端"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Quickfix 堆栈顶端"
 
 #, c-format
 msgid "error list %d of %d; %d errors"
-msgstr "错误列表 %d/%d; 共有 %d 项错误"
+msgstr "错误列表 %d / %d；共 %d 个错误"
 
 msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 不能写入，'buftype' 选项已设定"
+msgstr "E382: 无法写入，已设定选项 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "无法打开文件 \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: 缓冲区未加载"
+
+msgid "E777: String or List expected"
+msgstr "E777: 此处需要 String 或者 List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] 中有无效的项"
 
 msgid "E339: Pattern too long"
-msgstr "E339: 名字太长"
+msgstr "E339: 模式太长"
+
+msgid "E50: Too many \\z("
+msgstr "E50: 太多 \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: 太多 %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: 不匹配的 \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: 不匹配的 %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: 不匹配的 %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: 不匹配的 %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ 后面有无效的字符"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: 太多复杂的 %s{...}s"
 
 #, c-format
 msgid "E61: Nested %s*"
-msgstr "E61: 巢状 %s*"
+msgstr "E61: 嵌套的 %s*"
 
 #, c-format
 msgid "E62: Nested %s%c"
-msgstr "E62: 巢状 %s%c"
+msgstr "E62: 嵌套的 %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: 不正确地使用 \\_"
 
 #, c-format
 msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c 没有接东西"
+msgstr "E64: %s%c 前面无内容"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: 无效的回引"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: 此处不允许 \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: 此处不允许 \\z1 等"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z 后面有无效的字符"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 后缺少 ]"
 
 #, c-format
-msgid "Syntax error in %s{...}"
-msgstr "语法错误: %s{...}"
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 空的 %s%%[]"
 
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: 不能执行; regular expression 太复杂?"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] 后面有无效的字符"
 
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression 造成堆栈用光的错误"
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% 后面有无效的字符"
 
-msgid "External submatches:\n"
-msgstr "外部符合:\n"
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ 后缺少 ]"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--已 fold %3ld 行"
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} 中语法错误"
+
+msgid "External submatches:\n"
+msgstr "外部符合:\n"
 
 msgid " VREPLACE"
 msgstr " V-替换"
@@ -3683,7 +4518,7 @@ msgid " REPLACE"
 msgstr " 替换"
 
 msgid " REVERSE"
-msgstr " 反转"
+msgstr " 反向"
 
 msgid " INSERT"
 msgstr " 插入"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (替换)"
 
 msgid " (vreplace)"
-msgstr " (v-替换)"
+msgstr " (V-替换)"
 
 msgid " Hebrew"
-msgstr " 希伯莱"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (语言)"
@@ -3706,30 +4544,30 @@ msgstr " (语言)"
 msgid " (paste)"
 msgstr " (粘帖)"
 
-msgid " SELECT"
-msgstr " 选取"
-
 msgid " VISUAL"
 msgstr " 可视"
 
-msgid " BLOCK"
-msgstr " 块"
+msgid " VISUAL LINE"
+msgstr " 可视 行"
 
-msgid " LINE"
-msgstr " 行"
+msgid " VISUAL BLOCK"
+msgstr " 可视 块"
 
-msgid "recording"
-msgstr "记录中"
+msgid " SELECT"
+msgstr " 选择"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "已查找到文件开头；再从结尾继续查找"
+msgid " SELECT LINE"
+msgstr " 选择 行"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "已查找到文件结尾；再从开头继续查找"
+msgid " SELECT BLOCK"
+msgstr " 选择 块"
+
+msgid "recording"
+msgstr "记录中"
 
 #, c-format
 msgid "E383: Invalid search string: %s"
-msgstr "E383: 错误的查找字符串: %s"
+msgstr "E383: 无效的查找字符串: %s"
 
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@ msgstr "  找不到"
 msgid "Scanning included file: %s"
 msgstr "查找包含文件: %s"
 
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "查找包含文件: %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: 当前行匹配"
 
@@ -3780,9 +4622,364 @@ msgstr "E388: 找不到定义"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: 找不到 pattern"
 
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: 交换文件写入错误"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: 不能选择此打印机"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "使用交换文件 \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: 还有 %ld 个文件未编辑"
+
+#~ 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\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "不支持该选项"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "不正确的服务器 id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ 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"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "每一行都找不到模式: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "从标准输入读..."
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ 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 ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+
+#, 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 "向下"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "将改变保存到 \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: 没有前一个查找命令"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [菜单] 找不到 %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: 读取错误文件失败"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
 #, c-format
 msgid "E390: Illegal argument: %s"
-msgstr "E390: 参数不正确: %s"
+msgstr "E390: 无效的参数: %s"
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@ msgstr "最小"
 msgid "maximal "
 msgstr "最大"
 
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: 使用了不正确的参数"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "匹配 %d"
 
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: 找不到 %s 的 region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "少于一行"
 
 msgid "E395: contains argument not accepted here"
 msgstr "E395: 使用了不正确的参数"
@@ -3847,12 +5045,23 @@ msgstr "E395: 使用了不正确的参数"
 msgid "E396: containedin argument not accepted here"
 msgstr "E396: 使用了不正确的参数"
 
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: 使用了不正确的参数"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: 找不到 %s 的 region item"
+
 msgid "E397: Filename required"
 msgstr "E397: 需要文件名称"
 
 #, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: 缺少 ']': %s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
-msgstr "E398: 缺少 \"=\": %s"
+msgstr "E398: 缺少 '=': %s"
 
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@ msgstr "E403: 语法同步: 连接行符号指定了两次"
 
 #, c-format
 msgid "E404: Illegal arguments: %s"
-msgstr "E404: 参数不正确: %s"
+msgstr "E404: 无效的参数: %s"
 
 #, c-format
 msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@ msgstr "E405: 缺少等号: %s"
 
 #, c-format
 msgid "E406: Empty argument: %s"
-msgstr "E406: 空参数: %s"
+msgstr "E406: 空的参数: %s"
 
 #, c-format
 msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@ msgstr "E409: 不正确的组名: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 不正确的 :syntax 子命令: %s"
 
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: 找不到 highlight group: %s"
@@ -3947,23 +5159,30 @@ msgstr "E422: 终端编码太长: %s"
 
 #, c-format
 msgid "E423: Illegal argument: %s"
-msgstr "E423: 参数不正确: %s"
+msgstr "E423: 无效的参数: %s"
 
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: 使用了太多不同的高亮度属性"
 
-msgid "at bottom of tag stack"
-msgstr "标签(tag)堆栈结尾"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: 命令名称不正确"
 
-msgid "at top of tag stack"
-msgstr "标签(tag)堆栈开头"
+msgid "E555: at bottom of tag stack"
+msgstr "E555: 已在 tag 堆栈底部"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: 已在 tag 堆栈顶部"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: 已经在最前面的标签(tag)了"
+msgstr "E425: 已到第一个匹配的 tag"
 
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: 找不到标签(tag): %s"
+msgstr "E426: 找不到 tag: %s"
 
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
@@ -3971,18 +5190,11 @@ msgstr "  # pri kind tag"
 msgid "file\n"
 msgstr "文件\n"
 
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "输入 nr 或选择 (<CR> 退出): "
-
 msgid "E427: There is only one matching tag"
-msgstr "E427: 只有此项符合"
+msgstr "E427: 只有一个匹配的 tag"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: 己经在最后一个符合的标签(tag)了"
+msgstr "E428: 己到最后一个匹配的 tag"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@ msgstr "文件 \"%s\" 不存在"
 #. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "找到 tag: %d/%d%s"
+msgstr "找到 tag: %d / %d%s"
 
 msgid " or more"
 msgstr " 或更多"
 
 msgid "  Using tag with different case!"
-msgstr "  以不同大小写来使用 tag!"
+msgstr "  以不同大小写来使用 tag！"
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@ msgstr ""
 "\n"
 "  # 到 tag         从   行    在 文件/文本"
 
-msgid "Linear tag search"
-msgstr "线性查找标签 (Tags)"
-
-msgid "Binary tag search"
-msgstr "二进制查找(Binary search) 标签(Tags)"
-
 #, c-format
 msgid "Searching tags file %s"
-msgstr "查找 tag 文件 \"%s\""
+msgstr "查找 tag 文件 %s"
 
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@ msgstr "E431: Tag 文件 \"%s\" 格式错误"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "在 %ld 字节之前"
+msgstr "在第 %ld 字节之前"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 msgstr "E433: 没有 tag 文件"
 
 msgid "E434: Can't find tag pattern"
-msgstr "E434: 找不到 tag"
+msgstr "E434: 找不到 tag 模式"
 
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: 找不到 tag, 试着猜!"
+msgstr "E435: 找不到 tag，试着猜！"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' 不能加载。可用的内建终端形式有:"
+msgstr "' 未知。可用的内建终端有:"
 
 msgid "defaulting to '"
-msgstr "预设: '"
+msgstr "默认值为: '"
 
-msgid "Cannot open termcap file"
-msgstr "不能打开 termcap 文件"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: 无法打开 termcap 文件"
 
-msgid "Terminal entry not found in terminfo"
-msgstr "在terminfo中未找到终端项"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: 在 terminfo 中找不到终端项"
 
-msgid "Terminal entry not found in termcap"
-msgstr "在termcap中未找到终端项"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: 在 termcap 中找不到终端项"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap 没有 \"%s\" 项"
+msgstr "E436: termcap 中没有 \"%s\" 项"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: 终端需要 \"cm\" 的能力"
+msgstr "E437: 终端需要能力 \"cm\""
 
 #. Highlight title
 msgid ""
@@ -4085,23 +5291,60 @@ msgstr "Vim: 读错误，退出中...\n"
 
 #. must display the prompt
 msgid "No undo possible; continue anyway"
-msgstr "不能还原；请继续"
+msgstr "无法撤销；请继续"
+
+msgid "Already at oldest change"
+msgstr "已位于最旧的改变"
+
+msgid "Already at newest change"
+msgstr "已位于最新的改变"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "找不到撤销号 %ld"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行号错误"
 
-msgid "1 change"
-msgstr "一项改变"
+msgid "more line"
+msgstr "行被加入"
+
+msgid "more lines"
+msgstr "行被加入"
+
+msgid "line less"
+msgstr "行被去掉"
+
+msgid "fewer lines"
+msgstr "行被去掉"
+
+msgid "change"
+msgstr "行发生改变"
+
+msgid "changes"
+msgstr "行发生改变"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld 项改变"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s；%s #%ld  %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "无可撤销"
+
+msgid "number changes  time"
+msgstr "  编号    改变  时间"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: 撤销列表损坏"
 
 msgid "E440: undo line missing"
-msgstr "E440: 找不到要撤销操作的行"
+msgstr "E440: 找不到要撤销的行"
 
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
@@ -4109,34 +5352,34 @@ msgid ""
 "MS-Windows 16/32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 16/32位 图型界面版本"
+"MS-Windows 16/32 位图形界面版本"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 32 Bit 图型界面版本"
+"MS-Windows 32 位图形界面版本"
 
 msgid " in Win32s mode"
-msgstr "Win32s 模式"
+msgstr " Win32s 模式"
 
 msgid " with OLE support"
-msgstr "支持 OLE"
+msgstr " 带 OLE 支持"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
 msgstr ""
 "\n"
-"MS-Windows 32位 字符界面版本"
+"MS-Windows 32 位控制台版本"
 
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
 msgstr ""
 "\n"
-"MS-Windows 32位 字符界面版本"
+"MS-Windows 16 位控制台版本"
 
 msgid ""
 "\n"
@@ -4185,7 +5428,10 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"加入补丁: "
+"包含补丁: "
+
+msgid "Modified by "
+msgstr "修改者 "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "编译"
 
 msgid "by "
-msgstr "者:"
+msgstr "者 "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"超强版本 "
+"巨型版本 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "Normal version "
 msgstr ""
 "\n"
-"一般版本 "
+"正常版本 "
 
 msgid ""
 "\n"
 "Small version "
 msgstr ""
 "\n"
-"简易版本 "
+"小型版本 "
 
 msgid ""
 "\n"
 "Tiny version "
 msgstr ""
 "\n"
-"精简版本 "
+"微型版本 "
 
 msgid "without GUI."
-msgstr "不使用图型界面。"
+msgstr "无图形界面。"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "带 GTK2-GNOME 图形界面。"
 
 msgid "with GTK-GNOME GUI."
-msgstr "使用 GTK-GNOME 图型界面。"
+msgstr "带 GTK-GNOME 图形界面。"
+
+msgid "with GTK2 GUI."
+msgstr "带 GTK2 图形界面。"
 
 msgid "with GTK GUI."
-msgstr "使用 GTK 图型界面。"
+msgstr "带 GTK 图形界面。"
 
 msgid "with X11-Motif GUI."
-msgstr "使用 X11-Motif 图型界面。"
+msgstr "带 X11-Motif 图形界面。"
 
-msgid "with X11-Athena GUI."
-msgstr "使用 X11-Athena 图型界面。"
+msgid "with X11-neXtaw GUI."
+msgstr "带 X11-neXtaw 图形界面。"
 
-msgid "with BeOS GUI."
-msgstr "使用 BeOS 图型界面。"
+msgid "with X11-Athena GUI."
+msgstr "带 X11-Athena 图形界面。"
 
 msgid "with Photon GUI."
-msgstr "使用Photon图型界面。"
+msgstr "带 Photon 图形界面。"
 
 msgid "with GUI."
-msgstr "使用图型界面。"
+msgstr "带图形界面。"
 
 msgid "with Carbon GUI."
-msgstr "使用 Carbon 图型界面。"
+msgstr "带 Carbon 图形界面。"
 
 msgid "with Cocoa GUI."
-msgstr "使用 Cocoa 图型界面。"
+msgstr "带 Cocoa 图形界面。"
 
 msgid "with (classic) GUI."
-msgstr "使用 (传统) 图型界面。"
+msgstr "带(传统)图形界面。"
 
 msgid "  Features included (+) or not (-):\n"
-msgstr " 目前可使用(+)与不可使用(-)的模块列表:\n"
+msgstr "  可使用(+)与不可使用(-)的功能:\n"
 
 msgid "   system vimrc file: \""
-msgstr "        系统 vimrc 配置文件: \""
+msgstr "     系统 vimrc 文件: \""
 
 msgid "     user vimrc file: \""
-msgstr "  用户的 vimrc 配置文件: \""
+msgstr "     用户 vimrc 文件: \""
 
 msgid " 2nd user vimrc file: \""
-msgstr "    第二组用户 vimrc 文件: \""
+msgstr " 第二用户 vimrc 文件: \""
 
 msgid " 3rd user vimrc file: \""
-msgstr "    第三组用户 vimrc 文件: \""
+msgstr " 第三用户 vimrc 文件: \""
 
 msgid "      user exrc file: \""
-msgstr "   用户的 exrc 配置文件: \""
+msgstr "      用户 exrc 文件: \""
 
 msgid "  2nd user exrc file: \""
-msgstr "   第二组用户 exrc 文件: \""
+msgstr "  第二用户 exrc 文件: \""
 
 msgid "  system gvimrc file: \""
-msgstr "         系统 gvimrc 文件: \""
+msgstr "    系统 gvimrc 文件: \""
 
 msgid "    user gvimrc file: \""
-msgstr "     用户的 gvimrc 配置文件: \""
+msgstr "    用户 gvimrc 文件: \""
 
 msgid "2nd user gvimrc file: \""
-msgstr "   第二组用户 gvimrc 文件: \""
+msgstr "第二用户 gvimrc 文件: \""
 
 msgid "3rd user gvimrc file: \""
-msgstr "   第三组用户 gvimrc 文件: \""
+msgstr "第三用户 gvimrc 文件: \""
 
 msgid "    system menu file: \""
-msgstr "           系统菜单配置文件: \""
+msgstr "        系统菜单文件: \""
 
 msgid "  fall-back for $VIM: \""
-msgstr "              $VIM 预设值: \""
+msgstr "         $VIM 预设值: \""
 
 msgid " f-b for $VIMRUNTIME: \""
-msgstr "       $VIMRUNTIME 预设值: \""
+msgstr "  $VIMRUNTIME 预设值: \""
 
 msgid "Compilation: "
 msgstr "编译方式: "
@@ -4314,7 +5566,7 @@ msgid "Compiler: "
 msgstr "编译器: "
 
 msgid "Linking: "
-msgstr "链结方式: "
+msgstr "链接方式: "
 
 msgid "  DEBUG BUILD"
 msgstr "  调试版本"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
 msgid "version "
-msgstr "版本   "
+msgstr "版本 "
 
 msgid "by Bram Moolenaar et al."
-msgstr "维护人: Bram Moolenaar et al."
+msgstr "维护人 Bram Moolenaar 等"
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim 为可自由发行的开放源代码软件"
+msgstr "Vim 是可自由分发的开放源代码软件"
 
 msgid "Help poor children in Uganda!"
-msgstr "帮助乌干达的可怜儿童!"
+msgstr "帮助乌干达的可怜儿童！"
 
 msgid "type  :help iccf<Enter>       for information "
-msgstr "进一步说明请输入          :help iccf<Enter>"
+msgstr "输入  :help iccf<Enter>       查看说明        "
 
 msgid "type  :q<Enter>               to exit         "
-msgstr "要退出请输入                  :q<Enter>            "
+msgstr "输入  :q<Enter>               退出            "
 
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "在线帮助请输入                :help<Enter>         "
+msgstr "输入  :help<Enter>  或  <F1>  查看在线帮助    "
 
-msgid "type  :help version6<Enter>   for version info"
-msgstr "新版本信息请输入              :help version6<Enter>"
+msgid "type  :help version7<Enter>   for version info"
+msgstr "输入  :help version7<Enter>   查看版本信息    "
 
 msgid "Running in Vi compatible mode"
-msgstr "Vi 兼容模式"
+msgstr "运行于 Vi 兼容模式"
 
 msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "如果要完全模拟传统 Vi 请输入 :set nocp<Enter>"
+msgstr "输入  :set nocp<Enter>        恢复默认的 Vim  "
 
 msgid "type  :help cp-default<Enter> for info on this"
-msgstr "如果需要对 Vi 兼容模式进一步说明请输入 :help cp-default<Enter>"
+msgstr "输入  :help cp-default<Enter> 查看相关说明    "
+
+msgid "menu  Help->Orphans           for information    "
+msgstr "菜单  Help->Orphans           查看说明           "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "无模式运行，输入文字即插入"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "菜单  Edit->Global Settings->Toggle Insert Mode  "
+
+#, fuzzy
+#~ msgid "                              for two modes      "
+#~ msgstr " # pid    数据库名称                          prepend path\n"
+
+#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "                              for Vim defaults   "
+#~ msgstr " # pid    数据库名称                          prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "赞助 Vim 的开发！"
+
+msgid "Become a registered Vim user!"
+msgstr "成为 Vim 的注册用户！"
+
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "输入  :help sponsor<Enter>    查看说明        "
+
+msgid "type  :help register<Enter>   for information "
+msgstr "输入  :help register<Enter>   查看说明        "
+
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "菜单  Help->Sponsor/Register  查看说明           "
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "注意: 检测到 Windows 95/98/ME"
+msgstr "警告: 检测到 Windows 95/98/ME"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr "如果需要对 Windows 95 支持的更多信息请输入 :help windows95<Enter>"
+msgstr "输入  :help windows95<Enter>  查看相关说明    "
 
 msgid "E441: There is no preview window"
 msgstr "E441: 没有预览窗口"
 
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: 不能同时分割窗口为左上和右下角"
+msgstr "E442: 不能同时进行 topleft 和 botright 分割"
 
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: 有其它分割窗口时不能旋转"
@@ -4386,261 +5673,472 @@ msgstr "E446: 光标处没有文件名"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: 在路径中找不到文件 \"%s\""
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: 无法加载库 %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "抱歉，此命令不可用: 无法加载 Perl 库。"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
 msgid "Edit with &multiple Vims"
-msgstr "用 &multiple Vims 编辑"
+msgstr "用多个 Vim 编辑(&M)"
 
 msgid "Edit with single &Vim"
-msgstr "用 single &Vim 编辑"
+msgstr "用单个 Vim 编辑(&V)"
+
+msgid "Diff with Vim"
+msgstr "用 Vim 比较(diff)"
 
 msgid "Edit with &Vim"
-msgstr "用 &Vim 编辑"
+msgstr "用 Vim 编辑(&V)"
 
 #. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "用当前的 Vim 编辑 - &"
+msgid "Edit with existing Vim - "
+msgstr "用当前的 Vim 编辑 - "
 
 msgid "Edits the selected file(s) with Vim"
-msgstr "用 Vim 编辑选择的文件"
+msgstr "用 Vim 编辑选中的文件"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "创建进程失败: 请检查gvim是否在可执行路径中!"
+msgstr "创建进程失败: 请检查 gvim 是否在路径中！"
 
 msgid "gvimext.dll error"
-msgstr "gvimext.dll 出错"
+msgstr "gvimext.dll 错误"
 
 msgid "Path length too long!"
-msgstr "路径名太长"
+msgstr "路径太长！"
 
 msgid "--No lines in buffer--"
-msgstr "--缓冲区无资料--"
+msgstr "--缓冲区无内容--"
 
 #.
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-msgid "Command aborted"
-msgstr "命令被强制中断"
+msgid "E470: Command aborted"
+msgstr "E470: 命令被中止"
 
-msgid "Argument required"
-msgstr "需要指令参数"
+msgid "E471: Argument required"
+msgstr "E471: 需要参数"
 
 msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ 后面应该有 / ? 或 &"
+msgstr "E10: \\ 后面应该跟有 /、? 或 &"
 
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: 不能在命令行窗口中使用。<CR>执行，CTRL-C 退出"
+msgstr "E11: 在命令行窗口中无效；<CR> 执行，CTRL-C 退出"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc 里的指令不能执行"
+msgstr "E12: 当前目录中的 exrc/vimrc 或 tag 查找中不允许此命令"
+
+msgid "E171: Missing :endif"
+msgstr "E171: 缺少 :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: 缺少 :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: 缺少 :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: 缺少 :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile 缺少对应的 :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor 缺少对应的 :for"
 
 msgid "E13: File exists (add ! to override)"
-msgstr "E13: 文件已经存在 (可用 ! 强制替换)"
+msgstr "E13: 文件已存在 (请加 ! 强制执行)"
 
-msgid "Command failed"
-msgstr "命令执行失败"
+msgid "E472: Command failed"
+msgstr "E472: 命令执行失败"
 
-msgid "Internal error"
-msgstr "内部错误"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: 未知的 Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: 未知的字体: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: 字体 \"%s\" 不是等宽字体"
+
+msgid "E473: Internal error"
+msgstr "E473: 内部错误"
 
 msgid "Interrupted"
 msgstr "已中断"
 
 msgid "E14: Invalid address"
-msgstr "E14: 不正确的地址"
+msgstr "E14: 无效的地址"
 
-msgid "Invalid argument"
-msgstr "不正确的参数"
+msgid "E474: Invalid argument"
+msgstr "E474: 无效的参数"
 
 #, c-format
-msgid "Invalid argument: %s"
-msgstr "不正确的参数: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: 无效的参数: %s"
 
 #, c-format
 msgid "E15: Invalid expression: %s"
-msgstr "E15: 不正确的表达式: %s"
+msgstr "E15: 无效的表达式: %s"
 
 msgid "E16: Invalid range"
-msgstr "E16: 不正确的范围"
+msgstr "E16: 无效的范围"
 
-msgid "Invalid command"
-msgstr "不正确的命令"
+msgid "E476: Invalid command"
+msgstr "E476: 无效的命令"
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" 是目录"
 
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' 前面出现了错误的字符"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: 调用函数库 \"%s()\" 失败"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: 无法加载库函数 %s"
 
 msgid "E19: Mark has invalid line number"
-msgstr "E19: 标记的行号错误"
+msgstr "E19: 标记的行号无效"
 
 msgid "E20: Mark not set"
 msgstr "E20: 没有设定标记"
 
 msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 因为 'modifiable' 选项是关闭的，所以不能修改"
+msgstr "E21: 不能修改，因为选项 'modifiable' 是关的"
 
 msgid "E22: Scripts nested too deep"
-msgstr "E22: 递归调用太多层"
+msgstr "E22: 脚本嵌套过深"
 
 msgid "E23: No alternate file"
-msgstr "E23: 没有替代的文件"
+msgstr "E23: 没有交替文件"
 
 msgid "E24: No such abbreviation"
-msgstr "E24: 没有这个 abbreviation 对应"
+msgstr "E24: 没有这个缩写"
 
-msgid "No ! allowed"
-msgstr "不可使用 '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: 不能使用 \"!\""
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: 因为编译时没有加入图型界面的程序代码，所以不能使用图型界面"
+msgstr "E25: 无法使用图形界面: 编译时没有启用"
 
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: 因为编译时没有加入希伯莱的程序代码，所以不能使用 Hebrew\n"
+msgstr "E26: 无法使用 Hebrew: 编译时没有启用\n"
 
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: 因为编译时没有加入 Farsi 的程序代码，所以不能使用 Farsi\n"
+msgstr "E27: 无法使用 Farsi: 编译时没有启用\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: 无法使用 Arabic: 编译时没有启用\n"
 
 #, c-format
 msgid "E28: No such highlight group name: %s"
-msgstr "E28: 没有名为 '%s' 的 highlight group"
+msgstr "E28: 没有这个高亮群组名: %s"
 
 msgid "E29: No inserted text yet"
 msgstr "E29: 没有插入过文字"
 
 msgid "E30: No previous command line"
-msgstr "E30: 没有前一项命令"
+msgstr "E30: 没有前一个命令行"
 
 msgid "E31: No such mapping"
-msgstr "E31: 没有这个 mapping 对应"
+msgstr "E31: 没有这个映射"
 
-msgid "No match"
-msgstr "找不到"
+msgid "E479: No match"
+msgstr "E479: 没有匹配"
 
 #, c-format
-msgid "No match: %s"
-msgstr "找不到: %s"
+msgid "E480: No match: %s"
+msgstr "E480: 没有匹配: %s"
 
 msgid "E32: No file name"
 msgstr "E32: 没有文件名"
 
 msgid "E33: No previous substitute regular expression"
-msgstr "E33: 没有前一个查找/替换的命令"
+msgstr "E33: 没有前一个替换正则表达式"
 
 msgid "E34: No previous command"
 msgstr "E34: 没有前一个命令"
 
 msgid "E35: No previous regular expression"
-msgstr "E35: 没有前一个查找命令"
+msgstr "E35: 没有前一个正则表达式"
 
-msgid "No range allowed"
-msgstr "不可使用范围命令"
+msgid "E481: No range allowed"
+msgstr "E481: 不能使用范围"
 
 msgid "E36: Not enough room"
 msgstr "E36: 没有足够的空间"
 
 #, c-format
-msgid "Can't create file %s"
-msgstr "不能创建文件 %s"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: 没有名叫 \"%s\" 的已注册的服务器"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: 无法创建文件 %s"
 
-msgid "Can't get temp file name"
-msgstr "不能得到临时文件名"
+msgid "E483: Can't get temp file name"
+msgstr "E483: 无法获取临时文件名"
 
 #, c-format
-msgid "Can't open file %s"
-msgstr "不能打开文件 %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: 无法打开文件 %s"
 
 #, c-format
-msgid "Can't read file %s"
-msgstr "不能读取文件 %s"
+msgid "E485: Can't read file %s"
+msgstr "E485: 无法读取文件 %s"
 
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: 文件内容已改变但尚未保存 (可用 ! 强制执行)"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 已修改但尚未保存 (可用 ! 强制执行)"
 
 msgid "E38: Null argument"
-msgstr "E38: 空的 (Null) 参数"
+msgstr "E38: 空的参数"
 
 msgid "E39: Number expected"
-msgstr "E39: 应该要有数字"
+msgstr "E39: 此处需要数字"
 
 #, c-format
 msgid "E40: Can't open errorfile %s"
-msgstr "E40: 不能打开错误文件 %s"
+msgstr "E40: 无法打开错误文件 %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: 无法打开 display"
 
 msgid "E41: Out of memory!"
-msgstr "E41: 内存不足!"
+msgstr "E41: 内存不足！"
 
 msgid "Pattern not found"
 msgstr "找不到模式"
 
 #, c-format
-msgid "Pattern not found: %s"
-msgstr "找不到模式 %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: 找不到模式: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: 参数必须是正数"
 
-msgid "Argument must be positive"
-msgstr "参数应该是正数"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: 无法回到前一个目录"
 
 msgid "E42: No Errors"
 msgstr "E42: 没有错误"
 
+msgid "E776: No location list"
+msgstr "E776: 没有 location 列表"
+
 msgid "E43: Damaged match string"
-msgstr "E43: 匹配字符串有问题"
+msgstr "E43: 已损坏的匹配字符串"
 
 msgid "E44: Corrupted regexp program"
-msgstr "E44: 正则表达式有问题"
+msgstr "E44: 已损坏的正则表达式程序"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 已设定选项 'readonly' (请加 ! 强制执行)"
 
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: 设定 'readonly' 选项(只读) (可用 ! 强制执行)"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 不能改变只读变量 \"%s\""
 
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 不能设定只读变量 \"%s\""
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: 不能在 sandbox 中设定变量: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: 读取错误文件失败"
 
 msgid "E48: Not allowed in sandbox"
-msgstr "E48: 不能在 sandbox 里出现"
+msgstr "E48: 不允许在 sandbox 中使用"
+
+msgid "E523: Not allowed here"
+msgstr "E523: 不允许在此使用"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: 不支持设定屏幕模式"
 
 msgid "E49: Invalid scroll size"
-msgstr "E49: 错误的滚动大小"
+msgstr "E49: 无效的滚动大小"
 
 msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: 选项 'shell' 未设定"
+msgstr "E91: 选项 'shell' 为空"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: 无法读取 sign 数据！"
 
 msgid "E72: Close error on swap file"
 msgstr "E72: 交换文件关闭错误"
 
 msgid "E73: tag stack empty"
-msgstr "E73: 标签堆栈已空"
+msgstr "E73: tag 堆栈为空"
 
 msgid "E74: Command too complex"
-msgstr "E74: 命令太复杂"
+msgstr "E74: 命令过复杂"
 
 msgid "E75: Name too long"
-msgstr "E75: 名字太长"
+msgstr "E75: 名字过长"
 
 msgid "E76: Too many ["
-msgstr "E76: 太多 ["
+msgstr "E76: [ 过多"
 
 msgid "E77: Too many file names"
-msgstr "E77: 太多文件名"
+msgstr "E77: 文件名过多"
 
-msgid "Trailing characters"
-msgstr "你输入了多余的字符"
+msgid "E488: Trailing characters"
+msgstr "E488: 多余的尾部字符"
 
 msgid "E78: Unknown mark"
-msgstr "E78: 不能办识的标记"
+msgstr "E78: 未知的标记"
 
 msgid "E79: Cannot expand wildcards"
-msgstr "E79: 不能扩展通配符"
+msgstr "E79: 无法扩展通配符"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' 不能小于 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' 不能小于 'winminwidth'"
 
 msgid "E80: Error while writing"
-msgstr "E80: 写入错误"
+msgstr "E80: 写入出错"
 
 msgid "Zero count"
-msgstr "数到零 (?)"
+msgstr "计数为零"
 
 msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> 不能在 script 本文外使用."
+msgstr "E81: 在脚本环境外使用了 <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: 收到无效的表达式"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans 不允许改变只读文件"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部错误: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: 表达式的内存使用超出 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: 空的缓冲区"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 无效的搜索表达式或分隔符"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: 文件已在另一个缓冲区中被加载"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: 没有设定选项 '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "已查找到文件开头，再从结尾继续查找"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "已查找到文件结尾，再从开头继续查找"
+
+#~ msgid "[No file]"
+#~ msgstr "[未命名]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[错误列表]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: 未定义的变量: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: 函数 %s 的参数太少"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> 不能在 script 上下文外使用: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: 函数 %s 尚未定义"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: 函数 %s 正在使用中，不能重新定义"
+
+#~ msgid "function "
+#~ msgstr "函数 "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: 函数 %s 尚未定义"
+
+#~ msgid "Run Macro"
+#~ msgstr "执行宏"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s 为不能识别的颜色名称"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "读取 cscope 连接 %d 时错误"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: 找不到 cscope 连接"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope 连接已关闭"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "不能使用 malloc\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <无>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: 不能读取 VIM 的 注册表属性"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\t显示 Gnome 相关参数"
+
+#~ msgid "[string too long]"
+#~ msgstr "[字符串太长]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "请按 ENTER 继续"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: 向下/向上一行, 空格/b: 一页, d/u: 半页, q: 退出)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: 向下一行, 空白键: 一页, d: 半页, q: 退出)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: 不能执行; regular expression 太复杂?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression 造成堆栈用光的错误"
+
+#~ msgid " BLOCK"
+#~ msgstr " 块"
+
+#~ msgid " LINE"
+#~ msgstr " 行"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "输入 nr 或选择 (<CR> 退出): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "线性查找标签 (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "二进制查找(Binary search) 标签(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "使用 BeOS 图形界面。"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 0a5b7a762..6e701ac3f 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -7,53 +7,53 @@
 #
 # Generated from zh_CN.po, DO NOT EDIT.
 #
-#, no-wrap
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\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"
+"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"
 "Content-Type: text/plain; charset=gbk\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ���ܷ����κλ��������˳�����..."
+msgstr "E82: �޷������κλ��������˳�����..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ���ܷ��仺������ʹ����һ��������...."
+msgstr "E83: �޷����仺������ʹ����һ��������..."
 
-msgid "No buffers were unloaded"
-msgstr "û���ͷ��κλ�����"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: û���ͷ��κλ�����"
 
-msgid "No buffers were deleted"
-msgstr "û��ɾ���κλ�����"
+msgid "E516: No buffers were deleted"
+msgstr "E516: û��ɾ���κλ�����"
 
-msgid "No buffers were wiped out"
-msgstr "û��ɾ���κλ�����"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: û������κλ�����"
 
 msgid "1 buffer unloaded"
-msgstr "���ͷ�һ��������"
+msgstr "�ͷ��� 1 ��������"
 
 #, c-format
 msgid "%d buffers unloaded"
-msgstr "���ͷ� %d ��������"
+msgstr "�ͷ��� %d ��������"
 
 msgid "1 buffer deleted"
-msgstr "��ɾ��һ��������"
+msgstr "ɾ���� 1 ��������"
 
 #, c-format
 msgid "%d buffers deleted"
-msgstr "��ɾ�� %d ��������"
+msgstr "ɾ���� %d ��������"
 
 msgid "1 buffer wiped out"
-msgstr "��ɾ��һ��������"
+msgstr "����� 1 ��������"
 
 #, c-format
 msgid "%d buffers wiped out"
-msgstr "��ɾ�� %d ��������"
+msgstr "����� %d ��������"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: û���޸Ĺ��Ļ�����"
@@ -63,43 +63,43 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: û�п��г��Ļ�����"
 
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: �����л����� %ld ��������"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: ������ %ld ������"
 
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �����л���������Ļ�����"
+msgstr "E87: �޷��л����������һ��������"
 
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: �����л�����ǰ��Ļ�����"
+msgstr "E88: �޷��л������ǵ�һ��������"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: �Ѹ��Ĺ������� %ld ����δ���� (���� ! ǿ��ִ��)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: ������ %ld ���޸ĵ���δ���� (��� ! ǿ��ִ��)"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: �����ͷ����һ��������"
+msgstr "E90: �޷��ͷ����һ��������"
 
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: ����: �ļ�������"
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: �Ҳ����� %ld ��������"
+msgstr "E92: �Ҳ��������� %ld"
 
 #, c-format
 msgid "E93: More than one match for %s"
-msgstr "E93: �ҵ�һ�����ϵ� %s"
+msgstr "E93: �ҵ���ֹһ�� %s"
 
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: �Ҳ��� %s"
+msgstr "E94: û��ƥ��Ļ����� %s"
 
 #, c-format
 msgid "line %ld"
-msgstr "�� %ld"
+msgstr "�� %ld ��"
 
 msgid "E95: Buffer with this name already exists"
-msgstr "E95: ���л�����ʹ���������"
+msgstr "E95: ���л�����ʹ�ø�����"
 
 msgid " [Modified]"
 msgstr " [���޸�]"
@@ -118,24 +118,24 @@ msgstr "[ֻ��]"
 
 #, c-format
 msgid "1 line --%d%%--"
-msgstr "���� 1 --%d%%--"
+msgstr "1 �� --%d%%--"
 
 #, c-format
 msgid "%ld lines --%d%%--"
-msgstr "���� %ld --%d%%--"
+msgstr "%ld �� --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
-msgstr "�� %ld/%ld --%d%%-- �� "
+msgstr "�� %ld / %ld --%d%%-- �� "
 
-msgid "[No file]"
+msgid "[No Name]"
 msgstr "[δ����]"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[����]"
+msgstr "����"
 
-msgid "[help]"
+msgid "[Help]"
 msgstr "[����]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "�׶�"
 msgid "Top"
 msgstr "����"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# �������б�:\n"
 
-msgid "[Error List]"
-msgstr "[�����б�]"
+msgid "[Location List]"
+msgstr "[Location �б�]"
 
-msgid "[No File]"
-msgstr "[δ����]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix �б�]"
 
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
-"--- ���� ---"
+"--- Signs ---"
 
 #, c-format
 msgid "Signs for %s:"
-msgstr "%s �ķ���:"
+msgstr "%s �� Signs:"
 
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
@@ -180,91 +181,99 @@ msgstr "    ��=%ld  id=%d  ����=%s"
 
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: ���ܱȽ�(diff) %ld�����ϵĻ�����"
+msgstr "E96: ���ܱȽ�(diff) %ld �����ϵĻ�����"
 
 msgid "E97: Cannot create diffs"
-msgstr "E97: ���ܴ��� diff "
+msgstr "E97: �޷����� diff"
 
 msgid "Patch file"
 msgstr "Patch �ļ�"
 
 msgid "E98: Cannot read diff output"
-msgstr "E98: ���ܶ�ȡ diff �����"
+msgstr "E98: �޷���ȡ diff �����"
 
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Ŀǰ�Ļ����������� diff ģʽ"
+msgstr "E99: ��ǰ���������� diff ģʽ"
 
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: û�л������� diff ģʽ"
+msgstr "E100: û���������� diff ģʽ�Ļ�����"
 
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ���������ϵĻ������� diff ģʽ�����ܾ���Ҫ����һ��"
+msgstr "E101: ���������ϵĻ��������� diff ģʽ�����ܾ�������һ��"
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �Ҳ���������: \"%s\""
+msgstr "E102: �Ҳ��������� \"%s\""
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ������ \"%s\" ������ diff ģʽ"
+msgstr "E103: ������ \"%s\" ���� diff ģʽ"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����ַ�(digraph)�в���ʹ�� Escape"
 
-msgid "Keymap file not found"
-msgstr "�Ҳ��� keymap �ļ�"
+msgid "E544: Keymap file not found"
+msgstr "E544: �Ҳ��� Keymap �ļ�"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ʹ�� :loadkeymap "
+msgstr "E105: �����ڽű��ļ���ʹ�� :loadkeymap "
 
-msgid " Keyword completion (^N/^P)"
-msgstr " �ؼ����Զ���� (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " �ؼ��ֲ�ȫ (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X ģʽ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^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 " Whole line completion (^L^N^P)"
+msgstr " ���в�ȫ (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " �ļ�����ȫ (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag ��ȫ (^]^N^P)"
 
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " ����ؼ����Զ���� (^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " ·��ģʽ��ȫ (^N^P)"
 
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " �����Զ���� (^L/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " ���岹ȫ (^D^N^P)"
 
-msgid " File name completion (^F/^N/^P)"
-msgstr " �ļ����Զ���� (^F/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary ��ȫ (^K^N^P)"
 
-msgid " Tag completion (^]/^N/^P)"
-msgstr " ��ǩ�Զ���� (^]/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus ��ȫ (^T^N^P)"
 
-msgid " Path pattern completion (^N/^P)"
-msgstr " ·���Զ���� (^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " �����в�ȫ (^V^N^P)"
 
-msgid " Definition completion (^D/^N/^P)"
-msgstr " �����Զ���� (^D/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " �û��Զ��岹ȫ (^U^N^P)"
 
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " �ֵ��Զ���� (^K/^N/^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " ȫ�ܲ�ȫ (^O^N^P)"
 
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus �Զ���� (^T/^N/^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " ƴд���� (^S^N^P)"
 
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " �����Զ���� (^V/^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " �ؼ��־ֲ���ȫ (^N^P)"
 
 msgid "Hit end of paragraph"
 msgstr "�ѵ������β"
 
-msgid "'thesaurus' option is empty"
-msgstr "ѡ�� 'thesaurus' δ�趨"
-
 msgid "'dictionary' option is empty"
 msgstr "ѡ�� 'dictionary' Ϊ��"
 
+msgid "'thesaurus' option is empty"
+msgstr "ѡ�� 'thesaurus' Ϊ��"
+
 #, c-format
 msgid "Scanning dictionary: %s"
-msgstr "ɨ���ֵ�: %s"
+msgstr "����ɨ�� dictionary: %s"
 
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (����) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@ msgstr " (�滻) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "ɨ����: %s"
+msgstr "����ɨ��: %s"
 
+#, c-format
 msgid "Scanning tags."
 msgstr "ɨ���ǩ."
 
@@ -287,45 +297,157 @@ msgstr " ����"
 #. * longer needed.  -- Acevedo.
 #.
 msgid "-- Searching..."
-msgstr "-- ��Ѱ��..."
+msgstr "-- ������..."
 
 msgid "Back at original"
 msgstr "�ص����"
 
 msgid "Word from other line"
-msgstr "�������п�ʼ�Ĵ� (?)"
+msgstr "��һ�еĴ�"
 
 msgid "The only match"
-msgstr "ֻ�д���ƥ��"
+msgstr "Ψһƥ��"
 
 #, c-format
 msgid "match %d of %d"
-msgstr "�ҵ� %d / %d"
+msgstr "ƥ�� %d / %d"
 
 #, c-format
 msgid "match %d"
 msgstr "ƥ�� %d"
 
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let �г����쳣�ַ�"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List ����������Χ: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: δ����ı���: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: ȱ�� ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �Ĳ��������� List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �Ĳ��������� List ���� Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary �ļ�����Ϊ��"
+
+msgid "E714: List required"
+msgstr "E714: ��Ҫ List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: ��Ҫ Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �����Ĳ�������: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary �в����ڼ�: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ���� %s �Ѵ��ڣ���� ! ǿ���滻"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary ���Ѵ���"
+
+msgid "E718: Funcref required"
+msgstr "E718: ��Ҫ Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= �ı������Ͳ���ȷ"
+
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: δ����ı���: \"%s\""
+msgid "E130: Unknown function: %s"
+msgstr "E130: δ֪�ĺ���: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: ��Ч�ı�����: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Ŀ��� List ������"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Ŀ��� List ������"
+
+msgid "Double ; in list of variables"
+msgstr "�����б��г������� ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: �޷��г� %s �ı���"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ֻ������ List �� Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ���������"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ��Ҫһ�� List ֵ"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List ֵ�����Ŀ���"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List ֵû���㹻�����"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ��ȱ�� \"in\""
 
 #, c-format
 msgid "E107: Missing braces: %s"
-msgstr "E107: ȱ�ٶ�Ӧ������: %s"
+msgstr "E107: ȱ������: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �޴˱���: \"%s\""
 
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock �ı���Ƕ�׹���"
+
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' ��ȱ�� ':'"
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: ֻ�ܱȽ� List �� List"
+
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: �� List ��Ч�Ĳ���"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ֻ�ܱȽ� Dictionary �� Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: �� Dictionary ��Ч�Ĳ���"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: ֻ�ܱȽ� Funcref �� Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �� Funcrefs ��Ч�Ĳ���"
+
 msgid "E110: Missing ')'"
-msgstr "E110: ȱ�ٶ�Ӧ�� \")\""
+msgstr "E110: ȱ�� ')'"
 
-msgid "E111: Missing ']'"
-msgstr "E111: ȱ�ٶ�Ӧ�� \"]\""
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ��������һ�� Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: ȱ��ѡ������: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: ����ȷ��ѡ��: %s"
+msgstr "E113: δ֪��ѡ��: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: ȱ������: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ���� %s �Ĳ�������ȷ"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List ��ȱ�ٶ���: %s"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: δ����ĺ���: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List ȱ�ٽ����� ']': %s"
 
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ���� %s �Ĳ�������"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary ��ȱ��ð��: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ���� %s �Ĳ���̫��"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary �г����ظ��ļ�: \"%s\""
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ������ script ��������ʹ��: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary ��ȱ�ٶ���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary ȱ�ٽ����� '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: ����Ƕ�׹���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ��������"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() ֻ���ڲ���ģʽ��ʹ��"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "ȷ��(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ���Ѵ���: %s"
 
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld ��: "
 
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: δ֪�ĺ���: %s"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -374,91 +526,148 @@ msgstr ""
 "ȷ��(&O)\n"
 "ȡ��(&C)"
 
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() �ĵ��ô������� inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: �������ķ�Χ"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() ��������Ч"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ����Ϊ��"
+
+msgid "E727: Start past end"
+msgstr "E727: ��ʼֵ����ֵֹ��"
+
+msgid "<empty>"
+msgstr "<��>"
+
 msgid "E240: No connection to Vim server"
-msgstr "E240: û���� Vim Server ��������"
+msgstr "E240: û�е� Vim ������������"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: �޷����͵� %s"
 
 msgid "E277: Unable to read a server reply"
-msgstr "E277: ���ܶ�ȡ����������Ӧ"
+msgstr "E277: �޷���ȡ��������Ӧ"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: �������ӹ���(ѭ����)"
 
 msgid "E258: Unable to send to client"
-msgstr "E258: ���ܴ��͵��ͻ���"
+msgstr "E258: �޷����͵��ͻ���"
 
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: ���ܴ��͵� %s"
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort �ȽϺ���ʧ��"
 
 msgid "(Invalid)"
 msgstr "(��Ч)"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: д��ʱ�ļ�����"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: �� Funcref ������ʹ��"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: �� List ������ʹ��"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: �� Dictionary ������ʹ��"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: �� Funcref �� String ʹ��"
+
+msgid "E730: using List as a String"
+msgstr "E730: �� List �� String ʹ��"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �� Dictionary �� String ʹ��"
+
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ���� %s ��δ����"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref �����������Դ�д��ĸ��ͷ: %s"
 
 #, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: ���� %s �Ѿ�����, ��ʹ�� ! ǿ���滻"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: �����������к�������ͻ: %s"
 
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ���� %s ��δ����"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: �������Ͳ�ƥ��: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ֵ������: %s"
+
+msgid "Unknown"
+msgstr "δ֪"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: �޷��ı� %s ��ֵ"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: ����Ƕ�׹���"
 
 #, c-format
 msgid "E124: Missing '(': %s"
-msgstr "E124: ȱ�� \"(\": %s"
+msgstr "E124: ȱ�� '(': %s"
 
 #, c-format
 msgid "E125: Illegal argument: %s"
-msgstr "E125: ��������ȷ: %s"
+msgstr "E125: ��Ч�Ĳ���: %s"
 
 msgid "E126: Missing :endfunction"
 msgstr "E126: ȱ�� :endfunction"
 
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���� %s ����ʹ���У��������¶���"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: �������Ƶ�һ����ĸ�����д: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ��������ű��ļ�����ƥ��: %s"
 
 msgid "E129: Function name required"
-msgstr "E129: ��Ҫ��������"
-
-msgid "function "
-msgstr "���� "
+msgstr "E129: ��Ҫ������"
 
 #, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: ���� %s ��δ����"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
 
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ���� %s ����ʹ���У�����ɾ��"
+msgstr "E131: �޷�ɾ������ %s: ����ʹ����"
 
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �����ݹ���ò������� 'maxfuncdepth'"
+msgstr "E132: ����������ȳ��� 'maxfuncdepth'"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "calling %s"
 msgstr "���� %s"
 
-#. always scroll up, don't overwrite
 #, c-format
-msgid "continuing in %s"
-msgstr "����: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return �����ں�����ʹ��"
+msgid "%s aborted"
+msgstr "%s ����ֹ"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s ����ֵ #%ld "
+msgstr "%s ���� #%ld "
 
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ����ֵ \"%s\""
+msgid "%s returning %s"
+msgstr "%s ���� %s"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "�� %s �м���"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return ���ں�����"
+
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -466,76 +675,90 @@ msgstr ""
 "\n"
 "# ȫ�ֱ���:\n"
 
-msgid "Entering Debug mode.  Type \"cont\" to leave."
-msgstr "�������ģʽ. ���� \"cont\" �Իص�����ģʽ."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t����޸��� "
+
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "�������ģʽ������ \"cont\" �������С�"
 
 #, c-format
 msgid "line %ld: %s"
-msgstr "�� %ld: %s"
+msgstr "�� %ld ��: %s"
 
 #, c-format
 msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "����: %s"
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" �жϵ�: �� %ld ��"
+msgstr "�ϵ� \"%s%s\" �� %ld ��"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �Ҳ����жϵ�: %s"
+msgstr "E161: �Ҳ����ϵ�: %s"
 
 msgid "No breakpoints defined"
-msgstr "û�ж����жϵ�"
+msgstr "û�ж���ϵ�"
 
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  �� %ld ��"
 
+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\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "���ı䱣�浽 \"%s\" ��"
 
 msgid "Untitled"
 msgstr "δ����"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: �Ѹ��Ĺ������� \"%s\" ����δ���� (���� ! ǿ��ִ��)"
+msgstr "E162: ������ \"%s\" ���޸ĵ���δ����"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "ע��: ���л������������� (���� Autocommands ���޴���)"
+msgstr "����: ����ؽ��������������� (�����Զ�����)"
 
 msgid "E163: There is only one file to edit"
 msgstr "E163: ֻ��һ���ļ��ɱ༭"
 
 msgid "E164: Cannot go before first file"
-msgstr "E164: �Ѿ��ڵ�һ���ļ���"
+msgstr "E164: �޷��л������ǵ�һ���ļ�"
 
 msgid "E165: Cannot go beyond last file"
-msgstr "E165: �Ѿ������һ���ļ���"
+msgstr "E165: �޷��л����������һ���ļ�"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ��֧�ֱ�����: %s"
 
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "������: \"%s\" -- \"%s\""
+msgstr "���ڲ��� \"%s\"���� \"%s\" ��"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "������: \"%s\""
+msgstr "���ڲ��� \"%s\""
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
+msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
 
-msgid "Run Macro"
-msgstr "ִ�к�"
+msgid "Source Vim script"
+msgstr "ִ�� Vim �ű�"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "����ִ��Ŀ¼�� \"%s\""
+msgstr "����ִ��Ŀ¼: \"%s\""
 
 #, c-format
 msgid "could not source \"%s\""
@@ -547,69 +770,43 @@ msgstr "�� %ld ��: ����ִ�� \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "ִ�� \"%s\" ��"
+msgstr "ִ�� \"%s\""
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "�� %ld ��: ����ִ�� %s"
+msgstr "�� %ld ��: ִ�� \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
 msgstr "����ִ�� %s"
 
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ע��: ������зָ��ַ������������� ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ��ִ�� script �ļ��ⲻ��ʹ�� :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ��ִ�� script �ļ��ⲻ��ʹ�� :finish"
-
-msgid "No text to be printed"
-msgstr "û��Ҫ��ӡ������"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "��ӡ��: �� %d ҳ (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "���� %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "�Ѵ�ӡ: %s"
-
-msgid "Printing aborted"
-msgstr "��ӡ�ж�"
+msgid "modeline"
+msgstr "modeline"
 
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: д�� PostScript �ļ�����"
+msgid "--cmd argument"
+msgstr "--cmd ����"
 
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ���ܴ� PostScript ����ļ�"
+msgid "-c argument"
+msgstr "-c ����"
 
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: ���ܴ��ļ� \"%s\""
+msgid "environment variable"
+msgstr "��������"
 
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ���ܶ� PostScript ��Դ�ļ� \"%s\""
+#~ msgid "error handler"
+#~ msgstr ""
 
-msgid "Sending to printer..."
-msgstr "���͵���ӡ��..."
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: ����: ������зָ��������������� ^M"
 
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: ��ӡ PostScript �ļ�ʧ��"
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: �ڽű��ļ���ʹ���� :scriptencoding"
 
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: �ڽű��ļ���ʹ���� :finish"
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "Ŀǰ�� %s����: \"%s\""
+msgstr "��ǰ�� %s����: \"%s\""
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@ msgstr "E197: �����趨����Ϊ \"%s\""
 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: ���ܰ����Ƶ���������"
+msgstr "E134: �����ƶ���������"
 
 msgid "1 line moved"
-msgstr "���ƶ� 1 ��"
+msgstr "�ƶ��� 1 ��"
 
 #, c-format
 msgid "%ld lines moved"
-msgstr "�Ѱ��� %ld ��"
+msgstr "�ƶ��� %ld ��"
 
 #, c-format
 msgid "%ld lines filtered"
-msgstr "�Ѵ��� %ld ��"
+msgstr "������ %ld ��"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand �����Ը��Ļ�����������"
+msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
 
 msgid "[No write since last change]\n"
-msgstr "[���º���δ����]\n"
+msgstr "[���޸ĵ���δ����]\n"
 
 #, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s ������: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s λ����: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �������, �����ļ����ಿ��"
+msgstr "E136: viminfo: ������࣬�����ļ���ʣ�ಿ��"
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@ msgstr " ʧ��"
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo �ļ�����д��: %s"
+msgstr "E137: Viminfo �ļ�����д��: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ����д�� viminfo �ļ� %s !"
+msgstr "E138: �޷�д�� viminfo �ļ� %s��"
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "д�� viminfo �ļ� \"%s\" ��"
+msgstr "д�� viminfo �ļ� \"%s\""
 
 #. Write the info:
-#, c-format
+#, 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"
+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"
 "\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 "��Ч�������ַ�"
 
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ������һ��������Ҳ����������ļ�"
-
 msgid "Write partial file?"
 msgstr "Ҫд�벿���ļ���"
 
@@ -701,30 +907,38 @@ msgid "E140: Use ! to write partial buffer"
 msgstr "E140: ��ʹ�� ! ��д�벿�ֻ�����"
 
 #, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Ҫ�����Ѵ��ڵ��ļ� \"%.*s\"��"
+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' ѡ��ر�"
+msgstr "E142: �ļ�δд��: д�뱻 'write' ѡ�����"
 
 #, c-format
 msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"\"%.*s\" ���趨 'readonly' ѡ��.\n"
-"ȷ��Ҫ������"
+"\"%s\" ���趨 'readonly' ѡ�\n"
+"ȷʵҪ������"
 
 msgid "Edit File"
 msgstr "�༭�ļ�"
 
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands �����ɾ���»����� %s"
+msgstr "E143: �Զ����������ɾ�����»����� %s"
 
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z �����ܷ����ֵĲ���"
@@ -733,232 +947,283 @@ msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim �н�ֹʹ�� shell ����"
 
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: �������ʽ��������ĸ�ָ� (?)"
+msgstr "E146: �������ʽ��������ĸ���ֽ�"
 
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "�滻Ϊ %s (y/n/a/q/^E/^Y)?"
+msgstr "�滻Ϊ %s (y/n/a/q/l/^E/^Y)��"
 
 msgid "(Interrupted) "
 msgstr "(���ж�) "
 
+msgid "1 match"
+msgstr "1 ��ƥ�䣬"
+
 msgid "1 substitution"
-msgstr "�滻һ��"
+msgstr "1 ���滻��"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ��ƥ�䣬"
 
 #, c-format
 msgid "%ld substitutions"
-msgstr "�滻 %ld ��"
+msgstr "%ld ���滻��"
 
 msgid " on 1 line"
-msgstr " һ����"
+msgstr "�� 1 ��"
 
 #, c-format
 msgid " on %ld lines"
-msgstr " %ld ����"
+msgstr "�� %ld ��"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ���ܵݹ�ִ��"
 
 msgid "E148: Regular expression missing from global"
-msgstr "E148: û��ʹ�ù��������ʽ (?)"
+msgstr "E148: global ȱ���������ʽ"
 
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "ÿһ�ж��Ҳ���ģʽ: %s"
+msgstr "ÿ�ж�ƥ�����ʽ: %s"
 
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# Last Substitute String:\n"
 "$"
 msgstr ""
 "\n"
-"# ǰһ������ַ���:\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 ��˵��"
+msgstr "E149: ��Ǹ��û�� %s ��˵��"
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "��Ǹ, �Ҳ��������ļ� \"%s\""
+msgstr "��Ǹ���Ҳ��������ļ� \"%s\""
 
 #, c-format
 msgid "E150: Not a directory: %s"
-msgstr "E150: %s ����Ŀ¼"
+msgstr "E150: ����Ŀ¼: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
-msgstr "E152: ������д��ģʽ�� \"%s\""
+msgstr "E152: �޷��򿪲�д�� %s"
 
 #, c-format
 msgid "E153: Unable to open %s for reading"
-msgstr "E153: ���ܶ�ȡ�ļ�: %s"
+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"
-msgstr "E154: ��ǩ(tag) \"%s\" ���ļ� %s ���ظ����ֶ��"
+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 command: %s"
+msgstr "E160: δ֪�� sign ����: %s"
 
 msgid "E156: Missing sign name"
 msgstr "E156: ȱ�� sign ����"
 
-msgid "E255: Too many signs defined"
-msgstr "E326: �ҵ�̫�� signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs �������"
 
 #, c-format
 msgid "E239: Invalid sign text: %s"
-msgstr "E239: ����ȷ�� sign ����: %s"
+msgstr "E239: ��Ч�� sign ����: %s"
 
 #, c-format
 msgid "E155: Unknown sign: %s"
-msgstr "E155: ����ȷ�� sign: %s"
+msgstr "E155: δ֪�� sign: %s"
 
 msgid "E159: Missing sign number"
-msgstr "E159: ȱ�� sign number"
+msgstr "E159: ȱ�� sign ��"
 
 #, c-format
 msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ���������ƴ���: %s"
+msgstr "E158: ��Ч�Ļ�������: %s"
 
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 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 ģʽ. ���� \"visua\" �Իص�����ģʽ."
+msgstr "���� Ex ģʽ������ \"visual\" �ص�����ģʽ��"
 
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "�ѵ��ļ���β"
+msgid "E501: At end-of-file"
+msgstr "E501: �ѵ��ļ�ĩβ"
 
 msgid "E169: Command too recursive"
 msgstr "E169: ����ݹ��������"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱ�� :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: ȱ�� :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: �쳣û�б�����: %s"
 
 msgid "End of sourced file"
-msgstr "�����ļ�����"
+msgstr "�ű��ļ�����"
 
 msgid "End of function"
-msgstr "������β"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "�û��������������"
+msgstr "��������"
 
-msgid "Not an editor command"
-msgstr "���Ǳ༭��������"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: ��ȷ�����û��Զ�������"
 
-msgid "Don't panic!"
-msgstr "��Ҫ����!"
+msgid "E492: Not an editor command"
+msgstr "E492: ���Ǳ༭��������"
 
-msgid "Backwards range given"
-msgstr "ָ������ǰ�ο��ķ�Χ"
+msgid "E493: Backwards range given"
+msgstr "E493: ʹ��������ķ�Χ"
 
 msgid "Backwards range given, OK to swap"
-msgstr "ָ������ǰ�ο��ķ�Χ��OK to swap"
+msgstr "ʹ��������ķ�Χ��ȷ��������"
 
-msgid "Use w or w>>"
-msgstr "��ʹ�� w �� w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: ��ʹ�� w �� w>>"
 
 msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ��Ǹ, �������ڴ˰汾��δʵ��"
+msgstr "E319: ��Ǹ�������ڴ˰汾�в�����"
 
 msgid "E172: Only one file name allowed"
-msgstr "E172: ֻ����һ���ļ���"
+msgstr "E172: ֻ����һ���ļ���"
+
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "���� 1 ���ļ�δ�༭��ȷʵҪ�˳���"
 
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
-msgstr "���� %d ���ļ�δ�༭. ȷ��Ҫ�˳���"
+msgstr "���� %d ���ļ�δ�༭��ȷʵҪ�˳���"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: ���� 1 ���ļ�δ�༭"
 
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ���� %ld ���ļ�δ�༭"
 
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: �����Ѿ�����, ��ʹ�� ! ǿ�����¶���"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: �����Ѵ���: ��� ! ǿ���滻"
 
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
 msgstr ""
 "\n"
-"    ����        ���� ��Χ  ����      ����      "
+"    ����        ���� ��Χ  ��ȫ      ����      "
 
 msgid "No user-defined commands found"
-msgstr "�Ҳ����û��Զ��������"
+msgstr "�Ҳ����û��Զ�������"
 
 msgid "E175: No attribute specified"
-msgstr "E175: û��ָ��������"
+msgstr "E175: û��ָ������"
 
 msgid "E176: Invalid number of arguments"
-msgstr "E176: ����ȷ�Ĳ�������"
+msgstr "E176: ��Ч�Ĳ�������"
 
 msgid "E177: Count cannot be specified twice"
-msgstr "E177: ����ָ������"
+msgstr "E177: ����ָ�����μ���"
 
 msgid "E178: Invalid default value for count"
-msgstr "E178: ������ȱʡֵ����ȷ"
-
-msgid "E179: argument required for complete"
-msgstr "E179: ָ����Ҫ�����������"
+msgstr "E178: ��Ч�ļ���Ĭ��ֵ"
 
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ��������ֵ: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ��Ҫ����"
 
 #, c-format
 msgid "E181: Invalid attribute: %s"
-msgstr "E181: ����ȷ������: %s"
+msgstr "E181: ��Ч������: %s"
 
 msgid "E182: Invalid command name"
-msgstr "E182: �������Ʋ���ȷ"
+msgstr "E182: ��Ч��������"
 
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �û��Զ�����������Դ�д��ĸ��ʼ"
+msgstr "E183: �û��Զ�����������Դ�д��ĸ��ͷ"
 
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: û���û��Զ������� %s"
+msgstr "E184: û������û��Զ�������: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ��Ч�Ĳ�ȫ����: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: ֻ�� custom ��ȫ����������"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom ��ȫ��Ҫһ����������"
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: �Ҳ�����ɫ��ʽ %s"
+msgstr "E185: �Ҳ�����ɫ���� %s"
 
 msgid "Greetings, Vim user!"
-msgstr "���, Vim �û���"
+msgstr "���ã�Vim �û���"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: ���ܹر����һ�� tab ҳ"
+
+msgid "Already only one tab page"
+msgstr "�Ѿ�ֻʣһ�� tab ҳ��"
 
 msgid "Edit File in new window"
 msgstr "���´��ڱ༭�ļ�"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab ҳ %d"
+
 msgid "No swap file"
 msgstr "�޽����ļ�"
 
 msgid "Append File"
-msgstr "�����ļ�"
+msgstr "׷���ļ�"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: ���ܸı�Ŀ¼�����������޸� (��� ! ǿ��ִ��)"
 
 msgid "E186: No previous directory"
 msgstr "E186: ǰһ��Ŀ¼������"
 
 msgid "E187: Unknown"
-msgstr "E187: ����ʶ��ı��"
+msgstr "E187: δ֪"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize ��Ҫ�������ֲ���"
 
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "����λ��: X %d, Y %d"
 
 msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: ������ƽ̨�ϲ��ܻ�ô���λ��"
+msgstr "E188: �ڴ�ƽ̨�ϲ��ܻ�ô���λ��"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos ��Ҫ�������ֲ���"
 
 msgid "Save Redirection"
 msgstr "�����ض���"
@@ -973,85 +1238,170 @@ msgid "Save Setup"
 msgstr "�����趨"
 
 #, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" �Ѵ��� (���� ! ǿ��ִ��)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: �޷�����Ŀ¼: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" �Ѵ��� (��� ! ǿ��ִ��)"
 
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ������д��ģʽ�� \"%s\""
+msgstr "E190: �޷��򿪲�д�� \"%s\""
 
 #. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ����������Ӣ����ĸ����ǰ/�������"
+msgstr "E191: ����������һ����ĸ������/������"
 
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal �ݹ��������"
 
-msgid ":if nesting too deep"
-msgstr ":if ��������"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr "E194: û�������滻 '#' �Ľ����ļ���"
 
-msgid ":endif without :if"
-msgstr ":endif ȱ�ٶ�Ӧ�� :if"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: û�������滻 \"<afile>\" ���Զ������ļ���"
 
-msgid ":else without :if"
-msgstr ":else ȱ�ٶ�Ӧ�� :if"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: û�������滻 \"<abuf>\" ���Զ����������"
 
-msgid ":elseif without :if"
-msgstr ":elseif ȱ�ٶ�Ӧ�� :if"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: û�������滻 \"<amatch>\" ���Զ�����ƥ����"
 
-msgid ":while nesting too deep"
-msgstr ":while ��������"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
 
-msgid ":continue without :while"
-msgstr ":continue ȱ�ٶ�Ӧ�� :while"
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' �� '#' Ϊ���ļ�����ֻ������ \":p:h\""
 
-msgid ":break without :while"
-msgstr ":break ȱ�ٶ�Ӧ�� :while"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: ���Ϊ���ַ���"
 
-msgid ":endwhile without :while"
-msgstr ":endwhile ȱ�ٶ�Ӧ�� :while"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
 
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction �����ں����ڲ�ʹ��"
+msgid "E196: No digraphs in this version"
+msgstr "E196: �˰汾�޸����ַ�(digraph)"
 
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: û�� '#' ��������ļ���"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: ���� :throw ǰ׺Ϊ 'Vim' ���쳣"
 
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "û�� Autocommand �ļ������滻 \"<afile>\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "�׳��쳣: %s"
 
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "û�� Autocommand �������������滻 \"<abuf>\""
+#, c-format
+msgid "Exception finished: %s"
+msgstr "����쳣: %s"
 
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "û�� Autocommand Match name ���滻 \"<amatch>\""
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "�����쳣: %s"
 
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "û�� :source �ļ������滻 \"<sfile>\""
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s���� %ld ��"
 
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' �� '#' ָ����ļ�����ֻ����� \":p:h\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "�����쳣: %s"
 
-msgid "Evaluates to an empty string"
-msgstr "����Ϊ���ַ���"
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ���ܶ�ȡ viminfo"
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " �ѷ���\n"
 
-msgid "E196: No digraphs in this version"
-msgstr "E196: ���汾�޸����ַ�(digraph)"
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "�쳣"
+
+msgid "Error and interrupt"
+msgstr "������ж�"
+
+msgid "Error"
+msgstr "����"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "�ж�"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if Ƕ�ײ�������"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif ȱ�ٶ�Ӧ�� :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else ȱ�ٶ�Ӧ�� :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif ȱ�ٶ�Ӧ�� :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: ��� :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif �� :else ����"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for Ƕ�ײ�������"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue ȱ�ٶ�Ӧ�� :while �� :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break ȱ�ٶ�Ӧ�� :while �� :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while �� :endfor ��β"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for �� :endwhile ��β"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try Ƕ�ײ�������"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch ȱ�ٶ�Ӧ�� :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch �� :finally ����"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally ȱ�ٶ�Ӧ�� :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: ��� :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry ȱ�ٶ�Ӧ�� :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction ���ں�����"
 
 msgid "tagname"
-msgstr "��ǩ����"
+msgstr "tag ��"
 
 msgid " kind file\n"
-msgstr "���ļ�\n"
+msgstr " ���� �ļ�\n"
 
 msgid "'history' option is zero"
-msgstr "ѡ�� 'history' ����"
+msgstr "ѡ�� 'history' Ϊ��"
 
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@ msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ���������"
 
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: ��ɾ������ڻ򻺴�"
+msgstr "E199: ����ڻ򻺳����ѱ�ɾ��"
 
 msgid "Illegal file name"
-msgstr "����ȷ���ļ���"
+msgstr "��Ч���ļ���"
 
 msgid "is a directory"
 msgstr "��Ŀ¼"
@@ -1087,26 +1437,32 @@ msgid "is not a file"
 msgstr "�����ļ�"
 
 msgid "[New File]"
-msgstr "[δ����]"
+msgstr "[���ļ�]"
+
+msgid "[New DIRECTORY]"
+msgstr "[��Ŀ¼]"
+
+msgid "[File too big]"
+msgstr "[�ļ�����]"
 
 msgid "[Permission Denied]"
 msgstr "[Ȩ�޲���]"
 
 msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand ʹ�����ܶ�ȡ���ļ�"
+msgstr "E200: *ReadPre �Զ�������ļ����ɶ�"
 
 msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand �����Ը��Ļ�����������"
+msgstr "E201: *ReadPre �Զ���������ı䵱ǰ������"
 
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: �ӱ�׼�����ȡ...\n"
 
 msgid "Reading from stdin..."
-msgstr "�ӱ�׼�����..."
+msgstr "�ӱ�׼�����ȡ..."
 
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת������"
+msgstr "E202: ת�������ļ����ɶ�"
 
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@ msgid "[RO]"
 msgstr "[ֻ��]"
 
 msgid "[CR missing]"
-msgstr "[ȱ��CR]'"
+msgstr "[ȱ�� CR]'"
 
 msgid "[NL found]"
-msgstr "[�ҵ�NL]"
+msgstr "[�ҵ� NL]"
 
 msgid "[long lines split]"
-msgstr "[�ָ������]"
+msgstr "[���зָ�]"
 
 msgid "[NOT converted]"
 msgstr "[δת��]"
@@ -1138,74 +1494,92 @@ msgstr "[��ת��]"
 msgid "[crypted]"
 msgstr "[�Ѽ���]"
 
-msgid "[CONVERSION ERROR]"
-msgstr "ת������"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[�� %ld ��ת������]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[�� %ld ����Ч�ַ�]"
 
 msgid "[READ ERRORS]"
 msgstr "[������]"
 
 msgid "Can't find temp file for conversion"
-msgstr "�Ҳ���ת���õ���ʱ�ļ�"
+msgstr "�Ҳ�������ת������ʱ�ļ�"
 
 msgid "Conversion with 'charconvert' failed"
-msgstr "�ַ���ת������"
+msgstr "'charconvert' ת��ʧ��"
 
 msgid "can't read output of 'charconvert'"
-msgstr "���ܶ�ȡ 'charconvert' �����"
+msgstr "�޷���ȡ 'charconvert' �����"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: �Ҳ��� acwrite ��������Ӧ���Զ�����"
 
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand ɾ�����ͷ���Ҫд��Ļ�����"
+msgstr "E203: �Զ�����ɾ�����ͷ���Ҫд��Ļ�����"
 
 msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand ����ظı����к�"
+msgstr "E204: �Զ���������ظı�������"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans ������δ�޸ĵĻ�����д��"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans ����������������д��"
 
 msgid "is not a file or writable device"
 msgstr "�����ļ����д���豸"
 
-msgid "is read-only (use ! to override)"
-msgstr "��ֻ���ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "is read-only (add ! to override)"
+msgstr "ֻ�� (��� ! ǿ��ִ��)"
 
-msgid "Can't write to backup file (use ! to override)"
-msgstr "����д�����ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: �޷�д�뱸���ļ� (��� ! ǿ��ִ��)"
 
-msgid "Close error for backup file (use ! to override)"
-msgstr "�رձ����ļ����� (��ʹ�� ! ǿ��ִ��)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: �رձ����ļ����� (��� ! ǿ��ִ��)"
 
-msgid "Can't read file for backup (use ! to override)"
-msgstr "���ܶ�ȡ�ļ��Թ����� (��ʹ�� ! ǿ��ִ��)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: �޷���ȡ�ļ��Թ����� (��� ! ǿ��ִ��)"
 
-msgid "Cannot create backup file (use ! to override)"
-msgstr "���ܴ��������ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: �޷����������ļ� (��� ! ǿ��ִ��)"
 
-msgid "Can't make backup file (use ! to override)"
-msgstr "�����������ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: �޷����ɱ����ļ� (��� ! ǿ��ִ��)"
 
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork ����ʧ (��ʹ�� ! ǿ��ִ��)"
+#, fuzzy
+#~ 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: �Ҳ���д���õĽ����ļ�"
+msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
 
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: ����ת�� (��ʹ�� ! ǿ�Ʋ�ת��д��)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: �޷�ת�� (��� ! ǿ�Ʋ�ת��д��)"
 
 msgid "E166: Can't open linked file for writing"
-msgstr "E166: ������д��ģʽ�������ļ�"
+msgstr "E166: �޷��򿪲�д�������ļ�"
 
 msgid "E212: Can't open file for writing"
-msgstr "E212: ������д��ģʽ��"
+msgstr "E212: �޷��򿪲�д���ļ�"
+
+msgid "E667: Fsync failed"
+msgstr "E667: ͬ��ʧ��"
 
-msgid "Close failed"
-msgstr "�ر�ʧ��"
+msgid "E512: Close failed"
+msgstr "E512: �ر�ʧ��"
 
-msgid "write error, conversion failed"
-msgstr "����д�� -- ת��ʧ��"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
 
-msgid "write error (file system full?)"
-msgstr "д����� (�ļ�ϵͳ������)"
+msgid "E514: write error (file system full?)"
+msgstr "E514: д����� (�ļ�ϵͳ������)"
 
 msgid " CONVERSION ERROR"
-msgstr "ת������"
+msgstr " ת������"
 
 msgid "[Device]"
 msgstr "[�豸]"
@@ -1214,35 +1588,35 @@ msgid "[New]"
 msgstr "[��]"
 
 msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
 
 msgid " appended"
-msgstr " �Ѹ���"
+msgstr " ��׷��"
 
 msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
 
 msgid " written"
 msgstr " ��д��"
 
 msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch ģʽ: ���ܴ���ԭʼ�ļ�"
+msgstr "E205: Patchmode: �޷�����ԭʼ�ļ�"
 
 msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch ģʽ: ���ܸı�յ�ԭʼ�ļ�"
+msgstr "E206: Patchmode: �޷����ɿյ�ԭʼ�ļ�"
 
 msgid "E207: Can't delete backup file"
-msgstr "E207: ����ɾ�������ļ�"
+msgstr "E207: �޷�ɾ�������ļ�"
 
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"����: ԭʼ�ļ���ʧ����\n"
+"����: ԭʼ�ļ������Ѷ�ʧ����\n"
 
 msgid "don't quit the editor until the file is successfully written!"
-msgstr "���ļ���ȷд��ǰ�����˳��༭��!"
+msgstr "���ļ���ȷд��ǰ�����˳��༭����"
 
 msgid "[dos]"
 msgstr "[dos]"
@@ -1263,18 +1637,18 @@ msgid "[unix format]"
 msgstr "[unix ��ʽ]"
 
 msgid "1 line, "
-msgstr "1 ��, "
+msgstr "1 �У�"
 
 #, c-format
 msgid "%ld lines, "
-msgstr "%ld ��, "
+msgstr "%ld �У�"
 
 msgid "1 character"
-msgstr "һ���ַ�"
+msgstr "1 ���ַ�"
 
 #, c-format
 msgid "%ld characters"
-msgstr "%ld���ַ�"
+msgstr "%ld ���ַ�"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1286,47 +1660,56 @@ msgstr "[���һ�в�����]"
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "����: ���ļ����ϴζ�����ѱ䶯!!!"
+msgstr "����: ���ļ��Զ�����ѷ����䶯������"
 
 msgid "Do you really want to write to it"
-msgstr "ȷ��Ҫд����"
+msgstr "ȷʵҪд����"
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: д���ļ� \"%s\" ����"
+msgstr "E208: д���ļ� \"%s\" ����"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: �ر��ļ� \"%s\" ����"
+msgstr "E209: �ر��ļ� \"%s\" ����"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: ��ȡ�ļ� \"%s\" ����"
+msgstr "E210: ��ȡ�ļ� \"%s\" ����"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand ɾ��������"
+msgstr "E246: FileChangedShell �Զ�����ɾ���˻�����"
 
 #, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: ����: �ļ� \"%s\" �Ѿ�������"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: �ļ� \"%s\" �Ѿ�������"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: ����: �ļ� \"%s\" ���ϴζ�����ѱ䶯, ���ұ༭�еĻ�����Ҳ������"
+msgstr "W12: ����: �ļ� \"%s\" �ѱ䶯�������� Vim �еĻ�����Ҳ�ѱ䶯"
+
+msgid "See \":help W12\" for more info."
+msgstr "��һ��˵����� \":help W12\""
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ����: �ļ� \"%s\" ���ϴζ�����Ѹı�"
+msgstr "W11: ����: �༭��ʼ���ļ� \"%s\" �ѱ䶯"
+
+msgid "See \":help W11\" for more info."
+msgstr "��һ��˵����� \":help W11\""
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ����: �ļ� \"%s\" ���ϴζ�����Ѹı�"
+msgstr "W16: ����: �༭��ʼ���ļ� \"%s\" ��ģʽ�ѱ䶯"
+
+msgid "See \":help W16\" for more info."
+msgstr "��һ��˵����� \":help W16\""
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ����: �ļ� \"%s\" �ڿ�ʼ�༭���ֱ�������"
+msgstr "W13: ����: �༭��ʼ���ļ� \"%s\" �ѱ�����"
 
 msgid "Warning"
 msgstr "����"
@@ -1339,124 +1722,139 @@ msgstr ""
 "�����ļ�(&L)"
 
 #, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: �޷�Ϊ���¼��� \"%s\" ��׼��"
+
+#, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: �������¼��� \"%s\""
+msgstr "E321: �޷����¼��� \"%s\""
 
 msgid "--Deleted--"
 msgstr "--��ɾ��--"
 
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: �鲻����: \"%s\""
+msgstr "E367: �޴���: \"%s\""
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
-msgstr "E215: * �����в���ȷ���ַ�: %s"
+msgstr "E215: * ��������Ч�ַ�: %s"
 
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: �޴��¼�: %s"
 
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: �޴�����¼�: %s"
+
 #. Highlight title
 msgid ""
 "\n"
 "--- Auto-Commands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- �Զ����� ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: ��Ч�Ļ������� "
 
 msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ���ܶ������¼�ִ�� autocommand"
+msgstr "E217: ���ܶ������¼�ִ���Զ�����"
 
 msgid "No matching autocommands"
-msgstr "�Ҳ�����Ӧ�� autocommand"
+msgstr "û��ƥ����Զ�����"
 
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand ��������"
+msgstr "E218: �Զ�����Ƕ�ײ�������"
 
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s �Զ����� \"%s\""
 
 #, c-format
 msgid "Executing %s"
 msgstr "ִ�� %s"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "�Զ����� %s"
 
 msgid "E219: Missing {."
-msgstr "E219: ȱ�� {."
+msgstr "E219: ȱ�� {��"
 
 msgid "E220: Missing }."
-msgstr "E220: ȱ�� }."
+msgstr "E220: ȱ�� }��"
 
-msgid "No fold found"
-msgstr "�Ҳ����κ� fold"
+msgid "E490: No fold found"
+msgstr "E490: �Ҳ����۵�"
 
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ������Ŀǰ�� 'foldmethod' �´��� fold"
+msgstr "E350: �����ڵ�ǰ�� 'foldmethod' �´����۵�"
 
 msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ������Ŀǰ�� 'foldmethod' ��ɾ�� fold"
+msgstr "E351: �����ڵ�ǰ�� 'foldmethod' ��ɾ���۵�"
 
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: ѡ�� 'commentstring' δ�趨"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--���۵� %3ld ��"
 
 msgid "E222: Add to read buffer"
-msgstr "E222: �����������"
+msgstr "E222: ���ӵ��Ѷ���������"
 
 msgid "E223: recursive mapping"
-msgstr "E223: �ݹ� mapping"
+msgstr "E223: �ݹ�ӳ��"
 
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s �Ѿ���ȫ�� abbreviation ��"
+msgstr "E224: ȫ����д %s �Ѵ���"
 
 #, c-format
 msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s �Ѿ���ȫ�� mapping ��"
+msgstr "E225: ȫ��ӳ�� %s �Ѵ���"
 
 #, c-format
 msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s �Ѿ��� abbreviation ��"
+msgstr "E226: ��д %s �Ѵ���"
 
 #, c-format
 msgid "E227: mapping already exists for %s"
-msgstr "E227: %s �� mapping �Ѿ�����"
+msgstr "E227: ӳ�� %s �Ѵ���"
 
 msgid "No abbreviation found"
 msgstr "�Ҳ�����д"
 
 msgid "No mapping found"
-msgstr "û�������Ӧ"
+msgstr "�Ҳ���ӳ��"
 
 msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ����ȷ��ģʽ"
+msgstr "E228: makemap: ��Ч��ģʽ"
 
 msgid "<cannot open> "
-msgstr "<���ܴ�>"
+msgstr "<�޷���>"
 
 #, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: ����ʹ�� %s ����"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: �޷���ȡ���� %s"
 
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: ���ܻص�ĿǰĿ¼"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: �޷����ص�ǰĿ¼"
 
 msgid "Pathname:"
 msgstr "·��:"
 
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: ����ȡ��ĿǰĿ¼"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: �޷���ȡ��ǰĿ¼"
 
 msgid "OK"
 msgstr "ȷ��"
 
-#. 'Cancel' button
 msgid "Cancel"
 msgstr "ȡ��"
 
@@ -1464,45 +1862,68 @@ msgid "Vim dialog"
 msgstr "Vim �Ի���"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "������: �����趨 thumb pixmap ��λ��"
+msgstr "����������: �޷���ȡ����ͼ��ļ��δ�С"
 
 msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: ���ܶ���Ϣ�� callback ���� BallonEval"
+msgstr "E232: ����ͬʱʹ����Ϣ�ͻص����������� BalloonEval"
 
 msgid "E229: Cannot start the GUI"
-msgstr "E229: ��������ͼ�ͽ���"
+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'"
+msgstr "E231: ��Ч�� 'guifontwide'"
 
-msgid "Error"
-msgstr "����"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' ��ֵ��Ч"
 
-msgid "&Ok"
-msgstr "ȷ��(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: �޷�������ɫ %s"
+
+msgid "No match at cursor, finding next"
+msgstr "�ڹ�괦û��ƥ�䣬������һ��"
 
 msgid "Vim dialog..."
 msgstr "Vim �Ի���..."
 
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"��(&Y)\n"
+"��(&N)\n"
+"ȡ��(&C)"
+
+msgid "Input _Methods"
+msgstr "���뷨(_M)"
+
 msgid "VIM - Search and Replace..."
-msgstr "VIM - �������滻..."
+msgstr "VIM - ���Һ��滻..."
 
 msgid "VIM - Search..."
 msgstr "VIM - ����..."
 
 msgid "Find what:"
-msgstr "����:"
+msgstr "��������:"
 
 msgid "Replace with:"
 msgstr "�滻Ϊ:"
 
-#. exact match only button
-msgid "Match exact word only"
-msgstr "ֻƥ����ȫ��ͬ����"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "ƥ�������Ĵ�"
+
+#. match case button
+msgid "Match case"
+msgstr "ƥ���Сд"
 
 msgid "Direction"
 msgstr "����"
@@ -1514,108 +1935,130 @@ msgstr "����"
 msgid "Down"
 msgstr "����"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "����һ��"
+msgstr "������һ��"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "�滻"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "�滻ȫ��"
+msgstr "ȫ���滻"
 
-msgid "E233: cannot open display"
-msgstr "E233: <���ܴ� X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: �ӻỰ�������յ� \"die\" ����\n"
 
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: ����ȷ���ַ��� (Fontset): %s"
+msgid "Close"
+msgstr "�ر�"
 
-msgid "Font Selection"
-msgstr "����ѡ��"
+msgid "New tab"
+msgstr "�½���ǩ"
 
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "����ȷ����������: %s"
+msgid "Open Tab..."
+msgstr "�򿪱�ǩ..."
 
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" ���ǹ̶���������"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: �����ڱ�����شݻ�\n"
 
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s Ϊ����ʶ�����ɫ����"
+msgid "Font Selection"
+msgstr "ѡ������"
 
 msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "ʹ�� CUT_BUFFER0 ���滻��ѡ��"
+msgstr "ʹ�� CUT_BUFFER0 ��ȡ����ѡ��"
 
-msgid "Filter"
-msgstr "������"
+msgid "&Filter"
+msgstr "����(&F)"
+
+msgid "&Cancel"
+msgstr "ȡ��(&C)"
 
 msgid "Directories"
 msgstr "Ŀ¼"
 
-msgid "Help"
-msgstr "����"
+msgid "Filter"
+msgstr "������"
+
+msgid "&Help"
+msgstr "����(&H)"
 
 msgid "Files"
 msgstr "�ļ�"
 
+msgid "&OK"
+msgstr "ȷ��(&O)"
+
 msgid "Selection"
 msgstr "ѡ��"
 
-msgid "Undo"
-msgstr "����"
+msgid "Find &Next"
+msgstr "������һ��(&N)"
 
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: ���ܴ� Zap ���� '%s'"
+msgid "&Replace"
+msgstr "�滻(&R)"
+
+msgid "Replace &All"
+msgstr "ȫ���滻(&A)"
+
+msgid "&Undo"
+msgstr "����(&U)"
 
 #, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: ����ʹ������ %s"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: �޷����� Zap ���� '%s'"
 
 #, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: �Ҳ�����ɫ: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: �޷�ʹ������ %s"
 
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
 msgstr ""
 "\n"
-"���ڷ����ж��ӳ������Ϣ.\n"
+"���ڷ�����Ϣ��ֹ�ӽ��̡�\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �Ҳ������ڱ��� \"%s\""
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ��֧�ֲ��� \"-%s\"������ OLE �汾��"
+msgstr "E243: ��֧�ֵĲ���: \"-%s\"����ʹ�� OLE �汾��"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: �޷��� MDI Ӧ�ó����д򿪴���"
 
 msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "�����ַ��� (ʹ�� '\\\\' ����ʾ '\\')"
+msgstr "�����ַ��� (ʹ�� '\\\\' ������ '\\')"
 
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "���Ҽ��滻�ַ��� (ʹ�� '\\\\' ����ʾ '\\')"
+msgstr "���Һ��滻�ַ��� (ʹ�� '\\\\' ������ '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "δʹ��"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Ŀ¼\t*.nothing\n"
 
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: �������� color map ������Щ��ɫ��������ֵֹ�"
+msgstr "Vim E458: �޷�������ɫ���ĳЩ��ɫ���ܲ���ȷ"
 
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s û���趨��ȷ�������Թ���ʾ��Щ�ַ���:"
+msgstr "E250: Fontset %s ȱ�������ַ���������:"
 
 #, c-format
 msgid "E252: Fontset name: %s"
-msgstr "E252: ���弯(Fontset)����: %s"
+msgstr "E252: Fontset ����: %s"
 
 #, c-format
 msgid "Font '%s' is not fixed-width"
-msgstr "'%s' ���ǹ̶���������"
+msgstr "'%s' ���ǹ̶����ȵ�����"
 
 #, c-format
 msgid "E253: Fontset name: %s\n"
-msgstr "E253: ���弯(Fontset)����: %s\n"
+msgstr "E253: Fontset ����: %s\n"
 
 #, c-format
 msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@ msgid "Font1: %s\n"
 msgstr "����1: %s\n"
 
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "����%d���Ȳ�������0������\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "����%ld�Ŀ��Ȳ�������0������\n"
 
 #, c-format
 msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"����1����: %ld\n"
+"����1�Ŀ���: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ����������ɫ %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "����ȷ�����弯(Fontset)"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: ���ܶ�ȡ sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "����ѡ��"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "��¼��"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "����1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata ����"
 
+msgid "E550: Missing colon"
+msgstr "E550: ȱ��ð��"
+
+msgid "E551: Illegal component"
+msgstr "E551: ��Ч�Ĳ���"
+
+msgid "E552: digit expected"
+msgstr "E552: Ӧ��Ҫ������"
+
+#, c-format
+msgid "Page %d"
+msgstr "�� %d ҳ"
+
+msgid "No text to be printed"
+msgstr "û��Ҫ��ӡ������"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "���ڴ�ӡ�� %d ҳ (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "���� %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "�Ѵ�ӡ: %s"
+
+msgid "Printing aborted"
+msgstr "��ӡ��ֹ"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: д�� PostScript ����ļ�����"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: �޷����ļ� \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: �޷���ȡ PostScript ��Դ�ļ� \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: �ļ� \"%s\" ���� PostScript ��Դ�ļ�"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: �ļ� \"%s\" ������֧�ֵ� PostScript ��Դ�ļ�"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" ��Դ�ļ��汾����ȷ"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: �����ݵĶ��ֽڱ�����ַ�����"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset �ڶ��ֽڱ����²���Ϊ�ա�"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: û��ָ�����ֽڴ�ӡ��Ĭ�����塣"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: �޷��� PostScript ����ļ�"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: �޷����ļ� \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"cidfont.ps\""
+
 #, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: �޷�ת������ӡ���� \"%s\""
+
+msgid "Sending to printer..."
+msgstr "���͵���ӡ������"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: �޷���ӡ PostScript �ļ�"
+
+msgid "Print job sent."
+msgstr "��ӡ�����ѱ����͡�"
 
 msgid "Add a new database"
-msgstr "�������ݿ�"
+msgstr "����һ���µ����ݿ�"
 
 msgid "Query for a pattern"
-msgstr "��ѯģʽ"
+msgstr "��ѯһ��ģʽ"
 
 msgid "Show this message"
 msgstr "��ʾ����Ϣ"
 
 msgid "Kill a connection"
-msgstr "��������"
+msgstr "����һ������"
 
 msgid "Reinit all connections"
-msgstr "������������"
+msgstr "������������"
 
 msgid "Show connections"
 msgstr "��ʾ����"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: �÷�: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "��� cscope ���֧�ַָ���Ļ\n"
+msgstr "��� cscope ���֧�ַָ�ڡ�\n"
 
-msgid "Usage: cstag <ident>"
-msgstr "�÷�: cstag <ʶ����>"
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: �÷�: cstag <ident>"
 
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �Ҳ��� tag"
 
 #, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) ����: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) ����: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat ����"
 
 #, c-format
-msgid "Added cscope database %s"
-msgstr "���� cscope ���ݿ� %s"
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s ����Ŀ¼����Ч�� cscope ���ݿ�"
 
 #, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s ����Ŀ¼�� cscope ���ݿ�"
+msgid "Added cscope database %s"
+msgstr "������ cscope ���ݿ� %s"
 
 #, c-format
-msgid "error reading cscope connection %d"
-msgstr "��ȡ cscope ���� %d ʱ����"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: ��ȡ cscope ���� %ld ����"
 
-msgid "unknown cscope search type"
-msgstr "δ֪�� cscope ������̬"
+msgid "E561: unknown cscope search type"
+msgstr "E561: δ֪�� cscope ��������"
 
-msgid "Could not create cscope pipes"
-msgstr "���ܴ����� cscope ���ӵĹܵ�"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: �޷����� cscope �ܵ�"
+
+msgid "E622: Could not fork for cscope"
+msgstr "E622: �޷��� cscope ���� fork"
 
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ִ��ʧ��"
 
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: �޷����� cscope ����"
+
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ʧ�� (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp ʧ��"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ʧ�� (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp ʧ��"
 
-msgid "no cscope connections"
-msgstr "û�� cscope ����"
+msgid "E567: no cscope connections"
+msgstr "E567: û�� cscope ����"
 
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: �Ҳ������� cscope ����Ѱ %s / %s"
+msgstr "E259: cscope ��ѯ %s %s û���ҵ�ƥ��Ľ��"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix ��־ %c �� %c ��Ч"
 
 msgid "cscope commands:\n"
 msgstr "cscope ����:\n"
 
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (�÷�: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (�÷�: %s)"
 
-msgid "duplicate cscope database not added"
-msgstr "�ظ��� cscope ���ݿ�δ������"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: �޷��� cscope ���ݿ�: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: �޷���ȡ cscope ���ݿ���Ϣ"
 
-msgid "maximum number of cscope connections reached"
-msgstr "�Ѵﵽ cscope ���������Ŀ"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: �ظ��� cscope ���ݿ�δ������"
 
-msgid "E260: cscope connection not found"
-msgstr "E260: �Ҳ��� cscope ����"
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: �Ѵﵽ cscope �����������"
 
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: �Ҳ��� cscope ���� %s"
 
-msgid "cscope connection closed"
-msgstr "cscope �����ѹر�"
-
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope ���� %s �ѹر�\n"
+msgid "cscope connection %s closed"
+msgstr "cscope ���� %s �ѹر�"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches ���ش���"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: ��ȡ cscope ���� %d ����"
-
-msgid "couldn't malloc\n"
-msgstr "����ʹ�� malloc\n"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches ���ش���"
 
 #, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope ��ǩ(tag): %s\n"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
 
-msgid "   #   line"
-msgstr "   #   ��  "
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   ��  "
 
 msgid "filename / context / line\n"
-msgstr "�ļ���     / ������    / �к�\n"
+msgstr "�ļ��� / ������ / ��\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope ����: %s"
 
 msgid "All cscope databases reset"
-msgstr "�������� cscope ���ݿ�"
+msgstr "���� cscope ���ݿ��ѱ�����"
 
 msgid "no cscope connections\n"
 msgstr "û�� cscope ����\n"
 
 msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ���ݿ�����                          prepend path\n"
+msgstr " # pid    ���ݿ���                            prepend path\n"
 
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <��>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: ��Ǹ����������ã��޷����� MzScheme ��"
+
+msgid "invalid expression"
+msgstr "��Ч�ı���ʽ"
+
+msgid "expressions disabled at compile time"
+msgstr "����ʱû�����ñ���ʽ"
+
+msgid "hidden option"
+msgstr "���ص�ѡ��"
+
+msgid "unknown option"
+msgstr "δ֪��ѡ��"
+
+msgid "window index is out of range"
+msgstr "��������������Χ"
+
+msgid "couldn't open buffer"
+msgstr "�޷��򿪻�����"
+
+msgid "cannot save undo information"
+msgstr "�޷����泷����Ϣ"
+
+msgid "cannot delete line"
+msgstr "�޷�ɾ����"
+
+msgid "cannot replace line"
+msgstr "�޷��滻��"
+
+msgid "cannot insert line"
+msgstr "�޷�������"
+
+msgid "string cannot contain newlines"
+msgstr "�ַ������ܰ�������(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim ����: ~a"
+
+msgid "Vim error"
+msgstr "Vim ����"
+
+msgid "buffer is invalid"
+msgstr "��������Ч"
+
+msgid "window is invalid"
+msgstr "������Ч"
+
+msgid "linenr out of range"
+msgstr "�кų�����Χ"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "�������� sandbox ��ʹ��"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
-msgstr "E263: ��Ǹ����������ʹ�ã�Python �����û�м��ء�"
+msgstr "E263: ��Ǹ����������ã��޷����� Python �⡣"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: ���ܵݹ���� Python"
 
 msgid "can't delete OutputObject attributes"
 msgstr "����ɾ�� OutputObject ����"
 
 msgid "softspace must be an integer"
-msgstr "softspace ����������"
+msgstr "softspace ����������"
 
 msgid "invalid attribute"
-msgstr "����ȷ������"
+msgstr "��Ч������"
 
 msgid "writelines() requires list of strings"
-msgstr "writelines() ��Ҫ string list ������"
+msgstr "writelines() ��Ҫ�ַ����б�������"
 
 msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: ���ܳ�ʼ�� I/O ����"
-
-msgid "invalid expression"
-msgstr "����ȷ�ı���ʽ"
-
-msgid "expressions disabled at compile time"
-msgstr "��Ϊ����ʱû�м������ʽ(expression)�ĳ�����룬���Բ���ʹ�ñ���ʽ"
+msgstr "E264: Python: ��ʼ�� I/O �������"
 
 msgid "attempt to refer to deleted buffer"
-msgstr "��ͼʹ���ѱ�ɾ���Ļ�����"
+msgstr "��ͼ�����ѱ�ɾ���Ļ�����"
 
 msgid "line number out of range"
 msgstr "�кų�����Χ"
 
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer ���� (��ɾ��): %8lX>"
+msgstr "<����������(��ɾ��): %8lX>"
 
 msgid "invalid mark name"
-msgstr "������Ʋ���ȷ"
+msgstr "��Ч�ı������"
 
 msgid "no such buffer"
 msgstr "�޴˻�����"
 
 msgid "attempt to refer to deleted window"
-msgstr "��ͼʹ���ѱ�ɾ���Ĵ���"
+msgstr "��ͼ�����ѱ�ɾ���Ĵ���"
 
 msgid "readonly attribute"
 msgstr "ֻ������"
 
 msgid "cursor position outside buffer"
-msgstr "��궨λ�ڻ�����֮��"
+msgstr "���λ���ڻ�������"
 
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@ msgstr "<���� %d>"
 msgid "no such window"
 msgstr "�޴˴���"
 
-msgid "cannot save undo information"
-msgstr "���ܱ��渴ԭ��Ϣ"
-
-msgid "cannot delete line"
-msgstr "����ɾ������"
-
-msgid "cannot replace line"
-msgstr "�����滻����"
-
-msgid "cannot insert line"
-msgstr "���ܲ������"
-
-msgid "string cannot contain newlines"
-msgstr "�ַ������ܰ�������"
-
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: �������ʹ�ã��޷����� Ruby �����(Library)"
+msgstr "E266: ��Ǹ����������ã��޷����� Ruby ��"
 
 #, c-format
 msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@ msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: д����󡣽�������"
 
 msgid "invalid buffer number"
-msgstr "����ȷ�Ļ�������"
+msgstr "��Ч�Ļ�������"
 
 msgid "not implemented yet"
 msgstr "��δʵ��"
 
-msgid "unknown option"
-msgstr "����ȷ��ѡ��"
-
 #. ???
 msgid "cannot set line(s)"
-msgstr "�����趨��"
+msgstr "�޷��趨��"
 
 msgid "mark not set"
 msgstr "û���趨���"
 
 #, c-format
 msgid "row %d column %d"
-msgstr "�� %d �� %d"
+msgstr "�� %d �� �� %d ��"
 
 msgid "cannot insert/append line"
-msgstr "���ܲ�������Ӵ���"
+msgstr "�޷�����/׷����"
 
 msgid "unknown flag: "
-msgstr "����ı�־: "
+msgstr "δ֪�ı�־: "
 
 msgid "unknown vimOption"
-msgstr "����ȷ�� VIM ѡ��"
+msgstr "δ֪�� vim ѡ��"
 
 msgid "keyboard interrupt"
 msgstr "�����ж�"
@@ -1993,93 +2603,91 @@ msgid "vim error"
 msgstr "vim ����"
 
 msgid "cannot create buffer/window command: object is being deleted"
-msgstr "���ܴ���������/��������: ���󽫱�ɾ��"
+msgstr "�޷�����������/��������: ���󽫱�ɾ��"
 
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
-msgstr "����ע�� callback ����: ������/�����Ѿ���ɾ����"
+msgstr "�޷�ע��ص�����: ������/�����ѱ�ɾ��"
 
 #. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
-msgstr "E280: TCL ���ش���: reflist ���ɿ�!? �뱨��� to vim-dev@vim.org"
+msgstr "E280: TCL ���ش���: reflist �𻵣����뱨��� vim-dev@vim.org"
 
 msgid "cannot register callback command: buffer/window reference not found"
-msgstr "����ע�� callback ����: �Ҳ���������/����"
+msgstr "�޷�ע��ص�����: �Ҳ���������/��������"
 
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "�������ʹ��, ��Ϊ�޷����� Tcl �����(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: ��Ǹ����������ã��޷����� Tcl ��"
 
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL ����: �˳�����ֵ��������!? �뱨��� to vim-dev@vim.org"
+msgstr "E281: TCL ����: �˳�����ֵ�������������뱨��� vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: �˳�����ֵ %d"
 
 msgid "cannot get line"
-msgstr "����ȡ�ô���"
+msgstr "�޷���ȡ��"
 
 msgid "Unable to register a command server name"
-msgstr "����ע���������������"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: û��ע��Ϊ \"%s\" �ķ�����"
+msgstr "�޷�ע�������������"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: �����ͳ����Ŀ�ĵس���"
+msgstr "E248:  �޷��������Ŀ�ĳ���"
 
 #, c-format
-msgid "Invalid server id used: %s"
-msgstr "����ȷ�ķ����� id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ʹ������Ч�ķ����� id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM ��ע�������������ɾ����"
+msgstr "E251: VIM ʵ��ע������������ɾ����"
 
-msgid "Unknown option"
-msgstr "����ȷ��ѡ��"
+msgid "Unknown option argument"
+msgstr "δ֪��ѡ�����"
 
 msgid "Too many edit arguments"
-msgstr "̫��༭����"
+msgstr "�༭��������"
 
 msgid "Argument missing after"
-msgstr "ȱ�ٱ�Ҫ�Ĳ���:"
+msgstr "ȱ�ٱ�Ҫ�Ĳ���"
 
-msgid "Garbage after option"
-msgstr "���ܱ��ϴ�ѡ��������: "
+msgid "Garbage after option argument"
+msgstr "ѡ��������������Ч"
 
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "̫�� \"+command\" �� \"-c command\" ����"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"��\"-c command\" �� \"--cmd command\" ��������"
 
 msgid "Invalid argument for"
-msgstr "����ȷ�Ĳ���: "
+msgstr "��Ч�Ĳ���"
+
+#, c-format
+msgid "%d files to edit\n"
+msgstr "���� %d ���ļ��ȴ��༭\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "���� Vim ����ʱû�м��� diff ������"
+msgstr "�� Vim ����ʱû�м��� diff ����"
 
 msgid "Attempt to open script file again: \""
-msgstr "��ͼ�ٴδ� script �ļ�: \""
-
-msgid "\"\n"
-msgstr "\"\n"
+msgstr "��ͼ�ٴδ򿪽ű��ļ�: \""
 
 msgid "Cannot open for reading: \""
-msgstr "����Ϊ������: \""
+msgstr "�޷��򿪲���ȡ: \""
 
 msgid "Cannot open for script output: \""
-msgstr "����Ϊ script �������: \""
+msgstr "�޷��򿪲�����ű�: \""
 
-#, c-format
-msgid "%d files to edit\n"
-msgstr "���� %d ���ļ��ȴ��༭\n"
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ����: �޷��� NetBeans ������ gvim\n"
 
 msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ע��: ��������ն�(��Ļ)\n"
+msgstr "Vim: ����: ������ǵ��ն�(��Ļ)\n"
 
 msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ע��: ���벻���ն�(����)\n"
+msgstr "Vim: ����: ���벻�������ն�(����)\n"
 
 #. just in case..
 msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@ msgstr "pre-vimrc ������"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: ���ܶ�ȡ�ļ� \"%s\""
+msgstr "E282: �޷���ȡ \"%s\""
 
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"��ѯ������Ϣ��ִ��: \"vim -h\"\n"
+"������Ϣ���: \"vim -h\"\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�ļ� ..]       �༭ָ�����ļ�"
@@ -2103,10 +2711,10 @@ msgid "-               read text from stdin"
 msgstr "-               �ӱ�׼����(stdin)��ȡ�ı�"
 
 msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �༭ʱʹ��ָ���� tag"
+msgstr "-t tag          �༭ tag ���崦���ļ�"
 
 msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �༭ʱ���ص�һ������"
+msgstr "-q [errorfile]  �༭��һ�����������ļ�"
 
 msgid ""
 "\n"
@@ -2115,17 +2723,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �÷�:"
+"�÷�:"
 
 msgid " vim [arguments] "
-msgstr "vim [����] "
+msgstr " vim [����] "
 
 msgid ""
 "\n"
 "   or:"
 msgstr ""
 "\n"
-"   ��:"
+"  ��:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -2137,10 +2748,13 @@ msgstr ""
 "����:\n"
 
 msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tֻ������֮����ļ�"
+msgstr "--\t\t\t�����Ժ�ֻ���ļ���"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t����չͨ���"
 
 msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\tע�� gvim �� OLE"
+msgstr "-register\t\tע��� gvim �� OLE"
 
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
@@ -2148,8 +2762,8 @@ msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tʹ��ͼ�ν��� (ͬ \"gvim\")"
 
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tǰ��: ����ͼ�ν���ʱ�� fork"
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  ��  --nofork\tǰ̨: ����ͼ�ν���ʱ�� fork"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
@@ -2158,13 +2772,13 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t���� (batch) ģʽ (ֻ���� \"ex\" һ��ʹ��)"
+msgstr "-s\t\t\t����(������)ģʽ (ֻ���� \"ex\" һ��ʹ��)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\", ��Ѹ�ٱȽ����ļ���ͬ��)"
+msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t����ģʽ (ͬ \"evim\", modeless)"
+msgstr "-y\t\t\t����ģʽ (ͬ \"evim\"����ģʽ)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tֻ��ģʽ (ͬ \"view\")"
@@ -2173,7 +2787,7 @@ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t����ģʽ (ͬ \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t�����޸� (д���ļ�)"
+msgstr "-m\t\t\t�����޸�(д���ļ�)"
 
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�ı������޸�"
@@ -2185,10 +2799,10 @@ msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp ģʽ"
 
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' ��ͳ Vi ����ģʽ"
+msgstr "-C\t\t\t���ݴ�ͳ�� Vi: 'compatible'"
 
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' ����ȫ�봫ͳ Vi ���ݣ���ʹ�� Vim ��ǿ����"
+msgstr "-N\t\t\t����ȫ���ݴ�ͳ�� Vi: 'nocompatible'"
 
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose �ȼ�"
@@ -2197,163 +2811,183 @@ msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t����ģʽ"
 
 msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t��ʹ�ý����ļ�, ֻʹ���ڴ�"
+msgstr "-n\t\t\t��ʹ�ý����ļ���ֻʹ���ڴ�"
 
 msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�г������ļ����˳�"
+msgstr "-r\t\t\t�г������ļ����˳�"
 
 msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (���ļ���)       \t�ָ��ϴα���������(Recover crashed session)"
+msgstr "-r (���ļ���)\t\t�ָ������ĻỰ"
 
 msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t�� -r һ��"
+msgstr "-L\t\t\tͬ -r"
 
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t��ʹ�� newcli ���򿪴���"
 
 msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\tʹ�� <device> ����������豸"
+msgstr "-dev <device>\t\tʹ�� <device> �����������"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t�� Arabic ģʽ����"
 
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t����Ϊ ϣ����ģʽ"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\t�� Hebrew ģʽ����"
 
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t����Ϊ Farsi ģʽ"
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\t�� Farsi ģʽ����"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�趨�ն�Ϊ <terminal>"
+msgstr "-T <terminal>\t�趨�ն�����Ϊ <terminal>"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹ�� <vimrc> �滻�κ� .vimrc"
+msgstr "-u <vimrc>\t\tʹ�� <vimrc> ����κ� .vimrc"
 
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> �滻�κ� .gvimrc"
+msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> ����κ� .gvimrc"
 
 msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�������κ� plugin"
+msgstr "--noplugin\t\t������ plugin �ű�"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t�� N ����ǩҳ (Ĭ��ֵ: ÿ���ļ�һ��)"
 
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t�� N ������ (Ԥ����ÿ���ļ�һ��)"
+msgstr "-o[N]\t\t�� N ������ (Ĭ��ֵ: ÿ���ļ�һ��)"
 
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o ��ʹ�ô�ֱ�ָ�"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tͬ -o ����ֱ�ָ�"
 
 msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�����������ļ���β"
+msgstr "+\t\t\t�����������ļ�ĩβ"
 
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t������������ <lnum> ��"
 
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t�����κ� vimrc ǰִ�� <command>"
+msgstr "--cmd <command>\t�����κ� vimrc �ļ�ǰִ�� <command>"
 
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t���ص�һ���ļ���ִ�� <command>"
 
 msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t���ص�һ���ļ������� Session �ļ�<session>"
+msgstr "-S <session>\t\t���ص�һ���ļ���ִ���ļ� <session>"
 
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t�� <scriptin> ����һ��ģʽ����"
+msgstr "-s <scriptin>\t���ļ� <scriptin> ��������ģʽ������"
 
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���ļ� <scriptout> ����(append)�������������"
+msgstr "-w <scriptout>\t���������������׷�ӵ��ļ� <scriptout>"
 
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���ļ� <scriptout> д���������������"
+msgstr "-W <scriptout>\t���������������д�뵽�ļ� <scriptout>"
 
 msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t�༭��������ļ�"
+msgstr "-x\t\t\t�༭���ܵ��ļ�"
 
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\t�� vim ��ָ���� X-server ����"
 
 msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t��Ҫ���ӵ� X Server"
+msgstr "-X\t\t\t�����ӵ� X Server"
 
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t����һ�� GTK ����ڴ� Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t���п��ܣ��� Vim �������ϱ༭�ļ� <files>"
 
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t�༭ Vim �������ϵ��ļ����˳�"
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> ��Ч�� --remote, ����Ⱥ��ļ���ɱ༭"
+msgstr "--remote-wait <files>  ͬ --remote ����ȴ��ļ���ɱ༭"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
+
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <files>  ͬ --remote ����ÿ���ļ���һ����ǩҳ"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\t�ͳ� <keys> �� Vim ���������˳�"
 
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\t�ڷ������������ʽ��ֵ����ӡ���"
+msgstr "--remote-expr <expr>\t�� Vim ���������� <expr> ��ֵ����ӡ���"
 
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\t�г����õ� Vim ���������Ʋ��˳�"
 
 msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\t����/��Ϊ Vim ������ <name>"
+msgstr "--servername <name>\t���͵����Ϊ Vim ������ <name>"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹ�� <viminfo> ���� .viminfo"
+msgstr "-i <viminfo>\t\tʹ�� <viminfo> ȡ�� .viminfo"
 
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t��ӡ˵��(Ҳ���Ǳ���Ϣ)���˳�"
+msgid "-h  or  --help\tPrint Help (this message) and exit"
+msgstr "-h  ��  --help\t��ӡ����(����Ϣ)���˳�"
 
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (Motif ��):\n"
+"gvim (Motif �汾) ��ʶ��Ĳ���:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw �汾) ��ʶ��Ĳ���:\n"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (Athena ��):\n"
+"gvim (Athena �汾) ��ʶ��Ĳ���:\n"
 
 msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\t�ڴ��� <display> ִ�� vim"
+msgstr "-display <display>\t�� <display> ������ vim"
 
 msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\t��������С��(iconified)"
+msgstr "-iconic\t\t��������С��"
 
 msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��������Ϊ <name>"
+msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��Ϊ <name>"
 
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (��δʵ��)\n"
 
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\t�趨 <color> Ϊ����ɫ (Ҳ���� -bg)"
+msgstr "-background <color>\tʹ�� <color> ��Ϊ����ɫ (Ҳ���� -bg)"
 
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\t�趨 <color> Ϊһ��������ɫ (Ҳ���� -fg)"
+msgstr "-foreground <color>\tʹ�� <color> ��Ϊһ��������ɫ (Ҳ���� -fg)"
 
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\tʹ�� <font> Ϊһ������ (Ҳ���� -fn)"
+msgstr "-font <font>\tʹ�� <font> ��Ϊһ������ (Ҳ���� -fn)"
 
 msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\tʹ�� <font> Ϊ��������"
+msgstr "-boldfont <font>\tʹ�� <font> ��Ϊ��������"
 
 msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\tʹ�� <font> Ϊб������"
+msgstr "-italicfont <font>\tʹ�� <font> ��Ϊб������"
 
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\tʹ��<geom>Ϊ��ʼλ�� (Ҳ���� -geom)"
+msgstr "-geometry <geom>\tʹ�� <geom> ��Ϊ��ʼλ�� (Ҳ���� -geom)"
 
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\tʹ�ÿ���Ϊ <width> �ı߿� (Ҳ���� -bw)"
+msgstr "-borderwidth <width>\t�趨�߿����Ϊ <width> (Ҳ���� -bw)"
 
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr "-scrollbarwidth <width> �趨����������Ϊ <width> (Ҳ���� -sw)"
 
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\t�趨�˵��еĸ߶�Ϊ <height> (Ҳ���� -mh)"
+msgstr "-menuheight <height>\t�趨�˵����߶�Ϊ <height> (Ҳ���� -mh)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tʹ�÷��� (Ҳ���� -rv)"
@@ -2369,7 +3003,7 @@ msgid ""
 "Arguments recognised by gvim (RISC OS version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (RISC OS ��):\n"
+"gvim (RISC OS �汾) ��ʶ��Ĳ���:\n"
 
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t���ڳ�ʼ����"
@@ -2382,43 +3016,48 @@ msgid ""
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (GTK+ ��):\n"
+"gvim (GTK+ �汾) ��ʶ��Ĳ���:\n"
 
 msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\t�� <display> ִ�� vim (Ҳ���� --display)"
+msgstr "-display <display>\t�� <display> ������ vim (Ҳ���� --display)"
 
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t��ʾ Gnome ��ز���"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t����һ�� GTK �����д� Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t�ڸ�Ӧ�ó����д� Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
 
 #. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"���ͱ���ʽʧ�ܡ�\n"
+msgid ": Send failed.\n"
+msgstr ": ����ʧ�ܡ�\n"
 
 #. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"�ͳ�ʧ�ܡ���ͼ�ڱ���ִ��\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": ����ʧ�ܡ����Ա���ִ��\n"
 
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d �� %d �ѱ༭"
 
-msgid "Send expression failed.\n"
-msgstr "���ͱ���ʽʧ�ܡ�\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "���ͱ���ʽʧ�ܡ�\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ���ͱ���ʽʧ�ܡ�\n"
 
 msgid "No marks set"
-msgstr "û���趨��� (mark)"
+msgstr "û���趨���"
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: �Ҳ������� \"%s\" �ı��(mark)"
+msgstr "E283: û��ƥ�� \"%s\" �ı��"
 
 #. Highlight title
 msgid ""
@@ -2426,7 +3065,7 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"��� �к�  ��  �ļ�/�ı�"
+"���   ��   �� �ļ�/�ı�"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " jump line  col file/text"
 msgstr ""
 "\n"
-" ���� �к�  ��  �ļ�/�ı�"
+" ��ת   ��   �� �ļ�/�ı�"
+
+#. Highlight title
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"  �ı�   ��   �� �ı�"
 
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -2444,117 +3092,119 @@ msgstr ""
 "# �ļ����:\n"
 
 #. Write the jumplist with -'
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
 msgstr ""
 "\n"
-"# Jumplist (���µ���):\n"
+"# ��ת�б� (���µ���):\n"
 
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
 msgstr ""
 "\n"
-"# �ļ�����ʷ��¼ (���µ���):\n"
+"# �ļ��ڵı����ʷ��¼ (���µ���):\n"
 
 msgid "Missing '>'"
-msgstr "ȱ�ٶ�Ӧ�� '>'"
+msgstr "ȱ�� '>'"
 
-msgid "Not a valid codepage"
-msgstr "����ȷ�Ĵ���ҳ"
+msgid "E543: Not a valid codepage"
+msgstr "E543: ��Ч�Ĵ���ҳ"
 
 msgid "E284: Cannot set IC values"
-msgstr "E284: �����趨 IC ��ֵ"
+msgstr "E284: �����趨 IC ֵ"
 
 msgid "E285: Failed to create input context"
-msgstr "E285: ���ܴ�������������"
+msgstr "E285: �޷���������������"
 
 msgid "E286: Failed to open input method"
-msgstr "E286: ���ܴ����뷨"
+msgstr "E286: �޷������뷨"
 
 msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: ����: �����Ƴ� IM �� callback"
+msgstr "E287: ����: �޷��趨���뷨���ͷŻص�����"
 
 msgid "E288: input method doesn't support any style"
-msgstr "E288: ���뷨��֧���κ� style"
+msgstr "E288: ���뷨��֧���κη��"
 
 msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: ���뷨��֧���κ� style"
+msgstr "E289: ���뷨��֧���ҵ�Ԥ�༭����"
 
 msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot ��Ҫ���弯(Fontset)"
+msgstr "E290: over-the-spot �����Ҫ Fontset"
 
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: ��� GTK+ �� 1.2.3 �ϡ�����ʹ��״̬����"
+msgstr "E291: ��� GTK+ �� 1.2.3 �ɡ�״̬�������á�"
 
 msgid "E292: Input Method Server is not running"
-msgstr "E292: ���뷨��������(Input Method Server)δ����"
+msgstr "E292: ���뷨������δ����"
 
 msgid "E293: block was not locked"
 msgstr "E293: ��δ������"
 
 msgid "E294: Seek error in swap file read"
-msgstr "E294: �����ļ���ȡ����"
+msgstr "E294: �����ļ���ȡ��λ����"
 
 msgid "E295: Read error in swap file"
 msgstr "E295: �����ļ���ȡ����"
 
 msgid "E296: Seek error in swap file write"
-msgstr "E296: �����ļ�д�����"
+msgstr "E296: �����ļ�д�붨λ����"
 
 msgid "E297: Write error in swap file"
 msgstr "E297: �����ļ�д�����"
 
 msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �����ļ��Ѿ�����! (С�ķ�������İ�ȫ©��!?)"
+msgstr "E300: �����ļ��Ѵ��� (�������ӹ�����)"
 
 msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �Ҳ����� 0?"
+msgstr "E298: �Ҳ����� 0��"
 
 msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �Ҳ����� 1?"
+msgstr "E298: �Ҳ����� 1��"
 
 msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �Ҳ����� 2?"
+msgstr "E298: �Ҳ����� 2��"
 
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ����, �����ļ�������!!!"
+msgstr "E301: �ޣ������ļ������ˣ�����"
 
 msgid "E302: Could not rename swap file"
-msgstr "E302: ���ܸı佻���ļ�������"
+msgstr "E302: �޷������������ļ�"
 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: ���ܴ򿪽����ļ� \"%s\", �����ָܻ���"
+msgstr "E303: �޷��� \"%s\" �Ľ����ļ����ָ���������"
 
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: �Ҳ����� 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): �Ҳ����� 0��"
 
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: �Ҳ��� %s �Ľ����ļ�"
 
 msgid "Enter number of swap file to use (0 to quit): "
-msgstr "��ѡ����Ҫʹ�õĽ����ļ� (��0 �˳�): "
+msgstr "������Ҫʹ�õĽ����ļ���� (0 �˳�): "
 
 #, c-format
 msgid "E306: Cannot open %s"
-msgstr "E306: ���ܴ� %s"
+msgstr "E306: �޷��� %s"
 
 msgid "Unable to read block 0 from "
-msgstr "���ܶ�ȡ�� 0:"
+msgstr "�޷���ȡ�� 0: "
 
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"������û�����κ��޸Ļ��� Vim �����������½����ļ�."
+"������û�����κ��޸Ļ��� Vim �����������½����ļ���"
 
 msgid " cannot be used with this version of Vim.\n"
-msgstr " �����ڱ��汾�� Vim ��ʹ��.\n"
+msgstr " �����ڸð汾�� Vim ��ʹ�á�\n"
 
 msgid "Use Vim version 3.0.\n"
 msgstr "ʹ�� Vim 3.0��\n"
@@ -2564,17 +3214,17 @@ msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ������������ Vim �����ļ�"
 
 msgid " cannot be used on this computer.\n"
-msgstr " ��������̨������ʹ��.\n"
+msgstr " ��������̨������ʹ�á�\n"
 
 msgid "The file was created on "
-msgstr "���ļ������� "
+msgstr "���ļ������� "
 
 msgid ""
 ",\n"
 "or the file has been damaged."
 msgstr ""
-",\n"
-"�������ļ��ѱ��ƻ���"
+"��\n"
+"���Ǵ��ļ����𻵡�"
 
 #, c-format
 msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@ msgstr "ʹ�ý����ļ� \"%s\""
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "ԭ�ļ� \"%s\""
+msgstr "ԭʼ�ļ� \"%s\""
 
 msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ����: ԭʼ�ļ������Ѿ��޸Ĺ���"
+msgstr "E308: ����: ԭʼ�ļ������ѱ��޸�"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: ���ܴ� %s ��ȡ�� 1"
+msgstr "E309: �޷��� %s ��ȡ�� 1"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???MANY LINES MISSING"
-msgstr "???ȱ��̫����"
+msgstr "???ȱ����̫����"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINE COUNT WRONG"
-msgstr "???�кŴ���"
+msgstr "???��������"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???EMPTY BLOCK"
-msgstr "???�յ� ��"
+msgstr "???�յĿ�"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINES MISSING"
-msgstr "???�Ҳ���һЩ��"
+msgstr "???ȱ����һЩ��"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ�?)"
+msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ���)"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???BLOCK MISSING"
-msgstr "???�Ҳ�����"
+msgstr "???ȱ�ٿ�"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �����ﵽ ???END �����ݿ���������"
+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 �����ݿ��ܱ�ɾ��/�����"
+msgstr "??? �����ﵽ ???END ���п����ѱ�����/ɾ����"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???END"
 msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
-msgstr "E311: �ָ����ж�"
+msgstr "E311: �ָ��ѱ��ж�"
 
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: �ָ�ʱ��������; ��ע�⿪ͷΪ ??? ����"
+msgstr "E312: �ָ�ʱ����������ע�⿪ͷΪ ??? ����"
+
+msgid "See \":help E312\" for more information."
+msgstr "������Ϣ��� \":help E312\""
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "�ָ����. ��ȷ��һ������."
+msgstr "�ָ���ϡ���ȷ��һ��������"
 
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
 msgstr ""
 "\n"
-"(�������Ҫ������ļ�����Ϊ����ļ�����\n"
+"(�������Ҫ������ļ�����Ϊ����ļ���\n"
 
 msgid "and run diff with the original file to check for changes)\n"
-msgstr "��ִ�� diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
+msgstr "������ diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
 
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
 msgstr ""
-"(D)ֱ��ɾ�� .swp �����ļ�\n"
+"Ȼ��� .swp �ļ�ɾ����\n"
 "\n"
 
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
-msgstr "�ҵ����µĽ����ļ�:"
+msgstr "�ҵ������ļ�:"
 
 msgid "   In current directory:\n"
-msgstr "   ��ĿǰĿ¼:\n"
+msgstr "   λ�ڵ�ǰĿ¼:\n"
 
 msgid "   Using specified name:\n"
-msgstr "   Using specified name:\n"
+msgstr "   ʹ��ָ��������:\n"
 
 msgid "   In directory "
-msgstr "   ��Ŀ¼ "
+msgstr "   λ��Ŀ¼ "
 
 msgid "      -- none --\n"
 msgstr "      -- �� --\n"
@@ -2672,13 +3341,13 @@ msgid "             dated: "
 msgstr "              ����: "
 
 msgid "         [from Vim version 3.0]"
-msgstr "              [�� Vim �汾 3.0]"
+msgstr "         [���� Vim �汾 3.0]"
 
 msgid "         [does not look like a Vim swap file]"
-msgstr "                          [���� Vim �Ľ����ļ�]"
+msgstr "         [������ Vim �����ļ�]"
 
 msgid "         file name: "
-msgstr "              �ļ���: "
+msgstr "            �ļ���: "
 
 msgid ""
 "\n"
@@ -2718,14 +3387,14 @@ msgstr ""
 "           ���� ID: "
 
 msgid " (still running)"
-msgstr " (����ִ��)"
+msgstr " (��������)"
 
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
 msgstr ""
 "\n"
-"         [�����ڱ��汾�� Vim ��ʹ��]"
+"         [�����ڸð汾�� Vim ��ʹ��]"
 
 msgid ""
 "\n"
@@ -2735,13 +3404,13 @@ msgstr ""
 "         [�����ڱ�����ʹ��]"
 
 msgid "         [cannot be read]"
-msgstr "         [���ܶ�ȡ]"
+msgstr "         [�޷���ȡ]"
 
 msgid "         [cannot be opened]"
-msgstr "         [���ܴ�]"
+msgstr "         [�޷���]"
 
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ���ܱ���, ��ʹ�ý����ļ�"
+msgstr "E313: �޷�������û�н����ļ�"
 
 msgid "File preserved"
 msgstr "�ļ��ѱ���"
@@ -2751,7 +3420,7 @@ msgstr "E314: ����ʧ��"
 
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ����� lnum: %ld"
+msgstr "E315: ml_get: ��Ч�� lnum: %ld"
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@ msgid "stack_idx should be 0"
 msgstr "stack_idx Ӧ���� 0"
 
 msgid "E318: Updated too many blocks?"
-msgstr "E318: ����̫���?"
+msgstr "E318: ������̫��Ŀ飿"
 
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ָ��� id ���� 4"
 
 msgid "deleted block 1?"
-msgstr "ɾ���� 1?"
+msgstr "ɾ���˿� 1��"
 
 #, c-format
 msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@ msgstr "pe_line_count Ϊ��"
 
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: �кų�����Χ: %ld ������β"
+msgstr "E322: �кų�����Χ: %ld ������β"
 
 #, c-format
 msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@ msgid "Stack size increases"
 msgstr "��ջ��С����"
 
 msgid "E317: pointer block id wrong 2"
-msgstr "E317: ָ��� id �� 2"
+msgstr "E317: ָ��� id ���� 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" �������ӳ���ѭ��"
 
 msgid "E325: ATTENTION"
 msgstr "E325: ע��"
@@ -2807,10 +3480,10 @@ msgstr ""
 "���ֽ����ļ� \""
 
 msgid "While opening file \""
-msgstr "�����ļ�ʱ \""
+msgstr "���ڴ��ļ� \""
 
 msgid "      NEWER than swap file!\n"
-msgstr "      �Ƚ����ļ���!\n"
+msgstr "      �Ƚ����ļ��£�\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
@@ -2821,95 +3494,101 @@ msgid ""
 "    different instances of the same file when making changes.\n"
 msgstr ""
 "\n"
-"(1) ��������һ������Ҳ�ڱ༭ͬһ���ļ�.\n"
-"    �������������ע�ⲻҪһ��д�룬��Ȼ���Ŭ�����Ḷ�����\n"
+"(1) ��һ���������Ҳ�ڱ༭ͬһ���ļ���\n"
+"    ������������޸�ʱ��ע�����ͬһ���ļ�����������ͬ�İ汾��\n"
+"\n"
 
 msgid "    Quit, or continue with caution.\n"
-msgstr "    �˳������Ǽ����༭��\n"
+msgstr "    �˳�����С�ĵؼ�����\n"
 
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
 msgstr ""
 "\n"
-"(2) ��һ�α༭���ļ�ʱ����\n"
+"(2) �ϴα༭���ļ�ʱ������\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���������, ���� \":recover\" �� \"vim -r"
+msgstr "    ��������������� \":recover\" �� \"vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    �ָ��޸����� (��һ��˵���뿴 \":help recovery\").\n"
+"    �ָ��޸ĵ����� (��� \":help recovery\")��\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    ����ûָ��Ķ��Ѿ��ָ���, ��ֱ��ɾ���˽����ļ� \""
+msgstr "    ������Ѿ������˻ָ�����ɾ�������ļ� \""
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
 "\"\n"
-"    �Ա����ٿ�������Ϣ.\n"
+"    �Ա����ٿ�������Ϣ��\n"
 
 msgid "Swap file \""
 msgstr "�����ļ� \""
 
 msgid "\" already exists!"
-msgstr "\" �Ѿ�������!"
+msgstr "\" �Ѵ��ڣ�"
 
 msgid "VIM - ATTENTION"
 msgstr "VIM - ע��"
 
 msgid "Swap file already exists!"
-msgstr "�����ļ��Ѿ�����!"
+msgstr "�����ļ��Ѵ��ڣ�"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
 msgstr ""
 "��ֻ����ʽ��(&O)\n"
 "ֱ�ӱ༭(&E)\n"
 "�ָ�(&R)\n"
-"�˳�(&Q)"
+"�˳�(&Q)\n"
+"��ֹ(&A)"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Delete it"
+"&Abort"
 msgstr ""
 "��ֻ����ʽ��(&O)\n"
 "ֱ�ӱ༭(&E)\n"
 "�ָ�(&R)\n"
+"ɾ�������ļ�(&D)\n"
 "�˳�(&Q)\n"
-"ɾ�������ļ�(&D)"
+"��ֹ(&A)"
 
 msgid "E326: Too many swap files found"
 msgstr "E326: �ҵ�̫�ཻ���ļ�"
 
 msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ���ݲ˵�����Ӳ˵�"
+msgstr "E327: �˵����ĳ����·�������Ӳ˵�"
 
 msgid "E328: Menu only exists in another mode"
-msgstr "E328: �˵�ֻ��������ģʽ��ʹ��"
+msgstr "E328: �˵�ֻ������ģʽ�д���"
 
-msgid "E329: No menu of that name"
-msgstr "E329: û�������Ĳ˵�"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: û�в˵� \"%s\""
 
 msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: �˵�����ָ����ѡ��"
+msgstr "E330: �˵�·������ָ���Ӳ˵�"
 
 msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ����ֱ�ӰѲ˵���ӵ��˵�����"
+msgstr "E331: ���ܰѲ˵���ֱ�Ӽӵ��˵�����"
 
 msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: �ָ��߲����ǲ˵���һ����"
+msgstr "E332: �ָ��߲����ǲ˵�·����һ����"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
@@ -2921,21 +3600,21 @@ msgstr ""
 "--- �˵� ---"
 
 msgid "Tear off this menu"
-msgstr "���´˲˵�"
+msgstr "˺�´˲˵�"
 
 msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �˵�����ָ��һ���˵���"
+msgstr "E333: �˵�·������ָ��˵���"
 
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: [�˵�] �Ҳ��� %s"
+msgstr "E334: �Ҳ����˵�: %s"
 
 #, c-format
 msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽδ����˵�"
+msgstr "E335: %s ģʽ�в˵�δ����"
 
 msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: �˵�����ָ���Ӳ˵�"
+msgstr "E336: �˵�·������ָ���Ӳ˵�"
 
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: �Ҳ����˵� - ����˵�����"
@@ -2946,31 +3625,30 @@ msgstr "���� %s ʱ��������:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "�� %4ld:"
+msgstr "�� %4ld ��:"
 
-msgid "[string too long]"
-msgstr "[�ַ���̫��]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ��Ч�ļĴ�����: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "����������Ϣά����: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "����������Ϣά����: Yuheng Xie <elephant@linux.net.cn>"
 
 msgid "Interrupt: "
 msgstr "���ж�: "
 
-msgid "Hit ENTER to continue"
-msgstr "�밴 ENTER ����"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
 msgstr "�밴 ENTER �������������"
 
+#, c-format
+msgid "%s line %ld"
+msgstr "%s �� %ld ��"
+
 msgid "-- More --"
 msgstr "-- ���� --"
 
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " �ո�/d/j: ��Ļ/ҳ/�� �·���b/u/k: �Ϸ���q: �˳�"
 
 msgid "Question"
 msgstr "����"
@@ -2979,17 +3657,8 @@ msgid ""
 "&Yes\n"
 "&No"
 msgstr ""
-"&Y��\n"
-"&N��"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y��\n"
-"&N��\n"
-"&Cȡ��"
+"��(&Y)\n"
+"��(&N)"
 
 msgid ""
 "&Yes\n"
@@ -2998,11 +3667,14 @@ msgid ""
 "&Discard All\n"
 "&Cancel"
 msgstr ""
-"&Y��\n"
-"&N��\n"
-"&Aȫ������\n"
-"&Dȫ������\n"
-"&Cȡ��"
+"��(&Y)\n"
+"��(&N)\n"
+"ȫ������(&A)\n"
+"ȫ������(&D)\n"
+"ȡ��(&C)"
+
+msgid "Select Directory dialog"
+msgstr "ѡ��Ŀ¼�Ի���"
 
 msgid "Save File dialog"
 msgstr "�����ļ��Ի���"
@@ -3012,35 +3684,51 @@ msgstr "���ļ��Ի���"
 
 #. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: ����̨(Console)ģʽʱû���ļ������(file browser)"
+msgstr "E338: ��Ǹ������̨ģʽ��û���ļ������"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() �Ĳ�������"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() �Ĳ�������"
 
 msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ע��: �������޸�һ��ֻ���ļ�"
+msgstr "W10: ����: �����޸�һ��ֻ���ļ�"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "���������ֻ������ (<Enter> ȡ��): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "��ѡ������ (<Enter> ȡ��): "
 
 msgid "1 more line"
-msgstr "����һ��"
+msgstr "���� 1 ��"
 
 msgid "1 line less"
-msgstr "����һ��"
+msgstr "���� 1 ��"
 
 #, c-format
 msgid "%ld more lines"
-msgstr " ���� %ld ��"
+msgstr "���� %ld ��"
 
 #, c-format
 msgid "%ld fewer lines"
-msgstr "ֻʣ %ld ��"
+msgstr "���� %ld ��"
 
 msgid " (Interrupted)"
 msgstr " (���ж�)"
 
+msgid "Beep!"
+msgstr "Beep!"
+
 msgid "Vim: preserving files...\n"
-msgstr "Vim: �����ļ���...\n"
+msgstr "Vim: ���ڱ����ļ�����\n"
 
 #. close all memfiles, without deleting
 msgid "Vim: Finished.\n"
-msgstr "Vim: ����.\n"
+msgstr "Vim: ������\n"
 
+#, c-format
 msgid "ERROR: "
 msgstr "����: "
 
@@ -3050,14 +3738,14 @@ msgid ""
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
 msgstr ""
 "\n"
-"[bytes] ȫ�� alloc-freed %lu-%lu, ʹ���� %lu, peak ʹ�� %lu\n"
+"[�ֽ�] �ܹ� alloc-free %lu-%lu��ʹ���� %lu���߷�ʹ�� %lu\n"
 
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
 "\n"
 msgstr ""
-"[����] ȫ�� re/malloc(): %lu, ȫ�� free()': %lu\n"
+"[����] �ܹ� re/malloc(): %lu���ܹ� free()': %lu\n"
 "\n"
 
 msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@ msgstr "E341: �ڲ�����: lalloc(%ld, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
-msgstr "E342: �ڴ治��! (�������� %lu �ֽ���)"
+msgstr "E342: �ڴ治�㣡(���� %lu �ֽ�)"
 
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "���� shell ִ��: \"%s\""
 
-msgid "Missing colon"
-msgstr "ȱ��ð��"
+msgid "E545: Missing colon"
+msgstr "E545: ȱ��ð��"
 
-msgid "Illegal mode"
-msgstr "����ȷ��ģʽ"
+msgid "E546: Illegal mode"
+msgstr "E546: ��Ч��ģʽ"
 
-msgid "Illegal mouseshape"
-msgstr "����ȷ�������״"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ��Ч�������״"
 
-msgid "digit expected"
-msgstr "Ӧ��Ϊ����"
+msgid "E548: digit expected"
+msgstr "E548: �˴���Ҫ����"
 
-msgid "Illegal percentage"
-msgstr "����ȷ�İٷֱ�"
+msgid "E549: Illegal percentage"
+msgstr "E549: ��Ч�İٷֱ�"
 
 msgid "Enter encryption key: "
 msgstr "��������: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 msgstr "��������һ��: "
 
 msgid "Keys don't match!"
-msgstr "�����������벻ͬ!"
+msgstr "�������벻ƥ�䣡"
 
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
-msgstr "E343: ����ȷ��·��: '**[number]' ����Ҫ��·����β��Ҫ���� '%s'"
+msgstr "E343: ��Ч��·��: '**[number]' ������·��ĩβ���ߺ���� '%s'��"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ��û��Ŀ¼ \"%s\""
+msgstr "E344: cdpath ���Ҳ���Ŀ¼ \"%s\""
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@ msgstr "E346: ��·�����Ҳ���������ļ� \"%s\""
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: ��·�����Ҳ���������ļ� \"%s\""
 
-msgid "Illegal component"
-msgstr "����ȷ�����"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: ������ %ld ��ʧ NetBeans ����"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' Ϊ��"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ��ֵ���ܲ�����"
 
 msgid "Warning: terminal cannot highlight"
-msgstr "ע��: ����ն˲�����ʾ������"
+msgstr "����: ����ն˲�����ʾ����"
 
 msgid "E348: No string under cursor"
 msgstr "E348: ��괦û���ַ���"
@@ -3134,56 +3846,78 @@ msgid "E349: No identifier under cursor"
 msgstr "E349: ��괦û��ʶ����"
 
 msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ������Ŀǰ�� 'foldmethod' ��ɾ�� fold"
+msgstr "E352: �����ڵ�ǰ�� 'foldmethod' ��ɾ�� fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: �ı��б�Ϊ��"
+
+msgid "E662: At start of changelist"
+msgstr "E662: ���ڸı��б��Ŀ�ʼ��"
+
+msgid "E663: At end of changelist"
+msgstr "E663: ���ڸı��б���ĩβ��"
+
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "����  :quit<Enter>  �˳� Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
-msgstr "һ�� %s �� һ��"
+msgstr "1 �� %s �� 1 ��"
 
 #, c-format
 msgid "1 line %sed %d times"
-msgstr "һ�� %s �� %d ��"
+msgstr "1 �� %s �� %d ��"
 
 #, c-format
 msgid "%ld lines %sed 1 time"
-msgstr "%ld �� %s �� һ��"
+msgstr "%ld �� %s �� 1 ��"
 
 #, c-format
 msgid "%ld lines %sed %d times"
-msgstr "%ld �� %s �� %d ��"
+msgstr "%ld �� %s �� %d ��"
 
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "ʶ�� %ld ��..."
+msgstr "���� %ld �С��� "
 
 msgid "1 line indented "
-msgstr "һ����ʶ��"
+msgstr "������ 1 �� "
 
 #, c-format
 msgid "%ld lines indented "
-msgstr "��ʶ�� %ld ��"
+msgstr "������ %ld �� "
+
+msgid "E748: No previously used register"
+msgstr "E748: û��ǰһ��ʹ�õļĴ���"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
-msgstr "���ܸ���; ֱ��ɾ��"
+msgstr "�޷����ƣ���Ϊɾ��"
 
 msgid "1 line changed"
-msgstr " 1 �� ~ed"
+msgstr "�ı��� 1 ��"
 
 #, c-format
 msgid "%ld lines changed"
-msgstr " %ld �� ~ed"
+msgstr "�ı��� %ld ��"
 
 #, c-format
 msgid "freeing %ld lines"
-msgstr "�ͷ� %ld ����"
+msgstr "�ͷ��� %ld ��"
+
+msgid "block of 1 line yanked"
+msgstr "������ 1 �еĿ�"
 
 msgid "1 line yanked"
-msgstr "�Ѹ��� 1 ��"
+msgstr "������ 1 ��"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "������ %ld �еĿ�"
 
 #, c-format
 msgid "%ld lines yanked"
-msgstr "�Ѹ��� %ld ��"
+msgstr "������ %ld ��"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@ msgstr ""
 "--- �Ĵ��� ---"
 
 msgid "Illegal register name"
-msgstr "����ȷ�ļĴ�������"
+msgstr "��Ч�ļĴ�����"
 
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# �Ĵ���:\n"
 
 #, c-format
-msgid "Unknown register type %d"
-msgstr "δ֪��ע������: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �Ĵ������ƴ���: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: δ֪�ļĴ������� %d"
 
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ��; "
 
-#, 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)"
+#, 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 "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"
+#, fuzzy, 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"
+
+#, 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"
+
+#, fuzzy, 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"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "��л��ѡ�� Vim"
 
-msgid "Option not supported"
-msgstr "��֧�ָ�ѡ��"
+msgid "E518: Unknown option"
+msgstr "E518: δ֪��ѡ��"
 
-msgid "Not allowed in a modeline"
-msgstr "������ģʽ�������"
+msgid "E519: Option not supported"
+msgstr "E519: ��֧�ָ�ѡ��"
 
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t��ǰ����: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: �������� modeline ��ʹ��"
 
-msgid "Number required after ="
-msgstr "= ����Ҫ������"
+msgid "E521: Number required after ="
+msgstr "E521: = ������Ҫ����"
 
-msgid "Not found in termcap"
-msgstr "Termcap �����Ҳ���"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap �����Ҳ���"
 
 #, c-format
-msgid "Illegal character <%s>"
-msgstr "����ȷ���ַ� <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: ��Ч���ַ� <%s>"
 
-msgid "Not allowed here"
-msgstr "���ﲻ��ʹ��"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: �����趨 'term' Ϊ���ַ���"
 
-msgid "Cannot set 'term' to empty string"
-msgstr "�����趨 'term' Ϊ���ַ���"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: ��ͼ�ν����в��ܸı��ն�"
 
-msgid "Cannot change term in GUI"
-msgstr "��ͼ�ͽ����в����л��ն�"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: ���� \":gui\" ����ͼ�ν���"
 
-msgid "Use \":gui\" to start the GUI"
-msgstr "���� \":gui\" ������ͼ�ν���"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' �� 'patchmode' ���"
 
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' �� 'patchmode' ��һ����"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: �� GTK+ 2 ͼ�ν����в��ܸ���"
 
-msgid "Zero length string"
-msgstr "�㳤���ַ���"
+msgid "E524: Missing colon"
+msgstr "E524: ȱ��ð��"
+
+msgid "E525: Zero length string"
+msgstr "E525: �ַ�������Ϊ��"
 
 #, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> ��ȱ������"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> ����ȱ������"
 
-msgid "Missing comma"
-msgstr "ȱ�ٶ���"
+msgid "E527: Missing comma"
+msgstr "E527: ȱ�ٶ���"
 
-msgid "Must specify a ' value"
-msgstr "����ָ��һ�� ' ֵ"
+msgid "E528: Must specify a ' value"
+msgstr "E528: ����ָ��һ�� ' ֵ"
 
-msgid "contains unprintable character"
-msgstr "����������ʾ���ַ�"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: ����������ʾ�ַ�����ַ�"
 
-msgid "Invalid font(s)"
-msgstr "����ȷ������"
+msgid "E596: Invalid font(s)"
+msgstr "E596: ��Ч������"
 
-msgid "can't select fontset"
-msgstr "����ʹ�����弯(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: �޷�ѡ�� Fontset"
 
-msgid "Invalid fontset"
-msgstr "����ȷ�����弯(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: ��Ч�� Fontset"
 
-msgid "can't select wide font"
-msgstr "����ʹ���趨�Ŀ�����(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: �޷�ѡ�������"
 
-msgid "Invalid wide font"
-msgstr "����ȷ�Ŀ�����(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: ��Ч�Ŀ�����"
 
 #, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> ���в���ȷ���ַ�"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> ��������Ч���ַ�"
 
-msgid "comma required"
-msgstr "��Ҫ����"
+msgid "E536: comma required"
+msgstr "E536: ��Ҫ����"
 
 #, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' �����ǿհ׻���� %s"
-
-msgid "No mouse support"
-msgstr "��֧�����"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' ����Ϊ�ջ���� %s"
 
-msgid "Unclosed expression sequence"
-msgstr "û�н����ı���ʽ: "
+msgid "E538: No mouse support"
+msgstr "E538: ��֧�����"
 
-msgid "too many items"
-msgstr "̫�����"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: û�н����ı���ʽ����"
 
-msgid "unbalanced groups"
-msgstr "���ԳƵ���"
+msgid "E541: too many items"
+msgstr "E541: ��Ŀ����"
 
-msgid "A preview window already exists"
-msgstr "Ԥ�������Ѿ�������"
+msgid "E542: unbalanced groups"
+msgstr "E542: ���ҵ���"
 
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' ���ܱ� 'winminheight' ����"
+msgid "E590: A preview window already exists"
+msgstr "E590: Ԥ�������Ѵ���"
 
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' ���ܱ� 'winminwidth' ����"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic ��Ҫ UTF-8����ִ�� ':set encoding=utf-8'"
 
 #, c-format
-msgid "Need at least %d lines"
-msgstr "������Ҫ %d ��"
+msgid "E593: Need at least %d lines"
+msgstr "E593: ������Ҫ %d ��"
 
 #, c-format
-msgid "Need at least %d columns"
-msgstr "������Ҫ %d ��"
+msgid "E594: Need at least %d columns"
+msgstr "E594: ������Ҫ %d ��"
 
 #, c-format
 msgid "E355: Unknown option: %s"
-msgstr "E355: ����ȷ��ѡ��: %s"
+msgstr "E355: δ֪��ѡ��: %s"
 
 msgid ""
 "\n"
@@ -3359,14 +4102,14 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- ȫ�� ѡ��ֵ ---"
+"--- ȫ��ѡ��ֵ ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- ���� ѡ��ֵ ---"
+"--- �ֲ�ѡ��ֵ ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim ����ֵ: %d\n"
 msgid "cannot change console mode ?!\n"
 msgstr "�����л�����̨(console)ģʽ !?\n"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ��֧���趨��Ļģʽ"
-
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ��������̨(console)??\n"
 
@@ -3440,13 +4180,12 @@ msgstr "I/O ����"
 #~ msgid "...(truncated)"
 #~ msgstr ""
 
+#~ msgid "Message"
+#~ msgstr ""
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ���� 80, ����ִ���ⲿ����"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ���ú����� \"%s\"() ʧ��"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: ����ѡ��˴�ӡ��"
 
@@ -3455,12 +4194,13 @@ msgid "to %s on %s"
 msgstr "�� %s �� %s"
 
 #, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: δ֪�Ĵ�ӡ������: %s"
+
+#, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: ��ӡ����: %s"
 
-msgid "Unknown"
-msgstr "δ֪"
-
 #, c-format
 msgid "Printing '%s'"
 msgstr "�Ѵ�ӡ: '%s'"
@@ -3483,6 +4223,7 @@ msgstr "Vim: ˫���ź�, �˳���\n"
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: CVim: ���ص��ź�(signal) %s\n"
 
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: ���ص��������ź�(deadly signale)\n"
 
@@ -3545,9 +4286,31 @@ msgstr ""
 "\n"
 "�����ѽ���\n"
 
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "��ʾ����"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
 msgid "Opening the X display failed"
 msgstr "�� X Window ʧ��"
 
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "û�� cscope ����"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
 msgid "At line"
 msgstr "���к� "
 
@@ -3587,7 +4350,7 @@ msgid ""
 msgstr ""
 "����� $PATH ���Ҳ��� VIMRUN.EXE.\n"
 "�ⲿ����ִ����Ϻ󽫲�����ͣ.\n"
-"��һ��˵����ִ�� :help win32-vimrun "
+"��һ��˵����� :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim ����"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' δ�趨"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �Ҳ���Ŀ¼���ƻ��ǿյ�Ŀ¼����"
 
-msgid "No more items"
-msgstr "û����������"
+msgid "E553: No more items"
+msgstr "E553: û�и������"
 
 #, c-format
 msgid "(%d of %d)%s%s: "
@@ -3632,49 +4395,121 @@ msgid " (line deleted)"
 msgstr " (����ɾ��)"
 
 msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ��ջ��β"
+msgstr "E380: Quickfix ��ջ�׶�"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Quickfix ��ջ����"
 
 #, c-format
 msgid "error list %d of %d; %d errors"
-msgstr "�����б� %d/%d; ���� %d �����"
+msgstr "�����б� %d / %d���� %d ������"
 
 msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: ����д�룬'buftype' ѡ�����趨"
+msgstr "E382: �޷�д�룬���趨ѡ�� 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "�޷����ļ� \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: ������δ����"
+
+msgid "E777: String or List expected"
+msgstr "E777: �˴���Ҫ String ���� List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] ������Ч����"
 
 msgid "E339: Pattern too long"
-msgstr "E339: ����̫��"
+msgstr "E339: ģʽ̫��"
+
+msgid "E50: Too many \\z("
+msgstr "E50: ̫�� \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: ̫�� %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: ��ƥ��� \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: ��ƥ��� %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: ��ƥ��� %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: ��ƥ��� %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ ��������Ч���ַ�"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: ̫�ิ�ӵ� %s{...}s"
 
 #, c-format
 msgid "E61: Nested %s*"
-msgstr "E61: ��״ %s*"
+msgstr "E61: Ƕ�׵� %s*"
 
 #, c-format
 msgid "E62: Nested %s%c"
-msgstr "E62: ��״ %s%c"
+msgstr "E62: Ƕ�׵� %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: ����ȷ��ʹ�� \\_"
 
 #, c-format
 msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c û�нӶ���"
+msgstr "E64: %s%c ǰ��������"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: ��Ч�Ļ���"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: �˴������� \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: �˴������� \\z1 ��"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z ��������Ч���ַ�"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ��ȱ�� ]"
 
 #, c-format
-msgid "Syntax error in %s{...}"
-msgstr "�﷨����: %s{...}"
+msgid "E70: Empty %s%%[]"
+msgstr "E70: �յ� %s%%[]"
 
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ����ִ��; regular expression ̫����?"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ��������Ч���ַ�"
 
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% ��������Ч���ַ�"
 
-msgid "External submatches:\n"
-msgstr "�ⲿ����:\n"
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ��ȱ�� ]"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--�� fold %3ld ��"
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ���﷨����"
+
+msgid "External submatches:\n"
+msgstr "�ⲿ����:\n"
 
 msgid " VREPLACE"
 msgstr " V-�滻"
@@ -3683,7 +4518,7 @@ msgid " REPLACE"
 msgstr " �滻"
 
 msgid " REVERSE"
-msgstr " ��ת"
+msgstr " ����"
 
 msgid " INSERT"
 msgstr " ����"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (�滻)"
 
 msgid " (vreplace)"
-msgstr " (v-�滻)"
+msgstr " (V-�滻)"
 
 msgid " Hebrew"
-msgstr " ϣ����"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (����)"
@@ -3706,30 +4544,30 @@ msgstr " (����)"
 msgid " (paste)"
 msgstr " (ճ��)"
 
-msgid " SELECT"
-msgstr " ѡȡ"
-
 msgid " VISUAL"
 msgstr " ����"
 
-msgid " BLOCK"
-msgstr " ��"
+msgid " VISUAL LINE"
+msgstr " ���� ��"
 
-msgid " LINE"
-msgstr " ��"
+msgid " VISUAL BLOCK"
+msgstr " ���� ��"
 
-msgid "recording"
-msgstr "��¼��"
+msgid " SELECT"
+msgstr " ѡ��"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
+msgid " SELECT LINE"
+msgstr " ѡ�� ��"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
+msgid " SELECT BLOCK"
+msgstr " ѡ�� ��"
+
+msgid "recording"
+msgstr "��¼��"
 
 #, c-format
 msgid "E383: Invalid search string: %s"
-msgstr "E383: ����Ĳ����ַ���: %s"
+msgstr "E383: ��Ч�Ĳ����ַ���: %s"
 
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@ msgstr "  �Ҳ���"
 msgid "Scanning included file: %s"
 msgstr "���Ұ����ļ�: %s"
 
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "���Ұ����ļ�: %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: ��ǰ��ƥ��"
 
@@ -3780,9 +4622,364 @@ msgstr "E388: �Ҳ�������"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �Ҳ��� pattern"
 
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: �����ļ�д�����"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: ����ѡ��˴�ӡ��"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" �жϵ�: �� %ld ��"
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "ʹ�ý����ļ� \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s ������������ Vim �����ļ�"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: ���� %ld ���ļ�δ�༭"
+
+#~ 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\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "��֧�ָ�ѡ��"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "����ȷ�ķ����� id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: ��ǩ(tag) \"%s\" ���ļ� %s ���ظ����ֶ��"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ 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"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "ÿһ�ж��Ҳ���ģʽ: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "�ӱ�׼�����..."
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ 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 ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "д�� viminfo �ļ� \"%s\" ��"
+
+#, 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 "����"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "���ı䱣�浽 \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: û��ǰһ����������"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [�˵�] �Ҳ��� %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s ������������ Vim �����ļ�"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: ��ȡ�����ļ�ʧ��"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
 #, c-format
 msgid "E390: Illegal argument: %s"
-msgstr "E390: ��������ȷ: %s"
+msgstr "E390: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@ msgstr "��С"
 msgid "maximal "
 msgstr "���"
 
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹ���˲���ȷ�Ĳ���"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "ƥ�� %d"
 
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �Ҳ��� %s �� region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "����һ��"
 
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ʹ���˲���ȷ�Ĳ���"
@@ -3847,12 +5045,23 @@ msgstr "E395: ʹ���˲���ȷ�Ĳ���"
 msgid "E396: containedin argument not accepted here"
 msgstr "E396: ʹ���˲���ȷ�Ĳ���"
 
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: ʹ���˲���ȷ�Ĳ���"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: �Ҳ��� %s �� region item"
+
 msgid "E397: Filename required"
 msgstr "E397: ��Ҫ�ļ�����"
 
 #, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱ�� ']': %s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
-msgstr "E398: ȱ�� \"=\": %s"
+msgstr "E398: ȱ�� '=': %s"
 
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@ msgstr "E403: �﷨ͬ��: �����з���ָ��������"
 
 #, c-format
 msgid "E404: Illegal arguments: %s"
-msgstr "E404: ��������ȷ: %s"
+msgstr "E404: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@ msgstr "E405: ȱ�ٵȺ�: %s"
 
 #, c-format
 msgid "E406: Empty argument: %s"
-msgstr "E406: �ղ���: %s"
+msgstr "E406: �յĲ���: %s"
 
 #, c-format
 msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@ msgstr "E409: ����ȷ������: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ����ȷ�� :syntax ������: %s"
 
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �Ҳ��� highlight group: %s"
@@ -3947,23 +5159,30 @@ msgstr "E422: �ն˱���̫��: %s"
 
 #, c-format
 msgid "E423: Illegal argument: %s"
-msgstr "E423: ��������ȷ: %s"
+msgstr "E423: ��Ч�Ĳ���: %s"
 
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: ʹ����̫�಻ͬ�ĸ���������"
 
-msgid "at bottom of tag stack"
-msgstr "��ǩ(tag)��ջ��β"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: �������Ʋ���ȷ"
 
-msgid "at top of tag stack"
-msgstr "��ǩ(tag)��ջ��ͷ"
+msgid "E555: at bottom of tag stack"
+msgstr "E555: ���� tag ��ջ�ײ�"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: ���� tag ��ջ����"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �Ѿ�����ǰ��ı�ǩ(tag)��"
+msgstr "E425: �ѵ���һ��ƥ��� tag"
 
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: �Ҳ�����ǩ(tag): %s"
+msgstr "E426: �Ҳ��� tag: %s"
 
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
@@ -3971,18 +5190,11 @@ msgstr "  # pri kind tag"
 msgid "file\n"
 msgstr "�ļ�\n"
 
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "���� nr ��ѡ�� (<CR> �˳�): "
-
 msgid "E427: There is only one matching tag"
-msgstr "E427: ֻ�д������"
+msgstr "E427: ֻ��һ��ƥ��� tag"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ���������һ�����ϵı�ǩ(tag)��"
+msgstr "E428: �������һ��ƥ��� tag"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@ msgstr "�ļ� \"%s\" ������"
 #. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "�ҵ� tag: %d/%d%s"
+msgstr "�ҵ� tag: %d / %d%s"
 
 msgid " or more"
 msgstr " �����"
 
 msgid "  Using tag with different case!"
-msgstr "  �Բ�ͬ��Сд��ʹ�� tag!"
+msgstr "  �Բ�ͬ��Сд��ʹ�� tag��"
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@ msgstr ""
 "\n"
 "  # �� tag         ��   ��    �� �ļ�/�ı�"
 
-msgid "Linear tag search"
-msgstr "���Բ��ұ�ǩ (Tags)"
-
-msgid "Binary tag search"
-msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
-
 #, c-format
 msgid "Searching tags file %s"
-msgstr "���� tag �ļ� \"%s\""
+msgstr "���� tag �ļ� %s"
 
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@ msgstr "E431: Tag �ļ� \"%s\" ��ʽ����"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "�� %ld �ֽ�֮ǰ"
+msgstr "�ڵ� %ld �ֽ�֮ǰ"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 msgstr "E433: û�� tag �ļ�"
 
 msgid "E434: Can't find tag pattern"
-msgstr "E434: �Ҳ��� tag"
+msgstr "E434: �Ҳ��� tag ģʽ"
 
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �Ҳ��� tag, ���Ų�!"
+msgstr "E435: �Ҳ��� tag�����Ų£�"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' ���ܼ��ء����õ��ڽ��ն���ʽ��:"
+msgstr "' δ֪�����õ��ڽ��ն���:"
 
 msgid "defaulting to '"
-msgstr "Ԥ��: '"
+msgstr "Ĭ��ֵΪ: '"
 
-msgid "Cannot open termcap file"
-msgstr "���ܴ� termcap �ļ�"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: �޷��� termcap �ļ�"
 
-msgid "Terminal entry not found in terminfo"
-msgstr "��terminfo��δ�ҵ��ն���"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: �� terminfo ���Ҳ����ն���"
 
-msgid "Terminal entry not found in termcap"
-msgstr "��termcap��δ�ҵ��ն���"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: �� termcap ���Ҳ����ն���"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap û�� \"%s\" ��"
+msgstr "E436: termcap ��û�� \"%s\" ��"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �ն���Ҫ \"cm\" ������"
+msgstr "E437: �ն���Ҫ���� \"cm\""
 
 #. Highlight title
 msgid ""
@@ -4085,23 +5291,60 @@ msgstr "Vim: �������˳���...\n"
 
 #. must display the prompt
 msgid "No undo possible; continue anyway"
-msgstr "���ܻ�ԭ�������"
+msgstr "�޷������������"
+
+msgid "Already at oldest change"
+msgstr "��λ����ɵĸı�"
+
+msgid "Already at newest change"
+msgstr "��λ�����µĸı�"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "�Ҳ��������� %ld"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: �кŴ���"
 
-msgid "1 change"
-msgstr "һ��ı�"
+msgid "more line"
+msgstr "�б�����"
+
+msgid "more lines"
+msgstr "�б�����"
+
+msgid "line less"
+msgstr "�б�ȥ��"
+
+msgid "fewer lines"
+msgstr "�б�ȥ��"
+
+msgid "change"
+msgstr "�з����ı�"
+
+msgid "changes"
+msgstr "�з����ı�"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld ��ı�"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s��%s #%ld  %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "�޿ɳ���"
+
+msgid "number changes  time"
+msgstr "  ���    �ı�  ʱ��"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: �����б���"
 
 msgid "E440: undo line missing"
-msgstr "E440: �Ҳ���Ҫ������������"
+msgstr "E440: �Ҳ���Ҫ��������"
 
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
@@ -4109,34 +5352,34 @@ msgid ""
 "MS-Windows 16/32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 16/32λ ͼ�ͽ���汾"
+"MS-Windows 16/32 λͼ�ν���汾"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 32 Bit ͼ�ͽ���汾"
+"MS-Windows 32 λͼ�ν���汾"
 
 msgid " in Win32s mode"
-msgstr "Win32s ģʽ"
+msgstr " Win32s ģʽ"
 
 msgid " with OLE support"
-msgstr "֧�� OLE"
+msgstr " �� OLE ֧��"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
 msgstr ""
 "\n"
-"MS-Windows 32λ �ַ�����汾"
+"MS-Windows 32 λ����̨�汾"
 
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
 msgstr ""
 "\n"
-"MS-Windows 32λ �ַ�����汾"
+"MS-Windows 16 λ����̨�汾"
 
 msgid ""
 "\n"
@@ -4185,7 +5428,10 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"���벹��: "
+"��������: "
+
+msgid "Modified by "
+msgstr "�޸��� "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "����"
 
 msgid "by "
-msgstr "��:"
+msgstr "�� "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"��ǿ�汾 "
+"���Ͱ汾 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "Normal version "
 msgstr ""
 "\n"
-"һ��汾 "
+"�����汾 "
 
 msgid ""
 "\n"
 "Small version "
 msgstr ""
 "\n"
-"���װ汾 "
+"С�Ͱ汾 "
 
 msgid ""
 "\n"
 "Tiny version "
 msgstr ""
 "\n"
-"����汾 "
+"΢�Ͱ汾 "
 
 msgid "without GUI."
-msgstr "��ʹ��ͼ�ͽ��档"
+msgstr "��ͼ�ν��档"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "�� GTK2-GNOME ͼ�ν��档"
 
 msgid "with GTK-GNOME GUI."
-msgstr "ʹ�� GTK-GNOME ͼ�ͽ��档"
+msgstr "�� GTK-GNOME ͼ�ν��档"
+
+msgid "with GTK2 GUI."
+msgstr "�� GTK2 ͼ�ν��档"
 
 msgid "with GTK GUI."
-msgstr "ʹ�� GTK ͼ�ͽ��档"
+msgstr "�� GTK ͼ�ν��档"
 
 msgid "with X11-Motif GUI."
-msgstr "ʹ�� X11-Motif ͼ�ͽ��档"
+msgstr "�� X11-Motif ͼ�ν��档"
 
-msgid "with X11-Athena GUI."
-msgstr "ʹ�� X11-Athena ͼ�ͽ��档"
+msgid "with X11-neXtaw GUI."
+msgstr "�� X11-neXtaw ͼ�ν��档"
 
-msgid "with BeOS GUI."
-msgstr "ʹ�� BeOS ͼ�ͽ��档"
+msgid "with X11-Athena GUI."
+msgstr "�� X11-Athena ͼ�ν��档"
 
 msgid "with Photon GUI."
-msgstr "ʹ��Photonͼ�ͽ��档"
+msgstr "�� Photon ͼ�ν��档"
 
 msgid "with GUI."
-msgstr "ʹ��ͼ�ͽ��档"
+msgstr "��ͼ�ν��档"
 
 msgid "with Carbon GUI."
-msgstr "ʹ�� Carbon ͼ�ͽ��档"
+msgstr "�� Carbon ͼ�ν��档"
 
 msgid "with Cocoa GUI."
-msgstr "ʹ�� Cocoa ͼ�ͽ��档"
+msgstr "�� Cocoa ͼ�ν��档"
 
 msgid "with (classic) GUI."
-msgstr "ʹ�� (��ͳ) ͼ�ͽ��档"
+msgstr "��(��ͳ)ͼ�ν��档"
 
 msgid "  Features included (+) or not (-):\n"
-msgstr " Ŀǰ��ʹ��(+)�벻��ʹ��(-)��ģ���б�:\n"
+msgstr "  ��ʹ��(+)�벻��ʹ��(-)�Ĺ���:\n"
 
 msgid "   system vimrc file: \""
-msgstr "        ϵͳ vimrc �����ļ�: \""
+msgstr "     ϵͳ vimrc �ļ�: \""
 
 msgid "     user vimrc file: \""
-msgstr "  �û��� vimrc �����ļ�: \""
+msgstr "     �û� vimrc �ļ�: \""
 
 msgid " 2nd user vimrc file: \""
-msgstr "    �ڶ����û� vimrc �ļ�: \""
+msgstr " �ڶ��û� vimrc �ļ�: \""
 
 msgid " 3rd user vimrc file: \""
-msgstr "    �������û� vimrc �ļ�: \""
+msgstr " �����û� vimrc �ļ�: \""
 
 msgid "      user exrc file: \""
-msgstr "   �û��� exrc �����ļ�: \""
+msgstr "      �û� exrc �ļ�: \""
 
 msgid "  2nd user exrc file: \""
-msgstr "   �ڶ����û� exrc �ļ�: \""
+msgstr "  �ڶ��û� exrc �ļ�: \""
 
 msgid "  system gvimrc file: \""
-msgstr "         ϵͳ gvimrc �ļ�: \""
+msgstr "    ϵͳ gvimrc �ļ�: \""
 
 msgid "    user gvimrc file: \""
-msgstr "     �û��� gvimrc �����ļ�: \""
+msgstr "    �û� gvimrc �ļ�: \""
 
 msgid "2nd user gvimrc file: \""
-msgstr "   �ڶ����û� gvimrc �ļ�: \""
+msgstr "�ڶ��û� gvimrc �ļ�: \""
 
 msgid "3rd user gvimrc file: \""
-msgstr "   �������û� gvimrc �ļ�: \""
+msgstr "�����û� gvimrc �ļ�: \""
 
 msgid "    system menu file: \""
-msgstr "           ϵͳ�˵������ļ�: \""
+msgstr "        ϵͳ�˵��ļ�: \""
 
 msgid "  fall-back for $VIM: \""
-msgstr "              $VIM Ԥ��ֵ: \""
+msgstr "         $VIM Ԥ��ֵ: \""
 
 msgid " f-b for $VIMRUNTIME: \""
-msgstr "       $VIMRUNTIME Ԥ��ֵ: \""
+msgstr "  $VIMRUNTIME Ԥ��ֵ: \""
 
 msgid "Compilation: "
 msgstr "���뷽ʽ: "
@@ -4314,7 +5566,7 @@ msgid "Compiler: "
 msgstr "������: "
 
 msgid "Linking: "
-msgstr "���᷽ʽ: "
+msgstr "���ӷ�ʽ: "
 
 msgid "  DEBUG BUILD"
 msgstr "  ���԰汾"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
 msgid "version "
-msgstr "�汾   "
+msgstr "�汾 "
 
 msgid "by Bram Moolenaar et al."
-msgstr "ά����: Bram Moolenaar et al."
+msgstr "ά���� Bram Moolenaar ��"
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim Ϊ�����ɷ��еĿ���Դ��������"
+msgstr "Vim �ǿ����ɷַ��Ŀ���Դ��������"
 
 msgid "Help poor children in Uganda!"
-msgstr "�����ڸɴ�Ŀ�����ͯ!"
+msgstr "�����ڸɴ�Ŀ�����ͯ��"
 
 msgid "type  :help iccf<Enter>       for information "
-msgstr "��һ��˵��������          :help iccf<Enter>"
+msgstr "����  :help iccf<Enter>       �鿴˵��        "
 
 msgid "type  :q<Enter>               to exit         "
-msgstr "Ҫ�˳�������                  :q<Enter>            "
+msgstr "����  :q<Enter>               �˳�            "
 
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "���߰���������                :help<Enter>         "
+msgstr "����  :help<Enter>  ��  <F1>  �鿴���߰���    "
 
-msgid "type  :help version6<Enter>   for version info"
-msgstr "�°汾��Ϣ������              :help version6<Enter>"
+msgid "type  :help version7<Enter>   for version info"
+msgstr "����  :help version7<Enter>   �鿴�汾��Ϣ    "
 
 msgid "Running in Vi compatible mode"
-msgstr "Vi ����ģʽ"
+msgstr "������ Vi ����ģʽ"
 
 msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "���Ҫ��ȫģ�⴫ͳ Vi ������ :set nocp<Enter>"
+msgstr "����  :set nocp<Enter>        �ָ�Ĭ�ϵ� Vim  "
 
 msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�����Ҫ�� Vi ����ģʽ��һ��˵�������� :help cp-default<Enter>"
+msgstr "����  :help cp-default<Enter> �鿴���˵��    "
+
+msgid "menu  Help->Orphans           for information    "
+msgstr "�˵�  Help->Orphans           �鿴˵��           "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "��ģʽ���У��������ּ�����"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "�˵�  Edit->Global Settings->Toggle Insert Mode  "
+
+#, fuzzy
+#~ msgid "                              for two modes      "
+#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
+
+#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "                              for Vim defaults   "
+#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "���� Vim �Ŀ�����"
+
+msgid "Become a registered Vim user!"
+msgstr "��Ϊ Vim ��ע���û���"
+
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "����  :help sponsor<Enter>    �鿴˵��        "
+
+msgid "type  :help register<Enter>   for information "
+msgstr "����  :help register<Enter>   �鿴˵��        "
+
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "�˵�  Help->Sponsor/Register  �鿴˵��           "
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "ע��: ��⵽ Windows 95/98/ME"
+msgstr "����: ��⵽ Windows 95/98/ME"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr "�����Ҫ�� Windows 95 ֧�ֵĸ�����Ϣ������ :help windows95<Enter>"
+msgstr "����  :help windows95<Enter>  �鿴���˵��    "
 
 msgid "E441: There is no preview window"
 msgstr "E441: û��Ԥ������"
 
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����ͬʱ�ָ��Ϊ���Ϻ����½�"
+msgstr "E442: ����ͬʱ���� topleft �� botright �ָ�"
 
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: �������ָ��ʱ������ת"
@@ -4386,261 +5673,472 @@ msgstr "E446: ��괦û���ļ���"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: ��·�����Ҳ����ļ� \"%s\""
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �޷����ؿ� %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "��Ǹ�����������: �޷����� Perl �⡣"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
 msgid "Edit with &multiple Vims"
-msgstr "�� &multiple Vims �༭"
+msgstr "�ö�� Vim �༭(&M)"
 
 msgid "Edit with single &Vim"
-msgstr "�� single &Vim �༭"
+msgstr "�õ��� Vim �༭(&V)"
+
+msgid "Diff with Vim"
+msgstr "�� Vim �Ƚ�(diff)"
 
 msgid "Edit with &Vim"
-msgstr "�� &Vim �༭"
+msgstr "�� Vim �༭(&V)"
 
 #. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "�õ�ǰ�� Vim �༭ - &"
+msgid "Edit with existing Vim - "
+msgstr "�õ�ǰ�� Vim �༭ - "
 
 msgid "Edits the selected file(s) with Vim"
-msgstr "�� Vim �༭ѡ����ļ�"
+msgstr "�� Vim �༭ѡ�е��ļ�"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "��������ʧ��: ����gvim�Ƿ��ڿ�ִ��·����!"
+msgstr "��������ʧ��: ���� gvim �Ƿ���·���У�"
 
 msgid "gvimext.dll error"
-msgstr "gvimext.dll ����"
+msgstr "gvimext.dll ����"
 
 msgid "Path length too long!"
-msgstr "·����̫��"
+msgstr "·��̫����"
 
 msgid "--No lines in buffer--"
-msgstr "--������������--"
+msgstr "--������������--"
 
 #.
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-msgid "Command aborted"
-msgstr "���ǿ���ж�"
+msgid "E470: Command aborted"
+msgstr "E470: �����ֹ"
 
-msgid "Argument required"
-msgstr "��Ҫָ�����"
+msgid "E471: Argument required"
+msgstr "E471: ��Ҫ����"
 
 msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ����Ӧ���� / ? �� &"
+msgstr "E10: \\ ����Ӧ�ø��� /��? �� &"
 
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: �����������д�����ʹ�á�<CR>ִ�У�CTRL-C �˳�"
+msgstr "E11: �������д�������Ч��<CR> ִ�У�CTRL-C �˳�"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc ���ָ���ִ��"
+msgstr "E12: ��ǰĿ¼�е� exrc/vimrc �� tag �����в�����������"
+
+msgid "E171: Missing :endif"
+msgstr "E171: ȱ�� :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: ȱ�� :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: ȱ�� :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: ȱ�� :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile ȱ�ٶ�Ӧ�� :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ȱ�ٶ�Ӧ�� :for"
 
 msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ļ��Ѿ����� (���� ! ǿ���滻)"
+msgstr "E13: �ļ��Ѵ��� (��� ! ǿ��ִ��)"
 
-msgid "Command failed"
-msgstr "����ִ��ʧ��"
+msgid "E472: Command failed"
+msgstr "E472: ����ִ��ʧ��"
 
-msgid "Internal error"
-msgstr "�ڲ�����"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: δ֪�� Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: δ֪������: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ���� \"%s\" ���ǵȿ�����"
+
+msgid "E473: Internal error"
+msgstr "E473: �ڲ�����"
 
 msgid "Interrupted"
 msgstr "���ж�"
 
 msgid "E14: Invalid address"
-msgstr "E14: ����ȷ�ĵ�ַ"
+msgstr "E14: ��Ч�ĵ�ַ"
 
-msgid "Invalid argument"
-msgstr "����ȷ�Ĳ���"
+msgid "E474: Invalid argument"
+msgstr "E474: ��Ч�Ĳ���"
 
 #, c-format
-msgid "Invalid argument: %s"
-msgstr "����ȷ�Ĳ���: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E15: Invalid expression: %s"
-msgstr "E15: ����ȷ�ı���ʽ: %s"
+msgstr "E15: ��Ч�ı���ʽ: %s"
 
 msgid "E16: Invalid range"
-msgstr "E16: ����ȷ�ķ�Χ"
+msgstr "E16: ��Ч�ķ�Χ"
 
-msgid "Invalid command"
-msgstr "����ȷ������"
+msgid "E476: Invalid command"
+msgstr "E476: ��Ч������"
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" ��Ŀ¼"
 
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' ǰ������˴�����ַ�"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: ���ú����� \"%s()\" ʧ��"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: �޷����ؿ⺯�� %s"
 
 msgid "E19: Mark has invalid line number"
-msgstr "E19: ��ǵ��кŴ���"
+msgstr "E19: ��ǵ��к���Ч"
 
 msgid "E20: Mark not set"
 msgstr "E20: û���趨���"
 
 msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ��Ϊ 'modifiable' ѡ���ǹرյģ����Բ����޸�"
+msgstr "E21: �����޸ģ���Ϊѡ�� 'modifiable' �ǹص�"
 
 msgid "E22: Scripts nested too deep"
-msgstr "E22: �ݹ����̫���"
+msgstr "E22: �ű�Ƕ�׹���"
 
 msgid "E23: No alternate file"
-msgstr "E23: û��������ļ�"
+msgstr "E23: û�н����ļ�"
 
 msgid "E24: No such abbreviation"
-msgstr "E24: û����� abbreviation ��Ӧ"
+msgstr "E24: û�������д"
 
-msgid "No ! allowed"
-msgstr "����ʹ�� '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: ����ʹ�� \"!\""
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: ��Ϊ����ʱû�м���ͼ�ͽ���ĳ�����룬���Բ���ʹ��ͼ�ͽ���"
+msgstr "E25: �޷�ʹ��ͼ�ν���: ����ʱû������"
 
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ��Ϊ����ʱû�м���ϣ�����ĳ�����룬���Բ���ʹ�� Hebrew\n"
+msgstr "E26: �޷�ʹ�� Hebrew: ����ʱû������\n"
 
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ��Ϊ����ʱû�м��� Farsi �ĳ�����룬���Բ���ʹ�� Farsi\n"
+msgstr "E27: �޷�ʹ�� Farsi: ����ʱû������\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: �޷�ʹ�� Arabic: ����ʱû������\n"
 
 #, c-format
 msgid "E28: No such highlight group name: %s"
-msgstr "E28: û����Ϊ '%s' �� highlight group"
+msgstr "E28: û���������Ⱥ����: %s"
 
 msgid "E29: No inserted text yet"
 msgstr "E29: û�в��������"
 
 msgid "E30: No previous command line"
-msgstr "E30: û��ǰһ������"
+msgstr "E30: û��ǰһ��������"
 
 msgid "E31: No such mapping"
-msgstr "E31: û����� mapping ��Ӧ"
+msgstr "E31: û�����ӳ��"
 
-msgid "No match"
-msgstr "�Ҳ���"
+msgid "E479: No match"
+msgstr "E479: û��ƥ��"
 
 #, c-format
-msgid "No match: %s"
-msgstr "�Ҳ���: %s"
+msgid "E480: No match: %s"
+msgstr "E480: û��ƥ��: %s"
 
 msgid "E32: No file name"
 msgstr "E32: û���ļ���"
 
 msgid "E33: No previous substitute regular expression"
-msgstr "E33: û��ǰһ������/�滻������"
+msgstr "E33: û��ǰһ���滻�������ʽ"
 
 msgid "E34: No previous command"
 msgstr "E34: û��ǰһ������"
 
 msgid "E35: No previous regular expression"
-msgstr "E35: û��ǰһ����������"
+msgstr "E35: û��ǰһ���������ʽ"
 
-msgid "No range allowed"
-msgstr "����ʹ�÷�Χ����"
+msgid "E481: No range allowed"
+msgstr "E481: ����ʹ�÷�Χ"
 
 msgid "E36: Not enough room"
 msgstr "E36: û���㹻�Ŀռ�"
 
 #, c-format
-msgid "Can't create file %s"
-msgstr "���ܴ����ļ� %s"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: û������ \"%s\" ����ע��ķ�����"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: �޷������ļ� %s"
 
-msgid "Can't get temp file name"
-msgstr "���ܵõ���ʱ�ļ���"
+msgid "E483: Can't get temp file name"
+msgstr "E483: �޷���ȡ��ʱ�ļ���"
 
 #, c-format
-msgid "Can't open file %s"
-msgstr "���ܴ��ļ� %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: �޷����ļ� %s"
 
 #, c-format
-msgid "Can't read file %s"
-msgstr "���ܶ�ȡ�ļ� %s"
+msgid "E485: Can't read file %s"
+msgstr "E485: �޷���ȡ�ļ� %s"
 
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: �ļ������Ѹı䵫��δ���� (���� ! ǿ��ִ��)"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ���޸ĵ���δ���� (���� ! ǿ��ִ��)"
 
 msgid "E38: Null argument"
-msgstr "E38: �յ� (Null) ����"
+msgstr "E38: �յĲ���"
 
 msgid "E39: Number expected"
-msgstr "E39: Ӧ��Ҫ������"
+msgstr "E39: �˴���Ҫ����"
 
 #, c-format
 msgid "E40: Can't open errorfile %s"
-msgstr "E40: ���ܴ򿪴����ļ� %s"
+msgstr "E40: �޷��򿪴����ļ� %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: �޷��� display"
 
 msgid "E41: Out of memory!"
-msgstr "E41: �ڴ治��!"
+msgstr "E41: �ڴ治�㣡"
 
 msgid "Pattern not found"
 msgstr "�Ҳ���ģʽ"
 
 #, c-format
-msgid "Pattern not found: %s"
-msgstr "�Ҳ���ģʽ %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: �Ҳ���ģʽ: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: ��������������"
 
-msgid "Argument must be positive"
-msgstr "����Ӧ��������"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: �޷��ص�ǰһ��Ŀ¼"
 
 msgid "E42: No Errors"
 msgstr "E42: û�д���"
 
+msgid "E776: No location list"
+msgstr "E776: û�� location �б�"
+
 msgid "E43: Damaged match string"
-msgstr "E43: ƥ���ַ���������"
+msgstr "E43: ���𻵵�ƥ���ַ���"
 
 msgid "E44: Corrupted regexp program"
-msgstr "E44: �������ʽ������"
+msgstr "E44: ���𻵵��������ʽ����"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: ���趨ѡ�� 'readonly' (��� ! ǿ��ִ��)"
 
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: �趨 'readonly' ѡ��(ֻ��) (���� ! ǿ��ִ��)"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ���ܸı�ֻ������ \"%s\""
 
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: �����趨ֻ������ \"%s\""
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ������ sandbox ���趨����: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ��ȡ�����ļ�ʧ��"
 
 msgid "E48: Not allowed in sandbox"
-msgstr "E48: ������ sandbox �����"
+msgstr "E48: �������� sandbox ��ʹ��"
+
+msgid "E523: Not allowed here"
+msgstr "E523: �������ڴ�ʹ��"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ��֧���趨��Ļģʽ"
 
 msgid "E49: Invalid scroll size"
-msgstr "E49: ����Ĺ�����С"
+msgstr "E49: ��Ч�Ĺ�����С"
 
 msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: ѡ�� 'shell' δ�趨"
+msgstr "E91: ѡ�� 'shell' Ϊ��"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: �޷���ȡ sign ���ݣ�"
 
 msgid "E72: Close error on swap file"
 msgstr "E72: �����ļ��رմ���"
 
 msgid "E73: tag stack empty"
-msgstr "E73: ��ǩ��ջ�ѿ�"
+msgstr "E73: tag ��ջΪ��"
 
 msgid "E74: Command too complex"
-msgstr "E74: ����̫����"
+msgstr "E74: ���������"
 
 msgid "E75: Name too long"
-msgstr "E75: ����̫��"
+msgstr "E75: ���ֹ���"
 
 msgid "E76: Too many ["
-msgstr "E76: ̫�� ["
+msgstr "E76: [ ����"
 
 msgid "E77: Too many file names"
-msgstr "E77: ̫���ļ���"
+msgstr "E77: �ļ�������"
 
-msgid "Trailing characters"
-msgstr "�������˶�����ַ�"
+msgid "E488: Trailing characters"
+msgstr "E488: �����β���ַ�"
 
 msgid "E78: Unknown mark"
-msgstr "E78: ���ܰ�ʶ�ı��"
+msgstr "E78: δ֪�ı��"
 
 msgid "E79: Cannot expand wildcards"
-msgstr "E79: ������չͨ���"
+msgstr "E79: �޷���չͨ���"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ����С�� 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ����С�� 'winminwidth'"
 
 msgid "E80: Error while writing"
-msgstr "E80: д�����"
+msgstr "E80: д�����"
 
 msgid "Zero count"
-msgstr "������ (?)"
+msgstr "����Ϊ��"
 
 msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ������ script ������ʹ��."
+msgstr "E81: �ڽű�������ʹ���� <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: �յ���Ч�ı���ʽ"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans �������ı�ֻ���ļ�"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �ڲ�����: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ����ʽ���ڴ�ʹ�ó��� 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: �յĻ�����"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ��Ч����������ʽ��ָ���"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: �ļ�������һ���������б�����"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: û���趨ѡ�� '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
+
+#~ msgid "[No file]"
+#~ msgstr "[δ����]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[�����б�]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: δ����ı���: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: ���� %s �Ĳ���̫��"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> ������ script ��������ʹ��: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: ���� %s ��δ����"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: ���� %s ����ʹ���У��������¶���"
+
+#~ msgid "function "
+#~ msgstr "���� "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: ���� %s ��δ����"
+
+#~ msgid "Run Macro"
+#~ msgstr "ִ�к�"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s Ϊ����ʶ�����ɫ����"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "��ȡ cscope ���� %d ʱ����"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: �Ҳ��� cscope ����"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope �����ѹر�"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "����ʹ�� malloc\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <��>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\t��ʾ Gnome ��ز���"
+
+#~ msgid "[string too long]"
+#~ msgstr "[�ַ���̫��]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "�밴 ENTER ����"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: ����ִ��; regular expression ̫����?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
+
+#~ msgid " BLOCK"
+#~ msgstr " ��"
+
+#~ msgid " LINE"
+#~ msgstr " ��"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "���� nr ��ѡ�� (<CR> �˳�): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "���Բ��ұ�ǩ (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "ʹ�� BeOS ͼ�ν��档"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index abc652152..83bd7f4dd 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -7,53 +7,53 @@
 #
 # Original translations.
 #
-#, no-wrap
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
-"POT-Creation-Date: 2001-09-24 10:10+0800\n"
-"PO-Revision-Date: 2001-09-24 11:13+0800\n"
-"Last-Translator: Wang Jun <junw@turbolinux.com.cn>\n"
-"Language-Team: Wang Jun <junw@turbolinux.com.cn>\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"
+"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"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ���ܷ����κλ��������˳�����..."
+msgstr "E82: �޷������κλ��������˳�����..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ���ܷ��仺������ʹ����һ��������...."
+msgstr "E83: �޷����仺������ʹ����һ��������..."
 
-msgid "No buffers were unloaded"
-msgstr "û���ͷ��κλ�����"
+msgid "E515: No buffers were unloaded"
+msgstr "E515: û���ͷ��κλ�����"
 
-msgid "No buffers were deleted"
-msgstr "û��ɾ���κλ�����"
+msgid "E516: No buffers were deleted"
+msgstr "E516: û��ɾ���κλ�����"
 
-msgid "No buffers were wiped out"
-msgstr "û��ɾ���κλ�����"
+msgid "E517: No buffers were wiped out"
+msgstr "E517: û������κλ�����"
 
 msgid "1 buffer unloaded"
-msgstr "���ͷ�һ��������"
+msgstr "�ͷ��� 1 ��������"
 
 #, c-format
 msgid "%d buffers unloaded"
-msgstr "���ͷ� %d ��������"
+msgstr "�ͷ��� %d ��������"
 
 msgid "1 buffer deleted"
-msgstr "��ɾ��һ��������"
+msgstr "ɾ���� 1 ��������"
 
 #, c-format
 msgid "%d buffers deleted"
-msgstr "��ɾ�� %d ��������"
+msgstr "ɾ���� %d ��������"
 
 msgid "1 buffer wiped out"
-msgstr "��ɾ��һ��������"
+msgstr "����� 1 ��������"
 
 #, c-format
 msgid "%d buffers wiped out"
-msgstr "��ɾ�� %d ��������"
+msgstr "����� %d ��������"
 
 msgid "E84: No modified buffer found"
 msgstr "E84: û���޸Ĺ��Ļ�����"
@@ -63,43 +63,43 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: û�п��г��Ļ�����"
 
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: �����л����� %ld ��������"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: ������ %ld ������"
 
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �����л���������Ļ�����"
+msgstr "E87: �޷��л����������һ��������"
 
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: �����л�����ǰ��Ļ�����"
+msgstr "E88: �޷��л������ǵ�һ��������"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: �Ѹ��Ĺ������� %ld ����δ���� (���� ! ǿ��ִ��)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: ������ %ld ���޸ĵ���δ���� (��� ! ǿ��ִ��)"
 
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: �����ͷ����һ��������"
+msgstr "E90: �޷��ͷ����һ��������"
 
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: ����: �ļ�������"
 
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: �Ҳ����� %ld ��������"
+msgstr "E92: �Ҳ��������� %ld"
 
 #, c-format
 msgid "E93: More than one match for %s"
-msgstr "E93: �ҵ�һ�����ϵ� %s"
+msgstr "E93: �ҵ���ֹһ�� %s"
 
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: �Ҳ��� %s"
+msgstr "E94: û��ƥ��Ļ����� %s"
 
 #, c-format
 msgid "line %ld"
-msgstr "�� %ld"
+msgstr "�� %ld ��"
 
 msgid "E95: Buffer with this name already exists"
-msgstr "E95: ���л�����ʹ���������"
+msgstr "E95: ���л�����ʹ�ø�����"
 
 msgid " [Modified]"
 msgstr " [���޸�]"
@@ -118,24 +118,24 @@ msgstr "[ֻ��]"
 
 #, c-format
 msgid "1 line --%d%%--"
-msgstr "���� 1 --%d%%--"
+msgstr "1 �� --%d%%--"
 
 #, c-format
 msgid "%ld lines --%d%%--"
-msgstr "���� %ld --%d%%--"
+msgstr "%ld �� --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
-msgstr "�� %ld/%ld --%d%%-- �� "
+msgstr "�� %ld / %ld --%d%%-- �� "
 
-msgid "[No file]"
+msgid "[No Name]"
 msgstr "[δ����]"
 
 #. must be a help buffer
 msgid "help"
-msgstr "[����]"
+msgstr "����"
 
-msgid "[help]"
+msgid "[Help]"
 msgstr "[����]"
 
 msgid "[Preview]"
@@ -150,6 +150,7 @@ msgstr "�׶�"
 msgid "Top"
 msgstr "����"
 
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -157,22 +158,22 @@ msgstr ""
 "\n"
 "# �������б�:\n"
 
-msgid "[Error List]"
-msgstr "[�����б�]"
+msgid "[Location List]"
+msgstr "[Location �б�]"
 
-msgid "[No File]"
-msgstr "[δ����]"
+msgid "[Quickfix List]"
+msgstr "[Quickfix �б�]"
 
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
-"--- ���� ---"
+"--- Signs ---"
 
 #, c-format
 msgid "Signs for %s:"
-msgstr "%s �ķ���:"
+msgstr "%s �� Signs:"
 
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
@@ -180,91 +181,99 @@ msgstr "    ��=%ld  id=%d  ����=%s"
 
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: ���ܱȽ�(diff) %ld�����ϵĻ�����"
+msgstr "E96: ���ܱȽ�(diff) %ld �����ϵĻ�����"
 
 msgid "E97: Cannot create diffs"
-msgstr "E97: ���ܴ��� diff "
+msgstr "E97: �޷����� diff"
 
 msgid "Patch file"
 msgstr "Patch �ļ�"
 
 msgid "E98: Cannot read diff output"
-msgstr "E98: ���ܶ�ȡ diff �����"
+msgstr "E98: �޷���ȡ diff �����"
 
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Ŀǰ�Ļ����������� diff ģʽ"
+msgstr "E99: ��ǰ���������� diff ģʽ"
 
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: û�л������� diff ģʽ"
+msgstr "E100: û���������� diff ģʽ�Ļ�����"
 
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ���������ϵĻ������� diff ģʽ�����ܾ���Ҫ����һ��"
+msgstr "E101: ���������ϵĻ��������� diff ģʽ�����ܾ�������һ��"
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �Ҳ���������: \"%s\""
+msgstr "E102: �Ҳ��������� \"%s\""
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ������ \"%s\" ������ diff ģʽ"
+msgstr "E103: ������ \"%s\" ���� diff ģʽ"
 
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����ַ�(digraph)�в���ʹ�� Escape"
 
-msgid "Keymap file not found"
-msgstr "�Ҳ��� keymap �ļ�"
+msgid "E544: Keymap file not found"
+msgstr "E544: �Ҳ��� Keymap �ļ�"
 
 msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ʹ�� :loadkeymap "
+msgstr "E105: �����ڽű��ļ���ʹ�� :loadkeymap "
 
-msgid " Keyword completion (^N/^P)"
-msgstr " �ؼ����Զ���� (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " �ؼ��ֲ�ȫ (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X ģʽ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^]^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 " Whole line completion (^L^N^P)"
+msgstr " ���в�ȫ (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " �ļ�����ȫ (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Tag ��ȫ (^]^N^P)"
 
-#. Scroll has it's own msgs, in it's place there is the msg for local
-#. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
-msgid " Keyword Local completion (^N/^P)"
-msgstr " ����ؼ����Զ���� (^N/^P)"
+#, fuzzy
+#~ msgid " Path pattern completion (^N^P)"
+#~ msgstr " ·��ģʽ��ȫ (^N^P)"
 
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " �����Զ���� (^L/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " ���岹ȫ (^D^N^P)"
 
-msgid " File name completion (^F/^N/^P)"
-msgstr " �ļ����Զ���� (^F/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Dictionary ��ȫ (^K^N^P)"
 
-msgid " Tag completion (^]/^N/^P)"
-msgstr " ��ǩ�Զ���� (^]/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus ��ȫ (^T^N^P)"
 
-msgid " Path pattern completion (^N/^P)"
-msgstr " ·���Զ���� (^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " �����в�ȫ (^V^N^P)"
 
-msgid " Definition completion (^D/^N/^P)"
-msgstr " �����Զ���� (^D/^N/^P)"
+msgid " User defined completion (^U^N^P)"
+msgstr " �û��Զ��岹ȫ (^U^N^P)"
 
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " �ֵ��Զ���� (^K/^N/^P)"
+msgid " Omni completion (^O^N^P)"
+msgstr " ȫ�ܲ�ȫ (^O^N^P)"
 
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus �Զ���� (^T/^N/^P)"
+msgid " Spelling suggestion (^S^N^P)"
+msgstr " ƴд���� (^S^N^P)"
 
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " �����Զ���� (^V/^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " �ؼ��־ֲ���ȫ (^N^P)"
 
 msgid "Hit end of paragraph"
 msgstr "�ѵ������β"
 
-msgid "'thesaurus' option is empty"
-msgstr "ѡ�� 'thesaurus' δ�趨"
-
 msgid "'dictionary' option is empty"
 msgstr "ѡ�� 'dictionary' Ϊ��"
 
+msgid "'thesaurus' option is empty"
+msgstr "ѡ�� 'thesaurus' Ϊ��"
+
 #, c-format
 msgid "Scanning dictionary: %s"
-msgstr "ɨ���ֵ�: %s"
+msgstr "����ɨ�� dictionary: %s"
 
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (����) Scroll (^E/^Y)"
@@ -274,8 +283,9 @@ msgstr " (�滻) Scroll (^E/^Y)"
 
 #, c-format
 msgid "Scanning: %s"
-msgstr "ɨ����: %s"
+msgstr "����ɨ��: %s"
 
+#, c-format
 msgid "Scanning tags."
 msgstr "ɨ���ǩ."
 
@@ -287,45 +297,157 @@ msgstr " ����"
 #. * longer needed.  -- Acevedo.
 #.
 msgid "-- Searching..."
-msgstr "-- ��Ѱ��..."
+msgstr "-- ������..."
 
 msgid "Back at original"
 msgstr "�ص����"
 
 msgid "Word from other line"
-msgstr "�������п�ʼ�Ĵ� (?)"
+msgstr "��һ�еĴ�"
 
 msgid "The only match"
-msgstr "ֻ�д���ƥ��"
+msgstr "Ψһƥ��"
 
 #, c-format
 msgid "match %d of %d"
-msgstr "�ҵ� %d / %d"
+msgstr "ƥ�� %d / %d"
 
 #, c-format
 msgid "match %d"
 msgstr "ƥ�� %d"
 
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: :let �г����쳣�ַ�"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: List ����������Χ: %ld"
+
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: δ����ı���: %s"
+
+msgid "E111: Missing ']'"
+msgstr "E111: ȱ�� ']'"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �Ĳ��������� List"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �Ĳ��������� List ���� Dictionary"
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary �ļ�����Ϊ��"
+
+msgid "E714: List required"
+msgstr "E714: ��Ҫ List"
+
+msgid "E715: Dictionary required"
+msgstr "E715: ��Ҫ Dictionary"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �����Ĳ�������: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary �в����ڼ�: %s"
+
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ���� %s �Ѵ��ڣ���� ! ǿ���滻"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Dictionary ���Ѵ���"
+
+msgid "E718: Funcref required"
+msgstr "E718: ��Ҫ Funcref"
+
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: %s= �ı������Ͳ���ȷ"
+
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: δ����ı���: \"%s\""
+msgid "E130: Unknown function: %s"
+msgstr "E130: δ֪�ĺ���: %s"
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: ��Ч�ı�����: %s"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Ŀ��� List ������"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Ŀ��� List ������"
+
+msgid "Double ; in list of variables"
+msgstr "�����б��г������� ;"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: �޷��г� %s �ı���"
+
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ֻ������ List �� Dictionary"
+
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ���������"
+
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] ��Ҫһ�� List ֵ"
+
+msgid "E710: List value has more items than target"
+msgstr "E710: List ֵ�����Ŀ���"
+
+msgid "E711: List value has not enough items"
+msgstr "E711: List ֵû���㹻�����"
+
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ��ȱ�� \"in\""
 
 #, c-format
 msgid "E107: Missing braces: %s"
-msgstr "E107: ȱ�ٶ�Ӧ������: %s"
+msgstr "E107: ȱ������: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �޴˱���: \"%s\""
 
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (un)lock �ı���Ƕ�׹���"
+
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' ��ȱ�� ':'"
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: ֻ�ܱȽ� List �� List"
+
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: �� List ��Ч�Ĳ���"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ֻ�ܱȽ� Dictionary �� Dictionary"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: �� Dictionary ��Ч�Ĳ���"
+
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: ֻ�ܱȽ� Funcref �� Funcref"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �� Funcrefs ��Ч�Ĳ���"
+
 msgid "E110: Missing ')'"
-msgstr "E110: ȱ�ٶ�Ӧ�� \")\""
+msgstr "E110: ȱ�� ')'"
 
-msgid "E111: Missing ']'"
-msgstr "E111: ȱ�ٶ�Ӧ�� \"]\""
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: ��������һ�� Funcref"
 
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -333,7 +455,7 @@ msgstr "E112: ȱ��ѡ������: %s"
 
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: ����ȷ��ѡ��: %s"
+msgstr "E113: δ֪��ѡ��: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
@@ -344,29 +466,59 @@ msgid "E115: Missing quote: %s"
 msgstr "E115: ȱ������: %s"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ���� %s �Ĳ�������ȷ"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List ��ȱ�ٶ���: %s"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: δ����ĺ���: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List ȱ�ٽ����� ']': %s"
 
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ���� %s �Ĳ�������"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary ��ȱ��ð��: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ���� %s �Ĳ���̫��"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary �г����ظ��ļ�: \"%s\""
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ������ script ��������ʹ��: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary ��ȱ�ٶ���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary ȱ�ٽ����� '}': %s"
+
+#, fuzzy
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: ����Ƕ�׹���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ��������"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() ֻ���ڲ���ģʽ��ʹ��"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "ȷ��(&O)"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ���Ѵ���: %s"
 
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld ��: "
 
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: δ֪�ĺ���: %s"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -374,91 +526,148 @@ msgstr ""
 "ȷ��(&O)\n"
 "ȡ��(&C)"
 
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() �ĵ��ô������� inputsave()"
+
+msgid "E745: Range not allowed"
+msgstr "E745: �������ķ�Χ"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() ��������Ч"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ����Ϊ��"
+
+msgid "E727: Start past end"
+msgstr "E727: ��ʼֵ����ֵֹ��"
+
+msgid "<empty>"
+msgstr "<��>"
+
 msgid "E240: No connection to Vim server"
-msgstr "E240: û���� Vim Server ��������"
+msgstr "E240: û�е� Vim ������������"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: �޷����͵� %s"
 
 msgid "E277: Unable to read a server reply"
-msgstr "E277: ���ܶ�ȡ����������Ӧ"
+msgstr "E277: �޷���ȡ��������Ӧ"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: �������ӹ���(ѭ����)"
 
 msgid "E258: Unable to send to client"
-msgstr "E258: ���ܴ��͵��ͻ���"
+msgstr "E258: �޷����͵��ͻ���"
 
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: ���ܴ��͵� %s"
+#, fuzzy
+#~ msgid "E702: Sort compare function failed"
+#~ msgstr "E702: Sort �ȽϺ���ʧ��"
 
 msgid "(Invalid)"
 msgstr "(��Ч)"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: д��ʱ�ļ�����"
+
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: �� Funcref ������ʹ��"
+
+msgid "E745: Using a List as a number"
+msgstr "E745: �� List ������ʹ��"
+
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: �� Dictionary ������ʹ��"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: �� Funcref �� String ʹ��"
+
+msgid "E730: using List as a String"
+msgstr "E730: �� List �� String ʹ��"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �� Dictionary �� String ʹ��"
+
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ���� %s ��δ����"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcref �����������Դ�д��ĸ��ͷ: %s"
 
 #, c-format
-msgid "E122: Function %s already exists, use ! to replace"
-msgstr "E122: ���� %s �Ѿ�����, ��ʹ�� ! ǿ���滻"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: �����������к�������ͻ: %s"
 
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ���� %s ��δ����"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: �������Ͳ�ƥ��: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ֵ������: %s"
+
+msgid "Unknown"
+msgstr "δ֪"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: �޷��ı� %s ��ֵ"
+
+#, fuzzy
+#~ msgid "E698: variable nested too deep for making a copy"
+#~ msgstr "E698: ����Ƕ�׹���"
 
 #, c-format
 msgid "E124: Missing '(': %s"
-msgstr "E124: ȱ�� \"(\": %s"
+msgstr "E124: ȱ�� '(': %s"
 
 #, c-format
 msgid "E125: Illegal argument: %s"
-msgstr "E125: ��������ȷ: %s"
+msgstr "E125: ��Ч�Ĳ���: %s"
 
 msgid "E126: Missing :endfunction"
 msgstr "E126: ȱ�� :endfunction"
 
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���� %s ����ʹ���У��������¶���"
-
-#, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: �������Ƶ�һ����ĸ�����д: %s"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ��������ű��ļ�����ƥ��: %s"
 
 msgid "E129: Function name required"
-msgstr "E129: ��Ҫ��������"
-
-msgid "function "
-msgstr "���� "
+msgstr "E129: ��Ҫ������"
 
 #, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: ���� %s ��δ����"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
 
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ���� %s ����ʹ���У�����ɾ��"
+msgstr "E131: �޷�ɾ������ %s: ����ʹ����"
 
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �����ݹ���ò������� 'maxfuncdepth'"
+msgstr "E132: ����������ȳ��� 'maxfuncdepth'"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "calling %s"
 msgstr "���� %s"
 
-#. always scroll up, don't overwrite
 #, c-format
-msgid "continuing in %s"
-msgstr "����: %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return �����ں�����ʹ��"
+msgid "%s aborted"
+msgstr "%s ����ֹ"
 
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s ����ֵ #%ld "
+msgstr "%s ���� #%ld "
 
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s ����ֵ \"%s\""
+msgid "%s returning %s"
+msgstr "%s ���� %s"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "�� %s �м���"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return ���ں�����"
+
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -466,76 +675,90 @@ msgstr ""
 "\n"
 "# ȫ�ֱ���:\n"
 
-msgid "Entering Debug mode.  Type \"cont\" to leave."
-msgstr "�������ģʽ. ���� \"cont\" �Իص�����ģʽ."
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t����޸��� "
+
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "�������ģʽ������ \"cont\" �������С�"
 
 #, c-format
 msgid "line %ld: %s"
-msgstr "�� %ld: %s"
+msgstr "�� %ld ��: %s"
 
 #, c-format
 msgid "cmd: %s"
-msgstr "cmd: %s"
+msgstr "����: %s"
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" �жϵ�: �� %ld ��"
+msgstr "�ϵ� \"%s%s\" �� %ld ��"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �Ҳ����жϵ�: %s"
+msgstr "E161: �Ҳ����ϵ�: %s"
 
 msgid "No breakpoints defined"
-msgstr "û�ж����жϵ�"
+msgstr "û�ж���ϵ�"
 
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  �� %ld ��"
 
+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\"?"
+msgid "Save changes to \"%s\"?"
+msgstr "���ı䱣�浽 \"%s\" ��"
 
 msgid "Untitled"
 msgstr "δ����"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: �Ѹ��Ĺ������� \"%s\" ����δ���� (���� ! ǿ��ִ��)"
+msgstr "E162: ������ \"%s\" ���޸ĵ���δ����"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "ע��: ���л������������� (���� Autocommands ���޴���)"
+msgstr "����: ����ؽ��������������� (�����Զ�����)"
 
 msgid "E163: There is only one file to edit"
 msgstr "E163: ֻ��һ���ļ��ɱ༭"
 
 msgid "E164: Cannot go before first file"
-msgstr "E164: �Ѿ��ڵ�һ���ļ���"
+msgstr "E164: �޷��л������ǵ�һ���ļ�"
 
 msgid "E165: Cannot go beyond last file"
-msgstr "E165: �Ѿ������һ���ļ���"
+msgstr "E165: �޷��л����������һ���ļ�"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ��֧�ֱ�����: %s"
 
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "������: \"%s\" -- \"%s\""
+msgstr "���ڲ��� \"%s\"���� \"%s\" ��"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "������: \"%s\""
+msgstr "���ڲ��� \"%s\""
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
+msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
 
-msgid "Run Macro"
-msgstr "ִ�к�"
+msgid "Source Vim script"
+msgstr "ִ�� Vim �ű�"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "����ִ��Ŀ¼�� \"%s\""
+msgstr "����ִ��Ŀ¼: \"%s\""
 
 #, c-format
 msgid "could not source \"%s\""
@@ -547,69 +770,43 @@ msgstr "�� %ld ��: ����ִ�� \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "ִ�� \"%s\" ��"
+msgstr "ִ�� \"%s\""
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "�� %ld ��: ����ִ�� %s"
+msgstr "�� %ld ��: ִ�� \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
 msgstr "����ִ�� %s"
 
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ע��: ������зָ��ַ������������� ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ��ִ�� script �ļ��ⲻ��ʹ�� :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ��ִ�� script �ļ��ⲻ��ʹ�� :finish"
-
-msgid "No text to be printed"
-msgstr "û��Ҫ��ӡ������"
-
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "��ӡ��: �� %d ҳ (%d%%)"
-
-#, c-format
-msgid " Copy %d of %d"
-msgstr "���� %d / %d"
-
-#, c-format
-msgid "Printed: %s"
-msgstr "�Ѵ�ӡ: %s"
-
-msgid "Printing aborted"
-msgstr "��ӡ�ж�"
+msgid "modeline"
+msgstr "modeline"
 
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: д�� PostScript �ļ�����"
+msgid "--cmd argument"
+msgstr "--cmd ����"
 
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ���ܴ� PostScript ����ļ�"
+msgid "-c argument"
+msgstr "-c ����"
 
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: ���ܴ��ļ� \"%s\""
+msgid "environment variable"
+msgstr "��������"
 
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ���ܶ� PostScript ��Դ�ļ� \"%s\""
+#~ msgid "error handler"
+#~ msgstr ""
 
-msgid "Sending to printer..."
-msgstr "���͵���ӡ��..."
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: ����: ������зָ��������������� ^M"
 
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: ��ӡ PostScript �ļ�ʧ��"
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: �ڽű��ļ���ʹ���� :scriptencoding"
 
-#~ msgid "Print job sent."
-#~ msgstr ""
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: �ڽű��ļ���ʹ���� :finish"
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "Ŀǰ�� %s����: \"%s\""
+msgstr "��ǰ�� %s����: \"%s\""
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
@@ -619,32 +816,41 @@ msgstr "E197: �����趨����Ϊ \"%s\""
 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: ���ܰ����Ƶ���������"
+msgstr "E134: �����ƶ���������"
 
 msgid "1 line moved"
-msgstr "���ƶ� 1 ��"
+msgstr "�ƶ��� 1 ��"
 
 #, c-format
 msgid "%ld lines moved"
-msgstr "�Ѱ��� %ld ��"
+msgstr "�ƶ��� %ld ��"
 
 #, c-format
 msgid "%ld lines filtered"
-msgstr "�Ѵ��� %ld ��"
+msgstr "������ %ld ��"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand �����Ը��Ļ�����������"
+msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
 
 msgid "[No write since last change]\n"
-msgstr "[���º���δ����]\n"
+msgstr "[���޸ĵ���δ����]\n"
 
 #, c-format
-msgid "viminfo: %s in line: "
-msgstr "viminfo: %s ������: "
+# bad to translate
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s λ����: "
 
 msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �������, �����ļ����ಿ��"
+msgstr "E136: viminfo: ������࣬�����ļ���ʣ�ಿ��"
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
@@ -661,39 +867,39 @@ msgstr " ʧ��"
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo �ļ�����д��: %s"
+msgstr "E137: Viminfo �ļ�����д��: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ����д�� viminfo �ļ� %s !"
+msgstr "E138: �޷�д�� viminfo �ļ� %s��"
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "д�� viminfo �ļ� \"%s\" ��"
+msgstr "д�� viminfo �ļ� \"%s\""
 
 #. Write the info:
-#, c-format
+#, 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"
+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"
 "\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 "��Ч�������ַ�"
 
-#. Overwriting a file that is loaded in another buffer is not a
-#. * good idea.
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ������һ��������Ҳ����������ļ�"
-
 msgid "Write partial file?"
 msgstr "Ҫд�벿���ļ���"
 
@@ -701,30 +907,38 @@ msgid "E140: Use ! to write partial buffer"
 msgstr "E140: ��ʹ�� ! ��д�벿�ֻ�����"
 
 #, c-format
-msgid "Overwrite existing file \"%.*s\"?"
-msgstr "Ҫ�����Ѵ��ڵ��ļ� \"%.*s\"��"
+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' ѡ��ر�"
+msgstr "E142: �ļ�δд��: д�뱻 'write' ѡ�����"
 
 #, c-format
 msgid ""
-"'readonly' option is set for \"%.*s\".\n"
+"'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"\"%.*s\" ���趨 'readonly' ѡ��.\n"
-"ȷ��Ҫ������"
+"\"%s\" ���趨 'readonly' ѡ�\n"
+"ȷʵҪ������"
 
 msgid "Edit File"
 msgstr "�༭�ļ�"
 
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands �����ɾ���»����� %s"
+msgstr "E143: �Զ����������ɾ�����»����� %s"
 
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z �����ܷ����ֵĲ���"
@@ -733,232 +947,283 @@ msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim �н�ֹʹ�� shell ����"
 
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: �������ʽ��������ĸ�ָ� (?)"
+msgstr "E146: �������ʽ��������ĸ���ֽ�"
 
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "�滻Ϊ %s (y/n/a/q/^E/^Y)?"
+msgstr "�滻Ϊ %s (y/n/a/q/l/^E/^Y)��"
 
 msgid "(Interrupted) "
 msgstr "(���ж�) "
 
+msgid "1 match"
+msgstr "1 ��ƥ�䣬"
+
 msgid "1 substitution"
-msgstr "�滻һ��"
+msgstr "1 ���滻��"
+
+#, c-format
+msgid "%ld matches"
+msgstr "%ld ��ƥ�䣬"
 
 #, c-format
 msgid "%ld substitutions"
-msgstr "�滻 %ld ��"
+msgstr "%ld ���滻��"
 
 msgid " on 1 line"
-msgstr " һ����"
+msgstr "�� 1 ��"
 
 #, c-format
 msgid " on %ld lines"
-msgstr " %ld ����"
+msgstr "�� %ld ��"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ���ܵݹ�ִ��"
 
 msgid "E148: Regular expression missing from global"
-msgstr "E148: û��ʹ�ù��������ʽ (?)"
+msgstr "E148: global ȱ���������ʽ"
 
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "ÿһ�ж��Ҳ���ģʽ: %s"
+msgstr "ÿ�ж�ƥ�����ʽ: %s"
 
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# Last Substitute String:\n"
 "$"
 msgstr ""
 "\n"
-"# ǰһ������ַ���:\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 ��˵��"
+msgstr "E149: ��Ǹ��û�� %s ��˵��"
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "��Ǹ, �Ҳ��������ļ� \"%s\""
+msgstr "��Ǹ���Ҳ��������ļ� \"%s\""
 
 #, c-format
 msgid "E150: Not a directory: %s"
-msgstr "E150: %s ����Ŀ¼"
+msgstr "E150: ����Ŀ¼: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
-msgstr "E152: ������д��ģʽ�� \"%s\""
+msgstr "E152: �޷��򿪲�д�� %s"
 
 #, c-format
 msgid "E153: Unable to open %s for reading"
-msgstr "E153: ���ܶ�ȡ�ļ�: %s"
+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"
-msgstr "E154: ��ǩ(tag) \"%s\" ���ļ� %s ���ظ����ֶ��"
+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 command: %s"
+msgstr "E160: δ֪�� sign ����: %s"
 
 msgid "E156: Missing sign name"
 msgstr "E156: ȱ�� sign ����"
 
-msgid "E255: Too many signs defined"
-msgstr "E326: �ҵ�̫�� signs"
+msgid "E612: Too many signs defined"
+msgstr "E612: Signs �������"
 
 #, c-format
 msgid "E239: Invalid sign text: %s"
-msgstr "E239: ����ȷ�� sign ����: %s"
+msgstr "E239: ��Ч�� sign ����: %s"
 
 #, c-format
 msgid "E155: Unknown sign: %s"
-msgstr "E155: ����ȷ�� sign: %s"
+msgstr "E155: δ֪�� sign: %s"
 
 msgid "E159: Missing sign number"
-msgstr "E159: ȱ�� sign number"
+msgstr "E159: ȱ�� sign ��"
 
 #, c-format
 msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ���������ƴ���: %s"
+msgstr "E158: ��Ч�Ļ�������: %s"
 
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 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 ģʽ. ���� \"visua\" �Իص�����ģʽ."
+msgstr "���� Ex ģʽ������ \"visual\" �ص�����ģʽ��"
 
-#. must be at EOF
-msgid "At end-of-file"
-msgstr "�ѵ��ļ���β"
+msgid "E501: At end-of-file"
+msgstr "E501: �ѵ��ļ�ĩβ"
 
 msgid "E169: Command too recursive"
 msgstr "E169: ����ݹ��������"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱ�� :endwhile"
-
-msgid "E171: Missing :endif"
-msgstr "E171: ȱ�� :endif"
+#, c-format
+msgid "E605: Exception not caught: %s"
+msgstr "E605: �쳣û�б�����: %s"
 
 msgid "End of sourced file"
-msgstr "�����ļ�����"
+msgstr "�ű��ļ�����"
 
 msgid "End of function"
-msgstr "������β"
-
-msgid "Ambiguous use of user-defined command"
-msgstr "�û��������������"
+msgstr "��������"
 
-msgid "Not an editor command"
-msgstr "���Ǳ༭��������"
+msgid "E464: Ambiguous use of user-defined command"
+msgstr "E464: ��ȷ�����û��Զ�������"
 
-msgid "Don't panic!"
-msgstr "��Ҫ����!"
+msgid "E492: Not an editor command"
+msgstr "E492: ���Ǳ༭��������"
 
-msgid "Backwards range given"
-msgstr "ָ������ǰ�ο��ķ�Χ"
+msgid "E493: Backwards range given"
+msgstr "E493: ʹ��������ķ�Χ"
 
 msgid "Backwards range given, OK to swap"
-msgstr "ָ������ǰ�ο��ķ�Χ��OK to swap"
+msgstr "ʹ��������ķ�Χ��ȷ��������"
 
-msgid "Use w or w>>"
-msgstr "��ʹ�� w �� w>>"
+msgid "E494: Use w or w>>"
+msgstr "E494: ��ʹ�� w �� w>>"
 
 msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: ��Ǹ, �������ڴ˰汾��δʵ��"
+msgstr "E319: ��Ǹ�������ڴ˰汾�в�����"
 
 msgid "E172: Only one file name allowed"
-msgstr "E172: ֻ����һ���ļ���"
+msgstr "E172: ֻ����һ���ļ���"
+
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "���� 1 ���ļ�δ�༭��ȷʵҪ�˳���"
 
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
-msgstr "���� %d ���ļ�δ�༭. ȷ��Ҫ�˳���"
+msgstr "���� %d ���ļ�δ�༭��ȷʵҪ�˳���"
+
+msgid "E173: 1 more file to edit"
+msgstr "E173: ���� 1 ���ļ�δ�༭"
 
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ���� %ld ���ļ�δ�༭"
 
-msgid "E174: Command already exists: use ! to redefine"
-msgstr "E174: �����Ѿ�����, ��ʹ�� ! ǿ�����¶���"
+msgid "E174: Command already exists: add ! to replace it"
+msgstr "E174: �����Ѵ���: ��� ! ǿ���滻"
 
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
 msgstr ""
 "\n"
-"    ����        ���� ��Χ  ����      ����      "
+"    ����        ���� ��Χ  ��ȫ      ����      "
 
 msgid "No user-defined commands found"
-msgstr "�Ҳ����û��Զ��������"
+msgstr "�Ҳ����û��Զ�������"
 
 msgid "E175: No attribute specified"
-msgstr "E175: û��ָ��������"
+msgstr "E175: û��ָ������"
 
 msgid "E176: Invalid number of arguments"
-msgstr "E176: ����ȷ�Ĳ�������"
+msgstr "E176: ��Ч�Ĳ�������"
 
 msgid "E177: Count cannot be specified twice"
-msgstr "E177: ����ָ������"
+msgstr "E177: ����ָ�����μ���"
 
 msgid "E178: Invalid default value for count"
-msgstr "E178: ������ȱʡֵ����ȷ"
-
-msgid "E179: argument required for complete"
-msgstr "E179: ָ����Ҫ�����������"
+msgstr "E178: ��Ч�ļ���Ĭ��ֵ"
 
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ��������ֵ: '%s'"
+msgid "E179: argument required for -complete"
+msgstr "E179: -complete ��Ҫ����"
 
 #, c-format
 msgid "E181: Invalid attribute: %s"
-msgstr "E181: ����ȷ������: %s"
+msgstr "E181: ��Ч������: %s"
 
 msgid "E182: Invalid command name"
-msgstr "E182: �������Ʋ���ȷ"
+msgstr "E182: ��Ч��������"
 
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �û��Զ�����������Դ�д��ĸ��ʼ"
+msgstr "E183: �û��Զ�����������Դ�д��ĸ��ͷ"
 
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: û���û��Զ������� %s"
+msgstr "E184: û������û��Զ�������: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: ��Ч�Ĳ�ȫ����: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: ֻ�� custom ��ȫ����������"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Custom ��ȫ��Ҫһ����������"
 
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: �Ҳ�����ɫ��ʽ %s"
+msgstr "E185: �Ҳ�����ɫ���� %s"
 
 msgid "Greetings, Vim user!"
-msgstr "���, Vim �û���"
+msgstr "���ã�Vim �û���"
+
+msgid "E784: Cannot close last tab page"
+msgstr "E784: ���ܹر����һ�� tab ҳ"
+
+msgid "Already only one tab page"
+msgstr "�Ѿ�ֻʣһ�� tab ҳ��"
 
 msgid "Edit File in new window"
 msgstr "���´��ڱ༭�ļ�"
 
+#, c-format
+msgid "Tab page %d"
+msgstr "Tab ҳ %d"
+
 msgid "No swap file"
 msgstr "�޽����ļ�"
 
 msgid "Append File"
-msgstr "�����ļ�"
+msgstr "׷���ļ�"
+
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr "E747: ���ܸı�Ŀ¼�����������޸� (��� ! ǿ��ִ��)"
 
 msgid "E186: No previous directory"
 msgstr "E186: ǰһ��Ŀ¼������"
 
 msgid "E187: Unknown"
-msgstr "E187: ����ʶ��ı��"
+msgstr "E187: δ֪"
+
+msgid "E465: :winsize requires two number arguments"
+msgstr "E465: :winsize ��Ҫ�������ֲ���"
 
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "����λ��: X %d, Y %d"
 
 msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: ������ƽ̨�ϲ��ܻ�ô���λ��"
+msgstr "E188: �ڴ�ƽ̨�ϲ��ܻ�ô���λ��"
+
+msgid "E466: :winpos requires two number arguments"
+msgstr "E466: :winpos ��Ҫ�������ֲ���"
 
 msgid "Save Redirection"
 msgstr "�����ض���"
@@ -973,85 +1238,170 @@ msgid "Save Setup"
 msgstr "�����趨"
 
 #, c-format
-msgid "E189: \"%s\" exists (use ! to override)"
-msgstr "E189: \"%s\" �Ѵ��� (���� ! ǿ��ִ��)"
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: �޷�����Ŀ¼: %s"
+
+#, c-format
+msgid "E189: \"%s\" exists (add ! to override)"
+msgstr "E189: \"%s\" �Ѵ��� (��� ! ǿ��ִ��)"
 
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ������д��ģʽ�� \"%s\""
+msgstr "E190: �޷��򿪲�д�� \"%s\""
 
 #. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ����������Ӣ����ĸ����ǰ/�������"
+msgstr "E191: ����������һ����ĸ������/������"
 
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal �ݹ��������"
 
-msgid ":if nesting too deep"
-msgstr ":if ��������"
+msgid "E194: No alternate file name to substitute for '#'"
+msgstr "E194: û�������滻 '#' �Ľ����ļ���"
 
-msgid ":endif without :if"
-msgstr ":endif ȱ�ٶ�Ӧ�� :if"
+msgid "E495: no autocommand file name to substitute for \"<afile>\""
+msgstr "E495: û�������滻 \"<afile>\" ���Զ������ļ���"
 
-msgid ":else without :if"
-msgstr ":else ȱ�ٶ�Ӧ�� :if"
+msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
+msgstr "E496: û�������滻 \"<abuf>\" ���Զ����������"
 
-msgid ":elseif without :if"
-msgstr ":elseif ȱ�ٶ�Ӧ�� :if"
+msgid "E497: no autocommand match name to substitute for \"<amatch>\""
+msgstr "E497: û�������滻 \"<amatch>\" ���Զ�����ƥ����"
 
-msgid ":while nesting too deep"
-msgstr ":while ��������"
+msgid "E498: no :source file name to substitute for \"<sfile>\""
+msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
 
-msgid ":continue without :while"
-msgstr ":continue ȱ�ٶ�Ӧ�� :while"
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: '%' �� '#' Ϊ���ļ�����ֻ������ \":p:h\""
 
-msgid ":break without :while"
-msgstr ":break ȱ�ٶ�Ӧ�� :while"
+msgid "E500: Evaluates to an empty string"
+msgstr "E500: ���Ϊ���ַ���"
 
-msgid ":endwhile without :while"
-msgstr ":endwhile ȱ�ٶ�Ӧ�� :while"
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
 
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction �����ں����ڲ�ʹ��"
+msgid "E196: No digraphs in this version"
+msgstr "E196: �˰汾�޸����ַ�(digraph)"
 
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: û�� '#' ��������ļ���"
+msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
+msgstr "E608: ���� :throw ǰ׺Ϊ 'Vim' ���쳣"
 
-msgid "no autocommand file name to substitute for \"<afile>\""
-msgstr "û�� Autocommand �ļ������滻 \"<afile>\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception thrown: %s"
+msgstr "�׳��쳣: %s"
 
-msgid "no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "û�� Autocommand �������������滻 \"<abuf>\""
+#, c-format
+msgid "Exception finished: %s"
+msgstr "����쳣: %s"
 
-msgid "no autocommand match name to substitute for \"<amatch>\""
-msgstr "û�� Autocommand Match name ���滻 \"<amatch>\""
+#, c-format
+msgid "Exception discarded: %s"
+msgstr "�����쳣: %s"
 
-msgid "no :source file name to substitute for \"<sfile>\""
-msgstr "û�� :source �ļ������滻 \"<sfile>\""
+#, c-format
+msgid "%s, line %ld"
+msgstr "%s���� %ld ��"
 
-#, no-c-format
-msgid "Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "'%' �� '#' ָ����ļ�����ֻ����� \":p:h\""
+#. always scroll up, don't overwrite
+#, c-format
+msgid "Exception caught: %s"
+msgstr "�����쳣: %s"
 
-msgid "Evaluates to an empty string"
-msgstr "����Ϊ���ַ���"
+#, c-format
+#~ msgid "%s made pending"
+#~ msgstr ""
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ���ܶ�ȡ viminfo"
+#, fuzzy, c-format
+#~ msgid "%s resumed"
+#~ msgstr " �ѷ���\n"
 
-msgid "E196: No digraphs in this version"
-msgstr "E196: ���汾�޸����ַ�(digraph)"
+#, c-format
+#~ msgid "%s discarded"
+#~ msgstr ""
+
+msgid "Exception"
+msgstr "�쳣"
+
+msgid "Error and interrupt"
+msgstr "������ж�"
+
+msgid "Error"
+msgstr "����"
+
+#. if (pending & CSTP_INTERRUPT)
+msgid "Interrupt"
+msgstr "�ж�"
+
+msgid "E579: :if nesting too deep"
+msgstr "E579: :if Ƕ�ײ�������"
+
+msgid "E580: :endif without :if"
+msgstr "E580: :endif ȱ�ٶ�Ӧ�� :if"
+
+msgid "E581: :else without :if"
+msgstr "E581: :else ȱ�ٶ�Ӧ�� :if"
+
+msgid "E582: :elseif without :if"
+msgstr "E582: :elseif ȱ�ٶ�Ӧ�� :if"
+
+msgid "E583: multiple :else"
+msgstr "E583: ��� :else"
+
+msgid "E584: :elseif after :else"
+msgstr "E584: :elseif �� :else ����"
+
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while/:for Ƕ�ײ�������"
+
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :continue ȱ�ٶ�Ӧ�� :while �� :for"
+
+msgid "E587: :break without :while or :for"
+msgstr "E587: :break ȱ�ٶ�Ӧ�� :while �� :for"
+
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :while �� :endfor ��β"
+
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :for �� :endwhile ��β"
+
+msgid "E601: :try nesting too deep"
+msgstr "E601: :try Ƕ�ײ�������"
+
+msgid "E603: :catch without :try"
+msgstr "E603: :catch ȱ�ٶ�Ӧ�� :try"
+
+#. Give up for a ":catch" after ":finally" and ignore it.
+#. * Just parse.
+msgid "E604: :catch after :finally"
+msgstr "E604: :catch �� :finally ����"
+
+msgid "E606: :finally without :try"
+msgstr "E606: :finally ȱ�ٶ�Ӧ�� :try"
+
+#. Give up for a multiple ":finally" and ignore it.
+msgid "E607: multiple :finally"
+msgstr "E607: ��� :finally"
+
+msgid "E602: :endtry without :try"
+msgstr "E602: :endtry ȱ�ٶ�Ӧ�� :try"
+
+msgid "E193: :endfunction not inside a function"
+msgstr "E193: :endfunction ���ں�����"
 
 msgid "tagname"
-msgstr "��ǩ����"
+msgstr "tag ��"
 
 msgid " kind file\n"
-msgstr "���ļ�\n"
+msgstr " ���� �ļ�\n"
 
 msgid "'history' option is zero"
-msgstr "ѡ�� 'history' ����"
+msgstr "ѡ�� 'history' Ϊ��"
 
-#, c-format
+#, fuzzy, c-format
+# do not translate to avoid writing Chinese in files
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
@@ -1075,10 +1425,10 @@ msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ���������"
 
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: ��ɾ������ڻ򻺴�"
+msgstr "E199: ����ڻ򻺳����ѱ�ɾ��"
 
 msgid "Illegal file name"
-msgstr "����ȷ���ļ���"
+msgstr "��Ч���ļ���"
 
 msgid "is a directory"
 msgstr "��Ŀ¼"
@@ -1087,26 +1437,32 @@ msgid "is not a file"
 msgstr "�����ļ�"
 
 msgid "[New File]"
-msgstr "[δ����]"
+msgstr "[���ļ�]"
+
+msgid "[New DIRECTORY]"
+msgstr "[��Ŀ¼]"
+
+msgid "[File too big]"
+msgstr "[�ļ�����]"
 
 msgid "[Permission Denied]"
 msgstr "[Ȩ�޲���]"
 
 msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand ʹ�����ܶ�ȡ���ļ�"
+msgstr "E200: *ReadPre �Զ�������ļ����ɶ�"
 
 msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand �����Ը��Ļ�����������"
+msgstr "E201: *ReadPre �Զ���������ı䵱ǰ������"
 
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: �ӱ�׼�����ȡ...\n"
 
 msgid "Reading from stdin..."
-msgstr "�ӱ�׼�����..."
+msgstr "�ӱ�׼�����ȡ..."
 
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת������"
+msgstr "E202: ת�������ļ����ɶ�"
 
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
@@ -1121,13 +1477,13 @@ msgid "[RO]"
 msgstr "[ֻ��]"
 
 msgid "[CR missing]"
-msgstr "[ȱ��CR]'"
+msgstr "[ȱ�� CR]'"
 
 msgid "[NL found]"
-msgstr "[�ҵ�NL]"
+msgstr "[�ҵ� NL]"
 
 msgid "[long lines split]"
-msgstr "[�ָ������]"
+msgstr "[���зָ�]"
 
 msgid "[NOT converted]"
 msgstr "[δת��]"
@@ -1138,74 +1494,92 @@ msgstr "[��ת��]"
 msgid "[crypted]"
 msgstr "[�Ѽ���]"
 
-msgid "[CONVERSION ERROR]"
-msgstr "ת������"
+#, c-format
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[�� %ld ��ת������]"
+
+#, c-format
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[�� %ld ����Ч�ַ�]"
 
 msgid "[READ ERRORS]"
 msgstr "[������]"
 
 msgid "Can't find temp file for conversion"
-msgstr "�Ҳ���ת���õ���ʱ�ļ�"
+msgstr "�Ҳ�������ת������ʱ�ļ�"
 
 msgid "Conversion with 'charconvert' failed"
-msgstr "�ַ���ת������"
+msgstr "'charconvert' ת��ʧ��"
 
 msgid "can't read output of 'charconvert'"
-msgstr "���ܶ�ȡ 'charconvert' �����"
+msgstr "�޷���ȡ 'charconvert' �����"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: �Ҳ��� acwrite ��������Ӧ���Զ�����"
 
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand ɾ�����ͷ���Ҫд��Ļ�����"
+msgstr "E203: �Զ�����ɾ�����ͷ���Ҫд��Ļ�����"
 
 msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand ����ظı����к�"
+msgstr "E204: �Զ���������ظı�������"
+
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans ������δ�޸ĵĻ�����д��"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans ����������������д��"
 
 msgid "is not a file or writable device"
 msgstr "�����ļ����д���豸"
 
-msgid "is read-only (use ! to override)"
-msgstr "��ֻ���ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "is read-only (add ! to override)"
+msgstr "ֻ�� (��� ! ǿ��ִ��)"
 
-msgid "Can't write to backup file (use ! to override)"
-msgstr "����д�����ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: �޷�д�뱸���ļ� (��� ! ǿ��ִ��)"
 
-msgid "Close error for backup file (use ! to override)"
-msgstr "�رձ����ļ����� (��ʹ�� ! ǿ��ִ��)"
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: �رձ����ļ����� (��� ! ǿ��ִ��)"
 
-msgid "Can't read file for backup (use ! to override)"
-msgstr "���ܶ�ȡ�ļ��Թ����� (��ʹ�� ! ǿ��ִ��)"
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: �޷���ȡ�ļ��Թ����� (��� ! ǿ��ִ��)"
 
-msgid "Cannot create backup file (use ! to override)"
-msgstr "���ܴ��������ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: �޷����������ļ� (��� ! ǿ��ִ��)"
 
-msgid "Can't make backup file (use ! to override)"
-msgstr "�����������ļ� (��ʹ�� ! ǿ��ִ��)"
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: �޷����ɱ����ļ� (��� ! ǿ��ִ��)"
 
-msgid "The resource fork will be lost (use ! to override)"
-msgstr "Resource fork ����ʧ (��ʹ�� ! ǿ��ִ��)"
+#, fuzzy
+#~ 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: �Ҳ���д���õĽ����ļ�"
+msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
 
-msgid "E213: Cannot convert (use ! to write without conversion)"
-msgstr "E213: ����ת�� (��ʹ�� ! ǿ�Ʋ�ת��д��)"
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: �޷�ת�� (��� ! ǿ�Ʋ�ת��д��)"
 
 msgid "E166: Can't open linked file for writing"
-msgstr "E166: ������д��ģʽ�������ļ�"
+msgstr "E166: �޷��򿪲�д�������ļ�"
 
 msgid "E212: Can't open file for writing"
-msgstr "E212: ������д��ģʽ��"
+msgstr "E212: �޷��򿪲�д���ļ�"
+
+msgid "E667: Fsync failed"
+msgstr "E667: ͬ��ʧ��"
 
-msgid "Close failed"
-msgstr "�ر�ʧ��"
+msgid "E512: Close failed"
+msgstr "E512: �ر�ʧ��"
 
-msgid "write error, conversion failed"
-msgstr "����д�� -- ת��ʧ��"
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
 
-msgid "write error (file system full?)"
-msgstr "д����� (�ļ�ϵͳ������)"
+msgid "E514: write error (file system full?)"
+msgstr "E514: д����� (�ļ�ϵͳ������)"
 
 msgid " CONVERSION ERROR"
-msgstr "ת������"
+msgstr " ת������"
 
 msgid "[Device]"
 msgstr "[�豸]"
@@ -1214,35 +1588,35 @@ msgid "[New]"
 msgstr "[��]"
 
 msgid " [a]"
-msgstr "[a]"
+msgstr " [a]"
 
 msgid " appended"
-msgstr " �Ѹ���"
+msgstr " ��׷��"
 
 msgid " [w]"
-msgstr "[w]"
+msgstr " [w]"
 
 msgid " written"
 msgstr " ��д��"
 
 msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch ģʽ: ���ܴ���ԭʼ�ļ�"
+msgstr "E205: Patchmode: �޷�����ԭʼ�ļ�"
 
 msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch ģʽ: ���ܸı�յ�ԭʼ�ļ�"
+msgstr "E206: Patchmode: �޷����ɿյ�ԭʼ�ļ�"
 
 msgid "E207: Can't delete backup file"
-msgstr "E207: ����ɾ�������ļ�"
+msgstr "E207: �޷�ɾ�������ļ�"
 
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"����: ԭʼ�ļ���ʧ����\n"
+"����: ԭʼ�ļ������Ѷ�ʧ����\n"
 
 msgid "don't quit the editor until the file is successfully written!"
-msgstr "���ļ���ȷд��ǰ�����˳��༭��!"
+msgstr "���ļ���ȷд��ǰ�����˳��༭����"
 
 msgid "[dos]"
 msgstr "[dos]"
@@ -1263,18 +1637,18 @@ msgid "[unix format]"
 msgstr "[unix ��ʽ]"
 
 msgid "1 line, "
-msgstr "1 ��, "
+msgstr "1 �У�"
 
 #, c-format
 msgid "%ld lines, "
-msgstr "%ld ��, "
+msgstr "%ld �У�"
 
 msgid "1 character"
-msgstr "һ���ַ�"
+msgstr "1 ���ַ�"
 
 #, c-format
 msgid "%ld characters"
-msgstr "%ld���ַ�"
+msgstr "%ld ���ַ�"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1286,47 +1660,56 @@ msgstr "[���һ�в�����]"
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "����: ���ļ����ϴζ�����ѱ䶯!!!"
+msgstr "����: ���ļ��Զ�����ѷ����䶯������"
 
 msgid "Do you really want to write to it"
-msgstr "ȷ��Ҫд����"
+msgstr "ȷʵҪд����"
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: д���ļ� \"%s\" ����"
+msgstr "E208: д���ļ� \"%s\" ����"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: �ر��ļ� \"%s\" ����"
+msgstr "E209: �ر��ļ� \"%s\" ����"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: ��ȡ�ļ� \"%s\" ����"
+msgstr "E210: ��ȡ�ļ� \"%s\" ����"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand ɾ��������"
+msgstr "E246: FileChangedShell �Զ�����ɾ���˻�����"
 
 #, c-format
-msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: ����: �ļ� \"%s\" �Ѿ�������"
+msgid "E211: File \"%s\" no longer available"
+msgstr "E211: �ļ� \"%s\" �Ѿ�������"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: ����: �ļ� \"%s\" ���ϴζ�����ѱ䶯, ���ұ༭�еĻ�����Ҳ������"
+msgstr "W12: ����: �ļ� \"%s\" �ѱ䶯�������� Vim �еĻ�����Ҳ�ѱ䶯"
+
+msgid "See \":help W12\" for more info."
+msgstr "��һ��˵����� \":help W12\""
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ����: �ļ� \"%s\" ���ϴζ�����Ѹı�"
+msgstr "W11: ����: �༭��ʼ���ļ� \"%s\" �ѱ䶯"
+
+msgid "See \":help W11\" for more info."
+msgstr "��һ��˵����� \":help W11\""
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ����: �ļ� \"%s\" ���ϴζ�����Ѹı�"
+msgstr "W16: ����: �༭��ʼ���ļ� \"%s\" ��ģʽ�ѱ䶯"
+
+msgid "See \":help W16\" for more info."
+msgstr "��һ��˵����� \":help W16\""
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ����: �ļ� \"%s\" �ڿ�ʼ�༭���ֱ�������"
+msgstr "W13: ����: �༭��ʼ���ļ� \"%s\" �ѱ�����"
 
 msgid "Warning"
 msgstr "����"
@@ -1339,124 +1722,139 @@ msgstr ""
 "�����ļ�(&L)"
 
 #, c-format
+msgid "E462: Could not prepare for reloading \"%s\""
+msgstr "E462: �޷�Ϊ���¼��� \"%s\" ��׼��"
+
+#, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: �������¼��� \"%s\""
+msgstr "E321: �޷����¼��� \"%s\""
 
 msgid "--Deleted--"
 msgstr "--��ɾ��--"
 
+#, c-format
+#~ msgid "auto-removing autocommand: %s <buffer=%d>"
+#~ msgstr ""
+
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: �鲻����: \"%s\""
+msgstr "E367: �޴���: \"%s\""
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
-msgstr "E215: * �����в���ȷ���ַ�: %s"
+msgstr "E215: * ��������Ч�ַ�: %s"
 
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: �޴��¼�: %s"
 
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: �޴�����¼�: %s"
+
 #. Highlight title
 msgid ""
 "\n"
 "--- Auto-Commands ---"
 msgstr ""
 "\n"
-"--- Auto-Commands ---"
+"--- �Զ����� ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: ��Ч�Ļ������� "
 
 msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ���ܶ������¼�ִ�� autocommand"
+msgstr "E217: ���ܶ������¼�ִ���Զ�����"
 
 msgid "No matching autocommands"
-msgstr "�Ҳ�����Ӧ�� autocommand"
+msgstr "û��ƥ����Զ�����"
 
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand ��������"
+msgstr "E218: �Զ�����Ƕ�ײ�������"
 
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
+msgstr "%s �Զ����� \"%s\""
 
 #, c-format
 msgid "Executing %s"
 msgstr "ִ�� %s"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "autocommand %s"
-msgstr "autocommand %s"
+msgstr "�Զ����� %s"
 
 msgid "E219: Missing {."
-msgstr "E219: ȱ�� {."
+msgstr "E219: ȱ�� {��"
 
 msgid "E220: Missing }."
-msgstr "E220: ȱ�� }."
+msgstr "E220: ȱ�� }��"
 
-msgid "No fold found"
-msgstr "�Ҳ����κ� fold"
+msgid "E490: No fold found"
+msgstr "E490: �Ҳ����۵�"
 
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ������Ŀǰ�� 'foldmethod' �´��� fold"
+msgstr "E350: �����ڵ�ǰ�� 'foldmethod' �´����۵�"
 
 msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ������Ŀǰ�� 'foldmethod' ��ɾ�� fold"
+msgstr "E351: �����ڵ�ǰ�� 'foldmethod' ��ɾ���۵�"
 
-msgid "E221: 'commentstring' is empty"
-msgstr "E221: ѡ�� 'commentstring' δ�趨"
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--���۵� %3ld ��"
 
 msgid "E222: Add to read buffer"
-msgstr "E222: �����������"
+msgstr "E222: ���ӵ��Ѷ���������"
 
 msgid "E223: recursive mapping"
-msgstr "E223: �ݹ� mapping"
+msgstr "E223: �ݹ�ӳ��"
 
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s �Ѿ���ȫ�� abbreviation ��"
+msgstr "E224: ȫ����д %s �Ѵ���"
 
 #, c-format
 msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s �Ѿ���ȫ�� mapping ��"
+msgstr "E225: ȫ��ӳ�� %s �Ѵ���"
 
 #, c-format
 msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s �Ѿ��� abbreviation ��"
+msgstr "E226: ��д %s �Ѵ���"
 
 #, c-format
 msgid "E227: mapping already exists for %s"
-msgstr "E227: %s �� mapping �Ѿ�����"
+msgstr "E227: ӳ�� %s �Ѵ���"
 
 msgid "No abbreviation found"
 msgstr "�Ҳ�����д"
 
 msgid "No mapping found"
-msgstr "û�������Ӧ"
+msgstr "�Ҳ���ӳ��"
 
 msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ����ȷ��ģʽ"
+msgstr "E228: makemap: ��Ч��ģʽ"
 
 msgid "<cannot open> "
-msgstr "<���ܴ�>"
+msgstr "<�޷���>"
 
 #, c-format
-msgid "vim_SelFile: can't get font %s"
-msgstr "vim_SelFile: ����ʹ�� %s ����"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: �޷���ȡ���� %s"
 
-msgid "vim_SelFile: can't return to current directory"
-msgstr "vim_SelFile: ���ܻص�ĿǰĿ¼"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: �޷����ص�ǰĿ¼"
 
 msgid "Pathname:"
 msgstr "·��:"
 
-msgid "vim_SelFile: can't get current directory"
-msgstr "vim_SelFile: ����ȡ��ĿǰĿ¼"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: �޷���ȡ��ǰĿ¼"
 
 msgid "OK"
 msgstr "ȷ��"
 
-#. 'Cancel' button
 msgid "Cancel"
 msgstr "ȡ��"
 
@@ -1464,45 +1862,68 @@ msgid "Vim dialog"
 msgstr "Vim �Ի���"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "������: �����趨 thumb pixmap ��λ��"
+msgstr "����������: �޷���ȡ����ͼ��ļ��δ�С"
 
 msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: ���ܶ���Ϣ�� callback ���� BallonEval"
+msgstr "E232: ����ͬʱʹ����Ϣ�ͻص����������� BalloonEval"
 
 msgid "E229: Cannot start the GUI"
-msgstr "E229: ��������ͼ�ͽ���"
+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'"
+msgstr "E231: ��Ч�� 'guifontwide'"
 
-msgid "Error"
-msgstr "����"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' ��ֵ��Ч"
 
-msgid "&Ok"
-msgstr "ȷ��(&O)"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: �޷�������ɫ %s"
+
+msgid "No match at cursor, finding next"
+msgstr "�ڹ�괦û��ƥ�䣬������һ��"
 
 msgid "Vim dialog..."
 msgstr "Vim �Ի���..."
 
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"��(&Y)\n"
+"��(&N)\n"
+"ȡ��(&C)"
+
+msgid "Input _Methods"
+msgstr "���뷨(_M)"
+
 msgid "VIM - Search and Replace..."
-msgstr "VIM - �������滻..."
+msgstr "VIM - ���Һ��滻..."
 
 msgid "VIM - Search..."
 msgstr "VIM - ����..."
 
 msgid "Find what:"
-msgstr "����:"
+msgstr "��������:"
 
 msgid "Replace with:"
 msgstr "�滻Ϊ:"
 
-#. exact match only button
-msgid "Match exact word only"
-msgstr "ֻƥ����ȫ��ͬ����"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "ƥ�������Ĵ�"
+
+#. match case button
+msgid "Match case"
+msgstr "ƥ���Сд"
 
 msgid "Direction"
 msgstr "����"
@@ -1514,108 +1935,130 @@ msgstr "����"
 msgid "Down"
 msgstr "����"
 
-#. 'Find Next' button
 msgid "Find Next"
-msgstr "����һ��"
+msgstr "������һ��"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "�滻"
 
-#. 'Replace All' button
 msgid "Replace All"
-msgstr "�滻ȫ��"
+msgstr "ȫ���滻"
 
-msgid "E233: cannot open display"
-msgstr "E233: <���ܴ� X Server DISPLAY>"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: �ӻỰ�������յ� \"die\" ����\n"
 
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: ����ȷ���ַ��� (Fontset): %s"
+msgid "Close"
+msgstr "�ر�"
 
-msgid "Font Selection"
-msgstr "����ѡ��"
+msgid "New tab"
+msgstr "�½���ǩ"
 
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "����ȷ����������: %s"
+msgid "Open Tab..."
+msgstr "�򿪱�ǩ..."
 
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: \"%s\" ���ǹ̶���������"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: �����ڱ�����شݻ�\n"
 
-#, c-format
-msgid "E242: Color name not recognized: %s"
-msgstr "E242: %s Ϊ����ʶ�����ɫ����"
+msgid "Font Selection"
+msgstr "ѡ������"
 
 msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "ʹ�� CUT_BUFFER0 ���滻��ѡ��"
+msgstr "ʹ�� CUT_BUFFER0 ��ȡ����ѡ��"
 
-msgid "Filter"
-msgstr "������"
+msgid "&Filter"
+msgstr "����(&F)"
+
+msgid "&Cancel"
+msgstr "ȡ��(&C)"
 
 msgid "Directories"
 msgstr "Ŀ¼"
 
-msgid "Help"
-msgstr "����"
+msgid "Filter"
+msgstr "������"
+
+msgid "&Help"
+msgstr "����(&H)"
 
 msgid "Files"
 msgstr "�ļ�"
 
+msgid "&OK"
+msgstr "ȷ��(&O)"
+
 msgid "Selection"
 msgstr "ѡ��"
 
-msgid "Undo"
-msgstr "����"
+msgid "Find &Next"
+msgstr "������һ��(&N)"
 
-#, c-format
-msgid "E235: Can't load Zap font '%s'"
-msgstr "E235: ���ܴ� Zap ���� '%s'"
+msgid "&Replace"
+msgstr "�滻(&R)"
+
+msgid "Replace &All"
+msgstr "ȫ���滻(&A)"
+
+msgid "&Undo"
+msgstr "����(&U)"
 
 #, c-format
-msgid "E235: Can't use font %s"
-msgstr "E235: ����ʹ������ %s"
+msgid "E610: Can't load Zap font '%s'"
+msgstr "E610: �޷����� Zap ���� '%s'"
 
 #, c-format
-msgid "E242: Missing color: %s"
-msgstr "E242: �Ҳ�����ɫ: %s"
+msgid "E611: Can't use font %s"
+msgstr "E611: �޷�ʹ������ %s"
 
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
 msgstr ""
 "\n"
-"���ڷ����ж��ӳ������Ϣ.\n"
+"���ڷ�����Ϣ��ֹ�ӽ��̡�\n"
+
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �Ҳ������ڱ��� \"%s\""
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ��֧�ֲ��� \"-%s\"������ OLE �汾��"
+msgstr "E243: ��֧�ֵĲ���: \"-%s\"����ʹ�� OLE �汾��"
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: �޷��� MDI Ӧ�ó����д򿪴���"
 
 msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "�����ַ��� (ʹ�� '\\\\' ����ʾ '\\')"
+msgstr "�����ַ��� (ʹ�� '\\\\' ������ '\\')"
 
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "���Ҽ��滻�ַ��� (ʹ�� '\\\\' ����ʾ '\\')"
+msgstr "���Һ��滻�ַ��� (ʹ�� '\\\\' ������ '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "δʹ��"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Ŀ¼\t*.nothing\n"
 
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-msgstr "Vim E458: �������� color map ������Щ��ɫ��������ֵֹ�"
+msgstr "Vim E458: �޷�������ɫ���ĳЩ��ɫ���ܲ���ȷ"
 
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: Fontset %s û���趨��ȷ�������Թ���ʾ��Щ�ַ���:"
+msgstr "E250: Fontset %s ȱ�������ַ���������:"
 
 #, c-format
 msgid "E252: Fontset name: %s"
-msgstr "E252: ���弯(Fontset)����: %s"
+msgstr "E252: Fontset ����: %s"
 
 #, c-format
 msgid "Font '%s' is not fixed-width"
-msgstr "'%s' ���ǹ̶���������"
+msgstr "'%s' ���ǹ̶����ȵ�����"
 
 #, c-format
 msgid "E253: Fontset name: %s\n"
-msgstr "E253: ���弯(Fontset)����: %s\n"
+msgstr "E253: Fontset ����: %s\n"
 
 #, c-format
 msgid "Font0: %s\n"
@@ -1626,8 +2069,8 @@ msgid "Font1: %s\n"
 msgstr "����1: %s\n"
 
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "����%d���Ȳ�������0������\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "����%ld�Ŀ��Ȳ�������0������\n"
 
 #, c-format
 msgid "Font0 width: %ld\n"
@@ -1638,199 +2081,384 @@ msgid ""
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"����1����: %ld\n"
+"����1�Ŀ���: %ld\n"
 "\n"
 
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ����������ɫ %s"
+#, fuzzy
+#~ msgid "Invalid font specification"
+#~ msgstr "����ȷ�����弯(Fontset)"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: ���ܶ�ȡ sign data!"
+#~ msgid "&Dismiss"
+#~ msgstr ""
+
+#~ msgid "no specific match"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Vim - Font Selector"
+#~ msgstr "����ѡ��"
+
+#~ msgid "Name:"
+#~ msgstr ""
+
+#. create toggle button
+#~ msgid "Show size in Points"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoding:"
+#~ msgstr "��¼��"
+
+#, fuzzy
+#~ msgid "Font:"
+#~ msgstr "����1: %s\n"
+
+#~ msgid "Style:"
+#~ msgstr ""
+
+#~ msgid "Size:"
+#~ msgstr ""
 
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata ����"
 
+msgid "E550: Missing colon"
+msgstr "E550: ȱ��ð��"
+
+msgid "E551: Illegal component"
+msgstr "E551: ��Ч�Ĳ���"
+
+msgid "E552: digit expected"
+msgstr "E552: Ӧ��Ҫ������"
+
+#, c-format
+msgid "Page %d"
+msgstr "�� %d ҳ"
+
+msgid "No text to be printed"
+msgstr "û��Ҫ��ӡ������"
+
+#, c-format
+msgid "Printing page %d (%d%%)"
+msgstr "���ڴ�ӡ�� %d ҳ (%d%%)"
+
+#, c-format
+msgid " Copy %d of %d"
+msgstr "���� %d / %d"
+
+#, c-format
+msgid "Printed: %s"
+msgstr "�Ѵ�ӡ: %s"
+
+msgid "Printing aborted"
+msgstr "��ӡ��ֹ"
+
+msgid "E455: Error writing to PostScript output file"
+msgstr "E455: д�� PostScript ����ļ�����"
+
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: �޷����ļ� \"%s\""
+
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: �޷���ȡ PostScript ��Դ�ļ� \"%s\""
+
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: �ļ� \"%s\" ���� PostScript ��Դ�ļ�"
+
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: �ļ� \"%s\" ������֧�ֵ� PostScript ��Դ�ļ�"
+
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" ��Դ�ļ��汾����ȷ"
+
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: �����ݵĶ��ֽڱ�����ַ�����"
+
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: printmbcharset �ڶ��ֽڱ����²���Ϊ�ա�"
+
+msgid "E675: No default font specified for multi-byte printing."
+msgstr "E675: û��ָ�����ֽڴ�ӡ��Ĭ�����塣"
+
+msgid "E324: Can't open PostScript output file"
+msgstr "E324: �޷��� PostScript ����ļ�"
+
+#, c-format
+msgid "E456: Can't open file \"%s\""
+msgstr "E456: �޷����ļ� \"%s\""
+
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"prolog.ps\""
+
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"cidfont.ps\""
+
 #, c-format
-msgid "Usage: cs[cope] %s"
-msgstr "Usage: cs[cope] %s"
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"%s.ps\""
+
+#, c-format
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: �޷�ת������ӡ���� \"%s\""
+
+msgid "Sending to printer..."
+msgstr "���͵���ӡ������"
+
+msgid "E365: Failed to print PostScript file"
+msgstr "E365: �޷���ӡ PostScript �ļ�"
+
+msgid "Print job sent."
+msgstr "��ӡ�����ѱ����͡�"
 
 msgid "Add a new database"
-msgstr "�������ݿ�"
+msgstr "����һ���µ����ݿ�"
 
 msgid "Query for a pattern"
-msgstr "��ѯģʽ"
+msgstr "��ѯһ��ģʽ"
 
 msgid "Show this message"
 msgstr "��ʾ����Ϣ"
 
 msgid "Kill a connection"
-msgstr "��������"
+msgstr "����һ������"
 
 msgid "Reinit all connections"
-msgstr "������������"
+msgstr "������������"
 
 msgid "Show connections"
 msgstr "��ʾ����"
 
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: �÷�: cs[cope] %s"
+
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "��� cscope ���֧�ַָ���Ļ\n"
+msgstr "��� cscope ���֧�ַָ�ڡ�\n"
 
-msgid "Usage: cstag <ident>"
-msgstr "�÷�: cstag <ʶ����>"
+msgid "E562: Usage: cstag <ident>"
+msgstr "E562: �÷�: cstag <ident>"
 
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �Ҳ��� tag"
 
 #, c-format
-msgid "stat(%s) error: %d"
-msgstr "stat(%s) ����: %d"
+msgid "E563: stat(%s) error: %d"
+msgstr "E563: stat(%s) ����: %d"
+
+msgid "E563: stat error"
+msgstr "E563: stat ����"
 
 #, c-format
-msgid "Added cscope database %s"
-msgstr "���� cscope ���ݿ� %s"
+msgid "E564: %s is not a directory or a valid cscope database"
+msgstr "E564: %s ����Ŀ¼����Ч�� cscope ���ݿ�"
 
 #, c-format
-msgid "%s is not a directory or a valid cscope database"
-msgstr "%s ����Ŀ¼�� cscope ���ݿ�"
+msgid "Added cscope database %s"
+msgstr "������ cscope ���ݿ� %s"
 
 #, c-format
-msgid "error reading cscope connection %d"
-msgstr "��ȡ cscope ���� %d ʱ����"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: ��ȡ cscope ���� %ld ����"
 
-msgid "unknown cscope search type"
-msgstr "δ֪�� cscope ������̬"
+msgid "E561: unknown cscope search type"
+msgstr "E561: δ֪�� cscope ��������"
 
-msgid "Could not create cscope pipes"
-msgstr "���ܴ����� cscope ���ӵĹܵ�"
+msgid "E566: Could not create cscope pipes"
+msgstr "E566: �޷����� cscope �ܵ�"
+
+msgid "E622: Could not fork for cscope"
+msgstr "E622: �޷��� cscope ���� fork"
 
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ִ��ʧ��"
 
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: �޷����� cscope ����"
+
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ʧ�� (to_fp)"
+msgstr "cs_create_connection: fdopen to_fp ʧ��"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ʧ�� (fr_fp)"
+msgstr "cs_create_connection: fdopen fr_fp ʧ��"
 
-msgid "no cscope connections"
-msgstr "û�� cscope ����"
+msgid "E567: no cscope connections"
+msgstr "E567: û�� cscope ����"
 
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: �Ҳ������� cscope ����Ѱ %s / %s"
+msgstr "E259: cscope ��ѯ %s %s û���ҵ�ƥ��Ľ��"
+
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix ��־ %c �� %c ��Ч"
 
 msgid "cscope commands:\n"
 msgstr "cscope ����:\n"
 
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (�÷�: %s)\n"
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (�÷�: %s)"
 
-msgid "duplicate cscope database not added"
-msgstr "�ظ��� cscope ���ݿ�δ������"
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: �޷��� cscope ���ݿ�: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: �޷���ȡ cscope ���ݿ���Ϣ"
 
-msgid "maximum number of cscope connections reached"
-msgstr "�Ѵﵽ cscope ���������Ŀ"
+msgid "E568: duplicate cscope database not added"
+msgstr "E568: �ظ��� cscope ���ݿ�δ������"
 
-msgid "E260: cscope connection not found"
-msgstr "E260: �Ҳ��� cscope ����"
+msgid "E569: maximum number of cscope connections reached"
+msgstr "E569: �Ѵﵽ cscope �����������"
 
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: �Ҳ��� cscope ���� %s"
 
-msgid "cscope connection closed"
-msgstr "cscope �����ѹر�"
-
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope ���� %s �ѹر�\n"
+msgid "cscope connection %s closed"
+msgstr "cscope ���� %s �ѹر�"
 
 #. should not reach here
-msgid "fatal error in cs_manage_matches"
-msgstr "cs_manage_matches ���ش���"
-
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: ��ȡ cscope ���� %d ����"
-
-msgid "couldn't malloc\n"
-msgstr "����ʹ�� malloc\n"
+msgid "E570: fatal error in cs_manage_matches"
+msgstr "E570: cs_manage_matches ���ش���"
 
 #, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope ��ǩ(tag): %s\n"
+msgid "Cscope tag: %s"
+msgstr "Cscope tag: %s"
 
-msgid "   #   line"
-msgstr "   #   ��  "
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   ��  "
 
 msgid "filename / context / line\n"
-msgstr "�ļ���     / ������    / �к�\n"
+msgstr "�ļ��� / ������ / ��\n"
+
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Cscope ����: %s"
 
 msgid "All cscope databases reset"
-msgstr "�������� cscope ���ݿ�"
+msgstr "���� cscope ���ݿ��ѱ�����"
 
 msgid "no cscope connections\n"
 msgstr "û�� cscope ����\n"
 
 msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ���ݿ�����                          prepend path\n"
+msgstr " # pid    ���ݿ���                            prepend path\n"
 
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <��>\n"
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr "???: ��Ǹ����������ã��޷����� MzScheme ��"
+
+msgid "invalid expression"
+msgstr "��Ч�ı���ʽ"
+
+msgid "expressions disabled at compile time"
+msgstr "����ʱû�����ñ���ʽ"
+
+msgid "hidden option"
+msgstr "���ص�ѡ��"
+
+msgid "unknown option"
+msgstr "δ֪��ѡ��"
+
+msgid "window index is out of range"
+msgstr "��������������Χ"
+
+msgid "couldn't open buffer"
+msgstr "�޷��򿪻�����"
+
+msgid "cannot save undo information"
+msgstr "�޷����泷����Ϣ"
+
+msgid "cannot delete line"
+msgstr "�޷�ɾ����"
+
+msgid "cannot replace line"
+msgstr "�޷��滻��"
+
+msgid "cannot insert line"
+msgstr "�޷�������"
+
+msgid "string cannot contain newlines"
+msgstr "�ַ������ܰ�������(NL)"
+
+msgid "Vim error: ~a"
+msgstr "Vim ����: ~a"
+
+msgid "Vim error"
+msgstr "Vim ����"
+
+msgid "buffer is invalid"
+msgstr "��������Ч"
+
+msgid "window is invalid"
+msgstr "������Ч"
+
+msgid "linenr out of range"
+msgstr "�кų�����Χ"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "�������� sandbox ��ʹ��"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
-msgstr "E263: ��Ǹ����������ʹ�ã�Python �����û�м��ء�"
+msgstr "E263: ��Ǹ����������ã��޷����� Python �⡣"
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: ���ܵݹ���� Python"
 
 msgid "can't delete OutputObject attributes"
 msgstr "����ɾ�� OutputObject ����"
 
 msgid "softspace must be an integer"
-msgstr "softspace ����������"
+msgstr "softspace ����������"
 
 msgid "invalid attribute"
-msgstr "����ȷ������"
+msgstr "��Ч������"
 
 msgid "writelines() requires list of strings"
-msgstr "writelines() ��Ҫ string list ������"
+msgstr "writelines() ��Ҫ�ַ����б�������"
 
 msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: ���ܳ�ʼ�� I/O ����"
-
-msgid "invalid expression"
-msgstr "����ȷ�ı���ʽ"
-
-msgid "expressions disabled at compile time"
-msgstr "��Ϊ����ʱû�м������ʽ(expression)�ĳ�����룬���Բ���ʹ�ñ���ʽ"
+msgstr "E264: Python: ��ʼ�� I/O �������"
 
 msgid "attempt to refer to deleted buffer"
-msgstr "��ͼʹ���ѱ�ɾ���Ļ�����"
+msgstr "��ͼ�����ѱ�ɾ���Ļ�����"
 
 msgid "line number out of range"
 msgstr "�кų�����Χ"
 
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
-msgstr "<buffer ���� (��ɾ��): %8lX>"
+msgstr "<����������(��ɾ��): %8lX>"
 
 msgid "invalid mark name"
-msgstr "������Ʋ���ȷ"
+msgstr "��Ч�ı������"
 
 msgid "no such buffer"
 msgstr "�޴˻�����"
 
 msgid "attempt to refer to deleted window"
-msgstr "��ͼʹ���ѱ�ɾ���Ĵ���"
+msgstr "��ͼ�����ѱ�ɾ���Ĵ���"
 
 msgid "readonly attribute"
 msgstr "ֻ������"
 
 msgid "cursor position outside buffer"
-msgstr "��궨λ�ڻ�����֮��"
+msgstr "���λ���ڻ�������"
 
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
@@ -1847,24 +2475,9 @@ msgstr "<���� %d>"
 msgid "no such window"
 msgstr "�޴˴���"
 
-msgid "cannot save undo information"
-msgstr "���ܱ��渴ԭ��Ϣ"
-
-msgid "cannot delete line"
-msgstr "����ɾ������"
-
-msgid "cannot replace line"
-msgstr "�����滻����"
-
-msgid "cannot insert line"
-msgstr "���ܲ������"
-
-msgid "string cannot contain newlines"
-msgstr "�ַ������ܰ�������"
-
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr "E266: �������ʹ�ã��޷����� Ruby �����(Library)"
+msgstr "E266: ��Ǹ����������ã��޷����� Ruby ��"
 
 #, c-format
 msgid "E273: unknown longjmp status %d"
@@ -1958,33 +2571,30 @@ msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: д����󡣽�������"
 
 msgid "invalid buffer number"
-msgstr "����ȷ�Ļ�������"
+msgstr "��Ч�Ļ�������"
 
 msgid "not implemented yet"
 msgstr "��δʵ��"
 
-msgid "unknown option"
-msgstr "����ȷ��ѡ��"
-
 #. ???
 msgid "cannot set line(s)"
-msgstr "�����趨��"
+msgstr "�޷��趨��"
 
 msgid "mark not set"
 msgstr "û���趨���"
 
 #, c-format
 msgid "row %d column %d"
-msgstr "�� %d �� %d"
+msgstr "�� %d �� �� %d ��"
 
 msgid "cannot insert/append line"
-msgstr "���ܲ�������Ӵ���"
+msgstr "�޷�����/׷����"
 
 msgid "unknown flag: "
-msgstr "����ı�־: "
+msgstr "δ֪�ı�־: "
 
 msgid "unknown vimOption"
-msgstr "����ȷ�� VIM ѡ��"
+msgstr "δ֪�� vim ѡ��"
 
 msgid "keyboard interrupt"
 msgstr "�����ж�"
@@ -1993,93 +2603,91 @@ msgid "vim error"
 msgstr "vim ����"
 
 msgid "cannot create buffer/window command: object is being deleted"
-msgstr "���ܴ���������/��������: ���󽫱�ɾ��"
+msgstr "�޷�����������/��������: ���󽫱�ɾ��"
 
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
-msgstr "����ע�� callback ����: ������/�����Ѿ���ɾ����"
+msgstr "�޷�ע��ص�����: ������/�����ѱ�ɾ��"
 
 #. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
-msgstr "E280: TCL ���ش���: reflist ���ɿ�!? �뱨��� to vim-dev@vim.org"
+msgstr "E280: TCL ���ش���: reflist �𻵣����뱨��� vim-dev@vim.org"
 
 msgid "cannot register callback command: buffer/window reference not found"
-msgstr "����ע�� callback ����: �Ҳ���������/����"
+msgstr "�޷�ע��ص�����: �Ҳ���������/��������"
 
-msgid "Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr "�������ʹ��, ��Ϊ�޷����� Tcl �����(Library)"
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr "E571: ��Ǹ����������ã��޷����� Tcl ��"
 
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr "E281: TCL ����: �˳�����ֵ��������!? �뱨��� to vim-dev@vim.org"
+msgstr "E281: TCL ����: �˳�����ֵ�������������뱨��� vim-dev@vim.org"
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: �˳�����ֵ %d"
 
 msgid "cannot get line"
-msgstr "����ȡ�ô���"
+msgstr "�޷���ȡ��"
 
 msgid "Unable to register a command server name"
-msgstr "����ע���������������"
-
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: û��ע��Ϊ \"%s\" �ķ�����"
+msgstr "�޷�ע�������������"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: �����ͳ����Ŀ�ĵس���"
+msgstr "E248:  �޷��������Ŀ�ĳ���"
 
 #, c-format
-msgid "Invalid server id used: %s"
-msgstr "����ȷ�ķ����� id : %s"
-
-msgid "E249: couldn't read VIM instance registry property"
-msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ʹ������Ч�ķ����� id: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM ��ע�������������ɾ����"
+msgstr "E251: VIM ʵ��ע������������ɾ����"
 
-msgid "Unknown option"
-msgstr "����ȷ��ѡ��"
+msgid "Unknown option argument"
+msgstr "δ֪��ѡ�����"
 
 msgid "Too many edit arguments"
-msgstr "̫��༭����"
+msgstr "�༭��������"
 
 msgid "Argument missing after"
-msgstr "ȱ�ٱ�Ҫ�Ĳ���:"
+msgstr "ȱ�ٱ�Ҫ�Ĳ���"
 
-msgid "Garbage after option"
-msgstr "���ܱ��ϴ�ѡ��������: "
+msgid "Garbage after option argument"
+msgstr "ѡ��������������Ч"
 
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "̫�� \"+command\" �� \"-c command\" ����"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "\"+command\"��\"-c command\" �� \"--cmd command\" ��������"
 
 msgid "Invalid argument for"
-msgstr "����ȷ�Ĳ���: "
+msgstr "��Ч�Ĳ���"
+
+#, c-format
+msgid "%d files to edit\n"
+msgstr "���� %d ���ļ��ȴ��༭\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "���� Vim ����ʱû�м��� diff ������"
+msgstr "�� Vim ����ʱû�м��� diff ����"
 
 msgid "Attempt to open script file again: \""
-msgstr "��ͼ�ٴδ� script �ļ�: \""
-
-msgid "\"\n"
-msgstr "\"\n"
+msgstr "��ͼ�ٴδ򿪽ű��ļ�: \""
 
 msgid "Cannot open for reading: \""
-msgstr "����Ϊ������: \""
+msgstr "�޷��򿪲���ȡ: \""
 
 msgid "Cannot open for script output: \""
-msgstr "����Ϊ script �������: \""
+msgstr "�޷��򿪲�����ű�: \""
 
-#, c-format
-msgid "%d files to edit\n"
-msgstr "���� %d ���ļ��ȴ��༭\n"
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ����: �޷��� NetBeans ������ gvim\n"
 
 msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ע��: ��������ն�(��Ļ)\n"
+msgstr "Vim: ����: ������ǵ��ն�(��Ļ)\n"
 
 msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ע��: ���벻���ն�(����)\n"
+msgstr "Vim: ����: ���벻�������ն�(����)\n"
 
 #. just in case..
 msgid "pre-vimrc command line"
@@ -2087,14 +2695,14 @@ msgstr "pre-vimrc ������"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: ���ܶ�ȡ�ļ� \"%s\""
+msgstr "E282: �޷���ȡ \"%s\""
 
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"��ѯ������Ϣ��ִ��: \"vim -h\"\n"
+"������Ϣ���: \"vim -h\"\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�ļ� ..]       �༭ָ�����ļ�"
@@ -2103,10 +2711,10 @@ msgid "-               read text from stdin"
 msgstr "-               �ӱ�׼����(stdin)��ȡ�ı�"
 
 msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �༭ʱʹ��ָ���� tag"
+msgstr "-t tag          �༭ tag ���崦���ļ�"
 
 msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �༭ʱ���ص�һ������"
+msgstr "-q [errorfile]  �༭��һ�����������ļ�"
 
 msgid ""
 "\n"
@@ -2115,17 +2723,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �÷�:"
+"�÷�:"
 
 msgid " vim [arguments] "
-msgstr "vim [����] "
+msgstr " vim [����] "
 
 msgid ""
 "\n"
 "   or:"
 msgstr ""
 "\n"
-"   ��:"
+"  ��:"
+
+#~ msgid "where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -2137,10 +2748,13 @@ msgstr ""
 "����:\n"
 
 msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tֻ������֮����ļ�"
+msgstr "--\t\t\t�����Ժ�ֻ���ļ���"
+
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\t����չͨ���"
 
 msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\tע�� gvim �� OLE"
+msgstr "-register\t\tע��� gvim �� OLE"
 
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
@@ -2148,8 +2762,8 @@ msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tʹ��ͼ�ν��� (ͬ \"gvim\")"
 
-msgid "-f\t\t\tForeground: Don't fork when starting GUI"
-msgstr "-f\t\t\tǰ��: ����ͼ�ν���ʱ�� fork"
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  ��  --nofork\tǰ̨: ����ͼ�ν���ʱ�� fork"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
@@ -2158,13 +2772,13 @@ msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t���� (batch) ģʽ (ֻ���� \"ex\" һ��ʹ��)"
+msgstr "-s\t\t\t����(������)ģʽ (ֻ���� \"ex\" һ��ʹ��)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\", ��Ѹ�ٱȽ����ļ���ͬ��)"
+msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t����ģʽ (ͬ \"evim\", modeless)"
+msgstr "-y\t\t\t����ģʽ (ͬ \"evim\"����ģʽ)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tֻ��ģʽ (ͬ \"view\")"
@@ -2173,7 +2787,7 @@ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t����ģʽ (ͬ \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t�����޸� (д���ļ�)"
+msgstr "-m\t\t\t�����޸�(д���ļ�)"
 
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�ı������޸�"
@@ -2185,10 +2799,10 @@ msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp ģʽ"
 
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' ��ͳ Vi ����ģʽ"
+msgstr "-C\t\t\t���ݴ�ͳ�� Vi: 'compatible'"
 
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' ����ȫ�봫ͳ Vi ���ݣ���ʹ�� Vim ��ǿ����"
+msgstr "-N\t\t\t����ȫ���ݴ�ͳ�� Vi: 'nocompatible'"
 
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose �ȼ�"
@@ -2197,163 +2811,183 @@ msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t����ģʽ"
 
 msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t��ʹ�ý����ļ�, ֻʹ���ڴ�"
+msgstr "-n\t\t\t��ʹ�ý����ļ���ֻʹ���ڴ�"
 
 msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�г������ļ����˳�"
+msgstr "-r\t\t\t�г������ļ����˳�"
 
 msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (���ļ���)       \t�ָ��ϴα���������(Recover crashed session)"
+msgstr "-r (���ļ���)\t\t�ָ������ĻỰ"
 
 msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t�� -r һ��"
+msgstr "-L\t\t\tͬ -r"
 
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t��ʹ�� newcli ���򿪴���"
 
 msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <device>\t\tʹ�� <device> ����������豸"
+msgstr "-dev <device>\t\tʹ�� <device> �����������"
+
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t�� Arabic ģʽ����"
 
-msgid "-H\t\t\tstart in Hebrew mode"
-msgstr "-H\t\t\t����Ϊ ϣ����ģʽ"
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\t�� Hebrew ģʽ����"
 
-msgid "-F\t\t\tstart in Farsi mode"
-msgstr "-F\t\t\t����Ϊ Farsi ģʽ"
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\t�� Farsi ģʽ����"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�趨�ն�Ϊ <terminal>"
+msgstr "-T <terminal>\t�趨�ն�����Ϊ <terminal>"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹ�� <vimrc> �滻�κ� .vimrc"
+msgstr "-u <vimrc>\t\tʹ�� <vimrc> ����κ� .vimrc"
 
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> �滻�κ� .gvimrc"
+msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> ����κ� .gvimrc"
 
 msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�������κ� plugin"
+msgstr "--noplugin\t\t������ plugin �ű�"
+
+msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
+msgstr "-P[N]\t\t�� N ����ǩҳ (Ĭ��ֵ: ÿ���ļ�һ��)"
 
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t�� N ������ (Ԥ����ÿ���ļ�һ��)"
+msgstr "-o[N]\t\t�� N ������ (Ĭ��ֵ: ÿ���ļ�һ��)"
 
-msgid "-O[N]\t\tlike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o ��ʹ�ô�ֱ�ָ�"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tͬ -o ����ֱ�ָ�"
 
 msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�����������ļ���β"
+msgstr "+\t\t\t�����������ļ�ĩβ"
 
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t������������ <lnum> ��"
 
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t�����κ� vimrc ǰִ�� <command>"
+msgstr "--cmd <command>\t�����κ� vimrc �ļ�ǰִ�� <command>"
 
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t���ص�һ���ļ���ִ�� <command>"
 
 msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t���ص�һ���ļ������� Session �ļ�<session>"
+msgstr "-S <session>\t\t���ص�һ���ļ���ִ���ļ� <session>"
 
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t�� <scriptin> ����һ��ģʽ����"
+msgstr "-s <scriptin>\t���ļ� <scriptin> ��������ģʽ������"
 
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���ļ� <scriptout> ����(append)�������������"
+msgstr "-w <scriptout>\t���������������׷�ӵ��ļ� <scriptout>"
 
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���ļ� <scriptout> д���������������"
+msgstr "-W <scriptout>\t���������������д�뵽�ļ� <scriptout>"
 
 msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\t�༭��������ļ�"
+msgstr "-x\t\t\t�༭���ܵ��ļ�"
 
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\t�� vim ��ָ���� X-server ����"
 
 msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\t��Ҫ���ӵ� X Server"
+msgstr "-X\t\t\t�����ӵ� X Server"
 
-msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\t����һ�� GTK ����ڴ� Vim"
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t���п��ܣ��� Vim �������ϱ༭�ļ� <files>"
 
-msgid "--remote <files>\tEdit <files> in a Vim server and exit"
-msgstr "--remote <files>\t�༭ Vim �������ϵ��ļ����˳�"
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
-msgstr "--remote-wait <files> ��Ч�� --remote, ����Ⱥ��ļ���ɱ༭"
+msgstr "--remote-wait <files>  ͬ --remote ����ȴ��ļ���ɱ༭"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-wait-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
+
+msgid "--remote-tab <files>  As --remote but open tab page for each file"
+msgstr "--remote-tab <files>  ͬ --remote ����ÿ���ļ���һ����ǩҳ"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\t�ͳ� <keys> �� Vim ���������˳�"
 
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <expr>\t�ڷ������������ʽ��ֵ����ӡ���"
+msgstr "--remote-expr <expr>\t�� Vim ���������� <expr> ��ֵ����ӡ���"
 
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\t�г����õ� Vim ���������Ʋ��˳�"
 
 msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr "--servername <name>\t����/��Ϊ Vim ������ <name>"
+msgstr "--servername <name>\t���͵����Ϊ Vim ������ <name>"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹ�� <viminfo> ���� .viminfo"
+msgstr "-i <viminfo>\t\tʹ�� <viminfo> ȡ�� .viminfo"
 
-msgid "-h\t\t\tprint Help (this message) and exit"
-msgstr "-h\t\t\t��ӡ˵��(Ҳ���Ǳ���Ϣ)���˳�"
+msgid "-h  or  --help\tPrint Help (this message) and exit"
+msgstr "-h  ��  --help\t��ӡ����(����Ϣ)���˳�"
 
-msgid "--version\t\tprint version information and exit"
-msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (Motif ��):\n"
+"gvim (Motif �汾) ��ʶ��Ĳ���:\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim (neXtaw �汾) ��ʶ��Ĳ���:\n"
 
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (Athena ��):\n"
+"gvim (Athena �汾) ��ʶ��Ĳ���:\n"
 
 msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <display>\t�ڴ��� <display> ִ�� vim"
+msgstr "-display <display>\t�� <display> ������ vim"
 
 msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\t��������С��(iconified)"
+msgstr "-iconic\t\t��������С��"
 
 msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��������Ϊ <name>"
+msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��Ϊ <name>"
 
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (��δʵ��)\n"
 
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr "-background <color>\t�趨 <color> Ϊ����ɫ (Ҳ���� -bg)"
+msgstr "-background <color>\tʹ�� <color> ��Ϊ����ɫ (Ҳ���� -bg)"
 
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr "-foreground <color>\t�趨 <color> Ϊһ��������ɫ (Ҳ���� -fg)"
+msgstr "-foreground <color>\tʹ�� <color> ��Ϊһ��������ɫ (Ҳ���� -fg)"
 
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <font>\tʹ�� <font> Ϊһ������ (Ҳ���� -fn)"
+msgstr "-font <font>\tʹ�� <font> ��Ϊһ������ (Ҳ���� -fn)"
 
 msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <font>\tʹ�� <font> Ϊ��������"
+msgstr "-boldfont <font>\tʹ�� <font> ��Ϊ��������"
 
 msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <font>\tʹ�� <font> Ϊб������"
+msgstr "-italicfont <font>\tʹ�� <font> ��Ϊб������"
 
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr "-geometry <geom>\tʹ��<geom>Ϊ��ʼλ�� (Ҳ���� -geom)"
+msgstr "-geometry <geom>\tʹ�� <geom> ��Ϊ��ʼλ�� (Ҳ���� -geom)"
 
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <width>\tʹ�ÿ���Ϊ <width> �ı߿� (Ҳ���� -bw)"
+msgstr "-borderwidth <width>\t�趨�߿����Ϊ <width> (Ҳ���� -bw)"
 
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr "-scrollbarwidth <width> �趨����������Ϊ <width> (Ҳ���� -sw)"
 
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <height>\t�趨�˵��еĸ߶�Ϊ <height> (Ҳ���� -mh)"
+msgstr "-menuheight <height>\t�趨�˵����߶�Ϊ <height> (Ҳ���� -mh)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tʹ�÷��� (Ҳ���� -rv)"
@@ -2369,7 +3003,7 @@ msgid ""
 "Arguments recognised by gvim (RISC OS version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (RISC OS ��):\n"
+"gvim (RISC OS �汾) ��ʶ��Ĳ���:\n"
 
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t���ڳ�ʼ����"
@@ -2382,43 +3016,48 @@ msgid ""
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
-"gvim ��ʶ��Ĳ��� (GTK+ ��):\n"
+"gvim (GTK+ �汾) ��ʶ��Ĳ���:\n"
 
 msgid "-display <display>\tRun vim on <display> (also: --display)"
-msgstr "-display <display>\t�� <display> ִ�� vim (Ҳ���� --display)"
+msgstr "-display <display>\t�� <display> ������ vim (Ҳ���� --display)"
 
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t��ʾ Gnome ��ز���"
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t����һ�� GTK �����д� Vim"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t�ڸ�Ӧ�ó����д� Vim"
+
+#~ msgid "No display"
+#~ msgstr ""
 
 #. Failed to send, abort.
-msgid ""
-"\n"
-"Send failed.\n"
-msgstr ""
-"\n"
-"���ͱ���ʽʧ�ܡ�\n"
+msgid ": Send failed.\n"
+msgstr ": ����ʧ�ܡ�\n"
 
 #. Let vim start normally.
-msgid ""
-"\n"
-"Send failed. Trying to execute locally\n"
-msgstr ""
-"\n"
-"�ͳ�ʧ�ܡ���ͼ�ڱ���ִ��\n"
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": ����ʧ�ܡ����Ա���ִ��\n"
 
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d �� %d �ѱ༭"
 
-msgid "Send expression failed.\n"
-msgstr "���ͱ���ʽʧ�ܡ�\n"
+#, fuzzy
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "���ͱ���ʽʧ�ܡ�\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ���ͱ���ʽʧ�ܡ�\n"
 
 msgid "No marks set"
-msgstr "û���趨��� (mark)"
+msgstr "û���趨���"
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: �Ҳ������� \"%s\" �ı��(mark)"
+msgstr "E283: û��ƥ�� \"%s\" �ı��"
 
 #. Highlight title
 msgid ""
@@ -2426,7 +3065,7 @@ msgid ""
 "mark line  col file/text"
 msgstr ""
 "\n"
-"��� �к�  ��  �ļ�/�ı�"
+"���   ��   �� �ļ�/�ı�"
 
 #. Highlight title
 msgid ""
@@ -2434,8 +3073,17 @@ msgid ""
 " jump line  col file/text"
 msgstr ""
 "\n"
-" ���� �к�  ��  �ļ�/�ı�"
+" ��ת   ��   �� �ļ�/�ı�"
+
+#. Highlight title
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"  �ı�   ��   �� �ı�"
 
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -2444,117 +3092,119 @@ msgstr ""
 "# �ļ����:\n"
 
 #. Write the jumplist with -'
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
 msgstr ""
 "\n"
-"# Jumplist (���µ���):\n"
+"# ��ת�б� (���µ���):\n"
 
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
 msgstr ""
 "\n"
-"# �ļ�����ʷ��¼ (���µ���):\n"
+"# �ļ��ڵı����ʷ��¼ (���µ���):\n"
 
 msgid "Missing '>'"
-msgstr "ȱ�ٶ�Ӧ�� '>'"
+msgstr "ȱ�� '>'"
 
-msgid "Not a valid codepage"
-msgstr "����ȷ�Ĵ���ҳ"
+msgid "E543: Not a valid codepage"
+msgstr "E543: ��Ч�Ĵ���ҳ"
 
 msgid "E284: Cannot set IC values"
-msgstr "E284: �����趨 IC ��ֵ"
+msgstr "E284: �����趨 IC ֵ"
 
 msgid "E285: Failed to create input context"
-msgstr "E285: ���ܴ�������������"
+msgstr "E285: �޷���������������"
 
 msgid "E286: Failed to open input method"
-msgstr "E286: ���ܴ����뷨"
+msgstr "E286: �޷������뷨"
 
 msgid "E287: Warning: Could not set destroy callback to IM"
-msgstr "E287: ����: �����Ƴ� IM �� callback"
+msgstr "E287: ����: �޷��趨���뷨���ͷŻص�����"
 
 msgid "E288: input method doesn't support any style"
-msgstr "E288: ���뷨��֧���κ� style"
+msgstr "E288: ���뷨��֧���κη��"
 
 msgid "E289: input method doesn't support my preedit type"
-msgstr "E289: ���뷨��֧���κ� style"
+msgstr "E289: ���뷨��֧���ҵ�Ԥ�༭����"
 
 msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: over-the-spot ��Ҫ���弯(Fontset)"
+msgstr "E290: over-the-spot �����Ҫ Fontset"
 
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-msgstr "E291: ��� GTK+ �� 1.2.3 �ϡ�����ʹ��״̬����"
+msgstr "E291: ��� GTK+ �� 1.2.3 �ɡ�״̬�������á�"
 
 msgid "E292: Input Method Server is not running"
-msgstr "E292: ���뷨��������(Input Method Server)δ����"
+msgstr "E292: ���뷨������δ����"
 
 msgid "E293: block was not locked"
 msgstr "E293: ��δ������"
 
 msgid "E294: Seek error in swap file read"
-msgstr "E294: �����ļ���ȡ����"
+msgstr "E294: �����ļ���ȡ��λ����"
 
 msgid "E295: Read error in swap file"
 msgstr "E295: �����ļ���ȡ����"
 
 msgid "E296: Seek error in swap file write"
-msgstr "E296: �����ļ�д�����"
+msgstr "E296: �����ļ�д�붨λ����"
 
 msgid "E297: Write error in swap file"
 msgstr "E297: �����ļ�д�����"
 
 msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �����ļ��Ѿ�����! (С�ķ�������İ�ȫ©��!?)"
+msgstr "E300: �����ļ��Ѵ��� (�������ӹ�����)"
 
 msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �Ҳ����� 0?"
+msgstr "E298: �Ҳ����� 0��"
 
 msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �Ҳ����� 1?"
+msgstr "E298: �Ҳ����� 1��"
 
 msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �Ҳ����� 2?"
+msgstr "E298: �Ҳ����� 2��"
 
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ����, �����ļ�������!!!"
+msgstr "E301: �ޣ������ļ������ˣ�����"
 
 msgid "E302: Could not rename swap file"
-msgstr "E302: ���ܸı佻���ļ�������"
+msgstr "E302: �޷������������ļ�"
 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: ���ܴ򿪽����ļ� \"%s\", �����ָܻ���"
+msgstr "E303: �޷��� \"%s\" �Ľ����ļ����ָ���������"
 
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: �Ҳ����� 0??"
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): �Ҳ����� 0��"
 
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: �Ҳ��� %s �Ľ����ļ�"
 
 msgid "Enter number of swap file to use (0 to quit): "
-msgstr "��ѡ����Ҫʹ�õĽ����ļ� (��0 �˳�): "
+msgstr "������Ҫʹ�õĽ����ļ���� (0 �˳�): "
 
 #, c-format
 msgid "E306: Cannot open %s"
-msgstr "E306: ���ܴ� %s"
+msgstr "E306: �޷��� %s"
 
 msgid "Unable to read block 0 from "
-msgstr "���ܶ�ȡ�� 0:"
+msgstr "�޷���ȡ�� 0: "
 
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"������û�����κ��޸Ļ��� Vim �����������½����ļ�."
+"������û�����κ��޸Ļ��� Vim �����������½����ļ���"
 
 msgid " cannot be used with this version of Vim.\n"
-msgstr " �����ڱ��汾�� Vim ��ʹ��.\n"
+msgstr " �����ڸð汾�� Vim ��ʹ�á�\n"
 
 msgid "Use Vim version 3.0.\n"
 msgstr "ʹ�� Vim 3.0��\n"
@@ -2564,17 +3214,17 @@ msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ������������ Vim �����ļ�"
 
 msgid " cannot be used on this computer.\n"
-msgstr " ��������̨������ʹ��.\n"
+msgstr " ��������̨������ʹ�á�\n"
 
 msgid "The file was created on "
-msgstr "���ļ������� "
+msgstr "���ļ������� "
 
 msgid ""
 ",\n"
 "or the file has been damaged."
 msgstr ""
-",\n"
-"�������ļ��ѱ��ƻ���"
+"��\n"
+"���Ǵ��ļ����𻵡�"
 
 #, c-format
 msgid "Using swap file \"%s\""
@@ -2582,82 +3232,101 @@ msgstr "ʹ�ý����ļ� \"%s\""
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "ԭ�ļ� \"%s\""
+msgstr "ԭʼ�ļ� \"%s\""
 
 msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ����: ԭʼ�ļ������Ѿ��޸Ĺ���"
+msgstr "E308: ����: ԭʼ�ļ������ѱ��޸�"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: ���ܴ� %s ��ȡ�� 1"
+msgstr "E309: �޷��� %s ��ȡ�� 1"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???MANY LINES MISSING"
-msgstr "???ȱ��̫����"
+msgstr "???ȱ����̫����"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINE COUNT WRONG"
-msgstr "???�кŴ���"
+msgstr "???��������"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???EMPTY BLOCK"
-msgstr "???�յ� ��"
+msgstr "???�յĿ�"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???LINES MISSING"
-msgstr "???�Ҳ���һЩ��"
+msgstr "???ȱ����һЩ��"
 
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ�?)"
+msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ���)"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???BLOCK MISSING"
-msgstr "???�Ҳ�����"
+msgstr "???ȱ�ٿ�"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �����ﵽ ???END �����ݿ���������"
+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 �����ݿ��ܱ�ɾ��/�����"
+msgstr "??? �����ﵽ ???END ���п����ѱ�����/ɾ����"
 
+#, fuzzy
+# do not translate to avoid writing Chinese in files
 msgid "???END"
 msgstr "???END"
 
 msgid "E311: Recovery Interrupted"
-msgstr "E311: �ָ����ж�"
+msgstr "E311: �ָ��ѱ��ж�"
 
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: �ָ�ʱ��������; ��ע�⿪ͷΪ ??? ����"
+msgstr "E312: �ָ�ʱ����������ע�⿪ͷΪ ??? ����"
+
+msgid "See \":help E312\" for more information."
+msgstr "������Ϣ��� \":help E312\""
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "�ָ����. ��ȷ��һ������."
+msgstr "�ָ���ϡ���ȷ��һ��������"
 
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
 msgstr ""
 "\n"
-"(�������Ҫ������ļ�����Ϊ����ļ�����\n"
+"(�������Ҫ������ļ�����Ϊ����ļ���\n"
 
 msgid "and run diff with the original file to check for changes)\n"
-msgstr "��ִ�� diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
+msgstr "������ diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
 
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
 msgstr ""
-"(D)ֱ��ɾ�� .swp �����ļ�\n"
+"Ȼ��� .swp �ļ�ɾ����\n"
 "\n"
 
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
-msgstr "�ҵ����µĽ����ļ�:"
+msgstr "�ҵ������ļ�:"
 
 msgid "   In current directory:\n"
-msgstr "   ��ĿǰĿ¼:\n"
+msgstr "   λ�ڵ�ǰĿ¼:\n"
 
 msgid "   Using specified name:\n"
-msgstr "   Using specified name:\n"
+msgstr "   ʹ��ָ��������:\n"
 
 msgid "   In directory "
-msgstr "   ��Ŀ¼ "
+msgstr "   λ��Ŀ¼ "
 
 msgid "      -- none --\n"
 msgstr "      -- �� --\n"
@@ -2672,13 +3341,13 @@ msgid "             dated: "
 msgstr "              ����: "
 
 msgid "         [from Vim version 3.0]"
-msgstr "              [�� Vim �汾 3.0]"
+msgstr "         [���� Vim �汾 3.0]"
 
 msgid "         [does not look like a Vim swap file]"
-msgstr "                          [���� Vim �Ľ����ļ�]"
+msgstr "         [������ Vim �����ļ�]"
 
 msgid "         file name: "
-msgstr "              �ļ���: "
+msgstr "            �ļ���: "
 
 msgid ""
 "\n"
@@ -2718,14 +3387,14 @@ msgstr ""
 "           ���� ID: "
 
 msgid " (still running)"
-msgstr " (����ִ��)"
+msgstr " (��������)"
 
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
 msgstr ""
 "\n"
-"         [�����ڱ��汾�� Vim ��ʹ��]"
+"         [�����ڸð汾�� Vim ��ʹ��]"
 
 msgid ""
 "\n"
@@ -2735,13 +3404,13 @@ msgstr ""
 "         [�����ڱ�����ʹ��]"
 
 msgid "         [cannot be read]"
-msgstr "         [���ܶ�ȡ]"
+msgstr "         [�޷���ȡ]"
 
 msgid "         [cannot be opened]"
-msgstr "         [���ܴ�]"
+msgstr "         [�޷���]"
 
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ���ܱ���, ��ʹ�ý����ļ�"
+msgstr "E313: �޷�������û�н����ļ�"
 
 msgid "File preserved"
 msgstr "�ļ��ѱ���"
@@ -2751,7 +3420,7 @@ msgstr "E314: ����ʧ��"
 
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ����� lnum: %ld"
+msgstr "E315: ml_get: ��Ч�� lnum: %ld"
 
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
@@ -2764,13 +3433,13 @@ msgid "stack_idx should be 0"
 msgstr "stack_idx Ӧ���� 0"
 
 msgid "E318: Updated too many blocks?"
-msgstr "E318: ����̫���?"
+msgstr "E318: ������̫��Ŀ飿"
 
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ָ��� id ���� 4"
 
 msgid "deleted block 1?"
-msgstr "ɾ���� 1?"
+msgstr "ɾ���˿� 1��"
 
 #, c-format
 msgid "E320: Cannot find line %ld"
@@ -2784,7 +3453,7 @@ msgstr "pe_line_count Ϊ��"
 
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: �кų�����Χ: %ld ������β"
+msgstr "E322: �кų�����Χ: %ld ������β"
 
 #, c-format
 msgid "E323: line count wrong in block %ld"
@@ -2794,7 +3463,11 @@ msgid "Stack size increases"
 msgstr "��ջ��С����"
 
 msgid "E317: pointer block id wrong 2"
-msgstr "E317: ָ��� id �� 2"
+msgstr "E317: ָ��� id ���� 2"
+
+#, c-format
+msgid "E773: Symlink loop for \"%s\""
+msgstr "E773: \"%s\" �������ӳ���ѭ��"
 
 msgid "E325: ATTENTION"
 msgstr "E325: ע��"
@@ -2807,10 +3480,10 @@ msgstr ""
 "���ֽ����ļ� \""
 
 msgid "While opening file \""
-msgstr "�����ļ�ʱ \""
+msgstr "���ڴ��ļ� \""
 
 msgid "      NEWER than swap file!\n"
-msgstr "      �Ƚ����ļ���!\n"
+msgstr "      �Ƚ����ļ��£�\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
@@ -2821,95 +3494,101 @@ msgid ""
 "    different instances of the same file when making changes.\n"
 msgstr ""
 "\n"
-"(1) ��������һ������Ҳ�ڱ༭ͬһ���ļ�.\n"
-"    �������������ע�ⲻҪһ��д�룬��Ȼ���Ŭ�����Ḷ�����\n"
+"(1) ��һ���������Ҳ�ڱ༭ͬһ���ļ���\n"
+"    ������������޸�ʱ��ע�����ͬһ���ļ�����������ͬ�İ汾��\n"
+"\n"
 
 msgid "    Quit, or continue with caution.\n"
-msgstr "    �˳������Ǽ����༭��\n"
+msgstr "    �˳�����С�ĵؼ�����\n"
 
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
 msgstr ""
 "\n"
-"(2) ��һ�α༭���ļ�ʱ����\n"
+"(2) �ϴα༭���ļ�ʱ������\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���������, ���� \":recover\" �� \"vim -r"
+msgstr "    ��������������� \":recover\" �� \"vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    �ָ��޸����� (��һ��˵���뿴 \":help recovery\").\n"
+"    �ָ��޸ĵ����� (��� \":help recovery\")��\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    ����ûָ��Ķ��Ѿ��ָ���, ��ֱ��ɾ���˽����ļ� \""
+msgstr "    ������Ѿ������˻ָ�����ɾ�������ļ� \""
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
 "\"\n"
-"    �Ա����ٿ�������Ϣ.\n"
+"    �Ա����ٿ�������Ϣ��\n"
 
 msgid "Swap file \""
 msgstr "�����ļ� \""
 
 msgid "\" already exists!"
-msgstr "\" �Ѿ�������!"
+msgstr "\" �Ѵ��ڣ�"
 
 msgid "VIM - ATTENTION"
 msgstr "VIM - ע��"
 
 msgid "Swap file already exists!"
-msgstr "�����ļ��Ѿ�����!"
+msgstr "�����ļ��Ѵ��ڣ�"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
 msgstr ""
 "��ֻ����ʽ��(&O)\n"
 "ֱ�ӱ༭(&E)\n"
 "�ָ�(&R)\n"
-"�˳�(&Q)"
+"�˳�(&Q)\n"
+"��ֹ(&A)"
 
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
+"&Delete it\n"
 "&Quit\n"
-"&Delete it"
+"&Abort"
 msgstr ""
 "��ֻ����ʽ��(&O)\n"
 "ֱ�ӱ༭(&E)\n"
 "�ָ�(&R)\n"
+"ɾ�������ļ�(&D)\n"
 "�˳�(&Q)\n"
-"ɾ�������ļ�(&D)"
+"��ֹ(&A)"
 
 msgid "E326: Too many swap files found"
 msgstr "E326: �ҵ�̫�ཻ���ļ�"
 
 msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ���ݲ˵�����Ӳ˵�"
+msgstr "E327: �˵����ĳ����·�������Ӳ˵�"
 
 msgid "E328: Menu only exists in another mode"
-msgstr "E328: �˵�ֻ��������ģʽ��ʹ��"
+msgstr "E328: �˵�ֻ������ģʽ�д���"
 
-msgid "E329: No menu of that name"
-msgstr "E329: û�������Ĳ˵�"
+#, c-format
+msgid "E329: No menu \"%s\""
+msgstr "E329: û�в˵� \"%s\""
 
 msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: �˵�����ָ����ѡ��"
+msgstr "E330: �˵�·������ָ���Ӳ˵�"
 
 msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ����ֱ�ӰѲ˵���ӵ��˵�����"
+msgstr "E331: ���ܰѲ˵���ֱ�Ӽӵ��˵�����"
 
 msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: �ָ��߲����ǲ˵���һ����"
+msgstr "E332: �ָ��߲����ǲ˵�·����һ����"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
@@ -2921,21 +3600,21 @@ msgstr ""
 "--- �˵� ---"
 
 msgid "Tear off this menu"
-msgstr "���´˲˵�"
+msgstr "˺�´˲˵�"
 
 msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �˵�����ָ��һ���˵���"
+msgstr "E333: �˵�·������ָ��˵���"
 
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: [�˵�] �Ҳ��� %s"
+msgstr "E334: �Ҳ����˵�: %s"
 
 #, c-format
 msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽδ����˵�"
+msgstr "E335: %s ģʽ�в˵�δ����"
 
 msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: �˵�����ָ���Ӳ˵�"
+msgstr "E336: �˵�·������ָ���Ӳ˵�"
 
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: �Ҳ����˵� - ����˵�����"
@@ -2946,31 +3625,30 @@ msgstr "���� %s ʱ��������:"
 
 #, c-format
 msgid "line %4ld:"
-msgstr "�� %4ld:"
+msgstr "�� %4ld ��:"
 
-msgid "[string too long]"
-msgstr "[�ַ���̫��]"
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ��Ч�ļĴ�����: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "����������Ϣά����: Wang Jun <junw@turbolinux.com.cn>"
+msgstr "����������Ϣά����: Yuheng Xie <elephant@linux.net.cn>"
 
 msgid "Interrupt: "
 msgstr "���ж�: "
 
-msgid "Hit ENTER to continue"
-msgstr "�밴 ENTER ����"
-
-msgid "Hit ENTER or type command to continue"
+msgid "Press ENTER or type command to continue"
 msgstr "�밴 ENTER �������������"
 
+#, c-format
+msgid "%s line %ld"
+msgstr "%s �� %ld ��"
+
 msgid "-- More --"
 msgstr "-- ���� --"
 
-msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
-
-msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
+msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
+msgstr " �ո�/d/j: ��Ļ/ҳ/�� �·���b/u/k: �Ϸ���q: �˳�"
 
 msgid "Question"
 msgstr "����"
@@ -2979,17 +3657,8 @@ msgid ""
 "&Yes\n"
 "&No"
 msgstr ""
-"&Y��\n"
-"&N��"
-
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y��\n"
-"&N��\n"
-"&Cȡ��"
+"��(&Y)\n"
+"��(&N)"
 
 msgid ""
 "&Yes\n"
@@ -2998,11 +3667,14 @@ msgid ""
 "&Discard All\n"
 "&Cancel"
 msgstr ""
-"&Y��\n"
-"&N��\n"
-"&Aȫ������\n"
-"&Dȫ������\n"
-"&Cȡ��"
+"��(&Y)\n"
+"��(&N)\n"
+"ȫ������(&A)\n"
+"ȫ������(&D)\n"
+"ȡ��(&C)"
+
+msgid "Select Directory dialog"
+msgstr "ѡ��Ŀ¼�Ի���"
 
 msgid "Save File dialog"
 msgstr "�����ļ��Ի���"
@@ -3012,35 +3684,51 @@ msgstr "���ļ��Ի���"
 
 #. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: ����̨(Console)ģʽʱû���ļ������(file browser)"
+msgstr "E338: ��Ǹ������̨ģʽ��û���ļ������"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf() �Ĳ�������"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf() �Ĳ�������"
 
 msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ע��: �������޸�һ��ֻ���ļ�"
+msgstr "W10: ����: �����޸�һ��ֻ���ļ�"
+
+msgid "Type number or click with mouse (<Enter> cancels): "
+msgstr "���������ֻ������ (<Enter> ȡ��): "
+
+msgid "Choice number (<Enter> cancels): "
+msgstr "��ѡ������ (<Enter> ȡ��): "
 
 msgid "1 more line"
-msgstr "����һ��"
+msgstr "���� 1 ��"
 
 msgid "1 line less"
-msgstr "����һ��"
+msgstr "���� 1 ��"
 
 #, c-format
 msgid "%ld more lines"
-msgstr " ���� %ld ��"
+msgstr "���� %ld ��"
 
 #, c-format
 msgid "%ld fewer lines"
-msgstr "ֻʣ %ld ��"
+msgstr "���� %ld ��"
 
 msgid " (Interrupted)"
 msgstr " (���ж�)"
 
+msgid "Beep!"
+msgstr "Beep!"
+
 msgid "Vim: preserving files...\n"
-msgstr "Vim: �����ļ���...\n"
+msgstr "Vim: ���ڱ����ļ�����\n"
 
 #. close all memfiles, without deleting
 msgid "Vim: Finished.\n"
-msgstr "Vim: ����.\n"
+msgstr "Vim: ������\n"
 
+#, c-format
 msgid "ERROR: "
 msgstr "����: "
 
@@ -3050,14 +3738,14 @@ msgid ""
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
 msgstr ""
 "\n"
-"[bytes] ȫ�� alloc-freed %lu-%lu, ʹ���� %lu, peak ʹ�� %lu\n"
+"[�ֽ�] �ܹ� alloc-free %lu-%lu��ʹ���� %lu���߷�ʹ�� %lu\n"
 
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
 "\n"
 msgstr ""
-"[����] ȫ�� re/malloc(): %lu, ȫ�� free()': %lu\n"
+"[����] �ܹ� re/malloc(): %lu���ܹ� free()': %lu\n"
 "\n"
 
 msgid "E340: Line is becoming too long"
@@ -3069,26 +3757,26 @@ msgstr "E341: �ڲ�����: lalloc(%ld, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
-msgstr "E342: �ڴ治��! (�������� %lu �ֽ���)"
+msgstr "E342: �ڴ治�㣡(���� %lu �ֽ�)"
 
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "���� shell ִ��: \"%s\""
 
-msgid "Missing colon"
-msgstr "ȱ��ð��"
+msgid "E545: Missing colon"
+msgstr "E545: ȱ��ð��"
 
-msgid "Illegal mode"
-msgstr "����ȷ��ģʽ"
+msgid "E546: Illegal mode"
+msgstr "E546: ��Ч��ģʽ"
 
-msgid "Illegal mouseshape"
-msgstr "����ȷ�������״"
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ��Ч�������״"
 
-msgid "digit expected"
-msgstr "Ӧ��Ϊ����"
+msgid "E548: digit expected"
+msgstr "E548: �˴���Ҫ����"
 
-msgid "Illegal percentage"
-msgstr "����ȷ�İٷֱ�"
+msgid "E549: Illegal percentage"
+msgstr "E549: ��Ч�İٷֱ�"
 
 msgid "Enter encryption key: "
 msgstr "��������: "
@@ -3097,17 +3785,17 @@ msgid "Enter same key again: "
 msgstr "��������һ��: "
 
 msgid "Keys don't match!"
-msgstr "�����������벻ͬ!"
+msgstr "�������벻ƥ�䣡"
 
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
-msgstr "E343: ����ȷ��·��: '**[number]' ����Ҫ��·����β��Ҫ���� '%s'"
+msgstr "E343: ��Ч��·��: '**[number]' ������·��ĩβ���ߺ���� '%s'��"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ��û��Ŀ¼ \"%s\""
+msgstr "E344: cdpath ���Ҳ���Ŀ¼ \"%s\""
 
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
@@ -3121,11 +3809,35 @@ msgstr "E346: ��·�����Ҳ���������ļ� \"%s\""
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: ��·�����Ҳ���������ļ� \"%s\""
 
-msgid "Illegal component"
-msgstr "����ȷ�����"
+#. Get here when the server can't be found.
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr ""
+
+#~ msgid "Cannot connect to Netbeans"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr ""
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr ""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: ������ %ld ��ʧ NetBeans ����"
+
+msgid "E505: "
+msgstr "E505: "
+
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' Ϊ��"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ��ֵ���ܲ�����"
 
 msgid "Warning: terminal cannot highlight"
-msgstr "ע��: ����ն˲�����ʾ������"
+msgstr "����: ����ն˲�����ʾ����"
 
 msgid "E348: No string under cursor"
 msgstr "E348: ��괦û���ַ���"
@@ -3134,56 +3846,78 @@ msgid "E349: No identifier under cursor"
 msgstr "E349: ��괦û��ʶ����"
 
 msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ������Ŀǰ�� 'foldmethod' ��ɾ�� fold"
+msgstr "E352: �����ڵ�ǰ�� 'foldmethod' ��ɾ�� fold"
+
+msgid "E664: changelist is empty"
+msgstr "E664: �ı��б�Ϊ��"
+
+msgid "E662: At start of changelist"
+msgstr "E662: ���ڸı��б��Ŀ�ʼ��"
+
+msgid "E663: At end of changelist"
+msgstr "E663: ���ڸı��б���ĩβ��"
+
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "����  :quit<Enter>  �˳� Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
-msgstr "һ�� %s �� һ��"
+msgstr "1 �� %s �� 1 ��"
 
 #, c-format
 msgid "1 line %sed %d times"
-msgstr "һ�� %s �� %d ��"
+msgstr "1 �� %s �� %d ��"
 
 #, c-format
 msgid "%ld lines %sed 1 time"
-msgstr "%ld �� %s �� һ��"
+msgstr "%ld �� %s �� 1 ��"
 
 #, c-format
 msgid "%ld lines %sed %d times"
-msgstr "%ld �� %s �� %d ��"
+msgstr "%ld �� %s �� %d ��"
 
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "ʶ�� %ld ��..."
+msgstr "���� %ld �С��� "
 
 msgid "1 line indented "
-msgstr "һ����ʶ��"
+msgstr "������ 1 �� "
 
 #, c-format
 msgid "%ld lines indented "
-msgstr "��ʶ�� %ld ��"
+msgstr "������ %ld �� "
+
+msgid "E748: No previously used register"
+msgstr "E748: û��ǰһ��ʹ�õļĴ���"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
-msgstr "���ܸ���; ֱ��ɾ��"
+msgstr "�޷����ƣ���Ϊɾ��"
 
 msgid "1 line changed"
-msgstr " 1 �� ~ed"
+msgstr "�ı��� 1 ��"
 
 #, c-format
 msgid "%ld lines changed"
-msgstr " %ld �� ~ed"
+msgstr "�ı��� %ld ��"
 
 #, c-format
 msgid "freeing %ld lines"
-msgstr "�ͷ� %ld ����"
+msgstr "�ͷ��� %ld ��"
+
+msgid "block of 1 line yanked"
+msgstr "������ 1 �еĿ�"
 
 msgid "1 line yanked"
-msgstr "�Ѹ��� 1 ��"
+msgstr "������ 1 ��"
+
+#, c-format
+msgid "block of %ld lines yanked"
+msgstr "������ %ld �еĿ�"
 
 #, c-format
 msgid "%ld lines yanked"
-msgstr "�Ѹ��� %ld ��"
+msgstr "������ %ld ��"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3198,8 +3932,9 @@ msgstr ""
 "--- �Ĵ��� ---"
 
 msgid "Illegal register name"
-msgstr "����ȷ�ļĴ�������"
+msgstr "��Ч�ļĴ�����"
 
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -3208,144 +3943,152 @@ msgstr ""
 "# �Ĵ���:\n"
 
 #, c-format
-msgid "Unknown register type %d"
-msgstr "δ֪��ע������: %d"
-
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �Ĵ������ƴ���: '%s'"
+msgid "E574: Unknown register type %d"
+msgstr "E574: δ֪�ļĴ������� %d"
 
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ��; "
 
-#, 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)"
+#, 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 "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"
+#, fuzzy, 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"
+
+#, 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"
+
+#, fuzzy, 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"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr ""
 
 msgid "Thanks for flying Vim"
 msgstr "��л��ѡ�� Vim"
 
-msgid "Option not supported"
-msgstr "��֧�ָ�ѡ��"
+msgid "E518: Unknown option"
+msgstr "E518: δ֪��ѡ��"
 
-msgid "Not allowed in a modeline"
-msgstr "������ģʽ�������"
+msgid "E519: Option not supported"
+msgstr "E519: ��֧�ָ�ѡ��"
 
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t��ǰ����: "
+msgid "E520: Not allowed in a modeline"
+msgstr "E520: �������� modeline ��ʹ��"
 
-msgid "Number required after ="
-msgstr "= ����Ҫ������"
+msgid "E521: Number required after ="
+msgstr "E521: = ������Ҫ����"
 
-msgid "Not found in termcap"
-msgstr "Termcap �����Ҳ���"
+msgid "E522: Not found in termcap"
+msgstr "E522: Termcap �����Ҳ���"
 
 #, c-format
-msgid "Illegal character <%s>"
-msgstr "����ȷ���ַ� <%s>"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: ��Ч���ַ� <%s>"
 
-msgid "Not allowed here"
-msgstr "���ﲻ��ʹ��"
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: �����趨 'term' Ϊ���ַ���"
 
-msgid "Cannot set 'term' to empty string"
-msgstr "�����趨 'term' Ϊ���ַ���"
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: ��ͼ�ν����в��ܸı��ն�"
 
-msgid "Cannot change term in GUI"
-msgstr "��ͼ�ͽ����в����л��ն�"
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: ���� \":gui\" ����ͼ�ν���"
 
-msgid "Use \":gui\" to start the GUI"
-msgstr "���� \":gui\" ������ͼ�ν���"
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' �� 'patchmode' ���"
 
-msgid "'backupext' and 'patchmode' are equal"
-msgstr "'backupext' �� 'patchmode' ��һ����"
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: �� GTK+ 2 ͼ�ν����в��ܸ���"
 
-msgid "Zero length string"
-msgstr "�㳤���ַ���"
+msgid "E524: Missing colon"
+msgstr "E524: ȱ��ð��"
+
+msgid "E525: Zero length string"
+msgstr "E525: �ַ�������Ϊ��"
 
 #, c-format
-msgid "Missing number after <%s>"
-msgstr "<%s> ��ȱ������"
+msgid "E526: Missing number after <%s>"
+msgstr "E526: <%s> ����ȱ������"
 
-msgid "Missing comma"
-msgstr "ȱ�ٶ���"
+msgid "E527: Missing comma"
+msgstr "E527: ȱ�ٶ���"
 
-msgid "Must specify a ' value"
-msgstr "����ָ��һ�� ' ֵ"
+msgid "E528: Must specify a ' value"
+msgstr "E528: ����ָ��һ�� ' ֵ"
 
-msgid "contains unprintable character"
-msgstr "����������ʾ���ַ�"
+msgid "E595: contains unprintable or wide character"
+msgstr "E595: ����������ʾ�ַ�����ַ�"
 
-msgid "Invalid font(s)"
-msgstr "����ȷ������"
+msgid "E596: Invalid font(s)"
+msgstr "E596: ��Ч������"
 
-msgid "can't select fontset"
-msgstr "����ʹ�����弯(Fontset)"
+msgid "E597: can't select fontset"
+msgstr "E597: �޷�ѡ�� Fontset"
 
-msgid "Invalid fontset"
-msgstr "����ȷ�����弯(Fontset)"
+msgid "E598: Invalid fontset"
+msgstr "E598: ��Ч�� Fontset"
 
-msgid "can't select wide font"
-msgstr "����ʹ���趨�Ŀ�����(Widefont)"
+msgid "E533: can't select wide font"
+msgstr "E533: �޷�ѡ�������"
 
-msgid "Invalid wide font"
-msgstr "����ȷ�Ŀ�����(Widefont)"
+msgid "E534: Invalid wide font"
+msgstr "E534: ��Ч�Ŀ�����"
 
 #, c-format
-msgid "Illegal character after <%c>"
-msgstr "<%c> ���в���ȷ���ַ�"
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: <%c> ��������Ч���ַ�"
 
-msgid "comma required"
-msgstr "��Ҫ����"
+msgid "E536: comma required"
+msgstr "E536: ��Ҫ����"
 
 #, c-format
-msgid "'commentstring' must be empty or contain %s"
-msgstr "'commentstring' �����ǿհ׻���� %s"
-
-msgid "No mouse support"
-msgstr "��֧�����"
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' ����Ϊ�ջ���� %s"
 
-msgid "Unclosed expression sequence"
-msgstr "û�н����ı���ʽ: "
+msgid "E538: No mouse support"
+msgstr "E538: ��֧�����"
 
-msgid "too many items"
-msgstr "̫�����"
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: û�н����ı���ʽ����"
 
-msgid "unbalanced groups"
-msgstr "���ԳƵ���"
+msgid "E541: too many items"
+msgstr "E541: ��Ŀ����"
 
-msgid "A preview window already exists"
-msgstr "Ԥ�������Ѿ�������"
+msgid "E542: unbalanced groups"
+msgstr "E542: ���ҵ���"
 
-msgid "'winheight' cannot be smaller than 'winminheight'"
-msgstr "'winheight' ���ܱ� 'winminheight' ����"
+msgid "E590: A preview window already exists"
+msgstr "E590: Ԥ�������Ѵ���"
 
-msgid "'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "'winwidth' ���ܱ� 'winminwidth' ����"
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic ��Ҫ UTF-8����ִ�� ':set encoding=utf-8'"
 
 #, c-format
-msgid "Need at least %d lines"
-msgstr "������Ҫ %d ��"
+msgid "E593: Need at least %d lines"
+msgstr "E593: ������Ҫ %d ��"
 
 #, c-format
-msgid "Need at least %d columns"
-msgstr "������Ҫ %d ��"
+msgid "E594: Need at least %d columns"
+msgstr "E594: ������Ҫ %d ��"
 
 #, c-format
 msgid "E355: Unknown option: %s"
-msgstr "E355: ����ȷ��ѡ��: %s"
+msgstr "E355: δ֪��ѡ��: %s"
 
 msgid ""
 "\n"
@@ -3359,14 +4102,14 @@ msgid ""
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- ȫ�� ѡ��ֵ ---"
+"--- ȫ��ѡ��ֵ ---"
 
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- ���� ѡ��ֵ ---"
+"--- �ֲ�ѡ��ֵ ---"
 
 msgid ""
 "\n"
@@ -3412,9 +4155,6 @@ msgstr "Vim ����ֵ: %d\n"
 msgid "cannot change console mode ?!\n"
 msgstr "�����л�����̨(console)ģʽ !?\n"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ��֧���趨��Ļģʽ"
-
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ��������̨(console)??\n"
 
@@ -3440,13 +4180,12 @@ msgstr "I/O ����"
 #~ msgid "...(truncated)"
 #~ msgstr ""
 
+#~ msgid "Message"
+#~ msgstr ""
+
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ���� 80, ����ִ���ⲿ����"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ���ú����� \"%s\"() ʧ��"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: ����ѡ��˴�ӡ��"
 
@@ -3455,12 +4194,13 @@ msgid "to %s on %s"
 msgstr "�� %s �� %s"
 
 #, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: δ֪�Ĵ�ӡ������: %s"
+
+#, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: ��ӡ����: %s"
 
-msgid "Unknown"
-msgstr "δ֪"
-
 #, c-format
 msgid "Printing '%s'"
 msgstr "�Ѵ�ӡ: '%s'"
@@ -3483,6 +4223,7 @@ msgstr "Vim: ˫���ź�, �˳���\n"
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: CVim: ���ص��ź�(signal) %s\n"
 
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: ���ص��������ź�(deadly signale)\n"
 
@@ -3545,9 +4286,31 @@ msgstr ""
 "\n"
 "�����ѽ���\n"
 
+#, fuzzy
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "��ʾ����"
+
+#, c-format
+#~ msgid "dlerror = \"%s\""
+#~ msgstr ""
+
 msgid "Opening the X display failed"
 msgstr "�� X Window ʧ��"
 
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "XSMP opening connection"
+#~ msgstr "û�� cscope ����"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr ""
+
 msgid "At line"
 msgstr "���к� "
 
@@ -3587,7 +4350,7 @@ msgid ""
 msgstr ""
 "����� $PATH ���Ҳ��� VIMRUN.EXE.\n"
 "�ⲿ����ִ����Ϻ󽫲�����ͣ.\n"
-"��һ��˵����ִ�� :help win32-vimrun "
+"��һ��˵����� :help win32-vimrun"
 
 msgid "Vim Warning"
 msgstr "Vim ����"
@@ -3621,8 +4384,8 @@ msgstr "E378: 'errorformat' δ�趨"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �Ҳ���Ŀ¼���ƻ��ǿյ�Ŀ¼����"
 
-msgid "No more items"
-msgstr "û����������"
+msgid "E553: No more items"
+msgstr "E553: û�и������"
 
 #, c-format
 msgid "(%d of %d)%s%s: "
@@ -3632,49 +4395,121 @@ msgid " (line deleted)"
 msgstr " (����ɾ��)"
 
 msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ��ջ��β"
+msgstr "E380: Quickfix ��ջ�׶�"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Quickfix ��ջ����"
 
 #, c-format
 msgid "error list %d of %d; %d errors"
-msgstr "�����б� %d/%d; ���� %d �����"
+msgstr "�����б� %d / %d���� %d ������"
 
 msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: ����д�룬'buftype' ѡ�����趨"
+msgstr "E382: �޷�д�룬���趨ѡ�� 'buftype'"
+
+#~ msgid "E683: File name missing or invalid pattern"
+#~ msgstr ""
+
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "�޷����ļ� \"%s\""
+
+msgid "E681: Buffer is not loaded"
+msgstr "E681: ������δ����"
+
+msgid "E777: String or List expected"
+msgstr "E777: �˴���Ҫ String ���� List"
+
+#, c-format
+msgid "E369: invalid item in %s%%[]"
+msgstr "E369: %s%%[] ������Ч����"
 
 msgid "E339: Pattern too long"
-msgstr "E339: ����̫��"
+msgstr "E339: ģʽ̫��"
+
+msgid "E50: Too many \\z("
+msgstr "E50: ̫�� \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: ̫�� %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: ��ƥ��� \\z("
+
+#, c-format
+msgid "E53: Unmatched %s%%("
+msgstr "E53: ��ƥ��� %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: ��ƥ��� %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: ��ƥ��� %s)"
+
+#, c-format
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ ��������Ч���ַ�"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: ̫�ิ�ӵ� %s{...}s"
 
 #, c-format
 msgid "E61: Nested %s*"
-msgstr "E61: ��״ %s*"
+msgstr "E61: Ƕ�׵� %s*"
 
 #, c-format
 msgid "E62: Nested %s%c"
-msgstr "E62: ��״ %s%c"
+msgstr "E62: Ƕ�׵� %s%c"
+
+msgid "E63: invalid use of \\_"
+msgstr "E63: ����ȷ��ʹ�� \\_"
 
 #, c-format
 msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c û�нӶ���"
+msgstr "E64: %s%c ǰ��������"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: ��Ч�Ļ���"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: �˴������� \\z("
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: �˴������� \\z1 ��"
+
+msgid "E68: Invalid character after \\z"
+msgstr "E68: \\z ��������Ч���ַ�"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ ��ȱ�� ]"
 
 #, c-format
-msgid "Syntax error in %s{...}"
-msgstr "�﷨����: %s{...}"
+msgid "E70: Empty %s%%[]"
+msgstr "E70: �յ� %s%%[]"
 
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: ����ִ��; regular expression ̫����?"
+#, c-format
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] ��������Ч���ַ�"
 
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
+#, c-format
+msgid "E71: Invalid character after %s%%"
+msgstr "E71: %s%% ��������Ч���ַ�"
 
-msgid "External submatches:\n"
-msgstr "�ⲿ����:\n"
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ ��ȱ�� ]"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--�� fold %3ld ��"
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ���﷨����"
+
+msgid "External submatches:\n"
+msgstr "�ⲿ����:\n"
 
 msgid " VREPLACE"
 msgstr " V-�滻"
@@ -3683,7 +4518,7 @@ msgid " REPLACE"
 msgstr " �滻"
 
 msgid " REVERSE"
-msgstr " ��ת"
+msgstr " ����"
 
 msgid " INSERT"
 msgstr " ����"
@@ -3695,10 +4530,13 @@ msgid " (replace)"
 msgstr " (�滻)"
 
 msgid " (vreplace)"
-msgstr " (v-�滻)"
+msgstr " (V-�滻)"
 
 msgid " Hebrew"
-msgstr " ϣ����"
+msgstr " Hebrew"
+
+msgid " Arabic"
+msgstr " Arabic"
 
 msgid " (lang)"
 msgstr " (����)"
@@ -3706,30 +4544,30 @@ msgstr " (����)"
 msgid " (paste)"
 msgstr " (ճ��)"
 
-msgid " SELECT"
-msgstr " ѡȡ"
-
 msgid " VISUAL"
 msgstr " ����"
 
-msgid " BLOCK"
-msgstr " ��"
+msgid " VISUAL LINE"
+msgstr " ���� ��"
 
-msgid " LINE"
-msgstr " ��"
+msgid " VISUAL BLOCK"
+msgstr " ���� ��"
 
-msgid "recording"
-msgstr "��¼��"
+msgid " SELECT"
+msgstr " ѡ��"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
+msgid " SELECT LINE"
+msgstr " ѡ�� ��"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
+msgid " SELECT BLOCK"
+msgstr " ѡ�� ��"
+
+msgid "recording"
+msgstr "��¼��"
 
 #, c-format
 msgid "E383: Invalid search string: %s"
-msgstr "E383: ����Ĳ����ַ���: %s"
+msgstr "E383: ��Ч�Ĳ����ַ���: %s"
 
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
@@ -3765,6 +4603,10 @@ msgstr "  �Ҳ���"
 msgid "Scanning included file: %s"
 msgstr "���Ұ����ļ�: %s"
 
+#, fuzzy, c-format
+#~ msgid "Searching included file %s"
+#~ msgstr "���Ұ����ļ�: %s"
+
 msgid "E387: Match is on current line"
 msgstr "E387: ��ǰ��ƥ��"
 
@@ -3780,9 +4622,364 @@ msgstr "E388: �Ҳ�������"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �Ҳ��� pattern"
 
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: �����ļ�д�����"
+
+#, fuzzy
+#~ msgid "E758: Truncated spell file"
+#~ msgstr "E237: ����ѡ��˴�ӡ��"
+
+#, fuzzy, c-format
+#~ msgid "Trailing text in %s line %d: %s"
+#~ msgstr "\"%s%s\" �жϵ�: �� %ld ��"
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading spell file \"%s\""
+#~ msgstr "ʹ�ý����ļ� \"%s\""
+
+#, fuzzy
+#~ msgid "E757: This does not look like a spell file"
+#~ msgstr "E307: %s ������������ Vim �����ļ�"
+
+#, fuzzy
+#~ msgid "E771: Old spell file, needs to be updated"
+#~ msgstr "E173: ���� %ld ���ļ�δ�༭"
+
+#~ 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\""
+
+#, c-format
+#~ msgid "Conversion failure for word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Conversion in %s not supported: from %s to %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "��֧�ָ�ѡ��"
+
+#, fuzzy, c-format
+#~ msgid "Invalid value for FLAG in %s line %d: %s"
+#~ msgstr "����ȷ�ķ����� id : %s"
+
+#, c-format
+#~ msgid "FLAG after using flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate affix in %s line %d: %s"
+#~ msgstr "E154: ��ǩ(tag) \"%s\" ���ļ� %s ���ظ����ֶ��"
+
+#, c-format
+#~ msgid ""
+#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+#~ "line %d: %s"
+#~ 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"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected REP(SAL) count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Expected MAP count in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Duplicate character in MAP in %s line %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
+#~ msgstr ""
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Missing SOFO%s line in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Both SAL and SOFO lines in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Flag is not a number in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Illegal flag in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "E760: No word count in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "line %6d, word %6d - %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Duplicate word in %s line %d: %s"
+#~ msgstr "ÿһ�ж��Ҳ���ģʽ: %s"
+
+#, c-format
+#~ msgid "First duplicate word in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "%d duplicate word(s) in %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Reading word file %s ..."
+#~ msgstr "�ӱ�׼�����..."
+
+#, 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 ""
+
+#, c-format
+#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Too many regions in %s line %d: %s"
+#~ msgstr ""
+
+#, 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"
+
+#, c-format
+#~ msgid "Unrecognized flags in %s line %d: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Ignored %d words with non-ASCII characters"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+#~ msgstr ""
+
+#~ 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 ""
+
+#, c-format
+#~ msgid "Number of words after soundfolding: %ld"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Total number of words: %d"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing suggestion file %s ..."
+#~ msgstr "д�� viminfo �ļ� \"%s\" ��"
+
+#, 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 "����"
+
+#, c-format
+#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word removed from %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Word added to %s"
+#~ msgstr ""
+
+#~ msgid "E763: Word characters differ between spell files"
+#~ msgstr ""
+
+#~ msgid "Sorry, no suggestions"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Sorry, only %ld suggestions"
+#~ msgstr ""
+
+#. avoid more prompt
+#, fuzzy, c-format
+#~ msgid "Change \"%.*s\" to:"
+#~ msgstr "���ı䱣�浽 \"%.*s\"?"
+
+#, c-format
+#~ msgid " < \"%.*s\""
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E752: No previous spell replacement"
+#~ msgstr "E35: û��ǰһ����������"
+
+#, fuzzy, c-format
+#~ msgid "E753: Not found: %s"
+#~ msgstr "E334: [�˵�] �Ҳ��� %s"
+
+#, fuzzy, c-format
+#~ msgid "E778: This does not look like a .sug file: %s"
+#~ msgstr "E307: %s ������������ Vim �����ļ�"
+
+#, c-format
+#~ msgid "E779: Old .sug file, needs to be updated: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E780: .sug file is for newer version of Vim: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E781: .sug file doesn't match .spl file: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E782: error while reading .sug file: %s"
+#~ msgstr "E47: ��ȡ�����ļ�ʧ��"
+
+#. This should have been checked when generating the .spl
+#. * file.
+#~ msgid "E783: duplicate char in MAP entry"
+#~ msgstr ""
+
 #, c-format
 msgid "E390: Illegal argument: %s"
-msgstr "E390: ��������ȷ: %s"
+msgstr "E390: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -3834,12 +5031,13 @@ msgstr "��С"
 msgid "maximal "
 msgstr "���"
 
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹ���˲���ȷ�Ĳ���"
+#, fuzzy
+#~ msgid "; match "
+#~ msgstr "ƥ�� %d"
 
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �Ҳ��� %s �� region item"
+#, fuzzy
+#~ msgid " line breaks"
+#~ msgstr "����һ��"
 
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ʹ���˲���ȷ�Ĳ���"
@@ -3847,12 +5045,23 @@ msgstr "E395: ʹ���˲���ȷ�Ĳ���"
 msgid "E396: containedin argument not accepted here"
 msgstr "E396: ʹ���˲���ȷ�Ĳ���"
 
+msgid "E393: group[t]here not accepted here"
+msgstr "E393: ʹ���˲���ȷ�Ĳ���"
+
+#, c-format
+msgid "E394: Didn't find region item for %s"
+msgstr "E394: �Ҳ��� %s �� region item"
+
 msgid "E397: Filename required"
 msgstr "E397: ��Ҫ�ļ�����"
 
 #, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱ�� ']': %s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
-msgstr "E398: ȱ�� \"=\": %s"
+msgstr "E398: ȱ�� '=': %s"
 
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
@@ -3874,7 +5083,7 @@ msgstr "E403: �﷨ͬ��: �����з���ָ��������"
 
 #, c-format
 msgid "E404: Illegal arguments: %s"
-msgstr "E404: ��������ȷ: %s"
+msgstr "E404: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E405: Missing equal sign: %s"
@@ -3882,7 +5091,7 @@ msgstr "E405: ȱ�ٵȺ�: %s"
 
 #, c-format
 msgid "E406: Empty argument: %s"
-msgstr "E406: �ղ���: %s"
+msgstr "E406: �յĲ���: %s"
 
 #, c-format
 msgid "E407: %s not allowed here"
@@ -3900,6 +5109,9 @@ msgstr "E409: ����ȷ������: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ����ȷ�� :syntax ������: %s"
 
+#~ msgid "E679: recursive loop loading syncolor.vim"
+#~ msgstr ""
+
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �Ҳ��� highlight group: %s"
@@ -3947,23 +5159,30 @@ msgstr "E422: �ն˱���̫��: %s"
 
 #, c-format
 msgid "E423: Illegal argument: %s"
-msgstr "E423: ��������ȷ: %s"
+msgstr "E423: ��Ч�Ĳ���: %s"
 
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: ʹ����̫�಻ͬ�ĸ���������"
 
-msgid "at bottom of tag stack"
-msgstr "��ǩ(tag)��ջ��β"
+#~ msgid "E669: Unprintable character in group name"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "W18: Invalid character in group name"
+#~ msgstr "E182: �������Ʋ���ȷ"
 
-msgid "at top of tag stack"
-msgstr "��ǩ(tag)��ջ��ͷ"
+msgid "E555: at bottom of tag stack"
+msgstr "E555: ���� tag ��ջ�ײ�"
+
+msgid "E556: at top of tag stack"
+msgstr "E556: ���� tag ��ջ����"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �Ѿ�����ǰ��ı�ǩ(tag)��"
+msgstr "E425: �ѵ���һ��ƥ��� tag"
 
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: �Ҳ�����ǩ(tag): %s"
+msgstr "E426: �Ҳ��� tag: %s"
 
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
@@ -3971,18 +5190,11 @@ msgstr "  # pri kind tag"
 msgid "file\n"
 msgstr "�ļ�\n"
 
-#.
-#. * Ask to select a tag from the list.
-#. * When using ":silent" assume that <CR> was entered.
-#.
-msgid "Enter nr of choice (<CR> to abort): "
-msgstr "���� nr ��ѡ�� (<CR> �˳�): "
-
 msgid "E427: There is only one matching tag"
-msgstr "E427: ֻ�д������"
+msgstr "E427: ֻ��һ��ƥ��� tag"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ���������һ�����ϵı�ǩ(tag)��"
+msgstr "E428: �������һ��ƥ��� tag"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -3991,13 +5203,13 @@ msgstr "�ļ� \"%s\" ������"
 #. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "�ҵ� tag: %d/%d%s"
+msgstr "�ҵ� tag: %d / %d%s"
 
 msgid " or more"
 msgstr " �����"
 
 msgid "  Using tag with different case!"
-msgstr "  �Բ�ͬ��Сд��ʹ�� tag!"
+msgstr "  �Բ�ͬ��Сд��ʹ�� tag��"
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
@@ -4011,15 +5223,9 @@ msgstr ""
 "\n"
 "  # �� tag         ��   ��    �� �ļ�/�ı�"
 
-msgid "Linear tag search"
-msgstr "���Բ��ұ�ǩ (Tags)"
-
-msgid "Binary tag search"
-msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
-
 #, c-format
 msgid "Searching tags file %s"
-msgstr "���� tag �ļ� \"%s\""
+msgstr "���� tag �ļ� %s"
 
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
@@ -4031,7 +5237,7 @@ msgstr "E431: Tag �ļ� \"%s\" ��ʽ����"
 
 #, c-format
 msgid "Before byte %ld"
-msgstr "�� %ld �ֽ�֮ǰ"
+msgstr "�ڵ� %ld �ֽ�֮ǰ"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4042,32 +5248,32 @@ msgid "E433: No tags file"
 msgstr "E433: û�� tag �ļ�"
 
 msgid "E434: Can't find tag pattern"
-msgstr "E434: �Ҳ��� tag"
+msgstr "E434: �Ҳ��� tag ģʽ"
 
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �Ҳ��� tag, ���Ų�!"
+msgstr "E435: �Ҳ��� tag�����Ų£�"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' ���ܼ��ء����õ��ڽ��ն���ʽ��:"
+msgstr "' δ֪�����õ��ڽ��ն���:"
 
 msgid "defaulting to '"
-msgstr "Ԥ��: '"
+msgstr "Ĭ��ֵΪ: '"
 
-msgid "Cannot open termcap file"
-msgstr "���ܴ� termcap �ļ�"
+msgid "E557: Cannot open termcap file"
+msgstr "E557: �޷��� termcap �ļ�"
 
-msgid "Terminal entry not found in terminfo"
-msgstr "��terminfo��δ�ҵ��ն���"
+msgid "E558: Terminal entry not found in terminfo"
+msgstr "E558: �� terminfo ���Ҳ����ն���"
 
-msgid "Terminal entry not found in termcap"
-msgstr "��termcap��δ�ҵ��ն���"
+msgid "E559: Terminal entry not found in termcap"
+msgstr "E559: �� termcap ���Ҳ����ն���"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap û�� \"%s\" ��"
+msgstr "E436: termcap ��û�� \"%s\" ��"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �ն���Ҫ \"cm\" ������"
+msgstr "E437: �ն���Ҫ���� \"cm\""
 
 #. Highlight title
 msgid ""
@@ -4085,23 +5291,60 @@ msgstr "Vim: �������˳���...\n"
 
 #. must display the prompt
 msgid "No undo possible; continue anyway"
-msgstr "���ܻ�ԭ�������"
+msgstr "�޷������������"
+
+msgid "Already at oldest change"
+msgstr "��λ����ɵĸı�"
+
+msgid "Already at newest change"
+msgstr "��λ�����µĸı�"
+
+#, c-format
+msgid "Undo number %ld not found"
+msgstr "�Ҳ��������� %ld"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: �кŴ���"
 
-msgid "1 change"
-msgstr "һ��ı�"
+msgid "more line"
+msgstr "�б�����"
+
+msgid "more lines"
+msgstr "�б�����"
+
+msgid "line less"
+msgstr "�б�ȥ��"
+
+msgid "fewer lines"
+msgstr "�б�ȥ��"
+
+msgid "change"
+msgstr "�з����ı�"
+
+msgid "changes"
+msgstr "�з����ı�"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld ��ı�"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s��%s #%ld  %s"
+
+msgid "before"
+msgstr "before"
+
+msgid "after"
+msgstr "after"
+
+msgid "Nothing to undo"
+msgstr "�޿ɳ���"
+
+msgid "number changes  time"
+msgstr "  ���    �ı�  ʱ��"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: �����б���"
 
 msgid "E440: undo line missing"
-msgstr "E440: �Ҳ���Ҫ������������"
+msgstr "E440: �Ҳ���Ҫ��������"
 
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
@@ -4109,34 +5352,34 @@ msgid ""
 "MS-Windows 16/32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 16/32λ ͼ�ͽ���汾"
+"MS-Windows 16/32 λͼ�ν���汾"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
 msgstr ""
 "\n"
-"MS-Windows 32 Bit ͼ�ͽ���汾"
+"MS-Windows 32 λͼ�ν���汾"
 
 msgid " in Win32s mode"
-msgstr "Win32s ģʽ"
+msgstr " Win32s ģʽ"
 
 msgid " with OLE support"
-msgstr "֧�� OLE"
+msgstr " �� OLE ֧��"
 
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
 msgstr ""
 "\n"
-"MS-Windows 32λ �ַ�����汾"
+"MS-Windows 32 λ����̨�汾"
 
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
 msgstr ""
 "\n"
-"MS-Windows 32λ �ַ�����汾"
+"MS-Windows 16 λ����̨�汾"
 
 msgid ""
 "\n"
@@ -4185,7 +5428,10 @@ msgid ""
 "Included patches: "
 msgstr ""
 "\n"
-"���벹��: "
+"��������: "
+
+msgid "Modified by "
+msgstr "�޸��� "
 
 msgid ""
 "\n"
@@ -4195,14 +5441,14 @@ msgstr ""
 "����"
 
 msgid "by "
-msgstr "��:"
+msgstr "�� "
 
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"��ǿ�汾 "
+"���Ͱ汾 "
 
 msgid ""
 "\n"
@@ -4216,96 +5462,102 @@ msgid ""
 "Normal version "
 msgstr ""
 "\n"
-"һ��汾 "
+"�����汾 "
 
 msgid ""
 "\n"
 "Small version "
 msgstr ""
 "\n"
-"���װ汾 "
+"С�Ͱ汾 "
 
 msgid ""
 "\n"
 "Tiny version "
 msgstr ""
 "\n"
-"����汾 "
+"΢�Ͱ汾 "
 
 msgid "without GUI."
-msgstr "��ʹ��ͼ�ͽ��档"
+msgstr "��ͼ�ν��档"
+
+msgid "with GTK2-GNOME GUI."
+msgstr "�� GTK2-GNOME ͼ�ν��档"
 
 msgid "with GTK-GNOME GUI."
-msgstr "ʹ�� GTK-GNOME ͼ�ͽ��档"
+msgstr "�� GTK-GNOME ͼ�ν��档"
+
+msgid "with GTK2 GUI."
+msgstr "�� GTK2 ͼ�ν��档"
 
 msgid "with GTK GUI."
-msgstr "ʹ�� GTK ͼ�ͽ��档"
+msgstr "�� GTK ͼ�ν��档"
 
 msgid "with X11-Motif GUI."
-msgstr "ʹ�� X11-Motif ͼ�ͽ��档"
+msgstr "�� X11-Motif ͼ�ν��档"
 
-msgid "with X11-Athena GUI."
-msgstr "ʹ�� X11-Athena ͼ�ͽ��档"
+msgid "with X11-neXtaw GUI."
+msgstr "�� X11-neXtaw ͼ�ν��档"
 
-msgid "with BeOS GUI."
-msgstr "ʹ�� BeOS ͼ�ͽ��档"
+msgid "with X11-Athena GUI."
+msgstr "�� X11-Athena ͼ�ν��档"
 
 msgid "with Photon GUI."
-msgstr "ʹ��Photonͼ�ͽ��档"
+msgstr "�� Photon ͼ�ν��档"
 
 msgid "with GUI."
-msgstr "ʹ��ͼ�ͽ��档"
+msgstr "��ͼ�ν��档"
 
 msgid "with Carbon GUI."
-msgstr "ʹ�� Carbon ͼ�ͽ��档"
+msgstr "�� Carbon ͼ�ν��档"
 
 msgid "with Cocoa GUI."
-msgstr "ʹ�� Cocoa ͼ�ͽ��档"
+msgstr "�� Cocoa ͼ�ν��档"
 
 msgid "with (classic) GUI."
-msgstr "ʹ�� (��ͳ) ͼ�ͽ��档"
+msgstr "��(��ͳ)ͼ�ν��档"
 
 msgid "  Features included (+) or not (-):\n"
-msgstr " Ŀǰ��ʹ��(+)�벻��ʹ��(-)��ģ���б�:\n"
+msgstr "  ��ʹ��(+)�벻��ʹ��(-)�Ĺ���:\n"
 
 msgid "   system vimrc file: \""
-msgstr "        ϵͳ vimrc �����ļ�: \""
+msgstr "     ϵͳ vimrc �ļ�: \""
 
 msgid "     user vimrc file: \""
-msgstr "  �û��� vimrc �����ļ�: \""
+msgstr "     �û� vimrc �ļ�: \""
 
 msgid " 2nd user vimrc file: \""
-msgstr "    �ڶ����û� vimrc �ļ�: \""
+msgstr " �ڶ��û� vimrc �ļ�: \""
 
 msgid " 3rd user vimrc file: \""
-msgstr "    �������û� vimrc �ļ�: \""
+msgstr " �����û� vimrc �ļ�: \""
 
 msgid "      user exrc file: \""
-msgstr "   �û��� exrc �����ļ�: \""
+msgstr "      �û� exrc �ļ�: \""
 
 msgid "  2nd user exrc file: \""
-msgstr "   �ڶ����û� exrc �ļ�: \""
+msgstr "  �ڶ��û� exrc �ļ�: \""
 
 msgid "  system gvimrc file: \""
-msgstr "         ϵͳ gvimrc �ļ�: \""
+msgstr "    ϵͳ gvimrc �ļ�: \""
 
 msgid "    user gvimrc file: \""
-msgstr "     �û��� gvimrc �����ļ�: \""
+msgstr "    �û� gvimrc �ļ�: \""
 
 msgid "2nd user gvimrc file: \""
-msgstr "   �ڶ����û� gvimrc �ļ�: \""
+msgstr "�ڶ��û� gvimrc �ļ�: \""
 
 msgid "3rd user gvimrc file: \""
-msgstr "   �������û� gvimrc �ļ�: \""
+msgstr "�����û� gvimrc �ļ�: \""
 
 msgid "    system menu file: \""
-msgstr "           ϵͳ�˵������ļ�: \""
+msgstr "        ϵͳ�˵��ļ�: \""
 
 msgid "  fall-back for $VIM: \""
-msgstr "              $VIM Ԥ��ֵ: \""
+msgstr "         $VIM Ԥ��ֵ: \""
 
 msgid " f-b for $VIMRUNTIME: \""
-msgstr "       $VIMRUNTIME Ԥ��ֵ: \""
+msgstr "  $VIMRUNTIME Ԥ��ֵ: \""
 
 msgid "Compilation: "
 msgstr "���뷽ʽ: "
@@ -4314,7 +5566,7 @@ msgid "Compiler: "
 msgstr "������: "
 
 msgid "Linking: "
-msgstr "���᷽ʽ: "
+msgstr "���ӷ�ʽ: "
 
 msgid "  DEBUG BUILD"
 msgstr "  ���԰汾"
@@ -4323,49 +5575,84 @@ msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
 msgid "version "
-msgstr "�汾   "
+msgstr "�汾 "
 
 msgid "by Bram Moolenaar et al."
-msgstr "ά����: Bram Moolenaar et al."
+msgstr "ά���� Bram Moolenaar ��"
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim Ϊ�����ɷ��еĿ���Դ��������"
+msgstr "Vim �ǿ����ɷַ��Ŀ���Դ��������"
 
 msgid "Help poor children in Uganda!"
-msgstr "�����ڸɴ�Ŀ�����ͯ!"
+msgstr "�����ڸɴ�Ŀ�����ͯ��"
 
 msgid "type  :help iccf<Enter>       for information "
-msgstr "��һ��˵��������          :help iccf<Enter>"
+msgstr "����  :help iccf<Enter>       �鿴˵��        "
 
 msgid "type  :q<Enter>               to exit         "
-msgstr "Ҫ�˳�������                  :q<Enter>            "
+msgstr "����  :q<Enter>               �˳�            "
 
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "���߰���������                :help<Enter>         "
+msgstr "����  :help<Enter>  ��  <F1>  �鿴���߰���    "
 
-msgid "type  :help version6<Enter>   for version info"
-msgstr "�°汾��Ϣ������              :help version6<Enter>"
+msgid "type  :help version7<Enter>   for version info"
+msgstr "����  :help version7<Enter>   �鿴�汾��Ϣ    "
 
 msgid "Running in Vi compatible mode"
-msgstr "Vi ����ģʽ"
+msgstr "������ Vi ����ģʽ"
 
 msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "���Ҫ��ȫģ�⴫ͳ Vi ������ :set nocp<Enter>"
+msgstr "����  :set nocp<Enter>        �ָ�Ĭ�ϵ� Vim  "
 
 msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�����Ҫ�� Vi ����ģʽ��һ��˵�������� :help cp-default<Enter>"
+msgstr "����  :help cp-default<Enter> �鿴���˵��    "
+
+msgid "menu  Help->Orphans           for information    "
+msgstr "�˵�  Help->Orphans           �鿴˵��           "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "��ģʽ���У��������ּ�����"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "�˵�  Edit->Global Settings->Toggle Insert Mode  "
+
+#, fuzzy
+#~ msgid "                              for two modes      "
+#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
+
+#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "                              for Vim defaults   "
+#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
+
+msgid "Sponsor Vim development!"
+msgstr "���� Vim �Ŀ�����"
+
+msgid "Become a registered Vim user!"
+msgstr "��Ϊ Vim ��ע���û���"
+
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "����  :help sponsor<Enter>    �鿴˵��        "
+
+msgid "type  :help register<Enter>   for information "
+msgstr "����  :help register<Enter>   �鿴˵��        "
+
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "�˵�  Help->Sponsor/Register  �鿴˵��           "
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "ע��: ��⵽ Windows 95/98/ME"
+msgstr "����: ��⵽ Windows 95/98/ME"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr "�����Ҫ�� Windows 95 ֧�ֵĸ�����Ϣ������ :help windows95<Enter>"
+msgstr "����  :help windows95<Enter>  �鿴���˵��    "
 
 msgid "E441: There is no preview window"
 msgstr "E441: û��Ԥ������"
 
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����ͬʱ�ָ��Ϊ���Ϻ����½�"
+msgstr "E442: ����ͬʱ���� topleft �� botright �ָ�"
 
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: �������ָ��ʱ������ת"
@@ -4386,261 +5673,472 @@ msgstr "E446: ��괦û���ļ���"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: ��·�����Ҳ����ļ� \"%s\""
 
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �޷����ؿ� %s"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "��Ǹ�����������: �޷����� Perl �⡣"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr ""
+
 msgid "Edit with &multiple Vims"
-msgstr "�� &multiple Vims �༭"
+msgstr "�ö�� Vim �༭(&M)"
 
 msgid "Edit with single &Vim"
-msgstr "�� single &Vim �༭"
+msgstr "�õ��� Vim �༭(&V)"
+
+msgid "Diff with Vim"
+msgstr "�� Vim �Ƚ�(diff)"
 
 msgid "Edit with &Vim"
-msgstr "�� &Vim �༭"
+msgstr "�� Vim �༭(&V)"
 
 #. Now concatenate
-msgid "Edit with existing Vim - &"
-msgstr "�õ�ǰ�� Vim �༭ - &"
+msgid "Edit with existing Vim - "
+msgstr "�õ�ǰ�� Vim �༭ - "
 
 msgid "Edits the selected file(s) with Vim"
-msgstr "�� Vim �༭ѡ����ļ�"
+msgstr "�� Vim �༭ѡ�е��ļ�"
 
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "��������ʧ��: ����gvim�Ƿ��ڿ�ִ��·����!"
+msgstr "��������ʧ��: ���� gvim �Ƿ���·���У�"
 
 msgid "gvimext.dll error"
-msgstr "gvimext.dll ����"
+msgstr "gvimext.dll ����"
 
 msgid "Path length too long!"
-msgstr "·����̫��"
+msgstr "·��̫����"
 
 msgid "--No lines in buffer--"
-msgstr "--������������--"
+msgstr "--������������--"
 
 #.
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-msgid "Command aborted"
-msgstr "���ǿ���ж�"
+msgid "E470: Command aborted"
+msgstr "E470: �����ֹ"
 
-msgid "Argument required"
-msgstr "��Ҫָ�����"
+msgid "E471: Argument required"
+msgstr "E471: ��Ҫ����"
 
 msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ����Ӧ���� / ? �� &"
+msgstr "E10: \\ ����Ӧ�ø��� /��? �� &"
 
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: �����������д�����ʹ�á�<CR>ִ�У�CTRL-C �˳�"
+msgstr "E11: �������д�������Ч��<CR> ִ�У�CTRL-C �˳�"
 
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc ���ָ���ִ��"
+msgstr "E12: ��ǰĿ¼�е� exrc/vimrc �� tag �����в�����������"
+
+msgid "E171: Missing :endif"
+msgstr "E171: ȱ�� :endif"
+
+msgid "E600: Missing :endtry"
+msgstr "E600: ȱ�� :endtry"
+
+msgid "E170: Missing :endwhile"
+msgstr "E170: ȱ�� :endwhile"
+
+msgid "E170: Missing :endfor"
+msgstr "E170: ȱ�� :endfor"
+
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile ȱ�ٶ�Ӧ�� :while"
+
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ȱ�ٶ�Ӧ�� :for"
 
 msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ļ��Ѿ����� (���� ! ǿ���滻)"
+msgstr "E13: �ļ��Ѵ��� (��� ! ǿ��ִ��)"
 
-msgid "Command failed"
-msgstr "����ִ��ʧ��"
+msgid "E472: Command failed"
+msgstr "E472: ����ִ��ʧ��"
 
-msgid "Internal error"
-msgstr "�ڲ�����"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: δ֪�� Fontset: %s"
+
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: δ֪������: %s"
+
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: ���� \"%s\" ���ǵȿ�����"
+
+msgid "E473: Internal error"
+msgstr "E473: �ڲ�����"
 
 msgid "Interrupted"
 msgstr "���ж�"
 
 msgid "E14: Invalid address"
-msgstr "E14: ����ȷ�ĵ�ַ"
+msgstr "E14: ��Ч�ĵ�ַ"
 
-msgid "Invalid argument"
-msgstr "����ȷ�Ĳ���"
+msgid "E474: Invalid argument"
+msgstr "E474: ��Ч�Ĳ���"
 
 #, c-format
-msgid "Invalid argument: %s"
-msgstr "����ȷ�Ĳ���: %s"
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ��Ч�Ĳ���: %s"
 
 #, c-format
 msgid "E15: Invalid expression: %s"
-msgstr "E15: ����ȷ�ı���ʽ: %s"
+msgstr "E15: ��Ч�ı���ʽ: %s"
 
 msgid "E16: Invalid range"
-msgstr "E16: ����ȷ�ķ�Χ"
+msgstr "E16: ��Ч�ķ�Χ"
 
-msgid "Invalid command"
-msgstr "����ȷ������"
+msgid "E476: Invalid command"
+msgstr "E476: ��Ч������"
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" ��Ŀ¼"
 
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: '=' ǰ������˴�����ַ�"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: ���ú����� \"%s()\" ʧ��"
+
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: �޷����ؿ⺯�� %s"
 
 msgid "E19: Mark has invalid line number"
-msgstr "E19: ��ǵ��кŴ���"
+msgstr "E19: ��ǵ��к���Ч"
 
 msgid "E20: Mark not set"
 msgstr "E20: û���趨���"
 
 msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ��Ϊ 'modifiable' ѡ���ǹرյģ����Բ����޸�"
+msgstr "E21: �����޸ģ���Ϊѡ�� 'modifiable' �ǹص�"
 
 msgid "E22: Scripts nested too deep"
-msgstr "E22: �ݹ����̫���"
+msgstr "E22: �ű�Ƕ�׹���"
 
 msgid "E23: No alternate file"
-msgstr "E23: û��������ļ�"
+msgstr "E23: û�н����ļ�"
 
 msgid "E24: No such abbreviation"
-msgstr "E24: û����� abbreviation ��Ӧ"
+msgstr "E24: û�������д"
 
-msgid "No ! allowed"
-msgstr "����ʹ�� '!'"
+msgid "E477: No ! allowed"
+msgstr "E477: ����ʹ�� \"!\""
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: ��Ϊ����ʱû�м���ͼ�ͽ���ĳ�����룬���Բ���ʹ��ͼ�ͽ���"
+msgstr "E25: �޷�ʹ��ͼ�ν���: ����ʱû������"
 
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: ��Ϊ����ʱû�м���ϣ�����ĳ�����룬���Բ���ʹ�� Hebrew\n"
+msgstr "E26: �޷�ʹ�� Hebrew: ����ʱû������\n"
 
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: ��Ϊ����ʱû�м��� Farsi �ĳ�����룬���Բ���ʹ�� Farsi\n"
+msgstr "E27: �޷�ʹ�� Farsi: ����ʱû������\n"
+
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: �޷�ʹ�� Arabic: ����ʱû������\n"
 
 #, c-format
 msgid "E28: No such highlight group name: %s"
-msgstr "E28: û����Ϊ '%s' �� highlight group"
+msgstr "E28: û���������Ⱥ����: %s"
 
 msgid "E29: No inserted text yet"
 msgstr "E29: û�в��������"
 
 msgid "E30: No previous command line"
-msgstr "E30: û��ǰһ������"
+msgstr "E30: û��ǰһ��������"
 
 msgid "E31: No such mapping"
-msgstr "E31: û����� mapping ��Ӧ"
+msgstr "E31: û�����ӳ��"
 
-msgid "No match"
-msgstr "�Ҳ���"
+msgid "E479: No match"
+msgstr "E479: û��ƥ��"
 
 #, c-format
-msgid "No match: %s"
-msgstr "�Ҳ���: %s"
+msgid "E480: No match: %s"
+msgstr "E480: û��ƥ��: %s"
 
 msgid "E32: No file name"
 msgstr "E32: û���ļ���"
 
 msgid "E33: No previous substitute regular expression"
-msgstr "E33: û��ǰһ������/�滻������"
+msgstr "E33: û��ǰһ���滻�������ʽ"
 
 msgid "E34: No previous command"
 msgstr "E34: û��ǰһ������"
 
 msgid "E35: No previous regular expression"
-msgstr "E35: û��ǰһ����������"
+msgstr "E35: û��ǰһ���������ʽ"
 
-msgid "No range allowed"
-msgstr "����ʹ�÷�Χ����"
+msgid "E481: No range allowed"
+msgstr "E481: ����ʹ�÷�Χ"
 
 msgid "E36: Not enough room"
 msgstr "E36: û���㹻�Ŀռ�"
 
 #, c-format
-msgid "Can't create file %s"
-msgstr "���ܴ����ļ� %s"
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: û������ \"%s\" ����ע��ķ�����"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: �޷������ļ� %s"
 
-msgid "Can't get temp file name"
-msgstr "���ܵõ���ʱ�ļ���"
+msgid "E483: Can't get temp file name"
+msgstr "E483: �޷���ȡ��ʱ�ļ���"
 
 #, c-format
-msgid "Can't open file %s"
-msgstr "���ܴ��ļ� %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: �޷����ļ� %s"
 
 #, c-format
-msgid "Can't read file %s"
-msgstr "���ܶ�ȡ�ļ� %s"
+msgid "E485: Can't read file %s"
+msgstr "E485: �޷���ȡ�ļ� %s"
 
-msgid "E37: No write since last change (use ! to override)"
-msgstr "E37: �ļ������Ѹı䵫��δ���� (���� ! ǿ��ִ��)"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: ���޸ĵ���δ���� (���� ! ǿ��ִ��)"
 
 msgid "E38: Null argument"
-msgstr "E38: �յ� (Null) ����"
+msgstr "E38: �յĲ���"
 
 msgid "E39: Number expected"
-msgstr "E39: Ӧ��Ҫ������"
+msgstr "E39: �˴���Ҫ����"
 
 #, c-format
 msgid "E40: Can't open errorfile %s"
-msgstr "E40: ���ܴ򿪴����ļ� %s"
+msgstr "E40: �޷��򿪴����ļ� %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: �޷��� display"
 
 msgid "E41: Out of memory!"
-msgstr "E41: �ڴ治��!"
+msgstr "E41: �ڴ治�㣡"
 
 msgid "Pattern not found"
 msgstr "�Ҳ���ģʽ"
 
 #, c-format
-msgid "Pattern not found: %s"
-msgstr "�Ҳ���ģʽ %s"
+msgid "E486: Pattern not found: %s"
+msgstr "E486: �Ҳ���ģʽ: %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: ��������������"
 
-msgid "Argument must be positive"
-msgstr "����Ӧ��������"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: �޷��ص�ǰһ��Ŀ¼"
 
 msgid "E42: No Errors"
 msgstr "E42: û�д���"
 
+msgid "E776: No location list"
+msgstr "E776: û�� location �б�"
+
 msgid "E43: Damaged match string"
-msgstr "E43: ƥ���ַ���������"
+msgstr "E43: ���𻵵�ƥ���ַ���"
 
 msgid "E44: Corrupted regexp program"
-msgstr "E44: �������ʽ������"
+msgstr "E44: ���𻵵��������ʽ����"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: ���趨ѡ�� 'readonly' (��� ! ǿ��ִ��)"
 
-msgid "E45: 'readonly' option is set (use ! to override)"
-msgstr "E45: �趨 'readonly' ѡ��(ֻ��) (���� ! ǿ��ִ��)"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: ���ܸı�ֻ������ \"%s\""
 
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: �����趨ֻ������ \"%s\""
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: ������ sandbox ���趨����: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ��ȡ�����ļ�ʧ��"
 
 msgid "E48: Not allowed in sandbox"
-msgstr "E48: ������ sandbox �����"
+msgstr "E48: �������� sandbox ��ʹ��"
+
+msgid "E523: Not allowed here"
+msgstr "E523: �������ڴ�ʹ��"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: ��֧���趨��Ļģʽ"
 
 msgid "E49: Invalid scroll size"
-msgstr "E49: ����Ĺ�����С"
+msgstr "E49: ��Ч�Ĺ�����С"
 
 msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: ѡ�� 'shell' δ�趨"
+msgstr "E91: ѡ�� 'shell' Ϊ��"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: �޷���ȡ sign ���ݣ�"
 
 msgid "E72: Close error on swap file"
 msgstr "E72: �����ļ��رմ���"
 
 msgid "E73: tag stack empty"
-msgstr "E73: ��ǩ��ջ�ѿ�"
+msgstr "E73: tag ��ջΪ��"
 
 msgid "E74: Command too complex"
-msgstr "E74: ����̫����"
+msgstr "E74: ���������"
 
 msgid "E75: Name too long"
-msgstr "E75: ����̫��"
+msgstr "E75: ���ֹ���"
 
 msgid "E76: Too many ["
-msgstr "E76: ̫�� ["
+msgstr "E76: [ ����"
 
 msgid "E77: Too many file names"
-msgstr "E77: ̫���ļ���"
+msgstr "E77: �ļ�������"
 
-msgid "Trailing characters"
-msgstr "�������˶�����ַ�"
+msgid "E488: Trailing characters"
+msgstr "E488: �����β���ַ�"
 
 msgid "E78: Unknown mark"
-msgstr "E78: ���ܰ�ʶ�ı��"
+msgstr "E78: δ֪�ı��"
 
 msgid "E79: Cannot expand wildcards"
-msgstr "E79: ������չͨ���"
+msgstr "E79: �޷���չͨ���"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ����С�� 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ����С�� 'winminwidth'"
 
 msgid "E80: Error while writing"
-msgstr "E80: д�����"
+msgstr "E80: д�����"
 
 msgid "Zero count"
-msgstr "������ (?)"
+msgstr "����Ϊ��"
 
 msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ������ script ������ʹ��."
+msgstr "E81: �ڽű�������ʹ���� <SID>"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: �յ���Ч�ı���ʽ"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr ""
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans �������ı�ֻ���ļ�"
+
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �ڲ�����: %s"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ����ʽ���ڴ�ʹ�ó��� 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: �յĻ�����"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: ��Ч����������ʽ��ָ���"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: �ļ�������һ���������б�����"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: û���趨ѡ�� '%s'"
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
+
+#~ msgid "[No file]"
+#~ msgstr "[δ����]"
+
+#~ msgid "[Error List]"
+#~ msgstr "[�����б�]"
+
+#~ msgid "E106: Unknown variable: \"%s\""
+#~ msgstr "E106: δ����ı���: \"%s\""
+
+#~ msgid "E119: Not enough arguments for function: %s"
+#~ msgstr "E119: ���� %s �Ĳ���̫��"
+
+#~ msgid "E120: Using <SID> not in a script context: %s"
+#~ msgstr "E120: <SID> ������ script ��������ʹ��: %s"
+
+#~ msgid "E123: Undefined function: %s"
+#~ msgstr "E123: ���� %s ��δ����"
+
+#~ msgid "E127: Cannot redefine function %s: It is in use"
+#~ msgstr "E127: ���� %s ����ʹ���У��������¶���"
+
+#~ msgid "function "
+#~ msgstr "���� "
+
+#~ msgid "E130: Undefined function: %s"
+#~ msgstr "E130: ���� %s ��δ����"
+
+#~ msgid "Run Macro"
+#~ msgstr "ִ�к�"
+
+#~ msgid "E242: Color name not recognized: %s"
+#~ msgstr "E242: %s Ϊ����ʶ�����ɫ����"
+
+#~ msgid "error reading cscope connection %d"
+#~ msgstr "��ȡ cscope ���� %d ʱ����"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: �Ҳ��� cscope ����"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope �����ѹر�"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "����ʹ�� malloc\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <��>\n"
+
+#~ msgid "E249: couldn't read VIM instance registry property"
+#~ msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\t��ʾ Gnome ��ز���"
+
+#~ msgid "[string too long]"
+#~ msgstr "[�ַ���̫��]"
+
+#~ msgid "Hit ENTER to continue"
+#~ msgstr "�밴 ENTER ����"
+
+#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
+#~ msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
+
+#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
+#~ msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
+
+#~ msgid "E361: Crash intercepted; regexp too complex?"
+#~ msgstr "E361: ����ִ��; regular expression ̫����?"
+
+#~ msgid "E363: pattern caused out-of-stack error"
+#~ msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
+
+#~ msgid " BLOCK"
+#~ msgstr " ��"
+
+#~ msgid " LINE"
+#~ msgstr " ��"
+
+#~ msgid "Enter nr of choice (<CR> to abort): "
+#~ msgstr "���� nr ��ѡ�� (<CR> �˳�): "
+
+#~ msgid "Linear tag search"
+#~ msgstr "���Բ��ұ�ǩ (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
+
+#~ msgid "with BeOS GUI."
+#~ msgstr "ʹ�� BeOS ͼ�ν��档"
diff --git a/src/syntax.c b/src/syntax.c
index baded608b..dfeda5e92 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6171,8 +6171,8 @@ static char *(highlight_init_light[]) =
 	     "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
 #endif
 #ifdef FEAT_VISUAL
-	CENT("Visual term=reverse ctermbg=Magenta",
-	     "Visual term=reverse ctermbg=Magenta guibg=LightGrey"),
+	CENT("Visual term=reverse",
+	     "Visual term=reverse guibg=LightGrey"),
 #endif
 #ifdef FEAT_DIFF
 	CENT("DiffAdd term=bold ctermbg=LightBlue",
@@ -6251,8 +6251,8 @@ static char *(highlight_init_dark[]) =
 	     "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
 #endif
 #ifdef FEAT_VISUAL
-	CENT("Visual term=reverse ctermbg=Magenta",
-	     "Visual term=reverse ctermbg=Magenta guibg=DarkGrey"),
+	CENT("Visual term=reverse",
+	     "Visual term=reverse guibg=DarkGrey"),
 #endif
 #ifdef FEAT_DIFF
 	CENT("DiffAdd term=bold ctermbg=DarkBlue",
@@ -6325,11 +6325,13 @@ init_highlight(both, reset)
     for (i = 0; pp[i] != NULL; ++i)
 	do_highlight((char_u *)pp[i], reset, TRUE);
 
-    /* Magenta background looks ugly, but grey may not work for 8 colors.
-     * Thus let it depend on the number of colors available. */
+    /* Reverse looks ugly, but grey may not work for 8 colors.  Thus let it
+     * depend on the number of colors available. */
     if (t_colors > 8)
 	do_highlight((char_u *)(*p_bg == 'l' ? "Visual ctermbg=LightGrey"
 				   : "Visual ctermbg=DarkGrey"), reset, TRUE);
+    else
+	do_highlight((char_u *)"Visual cterm=reverse", reset, TRUE);
 
 #ifdef FEAT_SYN_HL
     /*
diff --git a/src/tag.c b/src/tag.c
index 3f0a35b96..24809e34f 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3844,14 +3844,17 @@ get_tags(list, pat)
 			if (*p == ':' && len > 0)
 			{
 			    s = ++p;
-			    while (*p != NUL && *p >= ' ' && *p < 127)
+			    while (*p != NUL && *p >= ' ')
 				++p;
 			    n[len] = NUL;
 			    if (add_tag_field(dict, (char *)n, s, p) == FAIL)
 				ret = FAIL;
 			    n[len] = ':';
 			}
-			--p;
+			else
+			    /* Skip field without colon. */
+			    while (*p != NUL && *p >= ' ')
+				++p;
 		    }
 		}
 	    }
diff --git a/src/version.h b/src/version.h
index f631b8fcf..9a77a5c48 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.0e01 BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e01 BETA (2006 Apr 17, compiled "
+#define VIM_VERSION_MEDIUM	"7.0e02 BETA"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0e02 BETA (2006 Apr 18, compiled "
diff --git a/src/vim.h b/src/vim.h
index 37762bea0..f24f15d2d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -346,8 +346,10 @@ typedef unsigned int	int_u;
  * bit and pointers 64 bit. */
 #ifdef _WIN64
 typedef unsigned __int64 long_u;
+typedef		 __int64 long_i;
 #else
 typedef unsigned long	long_u;
+typedef	         long	long_i;
 #endif
 
 /*
author	Bram Moolenaar <Bram@vim.org>	2006-04-18 21:55:01 +0000
committer	Bram Moolenaar <Bram@vim.org>	2006-04-18 21:55:01 +0000
commit	c1e37901fc8486c9960d7290e521ba51e292e94b (patch)
tree	5367e8f83d9d313dd73c0499fd310f57df5e605f /src
parent	a93fa7ee7856b54d3778e613c7b7e4b76aaeb2af (diff)
download	vim-git-c1e37901fc8486c9960d7290e521ba51e292e94b.tar.gz