diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 19:30:54 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-08-14 19:30:54 +0800 |
| commit | 309f8cf9f93b1e2219610600c8325111e91b551d (patch) | |
| tree | 5e4e9ede4b584b6fd2a79c27b959bf14e580f4b6 | |
| parent | Merge branch 'master' of github.com:vnwildman/git (diff) | |
| parent | l10n: zh_TW.po: remove the obsolete glossary (diff) | |
| download | tgif-309f8cf9f93b1e2219610600c8325111e91b551d.tar.xz | |
Merge branch 'loc/zh_TW/210814' of github.com:l10n-tw/git-po
* 'loc/zh_TW/210814' of github.com:l10n-tw/git-po:
l10n: zh_TW.po: remove the obsolete glossary
l10n: zh_TW.po: update for v2.33.0 rnd 2
| -rw-r--r-- | po/zh_TW.po | 5091 |
1 files changed, 2478 insertions, 2613 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 521292e390..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-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-23 15:30+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.3\n" +"X-Generator: Poedit 3.0\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -310,8 +40,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: 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:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "無法寫入索引" @@ -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:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: 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:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: 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" -#: 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]? " -#: 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,68 +673,68 @@ 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> 檢視更多）？ " -#: 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 個區塊。" -#: 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' 失敗" @@ -1055,7 +789,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" @@ -1068,12 +802,14 @@ msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" #: advice.c:296 -#, fuzzy, c-format +#, 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" +msgstr "" +"下列路徑規格不符合任何適合路徑，\n" +"但符合目前稀疏簽出外的索引項目：\n" #: advice.c:303 msgid "" @@ -1351,7 +1087,7 @@ msgstr "打修補檔失敗：%s:%ld" #: apply.c:3352 #, c-format msgid "cannot checkout %s" -msgstr "不能檢出 %s" +msgstr "不能簽出 %s" #: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 @@ -1411,7 +1147,7 @@ msgstr "成功套用修補檔到 '%s'。\n" #: apply.c:3642 #, c-format msgid "Falling back to direct application...\n" -msgstr "" +msgstr "回復至直接套用模式⋯⋯\n" #: apply.c:3654 msgid "removal patch leaves file contents" @@ -1427,8 +1163,8 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: 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'" @@ -1518,7 +1254,7 @@ msgstr "不能為建立檔案 %s 建立後端儲存" msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" @@ -1604,7 +1340,7 @@ msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" @@ -1616,7 +1352,7 @@ msgstr "不要套用符合提供路徑的變更" msgid "apply changes matching the given path" msgstr "套用符合提供路徑的變更" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "數字" @@ -1680,9 +1416,9 @@ msgstr "路徑以 NUL 字元分隔" msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: 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:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "動作" @@ -1712,8 +1448,8 @@ msgid "allow overlapping hunks" msgstr "允許重疊的修補檔區塊" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: 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 "詳細輸出" @@ -1725,7 +1461,7 @@ msgstr "允許不正確的檔案末尾換行符號" msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "根目錄" @@ -1767,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)" @@ -1801,13 +1537,13 @@ msgid "cannot read %s" msgstr "不能讀取 %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 -#: builtin/merge.c:1143 +#: 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:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: 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' 未符合任何檔案" @@ -1849,7 +1585,7 @@ msgstr "格式" msgid "archive format" msgstr "歸檔格式" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "前綴" @@ -1860,7 +1596,7 @@ msgstr "為歸檔中每個路徑名加上前綴" #: 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:922 builtin/hash-object.c:105 +#: 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" @@ -1891,7 +1627,8 @@ msgid "list supported archive formats" msgstr "列出支援的歸檔格式" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "版本庫" @@ -1899,7 +1636,7 @@ msgstr "版本庫" msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "指令" @@ -2081,11 +1818,11 @@ msgstr "不能將 --contents 和最終的提交物件名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 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 "版本遍歷設定失敗" @@ -2230,123 +1967,123 @@ msgstr "無效的分支點：'%s'。" #: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已經檢出到 '%s'" +msgstr "'%s' 已經簽出到 '%s'" #: 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:2593 sequencer.c:3385 +#: 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:1935 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>" @@ -2414,12 +2151,12 @@ msgstr "無法找到提交 %s" msgid "commit-graph requires overflow generation data but has none" msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" @@ -2480,7 +2217,7 @@ msgstr "正在尋找提交圖中額外的邊" msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -2522,84 +2259,84 @@ msgstr "正在合併提交圖形" #: 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:2351 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: 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:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2517 +#: 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:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2555 +#: 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:2559 +#: 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:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" -#: commit-graph.c:2582 +#: 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:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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" @@ -2881,7 +2618,7 @@ msgstr "%s 的取值格式錯誤：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" @@ -2901,110 +2638,110 @@ msgstr "引用 '%s' 沒有指向一個資料物件" 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:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2560 +#: 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:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:3054 +#: 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:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:3184 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:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -3180,7 +2917,7 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在檢查連通性" @@ -3298,23 +3035,23 @@ msgstr "意外的過濾類型" msgid "path name too long for external filter" msgstr "外部過濾器的路徑名太長" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 過濾器 %s 失敗" @@ -3430,36 +3167,36 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 msgid "Marked %d islands, done.\n" msgstr "已標記 %d 個資料島，結束。\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "--diff-merges 的值無效：%s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" -msgstr "—merge-base 跟範圍無法搭配運作" +msgstr "--merge-base 跟範圍無法搭配運作" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base 只能跟提交搭配才能運作" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "不能取得 HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "找不到合併基底" -#: diff-lib.c:566 +#: 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" @@ -3482,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 @@ -3514,35 +3251,47 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4712 +#: 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:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: 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:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3551,200 +3300,200 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "傳入 -I 的正規表示式無效：「%s」" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<寬度>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<次數>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "輸出一個可以套用的二進位差異" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<類型>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3752,311 +3501,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的源前綴取代 \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目標前綴取代 \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "不顯示任何源和目標前綴" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<字元>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "省略刪除變更的差異輸出" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現複製的源" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "停用重新命名偵測" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的源" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<正則>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "忽略整行符合 <regex> 的變更" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<文字>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<模式>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "使用 <正規表示式> 確定何為一個詞" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "停用本程式的所有輸出" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "允許執行一個外部的差異協助工具" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<何時>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<格式>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<字串>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<路徑>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "先顯示指定路徑的變更" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "略過輸出至指定路徑" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5626 +#: 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:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<檔案>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6287 -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:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4067,7 +3816,7 @@ msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令 msgid "failed to read orderfile '%s'" msgstr "讀取排序檔案 '%s' 失敗" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "正在進行非精確的重新命名偵測" @@ -4076,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:1206 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2314 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2614 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2738 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c:3543 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3590 dir.c:3595 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3624 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -4138,11 +3887,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的編輯器關閉檔案...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "過濾內容" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "不能對檔案 '%s' 呼叫 stat" @@ -4152,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'" @@ -4315,9 +4064,9 @@ msgstr "沒有共同的提交" #: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 msgid "source repository is shallow, reject to clone." -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕 clone。" +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" @@ -4339,7 +4088,7 @@ msgstr "伺服器不支援 shallow 請求" msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" @@ -4395,24 +4144,24 @@ msgstr "處理要取得的引用發生錯誤：%d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: 預期要有回應結束封包" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "從遠端收到非預期的 ‘ready’" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" @@ -4432,8 +4181,8 @@ 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:531 msgid "" @@ -4443,18 +4192,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: 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:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -4685,7 +4434,7 @@ msgstr "sparse:path 過濾器支援已被刪除" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式" #: list-objects-filter-options.c:124 @@ -4730,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:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "無法為提交 %s 載入根樹" @@ -4776,32 +4525,32 @@ msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" msgid "bad action '%s' for '%s'" msgstr "「%s」動作對「%s」無效" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: 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:1125 merge-recursive.c:1212 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "無法合併子模組 %s（提交不存在）" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: 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:1144 merge-ort.c:1151 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：正在將 %s 子模組快轉到 %s" -#: merge-ort.c:1172 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "無法合併 %s 子模組" -#: merge-ort.c:1179 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4810,7 +4559,7 @@ msgstr "" "無法合併 %s 子模組，但有找到一個可行的合併方案：\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4826,7 +4575,7 @@ msgstr "" "\n" "以接受此建議。\n" -#: merge-ort.c:1196 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4835,21 +4584,21 @@ msgstr "" "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "無法執行內部合併" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "不能新增 %s 至物件庫" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "自動合併 %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4858,7 +4607,7 @@ msgstr "" "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" "放在：%s。" -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4867,24 +4616,24 @@ msgstr "" "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" "些路徑放置於此：%s" -#: merge-ort.c:1634 -#, fuzzy, c-format +#: 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 重新命名的位置。它被重新命名為多個其他目" +"錄，但沒有目的地取得過半檔案。" -#: merge-ort.c:1788 merge-recursive.c:2468 +#: 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 本身已被重新命名。" -#: merge-ort.c:1932 merge-recursive.c:3244 +#: 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; " @@ -4892,7 +4641,7 @@ msgid "" msgstr "" "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" -#: merge-ort.c:1939 merge-recursive.c:3251 +#: 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 " @@ -4901,7 +4650,7 @@ msgstr "" "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" "其移動到 %5$s。" -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4910,7 +4659,7 @@ msgstr "" "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" "動到 %s。" -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4919,14 +4668,14 @@ msgstr "" "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " "中，建議將其移動到 %5$s。" -#: merge-ort.c:2103 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " "%4$s。" -#: merge-ort.c:2198 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4936,65 +4685,65 @@ msgstr "" "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" "能會因此出現巢狀衝突標記。" -#: merge-ort.c:2217 merge-ort.c:2241 +#: 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 "" "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "不能讀取物件 %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "物件 %s 不是一個資料物件" -#: merge-ort.c:2981 -#, fuzzy, c-format +#: merge-ort.c:3613 +#, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." -msgstr "衝突（檔案/目錄）：目錄擋住來自 %2$s 的 %1$s。改移動到 %3$s。" +msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" -#: merge-ort.c:3055 -#, fuzzy, c-format +#: merge-ort.c:3689 +#, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名這兩個來源，這樣每個來" -"源都可以分別記錄。" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" +"別記錄這兩方檔案。" -#: merge-ort.c:3062 -#, fuzzy, c-format +#: 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 類型不同。已經重新命名其中一個來源，這樣每個" -"來源都可以分別記錄。" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" +"分別記錄這兩方檔案。" -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "內容" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "新增/新增" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "子模組" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-ort.c:3198 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -5003,7 +4752,7 @@ msgstr "" "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" "上。" -#: merge-ort.c:3433 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5013,12 +4762,12 @@ msgstr "註：%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:3730 +#: 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:3699 +#: 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" @@ -5027,103 +4776,103 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: 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:876 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "建立路徑 '%s'%s 失敗" -#: merge-recursive.c:887 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "刪除 %s 以便為子目錄留出空間\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "：可能是一個目錄/檔案衝突？" -#: merge-recursive.c:910 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" -#: merge-recursive.c:951 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:956 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 應為資料物件" -#: merge-recursive.c:981 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "開啟 '%s' 失敗：%s" -#: merge-recursive.c:992 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "建立符號連結 '%s' 失敗：%s" -#: merge-recursive.c:997 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何處理 %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模組 %s 快轉到如下提交：" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快轉子模組 %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" -#: merge-recursive.c:1269 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "無法合併子模組 %s（非快轉）" -#: merge-recursive.c:1270 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模組的一個可能的合併方案：\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法合併子模組 %s （發現多個合併）" -#: merge-recursive.c:1424 +#: 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:1496 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5132,7 +4881,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1501 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5141,7 +4890,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1508 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5150,7 +4899,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1513 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5159,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:1548 +#: merge-recursive.c:1544 msgid "rename" msgstr "重新命名" -#: merge-recursive.c:1548 +#: merge-recursive.c:1544 msgid "renamed" msgstr "重新命名" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: 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:1609 +#: 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:1667 +#: 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:1698 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" -#: merge-recursive.c:1703 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" -#: merge-recursive.c:1730 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5202,18 +4951,18 @@ msgstr "" "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " （留下未解決）" -#: merge-recursive.c:1827 +#: 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:2090 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5223,7 +4972,7 @@ msgstr "" "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" "多個其它目錄，沒有目錄包含大部分檔案。" -#: merge-recursive.c:2224 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5232,77 +4981,77 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" "命名目錄 %4$s->%5$s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modify" msgstr "修改" -#: merge-recursive.c:3069 +#: merge-recursive.c:3075 msgid "modified" msgstr "修改" -#: merge-recursive.c:3108 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3161 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 為名新增" -#: merge-recursive.c:3368 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "刪除 %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "檔案/目錄" -#: merge-recursive.c:3396 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "目錄/檔案" -#: merge-recursive.c:3403 +#: 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:3412 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "新增 %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3581 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" -#: merge-recursive.c:3631 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3796 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -5311,8 +5060,8 @@ msgstr "不能寫入索引。" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: 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 "無法寫新的索引檔案" @@ -5386,106 +5135,114 @@ msgstr "開啟包索引 '%s' 失敗" msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "無法儲存倒排索引檔案" -#: midx.c:933 +#: 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:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知偏好包：「%s」" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "偏好包「%s」已經過期" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "沒有要索引的 pack 檔案。" -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "刪除 %s 失敗" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "有 multi-pack-index 檔案，但無法解析" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "總和檢查碼不正確" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c:1237 +#: 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:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx 沒有 oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1260 +#: 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:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "透過 packfile 為物件排序" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "正在驗證物件位移" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "正在計算引用物件" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有參考的 packfile" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" @@ -5548,265 +5305,266 @@ msgstr "壞的 %s 值：'%s'" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "無法規範化備用物件路徑：%s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "無法規範化物件目錄: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "無法讀取替代檔案" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "路徑 '%s' 不存在" -#: object-file.c:780 +#: 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:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "參考版本庫 '%s' 不是一個本機版本庫。" -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "參考版本庫 '%s' 是一個淺複製" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "參考版本庫 '%s' 已被移植" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析備用引用時無效的行：%s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap 失敗" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失敗%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "無效的物件類型" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "檔案寫錯誤" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件源資料搞糊塗了" -#: object-file.c:1963 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:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "損壞的提交" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "損壞的標籤" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: object-file.c:2344 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:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: object-file.c:2581 +#: 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" @@ -5828,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" @@ -5852,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" @@ -5866,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" @@ -5875,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' 物件名稱無效。" @@ -5904,27 +5662,27 @@ msgstr "無效的物件類型 \"%s\"" msgid "object %s is a %s, not a %s" msgstr "物件 %s 是一個 %s，不是一個 %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "物件 %s 有未知的類型 id %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析物件：%s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: 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:1547 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 的磁碟用量" @@ -5977,12 +5735,17 @@ msgstr "無法寫入「%s」promisor 檔案" msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:1937 +#: 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?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" @@ -6184,8 +5947,8 @@ 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" @@ -6244,19 +6007,19 @@ msgstr "無法建立執行緒 lstat：%s" 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" @@ -6277,7 +6040,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6294,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:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在物件資料庫中建立空的資料物件" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有檢出一個提交" +msgstr "'%s' 沒有簽出一個提交" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "無法索引檔案 '%s'" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "無法在索引中新增 '%s'" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6359,7 +6122,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6368,144 +6131,144 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: 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:332 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2238 +#: 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:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2392 +#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: 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 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "無法轉換成稀疏索引" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3222 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3234 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3263 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3412 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -6616,8 +6379,8 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: 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'" @@ -6660,7 +6423,7 @@ msgstr "" msgid "could not read '%s'." msgstr "不能讀取 '%s'。" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "遺失" @@ -6679,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:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之後" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "錯誤的格式化字串 %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "（無分支，重定 %s 的基底）" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "（無分支，重定 %s 分離開頭指標的基底）" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "（無分支，二分搜尋從 %s 開始）" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "（開頭指標分離於 %s）" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "（開頭指標分離自 %s）" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "（無分支）" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "缺少 %2$s 的物件 %1$s" -#: ref-filter.c:1614 +#: 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:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "格式錯誤的物件 '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略帶有錯誤名稱 %s 的引用" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略損壞的引用 %s" -#: ref-filter.c:2431 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2525 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "格式錯誤的物件名 %s" -#: ref-filter.c:2530 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "選項 `%s' 必須指向一個提交" @@ -6947,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" @@ -7365,8 +7128,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: 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'" @@ -7404,38 +7167,38 @@ msgstr "不能開啟 rr-cache 目錄" msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> 已不受支援" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2892 +#: 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" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7470,25 +7233,25 @@ msgstr "send-pack：無法 fork 一個 fetch 子處理程序" msgid "push negotiation failed; proceeding anyway with push" msgstr "push 協商失敗。繼續使用 push 處理" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支援此版本庫的雜湊算法" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "接收端不支援簽名推送" +msgstr "接收端不支援 --signed 推送" -#: send-pack.c:531 +#: 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:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "接收端不支援原子推送" +msgstr "接收端不支援 --atomic 推送" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" @@ -7547,7 +7310,7 @@ msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" @@ -7558,7 +7321,7 @@ msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" @@ -7608,8 +7371,8 @@ msgstr "在 '%.*s' 中沒有 key" msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 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' 進行讀取" @@ -7753,7 +7516,7 @@ msgstr "不能解析 HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" @@ -7761,7 +7524,7 @@ msgstr "不能解析 HEAD 提交" msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" @@ -7779,12 +7542,13 @@ msgstr "無效的作者身分 '%s'" msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 -#: builtin/merge.c:934 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:1557 sequencer.c:4493 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" @@ -7836,7 +7600,7 @@ msgstr "不能寫 '%s'" msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "不能讀取 HEAD" @@ -7977,7 +7741,7 @@ msgstr "不可用的 squash-onto" msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "提供了空的提交集" @@ -8008,7 +7772,7 @@ msgstr "不能建立序列目錄 '%s'" msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" @@ -8020,7 +7784,7 @@ msgstr "不能解析 HEAD" msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" @@ -8068,7 +7832,7 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" @@ -8153,90 +7917,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "無法 autostash" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "已套用 autostash。\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8247,29 +8011,29 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "因套用自動儲藏而導致衝突。" -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "已有自動儲藏；建立新儲藏項目。" -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8289,58 +8053,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在重定基底 (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功重定基底並更新 %s。\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8349,50 +8113,50 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "無法略過不必要的揀選" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" @@ -8441,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" @@ -8535,7 +8301,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8544,28 +8310,27 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "不能開啟或者複製 /dev/null" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid 失敗" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "嘗試不在 cone 模式使用稀疏索引" -#: sparse-index.c:156 -#, fuzzy +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" -msgstr "無法更新快取樹：保持用完狀態" +msgstr "無法更新快取樹，保持完整" -#: sparse-index.c:239 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" @@ -8620,7 +8385,7 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: 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" @@ -8676,7 +8441,7 @@ msgstr "將更新後 .gitmodules 新增暫存區失敗" #: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" -msgstr "位於未檢出的子模組 '%s'" +msgstr "位於未簽出的子模組 '%s'" #: submodule.c:359 #, c-format @@ -8688,55 +8453,55 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "無效 --ignore-submodules 參數：%s" -#: submodule.c:818 +#: 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' 的子模組與同名的子模組衝突。略過。" -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" -#: submodule.c:1006 +#: 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:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "處理 '%s' 子模組失敗" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: 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:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送 '%s' 子模組\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "無法推送 '%s' 子模組\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在抓取 %s%s 子模組\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "無法存取子模組 '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8745,77 +8510,77 @@ msgstr "" "抓取子模組時發生錯誤：\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "無法將 '%s' 識別為一個 git 版本庫" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中啟動 'git status'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中執行 'git status'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "無法遞迴子模組路徑 '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "無法重設子模組的索引" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模組 '%s' 中有髒索引" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "拒絕移動「%s」至現存 git 目錄" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8826,11 +8591,11 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -8867,7 +8632,7 @@ msgstr "簽名 '%.*s' 的鍵為空" msgid "could not read input file '%s'" msgstr "不能讀取輸入檔案 '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "不能自標準輸入讀取" @@ -8955,7 +8720,7 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -8964,7 +8729,7 @@ msgstr "協定不支援該動作" msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only 需要 v2 版協定" @@ -9097,53 +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:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "服務端選項需要版本 2 協定或更高" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "伺服器不支援「等待完成」(wait-for-done) 功能" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 設定" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "協定 v2 的支援尚未實現" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "傳輸 '%s' 不允許" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "不再支援 git-over-rsync" -#: transport.c:1181 +#: 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:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9170,11 +8935,11 @@ msgstr "" "以推送至遠端。\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "正在終止。" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" @@ -9200,7 +8965,7 @@ 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:117 @@ -9209,7 +8974,7 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"您對下列檔案的本機修改將被檢出動作覆蓋：\n" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s" #: unpack-trees.c:120 @@ -9263,7 +9028,7 @@ 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:138 @@ -9272,7 +9037,7 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s" #: unpack-trees.c:141 @@ -9318,7 +9083,7 @@ msgid "" "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s請在切換分支前移動或刪除。" #: unpack-trees.c:156 @@ -9328,7 +9093,7 @@ msgid "" "checkout:\n" "%%s" msgstr "" -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s" #: unpack-trees.c:159 @@ -9388,7 +9153,7 @@ msgid "" "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑不是最新且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" "%s" #: unpack-trees.c:182 @@ -9397,7 +9162,7 @@ msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑未合併且保留下來：\n" +"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" "%s" #: unpack-trees.c:184 @@ -9407,7 +9172,7 @@ msgid "" "patterns:\n" "%s" msgstr "" -"即使有稀疏檢出樣板，以下路徑已經存在而因此未更新：\n" +"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" "%s" #: unpack-trees.c:264 @@ -9435,11 +9200,11 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "正在更新索引旗標" -#: unpack-trees.c:2608 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作區和未追蹤提交有重複項目：%s" @@ -9481,99 +9246,99 @@ msgstr "無效的 '..' 路徑區塊" msgid "Fetching objects" msgstr "正在抓取物件" -#: worktree.c:238 builtin/am.c:2151 +#: 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 檔案指向的位置不存在" @@ -9626,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:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -9736,21 +9501,21 @@ msgstr "修改的內容, " msgid "untracked content, " msgstr "未追蹤的內容, " -#: wt-status.c:908 +#: 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:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "子模組已修改但尚未更新：" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "要提交的子模組變更：" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9758,7 +9523,7 @@ msgstr "" "不要改動或刪除上面的一行。\n" "其下所有內容都將被忽略。" -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9769,278 +9534,282 @@ msgstr "" "花了 %.2f 秒才計算出分支的領先/落後範圍。\n" "為避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "您有尚未合併的路徑。" # 譯者：請維持前導空格 -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " （解決衝突並執行 \"git commit\"）" # 譯者：請維持前導空格 -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 終止合併）" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "所有衝突已解決但您仍處於合併中。" # 譯者：請維持前導空格 -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 結束合併）" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "您正處於 am 動作過程中。" -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "目前的修補檔為空。" # 譯者：請維持前導空格 -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解決衝突，然後執行 \"git am --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 復原原有分支）" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 遺失。" -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "沒有指令被執行。" -#: wt-status.c:1315 +#: 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:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " （更多參見檔案 %s）" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "未剩下任何指令。" -#: wt-status.c:1334 +#: 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:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "您在執行重定基底動作。" # 譯者：請維持前導空格 -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1376 +#: 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:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" -#: wt-status.c:1387 +#: 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:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "您在執行重定基底動作時分割提交。" # 譯者：請維持前導空格 -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" -#: wt-status.c:1399 +#: 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:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "您在執行重定基底動作時編輯提交。" # 譯者：請維持前導空格 -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修補目前提交）" # 譯者：請維持前導空格 -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "揀選動作正在進行中。" -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在執行揀選提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." -msgstr "還原動作正在行中。" +msgstr "還原動作正在進行中。" -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "您在執行反轉提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解決衝突並執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " （執行 \"git revert --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "您在執行二分搜尋動作。" # 譯者：請維持前導空格 -#: wt-status.c:1486 +#: 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:1497 +#: 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:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "位於分支 " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "互動式重定基底動作正在進行中；至 " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "重定基底動作正在進行中；至 " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "開頭指標分離於 " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "開頭指標分離自 " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "目前不在任何分支上。" -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "尚無提交" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "未追蹤的檔案" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "忽略的檔案" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10050,115 +9819,115 @@ msgstr "" "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" "但您需要小心不要忘了新增新檔案（參見 'git help status'）。" -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "未追蹤的檔案沒有列出%s" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " （使用 -u 參數顯示未追蹤的檔案）" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "沒有修改" -#: wt-status.c:1812 +#: 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:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1820 +#: 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:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交為空，但是存在尚未追蹤的檔案\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1828 +#: 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:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "尚無提交在 " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "落後 " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "領先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暫存的變更。" -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的變更。" -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "無法傳送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "無法讀取 IPC 回應" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: 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:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "無法啟動「%s」的 worker[0]" @@ -10195,7 +9964,7 @@ msgstr "刪除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能讀取索引" @@ -10230,8 +9999,8 @@ msgstr "不能套用 '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: 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 "測試執行" @@ -10240,7 +10009,7 @@ msgstr "測試執行" msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" @@ -10369,13 +10138,13 @@ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: 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:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: 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" @@ -10394,105 +10163,105 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: builtin/am.c:1222 +#: 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:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "修補檔為空。" -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10500,24 +10269,24 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上修補及進行三方合併..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "提交內容為：" @@ -10526,39 +10295,39 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: 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:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "沒有變更——修補檔已經套用過。" -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1823 +#: 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:1867 +#: 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" @@ -10568,7 +10337,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要略過這個修補檔。" -#: builtin/am.c:1874 +#: 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 " @@ -10579,106 +10348,106 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 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:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2077 +#: 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:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "無效的 --show-current-patch 值：%s" -#: builtin/am.c:2230 +#: 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:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: 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:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交說明結尾加入 Signed-off-by" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2289 +#: 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:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳遞" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 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:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10687,67 +10456,67 @@ msgstr "傳遞給 git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: 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:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "略過目前修補檔" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" -msgstr "終止修補動作但保持 HEAD 不變。" +msgstr "終止修補動作但保持 HEAD 不變" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2376 +#: 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." @@ -10755,16 +10524,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10773,11 +10542,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -10870,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" @@ -10934,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" @@ -10945,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 提交的情況下二分搜尋" @@ -10955,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" @@ -10979,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:1021 +#: 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" @@ -11033,104 +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:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "<修訂版> 輸入格式錯誤：%s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "修訂版輸入有誤（不是提交）：%s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "我們沒有在二分搜尋。" -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%s」？？您在說什麼？" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀取「%s」檔案來重放" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "清除二分搜尋狀態" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "列印二分搜尋術語" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "啟動二分搜尋過程" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "尋找下一個二分搜尋提交" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "標記 ref (或 refs) 的狀態" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "列出迄今的二分搜尋步驟" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "從指定檔案重放二分搜尋過程" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" -msgstr "略過要檢出的部分提交" +msgstr "略過要簽出的部分提交" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 個引數" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 個引數" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "未提供日誌檔案" @@ -11181,10 +10950,10 @@ msgstr "不將根提交看作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: 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:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -11232,7 +11001,7 @@ msgstr "顯示作者信箱而非名稱（預設值：off）" msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "版本" @@ -11286,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 @@ -11387,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 @@ -11815,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:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: 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:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" @@ -11839,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>" @@ -11869,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]" @@ -11877,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 的輸出排序" @@ -11969,8 +11738,8 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -12024,14 +11793,15 @@ msgid "no contacts specified" msgstr "未指定聯繫位址" #: builtin/checkout--worker.c:110 -#| msgid "git checkout [<options>] <branch>" 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:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: 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 "字串" @@ -12049,7 +11819,7 @@ msgstr "索引值應該取值 1 到 3 或者 all" #: builtin/checkout-index.c:187 msgid "check out all files in the index" -msgstr "檢出索引區的所有檔案" +msgstr "簽出索引區的所有檔案" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" @@ -12061,7 +11831,7 @@ msgstr "存在或不在索引中的檔案都沒有警告" #: builtin/checkout-index.c:192 msgid "don't checkout new files" -msgstr "不檢出新檔案" +msgstr "不簽出新檔案" #: builtin/checkout-index.c:194 msgid "update stat information in the index file" @@ -12125,65 +11895,65 @@ msgstr "path '%s'：無法合併" msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:419 +#: 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:426 +#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: 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:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同時使用" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: 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:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12192,51 +11962,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:932 builtin/clone.c:725 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:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12253,7 +12023,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: 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" @@ -12274,19 +12044,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12295,7 +12065,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1191 +#: 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" @@ -12306,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" @@ -12314,51 +12084,51 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1330 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:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12366,7 +12136,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12374,7 +12144,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12382,7 +12152,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12390,7 +12160,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12398,207 +12168,208 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "您在執行二分搜尋時切換分支" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: 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:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "風格" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" -msgstr "強制檢出（捨棄本機修改）" +msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" -msgstr "對尚未合併的檔案檢出我們的版本" +msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" -msgstr "對尚未合併的檔案檢出他們的版本" +msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" -msgstr "對路徑不做稀疏檢出的限制" +msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1725 +#: 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:1729 +#: 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:1738 +#: builtin/checkout.c:1736 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 與 --detach 不相容" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: 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:1754 +#: 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:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 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:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" -msgstr "建立並檢出一個新的分支" +msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" -msgstr "建立/重設並檢出一個分支" +msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" -msgstr "要檢出哪一個樹" +msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "使用疊加模式" @@ -12633,7 +12404,7 @@ msgstr "將忽略版本庫 %s\n" 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" @@ -12646,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" @@ -12667,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" @@ -12711,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:924 builtin/log.c:184 builtin/log.c:186 +#: 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 不能同時使用" @@ -12783,9 +12554,9 @@ msgstr "不要複製淺版本庫" #: builtin/clone.c:98 msgid "don't create a checkout" -msgstr "不建立一個檢出" +msgstr "不建立一個簽出" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "建立一個純版本庫" @@ -12815,28 +12586,28 @@ msgstr "在複製時初始化子模組" #: builtin/clone.c:115 msgid "number of submodules cloned in parallel" -msgstr "並發複製的子模組的數量" +msgstr "並行複製的子模組數" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: 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:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: 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:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: 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 "名稱" @@ -12847,13 +12618,13 @@ msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" #: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "檢出 <分支> 而不是遠端 HEAD" +msgstr "簽出 <分支> 而不是遠端 HEAD" #: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "深度" @@ -12862,14 +12633,14 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "時間" #: builtin/clone.c:133 msgid "create a shallow clone since a specific time" -msgstr "從一個特定時間建立一個淺複製" +msgstr "建立從指定時間到現在的淺複製" #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 @@ -12878,26 +12649,26 @@ msgstr "修訂版" #: 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:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: 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:139 msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" +msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" #: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" @@ -12910,32 +12681,32 @@ msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "傳輸選項" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" #: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" -msgstr "任何複製的子模組將使用它們的遠端追蹤分支" +msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" #: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏檢出檔案，只包含根目錄中的檔案" +msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" #: builtin/clone.c:292 msgid "" @@ -12986,14 +12757,14 @@ msgid "" "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:594 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "不能發現要複製的遠端分支 %s。" +msgstr "找不到要複製的遠端分支 %s。" #: builtin/clone.c:713 #, c-format @@ -13002,15 +12773,15 @@ msgstr "不能更新 %s" #: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" -msgstr "無法初始化稀疏檢出" +msgstr "無法初始化稀疏簽出" #: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "遠端 HEAD 指向一個不存在的引用，無法檢出。\n" +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" #: builtin/clone.c:816 msgid "unable to checkout working tree" -msgstr "不能檢出工作區" +msgstr "不能簽出工作區" #: builtin/clone.c:894 msgid "unable to write parameters to config file" @@ -13024,13 +12795,13 @@ msgstr "無法執行 repack 來清理" msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "太多參數。" #: builtin/clone.c:1005 msgid "You must specify a repository to clone." -msgstr "您必須指定一個版本庫來複製。" +msgstr "您必須指定要複製的版本庫。" #: builtin/clone.c:1018 #, c-format @@ -13046,7 +12817,7 @@ msgstr "--bare 和 --separate-git-dir 選項不相容。" msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" @@ -13067,7 +12838,7 @@ msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" @@ -13091,7 +12862,7 @@ msgstr "正複製到 '%s'...\n" 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:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format @@ -13100,19 +12871,19 @@ msgstr "'%s' 不是一個有效的遠端名稱" #: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" #: 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:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" #: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" +msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" #: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" @@ -13122,14 +12893,18 @@ msgstr "源版本庫是淺複製，忽略 --local" msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: 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:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." -msgstr "您似乎複製了一個空版本庫。" +msgstr "您複製的版本庫似乎是空的。" #: builtin/column.c:10 msgid "git column [<options>]" @@ -13186,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:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "目錄" @@ -13280,7 +13055,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: 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" @@ -13308,13 +13083,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: 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:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "提交說明" @@ -13322,7 +13097,7 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 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 提交簽名" @@ -13467,7 +13242,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" @@ -13503,7 +13278,45 @@ msgstr "不能讀取 MERGE_MSG" msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:900 +#: 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" @@ -13517,7 +13330,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "後重試。\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13531,193 +13344,174 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "後重試。\n" -#: builtin/commit.c:915 -#, 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:923 -#, 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:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "無法將尾部署名傳遞至 --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: 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:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "正在合併中——不能重新輸入。" -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "正在揀選中——不能重新輸入。" -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" -#: builtin/commit.c:1226 +#: 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:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1285 +#: 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:1303 +#: 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:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知選項：--fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "版本" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: 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:1407 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: 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:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13725,202 +13519,201 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "何時" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "作者" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "日期" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: 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:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 -#| msgid "amend previous commit" +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾部署名" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: 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:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1737 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1744 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "提交說明內文空白，中止提交作業。\n" -#: builtin/commit.c:1824 +#: 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" @@ -14550,65 +14343,65 @@ msgstr "暫存檔存在於 '%s'。" msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "工具" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:716 +#: 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:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不相容" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" @@ -14631,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]" @@ -14696,7 +14489,7 @@ msgstr "使用 done 功能終止串流" msgid "skip output of blob data" msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "參照規格" @@ -14828,7 +14621,7 @@ msgstr "不抓取任何標籤(--no-tags)" #: 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/" @@ -14866,7 +14659,7 @@ msgstr "允許更新 HEAD 引用" #: 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:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" @@ -14903,9 +14696,8 @@ msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" #: builtin/fetch.c:210 -#, fuzzy msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "不取得包檔案。反之，輸出 negotiation tips 的祖先" +msgstr "不取得包檔案，而是輸出交涉的祖先提交" #: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" @@ -15010,8 +14802,8 @@ msgstr "%s 未傳送所有必需的物件\n" #: 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:1206 builtin/fetch.c:1357 #, c-format @@ -15111,58 +14903,62 @@ msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1995 +#: 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:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "使用 --negotiate-only 時必須提供遠端" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "協定不支援 --negotiate-only，結束。" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" -msgstr "--stdin 只能在擷取 (fetch) 一個遠端時使用" +msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" @@ -15255,19 +15051,19 @@ 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:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "未知" @@ -15283,16 +15079,16 @@ msgstr "%s %s 錯誤：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15301,211 +15097,211 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "已標記 %s %s (%s) 於 %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的頭節點（預設）" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" @@ -15782,8 +15578,8 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: 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" @@ -15798,243 +15594,243 @@ msgstr "無法讀取樹（%s）" msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "使用擴展的 POSIX 正規表示式" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正規表示式（預設）" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的正規表示式" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "分頁" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: 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:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked 不能與 --cached 一起使用" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" @@ -16157,30 +15953,30 @@ 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:348 +#: 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:380 +#: 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' 取得更多訊息" @@ -16217,7 +16013,7 @@ msgstr "輸入上的讀錯誤" msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:325 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 的定義" @@ -16244,233 +16040,233 @@ msgstr "包簽名不符合" msgid "pack version %<PRIu32> unsupported" msgstr "不支援包版本 %<PRIu32>" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c:587 +#: 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:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: 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:761 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:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "套用 delta 失敗" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1289 +#: 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:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1305 +#: 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:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "packfile 名稱「%s」的結尾不是「.%s」" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "無法儲存包檔案" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "無法儲存索引檔案" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: 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:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現存包檔案 '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1701 +#: 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:1708 +#: 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:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: 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:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: 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:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" @@ -16514,56 +16310,56 @@ msgstr "沒有在 %s 中找到範本" msgid "not copying templates from '%s': %s" msgstr "沒有從 '%s' 複製範本：%s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "無效的初始分支名稱：'%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "不能移動 %s 至 %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "嘗試以不同的雜湊值重新初始化版本庫" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s 已經存在" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: 忽略 --initial-branch=%s" -#: builtin/init-db.c:462 +#: 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:463 +#: 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:467 +#: 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:468 +#: 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:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16571,53 +16367,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " "[<目錄>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "權限" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "雜湊" -#: builtin/init-db.c:552 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:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir 和 --bare 互斥" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c:626 +#: 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:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 與純版本庫不相容" @@ -16724,85 +16520,85 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱 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:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: 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:1510 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:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1529 +#: 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" @@ -16812,288 +16608,288 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "header" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "信件位址" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "標記" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "簽名" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout、--output 和 --output-directory 互斥" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17291,7 +17087,6 @@ msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c:14 -#| msgid "git diff --no-index [<options>] <path> <path>" msgid "git mailinfo [<options>] <msg> <patch> < mail >info" msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info" @@ -17324,9 +17119,8 @@ msgid "re-code metadata to this encoding" msgstr "重新將中繼資料編碼為這個編碼方式" #: builtin/mailinfo.c:72 -#, fuzzy msgid "use scissors" -msgstr "使用 scissors" +msgstr "使用剪刀標記" #: builtin/mailinfo.c:73 msgid "<action>" @@ -17337,9 +17131,8 @@ msgid "action when quoted CR is found" msgstr "當找到可列印 CR 字元時所要採取的行為" #: builtin/mailinfo.c:77 -#, fuzzy msgid "use headers in message's body" -msgstr "在訊息本文部分使用標頭" +msgstr "在訊息內文中使用標頭" #: builtin/mailsplit.c:241 #, c-format @@ -17460,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' 需要一個值" @@ -17611,36 +17396,36 @@ msgstr "無合併訊息 -- 未更新 HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知選項：-X%s" -#: builtin/merge.c:760 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:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:821 +#: 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:827 +#: 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" @@ -17650,83 +17435,83 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:835 +#: 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:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "空提交說明。" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17734,7 +17519,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17742,88 +17527,88 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "您不能將 --squash 和 --no-ff 組合使用。" -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "您不能將 --squash 和 --commit 組合使用。" -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1718 +#: 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:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -17886,26 +17671,18 @@ msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" #: builtin/multi-pack-index.c:10 -#| msgid "" -#| "git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -#| "size=<size>)" msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" msgstr "git multi-pack-index [<選項>] write [--preferred-pack=<包>]" #: builtin/multi-pack-index.c:13 -#| msgid "git upload-pack [<options>] <dir>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<選項>] verify" #: builtin/multi-pack-index.c:16 -#| msgid "git upload-pack [<options>] <dir>" 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>] (write|verify|expire|repack --batch-" -#| "size=<size>)" msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]" @@ -17927,7 +17704,7 @@ msgid "" "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" @@ -18456,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 "不刪除，只顯示" @@ -18472,22 +18249,22 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: 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 " @@ -18495,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:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: 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:2339 builtin/pack-objects.c:2366 +#: 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:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18603,23 +18380,23 @@ msgstr "" "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " "<uri>' (收到 '%s')" -#: builtin/pack-objects.c:3004 +#: 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:3039 +#: 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:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18628,7 +18405,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18637,246 +18414,246 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "選項 --missing 的值無效" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "從標準輸入中讀取包" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "在增量壓縮時參考資料島" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "通訊協定" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:3934 +#: 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:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "無法將 --filter 及 --stdin-packs 結合使用" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "無法將內部版本清單與 --stdin-packs 結合使用" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18974,7 +18751,7 @@ msgstr "強制覆蓋本機分支" #: builtin/pull.c:201 msgid "number of submodules pulled in parallel" -msgstr "並發拉取的子模組的數量" +msgstr "並行拉取的子模組數量" #: builtin/pull.c:317 #, c-format @@ -19089,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" @@ -19111,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" @@ -19128,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 "本機子模組中有修改，無法重定基底" @@ -19198,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" @@ -19211,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" @@ -19226,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" @@ -19242,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" @@ -19250,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" @@ -19266,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" @@ -19279,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" @@ -19290,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 " @@ -19407,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 "推送選項不能有換行符號" @@ -19544,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" @@ -19716,7 +19493,7 @@ msgstr "切換到" #: builtin/rebase.c:545 msgid "the branch or commit to checkout" -msgstr "要檢出的分支或提交" +msgstr "要簽出的分支或提交" #: builtin/rebase.c:546 msgid "onto-name" @@ -19897,7 +19674,7 @@ msgstr "略過目前修補檔並繼續" # 譯者：請維持前導空格 #: builtin/rebase.c:1359 msgid "abort and check out the original branch" -msgstr "終止並檢出原有分支" +msgstr "終止並簽出原有分支" #: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" @@ -19973,7 +19750,7 @@ msgstr "即使已提供上游，仍套用所有變更" #: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起來 'git-am' 正在執行中。無法重定基底。" +msgstr "看起來 'git am' 正在執行中。無法重定基底。" #: builtin/rebase.c:1483 msgid "" @@ -20000,7 +19777,7 @@ msgstr "沒有正在進行的重定基底？" msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" @@ -20105,8 +19882,8 @@ msgstr "沒有指向一個有效的提交 '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" @@ -20174,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" @@ -20200,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" @@ -20211,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" @@ -20219,11 +19996,11 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "您必須指定一個目錄。" @@ -20922,7 +20699,6 @@ msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不相容" #: builtin/repack.c:527 -#| msgid "--long is incompatible with --abbrev=0" msgid "--geometric is incompatible with -A, -a" msgstr "--geometric 與 -A, -a 不相容" @@ -21190,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' 生成差異" @@ -21350,19 +21126,19 @@ msgstr "不能重設索引檔案至版本 '%s'。" msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "--objects 不相容標記計數 (marked counting)" @@ -21382,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" @@ -21396,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 [<選項>] <提交號>..." @@ -21506,7 +21338,7 @@ msgstr "" #: 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:221 builtin/rm.c:230 msgid "" @@ -21840,7 +21672,7 @@ msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" #: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" -msgstr "無法建立稀疏檢出檔案的目錄" +msgstr "無法建立稀疏簽出檔案的目錄" #: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" @@ -21851,13 +21683,12 @@ msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" #: builtin/sparse-checkout.c:290 -#| msgid "git sparse-checkout init [--cone]" msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" #: 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" @@ -21872,37 +21703,37 @@ msgstr "無法修改稀疏索引設定" msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" -msgstr "無法載入現存的稀疏檢出樣式" +msgstr "無法載入現存的稀疏簽出樣式" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" @@ -21926,10 +21757,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -22079,93 +21906,93 @@ msgstr "在儲藏區包含未追蹤檔案" msgid "only show untracked files in the stash" msgstr "只在儲藏區顯示未追蹤檔案" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1408 +#: 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:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22189,40 +22016,41 @@ msgstr "略過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: 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:1820 +#: 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:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: 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:525 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "進入 '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22231,7 +22059,7 @@ msgstr "" "對 %s 執行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22241,169 +22069,169 @@ msgstr "" "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: 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:573 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:600 +#: 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:667 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:671 +#: 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:681 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "隱藏初始化子模組的輸出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: 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:836 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: 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:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" -#: builtin/submodule--helper.c:888 +#: 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:894 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "無法雜湊來自 '%s' 的物件" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "非預期的模式 %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用儲存在索引中的提交而非子模組 HEAD" -#: builtin/submodule--helper.c:1303 -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:1305 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' 值設為 'all' 時略過子模組" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "限制摘要大小" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的版本" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached 和 --files 互斥" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "隱藏子模組 URL 同步的輸出" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22412,52 +22240,52 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1559 +#: 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:1567 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1596 +#: 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:1625 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "即使有本機變更仍移除子模組的工作區" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "取消註冊所有子模組" -#: builtin/submodule--helper.c:1631 +#: 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:1645 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1714 +#: 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" @@ -22469,46 +22297,67 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: 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:1792 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1823 +#: 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: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:1826 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22518,186 +22367,223 @@ msgstr "" ">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" "徑>" -#: builtin/submodule--helper.c:1874 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" - -#: builtin/submodule--helper.c:1885 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到子模組路徑 '%s'" - -#: builtin/submodule--helper.c:1889 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目錄不是空的：「%s」" - -#: builtin/submodule--helper.c:1901 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "無法得到 '%s' 的子模組目錄" - -#: builtin/submodule--helper.c:1937 +#: 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:1941 +#: 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:2042 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "複製 '%s' 失敗。按計劃重試" +msgstr "複製 '%s' 失敗。已排程重試作業" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "第二次嘗試複製 '%s' 失敗，離開" +msgstr "第二次嘗試複製 '%s' 失敗，中止作業" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "建立一個縮減至指定版本數的淺複製" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" -msgstr "並發任務" +msgstr "並行任務" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "初始複製是否應該遵守推薦的淺複製選項" +msgstr "初始複製是否應該遵循建議的淺複製選項" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:2358 +#: 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:2371 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:2419 +#: 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:2542 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2581 +#: 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:2637 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 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:2682 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:2686 +#: 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:2719 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:2725 +#: 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:2726 +#: 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:2733 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch 與 --default 互斥" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: 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:2799 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -23310,7 +23196,7 @@ msgstr "git worktree remove [<選項>] <工作區>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" @@ -23320,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" @@ -23347,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" @@ -23356,34 +23242,38 @@ 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:482 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "檢出 <分支>，即使已經被檢出到其它工作區" +msgstr "簽出 <分支>，即使已經被簽出到其它工作區" #: builtin/worktree.c:485 msgid "create a new branch" @@ -23401,82 +23291,90 @@ msgstr "生成新的工作區" msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:493 +#: 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:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:565 +#: 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:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "如果有則顯示延伸的註釋和原因" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose 和 --porcelain 互斥" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "鎖定原因" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: 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:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目標名稱" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23485,7 +23383,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23493,36 +23391,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23531,7 +23429,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23539,17 +23437,17 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修復：%s：%s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "錯誤：%s：%s" @@ -23762,7 +23660,6 @@ msgid "could not spawn daemon in the background" msgstr "無法在背景啟動 (spawn) 守護程式" #: t/helper/test-simple-ipc.c:356 -#| msgid "setsid failed" msgid "waitpid failed" msgstr "waitpid 失敗" @@ -23776,7 +23673,7 @@ msgstr "無法啟動守護程式" #: t/helper/test-simple-ipc.c:410 msgid "waitpid is confused" -msgstr "" +msgstr "waitpid 被混淆" #: t/helper/test-simple-ipc.c:541 msgid "daemon has not shutdown yet" @@ -23883,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:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23940,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 傳輸不支援 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'" @@ -24184,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" @@ -24224,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" @@ -24589,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" @@ -24866,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' 沒有檢出的提交" - -#: 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 目錄，與其對應的遠端版本庫：" +msgstr "'$sm_path' 沒有簽出的提交" -#: 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. " @@ -24950,47 +24807,47 @@ 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'" @@ -25283,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?" @@ -25685,39 +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:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命錯誤：命令「%s」中止，結束碼：%d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:321 +#: 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:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:493 +#: 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" @@ -25727,47 +25584,47 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: 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:501 +#: 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:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:573 +#: 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:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:577 +#: 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:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25782,12 +25639,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25797,17 +25654,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25820,37 +25677,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "摘要信件為空，略過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: 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:928 +#: 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:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25862,20 +25719,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 擴展為它自己\n" -#: git-send-email.perl:990 +#: 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:1048 git-send-email.perl:1056 +#: 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" @@ -25883,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:1060 +#: 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:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1460 +#: 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" @@ -25917,112 +25774,112 @@ 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:1475 +#: 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:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1571 +#: 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:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "結果：" -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: 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:1680 +#: 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:1737 +#: 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:1772 +#: 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:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:1890 +#: 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:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26033,12 +25890,12 @@ msgstr "" "%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: 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:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26047,17 +25904,32 @@ msgstr "" "致命錯誤：%s:%d 的字元數超過 998\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:1997 +#: 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:2001 +#: 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 不能同時使用。" @@ -26067,7 +25939,6 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "one" #~ msgstr "一方" -#, c-format #~ msgid "Already up to date!" #~ msgstr "已經是最新的！" @@ -26087,7 +25958,6 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ "對 rebase.useBuiltin 的支援已被刪除！\n" #~ "詳見 'git help config' 中的條目。" -#, perl-format #~ msgid "%s: patch contains a line longer than 998 characters" #~ msgstr "%s：修補檔包含一個超過 998 字元的行" @@ -26100,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 出現了多次" @@ -26155,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'" @@ -26178,6 +26044,5 @@ msgstr "您真的要傳送 %s？[y|N]：" #~ msgid "too many params" #~ msgstr "太多參數" -#, sh-format #~ msgid "Bad rev input: $arg" #~ msgstr "壞的輸入版本：$arg" |