diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-01-31 19:02:28 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-01-31 19:02:28 +0000 |
commit | 65c1b0166982f95d78106c3f0a3fac48424ba87d (patch) | |
tree | 515b58b1baf5972dee67de2cbe8e52d78c4d3ba6 /src | |
parent | 0182465bc07ec10606102ba744724f2b760c2bf9 (diff) |
updated for version 7.0046
Diffstat (limited to 'src')
-rw-r--r-- | src/INSTALLpc.txt | 36 | ||||
-rw-r--r-- | src/Make_cyg.mak | 12 | ||||
-rw-r--r-- | src/Make_mvc.mak | 5 | ||||
-rw-r--r-- | src/ex_docmd.c | 2 | ||||
-rw-r--r-- | src/globals.h | 2 | ||||
-rw-r--r-- | src/po/zh_TW.po | 3188 |
6 files changed, 1807 insertions, 1438 deletions
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 0514639862..b190e888f7 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -20,6 +20,7 @@ Contents: 5. Using Mingw 6. Cross compiling for Win32 from a Linux machine 7. Building with Python support +8. Building with MzScheme support 1. MS-DOS @@ -310,3 +311,38 @@ Now just do: make -f Make_ming.mak gvim.exe and you will end up with a Python-enabled, Win32 version. Enjoy! + +8. Building with MzScheme support +================================================= + +(written by Sergey Khorev <sergey.khorev@gmail.com>) + +Vim with MzScheme (http://www.plt-scheme.org/software/mzscheme) support can +be built with either MSVC, or MinGW, or Cygwin. Supported versions are 205 and +above (including 299 and 30x series). + +The MSVC build is quite straightforward. Simply invoke (in one line) +nmake -fMake_mvc.mak MZSCHEME=<Path-to-MzScheme> + [MZSCHEME_VER=<MzScheme-version>] [DYNAMIC_MZSCHEME=<yes or no>] +where <MzScheme-version> is the last seven characters from MzScheme dll name +(libmzschXXXXXXX.dll). +If DYNAMIC_MZSCHEME=yes, resulting executable will not depend on MzScheme +DLL's, but will load them in runtime on demand. + +Building dynamic MzScheme support on MinGW and Cygwin is similar. Take into +account that <Path-to-MzScheme> should contain slashes rather than backslashes +(e.g. d:/Develop/MzScheme) + +"Static" MzScheme support (Vim executable will depend on MzScheme DLLs +explicitly) on MinGW and Cygwin requires additional step. + +libmzschXXXXXXX.dll and libmzgcXXXXXXX.dll should be copied from +%WINDOWS%\System32 to other location (either build directory, some temporary +dir or even MzScheme home). + +Pass that path as MZSCHEME_DLLS parameter for Make. E.g., +make -fMake_cyg.mak MZSCHEME=d:/Develop/MzScheme MZSCHEME_VER=209_000 + MZSCHEME_DLLS=c:/Temp DYNAMIC_MZSCHEME=no + +After successful build these dlls can be freely removed, leaving them in +%WINDOWS%\System32 only. diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index 5319994ead..da98b501c2 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -1,6 +1,8 @@ # # Makefile for VIM on Win32, using Cygnus gcc -# Last updated by Dan Sharp. Last Change: 2005 Jan 19 +# Last updated by Dan Sharp. Last Change: 2005 Jan 29 +# +# Also read INSTALLpc.txt! # # This compiles Vim as a Windows application. If you want Vim to run as a # Cygwin application use the Makefile (just like on Unix). @@ -21,13 +23,7 @@ # MZSCHEME define to path to MzScheme dir to get MZSCHEME support (not defined) # MZSCHEME_VER define to version of MzScheme being used (209_000) # DYNAMIC_MZSCHEME no or yes: use yes to load the MzScheme DLLs dynamically (yes) -# MZSCHEME_DLLS path to MzScheme DLLs (libmzgc and libmzsch). -# Is used for DYNAMIC_MZSCHEME=no only. -# c:/windows/system32 isn't a good idea, copy them to some -# dir and point MZSCHEME_DLLS to this dir. -# By default $(MZSCHEME) will be used. You can remove -# these DLLs from $(MZSCHEME_DLLS) after you -# built Vim (they are used for dll "static" linking only) +# MZSCHEME_DLLS path to MzScheme DLLs (libmzgc and libmzsch), for "static" build. # GETTEXT no or yes: set to yes for dynamic gettext support (yes) # ICONV no or yes: set to yes for dynamic iconv support (yes) # MBYTE no or yes: set to yes to include multibyte support (yes) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5fbb2c2444..57012a48bf 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -19,7 +19,10 @@ # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default # is yes) # Global IME support: GIME=yes (requires GUI=yes) -# MzScheme interface: MZSCHEME=[Path to MzScheme directory], MZSCHEME_VER=[version, 205_000, ...] +# MzScheme interface: +# MZSCHEME=[Path to MzScheme directory] +# DYNAMIC_MZSCHEME=yes (to load the MzScheme DLLs dynamically) +# MZSCHEME_VER=[version, 205_000, ...] # Perl interface: # PERL=[Path to Perl directory] # DYNAMIC_PERL=yes (to load the Perl DLL dynamically) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 2b912d6821..53194496f2 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -336,6 +336,8 @@ static void ex_tag_cmd __ARGS((exarg_T *eap, char_u *name)); # define ex_endfunction ex_ni # define ex_let ex_ni # define ex_unlet ex_ni +# define ex_lockvar ex_ni +# define ex_unlockvar ex_ni # define ex_function ex_ni # define ex_delfunction ex_ni # define ex_return ex_ni diff --git a/src/globals.h b/src/globals.h index 7580dd0928..555c19e4e6 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1397,7 +1397,7 @@ EXTERN char_u e_invexprmsg[] INIT(=N_("E449: Invalid expression received")); #endif #ifdef FEAT_NETBEANS_INTG EXTERN char_u e_guarded[] INIT(=N_("E463: Region is guarded, cannot modify")); -EXTERN char_u e_nbreadonly[] INIT(=N_("E680: NetBeans does not allow changes in read-only files")); +EXTERN char_u e_nbreadonly[] INIT(=N_("E744: NetBeans does not allow changes in read-only files")); #endif #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) EXTERN char_u e_intern2[] INIT(=N_("E685: Internal error: %s")); diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po index c318e63414..bfbc44f4e6 100644 --- a/src/po/zh_TW.po +++ b/src/po/zh_TW.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=big5\n" "Content-Transfer-Encoding: 8-bit\n" -#: buffer.c:97 +#: buffer.c:102 msgid "E82: Cannot allocate any buffer, exiting..." msgstr "E82: 無法配置任何緩衝區,離開程式..." -#: 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: 無法切換到更後面的緩衝區" -#: buffer.c:942 +#: buffer.c:953 msgid "E88: Cannot go before first buffer" msgstr "E88: 無法切換到更前面的緩衝區" -#: 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.c:1304 +#: ex_cmds.c:1325 msgid " marks" msgstr " 標記" -#: ex_cmds.c:1305 +#: ex_cmds.c:1326 msgid " FAILED" msgstr " 失敗" -#: ex_cmds.c:1396 +#: ex_cmds.c:1418 #, c-format msgid "E137: Viminfo file is not writable: %s" msgstr "E137: Viminfo 檔案無法寫入: %s" -#: ex_cmds.c:1521 +#: ex_cmds.c:1543 #, c-format msgid "E138: Can't write viminfo file %s!" msgstr "E138: 無法寫入 viminfo 檔案 %s !" -#: ex_cmds.c:1529 +#: ex_cmds.c:1551 #, c-format msgid "Writing viminfo file \"%s\"" msgstr "寫入 viminfo 檔案 \"%s\" 中" #. Write the info: -#: ex_cmds.c:1627 +#: ex_cmds.c:1649 #, c-format msgid "# This viminfo file was generated by Vim %s.\n" msgstr "# 本 viminfo 檔案是由 Vim %s 所產生.\n" -#: ex_cmds.c:1629 +#: ex_cmds.c:1651 +#, c-format msgid "" "# You may edit it if you're careful!\n" "\n" @@ -706,47 +744,48 @@ msgstr "" "# 如果想要自行修改請特別小心!\n" "\n" -#: ex_cmds.c:1631 +#: ex_cmds.c:1653 +#, c-format msgid "# Value of 'encoding' when this file was written\n" msgstr "# 'encoding' 在此檔建立時的值\n" -#: ex_cmds.c:1730 +#: ex_cmds.c:1752 msgid "Illegal starting char" msgstr "無效的起始字元" -#: ex_cmds.c:2075 ex_cmds.c:2340 ex_cmds2.c:744 +#: ex_cmds.c:2097 ex_cmds2.c:761 msgid "Save As" msgstr "另存新檔" #. Overwriting a file that is loaded in another buffer is not a #. * good idea. -#: ex_cmds.c:2118 +#: ex_cmds.c:2140 msgid "E139: File is loaded in another buffer" msgstr "E139: 您在另一個緩衝區也載入了這個檔案" -#: ex_cmds.c:2152 +#: ex_cmds.c:2174 msgid "Write partial file?" msgstr "要寫入部分檔案嗎?" -#: ex_cmds.c:2159 +#: ex_cmds.c:2181 msgid "E140: Use ! to write partial buffer" msgstr "E140: 請使用 ! 以寫入部分緩衝區" -#: ex_cmds.c:2274 +#: ex_cmds.c:2296 #, c-format msgid "Overwrite existing file \"%.*s\"?" msgstr "要覆寫已存在的檔案 \"%.*s\"?" -#: ex_cmds.c:2345 +#: ex_cmds.c:2367 #, c-format msgid "E141: No file name for buffer %ld" msgstr "E141: 緩衝區 %ld 沒有檔案名稱" -#: ex_cmds.c:2383 +#: ex_cmds.c:2406 msgid "E142: File not written: Writing is disabled by 'write' option" msgstr "E142: 檔案未寫入,因為 'write' 選項被關閉" -#: ex_cmds.c:2403 +#: ex_cmds.c:2426 #, c-format msgid "" "'readonly' option is set for \"%.*s\".\n" @@ -755,68 +794,69 @@ msgstr "" "\"%.*s\" 已設定 'readonly' 選項.\n" "確定要覆寫嗎?" -#: ex_cmds.c:2568 +#: ex_cmds.c:2599 msgid "Edit File" msgstr "編輯檔案" -#: ex_cmds.c:3137 +#: ex_cmds.c:3206 #, c-format msgid "E143: Autocommands unexpectedly deleted new buffer %s" msgstr "E143: Autocommands 意外地刪除新緩衝區 %s" -#: ex_cmds.c:3269 +#: ex_cmds.c:3340 msgid "E144: non-numeric argument to :z" msgstr "E144: :z 不接受非數字的參數" -#: ex_cmds.c:3354 +#: ex_cmds.c:3425 msgid "E145: Shell commands not allowed in rvim" msgstr "E145: rvim 中禁止使用 shell 命令" -#: ex_cmds.c:3461 +#: ex_cmds.c:3532 msgid "E146: Regular expressions can't be delimited by letters" msgstr "E146: Regular expression 無法用字母分隔 (?)" -#: ex_cmds.c:3807 +#: ex_cmds.c:3878 #, c-format msgid "replace with %s (y/n/a/q/l/^E/^Y)?" msgstr "取代為 %s (y/n/a/q/^E/^Y)?" -#: ex_cmds.c:4172 +#: ex_cmds.c:4271 msgid "(Interrupted) " msgstr "(已中斷) " -#: ex_cmds.c:4176 +#: ex_cmds.c:4275 msgid "1 substitution" -msgstr "取代一組" +msgstr "取代一組 " -#: ex_cmds.c:4178 +#: ex_cmds.c:4277 #, c-format msgid "%ld substitutions" -msgstr "取代 %ld 組" +msgstr "取代 %ld 組 " -#: ex_cmds.c:4181 +#: ex_cmds.c:4280 msgid " on 1 line" -msgstr " 一行中" +msgstr ",範圍:一行 " -#: ex_cmds.c:4183 +#: ex_cmds.c:4282 #, c-format msgid " on %ld lines" -msgstr " %ld 行中" +msgstr ",範圍: %ld 行 " -#: ex_cmds.c:4234 +#: ex_cmds.c:4333 msgid "E147: Cannot do :global recursive" -msgstr "E147: :global 無法遞迴執行" +msgstr "E147: :global 無法遞迴執行 " -#: ex_cmds.c:4269 +#: ex_cmds.c:4368 msgid "E148: Regular expression missing from global" msgstr "E148: 沒有使用過 Regular expression (?)" -#: ex_cmds.c:4318 +#: ex_cmds.c:4417 #, c-format msgid "Pattern found in every line: %s" msgstr "每一行都找不到: %s" -#: ex_cmds.c:4399 +#: ex_cmds.c:4498 +#, c-format msgid "" "\n" "# Last Substitute String:\n" @@ -826,342 +866,408 @@ msgstr "" "# 前一組替代字串:\n" "$" -#: ex_cmds.c:4503 +#: ex_cmds.c:4599 +msgid "E478: Don't panic!" +msgstr "E478: 不要驚慌!" + +#: ex_cmds.c:4651 +#, c-format +msgid "E661: Sorry, no '%s' help for %s" +msgstr "E149: 抱歉, 沒有關於 %s-%s 的說明" + +#: ex_cmds.c:4654 #, c-format msgid "E149: Sorry, no help for %s" msgstr "E149: 抱歉, 沒有 %s 的說明" -#: ex_cmds.c:4537 +#: ex_cmds.c:4688 #, c-format msgid "Sorry, help file \"%s\" not found" msgstr "抱歉, 找不到說明檔 \"%s\"" -#: ex_cmds.c:5012 +#: ex_cmds.c:5191 #, c-format msgid "E150: Not a directory: %s" msgstr "E150: %s 不是目錄" -#: ex_cmds.c:5040 +#: ex_cmds.c:5330 #, c-format msgid "E152: Cannot open %s for writing" msgstr "E152: 無法以寫入模式開啟 \"%s\"" -#: ex_cmds.c:5075 +#: ex_cmds.c:5366 #, c-format msgid "E153: Unable to open %s for |