5e2dff212a · matheusbsbs/matheus-bagliano

@@ -21,12 +21,13 @@

21 #

22 # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023.

23 # Kaiyang Wu <self@origincode.me>, 2022.

24 +# lumynou5 <lumynou5.tw@gmail.com>, 2023.

25 msgid ""

26 msgstr ""

27 "Project-Id-Version: Git\n"

28 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

28 -"POT-Creation-Date: 2023-05-19 19:57+0000\n"

29 -"PO-Revision-Date: 2023-05-31 23:41+0800\n"

29 +"POT-Creation-Date: 2023-08-20 21:51+0800\n"

30 +"PO-Revision-Date: 2023-08-20 21:58+0800\n"

31 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

32 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"

33 "po/git-cli/zh_Hant/>\n"

@@ -35,7 +36,7 @@ msgstr ""

36 "Content-Type: text/plain; charset=UTF-8\n"

37 "Content-Transfer-Encoding: 8bit\n"

38 "Plural-Forms: nplurals=1; plural=0;\n"

38 -"X-Generator: Poedit 3.3.1\n"

39 +"X-Generator: Poedit 3.3.2\n"

40 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

41 "zhconvert.org\n"

42

@@ -126,7 +127,7 @@ msgstr "忽略未合併項目：%s"

127 #: add-interactive.c add-patch.c

128 #, c-format

129 msgid "Only binary files changed.\n"

129 -msgstr "只變更二進位檔案。\n"

130 +msgstr "只有二進位檔案更動了。\n"

131

132 #: add-interactive.c add-patch.c

133 #, c-format

@@ -770,9 +771,8 @@ msgid "Reverting is not possible because you have unmerged files."

771 msgstr "無法還原提交，有未合併的檔案。"

772

773 #: advice.c

773 -#, c-format

774 -msgid "It is not possible to %s because you have unmerged files."

775 -msgstr "無法 %s，有未合併的檔案。"

774 +msgid "Rebasing is not possible because you have unmerged files."

775 +msgstr "無法重定基底，有未合併的檔案。"

776

777 #: advice.c

778 msgid ""

@@ -941,6 +941,14 @@ msgstr "無法同時使用 “%s” 和 “%s” 選項"

941 msgid "'%s' outside a repository"

942 msgstr "“%s” 在版本庫之外"

943

944 +#: apply.c

945 +msgid "failed to read patch"

946 +msgstr "無法讀取修補檔"

947 +

948 +#: apply.c

949 +msgid "patch too large"

950 +msgstr "修補檔過大"

951 +

952 #: apply.c

953 #, c-format

954 msgid "Cannot prepare timestamp regexp %s"

@@ -1585,7 +1593,7 @@ msgstr "無法讀取 “%s”"

1593 #: archive.c

1594 #, c-format

1595 msgid "pathspec '%s' matches files outside the current directory"

1588 -msgstr "符合路徑規格「%s」的檔案在目前目錄之外"

1596 +msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外"

1597

1598 #: archive.c builtin/add.c builtin/rm.c

1599 #, c-format

@@ -2030,8 +2038,8 @@ msgstr "已有同名 “%s” 分支"

2038

2039 #: branch.c

2040 #, c-format

2033 -msgid "cannot force update the branch '%s' checked out at '%s'"

2034 -msgstr "無法強制更新在 “%2$s” 簽出的 “%1$s” 分支"

2041 +msgid "cannot force update the branch '%s' used by worktree at '%s'"

2042 +msgstr "無法強制更新被位於 “%2$s” 的工作區使用的 “%1$s” 分支"

2043

2044 #: branch.c

2045 #, c-format

@@ -2110,20 +2118,6 @@ msgstr "git add [<options>] [--] <pathspec>..."

2118 msgid "cannot chmod %cx '%s'"

2119 msgstr "無法 chmod %cx '%s'"

2120

2113 -#: builtin/add.c

2114 -#, c-format

2115 -msgid "unexpected diff status %c"

2116 -msgstr "非預期的 diff 狀態 %c"

2117 -

2118 -#: builtin/add.c builtin/commit.c

2119 -msgid "updating files failed"

2120 -msgstr "更新檔案失敗"

2121 -

2122 -#: builtin/add.c

2123 -#, c-format

2124 -msgid "remove '%s'\n"

2125 -msgstr "移除 “%s”\n"

2126 -

2121 #: builtin/add.c

2122 msgid "Unstaged changes after refreshing the index:"

2123 msgstr "重新整理索引之後，尚未被暫存的更動："

@@ -2656,10 +2650,6 @@ msgstr "向 git-mailinfo 傳入 -m 參數"

2650 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2651 msgstr "若為 mbox 格式，向 git-mailsplit 傳入 --keep-cr 標記"

2652

2659 -#: builtin/am.c

2660 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2661 -msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定"

2662 -

2653 #: builtin/am.c

2654 msgid "strip everything before a scissors line"

2655 msgstr "截掉裁切線前的所有內容"

@@ -3085,7 +3075,7 @@ msgstr "好的修訂版回傳偽造的錯誤碼 %d"

3075 #: builtin/bisect.c

3076 #, c-format

3077 msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"

3088 -msgstr "二分搜尋執行失敗：%2$s 回傳的離開碼 %1$d 小於 0 或大於 128"

3078 +msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128"

3079

3080 #: builtin/bisect.c

3081 #, c-format

