# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
-# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022.
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023.
# Kaiyang Wu <self@origincode.me>, 2022.
+# lumynou5 <lumynou5.tw@gmail.com>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-12-11 00:28+0800\n"
-"PO-Revision-Date: 2022-12-10 17:12+0000\n"
+"POT-Creation-Date: 2023-08-20 21:51+0800\n"
+"PO-Revision-Date: 2023-08-20 21:58+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
"po/git-cli/zh_Hant/>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14.2\n"
+"X-Generator: Poedit 3.3.2\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
msgid "could not read index"
msgstr "無法讀取索引"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "binary"
msgstr "二進位"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "nothing"
msgstr "無"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "unchanged"
msgstr "未變更"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "Update"
msgstr "更新"
msgid "could not write index"
msgstr "無法寫入索引"
-#: add-interactive.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-interactive.c
+#, c-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "已更新 %d 個路徑\n"
-#: add-interactive.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-interactive.c
+#, c-format
msgid "note: %s is untracked now.\n"
msgstr "註:現已不再追蹤 %s。\n"
msgid "make_cache_entry failed for path '%s'"
msgstr "對 “%s” 路徑執行 make_cache_entry 失敗"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "Revert"
msgstr "還原"
msgid "Could not parse HEAD^{tree}"
msgstr "無法解析 HEAD^{tree}"
-#: add-interactive.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-interactive.c
+#, c-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "已還原 %d 個路徑\n"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
#, c-format
msgid "No untracked files.\n"
msgstr "沒有未追蹤的檔案。\n"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "Add untracked"
msgstr "加入未追蹤項目"
-#: add-interactive.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-interactive.c
+#, c-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "已加入 %d 個路徑\n"
msgid "ignoring unmerged: %s"
msgstr "忽略未合併項目:%s"
-#: add-interactive.c add-patch.c git-add--interactive.perl
+#: add-interactive.c add-patch.c
#, c-format
msgid "Only binary files changed.\n"
-msgstr "只變更二進位檔案。\n"
+msgstr "只有二進位檔案更動了。\n"
-#: add-interactive.c add-patch.c git-add--interactive.perl
+#: add-interactive.c add-patch.c
#, c-format
msgid "No changes.\n"
msgstr "沒有更動。\n"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "Patch update"
msgstr "修補檔更新"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "Review diff"
msgstr "檢閱差異"
msgid "(empty) select nothing"
msgstr "(空)全部不選取"
-#: add-interactive.c builtin/clean.c git-add--interactive.perl
+#: add-interactive.c builtin/clean.c
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c builtin/clean.c git-add--interactive.perl
+#: add-interactive.c builtin/clean.c
msgid "What now"
msgstr "請選擇"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "staged"
msgstr "已暫存"
-#: add-interactive.c git-add--interactive.perl
+#: add-interactive.c
msgid "unstaged"
msgstr "未暫存"
#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
-#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
-#: builtin/submodule--helper.c git-add--interactive.perl
+#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c
+#: builtin/pull.c builtin/submodule--helper.c
msgid "path"
msgstr "路徑"
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c builtin/clean.c git-add--interactive.perl
+#: add-interactive.c builtin/clean.c
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暫存模式更動 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stage addition [y,n,q,a,d%s,?]? "
msgstr "暫存加入動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "貯存模式更動 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stash addition [y,n,q,a,d%s,?]? "
msgstr "貯存加入動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "貯存此區塊 [y,n,q,a,d%s,?]? "
"a - 貯存此區塊和本檔案中後面的全部區塊\n"
"d - 不貯存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Unstage addition [y,n,q,a,d%s,?]? "
msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
msgstr "將加入動作套用至索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區捨棄刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區捨棄加入動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區捨棄此區塊 [y,n,q,a,d%s,?]? "
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區捨棄刪除 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區捨棄加入動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區捨棄此區塊 [y,n,q,a,d%s,?]? "
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將模式更動套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將加入動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
msgstr "將加入動作套用到工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c git-add--interactive.perl
-#, c-format, perl-format
+#: add-patch.c
+#, c-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
"\t結尾不是:\n"
"%.*s"
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手動區塊編輯模式——檢視底部的快速指引。\n"
"要刪除 “%c” 開頭的列,請直接刪除。\n"
"開頭是 %c 的列將會被移除。\n"
-#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
msgid "'git apply --cached' failed"
msgstr "“git apply --cached” 失敗"
-#. #-#-#-#-# add-patch.c.po #-#-#-#-#
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#.
-#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "未套用您編輯的區塊。是否重新編輯(輸入 “no” 捨棄!) [y/n]? "
msgid "The selected hunks do not apply to the index!"
msgstr "選取的區塊無法套用至索引!"
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "Apply them to the worktree anyway? "
msgstr "無論如何都要套用到工作區嗎? "
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "Nothing was applied.\n"
msgstr "未套用。\n"
msgid "No other hunks to goto"
msgstr "沒有其它可以跳轉的區塊"
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "go to which hunk (<ret> to see more)? "
msgstr "要跳轉到哪個區塊(<ret> 檢視更多)? "
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "go to which hunk? "
msgstr "跳轉到哪個區塊? "
msgid "No other hunks to search"
msgstr "沒有其它可以尋找的區塊"
-#: add-patch.c git-add--interactive.perl
+#: add-patch.c
msgid "search for regex? "
msgstr "使用常規表示式搜尋? "
msgstr "無法還原提交,有未合併的檔案。"
#: advice.c
-#, c-format
-msgid "It is not possible to %s because you have unmerged files."
-msgstr "無法 %s,有未合併的檔案。"
+msgid "Rebasing is not possible because you have unmerged files."
+msgstr "無法重定基底,有未合併的檔案。"
#: advice.c
msgid ""
msgid "Exiting because of unfinished merge."
msgstr "存在未完成的合併,離開。"
+#: advice.c
+msgid ""
+"Diverging branches can't be fast-forwarded, you need to either:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"or:\n"
+"\n"
+"\tgit rebase\n"
+msgstr ""
+"岔開的分支不能快轉,您得執行:\n"
+"\n"
+"\tgit merge --no-ff\n"
+"\n"
+"或者:\n"
+"\n"
+"\tgit rebase\n"
+
#: advice.c
msgid "Not possible to fast-forward, aborting."
msgstr "無法快轉,中止。"
msgid "'%s' outside a repository"
msgstr "“%s” 在版本庫之外"
+#: apply.c
+msgid "failed to read patch"
+msgstr "無法讀取修補檔"
+
+#: apply.c
+msgid "patch too large"
+msgstr "修補檔過大"
+
#: apply.c
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 加入快取項目"
-#: apply.c builtin/bisect--helper.c builtin/gc.c
+#: apply.c builtin/bisect.c builtin/gc.c
#, c-format
msgid "failed to write to '%s'"
msgstr "無法寫入 “%s”"
msgid "cannot open %s"
msgstr "無法開啟 %s"
+#: apply.c rerere.c
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "無法刪除 “%s”"
+
#: apply.c
#, c-format
msgid "Hunk #%d applied cleanly."
msgid "cannot read '%s'"
msgstr "無法讀取 “%s”"
+#: archive.c
+#, c-format
+msgid "pathspec '%s' matches files outside the current directory"
+msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外"
+
#: archive.c builtin/add.c builtin/rm.c
#, c-format
msgid "pathspec '%s' did not match any files"
msgid "not a tree object: %s"
msgstr "非樹狀物件:%s"
-#: archive.c
-msgid "current working directory is untracked"
-msgstr "尚未追蹤目前的工作目錄"
-
#: archive.c
#, c-format
msgid "File not found: %s"
msgid "archive format"
msgstr "封存格式"
-#: archive.c builtin/log.c
+#: archive.c builtin/log.c parse-options.h
msgid "prefix"
msgstr "前綴"
msgid "report archived files on stderr"
msgstr "在 stderr 上回報封存的檔案"
+#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c
+#: builtin/pull.c
+msgid "time"
+msgstr "time"
+
+#: archive.c
+msgid "set modification time of archive entries"
+msgstr "設定封存項目的修改時間"
+
#: archive.c
msgid "set compression level"
msgstr "設定壓縮級別"
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是有效的屬性名稱"
+#: attr.c
+msgid "unable to add additional attribute"
+msgstr "無法加入其他屬性"
+
+#: attr.c
+#, c-format
+msgid "ignoring overly long attributes line %d"
+msgstr "忽略過長的屬性列 (第 %d 列)"
+
#: attr.c
#, c-format
msgid "%s not allowed: %s:%d"
"git attributes 會忽略反向模式\n"
"當字串確定要以驚嘆號開始時,請使用 “\\!”。"
+#: attr.c
+#, c-format
+msgid "cannot fstat gitattributes file '%s'"
+msgstr "無法 fstat gitattributes 檔案 “%s”"
+
+#: attr.c
+#, c-format
+msgid "ignoring overly large gitattributes file '%s'"
+msgstr "忽略過大的 gitattributes 檔案 “%s”"
+
+#: attr.c
+#, c-format
+msgid "ignoring overly large gitattributes blob '%s'"
+msgstr "忽略過大的 gitattributes 資料物件 “%s”"
+
+#: attr.c
+msgid "bad --attr-source or GIT_ATTR_SOURCE"
+msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"
+
#: bisect.c
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c
-msgid "cannot use --contents with final commit object name"
-msgstr "無法將 --contents 與最終的提交物件名稱共用"
-
#: blame.c
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
-#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
-#: ref-filter.c remote.c sequencer.c submodule.c
+#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c
+#: sequencer.c submodule.c
msgid "revision walk setup failed"
msgstr "修訂版遍歷設定失敗"
msgstr "未追蹤:“%s” 引用有歧義"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#. #-#-#-#-# branch.c.po #-#-#-#-#
#. TRANSLATORS: This is a line listing a remote with duplicate
#. refspecs in the advice message below. For RTL languages you'll
#. probably want to swap the "%s" and leading " " space around.
#.
-#. #-#-#-#-# object-name.c.po #-#-#-#-#
#. TRANSLATORS: This is line item of ambiguous object output
#. from describe_ambiguous_object() above. For RTL languages
#. you'll probably want to swap the "%s" and leading " " space
#: branch.c
#, c-format
-msgid "cannot force update the branch '%s' checked out at '%s'"
-msgstr "無法強制更新在 “%2$s” 簽出的 “%1$s” 分支"
+msgid "cannot force update the branch '%s' used by worktree at '%s'"
+msgstr "無法強制更新被位於 “%2$s” 的工作區使用的 “%1$s” 分支"
#: branch.c
#, c-format
#: branch.c
#, c-format
msgid ""
-"You may try updating the submodules using 'git checkout %s && git submodule "
-"update --init'"
+"You may try updating the submodules using 'git checkout --no-recurse-"
+"submodules %s && git submodule update --init'"
msgstr ""
-"您可以嘗試使用 “git checkout %s && git submodule update --init” 命令,更新子"
-"模組"
+"您可以使用 “git checkout --no-recurse-submodules %s && git submodule update "
+"--init” 命令嘗試更新子模組"
#: branch.c
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” 已在 “%s” 點簽出"
-#: branch.c
-#, c-format
-msgid "HEAD of working tree %s is not updated"
-msgstr "%s 工作區的 HEAD 指針未被更新"
-
#: builtin/add.c
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <pathspec>..."
msgid "cannot chmod %cx '%s'"
msgstr "無法 chmod %cx '%s'"
-#: builtin/add.c
-#, c-format
-msgid "unexpected diff status %c"
-msgstr "非預期的 diff 狀態 %c"
-
-#: builtin/add.c builtin/commit.c
-msgid "updating files failed"
-msgstr "更新檔案失敗"
-
-#: builtin/add.c
-#, c-format
-msgid "remove '%s'\n"
-msgstr "移除 “%s”\n"
-
#: builtin/add.c
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後,尚未被暫存的更動:"
+#: builtin/add.c
+msgid ""
+"the add.interactive.useBuiltin setting has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"add.interactive.useBuiltin 設定已被移除!\n"
+"深入了解請參閱 “git help config” 中的對應條目。"
+
#: builtin/add.c builtin/rev-parse.c
msgid "Could not read the index"
msgstr "無法讀取索引"
msgid "could not open '%s' for reading"
msgstr "無法開啟 “%s” 進行讀取"
-#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c
+#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c
#, c-format
msgid "could not open '%s' for writing"
msgstr "無法開啟 “%s” 進行寫入"
"您似乎在上一次 “am” 失敗後移動了 HEAD。\n"
"未倒轉回 ORIG_HEAD"
-#: builtin/am.c builtin/bisect--helper.c worktree.c
+#: builtin/am.c builtin/bisect.c worktree.c
#, c-format
msgid "failed to read '%s'"
msgstr "無法讀取 “%s”"
msgid "run interactively"
msgstr "互動式執行"
+#: builtin/am.c
+msgid "bypass pre-applypatch and applypatch-msg hooks"
+msgstr "繞過 pre-applypatch 和 applypatch-msg 掛鉤"
+
#: builtin/am.c
msgid "historical option -- no-op"
msgstr "歷史遺留選項——無作用"
#: builtin/am.c
msgid "recode into utf8 (default)"
-msgstr "使用 utf8 字元集(預設)"
+msgstr "使用 utf8 字元集(預設值)"
#: builtin/am.c
msgid "pass -k flag to git-mailinfo"
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "若為 mbox 格式,向 git-mailsplit 傳入 --keep-cr 標記"
-#: builtin/am.c
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "不向 git-mailsplit 傳入 --keep-cr 標記,無視 am.keepcr 的設定"
-
#: builtin/am.c
msgid "strip everything before a scissors line"
msgstr "截掉裁切線前的所有內容"
msgid "git archive: expected a flush"
msgstr "git archive:預期收到 flush 封包"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-reset [<commit>]"
-
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
+"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
+"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
msgstr ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
+"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
+"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
+#: builtin/bisect.c
+msgid "git bisect (good|bad) [<rev>...]"
+msgstr "git bisect (good|bad) [<rev>...]"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
+#: builtin/bisect.c
+msgid "git bisect skip [(<rev>|<range>)...]"
+msgstr "git bisect skip [(<rev>|<range>)...]"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-replay <filename>"
+#: builtin/bisect.c
+msgid "git bisect reset [<commit>]"
+msgstr "git bisect reset [<commit>]"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+#: builtin/bisect.c
+msgid "git bisect replay <logfile>"
+msgstr "git bisect replay <logfile>"
-#: builtin/bisect--helper.c
-msgid "git bisect--helper --bisect-run <cmd>..."
-msgstr "git bisect--helper --bisect-run <cmd>..."
+#: builtin/bisect.c
+msgid "git bisect run <cmd>..."
+msgstr "git bisect run <cmd>..."
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "cannot open file '%s' in mode '%s'"
msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "could not write to file '%s'"
msgstr "無法寫入 “%s” 檔案"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "cannot open file '%s' for reading"
msgstr "無法開啟 “%s” 檔案進行讀取"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "'%s' is not a valid term"
msgstr "“%s” 不是有效術語"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能將內建命令 “%s” 當作術語使用"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能變更術語 “%s” 的含義"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "please use two different terms"
msgstr "請使用兩個不同的術語"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "We are not bisecting.\n"
msgstr "我們沒有在二分搜尋。\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "'%s' is not a valid commit"
msgstr "“%s” 不是有效的提交"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "bisect_write 引數無效:%s"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "無法取得修訂版 “%s” 的物件 ID"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "couldn't open the file '%s'"
msgstr "無法開啟檔案 “%s”"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "命令無效:您目前正處於二分搜尋 %s/%s 的狀態"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"需指定至少一個 %s 和一個 %s 修訂版。\n"
"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"接著提供至少一個 %s 和一個 %s 修訂版。\n"
"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一個 %s 提交的情況下二分搜尋"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "Are you sure [Y/n]? "
msgstr "是否確定 [Y/n]? "
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "status: waiting for both good and bad commits\n"
msgstr "狀態:正在等待好和壞的提交\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "status: waiting for bad commit, %d good commit known\n"
msgid_plural "status: waiting for bad commit, %d good commits known\n"
msgstr[0] "狀態:正在等待壞的提交,已知有 %d 個好的提交\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "status: waiting for good commit(s), bad commit known\n"
msgstr "狀態:正在等待好的提交,已知有壞的提交\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "no terms defined"
msgstr "未定義術語"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"您目前針對舊狀態的術語是 %s;\n"
"對新狀態的術語是 %s。\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"傳入 “git bisect terms” 的 %s 引數無效。\n"
"支援的選項有:--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "revision walk setup failed\n"
msgstr "修訂版遍歷設定失敗\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "could not open '%s' for appending"
msgstr "無法開啟 “%s” 進行附加"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "'' is not a valid term"
msgstr "“ ” 不是有效術語"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "unrecognized option: '%s'"
msgstr "無法識別選項:“%s”"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "“%s” 似乎不是有效修訂版"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD 無效 — 需要一個 HEAD"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。"
-#: builtin/bisect--helper.c
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"
-
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD 無效 — 異常符號引用"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "invalid ref: '%s'"
msgstr "引用無效:“%s”"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "You need to start by \"git bisect start\"\n"
msgstr "要開始,請執行 “git bisect start”\n"
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "Do you want me to do it for you [Y/n]? "
msgstr "是否要這麼做 [Y/n]? "
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "Please call `--bisect-state` with at least one argument"
msgstr "要呼叫 `--bisect-state`,請傳入一個以上的引數"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "'git bisect %s' can take only one argument."
msgstr "“git bisect %s” 只取一個引數。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "Bad rev input: %s"
msgstr "rev 輸入格式錯誤:%s"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "Bad rev input (not a commit): %s"
msgstr "rev 輸入有誤(不是提交):%s"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "We are not bisecting."
msgstr "我們沒有在二分搜尋。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "'%s'?? what are you talking about?"
msgstr "「%s」??您在說什麼?"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "cannot read file '%s' for replaying"
msgstr "無法讀取「%s」檔案進行重放"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "running %s\n"
msgstr "正在執行 %s\n"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "bisect run failed: no command provided."
msgstr "二分搜尋執行失敗:沒有提供命令。"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
-msgid "unable to verify '%s' on good revision"
-msgstr "無法在好的修訂版上驗證 “%s”"
+msgid "unable to verify %s on good revision"
+msgstr "無法在好的修訂版上驗證 %s"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "bogus exit code %d for good revision"
msgstr "好的修訂版回傳偽造的錯誤碼 %d"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
-msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
-msgstr "二分搜尋執行失敗:“%2$s” 回傳的離開碼 %1$d 小於 0 或 >= 128"
+msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
+msgstr "二分搜尋執行失敗:%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
msgid "cannot open file '%s' for writing"
msgstr "無法開啟 “%s” 檔案進行寫入"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "bisect run cannot continue any more"
msgstr "二分搜尋不能繼續執行"
-#: builtin/bisect--helper.c
-#, c-format
+#: builtin/bisect.c
msgid "bisect run success"
msgstr "二分搜尋執行成功"
-#: builtin/bisect--helper.c
-#, c-format
+#: builtin/bisect.c
msgid "bisect found first bad commit"
msgstr "二分搜尋發現到第一個有問題的提交"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
#, c-format
-msgid ""
-"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
-"code %d"
-msgstr ""
-"二分搜尋執行失敗:“git bisect--helper --bisect-state %s” 以錯誤碼 %d 離開"
+msgid "bisect run failed: 'git bisect %s' exited with error code %d"
+msgstr "二分搜尋執行失敗:“git bisect %s” 以錯誤碼 %d 離開"
-#: builtin/bisect--helper.c
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset 可以不需要引數,或者得傳入一個提交"
-
-#: builtin/bisect--helper.c
-msgid "--bisect-terms requires 0 or 1 argument"
-msgstr "--bisect-terms 需要 0 或 1 個引數"
+#: builtin/bisect.c
+#, c-format
+msgid "'%s' requires either no argument or a commit"
+msgstr "“%s” 不需要引數,或者得傳入一個提交"
-#: builtin/bisect--helper.c
-msgid "--bisect-next requires 0 arguments"
-msgstr "--bisect-next 需要 0 個引數"
+#: builtin/bisect.c
+#, c-format
+msgid "'%s' requires 0 or 1 argument"
+msgstr "“%s” 需要 0 或 1 個引數"
-#: builtin/bisect--helper.c
-msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-log 需要 0 個引數"
+#: builtin/bisect.c
+#, c-format
+msgid "'%s' requires 0 arguments"
+msgstr "“%s” 不需引數"
-#: builtin/bisect--helper.c
+#: builtin/bisect.c
msgid "no logfile given"
msgstr "未提供日誌檔案"
+#: builtin/bisect.c
+#, c-format
+msgid "'%s' failed: no command provided."
+msgstr "“%s” 失敗:沒有提供命令。"
+
+#: builtin/bisect.c
+msgid "need a command"
+msgstr "需要提供命令"
+
+#: builtin/bisect.c builtin/cat-file.c
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "未知命令:“%s”"
+
#: builtin/blame.c
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
+msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
#: builtin/blame.c
msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git annotate [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
+msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
#: builtin/blame.c
msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
+msgstr "<rev-opts> 的文件在 git-rev-list(1)"
#: builtin/blame.c
#, c-format
msgid "expecting a color: %s"
-msgstr "期望一個顏色:%s"
+msgstr "預期是個顏色:%s"
#: builtin/blame.c
msgid "must end with a color"
-msgstr "必須以一個顏色結尾"
+msgstr "結尾必須是一個顏色"
#: builtin/blame.c
#, c-format
msgid "cannot find revision %s to ignore"
-msgstr "不能找到要忽略的版本 %s"
+msgstr "不能找到要忽略的 %s 修訂版"
#: builtin/blame.c
msgid "show blame entries as we find them, incrementally"
-msgstr "增量式顯示發現的 blame 條目"
+msgstr "漸進式顯示發現的溯源項目"
#: builtin/blame.c
msgid "do not show object names of boundary commits (Default: off)"
-msgstr "不要顯示邊界提交的物件名稱(預設值: off)"
+msgstr "不要顯示邊界提交的物件名稱(預設值:off)"
#: builtin/blame.c
msgid "do not treat root commits as boundaries (Default: off)"
-msgstr "不將根提交看作邊界(預設值:off)"
+msgstr "不把根提交當作邊界(預設值:off)"
#: builtin/blame.c
msgid "show work cost statistics"
#: builtin/blame.c
msgid "show output score for blame entries"
-msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
+msgstr "顯示溯源項目的輸出得分"
#: builtin/blame.c
msgid "show original filename (Default: auto)"
#: builtin/blame.c
msgid "show original linenumber (Default: off)"
-msgstr "顯示原始檔案名稱(預設值:off)"
+msgstr "顯示原始列碼(預設值:off)"
#: builtin/blame.c
msgid "show in a format designed for machine consumption"
#: builtin/blame.c
msgid "show porcelain format with per-line commit information"
-msgstr "顯示每一列適合機器的提交說明"
+msgstr "顯示包含每一列提交資訊,適合機器讀取的格式"
#: builtin/blame.c
msgid "use the same output mode as git-annotate (Default: off)"
#: builtin/blame.c builtin/log.c
msgid "rev"
-msgstr "版本"
+msgstr "rev"
#: builtin/blame.c
msgid "ignore <rev> when blaming"
-msgstr "在執行 blame 動作時忽略 <修訂版>"
+msgstr "在執行溯源動作時忽略 <rev>"
#: builtin/blame.c
msgid "ignore revisions from <file>"
-msgstr "忽略 <檔案> 中的修訂版"
+msgstr "忽略 <file> 中的修訂版"
#: builtin/blame.c
msgid "color redundant metadata from previous line differently"
#: builtin/blame.c
msgid "color lines by age"
-msgstr "依據時間著色"
+msgstr "根據時間著色"
#: builtin/blame.c
msgid "spend extra cycles to find better match"
-msgstr "循ç\92°æ\9b´å¤\9a次以æ\89¾å\88°æ\9b´ä½³ç¬¦å\90\88"
+msgstr "循ç\92°æ\9b´å¤\9a次ä¾\86æ\89¾å\88°æ\9b´ä½³ç¬¦å\90\88é \85ç\9b®"
#: builtin/blame.c
msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
+msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"
#: builtin/blame.c
msgid "use <file>'s contents as the final image"
-msgstr "將 <檔案> 的內容當成是最終 image"
+msgstr "將 <file> 的內容當成是最終印象"
#: builtin/blame.c
msgid "score"
-msgstr "得分"
+msgstr "score"
#: builtin/blame.c
msgid "find line copies within and across files"
-msgstr "找到檔案內及跨檔案的複製列"
+msgstr "找到檔案內及跨檔案的列拷貝動作"
#: builtin/blame.c
msgid "find line movements within and across files"
-msgstr "找到檔案內及跨檔案的移動列"
+msgstr "找到檔案內及跨檔案的列移動動作"
#: builtin/blame.c
msgid "range"
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
-msgstr[0] "檔案 %s 只有 %lu 行"
+msgstr[0] "檔案 %s 只有 %lu 列"
#: builtin/blame.c
msgid "Blaming lines"
-msgstr "追蹤程式碼行"
+msgstr "溯源文字列"
#: builtin/branch.c
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c
msgid ""
"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
"point>]"
-msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
+msgstr ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
#: builtin/branch.c
msgid "git branch [<options>] [-l] [<pattern>...]"
-msgstr "git branch [<選項>] [-l] [<模式>...]"
+msgstr "git branch [<options>] [-l] [<pattern>...]"
#: builtin/branch.c
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
+msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."
#: builtin/branch.c
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
+msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
#: builtin/branch.c
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
+msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
#: builtin/branch.c
msgid "git branch [<options>] [-r | -a] [--points-at]"
-msgstr "git branch [<選項>] [-r | -a] [--points-at]"
+msgstr "git branch [<options>] [-r | -a] [--points-at]"
#: builtin/branch.c
msgid "git branch [<options>] [-r | -a] [--format]"
-msgstr "git branch [<選項>] [-r | -a] [--format]"
+msgstr "git branch [<options>] [-r | -a] [--format]"
# 譯者:保持原換行格式,在輸出時 %s 的替代內容會讓字串變長
#: builtin/branch.c
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"將要刪除的分支 '%s' 已經被合併到\n"
-" '%s',但未合併到 HEAD。"
+"將要刪除的 “%s” 分支已經被合併到\n"
+" “%s”,但尚未合併到 HEAD。"
# 譯者:保持原換行格式,在輸出時 %s 的替代內容會讓字串變長
#: builtin/branch.c
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"並未刪除分支 '%s', 雖然它已經合併到 HEAD,\n"
-" 然而卻尚未被合併到分支 '%s' 。"
+"並未刪除分支 “%s”, 雖然已經合併到 HEAD,\n"
+" 卻尚未被合併至 “%s” 分支。"
#: builtin/branch.c
#, c-format
msgid "Couldn't look up commit object for '%s'"
-msgstr "無法查詢 '%s' 指向的提交物件"
+msgstr "無法查詢 “%s” 指向的提交物件"
#: builtin/branch.c
#, c-format
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
-"分支 '%s' 沒有完全合併。\n"
-"如果您確認要刪除它,執行 'git branch -D %s'。"
+"分支 “%s” 沒有完全合併。\n"
+"如果確定要刪除它,請執行 “git branch -D %s”。"
#: builtin/branch.c
msgid "Update of config-file failed"
-msgstr "更新設定檔案失敗"
+msgstr "更新組態檔案失敗"
#: builtin/branch.c
msgid "cannot use -a with -d"
#: builtin/branch.c
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
+msgstr "無法刪除在 “%2$s” 簽出的 “%1$s” 分支"
#: builtin/branch.c
#, c-format
msgid "remote-tracking branch '%s' not found."
-msgstr "未能找到遠端追蹤分支 '%s'。"
+msgstr "找不到 “%s” 遠端追蹤分支。"
+
+#: builtin/branch.c
+#, c-format
+msgid ""
+"branch '%s' not found.\n"
+"Did you forget --remote?"
+msgstr ""
+"找不到 “%s” 分支。\n"
+"您可能要加上 --remote?"
#: builtin/branch.c
#, c-format
msgid "branch '%s' not found."
-msgstr "分支 '%s' 未發現。"
+msgstr "找不到 “%s” 分支。"
#: builtin/branch.c
#, c-format
#: builtin/branch.c builtin/tag.c
msgid "unable to parse format string"
-msgstr "不能解析格式化字串"
+msgstr "無法解析格式化字串"
#: builtin/branch.c
msgid "could not resolve HEAD"
-msgstr "不能解析 HEAD 提交"
+msgstr "無法解析 HEAD 指針"
#: builtin/branch.c
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
-msgstr "HEAD (%s) 指向 refs/heads/ 之外"
+msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外"
#: builtin/branch.c
#, c-format
msgid "Branch %s is being rebased at %s"
-msgstr "分支 %s 正被重定基底到 %s"
+msgstr "%s 分支正在重定基底至 %s"
#: builtin/branch.c
#, c-format
msgid "Branch %s is being bisected at %s"
-msgstr "分支 %s 正被二分搜尋於 %s"
+msgstr "%s 分支正於 %s 進行二分搜尋"
+
+#: builtin/branch.c
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "%s 工作區的 HEAD 指針未被更新"
#: builtin/branch.c
#, c-format
msgid "Invalid branch name: '%s'"
-msgstr "無效的分支名:'%s'"
+msgstr "分支名稱無效:“%s”"
#: builtin/branch.c
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "分支 '%s' 尚無提交。"
+msgstr "分支 “%s” 尚無提交。"
#: builtin/branch.c
#, c-format
msgid "No branch named '%s'."
-msgstr "æ²\92æ\9c\89å\88\86æ\94¯ '%s'。"
+msgstr "æ²\92æ\9c\89å\90\8dç\82º â\80\9c%sâ\80\9d ç\9a\84å\88\86æ\94¯。"
#: builtin/branch.c
msgid "Branch rename failed"
#: builtin/branch.c
msgid "Branch copy failed"
-msgstr "分支複製失敗"
+msgstr "分支拷貝失敗"
#: builtin/branch.c
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
-msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
+msgstr "已為誤命名的 “%s” 分支建立拷貝"
#: builtin/branch.c
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "已將錯誤命名的分支 '%s' 重新命名"
+msgstr "已更改誤命名的 “%s” 分支的名稱"
#: builtin/branch.c
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "分支重新命名為 %s,但 HEAD 沒有更新!"
+msgstr "分支已重新命名為 %s,但 HEAD 指針尚未更新!"
#: builtin/branch.c
msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重新命名,但更新設定檔案失敗"
+msgstr "分支已重新命名,但無法更新組態檔案"
#: builtin/branch.c
msgid "Branch is copied, but update of config-file failed"
-msgstr "分支已複製,但更新設定檔案失敗"
+msgstr "分支已拷貝,但無法更新組態檔案"
#: builtin/branch.c
#, c-format
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-"請編輯分支的描述\n"
+"請編輯下述分支的描述\n"
" %s\n"
-"以 '%c' 開頭的行將被過濾。\n"
+"開頭是 “%c” 的列將被刪除。\n"
#: builtin/branch.c
msgid "Generic options"
-msgstr "通用選項"
+msgstr "一般性選項"
#: builtin/branch.c
msgid "show hash and subject, give twice for upstream branch"
-msgstr "顯示雜湊值和主題,若參數出現兩次則顯示上游分支"
+msgstr "顯示雜湊值和主旨,若傳入兩次則顯示上游分支"
#: builtin/branch.c
msgid "suppress informational messages"
-msgstr "不顯示訊息"
+msgstr "ä¸\8d顯示è³\87è¨\8aè¨\8aæ\81¯"
#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
msgid "set branch tracking configuration"
-msgstr "設定分支追蹤設定"
+msgstr "設定分支追蹤組態"
#: builtin/branch.c
msgid "do not use"
-msgstr "不要使用"
+msgstr "請勿使用"
#: builtin/branch.c
msgid "upstream"
-msgstr "上游"
+msgstr "upstream"
#: builtin/branch.c
msgid "change the upstream info"
-msgstr "改變上游訊息"
+msgstr "變更上游資訊"
#: builtin/branch.c
msgid "unset the upstream info"
-msgstr "取消上游資訊設定"
+msgstr "取消設定上游資訊"
#: builtin/branch.c
msgid "use colored output"
#: builtin/branch.c
msgid "print only branches that contain the commit"
-msgstr "只列印包含該提交的分支"
+msgstr "只輸出包含此提交的分支"
#: builtin/branch.c
msgid "print only branches that don't contain the commit"
-msgstr "只列印不包含該提交的分支"
+msgstr "只輸出不包含此提交的分支"
#: builtin/branch.c
msgid "Specific git-branch actions:"
-msgstr "具體的 git-branch 動作:"
+msgstr "特定的 git-branch 動作:"
#: builtin/branch.c
msgid "list both remote-tracking and local branches"
-msgstr "å\88\97å\87ºé\81 端追蹤å\8f\8a本機分支"
+msgstr "å\88\97å\87ºé\81 端追蹤å\92\8c本機分支"
#: builtin/branch.c
msgid "delete fully merged branch"
#: builtin/branch.c
msgid "delete branch (even if not merged)"
-msgstr "刪除分支(即使沒有合併)"
+msgstr "刪除分支(即使尚未合併)"
#: builtin/branch.c
msgid "move/rename a branch and its reflog"
-msgstr "移動/重新命名一個分支,以及它的引用日誌"
+msgstr "移動或重新命名分支及其引用日誌"
#: builtin/branch.c
msgid "move/rename a branch, even if target exists"
-msgstr "移動/重新命名一個分支,即使目標已存在"
+msgstr "即使目標已存在,仍移動或重新命名分支"
+
+#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
+msgid "do not output a newline after empty formatted refs"
+msgstr "在格式化引用結果為空之後,不要輸出換列符號"
#: builtin/branch.c
msgid "copy a branch and its reflog"
-msgstr "複製分支及其引用日誌"
+msgstr "拷貝分支及其引用日誌"
#: builtin/branch.c
msgid "copy a branch, even if target exists"
-msgstr "複製一個分支,即使目標已存在"
+msgstr "即使目標已存在仍拷貝分支"
#: builtin/branch.c
msgid "list branch names"
-msgstr "列出分支名"
+msgstr "列出分支名稱"
#: builtin/branch.c
msgid "show current branch name"
-msgstr "顯示目前分支名"
+msgstr "顯示目前分支名稱"
#: builtin/branch.c builtin/submodule--helper.c
msgid "create the branch's reflog"
#: builtin/branch.c
msgid "edit the description for the branch"
-msgstr "標記分支的描述"
+msgstr "編輯分支的描述"
#: builtin/branch.c
msgid "force creation, move/rename, deletion"
#: builtin/branch.c
msgid "print only branches that are merged"
-msgstr "只列印已經合併的分支"
+msgstr "只輸出已經合併的分支"
#: builtin/branch.c
msgid "print only branches that are not merged"
-msgstr "只列印尚未合併的分支"
+msgstr "只輸出尚未合併的分支"
#: builtin/branch.c
msgid "list branches in columns"
-msgstr "以å\88\97ç\9a\84æ\96¹å¼\8f顯示å\88\86æ\94¯"
+msgstr "以è¡\8cç\9a\84å½¢å¼\8få\88\97å\87ºå\88\86æ\94¯"
#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
msgid "object"
-msgstr "物件"
+msgstr "object"
#: builtin/branch.c
msgid "print only branches of the object"
-msgstr "只列印指向該物件的分支"
+msgstr "只輸出指向此物件的分支"
#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
msgid "sorting and filtering are case insensitive"
-msgstr "排序和過濾屬於大小寫不敏感"
+msgstr "排序和過濾不區分大小寫"
#: builtin/branch.c builtin/ls-files.c
msgid "recurse through submodules"
#: builtin/branch.c builtin/clone.c
msgid "HEAD not found below refs/heads!"
-msgstr "HEAD æ²\92æ\9c\89ä½\8dæ\96¼ /refs/heads ä¹\8bä¸\8b!"
+msgstr "HEAD æ\8c\87é\87\9dä¸\8då\9c¨ /refs/heads ä¸!"
#: builtin/branch.c
msgid ""
"branch with --recurse-submodules can only be used if submodule."
"propagateBranches is enabled"
msgstr ""
-"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"
+"有 --recurse-submodules 的分支,只能在啟用 submodule.propagateBranches 時使用"
#: builtin/branch.c
msgid "--recurse-submodules can only be used to create branches"
#: builtin/branch.c
msgid "branch name required"
-msgstr "必須提供分支名"
+msgstr "必須提供分支名稱"
#: builtin/branch.c
msgid "Cannot give description to detached HEAD"
-msgstr "不能向分離開頭指標提供描述"
+msgstr "無法向分離 HEAD 指針提供描述"
#: builtin/branch.c
msgid "cannot edit description of more than one branch"
-msgstr "不能為一個以上的分支編輯描述"
+msgstr "無法編輯超過一個分支的描述"
#: builtin/branch.c
msgid "cannot copy the current branch while not on any."
-msgstr "無法複製目前分支因為不處於任何分支上。"
+msgstr "不在任何分支上,無法拷貝目前分支。"
#: builtin/branch.c
msgid "cannot rename the current branch while not on any."
-msgstr "無法重新命名目前分支因為不處於任何分支上。"
+msgstr "不在任何分支上,無法重新命名目前分支。"
#: builtin/branch.c
msgid "too many branches for a copy operation"
-msgstr "為複製動作提供了太多的分支名"
+msgstr "要進行拷貝動作的分支太多"
#: builtin/branch.c
msgid "too many arguments for a rename operation"
-msgstr "為重新命名動作提供了太多的參數"
+msgstr "傳入重新命名動作的引數太多"
#: builtin/branch.c
msgid "too many arguments to set new upstream"
-msgstr "為設定新上游提供了太多的參數"
+msgstr "要設定新上游的引數太多"
#: builtin/branch.c
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "無法設定 HEAD 的上游為 %s,因為 HEAD 沒有指向任何分支。"
+msgstr "無法將 HEAD 的上游設為 %s:其未指向任何分支。"
#: builtin/branch.c
#, c-format
msgid "no such branch '%s'"
-msgstr "沒有此分支 '%s'"
+msgstr "無 “%s” 分支"
#: builtin/branch.c
#, c-format
msgid "branch '%s' does not exist"
-msgstr "分支 '%s' 不存在"
+msgstr "沒有 “%s” 分支"
#: builtin/branch.c
msgid "too many arguments to unset upstream"
-msgstr "為取消上游設定動作提供了太多的參數"
+msgstr "要取消設定上游的引數太多"
#: builtin/branch.c
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
+msgstr "無法取消設定 HEAD 的上游:其未指向任何分支。"
#: builtin/branch.c
#, c-format
msgid "Branch '%s' has no upstream information"
-msgstr "分支 '%s' 沒有上游訊息"
+msgstr "分支 “%s” 沒有上游資訊"
#: builtin/branch.c
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
-"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
-"您是否想要使用:-a|-r --list <模式>?"
+"“git branch” 的 -a 和 -r 選項不取分支名稱。\n"
+"您是想使用:-a|-r --list <pattern> 嗎?"
#: builtin/branch.c
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
-"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"
+"不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”。"
#: builtin/bugreport.c
msgid "git version:\n"
#: builtin/bugreport.c
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
-msgstr "uname() 失敗,錯誤:「%s」(%d)\n"
+msgstr "uname() 失敗,錯誤:“%s” (%d)\n"
#: builtin/bugreport.c
msgid "compiler info: "
#: builtin/bugreport.c
msgid "not run from a git repository - no hooks to show\n"
-msgstr "ä¸\8dæ\98¯å¾\9e git ç\89\88æ\9c¬åº«å\9f·è¡\8c - 沒有可顯示的掛鉤\n"
+msgstr "ä¸\8dæ\98¯å\9c¨ git ç\89\88æ\9c¬åº«å\9f·è¡\8c â\80\94 沒有可顯示的掛鉤\n"
#: builtin/bugreport.c
msgid ""
"You can delete any lines you don't wish to share.\n"
msgstr ""
"感謝您填寫 Git 臭蟲報告!\n"
-"請回答下列問題,以讓我們能夠了解您的問題。\n"
+"請回答下列詢問,協助我們了解您的問題。\n"
"\n"
"臭蟲發生前,您做了什麼?(重現問題的步驟)\n"
"\n"
-"你原本期望發生什麼?(期望行為)\n"
+"原本您預期發生什麼?(預期行為)\n"
"\n"
"那實際上發生了什麼?(實際行為)\n"
"\n"
-"期望行為跟實際發生的行為有什麼不同?\n"
+"預期發生的行為,跟實際發生的行為有什麼不同?\n"
"\n"
"其他您想加入的:\n"
"\n"
#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
#: parse-options.h
msgid "mode"
-msgstr "模式"
+msgstr "mode"
#: builtin/bugreport.c
msgid ""
"create an additional zip archive of detailed diagnostics (default 'stats')"
-msgstr "建ç«\8b詳細診æ\96·è³\87è¨\8aç\9a\84é¡\8då¤\96 zip å°\81å\98æª\94æ¡\88ï¼\88é \90è¨å\80¼æ\98¯ “stats”)"
+msgstr "å\8f¦å¤\96建ç«\8bæ\9c\89詳細診æ\96·è³\87è¨\8aç\9a\84 ZIP å°\81å\98æª\94ï¼\88é \90è¨å\80¼ “stats”)"
#: builtin/bugreport.c
msgid "specify a destination for the bugreport file(s)"
-msgstr "請指定臭蟲報告檔案的目的地"
+msgstr "指定臭蟲報告檔案的目的地"
#: builtin/bugreport.c
msgid "specify a strftime format suffix for the filename(s)"
-msgstr "指定檔名,strftime 格式的後綴"
+msgstr "指定用於檔名的 strftime 格式後綴"
#: builtin/bugreport.c builtin/diagnose.c
#, c-format
msgid "could not create leading directories for '%s'"
-msgstr "無法建立 '%s' 的前置目錄"
+msgstr "無法建立 “%s” 的前置目錄"
#: builtin/bugreport.c builtin/diagnose.c
#, c-format
#: builtin/bugreport.c
#, c-format
msgid "Created new report at '%s'.\n"
-msgstr "已在「%s」建立新報告。\n"
+msgstr "已在 “%s” 建立新報告。\n"
#: builtin/bundle.c
msgid ""
-"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
-"progress-implied]\n"
+"git bundle create [-q | --quiet | --progress]\n"
" [--version=<version>] <file> <git-rev-list-args>"
msgstr ""
-"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
-"progress-implied]\n"
+"git bundle create [-q | --quiet | --progress]\n"
" [--version=<version>] <file> <git-rev-list-args>"
#: builtin/bundle.c
#: builtin/bundle.c
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git bundle list-heads <檔案> [<引用名稱>...]"
+msgstr "git bundle list-heads <file> [<refname>...]"
#: builtin/bundle.c
msgid "git bundle unbundle [--progress] <file> [<refname>...]"
msgstr "git bundle unbundle [--progress] <file> [<refname>...]"
+#: builtin/bundle.c
+msgid "need a <file> argument"
+msgstr "需要提供 <file> 引數"
+
#: builtin/bundle.c builtin/pack-objects.c
msgid "do not show progress meter"
-msgstr "不顯示進度表"
+msgstr "不顯示進度列"
#: builtin/bundle.c builtin/pack-objects.c
msgid "show progress meter"
-msgstr "顯示進度表"
+msgstr "顯示進度列"
-#: builtin/bundle.c builtin/pack-objects.c
-msgid "show progress meter during object writing phase"
-msgstr "在物件寫入階段顯示進度表"
+#: builtin/bundle.c
+msgid "historical; same as --progress"
+msgstr "歷史遺留選項;和 --progress 相同"
-#: builtin/bundle.c builtin/pack-objects.c
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "當進度表顯示時類似於 --all-progress"
+#: builtin/bundle.c
+msgid "historical; does nothing"
+msgstr "歷史遺留選項;沒有作用"
#: builtin/bundle.c
msgid "specify bundle format version"
#: builtin/bundle.c
msgid "Unbundling objects"
-msgstr "正在解包物件"
+msgstr "正在拆分物件"
#: builtin/cat-file.c merge-recursive.c
#, c-format
msgid "cannot read object %s '%s'"
-msgstr "不能讀取物件 %s '%s'"
+msgstr "無法讀取物件 %s “%s”"
#: builtin/cat-file.c
msgid "flush is only for --buffer mode"
#: builtin/cat-file.c
#, c-format
msgid "whitespace before command: '%s'"
-msgstr "命令前空格:「%s」"
+msgstr "命令前有空格:“%s”"
#: builtin/cat-file.c
#, c-format
msgid "%s takes no arguments"
msgstr "%s 不取引數"
-#: builtin/cat-file.c
-#, c-format
-msgid "unknown command: '%s'"
-msgstr "未知命令:「%s」"
-
#: builtin/cat-file.c
msgid "only one batch option may be specified"
msgstr "只能指定一個批次處理選項"
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
"objects]\n"
" [--buffer] [--follow-symlinks] [--unordered]\n"
-" [--textconv | --filters] [-z]"
+" [--textconv | --filters] [-Z]"
msgstr ""
"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
"objects]\n"
" [--buffer] [--follow-symlinks] [--unordered]\n"
-" [--textconv | --filters] [-z]"
+" [--textconv | --filters] [-Z]"
#: builtin/cat-file.c
msgid ""
#: builtin/cat-file.c
msgid "Emit [broken] object attributes"
-msgstr "輸出 [損壞的] 物件屬性"
+msgstr "輸出 [損壞的] ([broken]) 物件屬性"
#: builtin/cat-file.c
msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
#: builtin/cat-file.c
msgid "stdin is NUL-terminated"
-msgstr "標準輸入以 NUL 字元終止"
+msgstr "stdin 以 NUL 字元終止"
+
+#: builtin/cat-file.c
+msgid "stdin and stdout is NUL-terminated"
+msgstr "stdin 和 stdout 以 NUL 字元終止"
#: builtin/cat-file.c
msgid "read commands from stdin"
-msgstr "從標準輸入讀取命令"
+msgstr "從 stdin 讀取命令"
#: builtin/cat-file.c
msgid "with --batch[-check]: ignores stdin, batches all known objects"
-msgstr "傳入 --batch[-check]:忽略標準輸入,批次處理所有已知物件"
+msgstr "傳入 --batch[-check]:忽略 stdin,批次處理所有已知物件"
#: builtin/cat-file.c
msgid "Change or optimize batch output"
#: builtin/cat-file.c
msgid "follow in-tree symlinks"
-msgstr "追蹤樹中的符號連結"
+msgstr "追蹤樹狀物件中的符號連結"
#: builtin/cat-file.c
msgid "do not order objects before emitting them"
-msgstr "不要在輸出物件前排序"
+msgstr "不要在輸出前排序物件"
#: builtin/cat-file.c
msgid ""
"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
"batch)"
-msgstr "轉換或過濾後輸出物件(blob 或樹)(單獨或批次處理)"
+msgstr "轉換或過濾後輸出物件 (blob 或 tree)(單獨或批次處理)"
#: builtin/cat-file.c
msgid "run textconv on object's content"
-msgstr "å\9c¨ç\89©ä»¶å\85§å®¹å\9f·è¡\8c textconv"
+msgstr "å°\8dç\89©ä»¶å\85§å®¹é\80²è¡\8cæ\96\87å\97è½\89æ\8f\9b (textconv)"
#: builtin/cat-file.c
msgid "run filters on object's content"
#: builtin/cat-file.c
#, c-format
msgid "'%s=<%s>' needs '%s' or '%s'"
-msgstr "「%s=<%s>」需要「%s」或「%s」"
+msgstr "“%s=<%s>” 需要 “%s” 或 “%s”"
#: builtin/cat-file.c
msgid "path|tree-ish"
#: builtin/cat-file.c
#, c-format
msgid "'%s' requires a batch mode"
-msgstr "「%s」需要批次處理模式"
+msgstr "“%s” 需要批次處理模式"
#: builtin/cat-file.c
#, c-format
msgid "'-%c' is incompatible with batch mode"
-msgstr "「-%c」與批次處理模式不相容"
+msgstr "“-%c” 與批次處理模式不相容"
#: builtin/cat-file.c
msgid "batch modes take no arguments"
#: builtin/cat-file.c
#, c-format
msgid "<rev> required with '%s'"
-msgstr "<rev> 需要搭配「%s」"
+msgstr "“%s” 需要 <rev>"
#: builtin/cat-file.c
#, c-format
msgid "<object> required with '-%c'"
-msgstr "<object> 需要搭配「-%c」"
+msgstr "“-%c” 需要 <object>"
#: builtin/cat-file.c
#, c-format
msgstr "只允許在 <type> <object> 模式傳入兩個引數,但傳了 %d 個"
#: builtin/check-attr.c
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."
+msgid ""
+"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"<pathname>..."
+msgstr ""
+"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
+"<pathname>..."
#: builtin/check-attr.c
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
+msgid ""
+"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
+msgstr ""
+"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
#: builtin/check-attr.c
msgid "report all attributes set on file"
-msgstr "å ±å\91\8a設定在檔案上的所有屬性"
+msgstr "å\9b\9eå ±設定在檔案上的所有屬性"
#: builtin/check-attr.c
msgid "use .gitattributes only from the index"
#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
msgid "read file names from stdin"
-msgstr "從標準輸入讀出檔案名"
+msgstr "從 stdin 讀出檔案名稱"
#: builtin/check-attr.c builtin/check-ignore.c
msgid "terminate input and output records by a NUL character"
-msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
+msgstr "輸入和輸出的紀錄使用 NUL 字元終止"
+
+#: builtin/check-attr.c
+msgid "<tree-ish>"
+msgstr "<tree-ish>"
+
+#: builtin/check-attr.c
+msgid "which tree-ish to check attributes at"
+msgstr "要用哪一個樹狀物件檢查屬性"
#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
msgid "suppress progress reporting"
#: builtin/check-ignore.c
msgid "show non-matching input paths"
-msgstr "顯示未符合的輸入路徑"
+msgstr "顯示不符合的輸入路徑"
#: builtin/check-ignore.c
msgid "ignore index when checking"
#: builtin/check-ignore.c
msgid "cannot specify pathnames with --stdin"
-msgstr "不能同時指定路徑及 --stdin 參數"
+msgstr "無法同時指定路徑名稱及 --stdin"
#: builtin/check-ignore.c
msgid "-z only makes sense with --stdin"
-msgstr "-z é\9c\80è¦\81å\92\8c --stdin å\8f\83æ\95¸å\85±用才有意義"
+msgstr "-z é\9c\80è¦\81å\92\8c --stdin å\90\8cæ\99\82使用才有意義"
#: builtin/check-ignore.c
msgid "no path specified"
#: builtin/check-ignore.c
msgid "--quiet is only valid with a single pathname"
-msgstr "å\8f\83æ\95¸ --quiet å\8fªå\9c¨æ\8f\90ä¾\9bä¸\80å\80\8bè·¯å¾\91å\90\8d時有效"
+msgstr "å¼\95æ\95¸ --quiet å\8fªå\9c¨æ\8f\90ä¾\9bä¸\80å\80\8bè·¯å¾\91å\90\8d稱時有效"
#: builtin/check-ignore.c
msgid "cannot have both --quiet and --verbose"
-msgstr "不能同時提供 --quiet 和 --verbose 參數"
+msgstr "無法同時傳入 --quiet 和 --verbose"
#: builtin/check-ignore.c
msgid "--non-matching is only valid with --verbose"
#: builtin/check-mailmap.c
msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<選項>] <聯繫位址>..."
+msgstr "git check-mailmap [<options>] <contact>..."
#: builtin/check-mailmap.c
msgid "also read contacts from stdin"
-msgstr "還從標準輸入讀取聯繫位址"
+msgstr "亦從 stdin 讀取聯絡地址"
#: builtin/check-mailmap.c
#, c-format
msgid "unable to parse contact: %s"
-msgstr "不能解析聯繫位址:%s"
+msgstr "無法解析聯絡地址:%s"
#: builtin/check-mailmap.c
msgid "no contacts specified"
-msgstr "æ\9cªæ\8c\87å®\9aè\81¯ç¹«ä½\8d址"
+msgstr "æ\9cªæ\8c\87å®\9aè\81¯çµ¡å\9c°址"
#: builtin/checkout--worker.c
msgid "git checkout--worker [<options>]"
-msgstr "git checkout--worker [<選項>]"
+msgstr "git checkout--worker [<options>]"
#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
#: builtin/submodule--helper.c builtin/worktree.c
msgid "string"
-msgstr "字串"
+msgstr "string"
#: builtin/checkout--worker.c builtin/checkout-index.c
msgid "when creating files, prepend <string>"
-msgstr "å\9c¨å»ºç«\8bæª\94æ¡\88æ\99\82ï¼\8cå\9c¨å\89\8dé\9d¢å\8a ä¸\8a <å\97串>"
+msgstr "建ç«\8bæª\94æ¡\88æ\99\82ï¼\8cå\9c¨å\89\8dé\9d¢å\8a ä¸\8a <string>"
#: builtin/checkout-index.c
msgid "git checkout-index [<options>] [--] [<file>...]"
-msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
+msgstr "git checkout-index [<options>] [--] [<file>...]"
#: builtin/checkout-index.c
msgid "stage should be between 1 and 3 or all"
-msgstr "索引值應該取值 1 到 3 或者 all"
+msgstr "stage 應該是 1 到 3 的值,或者是 all"
#: builtin/checkout-index.c
msgid "check out all files in the index"
#: builtin/checkout-index.c
msgid "update stat information in the index file"
-msgstr "更新索引中檔案的狀態訊息"
+msgstr "更新索引檔案的狀態訊息"
#: builtin/checkout-index.c
msgid "read list of paths from the standard input"
-msgstr "從標準輸入讀取路徑列表"
+msgstr "從標準輸入讀取路徑清單"
#: builtin/checkout-index.c
msgid "write the content to temporary files"
#: builtin/checkout.c
msgid "git checkout [<options>] <branch>"
-msgstr "git checkout [<選項>] <分支>"
+msgstr "git checkout [<options>] <branch>"
#: builtin/checkout.c
msgid "git checkout [<options>] [<branch>] -- <file>..."
-msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."
+msgstr "git checkout [<options>] [<branch>] -- <file>..."
#: builtin/checkout.c
msgid "git switch [<options>] [<branch>]"
-msgstr "git switch [<選項>] [<分支>]"
+msgstr "git switch [<options>] [<branch>]"
#: builtin/checkout.c
msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
+msgstr "git restore [<options>] [--source=<branch>] <file>..."
#: builtin/checkout.c
#, c-format
msgid "path '%s' does not have our version"
-msgstr "路徑 '%s' 沒有我們的版本"
+msgstr "“%s” 路徑沒有我們的版本"
#: builtin/checkout.c
#, c-format
msgid "path '%s' does not have their version"
-msgstr "路徑 '%s' 沒有他們的版本"
+msgstr "“%s” 路徑沒有他們的版本"
#: builtin/checkout.c
#, c-format
msgid "path '%s' does not have all necessary versions"
-msgstr "路徑 '%s' 沒有全部必需的版本"
+msgstr "“%s” 路徑沒有所有必須的版本"
#: builtin/checkout.c
#, c-format
msgid "path '%s' does not have necessary versions"
-msgstr "路徑 '%s' 沒有必需的版本"
+msgstr "“%s” 路徑沒有必須的版本"
#: builtin/checkout.c
#, c-format
msgid "path '%s': cannot merge"
-msgstr "path '%s':無法合併"
+msgstr "path “%s”:無法合併"
#: builtin/checkout.c
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "無法為 '%s' 新增合併結果"
+msgstr "無法為 “%s” 加上合併結果"
#: builtin/checkout.c
#, c-format
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
-msgstr[0] "å¾\9eç´¢å¼\95å\8d\80æ\9b´æ\96°äº\86 %d 個路徑"
+msgstr[0] "å·²å¾\9eç´¢å¼\95å\8d\80æ\9b´æ\96° %d 個路徑"
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' 不能在更新路徑時使用"
+msgstr "無法在更新路徑時使用 “%s”"
#: builtin/checkout.c
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "不能同時更新路徑並切換到分支'%s'。"
+msgstr "無法同時更新路徑和切換至 “%s” 分支。"
#: builtin/checkout.c
#, c-format
msgid "neither '%s' or '%s' is specified"
-msgstr "'%s' 或 '%s' 都沒有指定"
+msgstr "“%s” 或 “%s” 皆未指定"
#: builtin/checkout.c
#, c-format
msgid "'%s' must be used when '%s' is not specified"
-msgstr "未指定 '%2$s' 時,必須使用 '%1$s'"
+msgstr "未指定 “%2$s” 時,必須使用 “%1$s”"
#: builtin/checkout.c
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
-msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
+msgstr "“%s” 或 “%s” 無法與 %s 一起使用"
#: builtin/checkout.c
#, c-format
msgid "path '%s' is unmerged"
-msgstr "路徑 '%s' 未合併"
+msgstr "路徑 “%s” 未合併"
#: builtin/checkout.c
msgid "you need to resolve your current index first"
-msgstr "您需要先解決目前索引的衝突"
+msgstr "您需要先解決目前索引區的衝突"
#: builtin/checkout.c
#, c-format
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-"不能繼續,下列檔案有暫存的修改:\n"
+"無法繼續,下列檔案有暫存的更動:\n"
"%s"
#: builtin/checkout.c
#, c-format
msgid "Can not do reflog for '%s': %s\n"
-msgstr "不能對 '%s' 執行 reflog 動作:%s\n"
+msgstr "無法對 “%s” 執行 reflog 動作:%s\n"
#: builtin/checkout.c
msgid "HEAD is now at"
#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
msgid "unable to update HEAD"
-msgstr "不能更新 HEAD"
+msgstr "無法更新 HEAD"
#: builtin/checkout.c
#, c-format
msgid "Reset branch '%s'\n"
-msgstr "重設分支 '%s'\n"
+msgstr "重設分支 “%s”\n"
#: builtin/checkout.c
#, c-format
msgid "Already on '%s'\n"
-msgstr "已經位於 '%s'\n"
+msgstr "已經位於 “%s”\n"
#: builtin/checkout.c
#, c-format
msgid "Switched to and reset branch '%s'\n"
-msgstr "å\88\87æ\8f\9b並é\87\8dè¨å\88\86æ\94¯ '%s'\n"
+msgstr "å·²å\88\87æ\8f\9b並é\87\8dè¨å\88\86æ\94¯ â\80\9c%sâ\80\9d\n"
#: builtin/checkout.c
#, c-format
msgid "Switched to a new branch '%s'\n"
-msgstr "å\88\87æ\8f\9bå\88°ä¸\80å\80\8bæ\96°å\88\86æ\94¯ '%s'\n"
+msgstr "å·²å\88\87æ\8f\9bè\87³æ\96°å\88\86æ\94¯ â\80\9c%sâ\80\9d\n"
#: builtin/checkout.c
#, c-format
msgid "Switched to branch '%s'\n"
-msgstr "å\88\87æ\8f\9bå\88°å\88\86æ\94¯ '%s'\n"
+msgstr "å·²å\88\87æ\8f\9bè\87³å\88\86æ\94¯ â\80\9c%sâ\80\9d\n"
# 譯者:請維持前導空格
#: builtin/checkout.c
#, c-format
msgid " ... and %d more.\n"
-msgstr " ... 及其它 %d 個。\n"
+msgstr " …… 及其它 %d 個。\n"
#: builtin/checkout.c
#, c-format
"\n"
"%s\n"
msgstr[0] ""
-"警告:您正丟下 %d 個提交,未和任何分支關聯:\n"
+"警告:您正丟下 %d 個\n"
+"未和任何分支關聯的提交:\n"
"\n"
"%s\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"如果您想要透過建立新分支儲存它,這可能是一個好時候。\n"
-"如下動作:\n"
+"如果您想要透過建立新分支留下這些提交,\n"
+"現在很適合執行:\n"
"\n"
-" git branch <新分支名> %s\n"
+" git branch <新分支名稱> %s\n"
"\n"
#: builtin/checkout.c
msgid "internal error in revision walk"
-msgstr "在版本遍歷時遇到內部錯誤"
+msgstr "在修訂版遍歷時遇到內部錯誤"
#: builtin/checkout.c
msgid "Previous HEAD position was"
-msgstr "之前的 HEAD 位置是"
+msgstr "之前的 HEAD 指針位置在"
#: builtin/checkout.c
msgid "You are on a branch yet to be born"
-msgstr "您位於一個尚未初始化的分支"
+msgstr "您正位於一個尚未初始化的分支"
#: builtin/checkout.c
#, c-format
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-"'%s' 既可以是一個本機檔案,也可以是一個追蹤分支。\n"
+"“%s” 既可以是本機檔案,也可以是追蹤分支。\n"
"請使用 --(和可選的 --no-guess)來消除歧義"
#: builtin/checkout.c
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-"如果您想要簽出一個遠端追蹤分支,例如 'origin',您可以\n"
-"使用 --track 選項寫出全名:\n"
+"如果您想要簽出遠端追蹤分支,例如 “origin”,\n"
+"您可以使用 --track 選項寫出全名:\n"
"\n"
" git checkout --track origin/<name>\n"
"\n"
-"如果您總是喜歡使用模糊的簡短分支名 <name>,而不喜歡如 'origin' 的遠端\n"
-"版本庫名,可以在設定中設定 checkout.defaultRemote=origin。"
+"如果您平時比較想要使用模糊的簡短分支名稱 <name>,\n"
+"而不太想寫如 “origin” 的遠端版本庫名稱,\n"
+"可以在組態中設定 checkout.defaultRemote=origin。"
#: builtin/checkout.c
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
+msgstr "“%s” 符合多個 (%d) 遠端追蹤分支"
#: builtin/checkout.c
msgid "only one reference expected"
#: builtin/checkout.c
#, c-format
msgid "only one reference expected, %d given."
-msgstr "應只有一個引用,卻提供了 %d 個。"
+msgstr "預期只有一個引用,卻提供了 %d 個。"
#: builtin/checkout.c builtin/worktree.c
#, c-format
#: builtin/checkout.c
#, c-format
msgid "reference is not a tree: %s"
-msgstr "引用不是一個樹:%s"
+msgstr "引用不是樹狀物件:%s"
#: builtin/checkout.c
#, c-format
msgid "a branch is expected, got tag '%s'"
-msgstr "期望一個分支,得到標籤 '%s'"
+msgstr "預期收到分支,卻收到標籤 “%s”"
#: builtin/checkout.c
#, c-format
msgid "a branch is expected, got remote branch '%s'"
-msgstr "期望一個分支,得到遠端分支 '%s'"
+msgstr "預期收到分支,卻收到遠端分支 “%s”"
#: builtin/checkout.c
#, c-format
msgid "a branch is expected, got '%s'"
-msgstr "期望一個分支,得到 '%s'"
+msgstr "預期收到分支,卻收到 “%s”"
#: builtin/checkout.c
#, c-format
msgid "a branch is expected, got commit '%s'"
-msgstr "期望一個分支,得到提交 '%s'"
+msgstr "預期收到分支,卻收到提交 “%s”"
#: builtin/checkout.c
msgid ""
"If you want to detach HEAD at the commit, try again with the --detach option."
-msgstr "è\8b¥æ\82¨æ\83³è¦\81å\88\86é\9b¢æ\8f\90交ç\9a\84 HEAD,請傳入 --detach 選項重試。"
+msgstr "è\8b¥æ\82¨æ\83³è¦\81å\9c¨æ¤æ\8f\90交å\88\86é\9b¢ HEAD æ\8c\87é\87\9d,請傳入 --detach 選項重試。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-"不能在合併時切換分支\n"
-"è\80\83æ\85®ä½¿ç\94¨ \"git merge --quit\" æ\88\96 \"git worktree add\"。"
+"無法在合併時切換分支\n"
+"è«\8b試試 â\80\9cgit merge --quitâ\80\9d æ\88\96 â\80\9cgit worktree addâ\80\9d。"
#: builtin/checkout.c
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-"不能在 am 工作階段期間切換分支\n"
-"è\80\83æ\85®ä½¿ç\94¨ \"git am --quit\" æ\88\96 \"git worktree add\"。"
+"無法在 am 工作階段期間時切換分支\n"
+"è«\8b試試 â\80\9cgit am --quitâ\80\9d æ\88\96 â\80\9cgit worktree addâ\80\9d。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-"不能在重定基底時切換分支\n"
-"è\80\83æ\85®ä½¿ç\94¨ \"git rebase --quit\" æ\88\96 \"git worktree add\"。"
+"無法在重定基底時切換分支\n"
+"è«\8b試試 â\80\9cgit rebase --quitâ\80\9d æ\88\96 â\80\9cgit worktree addâ\80\9d。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-"不能在揀選時切換分支\n"
-"è\80\83æ\85®ä½¿ç\94¨ \"git cherry-pick --quit\" æ\88\96 \"git worktree add\"。"
+"無法在揀選時切換分支\n"
+"è«\8b試試 â\80\9cgit cherry-pick --quitâ\80\9d æ\88\96 â\80\9cgit worktree addâ\80\9d。"
#: builtin/checkout.c
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-"不能在還原時切換分支\n"
-"è\80\83æ\85®ä½¿ç\94¨ \"git revert --quit\" æ\88\96 \"git worktree add\"。"
+"無法在還原時切換分支\n"
+"è«\8b試試 â\80\9cgit revert --quitâ\80\9d æ\88\96 â\80\9cgit worktree addâ\80\9d。"
#: builtin/checkout.c
msgid "you are switching branch while bisecting"
-msgstr "您在執行二分搜尋時切換分支"
+msgstr "您在進行二分搜尋時切換分支"
#: builtin/checkout.c
msgid "paths cannot be used with switching branches"
-msgstr "路徑不能和切換分支同時使用"
+msgstr "路徑不能與切換分支同時使用"
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' 不能和切換分支同時使用"
+msgstr "“%s” 不能與切換分支同時使用"
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' 不能和 '%s' 同時使用"
+msgstr "“%s” 不能與 “%s” 同時使用"
#: builtin/checkout.c
#, c-format
msgid "'%s' cannot take <start-point>"
-msgstr "'%s' 不帶 <起始點>"
+msgstr "“%s” 不取 <start-point>"
#: builtin/checkout.c
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "不能切換分支到一個非提交 '%s'"
+msgstr "無法將分支切換至非提交項目 “%s”"
#: builtin/checkout.c
msgid "missing branch or commit argument"
-msgstr "缺å°\91å\88\86æ\94¯æ\88\96æ\8f\90交å\8f\83數"
+msgstr "缺å°\91å\88\86æ\94¯æ\88\96æ\8f\90交å¼\95數"
#: builtin/checkout.c
msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支執行三方合併"
+msgstr "和新分支進行三方合併"
#: builtin/checkout.c builtin/log.c parse-options.h
msgid "style"
-msgstr "風格"
+msgstr "style"
#: builtin/checkout.c
msgid "conflict style (merge, diff3, or zdiff3)"
#: builtin/checkout.c builtin/worktree.c
msgid "detach HEAD at named commit"
-msgstr "HEAD 從指定的提交分離"
+msgstr "自指定提交分離 HEAD 指針"
#: builtin/checkout.c
msgid "force checkout (throw away local modifications)"
#: builtin/checkout.c
msgid "new-branch"
-msgstr "新分支"
+msgstr "new-branch"
#: builtin/checkout.c
msgid "new unparented branch"
-msgstr "新的沒有父提交的分支"
+msgstr "新的,沒有父提交的分支"
#: builtin/checkout.c builtin/merge.c
msgid "update ignored files (default)"
-msgstr "更新忽略的檔案(預設)"
+msgstr "更新忽略的檔案(預設值)"
#: builtin/checkout.c
msgid "do not check if another worktree is holding the given ref"
-msgstr "不檢查指定的引用是否被其他工作區所占用"
+msgstr "不檢查其他工作區是否正在佔用指定的引用"
#: builtin/checkout.c
msgid "checkout our version for unmerged files"
#: builtin/checkout.c
msgid "do not limit pathspecs to sparse entries only"
-msgstr "對路徑不做稀疏簽出的限制"
+msgstr "對路徑規格不做稀疏簽出的限制"
#: builtin/checkout.c
#, c-format
msgid "options '-%c', '-%c', and '%s' cannot be used together"
-msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
+msgstr "“-%c”、“-%c” 和 “%s” 選項不得同時使用"
#: builtin/checkout.c
msgid "--track needs a branch name"
-msgstr "--track 需要一個分支名"
+msgstr "--track 需要分支名稱"
#: builtin/checkout.c
#, c-format
#: builtin/checkout.c
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "'%s' 不是一個提交,不能基於它建立分支 '%s'"
+msgstr "“%s” 不是提交,因此不能以這為基礎建立 “%s” 分支"
#: builtin/checkout.c
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout:--detach 不能接收路徑參數 '%s'"
+msgstr "git checkout:--detach 不取路徑引數 “%s”"
#: builtin/checkout.c
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-"git checkout:在從索引簽出時,--ours/--theirs、--force 和 --merge 不相容。"
+"git checkout:在從索引簽出時,--ours/--theirs、--force\n"
+"和 --merge 不相容。"
#: builtin/checkout.c
msgid "you must specify path(s) to restore"
-msgstr "您必須指定一個要復原的路徑"
+msgstr "您必須指定要還原的路徑"
#: builtin/checkout.c builtin/clone.c builtin/remote.c
#: builtin/submodule--helper.c builtin/worktree.c
msgid "branch"
-msgstr "分支"
+msgstr "branch"
#: builtin/checkout.c
msgid "create and checkout a new branch"
-msgstr "建立並簽出一個新的分支"
+msgstr "建立並簽出新分支"
#: builtin/checkout.c
msgid "create/reset and checkout a branch"
-msgstr "建立/重設並簽出一個分支"
+msgstr "建立/重設並簽出分支"
#: builtin/checkout.c
msgid "create reflog for new branch"
-msgstr "為新的分支建立引用日誌"
+msgstr "為新分支建立引用日誌"
#: builtin/checkout.c
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "二次猜測 'git checkout <無此分支>'(預設)"
+msgstr "二次猜測 “git checkout <無此分支>”(預設值)"
#: builtin/checkout.c
msgid "use overlay mode (default)"
-msgstr "使用疊加模式(預設)"
+msgstr "使用疊加模式(預設值)"
#: builtin/checkout.c
msgid "create and switch to a new branch"
-msgstr "建立並切換一個新分支"
+msgstr "建立並切換至新分支"
#: builtin/checkout.c
msgid "create/reset and switch to a branch"
-msgstr "建立/重設並切換一個分支"
+msgstr "建立/重設並切換至指定分支"
#: builtin/checkout.c
msgid "second guess 'git switch <no-such-branch>'"
-msgstr "二次猜測 'git switch <無此分支>'"
+msgstr "二次猜測 “git switch <無此分支>”"
#: builtin/checkout.c
msgid "throw away local modifications"
#: builtin/checkout.c
msgid "which tree-ish to checkout from"
-msgstr "要簽出哪一個樹"
+msgstr "要自哪一個樹狀物件指示元簽出"
#: builtin/checkout.c
msgid "restore the index"
-msgstr "復原索引"
+msgstr "還原索引"
#: builtin/checkout.c
msgid "restore the working tree (default)"
-msgstr "復原工作區(預設)"
+msgstr "還原工作區(預設值)"
#: builtin/checkout.c
msgid "ignore unmerged entries"
-msgstr "忽略未合併條目"
+msgstr "忽略未合併項目"
#: builtin/checkout.c
msgid "use overlay mode"
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
"[<pathspec>...]"
msgstr ""
-"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路徑規格>...]"
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
+"[<pathspec>...]"
#: builtin/clean.c
#, c-format
msgid "Removing %s\n"
-msgstr "正刪除 %s\n"
+msgstr "æ£å\9c¨å\88ªé\99¤ %s\n"
#: builtin/clean.c
#, c-format
msgid "Would remove %s\n"
-msgstr "將刪除 %s\n"
+msgstr "將會刪除 %s\n"
#: builtin/clean.c
#, c-format
#: builtin/clean.c midx.c
#, c-format
msgid "failed to remove %s"
-msgstr "刪除 %s 失敗"
+msgstr "無法移除 %s"
#: builtin/clean.c
#, c-format
msgid "could not lstat %s\n"
-msgstr "不能對 %s 呼叫 lstat\n"
+msgstr "不能對 %s 進行 lstat\n"
#: builtin/clean.c
msgid "Refusing to remove current working directory\n"
msgid "Would refuse to remove current working directory\n"
msgstr "會拒絕移除目前的工作目錄\n"
-#: builtin/clean.c git-add--interactive.perl
+#: builtin/clean.c
#, c-format
msgid ""
"Prompt help:\n"
"foo - select item based on unique prefix\n"
" - (empty) select nothing\n"
msgstr ""
-"協助:\n"
-"1 - 透過編號選擇一個選項\n"
-"foo - 透過唯一前綴選擇一個選項\n"
+"提示說明:\n"
+"1 - 透過編號選擇項目\n"
+"foo - 根據獨特前綴選擇項目\n"
" - (空)什麼也不選擇\n"
-#: builtin/clean.c git-add--interactive.perl
+#: builtin/clean.c
#, c-format
msgid ""
"Prompt help:\n"
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
-"協助:\n"
-"1 - é\81¸æ\93\87ä¸\80å\80\8bé\81¸é \85\n"
-"3-5 - 選擇一個範圍內的所有選項\n"
-"2-3,6-9 - 選擇多個範圍內的所有選項\n"
-"foo - 透過唯一前綴選擇一個選項\n"
-"-... - å\8f\8dé\81¸ç\89¹å®\9aç\9a\84é\81¸é \85\n"
-"* - é\81¸æ\93\87æ\89\80æ\9c\89é\81¸é \85\n"
-" - (空)結束選擇\n"
-
-#: builtin/clean.c git-add--interactive.perl
-#, c-format, perl-format
+"提示說明:\n"
+"1 - é\81¸æ\93\87ä¸\80å\80\8bé \85ç\9b®\n"
+"3-5 - 選擇一個項目範圍\n"
+"2-3,6-9 - 選擇多個項目範圍\n"
+"foo - 根據獨特前綴選擇項目\n"
+"-... - å\8f\96æ¶\88é\81¸å\8f\96æ\8c\87å®\9aé \85ç\9b®\n"
+"* - é\81¸æ\93\87æ\89\80æ\9c\89é \85ç\9b®\n"
+" - (空)完成選擇\n"
+
+#: builtin/clean.c
+#, c-format
msgid "Huh (%s)?\n"
-msgstr "嗯(%s)?\n"
+msgstr "嗯(%s)?\n"
#: builtin/clean.c
#, c-format
msgid "Input ignore patterns>> "
-msgstr "輸入範本以排除條目>> "
+msgstr "輸入要忽略的模式項目>> "
#: builtin/clean.c
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
-msgstr "警告:無法找到和 %s 符合的條目"
+msgstr "警告:無法找到和 %s 符合的項目"
#: builtin/clean.c
msgid "Select items to delete"
-msgstr "選擇要刪除的條目"
+msgstr "選擇要刪除的項目"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c
#, c-format
msgid "Remove %s [y/N]? "
-msgstr "移除 %s [y/N]? "
+msgstr "移除 %s [y/N]? "
#: builtin/clean.c
msgid ""
"clean - 開始清理\n"
"filter by pattern - 透過範本排除要刪除的條目\n"
"select by numbers - 透過數字選擇要刪除的條目\n"
-"ask each - 針對刪除逐一詢問(就像 \"rm -i\")\n"
+"ask each - 針對刪除逐一詢問(就像 “rm -i”)\n"
"quit - 停止刪除並離開\n"
-"help - 顯示本協助\n"
-"? - 顯示如何在提示符下選擇的協助"
+"help - 顯示本輔助說明\n"
+"? - 顯示如何在提示下選擇的協助"
#: builtin/clean.c
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
-msgstr[0] "將刪除如下條目:"
+msgstr[0] "將移除以下項目:"
#: builtin/clean.c
msgid "No more files to clean, exiting."
#: builtin/clean.c
msgid "do not print names of files removed"
-msgstr "不列印刪除檔案的名稱"
+msgstr "不輸出移除的檔案的名稱"
#: builtin/clean.c
msgid "force"
-msgstr "強制"
+msgstr "force"
#: builtin/clean.c
msgid "interactive cleaning"
#: builtin/clean.c
msgid "remove whole directories"
-msgstr "刪除整個目錄"
+msgstr "移除整個目錄"
#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
-#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
+#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
+#: ref-filter.h
msgid "pattern"
-msgstr "模式"
+msgstr "pattern"
#: builtin/clean.c
msgid "add <pattern> to ignore rules"
-msgstr "新增 <模式> 到忽略規則"
+msgstr "將 <pattern> 加到忽略規則"
#: builtin/clean.c
msgid "remove ignored files, too"
-msgstr "ä¹\9få\88ª除忽略的檔案"
+msgstr "亦移除忽略的檔案"
#: builtin/clean.c
msgid "remove only ignored files"
-msgstr "只刪除忽略的檔案"
+msgstr "只移除忽略的檔案"
#: builtin/clean.c
msgid ""
#: builtin/clone.c
msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
+msgstr "git clone [<options>] [--] <repo> [<dir>]"
#: builtin/clone.c
msgid "don't clone shallow repository"
-msgstr "不要複製淺版本庫"
+msgstr "不要複製淺層版本庫"
#: builtin/clone.c
msgid "don't create a checkout"
-msgstr "不建ç«\8bä¸\80å\80\8bç°½å\87º"
+msgstr "不è¦\81建ç«\8bç°½å\87º"
#: builtin/clone.c builtin/init-db.c
msgid "create a bare repository"
-msgstr "建立一個純版本庫"
+msgstr "建立裸版本庫"
#: builtin/clone.c
msgid "create a mirror repository (implies bare)"
-msgstr "建立一個鏡像版本庫(也是純版本庫)"
+msgstr "建立鏡像版本庫(亦即裸版本庫)"
#: builtin/clone.c
msgid "to clone from a local repository"
#: builtin/clone.c
msgid "don't use local hardlinks, always copy"
-msgstr "不使用本機硬連結,始終複製"
+msgstr "不使用本機硬連結,始終拷貝"
#: builtin/clone.c
msgid "setup as shared repository"
#: builtin/clone.c
msgid "number of submodules cloned in parallel"
-msgstr "並行複製的子模組數"
+msgstr "平行複製的子模組數量"
#: builtin/clone.c builtin/init-db.c
msgid "template-directory"
-msgstr "範本目錄"
+msgstr "模板目錄"
#: builtin/clone.c builtin/init-db.c
msgid "directory from which templates will be used"
-msgstr "範本目錄將被使用"
+msgstr "將被使用的模板目錄"
#: builtin/clone.c builtin/submodule--helper.c
msgid "reference repository"
#: builtin/clone.c builtin/submodule--helper.c
msgid "use --reference only while cloning"
-msgstr "僅在複製時參考 --reference 指向的本機版本庫"
+msgstr "僅在複製時使用 --reference"
#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
msgid "name"
-msgstr "名稱"
+msgstr "name"
#: builtin/clone.c
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
+msgstr "使用 <name> 而不是 “origin” 追蹤上游"
#: builtin/clone.c
msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "簽出 <分支> 而不是遠端 HEAD"
+msgstr "簽出 <branch> 而不是遠端 HEAD"
#: builtin/clone.c
msgid "path to git-upload-pack on the remote"
#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
msgid "depth"
-msgstr "深度"
+msgstr "depth"
#: builtin/clone.c
msgid "create a shallow clone of that depth"
-msgstr "建立一個指定深度的淺複製"
-
-#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
-msgid "time"
-msgstr "時間"
+msgstr "建立指定深度的淺層複製"
#: builtin/clone.c
msgid "create a shallow clone since a specific time"
-msgstr "建立從指定時間到現在的淺複製"
+msgstr "建立從指定時間到現在的淺層複製"
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
msgid "revision"
-msgstr "修訂版"
+msgstr "revision"
#: builtin/clone.c builtin/fetch.c builtin/pull.c
msgid "deepen history of shallow clone, excluding rev"
-msgstr "取得更多淺複製的過去歷史記錄,除了特定版本"
+msgstr "取得更多淺層複製的過去歷史記錄,除了特定修訂版"
#: builtin/clone.c builtin/submodule--helper.c
msgid "clone only one branch, HEAD or --branch"
#: builtin/clone.c builtin/init-db.c
msgid "gitdir"
-msgstr "git目錄"
+msgstr "gitdir"
#: builtin/clone.c builtin/init-db.c
msgid "separate git dir from working tree"
-msgstr "git目錄和工作區分離"
+msgstr "git 目錄和工作區分離"
#: builtin/clone.c
msgid "key=value"
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
-msgid "use IPv4 addresses only"
-msgstr "只使用 IPv4 位址"
-
-#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c
-msgid "use IPv6 addresses only"
-msgstr "只使用 IPv6 位址"
-
#: builtin/clone.c
msgid "apply partial clone filters to submodules"
msgstr "將部分複製過濾器套用至子模組"
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
+#: builtin/clone.c
+#, c-format
+msgid "'%s' is a symlink, refusing to clone with --local"
+msgstr "“%s” 是個符號連結,故不能使用 --local 複製"
+
#: builtin/clone.c
#, c-format
msgid "failed to start iterator over '%s'"
#: builtin/clone.c compat/precompose_utf8.c
#, c-format
msgid "failed to unlink '%s'"
-msgstr "刪除 '%s' 失敗"
+msgstr "無法刪除 “%s”"
#: builtin/clone.c
#, c-format
#: builtin/clone.c
msgid "cannot unlink temporary alternates file"
-msgstr "無法刪除暫時的 alternates 檔案"
+msgstr "無法刪除暫存 alternates 檔案"
#: builtin/clone.c
msgid "Too many arguments."
msgid "failed to fetch objects from bundle URI '%s'"
msgstr "無法從套件包 URL “%s” 抓取物件"
+#: builtin/clone.c
+msgid "failed to fetch advertised bundles"
+msgstr "無法抓取公佈的套件包"
+
#: builtin/clone.c
msgid "remote transport reported error"
msgstr "遠端傳輸回報錯誤"
" git cherry-pick --skip\n"
"\n"
+#: builtin/commit.c read-cache.c
+msgid "updating files failed"
+msgstr "更新檔案失敗"
+
#: builtin/commit.c
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 樹狀物件失敗"
"in the current commit message"
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
-#: builtin/commit.c
+#: builtin/commit.c builtin/merge-tree.c
#, c-format
-msgid "could not lookup commit %s"
-msgstr "不能查詢提交 %s"
+msgid "could not lookup commit '%s'"
+msgstr "無法查詢提交 “%s”"
#: builtin/commit.c builtin/shortlog.c
#, c-format
msgid "version"
msgstr "版本"
-#: builtin/commit.c builtin/push.c builtin/worktree.c
+#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c
msgid "machine-readable output"
msgstr "機器可讀的輸出"
#: builtin/commit.c
msgid "show status in long format (default)"
-msgstr "以長格式顯示狀態(預設)"
+msgstr "以長格式顯示狀態(預設值)"
#: builtin/commit.c
msgid "terminate entries with NUL"
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c parse-options.h ref-filter.h
+#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h
msgid "commit"
msgstr "提交"
msgid "git config [<options>]"
msgstr "git config [<選項>]"
-#: builtin/config.c builtin/env--helper.c
+#: builtin/config.c
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "無法識別的 --type 參數,%s"
#: builtin/config.c
msgid "find the color configured: slot [default]"
-msgstr "獲得設定的顏色:設定 [預設]"
+msgstr "獲得設定的顏色:設定 [預設值]"
#: builtin/config.c
msgid "find the color setting: slot [stdout-is-tty]"
msgid "Type"
msgstr "類型"
-#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
+#: builtin/config.c builtin/hash-object.c
msgid "type"
msgstr "類型"
-#: builtin/config.c builtin/env--helper.c
+#: builtin/config.c
msgid "value is given this type"
msgstr "取值為該類型"
"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"
"令 command)"
-#: builtin/config.c builtin/env--helper.c
+#: builtin/config.c
msgid "value"
msgstr "取值"
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
-#: builtin/env--helper.c
-msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
-msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
-
-#: builtin/env--helper.c
-msgid "default for git_env_*(...) to fall back on"
-msgstr "git_env_*(...) 的預設值"
-
-#: builtin/env--helper.c
-msgid "be quiet only use git_env_*() value as exit code"
-msgstr "安靜模式,只使用 git_env_*() 的值作為離開碼"
-
-#: builtin/env--helper.c
-#, c-format
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "選項「--default」預期收到「--type=bool」的布林值,而非「%s」"
-
-#: builtin/env--helper.c
-#, c-format
-msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not "
-"`%s`"
-msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值,而非「%s」"
-
#: builtin/fast-export.c
msgid "git fast-export [<rev-list-opts>]"
msgstr "git fast-export [<rev-list-opts>]"
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c builtin/pull.c
-msgid "fetch from all remotes"
-msgstr "從所有的遠端抓取"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "set upstream for git pull/fetch"
-msgstr "為 git pull/fetch 設定上游"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
-
-#: builtin/fetch.c
-msgid "use atomic transaction to update references"
-msgstr "使用 atomic 事務更新引用"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "path to upload pack on remote end"
-msgstr "上傳包到遠端的路徑"
-
-#: builtin/fetch.c
-msgid "force overwrite of local reference"
-msgstr "強制覆蓋本機引用"
-
-#: builtin/fetch.c
-msgid "fetch from multiple remotes"
-msgstr "從多個遠端抓取"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "fetch all tags and associated objects"
-msgstr "抓取所有的標籤和關聯物件"
-
-#: builtin/fetch.c
-msgid "do not fetch all tags (--no-tags)"
-msgstr "不抓取任何標籤(--no-tags)"
-
-#: builtin/fetch.c
-msgid "number of submodules fetched in parallel"
-msgstr "並行取得的子模組數量"
-
-#: builtin/fetch.c
-msgid "modify the refspec to place all refs within refs/prefetch/"
-msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "prune remote-tracking branches no longer on remote"
-msgstr "清除遠端已經不存在的分支的追蹤分支"
-
-#: builtin/fetch.c
-msgid "prune local tags no longer on remote and clobber changed tags"
-msgstr "清除遠端不存在的本機標籤,並且取代變更標籤"
-
-# 譯者:可選值,不能翻譯
-#: builtin/fetch.c builtin/pull.c
-msgid "on-demand"
-msgstr "on-demand"
-
-#: builtin/fetch.c
-msgid "control recursive fetching of submodules"
-msgstr "控制子模組的遞迴抓取"
-
-#: builtin/fetch.c
-msgid "write fetched references to the FETCH_HEAD file"
-msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "keep downloaded pack"
-msgstr "保持下載包"
-
-#: builtin/fetch.c
-msgid "allow updating of HEAD ref"
-msgstr "允許更新 HEAD 引用"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "deepen history of shallow clone"
-msgstr "取得淺複製的更多過去歷史記錄"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "deepen history of shallow repository based on time"
-msgstr "基於時間來深化淺複製的歷史"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "convert to a complete repository"
-msgstr "轉換為一個完整的版本庫"
-
-#: builtin/fetch.c
-msgid "re-fetch without negotiating common commits"
-msgstr "重新抓取而不協商共同提交"
-
-#: builtin/fetch.c
-msgid "prepend this to submodule path output"
-msgstr "在子模組路徑輸出的前面加上此目錄"
-
-#: builtin/fetch.c
-msgid ""
-"default for recursive fetching of submodules (lower priority than config "
-"files)"
-msgstr "遞迴取得子模組的預設值(比設定檔案優先度低)"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "accept refs that update .git/shallow"
-msgstr "接受更新 .git/shallow 的引用"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "refmap"
-msgstr "引用映射"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "specify fetch refmap"
-msgstr "指定取得動作的引用映射"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "report that we have only objects reachable from this object"
-msgstr "報告我們只擁有從該物件開始可以取得的物件"
-
-#: builtin/fetch.c
-msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr "不取得 packfile,而是輸出協商的祖先提交"
-
-#: builtin/fetch.c
-msgid "run 'maintenance --auto' after fetching"
-msgstr "取得 (fetch) 後執行 'maintenance --auto'"
-
-#: builtin/fetch.c builtin/pull.c
-msgid "check for forced-updates on all updated branches"
-msgstr "在所有更新分支上檢查強制更新"
-
-#: builtin/fetch.c
-msgid "write the commit-graph after fetching"
-msgstr "抓取後寫入分支圖"
-
-#: builtin/fetch.c
-msgid "accept refspecs from stdin"
-msgstr "從標準輸入中接受引用規格"
-
#: builtin/fetch.c
msgid "couldn't find remote ref HEAD"
msgstr "找不到遠端 HEAD 引用"
+#: builtin/fetch.c
+#, c-format
+msgid "From %.*s\n"
+msgstr "來自 %.*s\n"
+
#: builtin/fetch.c
#, c-format
msgid "object %s not found"
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "已拒絕 %s,不允許更新淺複製"
-#: builtin/fetch.c
-#, c-format
-msgid "From %.*s\n"
-msgstr "來自 %.*s\n"
-
#: builtin/fetch.c
#, c-format
msgid ""
msgid "you need to specify a tag name"
msgstr "您需要指定標籤名稱"
+#: builtin/fetch.c builtin/pull.c
+msgid "fetch from all remotes"
+msgstr "從所有的遠端抓取"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "set upstream for git pull/fetch"
+msgstr "為 git pull/fetch 設定上游"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
+
+#: builtin/fetch.c
+msgid "use atomic transaction to update references"
+msgstr "使用 atomic 事務更新引用"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "path to upload pack on remote end"
+msgstr "上傳包到遠端的路徑"
+
+#: builtin/fetch.c
+msgid "force overwrite of local reference"
+msgstr "強制覆蓋本機引用"
+
+#: builtin/fetch.c
+msgid "fetch from multiple remotes"
+msgstr "從多個遠端抓取"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "fetch all tags and associated objects"
+msgstr "抓取所有的標籤和關聯物件"
+
+#: builtin/fetch.c
+msgid "do not fetch all tags (--no-tags)"
+msgstr "不抓取任何標籤(--no-tags)"
+
+#: builtin/fetch.c
+msgid "number of submodules fetched in parallel"
+msgstr "並行取得的子模組數量"
+
+#: builtin/fetch.c
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "清除遠端已經不存在的分支的追蹤分支"
+
+#: builtin/fetch.c
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "清除遠端不存在的本機標籤,並且取代變更標籤"
+
+# 譯者:可選值,不能翻譯
+#: builtin/fetch.c builtin/pull.c
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c
+msgid "control recursive fetching of submodules"
+msgstr "控制子模組的遞迴抓取"
+
+#: builtin/fetch.c
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "keep downloaded pack"
+msgstr "保持下載包"
+
+#: builtin/fetch.c
+msgid "allow updating of HEAD ref"
+msgstr "允許更新 HEAD 引用"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "deepen history of shallow clone"
+msgstr "取得淺複製的更多過去歷史記錄"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "deepen history of shallow repository based on time"
+msgstr "基於時間來深化淺複製的歷史"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "convert to a complete repository"
+msgstr "轉換為一個完整的版本庫"
+
+#: builtin/fetch.c
+msgid "re-fetch without negotiating common commits"
+msgstr "重新抓取而不協商共同提交"
+
+#: builtin/fetch.c
+msgid "prepend this to submodule path output"
+msgstr "在子模組路徑輸出的前面加上此目錄"
+
+#: builtin/fetch.c
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "遞迴取得子模組的預設值(比設定檔案優先度低)"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "accept refs that update .git/shallow"
+msgstr "接受更新 .git/shallow 的引用"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "refmap"
+msgstr "引用映射"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "specify fetch refmap"
+msgstr "指定取得動作的引用映射"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "report that we have only objects reachable from this object"
+msgstr "報告我們只擁有從該物件開始可以取得的物件"
+
+#: builtin/fetch.c
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr "不取得 packfile,而是輸出協商的祖先提交"
+
+#: builtin/fetch.c
+msgid "run 'maintenance --auto' after fetching"
+msgstr "取得 (fetch) 後執行 'maintenance --auto'"
+
+#: builtin/fetch.c builtin/pull.c
+msgid "check for forced-updates on all updated branches"
+msgstr "在所有更新分支上檢查強制更新"
+
+#: builtin/fetch.c
+msgid "write the commit-graph after fetching"
+msgstr "抓取後寫入分支圖"
+
+#: builtin/fetch.c
+msgid "accept refspecs from stdin"
+msgstr "從標準輸入中接受引用規格"
+
#: builtin/fetch.c
msgid "--negotiate-only needs one or more --negotiation-tip=*"
msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫,參數 --unshallow 沒有意義"
+#: builtin/fetch.c
+#, c-format
+msgid "failed to fetch bundles from '%s'"
+msgstr "無法自「%s」抓取套件包"
+
#: builtin/fetch.c
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
msgid "print only refs which don't contain the commit"
msgstr "只列印不包含該提交的引用"
+#: builtin/for-each-ref.c
+msgid "read reference patterns from stdin"
+msgstr "從 stdin 讀取引用模式"
+
+#: builtin/for-each-ref.c
+msgid "unknown arguments supplied with --stdin"
+msgstr "為 --stdin 提供的引數未知"
+
#: builtin/for-each-repo.c
msgid "git for-each-repo --config=<config> [--] <arguments>"
msgstr "git for-each-repo --config=<config> [--] <arguments>"
msgid "missing --config=<config>"
msgstr "缺少 --config=<設定>"
+#: builtin/for-each-repo.c
+#, c-format
+msgid "got bad config --config=%s"
+msgstr "收到無效的組態 --config=%s"
+
#: builtin/fsck.c
msgid "unknown"
msgstr "未知"
msgstr "注意:%s 指向一個尚未誕生的分支(%s)"
#: builtin/fsck.c
-msgid "Checking cache tree"
-msgstr "正在檢查快取樹"
+#, c-format
+msgid "Checking cache tree of %s"
+msgstr "正在檢查 %s 的快取樹"
#: builtin/fsck.c
#, c-format
-msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "%s:cache-tree 中無效的 sha1 指標"
+msgid "%s: invalid sha1 pointer in cache-tree of %s"
+msgstr "%s:%s 的 cache-tree 中的 sha1 指標無效"
#: builtin/fsck.c
msgid "non-tree in cache-tree"
#: builtin/fsck.c
#, c-format
-msgid "%s: invalid sha1 pointer in resolve-undo"
-msgstr "%s:resolve-undo 的 sha1 指針無效"
+msgid "%s: invalid sha1 pointer in resolve-undo of %s"
+msgstr "%s:%s 的 resolve-undo 中的 sha1 指標無效"
+
+#: builtin/fsck.c
+#, c-format
+msgid "unable to load rev-index for pack '%s'"
+msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)"
+
+#: builtin/fsck.c
+#, c-format
+msgid "invalid rev-index for pack '%s'"
+msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效"
#: builtin/fsck.c
msgid ""
#: builtin/fsck.c
msgid "make reflogs head nodes (default)"
-msgstr "將引用日誌作為檢查的 HEAD 節點(預設)"
+msgstr "將引用日誌作為檢查的 HEAD 節點(預設值)"
#: builtin/fsck.c
msgid "also consider packs and alternate objects"
msgid "failed to parse '%s' value '%s'"
msgstr "無法解析 '%s' 值 '%s'"
-#: builtin/gc.c builtin/init-db.c
+#: builtin/gc.c setup.c
#, c-format
msgid "cannot stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
msgid "invalid number of threads specified (%d) for %s"
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
-#. #-#-#-#-# grep.c.po #-#-#-#-#
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
#: builtin/grep.c
msgid "search in subdirectories (default)"
-msgstr "在子目錄中尋找(預設)"
+msgstr "在子目錄中尋找(預設值)"
#: builtin/grep.c
msgid "descend at most <depth> levels"
#: builtin/grep.c
msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 常規表示式(預設)"
+msgstr "使用基本的 POSIX 常規表示式(預設值)"
#: builtin/grep.c
msgid "interpret patterns as fixed strings"
msgstr "'git help config' 取得更多訊息"
#: builtin/hook.c
-msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
-msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgid ""
+"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
+"args>]"
+msgstr ""
+"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
+"args>]"
#: builtin/hook.c
msgid "silently ignore missing requested <hook-name>"
msgstr "靜默忽略不存在而請求的 <hook-name>"
+#: builtin/hook.c
+msgid "file to read into hooks' stdin"
+msgstr "要讀進掛鉤 stdin 的檔案"
+
#: builtin/index-pack.c
#, c-format
msgid "object type mismatch at %s"
msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」"
#: builtin/index-pack.c
-msgid "error while closing pack file"
-msgstr "關閉包檔案時發生錯誤"
-
-#: builtin/index-pack.c builtin/pack-objects.c
-#, c-format
-msgid "bad pack.indexVersion=%<PRIu32>"
-msgstr "無效的 pack.indexVersion=%<PRIu32>"
-
-#: builtin/index-pack.c
-#, c-format
-msgid "Cannot open existing pack file '%s'"
-msgstr "無法開啟現有包檔案 '%s'"
-
-#: builtin/index-pack.c
-#, c-format
-msgid "Cannot open existing pack idx file for '%s'"
-msgstr "無法為 %s 開啟包索引檔案"
-
-#: builtin/index-pack.c
-#, c-format
-msgid "non delta: %d object"
-msgid_plural "non delta: %d objects"
-msgstr[0] "非 delta:%d 個物件"
-
-#: builtin/index-pack.c
-#, c-format
-msgid "chain length = %d: %lu object"
-msgid_plural "chain length = %d: %lu objects"
-msgstr[0] "鏈長 = %d: %lu 物件"
-
-#: builtin/index-pack.c
-msgid "Cannot come back to cwd"
-msgstr "無法返回目前工作目錄"
-
-#: builtin/index-pack.c
-#, c-format
-msgid "bad %s"
-msgstr "錯誤選項 %s"
-
-#: builtin/index-pack.c builtin/init-db.c
-#, c-format
-msgid "unknown hash algorithm '%s'"
-msgstr "未知的「%s」雜湊算法"
-
-#: builtin/index-pack.c
-msgid "--stdin requires a git repository"
-msgstr "--stdin 需要一個 git 版本庫"
-
-#: builtin/index-pack.c
-msgid "--verify with no packfile name given"
-msgstr "--verify 沒有提供 packfile 名稱參數"
-
-#: builtin/index-pack.c builtin/unpack-objects.c
-msgid "fsck error in pack objects"
-msgstr "在打包物件中 fsck 檢查發生錯誤"
-
-#: builtin/init-db.c
-#, c-format
-msgid "cannot stat template '%s'"
-msgstr "不能對範本 '%s' 呼叫 stat"
-
-#: builtin/init-db.c
-#, c-format
-msgid "cannot opendir '%s'"
-msgstr "不能開啟目錄 '%s'"
-
-#: builtin/init-db.c
-#, c-format
-msgid "cannot readlink '%s'"
-msgstr "不能讀取連結 '%s'"
-
-#: builtin/init-db.c
-#, c-format
-msgid "cannot symlink '%s' '%s'"
-msgstr "不能自 '%s' 到 '%s' 建立符號連結"
-
-#: builtin/init-db.c
-#, c-format
-msgid "cannot copy '%s' to '%s'"
-msgstr "不能複製 '%s' 至 '%s'"
-
-#: builtin/init-db.c
-#, c-format
-msgid "ignoring template %s"
-msgstr "忽略範本 %s"
+msgid "error while closing pack file"
+msgstr "關閉包檔案時發生錯誤"
-#: builtin/init-db.c
+#: builtin/index-pack.c builtin/pack-objects.c
#, c-format
-msgid "templates not found in %s"
-msgstr "沒有在 %s 中找到範本"
+msgid "bad pack.indexVersion=%<PRIu32>"
+msgstr "無效的 pack.indexVersion=%<PRIu32>"
-#: builtin/init-db.c
+#: builtin/index-pack.c
#, c-format
-msgid "not copying templates from '%s': %s"
-msgstr "沒有從 '%s' 複製範本:%s"
+msgid "Cannot open existing pack file '%s'"
+msgstr "無法開啟現有包檔案 '%s'"
-#: builtin/init-db.c
+#: builtin/index-pack.c
#, c-format
-msgid "invalid initial branch name: '%s'"
-msgstr "ç\84¡æ\95\88ç\9a\84å\88\9då§\8bå\88\86æ\94¯å\90\8d稱ï¼\9a'%s'"
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "ç\84¡æ³\95ç\82º %s é\96\8bå\95\9få\8c\85ç´¢å¼\95æª\94æ¡\88"
-#: builtin/init-db.c
+#: builtin/index-pack.c
#, c-format
-msgid "unable to handle file type %d"
-msgstr "不能處理 %d 類型的檔案"
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "非 delta:%d 個物件"
-#: builtin/init-db.c
+#: builtin/index-pack.c
#, c-format
-msgid "unable to move %s to %s"
-msgstr "不能移動 %s 至 %s"
-
-#: builtin/init-db.c
-msgid "attempt to reinitialize repository with different hash"
-msgstr "嘗試以不同的雜湊值重新初始化版本庫"
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "鏈長 = %d: %lu 物件"
-#: builtin/init-db.c
-#, c-format
-msgid "%s already exists"
-msgstr "%s 已經存在"
+#: builtin/index-pack.c
+msgid "Cannot come back to cwd"
+msgstr "無法返回目前工作目錄"
-#: builtin/init-db.c
+#: builtin/index-pack.c
#, c-format
-msgid "re-init: ignored --initial-branch=%s"
-msgstr "re-init: 忽略 --initial-branch=%s"
+msgid "bad %s"
+msgstr "錯誤選項 %s"
-#: builtin/init-db.c
+#: builtin/index-pack.c builtin/init-db.c setup.c
#, c-format
-msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的「%s」雜湊算法"
-#: builtin/init-db.c
-#, c-format
-msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
+#: builtin/index-pack.c
+msgid "--stdin requires a git repository"
+msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/init-db.c
-#, c-format
-msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
+#: builtin/index-pack.c
+msgid "--verify with no packfile name given"
+msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/init-db.c
-#, c-format
-msgid "Initialized empty Git repository in %s%s\n"
-msgstr "已初始化空的 Git 版本庫於 %s%s\n"
+#: builtin/index-pack.c builtin/unpack-objects.c
+msgid "fsck error in pack objects"
+msgstr "在打包物件中 fsck 檢查發生錯誤"
#: builtin/init-db.c
msgid ""
#: builtin/log.c
msgid "show patch format instead of default (patch + stat)"
-msgstr "顯示純修補檔格式而非預設的(修補檔+狀態)"
+msgstr "顯示純修補檔格式而非預設值(修補檔+狀態)"
#: builtin/log.c
msgid "Messaging"
#: builtin/log.c
msgid "email"
-msgstr "信件位址"
+msgstr "信箱"
#: builtin/log.c
msgid "add To: header"
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到追蹤的遠端分支,請手動指定 <上游>。\n"
+#: builtin/ls-files.c builtin/ls-tree.c
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "無法取得「%s」相關的物件資訊"
+
#: builtin/ls-files.c
#, c-format
msgid "bad ls-files format: element '%s' does not start with '('"
#: builtin/ls-files.c
msgid "show cached files in the output (default)"
-msgstr "顯示快取的檔案(預設)"
+msgstr "顯示快取的檔案(預設值)"
#: builtin/ls-files.c
msgid "show deleted files in the output"
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [--symref] [<repository> [<patterns>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
-" [--symref] [<repository> [<refs>...]]"
+" [--symref] [<repository> [<patterns>...]]"
#: builtin/ls-remote.c
msgid "do not print remote URL"
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
-#: builtin/ls-tree.c
-#, c-format
-msgid "could not get object info about '%s'"
-msgstr "無法取得「%s」相關的物件資訊"
-
#: builtin/ls-tree.c
#, c-format
msgid "bad ls-tree format: element '%s' does not start with '('"
msgid "perform multiple merges, one per line of input"
msgstr "執行多次合併,一次執行輸入一列"
+#: builtin/merge-tree.c
+msgid "specify a merge-base for the merge"
+msgstr "指定用來合併的合併基底"
+
#: builtin/merge-tree.c
msgid "--trivial-merge is incompatible with all other options"
msgstr "--trivial-merge 和其他所有選項都不相容"
+#: builtin/merge-tree.c
+msgid "--merge-base is incompatible with --stdin"
+msgstr "--merge-base 與 --stdin 不相容"
+
#: builtin/merge-tree.c builtin/notes.c
#, c-format
msgid "malformed input line: '%s'."
#: builtin/merge.c builtin/pull.c
msgid "perform a commit if the merge succeeds (default)"
-msgstr "如果合併成功,執行一次提交(預設)"
+msgstr "如果合併成功,執行一次提交(預設值)"
#: builtin/merge.c builtin/pull.c
msgid "edit message before committing"
#: builtin/merge.c
msgid "allow fast-forward (default)"
-msgstr "允許快轉(預設)"
+msgstr "允許快轉(預設值)"
#: builtin/merge.c builtin/pull.c
msgid "abort if fast-forward is not possible"
msgid "Bad value '%s' in environment '%s'"
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-#: builtin/merge.c read-cache.c strbuf.c wrapper.c
+#: builtin/merge.c editor.c read-cache.c wrapper.c
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
#: builtin/name-rev.c
msgid "allow to print `undefined` names (default)"
-msgstr "允許列印 `未定義` 的名稱(預設)"
+msgstr "允許列印 `未定義` 的名稱(預設值)"
#: builtin/name-rev.c
msgid "dereference tags in the input (internal use)"
#: builtin/notes.c
msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>]"
msgstr ""
-"git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> "
-"| (-c | -C) <物件>] [<物件>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
#: builtin/notes.c
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>]"
msgstr ""
-"git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | "
-"(-c | -C) <物件>] [<物件>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
+"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
+"| -C) <object>] [<object>]"
#: builtin/notes.c
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgid "replace existing notes"
msgstr "取代已存在的註解"
+#: builtin/notes.c
+msgid "<paragraph-break>"
+msgstr "<paragraph-break>"
+
+#: builtin/notes.c
+msgid "insert <paragraph-break> between paragraphs"
+msgstr "在段落間插入 <paragraph-break>"
+
+#: builtin/notes.c
+msgid "remove unnecessary whitespace"
+msgstr "移除不必要的空白字元"
+
#: builtin/notes.c
#, c-format
msgid ""
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c builtin/repack.c
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "停用 bitmap 寫入,因為一些物件將不會被打包"
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
+#: builtin/pack-objects.c
+msgid "show progress meter during object writing phase"
+msgstr "在物件寫入階段顯示進度列"
+
+#: builtin/pack-objects.c
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "顯示進度列時類似 --all-progress"
+
#: builtin/pack-objects.c
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
"<git@vger.kernel.org> 讓我們知道您還在使用。\n"
"感謝。\n"
+#: builtin/pack-redundant.c
+msgid "refusing to run without --i-still-use-this"
+msgstr "傳入 --i-still-use-this 前拒絕執行"
+
#: builtin/pack-refs.c
-msgid "git pack-refs [--all] [--no-prune]"
-msgstr "git pack-refs [--all] [--no-prune]"
+msgid ""
+"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
+"<pattern>]"
+msgstr ""
+"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
+"<pattern>]"
#: builtin/pack-refs.c
msgid "pack everything"
#: builtin/pack-refs.c
msgid "prune loose refs (default)"
-msgstr "剪除鬆散引用(預設)"
+msgstr "剪除鬆散引用(預設值)"
+
+#: builtin/pack-refs.c
+msgid "references to include"
+msgstr "要包含的引用"
+
+#: builtin/pack-refs.c
+msgid "references to exclude"
+msgstr "要排除的引用"
#: builtin/patch-id.c
msgid "git patch-id [--stable | --unstable | --verbatim]"
msgid "number of submodules pulled in parallel"
msgstr "並行拉取的子模組數量"
+#: builtin/pull.c parse-options.h
+msgid "use IPv4 addresses only"
+msgstr "只使用 IPv4 位址"
+
+#: builtin/pull.c parse-options.h
+msgid "use IPv6 addresses only"
+msgstr "只使用 IPv6 位址"
+
#: builtin/pull.c
msgid ""
"There is no candidate for rebasing against among the refs that you just "
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c
-msgid "please commit or stash them."
-msgstr "請提交或貯存它們。"
+#: builtin/pull.c builtin/rebase.c
+msgid "Please commit or stash them."
+msgstr "請提交或貯存修改。"
#: builtin/pull.c
#, c-format
#: builtin/push.c
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Integrate the remote changes (e.g.\n"
-"'git pull ...') before pushing again.\n"
+"its remote counterpart. If you want to integrate the remote changes,\n"
+"use 'git pull' before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒絕,因為您目前分支的最新提交落後於其對應的遠端分支。\n"
-"å\86\8d次æ\8e¨é\80\81å\89\8dï¼\8cå\85\88è\88\87é\81 端è®\8aæ\9b´å\90\88ä½µï¼\88å¦\82 'git pull ...'ï¼\89。詳見\n"
-"'git push --help' 中的 'Note about fast-forwards' 小節。"
+"å¦\82æ\9e\9cæ\82¨æ\83³è¦\81æ\95´å\90\88é\81 端æ\9b´å\8b\95ï¼\8cè«\8bå\9c¨å\86\8d次æ\8e¨é\80\81å\89\8d使ç\94¨ â\80\9cgit pullâ\80\9d。詳見\n"
+"“git push --help” 中的〈Note about fast-forwards〉小節。"
#: builtin/push.c
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and integrate the remote changes\n"
-"(e.g. 'git pull ...') before pushing again.\n"
+"counterpart. If you want to integrate the remote changes, use 'git pull'\n"
+"before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"更新被拒絕,因為推送的一個分支的最新提交落後於其對應的遠端分支。\n"
-"簽出該分支並整合遠端變更(如 'git pull ...'),然後再推送。詳見\n"
-"'git push --help' 中的 'Note about fast-forwards' 小節。"
+"更新被拒絕,因為推送的某分支的最新提交落後於其對應的遠端分支。\n"
+"如果您想要整合遠端更動,請在再次推送前使用 “git pull”。詳見\n"
+"“git push --help” 中的〈Note about fast-forwards〉小節。"
#: builtin/push.c
msgid ""
-"Updates were rejected because the remote contains work that you do\n"
-"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first integrate the remote changes\n"
-"(e.g., 'git pull ...') before pushing again.\n"
+"Updates were rejected because the remote contains work that you do not\n"
+"have locally. This is usually caused by another repository pushing to\n"
+"the same ref. If you want to integrate the remote changes, use\n"
+"'git pull' before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"因為遠端版本庫包含您本機尚不存在的提交,而導致更新被拒絕。這通常是因為另外\n"
-"一個版本庫已向該引用進行了推送。再次推送前,您可能需要先整合遠端變更\n"
-"(如 'git pull ...')。\n"
-"詳見 'git push --help' 中的 'Note about fast-forwards' 小節。"
+"更新被拒絕,因為遠端包含您本機沒有的提交。這通常是因為\n"
+"另一個版本庫有推送更動到同個引用。如果您想要整合遠端更動,\n"
+"請在再次推送前使用 “git pull”。詳見 “git push --help” 中的\n"
+"〈Note about fast-forwards〉小節。"
#: builtin/push.c
msgid "Updates were rejected because the tag already exists in the remote."
#: builtin/push.c
msgid ""
-"Updates were rejected because the tip of the remote-tracking\n"
-"branch has been updated since the last checkout. You may want\n"
-"to integrate those changes locally (e.g., 'git pull ...')\n"
-"before forcing an update.\n"
+"Updates were rejected because the tip of the remote-tracking branch has\n"
+"been updated since the last checkout. If you want to integrate the\n"
+"remote changes, use 'git pull' before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"更新被拒,因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"
-"您可能會希望先將這些變更整合至本地(例如:‘git pull …’)\n"
-"最後才強制更新。\n"
+"更新被拒絕,因為遠端追蹤分支的最新提交自上次簽出後有改變。\n"
+"如果您想要整合遠端更動,請在再次推送前使用 “git pull”。\n"
+"詳見 “git push --help” 中的〈Note about fast-forwards〉小節。"
#: builtin/push.c
#, c-format
msgid "repository"
msgstr "版本庫"
-#: builtin/push.c builtin/send-pack.c
-msgid "push all refs"
-msgstr "æ\8e¨é\80\81æ\89\80æ\9c\89å¼\95ç\94¨"
+#: builtin/push.c
+msgid "push all branches"
+msgstr "æ\8e¨é\80\81æ\89\80æ\9c\89å\88\86æ\94¯"
#: builtin/push.c builtin/send-pack.c
msgid "mirror all refs"
msgstr "刪除引用"
#: builtin/push.c
-msgid "push tags (can't be used with --all or --mirror)"
-msgstr "推送標籤(不能使用 --all or --mirror)"
+msgid "push tags (can't be used with --all or --branches or --mirror)"
+msgstr "推送標籤(不能和 --all、--branches 或 --mirror 一起使用)"
#: builtin/push.c builtin/send-pack.c
msgid "force updates"
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用沒有意義"
-#: builtin/push.c
+#: builtin/push.c t/helper/test-bundle-uri.c
#, c-format
msgid "bad repository '%s'"
msgstr "壞的版本庫 '%s'"
"\n"
"因此 git 無法對其重定基底。"
+#: builtin/rebase.c
+#, c-format
+msgid "Unknown rebase-merges mode: %s"
+msgstr "未知的 rebase-merges 模式:%s"
+
#: builtin/rebase.c
#, c-format
msgid "could not switch to %s"
msgstr "無法切換到 %s"
+#: builtin/rebase.c
+msgid "apply options and merge options cannot be used together"
+msgstr "套用選項與合併選項不得同時使用"
+
#: builtin/rebase.c
#, c-format
msgid ""
"\"ask\"."
msgstr "無法識別的 '%s' 空類型;有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
+#: builtin/rebase.c
+msgid ""
+"--rebase-merges with an empty string argument is deprecated and will stop "
+"working in a future version of Git. Use --rebase-merges without an argument "
+"instead, which does the same thing."
+msgstr ""
+"有字串引數的 --rebase-merges 已被棄用,而且會在未來的 Git 版本停止運作。請改"
+"用無引數的 --rebase-merges,功能相同。"
+
#: builtin/rebase.c
#, c-format
msgid ""
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c
-#, c-format
-msgid "Unknown mode: %s"
-msgstr "未知模式:%s"
-
#: builtin/rebase.c
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
#: builtin/rebase.c
-msgid "apply options and merge options cannot be used together"
-msgstr "套用選項與合併選項不得同時使用"
+msgid ""
+"apply options are incompatible with rebase.autoSquash. Consider adding --no-"
+"autosquash"
+msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"
+
+#: builtin/rebase.c
+msgid ""
+"apply options are incompatible with rebase.rebaseMerges. Consider adding --"
+"no-rebase-merges"
+msgstr "apply 選項與 rebase.rebaseMerges 不相容。請考慮加上 --no-rebase-merges"
+
+#: builtin/rebase.c
+msgid ""
+"apply options are incompatible with rebase.updateRefs. Consider adding --no-"
+"update-refs"
+msgstr "apply 選項與 rebase.updateRefs 不相容。請考慮加上 --no-update-refs"
#: builtin/rebase.c
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c
-msgid "Please commit or stash them."
-msgstr "請提交或貯存修改。"
-
#: builtin/rebase.c
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
msgstr "抓取遠端的分支"
#: builtin/remote.c
-msgid "import all tags and associated objects when fetching"
-msgstr "抓取時匯入所有的標籤和關聯物件"
-
-#: builtin/remote.c
-msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "或不抓取任何標籤(--no-tags)"
+msgid ""
+"import all tags and associated objects when fetching\n"
+"or do not fetch any tag at all (--no-tags)"
+msgstr ""
+"抓取時匯入所有的標籤和關聯物件\n"
+"或者是完全不抓取所有標籤 (--no-tags)"
#: builtin/remote.c
msgid "branch(es) to track"
msgstr "近似日期"
#: builtin/repack.c
-msgid "with -C, expire objects older than this"
-msgstr "搭配 -C 會將早於此的物件設為過期"
+msgid "with --cruft, expire objects older than this"
+msgstr "搭配 --cruft 會將早於此的物件標為過期"
#: builtin/repack.c
msgid "remove redundant packs, and run git-prune-packed"
#: builtin/repack.c sequencer.c
#, c-format
msgid "could not unlink: %s"
-msgstr "ç\84¡æ³\95å\8f\96æ¶\88é\80£çµ\90:%s"
+msgstr "ç\84¡æ³\95å\88ªé\99¤:%s"
#: builtin/replace.c
msgid "git replace [-f] <object> <replacement>"
msgid "remote name"
msgstr "遠端名稱"
+#: builtin/send-pack.c
+msgid "push all refs"
+msgstr "推送所有引用"
+
#: builtin/send-pack.c
msgid "use stateless RPC protocol"
msgstr "使用無狀態的 RPC 協定"
#: builtin/sparse-checkout.c
msgid ""
-"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]"
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules) [<options>]"
msgstr ""
-"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]"
+"git sparse-checkout (init | list | set | add | reapply | disable | check-"
+"rules) [<options>]"
#: builtin/sparse-checkout.c
msgid "this worktree is not sparse"
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
+#: builtin/sparse-checkout.c
+msgid ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <file>]"
+msgstr ""
+"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
+"file <file>]"
+
+#: builtin/sparse-checkout.c
+msgid "terminate input and output files by a NUL character"
+msgstr "使用 NUL 字元終止輸入和輸出檔案"
+
+#: builtin/sparse-checkout.c
+msgid "when used with --rules-file interpret patterns as cone mode patterns"
+msgstr ""
+"與 --rules-file 搭配使用時,將 patterns (模式) 解釋為 cone 模式的 patterns"
+
+#: builtin/sparse-checkout.c
+msgid "use patterns in <file> instead of the current ones."
+msgstr "使用 <file> 中的(而非目前使用的)模式。"
+
#: builtin/stash.c
msgid "git stash list [<log-options>]"
msgstr "git stash list [<log-options>]"
msgid "Skipping submodule '%s'"
msgstr "略過子模組 '%s'"
+#: builtin/submodule--helper.c
+#, c-format
+msgid "cannot clone submodule '%s' without a URL"
+msgstr "無法在沒有網址的情況下複製 “%s” 子模組"
+
#: builtin/submodule--helper.c
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgid "git submodule--helper <command>"
msgstr "git submodule--helper <command>"
-#: builtin/submodule--helper.c git.c
-#, c-format
-msgid "%s doesn't support --super-prefix"
-msgstr "%s 不支援 --super-prefix"
-
#: builtin/symbolic-ref.c
msgid "git symbolic-ref [-m <reason>] <name> <ref>"
msgstr "git symbolic-ref [-m <reason>] <name> <ref>"
#: builtin/worktree.c
msgid ""
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
-" [-b <new-branch>] <path> [<commit-ish>]"
+" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
msgstr ""
"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
-" [-b <new-branch>] <path> [<commit-ish>]"
+" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
#: builtin/worktree.c
msgid "git worktree list [-v | --porcelain [-z]]"
msgid "git worktree unlock <worktree>"
msgstr "git worktree unlock <worktree>"
+#: builtin/worktree.c
+msgid "No possible source branch, inferring '--orphan'"
+msgstr "沒有可能的來源分支,推測為 “--orphan”"
+
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new orphan branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+" git worktree add --orphan -b %s %s\n"
+msgstr ""
+"如果您是想要在這個版本庫建立一個工作區,裡面包含一個\n"
+"孤立分支(即沒有提交的分支),可以使用 --orphan 達到\n"
+"這個效果:\n"
+"\n"
+" git worktree add --orphan -b %s %s\n"
+
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"If you meant to create a worktree containing a new orphan branch\n"
+"(branch with no commits) for this repository, you can do so\n"
+"using the --orphan flag:\n"
+"\n"
+" git worktree add --orphan %s\n"
+msgstr ""
+"如果您是想要在這個版本庫建立一個工作區,裡面包含一個\n"
+"孤立分支(即沒有提交的分支),可以使用 --orphan 達到\n"
+"這個效果:\n"
+"\n"
+" git worktree add --orphan %s\n"
+
#: builtin/worktree.c
#, c-format
msgid "Removing %s/%s: %s"
msgid "Preparing worktree (checking out '%s')"
msgstr "準備工作區(簽出 '%s')"
+#: builtin/worktree.c
+#, c-format
+msgid "unreachable: invalid reference: %s"
+msgstr "不可達:無效引用:%s"
+
#: builtin/worktree.c
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區(分離開頭指標 %s)"
+#: builtin/worktree.c
+#, c-format
+msgid ""
+"HEAD points to an invalid (or orphaned) reference.\n"
+"HEAD path: '%s'\n"
+"HEAD contents: '%s'"
+msgstr ""
+"HEAD 指向無效(或孤立)引用。\n"
+"HEAD 路徑:“%s”\n"
+"HEAD 內容:“%s”"
+
+#: builtin/worktree.c
+msgid ""
+"No local or remote refs exist despite at least one remote\n"
+"present, stopping; use 'add -f' to overide or fetch a remote first"
+msgstr ""
+"即使有提供一個遠端,卻不存在本機或遠端引用,\n"
+"故停止。使用 “add -f” 先覆蓋或抓取遠端"
+
+#: builtin/worktree.c
+#, c-format
+msgid "'%s' and '%s' cannot be used together"
+msgstr "無法同時使用 “%s” 和 “%s”"
+
#: builtin/worktree.c
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "簽出 <分支>,即使已經被簽出到其它工作區"
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
+#: builtin/worktree.c
+msgid "create unborn/orphaned branch"
+msgstr "建立尚無內容(孤立)的分支"
+
#: builtin/worktree.c
msgid "populate the new working tree"
msgstr "生成新的工作區"
msgid "options '%s', '%s', and '%s' cannot be used together"
msgstr "「%s」、「%s」和「%s」選項不得同時使用"
+#: builtin/worktree.c
+#, c-format
+msgid "options '%s', and '%s' cannot be used together"
+msgstr "無法同時使用 “%s” 和 “%s” 選項"
+
+#: builtin/worktree.c
+msgid "<commit-ish>"
+msgstr "<提交指示元>"
+
#: builtin/worktree.c
msgid "added with --lock"
msgstr "已使用 --lock 加入"
msgid "core.fsyncMethod = batch is unsupported on this platform"
msgstr "core.fsyncMethod = batch 不支援本平台"
+#: bundle-uri.c
+#, c-format
+msgid "could not parse bundle list key %s with value '%s'"
+msgstr "無法解析套件包清單鍵 %s 的值 “%s”"
+
#: bundle-uri.c
#, c-format
msgid "bundle list at '%s' has no mode"
msgid "insufficient capabilities"
msgstr "功能不足"
+#: bundle-uri.c
+#, c-format
+msgid "file downloaded from '%s' is not a bundle"
+msgstr "從 “%s” 下載的檔案不是套件包"
+
+#: bundle-uri.c
+msgid "failed to store maximum creation token"
+msgstr "無法儲存最大的建立權杖"
+
#: bundle-uri.c
#, c-format
msgid "unrecognized bundle mode from URI '%s'"
msgid "file at URI '%s' is not a bundle or bundle list"
msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"
+#: bundle-uri.c
+#, c-format
+msgid "bundle-uri: unexpected argument: '%s'"
+msgstr "bundle-uri: 非預期的引數:“%s”"
+
+#: bundle-uri.c
+msgid "bundle-uri: expected flush after arguments"
+msgstr "bundle-uri: 引數後應該有一個 flush 包"
+
#: bundle-uri.c
msgid "bundle-uri: got an empty line"
msgstr "bundle-uri: 收到空白列"
msgid "need a repository to verify a bundle"
msgstr "需要版本庫驗證套件包"
+#: bundle.c
+msgid ""
+"some prerequisite commits exist in the object store, but are not connected "
+"to the repository's history"
+msgstr "一些前提提交存在於物件儲存區,但未連接到版本庫的歷史記錄"
+
#: bundle.c
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle requires these %<PRIuMAX> refs:"
msgstr[0] "這個套件包需要這 %<PRIuMAX> 個引用:"
+#: bundle.c
+#, c-format
+msgid "The bundle uses this hash algorithm: %s"
+msgstr "本套件包採用此雜湊演算法:%s"
+
+#: bundle.c
+#, c-format
+msgid "The bundle uses this filter: %s"
+msgstr "本套件包使用此過濾器:%s"
+
#: bundle.c
msgid "unable to dup bundle descriptor"
msgstr "無法複製套件包描述元"
#: command-list.h
msgid "Count unpacked number of objects and their disk consumption"
-msgstr "計算未打包物件的數量和磁碟空間占用"
+msgstr "計算未打包物件的數量和磁碟空間佔用"
#: command-list.h
msgid "Retrieve and store user credentials"
msgstr "一個便攜的 Git 圖形用戶端"
#: command-list.h
-msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "å¾\9eä¸\80å\80\8bæª\94æ¡\88è¨\88ç®\97ç\89©ä»¶ IDï¼\8c並å\8f¯ä»¥å»ºç«\8b blob è³\87æ\96\99物件"
+msgid "Compute object ID and optionally create an object from a file"
+msgstr "å¾\9eä¸\80å\80\8bæª\94æ¡\88è¨\88ç®\97ç\89©ä»¶ IDï¼\8cä¹\9fè\83½é \86帶建ç«\8bä¸\80å\80\8b物件"
#: command-list.h
msgid "Display help information about Git"
msgid "commit-graph chain does not match"
msgstr "提交圖形鏈不符合"
+#: commit-graph.c
+#, c-format
+msgid "commit count in base graph too high: %<PRIuMAX>"
+msgstr "基礎圖 (base graph) 中的提交數過多:%<PRIuMAX>"
+
#: commit-graph.c
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgid "failed to rename temporary commit-graph file"
msgstr "無法重新命名暫時提交圖形檔案"
+#: commit-graph.c
+#, c-format
+msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
+msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個提交進行合併"
+
+#: commit-graph.c
+#, c-format
+msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
+msgstr "無法合併 %s 圖,太多提交:%<PRIuMAX>"
+
#: commit-graph.c
msgid "Scanning merged commits"
msgstr "正在掃描合併提交"
msgid "failed to parse commit %s from commit-graph"
msgstr "無法從提交圖形中解析提交 %s"
-#: commit-graph.c
-msgid "Verifying commits in commit graph"
-msgstr "正在驗證提交圖中的提交"
-
#: commit-graph.c
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+#: commit-graph.c
+msgid "Verifying commits in commit graph"
+msgstr "正在驗證提交圖中的提交"
+
#: commit.c
#, c-format
msgid "%s %s is not a commit!"
msgstr "錯誤的 zlib 壓縮級別 %d"
#: config.c
-msgid "core.commentChar should only be one character"
-msgstr "core.commentChar 應該是一個字元"
+msgid "core.commentChar should only be one ASCII character"
+msgstr "core.commentChar 應該是一個 ASCII 字元"
#: config.c
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱:%s"
+#: config.c
+#, c-format
+msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
+msgstr "因為第 %2$<PRIuMAX> 列中 “%1$s” 的文字列太長,故拒絕運作"
+
#: config.c
#, c-format
msgid "missing value for '%s'"
#: connect.c
#, c-format
-msgid "invalid ls-refs response: %s"
-msgstr "無效的 ls-refs 回應:%s"
+msgid "error on bundle-uri response line %d: %s"
+msgstr "在 bundle-uri 回應的第 %d 列發現錯誤:%s"
#: connect.c
-msgid "expected flush after ref listing"
-msgstr "在引用列表之後應該有一個 flush 包"
+msgid "expected flush after bundle-uri listing"
+msgstr "在 bundle-uri 清單後應該有一個 flush 包"
#: connect.c
msgid "expected response end packet after ref listing"
msgstr "在引用列表後預期要有回應結束封包"
+#: connect.c
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "無效的 ls-refs 回應:%s"
+
+#: connect.c
+msgid "expected flush after ref listing"
+msgstr "在引用列表之後應該有一個 flush 包"
+
#: connect.c
#, c-format
msgid "protocol '%s' is not supported"
msgid "multiple merge bases found"
msgstr "找到多個合併基底"
+#: diff-no-index.c
+msgid "cannot compare stdin to a directory"
+msgstr "無法比對 stdin 和目錄"
+
+#: diff-no-index.c
+msgid "cannot compare a named pipe to a directory"
+msgstr "無法比對命名管線 (pipe) 和目錄"
+
#: diff-no-index.c
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開,停止在 %s"
+#: diff.c
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明確要求只跟一個路徑規格"
+
+#: diff.c
+#, c-format
+msgid "pathspec magic not supported by --follow: %s"
+msgstr "--follow 不支援路徑規格魔法:%s"
+
#: diff.c parse-options.c
#, c-format
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr "「%s」和「%s」選項不得同時使用,請使用「%s」搭配「%s」、「%s」"
-#: diff.c
-msgid "--follow requires exactly one pathspec"
-msgstr "--follow 明確要求只跟一個路徑規格"
-
#: diff.c
#, c-format
msgid "invalid --stat value: %s"
#: diff.c
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
-msgstr "輸出每個子目錄相對變更的分布"
+msgstr "輸出每個子目錄相對變更的分佈"
#: diff.c
msgid "synonym for --dirstat=cumulative"
msgid "do not show any source or destination prefix"
msgstr "不顯示任何來源和目的地前綴"
+#: diff.c
+msgid "use default prefixes a/ and b/"
+msgstr "使用預設的前置名稱 a/ 和 b/"
+
#: diff.c
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示:等待您的編輯器關閉檔案...%c"
+#: editor.c sequencer.c wrapper.c
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能寫入 '%s'"
+
+#: editor.c
+#, c-format
+msgid "could not edit '%s'"
+msgstr "無法編輯 '%s'"
+
#: entry.c
msgid "Filtering content"
msgstr "過濾內容"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-" <command> [<args>]"
+" [--config-env=<name>=<envvar>] <command> [<args>]"
msgstr ""
"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
-" <command> [<args>]"
+" [--config-env=<name>=<envvar>] <command> [<args>]"
#: git.c
msgid ""
msgid "no namespace given for --namespace\n"
msgstr "沒有為 --namespace 提供命名空間\n"
-#: git.c
-#, c-format
-msgid "no prefix given for --super-prefix\n"
-msgstr "沒有為 --super-prefix 提供前綴\n"
-
#: git.c
#, c-format
msgid "-c expects a configuration string\n"
msgid "no config key given for --config-env\n"
msgstr "未傳入設定鍵至 --config-env\n"
+#: git.c
+#, c-format
+msgid "no attribute source given for --attr-source\n"
+msgstr "沒有為 --attr-source 提供屬性來源\n"
+
#: git.c
#, c-format
msgid "unknown option: %s\n"
msgstr "gpg.ssh.defaultKeyCommand 執行失敗:%s %s"
#: gpg-interface.c
-msgid "gpg failed to sign the data"
-msgstr "gpg 無法為資料簽名"
+#, c-format
+msgid ""
+"gpg failed to sign the data:\n"
+"%s"
+msgstr ""
+"gpg 無法簽名資料:\n"
+"%s"
#: gpg-interface.c
msgid "user.signingKey needs to be set for ssh signing"
#. conflict in a submodule. The first argument is the submodule
#. name, and the second argument is the abbreviated id of the
#. commit that needs to be merged. For example:
-#. - go to submodule (mysubmodule), and either merge commit abc1234"
+#. - go to submodule (mysubmodule), and either merge commit abc1234"
#.
#: merge-ort.c
#, c-format
#: merge-recursive.c
msgid "renamed"
-msgstr "重新命名"
+msgstr "已重新命名"
#: merge-recursive.c
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "鬆散物件 '%s' 後面有垃圾資料"
+#: object-file.c
+#, c-format
+msgid "unable to open loose object %s"
+msgstr "無法打開鬆散物件 %s"
+
#: object-file.c
#, c-format
msgid "unable to parse %s header"
#: object-file.c
#, c-format
-msgid "failed to read object %s"
-msgstr "讀取物件 %s 失敗"
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "鬆散物件 %s(儲存在 %s)已損壞"
#: object-file.c
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "鬆散物件 %s(儲存在 %s)已損壞"
-
#: object-file.c
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgid "unable to set permission to '%s'"
msgstr "無法為 '%s' 設定權限"
-#: object-file.c
-msgid "file write error"
-msgstr "檔案寫錯誤"
-
#: object-file.c
msgid "error when closing loose object file"
msgstr "關閉鬆散物件檔案時發生錯誤"
msgstr "不能讀取物件 %s"
#: object-file.c
-msgid "corrupt commit"
-msgstr "損壞的提交"
+#, c-format
+msgid "object fails fsck: %s"
+msgstr "物件 fsck 失敗:%s"
#: object-file.c
-msgid "corrupt tag"
-msgstr "æ\90\8då£\9eç\9a\84æ¨\99籤"
+msgid "refusing to create malformed object"
+msgstr "æ\8b\92çµ\95建ç«\8bæ ¼å¼\8fé\8c¯èª¤ç\9a\84ç\89©ä»¶"
#: object-file.c
#, c-format
#. TRANSLATORS: This is a line of ambiguous commit
#. object output. E.g.:
#. *
-#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
#.
#: object-name.c
#, c-format
#. TRANSLATORS: This is a line of ambiguous
#. tag object output. E.g.:
#. *
-#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
#. *
#. The second argument is the YYYY-MM-DD found
#. in the tag.
#. tag object output where we couldn't parse
#. the tag itself. E.g.:
#. *
-#. "deadbeef [bad tag, could not parse it]"
+#. "deadbeef [bad tag, could not parse it]"
#.
#: object-name.c
#, c-format
msgid "cannot fstat bitmap file"
msgstr "無法 fstat 位圖檔案"
-#: pack-bitmap.c
-#, c-format
-msgid "ignoring extra bitmap file: '%s'"
-msgstr "忽略多出來的位圖檔案:「%s」"
-
#: pack-bitmap.c
msgid "checksum doesn't match in MIDX and bitmap"
msgstr "總和檢查碼在 MIDX 和位圖中無符合項目"
msgid "unable to get disk usage of '%s'"
msgstr "無法取得「%s」的磁碟用量"
+#: pack-bitmap.c
+#, c-format
+msgid "bitmap file '%s' has invalid checksum"
+msgstr "“%s” 位圖檔案的總和檢查碼無效"
+
#: pack-mtimes.c
#, c-format
msgid "mtimes file %s is too small"
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
+#: pack-revindex.c
+msgid "invalid checksum"
+msgstr "無效的總和檢查碼"
+
+#: pack-revindex.c
+#, c-format
+msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
+msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效:%<PRIu32> != %<PRIu32>"
+
#: pack-write.c
msgid "cannot both write and verify reverse index"
msgstr "無法同時寫入和驗證倒排索引"
msgid "use <n> digits to display object names"
msgstr "用 <n> 位數字顯示物件名稱"
+#: parse-options.h
+msgid "prefixed path to initial superproject"
+msgstr "初始父專案的前綴路徑"
+
#: parse-options.h
msgid "how to strip spaces and #comments from message"
msgstr "設定如何刪除提交說明裡的空格和 #備註"
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日誌"
+#: reachable.c
+#, c-format
+msgid "invalid extra cruft tip: '%s'"
+msgstr "無效的額外廢棄提交修訂版:“%s”"
+
+#: reachable.c
+msgid "unable to enumerate additional recent objects"
+msgstr "無法列舉多出來的近期物件"
+
#: read-cache.c
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgid "%s: cannot drop to stage #0"
msgstr "%s:不能落到暫存區 #0"
+#: read-cache.c
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "非預期的 diff 狀態 %c"
+
+#: read-cache.c
+#, c-format
+msgid "remove '%s'\n"
+msgstr "移除 “%s”\n"
+
#: rebase-interactive.c
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
msgid "ahead %d, behind %d"
msgstr "領先 %d,落後 %d"
+#: ref-filter.c
+#, c-format
+msgid "%%(%.*s) does not take arguments"
+msgstr "%%(%.*s) 不取引數"
+
+#: ref-filter.c
+#, c-format
+msgid "unrecognized %%(%.*s) argument: %s"
+msgstr "無法識別的 %%(%.*s) 引數:%s"
+
#: ref-filter.c
#, c-format
msgid "expected format: %%(color:<color>)"
#: ref-filter.c
#, c-format
-msgid "unrecognized %%(%s) argument: %s"
-msgstr "無法識別的 %%(%s) 參數:%s"
+msgid "expected %%(trailers:key=<value>)"
+msgstr "預期是 %%(trailers:key=<value>)"
#: ref-filter.c
#, c-format
-msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) 不帶參數"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 參數:%s"
#: ref-filter.c
#, c-format
-msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) 不帶參數"
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一個正數 contents:lines=%s"
#: ref-filter.c
#, c-format
-msgid "%%(body) does not take arguments"
-msgstr "%%(body) 不帶參數"
+msgid "argument expected for %s"
+msgstr "引數預期 %s"
#: ref-filter.c
#, c-format
-msgid "expected %%(trailers:key=<value>)"
-msgstr "預期是 %%(trailers:key=<value>)"
+msgid "positive value expected %s=%s"
+msgstr "期望一個正數 %s=%s"
#: ref-filter.c
#, c-format
-msgid "unknown %%(trailers) argument: %s"
-msgstr "未知的 %%(trailers) 參數:%s"
+msgid "cannot fully parse %s=%s"
+msgstr "無法完全解析 %s=%s"
#: ref-filter.c
#, c-format
-msgid "positive value expected contents:lines=%s"
-msgstr "æ\9c\9fæ\9c\9bä¸\80å\80\8bæ£æ\95¸ contents:lines=%s"
+msgid "value expected %s="
+msgstr "æ\95¸å\80¼é \90æ\9c\9f %s="
#: ref-filter.c
#, c-format
msgid "positive value expected '%s' in %%(%s)"
msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
-#: ref-filter.c
-#, c-format
-msgid "unrecognized email option: %s"
-msgstr "無法識別的 email 選項:%s"
-
#: ref-filter.c
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgid "unrecognized width:%s"
msgstr "無法識別的寬度:%s"
+#: ref-filter.c
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "無法識別的 %%(%s) 參數:%s"
+
#: ref-filter.c
#, c-format
msgid "positive width expected with the %%(align) atom"
#: ref-filter.c
#, c-format
-msgid "%%(rest) does not take arguments"
-msgstr "%%(rest) 未取引數"
+msgid "expected format: %%(ahead-behind:<committish>)"
+msgstr "預期格式:%%(ahead-behind:<committish>)"
#: ref-filter.c
#, c-format
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
+#: ref-filter.c
+msgid "failed to run 'describe'"
+msgstr "無法執行 “describe”"
+
#: ref-filter.c
#, c-format
msgid "(no branch, rebasing %s)"
msgid "field name to sort on"
msgstr "排序的欄位名"
+#: ref-filter.h
+msgid "exclude refs which match pattern"
+msgstr "排除符合模式的引用"
+
#: reflog.c
#, c-format
msgid "not a reflog: %s"
# 譯者:請維持前導空格
#: remote.c
-msgid " (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr " (使用 \"git pull\" 來合併遠端分支)\n"
+msgid ""
+" (use \"git pull\" if you want to integrate the remote branch with yours)\n"
+msgstr " (使用 “git pull” 來將遠端分支整合進您的分支)\n"
#: remote.c
#, c-format
#: rerere.c
#, c-format
msgid "cannot unlink stray '%s'"
-msgstr "不能刪除 stray '%s'"
+msgstr "無法刪除失散檔案 “%s”"
#: rerere.c
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "沒有為 '%s' 記憶的解決方案"
-#: rerere.c
-#, c-format
-msgid "cannot unlink '%s'"
-msgstr "不能刪除 '%s'"
-
#: rerere.c
#, c-format
msgid "Updated preimage for '%s'"
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> 已不受支援"
+#: revision.c
+#, c-format
+msgid "invalid option '%s' in --stdin mode"
+msgstr "在 --stdin 模式下,“%s” 選項無效"
+
#: revision.c
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c strbuf.c wrapper.c
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能寫入 '%s'"
-
#: sequencer.c
#, c-format
msgid "could not write eol to '%s'"
msgid "git %s: failed to refresh the index"
msgstr "git %s:無法重新整理索引"
+#: sequencer.c
+#, c-format
+msgid "'%s' is not a valid label"
+msgstr "“%s” 不是有效的標籤"
+
+#: sequencer.c
+#, c-format
+msgid "'%s' is not a valid refname"
+msgstr "“%s” 不是有效的引用名稱"
+
+#: sequencer.c
+#, c-format
+msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
+msgstr "update-ref 需要完全限定的引用名稱,比如:refs/heads/%s"
+
+#: sequencer.c
+#, c-format
+msgid "invalid command '%.*s'"
+msgstr "無效的命令 “%.*s”"
+
#: sequencer.c
#, c-format
msgid "%s does not accept arguments: '%s'"
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c
-msgid "could not lock HEAD"
-msgstr "不能鎖定 HEAD"
-
#: sequencer.c
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
"\n"
#: sequencer.c
-msgid "and made changes to the index and/or the working tree\n"
-msgstr "並且修改索引和/或工作區\n"
+msgid "and made changes to the index and/or the working tree.\n"
+msgstr "並且更改索引和(或)工作區。\n"
#: sequencer.c
#, c-format
msgid ""
"execution succeeded: %s\n"
-"but left changes to the index and/or the working tree\n"
+"but left changes to the index and/or the working tree.\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"執行成功:%s\n"
-"但是在索引和/或工作區中存在變更\n"
-"提交或貯存修改,然後執行\n"
+"但是在索引和(或)工作區中存在變更。\n"
+"請提交或貯存修改,然後執行\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr "不能切換目錄到 '%s'"
#: setup.c
-msgid "cannot come back to cwd"
-msgstr "無法返回目前工作目錄"
+msgid "cannot come back to cwd"
+msgstr "無法返回目前工作目錄"
+
+#: setup.c
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "取得 '%*s%s%s' 狀態(stat)失敗"
+
+#: setup.c
+msgid "Unable to read current working directory"
+msgstr "不能讀取目前工作目錄"
+
+#: setup.c
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "不能切換到 '%s'"
+
+#: setup.c
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "不是一個 git 版本庫(或者任何父目錄):%s"
+
+#: setup.c
+#, c-format
+msgid ""
+"not a git repository (or any parent up to mount point %s)\n"
+"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
+msgstr ""
+"不是一個 git 版本庫(或者直至掛載點 %s 的任何父目錄)\n"
+"停止在檔案系統邊界(未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
+
+#: setup.c
+#, c-format
+msgid ""
+"detected dubious ownership in repository at '%s'\n"
+"%sTo add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"在位於「%s」的版本庫偵測到可疑所有權\n"
+"%s若要放行本目錄,請呼叫:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c
+#, c-format
+msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
+msgstr "無法使用 “%s” 純版本庫(safe.bareRepository 是 “%s”)"
+
+#: setup.c
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"參數 core.sharedRepository 的檔案屬性值有問題(0%.3o)。\n"
+"檔案所有者必須始終擁有讀寫權限。"
+
+#: setup.c
+msgid "fork failed"
+msgstr "fork 失敗"
+
+#: setup.c
+msgid "setsid failed"
+msgstr "setsid 失敗"
+
+#: setup.c
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "不能對範本 '%s' 呼叫 stat"
+
+#: setup.c
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "不能開啟目錄 '%s'"
+
+#: setup.c
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "不能讀取連結 '%s'"
+
+#: setup.c
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "不能自 '%s' 到 '%s' 建立符號連結"
+
+#: setup.c
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "不能複製 '%s' 至 '%s'"
+
+#: setup.c
+#, c-format
+msgid "ignoring template %s"
+msgstr "忽略範本 %s"
+
+#: setup.c
+#, c-format
+msgid "templates not found in %s"
+msgstr "沒有在 %s 中找到範本"
+
+#: setup.c
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "沒有從 '%s' 複製範本:%s"
#: setup.c
#, c-format
-msgid "failed to stat '%*s%s%s'"
-msgstr "取得 '%*s%s%s' 狀態(stat)失敗"
+msgid "invalid initial branch name: '%s'"
+msgstr "無效的初始分支名稱:'%s'"
#: setup.c
-msgid "Unable to read current working directory"
-msgstr "不能讀取目前工作目錄"
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "不能處理 %d 類型的檔案"
#: setup.c
#, c-format
-msgid "cannot change to '%s'"
-msgstr "不能切換到 '%s'"
+msgid "unable to move %s to %s"
+msgstr "不能移動 %s 至 %s"
#: setup.c
-#, c-format
-msgid "not a git repository (or any of the parent directories): %s"
-msgstr "不是一個 git 版本庫(或者任何父目錄):%s"
+msgid "attempt to reinitialize repository with different hash"
+msgstr "嘗試以不同的雜湊值重新初始化版本庫"
#: setup.c
#, c-format
-msgid ""
-"not a git repository (or any parent up to mount point %s)\n"
-"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
-msgstr ""
-"不是一個 git 版本庫(或者直至掛載點 %s 的任何父目錄)\n"
-"停止在檔案系統邊界(未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
+msgid "%s already exists"
+msgstr "%s 已經存在"
#: setup.c
#, c-format
-msgid ""
-"detected dubious ownership in repository at '%s'\n"
-"%sTo add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"在位於「%s」的版本庫偵測到可疑所有權\n"
-"%s若要放行本目錄,請呼叫:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: 忽略 --initial-branch=%s"
#: setup.c
#, c-format
-msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
-msgstr "無法使用 “%s” 純版本庫(safe.bareRepository 是 “%s”)"
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
#: setup.c
#, c-format
-msgid ""
-"problem with core.sharedRepository filemode value (0%.3o).\n"
-"The owner of files must always have read and write permissions."
-msgstr ""
-"參數 core.sharedRepository 的檔案屬性值有問題(0%.3o)。\n"
-"檔案所有者必須始終擁有讀寫權限。"
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
#: setup.c
-msgid "fork failed"
-msgstr "fork 失敗"
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
#: setup.c
-msgid "setsid failed"
-msgstr "setsid 失敗"
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "已初始化空的 Git 版本庫於 %s%s\n"
#: sparse-index.c
#, c-format
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c
-#, c-format
-msgid "could not edit '%s'"
-msgstr "無法編輯 '%s'"
-
#: submodule-config.c
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgid "failed to lstat '%s'"
msgstr "無法 lstat “%s”"
+#: t/helper/test-bundle-uri.c
+msgid "no remote configured to get bundle URIs from"
+msgstr "沒有設定可以用來取得套件包 URIs 的遠端"
+
+#: t/helper/test-bundle-uri.c
+#, c-format
+msgid "remote '%s' has no configured URL"
+msgstr "“%s” 遠端未設定 URL"
+
+#: t/helper/test-bundle-uri.c
+msgid "could not get the bundle-uri list"
+msgstr "無法取得 bundle-uri 清單"
+
#: t/helper/test-cache-tree.c
msgid "test-tool cache-tree <options> (control|prime|update)"
msgstr "test-tool cache-tree <options> (control|prime|update)"
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模組"
+#: transport.c
+msgid "bundle-uri operation not supported by protocol"
+msgstr "通訊協定不支援 bundle-uri 動作"
+
+#: transport.c
+msgid "could not retrieve server-advertised bundle-uri list"
+msgstr "無法取得伺服器公佈的 bundle-uri 清單"
+
#: tree-walk.c
msgid "too-short tree object"
msgstr "太短的樹狀物件"
#: wt-status.c
#, c-format
msgid ""
-"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-"may speed it up, but you have to be careful not to forget to add\n"
-"new files yourself (see 'git help status')."
+"It took %.2f seconds to enumerate untracked files,\n"
+"but the results were cached, and subsequent runs may be faster."
msgstr ""
-"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度,\n"
-"但您需要小心不要忘了新增新檔案(參見 'git help status')。"
+"列舉未追蹤檔案花費 %.2f 秒,\n"
+"不過已經快取結果,之後執行的速度或許能比較快。"
+
+#: wt-status.c
+#, c-format
+msgid "It took %.2f seconds to enumerate untracked files."
+msgstr "列舉未追蹤檔案花費 %.2f 秒。"
+
+#: wt-status.c
+msgid "See 'git help status' for information on how to improve this."
+msgstr "請參閱 “git help status” 深入了解如何改善。"
#: wt-status.c
#, c-format
#. TRANSLATORS: the action is e.g. "pull with rebase"
#: wt-status.c
#, c-format
-msgid "cannot %s: You have unstaged changes."
-msgstr "不能%s:您有未暫存的變更。"
-
-#: wt-status.c
-msgid "additionally, your index contains uncommitted changes."
-msgstr "另外,您的索引中包含未提交的變更。"
-
-#: wt-status.c
-#, c-format
-msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "不能%s:您的索引中包含未提交的變更。"
-
-#: git-merge-octopus.sh git-merge-resolve.sh
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
-msgstr "錯誤:您對下列檔案的本機修改將被合併動作覆蓋"
-
-#: git-merge-octopus.sh
-msgid "Automated merge did not work."
-msgstr "自動合併未生效。"
-
-#: git-merge-octopus.sh
-msgid "Should not be doing an octopus."
-msgstr "不應該執行章魚式合併。"
-
-#: git-merge-octopus.sh
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr "無法找到和 $pretty_name 的基礎提交"
-
-#: git-merge-octopus.sh
-#, sh-format
-msgid "Already up to date with $pretty_name"
-msgstr "已經和 $pretty_name 保持一致"
-
-#: git-merge-octopus.sh
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr "快轉至:$pretty_name"
-
-#: git-merge-octopus.sh
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr "嘗試和 $pretty_name 的簡單合併"
-
-#: git-merge-octopus.sh
-msgid "Simple merge did not work, trying automatic merge."
-msgstr "簡單合併未生效,嘗試自動合併。"
-
-#: git-sh-setup.sh
-#, sh-format
-msgid "usage: $dashless $USAGE"
-msgstr "用法:$dashless $USAGE"
-
-#: git-sh-setup.sh
-#, sh-format
-msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "不能切換目錄到 $cdup,工作區的頂級目錄"
-
-#: git-sh-setup.sh
-#, sh-format
-msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "致命錯誤:$program_name 不能在沒有工作區的情況下使用。"
-
-#: git-sh-setup.sh
-msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "不能重寫分支:您有未暫存的變更。"
-
-#: git-sh-setup.sh
-#, sh-format
-msgid "Cannot $action: You have unstaged changes."
-msgstr "不能 $action:您有未暫存的變更。"
-
-#: git-sh-setup.sh
-#, sh-format
-msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr "不能 $action:您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh
-msgid "Additionally, your index contains uncommitted changes."
-msgstr "而且您的索引中包含未提交的變更。"
-
-#: git-sh-setup.sh
-msgid "You need to run this command from the toplevel of the working tree."
-msgstr "您需要在工作區的頂級目錄中執行這個指令。"
-
-#: git-sh-setup.sh
-msgid "Unable to determine absolute path of git directory"
-msgstr "不能確定 git 目錄的絕對路徑"
-
-#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl
-#, perl-format
-msgid "%12s %12s %s"
-msgstr "%12s %12s %s"
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "touched %d path\n"
-msgid_plural "touched %d paths\n"
-msgstr[0] "建立了 %d 個路徑\n"
-
-#: git-add--interactive.perl
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging."
-msgstr "如果修補檔能完全套用,編輯區塊將立即標記為暫存。"
-
-#: git-add--interactive.perl
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for stashing."
-msgstr "如果修補檔能完全套用,編輯區塊將立即標記為貯存。"
-
-#: git-add--interactive.perl
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for unstaging."
-msgstr "如果修補檔能完全套用,編輯區塊將立即標記為未暫存。"
-
-#: git-add--interactive.perl
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for applying."
-msgstr "如果修補檔能完全套用,編輯區塊將立即標記為套用。"
-
-#: git-add--interactive.perl
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding."
-msgstr "如果修補檔能完全套用,編輯塊將立即標記為捨棄。"
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "failed to open hunk edit file for writing: %s"
-msgstr "為寫入開啟區塊編輯檔案失敗:%s"
-
-#: git-add--interactive.perl
-#, perl-format
-msgid ""
-"---\n"
-"To remove '%s' lines, make them ' ' lines (context).\n"
-"To remove '%s' lines, delete them.\n"
-"Lines starting with %s will be removed.\n"
-msgstr ""
-"---\n"
-"要刪除 '%s' 開始的行,使其成為 ' ' 開始的行(上下文)。\n"
-"要刪除 '%s' 開始的行,刪除它們。\n"
-"以 %s 開始的行將被刪除。\n"
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "failed to open hunk edit file for reading: %s"
-msgstr "無法讀取區塊編輯檔案:%s"
-
-#: git-add--interactive.perl
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"a - stage this hunk and all later hunks in the file\n"
-"d - do not stage this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 暫存此區塊\n"
-"n - 不要暫存此區塊\n"
-"q - 離開。不暫存此區塊及後面的全部區塊\n"
-"a - 暫存此區塊和本檔案中後面的全部區塊\n"
-"d - 不暫存此區塊和本檔案中後面的全部區塊"
-
-#: git-add--interactive.perl
-msgid ""
-"y - stash this hunk\n"
-"n - do not stash this hunk\n"
-"q - quit; do not stash this hunk or any of the remaining ones\n"
-"a - stash this hunk and all later hunks in the file\n"
-"d - do not stash this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 貯存此區塊\n"
-"n - 不要貯存此區塊\n"
-"q - 離開。不貯存此區塊及後面的全部區塊\n"
-"a - 貯存此區塊和本檔案中後面的全部區塊\n"
-"d - 不貯存此區塊和本檔案中後面的全部區塊"
-
-#: git-add--interactive.perl
-msgid ""
-"y - unstage this hunk\n"
-"n - do not unstage this hunk\n"
-"q - quit; do not unstage this hunk or any of the remaining ones\n"
-"a - unstage this hunk and all later hunks in the file\n"
-"d - do not unstage this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 不暫存此區塊\n"
-"n - 不要不暫存此區塊\n"
-"q - 離開。不要不暫存此區塊及後面的全部區塊\n"
-"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
-"d - 不要不暫存此區塊和本檔案中後面的全部區塊"
-
-#: git-add--interactive.perl
-msgid ""
-"y - apply this hunk to index\n"
-"n - do not apply this hunk to index\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 在索引中套用此區塊\n"
-"n - 不要在索引中套用此區塊\n"
-"q - 離開。不要套用此區塊及後面的全部區塊\n"
-"a - 套用此區塊和本檔案中後面的全部區塊\n"
-"d - 不要套用此區塊和本檔案中後面的全部區塊"
-
-#: git-add--interactive.perl
-msgid ""
-"y - discard this hunk from worktree\n"
-"n - do not discard this hunk from worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 在工作區中捨棄此區塊\n"
-"n - 不要在工作區中捨棄此區塊\n"
-"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
-"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
-"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
+msgid "cannot %s: You have unstaged changes."
+msgstr "不能%s:您有未暫存的變更。"
-#: git-add--interactive.perl
-msgid ""
-"y - discard this hunk from index and worktree\n"
-"n - do not discard this hunk from index and worktree\n"
-"q - quit; do not discard this hunk or any of the remaining ones\n"
-"a - discard this hunk and all later hunks in the file\n"
-"d - do not discard this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 在索引和工作區中捨棄此區塊\n"
-"n - 不要在索引和工作區中捨棄此區塊\n"
-"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
-"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
-"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
+#: wt-status.c
+msgid "additionally, your index contains uncommitted changes."
+msgstr "另外,您的索引中包含未提交的變更。"
-#: git-add--interactive.perl
-msgid ""
-"y - apply this hunk to index and worktree\n"
-"n - do not apply this hunk to index and worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 在索引和工作區中套用此區塊\n"
-"n - 不要在索引和工作區中套用此區塊\n"
-"q - 離開。不要套用此區塊及後面的全部區塊\n"
-"a - 套用此區塊和本檔案中後面的全部區塊\n"
-"d - 不要套用此區塊和本檔案中後面的全部區塊"
+#: wt-status.c
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "不能%s:您的索引中包含未提交的變更。"
-#: git-add--interactive.perl
+#: git-merge-octopus.sh git-merge-resolve.sh
msgid ""
-"y - apply this hunk to worktree\n"
-"n - do not apply this hunk to worktree\n"
-"q - quit; do not apply this hunk or any of the remaining ones\n"
-"a - apply this hunk and all later hunks in the file\n"
-"d - do not apply this hunk or any of the later hunks in the file"
-msgstr ""
-"y - 在工作區中套用此區塊\n"
-"n - 不要在工作區中套用此區塊\n"
-"q - 離開。不要套用此區塊及後面的全部區塊\n"
-"a - 套用此區塊和本檔案中後面的全部區塊\n"
-"d - 不要套用此區塊和本檔案中後面的全部區塊"
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "錯誤:您對下列檔案的本機修改將被合併動作覆蓋"
-#: git-add--interactive.perl
-msgid ""
-"g - select a hunk to go to\n"
-"/ - search for a hunk matching the given regex\n"
-"j - leave this hunk undecided, see next undecided hunk\n"
-"J - leave this hunk undecided, see next hunk\n"
-"k - leave this hunk undecided, see previous undecided hunk\n"
-"K - leave this hunk undecided, see previous hunk\n"
-"s - split the current hunk into smaller hunks\n"
-"e - manually edit the current hunk\n"
-"? - print help\n"
-msgstr ""
-"g - 選擇跳轉到一個區塊\n"
-"/ - 尋找和提供常規表示式符合的區塊\n"
-"j - 維持此區塊未決狀態,檢視下一個未決定區塊\n"
-"J - 維持此區塊未決狀態,檢視下一個區塊\n"
-"k - 維持此區塊未決狀態,檢視上一個未決定區塊\n"
-"K - 維持此區塊未決狀態,檢視上一個區塊\n"
-"s - 分割目前區塊為更小的區塊\n"
-"e - 手動編輯目前區塊\n"
-"? - 顯示說明\n"
+#: git-merge-octopus.sh
+msgid "Automated merge did not work."
+msgstr "自動合併未生效。"
+
+#: git-merge-octopus.sh
+msgid "Should not be doing an octopus."
+msgstr "不應該執行章魚式合併。"
-#: git-add--interactive.perl
-msgid "The selected hunks do not apply to the index!\n"
-msgstr "選取區塊不能套用到索引!\n"
+#: git-merge-octopus.sh
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "無法找到和 $pretty_name 的基礎提交"
-#: git-add--interactive.perl
-#, perl-format
-msgid "ignoring unmerged: %s\n"
-msgstr "忽ç\95¥æ\9cªå¥\97ç\94¨ç\9a\84ï¼\9a%s\n"
+#: git-merge-octopus.sh
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "å·²ç¶\93å\92\8c $pretty_name ä¿\9dæ\8c\81ä¸\80è\87´"
-#: git-add--interactive.perl
-msgid "No other hunks to goto\n"
-msgstr "沒有其它可供跳轉的區塊\n"
+#: git-merge-octopus.sh
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "快轉至:$pretty_name"
-#: git-add--interactive.perl
-#, perl-format
-msgid "Invalid number: '%s'\n"
-msgstr "無效數字:'%s'\n"
+#: git-merge-octopus.sh
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "嘗試和 $pretty_name 的簡單合併"
-#: git-add--interactive.perl
-#, perl-format
-msgid "Sorry, only %d hunk available.\n"
-msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] "對不起,只有 %d 個可用區塊。\n"
+#: git-merge-octopus.sh
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "簡單合併未生效,嘗試自動合併。"
-#: git-add--interactive.perl
-msgid "No other hunks to search\n"
-msgstr "沒有其它可供尋找的區塊\n"
+#: git-sh-setup.sh
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "用法:$dashless $USAGE"
-#: git-add--interactive.perl
-#, perl-format
-msgid "Malformed search regexp %s: %s\n"
-msgstr "錯誤的常規表示式 %s:%s\n"
+#: git-sh-setup.sh
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "不能切換目錄到 $cdup,工作區的頂級目錄"
+
+#: git-sh-setup.sh
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "致命錯誤:$program_name 不能在沒有工作區的情況下使用。"
-#: git-add--interactive.perl
-msgid "No hunk matches the given pattern\n"
-msgstr "沒有和提供模式相符合的區塊\n"
+#: git-sh-setup.sh
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "不能重寫分支:您有未暫存的變更。"
-#: git-add--interactive.perl
-msgid "No previous hunk\n"
-msgstr "沒有上一個區塊\n"
+#: git-sh-setup.sh
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "不能 $action:您有未暫存的變更。"
-#: git-add--interactive.perl
-msgid "No next hunk\n"
-msgstr "沒有下一個區塊\n"
+#: git-sh-setup.sh
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "不能 $action:您的索引中包含未提交的變更。"
-#: git-add--interactive.perl
-msgid "Sorry, cannot split this hunk\n"
-msgstr "對不起,不能分割這個區塊\n"
+#: git-sh-setup.sh
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "而且您的索引中包含未提交的變更。"
-#: git-add--interactive.perl
-#, perl-format
-msgid "Split into %d hunk.\n"
-msgid_plural "Split into %d hunks.\n"
-msgstr[0] "分割為 %d 塊。\n"
-
-#: git-add--interactive.perl
-msgid "Sorry, cannot edit this hunk\n"
-msgstr "對不起,不能編輯這個區塊\n"
-
-#. TRANSLATORS: please do not translate the command names
-#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl
-msgid ""
-"status - show paths with changes\n"
-"update - add working tree state to the staged set of changes\n"
-"revert - revert staged set of changes back to the HEAD version\n"
-"patch - pick hunks and update selectively\n"
-"diff - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
-msgstr ""
-"status - 顯示含變更的路徑\n"
-"update - 新增工作區狀態至暫存列表\n"
-"revert - 還原修改的暫存集至 HEAD 版本\n"
-"patch - 挑選區塊並且有選擇地更新\n"
-"diff - 顯示 HEAD 和索引間差異\n"
-"add untracked - 新增未追蹤檔案的內容至暫存列表\n"
-
-#: git-add--interactive.perl
-msgid "missing --"
-msgstr "缺少 --"
-
-#: git-add--interactive.perl
-#, perl-format
-msgid "unknown --patch mode: %s"
-msgstr "未知的 --patch 模式:%s"
+#: git-sh-setup.sh
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "您需要在工作區的頂級目錄中執行這個指令。"
-#: git-add--interactive.perl
-#, perl-format
-msgid "invalid argument %s, expecting --"
-msgstr "無效的參數 %s,期望是 --"
+#: git-sh-setup.sh
+msgid "Unable to determine absolute path of git directory"
+msgstr "不能確定 git 目錄的絕對路徑"
#: git-send-email.perl
msgid "local zone differs from GMT by a non-minute interval\n"
#: git-send-email.perl
#, perl-format
-msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) 新增 %s: %s 自:'%s'\n"
+msgid "(%s) Malformed output from '%s'"
+msgstr "(%s) 從 “%s” 讀到格式錯誤的輸出"
#: git-send-email.perl
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 無法關閉管道至 '%s'"
+#: git-send-email.perl
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) 新增 %s: %s 自:'%s'\n"
+
#: git-send-email.perl
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式傳送訊息"
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要傳送 %s?[y|N]: "
+#, c-format
+#~ msgid "It is not possible to %s because you have unmerged files."
+#~ msgstr "無法 %s,有未合併的檔案。"
+
+#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#~ msgstr "不向 git-mailsplit 傳入 --keep-cr 標記,無視 am.keepcr 的設定"
+
+#~ msgid ""
+#~ "Updates were rejected because the tip of the remote-tracking\n"
+#~ "branch has been updated since the last checkout. You may want\n"
+#~ "to integrate those changes locally (e.g., 'git pull ...')\n"
+#~ "before forcing an update.\n"
+#~ msgstr ""
+#~ "更新被拒,因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"
+#~ "您可能會希望先將這些變更整合至本地(例如:‘git pull …’)\n"
+#~ "最後才強制更新。\n"
+
+#~ msgid "or do not fetch any tag at all (--no-tags)"
+#~ msgstr "或不抓取任何標籤(--no-tags)"
+
+#~ msgid "current working directory is untracked"
+#~ msgstr "尚未追蹤目前的工作目錄"
+
+#~ msgid "cannot use --contents with final commit object name"
+#~ msgstr "無法將 --contents 與最終的提交物件名稱共用"
+
+#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
+
+#~ msgid "won't bisect on cg-seek'ed tree"
+#~ msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"
+
+#~ msgid "--bisect-terms requires 0 or 1 argument"
+#~ msgstr "--bisect-terms 需要 0 或 1 個引數"
+
+#~ msgid "--bisect-next requires 0 arguments"
+#~ msgstr "--bisect-next 需要 0 個引數"
+
+#~ msgid "--bisect-log requires 0 arguments"
+#~ msgstr "--bisect-log 需要 0 個引數"
+
+#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+#~ msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
+
+#~ msgid "default for git_env_*(...) to fall back on"
+#~ msgstr "git_env_*(...) 的預設值"
+
+#~ msgid "be quiet only use git_env_*() value as exit code"
+#~ msgstr "安靜模式,只使用 git_env_*() 的值作為離開碼"
+
+#, c-format
+#~ msgid ""
+#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+#~ msgstr "選項「--default」預期收到「--type=bool」的布林值,而非「%s」"
+
+#, c-format
+#~ msgid ""
+#~ "option `--default' expects an unsigned long value with `--type=ulong`, "
+#~ "not `%s`"
+#~ msgstr ""
+#~ "選項「--default」預期收到「--type=ulong」的無號 long 數值,而非「%s」"
+
+#~ msgid "please commit or stash them."
+#~ msgstr "請提交或貯存它們。"
+
+#, c-format
+#~ msgid "Unknown mode: %s"
+#~ msgstr "未知模式:%s"
+
+#, c-format
+#~ msgid "%s doesn't support --super-prefix"
+#~ msgstr "%s 不支援 --super-prefix"
+
+#, c-format
+#~ msgid "no prefix given for --super-prefix\n"
+#~ msgstr "沒有為 --super-prefix 提供前綴\n"
+
+#, c-format
+#~ msgid "failed to read object %s"
+#~ msgstr "讀取物件 %s 失敗"
+
+#~ msgid "file write error"
+#~ msgstr "檔案寫錯誤"
+
+#~ msgid "corrupt commit"
+#~ msgstr "損壞的提交"
+
+#~ msgid "corrupt tag"
+#~ msgstr "損壞的標籤"
+
+#, c-format
+#~ msgid "%%(objecttype) does not take arguments"
+#~ msgstr "%%(objecttype) 不帶參數"
+
+#, c-format
+#~ msgid "%%(deltabase) does not take arguments"
+#~ msgstr "%%(deltabase) 不帶參數"
+
+#, c-format
+#~ msgid "%%(body) does not take arguments"
+#~ msgstr "%%(body) 不帶參數"
+
+#, c-format
+#~ msgid "unrecognized email option: %s"
+#~ msgstr "無法識別的 email 選項:%s"
+
+#~ msgid "could not lock HEAD"
+#~ msgstr "不能鎖定 HEAD"
+
+#, c-format
+#~ msgid ""
+#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
+#~ "may speed it up, but you have to be careful not to forget to add\n"
+#~ "new files yourself (see 'git help status')."
+#~ msgstr ""
+#~ "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度,\n"
+#~ "但您需要小心不要忘了新增新檔案(參見 'git help status')。"
+
+#, perl-format
+#~ msgid "%12s %12s %s"
+#~ msgstr "%12s %12s %s"
+
+#, perl-format
+#~ msgid "touched %d path\n"
+#~ msgid_plural "touched %d paths\n"
+#~ msgstr[0] "建立了 %d 個路徑\n"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging."
+#~ msgstr "如果修補檔能完全套用,編輯區塊將立即標記為暫存。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for stashing."
+#~ msgstr "如果修補檔能完全套用,編輯區塊將立即標記為貯存。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for unstaging."
+#~ msgstr "如果修補檔能完全套用,編輯區塊將立即標記為未暫存。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for applying."
+#~ msgstr "如果修補檔能完全套用,編輯區塊將立即標記為套用。"
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding."
+#~ msgstr "如果修補檔能完全套用,編輯塊將立即標記為捨棄。"
+
+#, perl-format
+#~ msgid "failed to open hunk edit file for writing: %s"
+#~ msgstr "為寫入開啟區塊編輯檔案失敗:%s"
+
+#, perl-format
+#~ msgid ""
+#~ "---\n"
+#~ "To remove '%s' lines, make them ' ' lines (context).\n"
+#~ "To remove '%s' lines, delete them.\n"
+#~ "Lines starting with %s will be removed.\n"
+#~ msgstr ""
+#~ "---\n"
+#~ "要刪除 '%s' 開始的行,使其成為 ' ' 開始的行(上下文)。\n"
+#~ "要刪除 '%s' 開始的行,刪除它們。\n"
+#~ "以 %s 開始的行將被刪除。\n"
+
+#, perl-format
+#~ msgid "failed to open hunk edit file for reading: %s"
+#~ msgstr "無法讀取區塊編輯檔案:%s"
+
+#~ msgid ""
+#~ "y - stage this hunk\n"
+#~ "n - do not stage this hunk\n"
+#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
+#~ "a - stage this hunk and all later hunks in the file\n"
+#~ "d - do not stage this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 暫存此區塊\n"
+#~ "n - 不要暫存此區塊\n"
+#~ "q - 離開。不暫存此區塊及後面的全部區塊\n"
+#~ "a - 暫存此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不暫存此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - stash this hunk\n"
+#~ "n - do not stash this hunk\n"
+#~ "q - quit; do not stash this hunk or any of the remaining ones\n"
+#~ "a - stash this hunk and all later hunks in the file\n"
+#~ "d - do not stash this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 貯存此區塊\n"
+#~ "n - 不要貯存此區塊\n"
+#~ "q - 離開。不貯存此區塊及後面的全部區塊\n"
+#~ "a - 貯存此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不貯存此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - unstage this hunk\n"
+#~ "n - do not unstage this hunk\n"
+#~ "q - quit; do not unstage this hunk or any of the remaining ones\n"
+#~ "a - unstage this hunk and all later hunks in the file\n"
+#~ "d - do not unstage this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 不暫存此區塊\n"
+#~ "n - 不要不暫存此區塊\n"
+#~ "q - 離開。不要不暫存此區塊及後面的全部區塊\n"
+#~ "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要不暫存此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - apply this hunk to index\n"
+#~ "n - do not apply this hunk to index\n"
+#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
+#~ "a - apply this hunk and all later hunks in the file\n"
+#~ "d - do not apply this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 在索引中套用此區塊\n"
+#~ "n - 不要在索引中套用此區塊\n"
+#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
+#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - discard this hunk from worktree\n"
+#~ "n - do not discard this hunk from worktree\n"
+#~ "q - quit; do not discard this hunk or any of the remaining ones\n"
+#~ "a - discard this hunk and all later hunks in the file\n"
+#~ "d - do not discard this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 在工作區中捨棄此區塊\n"
+#~ "n - 不要在工作區中捨棄此區塊\n"
+#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"
+#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - discard this hunk from index and worktree\n"
+#~ "n - do not discard this hunk from index and worktree\n"
+#~ "q - quit; do not discard this hunk or any of the remaining ones\n"
+#~ "a - discard this hunk and all later hunks in the file\n"
+#~ "d - do not discard this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 在索引和工作區中捨棄此區塊\n"
+#~ "n - 不要在索引和工作區中捨棄此區塊\n"
+#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"
+#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - apply this hunk to index and worktree\n"
+#~ "n - do not apply this hunk to index and worktree\n"
+#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
+#~ "a - apply this hunk and all later hunks in the file\n"
+#~ "d - do not apply this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 在索引和工作區中套用此區塊\n"
+#~ "n - 不要在索引和工作區中套用此區塊\n"
+#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
+#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "y - apply this hunk to worktree\n"
+#~ "n - do not apply this hunk to worktree\n"
+#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
+#~ "a - apply this hunk and all later hunks in the file\n"
+#~ "d - do not apply this hunk or any of the later hunks in the file"
+#~ msgstr ""
+#~ "y - 在工作區中套用此區塊\n"
+#~ "n - 不要在工作區中套用此區塊\n"
+#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
+#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
+#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
+
+#~ msgid ""
+#~ "g - select a hunk to go to\n"
+#~ "/ - search for a hunk matching the given regex\n"
+#~ "j - leave this hunk undecided, see next undecided hunk\n"
+#~ "J - leave this hunk undecided, see next hunk\n"
+#~ "k - leave this hunk undecided, see previous undecided hunk\n"
+#~ "K - leave this hunk undecided, see previous hunk\n"
+#~ "s - split the current hunk into smaller hunks\n"
+#~ "e - manually edit the current hunk\n"
+#~ "? - print help\n"
+#~ msgstr ""
+#~ "g - 選擇跳轉到一個區塊\n"
+#~ "/ - 尋找和提供常規表示式符合的區塊\n"
+#~ "j - 維持此區塊未決狀態,檢視下一個未決定區塊\n"
+#~ "J - 維持此區塊未決狀態,檢視下一個區塊\n"
+#~ "k - 維持此區塊未決狀態,檢視上一個未決定區塊\n"
+#~ "K - 維持此區塊未決狀態,檢視上一個區塊\n"
+#~ "s - 分割目前區塊為更小的區塊\n"
+#~ "e - 手動編輯目前區塊\n"
+#~ "? - 顯示說明\n"
+
+#~ msgid "The selected hunks do not apply to the index!\n"
+#~ msgstr "選取區塊不能套用到索引!\n"
+
+#, perl-format
+#~ msgid "ignoring unmerged: %s\n"
+#~ msgstr "忽略未套用的:%s\n"
+
+#~ msgid "No other hunks to goto\n"
+#~ msgstr "沒有其它可供跳轉的區塊\n"
+
+#, perl-format
+#~ msgid "Invalid number: '%s'\n"
+#~ msgstr "無效數字:'%s'\n"
+
+#, perl-format
+#~ msgid "Sorry, only %d hunk available.\n"
+#~ msgid_plural "Sorry, only %d hunks available.\n"
+#~ msgstr[0] "對不起,只有 %d 個可用區塊。\n"
+
+#~ msgid "No other hunks to search\n"
+#~ msgstr "沒有其它可供尋找的區塊\n"
+
+#, perl-format
+#~ msgid "Malformed search regexp %s: %s\n"
+#~ msgstr "錯誤的常規表示式 %s:%s\n"
+
+#~ msgid "No hunk matches the given pattern\n"
+#~ msgstr "沒有和提供模式相符合的區塊\n"
+
+#~ msgid "No previous hunk\n"
+#~ msgstr "沒有上一個區塊\n"
+
+#~ msgid "No next hunk\n"
+#~ msgstr "沒有下一個區塊\n"
+
+#~ msgid "Sorry, cannot split this hunk\n"
+#~ msgstr "對不起,不能分割這個區塊\n"
+
+#, perl-format
+#~ msgid "Split into %d hunk.\n"
+#~ msgid_plural "Split into %d hunks.\n"
+#~ msgstr[0] "分割為 %d 塊。\n"
+
+#~ msgid "Sorry, cannot edit this hunk\n"
+#~ msgstr "對不起,不能編輯這個區塊\n"
+
+#~ msgid ""
+#~ "status - show paths with changes\n"
+#~ "update - add working tree state to the staged set of changes\n"
+#~ "revert - revert staged set of changes back to the HEAD version\n"
+#~ "patch - pick hunks and update selectively\n"
+#~ "diff - view diff between HEAD and index\n"
+#~ "add untracked - add contents of untracked files to the staged set of "
+#~ "changes\n"
+#~ msgstr ""
+#~ "status - 顯示含變更的路徑\n"
+#~ "update - 新增工作區狀態至暫存列表\n"
+#~ "revert - 還原修改的暫存集至 HEAD 版本\n"
+#~ "patch - 挑選區塊並且有選擇地更新\n"
+#~ "diff - 顯示 HEAD 和索引間差異\n"
+#~ "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
+
+#~ msgid "missing --"
+#~ msgstr "缺少 --"
+
+#, perl-format
+#~ msgid "unknown --patch mode: %s"
+#~ msgstr "未知的 --patch 模式:%s"
+
+#, perl-format
+#~ msgid "invalid argument %s, expecting --"
+#~ msgstr "無效的參數 %s,期望是 --"
+
#, c-format
#~ msgid "unable to normalize object directory: %s"
#~ msgstr "無法規範化物件目錄: %s"