diff options
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 8731 |
1 files changed, 4540 insertions, 4191 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index a0a23a955b..5d5718abb1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,307 +1,37 @@ # Chinese (traditional) translations for Git package # Git 套裝軟體的繁體中文翻譯。 -# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> -# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com> +# Copyright (C) 2012-2021 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2019-2021 Yi-Jyun Pan <pan93412@gmail.com> # This file is distributed under the same license as the Git package. -# Contributors (CN): -# - Fangyi Zhou <me AT fangyi.io> -# - Jiang Xin <worldhello.net AT gmail.com> -# - Lian Cheng <rhythm.mail AT gmail.com> -# - Ray Chen <oldsharp AT gmail.com> -# - Riku <lu.riku AT gmail.com> -# - Thynson <lanxingcan AT gmail.com> -# - ws3389 <willsmith3389 AT gmail.com> -# - Wang Sheng <wangsheng2008love AT 163.com> -# - 依云 <lilydjwg AT gmail.com> -# - Yichao Yu <yyc1992 AT gmail.com> -# - Zhuang Ya <zhuangya AT me.com> -# -# Git glossary for Chinese translators -# updated on 5/23/2020 # -# 原文 翻譯 -# 3 way merge 三方合併 -# ? ？ -# abbreviate 縮寫 -# abort 中止 -# Add 加入 -# all 所有 -# allow 允許 -# alternative 替代 -# Amend 修訂 -# annotate 附註 -# annotated tag 附註標籤 -# Apply 套用 -# argument 引數 -# argument 引數 -# Assume 假設 -# author 作者 -# bad 不良 -# Bare 祼 -# bare repo 祼版本庫 -# Bisect 二分法 -# Blame 究責 -# blob blob -# bloom filter 布隆過濾器 -# Branch 分支 -# branch （動詞）建立分支 -# Branches 分支 -# browse 瀏覽 -# browser 瀏覽器 -# bug 臭蟲 -# Bug-ID Bug-ID -# cache 快取 -# certificate 憑證 -# Change 變更 -# change 變更 -# changed 已變更 -# changes 變更 -# Check help file 查看說明檔案 -# checkbox 核取方塊 -# Checkout 檢出 -# checksum 總和檢查碼 -# Cherry Pick 摘取 -# clean 清除 -# cleanup 清理 -# clear 清空 -# click 按一下 -# client 用戶端 -# clipboard 剪貼簿 -# Clone 複製 -# Close 關閉 -# Collapse 收合 -# Color 色彩 -# Combine 結合 -# comment 評註 -# Commit 提交 -# committer 提交者 -# compare 比對 -# comparing 比對 -# Configure 設定 -# confirm 確認 -# Conflict 衝突 -# Context lines 情境列 -# context menu 快顯功能表 -# continue 繼續 -# continuous 持續性 -# copy 複製 -# Corrections 更正 -# Could not start 無法啟動 -# Create 建立 -# Creates 建立 -# Creating 建立中 -# Credential 憑證 -# Credential helper 憑證協助程式 -# Credentials 憑證 -# credentials 憑證 -# current 目前 -# custom 自訂 -# Customize 自訂 -# Daemon 守護程序 -# Date 日期 -# Default 預設 -# Delete 刪除 -# describe describe -# description 描述 -# Destination 目的地 -# detach 分離 -# detect 偵測 -# Dialogs 對話框 -# Diff 差異 -# differences 差異 -# different 差異 -# dir 目錄 -# directory 目錄 -# Discard 丟棄 -# Display 顯示 -# double click 按兩下 -# edit 編輯 -# editor 編輯器 -# email email -# Enable 啟用 -# Error code 錯誤碼 -# explicitly 顯式 -# Export 匯出 -# expression 表示式 -# extension 擴充套件 -# external 外部 -# fast forward 快進 -# fast-forward 快進 -# fetch 獲取 -# FETCH_HEAD FETCH_HEAD -# file 檔案 -# files 檔案 -# filter 篩選 -# find 搜尋 -# Finish 完成 -# folder 資料夾 -# folders 資料夾 -# follow 跟隨 -# Force 強制 -# from 自 -# Git Git -# Git for Windows Git for Windows -# hash 雜湊 -# HEAD HEAD -# highlight 標示 -# Hook 掛鉤 -# hunk 區塊 -# hunks 區塊 -# Ignore 忽略 -# Index 索引 -# Info 資訊 -# information 資訊 -# Init 初始化 -# initial checkout 初始簽出 -# Inline Diff 行內差異 -# inline diff 列內差異 -# is up to date 已最新 -# issue 議題 -# item 項目 -# items 項目 -# Keywords 關鍵字 -# label 標記 -# labels 標記 -# Last 最後 -# later 稍後 -# limitation 限制 -# line 列 -# lines 列 -# local 本地端 -# Local 本地端 -# Log 記錄 -# Merge 合併 -# merge 合併 -# message 訊息 -# Message 訊息 -# modify 修改 -# Name 名稱 -# Note 註 -# note 註 -# Notes 註解 -# Open 開啟 -# Options 選項 -# Ordering 順序 -# ORIG_HEAD ORIG_HEAD -# Overlay 圖示覆蓋 -# pack 包裝 -# Parent 父 -# patch 補綴 -# patched 補綴 -# paths 路徑 -# pick 取 -# position 位置 -# preview 預覽 -# process 處理 -# program 程式 -# Project 專案 -# Prune 剪除 -# Pull 拉取 -# Pull Request 拉取請求 -# Push 推送 -# rebase 重定基底 -# rebase 重定基底 -# recover 還原 -# recovered 還原 -# recursively 遞迴 -# recycle bin 回收桶 -# redo 重做 -# Ref 參照 -# ref 參照 -# reference 參照 -# RefLog 參照日誌 -# refmap 參照映射 -# refs 參照 -# refspec 參照規格 -# Remote 遠端 -# remote branches 遠端分支 -# Remote-tracking branches 遠端跟蹤分支 -# remote-treacking branches 遠端追蹤分支 -# remove 移除 -# removed 已移除 -# repo 版本庫 -# repositories 版本庫 -# Repository 版本庫 -# request 要求 -# Reset 重設 -# resolve 解決 -# rest 其餘的 -# Restore 還原 -# Revert 復原 -# reverted 已復原 -# review 檢閱 -# revision 修訂版 -# revisions 版本 -# script 指令稿 -# Scripts 指令稿 -# sections 部分 -# Show 顯示 -# sign 簽署 -# signed 已簽署 -# skip 略過 -# special 特殊 -# Squash 壓合 -# stage 暫存 -# stage 暫存 -# staged 已暫存 -# staging area 暫存區 -# Stash 收藏 -# Status 狀態 -# subject 主旨 -# Submodule 子模組 -# Superproject 上層專案 -# Switch 切換 -# tag （動詞）貼標籤 -# Tag 標籤 -# tagger 貼標籤者 -# tags 標籤 -# task 工作 -# thesaurus 同義字 -# three way 三方 -# Track 跟蹤 -# Tracked 跟蹤中 -# tracking 跟蹤 -# tree 樹 -# two 2 -# type 類型 -# unchanged 未變更 -# Undo 復原 -# Unified diff 單一差異 -# unified diff 統合式差異 -# Unknown 未知 -# unstash 取消收藏 -# Untracked 未跟蹤的 -# Unversioned 無版控 -# Update 更新 -# UpStream 上游 -# user 使用者 -# username 使用者名稱 -# vanilla 原 -# verify 核驗 -# view 檢視 -# viewer 檢視器 -# Warning 警告 -# whitespace 空白字元 -# whitespaces 空白字元 -# working 工作 -# working copy 工作複本 -# Working tree 工作目錄 -# You might need 您可能需要 +# Contributors (CN): +# - Fangyi Zhou <me AT fangyi.io> +# - Jiang Xin <worldhello.net AT gmail.com> +# - Lian Cheng <rhythm.mail AT gmail.com> +# - Ray Chen <oldsharp AT gmail.com> +# - Riku <lu.riku AT gmail.com> +# - Thynson <lanxingcan AT gmail.com> +# - ws3389 <willsmith3389 AT gmail.com> +# - Wang Sheng <wangsheng2008love AT 163.com> +# - 依云 <lilydjwg AT gmail.com> +# - Yichao Yu <yyc1992 AT gmail.com> +# - Zhuang Ya <zhuangya AT me.com> # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-03-06 02:21+0800\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 13:55+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" -"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n" +"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" +"po/git-cli/zh_Hant/>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.0\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -310,9 +40,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "無法讀取索引" @@ -340,7 +70,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "無法寫入索引" @@ -355,7 +85,7 @@ msgstr[0] "已更新 %d 個路徑\n" msgid "note: %s is untracked now.\n" msgstr "注意：%s 現已不再追蹤。\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -395,12 +125,12 @@ msgstr[0] "增加了 %d 個路徑\n" msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" @@ -477,11 +207,11 @@ msgstr "選擇編號過的項目" msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "請選擇" @@ -493,12 +223,13 @@ msgstr "快取" msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "路徑" @@ -507,7 +238,7 @@ msgstr "路徑" msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再見。\n" @@ -798,40 +529,42 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "無法執行 '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." -msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。" +msgstr "" +"您的過濾器必須在其輸入及輸出行\n" +"維持一對一的對應關係。" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -840,7 +573,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -853,11 +586,11 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -871,20 +604,21 @@ msgstr "" "以 %c 開始的行將被刪除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" "aborted and the hunk is left unchanged.\n" msgstr "" -"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" -"此次編輯被終止，此區塊不會被修改。\n" +"如果未乾淨套用，您就有機會重新編輯。\n" +"若刪掉此區塊的全部內容，則會中止\n" +"本次編輯，區塊則不會被修改。\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -900,24 +634,24 @@ msgstr "「git apply --cached」失敗" #. 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:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? " +msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？" -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -939,72 +673,72 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " -msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ " +msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳轉到哪個區塊？" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正規表示式搜尋？" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "錯誤的正規表示式 %s：%s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." -msgstr "分割為 %d 塊。" +msgstr "分割為 %d 個區塊。" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' 失敗" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -1013,37 +747,37 @@ msgstr "" "\n" "請使用「git config advice.%s false」來停用此訊息" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -1051,23 +785,38 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" +"下列路徑規格不符合任何適合路徑，\n" +"但符合目前稀疏簽出外的索引項目：\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "若有意更新這些項目，請停用或修改稀疏規則。" + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1115,82 +864,78 @@ msgstr "指令列以 \\ 結尾" msgid "unclosed quote" msgstr "未閉合的引號" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "無法識別的空白字元選項 '%s'" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "無法識別的空白字元忽略選項 '%s'" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同時使用。" -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached 和 --3way 不能同時使用。" - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way 在版本庫之外" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index 在版本庫之外" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached 在版本庫之外" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "無法準備時間戳正規表示式 %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，輸入為：%s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在修補檔的第 %d 行找到檔案名" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含無效檔案模式：%s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的檔案頭，%d 行和 %d 行" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1200,91 +945,91 @@ msgid_plural "" "components (line %d)" msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的修補檔片段沒有標頭訊息：%.*s" +msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "新檔案依賴舊內容" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "刪除的檔案仍有內容" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "修補檔在第 %d 行發現損壞" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "新檔案 %s 依賴舊內容" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "刪除的檔案 %s 仍有內容" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二進位修補檔在第 %d 行損壞：%.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "無法識別的二進位修補檔位於第 %d 行" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "修補檔案的第 %d 行只有垃圾資料" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "無法讀取符號連結 %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "不能開啟或讀取 %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "無效的行首字元：'%c'" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。" -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段" +msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1293,428 +1038,434 @@ msgstr "" "當查詢：\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺少 '%s' 的二進位修補檔資料" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 '%s'" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" -msgstr "不能檢出 %s" +msgstr "不能簽出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "版本庫缺乏必要的資料物件以進行三方合併。" +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "版本庫缺少用來進行三方合併所需要的資料物件。" -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "回落到三方合併...\n" +msgid "Performing three-way merge...\n" +msgstr "正在進行三方合併⋯⋯\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "無法回落到三方合併...\n" +msgid "Failed to perform three-way merge...\n" +msgstr "無法進行三方合併⋯⋯\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "回復至直接套用模式⋯⋯\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3979 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合" -#: apply.c:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "內部錯誤" -#: apply.c:4557 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." -msgstr "第 #%d 個片段成功應用。" +msgstr "成功套用第 #%d 個區塊。" -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." -msgstr "拒絕第 #%d 個片段。" +msgstr "拒絕第 #%d 個區塊。" -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "無法識別的輸入" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -#: apply.c:4944 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "修復空白錯誤後，應用了 %d 行。" +msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" -msgstr "不要應用與給出路徑向符合的變更" +msgstr "不要套用符合提供路徑的變更" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" -msgstr "應用與給出路徑向符合的變更" +msgstr "套用符合提供路徑的變更" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "數字" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" -msgstr "不套用修補檔，而是檢視修補檔是否可應用" +msgstr "不套用修補檔，而是檢視修補檔是否可套用" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" -msgstr "如果一個修補檔不能應用則嘗試三方合併" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 +#: builtin/rebase.c:1347 msgid "action" msgstr "動作" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中" +msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" -msgstr "允許重疊的修補檔片段" +msgstr "允許重疊的修補檔區塊" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "詳細輸出" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" -msgstr "不信任修補檔片段的標頭訊息中的行號" +msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "根目錄" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" @@ -1752,7 +1503,7 @@ msgstr "路徑不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" @@ -1780,141 +1531,142 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本庫> [--exec <命令>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "不能讀取 %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "不能讀取 '%s'" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "無此引用：%.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "不是一個有效的物件名：%s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "不是一個樹狀物件：%s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "目前工作目錄未被追蹤" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "找不到檔案：%s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "不是一般檔案：%s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "格式" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "歸檔格式" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "前綴" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "檔案" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "將未追蹤檔案加入歸檔" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "歸檔寫入此檔案" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "讀取工作區中的 .gitattributes" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "在標準錯誤上報告歸檔檔案" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "設定壓縮級別" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "列出支援的歸檔格式" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "版本庫" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "指令" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "遠端 git-upload-archive 指令的路徑" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "未知參數 --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "選項 --exec 只能和 --remote 同時使用" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "未知參數 --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "--add-file 和 --remote 選項不能同時使用" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "未知歸檔格式 '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" @@ -1924,12 +1676,12 @@ msgstr "參數不支援此格式 '%s'：-%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一個有效的屬性名" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -2011,7 +1763,7 @@ msgstr "二分搜尋中：合併基礎必須是經過測試的\n" msgid "a %s revision is needed" msgstr "需要一個 %s 版本" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" @@ -2054,37 +1806,37 @@ msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "不能將 --contents 和最終的提交物件名共用" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中無此路徑 %1$s" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" @@ -2212,126 +1964,126 @@ msgstr "歧義的物件名：'%s'。" msgid "Not a valid branch point: '%s'." msgstr "無效的分支點：'%s'。" -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已經檢出到 '%s'" +msgstr "'%s' 已經簽出到 '%s'" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "無法識別的包雜湊演算法：%s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "未知功能 '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "無法識別的包頭：%s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "不能開啟 '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "版本庫中缺少這些必備的提交：" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "需要版本庫驗證一個包" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "這個包中含有這 %d 個引用：" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "這個包記錄一個完整歷史。" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "這個包需要這 %d 個引用：" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "無法複製 bundle 描述符" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 進程" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects 終止" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 選項排除" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "不支援的包版本 %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "無法寫入 %2$s 演算法的包版本 %1$d" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "無法識別的參數：%s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "不能建立空包。" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "不能建立 '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack 終止" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "終止區塊 id 出現的時間早於預期" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "找到重複的區塊 ID %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "最終區塊有非零 ID %<PRIx32>" @@ -2341,252 +2093,250 @@ msgstr "最終區塊有非零 ID %<PRIx32>" msgid "invalid color value: %.*s" msgstr "無效的顏色值：%.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "無效的雜湊版本" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交圖形簽名 %X 和簽名 %X 不符合" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交圖形版本 %X 和版本 %X 不符合" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "commit-graph 檔案不夠放置 %u 個區塊" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "提交圖形沒有基礎圖形區塊" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "提交圖形鏈不符合" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖形檔案" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖形可能已損壞" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "無法找到提交 %s" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" -msgstr "" +msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "正在擴展提交圖中的可以取得提交" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交圖中的提交標記" -#: commit-graph.c:1414 -#, fuzzy -#| msgid "Computing commit graph generation numbers" +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" -msgstr "正在計算提交圖世代數字" +msgstr "正在計算提交圖拓樸級別" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "正在計算提交圖世代數字" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "正在計算提交變更路徑的布隆過濾器" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "正在收集引用提交" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 個包中尋找提交圖的提交" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "新增包 %s 發生錯誤" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "為 %s 開啟索引發生錯誤" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包物件中尋找提交圖的提交" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "正在尋找提交圖中額外的邊" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "無法建立暫時的圖形層" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "無法調整「%s」的共用權限" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步寫出提交圖" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "無法開啟提交圖形鏈檔案" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "無法重新命名基礎提交圖形檔案" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "無法重新命名暫時提交圖形檔案" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "正在掃描合併提交" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "正在合併提交圖形" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。" +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:2440 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:2450 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2467 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2485 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2500 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2507 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" -#: commit-graph.c:2517 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2526 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2540 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2545 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" -#: commit-graph.c:2549 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" -#: commit-graph.c:2566 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" -#: commit-graph.c:2572 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2616,27 +2366,27 @@ msgstr "" "設定 \"git config advice.graftFileDeprecated false\"\n" "可關閉本消息" -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 沒有 GPG 簽名。" -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" -#: commit.c:1487 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2703,7 +2453,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s" msgid "key does not contain variable name: %s" msgstr "鍵名沒有包含變數名：%s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "無效鍵名：%s" @@ -2820,178 +2570,178 @@ msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "「%2$s」的「%1$s」布林設定值無效" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "無法擴展使用者目錄：'%s'" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "縮寫長度超出範圍：%d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "錯誤的 zlib 壓縮級別 %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar 應該是一個字元" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "無效的物件建立模式：%s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式錯誤" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式錯誤：%s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "無法從資料物件 '%s' 載入設定" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 沒有指向一個資料物件" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析設定物件 '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失敗" -#: config.c:1927 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2290 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2464 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2509 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2555 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2557 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2641 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2673 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2702 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2954 config.c:3280 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2965 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:3002 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:3027 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:3040 config.c:3293 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:3051 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "不能 mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "無法 mmap '%s'%s" -#: config.c:3060 config.c:3298 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:3145 config.c:3395 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:3179 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3271 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3438 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -3167,7 +2917,7 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在檢查連通性" @@ -3183,17 +2933,17 @@ msgstr "寫入 rev-list 失敗" msgid "failed to close rev-list's stdin" msgstr "關閉 rev-list 的標準輸入失敗" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" -msgstr "非法的 crlf 動作 %d" +msgstr "非法的 crlf_action %d" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "%s 中的 CRLF 將被 LF 取代" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3202,12 +2952,12 @@ msgstr "" "%s 中的 CRLF 將被 LF 取代。\n" "在工作區中該檔案仍保持原有的換行符號" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "檔案 %s 中的 LF 將被 CRLF 取代" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3216,24 +2966,24 @@ msgstr "" "%s 中的 LF 將被 CRLF 取代。\n" "在工作區中該檔案仍保持原有的換行符號" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3242,66 +2992,66 @@ msgstr "" "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" "字節序）作為工作區編碼。" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以執行外部過濾器 '%s'" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能將輸入傳遞給外部過濾器 '%s'" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "外部過濾器 '%s' 失敗碼 %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "從外部過濾器 '%s' 讀取失敗" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "外部過濾器 '%s' 失敗" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "意外的過濾類型" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "外部過濾器的路徑名太長" -#: convert.c:940 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" -#: convert.c:1240 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c:1428 convert.c:1462 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" -#: convert.c:1508 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 過濾器 %s 失敗" @@ -3309,7 +3059,7 @@ msgstr "%s：smudge 過濾器 %s 失敗" #: credential.c:96 #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "跳過鍵的憑證查詢：credential.%s" +msgstr "略過鍵的憑證查詢：credential.%s" #: credential.c:112 msgid "refusing to work with credential missing host field" @@ -3422,31 +3172,31 @@ msgstr "已標記 %d 個資料島，結束。\n" msgid "unknown value for --diff-merges: %s" msgstr "--diff-merges 的值無效：%s" -#: diff-lib.c:534 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" -msgstr "—merge-base 跟範圍無法搭配運作" +msgstr "--merge-base 跟範圍無法搭配運作" -#: diff-lib.c:536 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base 只能跟提交搭配才能運作" -#: diff-lib.c:553 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "不能取得 HEAD" -#: diff-lib.c:560 +#: diff-lib.c:583 msgid "no merge base found" msgstr "找不到合併基底" -#: diff-lib.c:562 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "找到多個合併基底" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<選項>] <路徑> <路徑>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3469,8 +3219,8 @@ msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " -"'plain'" +"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" +"zebra'、'plain'" #: diff.c:325 #, c-format @@ -3501,35 +3251,47 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4276 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4628 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4631 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4710 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S" + +#: diff.c:4643 +msgid "" +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow 明確要求只跟一個路徑規格" -#: diff.c:4758 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" -#: diff.c:4795 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3538,200 +3300,200 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4880 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4904 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4918 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4968 diff.c:4974 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4986 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:5007 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:5026 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c:5066 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5226 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "傳入 -I 的正規表示式無效：「%s」" -#: diff.c:5275 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5331 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5367 +#: diff.c:5379 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5369 diff.c:5375 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5383 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5386 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5390 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5394 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5397 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5399 diff.c:5407 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5400 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5404 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5408 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5412 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5415 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5418 +#: diff.c:5430 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5421 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5423 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5424 +#: diff.c:5436 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<寬度>" -#: diff.c:5427 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5430 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5433 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5435 +#: diff.c:5447 msgid "<count>" msgstr "<次數>" -#: diff.c:5436 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5439 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5442 +#: diff.c:5454 msgid "output a binary diff that can be applied" -msgstr "輸出一個可以應用的二進位差異" +msgstr "輸出一個可以套用的二進位差異" -#: diff.c:5445 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5447 +#: diff.c:5459 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5448 +#: diff.c:5460 msgid "<kind>" msgstr "<類型>" -#: diff.c:5449 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5452 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3739,311 +3501,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5456 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的源前綴取代 \"a/\"" -#: diff.c:5459 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目標前綴取代 \"b/\"" -#: diff.c:5462 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5465 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "不顯示任何源和目標前綴" -#: diff.c:5468 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<字元>" -#: diff.c:5473 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5478 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5483 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5486 +#: diff.c:5498 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5487 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5492 +#: diff.c:5504 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5496 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "省略刪除變更的差異輸出" -#: diff.c:5499 +#: diff.c:5511 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5503 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現複製的源" -#: diff.c:5505 +#: diff.c:5517 msgid "disable rename detection" msgstr "停用重新命名偵測" -#: diff.c:5508 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的源" -#: diff.c:5510 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5513 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5515 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5517 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5520 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5523 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5526 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5529 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5532 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<正則>" -#: diff.c:5535 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "忽略整行符合 <regex> 的變更" -#: diff.c:5538 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5541 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5545 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5547 +#: diff.c:5559 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5548 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5550 +#: diff.c:5562 msgid "<text>" msgstr "<文字>" -#: diff.c:5551 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<模式>" -#: diff.c:5554 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5557 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "使用 <正規表示式> 確定何為一個詞" -#: diff.c:5560 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5563 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5566 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5569 +#: diff.c:5581 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5571 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5575 +#: diff.c:5587 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5577 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5579 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5581 +#: diff.c:5593 msgid "disable all output of the program" msgstr "停用本程式的所有輸出" -#: diff.c:5583 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "允許執行一個外部的差異協助工具" -#: diff.c:5585 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5587 +#: diff.c:5599 msgid "<when>" msgstr "<何時>" -#: diff.c:5588 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5591 +#: diff.c:5603 msgid "<format>" msgstr "<格式>" -#: diff.c:5592 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5596 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5599 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5601 +#: diff.c:5613 msgid "<string>" msgstr "<字串>" -#: diff.c:5602 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5605 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5608 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5611 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" -#: diff.c:5614 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5615 diff.c:5618 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<路徑>" -#: diff.c:5616 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "先顯示指定路徑的變更" -#: diff.c:5619 +#: diff.c:5631 msgid "skip the output to the specified path" -msgstr "" +msgstr "略過輸出至指定路徑" -#: diff.c:5621 +#: diff.c:5633 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5622 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5624 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5637 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5627 +#: diff.c:5639 msgid "<file>" msgstr "<檔案>" -#: diff.c:5628 +#: diff.c:5640 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6285 -msgid "inexact rename detection was skipped due to too many files." -msgstr "因為檔案太多，略過不嚴格的重新命名檢查。" +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "因為檔案太多，已略過詳細重新命名偵測。" -#: diff.c:6288 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6291 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4054,7 +3816,7 @@ msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令 msgid "failed to read orderfile '%s'" msgstr "讀取排序檔案 '%s' 失敗" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "正在進行非精確的重新命名偵測" @@ -4063,59 +3825,59 @@ msgstr "正在進行非精確的重新命名偵測" msgid "No such path '%s' in the diff" msgstr "diff 中沒有「%s」路徑" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "無法識別樣式：「%s」" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "無法識別反向模式：「%s」" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複" +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "停用 cone 樣式符合模式" -#: dir.c:1198 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2305 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2605 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2729 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c:3534 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3579 dir.c:3584 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3613 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -4125,11 +3887,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的編輯器關閉檔案...%c" -#: entry.c:177 +#: entry.c:176 msgid "Filtering content" msgstr "過濾內容" -#: entry.c:478 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "不能對檔案 '%s' 呼叫 stat" @@ -4139,7 +3901,7 @@ msgstr "不能對檔案 '%s' 呼叫 stat" msgid "bad git namespace path \"%s\"" msgstr "錯誤的 git 名字空間路徑 \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能設定 GIT_DIR 為 '%s'" @@ -4149,249 +3911,257 @@ msgstr "不能設定 GIT_DIR 為 '%s'" msgid "too many args to run %s" msgstr "執行 %s 的參數太多" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：應為 shallow 列表" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "無法寫到遠端" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "無效的 unshallow 訊息：%s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "物件中發生錯誤：%s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "未發現 shallow：%s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "應為 shallow/unshallow，卻得到 %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "無效提交 %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "放棄" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "標記 %s 為完成" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "已經有 %s（%s）" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：無法衍生 sideband 多路輸出" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "協定錯誤：壞的包頭" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：無法 fork %s 處理程序" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack：無效的 index-pack 輸出" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s 失敗" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "sideband 多路輸出發生錯誤" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "伺服器版本 %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "伺服器支援 %s" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" -msgstr "伺服器不支援 shalllow 用戶端" +msgstr "伺服器不支援 shallow 用戶端" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "伺服器不支援 --shallow-since" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "伺服器不支援 --shallow-exclude" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "伺服器不支援 --deepen" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "伺服器不支援此版本庫的物件格式" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "沒有共同的提交" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" + +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "算法不一致：用戶端 %s；伺服器 %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "伺服器不支援「%s」算法" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" -msgstr "伺服器不支援 shalllow 請求" +msgstr "伺服器不支援 shallow 請求" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "讀取節標題 '%s' 發生錯誤" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "預期 '%s'，得到 '%s'" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的確認行：'%s'" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "處理 ack 發生錯誤：%d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "預期在 'ready' 之後傳送 packfile" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "在沒有 'ready' 不應該傳送其它小節" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "處理淺複製訊息發生錯誤：%d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "預期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "處理要取得的引用發生錯誤：%d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: 預期要有回應結束封包" -#: fetch-pack.c:1960 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:2010 +#: fetch-pack.c:2065 +msgid "unexpected 'ready' from remote" +msgstr "從遠端收到非預期的 ‘ready’" + +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" @@ -4411,10 +4181,10 @@ msgstr "gpg 無法為資料簽名" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'" +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4422,18 +4192,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:1906 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: grep.c:1934 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -4649,47 +4419,52 @@ msgstr "不允許空的姓名（對於 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中僅包含停用字元：%s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "無效的日期格式：%s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 過濾器支援已被刪除" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' is not a valid object type" +msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "無效的過濾器表達式 '%s'" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "期望在組合後有一些東西：" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多種過濾規格" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "無法升級版本庫格式，以致不支援部分複製" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "不能存取 '%s' 中的稀疏資料物件" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "無法解析 %s 中的稀疏過濾器資料" @@ -4704,7 +4479,7 @@ msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀 msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" -#: list-objects.c:375 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "無法為提交 %s 載入根樹" @@ -4741,32 +4516,41 @@ msgstr "lsrefs.unborn 的值「%s」無效" msgid "expected flush after ls-refs arguments" msgstr "在 ls-refs 引數之後應該有一個 flush 包" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "「%s」動作對「%s」無效" + +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" -msgstr "無法合併子模組 %s （沒有檢出）" +msgstr "無法合併子模組 %s （沒有簽出）" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "無法合併子模組 %s（提交不存在）" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：正在將 %s 子模組快轉到 %s" -#: merge-ort.c:944 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "無法合併 %s 子模組" -#: merge-ort.c:951 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4775,7 +4559,7 @@ msgstr "" "無法合併 %s 子模組，但有找到一個可行的合併方案：\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4791,7 +4575,7 @@ msgstr "" "\n" "以接受此建議。\n" -#: merge-ort.c:968 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4800,21 +4584,21 @@ msgstr "" "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "無法執行內部合併" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "不能新增 %s 至物件庫" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "自動合併 %s" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4823,7 +4607,7 @@ msgstr "" "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" "放在：%s。" -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4832,28 +4616,24 @@ msgstr "" "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" "些路徑放置於此：%s" -#: merge-ort.c:1471 -#, fuzzy, c-format -#| msgid "" -#| "CONFLICT (directory rename split): Unclear where to place %s because " -#| "directory %s was renamed to multiple other directories, with no " -#| "destination getting a majority of the files." +#: merge-ort.c:2087 +#, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " "renamed to multiple other directories, with no destination getting a " "majority of the files." msgstr "" -"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" -"多個其它目錄，沒有目錄包含大部分檔案。" +"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" +"錄，但沒有目的地取得過半檔案。" -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." -msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" +msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4861,7 +4641,7 @@ msgid "" msgstr "" "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4870,7 +4650,7 @@ msgstr "" "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" "其移動到 %5$s。" -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4879,7 +4659,7 @@ msgstr "" "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" "動到 %s。" -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4888,89 +4668,106 @@ msgstr "" "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " "中，建議將其移動到 %5$s。" -#: merge-ort.c:1952 -#, fuzzy, c-format -#| msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +#: merge-ort.c:2569 +#, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " -"%4$s->%5$s" +"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " +"%4$s。" -#: merge-ort.c:2047 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " "conflicts AND collides with another path; this may result in nested conflict " "markers." msgstr "" +"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" +"能會因此出現巢狀衝突標記。" -#: merge-ort.c:2066 merge-ort.c:2090 -#, fuzzy, c-format -#| msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +#: merge-ort.c:2683 merge-ort.c:2707 +#, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" +"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" + +#: merge-ort.c:3182 merge-recursive.c:3008 +#, c-format +msgid "cannot read object %s" +msgstr "不能讀取物件 %s" + +#: merge-ort.c:3185 merge-recursive.c:3011 +#, c-format +msgid "object %s is not a blob" +msgstr "物件 %s 不是一個資料物件" -#: merge-ort.c:2735 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." -msgstr "" +msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" -#: merge-ort.c:2808 +#: merge-ort.c:3689 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" +"別記錄這兩方檔案。" -#: merge-ort.c:2812 -msgid "both" -msgstr "雙方" - -#: merge-ort.c:2812 -msgid "one" -msgstr "一方" +#: merge-ort.c:3696 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" +"分別記錄這兩方檔案。" -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "內容" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "新增/新增" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "子模組" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-ort.c:2938 -#, fuzzy, c-format -#| msgid "" -#| "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s " -#| "left in tree." +#: merge-ort.c:3833 +#, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本被保留。" +"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" +"上。" + +#: merge-ort.c:4120 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "%s, %s, %s 樹的合併資訊收集失敗" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4979,104 +4776,103 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "已經是最新的！" +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 +msgid "Already up to date." +msgstr "已經是最新的。" -#: merge-recursive.c:356 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "（壞提交）\n" -#: merge-recursive.c:379 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" -#: merge-recursive.c:388 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" -#: merge-recursive.c:874 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "建立路徑 '%s'%s 失敗" -#: merge-recursive.c:885 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "刪除 %s 以便為子目錄留出空間\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "：可能是一個目錄/檔案衝突？" -#: merge-recursive.c:908 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能讀取物件 %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 應為資料物件" -#: merge-recursive.c:979 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "開啟 '%s' 失敗：%s" -#: merge-recursive.c:990 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "建立符號連結 '%s' 失敗：%s" -#: merge-recursive.c:995 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何處理 %06o %s '%s'" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模組 %s 快轉到如下提交：" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快轉子模組 %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" -#: merge-recursive.c:1255 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "無法合併子模組 %s（非快轉）" -#: merge-recursive.c:1256 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模組的一個可能的合併方案：\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法合併子模組 %s （發現多個合併）" -#: merge-recursive.c:1402 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" -#: merge-recursive.c:1474 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5085,7 +4881,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1479 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5094,7 +4890,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1486 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5103,7 +4899,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1491 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5112,41 +4908,41 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1526 +#: merge-recursive.c:1544 msgid "rename" msgstr "重新命名" -#: merge-recursive.c:1526 +#: merge-recursive.c:1544 msgid "renamed" msgstr "重新命名" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒絕遺失髒檔案 '%s'" -#: merge-recursive.c:1587 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" -#: merge-recursive.c:1645 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" -#: merge-recursive.c:1681 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5155,18 +4951,18 @@ msgstr "" "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " （留下未解決）" -#: merge-recursive.c:1805 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " "%4$s->%5$s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5176,7 +4972,7 @@ msgstr "" "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" "多個其它目錄，沒有目錄包含大部分檔案。" -#: merge-recursive.c:2202 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5185,88 +4981,78 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" "命名目錄 %4$s->%5$s" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "不能讀取物件 %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "物件 %s 不是一個資料物件" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3075 msgid "modify" msgstr "修改" -#: merge-recursive.c:3040 +#: merge-recursive.c:3075 msgid "modified" msgstr "修改" -#: merge-recursive.c:3079 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3132 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 為名新增" -#: merge-recursive.c:3339 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "刪除 %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "檔案/目錄" -#: merge-recursive.c:3367 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "目錄/檔案" -#: merge-recursive.c:3374 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" -#: merge-recursive.c:3383 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "新增 %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3539 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3552 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" -#: merge-recursive.c:3602 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3758 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -5274,181 +5060,206 @@ msgstr "不能寫入索引。" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" -#: midx.c:62 -#, fuzzy -#| msgid "multi-pack-index version %d not recognized" +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "multi-pack-index 版本 %d 不能被識別" +msgstr "多包索引的物件 ID fanout 大小錯誤" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引檔案 %s 太小" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被識別" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名塊" +msgstr "多包索引缺少必需的包名區塊" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的物件 ID 扇出塊" +msgstr "多包索引缺少必需的物件 ID fanout 區塊" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的物件 ID 查詢塊" +msgstr "多包索引缺少必需的物件 ID 查詢區塊" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的物件位移塊" +msgstr "多包索引缺少必需的物件位移區塊" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名無序：'%s' 在 '%s' 之前" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "錯的 pack-int-id：%u（共有 %u 個包）" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引儲存一個64位位移，但是 off_t 太小" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "新增 packfile '%s' 失敗" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "開啟包索引 '%s' 失敗" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1533 +msgid "cannot store reverse index file" +msgstr "無法儲存倒排索引檔案" + +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略現有的多包索引：總和檢查碼不符" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "正在新增 packfile 至多包索引" -#: midx.c:855 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:904 +#: midx.c:1034 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "未知偏好包：「%s」" + +#: midx.c:1039 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "偏好包「%s」已經過期" + +#: midx.c:1055 msgid "no pack files to index." msgstr "沒有要索引的 pack 檔案。" -#: midx.c:965 +#: midx.c:1135 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "刪除 %s 失敗" + +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1021 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "有 multi-pack-index 檔案，但無法解析" -#: midx.c:1029 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "總和檢查碼不正確" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c:1044 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1049 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx 沒有 oid" -#: midx.c:1058 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1067 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1087 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "透過 packfile 為物件排序" -#: midx.c:1094 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "正在驗證物件位移" -#: midx.c:1110 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1116 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1125 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1150 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "正在計算引用物件" -#: midx.c:1160 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有參考的 packfile" -#: midx.c:1351 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1371 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能建立 lazy_dir 執行緒：%s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能建立 lazy_name 執行緒：%s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lasy_name 執行緒：%s" +msgstr "不能加入 lazy_name 執行緒：%s" #: notes-merge.c:277 #, c-format @@ -5489,270 +5300,271 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" msgid "Bad %s value: '%s'" msgstr "壞的 %s 值：'%s'" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "無法規範化備用物件路徑：%s" -#: object-file.c:603 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" -#: object-file.c:610 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "無法規範化物件目錄: %s" -#: object-file.c:653 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" -#: object-file.c:671 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "無法讀取替代檔案" -#: object-file.c:678 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" -#: object-file.c:713 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "路徑 '%s' 不存在" -#: object-file.c:734 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。" +msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。" -#: object-file.c:740 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "參考版本庫 '%s' 不是一個本機版本庫。" -#: object-file.c:746 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "參考版本庫 '%s' 是一個淺複製" -#: object-file.c:754 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "參考版本庫 '%s' 已被移植" -#: object-file.c:814 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析備用引用時無效的行：%s" -#: object-file.c:964 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" -#: object-file.c:985 -msgid "mmap failed" -msgstr "mmap 失敗" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失敗%s" -#: object-file.c:1149 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: object-file.c:1328 +#: object-file.c:1397 msgid "invalid object type" msgstr "無效的物件類型" -#: object-file.c:1412 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" -#: object-file.c:1415 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: object-file.c:1421 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" -#: object-file.c:1424 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: object-file.c:1651 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: object-file.c:1655 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1659 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: object-file.c:1663 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: object-file.c:1768 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: object-file.c:1775 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: object-file.c:1782 +#: object-file.c:1848 msgid "file write error" msgstr "檔案寫錯誤" -#: object-file.c:1802 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: object-file.c:1867 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: object-file.c:1869 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: object-file.c:1893 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: object-file.c:1899 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: object-file.c:1903 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: object-file.c:1907 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件源資料搞糊塗了" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: object-file.c:1994 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: object-file.c:2045 +#: object-file.c:2111 msgid "corrupt commit" msgstr "損壞的提交" -#: object-file.c:2053 +#: object-file.c:2119 msgid "corrupt tag" msgstr "損壞的標籤" -#: object-file.c:2153 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: object-file.c:2156 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: object-file.c:2245 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: object-file.c:2269 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: object-file.c:2271 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能開啟 %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: object-file.c:2512 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2517 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: object-file.c:2523 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: object-file.c:2534 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "無法解壓縮 %s 的內容" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "短物件 ID %s 存在歧義" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "候選者有：" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5774,22 +5586,22 @@ msgstr "" "請檢查這些引用，並視需要刪除。執行\n" "「git config advice.objectNameWarning false」命令以關閉本訊息通知" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' 的日誌只能回到 %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日誌只有 %d 個項目" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5798,12 +5610,12 @@ msgstr "" "'%s' 路徑存在，但不是 '%s'\n" "提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "'%s' 路徑不存在於 '%.*s'" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5812,7 +5624,7 @@ msgstr "" "'%s' 路徑在索引，但不在 %d 暫存區\n" "提示：你在說 ':%d:%s' 嗎？" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5821,21 +5633,21 @@ msgstr "" "'%s' 路徑在索引，但不是 '%s'\n" "提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "磁碟上存在 '%s' 路徑，但不在索引中" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "相對路徑與法不能用在工作區外" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "'%.*s' 物件名稱無效。" @@ -5850,71 +5662,71 @@ msgstr "無效的物件類型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "物件 %s 是一個 %s，不是一個 %s" -#: object.c:233 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "物件 %s 有未知的類型 id %d" -#: object.c:246 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析物件：%s" -#: object.c:266 object.c:278 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "無法取得 %s 的磁碟用量" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "%s 倒排索引檔案過小" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "%s 倒排索引檔案損壞" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "%s 倒排索引檔案有未知簽章" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "無法同時寫入和驗證倒排索引" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "無法 stat：%s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "無法讓 %s 能夠寫入" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "無法寫入「%s」promisor 檔案" @@ -5923,6 +5735,11 @@ msgstr "無法寫入「%s」promisor 檔案" msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "包檔案 %s 無法映射%s" + #: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" @@ -5993,31 +5810,31 @@ msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有兩個短線）嗎？" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "--%s 的別名" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "未知選項 `%s'" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "未知開關 `%c'" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字串中未知的非 ascii 字元選項：`%s'" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -6025,18 +5842,18 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " 或：%s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-數字" @@ -6045,78 +5862,78 @@ msgstr "-數字" msgid "Could not make %s writable by group" msgstr "不能設定 %s 為組可寫" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "只允許一個 'attr:' 規格。" -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "屬性規格不能為空" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "無效的屬性名 %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路徑規格包含無效的神奇前綴" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不相容" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助記符：'%c'）" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路徑規格 '%s' 位於符號連結中" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "某行不應該被括號括住：%s" @@ -6130,14 +5947,14 @@ msgid "unable to write delim packet" msgstr "無法寫 delim 包" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "無法寫入無狀態的分隔符號封包" +msgid "unable to write response end packet" +msgstr "無法寫入回應結尾封包" #: pkt-line.c:113 msgid "flush packet write failed" msgstr "flush 包寫錯誤" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "協定錯誤：不可能的長行" @@ -6145,33 +5962,34 @@ msgstr "協定錯誤：不可能的長行" msgid "packet write with format failed" msgstr "格式化包寫入錯誤" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "寫封包失敗：資料超過了包的最大長度" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "封包寫入失敗" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "封包寫入失敗：%s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "讀取錯誤" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "遠端意外掛斷了" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "協定錯誤：錯誤的行長度字串：%.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "協定錯誤：錯誤的行長度 %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "遠端錯誤：%s" @@ -6185,27 +6003,31 @@ msgstr "正在重新整理索引" msgid "unable to create threaded lstat: %s" msgstr "無法建立執行緒 lstat：%s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: 無法 fork fetch 子處理程序" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: 無法寫入 fetch 子處理程序" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 遠端名稱不能以 '/' 開始：%s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info：引數後預期要有 flush" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "正在刪除重複物件" @@ -6218,7 +6040,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6235,63 +6057,63 @@ msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s msgid "could not parse git header '%.*s'" msgstr "無法解析 git 頭 '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "生成 diff 失敗" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only 和 --right-only 互斥" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日誌" -#: read-cache.c:682 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" -#: read-cache.c:698 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在物件資料庫中建立空的資料物件" -#: read-cache.c:720 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" -#: read-cache.c:725 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有檢出一個提交" +msgstr "'%s' 沒有簽出一個提交" -#: read-cache.c:777 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "無法索引檔案 '%s'" -#: read-cache.c:796 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "無法在索引中新增 '%s'" -#: read-cache.c:807 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1318 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1532 +#: read-cache.c:1573 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1657 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6300,7 +6122,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1667 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6309,140 +6131,144 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1723 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1735 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1765 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1767 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1804 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1820 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1877 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1880 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1883 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2133 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2146 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2179 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2183 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2187 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2191 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s：無法對索引檔案執行 map 動作" +msgid "%s: unable to map index file%s" +msgstr "%s：無法 map 索引檔案%s" -#: read-cache.c:2233 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2260 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2292 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2339 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3075 +msgid "failed to convert to a sparse-index" +msgstr "無法轉換成稀疏索引" + +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3151 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3163 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3188 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3337 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -6470,7 +6296,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -6479,36 +6308,38 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" -"指令:\n" +"指令：\n" "p, pick <提交> = 使用提交\n" -"r, reword <提交> = 使用提交，但修改提交說明\n" -"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n" -"s, squash <提交> = 使用提交，但融合到前一個提交\n" -"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n" -"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n" -"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n" -"d, drop <提交> = 刪除提交\n" -"l, label <label> = 為目前 HEAD 打上標記\n" -"t, reset <label> = 重設 HEAD 到該標記\n" +"r, reword <提交> = 使用提交，但編輯提交說明\n" +"e, edit <提交> = 使用提交，但不直接修補 (amend) \n" +"s, squash <提交> = 使用提交，但融合至上個提交\n" +"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n" +" 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n" +" 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n" +"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n" +"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n" +"d, drop <提交> = 移除提交\n" +"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n" +"t, reset <標籤> = 重設 HEAD 到指定標籤\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" ". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -". -c <提交> 可以編輯提交說明。\n" +". -c <commit> 可以編輯提交說明。\n" "\n" -"可以對這些行重新排序，將從上至下執行。\n" +"可以對這些行重新排序，會從上至下執行。\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "重定基底 %s 到 %s（%d 個提交）" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6516,7 +6347,7 @@ msgstr "" "\n" "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6524,7 +6355,7 @@ msgstr "" "\n" "如果您在這裡刪除一行，對應的提交將會遺失。\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6538,7 +6369,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6548,19 +6379,19 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "不能寫入 '%s'。" -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -6569,7 +6400,7 @@ msgstr "" "警告：一些提交可能被意外捨棄。\n" "捨棄的提交（從新到舊）：\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6585,14 +6416,14 @@ msgstr "" "可選值有：ignore、warn、error。\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "不能讀取 '%s'。" -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "遺失" @@ -6611,247 +6442,247 @@ msgstr "落後 %d" msgid "ahead %d, behind %d" msgstr "領先 %d，落後 %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<顏色>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "無法識別的顏色：%%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整數值 refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整數值 refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "無法識別的 %%(%s) 參數：%s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不帶參數" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "無法識別的 %%(objectsize) 參數：%s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不帶參數" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不帶參數" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "無法識別的 %%(subject) 引數：%s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "預期是 %%(trailers:key=<value>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 參數：%s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一個正數 contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "無法識別的 %%(contents) 參數：%s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "無法識別的 email 選項：%s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<寬度>,<位置>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "無法識別的位置：%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "無法識別的寬度：%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "無法識別的 %%(align) 參數：%s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一個正數的寬度" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "無法識別的 %%(if) 參數：%s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "格式錯誤的欄位名：%.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "未知的欄位名：%.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" -#: ref-filter.c:806 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" -#: ref-filter.c:808 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:810 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之後" -#: ref-filter.c:838 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" -#: ref-filter.c:840 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" -#: ref-filter.c:842 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:857 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" -#: ref-filter.c:914 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "錯誤的格式化字串 %s" -#: ref-filter.c:1555 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "（無分支，重定 %s 的基底）" -#: ref-filter.c:1558 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "（無分支，重定 %s 分離開頭指標的基底）" -#: ref-filter.c:1561 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（無分支，二分搜尋從 %s 開始）" -#: ref-filter.c:1565 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "（開頭指標分離於 %s）" -#: ref-filter.c:1568 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "（開頭指標分離自 %s）" -#: ref-filter.c:1571 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "（無分支）" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "缺少 %2$s 的物件 %1$s" -#: ref-filter.c:1613 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" -#: ref-filter.c:1996 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "格式錯誤的物件 '%s'" -#: ref-filter.c:2085 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略帶有錯誤名稱 %s 的引用" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略損壞的引用 %s" -#: ref-filter.c:2430 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2529 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "格式錯誤的物件名 %s" -#: ref-filter.c:2534 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "選項 `%s' 必須指向一個提交" @@ -6879,10 +6710,10 @@ msgstr "" "如果要設定所有新版本庫要使用的初始分支名稱，\n" "請呼叫（會隱藏這個警告）：\n" "\n" -"\tgit config —global init.defaultBranch <name>\n" +"\tgit config --global init.defaultBranch <name>\n" "\n" -"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n" -"‘development’。剛建立的分支可以用這個命令重新命名：\n" +"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n" +"“development”。剛建立的分支可以用這個命令重新命名：\n" "\n" "\tgit branch -m <name>\n" @@ -7260,7 +7091,7 @@ msgstr "重新整理 '%s' 失敗" #: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" -msgstr "不能解析 '%s' 中的衝突塊" +msgstr "不能解析 '%s' 中的衝突區塊" #: rerere.c:668 #, c-format @@ -7297,8 +7128,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -7336,29 +7167,29 @@ msgstr "不能開啟 rr-cache 目錄" msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" -#: revision.c:2338 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> 已不受支援" -#: revision.c:2668 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2671 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2877 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "不能開啟 /dev/null" @@ -7367,7 +7198,7 @@ msgstr "不能開啟 /dev/null" msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1338 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7376,79 +7207,87 @@ msgstr "" "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" "設定 `git config advice.ignoredHook false` 來關閉這條警告。" -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "讀取遠端解包狀態時收到意外的 flush 包" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析遠端解包狀態：%s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "遠端解包失敗：%s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "為推送證書籤名失敗" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack：無法 fork 一個 fetch 子處理程序" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "push 協商失敗。繼續使用 push 處理" + +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支援此版本庫的雜湊算法" -#: send-pack.c:476 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "接收端不支援簽名推送" +msgstr "接收端不支援 --signed 推送" -#: send-pack.c:478 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" -msgstr "未傳送推送證書，因為接收端不支援簽名推送" +msgstr "未傳送推送證書，因為接收端不支援 --signed 推送" -#: send-pack.c:490 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "接收端不支援原子推送" +msgstr "接收端不支援 --atomic 推送" -#: send-pack.c:495 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" -msgstr "無效的提交訊息清理模式 '%s'" +msgstr "無效的提交說明清理模式 '%s'" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "復原" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "摘取" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "rebase" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "未知動作：%d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7456,7 +7295,7 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "指令標記修正後的檔案" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -7465,43 +7304,43 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "對修正後的檔案做標記，然後用 'git commit' 提交" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本機修改將被%s覆蓋。" -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或儲藏後再繼續。" -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s：快轉" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "無效的清理模式 %s" @@ -7509,65 +7348,65 @@ msgstr "無效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：無法寫入新索引檔案" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "不能更新快取樹" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中沒有 key" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已經給出 'GIT_AUTHOR_NAME'" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已經給出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已經給出 'GIT_AUTHOR_DATE'" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "未知變數 '%s'" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7596,11 +7435,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 掛鉤失敗" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7624,7 +7463,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7647,339 +7486,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "無法找到新建立的提交" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "不能解析新建立的提交" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "建立提交後，不能解析 HEAD" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "分離 HEAD" # 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "無效的作者身分 '%s'" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "未知指令：%d" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "這是第一個提交說明：" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "這是提交說明 #%d：" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "略過第 1 個提交說明：" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "略過第 %d 個提交說明：" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." -msgstr "這是一個 %d 個提交的組合。" +msgstr "這是整合 %d 個提交的集合提交。" -#: sequencer.c:1761 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "不能寫 '%s'" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:1765 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" msgstr "不能讀取 HEAD 的提交說明" -#: sequencer.c:1771 -#, c-format -msgid "cannot write '%s'" -msgstr "不能寫 '%s'" - -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "這是第一個提交說明：" - -#: sequencer.c:1786 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" msgstr "不能讀取 %s 的提交說明" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" -msgstr "這是提交說明 #%d：" - -#: sequencer.c:1799 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "提交說明 #%d 將被跳過：" - -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "您的索引檔案未完成合併。" -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "不能修復根提交" -#: sequencer.c:1913 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 沒有第 %d 個父提交" -#: sequencer.c:1935 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交說明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能將 '%s' 重新命名為 '%s'" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "不能還原 %s... %s" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" -msgstr "不能應用 %s... %s" +msgstr "不能套用 %s... %s" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：無法讀取索引" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：無法重新整理索引" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "無效行 %d：%.*s" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "沒有父提交的情況下不能 '%s'" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "正在取消一個進行中的揀選" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "正在取消一個進行中的還原" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "請用 'git rebase --edit-todo' 來修改。" -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清單：'%s'" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "沒有解析提交。" -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "不能在還原提交中執行揀選。" -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "不能在揀選中執行還原提交。" -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "一個還原動作已在進行" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "揀選動作已在進行" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能建立序列目錄 '%s'" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "不能讀取 '%s'：%s" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "意外的檔案結束" -#: sequencer.c:2967 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" -#: sequencer.c:2978 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" -#: sequencer.c:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "沒有正在進行的還原" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "沒有正在進行的揀選" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" -msgstr "無法跳過這個提交" +msgstr "無法略過這個提交" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" -msgstr "沒有要跳過的" +msgstr "沒有要略過的" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" @@ -7988,16 +7832,16 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "無法複製 '%s' 至 '%s'" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8016,28 +7860,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" -msgstr "不能應用 %s... %.*s" +msgstr "不能套用 %s... %.*s" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "不能合併 %.*s" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "執行：%s\n" # 譯者：請維持前導空格 -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -8052,11 +7896,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3303 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "並且修改索引和/或工作區\n" -#: sequencer.c:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -8073,90 +7917,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3370 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3424 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3429 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3513 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3546 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3568 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3577 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3589 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3605 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3788 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:3804 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:3878 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "無法 autostash" -#: sequencer.c:3881 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: sequencer.c:3887 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: sequencer.c:3890 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: sequencer.c:3894 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: sequencer.c:3919 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" -msgstr "已應用 autostash。\n" +msgstr "已套用 autostash。\n" -#: sequencer.c:3931 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:3934 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8167,29 +8011,29 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3939 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "因套用自動儲藏而導致衝突。" -#: sequencer.c:3940 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "已有自動儲藏；建立新儲藏項目。" -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:4048 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4050 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4058 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8209,58 +8053,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4104 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在重定基底 (%d/%d)%s" -#: sequencer.c:4149 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4220 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4279 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4284 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4298 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4358 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功重定基底並更新 %s。\n" -#: sequencer.c:4391 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4400 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4402 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4404 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4407 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8269,50 +8113,50 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4498 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4505 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4621 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4625 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4660 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:5137 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:5140 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5418 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" -msgstr "無法跳過不必要的揀選" +msgstr "無法略過不必要的揀選" -#: sequencer.c:5512 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" @@ -8361,92 +8205,94 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "無法使用無效設定來建立工作區" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "發現未知的版本庫擴展：" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "找到未知的儲存庫擴充元件：" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "repo 的版本是 0，但找到只支援 v1 的擴充元件：" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件：" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "開啟 '%s' 發生錯誤" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "檔案太大，無法作為 .git 檔案：'%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "讀取 %s 發生錯誤" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "無效的 gitfile 格式：%s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中沒有路徑：%s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "不是一個 git 版本庫：%s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "取得 '%*s%s%s' 狀態（stat）失敗" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8455,7 +8301,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1362 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8464,75 +8310,88 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1409 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "不能開啟或者複製 /dev/null" -#: setup.c:1424 +#: setup.c:1445 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1429 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid 失敗" +#: sparse-index.c:162 +msgid "attempting to use sparse-index without cone mode" +msgstr "嘗試不在 cone 模式使用稀疏索引" + +#: sparse-index.c:176 +msgid "unable to update cache-tree, staying full" +msgstr "無法更新快取樹，保持完整" + +#: sparse-index.c:263 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u 位元組" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 '%s' 進行寫入" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "無法編輯 '%s'" @@ -8579,70 +8438,70 @@ msgstr "無法移除 %s 的 .gitmodules 條目" msgid "staging updated .gitmodules failed" msgstr "將更新後 .gitmodules 新增暫存區失敗" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" -msgstr "位於未檢出的子模組 '%s'" +msgstr "位於未簽出的子模組 '%s'" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "無效 --ignore-submodules 參數：%s" -#: submodule.c:817 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." -msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。" +msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。" -#: submodule.c:920 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" -#: submodule.c:1005 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" -#: submodule.c:1128 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "處理 '%s' 子模組失敗" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" -#: submodule.c:1168 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送 '%s' 子模組\n" -#: submodule.c:1171 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "無法推送 '%s' 子模組\n" -#: submodule.c:1463 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在抓取 %s%s 子模組\n" -#: submodule.c:1497 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "無法存取子模組 '%s'\n" -#: submodule.c:1652 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8651,77 +8510,77 @@ msgstr "" "抓取子模組時發生錯誤：\n" "%s" -#: submodule.c:1677 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "無法將 '%s' 識別為一個 git 版本庫" -#: submodule.c:1694 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" -#: submodule.c:1735 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" -#: submodule.c:1810 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中啟動 'git status'" -#: submodule.c:1823 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中執行 'git status'" -#: submodule.c:1838 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "無法遞迴子模組路徑 '%s'" -#: submodule.c:1886 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "無法重設子模組的索引" -#: submodule.c:1928 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模組 '%s' 中有髒索引" -#: submodule.c:1980 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2048 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" -#: submodule.c:2069 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2085 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "拒絕移動「%s」至現存 git 目錄" -#: submodule.c:2092 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8732,65 +8591,71 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2220 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2260 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: trailer.c:236 +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" +msgstr "無法 lstat “%s”" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "執行 trailer 指令 '%s' 失敗" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "鍵 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "多於一個 %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "簽名 '%.*s' 的鍵為空" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "不能讀取輸入檔案 '%s'" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "不能自標準輸入讀取" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "不能對 %s 呼叫 stat" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "檔案 %s 不是一個正規檔案" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "檔案 %s 使用者不可寫" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "不能開啟暫存檔" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重新命名暫存檔為 %s" @@ -8837,7 +8702,7 @@ msgstr "不能執行 fast-import" msgid "error while running fast-import" msgstr "執行 fast-import 發生錯誤" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "無法讀取引用 %s" @@ -8855,7 +8720,7 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -8864,68 +8729,72 @@ msgstr "協定不支援該動作" msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:400 +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only 需要 v2 版協定" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "'option' 缺少對應的 'ok/error' 指令" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "預期 ok/error，協助工具說 '%s'" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "協助工具報告 %s 的意外狀態" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "協助工具 %s 不支援 dry-run" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "協助工具 %s 不支援 --signed" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "協助工具 %s 不支援 --signed=if-asked" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "協助工具 %s 不支援 --atomic" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "協助工具 %s 不支援 --%s" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "協助工具 %s 不支援 'push-option'" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支援 push，需要引用表達式" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "協助工具 %s 不支援 'force'" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "無法執行 fast-export" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "執行 fast-export 時發生錯誤" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8934,52 +8803,52 @@ msgstr "" "沒有共同的引用並且也沒有指定，什麼也不會做。\n" "您或許得指定一個分支。\n" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "不支援的物件格式「%s」" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式錯誤的回應：%s" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "讀取（%s）失敗" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "寫（%s）失敗" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "%s 執行緒失敗" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 執行緒等待失敗：%s" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能啟動執行緒來複製資料：%s" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "%s 進程等待失敗" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "%s 進程失敗" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "不能啟動執行緒來複製資料" @@ -8993,49 +8862,53 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" msgid "could not read bundle '%s'" msgstr "無法讀取 bundle '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "傳輸：無效的深度選項 '%s'" -#: transport.c:269 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" -#: transport.c:270 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "服務端選項需要版本 2 協定或更高" -#: transport.c:727 +#: transport.c:403 +msgid "server does not support wait-for-done" +msgstr "伺服器不支援「等待完成」(wait-for-done) 功能" + +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 設定" -#: transport.c:802 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "協定 v2 的支援尚未實現" -#: transport.c:936 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" -#: transport.c:1002 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "傳輸 '%s' 不允許" -#: transport.c:1055 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "不再支援 git-over-rsync" -#: transport.c:1157 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n" -#: transport.c:1161 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9062,11 +8935,11 @@ msgstr "" "以推送至遠端。\n" "\n" -#: transport.c:1169 +#: transport.c:1199 msgid "Aborting." msgstr "正在終止。" -#: transport.c:1316 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" @@ -9086,25 +8959,25 @@ msgstr "樹狀物件條目中空的檔案名" msgid "too-short tree file" msgstr "太短的樹檔案" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -"您對下列檔案的本機修改將被檢出動作覆蓋：\n" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s請在切換分支前提交或儲藏您的修改。" -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"您對下列檔案的本機修改將被檢出動作覆蓋：\n" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9113,7 +8986,7 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" "%%s請在合併前提交或儲藏您的修改。" -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9122,7 +8995,7 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9131,7 +9004,7 @@ msgstr "" "您對下列檔案的本機修改將被 %s 覆蓋：\n" "%%s請在 %s 之前提交或儲藏您的修改。" -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9140,7 +9013,7 @@ msgstr "" "您對下列檔案的本機修改將被 %s 覆蓋：\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9149,25 +9022,25 @@ msgstr "" "更新如下目錄將會遺失其中未追蹤的檔案：\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s請在切換分支之前移動或刪除。" -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9176,7 +9049,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" "%%s請在合併前移動或刪除。" -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9185,7 +9058,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9194,7 +9067,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" "%%s請在 %s 前移動或刪除。" -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9203,27 +9076,27 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s請在切換分支前移動或刪除。" -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9232,7 +9105,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" "%%s請在合併前移動或刪除。" -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9241,7 +9114,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9250,7 +9123,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" "%%s請在 %s 前移動或刪除。" -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9259,12 +9132,12 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "條目 '%s' 和 '%s' 重疊。無法合併。" -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9273,52 +9146,52 @@ msgstr "" "無法更新子模組：\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑不是最新且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑未合併且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑已經存在而因此未更新：\n" +"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "正在終止\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "正在更新檔案" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9327,11 +9200,16 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" -#: unpack-trees.c:1498 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "正在更新索引旗標" -#: upload-pack.c:1543 +#: unpack-trees.c:2718 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "工作區和未追蹤提交有重複項目：%s" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "在 fetch 引數應為一個 flush 包" @@ -9362,105 +9240,105 @@ msgstr "無效的埠號" #: urlmatch.c:371 msgid "invalid '..' path segment" -msgstr "無效的 '..' 路徑片段" +msgstr "無效的 '..' 路徑區塊" #: walker.c:170 msgid "Fetching objects" msgstr "正在抓取物件" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "讀取 '%s' 失敗" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作區的 '%s' 不是版本庫目錄" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "檔案 '%s' 不包含工作區的絕對路徑" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 沒有指回到 '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "不是目錄" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git 不是檔案" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr ".git 檔案損毀" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr ".git 檔案不正確" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "非有效路徑" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "無法定位版本庫；.git 不是檔案" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "無法定位版本庫；.git 檔案未參考版本庫" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "無法定位版本庫；.git 檔案損壞" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "無法讀取 gitdir" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "不正確的 gitdir" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "非有效目錄" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "找不到 gitdir 檔案" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "無法讀取 gitdir 檔案 (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "gitdir 檔案無效" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "gitdir 檔案指向的位置不存在" @@ -9513,11 +9391,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -9623,21 +9501,21 @@ msgstr "修改的內容, " msgid "untracked content, " msgstr "未追蹤的內容, " -#: wt-status.c:905 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的儲藏區目前有 %d 條紀錄" -#: wt-status.c:936 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "子模組已修改但尚未更新：" -#: wt-status.c:938 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "要提交的子模組變更：" -#: wt-status.c:1020 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9645,7 +9523,7 @@ msgstr "" "不要改動或刪除上面的一行。\n" "其下所有內容都將被忽略。" -#: wt-status.c:1112 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9656,278 +9534,282 @@ msgstr "" "花了 %.2f 秒才計算出分支的領先/落後範圍。\n" "為避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1142 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "您有尚未合併的路徑。" # 譯者：請維持前導空格 -#: wt-status.c:1145 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " （解決衝突並執行 \"git commit\"）" # 譯者：請維持前導空格 -#: wt-status.c:1147 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 終止合併）" -#: wt-status.c:1151 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "所有衝突已解決但您仍處於合併中。" # 譯者：請維持前導空格 -#: wt-status.c:1154 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 結束合併）" -#: wt-status.c:1163 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "您正處於 am 動作過程中。" -#: wt-status.c:1166 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "目前的修補檔為空。" # 譯者：請維持前導空格 -#: wt-status.c:1170 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解決衝突，然後執行 \"git am --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1172 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " （使用 \"git am --skip\" 跳過此修補檔）" +msgstr " （使用 \"git am --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1174 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 復原原有分支）" -#: wt-status.c:1307 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 遺失。" -#: wt-status.c:1309 +#: wt-status.c:1362 msgid "No commands done." msgstr "沒有指令被執行。" -#: wt-status.c:1312 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" -#: wt-status.c:1323 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " （更多參見檔案 %s）" -#: wt-status.c:1328 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "未剩下任何指令。" -#: wt-status.c:1331 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）：" # 譯者：請維持前導空格 -#: wt-status.c:1339 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" -#: wt-status.c:1351 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" -#: wt-status.c:1356 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "您在執行重定基底動作。" # 譯者：請維持前導空格 -#: wt-status.c:1369 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1371 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " （使用 \"git rebase --skip\" 跳過此修補檔）" +msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1373 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " （使用 \"git rebase --abort\" 以檢出原有分支）" +msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" # 譯者：請維持前導空格 -#: wt-status.c:1380 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" -#: wt-status.c:1384 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" -#: wt-status.c:1389 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "您在執行重定基底動作時分割提交。" # 譯者：請維持前導空格 -#: wt-status.c:1392 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" -#: wt-status.c:1396 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" -#: wt-status.c:1401 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "您在執行重定基底動作時編輯提交。" # 譯者：請維持前導空格 -#: wt-status.c:1404 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修補目前提交）" # 譯者：請維持前導空格 -#: wt-status.c:1406 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" -#: wt-status.c:1417 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "揀選動作正在進行中。" -#: wt-status.c:1420 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在執行揀選提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1427 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1430 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1433 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1435 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " （使用 \"git cherry-pick --skip\" 跳過此修補檔）" +msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1437 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" -#: wt-status.c:1447 +#: wt-status.c:1500 msgid "Revert currently in progress." -msgstr "還原動作正在行中。" +msgstr "還原動作正在進行中。" -#: wt-status.c:1450 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "您在執行反轉提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1456 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解決衝突並執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1459 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " （執行 \"git revert --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1462 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1464 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " （使用 \"git revert --skip\" 跳過此修補檔）" +msgstr " （使用 \"git revert --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1466 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" -#: wt-status.c:1476 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" -#: wt-status.c:1480 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "您在執行二分搜尋動作。" # 譯者：請維持前導空格 -#: wt-status.c:1483 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " （使用 \"git bisect reset\" 檢出原有分支）" +msgstr " （使用 \"git bisect reset\" 簽出原有分支）" -#: wt-status.c:1494 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "您正在稀疏簽出的工作區中。" + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" -#: wt-status.c:1733 +#: wt-status.c:1794 msgid "On branch " msgstr "位於分支 " -#: wt-status.c:1740 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "互動式重定基底動作正在進行中；至 " -#: wt-status.c:1742 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "重定基底動作正在進行中；至 " -#: wt-status.c:1747 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "開頭指標分離於 " -#: wt-status.c:1749 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "開頭指標分離自 " -#: wt-status.c:1752 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "目前不在任何分支上。" -#: wt-status.c:1769 +#: wt-status.c:1830 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1770 +#: wt-status.c:1831 msgid "No commits yet" msgstr "尚無提交" -#: wt-status.c:1784 +#: wt-status.c:1845 msgid "Untracked files" msgstr "未追蹤的檔案" -#: wt-status.c:1786 +#: wt-status.c:1847 msgid "Ignored files" msgstr "忽略的檔案" -#: wt-status.c:1790 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9937,102 +9819,120 @@ msgstr "" "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" "但您需要小心不要忘了新增新檔案（參見 'git help status'）。" -#: wt-status.c:1796 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "未追蹤的檔案沒有列出%s" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1798 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " （使用 -u 參數顯示未追蹤的檔案）" -#: wt-status.c:1804 +#: wt-status.c:1865 msgid "No changes" msgstr "沒有修改" -#: wt-status.c:1809 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1813 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1817 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1821 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交為空，但是存在尚未追蹤的檔案\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1825 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1832 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1837 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" -#: wt-status.c:1942 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "尚無提交在 " -#: wt-status.c:1946 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1977 +#: wt-status.c:2038 msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "落後 " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "領先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暫存的變更。" -#: wt-status.c:2513 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的變更。" -#: wt-status.c:2515 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/simple-ipc/ipc-unix-socket.c:182 +msgid "could not send IPC command" +msgstr "無法傳送 IPC 命令" + +#: compat/simple-ipc/ipc-unix-socket.c:189 +msgid "could not read IPC response" +msgstr "無法讀取 IPC 回應" + +#: compat/simple-ipc/ipc-unix-socket.c:866 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "無法啟動 accept_thread “%s”" + +#: compat/simple-ipc/ipc-unix-socket.c:878 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "無法啟動「%s」的 worker[0]" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "刪除 '%s' 失敗" @@ -10041,131 +9941,131 @@ msgstr "刪除 '%s' 失敗" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<選項>] [--] <路徑規格>..." -#: builtin/add.c:58 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "無法 chmod %cx ‘%s’" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "意外的差異狀態 %c" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "更新檔案失敗" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "刪除 '%s'\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "無法為寫入開啟 '%s'。" -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" -msgstr "不能應用 '%s'" +msgstr "不能套用 '%s'" -#: builtin/add.c:316 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "測試執行" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" -msgstr "編輯目前差異並應用" +msgstr "編輯目前差異並套用" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:345 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:346 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:349 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:352 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" -msgstr "跳過因發生錯誤不能新增的檔案" +msgstr "略過因發生錯誤不能新增的檔案" -#: builtin/add.c:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "`git stash -p` 的後端" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10194,12 +10094,12 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10209,47 +10109,51 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run 和 --interactive/--patch 不相容" + +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file 與 --edit 不相容" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 選項互斥" -#: builtin/add.c:493 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" -#: builtin/add.c:497 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10259,105 +10163,105 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:436 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:478 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:516 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:542 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:730 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:795 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" -msgstr "一次只能有一個 StGIT 修補檔佇列被應用" +msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: builtin/am.c:843 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:855 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:948 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:958 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1089 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1090 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "如果您想要跳過這一修補檔，則執行 \"%s --skip\"。" +msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1091 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: builtin/am.c:1174 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: builtin/am.c:1202 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "修補檔為空。" -#: builtin/am.c:1267 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1270 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1491 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1510 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10365,24 +10269,24 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1516 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上修補及進行三方合併..." -#: builtin/am.c:1542 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1574 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1648 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "提交內容為：" @@ -10391,39 +10295,39 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1708 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" -msgstr "應用：%.*s" +msgstr "套用：%.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." -msgstr "沒有變更 —— 修補檔已經應用過。" +msgstr "沒有變更——修補檔已經套用過。" -#: builtin/am.c:1771 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1819 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10431,9 +10335,9 @@ msgid "" msgstr "" "沒有變更 —— 您是不是忘了執行 'git add'？\n" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" -"您也許想要跳過這個修補檔。" +"您也許想要略過這個修補檔。" -#: builtin/am.c:1826 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10444,171 +10348,175 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:1985 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2029 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" -#: builtin/am.c:2136 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2178 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "無效的 --show-current-patch 值：%s" -#: builtin/am.c:2182 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" -#: builtin/am.c:2213 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2269 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2222 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2224 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2227 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" -msgstr "在提交訊息結尾加入 Signed-off-by" +msgstr "在提交說明結尾加入 Signed-off-by" -#: builtin/am.c:2230 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2232 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2234 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2236 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2238 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2241 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2244 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2295 +msgid "pass it through git-mailinfo" +msgstr "透過 git-mailinfo 傳遞" + +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2270 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2276 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2278 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2281 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2284 +#: builtin/am.c:2336 msgid "skip the current patch" -msgstr "跳過目前修補檔" +msgstr "略過目前修補檔" -#: builtin/am.c:2287 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c:2290 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" -msgstr "終止修補動作但保持 HEAD 不變。" +msgstr "終止修補動作但保持 HEAD 不變" -#: builtin/am.c:2294 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2299 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2301 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2307 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2325 +#: builtin/am.c:2377 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10616,16 +10524,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2332 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2347 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2371 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10634,11 +10542,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2377 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2387 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -10731,62 +10639,62 @@ msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" msgid "could not write to file '%s'" msgstr "無法寫入 '%s' 檔案" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一個有效的術語" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用內建指令 '%s' 作為術語" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改術語 '%s' 的含義" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "請使用兩個不同的術語" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分搜尋。\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一個有效的提交" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "不能檢出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" +msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "壞的 bisect_write 參數：%s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得版本 '%s' 的物件 ID" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10795,7 +10703,7 @@ msgstr "" "您需要給我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10806,7 +10714,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分搜尋" @@ -10816,22 +10724,22 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10840,52 +10748,52 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "版本遍歷設定失敗\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "無法開啟 '%s' 進行附加" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' 不是一個有效的術語" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" +msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分搜尋" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "您需要執行 \"git bisect start\" 來開始\n" @@ -10894,99 +10802,104 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "您想讓我為您這樣做嗎[Y/n]？ " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" -msgstr "要呼叫 `—bisect-state`，請傳入一個以上的引數" +msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能有一個參數。" -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "<修訂版> 輸入格式錯誤：%s" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:889 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "修訂版輸入有誤（不是提交）：%s" + +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "我們沒有在二分搜尋。" -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%s」？？您在說什麼？" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀取「%s」檔案來重放" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "清除二分搜尋狀態" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "列印二分搜尋術語" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "啟動二分搜尋過程" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "尋找下一個二分搜尋提交" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "標記 ref (或 refs) 的狀態" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "列出迄今的二分搜尋步驟" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "從指定檔案重放二分搜尋過程" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" -msgstr "跳過要檢出的部分提交" +msgstr "略過要簽出的部分提交" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 個引數" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 個引數" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "未提供日誌檔案" @@ -11037,10 +10950,10 @@ msgstr "不將根提交看作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -11062,7 +10975,7 @@ msgstr "顯示成適合機器讀取的格式" #: builtin/blame.c:876 msgid "show porcelain format with per-line commit information" -msgstr "顯示每一列適合機器的提交訊息" +msgstr "顯示每一列適合機器的提交說明" #: builtin/blame.c:877 msgid "use the same output mode as git-annotate (Default: off)" @@ -11088,7 +11001,7 @@ msgstr "顯示作者信箱而非名稱（預設值：off）" msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "版本" @@ -11142,7 +11055,7 @@ msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函 #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" +msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -11243,7 +11156,7 @@ msgstr "無法查詢 HEAD 指向的提交物件" #: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "無法刪除在「%2$s」檢出的「%1$s」分支" +msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" #: builtin/branch.c:259 #, c-format @@ -11265,74 +11178,74 @@ msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" msgid "Deleted branch %s (was %s).\n" msgstr "已刪除分支 %s（曾為 %s）。\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" msgstr "不能解析格式化字串" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被重定基底到 %s" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分搜尋於 %s" -#: builtin/branch.c:511 +#: builtin/branch.c:513 msgid "cannot copy the current branch while not on any." msgstr "無法複製目前分支因為不處於任何分支上。" -#: builtin/branch.c:513 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." msgstr "無法重新命名目前分支因為不處於任何分支上。" -#: builtin/branch.c:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "無效的分支名：'%s'" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "分支重新命名失敗" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" msgstr "分支複製失敗" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已將錯誤命名的分支 '%s' 重新命名" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" -#: builtin/branch.c:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重新命名，但更新設定檔案失敗" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" msgstr "分支已複製，但更新設定檔案失敗" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11343,209 +11256,209 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被過濾。\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" msgstr "通用選項" -#: builtin/branch.c:631 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" -#: builtin/branch.c:632 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "不顯示訊息" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "設定追蹤模式（參見 git-pull(1)）" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "上游" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "改變上游訊息" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "取消上游資訊設定" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" msgstr "使用彩色輸出" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "只列印包含該提交的分支" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" msgstr "只列印不包含該提交的分支" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "具體的 git-branch 動作：" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "列出遠端追蹤及本機分支" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "刪除完全合併的分支" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" msgstr "刪除分支（即使沒有合併）" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "移動/重新命名一個分支，以及它的引用日誌" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "移動/重新命名一個分支，即使目標已存在" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" msgstr "複製一個分支和它的引用日誌" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" msgstr "複製一個分支，即使目標已存在" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "顯示目前分支名" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "建立分支的引用日誌" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "標記分支的描述" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "強制建立、移動/重新命名、刪除" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "只列印已經合併的分支" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" msgstr "只列印尚未合併的分支" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "以列的方式顯示分支" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" msgstr "物件" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "只列印指向該物件的分支" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "排序和過濾屬於大小寫不敏感" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不相容" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "必須提供分支名" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "不能向分離開頭指標提供描述" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" msgstr "不能為一個以上的分支編輯描述" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚無提交。" -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "沒有分支 '%s'。" -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" msgstr "為複製動作提供了太多的分支名" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" msgstr "為重新命名動作提供了太多的參數" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" msgstr "為設定新上游提供了太多的參數" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。" -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" msgstr "沒有此分支 '%s'" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" msgstr "為取消上游設定動作提供了太多的參數" -#: builtin/branch.c:836 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。" -#: builtin/branch.c:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 沒有上游訊息" -#: builtin/branch.c:852 +#: builtin/branch.c:854 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>?" @@ -11553,7 +11466,7 @@ msgstr "" "'git branch' 的 -a 和 -r 選項不帶一個分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11619,38 +11532,38 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "請指定 bugreport 檔案的目的地" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "請指定檔案名稱的 strftime 格式後綴" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "無法建立 '%s' 的前置目錄" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "系統資訊" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "啟用的掛鉤" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "不要在「%s」建立新檔案" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "無法寫入 %s" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "已在「%s」建立新報告。\n" @@ -11671,19 +11584,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <檔案> [<參考名稱>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度表" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" @@ -11695,29 +11608,29 @@ msgstr "指定包格式版本" msgid "Need a repository to create a bundle." msgstr "需要一個版本庫來建立包。" -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "不顯示包 (bundle) 詳細資訊" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "需要一個版本庫來解包。" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11725,7 +11638,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11733,71 +11646,71 @@ msgstr "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "只能指定一個批次處理選項" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<類型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "顯示物件類型" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "顯示物件大小" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "當沒有錯誤時離開並返回零" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "美觀地列印物件的內容" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "對於資料物件，對其內容做文字轉換" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "對於資料物件，對其內容做過濾" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "對於 --textconv/--filters 使用一個特定的路徑" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允許 -s 和 -t 對損壞的物件生效" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "緩衝 --batch 的輸出" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "顯示從標準輸入提供的物件的訊息和內容" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "顯示從標準輸入提供的物件的訊息" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 參數顯示所有物件" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "不要對 --batch-all-objects 的輸出排序" @@ -11825,8 +11738,8 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -11838,27 +11751,27 @@ msgstr "顯示未符合的輸入路徑" msgid "ignore index when checking" msgstr "檢查時忽略索引" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "不能同時指定路徑及 --stdin 參數" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 參數共用才有意義" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "未指定路徑" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "參數 --quiet 只在提供一個路徑名時有效" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "不能同時提供 --quiet 和 --verbose 參數" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 選項只在使用 --verbose 時有效" @@ -11879,6 +11792,23 @@ msgstr "不能解析聯繫位址：%s" msgid "no contacts specified" msgstr "未指定聯繫位址" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<選項>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 +#: builtin/worktree.c:728 +msgid "string" +msgstr "字串" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "在建立檔案時，在前面加上 <字串>" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<選項>] [--] [<檔案>...]" @@ -11887,154 +11817,143 @@ msgstr "git checkout-index [<選項>] [--] [<檔案>...]" msgid "stage should be between 1 and 3 or all" msgstr "索引值應該取值 1 到 3 或者 all" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" -msgstr "檢出索引區的所有檔案" +msgstr "簽出索引區的所有檔案" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "強制覆蓋現有的檔案" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的檔案都沒有警告" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" -msgstr "不檢出新檔案" +msgstr "不簽出新檔案" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "更新索引中檔案的狀態訊息" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "從標準輸入讀取路徑列表" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "字串" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "在建立檔案時，在前面加上 <字串>" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<選項>] <分支>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<選項>] [<分支>] -- <檔案>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<選項>] [<分支>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "路徑 '%s' 沒有我們的版本" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "路徑 '%s' 沒有他們的版本" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路徑 '%s' 沒有全部必需的版本" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路徑 '%s' 沒有必需的版本" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：無法合併" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:396 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:401 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c:408 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同時使用" -#: builtin/checkout.c:451 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:455 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:459 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:718 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:772 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12043,51 +11962,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:915 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:977 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12104,7 +12023,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12125,19 +12044,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12146,7 +12065,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1186 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12157,7 +12076,7 @@ msgid "" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" -"如果您想要檢出一個遠端追蹤分支，例如 'origin'，您可以\n" +"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n" "使用 --track 選項寫出全名：\n" "\n" " git checkout --track origin/<name>\n" @@ -12165,51 +12084,51 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12217,7 +12136,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12225,7 +12144,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12233,7 +12152,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12241,7 +12160,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12249,207 +12168,208 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "您在執行二分搜尋時切換分支" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "風格" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" -msgstr "強制檢出（捨棄本機修改）" +msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" -msgstr "對尚未合併的檔案檢出我們的版本" +msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" -msgstr "對尚未合併的檔案檢出他們的版本" +msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" -msgstr "對路徑不做稀疏檢出的限制" +msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 與 --detach 不相容" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 與 --patch 不相容" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1752 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 和 --merge 不相容。" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" -msgstr "建立並檢出一個新的分支" +msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" -msgstr "建立/重設並檢出一個分支" +msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" -msgstr "要檢出哪一個樹" +msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "使用疊加模式" @@ -12479,17 +12399,12 @@ msgstr "忽略版本庫 %s\n" msgid "Would skip repository %s\n" msgstr "將忽略版本庫 %s\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "刪除 %s 失敗" - #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12502,7 +12417,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12523,33 +12438,33 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "輸入範本以排除條目>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：無法找到和 %s 符合的條目" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "選擇要刪除的條目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "移除 %s [y/N]？ " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12567,65 +12482,65 @@ msgstr "" "help - 顯示本協助\n" "? - 顯示如何在提示符下選擇的協助" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將刪除如下條目：" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "沒有要清理的檔案，離開。" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "不列印刪除檔案的名稱" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "強制" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "互動式清除" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "刪除整個目錄" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "新增 <模式> 到忽略規則" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "也刪除忽略的檔案" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "只刪除忽略的檔案" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同時使用" @@ -12633,162 +12548,167 @@ msgstr "-x 和 -X 不能同時使用" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "不要複製淺版本庫" + +#: builtin/clone.c:98 msgid "don't create a checkout" -msgstr "不建立一個檢出" +msgstr "不建立一個簽出" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "建立一個純版本庫" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "建立一個鏡像版本庫（也是純版本庫）" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "從本機版本庫複製" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "不使用本機硬連結，始終複製" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "設定為共享版本庫" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "路徑規格" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "在複製時初始化子模組" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" -msgstr "並發複製的子模組的數量" +msgstr "並行複製的子模組數" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "參考版本庫" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "名稱" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "檢出 <分支> 而不是遠端 HEAD" +msgstr "簽出 <分支> 而不是遠端 HEAD" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "深度" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "時間" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" -msgstr "從一個特定時間建立一個淺複製" +msgstr "建立從指定時間到現在的淺複製" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "修訂版" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" -msgstr "深化淺複製的歷史，除了特定版本" +msgstr "取得更多淺複製的過去歷史記錄，除了特定版本" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" +msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" -msgstr "任何複製的子模組將使用它們的遠端追蹤分支" +msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏檢出檔案，只包含根目錄中的檔案" +msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12796,191 +12716,195 @@ msgstr "" "無法猜到目錄名。\n" "請在指令列指定一個目錄" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一個目錄" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "建立連結 '%s' 失敗" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "複製檔案至 '%s' 失敗" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "無法在 '%s' 上疊代" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"複製成功，但是檢出失敗。\n" -"您可以透過 'git status' 檢查哪些已被檢出，然後使用指令\n" +"複製成功，但是簽出失敗。\n" +"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "不能發現要複製的遠端分支 %s。" +msgstr "找不到要複製的遠端分支 %s。" -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" -msgstr "無法初始化稀疏檢出" +msgstr "無法初始化稀疏簽出" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "遠端 HEAD 指向一個不存在的引用，無法檢出。\n" +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" -msgstr "不能檢出工作區" +msgstr "不能簽出工作區" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." -msgstr "您必須指定一個版本庫來複製。" +msgstr "您必須指定要複製的版本庫。" -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 選項不相容。" -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 選項不相容。" -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" -msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" +msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。" -#: builtin/clone.c:1215 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" -#: builtin/clone.c:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "源版本庫是淺複製，忽略 --local" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "遠端傳輸回報錯誤" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1326 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." -msgstr "您似乎複製了一個空版本庫。" +msgstr "您複製的版本庫似乎是空的。" #: builtin/column.c:10 msgid "git column [<options>]" @@ -12995,20 +12919,20 @@ msgid "layout to use" msgstr "要使用的配置" #: builtin/column.c:30 -msgid "Maximum width" +msgid "maximum width" msgstr "最大寬度" #: builtin/column.c:31 -msgid "Padding space on left border" +msgid "padding space on left border" msgstr "左邊框的填充空間" #: builtin/column.c:32 -msgid "Padding space on right border" +msgid "padding space on right border" msgstr "右邊框的填充空間" #: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "兩列之間的填充空間" +msgid "padding space between columns" +msgstr "兩直行之間的填充空間" #: builtin/column.c:51 msgid "--command must be the first argument" @@ -13037,7 +12961,7 @@ msgid "could not find object directory matching %s" msgstr "找不到符合 %s 的物件目錄" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "目錄" @@ -13131,7 +13055,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -13159,21 +13083,21 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 +#: builtin/tag.c:456 msgid "message" msgstr "訊息" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" -msgstr "提交訊息" +msgstr "提交說明" #: builtin/commit-tree.c:118 msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -13241,115 +13165,158 @@ msgstr "" "\n" " git cherry-pick --continue\n" "\n" -"來繼續揀選剩餘提交。如果您想跳過此提交，使用：\n" +"來繼續揀選剩餘提交。如果您想略過此提交，使用：\n" "\n" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." msgstr "參數 --include/--only 不跟路徑沒有意義。" -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" msgstr "不能建立暫時索引" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "互動式新增失敗" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" msgstr "無法更新暫時索引" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "不能更新樹的主快取" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" msgstr "無法寫 new_index 檔案" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." msgstr "在合併過程中不能做部分提交。" -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." msgstr "在揀選過程中不能做部分提交。" -#: builtin/commit.c:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "在重定基底過程中不能做部分提交。" -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" msgstr "無法讀取索引" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" msgstr "無法寫暫時索引檔案" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者訊息" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "格式錯誤的 --author 參數" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" msgstr "不能從標準輸入中讀取日誌訊息" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" msgstr "不能讀取日誌檔案 '%s'" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "-m 和 --fixup:%s 不可結合使用" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" msgstr "不能讀取 SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" msgstr "不能讀取 MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:853 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"請輸入描述您變更的提交訊息。\n" +"開頭是「%c」的行皆會忽略。\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"請輸入描述您變更的提交訊息。開頭是「%c」\n" +"的行皆會忽略。提交訊息空白則取消本次提交作業。\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" +"的行，但也可以自己移除掉這些行。\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"請輸入描述您變更的提交訊息。會保留開頭是\n" +"「%c」的行，但也可以自己移除掉這些行。\n" +"提交訊息空白則取消本次提交作業。\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13363,7 +13330,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "後重試。\n" -#: builtin/commit.c:858 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13377,164 +13344,174 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "後重試。\n" -#: builtin/commit.c:868 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" -"說明將會終止提交。\n" - -#: builtin/commit.c:876 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被保留，如果您原意\n" -"也可以刪除它們。一個空的提交說明將會終止提交。\n" - # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:893 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:901 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:908 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:997 +#: builtin/commit.c:1025 +msgid "unable to pass trailers to --trailers" +msgstr "無法將尾部署名傳遞至 --trailers" + +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1069 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1171 +#: builtin/commit.c:1226 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "正在合併中——不能重新輸入。" + +#: builtin/commit.c:1228 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "正在揀選中——不能重新輸入。" + +#: builtin/commit.c:1231 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" + +#: builtin/commit.c:1233 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥" + +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1180 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1185 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1187 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1190 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1200 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1202 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1211 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1229 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1235 +#: builtin/commit.c:1338 +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "未知選項：--fixup=%s:%s" + +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1370 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1374 +#: builtin/commit.c:1491 msgid "version" msgstr "版本" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#: builtin/commit.c:1387 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13542,180 +13519,201 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "何時" -#: builtin/commit.c:1390 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c:1392 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1393 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1395 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1415 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1497 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1498 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1500 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1502 +#: builtin/commit.c:1622 msgid "author" msgstr "作者" -#: builtin/commit.c:1502 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "日期" -#: builtin/commit.c:1503 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "提交" -#: builtin/commit.c:1505 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1506 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" -msgstr "使用 autosquash 格式的提交說明用以修正指定的提交" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1631 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]commit" + +#: builtin/commit.c:1631 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" +msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c:1508 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1509 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "尾部署名" + +#: builtin/commit.c:1634 +msgid "add custom trailer(s)" +msgstr "加入自訂尾部署名" + +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c:1511 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1512 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1514 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1519 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1520 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1521 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1522 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1523 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1524 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1525 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1526 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1539 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1540 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1547 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1549 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1622 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1629 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1801 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "提交說明內文空白，中止提交作業。\n" + +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14054,7 +14052,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "以使用者可讀的格式顯示大小" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14067,11 +14065,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" @@ -14275,7 +14273,7 @@ msgstr "%s...%s: 無合併基底" msgid "Not a git repository" msgstr "不是一個 git 版本庫" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "提供了無效物件 '%s'。" @@ -14295,31 +14293,31 @@ msgstr "無法處理的物件 '%s'。" msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多個合併基底，使用 %s" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "失敗：%d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "無法讀取符號連結 %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "無法讀取符號連結檔案 %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14327,83 +14325,83 @@ msgstr "" "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "兩個檔案都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "暫存檔存在於 '%s'。" -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:696 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:700 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:705 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:706 +#: builtin/difftool.c:709 msgid "tool" msgstr "工具" -#: builtin/difftool.c:707 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:709 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:712 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c:715 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:716 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:731 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:738 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不相容" -#: builtin/difftool.c:741 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:749 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:756 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" @@ -14426,14 +14424,14 @@ msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼" #: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "選項 `--default' 和 `type=bool` 期望一個布林值，不是 `%s`" +msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」" #: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" -msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不是 `%s`" +msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" @@ -14489,9 +14487,9 @@ msgstr "使用 done 功能終止串流" #: builtin/fast-export.c:1221 msgid "skip output of blob data" -msgstr "跳過資料物件資料的輸出" +msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "參照規格" @@ -14581,194 +14579,202 @@ msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "使用原子事務更新參考" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" -msgstr "子模組取得的並發數" +msgstr "並行取得的子模組數量" + +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "修改參考規格 (refspec) 以便將所有參考 (refs) 放置在 refs/prefetch/ 中" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "將取得的參考寫入 FETCH_HEAD 檔案" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" -msgstr "深化淺複製的歷史" +msgstr "取得淺複製的更多過去歷史記錄" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "不取得包檔案，而是輸出交涉的祖先提交" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "抓取後寫入分支圖" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用表達式" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "無法發現遠端 HEAD 引用" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "設定變數 fetch.output 包含無效值 %s" -#: builtin/fetch.c:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "物件 %s 未發現" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[已拒絕]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "目前分支下不能執行取得動作" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14778,7 +14784,7 @@ msgstr "" "要重新啟用，請使用 '--show-forced-updates' 選項或執行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14789,22 +14795,22 @@ msgstr "" "花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" "或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "拒絕 %s 因為淺複製不允許被更新" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "已拒絕 %s，不允許更新淺複製" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14814,57 +14820,57 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒絕取得到非純版本庫的目前分支 %s" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "選項 \"%s\" 為 %s 所忽略\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14872,75 +14878,87 @@ msgstr "" "未發現源分支。\n" "您需要使用 --set-upstream 選項指定一個分支。" -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。" -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2058 +msgid "must supply remote when using --negotiate-only" +msgstr "使用 --negotiate-only 時必須提供遠端" + +#: builtin/fetch.c:2063 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "協定不支援 --negotiate-only，結束。" + +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" -msgstr "只可以將 --filter 用於在 extensions.partialClone 中設定的遠端版本庫" +msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" -msgstr "--stdin 只能在擷取 (fetch) 一個遠端時使用" +msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" @@ -14985,47 +15003,47 @@ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "引用占位符適用於 shells" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "引用占位符適用於 perl" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "引用占位符適用於 python" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符適用於 Tcl" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "只顯示 <n> 個符合的引用" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "遵照格式中的顏色輸出" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "只列印指向提供物件的引用" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "只列印已經合併的引用" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "只列印沒有合併的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "只列印包含該提交的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" @@ -15033,44 +15051,44 @@ msgstr "只列印不包含該提交的引用" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<設定> <命令引數>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "config" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "儲存版本庫路徑清單的設定鍵" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "缺少 --config=<設定>" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c:138 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c:154 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15079,211 +15097,211 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:265 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c:292 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c:312 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c:322 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c:333 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:350 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c:388 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c:407 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c:412 +#: builtin/fsck.c:411 msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c:421 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "已標記 %s %s (%s) 於 %s" -#: builtin/fsck.c:458 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c:483 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c:497 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c:531 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c:538 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c:592 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c:607 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:640 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:655 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:658 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:673 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:691 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:695 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:707 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:712 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:721 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:752 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:758 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:759 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:760 +#: builtin/fsck.c:759 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:761 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:762 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:763 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的頭節點（預設）" -#: builtin/fsck.c:764 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:765 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:768 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:770 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:857 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:868 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" @@ -15302,12 +15320,12 @@ msgstr "對 %s 呼叫 fstat 失敗：%s" msgid "failed to parse '%s' value '%s'" msgstr "無法解析 '%s' 值 '%s'" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "不能讀取 '%s'" @@ -15401,143 +15419,143 @@ msgstr "無法識別的 --schedule 引數 '%s'" msgid "failed to write commit-graph" msgstr "無法寫入提交圖形" -#: builtin/gc.c:914 -msgid "failed to fill remotes" -msgstr "無法填充遠端位置" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" +msgstr "無法預先取得遠端" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "無法啟動 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "無法完成 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "無法寫入多包索引" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失敗" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失敗" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "已存在 '%s' 鎖定檔案，略過維護" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "作業 '%s' 失敗" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 非有效作業" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "frequency" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "依據頻率執行工作" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "作業" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "執行指定作業" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto 和 --schedule=<頻率> 請任選一" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "無法執行 ‘git config’" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "無法啟動載入 %s 服務" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "無法建立暫存 XML 檔案" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "無法啟動 schtasks" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "無法開啟 ‘crontab’ 的標準輸入" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "“crontab” 結束運作" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "其他處理程序正在排定背景維護工作" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "無法將版本庫加至全域設定" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<選項>]" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "無效子命令：%s" @@ -15560,259 +15578,259 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹（%s）" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:737 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:836 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:838 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:840 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:842 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:844 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:847 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:849 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:851 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:853 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:855 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:858 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:860 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:862 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:866 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "使用擴展的 POSIX 正規表示式" -#: builtin/grep.c:869 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正規表示式（預設）" -#: builtin/grep.c:872 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:875 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的正規表示式" -#: builtin/grep.c:878 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:879 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:880 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:881 +#: builtin/grep.c:882 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:883 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:885 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:887 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:890 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:892 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:895 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:897 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:898 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:900 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:902 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:905 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:908 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:910 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:913 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:916 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:918 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:921 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:923 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:925 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:937 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:939 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:942 +#: builtin/grep.c:943 msgid "pager" msgstr "分頁" -#: builtin/grep.c:942 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:946 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c:1012 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1048 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1056 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1086 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c:1090 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c:1130 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1156 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" -#: builtin/grep.c:1159 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked 不能與 --cached 一起使用" -#: builtin/grep.c:1165 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1173 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" @@ -15935,417 +15953,413 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 檢視器。" -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "沒有 man 檢視器處理此請求" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "%s 的物件類型不符合" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "未能取得預期的物件 %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "物件 %s：應為類型 %s，卻是 %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "無法填充 %d 位元組" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "過早的檔案結束符（EOF）" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "輸入上的讀錯誤" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "包超過了最大允許值" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "不能建立 '%s'" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "無法開啟 packfile '%s'" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "包簽名不符合" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支援包版本 %<PRIu32>" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "不能讀 %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" -msgstr "應用 delta 失敗" +msgstr "套用 delta 失敗" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "packfile 名稱「%s」的結尾不是「.%s」" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "無法儲存包檔案" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "無法儲存索引檔案" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "無法儲存倒排索引檔案" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "壞的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現存包檔案 '%s'" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "不能對範本 '%s' 呼叫 stat" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "不能開啟目錄 '%s'" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "不能讀取連結 '%s'" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 建立符號連結" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "忽略範本 %s" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "沒有在 %s 中找到範本" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "沒有從 '%s' 複製範本：%s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "無效的初始分支名稱：'%s'" -#: builtin/init-db.c:367 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" -#: builtin/init-db.c:370 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "不能移動 %s 至 %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "嘗試以不同的雜湊值重新初始化版本庫" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已經存在" -#: builtin/init-db.c:445 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: 忽略 --initial-branch=%s" -#: builtin/init-db.c:476 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:477 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:482 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16353,53 +16367,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " "[<目錄>]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:544 msgid "permissions" msgstr "權限" -#: builtin/init-db.c:558 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c:564 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "雜湊" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c:573 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir 和 --bare 互斥" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c:638 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）" -#: builtin/init-db.c:690 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" -#: builtin/init-db.c:695 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 與純版本庫不相容" @@ -16437,7 +16451,7 @@ msgstr "只輸出尾部署名" #: builtin/interpret-trailers.c:106 msgid "do not apply config rules" -msgstr "不要應用設定規則" +msgstr "不要套用組態設定規則" #: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" @@ -16451,10 +16465,6 @@ msgstr "設定解析選項" msgid "do not treat --- specially" msgstr "不要對 --- 特殊處理" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "尾部署名" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "要新增的尾部署名" @@ -16501,96 +16511,94 @@ msgid "decorate options" msgstr "修飾選項" #: builtin/log.c:190 -#, fuzzy -#| msgid "Process only line range <start>,<end> or function :<funcname>" msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" -msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" +msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" #: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:696 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:841 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:848 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:977 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:994 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1004 +#: builtin/log.c:1009 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1168 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1174 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1261 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1288 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1346 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c:1517 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1527 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16600,394 +16608,398 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1550 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1567 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1577 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1635 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1692 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c:1694 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1738 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1741 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1745 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1747 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1749 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1750 +#: builtin/log.c:1761 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1751 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1753 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1755 +#: builtin/log.c:1765 +msgid "reroll-count" +msgstr "reroll-count" + +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1757 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c:1759 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1762 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1763 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1765 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1768 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1771 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1774 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1776 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1778 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1780 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1782 +#: builtin/log.c:1793 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1783 +#: builtin/log.c:1794 msgid "header" msgstr "header" -#: builtin/log.c:1784 +#: builtin/log.c:1795 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "信件位址" -#: builtin/log.c:1785 +#: builtin/log.c:1796 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1786 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1787 +#: builtin/log.c:1798 msgid "ident" msgstr "標記" -#: builtin/log.c:1788 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1790 +#: builtin/log.c:1801 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1791 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1793 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1796 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1800 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1802 +#: builtin/log.c:1813 msgid "signature" msgstr "簽名" -#: builtin/log.c:1803 +#: builtin/log.c:1814 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1804 +#: builtin/log.c:1815 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1805 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1808 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1809 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1811 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1813 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1816 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1818 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1904 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1919 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1921 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1929 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1931 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1933 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1955 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout、--output 和 --output-directory 互斥" -#: builtin/log.c:2078 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2082 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:2083 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:2089 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:2093 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2101 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2102 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2113 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2149 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2193 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2252 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<選項>] [<檔案>...]" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "用標籤標記檔案的狀態" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小寫字母表示 '假設未改變的' 檔案" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小寫字母表示 'fsmonitor clean' 檔案" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "顯示快取的檔案（預設）" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "顯示已刪除的檔案" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "顯示已修改的檔案" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "顯示其它檔案" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "顯示忽略的檔案" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "顯示暫存區內容的物件名稱" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "顯示檔案系統需要刪除的檔案" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "只顯示「其他」目錄的名稱" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "顯示檔案換行符號格式" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "不顯示空目錄" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "顯示未合併的檔案" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "顯示 resolve-undo 訊息" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "符合排除檔案的模式" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "從 <檔案> 中讀取排除模式" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "從 <檔案> 讀取額外的每個目錄的排除模式" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "新增標準的 git 排除" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "樹或提交" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "顯示除錯資料" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "不顯示重複項目" @@ -17005,7 +17017,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "exec" @@ -17073,6 +17085,55 @@ msgstr "使用檔案的全路徑" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "保留主旨" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "保留主旨中不是 PATCH 的方括號" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "複製 Message-ID 至提交說明末尾" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "重新將中繼資料編碼為 i18n.commitEncoding 的設定值" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "停用中繼資料的字元重新編碼功能" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "編碼" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "重新將中繼資料編碼為這個編碼方式" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "使用剪刀標記" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "<動作>" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "當找到可列印 CR 字元時所要採取的行為" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "在訊息內文中使用標頭" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -17192,14 +17253,6 @@ msgstr "合併 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" @@ -17238,7 +17291,7 @@ msgstr "（和 --stat 同義）" #: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄" +msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄" #: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" @@ -17265,7 +17318,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "策略" @@ -17324,141 +17377,141 @@ msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr " （無可壓縮）" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "已經是最新的。（無需壓縮 (squash)）" -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:598 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:724 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:737 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知選項：-X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:808 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:817 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:823 +#: builtin/merge.c:828 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -"請輸入一個提交訊息以解釋此合併的必要性，尤其是將一個更新後的上游分支\n" +"請輸入一個提交說明以解釋此合併的必要性，尤其是將一個更新後的上游分支\n" "合併到主題分支。\n" "\n" -#: builtin/merge.c:828 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:831 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" -#: builtin/merge.c:884 +#: builtin/merge.c:889 msgid "Empty commit message." -msgstr "空提交訊息。" +msgstr "空提交說明。" -#: builtin/merge.c:899 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:960 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:999 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:1001 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:1003 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:1008 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1065 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1168 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1202 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1312 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1316 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1347 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1351 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1367 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17466,7 +17519,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1374 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17474,96 +17527,88 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1377 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1391 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "您不能將 --squash 和 --no-ff 組合使用。" -#: builtin/merge.c:1393 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "您不能將 --squash 和 --commit 組合使用。" -#: builtin/merge.c:1409 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1426 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1428 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1433 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1435 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1516 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "已經是最新的。" - -#: builtin/merge.c:1535 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "已經是最新的。耶！" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "使用 %s 以準備手動解決。\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "使用 %s 策略，準備自行解決。\n" -#: builtin/merge.c:1728 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -17572,40 +17617,40 @@ msgstr "自動合併進展順利，按要求在提交前停止\n" msgid "git mktag" msgstr "git mktag" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "警告：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "錯誤：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" msgstr "無法讀取有標籤的物件「%s」" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "「%s」已標為「%s」，但卻是「%s」類型" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "標準輸入上的標籤參考的不是有效物件" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "無法寫標籤檔案" @@ -17625,36 +17670,41 @@ msgstr "允許遺失的物件" msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<選項>] (write|verify|expire|repack --batch-size=<大小" -">)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<選項>] write [--preferred-pack=<包>]" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<選項>] verify" + +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<選項>] expire" + +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]" + +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成對 packfile 和包索引的物件目錄" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "偏好包" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "計算多包位圖時要重複使用的包" + +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" -msgstr "太多參數" - -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "--batch-size 選項僅用於 'repack' 子指令" - -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" @@ -17683,7 +17733,7 @@ msgstr "強制移動/重指令，即使目標存在" #: builtin/mv.c:127 msgid "skip move/rename errors" -msgstr "跳過移動/重新命名錯誤" +msgstr "略過移動/重新命名錯誤" #: builtin/mv.c:170 #, c-format @@ -17750,7 +17800,7 @@ msgstr "%s，源=%s，目標=%s" msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" @@ -17939,7 +17989,7 @@ msgstr "不能寫註解物件" msgid "the note contents have been left in %s" msgstr "註解內容被留在 %s 中" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "不能開啟或讀取 '%s'" @@ -17979,6 +18029,13 @@ msgstr "從 '%s' 複製註解到 '%s' 時失敗" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "太多參數" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18158,7 +18215,7 @@ msgstr "" "自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提" "交結果，或者使用指令 'git notes merge --abort' 終止合併。\n" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" @@ -18176,7 +18233,7 @@ msgstr "嘗試刪除不存在的註解不是一個錯誤" msgid "read object names from the standard input" msgstr "從標準輸入讀取物件名稱" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "不刪除，只顯示" @@ -18192,22 +18249,22 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18215,106 +18272,106 @@ msgid "" msgstr "" "write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18323,13 +18380,23 @@ msgstr "" "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " "<uri>' (收到 '%s')" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3199 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "無法取得 %2$s 包中 %1$s 物件的類型" + +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 +#, c-format +msgid "could not find pack '%s'" +msgstr "找不到「%s」包" + +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18338,7 +18405,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18347,234 +18414,246 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "選項 --missing 的值無效" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3955 +msgid "read packs from stdin" +msgstr "從標準輸入中讀取包" + +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "在增量壓縮時參考資料島" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "通訊協定" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:3622 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:3676 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:3686 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:4112 +msgid "cannot use --filter with --stdin-packs" +msgstr "無法將 --filter 及 --stdin-packs 結合使用" + +#: builtin/pack-objects.c:4116 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "無法將內部版本清單與 --stdin-packs 結合使用" + +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18654,11 +18733,11 @@ msgstr "和合併相關的選項" msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允許快轉式" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" @@ -18672,7 +18751,7 @@ msgstr "強制覆蓋本機分支" #: builtin/pull.c:201 msgid "number of submodules pulled in parallel" -msgstr "並發拉取的子模組的數量" +msgstr "並行拉取的子模組數量" #: builtin/pull.c:317 #, c-format @@ -18706,7 +18785,7 @@ msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" -#: builtin/pull.c:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" @@ -18723,7 +18802,7 @@ msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<遠端>" @@ -18731,7 +18810,7 @@ msgstr "<遠端>" msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" @@ -18787,19 +18866,19 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18809,7 +18888,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18826,15 +18905,15 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" @@ -18896,7 +18975,7 @@ msgstr "" "\n" " git push %s HEAD:<遠端分支名字>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18909,12 +18988,17 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "目前分支 %s 有多個上游分支，拒絕推送。" -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18924,12 +19008,7 @@ msgstr "" "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" "而沒有告訴我要推送什麼、更新哪個遠端分支。" -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18940,7 +19019,7 @@ msgstr "" "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:273 +#: builtin/push.c:264 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" @@ -18948,10 +19027,10 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n" -"檢出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" +"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:279 +#: builtin/push.c:270 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" @@ -18964,11 +19043,11 @@ msgstr "" "（如 'git pull ...'）。\n" "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒絕，因為該標籤在遠端已經存在。" -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18977,7 +19056,7 @@ msgstr "" "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" "也不能更新遠端引用讓其指向一個非提交物件。\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -18988,103 +19067,103 @@ msgstr "" "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n" "最後才強制更新。\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "版本庫" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "鏡像所有引用" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "刪除引用" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送標籤（不能使用 --all or --mirror）" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "強制更新" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "要求引用舊的取值為設定值" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "需要將遠端更新整合進本地" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "控制子模組的遞迴推送" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "接收包程式" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "設定 git pull/status 的上游" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "清除本機刪除的引用" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "繞過 pre-push 掛鉤" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "推送缺少但有關的標籤" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "用 GPG 為推送簽名" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "需要遠端支援原子事務" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 與 --all、--mirror 及 --tags 不相容" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19105,27 +19184,27 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不相容" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不相容" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不相容" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" @@ -19141,10 +19220,6 @@ msgstr "git range-diff [<選項>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "建立權重的百分比" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "使用簡單差異顏色" @@ -19246,7 +19321,7 @@ msgstr "不更新索引區和工作區" #: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" -msgstr "跳過應用稀疏檢出過濾器" +msgstr "略過套用稀疏簽出過濾器" #: builtin/read-tree.c:153 msgid "debug unpack-trees" @@ -19278,188 +19353,188 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待辦列表：'%s'" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" msgstr "無法建立暫時的 %s" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" msgstr "無法標記為互動式" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" msgstr "無法生成待辦列表" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<選項>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "保留開頭是空白的提交" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允許提交說明為空" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" msgstr "對合併提交重定基底" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支點" -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" msgstr "簽名提交" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "顯示上游變化的差異統計" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "繼續重定基底" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" -msgstr "跳過提交" +msgstr "略過提交" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" msgstr "重定基底待辦列表" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" msgstr "顯示目前修補檔" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "縮短待辦列表中的提交號" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "擴展待辦列表中的提交號" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "檢查待辦列表" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "在待辦列表中插入 exec 執行指令" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" msgstr "onto" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" msgstr "head 名稱" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" msgstr "重定基底策略" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" msgstr "策略選項" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "切換到" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" -msgstr "要檢出的分支或提交" +msgstr "要簽出的分支或提交" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" msgstr "要執行的指令" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "自動重新安排任何失敗的 `exec`" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "%s 需要合併後端" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" msgstr "無法取得 'onto'：'%s'" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" msgstr "無效的原始 head：'%s'" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" @@ -19474,7 +19549,7 @@ msgid "" msgstr "" "手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n" "衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n" -"\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n" +"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n" "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" #: builtin/rebase.c:896 @@ -19495,14 +19570,14 @@ msgstr "" "\n" "因此 git 無法對其重定基底。" -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -19519,7 +19594,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19532,189 +19607,181 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "exec 指令不能包含換行符號" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "空的 exec 指令" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" msgstr "重定基底到提供的分支而非上游" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合併基礎做為目前基礎" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" msgstr "允許執行 pre-rebase 掛鉤" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "安靜。暗示 --no-stat" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" msgstr "不顯示上游變化的差異統計" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" msgstr "在每個提交結尾加入 Signed-off-by" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" msgstr "使提交日期與製作日期相符合" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "忽略製作日期而使用日前日期" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" msgstr "和 --reset-author-date 同義" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" msgstr "忽略空白字元中的變更" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" msgstr "繼續" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" -msgstr "跳過目前修補檔並繼續" +msgstr "略過目前修補檔並繼續" # 譯者：請維持前導空格 -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" -msgstr "終止並檢出原有分支" +msgstr "終止並簽出原有分支" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "終止但保持 HEAD 不變" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" msgstr "在互動式重定基底中編輯待辦列表" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "顯示正在套用或合併的修補檔案" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "使用套用策略進行重定基底" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" msgstr "使用合併策略進行重定基底" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" msgstr "讓使用者編輯要重定基底的提交列表" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已棄用）嘗試重建合併提交而非忽略它們" -#: builtin/rebase.c:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "處理空白提交的方式" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" msgstr "允許針對空提交說明的提交重定基底" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" msgstr "嘗試對合併提交重定基底而不是忽略它們" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 來最佳化上游" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" msgstr "使用提供的合併策略" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "選項" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "將參數傳遞給合併策略" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "將所有可以取得的提交重定基底到根提交" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "即使已提供上游，仍套用所有變更" -#: builtin/rebase.c:1446 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"對 rebase.useBuiltin 的支援已被刪除！\n" -"詳見 'git help config' 中的條目。" - -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起來 'git-am' 正在執行中。無法重定基底。" +msgstr "看起來 'git am' 正在執行中。無法重定基底。" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" msgstr "不能將 '--keep-base' 和 '--root' 組合使用" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" msgstr "不能將 '--root' 和 '--fork-point' 結合使用" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19722,16 +19789,16 @@ msgstr "" "您必須編輯所有的合併衝突，然後透過 git add\n" "指令將它們標記為已解決" -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" msgstr "無法捨棄工作區變更" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" msgstr "無法移回 %s" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19750,132 +19817,132 @@ msgstr "" "\t%s\n" "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" msgstr "未知 rebase 後端：%s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" msgstr "無效的上游 '%s'" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" msgstr "不能建立新的根提交" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要與分支的一個合併基礎" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一個合併基礎" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "沒有指向一個有效的提交 '%s'" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "無法將 HEAD 解析為一個版本" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "請提交或儲藏修改。" -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" msgstr "目前分支 %s 是最新的。\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，強制重定基底。" -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "目前分支 %s 是最新的，強制重定基底。\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的變更：\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" msgstr "從 %s 到 %s 的變更：\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" -#: builtin/rebase.c:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" msgstr "無法分離開頭指標" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快轉 %s 到 %s。\n" @@ -19884,7 +19951,7 @@ msgstr "快轉 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19910,7 +19977,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19921,7 +19988,7 @@ msgid "" "\n" "To squelch this message, you can set it to 'refuse'." msgstr "" -"預設禁止刪除目前分支，因為下一次 'git clone' 將不會檢出任何檔案，\n" +"預設禁止刪除目前分支，因為下一次 'git clone' 將不會簽出任何檔案，\n" "導致困惑。\n" "\n" "您可以在遠端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n" @@ -19929,11 +19996,11 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "您必須指定一個目錄。" @@ -20167,7 +20234,7 @@ msgstr "" "\t%s:%d\n" "現命名成不存在的遠端分支 '%s'" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" @@ -20516,7 +20583,7 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" @@ -20524,104 +20591,127 @@ msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" msgid "could not finish pack-objects to repack promisor objects" msgstr "無法完成 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "無法開啟 %s 的索引" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "%s 包太大，以致不能在等比數列中考慮" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "%s 包太大，以致不能縮合" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "刪除多餘的包，執行 git-prune-packed" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --local" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "寫 bitmap 索引" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --delta-islands" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要將早於提供時間的物件過期" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新對無法取得物件打包" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "用於增量壓縮的視窗值" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "位元組" -#: builtin/repack.c:348 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制記憶體大小而非條目數" -#: builtin/repack.c:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "限制最大執行緒數" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "每個 packfile 的最大尺寸" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "對標記為 .keep 的包中的物件重新打包" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "不要對該包檔案重新打包" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "尋找因數是 <N> 的等比數列" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的打包檔案" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不相容" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "--geometric 與 -A, -a 不相容" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "沒有新的要打包。" -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "缺少必要檔案：%s" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "無法取消連結：%s" @@ -20876,15 +20966,15 @@ msgstr "只能為 -l 提供一個模式" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "在索引中註冊乾淨的解決方案" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "沒有路徑的 'git rerere forget' 已經過時" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "無法為 '%s' 生成差異" @@ -20952,8 +21042,8 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -21036,19 +21126,19 @@ msgstr "不能重設索引檔案至版本 '%s'。" msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "--objects 不相容標記計數 (marked counting)" @@ -21068,6 +21158,18 @@ msgstr "遇到第一個非選項參數後停止解析" msgid "output in stuck long form" msgstr "以固定長格式輸出" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "輸入過早到達結尾" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "「--」分隔符號前未提供用法字串" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "需要一個修訂版本" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21082,6 +21184,50 @@ msgstr "" "\n" "初次使用時執行 \"git rev-parse --parseopt -h\" 來獲得更多訊息。" +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir 需要 1 個引數" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "'%s' 不是 git 目錄" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path 需要 1 個引數" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n 需要 1 個引數" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format 需要 1 個引數" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "傳入 --path-format 的引數未知：%s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default 需要 1 個引數" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix 需要 1 個引數" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "--abbrev-ref 的模式未知：%s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "--show-object-format 的模式未知：%s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<選項>] <提交號>..." @@ -21122,7 +21268,7 @@ msgstr "取消反轉或揀選動作" #: builtin/revert.c:105 msgid "skip current commit and continue" -msgstr "跳過目前提交並繼續" +msgstr "略過目前提交並繼續" #: builtin/revert.c:107 msgid "don't automatically commit" @@ -21160,19 +21306,19 @@ msgstr "保留初始化的空提交" msgid "keep redundant, empty commits" msgstr "保持多餘的、空的提交" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "還原失敗" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "揀選失敗" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<選項>] [--] <檔案>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21181,7 +21327,7 @@ msgid_plural "" "file and the HEAD:" msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣：" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21189,12 +21335,12 @@ msgstr "" "\n" "（使用 -f 強制刪除）" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "下列檔案索引中有變更" +msgstr[0] "下列檔案有暫存在索引的變更：" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21202,45 +21348,45 @@ msgstr "" "\n" "（使用 --cached 保留本機檔案，或用 -f 強制刪除）" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下檔案有本機修改：" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" msgstr "不列出刪除的檔案" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "只從索引區刪除" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "忽略檔案更新狀態檢查" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "允許遞迴刪除" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" msgstr "即使沒有符合，也以零狀態離開" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "沒有提供路徑規格。我該移除哪個檔案？" -#: builtin/rm.c:305 +#: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 選項不會遞迴刪除 '%s'" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能刪除 %s" @@ -21512,102 +21658,106 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" -msgstr "無法建立稀疏檢出檔案的目錄" +msgstr "無法建立稀疏簽出檔案的目錄" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" -msgstr "以 cone 模式初始化稀疏檢出" +msgstr "以 cone 模式初始化稀疏簽出" + +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "切換是否使用稀疏索引" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "無法修改稀疏索引設定" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" -msgstr "無法載入現存的稀疏檢出樣式" +msgstr "無法載入現存的稀疏簽出樣式" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" msgstr "git stash list [<選項>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<選項>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 -msgid "git stash clear" -msgstr "git stash clear" - -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21619,7 +21769,7 @@ msgstr "" " [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" " [--] [<路徑規格>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21627,19 +21777,19 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<消息>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21649,181 +21799,200 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" " [--] [<路徑規格>...]]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' 不像是一個儲藏提交" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." msgstr "未發現儲藏條目。" -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" msgstr "%s 不是一個有效的引用名" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" msgstr "尚未實作傳入參數的 git stash clear" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" " %s -> %s\n" " to make room.\n" msgstr "" +"警告：未追蹤檔案擋住追蹤檔案的去路！已重新命名：\n" +" %s -> %s\n" +" 以騰出空間留給追蹤檔案。\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 msgid "cannot apply a stash in the middle of a merge" msgstr "無法在合併過程套用儲藏" -#: builtin/stash.c:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." msgstr "無法生成差異 %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." msgstr "索引中有衝突。請試試看不用 --index。" -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" msgstr "不能儲存索引樹" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" msgstr "無法從儲藏條目中復原未追蹤檔案" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" msgstr "正在合併 %s 和 %s" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:699 +#: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:722 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "無法解析樹" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "無法解包樹" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "在儲藏區包含未追蹤檔案" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "只在儲藏區顯示未追蹤檔案" + +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:894 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1109 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1209 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1236 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1245 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1293 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1342 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1358 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1373 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1380 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1395 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1400 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1490 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1636 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21841,46 +22010,47 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" -msgstr "跳過和移除所有的備註行" +msgstr "略過和移除所有的備註行" #: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不帶參數" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' 剝離一個元件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "進入 '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21889,7 +22059,7 @@ msgstr "" "對 %s 執行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21899,169 +22069,169 @@ msgstr "" "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "隱藏初始化子模組的輸出" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "無法雜湊來自 '%s' 的物件" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "非預期的模式 %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用儲存在索引中的提交而非子模組 HEAD" -#: builtin/submodule--helper.c:1302 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "比較索引中的，和子模組 HEAD 中的提交" - #: builtin/submodule--helper.c:1304 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "比較索引中提交與子模組 HEAD 提交的差異" + +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' 值設為 'all' 時略過子模組" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "限制摘要大小" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的版本" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached 和 --files 互斥" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "隱藏子模組 URL 同步的輸出" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22070,52 +22240,52 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "即使有本機變更仍移除子模組的工作區" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "取消註冊所有子模組" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22127,46 +22297,67 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" +msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" + +#: builtin/submodule--helper.c:1800 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" + +#: builtin/submodule--helper.c:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "目錄不是空的：「%s」" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "無法得到 '%s' 的子模組目錄" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22176,189 +22367,223 @@ msgstr "" ">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" "徑>" -#: builtin/submodule--helper.c:1873 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" - -#: builtin/submodule--helper.c:1884 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到子模組路徑 '%s'" - -#: builtin/submodule--helper.c:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目錄不是空的：「%s」" - -#: builtin/submodule--helper.c:1900 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "無法得到 '%s' 的子模組目錄" - -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "複製 '%s' 失敗。按計劃重試" +msgstr "複製 '%s' 失敗。已排程重試作業" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "第二次嘗試複製 '%s' 失敗，離開" +msgstr "第二次嘗試複製 '%s' 失敗，中止作業" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2340 -#, fuzzy -#| msgid "" -#| "Create a shallow clone truncated to the specified number of revisions" +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" -msgstr "建立一個指定深度的淺複製" +msgstr "建立一個縮減至指定版本數的淺複製" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" -msgstr "並發任務" +msgstr "並行任務" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "初始複製是否應該遵守推薦的淺複製選項" +msgstr "初始複製是否應該遵循建議的淺複製選項" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch 與 --default 互斥" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "「%s」已存在，且不是有效的 git 版本庫" + +#: builtin/submodule--helper.c:2828 +#, fuzzy, c-format +#| msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"如果您想要直接使用這個本機 git 目錄，而非重新複製自\n" +" %s\n" +"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" +"或者說您不確定，請使用 '--name' 選項輸入其他名稱。\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "無法簽出「%s」子模組" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "複製時要簽出的版本庫分支" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "允許加入忽略的子模組路徑" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --name " +"<名稱>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -22371,23 +22596,23 @@ msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <名稱>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "不顯示非符號（分離的）引用的錯誤訊息" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "刪除符號引用" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "縮短引用輸出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "更新的原因" @@ -22418,17 +22643,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<格式>] <標籤名>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." msgstr "未發現標籤 '%s'。" -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已刪除標籤 '%s'（曾為 %s）\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22441,7 +22666,7 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被忽略。\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22455,11 +22680,11 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "無法簽署標籤" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22472,139 +22697,139 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." msgstr "壞的物件類型。" -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "無標籤說明？" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "標籤說明被保留在 %s\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" msgstr "列出標籤名稱" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "每個標籤訊息列印 <n> 行" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" msgstr "刪除標籤" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" msgstr "驗證標籤" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "標籤建立選項" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "附註標籤，需要一個說明" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" msgstr "標籤說明" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" msgstr "強制編輯標籤說明" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "附註並附加 GPG 簽名的標籤" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "使用另外的私鑰簽名該標籤" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "如果存在，取代現有的標籤" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "建立引用日誌" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "標籤列表選項" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "以列的方式顯示標籤列表" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "只列印包含該提交的標籤" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" msgstr "只列印不包含該提交的標籤" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "只列印已經合併的標籤" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" msgstr "只列印尚未合併的標籤" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" msgstr "只列印指向該物件的標籤" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不相容" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "-n 選項只允許用在列表顯示模式" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "--contains 選項只允許用在列表顯示模式" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 選項只允許用在列表顯示模式" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 選項只允許用在列表顯示模式" -#: builtin/tag.c:545 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式" -#: builtin/tag.c:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "只允許一個 -F 或 -m 選項。" -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一個有效的標籤名稱。" -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "標籤 '%s' 已存在" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新標籤 '%s'（曾為 %s）\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "展開物件中" @@ -22665,155 +22890,155 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<選項>] [--] [<檔案>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "當索引需要更新時繼續重新整理" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "重新整理：忽略子模組" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "不忽略新的檔案" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "讓檔案取代目錄（反之亦然）" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "通知檔案從工作區遺失" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "即使索引區包含未合併的條目也執行重新整理" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "重新整理統計訊息" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<物件>,<路徑>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "新增指定的條目到索引區" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "把檔案標記為 \"沒有變更\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "把檔案標記為 \"僅索引\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "不要建立只有索引的項目" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "只新增到索引區；不新增物件到物件庫" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "即使存在工作區裡，也刪除路徑" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "攜帶 --stdin：輸入的行以 null 字元終止" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "從標準輸入中讀取需要更新的路徑列表" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "從標準輸入新增條目到索引區" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "為指定檔案重新生成第2和第3暫存區" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "只更新與 HEAD 不同的條目" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "忽略工作區遺失的檔案" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "在標準輸出顯示動作" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘記儲存的未解決的衝突" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "以這種格式寫入索引區" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "啟用或停用索引分割" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "啟用/停用對未追蹤檔案的快取" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "測試檔案系統是否支援未追蹤檔案快取" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "即使沒有被標記為已更改，也要寫出索引" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "啟用或停用檔案系統監控" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "標記檔案為 fsmonitor 有效" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割，請移除或修改" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割，請移除或修改" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22821,11 +23046,11 @@ msgstr "" "core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或" "修改" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "快取未追蹤檔案被停用" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22833,25 +23058,25 @@ msgstr "" "core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或" "修改" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "快取未追蹤檔案在 '%s' 啟用" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "fsmonitor 被啟用" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "fsmonitor 被停用" @@ -22971,7 +23196,7 @@ msgstr "git worktree remove [<選項>] <工作區>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" @@ -22981,25 +23206,25 @@ msgstr "刪除 '%s' 失敗" msgid "Removing %s/%s: %s" msgstr "移除 %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "報告清除的工作區" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "將早於 <時間> 的工作區過期" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' 已經存在" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "無法使用的工作目錄目的地「%s」" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23008,7 +23233,7 @@ msgstr "" "'%s' 是個遺失但被鎖定的工作區；\n" "使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23017,129 +23242,139 @@ msgstr "" "'%s' 是個遺失但已註冊的工作區；\n" "使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "不能建立目錄 '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "正在初始化" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "準備工作區（重設分支 '%s'，之前為 %s）" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" -msgstr "準備工作區（檢出 '%s'）" +msgstr "準備工作區（簽出 '%s'）" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "準備工作區（分離開頭指標 %s）" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "檢出 <分支>，即使已經被檢出到其它工作區" +msgstr "簽出 <分支>，即使已經被簽出到其它工作區" -#: builtin/worktree.c:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "建立一個新分支" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "建立或重設一個分支" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "生成新的工作區" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:491 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "鎖定原因" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "設定追蹤模式（參見 git-branch(1)）" -#: builtin/worktree.c:494 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:502 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:563 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason 需要 --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "已使用 --lock 加入" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用 --[no-]track 選項" -#: builtin/worktree.c:680 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "如果有則顯示延伸的註釋和原因" -#: builtin/worktree.c:682 -#, fuzzy -#| msgid "expire working trees older than <time>" +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" -msgstr "將早於 <時間> 的工作區過期" +msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示" -#: builtin/worktree.c:691 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose 和 --porcelain 互斥" -#: builtin/worktree.c:718 -msgid "reason for locking" -msgstr "鎖定原因" - -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:737 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:739 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:767 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:808 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:816 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:844 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目標名稱" -#: builtin/worktree.c:857 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23148,7 +23383,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:859 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23156,36 +23391,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:862 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:867 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:913 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:917 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:922 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:945 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:968 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23194,7 +23429,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:970 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23202,17 +23437,17 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:973 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" -#: builtin/worktree.c:997 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修復：%s：%s" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "錯誤：%s：%s" @@ -23233,58 +23468,7 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" msgid "only useful for debugging" msgstr "只對除錯有用" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "不是一個 git 版本庫" - -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile 需要 --index-pack-args" - -#: http-fetch.c:143 -#| msgid "-N can only be used with --mixed" -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args 只能與 --packfile 一起使用" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "未處理選項" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "準備修訂版本時發生錯誤" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "提交 %s 沒有標記為可以取得" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "太多提交標記為可以取得" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<選項>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "對能力廣告之後立即離開" - #: git.c:28 -#| msgid "" -#| "git [--version] [--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" -#| " <command> [<args>]" msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -23339,22 +23523,27 @@ msgstr "沒有為 --super-prefix 提供前綴\n" msgid "-c expects a configuration string\n" msgstr "應為 -c 提供一個設定字串\n" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "未傳入設定鍵至 --config-env\n" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "沒有為 -C 提供目錄\n" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "未知選項：%s\n" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "在擴展別名 '%s' 時：'%s'" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23363,39 +23552,39 @@ msgstr "" "別名 '%s' 修改環境變數。您可以使用在別名中\n" "使用 '!git'" -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "%s 的空別名" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "遞迴的別名：%s" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "在標準輸出寫入失敗" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "到標準輸出的未知寫入錯誤" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "標準輸出關閉失敗" -#: git.c:823 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "檢測到別名循環：'%s'的擴展未終止：%s" -#: git.c:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作為內建指令處理 %s" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" @@ -23404,16 +23593,164 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:906 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" -#: git.c:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "執行指令 '%s' 失敗：%s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "不是一個 git 版本庫" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile 需要 --index-pack-args" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args 只能與 --packfile 一起使用" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "未處理選項" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "準備修訂版本時發生錯誤" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "提交 %s 沒有標記為可以取得" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "太多提交標記為可以取得" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<選項>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "對能力廣告之後立即離開" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "無法在下述位置啟動伺服器：「%s」" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "無法在背景啟動 (spawn) 守護程式" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "waitpid 失敗" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "守護程式尚未上線" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "無法啟動守護程式" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "waitpid 被混淆" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "守護程式尚未關閉" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<name>] [<options>]" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<name>] [<token>]" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "Unix 網域通訊端的名稱或路徑名稱" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "有命名管道的名稱" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "伺服器執行緒集區的執行緒數量" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "要等待守護程式啟動或停止多久（秒）" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "位元組數" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "每個執行緒的請求數" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "位元組" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "穩定 (ballast) 字元" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "代符" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "要傳送至伺服器的命令代符" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23443,14 +23780,14 @@ msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" #: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建" +msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端" #: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "無法將 SSL 後端設定為 '%s'：已經設定" -#: http.c:2025 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23500,95 +23837,95 @@ msgstr "無法存取 '%s'：%s" msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "遠端伺服器傳送了無狀態的分隔符號" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "遠端伺服器傳送了非預期的回應結束封包" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: 錯誤的行長度字串：%.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: 非預期的回應結束封包" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC 失敗。%s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "不能處理這麼大的推送" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能壓縮請求，zlib 結束錯誤 %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "收到了 %d 位元組長度的標頭" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "預期仍要有 %d 位元組的本文 (body)" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" -msgstr "啞 http 傳輸不支援 shalllow 能力" +msgstr "啞 http 傳輸不支援 shallow 能力" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "取得失敗。" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "無法透過智慧 HTTP 取得 sha1" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push 失敗" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：錯誤讀取來自 git 的指令流" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：嘗試沒有本機版本庫下取得" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" @@ -23601,43 +23938,43 @@ msgstr "沒有可用的編譯器資訊\n" msgid "no libc information available\n" msgstr "沒有可用的 libc 資訊\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "參數" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "物件過濾" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "到期時間" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "空動作（向後相容）" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "更加詳細" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "更加安靜" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "用 <n> 位數字顯示物件名稱" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "設定如何刪除提交說明裡的空格和 #備註" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "從檔案讀取 <路徑規格>" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" @@ -23664,7 +24001,7 @@ msgstr "套用信箱格式的系列修補檔" #: command-list.h:52 msgid "Annotate file lines with commit information" -msgstr "使用提交訊息備註檔案行" +msgstr "使用提交說明備註檔案行" #: command-list.h:53 msgid "Apply a patch to files and/or to the index" @@ -23732,7 +24069,7 @@ msgstr "尋找尚未套用到上游的提交" #: command-list.h:69 msgid "Apply the changes introduced by some existing commits" -msgstr "應用一些現存提交引入的修改" +msgstr "套用一些現存提交引入的修改" #: command-list.h:70 msgid "Graphical alternative to git-commit" @@ -23744,7 +24081,7 @@ msgstr "從工作區中刪除未追蹤檔案" #: command-list.h:72 msgid "Clone a repository into a new directory" -msgstr "複製版本庫到一個新目錄" +msgstr "複製版本庫至新目錄" #: command-list.h:73 msgid "Display data in columns" @@ -23784,7 +24121,7 @@ msgstr "在磁碟儲存密碼的協助工具" #: command-list.h:82 msgid "Export a single commit to a CVS checkout" -msgstr "將一個提交匯出到 CVS 檢出中" +msgstr "將一個提交匯出到 CVS 簽出中" #: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" @@ -23844,7 +24181,7 @@ msgstr "重寫分支" #: command-list.h:97 msgid "Produce a merge commit message" -msgstr "生成一個合併提交訊息" +msgstr "生成一個合併提交說明" #: command-list.h:98 msgid "Output information on each ref" @@ -24053,7 +24390,7 @@ msgstr "將樹訊息讀取到索引" #: command-list.h:149 msgid "Reapply commits on top of another base tip" -msgstr "在另一個分支上重新應用提交" +msgstr "在另一個分支上重新套用提交" #: command-list.h:150 msgid "Receive what is pushed into the repository" @@ -24149,7 +24486,7 @@ msgstr "常用的 Git shell 腳本設定程式碼" #: command-list.h:173 msgid "Initialize and modify the sparse-checkout" -msgstr "初始化並修改稀疏檢出" +msgstr "初始化並修改稀疏簽出" #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" @@ -24426,83 +24763,43 @@ msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" #: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" -msgstr "'$sm_path' 沒有檢出的提交" +msgstr "'$sm_path' 沒有簽出的提交" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "新增位於 '$sm_path' 的現存版本庫到索引" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" - -#: git-submodule.sh:261 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"如果您想要重用這個本機 git 目錄而非重新複製自\n" -" $realrepo\n" -"使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" -"或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "不能檢出子模組 '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "無法新增子模組 '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "無法註冊子模組 '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中取得" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24510,54 +24807,54 @@ msgid "" msgstr "" "取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "無法在子模組路徑 '$displaypath' 中檢出 '$sha1'" +msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "子模組路徑 '$displaypath'：檢出 '$sha1'" +msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模組 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "無法遞迴進子模組路徑 '$displaypath'" #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." -msgstr "已應用 autostash。" +msgstr "已套用 autostash。" #: git-rebase--preserve-merges.sh:112 #, sh-format @@ -24570,7 +24867,7 @@ msgid "" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"應用 autostash 導致衝突。\n" +"套用 autostash 導致衝突。\n" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" @@ -24688,7 +24985,7 @@ msgstr "這是提交說明 #${n}：" #: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" -msgstr "提交說明 #${n} 將被跳過：" +msgstr "提交說明 #${n} 將被略過：" #: git-rebase--preserve-merges.sh:473 #, sh-format @@ -24709,7 +25006,7 @@ msgstr "這是一個 2 個提交的組合。" #: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" -msgstr "不能應用 $sha1... $rest" +msgstr "不能套用 $sha1... $rest" #: git-rebase--preserve-merges.sh:601 #, sh-format @@ -24843,7 +25140,7 @@ msgstr "無法執行編輯器" #: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" -msgstr "不能檢出 $switch_to" +msgstr "不能簽出 $switch_to" #: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" @@ -24945,26 +25242,26 @@ msgstr[0] "建立了 %d 個路徑\n" msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。" +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" #: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。" +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" #: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。" +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" #: git-add--interactive.perl:1065 git-add--interactive.perl:1074 #: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。" +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" #: git-add--interactive.perl:1068 git-add--interactive.perl:1071 #: git-add--interactive.perl:1077 @@ -25132,7 +25429,7 @@ msgstr "" #: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" -msgstr "選中的區塊不能套用到索引！\n" +msgstr "選取區塊不能套用到索引！\n" #: git-add--interactive.perl:1360 #, perl-format @@ -25189,7 +25486,7 @@ msgstr "沒有和提供模式相符合的區塊\n" #: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" -msgstr "沒有前一個區塊\n" +msgstr "沒有上一個區塊\n" #: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" @@ -25245,34 +25542,39 @@ msgstr "未知的 --patch 模式：%s" msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有不到一分鐘間隔\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本機時間位移量大於等於 24 小時\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:214 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "致命錯誤：命令「%s」中止，結束碼：%d" + +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:312 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" -#: git-send-email.perl:317 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:410 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:484 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25282,47 +25584,47 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" -#: git-send-email.perl:492 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" -#: git-send-email.perl:505 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:536 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:564 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" -#: git-send-email.perl:566 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:573 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:657 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25337,21 +25639,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:678 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"致命錯誤：%s：%s\n" -"警告：修補檔未能傳送\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25361,17 +25654,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:736 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25384,37 +25677,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:771 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" -msgstr "摘要信件為空，跳過\n" +msgstr "摘要信件為空，略過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您是否要使用 <%s> [y/N]？ " -#: git-send-email.perl:921 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n" -#: git-send-email.perl:926 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:934 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25426,20 +25719,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:953 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:971 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 擴展為它自己\n" -#: git-send-email.perl:983 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ " -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -25447,16 +25740,16 @@ msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1370 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1453 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25469,7 +25762,7 @@ msgid "" " run 'git config --global sendemail.confirm auto'.\n" "\n" msgstr "" -" 以上的抄送列表（Cc）已經用修補檔提交訊息中發現的位址進行\n" +" 以上的抄送列表（Cc）已經用修補檔提交說明中發現的位址進行\n" " 了擴展。預設 send-email 會給出提示。這個行為可以透過\n" " sendemail.confirm 設定設定。\n" "\n" @@ -25481,132 +25774,193 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1471 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1499 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1546 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" -#: git-send-email.perl:1582 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1688 msgid "Result: " msgstr "結果：" -#: git-send-email.perl:1602 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1673 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 新增 to：%s 自行 '%s'\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1765 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 新增 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1876 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:1883 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 新增 %s: %s 自：'%s'\n" -#: git-send-email.perl:1887 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:1917 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:1925 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:2051 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"致命錯誤：%s：被 sendemail-validate 掛鈎拒絕\n" +"%s\n" +"警告：修補檔未能傳送\n" + +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能開啟 %s：%s\n" -#: git-send-email.perl:1969 +#: git-send-email.perl:2064 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s：修補檔包含一個超過 998 字元的行" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"致命錯誤：%s:%d 的字元數超過 998\n" +"警告：修補檔未能傳送\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略過 %s 含備份後綴 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]：" +#~ msgid "unable to write stateless separator packet" +#~ msgstr "無法寫入無狀態的分隔符號封包" + +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + +#~ msgid "remote server sent stateless separator" +#~ msgstr "遠端伺服器傳送了無狀態的分隔符號" + +#~ msgid "--cached and --3way cannot be used together." +#~ msgstr "--cached 和 --3way 不能同時使用。" + +#~ msgid "both" +#~ msgstr "雙方" + +#~ msgid "one" +#~ msgstr "一方" + +#~ msgid "Already up to date!" +#~ msgstr "已經是最新的！" + +#~ msgid "Already up to date. Yeeah!" +#~ msgstr "已經是最新的。耶！" + +#~ msgid "--batch-size option is only for 'repack' subcommand" +#~ msgstr "--batch-size 選項僅用於 'repack' 子指令" + +#~ msgid "Percentage by which creation is weighted" +#~ msgstr "建立權重的百分比" + +#~ msgid "" +#~ "the rebase.useBuiltin support has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "對 rebase.useBuiltin 的支援已被刪除！\n" +#~ "詳見 'git help config' 中的條目。" + +#~ msgid "%s: patch contains a line longer than 998 characters" +#~ msgstr "%s：修補檔包含一個超過 998 字元的行" + #~ msgid "repository contains replace objects; skipping commit-graph" #~ msgstr "版本庫有取代物件；跳過提交圖形" @@ -25616,11 +25970,9 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "repository is shallow; skipping commit-graph" #~ msgstr "版本庫是淺複製；忽略提交圖形" -#, c-format #~ msgid "commit-graph improper chunk offset %08x%08x" #~ msgstr "提交圖形不正確的區塊位移 %08x%08x" -#, c-format #~ msgid "commit-graph chunk id %08x appears multiple times" #~ msgstr "提交圖形區塊 id %08x 出現了多次" @@ -25671,11 +26023,9 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "Force progress reporting" #~ msgstr "強制進度顯示" -#, c-format #~ msgid "Error deleting remote-tracking branch '%s'" #~ msgstr "無法刪除遠端追蹤分支 '%s'" -#, c-format #~ msgid "Error deleting branch '%s'" #~ msgstr "無法刪除分支 '%s'" @@ -25694,6 +26044,5 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "too many params" #~ msgstr "太多參數" -#, sh-format #~ msgid "Bad rev input: $arg" #~ msgstr "壞的輸入版本：$arg" |