@@ -3964,12 +3954,12 @@ msgid ""

3954 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"

3955 "objects]\n"

3956 " [--buffer] [--follow-symlinks] [--unordered]\n"

3967 -" [--textconv | --filters] [-z]"

3957 +" [--textconv | --filters] [-Z]"

3958 msgstr ""

3959 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"

3960 "objects]\n"

3961 " [--buffer] [--follow-symlinks] [--unordered]\n"

3972 -" [--textconv | --filters] [-z]"

3962 +" [--textconv | --filters] [-Z]"

3963

3964 #: builtin/cat-file.c

3965 msgid ""

@@ -4027,6 +4017,10 @@ msgstr "類似 --batch 但不輸出 <contents>"

4017 msgid "stdin is NUL-terminated"

4018 msgstr "stdin 以 NUL 字元終止"

4019

4020 +#: builtin/cat-file.c

4021 +msgid "stdin and stdout is NUL-terminated"

4022 +msgstr "stdin 和 stdout 以 NUL 字元終止"

4023 +

4024 #: builtin/cat-file.c

4025 msgid "read commands from stdin"

4026 msgstr "從 stdin 讀取命令"

@@ -4914,7 +4908,8 @@ msgid "remove whole directories"

4908 msgstr "移除整個目錄"

4909

4910 #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c

4917 -#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c

4911 +#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c

4912 +#: ref-filter.h

4913 msgid "pattern"

4914 msgstr "pattern"

4915

@@ -5084,14 +5079,6 @@ msgstr "server-specific"

5079 msgid "option to transmit"

5080 msgstr "傳輸選項"

5081

5087 -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c

5088 -msgid "use IPv4 addresses only"

5089 -msgstr "只使用 IPv4 位址"

5090 -

5091 -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c

5092 -msgid "use IPv6 addresses only"

5093 -msgstr "只使用 IPv6 位址"

5094 -

5082 #: builtin/clone.c

5083 msgid "apply partial clone filters to submodules"

5084 msgstr "將部分複製過濾器套用至子模組"

@@ -5626,6 +5613,10 @@ msgstr ""

5613 " git cherry-pick --skip\n"

5614 "\n"

5615

5616 +#: builtin/commit.c read-cache.c

5617 +msgid "updating files failed"

5618 +msgstr "更新檔案失敗"

5619 +

5620 #: builtin/commit.c

5621 msgid "failed to unpack HEAD tree object"

5622 msgstr "解包 HEAD 樹狀物件失敗"

@@ -5701,8 +5692,8 @@ msgstr "無法選擇一個未被目前提交說明使用的備註字元"

5692

5693 #: builtin/commit.c builtin/merge-tree.c

5694 #, c-format

5704 -msgid "could not lookup commit %s"

5705 -msgstr "不能查詢提交 %s"

5695 +msgid "could not lookup commit '%s'"

5696 +msgstr "無法查詢提交 “%s”"

5697

5698 #: builtin/commit.c builtin/shortlog.c

5699 #, c-format

@@ -7936,7 +7927,7 @@ msgstr "對 %s 呼叫 fstat 失敗：%s"

7927 msgid "failed to parse '%s' value '%s'"

7928 msgstr "無法解析 '%s' 值 '%s'"

7929

7939 -#: builtin/gc.c builtin/init-db.c

7930 +#: builtin/gc.c setup.c

7931 #, c-format

7932 msgid "cannot stat '%s'"

7933 msgstr "不能對 '%s' 呼叫 stat"

@@ -8940,7 +8931,7 @@ msgstr "無法返回目前工作目錄"

8931 msgid "bad %s"

8932 msgstr "錯誤選項 %s"

8933

8943 -#: builtin/index-pack.c builtin/init-db.c

8934 +#: builtin/index-pack.c builtin/init-db.c setup.c

8935 #, c-format

8936 msgid "unknown hash algorithm '%s'"

8937 msgstr "未知的「%s」雜湊算法"

@@ -8957,95 +8948,6 @@ msgstr "--verify 沒有提供 packfile 名稱參數"

8948 msgid "fsck error in pack objects"

8949 msgstr "在打包物件中 fsck 檢查發生錯誤"

8950

8960 -#: builtin/init-db.c

8961 -#, c-format

8962 -msgid "cannot stat template '%s'"

8963 -msgstr "不能對範本 '%s' 呼叫 stat"

8964 -

8965 -#: builtin/init-db.c

8966 -#, c-format

8967 -msgid "cannot opendir '%s'"

8968 -msgstr "不能開啟目錄 '%s'"

8969 -

8970 -#: builtin/init-db.c

8971 -#, c-format

8972 -msgid "cannot readlink '%s'"

8973 -msgstr "不能讀取連結 '%s'"

8974 -

8975 -#: builtin/init-db.c

8976 -#, c-format

8977 -msgid "cannot symlink '%s' '%s'"

8978 -msgstr "不能自 '%s' 到 '%s' 建立符號連結"

8979 -

8980 -#: builtin/init-db.c

8981 -#, c-format

8982 -msgid "cannot copy '%s' to '%s'"

8983 -msgstr "不能複製 '%s' 至 '%s'"

8984 -

8985 -#: builtin/init-db.c

8986 -#, c-format

8987 -msgid "ignoring template %s"

8988 -msgstr "忽略範本 %s"

8989 -

8990 -#: builtin/init-db.c

