diff options
-rw-r--r-- | runtime/doc/debugger.txt | 8 | ||||
-rw-r--r-- | runtime/doc/if_cscop.txt | 4 | ||||
-rw-r--r-- | runtime/lang/menu_chinese_taiwan.950.vim | 11 | ||||
-rw-r--r-- | runtime/syntax/vim.vim | 6 | ||||
-rw-r--r-- | src/Make_ming.mak | 2 | ||||
-rw-r--r-- | src/gui.c | 6 | ||||
-rw-r--r-- | src/gui_motif.c | 3 | ||||
-rw-r--r-- | src/gui_xmebw.c | 7 | ||||
-rw-r--r-- | src/gui_xmebw.h | 3 | ||||
-rw-r--r-- | src/os_unix.c | 26 | ||||
-rw-r--r-- | src/po/zh_TW.UTF-8.po | 3188 |
11 files changed, 1816 insertions, 1448 deletions
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 4b1a188db1..b9536e68d5 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.0aa. Last change: 2001 Dec 22 +*debugger.txt* For Vim version 7.0aa. Last change: 2005 Jan 29 VIM REFERENCE MANUAL by Gordon Prieur @@ -129,7 +129,9 @@ all the above flags: ============================================================================== 3. Integrated Debuggers *debugger-integration* -Currently the only fully integrated debugger/IPE/IDE is Sun's Visual WorkShop -Integrated Programming Environment. +One fully integrated debugger/IPE/IDE is Sun's Visual WorkShop Integrated +Programming Environment. + +For Sun NetBeans support see |netbeans|. vim:tw=78:sw=4:ts=8:ft=help:norl: diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index 102a1157c3..368fbd66ca 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -472,7 +472,7 @@ cscope within Vim to him. *cscope-win32* For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html -Win32 support was added by Sergey Khorev <khorev@softlab.ru>. Contact him -if you have Win32-specific issues. +Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>. Contact +him if you have Win32-specific issues. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/lang/menu_chinese_taiwan.950.vim b/runtime/lang/menu_chinese_taiwan.950.vim index f3b285913a..60dc2a799e 100644 --- a/runtime/lang/menu_chinese_taiwan.950.vim +++ b/runtime/lang/menu_chinese_taiwan.950.vim @@ -1,6 +1,6 @@ -" Menu Translations: Traditional Chinese (for Big5 UNIX/Windows) -" Translated By: Hung-Teh, Lin <piaip@csie.ntu.edu.tw> -" Last Change: Thu Apr 24 17:34:50 CST 2003 +" Menu Translations: Traditional Chinese +" Translated By: Hung-Te Lin <piaip@csie.ntu.edu.tw> +" Last Change: 2005/01/28 02:51:38 " {{{ Quit when menu translations have already been done. if exists("did_menu_trans") @@ -19,7 +19,8 @@ menutrans &User\ Manual 使用者手冊(&U) menutrans &How-to\ links 如何作\.\.\.(&H) menutrans &GUI 圖型界面(&G) menutrans &Credits 感謝(&C) -menutrans Co&pying 版權宣告(&P) +menutrans Co&pying 版權(&P) +menutrans &Sponsor/Register 贊助/註冊(&S) menutrans O&rphans 拯救孤兒(&R) " ------------------------------------------------------------------------ menutrans &Version 程式版本資訊(&V) @@ -59,7 +60,7 @@ menutrans &Paste<Tab>"+gP 貼上(&P)<Tab>"+gP menutrans Put\ &Before<Tab>[p 貼到游標前(&B)<Tab>[p menutrans Put\ &After<Tab>]p 貼到游標後(&A)<Tab>]p menutrans &Delete<Tab>x 刪除(&D)<Tab>x -menutrans &Select\ all<Tab>ggVG 全選(&S)<Tab>ggvG +menutrans &Select\ All<Tab>ggVG 全選(&S)<Tab>ggvG " ------------------------------------------------------------------------ menutrans &Find\.\.\. 尋找(&F)\.\.\. menutrans Find\ and\ Rep&lace\.\.\. 尋找並取代(&L)\.\.\. diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 04226d4ada..fe36e0ce65 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: Vim 7.0 script " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> -" Last Change: January 19, 2005 -" Version: 7.0-2 +" Last Change: January 31, 2005 +" Version: 7.0-03 " Automatically generated keyword lists: {{{1 " Quit when a syntax file was already loaded {{{2 @@ -55,7 +55,7 @@ syn match vimHLGroup contained "Conceal" syn case match " Function Names {{{2 -syn keyword vimFuncName contained add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function get getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfontname getfperm getfsize getftime getftype getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputrestore inputsave inputsecret insert isdirectory join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchstr max min mode nextnonblank nr2char prevnonblank range remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify sort split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper tr type virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth +syn keyword vimFuncName contained add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function get getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfontname getfperm getfsize getftime getftype getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputrestore inputsave inputsecret insert isdirectory items join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchstr max min mode nextnonblank nr2char prevnonblank range remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify sort split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper tr type values virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth "--- syntax above generated by mkvimvim --- " Special Vim Highlighting (not automatic) {{{1 diff --git a/src/Make_ming.mak b/src/Make_ming.mak index a27ce52089..47b1910a1b 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -119,8 +119,6 @@ ifeq (no,$(DYNAMIC_MZSCHEME)) MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) # the modern MinGW can dynamically link to dlls directly. # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll -# c:/windows/system32 isn't a good idea, use some other dir; -# to build you can put them in temp dir) ifndef MZSCHEME_DLLS MZSCHEME_DLLS=$(MZSCHEME) endif @@ -318,6 +318,12 @@ gui_init() } /* + * Reset 'paste'. It's useful in the terminal, but not in the GUI. It + * breaks the Paste toolbar button. + */ + set_option_value((char_u *)"paste", 0L, NULL, 0); + + /* * Set up system-wide default menus. */ #if defined(SYS_MENU_FILE) && defined(FEAT_MENU) diff --git a/src/gui_motif.c b/src/gui_motif.c index 364c020be2..acb9d81faa 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -878,6 +878,8 @@ gui_mch_compute_menu_height(id) XtVaSetValues(menuBar, XmNheight, gui.menu_height, NULL); } +#ifdef FEAT_TOOLBAR + /* * Icons used by the toolbar code. */ @@ -950,6 +952,7 @@ get_toolbar_pixmap(menu) return xpm; } +#endif /* FEAT_TOOLBAR */ void gui_mch_add_menu_item(menu, idx) diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c index d63cf5a427..648eeb3183 100644 --- a/src/gui_xmebw.c +++ b/src/gui_xmebw.c @@ -24,14 +24,17 @@ #include <ctype.h> #include <stdio.h> #include <assert.h> +#include <auto/config.h> #include <Xm/XmP.h> #include <Xm/DrawP.h> -#ifndef LESSTIF_VERSION +#if defined(HAVE_XM_TRAITP_H) && defined(HAVE_XM_MANAGER_H) \ + && defined(HAVE_XM_UNHIGHLIGHT_H) && defined(HAVE_XM_XPMP_H) # include <Xm/TraitP.h> # include <Xm/Manager.h> # include <Xm/UnhighlightT.h> # include <Xm/XpmP.h> +# define UNHIGHLIGHTT #else # include <X11/xpm.h> #endif @@ -523,7 +526,7 @@ draw_unhighlight(XmEnhancedButtonWidget eb) if (XmIsManager(eb->core.parent)) { -#ifndef LESSTIF_VERSION +#ifdef UNHIGHLIGHTT XmSpecifyUnhighlightTrait UnhighlightT; if (((UnhighlightT = (XmSpecifyUnhighlightTrait) XmeTraitGet((XtPointer) diff --git a/src/gui_xmebw.h b/src/gui_xmebw.h index 2aaf5423c3..4d9980c7f1 100644 --- a/src/gui_xmebw.h +++ b/src/gui_xmebw.h @@ -46,11 +46,10 @@ # define XmNpixmapFile "pixmapFile" #endif -#ifndef LESSTIF_VERSION /* * Constants for labelLocation. */ - +#ifdef HAVE_XM_JOINSIDET_H # include <Xm/JoinSideT.h> #else # define XmLEFT 1 diff --git a/src/os_unix.c b/src/os_unix.c index 7c5b899e53..abfcdcc6f5 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4873,8 +4873,32 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags) /* "unset nonomatch; print -N >" plus two is 29 */ len = STRLEN(tempname) + 29; - for (i = 0; i < num_pat; ++i) /* count the length of the patterns */ + for (i = 0; i < num_pat; ++i) + { + /* Count the length of the patterns in the same way as they are put in + * "command" below. */ +#ifdef USE_SYSTEM len += STRLEN(pat[i]) + 3; /* add space and two quotes */ +#else + ++len; /* add space */ + for (j = 0; pat[i][j] != NUL; ) + if (vim_strchr((char_u *)" '", pat[i][j]) != NULL) + { + len += 2; /* add two quotes */ + while (pat[i][j] != NUL + && vim_strchr((char_u *)" '", pat[i][j]) != NULL) + { + ++len; + ++j; + } + } + else + { + ++len; + ++j; + } +#endif + } command = alloc(len); if (command == NULL) { diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po index 0af90e6b82..3251b98294 100644 --- a/src/po/zh_TW.UTF-8.po +++ b/src/po/zh_TW.UTF-8.po @@ -6,199 +6,220 @@ # FIRST AUTHOR Francis S.Lin <piaip@csie.ntu.edu.tw>, 2000 # FIRST RELEASE Thu Jun 14 14:24:17 CST 2001 # -# Last update: Thu Apr 24 13:09:07 CST 2003 (6.2a) +# Last update: 2005/01/27 07:03 (6.3) # # To update, search pattern: /fuzzy\|^msgstr ""\(\n"\)\@! # # DO NOT USE WORDS WITH BACKSLASH ('\') AS SECOND BYTE OF BIG5 CHARS # EG: '', # 閮勗 -# 擗舫梁桃頝瘛頨∟措箇蝮琿剜倍靽 -# 憓血撏日摮撱菜抒暹銋瘝潸憛輯 +# [blacklist: 擗舫梁桃頝瘛頨∟措箇蝮琿剜倍靽] +# [blacklist: 憡撏日摮撱菜折暹銋憛輯] # you can replace these characters with alternative words. # THIS WILL CAUSE INCOMPATIBLE ON gettext 0.10.36+ # +# Note (2005.01.27): +# A bug was found for UTF8 mode. +# > msgid "%ld fewer lines" "on %ld lines" +# If you don't put more (at least 2) spaces after %ld +# gvim/win32 will crash (no reason). +# So please change [銵"] to [銵 "] +# +# Q. How to use UTF8 mode on Win32? +# A. A simple configuration: +# set encoding=utf-8; let $LANG='zh_TW.UTF-8'; +# (set langmenu=none or ..) +# set termencoding=utf-8 +# set fileencodings=ucs-bom,utf-8,japan,taiwan,prc +# set fileencoding=taiwan (or utf-8) +# msgid "" msgstr "" "Project-Id-Version: Vim(Traditional Chinese)\n" -"POT-Creation-Date: 2003-04-24 13:06+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-01-27 19:00+0800\n" "PO-Revision-Date: Mon Feb 19 22:49:21 CST 2001\n" -"Last-Translator: Francis S.Lin <piaip@csie.ntu.edu.tw>\n" -"Language-Team: Francis S.Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng " +"Last-Translator: Hung-Te Lin <piaip@csie.ntu.edu.tw>\n" +"Language-Team: Hung-Te Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng " "<b7506022@csie.ntu.edu.tw>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: buffer.c:97 +#: buffer.c:102 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: ⊥蝵桐遙雿蝺抵嚗a蝔撘..." -#: buffer.c:100 +#: buffer.c:105 msgid "E83: Cannot allocate buffer, using other one..." msgstr "E83: ⊥蝵桃楨銵嚗雿輻典虫蝺抵...." -#: buffer.c:797 +#: buffer.c:808 +#, c-format msgid "E515: No buffers were unloaded" msgstr "E515: 瘝曆遙雿蝺抵" -#: buffer.c:799 +#: buffer.c:810 +#, c-format msgid "E516: No buffers were deleted" msgstr "E516: 瘝芷支遙雿蝺抵" -#: buffer.c:801 +#: buffer.c:812 +#, c-format msgid "E517: No buffers were wiped out" msgstr "E517: 瘝皜支遙雿蝺抵" -#: buffer.c:809 +#: buffer.c:820 msgid "1 buffer unloaded" msgstr "撌脤曆蝺抵" -#: buffer.c:811 +#: buffer.c:822 #, c-format msgid "%d buffers unloaded" msgstr "撌脤 %d 蝺抵" -#: buffer.c:816 +#: buffer.c:827 msgid "1 buffer deleted" msgstr "撌脣芷支蝺抵" -#: buffer.c:818 +#: buffer.c:829 #, c-format msgid "%d buffers deleted" msgstr "撌脣芷 %d 蝺抵" -#: buffer.c:823 +#: buffer.c:834 msgid "1 buffer wiped out" msgstr "撌脣芷支蝺抵" -#: buffer.c:825 +#: buffer.c:836 #, c-format msgid "%d buffers wiped out" msgstr "撌脣芷 %d 蝺抵" -#: buffer.c:886 +#: buffer.c:897 msgid "E84: No modified buffer found" msgstr "E84: 瘝靽格寥蝺抵" #. back where we started, didn't find anything. -#: buffer.c:925 +#: buffer.c:936 msgid "E85: There is no listed buffer" msgstr "E85: 瘝箇蝺抵" -#: buffer.c:937 +#: buffer.c:948 #, c-format -msgid "E86: Cannot go to buffer %ld" -msgstr "E86: ⊥啁洵 %ld 蝺抵" +msgid "E86: Buffer %ld does not exist" +msgstr "E86: 蝺抵 %ld 銝摮" -#: buffer.c:940 +#: buffer.c:951 msgid "E87: Cannot go beyond last buffer" msgstr "E87: ⊥唳游Y蝺抵" -#: buffer.c:942 +#: buffer.c:953 msgid "E88: Cannot go before first buffer" msgstr "E88: ⊥唳游Y蝺抵" -#: buffer.c:966 +#: buffer.c:991 +#, c-format msgid "E89: No write since last change for buffer %ld (add ! to override)" msgstr "E89: 撌脫湔寥蝺抵 %ld 雿撠芸瑼 (舐 ! 撘瑕嗅瑁)" -#: buffer.c:982 +#: buffer.c:1008 msgid "E90: Cannot unload last buffer" msgstr "E90: ⊥暹敺銝蝺抵" -#: buffer.c:1494 +#: buffer.c:1544 msgid "W14: Warning: List of file names overflow" msgstr "W14: 霅血: 瑼憭" -#: buffer.c:1664 +#: buffer.c:1716 #, c-format msgid "E92: Buffer %ld not found" msgstr "E92: 曆啁洵 %ld 蝺抵" -#: buffer.c:1890 +#: buffer.c:1947 #, c-format msgid "E93: More than one match for %s" msgstr "E93: 曉唬隞乩 %s" -#: buffer.c:1892 +#: buffer.c:1949 #, c-format msgid "E94: No matching buffer for %s" msgstr "E94: 曆 %s" -#: buffer.c:2297 ex_docmd.c:6479 +#: buffer.c:2344 #, c-format msgid "line %ld" msgstr "銵 %ld" -#: buffer.c:2380 +#: buffer.c:2429 msgid "E95: Buffer with this name already exists" msgstr "E95: 撌脫蝺抵雿輻券摮" -#: buffer.c:2673 +#: buffer.c:2724 msgid " [Modified]" msgstr " [撌脖耨鉛" -#: buffer.c:2678 +#: buffer.c:2729 msgid "[Not edited]" msgstr "[芰楊頛珠" -#: buffer.c:2683 +#: buffer.c:2734 msgid "[New file]" msgstr "[唳獢]" -#: buffer.c:2684 +#: buffer.c:2735 msgid "[Read errors]" msgstr "[霈航炊]" -#: buffer.c:2686 fileio.c:1914 +#: buffer.c:2737 fileio.c:2124 msgid "[readonly]" msgstr "[航]" -#: buffer.c:2701 +#: buffer.c:2758 #, c-format msgid "1 line --%d%%--" msgstr "銵 1 --%d%%--" -#: buffer.c:2703 +#: buffer.c:2760 #, c-format msgid "%ld lines --%d%%--" msgstr "銵 %ld --%d%%--" -#: buffer.c:2710 +#: buffer.c:2767 #, c-format msgid "line %ld of %ld --%d%%-- col " msgstr "銵 %ld/%ld --%d%%-- 甈 " -#: buffer.c:2811 +#: buffer.c:2875 msgid "[No file]" msgstr "[芸賢]" #. must be a help buffer -#: buffer.c:2851 +#: buffer.c:2915 msgid "help" msgstr "[頛抵牧]" -#: buffer.c:3405 screen.c:4943 +#: buffer.c:3474 screen.c:5079 msgid "[help]" msgstr "[頛抵牧]" -#: buffer.c:3437 screen.c:4949 +#: buffer.c:3506 screen.c:5085 msgid "[Preview]" msgstr "[閬稽" -#: buffer.c:3708 +#: buffer.c:3786 msgid "All" msgstr "券" -#: buffer.c:3708 +#: buffer.c:3786 msgid "Bot" msgstr "摨蝡" -#: buffer.c:3710 +#: buffer.c:3788 msgid "Top" msgstr "蝡" -#: buffer.c:4454 +#: buffer.c:4536 +#, c-format msgid "" "\n" "# Buffer list:\n" @@ -206,15 +227,15 @@ msgstr "" "\n" "# 蝺抵銵:\n" -#: buffer.c:4487 +#: buffer.c:4569 msgid "[Error List]" msgstr "[航炊銵沘" -#: buffer.c:4500 memline.c:1501 +#: buffer.c:4582 memline.c:1521 msgid "[No File]" msgstr "[芸賢]" -#: buffer.c:4803 +#: buffer.c:4895 msgid "" "\n" "--- Signs ---" @@ -222,149 +243,150 @@ msgstr "" "\n" "--- 蝚西 ---" -#: buffer.c:4813 +#: buffer.c:4914 #, c-format msgid "Signs for %s:" msgstr "%s 蝚西:" -#: buffer.c:4819 +#: buffer.c:4920 #, c-format msgid " line=%ld id=%d name=%s" msgstr " 銵=%ld id=%d 蝔=%s" -#: diff.c:133 +#: diff.c:139 #, c-format msgid "E96: Can not diff more than %ld buffers" msgstr "E96: ⊥瘥頛(diff) %ld隞乩蝺抵" -#: diff.c:651 +#: diff.c:713 msgid "E97: Cannot create diffs" msgstr "E97: 銝賢遣蝡 " -#: diff.c:750 +#: diff.c:818 msgid "Patch file" msgstr "Patch 瑼獢" -#: diff.c:1001 +#: diff.c:1069 msgid "E98: Cannot read diff output" msgstr "E98: ⊥霈 diff 頛詨" -#: diff.c:1742 +#: diff.c:1819 msgid "E99: Current buffer is not in diff mode" msgstr "E99: 桀蝺抵銝臬 diff 璅∪" -#: diff.c:1754 +#: diff.c:1831 msgid "E100: No other buffer in diff mode" msgstr "E100: 瘝蝺抵 diff 璅∪" -#: diff.c:1762 +#: diff.c:1839 msgid "E101: More than two buffers in diff mode, don't know which one to use" msgstr "E101: 拙隞乩蝺抵 diff 璅∪嚗⊥瘙箏閬典芯" -#: diff.c:1785 +#: diff.c:1862 #, c-format msgid "E102: Can't find buffer \"%s\"" msgstr "E102: 曆啁楨銵: \"%s\"" -#: diff.c:1791 +#: diff.c:1868 #, c-format msgid "E103: Buffer \"%s\" is not in diff mode" msgstr "E103: 蝺抵 \"%s\" 銝臬 diff 璅∪" -#: digraph.c:2172 +#: digraph.c:2199 msgid "E104: Escape not allowed in digraph" msgstr "E104: 銴摮(digraph)銝凋賭蝙 Escape" -#: digraph.c:2344 +#: digraph.c:2384 msgid "E544: Keymap file not found" msgstr "E544: 曆 keymap 瑼" -#: digraph.c:2371 +#: digraph.c:2411 msgid "E105: Using :loadkeymap not in a sourced file" msgstr "E105: 雿輻 :loadkeymap " #: edit.c:40 -msgid " Keyword completion (^N/^P)" -msgstr " 萄芸摰 (^N/^P)" +msgid " Keyword completion (^N^P)" +msgstr " 萄芸摰 (^N^P)" #. ctrl_x_mode == 0, ^P/^N compl. #: edit.c:41 -msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)" -msgstr " ^X 璅∪ (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)" +msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)" +msgstr " ^X 璅∪ (^E^Y^L^]^F^I^K^D^N^P)" #. Scroll has it's own msgs, in it's place there is the msg for local #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL) -- Acevedo #: edit.c:44 -msgid " Keyword Local completion (^N/^P)" -msgstr " 萄芸摰 (^N/^P)" +msgid " Keyword Local completion (^N^P)" +msgstr " 萄芸摰 (^N^P)" #: edit.c:45 -msgid " Whole line completion (^L/^N/^P)" -msgstr " 渲芸摰 (^L/^N/^P)" +msgid " Whole line completion (^L^N^P)" +msgstr " 渲芸摰 (^L^N^P)" #: edit.c:46 -msgid " File name completion (^F/^N/^P)" -msgstr " 瑼芸摰 (^F/^N/^P)" +msgid " File name completion (^F^N^P)" +msgstr " 瑼芸摰 (^F^N^P)" #: edit.c:47 -msgid " Tag completion (^]/^N/^P)" -msgstr " 璅蝐方芸摰 (^]/^N/^P)" +msgid " Tag completion (^]^N^P)" +msgstr " 璅蝐方芸摰 (^]^N^P)" #: edit.c:48 -msgid " Path pattern completion (^N/^P)" -msgstr " 頝臬芸摰 (^N/^P)" +msgid " Path pattern completion (^N^P)" +msgstr " 頝臬芸摰 (^N^P)" #: edit.c:49 -msgid " Definition completion (^D/^N/^P)" -msgstr " 摰蝢抵芸摰 (^D/^N/^P)" +msgid " Definition completion (^D^N^P)" +msgstr " 摰蝢抵芸摰 (^D^N^P)" #: edit.c:51 -msgid " Dictionary completion (^K/^N/^P)" -msgstr " 摮貉芸摰 (^K/^N/^P)" +msgid " Dictionary completion (^K^N^P)" +msgstr " 摮貉芸摰 (^K^N^P)" #: edit.c:52 -msgid " Thesaurus completion (^T/^N/^P)" -msgstr " Thesaurus 芸摰 (^T/^N/^P)" +msgid " Thesaurus completion (^T^N^P)" +msgstr " Thesaurus 芸摰 (^T^N^P)" #: edit.c:53 -msgid " Command-line completion (^V/^N/^P)" -msgstr " 賭誘芸摰 (^V/^N/^P)" +msgid " Command-line completion (^V^N^P)" +msgstr " 賭誘芸摰 (^V^N^P)" #: edit.c:56 msgid "Hit end of paragraph" msgstr "撌脣唳挾賜撠" -#: edit.c:941 +#: edit.c:962 msgid "'thesaurus' option is empty" msgstr "賊 'thesaurus' 芾身摰" -#: edit.c:1145 +#: edit.c:1166 msgid "'dictionary' option is empty" msgstr "賊 'dictionary' 芾身摰" -#: edit.c:2130 +#: edit.c:2162 #, c-format msgid "Scanning dictionary: %s" msgstr "摮: %s" -#: edit.c:2336 +#: edit.c:2368 msgid " (insert) Scroll (^E/^Y)" msgstr " () Scroll (^E/^Y)" -#: edit.c:2338 +#: edit.c:2370 msgid " (replace) Scroll (^E/^Y)" msgstr " (隞) Scroll (^E/^Y)" -#: edit.c:2652 +#: edit.c:2684 #, c-format msgid "Scanning: %s" msgstr "銝: %s" -#: edit.c:2687 +#: edit.c:2719 +#, c-format msgid "Scanning tags." msgstr "璅蝐." -#: edit.c:3349 +#: edit.c:3381 msgid " Adding" msgstr " 憓" @@ -372,102 +394,102 @@ msgstr " 憓" #. * be called before line = ml_get(), or when this address is no #. * longer needed. -- Acevedo. #. -#: edit.c:3398 +#: edit.c:3430 msgid "-- Searching..." msgstr "-- 撠銝..." -#: edit.c:3454 +#: edit.c:3486 msgid "Back at original" msgstr "啗絲暺" -#: edit.c:3459 +#: edit.c:3491 msgid "Word from other line" msgstr "敺亥憪摮 (?)" -#: edit.c:3464 +#: edit.c:3496 msgid "The only match" msgstr "芣甇日蝚血" -#: edit.c:3523 +#: edit.c:3555 #, c-format msgid "match %d of %d" msgstr "曉 %d / %d" -#: edit.c:3526 +#: edit.c:3558 #, c-format msgid "match %d" msgstr "蝚血 %d" #. Skip further arguments but do continue to #. * search for a trailing command. -#: eval.c:889 +#: eval.c:1024 #, c-format msgid "E106: Unknown variable: \"%s\"" msgstr "E106: 芸蝢拍霈: \"%s\"" -#: eval.c:1185 +#: eval.c:1320 #, c-format msgid "E107: Missing braces: %s" msgstr "E107: 蝻箏撠祈: %s" -#: eval.c:1290 eval.c:1304 +#: eval.c:1435 eval.c:1449 #, c-format msgid "E108: No such variable: \"%s\"" msgstr "E108: ⊥迨霈: \"%s\"" -#: eval.c:1560 +#: eval.c:1705 msgid "E109: Missing ':' after '?'" msgstr "E109: '?' 敺蝻箏 ':'" -#: eval.c:2176 +#: eval.c:2327 msgid "E110: Missing ')'" msgstr "E110: 蝻箏撠 \")\"" -#: eval.c:2233 +#: eval.c:2389 msgid "E111: Missing ']'" msgstr "E111: 蝻箏撠 \"]\"" -#: eval.c:2309 +#: eval.c:2466 #, c-format msgid "E112: Option name missing: %s" msgstr "E112: 蝻箏賊蝔: %s" -#: eval.c:2327 +#: eval.c:2484 #, c-format msgid "E113: Unknown option: %s" msgstr "E113: 銝甇蝣箇賊: %s" -#: eval.c:2391 +#: eval.c:2555 #, c-format msgid "E114: Missing quote: %s" msgstr "E114: 蝻箏撘: %s" -#: eval.c:2523 +#: eval.c:2698 #, c-format msgid "E115: Missing quote: %s" msgstr "E115: 蝻箏撘: %s" -#: eval.c:2843 +#: eval.c:3054 #, c-format msgid "E116: Invalid arguments for function %s" msgstr "E116: 賢 %s 撘訾甇蝣" -#: eval.c:2844 +#: eval.c:3083 #, c-format msgid "E117: Unknown function: %s" msgstr "E117: 芸蝢拍賢: %s" -#: eval.c:2845 +#: eval.c:3084 #, c-format msgid "E118: Too many arguments for function: %s" msgstr "E118: 賢 %s 撘賊憭" -#: eval.c:2846 +#: eval.c:3085 #, c-format msgid "E119: Not enough arguments for function: %s" msgstr "E119: 賢 %s 撘詨云撠" -#: eval.c:2847 +#: eval.c:3086 #, c-format msgid "E120: Using <SID> not in a script context: %s" msgstr "E120: <SID> 銝賢 script 祆憭雿輻: %s" @@ -477,16 +499,16 @@ msgstr "E120: <SID> 銝賢 script 祆憭雿輻: %s" #. * this way has the compelling advantage that translations need not to #. * be touched at all. See below what 'ok' and 'ync' are used for. #. -#: eval.c:3465 gui.c:4238 gui_gtk.c:1991 +#: eval.c:3687 gui.c:4385 gui_gtk.c:2059 msgid "&Ok" msgstr "蝣箏(&O)" -#: eval.c:4000 +#: eval.c:4226 #, c-format msgid "+-%s%3ld lines: " msgstr "+-%s%3ld 銵: " -#: eval.c:5149 +#: eval.c:5477 msgid "" "&OK\n" "&Cancel" @@ -494,125 +516,130 @@ msgstr "" "蝣箏(&O)\n" "瘨(&C)" -#: eval.c:5182 +#: eval.c:5517 msgid "called inputrestore() more often than inputsave()" msgstr "澆 inputrestore() 甈⊥豢 inputsave() 憭" -#: eval.c:6036 +#: eval.c:5977 +msgid "E655: Too many symbolic links (cycle?)" +msgstr "E655: 憭芸撅斤蝚西蝯(symlink) (敺芰?)" + +#: eval.c:6626 msgid "E240: No connection to Vim server" msgstr "E240: 瘝 Vim Server 撱箇蝺" -#: eval.c:6133 +#: eval.c:6724 msgid "E277: Unable to read a server reply" msgstr "E277: ⊥霈隡箸函" -#: eval.c:6161 +#: eval.c:6752 msgid "E258: Unable to send to client" msgstr "E258: ⊥喲 client" -#: eval.c:6209 +#: eval.c:6800 #, c-format msgid "E241: Unable to send to %s" msgstr "E241: ⊥喲 %s" -#: eval.c:6309 +#: eval.c:6900 msgid "(Invalid)" msgstr "(銝甇蝣)" -#: eval.c:7402 +#: eval.c:8078 #, c-format msgid "E121: Undefined variable: %s" msgstr "E121: 霈 %s 撠芸蝢" -#: eval.c:7834 +#: eval.c:8510 #, c-format msgid "E461: Illegal variable name: %s" msgstr "E461: 銝瘜霈詨蝔: %s" -#: eval.c:8121 +#: eval.c:8802 #, c-format msgid "E122: Function %s already exists, add ! to replace it" msgstr "E122: 賢 %s 撌脩摮, 隢雿輻 ! 撘瑕嗅隞" -#: eval.c:8188 +#: eval.c:8875 #, c-format msgid "E123: Undefined function: %s" msgstr "E123: 賢 %s 撠芸蝢" -#: eval.c:8201 +#: eval.c:8888 #, c-format msgid "E124: Missing '(': %s" msgstr "E124: 蝻箏 \"(\": %s" -#: eval.c:8234 +#: eval.c:8921 #, c-format msgid "E125: Illegal argument: %s" msgstr "E125: 訾甇蝣: %s" -#: eval.c:8313 +#: eval.c:9000 msgid "E126: Missing :endfunction" msgstr "E126: 蝻箏 :endfunction" -#: eval.c:8396 +#: eval.c:9107 #, c-format msgid "E127: Cannot redefine function %s: It is in use" msgstr "E127: 賢 %s 甇其蝙其葉嚗⊥啣蝢" -#: eval.c:8464 +#: eval.c:9177 msgid "E129: Function name required" msgstr "E129: 閬賢蝔" -#: eval.c:8515 +#: eval.c:9228 #, c-format msgid "E128: Function name must start with a capital: %s" msgstr "E128: 賢蝔梁洵銝摮瘥敹憭批神: %s" -#: eval.c:8707 +#: eval.c:9420 #, c-format msgid "E130: Undefined function: %s" msgstr "E130: 賢 %s 撠芸蝢" -#: eval.c:8712 +#: eval.c:9425 #, c-format msgid "E131: Cannot delete function %s: It is in use" msgstr "E131: 賢 %s 甇其蝙其葉嚗⊥芷" -#: eval.c:8760 +#: eval.c:9473 msgid "E132: Function call depth is higher than 'maxfuncdepth'" msgstr "E132: 賢餈游澆怠惜貉 'maxfuncdepth'" #. always scroll up, don't overwrite -#: eval.c:8813 +#: eval.c:9526 #, c-format msgid "calling %s" msgstr "澆 %s" -#: eval.c:8867 +#: eval.c:9588 #, c-format msgid "%s aborted" -msgstr "%s 鋡怠撥嗡葉瑕瑁" +msgstr "%s 鋡怠撥嗡葉瑕瑁 " -#: eval.c:8869 +#: eval.c:9590 #, c-format msgid "%s returning #%ld" msgstr "%s 喳 #%ld " -#: eval.c:8872 +#: eval.c:9597 #, c-format msgid "%s returning \"%s\"" msgstr "%s 喳 \"%s\"" #. always scroll up, don't overwrite -#: eval.c:8888 ex_cmds2.c:2231 +#: eval.c:9613 ex_cmds2.c:2370 #, c-format msgid "continuing in %s" msgstr "蝜潛: %s" -#: eval.c:8935 +#: eval.c:9639 msgid "E133: :return not inside a function" msgstr "E133: :return 敹典賢鋆∩蝙" -#: eval.c:9266 +#: eval.c:9970 +#, c-format msgid "" "\n" "# global variables:\n" @@ -625,80 +652,91 @@ msgstr "" msgid "<%s>%s%s %d, Hex %02x, Octal %03o" msgstr "<%s>%s%s %d, 剝脖 %02x, 恍脖 %03o" -#: ex_cmds.c:433 +#: ex_cmds.c:118 +#, c-format +msgid "> %d, Hex %04x, Octal %o" +msgstr "> %d, 剝脖 %04x, 恍脖 %o" + +#: ex_cmds.c:119 +#, c-format +msgid "> %d, Hex %08x, Octal %o" +msgstr "> %d, 剝脖 %08x, 恍脖 %o" + +#: ex_cmds.c:430 msgid "E134: Move lines into themselves" msgstr "E134: ⊥銵蝘餃啣芸歇" -#: ex_cmds.c:502 +#: ex_cmds.c:499 msgid "1 line moved" -msgstr "撌脫祉宏 1 銵" +msgstr "撌脫祉宏 1 銵 " -#: ex_cmds.c:504 +#: ex_cmds.c:501 #, c-format msgid "%ld lines moved" -msgstr "撌脫祉宏 %ld 銵" +msgstr "撌脫祉宏 %ld 銵 " -#: ex_cmds.c:909 +#: ex_cmds.c:924 #, c-format msgid "%ld lines filtered" -msgstr "撌脰 %ld 銵" +msgstr "撌脰 %ld 銵 " -#: ex_cmds.c:937 +#: ex_cmds.c:952 msgid "E135: *Filter* Autocommands must not change current buffer" msgstr "E135: *Filter* Autocommand 銝臭誑湔寧楨銵批捆" -#: ex_cmds.c:1022 +#: ex_cmds.c:1037 msgid "[No write since last change]\n" msgstr "[湔啣撠芸脣]\n" -#: ex_cmds.c:1268 +#: ex_cmds.c:1283 #, c-format msgid "%sviminfo: %s in line: " msgstr "%sviminfo: %s 刻銝: " -#: ex_cmds.c:1273 +#: ex_cmds.c:1288 msgid "E136: viminfo: Too many errors, skipping rest of file" msgstr "E136: viminfo: 憭航炊, 敹賜交獢園典" -#: ex_cmds.c:1302 +#: ex_cmds.c:1323 #, c-format msgid "Reading viminfo file \"%s\"%s%s%s" msgstr "霈 viminfo 瑼獢 \"%s\"%s%s%s" -#: ex_cmds.c:1303 +#: ex_cmds.c:1324 msgid " info" msgstr " 閮" -#: ex_cmds. |