diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/digraph.c | 5 | ||||
| -rw-r--r-- | src/ex_eval.c | 34 | ||||
| -rw-r--r-- | src/gui.c | 22 | ||||
| -rw-r--r-- | src/gui_gtk_x11.c | 2 | ||||
| -rw-r--r-- | src/gui_motif.c | 5 | ||||
| -rw-r--r-- | src/gui_w48.c | 2 | ||||
| -rw-r--r-- | src/message.c | 7 | ||||
| -rw-r--r-- | src/misc2.c | 6 | ||||
| -rw-r--r-- | src/option.c | 13 | ||||
| -rw-r--r-- | src/option.h | 1 | ||||
| -rw-r--r-- | src/po/it.po | 68 | ||||
| -rw-r--r-- | src/po/zh_CN.UTF-8.po | 1048 | ||||
| -rw-r--r-- | src/po/zh_CN.cp936.po | 1048 | ||||
| -rw-r--r-- | src/po/zh_CN.po | 1048 | ||||
| -rw-r--r-- | src/proto/gui.pro | 126 | ||||
| -rw-r--r-- | src/undo.c | 9 | ||||
| -rw-r--r-- | src/version.h | 6 | ||||
| -rw-r--r-- | src/window.c | 2 |
20 files changed, 1788 insertions, 1668 deletions
diff --git a/src/auto/configure b/src/auto/configure index 7a308a7e8d..319fd4e5af 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 6a1a56f082..5c6dd516f7 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 892a3ed627..667ff07169 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 1da7f1bc13..c89cb2bd0f 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. */ @@ -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 23318bb7a3..79557a834b 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 9e28be2b05..ccc97782da 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 6e4ec1ad69..2e43557f24 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 69b194d4e5..c0146c962a 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 f8a583bc7c..4667a563dc 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 cfca188d9b..c1fc7dc3d8 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 39c03e181f..d512a2055f 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 2673c63a73..22584cdcac 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 de60cda76a..cb516e6098 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 |