8991 -#, c-format

8992 -msgid "templates not found in %s"

8993 -msgstr "沒有在 %s 中找到範本"

8994 -

8995 -#: builtin/init-db.c

8996 -#, c-format

8997 -msgid "not copying templates from '%s': %s"

8998 -msgstr "沒有從 '%s' 複製範本：%s"

8999 -

9000 -#: builtin/init-db.c

9001 -#, c-format

9002 -msgid "invalid initial branch name: '%s'"

9003 -msgstr "無效的初始分支名稱：'%s'"

9004 -

9005 -#: builtin/init-db.c

9006 -#, c-format

9007 -msgid "unable to handle file type %d"

9008 -msgstr "不能處理 %d 類型的檔案"

9009 -

9010 -#: builtin/init-db.c

9011 -#, c-format

9012 -msgid "unable to move %s to %s"

9013 -msgstr "不能移動 %s 至 %s"

9014 -

9015 -#: builtin/init-db.c

9016 -msgid "attempt to reinitialize repository with different hash"

9017 -msgstr "嘗試以不同的雜湊值重新初始化版本庫"

9018 -

9019 -#: builtin/init-db.c

9020 -#, c-format

9021 -msgid "%s already exists"

9022 -msgstr "%s 已經存在"

9023 -

9024 -#: builtin/init-db.c

9025 -#, c-format

9026 -msgid "re-init: ignored --initial-branch=%s"

9027 -msgstr "re-init: 忽略 --initial-branch=%s"

9028 -

9029 -#: builtin/init-db.c

9030 -#, c-format

9031 -msgid "Reinitialized existing shared Git repository in %s%s\n"

9032 -msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"

9033 -

9034 -#: builtin/init-db.c

9035 -#, c-format

9036 -msgid "Reinitialized existing Git repository in %s%s\n"

9037 -msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"

9038 -

9039 -#: builtin/init-db.c

9040 -#, c-format

9041 -msgid "Initialized empty shared Git repository in %s%s\n"

9042 -msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"

9043 -

9044 -#: builtin/init-db.c

9045 -#, c-format

9046 -msgid "Initialized empty Git repository in %s%s\n"

9047 -msgstr "已初始化空的 Git 版本庫於 %s%s\n"

9048 -

8951 #: builtin/init-db.c

8952 msgid ""

8953 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"

@@ -9593,6 +9495,11 @@ msgid ""

9495 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

9496 msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"

9497

9498 +#: builtin/ls-files.c builtin/ls-tree.c

9499 +#, c-format

9500 +msgid "could not get object info about '%s'"

9501 +msgstr "無法取得「%s」相關的物件資訊"

9502 +

9503 #: builtin/ls-files.c

9504 #, c-format

9505 msgid "bad ls-files format: element '%s' does not start with '('"

@@ -9777,11 +9684,6 @@ msgstr "除了顯示指向的物件外，顯示指向的引用名"

9684 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

9685 msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"

9686

9780 -#: builtin/ls-tree.c

9781 -#, c-format

9782 -msgid "could not get object info about '%s'"

9783 -msgstr "無法取得「%s」相關的物件資訊"

9784 -

9687 #: builtin/ls-tree.c

9688 #, c-format

9689 msgid "bad ls-tree format: element '%s' does not start with '('"

@@ -10707,11 +10609,13 @@ msgstr "git notes [--ref <註解引用>] [list [<物件>]]"

10609

10610 #: builtin/notes.c

10611 msgid ""

10710 -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

10711 -"| (-c | -C) <object>] [<object>]"

10612 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"

10613 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10614 +"| -C) <object>] [<object>]"

10615 msgstr ""

10713 -"git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> "

10714 -"| (-c | -C) <物件>] [<物件>]"

10616 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"

10617 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10618 +"| -C) <object>] [<object>]"

10619

10620 #: builtin/notes.c

10621 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"

@@ -10719,11 +10623,13 @@ msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>

10623

10624 #: builtin/notes.c

10625 msgid ""

10722 -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

10723 -"(-c | -C) <object>] [<object>]"

10626 +"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"

10627 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10628 +"| -C) <object>] [<object>]"

10629 msgstr ""

10725 -"git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | "

10726 -"(-c | -C) <物件>] [<物件>]"

10630 +"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"

10631 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10632 +"| -C) <object>] [<object>]"

10633

10634 #: builtin/notes.c

10635 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

@@ -10891,6 +10797,18 @@ msgstr "允許儲存空白備註"

10797 msgid "replace existing notes"

10798 msgstr "取代已存在的註解"

10799

10800 +#: builtin/notes.c

10801 +msgid "<paragraph-break>"

10802 +msgstr "<paragraph-break>"

10803 +

10804 +#: builtin/notes.c

10805 +msgid "insert <paragraph-break> between paragraphs"

10806 +msgstr "在段落間插入 <paragraph-break>"

10807 +

10808 +#: builtin/notes.c

10809 +msgid "remove unnecessary whitespace"

10810 +msgstr "移除不必要的空白字元"

10811 +

10812 #: builtin/notes.c

10813 #, c-format

10814 msgid ""

@@ -11570,8 +11488,12 @@ msgid "refusing to run without --i-still-use-this"

11488 msgstr "傳入 --i-still-use-this 前拒絕執行"

11489

11490 #: builtin/pack-refs.c

