diff options
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 407 |
1 files changed, 204 insertions, 203 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 61b5dc2..f8649bb 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2005-04-01 14:31+0800\n" "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -14,31 +14,31 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "無效的 --bytes 值 ‘%s’" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "無效的 --bytes 值 ‘%s’" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "程式錯誤" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "堆疊溢位" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "不明的系統錯誤" @@ -142,66 +142,41 @@ msgstr "" msgid "weird file" msgstr "不尋常的檔案" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s：選項‘%s’是不明確的\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s：選項‘-W %s’是不明確的\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s：選項‘%s’是不明確的\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s：選項‘--%s’不可配合參數使用\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s：無法識別的選項‘%c%s’\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s：選項‘%c%s’不可配合參數使用\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s：選項‘%s’需要參數\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s：無法識別的選項‘--%s’\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s：無法識別的選項‘%c%s’\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：無效的選項 ─ %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：選項需要參數 ─ %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s：選項‘-W %s’是不明確的\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s：選項‘-W %s’不可配合參數使用\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s：選項‘%s’需要參數\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -223,11 +198,11 @@ msgstr "%s：選項‘%s’需要參數\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -510,7 +485,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "檔案 %s 與 %s 不同\n" @@ -520,21 +495,21 @@ msgstr "檔案 %s 與 %s 不同\n" msgid "Binary files %s and %s differ\n" msgstr "二元碼檔 %s 與 %s 不同\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "檔案末沒有 newline 字元" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "請嘗試‘%s --help’來獲取更多資訊。" @@ -549,12 +524,12 @@ msgstr "無效的 --ignore-initial 值 ‘%s’" msgid "options -l and -s are incompatible" msgstr "-l 和 -s 選項不兼容" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "寫入失敗" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "標準輸出" @@ -615,7 +590,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 和 SKIP2 是每個檔案會略過的位元組數目。" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -635,7 +610,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "如果檔案是‘-’或沒有指定，則由標準輸入讀入資料。" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "如果兩邊內容一樣，回傳值是 0；1 代表兩邊內容不相同，2 代表有錯誤。" @@ -644,245 +619,258 @@ msgstr "如果兩邊內容一樣，回傳值是 0；1 代表兩邊內容不相 msgid "invalid --bytes value '%s'" msgstr "無效的 --bytes 值 ‘%s’" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "‘%s’後缺少了參數" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "多餘的參數‘%s’" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s 不同：第 %s 位元組，第 %s 行\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s 不同：第 %s 行，第 %s 位元組為 %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp：%s 已結束\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s 不同：第 %s 位元組，第 %s 行\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s 不同：第 %s 位元組，第 %s 行\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp：%s 已結束\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "無效的上下文行數‘%s’" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "此系統不支援分頁" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "太多有關檔案標籤的選項" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "無效的寬度‘%s’" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "出現互相抵觸的寬度選項" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "無效的水平長度 ‘%s’" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "無效的定位字元寬度 ‘%s’" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "出現互相抵觸的定位字元寬度選項" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "同時指定了 --from-file 及 --to-file 選項" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal 以正常的 diff 方式輸出。" -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief 只顯示檔案是否不同。" -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files 當兩個檔案一樣時仍然顯示結果。" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed 以 ed script 方式輸出。" -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs 以 RCS diff 格式輸出。" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column 當有兩行相同時只顯示左邊的一行。" -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 當有兩行相同時不會顯示。" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=FILE1 將 FILE1 和參數中的所有檔案/目錄作比較。FILE1 可以是目錄。" -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 將輸出中的 tab 換成空格。" -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。" -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM 定位字元 (tab) 的寬度，預設為 8 個空格。" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate 將輸出送至‘pr’指令來分頁。" -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive 連同所有副目錄一起比較。" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file 不存在的檔案以空白檔案方式處理。" -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file 若第一個檔案不存在，以空白檔案處理。" -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case 當比較檔案名稱時不分辨大小寫。" -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "--no-ignore-file-name-case 當比較檔案名稱時會分辨大小寫。" -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT 排除樣式為 PAT 的檔案。" -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "-X FILE --exclude-from=FILE 排除所有在 FILE 中列出的樣式的檔案。" -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S FILE --starting-file=FILE 當比較目錄時，由 FILE 開始比較。" -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -890,7 +878,7 @@ msgid "" msgstr "" "--from-file=FILE1 將 FILE1 和參數中的所有檔案/目錄作比較。FILE1 可以是目錄。" -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -898,97 +886,97 @@ msgid "" msgstr "" "--to-file=FILE2 將參數中的所有檔案/目錄和 FILE2 作比較。FILE2 可以是目錄。" -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case 不分辨檔案內容中的大小寫。" -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion 忽略因將 tab 轉換為空格而造成的差異。" -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空白字元。" -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change 忽略因空白字元數目不同而造成的差異。" -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space 忽略所有空白字元。" -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差異。" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE 忽略任何符合指定的<正規表示式>的地方。" -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文字檔方式處理。" -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。" -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary 以二元碼檔模式讀寫資料。" -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "-D NAME --ifdef=NAME 輸出的資料以‘#ifdef NAME’方式標明差異。" -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT 效果類似，但會以 GFMT 格式處理 GTYPE 輸入行組。" -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT 效果類似，但會以 LFMT 格式處理每一行資料。" -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT 效果類似，但會以 LFMT 格式處理 LTYPE 輸入行組。" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE 可以是‘old’、‘new’或‘unchanged’。GTYPE 可以是 LTYPE 的選擇\n" " 或是‘changed’。" -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1016,7 +1004,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1029,7 +1017,7 @@ msgstr "" " %l 該行的內容，但不包括結束的 newline 字元\n" " %[-][寬度][.[精確度]]{doxX}n 以 printf 格式表示的輸入資料行號" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1043,156 +1031,149 @@ msgstr "" " %c'C' 字元 C\n" " %c'\\OOO' 八進位數字 OOO 所代表的字元" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 盡可能找出最小的差異。" -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM (此選項不作處理)" -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "-H --speed-large-files 假設檔案十分大而且當中含有許多些微的差異。" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal 以正常的 diff 方式輸出。" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FILES 的格式可以是‘FILE1 FILE2’、‘DIR1 DIR2’、‘DIR FILE...’或\n" " ‘FILE... DIR’。" -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "如果使用 --from-file 或 --to-file 選項，FILES 的格式則不受限制。" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "如果 FILE 是‘-’，則由標準輸入讀取資料。" # It is intentional *not* to translate FILES -- maddog -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "用法：%s [選項]... FILES\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "比較兩個檔案的每一行。" -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "互相矛盾的 %s 選項，參數值為‘%s’" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "互相矛盾的輸出模式選項" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "無效的寬度‘%s’" +msgstr "無效的上下文行數‘%s’" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "只在 %s 存在：%s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "‘-’無法與目錄作比較" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D 選項不可配合目錄使用" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s 和 %s 有共同的副目錄\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "檔案 %s 是%s而檔案 %s 是%s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "檔案 %s 與 %s 不同\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "檔案 %s 和 %s 相同\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "不兼容的選項" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "輸入檔‘-’不可多於一個" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "讀取資料失敗" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all 顯示所有要更改的部份，並括上互相抵觸的地方。" -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1201,84 +1182,84 @@ msgstr "" "-e --ed 取出由 OLDFILE 至 YOURFILE 的更改部份，並顯示可將此\n" " 部份套用至 MYFILE 的 ed script。" -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E --show-overlap 顯示未合併的更改部份，並括上互相抵觸的地方。" -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only 顯示未合併而且不重疊的更改部份。" -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only 只顯示重疊的更改部份。" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i 在 ed script 中附加‘w’和‘q’指令。" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文字檔方式處理。" -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。" -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。" -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=程式 使用<程式>來比較檔案。" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "用法：%s [選項]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "比較三個檔案的每一行。" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1292,45 +1273,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "回傳值是 0 的話代表指令成功執行，1 代表內容有衝突，2 代表有錯誤。" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "內部錯誤：diff 區段的格式出錯" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s：diff 失敗：" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "內部錯誤：process_diff 中的 diff 類型無效" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "無效的 diff 格式；表示資料變更的分隔字串無效" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "無效的 diff 格式；最後一行不完整" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "子程式 ‘%s’ 無法執行" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "diff 格式無效；某行的第一個字元不正確" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "內部錯誤：準備輸出的 diff 資料類型無效" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "輸入檔縮小" @@ -1345,7 +1326,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1499,16 +1480,36 @@ msgstr "" "v ：\t加上兩邊一樣的行組時會在畫面顯示。\n" "q ：\t離開。\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s：無法識別的選項‘--%s’\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s：選項‘--%s’不可配合參數使用\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s：無法識別的選項‘--%s’\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s：選項‘-W %s’是不明確的\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s：選項‘-W %s’不可配合參數使用\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s：選項‘%s’需要參數\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s：不合法的選項 ─ %c\n" |