summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/auto/configure2
-rw-r--r--src/configure.in2
-rw-r--r--src/digraph.c5
-rw-r--r--src/ex_eval.c34
-rw-r--r--src/gui.c22
-rw-r--r--src/gui_gtk_x11.c2
-rw-r--r--src/gui_motif.c5
-rw-r--r--src/gui_w48.c2
-rw-r--r--src/message.c7
-rw-r--r--src/misc2.c6
-rw-r--r--src/option.c13
-rw-r--r--src/option.h1
-rw-r--r--src/po/it.po68
-rw-r--r--src/po/zh_CN.UTF-8.po1048
-rw-r--r--src/po/zh_CN.cp936.po1048
-rw-r--r--src/po/zh_CN.po1048
-rw-r--r--src/proto/gui.pro126
-rw-r--r--src/undo.c9
-rw-r--r--src/version.h6
-rw-r--r--src/window.c2
20 files changed, 1788 insertions, 1668 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 7a308a7e8..319fd4e5a 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9197,7 +9197,7 @@ fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
cat >>confdefs.h <<\_ACEOF
-#define XPMATTRIBUTES_TYPE XpmAttributes_21
+#define XPMATTRIBUTES_TYPE XpmAttributes
_ACEOF
fi
diff --git a/src/configure.in b/src/configure.in
index 6a1a56f08..5c6dd516f 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1911,7 +1911,7 @@ if test -z "$SKIP_MOTIF"; then
AC_MSG_RESULT(no); AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
)
else
- AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes_21)
+ AC_DEFINE(XPMATTRIBUTES_TYPE, XpmAttributes)
fi
CPPFLAGS=$cppflags_save
fi
diff --git a/src/digraph.c b/src/digraph.c
index 892a3ed62..667ff0716 100644
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -2439,8 +2439,11 @@ ex_loadkeymap(eap)
kp->to = vim_strnsave(p, (int)(s - p));
if (kp->from == NULL || kp->to == NULL
- || STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN)
+ || STRLEN(kp->from) + STRLEN(kp->to) >= KMAP_LLEN
+ || *kp->from == NUL || *kp->to == NUL)
{
+ if (kp->to != NULL && *kp->to == NUL)
+ EMSG(_("E791: Empty keymap entry"));
vim_free(kp->from);
vim_free(kp->to);
}
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 1da7f1bc1..c89cb2bd0 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -155,22 +155,22 @@ cause_errthrow(mesg, severe, ignore)
struct msglist **plist;
/*
- * Do nothing when displaying the interrupt message or reporting an uncaught
- * exception (which has already been discarded then) at the top level. Also
- * when no exception can be thrown. The message will be displayed by
- * emsg().
+ * Do nothing when displaying the interrupt message or reporting an
+ * uncaught exception (which has already been discarded then) at the top
+ * level. Also when no exception can be thrown. The message will be
+ * displayed by emsg().
*/
if (suppress_errthrow)
return FALSE;
/*
- * If emsg() has not been called previously, temporarily reset "force_abort"
- * until the throw point for error messages has been reached. This ensures
- * that aborting() returns the same value for all errors that appear in the
- * same command. This means particularly that for parsing errors during
- * expression evaluation emsg() will be called multiply, even when the
- * expression is evaluated from a finally clause that was activated due to
- * an aborting error, interrupt, or exception.
+ * If emsg() has not been called previously, temporarily reset
+ * "force_abort" until the throw point for error messages has been
+ * reached. This ensures that aborting() returns the same value for all
+ * errors that appear in the same command. This means particularly that
+ * for parsing errors during expression evaluation emsg() will be called
+ * multiply, even when the expression is evaluated from a finally clause
+ * that was activated due to an aborting error, interrupt, or exception.
*/
if (!did_emsg)
{
@@ -181,18 +181,18 @@ cause_errthrow(mesg, severe, ignore)
/*
* If no try conditional is active and no exception is being thrown and
* there has not been an error in a try conditional or a throw so far, do
- * nothing (for compatibility of non-EH scripts). The message will then be
- * displayed by emsg(). When ":silent!" was used and we are not currently
- * throwing an exception, do nothing. The message text will then be stored
- * to v:errmsg by emsg() without displaying it.
+ * nothing (for compatibility of non-EH scripts). The message will then
+ * be displayed by emsg(). When ":silent!" was used and we are not
+ * currently throwing an exception, do nothing. The message text will
+ * then be stored to v:errmsg by emsg() without displaying it.
*/
if (((trylevel == 0 && !cause_abort) || emsg_silent) && !did_throw)
return FALSE;
/*
* Ignore an interrupt message when inside a try conditional or when an
- * exception is being thrown or when an error in a try conditional or throw
- * has been detected previously. This is important in order that an
+ * exception is being thrown or when an error in a try conditional or
+ * throw has been detected previously. This is important in order that an
* interrupt exception is catchable by the innermost try conditional and
* not replaced by an interrupt message error exception.
*/
diff --git a/src/gui.c b/src/gui.c
index 755c20c1f..0fdcabe5a 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -3407,31 +3407,36 @@ gui_update_tabline()
}
/*
- * Get the label for tab page "tp" into NameBuff[].
+ * Get the label or tooltip for tab page "tp" into NameBuff[].
*/
void
-get_tabline_label(tp)
+get_tabline_label(tp, tooltip)
tabpage_T *tp;
+ int tooltip; /* TRUE: get tooltip */
{
int modified = FALSE;
char_u buf[40];
int wincount;
win_T *wp;
+ char_u *opt;
- /* Use 'guitablabel' if it's set. */
- if (*p_gtl != NUL)
+ /* Use 'guitablabel' or 'guitabtooltip' if it's set. */
+ opt = (tooltip ? p_gtt : p_gtl);
+ if (*opt != NUL)
{
int use_sandbox = FALSE;
int save_called_emsg = called_emsg;
char_u res[MAXPATHL];
tabpage_T *save_curtab;
+ char_u *opt_name = (char_u *)(tooltip ? "guitabtooltip"
+ : "guitablabel");
called_emsg = FALSE;
printer_page_num = tabpage_index(tp);
# ifdef FEAT_EVAL
set_vim_var_nr(VV_LNUM, printer_page_num);
- use_sandbox = was_set_insecurely((char_u *)"guitablabel", 0);
+ use_sandbox = was_set_insecurely(opt_name, 0);
# endif
/* It's almost as going to the tabpage, but without autocommands. */
curtab->tp_firstwin = firstwin;
@@ -3446,7 +3451,7 @@ get_tabline_label(tp)
curbuf = curwin->w_buffer;
/* Can't use NameBuff directly, build_stl_str_hl() uses it. */
- build_stl_str_hl(curwin, res, MAXPATHL, p_gtl, use_sandbox,
+ build_stl_str_hl(curwin, res, MAXPATHL, opt, use_sandbox,
0, (int)Columns, NULL, NULL);
STRCPY(NameBuff, res);
@@ -3459,7 +3464,7 @@ get_tabline_label(tp)
curbuf = curwin->w_buffer;
if (called_emsg)
- set_string_option_direct((char_u *)"guitablabel", -1,
+ set_string_option_direct(opt_name, -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
}
@@ -3467,7 +3472,8 @@ get_tabline_label(tp)
{
/* Get the buffer name into NameBuff[] and shorten it. */
get_trans_bufname(tp == curtab ? curbuf : tp->tp_curwin->w_buffer);
- shorten_dir(NameBuff);
+ if (!tooltip)
+ shorten_dir(NameBuff);
wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 23318bb7a..79557a834 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3320,7 +3320,7 @@ gui_mch_update_tabline(void)
nr++);
}
- get_tabline_label(tp);
+ get_tabline_label(tp, FALSE);
labeltext = CONVERT_TO_UTF8(NameBuff);
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(gui.tabline), page,
(const gchar *)labeltext);
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 9e28be2b0..ccc97782d 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -3359,8 +3359,9 @@ gui_mch_update_tabline(void)
XtVaGetValues(tab, XmNlabelString, &label_str, NULL);
if (XmStringGetLtoR(label_str, XmSTRING_DEFAULT_CHARSET, &label_cstr))
{
- get_tabline_label(tp);
- if (STRCMP(label_cstr, NameBuff) != 0) {
+ get_tabline_label(tp, FALSE);
+ if (STRCMP(label_cstr, NameBuff) != 0)
+ {
XtVaSetValues(tab, XtVaTypedArg, XmNlabelString, XmRString,
NameBuff, STRLEN(NameBuff) + 1, NULL);
/*
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 6e4ec1ad6..2e43557f2 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2334,7 +2334,7 @@ gui_mch_update_tabline(void)
TabCtrl_InsertItem(s_tabhwnd, nr, &tie);
}
- get_tabline_label(tp);
+ get_tabline_label(tp, FALSE);
tie.pszText = NameBuff;
#ifdef FEAT_MBYTE
wstr = NULL;
diff --git a/src/message.c b/src/message.c
index 69b194d4e..c0146c962 100644
--- a/src/message.c
+++ b/src/message.c
@@ -561,17 +561,18 @@ emsg(s)
/*
* If "emsg_off" is set: no error messages at the moment.
- * If 'debug' is set: do error message anyway, but without side effects.
+ * If "msg" is in 'debug': do error message but without side effects.
* If "emsg_skip" is set: never do error messages.
*/
- if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+ if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+ && vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif
)
return TRUE;
- if (!emsg_off)
+ if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
{
#ifdef FEAT_EVAL
/*
diff --git a/src/misc2.c b/src/misc2.c
index f8a583bc7..4667a563d 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5816,7 +5816,8 @@ filewritable(fname)
emsg3(s, a1, a2)
char_u *s, *a1, *a2;
{
- if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+ if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+ && vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif
@@ -5835,7 +5836,8 @@ emsgn(s, n)
char_u *s;
long n;
{
- if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL)
+ if ((emsg_off > 0 && vim_strchr(p_debug, 'm') == NULL
+ && vim_strchr(p_debug, 't') == NULL)
#ifdef FEAT_EVAL
|| emsg_skip > 0
#endif
diff --git a/src/option.c b/src/option.c
index cfca188d9..c1fc7dc3d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1267,6 +1267,15 @@ static struct vimoption
{(char_u *)NULL, (char_u *)0L}
#endif
},
+ {"guitabtooltip", "gtl", P_STRING|P_VI_DEF|P_RWIN,
+#if defined(FEAT_GUI_TABLINE)
+ (char_u *)&p_gtt, PV_NONE,
+ {(char_u *)"", (char_u *)0L}
+#else
+ (char_u *)NULL, PV_NONE,
+ {(char_u *)NULL, (char_u *)0L}
+#endif
+ },
{"hardtabs", "ht", P_NUM|P_VI_DEF,
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}},
@@ -2812,7 +2821,7 @@ static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
#endif
static char *(p_swb_values[]) = {"useopen", "usetab", "split", NULL};
-static char *(p_debug_values[]) = {"msg", "beep", NULL};
+static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL};
#ifdef FEAT_VERTSPLIT
static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
#endif
@@ -6188,7 +6197,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
/* 'debug' */
else if (varp == &p_debug)
{
- if (check_opt_strings(p_debug, p_debug_values, FALSE) != OK)
+ if (check_opt_strings(p_debug, p_debug_values, TRUE) != OK)
errmsg = e_invarg;
}
diff --git a/src/option.h b/src/option.h
index 39c03e181..d512a2055 100644
--- a/src/option.h
+++ b/src/option.h
@@ -508,6 +508,7 @@ EXTERN char_u *p_go; /* 'guioptions' */
#endif
#if defined(FEAT_GUI_TABLINE)
EXTERN char_u *p_gtl; /* 'guitablabel' */
+EXTERN char_u *p_gtt; /* 'guitabtooltip' */
#endif
EXTERN char_u *p_hf; /* 'helpfile' */
#ifdef FEAT_WINDOWS
diff --git a/src/po/it.po b/src/po/it.po
index 2673c63a7..22584cdca 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -12,8 +12,8 @@
msgid ""
msgstr ""
"Project-Id-Version: vim 7.0\n"
-"POT-Creation-Date: 2006-04-08 09:01+0200\n"
-"PO-Revision-Date: 2006-04-08 09:01+0200\n"
+"POT-Creation-Date: 2006-04-21 09:26+0200\n"
+"PO-Revision-Date: 2006-04-21 09:26+0200\n"
"Last-Translator: Vlad Sandrini <vlad.gently@gmail.com>\n"
"Language-Team: Italian"
" Antonio Colombo <azc100@gmail.com>"
@@ -494,6 +494,22 @@ msgstr "E723: Manca '}' a fine Dizionario: %s"
msgid "E724: variable nested too deep for displaying"
msgstr "E724: variabile troppo nidificata per la visualizzazione"
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Funzione sconosciuta: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: La funzione: %s richiede pi argomenti"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: Uso di <SID> fuori dal contesto di uno script: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s"
+
msgid "E699: Too many arguments"
msgstr "E699: Troppi argomenti"
@@ -2517,12 +2533,33 @@ msgstr "<finestra %d>"
msgid "no such window"
msgstr "finestra inesistente"
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ deve essere un'istanza di String"
+
msgid ""
"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
msgstr ""
"E266: Spiacente, comando non disponibile, non riesco a caricare libreria "
"programmi Ruby."
+msgid "E267: unexpected return"
+msgstr "E267: return imprevisto"
+
+msgid "E268: unexpected next"
+msgstr "E268: next imprevisto"
+
+msgid "E269: unexpected break"
+msgstr "E269: break imprevisto"
+
+msgid "E270: unexpected redo"
+msgstr "E270: redo imprevisto"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: retry fuori da clausola rescue"
+
+msgid "E272: unhandled exception"
+msgstr "E272: eccezione non gestita"
+
#, c-format
msgid "E273: unknown longjmp status %d"
msgstr "E273: tipo sconosciuto di salto nel programma %d"
@@ -4232,9 +4269,6 @@ msgstr "ANCHOR_BUF_SIZE troppo piccolo."
msgid "I/O ERROR"
msgstr "ERRORE I/O"
-msgid "...(truncated)"
-msgstr "...(troncato)"
-
msgid "Message"
msgstr "Messaggio"
@@ -4660,6 +4694,16 @@ msgstr "E388: Non sono riuscito a trovare la definizione"
msgid "E389: Couldn't find pattern"
msgstr "E389: Non sono riuscito a trovare il modello"
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Ult. %sEspressione di Ricerca:\n"
+"~"
+
msgid "E759: Format error in spell file"
msgstr "E759: Errore di formato nel file ortografico"
@@ -4739,7 +4783,7 @@ msgid ""
"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
-"Definire COMPOUNDFORBIDFLAG dop l'elemento PFX potrebbe dare risultati "
+"Definire COMPOUNDFORBIDFLAG dopo l'elemento PFX potrebbe dare risultati "
"errati in %s linea %d"
#, c-format
@@ -4747,7 +4791,7 @@ msgid ""
"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
"%d"
msgstr ""
-"Definire COMPOUNDPERMITFLAG dop l'elemento PFX potrebbe dare risultati "
+"Definire COMPOUNDPERMITFLAG dopo l'elemento PFX potrebbe dare risultati "
"errati in %s linea %d"
#, c-format
@@ -5380,6 +5424,10 @@ msgstr "Nessuna modifica, Undo impossibile"
msgid "number changes time"
msgstr "numero modif. ora"
+#, c-format
+msgid "%ld seconds ago"
+msgstr "%ld secondi fa"
+
msgid "E439: undo list corrupt"
msgstr "E439: lista 'undo' non valida"
@@ -5686,6 +5734,9 @@ msgstr "ATTENZIONE: Trovato Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
msgstr "batti :help windows95<Enter> per info al riguardo"
+msgid "Already only one window"
+msgstr "C' gi una finestra sola"
+
msgid "E441: There is no preview window"
msgstr "E441: Non c' una finestra di pre-visualizzazione"
@@ -5698,9 +5749,6 @@ msgstr "E443: Non posso ruotare quando un'altra finestra divisa in due"
msgid "E444: Cannot close last window"
msgstr "E444: Non riesco a chiudere l'ultima finestra"
-msgid "Already only one window"
-msgstr "C' gi una finestra sola"
-
msgid "E445: Other window contains changes"
msgstr "E445: Altre finestre contengono modifiche"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index de60cda76..cb516e609 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -4,6 +4,10 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# FIRST AUTHOR Wang Jun <junw@turbolinux.com.cn>
+#
+# TRANSLATORS
+# Edyfox <edyfox@gmail.com>
+# Yuheng Xie <elephant@linux.net.cn>
#
# Original translations.
#
@@ -11,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@ msgstr "E102: 找不到缓冲区 \"%s\""
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: 缓冲区 \"%s\" 不在 diff 模式"
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: 意外地改变了缓冲区"
+
msgid "E104: Escape not allowed in digraph"
msgstr "E104: 复合字符(digraph)中不能使用 Escape"
@@ -222,8 +229,8 @@ 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)"
@@ -256,8 +263,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)"
@@ -489,9 +496,8 @@ msgstr "E722: Dictionary 中缺少逗号: %s"
msgid "E723: Missing end of Dictionary '}': %s"
msgstr "E723: Dictionary 缺少结束符 '}': %s"
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: 变量嵌套过深"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: 变量嵌套过深无法显示"
msgid "E699: Too many arguments"
msgstr "E699: 参数过多"
@@ -529,8 +535,8 @@ 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() 的类型无效"
@@ -560,9 +566,8 @@ msgstr "E655: 符号连接过多(循环？)"
msgid "E258: Unable to send to client"
msgstr "E258: 无法发送到客户端"
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort 比较函数失败"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort 比较函数失败"
msgid "(Invalid)"
msgstr "(无效)"
@@ -611,9 +616,8 @@ msgstr "未知"
msgid "E742: Cannot change value of %s"
msgstr "E742: 无法改变 %s 的值"
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: 变量嵌套过深"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: 变量嵌套过深无法复制"
#, c-format
msgid "E124: Missing '(': %s"
@@ -682,136 +686,6 @@ msgstr ""
"\n"
"\t最近修改于 "
-msgid "Entering Debug mode. Type \"cont\" to continue."
-msgstr "进入调试模式。输入 \"cont\" 继续运行。"
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "第 %ld 行: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "命令: %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "断点 \"%s%s\" 第 %ld 行"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: 找不到断点: %s"
-
-msgid "No breakpoints defined"
-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 "Untitled"
-msgstr "未命名"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: 缓冲区 \"%s\" 已修改但尚未保存"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: 只有一个文件可编辑"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: 无法切换，已是第一个文件"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: 无法切换，已是最后一个文件"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: 不支持编译器: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "正在查找 \"%s\"，在 \"%s\" 中"
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "正在查找 \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "在 'runtimepath' 中找不到 \"%s\""
-
-msgid "Source Vim script"
-msgstr "执行 Vim 脚本"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "不能执行目录: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "不能执行 \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "第 %ld 行: 不能执行 \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "执行 \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "第 %ld 行: 执行 \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "结束执行 %s"
-
-msgid "modeline"
-msgstr "modeline"
-
-msgid "--cmd argument"
-msgstr "--cmd 参数"
-
-msgid "-c argument"
-msgstr "-c 参数"
-
-msgid "environment variable"
-msgstr "环境变量"
-
-#~ msgid "error handler"
-#~ msgstr ""
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: 警告: 错误的行分隔符，可能是少了 ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: 在脚本文件外使用了 :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: 在脚本文件外使用了 :finish"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "当前的 %s语言: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: 不能设定语言为 \"%s\""
-
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, 十六进制 %02x, 八进制 %03o"
@@ -844,8 +718,8 @@ msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
msgid "[No write since last change]\n"
msgstr "[已修改但尚未保存]\n"
-#, c-format
# bad to translate
+#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s 位于行: "
@@ -877,14 +751,14 @@ msgstr "E138: 无法写入 viminfo 文件 %s！"
msgid "Writing viminfo file \"%s\""
msgstr "写入 viminfo 文件 \"%s\""
+# do not translate to avoid writing Chinese in files
#. Write the info:
#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# 这个 viminfo 文件是由 vim %s 生成的。\n"
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# 这个 viminfo 文件是由 Vim %s 生成的。\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -892,14 +766,17 @@ msgstr ""
"# 如果要自行修改请特别小心！\n"
"\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' 在此文件建立时的值\n"
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' 在此文件建立时的值\n"
msgid "Illegal starting char"
msgstr "无效的启动字符"
+msgid "Save As"
+msgstr "另存为"
+
msgid "Write partial file?"
msgstr "要写入部分文件吗？"
@@ -987,8 +864,8 @@ msgstr "E148: global 缺少正则表达式"
msgid "Pattern found in every line: %s"
msgstr "每行都匹配表达式: %s"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1071,6 +948,133 @@ msgstr " (不支持)"
msgid "[Deleted]"
msgstr "[已删除]"
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "进入调试模式。输入 \"cont\" 继续运行。"
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "第 %ld 行: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "命令: %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "断点 \"%s%s\" 第 %ld 行"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: 找不到断点: %s"
+
+msgid "No breakpoints defined"
+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>"
+
+#, c-format
+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\" 已修改但尚未保存"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: 只有一个文件可编辑"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: 无法切换，已是第一个文件"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: 无法切换，已是最后一个文件"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: 不支持编译器: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "正在查找 \"%s\"，在 \"%s\" 中"
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "正在查找 \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr "在 'runtimepath' 中找不到 \"%s\""
+
+msgid "Source Vim script"
+msgstr "执行 Vim 脚本"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "不能执行目录: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "不能执行 \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "第 %ld 行: 不能执行 \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "执行 \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "第 %ld 行: 执行 \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "结束执行 %s"
+
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd 参数"
+
+msgid "-c argument"
+msgstr "-c 参数"
+
+msgid "environment variable"
+msgstr "环境变量"
+
+#~ msgid "error handler"
+#~ msgstr ""
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: 警告: 错误的行分隔符，可能是少了 ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: 在脚本文件外使用了 :scriptencoding"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: 在脚本文件外使用了 :finish"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "当前的 %s语言: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: 不能设定语言为 \"%s\""
+
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
@@ -1179,7 +1183,7 @@ msgstr "E467: Custom 补全需要一个函数参数"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: 找不到颜色主题 %s"
+msgstr "E185: 找不到配色方案 %s"
msgid "Greetings, Vim user!"
msgstr "您好，Vim 用户！"
@@ -1391,6 +1395,9 @@ msgstr "E602: :endtry 缺少对应的 :try"
msgid "E193: :endfunction not inside a function"
msgstr "E193: :endfunction 不在函数内"
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: 目前不允许编辑别的缓冲区"
+
msgid "tagname"
msgstr "tag 名"
@@ -1400,8 +1407,8 @@ msgstr " 类型 文件\n"
msgid "'history' option is zero"
msgstr "选项 'history' 为零"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@ msgstr ""
"\n"
"# %s 历史记录 (从新到旧):\n"
-msgid "Command Line"
-msgstr "命令行"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr "命令行"
-msgid "Search String"
-msgstr "查找字符串"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "查找字符串"
-msgid "Expression"
-msgstr "表达式"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "表达式"
-msgid "Input Line"
-msgstr "输入行"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr "输入行"
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar 超过命令长度"
@@ -1550,9 +1565,8 @@ msgstr "E509: 无法创建备份文件 (请加 ! 强制执行)"
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: 无法生成备份文件 (请加 ! 强制执行)"
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork 会消失 (请加 ! 强制执行)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork 会丢失 (请加 ! 强制执行)"
msgid "E214: Can't find temp file for writing"
msgstr "E214: 找不到用于写入的临时文件"
@@ -1836,6 +1850,29 @@ msgstr "找不到映射"
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: 无效的模式"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: 无法启动图形界面"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: 无法读取文件 \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: 无法启动图形界面，找不到有效的字体"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 无效的 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' 的值无效"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: 无法分配颜色 %s"
+
+msgid "No match at cursor, finding next"
+msgstr "在光标处没有匹配，查找下一个"
+
msgid "<cannot open> "
msgstr "<无法打开>"
@@ -1858,38 +1895,15 @@ msgstr "确定"
msgid "Cancel"
msgstr "取消"
-msgid "Vim dialog"
-msgstr "Vim 对话框"
-
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
msgstr "滚动条部件: 无法获取滑块图像的几何大小"
+msgid "Vim dialog"
+msgstr "Vim 对话框"
+
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: 不能同时使用消息和回调函数来创建 BalloonEval"
-msgid "E229: Cannot start the GUI"
-msgstr "E229: 无法启动图形界面"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: 不能读取文件 \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: 无法启动图形界面，找不到有效的字体"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: 无效的 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' 的值无效"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: 无法分配颜色 %s"
-
-msgid "No match at cursor, finding next"
-msgstr "在光标处没有匹配，查找下一个"
-
msgid "Vim dialog..."
msgstr "Vim 对话框..."
@@ -2027,6 +2041,12 @@ msgstr "E243: 不支持的参数: \"-%s\"；请使用 OLE 版本。"
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: 无法在 MDI 应用程序中打开窗口"
+msgid "Close tab"
+msgstr "关闭标签"
+
+msgid "Open tab..."
+msgstr "打开标签..."
+
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "查找字符串 (使用 '\\\\' 来查找 '\\')"
@@ -2084,40 +2104,36 @@ msgstr ""
"字体1的宽度: %ld\n"
"\n"
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "不正确的字体集(Fontset)"
+msgid "Invalid font specification"
+msgstr "指定了无效的字体"
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "取消(&D)"
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "找不到匹配的项"
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "字体选择"
+msgid "Vim - Font Selector"
+msgstr "Vim - 字体选择器"
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr "名称:"
#. create toggle button
#~ msgid "Show size in Points"
#~ msgstr ""
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "记录中"
+msgid "Encoding:"
+msgstr "编码:"
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "字体1: %s\n"
+msgid "Font:"
+msgstr "字体:"
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr "风格:"
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "尺寸:"
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata 错误"
@@ -3021,8 +3037,8 @@ msgstr ""
msgid "-display <display>\tRun vim on <display> (also: --display)"
msgstr "-display <display>\t在 <display> 上运行 vim (也可用 --display)"
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\t设置用于区分主窗口的窗口角色名"
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\t在另一个 GTK 部件中打开 Vim"
@@ -3030,8 +3046,8 @@ 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 ""
+msgid "No display"
+msgstr "没有 display"
#. Failed to send, abort.
msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@ msgstr ": 发送失败。尝试本地执行\n"
msgid "%d of %d edited"
msgstr "%d 中 %d 已编辑"
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "发送表达式失败。\n"
+msgid "No display: Send expression failed.\n"
+msgstr "没有 display: 发送表达式失败。\n"
msgid ": Send expression failed.\n"
msgstr ": 发送表达式失败。\n"
@@ -3241,49 +3256,49 @@ msgstr "E308: 警告: 原始文件可能已被修改"
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: 无法从 %s 读取块 1"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???缺少了太多行"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???行数错误"
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???缺少了太多行"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???空的块"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???行数错误"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???空的块"
+
# do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???缺少了一些行"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???缺少了一些行"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
msgstr "E310: 块 1 ID 错误 (%s 不是交换文件？)"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???缺少块"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? 从这里到 ???END 的行可能已混乱"
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???缺少块"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? 从这里到 ???END 的行可能已混乱"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? 从这里到 ???END 的行可能已被插入/删除过"
+
# do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
msgid "E311: Recovery Interrupted"
msgstr "E311: 恢复已被中断"
@@ -3810,18 +3825,18 @@ msgid "E347: No more file \"%s\" found in path"
msgstr "E347: 在路径中找不到更多的文件 \"%s\""
#. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "无法连接到 Netbeans #2"
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "无法连接到 Netbeans"
#, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans 连接信息文件中错误的访问模式: \"%s\""
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr "从 Netbeans 套接字读取"
#, c-format
msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@ msgstr "E574: 未知的寄存器类型 %d"
msgid "%ld Cols; "
msgstr "%ld 列; "
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字节"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "选择了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字符(Chars); %ld/%ld"
+msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字符; %ld/%ld 个字节"
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr "列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr "第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字节"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-"列 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字符(Char) %ld/%ld; 字符(Byte) %ld/%ld"
+"第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字符; 第 %ld/%ld 个"
+"字节"
#, c-format
#~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@ msgstr "ANCHOR_BUF_SIZE 太小"
msgid "I/O ERROR"
msgstr "I/O 错误"
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "消息"
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' 不是 80, 不能执行外部命令"
msgid "E237: Printer selection failed"
-msgstr "E237: 不能选择此打印机"
+msgstr "E237: 选择打印机失败"
#, c-format
msgid "to %s on %s"
@@ -4203,7 +4216,7 @@ msgstr "E238: 打印错误: %s"
#, c-format
msgid "Printing '%s'"
-msgstr "已打印: '%s'"
+msgstr "打印 '%s'"
#, c-format
msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@ msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: 不正确的字符 '%c' 出现在字体名称 \"%s\" 内"
msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: 不正确的 'filetype' 选项 - 使用纯文字模式"
+msgstr "E366: 不正确的 'osfiletype' 选项 - 使用纯文字模式"
msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: 双重信号, 退出中\n"
+msgstr "Vim: 双重信号，退出中\n"
#, c-format
msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: 拦截到信号(signal) %s\n"
+msgstr "Vim: 拦截到致命信号(deadly signal) %s\n"
#, c-format
msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: 拦截到致命的信号(deadly signale)\n"
+msgstr "Vim: 拦截到致命信号(deadly signal)\n"
#, c-format
msgid "Opening the X display took %ld msec"
-msgstr "打开 X Window 用时 %ld 秒"
+msgstr "打开 X display 用时 %ld 秒"
msgid ""
"\n"
@@ -4239,24 +4252,24 @@ msgstr ""
"Vim: X 错误\n"
msgid "Testing the X display failed"
-msgstr "测试 X Window 失败"
+msgstr "测试 X display 失败"
msgid "Opening the X display timed out"
-msgstr "打开 X Window 超时"
+msgstr "打开 X display 超时"
msgid ""
"\n"
"Cannot execute shell "
msgstr ""
"\n"
-"不能执行 shell"
+"无法执行 shell"
msgid ""
"\n"
"Cannot execute shell sh\n"
msgstr ""
"\n"
-"不能执行 shell sh\n"
+"无法执行 shell sh\n"
msgid ""
"\n"
@@ -4270,14 +4283,14 @@ msgid ""
"Cannot create pipes\n"
msgstr ""
"\n"
-"不能建立管道\n"
+"无法建立管道\n"
msgid ""
"\n"
"Cannot fork\n"
msgstr ""
"\n"
-"不能 fork\n"
+"无法 fork\n"
msgid ""
"\n"
@@ -4286,46 +4299,45 @@ msgstr ""
"\n"
"命令已结束\n"
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "显示连接"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP 丢失了到 ICE 的连接"
+# do not translate
#, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
msgid "Opening the X display failed"
-msgstr "打开 X Window 失败"
+msgstr "打开 X display 失败"
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP 处理 save-yourself 请求"
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "没有 cscope 连接"
+msgid "XSMP opening connection"
+msgstr "XSMP 打开连接"
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE 连接监视失败"
#, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection 调用失败: %s"
msgid "At line"
msgstr "在行号 "
msgid "Could not load vim32.dll!"
-msgstr "不能加载 vim32.dll！"
+msgstr "无法加载 vim32.dll！"
msgid "VIM Error"
msgstr "VIM 错误"
msgid "Could not fix up function pointers to the DLL!"
-msgstr "不能修正函数指针到 DLL!"
+msgstr "无法修正到 DLL 的函数指针!"
#, c-format
msgid "shell returned %d"
-msgstr "Shell 返回值 %d"
+msgstr "Shell 返回 %d"
#, c-format
msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@ msgid ""
"External commands will not pause after completion.\n"
"See :help win32-vimrun for more information."
msgstr ""
-"在你的 $PATH 中找不到 VIMRUN.EXE.\n"
-"外部命令执行完毕后将不会暂停.\n"
+"在你的 $PATH 中找不到 VIMRUN.EXE。\n"
+"外部命令执行完毕后将不会暂停。\n"
"进一步说明请见 :help win32-vimrun"
msgid "Vim Warning"
@@ -4407,8 +4419,8 @@ msgstr "错误列表 %d / %d；共 %d 个错误"
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 无法写入，已设定选项 'buftype'"
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: 缺少文件名或模式无效"
#, c-format
msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@ msgstr " 找不到"
msgid "Scanning included file: %s"
msgstr "查找包含文件: %s"
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "查找包含文件: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "查找包含的文件 %s"
msgid "E387: Match is on current line"
msgstr "E387: 当前行匹配"
@@ -4622,339 +4634,339 @@ msgstr "E388: 找不到定义"
msgid "E389: Couldn't find pattern"
msgstr "E389: 找不到 pattern"
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: 交换文件写入错误"
+msgid "E759: Format error in spell file"
+msgstr "E759: 拼写文件格式错误"
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: 不能选择此打印机"
+msgid "E758: Truncated spell file"
+msgstr "E758: 已截断的拼写文件"
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s 第 %d 行，多余的后续字符: %s"
#, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s 第 %d 行，附加项名字太长: %s"
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag 文件 \"%s\" 格式错误"
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: 附加文件 FOL、LOW 或 UPP 中格式错误"
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL、LOW 或 UPP 中字符超出范围"
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
+msgid "Compressing word tree..."
+msgstr "压缩单词树……"
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: 拼写检查未启用"
#, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "警告: 找不到单词列表 \"%s.%s.spl\" or \"%s.ascii.spl\""
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "使用交换文件 \"%s\""
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "读取拼写文件 \"%s\""
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: 这看起来不像是拼写文件"
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: 还有 %ld 个文件未编辑"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: 旧版本的拼写文件，需要更新"
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: 为更高版本的 Vim 所用的拼写文件"
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: 交换文件写入错误"
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: 拼写文件中存在不支持的节"
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "不支持该选项"
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "警告: 区域 %s 不支持"
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr "查找 tag 文件 \"%s\""
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "读取附加文件 %s ……"
#, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr "单词 %s 转换失败，第 %d 行: %s"
#, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "不支持 %s 中的转换: 从 %s 到 %s"
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "不支持该选项"
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "不支持 %s 中的转换"
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "不正确的服务器 id : %s"
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s 第 %d 行，FLAG 的值无效: %s"
#, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s 第 %d 行，在使用标志后出现 FLAG: %s"
#, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDWORDMAX 值: %s"
#, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDMIN 值: %s"
#, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 COMPOUNDSYLMAX 值: %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: 标签(tag) \"%s\" 在文件 %s 里重复出现多次"
+#, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的 CHECKCOMPOUNDPATTERN 值: %s"
#, c-format
-#~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s 第 %d 行，在连续的附加块中出现不同的组合标志: %s"
#, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的附加项: %s"
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" 中断点: 第 %ld 行"
+#, c-format
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s 第 %d 行，附加项被 BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST 使"
+"用: %s"
#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s 第 %d 行，此处需要 Y 或 N: %s"
#, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s 第 %d 行，错误的条件: %s"
#, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s 第 %d 行，此处需要 REP(SAL) 计数"
#, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s 第 %d 行，此处需要 MAP 计数"
#, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s 第 %d 行，MAP 中存在重复的字符"
#, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s 第 %d 行，无法识别或重复的项: %s"
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s 中缺少 FOL/LOW/UPP 行"
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "太多编辑参数"
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "在没有 SYLLABLE 的情况下使用了 COMPOUNDSYLMAX"
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "太多编辑参数"
+msgid "Too many postponed prefixes"
+msgstr "太多延迟前缀"
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+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 ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s 中缺少 SOFO%s 行"
#, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s 同时出现 SQL 和 SOFO 行"
#, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s 第 %d 行，标志不是数字: %s"
#, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s 第 %d 行，无效的标志: %s"
#, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s 的值与另一个 .aff 文件中使用的值不相同"
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "扫描字典: %s"
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "读取字典文件 %s ……"
#, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "E760: No word count in %s"
+msgstr "E760: %s 中没有单词计数"
#, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
+msgid "line %6d, word %6d - %s"
+msgstr "第 %6d 行，第 %6d 个单词 - %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "每一行都找不到模式: %s"
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的单词: %s"
#, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s 第 %d 行，首次重复的单词: %s"
#, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "%d duplicate word(s) in %s"
+msgstr "存在 %d 个重复的单词，在 %s 中"
#, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "忽略了含有非 ASCII 字符的 %d 个单词，在 %s 中"
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "从标准输入读..."
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "读取单词文件 %s ……"
#, c-format
#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
#~ msgstr ""
#, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，单词后的 /encoding= 行已被忽略: %s"
#, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，重复的 /regions= 行已被忽略: %s"
#, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s 第 %d 行，太多区域: %s"
#, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s 第 %d 行，/ 行已被忽略: %s"
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "不正确的服务器 id : %s"
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s 第 %d 行，无效的区域号: %s"
#, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s 第 %d 行，不可识别的标志: %s"
#, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "忽略了含有非 ASCII 字符的 %d 个单词"
#, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "压缩了 %d/%d 个节点；剩余 %d (%d%%)"
-#~ msgid "Reading back spell file..."
-#~ 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 ""
+msgid "Performing soundfolding..."
+msgstr "正在 soundfolding……"
#, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding 后的单词数: %ld"
#, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
+msgid "Total number of words: %d"
+msgstr "单词总数: %d"
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "写入建议文件 %s ……"
#, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "估计运行时内存用量: %d 字节"
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
+msgid "E751: Output file name must not have region name"
+msgstr "E751: 输出文件名不能含有区域名"
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: 最多只支持 8 个区域"
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: 不正确的表达式: %s"
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s 出现无效的范围"
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr "警告: 同时指定了 compounding 和 NOBREAK"
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "写入 viminfo 文件 \"%s\" 中"
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "写入拼写文件 %s ……"
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr "向下"
+msgid "Done!"
+msgstr "完成！"
#, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' 没有 %ld 项"
#, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "Word removed from %s"
+msgstr "从 %s 中删除了单词"
#, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Word added to %s"
+msgstr "向 %s 中添加了单词"
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: 拼写文件之间的字符不相同"
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Sorry, no suggestions"
+msgstr "抱歉，没有建议"
#, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "Sorry, only %ld suggestions"
+msgstr "抱歉，只有 %ld 条建议"
#. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "将改变保存到 \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "将 \"%.*s\" 改为："
#, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: 没有前一个查找命令"
+msgid "E752: No previous spell replacement"
+msgstr "E752: 之前没有拼写替换"
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [菜单] 找不到 %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 找不到: %s"
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s 看起来不像是 Vim 交换文件"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: 看起来不像是 .sug 文件: %s"
#, c-format
#~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@ msgid "E397: Filename required"
msgstr "E397: 需要文件名称"
#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: 缺少 ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: 缺少 ']': %s"
#, c-format
msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@ msgstr "E409: 不正确的组名: %s"
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: 不正确的 :syntax 子命令: %s"
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: 加载 syncolor.vim 时出现嵌套循环"
#, c-format
msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@ msgstr "E423: 无效的参数: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: 使用了太多不同的高亮度属性"
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: 组名中存在不可显示字符"
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: 命令名称不正确"
+msgid "W18: Invalid character in group name"
+msgstr "W18: 组名中含有无效字符"
msgid "E555: at bottom of tag stack"
msgstr "E555: 已在 tag 堆栈底部"
@@ -5648,6 +5659,9 @@ msgstr "警告: 检测到 Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
msgstr "输入 :help windows95<Enter> 查看相关说明 "
+msgid "Already only one window"
+msgstr "已经只剩一个窗口了"
+
msgid "E441: There is no preview window"
msgstr "E441: 没有预览窗口"
@@ -5660,9 +5674,6 @@ msgstr "E443: 有其它分割窗口时不能旋转"
msgid "E444: Cannot close last window"
msgstr "E444: 不能关闭最后一个窗口"
-msgid "Already only one window"
-msgstr "已经只剩一个窗口了"
-
msgid "E445: Other window contains changes"
msgstr "E445: 其它窗口有改变的内容"
@@ -6050,6 +6061,9 @@ msgstr "已查找到文件开头，再从结尾继续查找"
msgid "search hit BOTTOM, continuing at TOP"
msgstr "已查找到文件结尾，再从开头继续查找"
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s 第 %d 行，使用 PFXPOSTPONE 时附加标志被忽略: %s"
+
#~ msgid "[No file]"
#~ msgstr "[未命名]"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index dd4df46e5..591839f40 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -4,6 +4,10 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# FIRST AUTHOR Wang Jun <junw@turbolinux.com.cn>
+#
+# TRANSLATORS
+# Edyfox <edyfox@gmail.com>
+# Yuheng Xie <elephant@linux.net.cn>
#
# Generated from zh_CN.po, DO NOT EDIT.
#
@@ -11,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@ msgstr "E102: Ҳ \"%s\""
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: \"%s\" diff ģʽ"
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ظı˻"
+
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ַ(digraph)вʹ Escape"
@@ -222,8 +229,8 @@ 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)"
@@ -256,8 +263,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)"
@@ -489,9 +496,8 @@ msgstr "E722: Dictionary ȱٶ: %s"
msgid "E723: Missing end of Dictionary '}': %s"
msgstr "E723: Dictionary ȱٽ '}': %s"
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: Ƕ׹"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: Ƕ׹޷ʾ"
msgid "E699: Too many arguments"
msgstr "E699: "
@@ -529,8 +535,8 @@ 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() Ч"
@@ -560,9 +566,8 @@ msgstr "E655: ӹ(ѭ)"
msgid "E258: Unable to send to client"
msgstr "E258: ޷͵ͻ"
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort ȽϺʧ"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort ȽϺʧ"
msgid "(Invalid)"
msgstr "(Ч)"
@@ -611,9 +616,8 @@ msgstr "δ֪"
msgid "E742: Cannot change value of %s"
msgstr "E742: ޷ı %s ֵ"
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: Ƕ׹"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: Ƕ׹޷"
#, c-format
msgid "E124: Missing '(': %s"
@@ -682,136 +686,6 @@ msgstr ""
"\n"
"\t޸ "
-msgid "Entering Debug mode. Type \"cont\" to continue."
-msgstr "ģʽ \"cont\" С"
-
-#, c-format
-msgid "line %ld: %s"
-msgstr " %ld : %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr ": %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ϵ \"%s%s\" %ld "
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Ҳϵ: %s"
-
-msgid "No breakpoints defined"
-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 "Untitled"
-msgstr "δ"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: \"%s\" ޸ĵδ"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ": ؽ (Զ)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: ֻһļɱ༭"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: ޷лǵһļ"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: ޷лһļ"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ֱ֧: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "ڲ \"%s\" \"%s\" "
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "ڲ \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr " 'runtimepath' Ҳ \"%s\""
-
-msgid "Source Vim script"
-msgstr "ִ Vim ű"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "ִĿ¼: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "ִ \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr " %ld : ִ \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "ִ \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr " %ld : ִ \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "ִ %s"
-
-msgid "modeline"
-msgstr "modeline"
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr ""
-
-#~ msgid "error handler"
-#~ msgstr ""
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: : зָ ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ڽűļʹ :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ڽűļʹ :finish"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "ǰ %s: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: 趨Ϊ \"%s\""
-
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, ʮ %02x, ˽ %03o"
@@ -844,8 +718,8 @@ msgstr "E135: *Filter* ԶԸı䵱ǰ"
msgid "[No write since last change]\n"
msgstr "[޸ĵδ]\n"
-#, c-format
# bad to translate
+#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s λ: "
@@ -877,14 +751,14 @@ msgstr "E138: ޷д viminfo ļ %s"
msgid "Writing viminfo file \"%s\""
msgstr "д viminfo ļ \"%s\""
+# do not translate to avoid writing Chinese in files
#. Write the info:
#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# viminfo ļ vim %s ɵġ\n"
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# viminfo ļ Vim %s ɵġ\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -892,14 +766,17 @@ msgstr ""
"# Ҫ޸رСģ\n"
"\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' ڴļʱֵ\n"
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' ڴļʱֵ\n"
msgid "Illegal starting char"
msgstr "Чַ"
+msgid "Save As"
+msgstr "Ϊ"
+
msgid "Write partial file?"
msgstr "Ҫд벿ļ"
@@ -987,8 +864,8 @@ msgstr "E148: global ȱʽ"
msgid "Pattern found in every line: %s"
msgstr "ÿжƥʽ: %s"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1071,6 +948,133 @@ msgstr " (֧)"
msgid "[Deleted]"
msgstr "[ɾ]"
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "ģʽ \"cont\" С"
+
+#, c-format
+msgid "line %ld: %s"
+msgstr " %ld : %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr ": %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ϵ \"%s%s\" %ld "
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Ҳϵ: %s"
+
+msgid "No breakpoints defined"
+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>"
+
+#, c-format
+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\" ޸ĵδ"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr ": ؽ (Զ)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: ֻһļɱ༭"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: ޷лǵһļ"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: ޷лһļ"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ֱ֧: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "ڲ \"%s\" \"%s\" "
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "ڲ \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr " 'runtimepath' Ҳ \"%s\""
+
+msgid "Source Vim script"
+msgstr "ִ Vim ű"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "ִĿ¼: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "ִ \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr " %ld : ִ \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "ִ \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr " %ld : ִ \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "ִ %s"
+
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr ""
+
+#~ msgid "error handler"
+#~ msgstr ""
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: : зָ ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: ڽűļʹ :scriptencoding"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: ڽűļʹ :finish"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "ǰ %s: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: 趨Ϊ \"%s\""
+
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr " Ex ģʽ \"visual\" صģʽ"
@@ -1179,7 +1183,7 @@ msgstr "E467: Custom ȫҪһ"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Ҳɫ %s"
+msgstr "E185: Ҳɫ %s"
msgid "Greetings, Vim user!"
msgstr "ãVim û"
@@ -1391,6 +1395,9 @@ msgstr "E602: :endtry ȱٶӦ :try"
msgid "E193: :endfunction not inside a function"
msgstr "E193: :endfunction ں"
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: Ŀǰ༭Ļ"
+
msgid "tagname"
msgstr "tag "
@@ -1400,8 +1407,8 @@ msgstr " ļ\n"
msgid "'history' option is zero"
msgstr "ѡ 'history' Ϊ"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@ msgstr ""
"\n"
"# %s ʷ¼ (µ):\n"
-msgid "Command Line"
-msgstr ""
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr ""
-msgid "Search String"
-msgstr "ַ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "ַ"
-msgid "Expression"
-msgstr "ʽ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "ʽ"
-msgid "Input Line"
-msgstr ""
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr ""
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar "
@@ -1550,9 +1565,8 @@ msgstr "E509: ޷ļ ( ! ǿִ)"
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: ޷ɱļ ( ! ǿִ)"
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork ʧ ( ! ǿִ)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork ᶪʧ ( ! ǿִ)"
msgid "E214: Can't find temp file for writing"
msgstr "E214: Ҳдʱļ"
@@ -1836,6 +1850,29 @@ msgstr "Ҳӳ"
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: Чģʽ"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: ޷ͼν"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: ޷ȡļ \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ޷ͼν棬ҲЧ"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: Ч 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' ֵЧ"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ޷ɫ %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ڹ괦ûƥ䣬һ"
+
msgid "<cannot open> "
msgstr "<޷>"
@@ -1858,38 +1895,15 @@ msgstr "ȷ"
msgid "Cancel"
msgstr "ȡ"
-msgid "Vim dialog"
-msgstr "Vim Ի"
-
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
msgstr ": ޷ȡͼļδС"
+msgid "Vim dialog"
+msgstr "Vim Ի"
+
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: ͬʱʹϢͻص BalloonEval"
-msgid "E229: Cannot start the GUI"
-msgstr "E229: ޷ͼν"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: ܶȡļ \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: ޷ͼν棬ҲЧ"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: Ч 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' ֵЧ"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ޷ɫ %s"
-
-msgid "No match at cursor, finding next"
-msgstr "ڹ괦ûƥ䣬һ"
-
msgid "Vim dialog..."
msgstr "Vim Ի..."
@@ -2027,6 +2041,12 @@ msgstr "E243: ֵ֧IJ: \"-%s\"ʹ OLE 汾"
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: ޷ MDI Ӧóд򿪴"
+msgid "Close tab"
+msgstr "رձǩ"
+
+msgid "Open tab..."
+msgstr "򿪱ǩ..."
+
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "ַ (ʹ '\\\\' '\\')"
@@ -2084,40 +2104,36 @@ msgstr ""
"1Ŀ: %ld\n"
"\n"
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "ȷ弯(Fontset)"
+msgid "Invalid font specification"
+msgstr "ָЧ"
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "ȡ(&D)"
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "Ҳƥ"
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "ѡ"
+msgid "Vim - Font Selector"
+msgstr "Vim - ѡ"
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr ":"
#. create toggle button
#~ msgid "Show size in Points"
#~ msgstr ""
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "¼"
+msgid "Encoding:"
+msgstr ":"
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "1: %s\n"
+msgid "Font:"
+msgstr ":"
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr ":"
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "ߴ:"
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata "
@@ -3021,8 +3037,8 @@ msgstr ""
msgid "-display <display>\tRun vim on <display> (also: --display)"
msgstr "-display <display>\t <display> vim (Ҳ --display)"
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tڵĴڽɫ"
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\tһ GTK д Vim"
@@ -3030,8 +3046,8 @@ 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 ""
+msgid "No display"
+msgstr "û display"
#. Failed to send, abort.
msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@ msgstr ": ʧܡԱִ\n"
msgid "%d of %d edited"
msgstr "%d %d ѱ༭"
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "ͱʽʧܡ\n"
+msgid "No display: Send expression failed.\n"
+msgstr "û display: ͱʽʧܡ\n"
msgid ": Send expression failed.\n"
msgstr ": ͱʽʧܡ\n"
@@ -3241,49 +3256,49 @@ msgstr "E308: : ԭʼļѱ޸"
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: ޷ %s ȡ 1"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???ȱ̫"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???"
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???ȱ̫"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???յĿ"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???յĿ"
+
# do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???ȱһЩ"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???ȱһЩ"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
msgstr "E310: 1 ID (%s ǽļ)"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???ȱٿ"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ﵽ ???END пѻ"
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???ȱٿ"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ﵽ ???END пѱ/ɾ"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? ﵽ ???END пѻ"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? ﵽ ???END пѱ/ɾ"
+
# do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
msgid "E311: Recovery Interrupted"
msgstr "E311: ָѱж"
@@ -3810,18 +3825,18 @@ msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ·Ҳļ \"%s\""
#. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "޷ӵ Netbeans #2"
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "޷ӵ Netbeans"
#, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans Ϣļдķģʽ: \"%s\""
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr " Netbeans ׽ֶȡ"
#, c-format
msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@ msgstr "E574: δ֪ļĴ %d"
msgid "%ld Cols; "
msgstr "%ld ; "
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "ѡ %s%ld/%ld ; %ld/%ld (Word); %ld/%ld ַ(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "ѡ %s%ld/%ld ; %ld/%ld ; %ld/%ld ֽ"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "ѡ %s%ld/%ld ; %ld/%ld (Word); %ld/%ld ַ(Chars); %ld/%ld"
+msgstr "ѡ %s%ld/%ld ; %ld/%ld ; %ld/%ld ַ; %ld/%ld ֽ"
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr " %s/%s; %ld/%ld; (Word) %ld/%ld; ַ(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr " %s/%s ; %ld/%ld ; %ld/%ld ; %ld/%ld ֽ"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-" %s/%s; %ld/%ld; (Word) %ld/%ld; ַ(Char) %ld/%ld; ַ(Byte) %ld/%ld"
+" %s/%s ; %ld/%ld ; %ld/%ld ; %ld/%ld ַ; %ld/%ld "
+"ֽ"
#, c-format
#~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@ msgstr "ANCHOR_BUF_SIZE ̫С"
msgid "I/O ERROR"
msgstr "I/O "
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "Ϣ"
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' 80, ִⲿ"
msgid "E237: Printer selection failed"
-msgstr "E237: ѡ˴ӡ"
+msgstr "E237: ѡӡʧ"
#, c-format
msgid "to %s on %s"
@@ -4203,7 +4216,7 @@ msgstr "E238: ӡ: %s"
#, c-format
msgid "Printing '%s'"
-msgstr "Ѵӡ: '%s'"
+msgstr "ӡ '%s'"
#, c-format
msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@ msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: ȷַ '%c' \"%s\" "
msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: ȷ 'filetype' ѡ - ʹôģʽ"
+msgstr "E366: ȷ 'osfiletype' ѡ - ʹôģʽ"
msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: ˫ź, ˳\n"
+msgstr "Vim: ˫źţ˳\n"
#, c-format
msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: صź(signal) %s\n"
+msgstr "Vim: صź(deadly signal) %s\n"
#, c-format
msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: صź(deadly signale)\n"
+msgstr "Vim: صź(deadly signal)\n"
#, c-format
msgid "Opening the X display took %ld msec"
-msgstr " X Window ʱ %ld "
+msgstr " X display ʱ %ld "
msgid ""
"\n"
@@ -4239,24 +4252,24 @@ msgstr ""
"Vim: X \n"
msgid "Testing the X display failed"
-msgstr " X Window ʧ"
+msgstr " X display ʧ"
msgid "Opening the X display timed out"
-msgstr " X Window ʱ"
+msgstr " X display ʱ"
msgid ""
"\n"
"Cannot execute shell "
msgstr ""
"\n"
-"ִ shell"
+"޷ִ shell"
msgid ""
"\n"
"Cannot execute shell sh\n"
msgstr ""
"\n"
-"ִ shell sh\n"
+"޷ִ shell sh\n"
msgid ""
"\n"
@@ -4270,14 +4283,14 @@ msgid ""
"Cannot create pipes\n"
msgstr ""
"\n"
-"ܽܵ\n"
+"޷ܵ\n"
msgid ""
"\n"
"Cannot fork\n"
msgstr ""
"\n"
-" fork\n"
+"޷ fork\n"
msgid ""
"\n"
@@ -4286,46 +4299,45 @@ msgstr ""
"\n"
"ѽ\n"
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "ʾ"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ʧ˵ ICE "
+# do not translate
#, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
msgid "Opening the X display failed"
-msgstr " X Window ʧ"
+msgstr " X display ʧ"
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP save-yourself "
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "û cscope "
+msgid "XSMP opening connection"
+msgstr "XSMP "
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE Ӽʧ"
#, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection ʧ: %s"
msgid "At line"
msgstr "к "
msgid "Could not load vim32.dll!"
-msgstr "ܼ vim32.dll"
+msgstr "޷ vim32.dll"
msgid "VIM Error"
msgstr "VIM "
msgid "Could not fix up function pointers to the DLL!"
-msgstr "ָ뵽 DLL!"
+msgstr "޷ DLL ĺָ!"
#, c-format
msgid "shell returned %d"
-msgstr "Shell ֵ %d"
+msgstr "Shell %d"
#, c-format
msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@ msgid ""
"External commands will not pause after completion.\n"
"See :help win32-vimrun for more information."
msgstr ""
-" $PATH Ҳ VIMRUN.EXE.\n"
-"ⲿִϺ󽫲ͣ.\n"
+" $PATH Ҳ VIMRUN.EXE\n"
+"ⲿִϺ󽫲ͣ\n"
"һ˵ :help win32-vimrun"
msgid "Vim Warning"
@@ -4407,8 +4419,8 @@ msgstr "б %d / %d %d "
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: ޷д룬趨ѡ 'buftype'"
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: ȱļģʽЧ"
#, c-format
msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@ msgstr " Ҳ"
msgid "Scanning included file: %s"
msgstr "Ұļ: %s"
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "Ұļ: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "Ұļ %s"
msgid "E387: Match is on current line"
msgstr "E387: ǰƥ"
@@ -4622,339 +4634,339 @@ msgstr "E388: Ҳ"
msgid "E389: Couldn't find pattern"
msgstr "E389: Ҳ pattern"
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: ļд"
+msgid "E759: Format error in spell file"
+msgstr "E759: ƴдļʽ"
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: ѡ˴ӡ"
+msgid "E758: Truncated spell file"
+msgstr "E758: ѽضϵƴдļ"
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" жϵ: %ld "
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s %d Уĺַ: %s"
#, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s %d У̫: %s"
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag ļ \"%s\" ʽ"
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: ļ FOLLOW UPP иʽ"
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOLLOW UPP ַΧ"
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
+msgid "Compressing word tree..."
+msgstr "ѹ"
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ƴдδ"
#, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ": Ҳб \"%s.%s.spl\" or \"%s.ascii.spl\""
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "ʹýļ \"%s\""
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "ȡƴдļ \"%s\""
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s Vim ļ"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: ⿴ƴдļ"
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: %ld ļδ༭"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: ɰ汾ƴдļҪ"
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Ϊ߰汾 Vim õƴдļ"
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: ļд"
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: ƴдļдڲֵ֧Ľ"
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "ָ֧ѡ"
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr ": %s ֧"
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr " tag ļ \"%s\""
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "ȡļ %s "
#, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr " %s תʧܣ %d : %s"
#, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "֧ %s еת: %s %s"
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "ָ֧ѡ"
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "֧ %s еת"
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "ȷķ id : %s"
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s %d УFLAG ֵЧ: %s"
#, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s %d Уʹñ־ FLAG: %s"
#, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDWORDMAX ֵ: %s"
#, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDMIN ֵ: %s"
#, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDSYLMAX ֵ: %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: ǩ(tag) \"%s\" ļ %s ظֶ"
+#, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s %d У CHECKCOMPOUNDPATTERN ֵ: %s"
#, c-format
-#~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s %d Уĸӿгֲͬϱ־: %s"
#, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s %d Уظĸ: %s"
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" жϵ: %ld "
+#, c-format
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s %d У BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST ʹ"
+": %s"
#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s %d У˴Ҫ Y N: %s"
#, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s %d У: %s"
#, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s %d У˴Ҫ REP(SAL) "
#, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s %d У˴Ҫ MAP "
#, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s %d УMAP дظַ"
#, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s %d У޷ʶظ: %s"
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s ȱ FOL/LOW/UPP "
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "̫༭"
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "û SYLLABLE ʹ COMPOUNDSYLMAX"
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "̫༭"
+msgid "Too many postponed prefixes"
+msgstr "̫ӳǰ׺"
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+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 ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s ȱ SOFO%s "
#, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s ͬʱ SQL SOFO "
#, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s %d У־: %s"
#, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s %d УЧı־: %s"
#, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s ֵһ .aff ļʹõֵͬ"
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "ɨֵ: %s"
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "ȡֵļ %s "
#, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "E760: No word count in %s"
+msgstr "E760: %s ûеʼ"
#, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
+msgid "line %6d, word %6d - %s"
+msgstr " %6d У %6d - %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "ÿһжҲģʽ: %s"
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s %d Уظĵ: %s"
#, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s %d У״ظĵ: %s"
#, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "%d duplicate word(s) in %s"
+msgstr " %d ظĵʣ %s "
#, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "˺з ASCII ַ %d ʣ %s "
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "ӱ׼..."
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "ȡļ %s "
#, c-format
#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
#~ msgstr ""
#, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s %d Уʺ /encoding= ѱ: %s"
#, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s %d Уظ /regions= ѱ: %s"
#, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s %d У̫: %s"
#, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s %d У/ ѱ: %s"
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "ȷķ id : %s"
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s %d УЧ: %s"
#, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s %d Уʶı־: %s"
#, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "˺з ASCII ַ %d "
#, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "ѹ %d/%d ڵ㣻ʣ %d (%d%%)"
-#~ msgid "Reading back spell file..."
-#~ 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 ""
+msgid "Performing soundfolding..."
+msgstr " soundfolding"
#, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding ĵ: %ld"
#, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
+msgid "Total number of words: %d"
+msgstr ": %d"
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "д viminfo ļ \"%s\" "
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "д뽨ļ %s "
#, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "ʱڴ: %d ֽ"
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
+msgid "E751: Output file name must not have region name"
+msgstr "E751: ļܺ"
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: ֻ֧ 8 "
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: ȷıʽ: %s"
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s ЧķΧ"
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr ": ͬʱָ compounding NOBREAK"
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "д viminfo ļ \"%s\" "
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "дƴдļ %s "
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr ""
+msgid "Done!"
+msgstr "ɣ"
#, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' û %ld "
#, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "Word removed from %s"
+msgstr " %s ɾ˵"
#, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Word added to %s"
+msgstr " %s ˵"
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: ƴдļַ֮ͬ"
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Sorry, no suggestions"
+msgstr "Ǹûн"
#, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "Sorry, only %ld suggestions"
+msgstr "Ǹֻ %ld "
#. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "ı䱣浽 \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr " \"%.*s\" Ϊ"
#, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: ûǰһ"
+msgid "E752: No previous spell replacement"
+msgstr "E752: ֮ǰûƴд滻"
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [˵] Ҳ %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Ҳ: %s"
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s Vim ļ"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ļ: %s"
#, c-format
#~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@ msgid "E397: Filename required"
msgstr "E397: Ҫļ"
#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ȱ ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱ ']': %s"
#, c-format
msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@ msgstr "E409: ȷ: %s"
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: ȷ :syntax : %s"
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim ʱǶѭ"
#, c-format
msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@ msgstr "E423: ЧIJ: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: ʹ̫಻ͬĸ"
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: дڲʾַ"
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: Ʋȷ"
+msgid "W18: Invalid character in group name"
+msgstr "W18: кЧַ"
msgid "E555: at bottom of tag stack"
msgstr "E555: tag ջײ"
@@ -5648,6 +5659,9 @@ msgstr ": ⵽ Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
msgstr " :help windows95<Enter> 鿴˵ "
+msgid "Already only one window"
+msgstr "Ѿֻʣһ"
+
msgid "E441: There is no preview window"
msgstr "E441: ûԤ"
@@ -5660,9 +5674,6 @@ msgstr "E443: ָʱת"
msgid "E444: Cannot close last window"
msgstr "E444: ܹرһ"
-msgid "Already only one window"
-msgstr "Ѿֻʣһ"
-
msgid "E445: Other window contains changes"
msgstr "E445: иı"
@@ -6050,6 +6061,9 @@ msgstr "Ѳҵļͷٴӽβ"
msgid "search hit BOTTOM, continuing at TOP"
msgstr "Ѳҵļβٴӿͷ"
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s %d Уʹ PFXPOSTPONE ʱӱ־: %s"
+
#~ msgid "[No file]"
#~ msgstr "[δ]"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index b77b45e2a..3d3ab6285 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -4,6 +4,10 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# FIRST AUTHOR Wang Jun <junw@turbolinux.com.cn>
+#
+# TRANSLATORS
+# Edyfox <edyfox@gmail.com>
+# Yuheng Xie <elephant@linux.net.cn>
#
# Original translations.
#
@@ -11,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-28 21:47+0800\n"
-"PO-Revision-Date: 2006-04-18 18:00+0800\n"
+"POT-Creation-Date: 2006-04-21 15:16+0800\n"
+"PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -209,6 +213,9 @@ msgstr "E102: Ҳ \"%s\""
msgid "E103: Buffer \"%s\" is not in diff mode"
msgstr "E103: \"%s\" diff ģʽ"
+msgid "E787: Buffer changed unexpectedly"
+msgstr "E787: ظı˻"
+
msgid "E104: Escape not allowed in digraph"
msgstr "E104: ַ(digraph)вʹ Escape"
@@ -222,8 +229,8 @@ 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)"
@@ -256,8 +263,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)"
@@ -489,9 +496,8 @@ msgstr "E722: Dictionary ȱٶ: %s"
msgid "E723: Missing end of Dictionary '}': %s"
msgstr "E723: Dictionary ȱٽ '}': %s"
-#, fuzzy
-#~ msgid "E724: variable nested too deep for displaying"
-#~ msgstr "E724: Ƕ׹"
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: Ƕ׹޷ʾ"
msgid "E699: Too many arguments"
msgstr "E699: "
@@ -529,8 +535,8 @@ 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() Ч"
@@ -560,9 +566,8 @@ msgstr "E655: ӹ(ѭ)"
msgid "E258: Unable to send to client"
msgstr "E258: ޷͵ͻ"
-#, fuzzy
-#~ msgid "E702: Sort compare function failed"
-#~ msgstr "E702: Sort ȽϺʧ"
+msgid "E702: Sort compare function failed"
+msgstr "E702: Sort ȽϺʧ"
msgid "(Invalid)"
msgstr "(Ч)"
@@ -611,9 +616,8 @@ msgstr "δ֪"
msgid "E742: Cannot change value of %s"
msgstr "E742: ޷ı %s ֵ"
-#, fuzzy
-#~ msgid "E698: variable nested too deep for making a copy"
-#~ msgstr "E698: Ƕ׹"
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: Ƕ׹޷"
#, c-format
msgid "E124: Missing '(': %s"
@@ -682,136 +686,6 @@ msgstr ""
"\n"
"\t޸ "
-msgid "Entering Debug mode. Type \"cont\" to continue."
-msgstr "ģʽ \"cont\" С"
-
-#, c-format
-msgid "line %ld: %s"
-msgstr " %ld : %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr ": %s"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ϵ \"%s%s\" %ld "
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Ҳϵ: %s"
-
-msgid "No breakpoints defined"
-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 "Untitled"
-msgstr "δ"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: \"%s\" ޸ĵδ"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ": ؽ (Զ)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: ֻһļɱ༭"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: ޷лǵһļ"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: ޷лһļ"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ֱ֧: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "ڲ \"%s\" \"%s\" "
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "ڲ \"%s\""
-
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr " 'runtimepath' Ҳ \"%s\""
-
-msgid "Source Vim script"
-msgstr "ִ Vim ű"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "ִĿ¼: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "ִ \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr " %ld : ִ \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "ִ \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr " %ld : ִ \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "ִ %s"
-
-msgid "modeline"
-msgstr "modeline"
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr ""
-
-#~ msgid "error handler"
-#~ msgstr ""
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: : зָ ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ڽűļʹ :scriptencoding"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ڽűļʹ :finish"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "ǰ %s: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: 趨Ϊ \"%s\""
-
#, c-format
msgid "<%s>%s%s %d, Hex %02x, Octal %03o"
msgstr "<%s>%s%s %d, ʮ %02x, ˽ %03o"
@@ -844,8 +718,8 @@ msgstr "E135: *Filter* ԶԸı䵱ǰ"
msgid "[No write since last change]\n"
msgstr "[޸ĵδ]\n"
-#, c-format
# bad to translate
+#, c-format
msgid "%sviminfo: %s in line: "
msgstr "%sviminfo: %s λ: "
@@ -877,14 +751,14 @@ msgstr "E138: ޷д viminfo ļ %s"
msgid "Writing viminfo file \"%s\""
msgstr "д viminfo ļ \"%s\""
+# do not translate to avoid writing Chinese in files
#. Write the info:
#, fuzzy, c-format
-# do not translate to avoid writing Chinese in files
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# viminfo ļ vim %s ɵġ\n"
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# viminfo ļ Vim %s ɵġ\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"# You may edit it if you're careful!\n"
"\n"
@@ -892,14 +766,17 @@ msgstr ""
"# Ҫ޸رСģ\n"
"\n"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' ڴļʱֵ\n"
+#, fuzzy, c-format
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# 'encoding' ڴļʱֵ\n"
msgid "Illegal starting char"
msgstr "Чַ"
+msgid "Save As"
+msgstr "Ϊ"
+
msgid "Write partial file?"
msgstr "Ҫд벿ļ"
@@ -987,8 +864,8 @@ msgstr "E148: global ȱʽ"
msgid "Pattern found in every line: %s"
msgstr "ÿжƥʽ: %s"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# Last Substitute String:\n"
@@ -1071,6 +948,133 @@ msgstr " (֧)"
msgid "[Deleted]"
msgstr "[ɾ]"
+msgid "Entering Debug mode. Type \"cont\" to continue."
+msgstr "ģʽ \"cont\" С"
+
+#, c-format
+msgid "line %ld: %s"
+msgstr " %ld : %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr ": %s"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ϵ \"%s%s\" %ld "
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Ҳϵ: %s"
+
+msgid "No breakpoints defined"
+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>"
+
+#, c-format
+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\" ޸ĵδ"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr ": ؽ (Զ)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: ֻһļɱ༭"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: ޷лǵһļ"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: ޷лһļ"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: ֱ֧: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "ڲ \"%s\" \"%s\" "
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "ڲ \"%s\""
+
+#, c-format
+msgid "not found in 'runtimepath': \"%s\""
+msgstr " 'runtimepath' Ҳ \"%s\""
+
+msgid "Source Vim script"
+msgstr "ִ Vim ű"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "ִĿ¼: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "ִ \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr " %ld : ִ \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "ִ \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr " %ld : ִ \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "ִ %s"
+
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr ""
+
+#~ msgid "error handler"
+#~ msgstr ""
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: : зָ ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: ڽűļʹ :scriptencoding"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: ڽűļʹ :finish"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "ǰ %s: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: 趨Ϊ \"%s\""
+
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
msgstr " Ex ģʽ \"visual\" صģʽ"
@@ -1179,7 +1183,7 @@ msgstr "E467: Custom ȫҪһ"
#, c-format
msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Ҳɫ %s"
+msgstr "E185: Ҳɫ %s"
msgid "Greetings, Vim user!"
msgstr "ãVim û"
@@ -1391,6 +1395,9 @@ msgstr "E602: :endtry ȱٶӦ :try"
msgid "E193: :endfunction not inside a function"
msgstr "E193: :endfunction ں"
+msgid "E788: Not allowed to edit another buffer now"
+msgstr "E788: Ŀǰ༭Ļ"
+
msgid "tagname"
msgstr "tag "
@@ -1400,8 +1407,8 @@ msgstr " ļ\n"
msgid "'history' option is zero"
msgstr "ѡ 'history' Ϊ"
-#, fuzzy, c-format
# do not translate to avoid writing Chinese in files
+#, fuzzy, c-format
msgid ""
"\n"
"# %s History (newest to oldest):\n"
@@ -1409,17 +1416,25 @@ msgstr ""
"\n"
"# %s ʷ¼ (µ):\n"
-msgid "Command Line"
-msgstr ""
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Command Line"
+#~ msgstr ""
-msgid "Search String"
-msgstr "ַ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Search String"
+#~ msgstr "ַ"
-msgid "Expression"
-msgstr "ʽ"
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Expression"
+#~ msgstr "ʽ"
-msgid "Input Line"
-msgstr ""
+# do not translate to avoid writing Chinese in files
+#, fuzzy
+#~ msgid "Input Line"
+#~ msgstr ""
msgid "E198: cmd_pchar beyond the command length"
msgstr "E198: cmd_pchar "
@@ -1550,9 +1565,8 @@ msgstr "E509: ޷ļ ( ! ǿִ)"
msgid "E510: Can't make backup file (add ! to override)"
msgstr "E510: ޷ɱļ ( ! ǿִ)"
-#, fuzzy
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork ʧ ( ! ǿִ)"
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Resource fork ᶪʧ ( ! ǿִ)"
msgid "E214: Can't find temp file for writing"
msgstr "E214: Ҳдʱļ"
@@ -1836,6 +1850,29 @@ msgstr "Ҳӳ"
msgid "E228: makemap: Illegal mode"
msgstr "E228: makemap: Чģʽ"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: ޷ͼν"
+
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: ޷ȡļ \"%s\""
+
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ޷ͼν棬ҲЧ"
+
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: Ч 'guifontwide'"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' ֵЧ"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: ޷ɫ %s"
+
+msgid "No match at cursor, finding next"
+msgstr "ڹ괦ûƥ䣬һ"
+
msgid "<cannot open> "
msgstr "<޷>"
@@ -1858,38 +1895,15 @@ msgstr "ȷ"
msgid "Cancel"
msgstr "ȡ"
-msgid "Vim dialog"
-msgstr "Vim Ի"
-
msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
msgstr ": ޷ȡͼļδС"
+msgid "Vim dialog"
+msgstr "Vim Ի"
+
msgid "E232: Cannot create BalloonEval with both message and callback"
msgstr "E232: ͬʱʹϢͻص BalloonEval"
-msgid "E229: Cannot start the GUI"
-msgstr "E229: ޷ͼν"
-
-#, c-format
-msgid "E230: Cannot read from \"%s\""
-msgstr "E230: ܶȡļ \"%s\""
-
-msgid "E665: Cannot start GUI, no valid font found"
-msgstr "E665: ޷ͼν棬ҲЧ"
-
-msgid "E231: 'guifontwide' invalid"
-msgstr "E231: Ч 'guifontwide'"
-
-msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: 'imactivatekey' ֵЧ"
-
-#, c-format
-msgid "E254: Cannot allocate color %s"
-msgstr "E254: ޷ɫ %s"
-
-msgid "No match at cursor, finding next"
-msgstr "ڹ괦ûƥ䣬һ"
-
msgid "Vim dialog..."
msgstr "Vim Ի..."
@@ -2027,6 +2041,12 @@ msgstr "E243: ֵ֧IJ: \"-%s\"ʹ OLE 汾"
msgid "E672: Unable to open window inside MDI application"
msgstr "E672: ޷ MDI Ӧóд򿪴"
+msgid "Close tab"
+msgstr "رձǩ"
+
+msgid "Open tab..."
+msgstr "򿪱ǩ..."
+
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "ַ (ʹ '\\\\' '\\')"
@@ -2084,40 +2104,36 @@ msgstr ""
"1Ŀ: %ld\n"
"\n"
-#, fuzzy
-#~ msgid "Invalid font specification"
-#~ msgstr "ȷ弯(Fontset)"
+msgid "Invalid font specification"
+msgstr "ָЧ"
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "&Dismiss"
+msgstr "ȡ(&D)"
-#~ msgid "no specific match"
-#~ msgstr ""
+msgid "no specific match"
+msgstr "Ҳƥ"
-#, fuzzy
-#~ msgid "Vim - Font Selector"
-#~ msgstr "ѡ"
+msgid "Vim - Font Selector"
+msgstr "Vim - ѡ"
-#~ msgid "Name:"
-#~ msgstr ""
+msgid "Name:"
+msgstr ":"
#. create toggle button
#~ msgid "Show size in Points"
#~ msgstr ""
-#, fuzzy
-#~ msgid "Encoding:"
-#~ msgstr "¼"
+msgid "Encoding:"
+msgstr ":"
-#, fuzzy
-#~ msgid "Font:"
-#~ msgstr "1: %s\n"
+msgid "Font:"
+msgstr ":"
-#~ msgid "Style:"
-#~ msgstr ""
+msgid "Style:"
+msgstr ":"
-#~ msgid "Size:"
-#~ msgstr ""
+msgid "Size:"
+msgstr "ߴ:"
msgid "E256: Hangul automata ERROR"
msgstr "E256: Hangul automata "
@@ -3021,8 +3037,8 @@ msgstr ""
msgid "-display <display>\tRun vim on <display> (also: --display)"
msgstr "-display <display>\t <display> vim (Ҳ --display)"
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tڵĴڽɫ"
msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
msgstr "--socketid <xid>\tһ GTK д Vim"
@@ -3030,8 +3046,8 @@ 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 ""
+msgid "No display"
+msgstr "û display"
#. Failed to send, abort.
msgid ": Send failed.\n"
@@ -3045,9 +3061,8 @@ msgstr ": ʧܡԱִ\n"
msgid "%d of %d edited"
msgstr "%d %d ѱ༭"
-#, fuzzy
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "ͱʽʧܡ\n"
+msgid "No display: Send expression failed.\n"
+msgstr "û display: ͱʽʧܡ\n"
msgid ": Send expression failed.\n"
msgstr ": ͱʽʧܡ\n"
@@ -3241,49 +3256,49 @@ msgstr "E308: : ԭʼļѱ޸"
msgid "E309: Unable to read block 1 from %s"
msgstr "E309: ޷ %s ȡ 1"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???MANY LINES MISSING"
-msgstr "???ȱ̫"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "???LINE COUNT WRONG"
-msgstr "???"
+#~ msgid "???MANY LINES MISSING"
+#~ msgstr "???ȱ̫"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???EMPTY BLOCK"
-msgstr "???յĿ"
+#, fuzzy
+#~ msgid "???LINE COUNT WRONG"
+#~ msgstr "???"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "???EMPTY BLOCK"
+#~ msgstr "???յĿ"
+
# do not translate to avoid writing Chinese in files
-msgid "???LINES MISSING"
-msgstr "???ȱһЩ"
+#, fuzzy
+#~ msgid "???LINES MISSING"
+#~ msgstr "???ȱһЩ"
#, c-format
msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
msgstr "E310: 1 ID (%s ǽļ)"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "???BLOCK MISSING"
-msgstr "???ȱٿ"
-
#, fuzzy
-# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ﵽ ???END пѻ"
+#~ msgid "???BLOCK MISSING"
+#~ msgstr "???ȱٿ"
-#, fuzzy
# do not translate to avoid writing Chinese in files
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ﵽ ???END пѱ/ɾ"
+#, fuzzy
+#~ msgid "??? from here until ???END lines may be messed up"
+#~ msgstr "??? ﵽ ???END пѻ"
+# do not translate to avoid writing Chinese in files
#, fuzzy
+#~ msgid "??? from here until ???END lines may have been inserted/deleted"
+#~ msgstr "??? ﵽ ???END пѱ/ɾ"
+
# do not translate to avoid writing Chinese in files
-msgid "???END"
-msgstr "???END"
+#, fuzzy
+#~ msgid "???END"
+#~ msgstr "???END"
msgid "E311: Recovery Interrupted"
msgstr "E311: ָѱж"
@@ -3810,18 +3825,18 @@ msgid "E347: No more file \"%s\" found in path"
msgstr "E347: ·Ҳļ \"%s\""
#. Get here when the server can't be found.
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans #2"
+msgstr "޷ӵ Netbeans #2"
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr ""
+msgid "Cannot connect to Netbeans"
+msgstr "޷ӵ Netbeans"
#, c-format
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans Ϣļдķģʽ: \"%s\""
-#~ msgid "read from Netbeans socket"
-#~ msgstr ""
+msgid "read from Netbeans socket"
+msgstr " Netbeans ׽ֶȡ"
#, c-format
msgid "E658: NetBeans connection lost for buffer %ld"
@@ -3950,26 +3965,27 @@ msgstr "E574: δ֪ļĴ %d"
msgid "%ld Cols; "
msgstr "%ld ; "
-#, fuzzy, c-format
-#~ msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-#~ msgstr "ѡ %s%ld/%ld ; %ld/%ld (Word); %ld/%ld ַ(Bytes)"
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgstr "ѡ %s%ld/%ld ; %ld/%ld ; %ld/%ld ֽ"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
"Bytes"
-msgstr "ѡ %s%ld/%ld ; %ld/%ld (Word); %ld/%ld ַ(Chars); %ld/%ld"
+msgstr "ѡ %s%ld/%ld ; %ld/%ld ; %ld/%ld ַ; %ld/%ld ֽ"
-#, fuzzy, c-format
-#~ msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-#~ msgstr " %s/%s; %ld/%ld; (Word) %ld/%ld; ַ(Byte) %ld/%ld"
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgstr " %s/%s ; %ld/%ld ; %ld/%ld ; %ld/%ld ֽ"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
"%ld"
msgstr ""
-" %s/%s; %ld/%ld; (Word) %ld/%ld; ַ(Char) %ld/%ld; ַ(Byte) %ld/%ld"
+" %s/%s ; %ld/%ld ; %ld/%ld ; %ld/%ld ַ; %ld/%ld "
+"ֽ"
#, c-format
#~ msgid "(+%ld for BOM)"
@@ -4177,17 +4193,14 @@ msgstr "ANCHOR_BUF_SIZE ̫С"
msgid "I/O ERROR"
msgstr "I/O "
-#~ msgid "...(truncated)"
-#~ msgstr ""
-
-#~ msgid "Message"
-#~ msgstr ""
+msgid "Message"
+msgstr "Ϣ"
msgid "'columns' is not 80, cannot execute external commands"
msgstr "'columns' 80, ִⲿ"
msgid "E237: Printer selection failed"
-msgstr "E237: ѡ˴ӡ"
+msgstr "E237: ѡӡʧ"
#, c-format
msgid "to %s on %s"
@@ -4203,7 +4216,7 @@ msgstr "E238: ӡ: %s"
#, c-format
msgid "Printing '%s'"
-msgstr "Ѵӡ: '%s'"
+msgstr "ӡ '%s'"
#, c-format
msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
@@ -4214,22 +4227,22 @@ msgid "E245: Illegal char '%c' in font name \"%s\""
msgstr "E245: ȷַ '%c' \"%s\" "
msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: ȷ 'filetype' ѡ - ʹôģʽ"
+msgstr "E366: ȷ 'osfiletype' ѡ - ʹôģʽ"
msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: ˫ź, ˳\n"
+msgstr "Vim: ˫źţ˳\n"
#, c-format
msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: CVim: صź(signal) %s\n"
+msgstr "Vim: صź(deadly signal) %s\n"
#, c-format
msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: صź(deadly signale)\n"
+msgstr "Vim: صź(deadly signal)\n"
#, c-format
msgid "Opening the X display took %ld msec"
-msgstr " X Window ʱ %ld "
+msgstr " X display ʱ %ld "
msgid ""
"\n"
@@ -4239,24 +4252,24 @@ msgstr ""
"Vim: X \n"
msgid "Testing the X display failed"
-msgstr " X Window ʧ"
+msgstr " X display ʧ"
msgid "Opening the X display timed out"
-msgstr " X Window ʱ"
+msgstr " X display ʱ"
msgid ""
"\n"
"Cannot execute shell "
msgstr ""
"\n"
-"ִ shell"
+"޷ִ shell"
msgid ""
"\n"
"Cannot execute shell sh\n"
msgstr ""
"\n"
-"ִ shell sh\n"
+"޷ִ shell sh\n"
msgid ""
"\n"
@@ -4270,14 +4283,14 @@ msgid ""
"Cannot create pipes\n"
msgstr ""
"\n"
-"ܽܵ\n"
+"޷ܵ\n"
msgid ""
"\n"
"Cannot fork\n"
msgstr ""
"\n"
-" fork\n"
+"޷ fork\n"
msgid ""
"\n"
@@ -4286,46 +4299,45 @@ msgstr ""
"\n"
"ѽ\n"
-#, fuzzy
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "ʾ"
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ʧ˵ ICE "
+# do not translate
#, c-format
-#~ msgid "dlerror = \"%s\""
-#~ msgstr ""
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
msgid "Opening the X display failed"
-msgstr " X Window ʧ"
+msgstr " X display ʧ"
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr ""
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP save-yourself "
-#, fuzzy
-#~ msgid "XSMP opening connection"
-#~ msgstr "û cscope "
+msgid "XSMP opening connection"
+msgstr "XSMP "
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr ""
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE Ӽʧ"
#, c-format
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr ""
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection ʧ: %s"
msgid "At line"
msgstr "к "
msgid "Could not load vim32.dll!"
-msgstr "ܼ vim32.dll"
+msgstr "޷ vim32.dll"
msgid "VIM Error"
msgstr "VIM "
msgid "Could not fix up function pointers to the DLL!"
-msgstr "ָ뵽 DLL!"
+msgstr "޷ DLL ĺָ!"
#, c-format
msgid "shell returned %d"
-msgstr "Shell ֵ %d"
+msgstr "Shell %d"
#, c-format
msgid "Vim: Caught %s event\n"
@@ -4348,8 +4360,8 @@ msgid ""
"External commands will not pause after completion.\n"
"See :help win32-vimrun for more information."
msgstr ""
-" $PATH Ҳ VIMRUN.EXE.\n"
-"ⲿִϺ󽫲ͣ.\n"
+" $PATH Ҳ VIMRUN.EXE\n"
+"ⲿִϺ󽫲ͣ\n"
"һ˵ :help win32-vimrun"
msgid "Vim Warning"
@@ -4407,8 +4419,8 @@ msgstr "б %d / %d %d "
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: ޷д룬趨ѡ 'buftype'"
-#~ msgid "E683: File name missing or invalid pattern"
-#~ msgstr ""
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: ȱļģʽЧ"
#, c-format
msgid "Cannot open file \"%s\""
@@ -4603,9 +4615,9 @@ msgstr " Ҳ"
msgid "Scanning included file: %s"
msgstr "Ұļ: %s"
-#, fuzzy, c-format
-#~ msgid "Searching included file %s"
-#~ msgstr "Ұļ: %s"
+#, c-format
+msgid "Searching included file %s"
+msgstr "Ұļ %s"
msgid "E387: Match is on current line"
msgstr "E387: ǰƥ"
@@ -4622,339 +4634,339 @@ msgstr "E388: Ҳ"
msgid "E389: Couldn't find pattern"
msgstr "E389: Ҳ pattern"
-#, fuzzy
-#~ msgid "E759: Format error in spell file"
-#~ msgstr "E297: ļд"
+msgid "E759: Format error in spell file"
+msgstr "E759: ƴдļʽ"
-#, fuzzy
-#~ msgid "E758: Truncated spell file"
-#~ msgstr "E237: ѡ˴ӡ"
+msgid "E758: Truncated spell file"
+msgstr "E758: ѽضϵƴдļ"
-#, fuzzy, c-format
-#~ msgid "Trailing text in %s line %d: %s"
-#~ msgstr "\"%s%s\" жϵ: %ld "
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s %d Уĺַ: %s"
#, c-format
-#~ msgid "Affix name too long in %s line %d: %s"
-#~ msgstr ""
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s %d У̫: %s"
-#, fuzzy
-#~ msgid "E761: Format error in affix file FOL, LOW or UPP"
-#~ msgstr "E431: Tag ļ \"%s\" ʽ"
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: ļ FOLLOW UPP иʽ"
-#~ msgid "E762: Character in FOL, LOW or UPP is out of range"
-#~ msgstr ""
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOLLOW UPP ַΧ"
-#~ msgid "Compressing word tree..."
-#~ msgstr ""
+msgid "Compressing word tree..."
+msgstr "ѹ"
-#~ msgid "E756: Spell checking is not enabled"
-#~ msgstr ""
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ƴдδ"
#, c-format
-#~ msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-#~ msgstr ""
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ": Ҳб \"%s.%s.spl\" or \"%s.ascii.spl\""
-#, fuzzy, c-format
-#~ msgid "Reading spell file \"%s\""
-#~ msgstr "ʹýļ \"%s\""
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "ȡƴдļ \"%s\""
-#, fuzzy
-#~ msgid "E757: This does not look like a spell file"
-#~ msgstr "E307: %s Vim ļ"
+msgid "E757: This does not look like a spell file"
+msgstr "E757: ⿴ƴдļ"
-#, fuzzy
-#~ msgid "E771: Old spell file, needs to be updated"
-#~ msgstr "E173: %ld ļδ༭"
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: ɰ汾ƴдļҪ"
-#~ msgid "E772: Spell file is for newer version of Vim"
-#~ msgstr ""
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Ϊ߰汾 Vim õƴдļ"
-#, fuzzy
-#~ msgid "E770: Unsupported section in spell file"
-#~ msgstr "E297: ļд"
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: ƴдļдڲֵ֧Ľ"
-#, fuzzy, c-format
-#~ msgid "Warning: region %s not supported"
-#~ msgstr "ָ֧ѡ"
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr ": %s ֧"
-#, fuzzy, c-format
-#~ msgid "Reading affix file %s ..."
-#~ msgstr " tag ļ \"%s\""
+#, c-format
+msgid "Reading affix file %s ..."
+msgstr "ȡļ %s "
#, c-format
-#~ msgid "Conversion failure for word in %s line %d: %s"
-#~ msgstr ""
+msgid "Conversion failure for word in %s line %d: %s"
+msgstr " %s תʧܣ %d : %s"
#, c-format
-#~ msgid "Conversion in %s not supported: from %s to %s"
-#~ msgstr ""
+msgid "Conversion in %s not supported: from %s to %s"
+msgstr "֧ %s еת: %s %s"
-#, fuzzy, c-format
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "ָ֧ѡ"
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "֧ %s еת"
-#, fuzzy, c-format
-#~ msgid "Invalid value for FLAG in %s line %d: %s"
-#~ msgstr "ȷķ id : %s"
+#, c-format
+msgid "Invalid value for FLAG in %s line %d: %s"
+msgstr "%s %d УFLAG ֵЧ: %s"
#, c-format
-#~ msgid "FLAG after using flags in %s line %d: %s"
-#~ msgstr ""
+msgid "FLAG after using flags in %s line %d: %s"
+msgstr "%s %d Уʹñ־ FLAG: %s"
#, c-format
-#~ msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+#~ msgid ""
+#~ "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
+#~ "%d"
#~ msgstr ""
#, c-format
-#~ msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDWORDMAX ֵ: %s"
#, c-format
-#~ msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDMIN ֵ: %s"
#, c-format
-#~ msgid "Different combining flag in continued affix block in %s line %d: %s"
-#~ msgstr ""
+msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
+msgstr "%s %d У COMPOUNDSYLMAX ֵ: %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate affix in %s line %d: %s"
-#~ msgstr "E154: ǩ(tag) \"%s\" ļ %s ظֶ"
+#, c-format
+msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
+msgstr "%s %d У CHECKCOMPOUNDPATTERN ֵ: %s"
#, c-format
-#~ msgid ""
-#~ "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-#~ "line %d: %s"
-#~ msgstr ""
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr "%s %d Уĸӿгֲͬϱ־: %s"
#, c-format
-#~ msgid "Expected Y or N in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate affix in %s line %d: %s"
+msgstr "%s %d Уظĸ: %s"
-#, fuzzy, c-format
-#~ msgid "Broken condition in %s line %d: %s"
-#~ msgstr "\"%s%s\" жϵ: %ld "
+#, c-format
+msgid ""
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"line %d: %s"
+msgstr ""
+"%s %d У BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST ʹ"
+": %s"
#, c-format
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-#~ msgstr ""
+msgid "Expected Y or N in %s line %d: %s"
+msgstr "%s %d У˴Ҫ Y N: %s"
#, c-format
-#~ msgid "Expected REP(SAL) count in %s line %d"
-#~ msgstr ""
+msgid "Broken condition in %s line %d: %s"
+msgstr "%s %d У: %s"
#, c-format
-#~ msgid "Expected MAP count in %s line %d"
-#~ msgstr ""
+msgid "Expected REP(SAL) count in %s line %d"
+msgstr "%s %d У˴Ҫ REP(SAL) "
#, c-format
-#~ msgid "Duplicate character in MAP in %s line %d"
-#~ msgstr ""
+msgid "Expected MAP count in %s line %d"
+msgstr "%s %d У˴Ҫ MAP "
#, c-format
-#~ msgid "Unrecognized or duplicate item in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate character in MAP in %s line %d"
+msgstr "%s %d УMAP дظַ"
#, c-format
-#~ msgid "Missing FOL/LOW/UPP line in %s"
-#~ msgstr ""
+msgid "Unrecognized or duplicate item in %s line %d: %s"
+msgstr "%s %d У޷ʶظ: %s"
-#~ msgid "COMPOUNDSYLMAX used without SYLLABLE"
-#~ msgstr ""
+#, c-format
+msgid "Missing FOL/LOW/UPP line in %s"
+msgstr "%s ȱ FOL/LOW/UPP "
-#, fuzzy
-#~ msgid "Too many postponed prefixes"
-#~ msgstr "̫༭"
+msgid "COMPOUNDSYLMAX used without SYLLABLE"
+msgstr "û SYLLABLE ʹ COMPOUNDSYLMAX"
-#, fuzzy
-#~ msgid "Too many compound flags"
-#~ msgstr "̫༭"
+msgid "Too many postponed prefixes"
+msgstr "̫ӳǰ׺"
-#~ msgid "Too many posponed prefixes and/or compound flags"
-#~ msgstr ""
+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 ""
+msgid "Missing SOFO%s line in %s"
+msgstr "%s ȱ SOFO%s "
#, c-format
-#~ msgid "Both SAL and SOFO lines in %s"
-#~ msgstr ""
+msgid "Both SAL and SOFO lines in %s"
+msgstr "%s ͬʱ SQL SOFO "
#, c-format
-#~ msgid "Flag is not a number in %s line %d: %s"
-#~ msgstr ""
+msgid "Flag is not a number in %s line %d: %s"
+msgstr "%s %d У־: %s"
#, c-format
-#~ msgid "Illegal flag in %s line %d: %s"
-#~ msgstr ""
+msgid "Illegal flag in %s line %d: %s"
+msgstr "%s %d УЧı־: %s"
#, c-format
-#~ msgid "%s value differs from what is used in another .aff file"
-#~ msgstr ""
+msgid "%s value differs from what is used in another .aff file"
+msgstr "%s ֵһ .aff ļʹõֵͬ"
-#, fuzzy, c-format
-#~ msgid "Reading dictionary file %s ..."
-#~ msgstr "ɨֵ: %s"
+#, c-format
+msgid "Reading dictionary file %s ..."
+msgstr "ȡֵļ %s "
#, c-format
-#~ msgid "E760: No word count in %s"
-#~ msgstr ""
+msgid "E760: No word count in %s"
+msgstr "E760: %s ûеʼ"
#, c-format
-#~ msgid "line %6d, word %6d - %s"
-#~ msgstr ""
+msgid "line %6d, word %6d - %s"
+msgstr " %6d У %6d - %s"
-#, fuzzy, c-format
-#~ msgid "Duplicate word in %s line %d: %s"
-#~ msgstr "ÿһжҲģʽ: %s"
+#, c-format
+msgid "Duplicate word in %s line %d: %s"
+msgstr "%s %d Уظĵ: %s"
#, c-format
-#~ msgid "First duplicate word in %s line %d: %s"
-#~ msgstr ""
+msgid "First duplicate word in %s line %d: %s"
+msgstr "%s %d У״ظĵ: %s"
#, c-format
-#~ msgid "%d duplicate word(s) in %s"
-#~ msgstr ""
+msgid "%d duplicate word(s) in %s"
+msgstr " %d ظĵʣ %s "
#, c-format
-#~ msgid "Ignored %d word(s) with non-ASCII characters in %s"
-#~ msgstr ""
+msgid "Ignored %d word(s) with non-ASCII characters in %s"
+msgstr "˺з ASCII ַ %d ʣ %s "
-#, fuzzy, c-format
-#~ msgid "Reading word file %s ..."
-#~ msgstr "ӱ׼..."
+#, c-format
+msgid "Reading word file %s ..."
+msgstr "ȡļ %s "
#, c-format
#~ msgid "Duplicate /encoding= line ignored in %s line %d: %s"
#~ msgstr ""
#, c-format
-#~ msgid "/encoding= line after word ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/encoding= line after word ignored in %s line %d: %s"
+msgstr "%s %d Уʺ /encoding= ѱ: %s"
#, c-format
-#~ msgid "Duplicate /regions= line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "Duplicate /regions= line ignored in %s line %d: %s"
+msgstr "%s %d Уظ /regions= ѱ: %s"
#, c-format
-#~ msgid "Too many regions in %s line %d: %s"
-#~ msgstr ""
+msgid "Too many regions in %s line %d: %s"
+msgstr "%s %d У̫: %s"
#, c-format
-#~ msgid "/ line ignored in %s line %d: %s"
-#~ msgstr ""
+msgid "/ line ignored in %s line %d: %s"
+msgstr "%s %d У/ ѱ: %s"
-#, fuzzy, c-format
-#~ msgid "Invalid region nr in %s line %d: %s"
-#~ msgstr "ȷķ id : %s"
+#, c-format
+msgid "Invalid region nr in %s line %d: %s"
+msgstr "%s %d УЧ: %s"
#, c-format
-#~ msgid "Unrecognized flags in %s line %d: %s"
-#~ msgstr ""
+msgid "Unrecognized flags in %s line %d: %s"
+msgstr "%s %d Уʶı־: %s"
#, c-format
-#~ msgid "Ignored %d words with non-ASCII characters"
-#~ msgstr ""
+msgid "Ignored %d words with non-ASCII characters"
+msgstr "˺з ASCII ַ %d "
#, c-format
-#~ msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-#~ msgstr ""
+msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
+msgstr "ѹ %d/%d ڵ㣻ʣ %d (%d%%)"
-#~ msgid "Reading back spell file..."
-#~ 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 ""
+msgid "Performing soundfolding..."
+msgstr " soundfolding"
#, c-format
-#~ msgid "Number of words after soundfolding: %ld"
-#~ msgstr ""
+msgid "Number of words after soundfolding: %ld"
+msgstr "soundfolding ĵ: %ld"
#, c-format
-#~ msgid "Total number of words: %d"
-#~ msgstr ""
+msgid "Total number of words: %d"
+msgstr ": %d"
-#, fuzzy, c-format
-#~ msgid "Writing suggestion file %s ..."
-#~ msgstr "д viminfo ļ \"%s\" "
+#, c-format
+msgid "Writing suggestion file %s ..."
+msgstr "д뽨ļ %s "
#, c-format
-#~ msgid "Estimated runtime memory use: %d bytes"
-#~ msgstr ""
+msgid "Estimated runtime memory use: %d bytes"
+msgstr "ʱڴ: %d ֽ"
-#~ msgid "E751: Output file name must not have region name"
-#~ msgstr ""
+msgid "E751: Output file name must not have region name"
+msgstr "E751: ļܺ"
-#~ msgid "E754: Only up to 8 regions supported"
-#~ msgstr ""
+msgid "E754: Only up to 8 regions supported"
+msgstr "E754: ֻ֧ 8 "
-#, fuzzy, c-format
-#~ msgid "E755: Invalid region in %s"
-#~ msgstr "E15: ȷıʽ: %s"
+#, c-format
+msgid "E755: Invalid region in %s"
+msgstr "E755: %s ЧķΧ"
-#~ msgid "Warning: both compounding and NOBREAK specified"
-#~ msgstr ""
+msgid "Warning: both compounding and NOBREAK specified"
+msgstr ": ͬʱָ compounding NOBREAK"
-#, fuzzy, c-format
-#~ msgid "Writing spell file %s ..."
-#~ msgstr "д viminfo ļ \"%s\" "
+#, c-format
+msgid "Writing spell file %s ..."
+msgstr "дƴдļ %s "
-#, fuzzy
-#~ msgid "Done!"
-#~ msgstr ""
+msgid "Done!"
+msgstr "ɣ"
#, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
-#~ msgstr ""
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' û %ld "
#, c-format
-#~ msgid "Word removed from %s"
-#~ msgstr ""
+msgid "Word removed from %s"
+msgstr " %s ɾ˵"
#, c-format
-#~ msgid "Word added to %s"
-#~ msgstr ""
+msgid "Word added to %s"
+msgstr " %s ˵"
-#~ msgid "E763: Word characters differ between spell files"
-#~ msgstr ""
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: ƴдļַ֮ͬ"
-#~ msgid "Sorry, no suggestions"
-#~ msgstr ""
+msgid "Sorry, no suggestions"
+msgstr "Ǹûн"
#, c-format
-#~ msgid "Sorry, only %ld suggestions"
-#~ msgstr ""
+msgid "Sorry, only %ld suggestions"
+msgstr "Ǹֻ %ld "
#. avoid more prompt
-#, fuzzy, c-format
-#~ msgid "Change \"%.*s\" to:"
-#~ msgstr "ı䱣浽 \"%.*s\"?"
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr " \"%.*s\" Ϊ"
#, c-format
-#~ msgid " < \"%.*s\""
-#~ msgstr ""
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
-#, fuzzy
-#~ msgid "E752: No previous spell replacement"
-#~ msgstr "E35: ûǰһ"
+msgid "E752: No previous spell replacement"
+msgstr "E752: ֮ǰûƴд滻"
-#, fuzzy, c-format
-#~ msgid "E753: Not found: %s"
-#~ msgstr "E334: [˵] Ҳ %s"
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Ҳ: %s"
-#, fuzzy, c-format
-#~ msgid "E778: This does not look like a .sug file: %s"
-#~ msgstr "E307: %s Vim ļ"
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ļ: %s"
#, c-format
#~ msgid "E779: Old .sug file, needs to be updated: %s"
@@ -5056,8 +5068,8 @@ msgid "E397: Filename required"
msgstr "E397: Ҫļ"
#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ȱ ']': %s"
+msgid "E747: Missing ']': %s"
+msgstr "E747: ȱ ']': %s"
#, c-format
msgid "E398: Missing '=': %s"
@@ -5109,8 +5121,8 @@ msgstr "E409: ȷ: %s"
msgid "E410: Invalid :syntax subcommand: %s"
msgstr "E410: ȷ :syntax : %s"
-#~ msgid "E679: recursive loop loading syncolor.vim"
-#~ msgstr ""
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim ʱǶѭ"
#, c-format
msgid "E411: highlight group not found: %s"
@@ -5164,12 +5176,11 @@ msgstr "E423: ЧIJ: %s"
msgid "E424: Too many different highlighting attributes in use"
msgstr "E424: ʹ̫಻ͬĸ"
-#~ msgid "E669: Unprintable character in group name"
-#~ msgstr ""
+msgid "E669: Unprintable character in group name"
+msgstr "E669: дڲʾַ"
-#, fuzzy
-#~ msgid "W18: Invalid character in group name"
-#~ msgstr "E182: Ʋȷ"
+msgid "W18: Invalid character in group name"
+msgstr "W18: кЧַ"
msgid "E555: at bottom of tag stack"
msgstr "E555: tag ջײ"
@@ -5648,6 +5659,9 @@ msgstr ": ⵽ Windows 95/98/ME"
msgid "type :help windows95<Enter> for info on this"
msgstr " :help windows95<Enter> 鿴˵ "
+msgid "Already only one window"
+msgstr "Ѿֻʣһ"
+
msgid "E441: There is no preview window"
msgstr "E441: ûԤ"
@@ -5660,9 +5674,6 @@ msgstr "E443: ָʱת"
msgid "E444: Cannot close last window"
msgstr "E444: ܹرһ"
-msgid "Already only one window"
-msgstr "Ѿֻʣһ"
-
msgid "E445: Other window contains changes"
msgstr "E445: иı"
@@ -6050,6 +6061,9 @@ msgstr "Ѳҵļͷٴӽβ"
msgid "search hit BOTTOM, continuing at TOP"
msgstr "Ѳҵļβٴӿͷ"
+#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
+#~ msgstr "%s %d Уʹ PFXPOSTPONE ʱӱ־: %s"
+
#~ msgid "[No file]"
#~ msgstr "[δ]"
diff --git a/src/proto/gui.pro b/src/proto/gui.pro
index 7105a6f83..322dc7955 100644
--- a/src/proto/gui.pro
+++ b/src/proto/gui.pro
@@ -1,65 +1,65 @@
/* gui.c */
-extern void gui_start __ARGS((void));
-extern void gui_prepare __ARGS((int *argc, char **argv));
-extern int gui_init_check __ARGS((void));
-extern void gui_init __ARGS((void));
-extern void gui_exit __ARGS((int rc));
-extern void gui_shell_closed __ARGS((void));
-extern int gui_init_font __ARGS((char_u *font_list, int fontset));
-extern int gui_get_wide_font __ARGS((void));
-extern void gui_set_cursor __ARGS((int row, int col));
-extern void gui_update_cursor __ARGS((int force, int clear_selection));
-extern void gui_position_menu __ARGS((void));
-extern int gui_get_base_width __ARGS((void));
-extern int gui_get_base_height __ARGS((void));
-extern void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
-extern void gui_may_resize_shell __ARGS((void));
-extern int gui_get_shellsize __ARGS((void));
-extern void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
-extern void gui_new_shellsize __ARGS((void));
-extern void gui_reset_scroll_region __ARGS((void));
-extern void gui_start_highlight __ARGS((int mask));
-extern void gui_stop_highlight __ARGS((int mask));
-extern void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
-extern void gui_update_cursor_later __ARGS((void));
-extern void gui_write __ARGS((char_u *s, int len));
-extern void gui_dont_update_cursor __ARGS((void));
-extern void gui_can_update_cursor __ARGS((void));
-extern int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
-extern void gui_undraw_cursor __ARGS((void));
-extern void gui_redraw __ARGS((int x, int y, int w, int h));
-extern int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
-extern int gui_wait_for_chars __ARGS((long wtime));
-extern void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
-extern int gui_xy2colrow __ARGS((int x, int y, int *colp));
-extern void gui_menu_cb __ARGS((vimmenu_T *menu));
-extern void gui_init_which_components __ARGS((char_u *oldval));
-extern int gui_use_tabline __ARGS((void));
-extern void gui_update_tabline __ARGS((void));
-extern void get_tabline_label __ARGS((tabpage_T *tp));
-extern int send_tabline_event __ARGS((int nr));
-extern void send_tabline_menu_event __ARGS((int tabidx, int event));
-extern void gui_remove_scrollbars __ARGS((void));
-extern void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
-extern scrollbar_T *gui_find_scrollbar __ARGS((long ident));
-extern void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
-extern void gui_update_scrollbars __ARGS((int force));
-extern int gui_do_scroll __ARGS((void));
-extern int gui_do_horiz_scroll __ARGS((void));
-extern void gui_check_colors __ARGS((void));
-extern guicolor_T gui_get_color __ARGS((char_u *name));
-extern int gui_get_lightness __ARGS((guicolor_T pixel));
-extern void gui_new_scrollbar_colors __ARGS((void));
-extern void gui_focus_change __ARGS((int in_focus));
-extern void gui_mouse_moved __ARGS((int x, int y));
-extern void gui_mouse_correct __ARGS((void));
-extern void ex_gui __ARGS((exarg_T *eap));
-extern int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
-extern void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
-extern void display_errors __ARGS((void));
-extern int no_console_input __ARGS((void));
-extern void gui_update_screen __ARGS((void));
-extern char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
-extern int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
-extern void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
+void gui_start __ARGS((void));
+void gui_prepare __ARGS((int *argc, char **argv));
+int gui_init_check __ARGS((void));
+void gui_init __ARGS((void));
+void gui_exit __ARGS((int rc));
+void gui_shell_closed __ARGS((void));
+int gui_init_font __ARGS((char_u *font_list, int fontset));
+int gui_get_wide_font __ARGS((void));
+void gui_set_cursor __ARGS((int row, int col));
+void gui_update_cursor __ARGS((int force, int clear_selection));
+void gui_position_menu __ARGS((void));
+int gui_get_base_width __ARGS((void));
+int gui_get_base_height __ARGS((void));
+void gui_resize_shell __ARGS((int pixel_width, int pixel_height));
+void gui_may_resize_shell __ARGS((void));
+int gui_get_shellsize __ARGS((void));
+void gui_set_shellsize __ARGS((int mustset, int fit_to_display, int direction));
+void gui_new_shellsize __ARGS((void));
+void gui_reset_scroll_region __ARGS((void));
+void gui_start_highlight __ARGS((int mask));
+void gui_stop_highlight __ARGS((int mask));
+void gui_clear_block __ARGS((int row1, int col1, int row2, int col2));
+void gui_update_cursor_later __ARGS((void));
+void gui_write __ARGS((char_u *s, int len));
+void gui_dont_update_cursor __ARGS((void));
+void gui_can_update_cursor __ARGS((void));
+int gui_outstr_nowrap __ARGS((char_u *s, int len, int flags, guicolor_T fg, guicolor_T bg, int back));
+void gui_undraw_cursor __ARGS((void));
+void gui_redraw __ARGS((int x, int y, int w, int h));
+int gui_redraw_block __ARGS((int row1, int col1, int row2, int col2, int flags));
+int gui_wait_for_chars __ARGS((long wtime));
+void gui_send_mouse_event __ARGS((int button, int x, int y, int repeated_click, int_u modifiers));
+int gui_xy2colrow __ARGS((int x, int y, int *colp));
+void gui_menu_cb __ARGS((vimmenu_T *menu));
+void gui_init_which_components __ARGS((char_u *oldval));
+int gui_use_tabline __ARGS((void));
+void gui_update_tabline __ARGS((void));
+void get_tabline_label __ARGS((tabpage_T *tp, int tooltip));
+int send_tabline_event __ARGS((int nr));
+void send_tabline_menu_event __ARGS((int tabidx, int event));
+void gui_remove_scrollbars __ARGS((void));
+void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
+scrollbar_T *gui_find_scrollbar __ARGS((long ident));
+void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
+void gui_update_scrollbars __ARGS((int force));
+int gui_do_scroll __ARGS((void));
+int gui_do_horiz_scroll __ARGS((void));
+void gui_check_colors __ARGS((void));
+guicolor_T gui_get_color __ARGS((char_u *name));
+int gui_get_lightness __ARGS((guicolor_T pixel));
+void gui_new_scrollbar_colors __ARGS((void));
+void gui_focus_change __ARGS((int in_focus));
+void gui_mouse_moved __ARGS((int x, int y));
+void gui_mouse_correct __ARGS((void));
+void ex_gui __ARGS((exarg_T *eap));
+int gui_find_bitmap __ARGS((char_u *name, char_u *buffer, char *ext));
+void gui_find_iconfile __ARGS((char_u *name, char_u *buffer, char *ext));
+void display_errors __ARGS((void));
+int no_console_input __ARGS((void));
+void gui_update_screen __ARGS((void));
+char_u *get_find_dialog_text __ARGS((char_u *arg, int *wwordp, int *mcasep));
+int gui_do_findrepl __ARGS((int flags, char_u *find_text, char_u *repl_text, int down));
+void gui_handle_drop __ARGS((int x, int y, int_u modifiers, char_u **fnames, int count));
/* vim: set ft=c : */
diff --git a/src/undo.c b/src/undo.c
index f9e735aaa..fd1bcc79c 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1405,10 +1405,15 @@ u_add_time(buf, buflen, tt)
ex_undojoin(eap)
exarg_T *eap;
{
- if (!curbuf->b_u_synced)
- return; /* already unsynced */
if (curbuf->b_u_newhead == NULL)
return; /* nothing changed before */
+ if (curbuf->b_u_curhead != NULL)
+ {
+ EMSG(_("E790: undojoin is not allowed after undo"));
+ return;
+ }
+ if (!curbuf->b_u_synced)
+ return; /* already unsynced */
if (p_ul < 0)
return; /* no entries, nothing to do */
else
diff --git a/src/version.h b/src/version.h
index d2a14fe83..bb77f87e2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -35,6 +35,6 @@
*/
#define VIM_VERSION_NODOT "vim70e"
#define VIM_VERSION_SHORT "7.0e"
-#define VIM_VERSION_MEDIUM "7.0e04 BETA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e04 BETA (2006 Apr 20, compiled "
+#define VIM_VERSION_MEDIUM "7.0e05 BETA"
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e05 BETA (2006 Apr 21, compiled "
diff --git a/src/window.c b/src/window.c
index dabfe2d5a..d9d5bca23 100644
--- a/src/window.c
+++ b/src/window.c
@@ -621,7 +621,9 @@ wingotofile:
#ifdef FEAT_SEARCHPATH
case 'f': /* CTRL-W gf: "gf" in a new tab page */
+ case 'F': /* CTRL-W gF: "gF" in a new tab page */
cmdmod.tab = TRUE;
+ nchar = xchar;
goto wingotofile;
#endif
default:
View Lorry Controller Status