11573 -msgid "git pack-refs [--all] [--no-prune]"

11574 -msgstr "git pack-refs [--all] [--no-prune]"

11491 +msgid ""

11492 +"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "

11493 +"<pattern>]"

11494 +msgstr ""

11495 +"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "

11496 +"<pattern>]"

11497

11498 #: builtin/pack-refs.c

11499 msgid "pack everything"

@@ -11581,6 +11503,14 @@ msgstr "打包一切"

11503 msgid "prune loose refs (default)"

11504 msgstr "剪除鬆散引用（預設值）"

11505

11506 +#: builtin/pack-refs.c

11507 +msgid "references to include"

11508 +msgstr "要包含的引用"

11509 +

11510 +#: builtin/pack-refs.c

11511 +msgid "references to exclude"

11512 +msgstr "要排除的引用"

11513 +

11514 #: builtin/patch-id.c

11515 msgid "git patch-id [--stable | --unstable | --verbatim]"

11516 msgstr "git patch-id [--stable | --unstable | --verbatim]"

@@ -11657,6 +11587,14 @@ msgstr "強制覆蓋本機分支"

11587 msgid "number of submodules pulled in parallel"

11588 msgstr "並行拉取的子模組數量"

11589

11590 +#: builtin/pull.c parse-options.h

11591 +msgid "use IPv4 addresses only"

11592 +msgstr "只使用 IPv4 位址"

11593 +

11594 +#: builtin/pull.c parse-options.h

11595 +msgid "use IPv6 addresses only"

11596 +msgstr "只使用 IPv6 位址"

11597 +

11598 #: builtin/pull.c

11599 msgid ""

11600 "There is no candidate for rebasing against among the refs that you just "

@@ -11941,37 +11879,37 @@ msgstr ""

11879 #: builtin/push.c

11880 msgid ""

11881 "Updates were rejected because the tip of your current branch is behind\n"

11944 -"its remote counterpart. Integrate the remote changes (e.g.\n"

11945 -"'git pull ...') before pushing again.\n"

11882 +"its remote counterpart. If you want to integrate the remote changes,\n"

11883 +"use 'git pull' before pushing again.\n"

11884 "See the 'Note about fast-forwards' in 'git push --help' for details."

11885 msgstr ""

11886 "更新被拒絕，因為您目前分支的最新提交落後於其對應的遠端分支。\n"

11949 -"再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n"

11950 -"'git push --help' 中的 'Note about fast-forwards' 小節。"

11887 +"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"

11888 +"“git push --help” 中的〈Note about fast-forwards〉小節。"

11889

11890 #: builtin/push.c

11891 msgid ""

11892 "Updates were rejected because a pushed branch tip is behind its remote\n"

11955 -"counterpart. Check out this branch and integrate the remote changes\n"

11956 -"(e.g. 'git pull ...') before pushing again.\n"

11893 +"counterpart. If you want to integrate the remote changes, use 'git pull'\n"

11894 +"before pushing again.\n"

11895 "See the 'Note about fast-forwards' in 'git push --help' for details."

11896 msgstr ""

11959 -"更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n"

11960 -"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n"

11961 -"'git push --help' 中的 'Note about fast-forwards' 小節。"

11897 +"更新被拒絕，因為推送的某分支的最新提交落後於其對應的遠端分支。\n"

11898 +"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"

11899 +"“git push --help” 中的〈Note about fast-forwards〉小節。"

11900

11901 #: builtin/push.c

11902 msgid ""

11965 -"Updates were rejected because the remote contains work that you do\n"

11966 -"not have locally. This is usually caused by another repository pushing\n"

11967 -"to the same ref. You may want to first integrate the remote changes\n"

11968 -"(e.g., 'git pull ...') before pushing again.\n"

11903 +"Updates were rejected because the remote contains work that you do not\n"

11904 +"have locally. This is usually caused by another repository pushing to\n"

11905 +"the same ref. If you want to integrate the remote changes, use\n"

11906 +"'git pull' before pushing again.\n"

11907 "See the 'Note about fast-forwards' in 'git push --help' for details."

11908 msgstr ""

11971 -"因為遠端版本庫包含您本機尚不存在的提交，而導致更新被拒絕。這通常是因為另外\n"

11972 -"一個版本庫已向該引用進行了推送。再次推送前，您可能需要先整合遠端變更\n"

11973 -"（如 'git pull ...'）。\n"

11974 -"詳見 'git push --help' 中的 'Note about fast-forwards' 小節。"

11909 +"更新被拒絕，因為遠端包含您本機沒有的提交。這通常是因為\n"

11910 +"另一個版本庫有推送更動到同個引用。如果您想要整合遠端更動，\n"

11911 +"請在再次推送前使用 “git pull”。詳見 “git push --help” 中的\n"

11912 +"〈Note about fast-forwards〉小節。"

11913

11914 #: builtin/push.c

11915 msgid "Updates were rejected because the tag already exists in the remote."

@@ -11988,14 +11926,14 @@ msgstr ""

11926

11927 #: builtin/push.c

11928 msgid ""

11991 -"Updates were rejected because the tip of the remote-tracking\n"

11992 -"branch has been updated since the last checkout. You may want\n"

11993 -"to integrate those changes locally (e.g., 'git pull ...')\n"

11994 -"before forcing an update.\n"

11929 +"Updates were rejected because the tip of the remote-tracking branch has\n"

