@matheusbsbs / matheus-bagliano / commits / 710636a908
Fork 0

l10n: zh_TW.po: v2.27.0 round 1 (0 untranslated)

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed May 23, 2020 at 21:26 UTC 710636a908e93054196618487cd7c16d2b3dad88
1 file changed +4155 -3654
po/zh_TW.po
+4155 -3654
@@ -17,152 +17,304 @@
17 # - Zhuang Ya <zhuangya AT me.com>
18 #
19 # Git glossary for Chinese translators
20 +# updated on 5/23/2020
21 #
21 -# English | Chinese
22 -# ---------------------------------+--------------------------------------
23 -# 3-way merge | 三方合併
24 -# abbreviate | 簡寫（的 SHA-1 值）
25 -# alternate object database | 備用物件庫
26 -# amend | 修補
27 -# ancestor | 祖先，祖先提交
28 -# annotated tag | 附註標籤
29 -# bare repository | 純版本庫
30 -# bisect | 二分尋找
31 -# blob object | 資料物件
32 -# branch | 分支
33 -# bundle | 包
34 -# bypass | 繞過
35 -# cache | 索引（的別稱）
36 -# chain | （提交）鏈
37 -# changeset | 變更集
38 -# checkout | 簽出
39 -# checksum | 校驗，校驗和
40 -# cherry-picking | 揀選
41 -# clean | 乾淨（的工作區）
42 -# clone | 複製
43 -# commit | 提交
44 -# commit message | 提交說明
45 -# commit object | 提交物件
46 -# commit-ish (also committish) | 提交號
47 -# conflict | 衝突
48 -# core Git | 核心 Git 工具
49 -# cover letter | 附函
50 -# DAG | 有向無環圖
51 -# dangling object | 懸空物件
52 -# detached HEAD | 分離開頭指標
53 -# directory | 目錄
54 -# dirty | 髒（的工作區）
55 -# dumb HTTP protocol | 啞 HTTP 協定
56 -# evil merge | 壞合併（合併引入了父提交沒有的修改）
57 -# fast-forward | 快轉
58 -# fetch | 取得
59 -# file system | 檔案系統
60 -# fork | 衍生
61 -# Git archive | 版本庫（對於 arch 使用者）
62 -# gitfile | gitfile（版本庫連結檔案）
63 -# grafts | （提交）移植
64 -# hash | 雜湊值
65 -# HEAD | HEAD（開頭指標，亦即目前分支）
66 -# head | 頭、分支
67 -# head ref | 分支
68 -# header | 標頭訊息
69 -# hook | 掛鉤
70 -# hunk | 修補檔片段
71 -# index | 索引
72 -# index entry | 索引條目
73 -# loose object | 鬆散物件
74 -# loose refs | 鬆散引用
75 -# master | master（預設分支名）
76 -# merge | 合併
77 -# object | 物件
78 -# object database | 物件庫
79 -# object identifier | 物件識別元
80 -# object name | 物件名稱
81 -# object type | 物件類型
82 -# octopus | 章魚式合併（兩分支以上的合併）
83 -# origin | origin（預設的遠端名稱）
84 -# pack | 包
85 -# pack index | 包索引
86 -# packfile | 包檔案
87 -# parent | 父提交
88 -# patch | 修補檔
89 -# pathspec | 路徑規格
90 -# pattern | 模式
91 -# pickaxe | 挖掘
92 -# plumbing | 管件（Git 底層核心指令的別稱）
93 -# porcelain | 瓷件（Git 上層封裝指令的別稱）
94 -# precious-objects repo | 珍品版本庫
95 -# prune | 清除
96 -# pull | 拉，拉取
97 -# push | 推，推送
98 -# reachable | 可以取得
99 -# rebase | 重定基底
100 -# ref | 引用
101 -# reflog | 引用日誌
102 -# refspec | 引用規格
103 -# remote | 遠端，遠端版本庫
104 -# remote-tracking branch | 遠端追蹤分支
105 -# replay | 重放
106 -# repo | 版本庫
107 -# repository | 版本庫
108 -# resolve | （衝突）解決
109 -# revert | 還原提交
110 -# revision | 版本
111 -# rewind | 還原 (Fuzzy)
112 -# SCM | 原始碼管理（工具）
113 -# SHA-1 | SHA-1（安全雜湊演算法1）
114 -# shallow repository | 淺（複製）版本庫
115 -# signed tag | 簽名標籤
116 -# smart HTTP protocol | 智慧 HTTP 協定
117 -# squash | 壓縮
118 -# stage | n. 暫存區（即索引）; v. 暫存
119 -# stash | n. 儲藏區; v. 儲藏
120 -# submodule | 子模組
121 -# symref | 符號引用
122 -# tag | n. 標籤; v. 打標籤
123 -# tag object | 標籤物件
124 -# tagger | 打標籤者
125 -# topic branch | 主題分支
126 -# track | 追蹤
127 -# trailer | 尾部署名
128 -# tree | 樹（工作區或樹狀物件）
129 -# tree object | 樹狀物件
130 -# tree-ish (also treeish) | 樹狀物件（或可以解析為一樹狀物件）
131 -# unmerged index | 未合併索引
132 -# unpack | 解包
133 -# unreachable object | 無法取得物件
134 -# unstage | 取消暫存
135 -# upstream | 上游
136 -# upstream branch | 上游分支
137 -# working tree | 工作區
22 +# 原文 翻譯
23 +# 3 way merge 三方合併
24 +# ? ？
25 +# abbreviate 縮寫
26 +# abort 中止
27 +# Add 加入
28 +# all 所有
29 +# allow 允許
30 +# alternative 替代
31 +# Amend 修訂
32 +# annotate 附註
33 +# annotated tag 附註標籤
34 +# Apply 套用
35 +# argument 引數
36 +# argument 引數
37 +# Assume 假設
38 +# author 作者
39 +# bad 不良
40 +# Bare 祼
41 +# bare repo 祼版本庫
42 +# Bisect 二分法
43 +# Blame 究責
44 +# blob blob
45 +# bloom filter 布隆過濾器
46 +# Branch 分支
47 +# branch （動詞）建立分支
48 +# Branches 分支
49 +# browse 瀏覽
50 +# browser 瀏覽器
51 +# bug 臭蟲
52 +# Bug-ID Bug-ID
53 +# cache 快取
54 +# certificate 憑證
55 +# Change 變更
56 +# change 變更
57 +# changed 已變更
58 +# changes 變更
59 +# Check help file 查看說明檔案
60 +# checkbox 核取方塊
61 +# Checkout 檢出
62 +# checksum 總和檢查碼
63 +# Cherry Pick 摘取
64 +# clean 清除
65 +# cleanup 清理
66 +# clear 清空
67 +# click 按一下
68 +# client 用戶端
69 +# clipboard 剪貼簿
70 +# Clone 複製
71 +# Close 關閉
72 +# Collapse 收合
73 +# Color 色彩
74 +# Combine 結合
75 +# comment 評註
76 +# Commit 提交
77 +# committer 提交者
78 +# compare 比對
79 +# comparing 比對
80 +# Configure 設定
81 +# confirm 確認
82 +# Conflict 衝突
83 +# Context lines 情境列
84 +# context menu 快顯功能表
85 +# continue 繼續
86 +# continuous 持續性
87 +# copy 複製
88 +# Corrections 更正
89 +# Could not start 無法啟動
90 +# Create 建立
91 +# Creates 建立
92 +# Creating 建立中
93 +# Credential 憑證
94 +# Credential helper 憑證協助程式
95 +# Credentials 憑證
96 +# credentials 憑證
97 +# current 目前
98 +# custom 自訂
99 +# Customize 自訂
100 +# Daemon 守護程序
101 +# Date 日期
102 +# Default 預設
103 +# Delete 刪除
104 +# describe describe
105 +# description 描述
106 +# Destination 目的地
107 +# detach 分離
108 +# detect 偵測
109 +# Dialogs 對話框
110 +# Diff 差異
111 +# differences 差異
112 +# different 差異
113 +# dir 目錄
114 +# directory 目錄
115 +# Discard 丟棄
116 +# Display 顯示
117 +# double click 按兩下
118 +# edit 編輯
119 +# editor 編輯器
120 +# email email
121 +# Enable 啟用
122 +# Error code 錯誤碼
123 +# explicitly 顯式
124 +# Export 匯出
125 +# expression 表示式
126 +# extension 擴充套件
127 +# external 外部
128 +# fast forward 快進
129 +# fast-forward 快進
130 +# fetch 獲取
131 +# FETCH_HEAD FETCH_HEAD
132 +# file 檔案
133 +# files 檔案
134 +# filter 篩選
135 +# find 搜尋
136 +# Finish 完成
137 +# folder 資料夾
138 +# folders 資料夾
139 +# follow 跟隨
140 +# Force 強制
141 +# from 自
142 +# Git Git
143 +# Git for Windows Git for Windows
144 +# hash 雜湊
145 +# HEAD HEAD
146 +# highlight 標示
147 +# Hook 掛鉤
148 +# hunk 區塊
149 +# hunks 區塊
150 +# Ignore 忽略
151 +# Index 索引
152 +# Info 資訊
153 +# information 資訊
154 +# Init 初始化
155 +# initial checkout 初始簽出
156 +# Inline Diff 行內差異
157 +# inline diff 列內差異
158 +# is up to date 已最新
159 +# issue 議題
160 +# item 項目
161 +# items 項目
162 +# Keywords 關鍵字
163 +# label 標記
164 +# labels 標記
165 +# Last 最後
166 +# later 稍後
167 +# limitation 限制
168 +# line 列
169 +# lines 列
170 +# local 本地端
171 +# Local 本地端
172 +# Log 記錄
173 +# Merge 合併
174 +# merge 合併
175 +# message 訊息
176 +# Message 訊息
177 +# modify 修改
178 +# Name 名稱
179 +# Note 註
180 +# note 註
181 +# Notes 註解
182 +# Open 開啟
183 +# Options 選項
184 +# Ordering 順序
185 +# ORIG_HEAD ORIG_HEAD
186 +# Overlay 圖示覆蓋
187 +# pack 包裝
188 +# Parent 父
189 +# patch 補綴
190 +# patched 補綴
191 +# paths 路徑
192 +# pick 取
193 +# position 位置
194 +# preview 預覽
195 +# process 處理
196 +# program 程式
197 +# Project 專案
198 +# Prune 剪除
199 +# Pull 拉取
200 +# Pull Request 拉取請求
201 +# Push 推送
202 +# rebase 重定基底
203 +# rebase 重定基底
204 +# recover 還原
205 +# recovered 還原
206 +# recursively 遞迴
207 +# recycle bin 回收桶
208 +# redo 重做
209 +# Ref 參照
210 +# ref 參照
211 +# reference 參照
212 +# RefLog 參照日誌
213 +# refmap 參照映射
214 +# refs 參照
215 +# refspec 參照規格
216 +# Remote 遠端
217 +# remote branches 遠端分支
218 +# Remote-tracking branches 遠端跟蹤分支
219 +# remote-treacking branches 遠端追蹤分支
220 +# remove 移除
221 +# removed 已移除
222 +# repo 版本庫
223 +# repositories 版本庫
224 +# Repository 版本庫
225 +# request 要求
226 +# Reset 重設
227 +# resolve 解決
228 +# rest 其餘的
229 +# Restore 還原
230 +# Revert 復原
231 +# reverted 已復原
232 +# review 檢閱
233 +# revision 修訂版
234 +# revisions 版本
235 +# script 指令稿
236 +# Scripts 指令稿
237 +# sections 部分
238 +# Show 顯示
239 +# sign 簽署
240 +# signed 已簽署
241 +# skip 略過
242 +# special 特殊
243 +# Squash 壓合
244 +# stage 暫存
245 +# stage 暫存
246 +# staged 已暫存
247 +# staging area 暫存區
248 +# Stash 收藏
249 +# Status 狀態
250 +# subject 主旨
251 +# Submodule 子模組
252 +# Superproject 上層專案
253 +# Switch 切換
254 +# tag （動詞）貼標籤
255 +# Tag 標籤
256 +# tagger 貼標籤者
257 +# tags 標籤
258 +# task 工作
259 +# thesaurus 同義字
260 +# three way 三方
261 +# Track 跟蹤
262 +# Tracked 跟蹤中
263 +# tracking 跟蹤
264 +# tree 樹
265 +# two 2
266 +# type 類型
267 +# unchanged 未變更
268 +# Undo 復原
269 +# Unified diff 單一差異
270 +# unified diff 統合式差異
271 +# Unknown 未知
272 +# unstash 取消收藏
273 +# Untracked 未跟蹤的
274 +# Unversioned 無版控
275 +# Update 更新
276 +# UpStream 上游
277 +# user 使用者
278 +# username 使用者名稱
279 +# vanilla 原
280 +# verify 核驗
281 +# view 檢視
282 +# viewer 檢視器
283 +# Warning 警告
284 +# whitespace 空白字元
285 +# whitespaces 空白字元
286 +# working 工作
287 +# working copy 工作複本
288 +# Working tree 工作目錄
289 +# You might need 您可能需要
290 #
291 msgid ""
292 msgstr ""
293 "Project-Id-Version: Git\n"
294 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
143 -"POT-Creation-Date: 2020-03-11 15:26+0800\n"
144 -"PO-Revision-Date: 2020-03-15 01:48+0800\n"
295 +"POT-Creation-Date: 2020-05-15 09:11+0800\n"
296 +"PO-Revision-Date: 2020-05-23 21:36+0800\n"
297 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
146 -"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
298 +"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
299 "Language: zh_TW\n"
300 "MIME-Version: 1.0\n"
301 "Content-Type: text/plain; charset=UTF-8\n"
302 "Content-Transfer-Encoding: 8bit\n"
303 +"Plural-Forms: nplurals=1; plural=0;\n"
304 +"X-Generator: Poedit 2.3.1\n"
305 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
306 "zhconvert.org\n"
153 -"Plural-Forms: nplurals=1; plural=0;\n"
154 -"X-Generator: Poedit 2.3\n"
307
308 #: add-interactive.c:368
309 #, c-format
310 msgid "Huh (%s)?"
311 msgstr "嗯（%s）？"
312
161 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
162 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
163 -#: builtin/rebase.c:2086 builtin/rebase.c:2130
313 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
314 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
315 +#: builtin/rebase.c:1919
316 msgid "could not read index"
165 -msgstr "不能讀取索引"
317 +msgstr "無法讀取索引"
318
319 #: add-interactive.c:576 git-add--interactive.perl:269
320 #: git-add--interactive.perl:294
@@ -177,7 +329,7 @@ msgstr "無"
329 #: add-interactive.c:635 git-add--interactive.perl:314
330 #: git-add--interactive.perl:329
331 msgid "unchanged"
180 -msgstr "沒有修改"
332 +msgstr "未變更"
333
334 #: add-interactive.c:672 git-add--interactive.perl:643
335 msgid "Update"
@@ -186,29 +338,28 @@ msgstr "更新"
338 #: add-interactive.c:689 add-interactive.c:877
339 #, c-format
340 msgid "could not stage '%s'"
189 -msgstr "不能暫存 '%s'"
341 +msgstr "無法暫存「%s」"
342
191 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
192 -#: builtin/rebase.c:899
343 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
344 msgid "could not write index"
194 -msgstr "不能寫入索引"
345 +msgstr "無法寫入索引"
346
347 #: add-interactive.c:698 git-add--interactive.perl:628
348 #, c-format, perl-format
349 msgid "updated %d path\n"
350 msgid_plural "updated %d paths\n"
200 -msgstr[0] "更新了 %d 個路徑\n"
351 +msgstr[0] "已更新 %d 個路徑\n"
352
353 #: add-interactive.c:716 git-add--interactive.perl:678
354 #, c-format, perl-format
355 msgid "note: %s is untracked now.\n"
205 -msgstr "說明：%s 現已成為未追蹤的。\n"
356 +msgstr "註：%s 現已不再追蹤。\n"
357
207 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
208 -#: builtin/reset.c:144
358 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
359 +#: builtin/reset.c:145
360 #, c-format
361 msgid "make_cache_entry failed for path '%s'"
211 -msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"
362 +msgstr "「%s」路徑執行 make_cache_entry 失敗"
363
364 #: add-interactive.c:751 git-add--interactive.perl:655
365 msgid "Revert"
@@ -326,11 +477,11 @@ msgstr "選擇編號過的項目"
477 msgid "(empty) select nothing"
478 msgstr "（空）全不選取"
479
329 -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
480 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
481 msgid "*** Commands ***"
482 msgstr "*** 指令 ***"
483
333 -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
484 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
485 msgid "What now"
486 msgstr "請選擇"
487
@@ -342,12 +493,13 @@ msgstr "快取"
493 msgid "unstaged"
494 msgstr "未快取"
495
345 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
346 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
347 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
496 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
497 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
498 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
499 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
500 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
350 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
501 +#: builtin/submodule--helper.c:2148 bugreport.c:129
502 +#: git-add--interactive.perl:213
503 msgid "path"
504 msgstr "路徑"
505
@@ -355,33 +507,33 @@ msgstr "路徑"
507 msgid "could not refresh index"
508 msgstr "無法重新整理索引"
509
358 -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
510 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
511 #, c-format
512 msgid "Bye.\n"
513 msgstr "再見。\n"
514
363 -#: add-patch.c:33 git-add--interactive.perl:1428
515 +#: add-patch.c:34 git-add--interactive.perl:1428
516 #, c-format, perl-format
517 msgid "Stage mode change [y,n,q,a,d%s,?]? "
518 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
519
368 -#: add-patch.c:34 git-add--interactive.perl:1429
520 +#: add-patch.c:35 git-add--interactive.perl:1429
521 #, c-format, perl-format
522 msgid "Stage deletion [y,n,q,a,d%s,?]? "
523 msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
524
373 -#: add-patch.c:35 git-add--interactive.perl:1430
525 +#: add-patch.c:36 git-add--interactive.perl:1430
526 #, c-format, perl-format
527 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
528 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
529
378 -#: add-patch.c:37
530 +#: add-patch.c:38
531 msgid ""
532 "If the patch applies cleanly, the edited hunk will immediately be marked for "
533 "staging."
534 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
535
384 -#: add-patch.c:40
536 +#: add-patch.c:41
537 msgid ""
538 "y - stage this hunk\n"
539 "n - do not stage this hunk\n"
@@ -395,28 +547,28 @@ msgstr ""
547 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
548 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"
549
398 -#: add-patch.c:54 git-add--interactive.perl:1433
550 +#: add-patch.c:55 git-add--interactive.perl:1433
551 #, c-format, perl-format
552 msgid "Stash mode change [y,n,q,a,d%s,?]? "
553 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
554
403 -#: add-patch.c:55 git-add--interactive.perl:1434
555 +#: add-patch.c:56 git-add--interactive.perl:1434
556 #, c-format, perl-format
557 msgid "Stash deletion [y,n,q,a,d%s,?]? "
558 msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "
559
408 -#: add-patch.c:56 git-add--interactive.perl:1435
560 +#: add-patch.c:57 git-add--interactive.perl:1435
561 #, c-format, perl-format
562 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
563 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
564
413 -#: add-patch.c:58
565 +#: add-patch.c:59
566 msgid ""
567 "If the patch applies cleanly, the edited hunk will immediately be marked for "
568 "stashing."
569 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
570
419 -#: add-patch.c:61
571 +#: add-patch.c:62
572 msgid ""
573 "y - stash this hunk\n"
574 "n - do not stash this hunk\n"
@@ -430,28 +582,28 @@ msgstr ""
582 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
583 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
584
433 -#: add-patch.c:77 git-add--interactive.perl:1438
585 +#: add-patch.c:78 git-add--interactive.perl:1438
586 #, c-format, perl-format
587 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
588 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
589
438 -#: add-patch.c:78 git-add--interactive.perl:1439
590 +#: add-patch.c:79 git-add--interactive.perl:1439
591 #, c-format, perl-format
592 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
593 msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
594
443 -#: add-patch.c:79 git-add--interactive.perl:1440
595 +#: add-patch.c:80 git-add--interactive.perl:1440
596 #, c-format, perl-format
597 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
598 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
599
448 -#: add-patch.c:81
600 +#: add-patch.c:82
601 msgid ""
602 "If the patch applies cleanly, the edited hunk will immediately be marked for "
603 "unstaging."
604 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
605
454 -#: add-patch.c:84
606 +#: add-patch.c:85
607 msgid ""
608 "y - unstage this hunk\n"
609 "n - do not unstage this hunk\n"
@@ -465,28 +617,28 @@ msgstr ""
617 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
618 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
619
468 -#: add-patch.c:99 git-add--interactive.perl:1443
620 +#: add-patch.c:100 git-add--interactive.perl:1443
621 #, c-format, perl-format
622 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
623 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
624
473 -#: add-patch.c:100 git-add--interactive.perl:1444
625 +#: add-patch.c:101 git-add--interactive.perl:1444
626 #, c-format, perl-format
627 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
628 msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "
629
478 -#: add-patch.c:101 git-add--interactive.perl:1445
630 +#: add-patch.c:102 git-add--interactive.perl:1445
631 #, c-format, perl-format
632 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
633 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
634
483 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211
635 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212
636 msgid ""
637 "If the patch applies cleanly, the edited hunk will immediately be marked for "
638 "applying."
639 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
640
489 -#: add-patch.c:106
641 +#: add-patch.c:107
642 msgid ""
643 "y - apply this hunk to index\n"
644 "n - do not apply this hunk to index\n"
@@ -500,31 +652,31 @@ msgstr ""
652 "a - 套用此區塊和本檔案中後面的全部區塊\n"
653 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
654
503 -#: add-patch.c:121 git-add--interactive.perl:1448
655 +#: add-patch.c:122 git-add--interactive.perl:1448
656 #: git-add--interactive.perl:1463
657 #, c-format, perl-format
658 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
659 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
660
509 -#: add-patch.c:122 git-add--interactive.perl:1449
661 +#: add-patch.c:123 git-add--interactive.perl:1449
662 #: git-add--interactive.perl:1464
663 #, c-format, perl-format
664 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
665 msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "
666
515 -#: add-patch.c:123 git-add--interactive.perl:1450
667 +#: add-patch.c:124 git-add--interactive.perl:1450
668 #: git-add--interactive.perl:1465
669 #, c-format, perl-format
670 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
671 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
672
521 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190
673 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191
674 msgid ""
675 "If the patch applies cleanly, the edited hunk will immediately be marked for "
676 "discarding."
677 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
678
527 -#: add-patch.c:128 add-patch.c:193
679 +#: add-patch.c:129 add-patch.c:194
680 msgid ""
681 "y - discard this hunk from worktree\n"
682 "n - do not discard this hunk from worktree\n"
@@ -538,22 +690,22 @@ msgstr ""
690 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
691 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
692
541 -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
693 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
694 #, c-format, perl-format
695 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
696 msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
697
546 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
698 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
699 #, c-format, perl-format
700 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
701 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
702
551 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
703 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
704 #, c-format, perl-format
705 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
706 msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
707
556 -#: add-patch.c:150
708 +#: add-patch.c:151
709 msgid ""
710 "y - discard this hunk from index and worktree\n"
711 "n - do not discard this hunk from index and worktree\n"
@@ -567,22 +719,22 @@ msgstr ""
719 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
720 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
721
570 -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
722 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
723 #, c-format, perl-format
724 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
725 msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
726
575 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
727 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
728 #, c-format, perl-format
729 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
730 msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
731
580 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
732 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
733 #, c-format, perl-format
734 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
735 msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
736
585 -#: add-patch.c:171
737 +#: add-patch.c:172
738 msgid ""
739 "y - apply this hunk to index and worktree\n"
740 "n - do not apply this hunk to index and worktree\n"
@@ -596,7 +748,7 @@ msgstr ""
748 "a - 套用此區塊和本檔案中後面的全部區塊\n"
749 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
750
599 -#: add-patch.c:214
751 +#: add-patch.c:215
752 msgid ""
753 "y - apply this hunk to worktree\n"
754 "n - do not apply this hunk to worktree\n"
@@ -610,40 +762,40 @@ msgstr ""
762 "a - 套用此區塊和本檔案中後面的全部區塊\n"
763 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
764
613 -#: add-patch.c:318
765 +#: add-patch.c:319
766 #, c-format
767 msgid "could not parse hunk header '%.*s'"
768 msgstr "無法解析區塊標頭 '%.*s'"
769
618 -#: add-patch.c:337 add-patch.c:341
770 +#: add-patch.c:338 add-patch.c:342
771 #, c-format
772 msgid "could not parse colored hunk header '%.*s'"
773 msgstr "無法解析上色過的區塊標頭 '%.*s'"
774
623 -#: add-patch.c:395
775 +#: add-patch.c:396
776 msgid "could not parse diff"
777 msgstr "無法解析差異 (diff)"
778
627 -#: add-patch.c:414
779 +#: add-patch.c:415
780 msgid "could not parse colored diff"
781 msgstr "無法解析上色過的差異 (diff)"
782
631 -#: add-patch.c:428
783 +#: add-patch.c:429
784 #, c-format
785 msgid "failed to run '%s'"
786 msgstr "無法執行 '%s'"
787
636 -#: add-patch.c:587
788 +#: add-patch.c:588
789 msgid "mismatched output from interactive.diffFilter"
790 msgstr "interactive.diffFilter 的輸出不符"
791
640 -#: add-patch.c:588
792 +#: add-patch.c:589
793 msgid ""
794 "Your filter must maintain a one-to-one correspondence\n"
795 "between its input and output lines."
796 msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"
797
646 -#: add-patch.c:761
798 +#: add-patch.c:762
799 #, c-format
800 msgid ""
801 "expected context line #%d in\n"
@@ -652,7 +804,7 @@ msgstr ""
804 "應有上下文行 #%d 於\n"
805 "%.*s"
806
655 -#: add-patch.c:776
807 +#: add-patch.c:777
808 #, c-format
809 msgid ""
810 "hunks do not overlap:\n"
@@ -665,11 +817,11 @@ msgstr ""
817 "\t不以下述結尾：\n"
818 "%.*s"
819
668 -#: add-patch.c:1052 git-add--interactive.perl:1112
820 +#: add-patch.c:1053 git-add--interactive.perl:1112
821 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
822 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
823
672 -#: add-patch.c:1056
824 +#: add-patch.c:1057
825 #, c-format
826 msgid ""
827 "---\n"
@@ -683,7 +835,7 @@ msgstr ""
835 "以 %c 開始的行將被刪除。\n"
836
837 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
686 -#: add-patch.c:1070 git-add--interactive.perl:1126
838 +#: add-patch.c:1071 git-add--interactive.perl:1126
839 msgid ""
840 "If it does not apply cleanly, you will be given an opportunity to\n"
841 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -692,11 +844,11 @@ msgstr ""
844 "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
845 "此次編輯被終止，此區塊不會被修改。\n"
846
695 -#: add-patch.c:1103
847 +#: add-patch.c:1104
848 msgid "could not parse hunk header"
849 msgstr "無法解析區塊標頭"
850
699 -#: add-patch.c:1148
851 +#: add-patch.c:1149
852 msgid "'git apply --cached' failed"
853 msgstr "「git apply --cached」失敗"
854
@@ -816,37 +968,46 @@ msgstr "對不起，不能編輯這個區塊"
968 msgid "'git apply' failed"
969 msgstr "'git apply' 失敗"
970
819 -#: advice.c:115
971 +#: advice.c:140
972 +#, c-format
973 +msgid ""
974 +"\n"
975 +"Disable this message with \"git config advice.%s false\""
976 +msgstr ""
977 +"\n"
978 +"請使用「git config advice.%s false」來停用此訊息"
979 +
980 +#: advice.c:156
981 #, c-format
982 msgid "%shint: %.*s%s\n"
983 msgstr "%s提示：%.*s%s\n"
984
824 -#: advice.c:168
985 +#: advice.c:247
986 msgid "Cherry-picking is not possible because you have unmerged files."
987 msgstr "無法揀選，因為您有未合併的檔案。"
988
828 -#: advice.c:170
989 +#: advice.c:249
990 msgid "Committing is not possible because you have unmerged files."
991 msgstr "無法提交，因為您有未合併的檔案。"
992
832 -#: advice.c:172
993 +#: advice.c:251
994 msgid "Merging is not possible because you have unmerged files."
995 msgstr "無法合併，因為您有未合併的檔案。"
996
836 -#: advice.c:174
997 +#: advice.c:253
998 msgid "Pulling is not possible because you have unmerged files."
999 msgstr "無法拉取，因為您有未合併的檔案。"
1000
840 -#: advice.c:176
1001 +#: advice.c:255
1002 msgid "Reverting is not possible because you have unmerged files."
1003 msgstr "無法還原提交，因為您有未合併的檔案。"
1004
844 -#: advice.c:178
1005 +#: advice.c:257
1006 #, c-format
1007 msgid "It is not possible to %s because you have unmerged files."
1008 msgstr "無法 %s，因為您有未合併的檔案。"
1009
849 -#: advice.c:186
1010 +#: advice.c:265
1011 msgid ""
1012 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
1013 "as appropriate to mark resolution and make a commit."
@@ -854,23 +1015,23 @@ msgstr ""
1015 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
1016 "解決方案並提交。"
1017
857 -#: advice.c:194
1018 +#: advice.c:273
1019 msgid "Exiting because of an unresolved conflict."
1020 msgstr "因為存在未解決的衝突而離開。"
1021
861 -#: advice.c:199 builtin/merge.c:1335
1022 +#: advice.c:278 builtin/merge.c:1353
1023 msgid "You have not concluded your merge (MERGE_HEAD exists)."
1024 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
1025
865 -#: advice.c:201
1026 +#: advice.c:280
1027 msgid "Please, commit your changes before merging."
1028 msgstr "請在合併前先提交您的修改。"
1029
869 -#: advice.c:202
1030 +#: advice.c:281
1031 msgid "Exiting because of unfinished merge."
1032 msgstr "因為存在未完成的合併而離開。"
1033
873 -#: advice.c:208
1034 +#: advice.c:287
1035 #, c-format
1036 msgid ""
1037 "Note: switching to '%s'.\n"
@@ -921,12 +1082,12 @@ msgstr "未閉合的引號"
1082 #: apply.c:69
1083 #, c-format
1084 msgid "unrecognized whitespace option '%s'"
924 -msgstr "未能識別的空白字元選項 '%s'"
1085 +msgstr "無法識別的空白字元選項 '%s'"
1086
1087 #: apply.c:85
1088 #, c-format
1089 msgid "unrecognized whitespace ignore option '%s'"
929 -msgstr "未能識別的空白字元忽略選項 '%s'"
1090 +msgstr "無法識別的空白字元忽略選項 '%s'"
1091
1092 #: apply.c:135
1093 msgid "--reject and --3way cannot be used together."
@@ -1054,7 +1215,7 @@ msgstr "二進位修補檔在第 %d 行損壞：%.*s"
1215 #: apply.c:2015
1216 #, c-format
1217 msgid "unrecognized binary patch at line %d"
1057 -msgstr "未能識別的二進位修補檔位於第 %d 行"
1218 +msgstr "無法識別的二進位修補檔位於第 %d 行"
1219
1220 #: apply.c:2177
1221 #, c-format
@@ -1080,7 +1241,7 @@ msgstr "無效的行首字元：'%c'"
1241 #, c-format
1242 msgid "Hunk #%d succeeded at %d (offset %d line)."
1243 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1083 -msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）"
1244 +msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
1245
1246 #: apply.c:3069
1247 #, c-format
@@ -1145,9 +1306,9 @@ msgstr "打修補檔失敗：%s:%ld"
1306 #: apply.c:3353
1307 #, c-format
1308 msgid "cannot checkout %s"
1148 -msgstr "不能簽出 %s"
1309 +msgstr "不能檢出 %s"
1310
1150 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
1311 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
1312 #, c-format
1313 msgid "failed to read %s"
1314 msgstr "無法讀取 %s"
@@ -1341,7 +1502,7 @@ msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
1502 msgid "truncating .rej filename to %.*s.rej"
1503 msgstr "截短 .rej 檔案名為 %.*s.rej"
1504
1344 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
1505 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
1506 #, c-format
1507 msgid "cannot open %s"
1508 msgstr "不能開啟 %s"
@@ -1363,7 +1524,7 @@ msgstr "略過修補檔 '%s'。"
1524
1525 #: apply.c:4706
1526 msgid "unrecognized input"
1366 -msgstr "未能識別的輸入"
1527 +msgstr "無法識別的輸入"
1528
1529 #: apply.c:4726
1530 msgid "unable to read index file"
@@ -1404,7 +1565,7 @@ msgstr "不要應用與給出路徑向符合的變更"
1565 msgid "apply changes matching the given path"
1566 msgstr "應用與給出路徑向符合的變更"
1567
1407 -#: apply.c:4973 builtin/am.c:2260
1568 +#: apply.c:4973 builtin/am.c:2259
1569 msgid "num"
1570 msgstr "數字"
1571
@@ -1460,7 +1621,7 @@ msgstr "如果一個修補檔不能應用則嘗試三方合併"
1621 msgid "build a temporary index based on embedded index information"
1622 msgstr "建立一個暫時索引基於嵌入的索引訊息"
1623
1463 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
1624 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
1625 msgid "paths are separated with NUL character"
1626 msgstr "路徑以 NUL 字元分隔"
1627
@@ -1468,9 +1629,9 @@ msgstr "路徑以 NUL 字元分隔"
1629 msgid "ensure at least <n> lines of context match"
1630 msgstr "確保至少符合 <n> 行上下文"
1631
1471 -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
1632 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
1633 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1473 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1634 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
1635 msgid "action"
1636 msgstr "動作"
1637
@@ -1499,8 +1660,8 @@ msgid "allow overlapping hunks"
1660 msgstr "允許重疊的修補檔片段"
1661
1662 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1502 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
1503 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1663 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
1664 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
1665 msgid "be verbose"
1666 msgstr "詳細輸出"
1667
@@ -1512,7 +1673,7 @@ msgstr "允許不正確的檔案末尾換行符號"
1673 msgid "do not trust the line counts in the hunk headers"
1674 msgstr "不信任修補檔片段的標頭訊息中的行號"
1675
1515 -#: apply.c:5032 builtin/am.c:2248
1676 +#: apply.c:5032 builtin/am.c:2247
1677 msgid "root"
1678 msgstr "根目錄"
1679
@@ -1520,6 +1681,55 @@ msgstr "根目錄"
1681 msgid "prepend <root> to all filenames"
1682 msgstr "為所有檔案名前新增 <根目錄>"
1683
1684 +#: archive-tar.c:125 archive-zip.c:351
1685 +#, c-format
1686 +msgid "cannot stream blob %s"
1687 +msgstr "不能開啟資料物件 %s"
1688 +
1689 +#: archive-tar.c:266 archive-zip.c:369
1690 +#, c-format
1691 +msgid "unsupported file mode: 0%o (SHA1: %s)"
1692 +msgstr "不支援的檔案模式：0%o (SHA1: %s)"
1693 +
1694 +#: archive-tar.c:293 archive-zip.c:359
1695 +#, c-format
1696 +msgid "cannot read %s"
1697 +msgstr "不能讀取 %s"
1698 +
1699 +#: archive-tar.c:465
1700 +#, c-format
1701 +msgid "unable to start '%s' filter"
1702 +msgstr "無法啟動 '%s' 過濾器"
1703 +
1704 +#: archive-tar.c:468
1705 +msgid "unable to redirect descriptor"
1706 +msgstr "無法重定向描述符"
1707 +
1708 +#: archive-tar.c:475
1709 +#, c-format
1710 +msgid "'%s' filter reported error"
1711 +msgstr "'%s' 過濾器報告了錯誤"
1712 +
1713 +#: archive-zip.c:319
1714 +#, c-format
1715 +msgid "path is not valid UTF-8: %s"
1716 +msgstr "路徑不是有效的 UTF-8：%s"
1717 +
1718 +#: archive-zip.c:323
1719 +#, c-format
1720 +msgid "path too long (%d chars, SHA1: %s): %s"
1721 +msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1722 +
1723 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
1724 +#, c-format
1725 +msgid "deflate error (%d)"
1726 +msgstr "壓縮錯誤 (%d)"
1727 +
1728 +#: archive-zip.c:615
1729 +#, c-format
1730 +msgid "timestamp too large for this system: %<PRIuMAX>"
1731 +msgstr "對於本系統時間戳太大：%<PRIuMAX>"
1732 +
1733 #: archive.c:14
1734 msgid "git archive [<options>] <tree-ish> [<path>...]"
1735 msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
@@ -1538,172 +1748,123 @@ msgstr ""
1748 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1749 msgstr "git archive --remote <版本庫> [--exec <指令>] --list"
1750
1541 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1751 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1752 #, c-format
1753 msgid "pathspec '%s' did not match any files"
1754 msgstr "路徑規格 '%s' 未符合任何檔案"
1755
1546 -#: archive.c:396
1756 +#: archive.c:401
1757 #, c-format
1758 msgid "no such ref: %.*s"
1759 msgstr "無此引用：%.*s"
1760
1551 -#: archive.c:401
1761 +#: archive.c:407
1762 #, c-format
1763 msgid "not a valid object name: %s"
1764 msgstr "不是一個有效的物件名：%s"
1765
1556 -#: archive.c:414
1766 +#: archive.c:420
1767 #, c-format
1768 msgid "not a tree object: %s"
1769 msgstr "不是一個樹狀物件：%s"
1770
1561 -#: archive.c:426
1771 +#: archive.c:432
1772 msgid "current working directory is untracked"
1773 msgstr "目前工作目錄未被追蹤"
1774
1565 -#: archive.c:457
1775 +#: archive.c:464
1776 msgid "fmt"
1777 msgstr "格式"
1778
1569 -#: archive.c:457
1779 +#: archive.c:464
1780 msgid "archive format"
1781 msgstr "歸檔格式"
1782
1573 -#: archive.c:458 builtin/log.c:1653
1783 +#: archive.c:465 builtin/log.c:1674
1784 msgid "prefix"
1785 msgstr "前綴"
1786
1577 -#: archive.c:459
1787 +#: archive.c:466
1788 msgid "prepend prefix to each pathname in the archive"
1789 msgstr "為歸檔中每個路徑名加上前綴"
1790
1581 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1791 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1792 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1583 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
1584 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1793 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
1794 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
1795 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1796 #: parse-options.h:190
1797 msgid "file"
1798 msgstr "檔案"
1799
1590 -#: archive.c:461 builtin/archive.c:90
1800 +#: archive.c:468 builtin/archive.c:90
1801 msgid "write the archive to this file"
1802 msgstr "歸檔寫入此檔案"
1803
1594 -#: archive.c:463
1804 +#: archive.c:470
1805 msgid "read .gitattributes in working directory"
1806 msgstr "讀取工作區中的 .gitattributes"
1807
1598 -#: archive.c:464
1808 +#: archive.c:471
1809 msgid "report archived files on stderr"
1810 msgstr "在標準錯誤上報告歸檔檔案"
1811
1602 -#: archive.c:465
1812 +#: archive.c:472
1813 msgid "store only"
1814 msgstr "只儲存"
1815
1606 -#: archive.c:466
1816 +#: archive.c:473
1817 msgid "compress faster"
1818 msgstr "壓縮速度更快"
1819
1610 -#: archive.c:474
1820 +#: archive.c:481
1821 msgid "compress better"
1822 msgstr "壓縮效果更好"
1823
1614 -#: archive.c:477
1824 +#: archive.c:484
1825 msgid "list supported archive formats"
1826 msgstr "列出支援的歸檔格式"
1827
1618 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1828 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1829 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1830 msgid "repo"
1831 msgstr "版本庫"
1832
1623 -#: archive.c:480 builtin/archive.c:92
1833 +#: archive.c:487 builtin/archive.c:92
1834 msgid "retrieve the archive from remote repository <repo>"
1835 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
1836
1627 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
1837 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
1838 #: builtin/notes.c:498
1839 msgid "command"
1840 msgstr "指令"
1841
1632 -#: archive.c:482 builtin/archive.c:94
1842 +#: archive.c:489 builtin/archive.c:94
1843 msgid "path to the remote git-upload-archive command"
1844 msgstr "遠端 git-upload-archive 指令的路徑"
1845
1636 -#: archive.c:489
1846 +#: archive.c:496
1847 msgid "Unexpected option --remote"
1848 msgstr "未知參數 --remote"
1849
1640 -#: archive.c:491
1850 +#: archive.c:498
1851 msgid "Option --exec can only be used together with --remote"
1852 msgstr "選項 --exec 只能和 --remote 同時使用"
1853
1644 -#: archive.c:493
1854 +#: archive.c:500
1855 msgid "Unexpected option --output"
1856 msgstr "未知參數 --output"
1857
1648 -#: archive.c:515
1858 +#: archive.c:522
1859 #, c-format
1860 msgid "Unknown archive format '%s'"
1861 msgstr "未知歸檔格式 '%s'"
1862
1653 -#: archive.c:522
1863 +#: archive.c:529
1864 #, c-format
1865 msgid "Argument not supported for format '%s': -%d"
1866 msgstr "參數不支援此格式 '%s'：-%d"
1867
1658 -#: archive-tar.c:125 archive-zip.c:351
1659 -#, c-format
1660 -msgid "cannot stream blob %s"
1661 -msgstr "不能開啟資料物件 %s"
1662 -
1663 -#: archive-tar.c:266 archive-zip.c:369
1664 -#, c-format
1665 -msgid "unsupported file mode: 0%o (SHA1: %s)"
1666 -msgstr "不支援的檔案模式：0%o (SHA1: %s)"
1667 -
1668 -#: archive-tar.c:293 archive-zip.c:359
1669 -#, c-format
1670 -msgid "cannot read %s"
1671 -msgstr "不能讀取 %s"
1672 -
1673 -#: archive-tar.c:465
1674 -#, c-format
1675 -msgid "unable to start '%s' filter"
1676 -msgstr "無法啟動 '%s' 過濾器"
1677 -
1678 -#: archive-tar.c:468
1679 -msgid "unable to redirect descriptor"
1680 -msgstr "無法重定向描述符"
1681 -
1682 -#: archive-tar.c:475
1683 -#, c-format
1684 -msgid "'%s' filter reported error"
1685 -msgstr "'%s' 過濾器報告了錯誤"
1686 -
1687 -#: archive-zip.c:319
1688 -#, c-format
1689 -msgid "path is not valid UTF-8: %s"
1690 -msgstr "路徑不是有效的 UTF-8：%s"
1691 -
1692 -#: archive-zip.c:323
1693 -#, c-format
1694 -msgid "path too long (%d chars, SHA1: %s): %s"
1695 -msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1696 -
1697 -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
1698 -#, c-format
1699 -msgid "deflate error (%d)"
1700 -msgstr "壓縮錯誤 (%d)"
1701 -
1702 -#: archive-zip.c:615
1703 -#, c-format
1704 -msgid "timestamp too large for this system: %<PRIuMAX>"
1705 -msgstr "對於本系統時間戳太大：%<PRIuMAX>"
1706 -
1868 #: attr.c:212
1869 #, c-format
1870 msgid "%.*s is not a valid attribute name"
@@ -1720,7 +1881,7 @@ msgid ""
1881 "Use '\\!' for literal leading exclamation."
1882 msgstr ""
1883 "反向模式在 git attributes 中被忽略\n"
1723 -"當字串確實要以驚嘆號開始時，使用 '\\!'。"
1884 +"當字串確定要以驚嘆號開始時，使用 '\\!'。"
1885
1886 #: bisect.c:468
1887 #, c-format
@@ -1796,12 +1957,12 @@ msgstr "二分尋找中：合併基礎必須是經過測試的\n"
1957 msgid "a %s revision is needed"
1958 msgstr "需要一個 %s 版本"
1959
1799 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
1960 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
1961 #, c-format
1962 msgid "could not create file '%s'"
1963 msgstr "不能建立檔案 '%s'"
1964
1804 -#: bisect.c:966 builtin/merge.c:149
1965 +#: bisect.c:966 builtin/merge.c:151
1966 #, c-format
1967 msgid "could not read file '%s'"
1968 msgstr "不能讀取檔案 '%s'"
@@ -1839,37 +2000,37 @@ msgid "Bisecting: %d revision left to test after this %s\n"
2000 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
2001 msgstr[0] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n"
2002
1842 -#: blame.c:2700
2003 +#: blame.c:2777
2004 msgid "--contents and --reverse do not blend well."
2005 msgstr "--contents 和 --reverse 不能混用。"
2006
1846 -#: blame.c:2714
2007 +#: blame.c:2791
2008 msgid "cannot use --contents with final commit object name"
2009 msgstr "不能將 --contents 和最終的提交物件名共用"
2010
1850 -#: blame.c:2735
2011 +#: blame.c:2812
2012 msgid "--reverse and --first-parent together require specified latest commit"
2013 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
2014
1854 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
1855 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
1856 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
1857 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
2015 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
2016 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
2017 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
2018 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
2019 #: builtin/shortlog.c:192
2020 msgid "revision walk setup failed"
2021 msgstr "版本遍歷設定失敗"
2022
1862 -#: blame.c:2762
2023 +#: blame.c:2839
2024 msgid ""
2025 "--reverse --first-parent together require range along first-parent chain"
2026 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
2027
1867 -#: blame.c:2773
2028 +#: blame.c:2850
2029 #, c-format
2030 msgid "no such path %s in %s"
2031 msgstr "在 %2$s 中無此路徑 %1$s"
2032
1872 -#: blame.c:2784
2033 +#: blame.c:2861
2034 #, c-format
2035 msgid "cannot read blob %s for path %s"
2036 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
@@ -1997,12 +2158,12 @@ msgstr "歧義的物件名：'%s'。"
2158 msgid "Not a valid branch point: '%s'."
2159 msgstr "無效的分支點：'%s'。"
2160
2000 -#: branch.c:364
2161 +#: branch.c:365
2162 #, c-format
2163 msgid "'%s' is already checked out at '%s'"
2003 -msgstr "'%s' 已經簽出到 '%s'"
2164 +msgstr "'%s' 已經檢出到 '%s'"
2165
2005 -#: branch.c:387
2166 +#: branch.c:388
2167 #, c-format
2168 msgid "HEAD of working tree %s is not updated"
2169 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
@@ -2015,10 +2176,10 @@ msgstr "'%s' 不像是一個 v2 版本的包檔案"
2176 #: bundle.c:64
2177 #, c-format
2178 msgid "unrecognized header: %s%s (%d)"
2018 -msgstr "未能識別的包頭：%s%s (%d)"
2179 +msgstr "無法識別的包頭：%s%s (%d)"
2180
2020 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
2021 -#: builtin/commit.c:815
2181 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
2182 +#: builtin/commit.c:814
2183 #, c-format
2184 msgid "could not open '%s'"
2185 msgstr "不能開啟 '%s'"
@@ -2068,10 +2229,10 @@ msgstr "rev-list 終止"
2229 msgid "ref '%s' is excluded by the rev-list options"
2230 msgstr "引用 '%s' 被 rev-list 選項排除"
2231
2071 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
2232 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
2233 #, c-format
2234 msgid "unrecognized argument: %s"
2074 -msgstr "未能識別的參數：%s"
2235 +msgstr "無法識別的參數：%s"
2236
2237 #: bundle.c:469
2238 msgid "Refusing to create empty bundle."
@@ -2091,320 +2252,336 @@ msgstr "index-pack 終止"
2252 msgid "invalid color value: %.*s"
2253 msgstr "無效的顏色值：%.*s"
2254
2094 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
2095 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
2096 -#, c-format
2097 -msgid "could not parse %s"
2098 -msgstr "不能解析 %s"
2099 -
2100 -#: commit.c:53
2101 -#, c-format
2102 -msgid "%s %s is not a commit!"
2103 -msgstr "%s %s 不是一個提交！"
2104 -
2105 -#: commit.c:193
2106 -msgid ""
2107 -"Support for <GIT_DIR>/info/grafts is deprecated\n"
2108 -"and will be removed in a future Git version.\n"
2109 -"\n"
2110 -"Please use \"git replace --convert-graft-file\"\n"
2111 -"to convert the grafts into replace refs.\n"
2112 -"\n"
2113 -"Turn this message off by running\n"
2114 -"\"git config advice.graftFileDeprecated false\""
2115 -msgstr ""
2116 -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
2117 -"未來的Git版本中被移除。\n"
2118 -"\n"
2119 -"請使用 \"git replace --convert-graft-file\" 將\n"
2120 -"grafts 轉換為取代引用。\n"
2121 -"\n"
2122 -"設定 \"git config advice.graftFileDeprecated false\"\n"
2123 -"可關閉本消息"
2124 -
2125 -#: commit.c:1153
2126 -#, c-format
2127 -msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2128 -msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
2129 -
2130 -#: commit.c:1157
2131 -#, c-format
2132 -msgid "Commit %s has a bad GPG signature allegedly by %s."
2133 -msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
2134 -
2135 -#: commit.c:1160
2136 -#, c-format
2137 -msgid "Commit %s does not have a GPG signature."
2138 -msgstr "提交 %s 沒有 GPG 簽名。"
2139 -
2140 -#: commit.c:1163
2141 -#, c-format
2142 -msgid "Commit %s has a good GPG signature by %s\n"
2143 -msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
2144 -
2145 -#: commit.c:1417
2146 -msgid ""
2147 -"Warning: commit message did not conform to UTF-8.\n"
2148 -"You may want to amend it after fixing the message, or set the config\n"
2149 -"variable i18n.commitencoding to the encoding your project uses.\n"
2150 -msgstr ""
2151 -"警告：提交說明不符合 UTF-8 字元編碼。\n"
2152 -"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
2153 -"設定為您項目所用的字元編碼。\n"
2154 -
2155 -#: commit-graph.c:122
2255 +#: commit-graph.c:183
2256 msgid "commit-graph file is too small"
2257 msgstr "提交圖形檔案太小"
2258
2159 -#: commit-graph.c:189
2259 +#: commit-graph.c:248
2260 #, c-format
2261 msgid "commit-graph signature %X does not match signature %X"
2262 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
2263
2164 -#: commit-graph.c:196
2264 +#: commit-graph.c:255
2265 #, c-format
2266 msgid "commit-graph version %X does not match version %X"
2267 msgstr "提交圖形版本 %X 和版本 %X 不符合"
2268
2169 -#: commit-graph.c:203
2269 +#: commit-graph.c:262
2270 #, c-format
2271 msgid "commit-graph hash version %X does not match version %X"
2272 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
2273
2174 -#: commit-graph.c:226
2274 +#: commit-graph.c:284
2275 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2276 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"
2277
2178 -#: commit-graph.c:237
2278 +#: commit-graph.c:294
2279 #, c-format
2280 msgid "commit-graph improper chunk offset %08x%08x"
2281 msgstr "提交圖形不正確的區塊位移 %08x%08x"
2282
2183 -#: commit-graph.c:280
2283 +#: commit-graph.c:362
2284 #, c-format
2285 msgid "commit-graph chunk id %08x appears multiple times"
2286 msgstr "提交圖形區塊 id %08x 出現了多次"
2287
2188 -#: commit-graph.c:343
2288 +#: commit-graph.c:436
2289 msgid "commit-graph has no base graphs chunk"
2290 msgstr "提交圖形沒有基礎圖形區塊"
2291
2192 -#: commit-graph.c:353
2292 +#: commit-graph.c:446
2293 msgid "commit-graph chain does not match"
2294 msgstr "提交圖形鏈不符合"
2295
2196 -#: commit-graph.c:401
2296 +#: commit-graph.c:494
2297 #, c-format
2298 msgid "invalid commit-graph chain: line '%s' not a hash"
2299 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
2300
2201 -#: commit-graph.c:425
2301 +#: commit-graph.c:518
2302 msgid "unable to find all commit-graph files"
2303 msgstr "無法找到所有提交圖形檔案"
2304
2205 -#: commit-graph.c:558 commit-graph.c:618
2305 +#: commit-graph.c:651 commit-graph.c:711
2306 msgid "invalid commit position. commit-graph is likely corrupt"
2307 msgstr "無效的提交位置。提交圖形可能已損壞"
2308
2209 -#: commit-graph.c:579
2309 +#: commit-graph.c:672
2310 #, c-format
2311 msgid "could not find commit %s"
2312 msgstr "無法找到提交 %s"
2313
2214 -#: commit-graph.c:852 builtin/am.c:1292
2314 +#: commit-graph.c:948 builtin/am.c:1292
2315 #, c-format
2316 msgid "unable to parse commit %s"
2317 msgstr "不能解析提交 %s"
2318
2219 -#: commit-graph.c:1011 builtin/pack-objects.c:2782
2319 +#: commit-graph.c:1096
2320 +msgid "Writing changed paths Bloom filters index"
2321 +msgstr "正在寫入變更路徑的布隆過濾器索引"
2322 +
2323 +#: commit-graph.c:1121
2324 +msgid "Writing changed paths Bloom filters data"
2325 +msgstr "正在寫入變更路徑的布隆過濾器索引"
2326 +
2327 +#: commit-graph.c:1160 builtin/pack-objects.c:2783
2328 #, c-format
2329 msgid "unable to get type of object %s"
2330 msgstr "無法獲得物件 %s 類型"
2331
2224 -#: commit-graph.c:1043
2332 +#: commit-graph.c:1196
2333 msgid "Loading known commits in commit graph"
2334 msgstr "正在載入提交圖中的已知提交"
2335
2228 -#: commit-graph.c:1060
2336 +#: commit-graph.c:1213
2337 msgid "Expanding reachable commits in commit graph"
2338 msgstr "正在擴展提交圖中的可以取得提交"
2339
2232 -#: commit-graph.c:1079
2340 +#: commit-graph.c:1233
2341 msgid "Clearing commit marks in commit graph"
2342 msgstr "正在清除提交圖中的提交標記"
2343
2236 -#: commit-graph.c:1098
2344 +#: commit-graph.c:1252
2345 msgid "Computing commit graph generation numbers"
2346 msgstr "正在計算提交圖世代數字"
2347
2240 -#: commit-graph.c:1173
2348 +#: commit-graph.c:1300
2349 +msgid "Computing commit changed paths Bloom filters"
2350 +msgstr "正在計算提交變更路徑的布隆過濾器"
2351 +
2352 +#: commit-graph.c:1359
2353 #, c-format
2354 msgid "Finding commits for commit graph in %d pack"
2355 msgid_plural "Finding commits for commit graph in %d packs"
2356 msgstr[0] "正在 %d 個包中尋找提交圖的提交"
2357
2246 -#: commit-graph.c:1186
2358 +#: commit-graph.c:1372
2359 #, c-format
2360 msgid "error adding pack %s"
2361 msgstr "新增包 %s 發生錯誤"
2362
2251 -#: commit-graph.c:1190
2363 +#: commit-graph.c:1376
2364 #, c-format
2365 msgid "error opening index for %s"
2366 msgstr "為 %s 開啟索引發生錯誤"
2367
2256 -#: commit-graph.c:1214
2368 +#: commit-graph.c:1405
2369 #, c-format
2370 msgid "Finding commits for commit graph from %d ref"
2371 msgid_plural "Finding commits for commit graph from %d refs"
2372 msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
2373
2262 -#: commit-graph.c:1234
2374 +#: commit-graph.c:1426
2375 #, c-format
2376 msgid "invalid commit object id: %s"
2377 msgstr "無效的提交物件 ID：%s"
2378
2267 -#: commit-graph.c:1249
2379 +#: commit-graph.c:1442
2380 msgid "Finding commits for commit graph among packed objects"
2381 msgstr "正在打包物件中尋找提交圖的提交"
2382
2271 -#: commit-graph.c:1264
2383 +#: commit-graph.c:1457
2384 msgid "Counting distinct commits in commit graph"
2385 msgstr "正在計算提交圖中不同的提交"
2386
2275 -#: commit-graph.c:1294
2387 +#: commit-graph.c:1489
2388 msgid "Finding extra edges in commit graph"
2389 msgstr "正在尋找提交圖中額外的邊"
2390
2279 -#: commit-graph.c:1340
2391 +#: commit-graph.c:1538
2392 msgid "failed to write correct number of base graph ids"
2393 msgstr "無法寫入正確數量的基礎圖形 ID"
2394
2283 -#: commit-graph.c:1373 midx.c:814
2395 +#: commit-graph.c:1572 midx.c:812
2396 #, c-format
2397 msgid "unable to create leading directories of %s"
2398 msgstr "不能為 %s 建立先導目錄"
2399
2288 -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
2400 +#: commit-graph.c:1585
2401 +msgid "unable to create temporary graph layer"
2402 +msgstr "無法建立暫時的圖形層"
2403 +
2404 +#: commit-graph.c:1590
2405 #, c-format
2290 -msgid "unable to create '%s'"
2291 -msgstr "不能建立 '%s'"
2406 +msgid "unable to adjust shared permissions for '%s'"
2407 +msgstr "無法調整「%s」的共用權限"
2408
2293 -#: commit-graph.c:1445
2409 +#: commit-graph.c:1667
2410 #, c-format
2411 msgid "Writing out commit graph in %d pass"
2412 msgid_plural "Writing out commit graph in %d passes"
2413 msgstr[0] "正在用 %d 步寫出提交圖"
2414
2299 -#: commit-graph.c:1486
2415 +#: commit-graph.c:1712
2416 msgid "unable to open commit-graph chain file"
2417 msgstr "無法開啟提交圖形鏈檔案"
2418
2303 -#: commit-graph.c:1498
2419 +#: commit-graph.c:1728
2420 msgid "failed to rename base commit-graph file"
2421 msgstr "無法重新命名基礎提交圖形檔案"
2422
2307 -#: commit-graph.c:1518
2423 +#: commit-graph.c:1748
2424 msgid "failed to rename temporary commit-graph file"
2425 msgstr "無法重新命名暫時提交圖形檔案"
2426
2311 -#: commit-graph.c:1631
2427 +#: commit-graph.c:1874
2428 msgid "Scanning merged commits"
2429 msgstr "正在掃描合併提交"
2430
2315 -#: commit-graph.c:1642
2431 +#: commit-graph.c:1885
2432 #, c-format
2433 msgid "unexpected duplicate commit id %s"
2434 msgstr "意外的重複提交 ID %s"
2435
2320 -#: commit-graph.c:1665
2436 +#: commit-graph.c:1908
2437 msgid "Merging commit-graph"
2438 msgstr "正在合併提交圖形"
2439
2324 -#: commit-graph.c:1844
2440 +#: commit-graph.c:2096
2441 #, c-format
2442 msgid "the commit graph format cannot write %d commits"
2443 msgstr "提交圖格式不能寫入 %d 個提交"
2444
2329 -#: commit-graph.c:1855
2445 +#: commit-graph.c:2107
2446 msgid "too many commits to write graph"
2447 msgstr "提交太多不能畫圖"
2448
2333 -#: commit-graph.c:1944
2449 +#: commit-graph.c:2200
2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2451 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
2452
2337 -#: commit-graph.c:1954
2453 +#: commit-graph.c:2210
2454 #, c-format
2455 msgid "commit-graph has incorrect OID order: %s then %s"
2456 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
2457
2342 -#: commit-graph.c:1964 commit-graph.c:1979
2458 +#: commit-graph.c:2220 commit-graph.c:2235
2459 #, c-format
2460 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2461 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
2462
2347 -#: commit-graph.c:1971
2463 +#: commit-graph.c:2227
2464 #, c-format
2465 msgid "failed to parse commit %s from commit-graph"
2466 msgstr "無法從提交圖形中解析提交 %s"
2467
2352 -#: commit-graph.c:1989
2468 +#: commit-graph.c:2245
2469 msgid "Verifying commits in commit graph"
2470 msgstr "正在驗證提交圖中的提交"
2471
2356 -#: commit-graph.c:2003
2472 +#: commit-graph.c:2259
2473 #, c-format
2474 msgid "failed to parse commit %s from object database for commit-graph"
2475 msgstr "無法從提交圖形的物件庫中解析提交 %s"
2476
2361 -#: commit-graph.c:2010
2477 +#: commit-graph.c:2266
2478 #, c-format
2479 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2480 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
2481
2366 -#: commit-graph.c:2020
2482 +#: commit-graph.c:2276
2483 #, c-format
2484 msgid "commit-graph parent list for commit %s is too long"
2485 msgstr "提交 %s 的提交圖形父提交列表太長了"
2486
2371 -#: commit-graph.c:2029
2487 +#: commit-graph.c:2285
2488 #, c-format
2489 msgid "commit-graph parent for %s is %s != %s"
2490 msgstr "%s 的提交圖形父提交是 %s != %s"
2491
2376 -#: commit-graph.c:2042
2492 +#: commit-graph.c:2298
2493 #, c-format
2494 msgid "commit-graph parent list for commit %s terminates early"
2495 msgstr "提交 %s 的提交圖形父提交列表過早終止"
2496
2381 -#: commit-graph.c:2047
2497 +#: commit-graph.c:2303
2498 #, c-format
2499 msgid ""
2500 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2501 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
2502
2387 -#: commit-graph.c:2051
2503 +#: commit-graph.c:2307
2504 #, c-format
2505 msgid ""
2506 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2507 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
2508
2393 -#: commit-graph.c:2066
2509 +#: commit-graph.c:2322
2510 #, c-format
2511 msgid "commit-graph generation for commit %s is %u != %u"
2512 msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
2513
2398 -#: commit-graph.c:2072
2514 +#: commit-graph.c:2328
2515 #, c-format
2516 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2517 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2518
2519 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
2520 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
2521 +#, c-format
2522 +msgid "could not parse %s"
2523 +msgstr "不能解析 %s"
2524 +
2525 +#: commit.c:54
2526 +#, c-format
2527 +msgid "%s %s is not a commit!"
2528 +msgstr "%s %s 不是一個提交！"
2529 +
2530 +#: commit.c:194
2531 +msgid ""
2532 +"Support for <GIT_DIR>/info/grafts is deprecated\n"
2533 +"and will be removed in a future Git version.\n"
2534 +"\n"
2535 +"Please use \"git replace --convert-graft-file\"\n"
2536 +"to convert the grafts into replace refs.\n"
2537 +"\n"
2538 +"Turn this message off by running\n"
2539 +"\"git config advice.graftFileDeprecated false\""
2540 +msgstr ""
2541 +"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
2542 +"未來的Git版本中被移除。\n"
2543 +"\n"
2544 +"請使用 \"git replace --convert-graft-file\" 將\n"
2545 +"grafts 轉換為取代引用。\n"
2546 +"\n"
2547 +"設定 \"git config advice.graftFileDeprecated false\"\n"
2548 +"可關閉本消息"
2549 +
2550 +#: commit.c:1168
2551 +#, c-format
2552 +msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2553 +msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
2554 +
2555 +#: commit.c:1172
2556 +#, c-format
2557 +msgid "Commit %s has a bad GPG signature allegedly by %s."
2558 +msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
2559 +
2560 +#: commit.c:1175
2561 +#, c-format
2562 +msgid "Commit %s does not have a GPG signature."
2563 +msgstr "提交 %s 沒有 GPG 簽名。"
2564 +
2565 +#: commit.c:1178
2566 +#, c-format
2567 +msgid "Commit %s has a good GPG signature by %s\n"
2568 +msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
2569 +
2570 +#: commit.c:1432
2571 +msgid ""
2572 +"Warning: commit message did not conform to UTF-8.\n"
2573 +"You may want to amend it after fixing the message, or set the config\n"
2574 +"variable i18n.commitencoding to the encoding your project uses.\n"
2575 +msgstr ""
2576 +"警告：提交說明不符合 UTF-8 字元編碼。\n"
2577 +"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
2578 +"設定為您項目所用的字元編碼。\n"
2579 +
2580 #: compat/obstack.c:406 compat/obstack.c:408
2581 msgid "memory exhausted"
2582 msgstr "記憶體耗盡"
2583
2407 -#: config.c:124
2584 +#: config.c:125
2585 #, c-format
2586 msgid ""
2587 "exceeded maximum include depth (%d) while including\n"
@@ -2419,289 +2596,289 @@ msgstr ""
2596 "\t%2$s\n"
2597 "這可能是因為循環包含。"
2598
2422 -#: config.c:140
2599 +#: config.c:141
2600 #, c-format
2601 msgid "could not expand include path '%s'"
2602 msgstr "無法擴展包含路徑 '%s'"
2603
2427 -#: config.c:151
2604 +#: config.c:152
2605 msgid "relative config includes must come from files"
2606 msgstr "相對路徑的設定檔案引用必須來自於檔案"
2607
2431 -#: config.c:197
2608 +#: config.c:198
2609 msgid "relative config include conditionals must come from files"
2610 msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
2611
2435 -#: config.c:376
2612 +#: config.c:378
2613 #, c-format
2614 msgid "key does not contain a section: %s"
2615 msgstr "鍵名沒有包含一個小節名稱：%s"
2616
2440 -#: config.c:382
2617 +#: config.c:384
2618 #, c-format
2619 msgid "key does not contain variable name: %s"
2620 msgstr "鍵名沒有包含變數名：%s"
2621
2445 -#: config.c:406 sequencer.c:2444
2622 +#: config.c:408 sequencer.c:2456
2623 #, c-format
2624 msgid "invalid key: %s"
2625 msgstr "無效鍵名：%s"
2626
2450 -#: config.c:412
2627 +#: config.c:414
2628 #, c-format
2629 msgid "invalid key (newline): %s"
2630 msgstr "無效鍵名（有換行符號）：%s"
2631
2455 -#: config.c:448 config.c:460
2632 +#: config.c:450 config.c:462
2633 #, c-format
2634 msgid "bogus config parameter: %s"
2635 msgstr "偽設定參數：%s"
2636
2460 -#: config.c:495
2637 +#: config.c:497
2638 #, c-format
2639 msgid "bogus format in %s"
2640 msgstr "%s 中格式錯誤"
2641
2465 -#: config.c:821
2642 +#: config.c:836
2643 #, c-format
2644 msgid "bad config line %d in blob %s"
2645 msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
2646
2470 -#: config.c:825
2647 +#: config.c:840
2648 #, c-format
2649 msgid "bad config line %d in file %s"
2650 msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
2651
2475 -#: config.c:829
2652 +#: config.c:844
2653 #, c-format
2654 msgid "bad config line %d in standard input"
2655 msgstr "標準輸入中錯誤的設定行 %d"
2656
2480 -#: config.c:833
2657 +#: config.c:848
2658 #, c-format
2659 msgid "bad config line %d in submodule-blob %s"
2660 msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
2661
2485 -#: config.c:837
2662 +#: config.c:852
2663 #, c-format
2664 msgid "bad config line %d in command line %s"
2665 msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
2666
2490 -#: config.c:841
2667 +#: config.c:856
2668 #, c-format
2669 msgid "bad config line %d in %s"
2670 msgstr "在 %2$s 中錯誤的設定行 %1$d"
2671
2495 -#: config.c:978
2672 +#: config.c:993
2673 msgid "out of range"
2674 msgstr "超出範圍"
2675
2499 -#: config.c:978
2676 +#: config.c:993
2677 msgid "invalid unit"
2678 msgstr "無效的單位"
2679
2503 -#: config.c:979
2680 +#: config.c:994
2681 #, c-format
2682 msgid "bad numeric config value '%s' for '%s': %s"
2683 msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
2684
2508 -#: config.c:998
2685 +#: config.c:1013
2686 #, c-format
2687 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2688 msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2689
2513 -#: config.c:1001
2690 +#: config.c:1016
2691 #, c-format
2692 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2693 msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2694
2518 -#: config.c:1004
2695 +#: config.c:1019
2696 #, c-format
2697 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2698 msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
2699
2523 -#: config.c:1007
2700 +#: config.c:1022
2701 #, c-format
2702 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2703 msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2704
2528 -#: config.c:1010
2705 +#: config.c:1025
2706 #, c-format
2707 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2708 msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2709
2533 -#: config.c:1013
2710 +#: config.c:1028
2711 #, c-format
2712 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2713 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2714
2538 -#: config.c:1108
2715 +#: config.c:1123
2716 #, c-format
2717 msgid "failed to expand user dir in: '%s'"
2718 msgstr "無法擴展使用者目錄：'%s'"
2719
2543 -#: config.c:1117
2720 +#: config.c:1132
2721 #, c-format
2722 msgid "'%s' for '%s' is not a valid timestamp"
2723 msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
2724
2548 -#: config.c:1208
2725 +#: config.c:1223
2726 #, c-format
2727 msgid "abbrev length out of range: %d"
2728 msgstr "縮寫長度超出範圍：%d"
2729
2553 -#: config.c:1222 config.c:1233
2730 +#: config.c:1237 config.c:1248
2731 #, c-format
2732 msgid "bad zlib compression level %d"
2733 msgstr "錯誤的 zlib 壓縮級別 %d"
2734
2558 -#: config.c:1325
2735 +#: config.c:1340
2736 msgid "core.commentChar should only be one character"
2737 msgstr "core.commentChar 應該是一個字元"
2738
2562 -#: config.c:1358
2739 +#: config.c:1373
2740 #, c-format
2741 msgid "invalid mode for object creation: %s"
2742 msgstr "無效的物件建立模式：%s"
2743
2567 -#: config.c:1430
2744 +#: config.c:1445
2745 #, c-format
2746 msgid "malformed value for %s"
2747 msgstr "%s 的取值格式錯誤"
2748
2572 -#: config.c:1456
2749 +#: config.c:1471
2750 #, c-format
2751 msgid "malformed value for %s: %s"
2752 msgstr "%s 的取值格式錯誤：%s"
2753
2577 -#: config.c:1457
2754 +#: config.c:1472
2755 msgid "must be one of nothing, matching, simple, upstream or current"
2756 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
2757
2581 -#: config.c:1518 builtin/pack-objects.c:3541
2758 +#: config.c:1533 builtin/pack-objects.c:3542
2759 #, c-format
2760 msgid "bad pack compression level %d"
2761 msgstr "錯誤的打包壓縮級別 %d"
2762
2586 -#: config.c:1639
2763 +#: config.c:1655
2764 #, c-format
2765 msgid "unable to load config blob object '%s'"
2766 msgstr "無法從資料物件 '%s' 載入設定"
2767
2591 -#: config.c:1642
2768 +#: config.c:1658
2769 #, c-format
2770 msgid "reference '%s' does not point to a blob"
2771 msgstr "引用 '%s' 沒有指向一個資料物件"
2772
2596 -#: config.c:1659
2773 +#: config.c:1675
2774 #, c-format
2775 msgid "unable to resolve config blob '%s'"
2776 msgstr "不能解析設定物件 '%s'"
2777
2601 -#: config.c:1689
2778 +#: config.c:1705
2779 #, c-format
2780 msgid "failed to parse %s"
2781 msgstr "解析 %s 失敗"
2782
2606 -#: config.c:1743
2783 +#: config.c:1759
2784 msgid "unable to parse command-line config"
2785 msgstr "無法解析指令列中的設定"
2786
2610 -#: config.c:2097
2787 +#: config.c:2113
2788 msgid "unknown error occurred while reading the configuration files"
2789 msgstr "在讀取設定檔案時遇到未知錯誤"
2790
2614 -#: config.c:2267
2791 +#: config.c:2283
2792 #, c-format
2793 msgid "Invalid %s: '%s'"
2794 msgstr "無效 %s：'%s'"
2795
2619 -#: config.c:2312
2796 +#: config.c:2328
2797 #, c-format
2798 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2799 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
2800
2624 -#: config.c:2358
2801 +#: config.c:2374
2802 #, c-format
2803 msgid "unable to parse '%s' from command-line config"
2804 msgstr "無法解析指令列設定中的 '%s'"
2805
2629 -#: config.c:2360
2806 +#: config.c:2376
2807 #, c-format
2808 msgid "bad config variable '%s' in file '%s' at line %d"
2809 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
2810
2634 -#: config.c:2441
2811 +#: config.c:2457
2812 #, c-format
2813 msgid "invalid section name '%s'"
2814 msgstr "無效的小節名稱 '%s'"
2815
2639 -#: config.c:2473
2816 +#: config.c:2489
2817 #, c-format
2818 msgid "%s has multiple values"
2819 msgstr "%s 有多個取值"
2820
2644 -#: config.c:2502
2821 +#: config.c:2518
2822 #, c-format
2823 msgid "failed to write new configuration file %s"
2824 msgstr "寫入新的設定檔案 %s 失敗"
2825
2649 -#: config.c:2754 config.c:3078
2826 +#: config.c:2770 config.c:3094
2827 #, c-format
2828 msgid "could not lock config file %s"
2829 msgstr "不能鎖定設定檔案 %s"
2830
2654 -#: config.c:2765
2831 +#: config.c:2781
2832 #, c-format
2833 msgid "opening %s"
2834 msgstr "開啟 %s"
2835
2659 -#: config.c:2800 builtin/config.c:344
2836 +#: config.c:2816 builtin/config.c:344
2837 #, c-format
2838 msgid "invalid pattern: %s"
2839 msgstr "無效模式：%s"
2840
2664 -#: config.c:2825
2841 +#: config.c:2841
2842 #, c-format
2843 msgid "invalid config file %s"
2844 msgstr "無效的設定檔案 %s"
2845
2669 -#: config.c:2838 config.c:3091
2846 +#: config.c:2854 config.c:3107
2847 #, c-format
2848 msgid "fstat on %s failed"
2849 msgstr "對 %s 呼叫 fstat 失敗"
2850
2674 -#: config.c:2849
2851 +#: config.c:2865
2852 #, c-format
2853 msgid "unable to mmap '%s'"
2854 msgstr "不能 mmap '%s'"
2855
2679 -#: config.c:2858 config.c:3096
2856 +#: config.c:2874 config.c:3112
2857 #, c-format
2858 msgid "chmod on %s failed"
2859 msgstr "對 %s 呼叫 chmod 失敗"
2860
2684 -#: config.c:2943 config.c:3193
2861 +#: config.c:2959 config.c:3209
2862 #, c-format
2863 msgid "could not write config file %s"
2864 msgstr "不能寫入設定檔案 %s"
2865
2689 -#: config.c:2977
2866 +#: config.c:2993
2867 #, c-format
2868 msgid "could not set '%s' to '%s'"
2869 msgstr "不能設定 '%s' 為 '%s'"
2870
2694 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2871 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2872 #, c-format
2873 msgid "could not unset '%s'"
2874 msgstr "不能取消設定 '%s'"
2875
2699 -#: config.c:3069
2876 +#: config.c:3085
2877 #, c-format
2878 msgid "invalid section name: %s"
2879 msgstr "無效的小節名稱：%s"
2880
2704 -#: config.c:3236
2881 +#: config.c:3252
2882 #, c-format
2883 msgid "missing value for '%s'"
2884 msgstr "%s 的取值缺少"
@@ -2783,7 +2960,7 @@ msgstr "無法為 socket 設定 SO_KEEPALIVE"
2960 #: connect.c:635 connect.c:698
2961 #, c-format
2962 msgid "Looking up %s ... "
2786 -msgstr "尋找 %s ..."
2963 +msgstr "尋找 %s ... "
2964
2965 #: connect.c:639
2966 #, c-format
@@ -2864,19 +3041,19 @@ msgstr "已阻止奇怪的路徑名 '%s'"
3041 msgid "unable to fork"
3042 msgstr "無法 fork"
3043
2867 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
3044 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
3045 msgid "Checking connectivity"
3046 msgstr "正在檢查連通性"
3047
2871 -#: connected.c:110
3048 +#: connected.c:119
3049 msgid "Could not run 'git rev-list'"
3050 msgstr "不能執行 'git rev-list'"
3051
2875 -#: connected.c:130
3052 +#: connected.c:139
3053 msgid "failed write to rev-list"
3054 msgstr "寫入 rev-list 失敗"
3055
2879 -#: connected.c:137
3056 +#: connected.c:146
3057 msgid "failed to close rev-list's stdin"
3058 msgstr "關閉 rev-list 的標準輸入失敗"
3059
@@ -2896,8 +3073,8 @@ msgid ""
3073 "CRLF will be replaced by LF in %s.\n"
3074 "The file will have its original line endings in your working directory"
3075 msgstr ""
2899 -"%s 中的 CRLF 將被 LF 取代。<\n"
2900 -"在工作區中該檔案仍保持原有的換行符號。"
3076 +"%s 中的 CRLF 將被 LF 取代。\n"
3077 +"在工作區中該檔案仍保持原有的換行符號"
3078
3079 #: convert.c:217
3080 #, c-format
@@ -2974,35 +3151,63 @@ msgstr "從外部過濾器 '%s' 讀取失敗"
3151 msgid "external filter '%s' failed"
3152 msgstr "外部過濾器 '%s' 失敗"
3153
2977 -#: convert.c:839
3154 +#: convert.c:840
3155 msgid "unexpected filter type"
3156 msgstr "意外的過濾類型"
3157
2981 -#: convert.c:850
3158 +#: convert.c:851
3159 msgid "path name too long for external filter"
3160 msgstr "外部過濾器的路徑名太長"
3161
2985 -#: convert.c:924
3162 +#: convert.c:943
3163 #, c-format
3164 msgid ""
3165 "external filter '%s' is not available anymore although not all paths have "
3166 "been filtered"
3167 msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"
3168
2992 -#: convert.c:1223
3169 +#: convert.c:1243
3170 msgid "true/false are no valid working-tree-encodings"
3171 msgstr "true/false 不是有效的工作區編碼"
3172
2996 -#: convert.c:1411 convert.c:1445
3173 +#: convert.c:1431 convert.c:1465
3174 #, c-format
3175 msgid "%s: clean filter '%s' failed"
3176 msgstr "%s：clean 過濾器 '%s' 失敗"
3177
3001 -#: convert.c:1489
3178 +#: convert.c:1511
3179 #, c-format
3180 msgid "%s: smudge filter %s failed"
3181 msgstr "%s：smudge 過濾器 %s 失敗"
3182
3183 +#: credential.c:96
3184 +#, c-format
3185 +msgid "skipping credential lookup for key: credential.%s"
3186 +msgstr "跳過鍵的憑證查詢：credential.%s"
3187 +
3188 +#: credential.c:112
3189 +msgid "refusing to work with credential missing host field"
3190 +msgstr "拒絕使用缺少主機欄位的憑證"
3191 +
3192 +#: credential.c:114
3193 +msgid "refusing to work with credential missing protocol field"
3194 +msgstr "拒絕使用缺少通訊協定欄位的憑證"
3195 +
3196 +#: credential.c:396
3197 +#, c-format
3198 +msgid "url contains a newline in its %s component: %s"
3199 +msgstr "URL 的 %s 部分有換行：%s"
3200 +
3201 +#: credential.c:440
3202 +#, c-format
3203 +msgid "url has no scheme: %s"
3204 +msgstr "URL 沒有 Scheme：%s"
3205 +
3206 +#: credential.c:513
3207 +#, c-format
3208 +msgid "credential url cannot be parsed: %s"
3209 +msgstr "無法解析憑證 URL：%s"
3210 +
3211 #: date.c:138
3212 msgid "in the future"
3213 msgstr "在將來"
@@ -3086,15 +3291,6 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多
3291 msgid "Marked %d islands, done.\n"
3292 msgstr "已標記 %d 個資料島，結束。\n"
3293
3089 -#: diffcore-order.c:24
3090 -#, c-format
3091 -msgid "failed to read orderfile '%s'"
3092 -msgstr "讀取排序檔案 '%s' 失敗"
3093 -
3094 -#: diffcore-rename.c:543
3095 -msgid "Performing inexact rename detection"
3096 -msgstr "正在進行非精確的重新命名偵測"
3097 -
3294 #: diff-no-index.c:238
3295 msgid "git diff --no-index [<options>] <path> <path>"
3296 msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
@@ -3154,35 +3350,35 @@ msgstr ""
3350 "發現設定變數 'diff.dirstat' 中的錯誤：\n"
3351 "%s"
3352
3157 -#: diff.c:4202
3353 +#: diff.c:4238
3354 #, c-format
3355 msgid "external diff died, stopping at %s"
3356 msgstr "外部 diff 離開，停止在 %s"
3357
3162 -#: diff.c:4547
3358 +#: diff.c:4583
3359 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3360 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3361
3166 -#: diff.c:4550
3362 +#: diff.c:4586
3363 msgid "-G, -S and --find-object are mutually exclusive"
3364 msgstr "-G、-S 和 --find-object 是互斥的"
3365
3170 -#: diff.c:4628
3366 +#: diff.c:4664
3367 msgid "--follow requires exactly one pathspec"
3368 msgstr "--follow 明確要求只跟一個路徑規格"
3369
3174 -#: diff.c:4676
3370 +#: diff.c:4712
3371 #, c-format
3372 msgid "invalid --stat value: %s"
3373 msgstr "無效的 --stat 值：%s"
3374
3179 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
3375 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
3376 #: parse-options.c:197 parse-options.c:201
3377 #, c-format
3378 msgid "%s expects a numerical value"
3379 msgstr "%s 期望一個數字值"
3380
3185 -#: diff.c:4713
3381 +#: diff.c:4749
3382 #, c-format
3383 msgid ""
3384 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3191,195 +3387,195 @@ msgstr ""
3387 "無法解析 --dirstat/-X 選項的參數：\n"
3388 "%s"
3389
3194 -#: diff.c:4798
3390 +#: diff.c:4834
3391 #, c-format
3392 msgid "unknown change class '%c' in --diff-filter=%s"
3393 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
3394
3199 -#: diff.c:4822
3395 +#: diff.c:4858
3396 #, c-format
3397 msgid "unknown value after ws-error-highlight=%.*s"
3398 msgstr "ws-error-highlight=%.*s 之後未知的值"
3399
3204 -#: diff.c:4836
3400 +#: diff.c:4872
3401 #, c-format
3402 msgid "unable to resolve '%s'"
3403 msgstr "不能解析 '%s'"
3404
3209 -#: diff.c:4886 diff.c:4892
3405 +#: diff.c:4922 diff.c:4928
3406 #, c-format
3407 msgid "%s expects <n>/<m> form"
3408 msgstr "%s 期望 <n>/<m> 格式"
3409
3214 -#: diff.c:4904
3410 +#: diff.c:4940
3411 #, c-format
3412 msgid "%s expects a character, got '%s'"
3413 msgstr "%s 期望一個字元，得到 '%s'"
3414
3219 -#: diff.c:4925
3415 +#: diff.c:4961
3416 #, c-format
3417 msgid "bad --color-moved argument: %s"
3418 msgstr "壞的 --color-moved 參數：%s"
3419
3224 -#: diff.c:4944
3420 +#: diff.c:4980
3421 #, c-format
3422 msgid "invalid mode '%s' in --color-moved-ws"
3227 -msgstr "--color-moved-ws 中的無效模式 '%s' "
3423 +msgstr "--color-moved-ws 中的無效模式 '%s'"
3424
3229 -#: diff.c:4984
3425 +#: diff.c:5020
3426 msgid ""
3427 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3428 "\"histogram\""
3429 msgstr ""
3430 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3431
3236 -#: diff.c:5020 diff.c:5040
3432 +#: diff.c:5056 diff.c:5076
3433 #, c-format
3434 msgid "invalid argument to %s"
3435 msgstr "%s 的參數無效"
3436
3241 -#: diff.c:5178
3437 +#: diff.c:5214
3438 #, c-format
3439 msgid "failed to parse --submodule option parameter: '%s'"
3440 msgstr "無法解析 --submodule 選項的參數：'%s'"
3441
3246 -#: diff.c:5234
3442 +#: diff.c:5270
3443 #, c-format
3444 msgid "bad --word-diff argument: %s"
3445 msgstr "壞的 --word-diff 參數：%s"
3446
3251 -#: diff.c:5257
3447 +#: diff.c:5293
3448 msgid "Diff output format options"
3449 msgstr "差異輸出格式化選項"
3450
3255 -#: diff.c:5259 diff.c:5265
3451 +#: diff.c:5295 diff.c:5301
3452 msgid "generate patch"
3453 msgstr "生成修補檔"
3454
3259 -#: diff.c:5262 builtin/log.c:173
3455 +#: diff.c:5298 builtin/log.c:177
3456 msgid "suppress diff output"
3457 msgstr "不顯示差異輸出"
3458
3263 -#: diff.c:5267 diff.c:5381 diff.c:5388
3459 +#: diff.c:5303 diff.c:5417 diff.c:5424
3460 msgid "<n>"
3461 msgstr "<n>"
3462
3267 -#: diff.c:5268 diff.c:5271
3463 +#: diff.c:5304 diff.c:5307
3464 msgid "generate diffs with <n> lines context"
3465 msgstr "生成含 <n> 行上下文的差異"
3466
3271 -#: diff.c:5273
3467 +#: diff.c:5309
3468 msgid "generate the diff in raw format"
3469 msgstr "生成原始格式的差異"
3470
3275 -#: diff.c:5276
3471 +#: diff.c:5312
3472 msgid "synonym for '-p --raw'"
3473 msgstr "和 '-p --raw' 同義"
3474
3279 -#: diff.c:5280
3475 +#: diff.c:5316
3476 msgid "synonym for '-p --stat'"
3477 msgstr "和 '-p --stat' 同義"
3478
3283 -#: diff.c:5284
3479 +#: diff.c:5320
3480 msgid "machine friendly --stat"
3481 msgstr "機器友好的 --stat"
3482
3287 -#: diff.c:5287
3483 +#: diff.c:5323
3484 msgid "output only the last line of --stat"
3485 msgstr "只輸出 --stat 的最後一行"
3486
3291 -#: diff.c:5289 diff.c:5297
3487 +#: diff.c:5325 diff.c:5333
3488 msgid "<param1,param2>..."
3489 msgstr "<參數1,參數2>..."
3490
3295 -#: diff.c:5290
3491 +#: diff.c:5326
3492 msgid ""
3493 "output the distribution of relative amount of changes for each sub-directory"
3494 msgstr "輸出每個子目錄相對變更的分布"
3495
3300 -#: diff.c:5294
3496 +#: diff.c:5330
3497 msgid "synonym for --dirstat=cumulative"
3498 msgstr "和 --dirstat=cumulative 同義"
3499
3304 -#: diff.c:5298
3500 +#: diff.c:5334
3501 msgid "synonym for --dirstat=files,param1,param2..."
3502 msgstr "是 --dirstat=files,param1,param2... 的同義詞"
3503
3308 -#: diff.c:5302
3504 +#: diff.c:5338
3505 msgid "warn if changes introduce conflict markers or whitespace errors"
3506 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
3507
3312 -#: diff.c:5305
3508 +#: diff.c:5341
3509 msgid "condensed summary such as creations, renames and mode changes"
3510 msgstr "精簡摘要，例如建立、重新命名和模式變更"
3511
3316 -#: diff.c:5308
3512 +#: diff.c:5344
3513 msgid "show only names of changed files"
3514 msgstr "只顯示變更檔案的檔案名"
3515
3320 -#: diff.c:5311
3516 +#: diff.c:5347
3517 msgid "show only names and status of changed files"
3518 msgstr "只顯示變更檔案的檔案名和狀態"
3519
3324 -#: diff.c:5313
3520 +#: diff.c:5349
3521 msgid "<width>[,<name-width>[,<count>]]"
3522 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
3523
3328 -#: diff.c:5314
3524 +#: diff.c:5350
3525 msgid "generate diffstat"
3526 msgstr "生成差異統計（diffstat）"
3527
3332 -#: diff.c:5316 diff.c:5319 diff.c:5322
3528 +#: diff.c:5352 diff.c:5355 diff.c:5358
3529 msgid "<width>"
3530 msgstr "<寬度>"
3531
3336 -#: diff.c:5317
3532 +#: diff.c:5353
3533 msgid "generate diffstat with a given width"
3534 msgstr "使用提供的長度生成差異統計"
3535
3340 -#: diff.c:5320
3536 +#: diff.c:5356
3537 msgid "generate diffstat with a given name width"
3538 msgstr "使用提供的檔案名長度生成差異統計"
3539
3344 -#: diff.c:5323
3540 +#: diff.c:5359
3541 msgid "generate diffstat with a given graph width"
3542 msgstr "使用提供的圖形長度生成差異統計"
3543
3348 -#: diff.c:5325
3544 +#: diff.c:5361
3545 msgid "<count>"
3546 msgstr "<次數>"
3547
3352 -#: diff.c:5326
3548 +#: diff.c:5362
3549 msgid "generate diffstat with limited lines"
3550 msgstr "生成有限行數的差異統計"
3551
3356 -#: diff.c:5329
3552 +#: diff.c:5365
3553 msgid "generate compact summary in diffstat"
3554 msgstr "生成差異統計的簡潔摘要"
3555
3360 -#: diff.c:5332
3556 +#: diff.c:5368
3557 msgid "output a binary diff that can be applied"
3558 msgstr "輸出一個可以應用的二進位差異"
3559
3364 -#: diff.c:5335
3560 +#: diff.c:5371
3561 msgid "show full pre- and post-image object names on the \"index\" lines"
3562 msgstr "在 \"index\" 行顯示完整的前後物件名稱"
3563
3368 -#: diff.c:5337
3564 +#: diff.c:5373
3565 msgid "show colored diff"
3566 msgstr "顯示帶顏色的差異"
3567
3372 -#: diff.c:5338
3568 +#: diff.c:5374
3569 msgid "<kind>"
3570 msgstr "<類型>"
3571
3376 -#: diff.c:5339
3572 +#: diff.c:5375
3573 msgid ""
3574 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3575 "diff"
3576 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
3577
3382 -#: diff.c:5342
3578 +#: diff.c:5378
3579 msgid ""
3580 "do not munge pathnames and use NULs as output field terminators in --raw or "
3581 "--numstat"
@@ -3387,300 +3583,309 @@ msgstr ""
3583 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
3584 "符"
3585
3390 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
3586 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
3587 msgid "<prefix>"
3588 msgstr "<前綴>"
3589
3394 -#: diff.c:5346
3590 +#: diff.c:5382
3591 msgid "show the given source prefix instead of \"a/\""
3592 msgstr "顯示提供的源前綴取代 \"a/\""
3593
3398 -#: diff.c:5349
3594 +#: diff.c:5385
3595 msgid "show the given destination prefix instead of \"b/\""
3596 msgstr "顯示提供的目標前綴取代 \"b/\""
3597
3402 -#: diff.c:5352
3598 +#: diff.c:5388
3599 msgid "prepend an additional prefix to every line of output"
3600 msgstr "輸出的每一行附加前綴"
3601
3406 -#: diff.c:5355
3602 +#: diff.c:5391
3603 msgid "do not show any source or destination prefix"
3604 msgstr "不顯示任何源和目標前綴"
3605
3410 -#: diff.c:5358
3606 +#: diff.c:5394
3607 msgid "show context between diff hunks up to the specified number of lines"
3608 msgstr "顯示指定行數的差異區塊間的上下文"
3609
3414 -#: diff.c:5362 diff.c:5367 diff.c:5372
3610 +#: diff.c:5398 diff.c:5403 diff.c:5408
3611 msgid "<char>"
3612 msgstr "<字元>"
3613
3418 -#: diff.c:5363
3614 +#: diff.c:5399
3615 msgid "specify the character to indicate a new line instead of '+'"
3616 msgstr "指定一個字元取代 '+' 來表示新的一行"
3617
3422 -#: diff.c:5368
3618 +#: diff.c:5404
3619 msgid "specify the character to indicate an old line instead of '-'"
3620 msgstr "指定一個字元取代 '-' 來表示舊的一行"
3621
3426 -#: diff.c:5373
3622 +#: diff.c:5409
3623 msgid "specify the character to indicate a context instead of ' '"
3624 msgstr "指定一個字元取代 ' ' 來表示一行上下文"
3625
3430 -#: diff.c:5376
3626 +#: diff.c:5412
3627 msgid "Diff rename options"
3628 msgstr "差異重新命名選項"
3629
3434 -#: diff.c:5377
3630 +#: diff.c:5413
3631 msgid "<n>[/<m>]"
3632 msgstr "<n>[/<m>]"
3633
3438 -#: diff.c:5378
3634 +#: diff.c:5414
3635 msgid "break complete rewrite changes into pairs of delete and create"
3636 msgstr "將完全重寫的變更打破為成對的刪除和建立"
3637
3442 -#: diff.c:5382
3638 +#: diff.c:5418
3639 msgid "detect renames"
3640 msgstr "檢測重新命名"
3641
3446 -#: diff.c:5386
3642 +#: diff.c:5422
3643 msgid "omit the preimage for deletes"
3644 msgstr "省略刪除動作的差異輸出"
3645
3450 -#: diff.c:5389
3646 +#: diff.c:5425
3647 msgid "detect copies"
3648 msgstr "檢測複製"
3649
3454 -#: diff.c:5393
3650 +#: diff.c:5429
3651 msgid "use unmodified files as source to find copies"
3652 msgstr "使用未修改的檔案做為發現複製的源"
3653
3458 -#: diff.c:5395
3654 +#: diff.c:5431
3655 msgid "disable rename detection"
3460 -msgstr "禁用重新命名偵測"
3656 +msgstr "停用重新命名偵測"
3657
3462 -#: diff.c:5398
3658 +#: diff.c:5434
3659 msgid "use empty blobs as rename source"
3660 msgstr "使用空的資料物件做為重新命名的源"
3661
3466 -#: diff.c:5400
3662 +#: diff.c:5436
3663 msgid "continue listing the history of a file beyond renames"
3664 msgstr "繼續列出檔案重新命名以外的歷史記錄"
3665
3470 -#: diff.c:5403
3666 +#: diff.c:5439
3667 msgid ""
3668 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3669 "given limit"
3670 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
3671
3476 -#: diff.c:5405
3672 +#: diff.c:5441
3673 msgid "Diff algorithm options"
3674 msgstr "差異演算法選項"
3675
3480 -#: diff.c:5407
3676 +#: diff.c:5443
3677 msgid "produce the smallest possible diff"
3678 msgstr "生成儘可能小的差異"
3679
3484 -#: diff.c:5410
3680 +#: diff.c:5446
3681 msgid "ignore whitespace when comparing lines"
3682 msgstr "行比較時忽略空白字元"
3683
3488 -#: diff.c:5413
3684 +#: diff.c:5449
3685 msgid "ignore changes in amount of whitespace"
3686 msgstr "忽略空白字元的變更"
3687
3492 -#: diff.c:5416
3688 +#: diff.c:5452
3689 msgid "ignore changes in whitespace at EOL"
3690 msgstr "忽略行尾的空白字元變更"
3691
3496 -#: diff.c:5419
3692 +#: diff.c:5455
3693 msgid "ignore carrier-return at the end of line"
3694 msgstr "忽略行尾的Enter符（CR）"
3695
3500 -#: diff.c:5422
3696 +#: diff.c:5458
3697 msgid "ignore changes whose lines are all blank"
3698 msgstr "忽略整行都是空白的變更"
3699
3504 -#: diff.c:5425
3700 +#: diff.c:5461
3701 msgid "heuristic to shift diff hunk boundaries for easy reading"
3702 msgstr "啟發式轉換差異邊界以便閱讀"
3703
3508 -#: diff.c:5428
3704 +#: diff.c:5464
3705 msgid "generate diff using the \"patience diff\" algorithm"
3706 msgstr "使用 \"patience diff\" 演算法生成差異"
3707
3512 -#: diff.c:5432
3708 +#: diff.c:5468
3709 msgid "generate diff using the \"histogram diff\" algorithm"
3710 msgstr "使用 \"histogram diff\" 演算法生成差異"
3711
3516 -#: diff.c:5434
3712 +#: diff.c:5470
3713 msgid "<algorithm>"
3714 msgstr "<演算法>"
3715
3520 -#: diff.c:5435
3716 +#: diff.c:5471
3717 msgid "choose a diff algorithm"
3718 msgstr "選擇一個差異演算法"
3719
3524 -#: diff.c:5437
3720 +#: diff.c:5473
3721 msgid "<text>"
3722 msgstr "<文字>"
3723
3528 -#: diff.c:5438
3724 +#: diff.c:5474
3725 msgid "generate diff using the \"anchored diff\" algorithm"
3726 msgstr "使用 \"anchored diff\" 演算法生成差異"
3727
3532 -#: diff.c:5440 diff.c:5449 diff.c:5452
3728 +#: diff.c:5476 diff.c:5485 diff.c:5488
3729 msgid "<mode>"
3730 msgstr "<模式>"
3731
3536 -#: diff.c:5441
3732 +#: diff.c:5477
3733 msgid "show word diff, using <mode> to delimit changed words"
3734 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
3735
3540 -#: diff.c:5443 diff.c:5446 diff.c:5491
3736 +#: diff.c:5479 diff.c:5482 diff.c:5527
3737 msgid "<regex>"
3738 msgstr "<正則>"
3739
3544 -#: diff.c:5444
3740 +#: diff.c:5480
3741 msgid "use <regex> to decide what a word is"
3742 msgstr "使用 <正規表示式> 確定何為一個詞"
3743
3548 -#: diff.c:5447
3744 +#: diff.c:5483
3745 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3746 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
3747
3552 -#: diff.c:5450
3748 +#: diff.c:5486
3749 msgid "moved lines of code are colored differently"
3750 msgstr "移動的程式碼行用不同方式著色"
3751
3556 -#: diff.c:5453
3752 +#: diff.c:5489
3753 msgid "how white spaces are ignored in --color-moved"
3754 msgstr "在 --color-moved 下如何忽略空白字元"
3755
3560 -#: diff.c:5456
3756 +#: diff.c:5492
3757 msgid "Other diff options"
3758 msgstr "其它差異選項"
3759
3564 -#: diff.c:5458
3760 +#: diff.c:5494
3761 msgid "when run from subdir, exclude changes outside and show relative paths"
3762 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
3763
3568 -#: diff.c:5462
3764 +#: diff.c:5498
3765 msgid "treat all files as text"
3766 msgstr "把所有檔案當做文字處理"
3767
3572 -#: diff.c:5464
3768 +#: diff.c:5500
3769 msgid "swap two inputs, reverse the diff"
3770 msgstr "交換兩個輸入，反轉差異"
3771
3576 -#: diff.c:5466
3772 +#: diff.c:5502
3773 msgid "exit with 1 if there were differences, 0 otherwise"
3774 msgstr "有差異時離開碼為 1，否則為 0"
3775
3580 -#: diff.c:5468
3776 +#: diff.c:5504
3777 msgid "disable all output of the program"
3582 -msgstr "禁用本程式的所有輸出"
3778 +msgstr "停用本程式的所有輸出"
3779
3584 -#: diff.c:5470
3780 +#: diff.c:5506
3781 msgid "allow an external diff helper to be executed"
3782 msgstr "允許執行一個外部的差異助手"
3783
3588 -#: diff.c:5472
3784 +#: diff.c:5508
3785 msgid "run external text conversion filters when comparing binary files"
3786 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
3787
3592 -#: diff.c:5474
3788 +#: diff.c:5510
3789 msgid "<when>"
3790 msgstr "<何時>"
3791
3596 -#: diff.c:5475
3792 +#: diff.c:5511
3793 msgid "ignore changes to submodules in the diff generation"
3794 msgstr "在生成差異時，忽略子模組的更改"
3795
3600 -#: diff.c:5478
3796 +#: diff.c:5514
3797 msgid "<format>"
3798 msgstr "<格式>"
3799
3604 -#: diff.c:5479
3800 +#: diff.c:5515
3801 msgid "specify how differences in submodules are shown"
3802 msgstr "指定子模組的差異如何顯示"
3803
3608 -#: diff.c:5483
3804 +#: diff.c:5519
3805 msgid "hide 'git add -N' entries from the index"
3806 msgstr "隱藏索引中 'git add -N' 條目"
3807
3612 -#: diff.c:5486
3808 +#: diff.c:5522
3809 msgid "treat 'git add -N' entries as real in the index"
3810 msgstr "將索引中 'git add -N' 條目當做真實的"
3811
3616 -#: diff.c:5488
3812 +#: diff.c:5524
3813 msgid "<string>"
3814 msgstr "<字串>"
3815
3620 -#: diff.c:5489
3816 +#: diff.c:5525
3817 msgid ""
3818 "look for differences that change the number of occurrences of the specified "
3819 "string"
3820 msgstr "尋找改變了指定字串出現次數的差異"
3821
3626 -#: diff.c:5492
3822 +#: diff.c:5528
3823 msgid ""
3824 "look for differences that change the number of occurrences of the specified "
3825 "regex"
3826 msgstr "尋找改變指定正則符合出現次數的差異"
3827
3632 -#: diff.c:5495
3828 +#: diff.c:5531
3829 msgid "show all changes in the changeset with -S or -G"
3830 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
3831
3636 -#: diff.c:5498
3832 +#: diff.c:5534
3833 msgid "treat <string> in -S as extended POSIX regular expression"
3834 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
3835
3640 -#: diff.c:5501
3836 +#: diff.c:5537
3837 msgid "control the order in which files appear in the output"
3838 msgstr "控制輸出中的檔案顯示順序"
3839
3644 -#: diff.c:5502
3840 +#: diff.c:5538
3841 msgid "<object-id>"
3842 msgstr "<物件 ID>"
3843
3648 -#: diff.c:5503
3844 +#: diff.c:5539
3845 msgid ""
3846 "look for differences that change the number of occurrences of the specified "
3847 "object"
3848 msgstr "尋找改變指定物件出現次數的差異"
3849
3654 -#: diff.c:5505
3850 +#: diff.c:5541
3851 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3852 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3853
3658 -#: diff.c:5506
3854 +#: diff.c:5542
3855 msgid "select files by diff type"
3856 msgstr "透過差異類型選擇檔案"
3857
3662 -#: diff.c:5508
3858 +#: diff.c:5544
3859 msgid "<file>"
3860 msgstr "<檔案>"
3861
3666 -#: diff.c:5509
3862 +#: diff.c:5545
3863 msgid "Output to a specific file"
3864 msgstr "輸出到一個指定的檔案"
3865
3670 -#: diff.c:6164
3866 +#: diff.c:6200
3867 msgid "inexact rename detection was skipped due to too many files."
3868 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"
3869
3674 -#: diff.c:6167
3870 +#: diff.c:6203
3871 msgid "only found copies from modified paths due to too many files."
3872 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
3873
3678 -#: diff.c:6170
3874 +#: diff.c:6206
3875 #, c-format
3876 msgid ""
3877 "you may want to set your %s variable to at least %d and retry the command."
3878 msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
3879
3880 +#: diffcore-order.c:24
3881 +#, c-format
3882 +msgid "failed to read orderfile '%s'"
3883 +msgstr "讀取排序檔案 '%s' 失敗"
3884 +
3885 +#: diffcore-rename.c:592
3886 +msgid "Performing inexact rename detection"
3887 +msgstr "正在進行非精確的重新命名偵測"
3888 +
3889 #: dir.c:555
3890 #, c-format
3891 msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3699,7 +3904,7 @@ msgstr "無法識別反向模式：「%s」"
3904 #: dir.c:786
3905 #, c-format
3906 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3702 -msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
3907 +msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"
3908
3909 #: dir.c:796
3910 msgid "disabling cone pattern matching"
@@ -3710,35 +3915,35 @@ msgstr "停用 cone 樣式符合模式"
3915 msgid "cannot use %s as an exclude file"
3916 msgstr "不能將 %s 用作排除檔案"
3917
3713 -#: dir.c:2144
3918 +#: dir.c:2275
3919 #, c-format
3920 msgid "could not open directory '%s'"
3921 msgstr "不能開啟目錄 '%s'"
3922
3718 -#: dir.c:2479
3923 +#: dir.c:2575
3924 msgid "failed to get kernel name and information"
3925 msgstr "無法獲得核心名稱和訊息"
3926
3722 -#: dir.c:2603
3927 +#: dir.c:2699
3928 msgid "untracked cache is disabled on this system or location"
3724 -msgstr "快取未追蹤檔案在本系統或位置中被禁用"
3929 +msgstr "快取未追蹤檔案在本系統或位置中被停用"
3930
3726 -#: dir.c:3407
3931 +#: dir.c:3481
3932 #, c-format
3933 msgid "index file corrupt in repo %s"
3934 msgstr "版本庫 %s 中的索引檔案損壞"
3935
3731 -#: dir.c:3452 dir.c:3457
3936 +#: dir.c:3526 dir.c:3531
3937 #, c-format
3938 msgid "could not create directories for %s"
3939 msgstr "不能為 %s 建立目錄"
3940
3736 -#: dir.c:3486
3941 +#: dir.c:3560
3942 #, c-format
3943 msgid "could not migrate git directory from '%s' to '%s'"
3944 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
3945
3741 -#: editor.c:73
3946 +#: editor.c:74
3947 #, c-format
3948 msgid "hint: Waiting for your editor to close the file...%c"
3949 msgstr "提示：等待您的編輯器關閉檔案...%c"
@@ -3747,17 +3952,17 @@ msgstr "提示：等待您的編輯器關閉檔案...%c"
3952 msgid "Filtering content"
3953 msgstr "過濾內容"
3954
3750 -#: entry.c:476
3955 +#: entry.c:479
3956 #, c-format
3957 msgid "could not stat file '%s'"
3958 msgstr "不能對檔案 '%s' 呼叫 stat"
3959
3755 -#: environment.c:149
3960 +#: environment.c:150
3961 #, c-format
3962 msgid "bad git namespace path \"%s\""
3963 msgstr "錯誤的 git 名字空間路徑 \"%s\""
3964
3760 -#: environment.c:331
3965 +#: environment.c:337
3966 #, c-format
3967 msgid "could not set GIT_DIR to '%s'"
3968 msgstr "不能設定 GIT_DIR 為 '%s'"
@@ -3767,244 +3972,244 @@ msgstr "不能設定 GIT_DIR 為 '%s'"
3972 msgid "too many args to run %s"
3973 msgstr "執行 %s 的參數太多"
3974
3770 -#: fetch-pack.c:150
3975 +#: fetch-pack.c:151
3976 msgid "git fetch-pack: expected shallow list"
3977 msgstr "git fetch-pack：應為 shallow 列表"
3978
3774 -#: fetch-pack.c:153
3979 +#: fetch-pack.c:154
3980 msgid "git fetch-pack: expected a flush packet after shallow list"
3981 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
3982
3778 -#: fetch-pack.c:164
3983 +#: fetch-pack.c:165
3984 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3985 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
3986
3782 -#: fetch-pack.c:184
3987 +#: fetch-pack.c:185
3988 #, c-format
3989 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3990 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
3991
3787 -#: fetch-pack.c:195
3992 +#: fetch-pack.c:196
3993 msgid "unable to write to remote"
3994 msgstr "無法寫到遠端"
3995
3791 -#: fetch-pack.c:257
3996 +#: fetch-pack.c:258
3997 msgid "--stateless-rpc requires multi_ack_detailed"
3998 msgstr "--stateless-rpc 需要 multi_ack_detailed"
3999
3795 -#: fetch-pack.c:356 fetch-pack.c:1340
4000 +#: fetch-pack.c:357 fetch-pack.c:1364
4001 #, c-format
4002 msgid "invalid shallow line: %s"
4003 msgstr "無效的 shallow 訊息：%s"
4004
3800 -#: fetch-pack.c:362 fetch-pack.c:1346
4005 +#: fetch-pack.c:363 fetch-pack.c:1370
4006 #, c-format
4007 msgid "invalid unshallow line: %s"
4008 msgstr "無效的 unshallow 訊息：%s"
4009
3805 -#: fetch-pack.c:364 fetch-pack.c:1348
4010 +#: fetch-pack.c:365 fetch-pack.c:1372
4011 #, c-format
4012 msgid "object not found: %s"
4013 msgstr "物件未找到：%s"
4014
3810 -#: fetch-pack.c:367 fetch-pack.c:1351
4015 +#: fetch-pack.c:368 fetch-pack.c:1375
4016 #, c-format
4017 msgid "error in object: %s"
4018 msgstr "物件中發生錯誤：%s"
4019
3815 -#: fetch-pack.c:369 fetch-pack.c:1353
4020 +#: fetch-pack.c:370 fetch-pack.c:1377
4021 #, c-format
4022 msgid "no shallow found: %s"
4023 msgstr "未發現 shallow：%s"
4024
3820 -#: fetch-pack.c:372 fetch-pack.c:1357
4025 +#: fetch-pack.c:373 fetch-pack.c:1381
4026 #, c-format
4027 msgid "expected shallow/unshallow, got %s"
4028 msgstr "應為 shallow/unshallow，卻得到 %s"
4029
3825 -#: fetch-pack.c:414
4030 +#: fetch-pack.c:415
4031 #, c-format
4032 msgid "got %s %d %s"
4033 msgstr "得到 %s %d %s"
4034
3830 -#: fetch-pack.c:431
4035 +#: fetch-pack.c:432
4036 #, c-format
4037 msgid "invalid commit %s"
4038 msgstr "無效提交 %s"
4039
3835 -#: fetch-pack.c:462
4040 +#: fetch-pack.c:463
4041 msgid "giving up"
4042 msgstr "放棄"
4043
3839 -#: fetch-pack.c:475 progress.c:323
4044 +#: fetch-pack.c:476 progress.c:340
4045 msgid "done"
4046 msgstr "完成"
4047
3843 -#: fetch-pack.c:487
4048 +#: fetch-pack.c:488
4049 #, c-format
4050 msgid "got %s (%d) %s"
4051 msgstr "得到 %s (%d) %s"
4052
3848 -#: fetch-pack.c:533
4053 +#: fetch-pack.c:534
4054 #, c-format
4055 msgid "Marking %s as complete"
4056 msgstr "標記 %s 為完成"
4057
3853 -#: fetch-pack.c:754
4058 +#: fetch-pack.c:755
4059 #, c-format
4060 msgid "already have %s (%s)"
4061 msgstr "已經有 %s（%s）"
4062
3858 -#: fetch-pack.c:818
4063 +#: fetch-pack.c:819
4064 msgid "fetch-pack: unable to fork off sideband demultiplexer"
4065 msgstr "fetch-pack：無法衍生 sideband 多路輸出"
4066
3862 -#: fetch-pack.c:826
4067 +#: fetch-pack.c:827
4068 msgid "protocol error: bad pack header"
4069 msgstr "協定錯誤：壞的包頭"
4070
3866 -#: fetch-pack.c:900
4071 +#: fetch-pack.c:901
4072 #, c-format
4073 msgid "fetch-pack: unable to fork off %s"
4074 msgstr "fetch-pack：無法衍生進程 %s"
4075
3871 -#: fetch-pack.c:916
4076 +#: fetch-pack.c:917
4077 #, c-format
4078 msgid "%s failed"
4079 msgstr "%s 失敗"
4080
3876 -#: fetch-pack.c:918
4081 +#: fetch-pack.c:919
4082 msgid "error in sideband demultiplexer"
4083 msgstr "sideband 多路輸出發生錯誤"
4084
3880 -#: fetch-pack.c:965
4085 +#: fetch-pack.c:966
4086 #, c-format
4087 msgid "Server version is %.*s"
4088 msgstr "伺服器版本 %.*s"
4089
3885 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3886 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3887 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3888 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
4090 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
4091 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
4092 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
4093 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
4094 #, c-format
4095 msgid "Server supports %s"
4096 msgstr "伺服器支援 %s"
4097
3893 -#: fetch-pack.c:972
4098 +#: fetch-pack.c:973
4099 msgid "Server does not support shallow clients"
4100 msgstr "伺服器不支援 shalllow 用戶端"
4101
3897 -#: fetch-pack.c:1032
4102 +#: fetch-pack.c:1033
4103 msgid "Server does not support --shallow-since"
4104 msgstr "伺服器不支援 --shallow-since"
4105
3901 -#: fetch-pack.c:1037
4106 +#: fetch-pack.c:1038
4107 msgid "Server does not support --shallow-exclude"
4108 msgstr "伺服器不支援 --shallow-exclude"
4109
3905 -#: fetch-pack.c:1041
4110 +#: fetch-pack.c:1042
4111 msgid "Server does not support --deepen"
4112 msgstr "伺服器不支援 --deepen"
4113
3909 -#: fetch-pack.c:1058
4114 +#: fetch-pack.c:1059
4115 msgid "no common commits"
4116 msgstr "沒有共同的提交"
4117
3913 -#: fetch-pack.c:1070 fetch-pack.c:1536
4118 +#: fetch-pack.c:1071 fetch-pack.c:1563
4119 msgid "git fetch-pack: fetch failed."
4120 msgstr "git fetch-pack：取得失敗。"
4121
3917 -#: fetch-pack.c:1209
4122 +#: fetch-pack.c:1211
4123 msgid "Server does not support shallow requests"
4124 msgstr "伺服器不支援 shalllow 請求"
4125
3921 -#: fetch-pack.c:1216
4126 +#: fetch-pack.c:1218
4127 msgid "Server supports filter"
4128 msgstr "伺服器支援 filter"
4129
3925 -#: fetch-pack.c:1239
4130 +#: fetch-pack.c:1242
4131 msgid "unable to write request to remote"
4132 msgstr "無法將請求寫到遠端"
4133
3929 -#: fetch-pack.c:1257
4134 +#: fetch-pack.c:1260
4135 #, c-format
4136 msgid "error reading section header '%s'"
4137 msgstr "讀取節標題 '%s' 發生錯誤"
4138
3934 -#: fetch-pack.c:1263
4139 +#: fetch-pack.c:1266
4140 #, c-format
4141 msgid "expected '%s', received '%s'"
4142 msgstr "預期 '%s'，得到 '%s'"
4143
3939 -#: fetch-pack.c:1303
4144 +#: fetch-pack.c:1327
4145 #, c-format
4146 msgid "unexpected acknowledgment line: '%s'"
4147 msgstr "意外的確認行：'%s'"
4148
3944 -#: fetch-pack.c:1308
4149 +#: fetch-pack.c:1332
4150 #, c-format
4151 msgid "error processing acks: %d"
4152 msgstr "處理 ack 發生錯誤：%d"
4153
3949 -#: fetch-pack.c:1318
4154 +#: fetch-pack.c:1342
4155 msgid "expected packfile to be sent after 'ready'"
4156 msgstr "預期在 'ready' 之後傳送 packfile"
4157
3953 -#: fetch-pack.c:1320
4158 +#: fetch-pack.c:1344
4159 msgid "expected no other sections to be sent after no 'ready'"
4160 msgstr "在沒有 'ready' 不應該傳送其它小節"
4161
3957 -#: fetch-pack.c:1362
4162 +#: fetch-pack.c:1386
4163 #, c-format
4164 msgid "error processing shallow info: %d"
4165 msgstr "處理淺複製訊息發生錯誤：%d"
4166
3962 -#: fetch-pack.c:1409
4167 +#: fetch-pack.c:1433
4168 #, c-format
4169 msgid "expected wanted-ref, got '%s'"
4170 msgstr "預期 wanted-ref，得到 '%s'"
4171
3967 -#: fetch-pack.c:1414
4172 +#: fetch-pack.c:1438
4173 #, c-format
4174 msgid "unexpected wanted-ref: '%s'"
4175 msgstr "意外的 wanted-ref：'%s'"
4176
3972 -#: fetch-pack.c:1419
4177 +#: fetch-pack.c:1443
4178 #, c-format
4179 msgid "error processing wanted refs: %d"
4180 msgstr "處理要取得的引用發生錯誤：%d"
4181
3977 -#: fetch-pack.c:1762
4182 +#: fetch-pack.c:1789
4183 msgid "no matching remote head"
4184 msgstr "沒有符合的遠端分支"
4185
3981 -#: fetch-pack.c:1785 builtin/clone.c:689
4186 +#: fetch-pack.c:1812 builtin/clone.c:692
4187 msgid "remote did not send all necessary objects"
4188 msgstr "遠端沒有傳送所有必需的物件"
4189
3985 -#: fetch-pack.c:1812
4190 +#: fetch-pack.c:1839
4191 #, c-format
4192 msgid "no such remote ref %s"
4193 msgstr "沒有這樣的遠端引用 %s"
4194
3990 -#: fetch-pack.c:1815
4195 +#: fetch-pack.c:1842
4196 #, c-format
4197 msgid "Server does not allow request for unadvertised object %s"
4198 msgstr "伺服器不允許請求未公開的物件 %s"
4199
3995 -#: gpg-interface.c:408
3996 -msgid "gpg failed to sign the data"
3997 -msgstr "gpg 無法為資料簽名"
3998 -
3999 -#: gpg-interface.c:434
4200 +#: gpg-interface.c:272
4201 msgid "could not create temporary file"
4202 msgstr "不能建立暫存檔"
4203
4003 -#: gpg-interface.c:437
4204 +#: gpg-interface.c:275
4205 #, c-format
4206 msgid "failed writing detached signature to '%s'"
4207 msgstr "無法將分離式簽名寫入 '%s'"
4208
4209 +#: gpg-interface.c:457
4210 +msgid "gpg failed to sign the data"
4211 +msgstr "gpg 無法為資料簽名"
4212 +
4213 #: graph.c:98
4214 #, c-format
4215 msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4023,7 +4228,7 @@ msgstr ""
4228 msgid "'%s': unable to read %s"
4229 msgstr "'%s'：無法讀取 %s"
4230
4026 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
4231 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
4232 #: builtin/rm.c:135
4233 #, c-format
4234 msgid "failed to stat '%s'"
@@ -4099,7 +4304,7 @@ msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
4304 msgid "These are common Git commands used in various situations:"
4305 msgstr "這些是各種場合常見的 Git 指令："
4306
4102 -#: help.c:363 git.c:98
4307 +#: help.c:363 git.c:99
4308 #, c-format
4309 msgid "unsupported command listing type '%s'"
4310 msgstr "不支援的指令列表類型 '%s'"
@@ -4108,19 +4313,19 @@ msgstr "不支援的指令列表類型 '%s'"
4313 msgid "The common Git guides are:"
4314 msgstr "最常用的 Git 嚮導有："
4315
4111 -#: help.c:512
4316 +#: help.c:427
4317 msgid "See 'git help <command>' to read about a specific subcommand"
4318 msgstr "執行　'git help <command>' 來檢視特定子指令"
4319
4115 -#: help.c:517
4320 +#: help.c:432
4321 msgid "External commands"
4322 msgstr "外部指令"
4323
4119 -#: help.c:532
4324 +#: help.c:447
4325 msgid "Command aliases"
4326 msgstr "指令別名"
4327
4123 -#: help.c:596
4328 +#: help.c:511
4329 #, c-format
4330 msgid ""
4331 "'%s' appears to be a git command, but we were not\n"
@@ -4129,31 +4334,31 @@ msgstr ""
4334 "'%s' 像是一個 git 指令，但卻無法執行。\n"
4335 "可能是 git-%s 受損？"
4336
4132 -#: help.c:655
4337 +#: help.c:570
4338 msgid "Uh oh. Your system reports no Git commands at all."
4339 msgstr "唉呀，您的系統中未發現 Git 指令。"
4340
4136 -#: help.c:677
4341 +#: help.c:592
4342 #, c-format
4343 msgid "WARNING: You called a Git command named '%s', which does not exist."
4344 msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
4345
4141 -#: help.c:682
4346 +#: help.c:597
4347 #, c-format
4348 msgid "Continuing under the assumption that you meant '%s'."
4349 msgstr "假定你想要的是 '%s' 並繼續。"
4350
4146 -#: help.c:687
4351 +#: help.c:602
4352 #, c-format
4353 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4354 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
4355
4151 -#: help.c:695
4356 +#: help.c:610
4357 #, c-format
4358 msgid "git: '%s' is not a git command. See 'git --help'."
4359 msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
4360
4156 -#: help.c:699
4361 +#: help.c:614
4362 msgid ""
4363 "\n"
4364 "The most similar command is"
@@ -4164,16 +4369,16 @@ msgstr[0] ""
4369 "\n"
4370 "最類似的指令有"
4371
4167 -#: help.c:714
4372 +#: help.c:653
4373 msgid "git version [<options>]"
4374 msgstr "git version [<選項>]"
4375
4171 -#: help.c:783
4376 +#: help.c:708
4377 #, c-format
4378 msgid "%s: %s - %s"
4379 msgstr "%s：%s - %s"
4380
4176 -#: help.c:787
4381 +#: help.c:712
4382 msgid ""
4383 "\n"
4384 "Did you mean this?"
@@ -4211,7 +4416,7 @@ msgstr ""
4416
4417 #: ident.c:379
4418 msgid "no email was given and auto-detection is disabled"
4214 -msgstr "未提供信件位址且自動偵測被禁用"
4419 +msgstr "未提供信件位址且自動偵測被停用"
4420
4421 #: ident.c:384
4422 #, c-format
@@ -4220,7 +4425,7 @@ msgstr "無法自動偵測信件位址（得到 '%s'）"
4425
4426 #: ident.c:401
4427 msgid "no name was given and auto-detection is disabled"
4223 -msgstr "未提供姓名且自動偵測被禁用"
4428 +msgstr "未提供姓名且自動偵測被停用"
4429
4430 #: ident.c:407
4431 #, c-format
@@ -4235,38 +4440,13 @@ msgstr "不允許空的姓名（對於 <%s>）"
4440 #: ident.c:421
4441 #, c-format
4442 msgid "name consists only of disallowed characters: %s"
4238 -msgstr "姓名中僅包含禁用字元：%s"
4443 +msgstr "姓名中僅包含停用字元：%s"
4444
4240 -#: ident.c:436 builtin/commit.c:635
4445 +#: ident.c:436 builtin/commit.c:634
4446 #, c-format
4447 msgid "invalid date format: %s"
4448 msgstr "無效的日期格式：%s"
4449
4245 -#: list-objects.c:127
4246 -#, c-format
4247 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4248 -msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
4249 -
4250 -#: list-objects.c:140
4251 -#, c-format
4252 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4253 -msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
4254 -
4255 -#: list-objects.c:375
4256 -#, c-format
4257 -msgid "unable to load root tree for commit %s"
4258 -msgstr "無法為提交 %s 載入根樹"
4259 -
4260 -#: list-objects-filter.c:492
4261 -#, c-format
4262 -msgid "unable to access sparse blob in '%s'"
4263 -msgstr "不能存取 '%s' 中的稀疏資料物件"
4264 -
4265 -#: list-objects-filter.c:495
4266 -#, c-format
4267 -msgid "unable to parse sparse filter data in %s"
4268 -msgstr "無法解析 %s 中的稀疏過濾器資料"
4269 -
4450 #: list-objects-filter-options.c:58
4451 msgid "expected 'tree:<depth>'"
4452 msgstr "期望 'tree:<深度>'"
@@ -4293,7 +4473,32 @@ msgstr "期望在組合後有一些東西："
4473 msgid "multiple filter-specs cannot be combined"
4474 msgstr "不能混用多種過濾規格"
4475
4296 -#: lockfile.c:151
4476 +#: list-objects-filter.c:492
4477 +#, c-format
4478 +msgid "unable to access sparse blob in '%s'"
4479 +msgstr "不能存取 '%s' 中的稀疏資料物件"
4480 +
4481 +#: list-objects-filter.c:495
4482 +#, c-format
4483 +msgid "unable to parse sparse filter data in %s"
4484 +msgstr "無法解析 %s 中的稀疏過濾器資料"
4485 +
4486 +#: list-objects.c:127
4487 +#, c-format
4488 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4489 +msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
4490 +
4491 +#: list-objects.c:140
4492 +#, c-format
4493 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4494 +msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
4495 +
4496 +#: list-objects.c:375
4497 +#, c-format
4498 +msgid "unable to load root tree for commit %s"
4499 +msgstr "無法為提交 %s 載入根樹"
4500 +
4501 +#: lockfile.c:152
4502 #, c-format
4503 msgid ""
4504 "Unable to create '%s.lock': %s.\n"
@@ -4311,20 +4516,14 @@ msgstr ""
4516 "可能之前有一個 git 進程在這個版本庫中異常離開：\n"
4517 "手動刪除這個檔案再繼續。"
4518
4314 -#: lockfile.c:159
4519 +#: lockfile.c:160
4520 #, c-format
4521 msgid "Unable to create '%s.lock': %s"
4522 msgstr "不能建立 '%s.lock'：%s"
4523
4319 -#: merge.c:41
4320 -msgid "failed to read the cache"
4321 -msgstr "讀取快取失敗"
4322 -
4323 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
4324 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4325 -#: builtin/stash.c:265
4326 -msgid "unable to write new index file"
4327 -msgstr "無法寫新的索引檔案"
4524 +#: ls-refs.c:109
4525 +msgid "expected flush after ls-refs arguments"
4526 +msgstr "在 ls-refs 引數之後應該有一個 flush 包"
4527
4528 #: merge-recursive.c:356
4529 msgid "(bad commit)\n"
@@ -4387,7 +4586,7 @@ msgstr "不知道如何處理 %06o %s '%s'"
4586 #: merge-recursive.c:1191
4587 #, c-format
4588 msgid "Failed to merge submodule %s (not checked out)"
4390 -msgstr "無法合併子模組 %s （沒有簽出）"
4589 +msgstr "無法合併子模組 %s （沒有檢出）"
4590
4591 #: merge-recursive.c:1198
4592 #, c-format
@@ -4544,7 +4743,7 @@ msgstr ""
4743
4744 #: merge-recursive.c:1713
4745 msgid " (left unresolved)"
4547 -msgstr "（留下未解決）"
4746 +msgstr " （留下未解決）"
4747
4748 #: merge-recursive.c:1793
4749 #, c-format
@@ -4628,7 +4827,7 @@ msgstr "新增/新增"
4827 msgid "Skipped %s (merged same as existing)"
4828 msgstr "略過 %s（已經做過相同合併）"
4829
4631 -#: merge-recursive.c:3089 git-submodule.sh:1003
4830 +#: merge-recursive.c:3089 git-submodule.sh:985
4831 msgid "submodule"
4832 msgstr "子模組"
4833
@@ -4742,10 +4941,20 @@ msgstr ""
4941 msgid "Could not parse object '%s'"
4942 msgstr "不能解析物件 '%s'"
4943
4745 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
4944 +#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885
4945 msgid "Unable to write index."
4946 msgstr "不能寫入索引。"
4947
4948 +#: merge.c:41
4949 +msgid "failed to read the cache"
4950 +msgstr "讀取快取失敗"
4951 +
4952 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
4953 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
4954 +#: builtin/stash.c:265
4955 +msgid "unable to write new index file"
4956 +msgstr "無法寫新的索引檔案"
4957 +
4958 #: midx.c:68
4959 #, c-format
4960 msgid "multi-pack-index file %s is too small"
@@ -4795,107 +5004,115 @@ msgstr "多包索引缺少必需的物件位移塊"
5004 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5005 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
5006
4798 -#: midx.c:210
5007 +#: midx.c:208
5008 #, c-format
5009 msgid "bad pack-int-id: %u (%u total packs)"
5010 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
5011
4803 -#: midx.c:260
5012 +#: midx.c:258
5013 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5014 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
5015
4807 -#: midx.c:288
5016 +#: midx.c:286
5017 msgid "error preparing packfile from multi-pack-index"
5018 msgstr "從多包索引準備 packfile 時發生錯誤"
5019
4811 -#: midx.c:472
5020 +#: midx.c:470
5021 #, c-format
5022 msgid "failed to add packfile '%s'"
5023 msgstr "新增 packfile '%s' 失敗"
5024
4816 -#: midx.c:478
5025 +#: midx.c:476
5026 #, c-format
5027 msgid "failed to open pack-index '%s'"
5028 msgstr "開啟包索引 '%s' 失敗"
5029
4821 -#: midx.c:538
5030 +#: midx.c:536
5031 #, c-format
5032 msgid "failed to locate object %d in packfile"
5033 msgstr "在 packfile 中定位物件 %d 失敗"
5034
4826 -#: midx.c:842
5035 +#: midx.c:840
5036 msgid "Adding packfiles to multi-pack-index"
5037 msgstr "正在新增 packfile 至多包索引"
5038
4830 -#: midx.c:875
5039 +#: midx.c:873
5040 #, c-format
5041 msgid "did not see pack-file %s to drop"
5042 msgstr "沒有看到要捨棄的包檔案 %s"
5043
4835 -#: midx.c:973
5044 +#: midx.c:925
5045 +msgid "no pack files to index."
5046 +msgstr "沒有要索引的 pack 檔案。"
5047 +
5048 +#: midx.c:977
5049 msgid "Writing chunks to multi-pack-index"
5050 msgstr "寫入區塊至多包索引"
5051
4839 -#: midx.c:1052
5052 +#: midx.c:1056
5053 #, c-format
5054 msgid "failed to clear multi-pack-index at %s"
5055 msgstr "清理位於 %s 的多包索引失敗"
5056
4844 -#: midx.c:1108
5057 +#: midx.c:1112
5058 msgid "Looking for referenced packfiles"
5059 msgstr "正在尋找引用的 packfile"
5060
4848 -#: midx.c:1123
5061 +#: midx.c:1127
5062 #, c-format
5063 msgid ""
5064 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5065 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5066
4854 -#: midx.c:1128
5067 +#: midx.c:1132
5068 +msgid "the midx contains no oid"
5069 +msgstr "midx 沒有 oid"
5070 +
5071 +#: midx.c:1141
5072 msgid "Verifying OID order in multi-pack-index"
5073 msgstr "正在驗證多包索引中的物件 ID 順序"
5074
4858 -#: midx.c:1137
5075 +#: midx.c:1150
5076 #, c-format
5077 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5078 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
5079
4863 -#: midx.c:1157
5080 +#: midx.c:1170
5081 msgid "Sorting objects by packfile"
5082 msgstr "透過 packfile 為物件排序"
5083
4867 -#: midx.c:1164
5084 +#: midx.c:1177
5085 msgid "Verifying object offsets"
5086 msgstr "正在驗證物件位移"
5087
4871 -#: midx.c:1180
5088 +#: midx.c:1193
5089 #, c-format
5090 msgid "failed to load pack entry for oid[%d] = %s"
5091 msgstr "為 oid[%d] = %s 載入包條目失敗"
5092
4876 -#: midx.c:1186
5093 +#: midx.c:1199
5094 #, c-format
5095 msgid "failed to load pack-index for packfile %s"
5096 msgstr "為 packfile %s 載入包索引失敗"
5097
4881 -#: midx.c:1195
5098 +#: midx.c:1208
5099 #, c-format
5100 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5101 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
5102
4886 -#: midx.c:1220
5103 +#: midx.c:1233
5104 msgid "Counting referenced objects"
5105 msgstr "正在計算引用物件"
5106
4890 -#: midx.c:1230
5107 +#: midx.c:1243
5108 msgid "Finding and deleting unreferenced packfiles"
5109 msgstr "正在尋找並刪除沒有參考的 packfile"
5110
4894 -#: midx.c:1388
5111 +#: midx.c:1433
5112 msgid "could not start pack-objects"
5113 msgstr "不能開始 pack-objects"
5114
4898 -#: midx.c:1407
5115 +#: midx.c:1452
5116 msgid "could not finish pack-objects"
5117 msgstr "不能結束 pack-objects"
5118
@@ -4978,6 +5195,11 @@ msgstr "不能解析物件：%s"
5195 msgid "hash mismatch %s"
5196 msgstr "雜湊值與 %s 不符合"
5197
5198 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
5199 +#, c-format
5200 +msgid "unable to get size of %s"
5201 +msgstr "不能得到 %s 的大小"
5202 +
5203 #: packfile.c:629
5204 msgid "offset before end of packfile (broken .idx?)"
5205 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
@@ -4992,10 +5214,25 @@ msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
5214 msgid "offset beyond end of pack index for %s (truncated index?)"
5215 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
5216
4995 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
5217 +#: parse-options-cb.c:20 parse-options-cb.c:24
5218 #, c-format
4997 -msgid "unable to get size of %s"
4998 -msgstr "不能得到 %s 的大小"
5219 +msgid "option `%s' expects a numerical value"
5220 +msgstr "選項 `%s' 期望一個數字值"
5221 +
5222 +#: parse-options-cb.c:41
5223 +#, c-format
5224 +msgid "malformed expiration date '%s'"
5225 +msgstr "格式錯誤的到期時間：'%s'"
5226 +
5227 +#: parse-options-cb.c:54
5228 +#, c-format
5229 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5230 +msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5231 +
5232 +#: parse-options-cb.c:130 parse-options-cb.c:147
5233 +#, c-format
5234 +msgid "malformed object name '%s'"
5235 +msgstr "格式錯誤的物件名 '%s'"
5236
5237 #: parse-options.c:38
5238 #, c-format
@@ -5037,26 +5274,31 @@ msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
5274 msgid "did you mean `--%s` (with two dashes)?"
5275 msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
5276
5040 -#: parse-options.c:857
5277 +#: parse-options.c:663 parse-options.c:963
5278 +#, c-format
5279 +msgid "alias of --%s"
5280 +msgstr "--%s 的別名"
5281 +
5282 +#: parse-options.c:854
5283 #, c-format
5284 msgid "unknown option `%s'"
5285 msgstr "未知選項 `%s'"
5286
5045 -#: parse-options.c:859
5287 +#: parse-options.c:856
5288 #, c-format
5289 msgid "unknown switch `%c'"
5290 msgstr "未知開關 `%c'"
5291
5050 -#: parse-options.c:861
5292 +#: parse-options.c:858
5293 #, c-format
5294 msgid "unknown non-ascii option in string: `%s'"
5295 msgstr "字串中未知的非 ascii 字元選項：`%s'"
5296
5055 -#: parse-options.c:885
5297 +#: parse-options.c:882
5298 msgid "..."
5299 msgstr "..."
5300
5059 -#: parse-options.c:904
5301 +#: parse-options.c:901
5302 #, c-format
5303 msgid "usage: %s"
5304 msgstr "用法：%s"
@@ -5064,46 +5306,21 @@ msgstr "用法：%s"
5306 #. TRANSLATORS: the colon here should align with the
5307 #. one in "usage: %s" translation.
5308 #.
5067 -#: parse-options.c:910
5309 +#: parse-options.c:907
5310 #, c-format
5311 msgid " or: %s"
5070 -msgstr " 或：%s"
5312 +msgstr " 或：%s"
5313
5314 # 譯者：為保證在輸出中對齊，注意調整句中空格！
5073 -#: parse-options.c:913
5315 +#: parse-options.c:910
5316 #, c-format
5317 msgid " %s"
5318 msgstr " %s"
5319
5078 -#: parse-options.c:952
5320 +#: parse-options.c:949
5321 msgid "-NUM"
5322 msgstr "-數字"
5323
5082 -#: parse-options.c:966
5083 -#, c-format
5084 -msgid "alias of --%s"
5085 -msgstr "--%s 的別名"
5086 -
5087 -#: parse-options-cb.c:20 parse-options-cb.c:24
5088 -#, c-format
5089 -msgid "option `%s' expects a numerical value"
5090 -msgstr "選項 `%s' 期望一個數字值"
5091 -
5092 -#: parse-options-cb.c:41
5093 -#, c-format
5094 -msgid "malformed expiration date '%s'"
5095 -msgstr "格式錯誤的到期時間：'%s'"
5096 -
5097 -#: parse-options-cb.c:54
5098 -#, c-format
5099 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5100 -msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5101 -
5102 -#: parse-options-cb.c:130 parse-options-cb.c:147
5103 -#, c-format
5104 -msgid "malformed object name '%s'"
5105 -msgstr "格式錯誤的物件名 '%s'"
5106 -
5324 #: path.c:915
5325 #, c-format
5326 msgid "Could not make %s writable by group"
@@ -5160,27 +5377,27 @@ msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
5377 msgid "%s: 'literal' and 'glob' are incompatible"
5378 msgstr "%s：'literal' 和 'glob' 不相容"
5379
5163 -#: pathspec.c:442
5380 +#: pathspec.c:445
5381 #, c-format
5382 msgid "%s: '%s' is outside repository at '%s'"
5383 msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
5384
5168 -#: pathspec.c:517
5385 +#: pathspec.c:521
5386 #, c-format
5387 msgid "'%s' (mnemonic: '%c')"
5388 msgstr "'%s'（助記符：'%c'）"
5389
5173 -#: pathspec.c:527
5390 +#: pathspec.c:531
5391 #, c-format
5392 msgid "%s: pathspec magic not supported by this command: %s"
5393 msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
5394
5178 -#: pathspec.c:594
5395 +#: pathspec.c:598
5396 #, c-format
5397 msgid "pathspec '%s' is beyond a symbolic link"
5398 msgstr "路徑規格 '%s' 位於符號連結中"
5399
5183 -#: pathspec.c:639
5400 +#: pathspec.c:643
5401 #, c-format
5402 msgid "line is badly quoted: %s"
5403 msgstr "某行不應該被括號括住：%s"
@@ -5245,7 +5462,7 @@ msgstr "正在重新整理索引"
5462 msgid "unable to create threaded lstat: %s"
5463 msgstr "無法建立執行緒 lstat：%s"
5464
5248 -#: pretty.c:981
5465 +#: pretty.c:982
5466 msgid "unable to parse --pretty format"
5467 msgstr "不能解析 --pretty 格式"
5468
@@ -5258,29 +5475,40 @@ msgstr "遠端未設定 URL"
5475 msgid "promisor remote name cannot begin with '/': %s"
5476 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"
5477
5261 -#: range-diff.c:75
5478 +#: prune-packed.c:35
5479 +msgid "Removing duplicate objects"
5480 +msgstr "正在刪除重複物件"
5481 +
5482 +#: range-diff.c:77
5483 msgid "could not start `log`"
5484 msgstr "不能啟動 `log`"
5485
5265 -#: range-diff.c:77
5486 +#: range-diff.c:79
5487 msgid "could not read `log` output"
5488 msgstr "不能讀取 `log` 的輸出"
5489
5269 -#: range-diff.c:96 sequencer.c:5020
5490 +#: range-diff.c:98 sequencer.c:5143
5491 #, c-format
5492 msgid "could not parse commit '%s'"
5493 msgstr "不能解析提交 '%s'"
5494
5274 -#: range-diff.c:122
5495 +#: range-diff.c:112
5496 +#, c-format
5497 +msgid ""
5498 +"could not parse first line of `log` output: did not start with 'commit ': "
5499 +"'%s'"
5500 +msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
5501 +
5502 +#: range-diff.c:137
5503 #, c-format
5504 msgid "could not parse git header '%.*s'"
5505 msgstr "無法解析 git 頭 '%.*s'"
5506
5279 -#: range-diff.c:285
5507 +#: range-diff.c:301
5508 msgid "failed to generate diff"
5509 msgstr "生成 diff 失敗"
5510
5283 -#: range-diff.c:518 range-diff.c:520
5511 +#: range-diff.c:534 range-diff.c:536
5512 #, c-format
5513 msgid "could not parse log for '%s'"
5514 msgstr "不能解析 '%s' 的日誌"
@@ -5302,7 +5530,7 @@ msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"
5530 #: read-cache.c:723
5531 #, c-format
5532 msgid "'%s' does not have a commit checked out"
5305 -msgstr "'%s' 沒有簽出一個提交"
5533 +msgstr "'%s' 沒有檢出一個提交"
5534
5535 #: read-cache.c:775
5536 #, c-format
@@ -5397,9 +5625,9 @@ msgstr "'%s' 的未排序暫存條目"
5625
5626 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5627 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5400 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5401 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5402 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
5628 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
5629 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
5630 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
5631 #: builtin/submodule--helper.c:332
5632 msgid "index file corrupt"
5633 msgstr "索引檔案損壞"
@@ -5454,12 +5682,12 @@ msgstr "無法重新整理共享索引 '%s'"
5682 msgid "broken index, expect %s in %s, got %s"
5683 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
5684
5457 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
5685 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
5686 #, c-format
5687 msgid "could not close '%s'"
5688 msgstr "不能關閉 '%s'"
5689
5462 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
5690 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
5691 #, c-format
5692 msgid "could not stat '%s'"
5693 msgstr "不能對 '%s' 呼叫 stat"
@@ -5585,14 +5813,14 @@ msgstr ""
5813 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"
5814 "\n"
5815
5588 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
5589 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
5816 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
5817 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
5818 #, c-format
5819 msgid "could not write '%s'"
5820 msgstr "不能寫入 '%s'"
5821
5594 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
5595 -#: builtin/rebase.c:234
5822 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216
5823 +#: builtin/rebase.c:240
5824 #, c-format
5825 msgid "could not write '%s'."
5826 msgstr "不能寫入 '%s'。"
@@ -5622,196 +5850,78 @@ msgstr ""
5850 "可選值有：ignore、warn、error。\n"
5851 "\n"
5852
5625 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
5626 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
5627 -#: builtin/rebase.c:246
5853 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274
5854 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
5855 +#: builtin/rebase.c:252
5856 #, c-format
5857 msgid "could not read '%s'."
5858 msgstr "不能讀取 '%s'。"
5859
5632 -#: refs.c:262
5633 -#, c-format
5634 -msgid "%s does not point to a valid object!"
5635 -msgstr "%s 沒有指向一個有效的物件！"
5860 +#: ref-filter.c:42 wt-status.c:1936
5861 +msgid "gone"
5862 +msgstr "遺失"
5863
5637 -#: refs.c:667
5864 +#: ref-filter.c:43
5865 #, c-format
5639 -msgid "ignoring dangling symref %s"
5640 -msgstr "忽略懸空符號引用 %s"
5866 +msgid "ahead %d"
5867 +msgstr "領先 %d"
5868
5642 -#: refs.c:669 ref-filter.c:2098
5869 +#: ref-filter.c:44
5870 #, c-format
5644 -msgid "ignoring broken ref %s"
5645 -msgstr "忽略損壞的引用 %s"
5871 +msgid "behind %d"
5872 +msgstr "落後 %d"
5873
5647 -#: refs.c:804
5874 +#: ref-filter.c:45
5875 #, c-format
5649 -msgid "could not open '%s' for writing: %s"
5650 -msgstr "無法為寫入開啟 '%s'：%s"
5876 +msgid "ahead %d, behind %d"
5877 +msgstr "領先 %d，落後 %d"
5878
5652 -#: refs.c:814 refs.c:865
5879 +#: ref-filter.c:165
5880 #, c-format
5654 -msgid "could not read ref '%s'"
5655 -msgstr "無法讀取引用 '%s'"
5881 +msgid "expected format: %%(color:<color>)"
5882 +msgstr "期望的格式：%%(color:<顏色>)"
5883
5657 -#: refs.c:820
5884 +#: ref-filter.c:167
5885 #, c-format
5659 -msgid "ref '%s' already exists"
5660 -msgstr "引用 '%s' 已經存在"
5886 +msgid "unrecognized color: %%(color:%s)"
5887 +msgstr "無法識別的顏色：%%(color:%s)"
5888
5662 -#: refs.c:825
5889 +#: ref-filter.c:189
5890 #, c-format
5664 -msgid "unexpected object ID when writing '%s'"
5665 -msgstr "寫入 '%s' 時意外的物件 ID"
5891 +msgid "Integer value expected refname:lstrip=%s"
5892 +msgstr "期望整數值 refname:lstrip=%s"
5893
5667 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
5668 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
5669 -#: wrapper.c:620
5894 +#: ref-filter.c:193
5895 #, c-format
5671 -msgid "could not write to '%s'"
5672 -msgstr "不能寫入 '%s'"
5896 +msgid "Integer value expected refname:rstrip=%s"
5897 +msgstr "期望整數值 refname:rstrip=%s"
5898
5674 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5675 -#: builtin/rebase.c:1029
5899 +#: ref-filter.c:195
5900 #, c-format
5677 -msgid "could not open '%s' for writing"
5678 -msgstr "無法開啟 '%s' 進行寫入"
5901 +msgid "unrecognized %%(%s) argument: %s"
5902 +msgstr "無法識別的 %%(%s) 參數：%s"
5903
5680 -#: refs.c:867
5904 +#: ref-filter.c:250
5905 #, c-format
5682 -msgid "unexpected object ID when deleting '%s'"
5683 -msgstr "刪除 '%s' 時意外的物件 ID"
5906 +msgid "%%(objecttype) does not take arguments"
5907 +msgstr "%%(objecttype) 不帶參數"
5908
5685 -#: refs.c:998
5909 +#: ref-filter.c:272
5910 #, c-format
5687 -msgid "log for ref %s has gap after %s"
5688 -msgstr "引用 %s 的日誌在 %s 之後有缺口"
5911 +msgid "unrecognized %%(objectsize) argument: %s"
5912 +msgstr "無法識別的 %%(objectsize) 參數：%s"
5913
5690 -#: refs.c:1004
5914 +#: ref-filter.c:280
5915 #, c-format
5692 -msgid "log for ref %s unexpectedly ended on %s"
5693 -msgstr "引用 %s 的日誌意外終止於 %s "
5916 +msgid "%%(deltabase) does not take arguments"
5917 +msgstr "%%(deltabase) 不帶參數"
5918
5695 -#: refs.c:1063
5919 +#: ref-filter.c:292
5920 #, c-format
5697 -msgid "log for %s is empty"
5698 -msgstr "%s 的日誌為空"
5921 +msgid "%%(body) does not take arguments"
5922 +msgstr "%%(body) 不帶參數"
5923
5700 -#: refs.c:1155
5701 -#, c-format
5702 -msgid "refusing to update ref with bad name '%s'"
5703 -msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
5704 -
5705 -#: refs.c:1231
5706 -#, c-format
5707 -msgid "update_ref failed for ref '%s': %s"
5708 -msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
5709 -
5710 -#: refs.c:2023
5711 -#, c-format
5712 -msgid "multiple updates for ref '%s' not allowed"
5713 -msgstr "不允許對引用 '%s' 多次更新"
5714 -
5715 -#: refs.c:2055
5716 -msgid "ref updates forbidden inside quarantine environment"
5717 -msgstr "在隔離環境中禁止更新引用"
5718 -
5719 -#: refs.c:2151 refs.c:2181
5720 -#, c-format
5721 -msgid "'%s' exists; cannot create '%s'"
5722 -msgstr "'%s' 已存在，無法建立 '%s'"
5723 -
5724 -#: refs.c:2157 refs.c:2192
5725 -#, c-format
5726 -msgid "cannot process '%s' and '%s' at the same time"
5727 -msgstr "無法同時處理 '%s' 和 '%s'"
5728 -
5729 -#: refs/files-backend.c:1233
5730 -#, c-format
5731 -msgid "could not remove reference %s"
5732 -msgstr "無法刪除引用 %s"
5733 -
5734 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541
5735 -#: refs/packed-backend.c:1551
5736 -#, c-format
5737 -msgid "could not delete reference %s: %s"
5738 -msgstr "無法刪除引用 %s：%s"
5739 -
5740 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554
5741 -#, c-format
5742 -msgid "could not delete references: %s"
5743 -msgstr "無法刪除引用：%s"
5744 -
5745 -#: refspec.c:137
5746 -#, c-format
5747 -msgid "invalid refspec '%s'"
5748 -msgstr "無效的引用表達式：'%s'"
5749 -
5750 -#: ref-filter.c:42 wt-status.c:1938
5751 -msgid "gone"
5752 -msgstr "遺失"
5753 -
5754 -#: ref-filter.c:43
5755 -#, c-format
5756 -msgid "ahead %d"
5757 -msgstr "領先 %d"
5758 -
5759 -#: ref-filter.c:44
5760 -#, c-format
5761 -msgid "behind %d"
5762 -msgstr "落後 %d"
5763 -
5764 -#: ref-filter.c:45
5765 -#, c-format
5766 -msgid "ahead %d, behind %d"
5767 -msgstr "領先 %d，落後 %d"
5768 -
5769 -#: ref-filter.c:165
5770 -#, c-format
5771 -msgid "expected format: %%(color:<color>)"
5772 -msgstr "期望的格式：%%(color:<顏色>)"
5773 -
5774 -#: ref-filter.c:167
5775 -#, c-format
5776 -msgid "unrecognized color: %%(color:%s)"
5777 -msgstr "未能識別的顏色：%%(color:%s)"
5778 -
5779 -#: ref-filter.c:189
5780 -#, c-format
5781 -msgid "Integer value expected refname:lstrip=%s"
5782 -msgstr "期望整數值 refname:lstrip=%s"
5783 -
5784 -#: ref-filter.c:193
5785 -#, c-format
5786 -msgid "Integer value expected refname:rstrip=%s"
5787 -msgstr "期望整數值 refname:rstrip=%s"
5788 -
5789 -#: ref-filter.c:195
5790 -#, c-format
5791 -msgid "unrecognized %%(%s) argument: %s"
5792 -msgstr "未能識別的 %%(%s) 參數：%s"
5793 -
5794 -#: ref-filter.c:250
5795 -#, c-format
5796 -msgid "%%(objecttype) does not take arguments"
5797 -msgstr "%%(objecttype) 不帶參數"
5798 -
5799 -#: ref-filter.c:272
5800 -#, c-format
5801 -msgid "unrecognized %%(objectsize) argument: %s"
5802 -msgstr "未能識別的 %%(objectsize) 參數：%s"
5803 -
5804 -#: ref-filter.c:280
5805 -#, c-format
5806 -msgid "%%(deltabase) does not take arguments"
5807 -msgstr "%%(deltabase) 不帶參數"
5808 -
5809 -#: ref-filter.c:292
5810 -#, c-format
5811 -msgid "%%(body) does not take arguments"
5812 -msgstr "%%(body) 不帶參數"
5813 -
5814 -#: ref-filter.c:301
5924 +#: ref-filter.c:301
5925 #, c-format
5926 msgid "%%(subject) does not take arguments"
5927 msgstr "%%(subject) 不帶參數"
@@ -5829,7 +5939,7 @@ msgstr "期望一個正數 contents:lines=%s"
5939 #: ref-filter.c:354
5940 #, c-format
5941 msgid "unrecognized %%(contents) argument: %s"
5832 -msgstr "未能識別的 %%(contents) 參數：%s"
5942 +msgstr "無法識別的 %%(contents) 參數：%s"
5943
5944 #: ref-filter.c:369
5945 #, c-format
@@ -5839,7 +5949,7 @@ msgstr "期望一個正數 objectname:short=%s"
5949 #: ref-filter.c:373
5950 #, c-format
5951 msgid "unrecognized %%(objectname) argument: %s"
5842 -msgstr "未能識別的 %%(objectname) 參數：%s"
5952 +msgstr "無法識別的 %%(objectname) 參數：%s"
5953
5954 #: ref-filter.c:403
5955 #, c-format
@@ -5849,17 +5959,17 @@ msgstr "期望的格式：%%(align:<寬度>,<位置>)"
5959 #: ref-filter.c:415
5960 #, c-format
5961 msgid "unrecognized position:%s"
5852 -msgstr "未能識別的位置：%s"
5962 +msgstr "無法識別的位置：%s"
5963
5964 #: ref-filter.c:422
5965 #, c-format
5966 msgid "unrecognized width:%s"
5857 -msgstr "未能識別的寬度：%s"
5967 +msgstr "無法識別的寬度：%s"
5968
5969 #: ref-filter.c:431
5970 #, c-format
5971 msgid "unrecognized %%(align) argument: %s"
5862 -msgstr "未能識別的 %%(align) 參數：%s"
5972 +msgstr "無法識別的 %%(align) 參數：%s"
5973
5974 #: ref-filter.c:439
5975 #, c-format
@@ -5869,7 +5979,7 @@ msgstr "元素 %%(align) 需要一個正數的寬度"
5979 #: ref-filter.c:457
5980 #, c-format
5981 msgid "unrecognized %%(if) argument: %s"
5872 -msgstr "未能識別的 %%(if) 參數：%s"
5982 +msgstr "無法識別的 %%(if) 參數：%s"
5983
5984 #: ref-filter.c:559
5985 #, c-format
@@ -5932,114 +6042,232 @@ msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
6042 msgid "malformed format string %s"
6043 msgstr "錯誤的格式化字串 %s"
6044
5935 -#: ref-filter.c:1488
6045 +#: ref-filter.c:1486
6046 #, c-format
6047 msgid "no branch, rebasing %s"
6048 msgstr "非分支，正重定基底 %s"
6049
5940 -#: ref-filter.c:1491
6050 +#: ref-filter.c:1489
6051 #, c-format
6052 msgid "no branch, rebasing detached HEAD %s"
6053 msgstr "非分支，正重定基底分離開頭指標 %s"
6054
5945 -#: ref-filter.c:1494
6055 +#: ref-filter.c:1492
6056 #, c-format
6057 msgid "no branch, bisect started on %s"
6058 msgstr "非分支，二分尋找開始於 %s"
6059
5950 -#: ref-filter.c:1504
6060 +#: ref-filter.c:1502
6061 msgid "no branch"
6062 msgstr "非分支"
6063
5954 -#: ref-filter.c:1540 ref-filter.c:1749
6064 +#: ref-filter.c:1538 ref-filter.c:1747
6065 #, c-format
6066 msgid "missing object %s for %s"
6067 msgstr "缺少 %2$s 的物件 %1$s"
6068
5959 -#: ref-filter.c:1550
6069 +#: ref-filter.c:1548
6070 #, c-format
6071 msgid "parse_object_buffer failed on %s for %s"
6072 msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
6073
5964 -#: ref-filter.c:2004
6074 +#: ref-filter.c:2001
6075 #, c-format
6076 msgid "malformed object at '%s'"
6077 msgstr "格式錯誤的物件 '%s'"
6078
5969 -#: ref-filter.c:2093
6079 +#: ref-filter.c:2090
6080 #, c-format
6081 msgid "ignoring ref with broken name %s"
6082 msgstr "忽略帶有錯誤名稱 %s 的引用"
6083
5974 -#: ref-filter.c:2389
6084 +#: ref-filter.c:2095 refs.c:625
6085 +#, c-format
6086 +msgid "ignoring broken ref %s"
6087 +msgstr "忽略損壞的引用 %s"
6088 +
6089 +#: ref-filter.c:2395
6090 #, c-format
6091 msgid "format: %%(end) atom missing"
6092 msgstr "格式：缺少 %%(end) 元素"
6093
5979 -#: ref-filter.c:2489
6094 +#: ref-filter.c:2495
6095 #, c-format
6096 msgid "option `%s' is incompatible with --merged"
6097 msgstr "選項 `%s' 和 --merged 不相容"
6098
5984 -#: ref-filter.c:2492
6099 +#: ref-filter.c:2498
6100 #, c-format
6101 msgid "option `%s' is incompatible with --no-merged"
6102 msgstr "選項 `%s' 和 --no-merged 不相容"
6103
5989 -#: ref-filter.c:2502
6104 +#: ref-filter.c:2508
6105 #, c-format
6106 msgid "malformed object name %s"
6107 msgstr "格式錯誤的物件名 %s"
6108
5994 -#: ref-filter.c:2507
6109 +#: ref-filter.c:2513
6110 #, c-format
6111 msgid "option `%s' must point to a commit"
6112 msgstr "選項 `%s' 必須指向一個提交"
6113
5999 -#: remote.c:366
6114 +#: refs.c:262
6115 +#, c-format
6116 +msgid "%s does not point to a valid object!"
6117 +msgstr "%s 沒有指向一個有效的物件！"
6118 +
6119 +#: refs.c:623
6120 +#, c-format
6121 +msgid "ignoring dangling symref %s"
6122 +msgstr "忽略懸空符號引用 %s"
6123 +
6124 +#: refs.c:760
6125 +#, c-format
6126 +msgid "could not open '%s' for writing: %s"
6127 +msgstr "無法為寫入開啟 '%s'：%s"
6128 +
6129 +#: refs.c:770 refs.c:821
6130 +#, c-format
6131 +msgid "could not read ref '%s'"
6132 +msgstr "無法讀取引用 '%s'"
6133 +
6134 +#: refs.c:776
6135 +#, c-format
6136 +msgid "ref '%s' already exists"
6137 +msgstr "引用 '%s' 已經存在"
6138 +
6139 +#: refs.c:781
6140 +#, c-format
6141 +msgid "unexpected object ID when writing '%s'"
6142 +msgstr "寫入 '%s' 時意外的物件 ID"
6143 +
6144 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
6145 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
6146 +#: wrapper.c:620
6147 +#, c-format
6148 +msgid "could not write to '%s'"
6149 +msgstr "不能寫入 '%s'"
6150 +
6151 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
6152 +#: builtin/rebase.c:852
6153 +#, c-format
6154 +msgid "could not open '%s' for writing"
6155 +msgstr "無法開啟 '%s' 進行寫入"
6156 +
6157 +#: refs.c:823
6158 +#, c-format
6159 +msgid "unexpected object ID when deleting '%s'"
6160 +msgstr "刪除 '%s' 時意外的物件 ID"
6161 +
6162 +#: refs.c:954
6163 +#, c-format
6164 +msgid "log for ref %s has gap after %s"
6165 +msgstr "引用 %s 的日誌在 %s 之後有缺口"
6166 +
6167 +#: refs.c:960
6168 +#, c-format
6169 +msgid "log for ref %s unexpectedly ended on %s"
6170 +msgstr "引用 %s 的日誌意外終止於 %s"
6171 +
6172 +#: refs.c:1019
6173 +#, c-format
6174 +msgid "log for %s is empty"
6175 +msgstr "%s 的日誌為空"
6176 +
6177 +#: refs.c:1111
6178 +#, c-format
6179 +msgid "refusing to update ref with bad name '%s'"
6180 +msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
6181 +
6182 +#: refs.c:1187
6183 +#, c-format
6184 +msgid "update_ref failed for ref '%s': %s"
6185 +msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
6186 +
6187 +#: refs.c:1979
6188 +#, c-format
6189 +msgid "multiple updates for ref '%s' not allowed"
6190 +msgstr "不允許對引用 '%s' 多次更新"
6191 +
6192 +#: refs.c:2011
6193 +msgid "ref updates forbidden inside quarantine environment"
6194 +msgstr "在隔離環境中禁止更新引用"
6195 +
6196 +#: refs.c:2107 refs.c:2137
6197 +#, c-format
6198 +msgid "'%s' exists; cannot create '%s'"
6199 +msgstr "'%s' 已存在，無法建立 '%s'"
6200 +
6201 +#: refs.c:2113 refs.c:2148
6202 +#, c-format
6203 +msgid "cannot process '%s' and '%s' at the same time"
6204 +msgstr "無法同時處理 '%s' 和 '%s'"
6205 +
6206 +#: refs/files-backend.c:1233
6207 +#, c-format
6208 +msgid "could not remove reference %s"
6209 +msgstr "無法刪除引用 %s"
6210 +
6211 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541
6212 +#: refs/packed-backend.c:1551
6213 +#, c-format
6214 +msgid "could not delete reference %s: %s"
6215 +msgstr "無法刪除引用 %s：%s"
6216 +
6217 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554
6218 +#, c-format
6219 +msgid "could not delete references: %s"
6220 +msgstr "無法刪除引用：%s"
6221 +
6222 +#: refspec.c:137
6223 +#, c-format
6224 +msgid "invalid refspec '%s'"
6225 +msgstr "無效的引用表達式：'%s'"
6226 +
6227 +#: remote.c:355
6228 #, c-format
6229 msgid "config remote shorthand cannot begin with '/': %s"
6230 msgstr "設定的遠端短名稱不能以 '/' 開始：%s"
6231
6004 -#: remote.c:414
6232 +#: remote.c:403
6233 msgid "more than one receivepack given, using the first"
6234 msgstr "提供了一個以上的 receivepack，使用第一個"
6235
6008 -#: remote.c:422
6236 +#: remote.c:411
6237 msgid "more than one uploadpack given, using the first"
6238 msgstr "提供了一個以上的 uploadpack，使用第一個"
6239
6012 -#: remote.c:612
6240 +#: remote.c:594
6241 #, c-format
6242 msgid "Cannot fetch both %s and %s to %s"
6243 msgstr "不能同時取得 %s 和 %s 至 %s"
6244
6017 -#: remote.c:616
6245 +#: remote.c:598
6246 #, c-format
6247 msgid "%s usually tracks %s, not %s"
6248 msgstr "%s 通常追蹤 %s，而非 %s"
6249
6022 -#: remote.c:620
6250 +#: remote.c:602
6251 #, c-format
6252 msgid "%s tracks both %s and %s"
6253 msgstr "%s 同時追蹤 %s 和 %s"
6254
6027 -#: remote.c:688
6255 +#: remote.c:670
6256 #, c-format
6257 msgid "key '%s' of pattern had no '*'"
6258 msgstr "模式的鍵 '%s' 沒有 '*'"
6259
6032 -#: remote.c:698
6260 +#: remote.c:680
6261 #, c-format
6262 msgid "value '%s' of pattern has no '*'"
6263 msgstr "模式的值 '%s' 沒有 '*'"
6264
6037 -#: remote.c:1004
6265 +#: remote.c:986
6266 #, c-format
6267 msgid "src refspec %s does not match any"
6268 msgstr "源引用表達式 %s 沒有符合"
6269
6042 -#: remote.c:1009
6270 +#: remote.c:991
6271 #, c-format
6272 msgid "src refspec %s matches more than one"
6273 msgstr "源引用表達式 %s 符合超過一個"
@@ -6048,7 +6276,7 @@ msgstr "源引用表達式 %s 符合超過一個"
6276 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6277 #. the <src>.
6278 #.
6051 -#: remote.c:1024
6279 +#: remote.c:1006
6280 #, c-format
6281 msgid ""
6282 "The destination you provided is not a full refname (i.e.,\n"
@@ -6070,7 +6298,7 @@ msgstr ""
6298 "\n"
6299 "都不行，所以我們已放棄。您必須給出完整的引用。"
6300
6073 -#: remote.c:1044
6301 +#: remote.c:1026
6302 #, c-format
6303 msgid ""
6304 "The <src> part of the refspec is a commit object.\n"
@@ -6080,7 +6308,7 @@ msgstr ""
6308 "引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
6309 "'%s:refs/heads/%s' 推送嗎？"
6310
6083 -#: remote.c:1049
6311 +#: remote.c:1031
6312 #, c-format
6313 msgid ""
6314 "The <src> part of the refspec is a tag object.\n"
@@ -6090,7 +6318,7 @@ msgstr ""
6318 "引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
6319 "'%s:refs/tags/%s' 推送嗎？"
6320
6093 -#: remote.c:1054
6321 +#: remote.c:1036
6322 #, c-format
6323 msgid ""
6324 "The <src> part of the refspec is a tree object.\n"
@@ -6100,7 +6328,7 @@ msgstr ""
6328 "引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
6329 "'%s:refs/tags/%s' 推送嗎？"
6330
6103 -#: remote.c:1059
6331 +#: remote.c:1041
6332 #, c-format
6333 msgid ""
6334 "The <src> part of the refspec is a blob object.\n"
@@ -6110,113 +6338,113 @@ msgstr ""
6338 "引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
6339 "'%s:refs/tags/%s' 推送嗎？"
6340
6113 -#: remote.c:1095
6341 +#: remote.c:1077
6342 #, c-format
6343 msgid "%s cannot be resolved to branch"
6344 msgstr "%s 無法被解析為分支"
6345
6118 -#: remote.c:1106
6346 +#: remote.c:1088
6347 #, c-format
6348 msgid "unable to delete '%s': remote ref does not exist"
6349 msgstr "無法刪除 '%s'：遠端引用不存在"
6350
6123 -#: remote.c:1118
6351 +#: remote.c:1100
6352 #, c-format
6353 msgid "dst refspec %s matches more than one"
6354 msgstr "目標引用表達式 %s 符合超過一個"
6355
6128 -#: remote.c:1125
6356 +#: remote.c:1107
6357 #, c-format
6358 msgid "dst ref %s receives from more than one src"
6359 msgstr "目標引用 %s 接收超過一個源"
6360
6133 -#: remote.c:1628 remote.c:1729
6361 +#: remote.c:1610 remote.c:1711
6362 msgid "HEAD does not point to a branch"
6363 msgstr "HEAD 沒有指向一個分支"
6364
6137 -#: remote.c:1637
6365 +#: remote.c:1619
6366 #, c-format
6367 msgid "no such branch: '%s'"
6368 msgstr "沒有此分支：'%s'"
6369
6142 -#: remote.c:1640
6370 +#: remote.c:1622
6371 #, c-format
6372 msgid "no upstream configured for branch '%s'"
6373 msgstr "尚未給分支 '%s' 設定上游"
6374
6147 -#: remote.c:1646
6375 +#: remote.c:1628
6376 #, c-format
6377 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6378 msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
6379
6152 -#: remote.c:1661
6380 +#: remote.c:1643
6381 #, c-format
6382 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6383 msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
6384
6157 -#: remote.c:1673
6385 +#: remote.c:1655
6386 #, c-format
6387 msgid "branch '%s' has no remote for pushing"
6388 msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
6389
6162 -#: remote.c:1683
6390 +#: remote.c:1665
6391 #, c-format
6392 msgid "push refspecs for '%s' do not include '%s'"
6393 msgstr "向 '%s' 推送引用規格未包含 '%s'"
6394
6167 -#: remote.c:1696
6395 +#: remote.c:1678
6396 msgid "push has no destination (push.default is 'nothing')"
6397 msgstr "推送無目標（push.default 是 'nothing'）"
6398
6171 -#: remote.c:1718
6399 +#: remote.c:1700
6400 msgid "cannot resolve 'simple' push to a single destination"
6401 msgstr "無法解析 'simple' 推送至一個單獨的目標"
6402
6175 -#: remote.c:1844
6403 +#: remote.c:1826
6404 #, c-format
6405 msgid "couldn't find remote ref %s"
6406 msgstr "無法找到遠端引用 %s"
6407
6180 -#: remote.c:1857
6408 +#: remote.c:1839
6409 #, c-format
6410 msgid "* Ignoring funny ref '%s' locally"
6411 msgstr "* 在本機忽略可笑的引用 '%s'"
6412
6185 -#: remote.c:2020
6413 +#: remote.c:2002
6414 #, c-format
6415 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6416 msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
6417
6190 -#: remote.c:2024
6418 +#: remote.c:2006
6419 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6420 msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"
6421
6194 -#: remote.c:2027
6422 +#: remote.c:2009
6423 #, c-format
6424 msgid "Your branch is up to date with '%s'.\n"
6425 msgstr "您的分支與上游分支 '%s' 一致。\n"
6426
6199 -#: remote.c:2031
6427 +#: remote.c:2013
6428 #, c-format
6429 msgid "Your branch and '%s' refer to different commits.\n"
6430 msgstr "您的分支和 '%s' 指向不同的提交。\n"
6431
6204 -#: remote.c:2034
6432 +#: remote.c:2016
6433 #, c-format
6434 msgid " (use \"%s\" for details)\n"
6435 msgstr " （使用 \"%s\" 檢視詳情）\n"
6436
6209 -#: remote.c:2038
6437 +#: remote.c:2020
6438 #, c-format
6439 msgid "Your branch is ahead of '%s' by %d commit.\n"
6440 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6441 msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
6442
6215 -#: remote.c:2044
6443 +#: remote.c:2026
6444 msgid " (use \"git push\" to publish your local commits)\n"
6445 msgstr " （使用 \"git push\" 來發布您的本機提交）\n"
6446
6219 -#: remote.c:2047
6447 +#: remote.c:2029
6448 #, c-format
6449 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6450 msgid_plural ""
@@ -6224,11 +6452,11 @@ msgid_plural ""
6452 msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
6453
6454 # 譯者：請維持前導空格
6227 -#: remote.c:2055
6455 +#: remote.c:2037
6456 msgid " (use \"git pull\" to update your local branch)\n"
6457 msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"
6458
6231 -#: remote.c:2058
6459 +#: remote.c:2040
6460 #, c-format
6461 msgid ""
6462 "Your branch and '%s' have diverged,\n"
@@ -6241,11 +6469,11 @@ msgstr[0] ""
6469 "並且分別有 %d 和 %d 處不同的提交。\n"
6470
6471 # 譯者：請維持前導空格
6244 -#: remote.c:2068
6472 +#: remote.c:2050
6473 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6474 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"
6475
6248 -#: remote.c:2251
6476 +#: remote.c:2233
6477 #, c-format
6478 msgid "cannot parse expected object name '%s'"
6479 msgstr "無法解析期望的物件名 '%s'"
@@ -6265,6 +6493,11 @@ msgstr "重複的取代引用：%s"
6493 msgid "replace depth too high for object %s"
6494 msgstr "物件 %s 的取代層級太深"
6495
6496 +#: repository.c:94 builtin/init-db.c:188
6497 +#, c-format
6498 +msgid "The hash algorithm %s is not supported in this build."
6499 +msgstr "此組建不支援 %s 雜湊算法。"
6500 +
6501 #: rerere.c:217 rerere.c:226 rerere.c:229
6502 msgid "corrupt MERGE_RR"
6503 msgstr "損壞的 MERGE_RR"
@@ -6323,7 +6556,7 @@ msgstr "不能刪除 stray '%s'"
6556 msgid "Recorded preimage for '%s'"
6557 msgstr "為 '%s' 記錄 preimage"
6558
6326 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
6559 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
6560 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
6561 #, c-format
6562 msgid "could not create directory '%s'"
@@ -6358,20 +6591,29 @@ msgstr "忘記 '%s' 的解決方案\n"
6591 msgid "unable to open rr-cache directory"
6592 msgstr "不能開啟 rr-cache 目錄"
6593
6361 -#: revision.c:2497
6594 +#: reset.c:42
6595 +msgid "could not determine HEAD revision"
6596 +msgstr "不能確定 HEAD 版本"
6597 +
6598 +#: reset.c:70 reset.c:76 sequencer.c:3318
6599 +#, c-format
6600 +msgid "failed to find tree of %s"
6601 +msgstr "無法找到 %s 指向的樹"
6602 +
6603 +#: revision.c:2655
6604 msgid "your current branch appears to be broken"
6605 msgstr "您的目前分支好像被損壞"
6606
6365 -#: revision.c:2500
6607 +#: revision.c:2658
6608 #, c-format
6609 msgid "your current branch '%s' does not have any commits yet"
6610 msgstr "您的目前分支 '%s' 尚無任何提交"
6611
6370 -#: revision.c:2708
6612 +#: revision.c:2866
6613 msgid "--first-parent is incompatible with --bisect"
6614 msgstr "--first-parent 與 --bisect 不相容"
6615
6374 -#: revision.c:2712
6616 +#: revision.c:2870
6617 msgid "-L does not yet support diff formats besides -p and -s"
6618 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
6619
@@ -6393,75 +6635,75 @@ msgstr ""
6635 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
6636 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"
6637
6396 -#: send-pack.c:144
6638 +#: send-pack.c:145
6639 msgid "unexpected flush packet while reading remote unpack status"
6640 msgstr "讀取遠端解包狀態時收到意外的 flush 包"
6641
6400 -#: send-pack.c:146
6642 +#: send-pack.c:147
6643 #, c-format
6644 msgid "unable to parse remote unpack status: %s"
6645 msgstr "不能解析遠端解包狀態：%s"
6646
6405 -#: send-pack.c:148
6647 +#: send-pack.c:149
6648 #, c-format
6649 msgid "remote unpack failed: %s"
6650 msgstr "遠端解包失敗：%s"
6651
6410 -#: send-pack.c:309
6652 +#: send-pack.c:308
6653 msgid "failed to sign the push certificate"
6654 msgstr "為推送證書籤名失敗"
6655
6414 -#: send-pack.c:423
6656 +#: send-pack.c:399
6657 msgid "the receiving end does not support --signed push"
6658 msgstr "接收端不支援簽名推送"
6659
6418 -#: send-pack.c:425
6660 +#: send-pack.c:401
6661 msgid ""
6662 "not sending a push certificate since the receiving end does not support --"
6663 "signed push"
6664 msgstr "未傳送推送證書，因為接收端不支援簽名推送"
6665
6424 -#: send-pack.c:437
6666 +#: send-pack.c:413
6667 msgid "the receiving end does not support --atomic push"
6668 msgstr "接收端不支援原子推送"
6669
6428 -#: send-pack.c:442
6670 +#: send-pack.c:418
6671 msgid "the receiving end does not support push options"
6672 msgstr "接收端不支援推送選項"
6673
6432 -#: sequencer.c:191
6674 +#: sequencer.c:192
6675 #, c-format
6676 msgid "invalid commit message cleanup mode '%s'"
6677 msgstr "無效的提交訊息清理模式 '%s'"
6678
6437 -#: sequencer.c:296
6679 +#: sequencer.c:297
6680 #, c-format
6681 msgid "could not delete '%s'"
6682 msgstr "無法刪除 '%s'"
6683
6442 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
6684 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
6685 #, c-format
6686 msgid "could not remove '%s'"
6687 msgstr "無法刪除 '%s'"
6688
6447 -#: sequencer.c:325
6689 +#: sequencer.c:326
6690 msgid "revert"
6449 -msgstr "還原"
6691 +msgstr "復原"
6692
6451 -#: sequencer.c:327
6693 +#: sequencer.c:328
6694 msgid "cherry-pick"
6453 -msgstr "揀選"
6695 +msgstr "摘取"
6696
6455 -#: sequencer.c:329
6697 +#: sequencer.c:330
6698 msgid "rebase"
6699 msgstr "rebase"
6700
6459 -#: sequencer.c:331
6701 +#: sequencer.c:332
6702 #, c-format
6703 msgid "unknown action: %d"
6704 msgstr "未知動作：%d"
6705
6464 -#: sequencer.c:389
6706 +#: sequencer.c:390
6707 msgid ""
6708 "after resolving the conflicts, mark the corrected paths\n"
6709 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6469,7 +6711,7 @@ msgstr ""
6711 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
6712 "指令標記修正後的檔案"
6713
6472 -#: sequencer.c:392
6714 +#: sequencer.c:393
6715 msgid ""
6716 "after resolving the conflicts, mark the corrected paths\n"
6717 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6478,44 +6720,43 @@ msgstr ""
6720 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
6721 "對修正後的檔案做標記，然後用 'git commit' 提交"
6722
6481 -#: sequencer.c:405 sequencer.c:2901
6723 +#: sequencer.c:406 sequencer.c:2921
6724 #, c-format
6725 msgid "could not lock '%s'"
6726 msgstr "不能鎖定 '%s'"
6727
6486 -#: sequencer.c:412
6728 +#: sequencer.c:413
6729 #, c-format
6730 msgid "could not write eol to '%s'"
6731 msgstr "不能將換行符號寫入 '%s'"

This file is too large to show in full.