11930 +"been updated since the last checkout. If you want to integrate the\n"

11931 +"remote changes, use 'git pull' before pushing again.\n"

11932 +"See the 'Note about fast-forwards' in 'git push --help' for details."

11933 msgstr ""

11996 -"更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"

11997 -"您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"

11998 -"最後才強制更新。\n"

11934 +"更新被拒絕，因為遠端追蹤分支的最新提交自上次簽出後有改變。\n"

11935 +"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。\n"

11936 +"詳見 “git push --help” 中的〈Note about fast-forwards〉小節。"

11937

11938 #: builtin/push.c

11939 #, c-format

@@ -13024,12 +12962,12 @@ msgid "fetch the remote branches"

12962 msgstr "抓取遠端的分支"

12963

12964 #: builtin/remote.c

13027 -msgid "import all tags and associated objects when fetching"

13028 -msgstr "抓取時匯入所有的標籤和關聯物件"

13029 -

13030 -#: builtin/remote.c

13031 -msgid "or do not fetch any tag at all (--no-tags)"

13032 -msgstr "或不抓取任何標籤（--no-tags）"

12965 +msgid ""

12966 +"import all tags and associated objects when fetching\n"

12967 +"or do not fetch any tag at all (--no-tags)"

12968 +msgstr ""

12969 +"抓取時匯入所有的標籤和關聯物件\n"

12970 +"或者是完全不抓取所有標籤 (--no-tags)"

12971

12972 #: builtin/remote.c

12973 msgid "branch(es) to track"

@@ -15410,6 +15348,11 @@ msgstr "略過未合併的子模組 %s"

15348 msgid "Skipping submodule '%s'"

15349 msgstr "略過子模組 '%s'"

15350

15351 +#: builtin/submodule--helper.c

15352 +#, c-format

15353 +msgid "cannot clone submodule '%s' without a URL"

15354 +msgstr "無法在沒有網址的情況下複製 “%s” 子模組"

15355 +

15356 #: builtin/submodule--helper.c

15357 #, c-format

15358 msgid "Failed to clone '%s'. Retry scheduled"

@@ -16320,10 +16263,10 @@ msgstr "列印標籤內容"

16263 #: builtin/worktree.c

16264 msgid ""

16265 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"

16323 -" [-b <new-branch>] <path> [<commit-ish>]"

16266 +" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"

16267 msgstr ""

16268 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"

16326 -" [-b <new-branch>] <path> [<commit-ish>]"

16269 +" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"

16270

16271 #: builtin/worktree.c

16272 msgid "git worktree list [-v | --porcelain [-z]]"

@@ -16353,6 +16296,40 @@ msgstr "git worktree repair [<路徑>...]"

16296 msgid "git worktree unlock <worktree>"

16297 msgstr "git worktree unlock <worktree>"

16298

16299 +#: builtin/worktree.c

16300 +msgid "No possible source branch, inferring '--orphan'"

16301 +msgstr "沒有可能的來源分支，推測為 “--orphan”"

16302 +

16303 +#: builtin/worktree.c

16304 +#, c-format

16305 +msgid ""

16306 +"If you meant to create a worktree containing a new orphan branch\n"

16307 +"(branch with no commits) for this repository, you can do so\n"

16308 +"using the --orphan flag:\n"

16309 +"\n"

16310 +" git worktree add --orphan -b %s %s\n"

16311 +msgstr ""

16312 +"如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"

16313 +"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"

16314 +"這個效果：\n"

16315 +"\n"

16316 +" git worktree add --orphan -b %s %s\n"

16317 +

16318 +#: builtin/worktree.c

16319 +#, c-format

16320 +msgid ""

16321 +"If you meant to create a worktree containing a new orphan branch\n"

16322 +"(branch with no commits) for this repository, you can do so\n"

16323 +"using the --orphan flag:\n"

16324 +"\n"

16325 +" git worktree add --orphan %s\n"

16326 +msgstr ""

16327 +"如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"

16328 +"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"

16329 +"這個效果：\n"

16330 +"\n"

16331 +" git worktree add --orphan %s\n"

16332 +

16333 #: builtin/worktree.c

16334 #, c-format

16335 msgid "Removing %s/%s: %s"

@@ -16433,11 +16410,40 @@ msgstr "準備工作區（重設分支 '%s'，之前為 %s）"

16410 msgid "Preparing worktree (checking out '%s')"

16411 msgstr "準備工作區（簽出 '%s'）"

16412

16413 +#: builtin/worktree.c

16414 +#, c-format

16415 +msgid "unreachable: invalid reference: %s"

16416 +msgstr "不可達：無效引用：%s"

16417 +

16418 #: builtin/worktree.c

16419 #, c-format

16420 msgid "Preparing worktree (detached HEAD %s)"

16421 msgstr "準備工作區（分離開頭指標 %s）"

16422

16423 +#: builtin/worktree.c

16424 +#, c-format

16425 +msgid ""

16426 +"HEAD points to an invalid (or orphaned) reference.\n"

16427 +"HEAD path: '%s'\n"

16428 +"HEAD contents: '%s'"

16429 +msgstr ""

16430 +"HEAD 指向無效（或孤立）引用。\n"

16431 +"HEAD 路徑：“%s”\n"

16432 +"HEAD 內容：“%s”"

16433 +

16434 +#: builtin/worktree.c

16435 +msgid ""

16436 +"No local or remote refs exist despite at least one remote\n"

16437 +"present, stopping; use 'add -f' to overide or fetch a remote first"

16438 +msgstr ""

16439 +"即使有提供一個遠端，卻不存在本機或遠端引用，\n"

16440 +"故停止。使用 “add -f” 先覆蓋或抓取遠端"

16441 +

16442 +#: builtin/worktree.c

16443 +#, c-format

16444 +msgid "'%s' and '%s' cannot be used together"

16445 +msgstr "無法同時使用 “%s” 和 “%s”"

16446 +

16447 #: builtin/worktree.c

16448 msgid "checkout <branch> even if already checked out in other worktree"

16449 msgstr "簽出 <分支>，即使已經被簽出到其它工作區"

@@ -16450,6 +16456,10 @@ msgstr "建立一個新分支"

16456 msgid "create or reset a branch"

16457 msgstr "建立或重設一個分支"

16458

16459 +#: builtin/worktree.c

16460 +msgid "create unborn/orphaned branch"

16461 +msgstr "建立尚無內容（孤立）的分支"

16462 +

16463 #: builtin/worktree.c

16464 msgid "populate the new working tree"

16465 msgstr "生成新的工作區"

@@ -16475,6 +16485,15 @@ msgstr "嘗試為新分支名符合一個遠端追蹤分支"

16485 msgid "options '%s', '%s', and '%s' cannot be used together"

16486 msgstr "「%s」、「%s」和「%s」選項不得同時使用"

16487

16488 +#: builtin/worktree.c

16489 +#, c-format

16490 +msgid "options '%s', and '%s' cannot be used together"

16491 +msgstr "無法同時使用 “%s” 和 “%s” 選項"

16492 +

16493 +#: builtin/worktree.c

16494 +msgid "<commit-ish>"

16495 +msgstr "<提交指示元>"

16496 +

16497 #: builtin/worktree.c

16498 msgid "added with --lock"

16499 msgstr "已使用 --lock 加入"

@@ -16753,6 +16772,16 @@ msgid "The bundle requires this ref:"

16772 msgid_plural "The bundle requires these %<PRIuMAX> refs:"

16773 msgstr[0] "這個套件包需要這 %<PRIuMAX> 個引用："

16774

16775 +#: bundle.c

16776 +#, c-format

16777 +msgid "The bundle uses this hash algorithm: %s"

16778 +msgstr "本套件包採用此雜湊演算法：%s"

16779 +

16780 +#: bundle.c

16781 +#, c-format

16782 +msgid "The bundle uses this filter: %s"

16783 +msgstr "本套件包使用此過濾器：%s"

16784 +

16785 #: bundle.c

16786 msgid "unable to dup bundle descriptor"

16787 msgstr "無法複製套件包描述元"

@@ -17050,8 +17079,8 @@ msgid "A portable graphical interface to Git"

17079 msgstr "一個便攜的 Git 圖形用戶端"

17080

17081 #: command-list.h

17053 -msgid "Compute object ID and optionally creates a blob from a file"

17054 -msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件"

17082 +msgid "Compute object ID and optionally create an object from a file"

17083 +msgstr "從一個檔案計算物件 ID，也能順帶建立一個物件"

17084

17085 #: command-list.h

17086 msgid "Display help information about Git"

@@ -17591,6 +17620,11 @@ msgstr "提交圖形沒有基礎圖形區塊"

17620 msgid "commit-graph chain does not match"

17621 msgstr "提交圖形鏈不符合"

17622

17623 +#: commit-graph.c

17624 +#, c-format

17625 +msgid "commit count in base graph too high: %<PRIuMAX>"

17626 +msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>"

17627 +

17628 #: commit-graph.c

17629 #, c-format

17630 msgid "invalid commit-graph chain: line '%s' not a hash"

@@ -17696,6 +17730,16 @@ msgstr "無法重新命名基礎提交圖形檔案"

17730 msgid "failed to rename temporary commit-graph file"

17731 msgstr "無法重新命名暫時提交圖形檔案"

17732

17733 +#: commit-graph.c

17734 +#, c-format

17735 +msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"

17736 +msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個提交進行合併"

17737 +

17738 +#: commit-graph.c

17739 +#, c-format

17740 +msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"

17741 +msgstr "無法合併 %s 圖，太多提交：%<PRIuMAX>"

17742 +

17743 #: commit-graph.c

17744 msgid "Scanning merged commits"

17745 msgstr "正在掃描合併提交"

@@ -17731,10 +17775,6 @@ msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

17775 msgid "failed to parse commit %s from commit-graph"

17776 msgstr "無法從提交圖形中解析提交 %s"

17777

17734 -#: commit-graph.c

17735 -msgid "Verifying commits in commit graph"

17736 -msgstr "正在驗證提交圖中的提交"

17737 -

17778 #: commit-graph.c

17779 #, c-format

17780 msgid "failed to parse commit %s from object database for commit-graph"

@@ -17782,6 +17822,10 @@ msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

17822 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

17823 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

17824

17825 +#: commit-graph.c

17826 +msgid "Verifying commits in commit graph"

17827 +msgstr "正在驗證提交圖中的提交"

17828 +

17829 #: commit.c

17830 #, c-format

17831 msgid "%s %s is not a commit!"

@@ -18928,6 +18972,14 @@ msgstr "找不到合併基底"

18972 msgid "multiple merge bases found"

18973 msgstr "找到多個合併基底"

18974

18975 +#: diff-no-index.c

18976 +msgid "cannot compare stdin to a directory"

18977 +msgstr "無法比對 stdin 和目錄"

18978 +

18979 +#: diff-no-index.c

18980 +msgid "cannot compare a named pipe to a directory"

18981 +msgstr "無法比對命名管線 (pipe) 和目錄"

18982 +

18983 #: diff-no-index.c

18984 msgid "git diff --no-index [<options>] <path> <path>"

18985 msgstr "git diff --no-index [<選項>] <路徑> <路徑>"

@@ -18992,6 +19044,15 @@ msgstr ""

19044 msgid "external diff died, stopping at %s"

19045 msgstr "外部 diff 離開，停止在 %s"

19046

19047 +#: diff.c

19048 +msgid "--follow requires exactly one pathspec"

19049 +msgstr "--follow 明確要求只跟一個路徑規格"

19050 +

19051 +#: diff.c

19052 +#, c-format

19053 +msgid "pathspec magic not supported by --follow: %s"

19054 +msgstr "--follow 不支援路徑規格魔法：%s"

19055 +

19056 #: diff.c parse-options.c

19057 #, c-format

19058 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

@@ -19008,10 +19069,6 @@ msgid ""

19069 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

19070 msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"

19071

19011 -#: diff.c

19012 -msgid "--follow requires exactly one pathspec"

19013 -msgstr "--follow 明確要求只跟一個路徑規格"

19014 -

19072 #: diff.c

19073 #, c-format

19074 msgid "invalid --stat value: %s"

@@ -22470,6 +22527,15 @@ msgstr "生成 diff 失敗"

22527 msgid "could not parse log for '%s'"

22528 msgstr "不能解析 '%s' 的日誌"

22529

22530 +#: reachable.c

22531 +#, c-format

22532 +msgid "invalid extra cruft tip: '%s'"

22533 +msgstr "無效的額外廢棄提交修訂版：“%s”"

22534 +

22535 +#: reachable.c

22536 +msgid "unable to enumerate additional recent objects"

22537 +msgstr "無法列舉多出來的近期物件"

22538 +

22539 #: read-cache.c

22540 #, c-format

22541 msgid "will not add file alias '%s' ('%s' already exists in index)"

@@ -22658,6 +22724,16 @@ msgstr "不能修復 '%s' 的權限位"

22724 msgid "%s: cannot drop to stage #0"

22725 msgstr "%s：不能落到暫存區 #0"

22726

22727 +#: read-cache.c

22728 +#, c-format

22729 +msgid "unexpected diff status %c"

22730 +msgstr "非預期的 diff 狀態 %c"

22731 +

22732 +#: read-cache.c

22733 +#, c-format

22734 +msgid "remove '%s'\n"

22735 +msgstr "移除 “%s”\n"

22736 +

22737 #: rebase-interactive.c

22738 msgid ""

22739 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -22869,6 +22945,26 @@ msgstr "未知的 %%(trailers) 參數：%s"

22945 msgid "positive value expected contents:lines=%s"

22946 msgstr "期望一個正數 contents:lines=%s"

22947

22948 +#: ref-filter.c

22949 +#, c-format

22950 +msgid "argument expected for %s"

22951 +msgstr "引數預期 %s"

22952 +

22953 +#: ref-filter.c

22954 +#, c-format

22955 +msgid "positive value expected %s=%s"

22956 +msgstr "期望一個正數 %s=%s"

22957 +

22958 +#: ref-filter.c

22959 +#, c-format

22960 +msgid "cannot fully parse %s=%s"

22961 +msgstr "無法完全解析 %s=%s"

22962 +

22963 +#: ref-filter.c

22964 +#, c-format

22965 +msgid "value expected %s="

22966 +msgstr "數值預期 %s="

22967 +

22968 #: ref-filter.c

22969 #, c-format

22970 msgid "positive value expected '%s' in %%(%s)"

@@ -22960,6 +23056,10 @@ msgstr "本命令拒絕 atom %%(%.*s)"

23056 msgid "--format=%.*s cannot be used with --python, --shell, --tcl"

23057 msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"

23058

23059 +#: ref-filter.c

23060 +msgid "failed to run 'describe'"

23061 +msgstr "無法執行 “describe”"

23062 +

23063 #: ref-filter.c

23064 #, c-format

23065 msgid "(no branch, rebasing %s)"

@@ -23037,6 +23137,10 @@ msgstr "key"

23137 msgid "field name to sort on"

23138 msgstr "排序的欄位名"

23139

23140 +#: ref-filter.h

23141 +msgid "exclude refs which match pattern"

23142 +msgstr "排除符合模式的引用"

23143 +

23144 #: reflog.c

23145 #, c-format

23146 msgid "not a reflog: %s"

@@ -23566,8 +23670,9 @@ msgstr[0] ""

23670

23671 # 譯者：請維持前導空格

23672 #: remote.c

23569 -msgid " (use \"git pull\" to merge the remote branch into yours)\n"

23570 -msgstr " （使用 \"git pull\" 來合併遠端分支）\n"

23673 +msgid ""

23674 +" (use \"git pull\" if you want to integrate the remote branch with yours)\n"

23675 +msgstr " （使用 “git pull” 來將遠端分支整合進您的分支）\n"

23676

23677 #: remote.c

23678 #, c-format

@@ -23707,6 +23812,11 @@ msgstr "無法取得 ancestry-path 引數 %s 的提交"

23812 msgid "--unpacked=<packfile> no longer supported"

23813 msgstr "--unpacked=<packfile> 已不受支援"

23814

23815 +#: revision.c

23816 +#, c-format

23817 +msgid "invalid option '%s' in --stdin mode"

23818 +msgstr "在 --stdin 模式下，“%s” 選項無效"

23819 +

23820 #: revision.c

23821 msgid "your current branch appears to be broken"

23822 msgstr "您的目前分支好像被損壞"

@@ -25098,6 +25208,95 @@ msgstr "fork 失敗"

25208 msgid "setsid failed"

25209 msgstr "setsid 失敗"

25210

25211 +#: setup.c

25212 +#, c-format

25213 +msgid "cannot stat template '%s'"

25214 +msgstr "不能對範本 '%s' 呼叫 stat"

25215 +

25216 +#: setup.c

25217 +#, c-format

25218 +msgid "cannot opendir '%s'"

25219 +msgstr "不能開啟目錄 '%s'"

25220 +

25221 +#: setup.c

25222 +#, c-format

25223 +msgid "cannot readlink '%s'"

25224 +msgstr "不能讀取連結 '%s'"

25225 +

25226 +#: setup.c

25227 +#, c-format

25228 +msgid "cannot symlink '%s' '%s'"

25229 +msgstr "不能自 '%s' 到 '%s' 建立符號連結"

25230 +

25231 +#: setup.c

25232 +#, c-format

25233 +msgid "cannot copy '%s' to '%s'"

25234 +msgstr "不能複製 '%s' 至 '%s'"

25235 +

25236 +#: setup.c

25237 +#, c-format

25238 +msgid "ignoring template %s"

25239 +msgstr "忽略範本 %s"

25240 +

25241 +#: setup.c

25242 +#, c-format

25243 +msgid "templates not found in %s"

25244 +msgstr "沒有在 %s 中找到範本"

25245 +

25246 +#: setup.c

25247 +#, c-format

25248 +msgid "not copying templates from '%s': %s"

25249 +msgstr "沒有從 '%s' 複製範本：%s"

25250 +

25251 +#: setup.c

25252 +#, c-format

25253 +msgid "invalid initial branch name: '%s'"

25254 +msgstr "無效的初始分支名稱：'%s'"

25255 +

25256 +#: setup.c

25257 +#, c-format

25258 +msgid "unable to handle file type %d"

25259 +msgstr "不能處理 %d 類型的檔案"

25260 +

25261 +#: setup.c

25262 +#, c-format

25263 +msgid "unable to move %s to %s"

25264 +msgstr "不能移動 %s 至 %s"

25265 +

25266 +#: setup.c

25267 +msgid "attempt to reinitialize repository with different hash"

25268 +msgstr "嘗試以不同的雜湊值重新初始化版本庫"

25269 +

25270 +#: setup.c

25271 +#, c-format

25272 +msgid "%s already exists"

25273 +msgstr "%s 已經存在"

25274 +

25275 +#: setup.c

25276 +#, c-format

25277 +msgid "re-init: ignored --initial-branch=%s"

25278 +msgstr "re-init: 忽略 --initial-branch=%s"

25279 +

25280 +#: setup.c

25281 +#, c-format

25282 +msgid "Reinitialized existing shared Git repository in %s%s\n"

25283 +msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"

25284 +

25285 +#: setup.c

25286 +#, c-format

25287 +msgid "Reinitialized existing Git repository in %s%s\n"

25288 +msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"

25289 +

25290 +#: setup.c

25291 +#, c-format

25292 +msgid "Initialized empty shared Git repository in %s%s\n"

25293 +msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"

25294 +

25295 +#: setup.c

25296 +#, c-format

25297 +msgid "Initialized empty Git repository in %s%s\n"

25298 +msgstr "已初始化空的 Git 版本庫於 %s%s\n"

25299 +

25300 #: sparse-index.c

25301 #, c-format

25302 msgid "index entry is a directory, but not sparse (%08x)"

@@ -27305,6 +27504,26 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"

27504 msgid "Do you really want to send %s? [y|N]: "

27505 msgstr "您真的要傳送 %s？[y|N]： "

27506

27507 +#, c-format

27508 +#~ msgid "It is not possible to %s because you have unmerged files."

27509 +#~ msgstr "無法 %s，有未合併的檔案。"

27510 +

27511 +#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

27512 +#~ msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定"

27513 +

27514 +#~ msgid ""

27515 +#~ "Updates were rejected because the tip of the remote-tracking\n"

27516 +#~ "branch has been updated since the last checkout. You may want\n"

27517 +#~ "to integrate those changes locally (e.g., 'git pull ...')\n"

27518 +#~ "before forcing an update.\n"

27519 +#~ msgstr ""

27520 +#~ "更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"

27521 +#~ "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"

27522 +#~ "最後才強制更新。\n"

27523 +

27524 +#~ msgid "or do not fetch any tag at all (--no-tags)"

27525 +#~ msgstr "或不抓取任何標籤（--no-tags）"

27526 +

27527 #~ msgid "current working directory is untracked"

27528 #~ msgstr "尚未追蹤目前的工作目錄"

27529

l10n: zh_TW.po: Git 2.42