6d0497d526 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,11 @@

1 # Chinese (traditional) translations for Git package

2 # Git 套裝軟體的繁體中文翻譯。

5 # This file is distributed under the same license as the Git package.

6 #

7 +# The glossary can be found on https://github.com/l10n-tw/git-glossary

8 +#

9 # Contributors (CN):

10 # - Fangyi Zhou <me AT fangyi.io>

11 # - Jiang Xin <worldhello.net AT gmail.com>

@@ -18,12 +20,13 @@

20 # - Zhuang Ya <zhuangya AT me.com>

21 #

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

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

24 msgid ""

25 msgstr ""

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

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

25 -"POT-Creation-Date: 2022-09-23 21:57+0000\n"

26 -"PO-Revision-Date: 2022-10-01 19:02+0800\n"

28 +"POT-Creation-Date: 2022-12-11 00:28+0800\n"

29 +"PO-Revision-Date: 2022-12-10 17:12+0000\n"

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

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

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

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

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

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

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

35 -"X-Generator: Poedit 3.1.1\n"

38 +"X-Generator: Weblate 4.14.2\n"

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

40 "zhconvert.org\n"

41

@@ -64,7 +67,7 @@ msgstr "更新"

67 #: add-interactive.c

68 #, c-format

69 msgid "could not stage '%s'"

67 -msgstr "無法暫存「%s」"

70 +msgstr "無法暫存 “%s”"

71

72 #: add-interactive.c builtin/stash.c reset.c sequencer.c

73 msgid "could not write index"

@@ -79,12 +82,12 @@ msgstr[0] "已更新 %d 個路徑\n"

82 #: add-interactive.c git-add--interactive.perl

83 #, c-format, perl-format

84 msgid "note: %s is untracked now.\n"

82 -msgstr "注意：%s 現已不再追蹤。\n"

85 +msgstr "註：現已不再追蹤 %s。\n"

86

87 #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c

88 #, c-format

89 msgid "make_cache_entry failed for path '%s'"

87 -msgstr "「%s」路徑執行 make_cache_entry 失敗"

90 +msgstr "對 “%s” 路徑執行 make_cache_entry 失敗"

91

92 #: add-interactive.c git-add--interactive.perl

93 msgid "Revert"

@@ -92,13 +95,13 @@ msgstr "還原"

95

96 #: add-interactive.c

97 msgid "Could not parse HEAD^{tree}"

95 -msgstr "不能解析 HEAD^{樹}"

98 +msgstr "無法解析 HEAD^{tree}"

99

100 #: add-interactive.c git-add--interactive.perl

101 #, c-format, perl-format

102 msgid "reverted %d path\n"

103 msgid_plural "reverted %d paths\n"

101 -msgstr[0] "還原了 %d 個路徑\n"

104 +msgstr[0] "已還原 %d 個路徑\n"

105

106 #: add-interactive.c git-add--interactive.perl

107 #, c-format

@@ -107,28 +110,28 @@ msgstr "沒有未追蹤的檔案。\n"

110

111 #: add-interactive.c git-add--interactive.perl

112 msgid "Add untracked"

110 -msgstr "新增未追蹤的"

113 +msgstr "加入未追蹤項目"

114

115 #: add-interactive.c git-add--interactive.perl

116 #, c-format, perl-format

117 msgid "added %d path\n"

118 msgid_plural "added %d paths\n"

116 -msgstr[0] "增加了 %d 個路徑\n"

119 +msgstr[0] "已加入 %d 個路徑\n"

120

121 #: add-interactive.c

122 #, c-format

123 msgid "ignoring unmerged: %s"

121 -msgstr "忽略未合併：%s"

124 +msgstr "忽略未合併項目：%s"

125

126 #: add-interactive.c add-patch.c git-add--interactive.perl

127 #, c-format

128 msgid "Only binary files changed.\n"

126 -msgstr "只有二進位檔案被修改。\n"

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

130

131 #: add-interactive.c add-patch.c git-add--interactive.perl

132 #, c-format

133 msgid "No changes.\n"

131 -msgstr "沒有修改。\n"

134 +msgstr "沒有更動。\n"

135

136 #: add-interactive.c git-add--interactive.perl

137 msgid "Patch update"

@@ -136,19 +139,19 @@ msgstr "修補檔更新"

139

140 #: add-interactive.c git-add--interactive.perl

141 msgid "Review diff"

139 -msgstr "檢視 diff"

142 +msgstr "檢閱差異"

143

144 #: add-interactive.c

145 msgid "show paths with changes"

143 -msgstr "顯示有變更的路徑"

146 +msgstr "顯示有更動的路徑"

147

148 #: add-interactive.c

149 msgid "add working tree state to the staged set of changes"

147 -msgstr "加入工作區狀態至暫存列表"

150 +msgstr "將工作區狀態加入至暫存更動集"

151

152 #: add-interactive.c

153 msgid "revert staged set of changes back to the HEAD version"

151 -msgstr "還原修改的暫存集至 HEAD 版本"

154 +msgstr "將暫存的更動集還原回 HEAD 版本"

155

156 #: add-interactive.c

157 msgid "pick hunks and update selectively"

@@ -160,7 +163,7 @@ msgstr "檢視 HEAD 及索引之間的差異"

163

164 #: add-interactive.c

165 msgid "add contents of untracked files to the staged set of changes"

163 -msgstr "加入未追蹤檔案的內容至暫存列表"

166 +msgstr "將未追蹤檔案的內容加入至更動暫存集"

167

168 #: add-interactive.c

169 msgid "Prompt help:"

@@ -168,23 +171,23 @@ msgstr "提示說明："

171

172 #: add-interactive.c

173 msgid "select a single item"

171 -msgstr "選擇單一項目"

174 +msgstr "選取一個項目"

175

176 #: add-interactive.c

177 msgid "select a range of items"

175 -msgstr "選擇項目範圍"

178 +msgstr "選取範圍中項目"

179

180 #: add-interactive.c

181 msgid "select multiple ranges"

179 -msgstr "選擇多個範圍"

182 +msgstr "選取多個範圍"

183

184 #: add-interactive.c

185 msgid "select item based on unique prefix"

183 -msgstr "基於唯一前綴選擇項目"

186 +msgstr "根據獨特前綴選取項目"

187

188 #: add-interactive.c

189 msgid "unselect specified items"

187 -msgstr "取消選擇指定項目"

190 +msgstr "取消選取指定項目"

191

192 #: add-interactive.c

193 msgid "choose all items"

@@ -196,15 +199,15 @@ msgstr "（空）完成選取"

199

200 #: add-interactive.c

201 msgid "select a numbered item"

199 -msgstr "選擇編號過的項目"

202 +msgstr "選取編號過的項目"

203

204 #: add-interactive.c

205 msgid "(empty) select nothing"

203 -msgstr "（空）全不選取"

206 +msgstr "（空）全部不選取"

207

208 #: add-interactive.c builtin/clean.c git-add--interactive.perl

209 msgid "*** Commands ***"

207 -msgstr "*** 指令 ***"

210 +msgstr "*** 命令 ***"

211

212 #: add-interactive.c builtin/clean.c git-add--interactive.perl

213 msgid "What now"

@@ -212,11 +215,11 @@ msgstr "請選擇"

215

216 #: add-interactive.c git-add--interactive.perl

217 msgid "staged"

215 -msgstr "快取"

218 +msgstr "已暫存"

219

220 #: add-interactive.c git-add--interactive.perl

221 msgid "unstaged"

219 -msgstr "未快取"

222 +msgstr "未暫存"

223

224 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c

225 #: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c

@@ -236,17 +239,17 @@ msgstr "再見。\n"

239 #: add-patch.c git-add--interactive.perl

240 #, c-format, perl-format

241 msgid "Stage mode change [y,n,q,a,d%s,?]? "

239 -msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "

242 +msgstr "暫存模式更動 [y,n,q,a,d%s,?]? "

243

244 #: add-patch.c git-add--interactive.perl

245 #, c-format, perl-format

246 msgid "Stage deletion [y,n,q,a,d%s,?]? "

244 -msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "

247 +msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "

248

249 #: add-patch.c git-add--interactive.perl

250 #, c-format, perl-format

251 msgid "Stage addition [y,n,q,a,d%s,?]? "

249 -msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "

252 +msgstr "暫存加入動作 [y,n,q,a,d%s,?]? "

253

254 #: add-patch.c git-add--interactive.perl

255 #, c-format, perl-format

@@ -257,7 +260,7 @@ msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "

260 msgid ""

261 "If the patch applies cleanly, the edited hunk will immediately be marked for "

262 "staging."

260 -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"

263 +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。"

264

265 #: add-patch.c

266 msgid ""

@@ -276,28 +279,28 @@ msgstr ""

279 #: add-patch.c git-add--interactive.perl

280 #, c-format, perl-format

281 msgid "Stash mode change [y,n,q,a,d%s,?]? "

279 -msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "

282 +msgstr "貯存模式更動 [y,n,q,a,d%s,?]? "

283

284 #: add-patch.c git-add--interactive.perl

285 #, c-format, perl-format

286 msgid "Stash deletion [y,n,q,a,d%s,?]? "

284 -msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "

287 +msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? "

288

289 #: add-patch.c git-add--interactive.perl

290 #, c-format, perl-format

291 msgid "Stash addition [y,n,q,a,d%s,?]? "

289 -msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "

292 +msgstr "貯存加入動作 [y,n,q,a,d%s,?]? "

293

294 #: add-patch.c git-add--interactive.perl

295 #, c-format, perl-format

296 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

294 -msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "

297 +msgstr "貯存此區塊 [y,n,q,a,d%s,?]? "

298

299 #: add-patch.c

300 msgid ""

301 "If the patch applies cleanly, the edited hunk will immediately be marked for "

302 "stashing."

300 -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"

303 +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。"

304

305 #: add-patch.c

306 msgid ""

@@ -307,26 +310,26 @@ msgid ""

310 "a - stash this hunk and all later hunks in the file\n"

311 "d - do not stash this hunk or any of the later hunks in the file\n"

312 msgstr ""

310 -"y - 儲藏此區塊\n"

311 -"n - 不要儲藏此區塊\n"

312 -"q - 離開。不儲藏此區塊及後面的全部區塊\n"

313 -"a - 儲藏此區塊和本檔案中後面的全部區塊\n"

314 -"d - 不儲藏此區塊和本檔案中後面的全部區塊\n"

313 +"y - 貯存此區塊\n"

314 +"n - 不要貯存此區塊\n"

315 +"q - 離開。不貯存此區塊及後面的全部區塊\n"

316 +"a - 貯存此區塊和本檔案中後面的全部區塊\n"

317 +"d - 不貯存此區塊和本檔案中後面的全部區塊\n"

318

319 #: add-patch.c git-add--interactive.perl

320 #, c-format, perl-format

321 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

319 -msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "

322 +msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? "

323

324 #: add-patch.c git-add--interactive.perl

325 #, c-format, perl-format

326 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

324 -msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "

327 +msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "

328

329 #: add-patch.c git-add--interactive.perl

330 #, c-format, perl-format

331 msgid "Unstage addition [y,n,q,a,d%s,?]? "

329 -msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "

332 +msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? "

333

334 #: add-patch.c git-add--interactive.perl

335 #, c-format, perl-format

@@ -337,7 +340,7 @@ msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "

340 msgid ""

341 "If the patch applies cleanly, the edited hunk will immediately be marked for "

342 "unstaging."

340 -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"

343 +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。"

344

345 #: add-patch.c

346 msgid ""

@@ -356,17 +359,17 @@ msgstr ""

359 #: add-patch.c git-add--interactive.perl

360 #, c-format, perl-format

361 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

359 -msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "

362 +msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? "

363

364 #: add-patch.c git-add--interactive.perl

365 #, c-format, perl-format

366 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

364 -msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "

367 +msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? "

368

369 #: add-patch.c git-add--interactive.perl

370 #, c-format, perl-format

371 msgid "Apply addition to index [y,n,q,a,d%s,?]? "

369 -msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "

372 +msgstr "將加入動作套用至索引 [y,n,q,a,d%s,?]? "

373

374 #: add-patch.c git-add--interactive.perl

375 #, c-format, perl-format

@@ -377,7 +380,7 @@ msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "

380 msgid ""

381 "If the patch applies cleanly, the edited hunk will immediately be marked for "

382 "applying."

380 -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"

383 +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。"

384

385 #: add-patch.c

386 msgid ""

@@ -396,28 +399,28 @@ msgstr ""

399 #: add-patch.c git-add--interactive.perl

400 #, c-format, perl-format

401 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

399 -msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "

402 +msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? "

403

404 #: add-patch.c git-add--interactive.perl

405 #, c-format, perl-format

406 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

404 -msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "

407 +msgstr "從工作區捨棄刪除動作 [y,n,q,a,d%s,?]? "

408

409 #: add-patch.c git-add--interactive.perl

410 #, c-format, perl-format

411 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

409 -msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "

412 +msgstr "從工作區捨棄加入動作 [y,n,q,a,d%s,?]? "

413

414 #: add-patch.c git-add--interactive.perl

415 #, c-format, perl-format

416 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

414 -msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "

417 +msgstr "從工作區捨棄此區塊 [y,n,q,a,d%s,?]? "

418

419 #: add-patch.c

420 msgid ""

421 "If the patch applies cleanly, the edited hunk will immediately be marked for "

422 "discarding."

420 -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"

423 +msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。"

424

425 #: add-patch.c

426 msgid ""

@@ -436,22 +439,22 @@ msgstr ""

439 #: add-patch.c git-add--interactive.perl

440 #, c-format, perl-format

441 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

439 -msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "

442 +msgstr "從索引和工作區捨棄模式更動 [y,n,q,a,d%s,?]? "

443

444 #: add-patch.c git-add--interactive.perl

445 #, c-format, perl-format

446 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

444 -msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "

447 +msgstr "從索引和工作區捨棄刪除 [y,n,q,a,d%s,?]? "

448

449 #: add-patch.c git-add--interactive.perl

450 #, c-format, perl-format

451 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

449 -msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "

452 +msgstr "從索引和工作區捨棄加入動作 [y,n,q,a,d%s,?]? "

453

454 #: add-patch.c git-add--interactive.perl

455 #, c-format, perl-format

456 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

454 -msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "

457 +msgstr "從索引和工作區捨棄此區塊 [y,n,q,a,d%s,?]? "

458

459 #: add-patch.c

460 msgid ""

@@ -470,17 +473,17 @@ msgstr ""

473 #: add-patch.c git-add--interactive.perl

474 #, c-format, perl-format

475 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

473 -msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "

476 +msgstr "將模式更動套用到索引和工作區 [y,n,q,a,d%s,?]? "

477

478 #: add-patch.c git-add--interactive.perl

479 #, c-format, perl-format

480 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

478 -msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "

481 +msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "

482

483 #: add-patch.c git-add--interactive.perl

484 #, c-format, perl-format

485 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "

483 -msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "

486 +msgstr "將加入動作套用到索引和工作區 [y,n,q,a,d%s,?]? "

487

488 #: add-patch.c git-add--interactive.perl

489 #, c-format, perl-format

@@ -504,17 +507,17 @@ msgstr ""

507 #: add-patch.c git-add--interactive.perl

508 #, c-format, perl-format

509 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "

507 -msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "

510 +msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? "

511

512 #: add-patch.c git-add--interactive.perl

513 #, c-format, perl-format

514 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "

512 -msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "

515 +msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? "

516

517 #: add-patch.c git-add--interactive.perl

518 #, c-format, perl-format

519 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "

517 -msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "

520 +msgstr "將加入動作套用到工作區 [y,n,q,a,d%s,?]? "

521

522 #: add-patch.c git-add--interactive.perl

523 #, c-format, perl-format

@@ -538,20 +541,20 @@ msgstr ""

541 #: add-patch.c

542 #, c-format

543 msgid "could not parse hunk header '%.*s'"

541 -msgstr "無法解析區塊標頭 '%.*s'"

544 +msgstr "無法解析區塊標頭 “%.*s”"

545

546 #: add-patch.c

547 msgid "could not parse diff"

545 -msgstr "無法解析差異 (diff)"

548 +msgstr "無法解析差異"

549

550 #: add-patch.c

551 msgid "could not parse colored diff"

549 -msgstr "無法解析上色過的差異 (diff)"

552 +msgstr "無法解析上色過的差異"

553

554 #: add-patch.c

555 #, c-format

556 msgid "failed to run '%s'"

554 -msgstr "無法執行 '%s'"

557 +msgstr "無法執行 “%s”"

558

559 #: add-patch.c

560 msgid "mismatched output from interactive.diffFilter"

@@ -562,7 +565,7 @@ msgid ""

565 "Your filter must maintain a one-to-one correspondence\n"

566 "between its input and output lines."

567 msgstr ""

565 -"您的過濾器必須在其輸入及輸出行\n"

568 +"您的過濾器必須在其輸入及輸出列\n"

569 "維持一對一的對應關係。"

570

571 #: add-patch.c

@@ -571,7 +574,7 @@ msgid ""

574 "expected context line #%d in\n"

575 "%.*s"

576 msgstr ""

574 -"應有上下文行 #%d 於\n"

577 +"預期在下述位置有上下文列 #%d：\n"

578 "%.*s"

579

580 #: add-patch.c

@@ -584,12 +587,12 @@ msgid ""

587 msgstr ""

588 "區塊未重疊：\n"

589 "%.*s\n"

587 -"\t不以下述結尾：\n"

590 +"\t結尾不是：\n"

591 "%.*s"

592

593 #: add-patch.c git-add--interactive.perl

594 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

592 -msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"

595 +msgstr "手動區塊編輯模式——檢視底部的快速指引。\n"

596

597 #: add-patch.c

598 #, c-format

@@ -600,9 +603,9 @@ msgid ""

603 "Lines starting with %c will be removed.\n"

604 msgstr ""

605 "---\n"

603 -"要刪除 '%c' 開始的行，使其成為 ' ' 開始的行（上下文）。\n"

604 -"要刪除 '%c' 開始的行，刪除它們。\n"

605 -"以 %c 開始的行將被刪除。\n"

606 +"要刪除 “%c” 開頭的列，請將列首（上下文）改成空白。\n"

607 +"要刪除 “%c” 開頭的列，請直接刪除。\n"

608 +"開頭是 %c 的列將會被移除。\n"

609

610 #. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#

611 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

@@ -612,9 +615,9 @@ msgid ""

615 "edit again. If all lines of the hunk are removed, then the edit is\n"

616 "aborted and the hunk is left unchanged.\n"

617 msgstr ""

615 -"如果未乾淨套用，您就有機會重新編輯。\n"

616 -"若刪掉此區塊的全部內容，則會中止\n"

617 -"本次編輯，區塊則不會被修改。\n"

618 +"如果沒有完全套用，您可以再次編輯。\n"

619 +"若刪掉此區塊的所有內容，則會中止編輯，\n"

620 +"區塊則不會變更。\n"

621

622 #: add-patch.c

623 msgid "could not parse hunk header"

@@ -622,7 +625,7 @@ msgstr "無法解析區塊標頭"

625

626 #: add-patch.c

627 msgid "'git apply --cached' failed"

625 -msgstr "「git apply --cached」失敗"

628 +msgstr "“git apply --cached” 失敗"

629

630 #. #-#-#-#-# add-patch.c.po #-#-#-#-#

631 #. TRANSLATORS: do not translate [y/n]

@@ -641,15 +644,15 @@ msgstr "「git apply --cached」失敗"

644 #: add-patch.c git-add--interactive.perl

645 msgid ""

646 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

644 -msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "

647 +msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "

648

649 #: add-patch.c

650 msgid "The selected hunks do not apply to the index!"

648 -msgstr "選取的區塊不會套用進索引！"

651 +msgstr "選取的區塊無法套用至索引！"

652

653 #: add-patch.c git-add--interactive.perl

654 msgid "Apply them to the worktree anyway? "

652 -msgstr "無論如何都要套用到工作區嗎？ "

655 +msgstr "無論如何都要套用到工作區嗎? "

656

657 #: add-patch.c git-add--interactive.perl

658 msgid "Nothing was applied.\n"

@@ -687,20 +690,20 @@ msgstr "沒有下一個區塊"

690

691 #: add-patch.c

692 msgid "No other hunks to goto"

690 -msgstr "沒有其它可供跳轉的區塊"

693 +msgstr "沒有其它可以跳轉的區塊"

694

695 #: add-patch.c git-add--interactive.perl

696 msgid "go to which hunk (<ret> to see more)? "

694 -msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "

697 +msgstr "要跳轉到哪個區塊（<ret> 檢視更多）? "

698

699 #: add-patch.c git-add--interactive.perl

700 msgid "go to which hunk? "

698 -msgstr "跳轉到哪個區塊？ "

701 +msgstr "跳轉到哪個區塊? "

702

703 #: add-patch.c

704 #, c-format

705 msgid "Invalid number: '%s'"

703 -msgstr "無效數字：'%s'"

706 +msgstr "無效數字：“%s”"

707

708 #: add-patch.c

709 #, c-format

@@ -710,20 +713,20 @@ msgstr[0] "對不起，只有 %d 個可用區塊。"

713

714 #: add-patch.c

715 msgid "No other hunks to search"

713 -msgstr "沒有其它可供尋找的區塊"

716 +msgstr "沒有其它可以尋找的區塊"

717

718 #: add-patch.c git-add--interactive.perl

719 msgid "search for regex? "

717 -msgstr "使用常規表示式搜尋？ "

720 +msgstr "使用常規表示式搜尋? "

721

722 #: add-patch.c

723 #, c-format

724 msgid "Malformed search regexp %s: %s"

722 -msgstr "錯誤的常規表示式 %s：%s"

725 +msgstr "格式錯誤的常規表示式 %s：%s"

726

727 #: add-patch.c

728 msgid "No hunk matches the given pattern"

726 -msgstr "沒有和提供模式相符合的區塊"

729 +msgstr "沒有符合提供模式的區塊"

730

731 #: add-patch.c

732 msgid "Sorry, cannot split this hunk"

@@ -736,11 +739,11 @@ msgstr "分割為 %d 個區塊。"

739

740 #: add-patch.c

741 msgid "Sorry, cannot edit this hunk"

739 -msgstr "對不起，不能編輯這個區塊"

742 +msgstr "對不起，無法編輯這個區塊"

743

744 #: add-patch.c

745 msgid "'git apply' failed"

743 -msgstr "'git apply' 失敗"

746 +msgstr "“git apply” 失敗"

747

748 #: advice.c

749 #, c-format

@@ -749,7 +752,7 @@ msgid ""

752 "Disable this message with \"git config advice.%s false\""

753 msgstr ""

754 "\n"

752 -"請使用「git config advice.%s false」來停用此訊息"

755 +"請使用 “git config advice.%s false” 停用此訊息"

756

757 #: advice.c

758 #, c-format

@@ -758,56 +761,56 @@ msgstr "%s提示：%.*s%s\n"

761

762 #: advice.c

763 msgid "Cherry-picking is not possible because you have unmerged files."

761 -msgstr "無法揀選，因為您有未合併的檔案。"

764 +msgstr "無法揀選，有未合併的檔案。"

765

766 #: advice.c

767 msgid "Committing is not possible because you have unmerged files."

765 -msgstr "無法提交，因為您有未合併的檔案。"

768 +msgstr "無法提交，有未合併的檔案。"

769

770 #: advice.c

771 msgid "Merging is not possible because you have unmerged files."

769 -msgstr "無法合併，因為您有未合併的檔案。"

772 +msgstr "無法合併，有未合併的檔案。"

773

774 #: advice.c

775 msgid "Pulling is not possible because you have unmerged files."

773 -msgstr "無法拉取，因為您有未合併的檔案。"

776 +msgstr "無法拉取，有未合併的檔案。"

777

778 #: advice.c

779 msgid "Reverting is not possible because you have unmerged files."

777 -msgstr "無法還原提交，因為您有未合併的檔案。"

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

781

782 #: advice.c

783 #, c-format

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

782 -msgstr "無法 %s，因為您有未合併的檔案。"

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

786

787 #: advice.c

788 msgid ""

789 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

790 "as appropriate to mark resolution and make a commit."

791 msgstr ""

789 -"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"

790 -"解決方案並提交。"

792 +"請在工作區修正檔案，然後視情況使用 “git add/rm <file>”\n"

793 +"命令標記解決方案並提交。"

794

795 #: advice.c

796 msgid "Exiting because of an unresolved conflict."

794 -msgstr "因為存在未解決的衝突而離開。"

797 +msgstr "存在未解決的衝突，離開。"

798

799 #: advice.c builtin/merge.c

800 msgid "You have not concluded your merge (MERGE_HEAD exists)."

798 -msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"

801 +msgstr "合併尚未結束（有 MERGE_HEAD）。"

802

803 #: advice.c

804 msgid "Please, commit your changes before merging."

802 -msgstr "請在合併前先提交您的修改。"

805 +msgstr "請在合併前先提交您的更動。"

806

807 #: advice.c

808 msgid "Exiting because of unfinished merge."

806 -msgstr "因為存在未完成的合併而離開。"

809 +msgstr "存在未完成的合併，離開。"

810

811 #: advice.c

812 msgid "Not possible to fast-forward, aborting."

810 -msgstr "無法快轉，終止。"

813 +msgstr "無法快轉，中止。"

814

815 #: advice.c

816 #, c-format

@@ -852,18 +855,18 @@ msgid ""

855 "false\n"

856 "\n"

857 msgstr ""

855 -"注意：正在切換到 '%s'。\n"

858 +"註：切換至 “%s”。\n"

859 "\n"

857 -"您正處於分離開頭指標狀態。您可以檢視、進行實驗性修改並提交，\n"

858 -"而且您可以在切換回一個分支時，\n"

859 -"捨棄在此狀態下所做的提交而不對分支造成影響。\n"

860 +"您正處於「分離 HEAD」狀態。您可以檢視、進行實驗性修改並提交，\n"

861 +"而且您可以在切回分支時，捨棄在此狀態下所做的提交\n"

862 +"而不對分支造成影響。\n"

863 "\n"

864 "如果您想要透過建立分支來保留在此狀態下所做的提交，\n"

865 "您可以現在或稍後在 switch 指令使用 -c 選項。例如：\n"

866 "\n"

867 " git switch -c <新分支名稱>\n"

868 "\n"

866 -"或者是復原此動作：\n"

869 +"或者是使用下述命令復原此動作：\n"

870 "\n"

871 " git switch -\n"

872 "\n"

@@ -887,26 +890,31 @@ msgid ""

890 "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"

891 msgstr ""

892 "若要更正這些路徑的稀疏狀態，請：\n"

890 -"* 使用 `git add --sparse <路徑>` 更新索引\n"

891 -"* 使用 `git sparse-checkout reapply` 套用稀疏規則"

893 +"* 使用 “git add --sparse <路徑” 更新索引\n"

894 +"* 使用 “git sparse-checkout reapply” 套用稀疏規則"

895

896 #: alias.c

897 msgid "cmdline ends with \\"

895 -msgstr "指令列以 \\ 結尾"

898 +msgstr "命令列以 \\ 結尾"

899

900 #: alias.c

901 msgid "unclosed quote"

902 msgstr "未閉合的引號"

903

904 +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c

905 +#: builtin/receive-pack.c builtin/tag.c

906 +msgid "too many arguments"

907 +msgstr "引數過多"

908 +

909 #: apply.c

910 #, c-format

911 msgid "unrecognized whitespace option '%s'"

904 -msgstr "無法識別的空白字元選項 '%s'"

912 +msgstr "空白字元選項 “%s” 無法識別"

913

914 #: apply.c

915 #, c-format

916 msgid "unrecognized whitespace ignore option '%s'"

909 -msgstr "無法識別的空白字元忽略選項 '%s'"

917 +msgstr "空白字元忽略選項 “%s” 無法識別"

918

919 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c

920 #: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c

@@ -918,12 +926,12 @@ msgstr "無法識別的空白字元忽略選項 '%s'"

926 #: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c

927 #, c-format

928 msgid "options '%s' and '%s' cannot be used together"

921 -msgstr "不能同時使用 '%s' 和 '%s' 選項"

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

930

931 #: apply.c

932 #, c-format

933 msgid "'%s' outside a repository"

926 -msgstr "'%s' 在版本庫之外"

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

935

936 #: apply.c

937 #, c-format

@@ -933,42 +941,42 @@ msgstr "無法準備時間戳常規表示式 %s"

941 #: apply.c

942 #, c-format

943 msgid "regexec returned %d for input: %s"

936 -msgstr "regexec 返回 %d，輸入為：%s"

944 +msgstr "regexec 回傳 %d，輸入為：%s"

945

946 #: apply.c

947 #, c-format

948 msgid "unable to find filename in patch at line %d"

941 -msgstr "不能在修補檔的第 %d 行找到檔案名"

949 +msgstr "無法在修補檔的第 %d 列找到檔案名稱"

950

951 #: apply.c

952 #, c-format

953 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

946 -msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"

954 +msgstr "git apply：無效的 git-diff — 應為 /dev/null，但在第 %2$d 列得到 %1$s"

955

956 #: apply.c

957 #, c-format

958 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

951 -msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"

959 +msgstr "git apply：無效的 git-diff — 第 %d 列的新檔案名稱不一致"

960

961 #: apply.c

962 #, c-format

963 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

956 -msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"

964 +msgstr "git apply：無效的 git-diff — 第 %d 列上舊檔案名稱不一致"

965

966 #: apply.c

967 #, c-format

968 msgid "git apply: bad git-diff - expected /dev/null on line %d"

961 -msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"

969 +msgstr "git apply：無效的 git-diff — 第 %d 列處預期是 /dev/null"

970

971 #: apply.c

972 #, c-format

973 msgid "invalid mode on line %d: %s"

966 -msgstr "第 %d 行包含無效檔案模式：%s"

974 +msgstr "第 %d 列包含無效檔案模式：%s"

975

976 #: apply.c

977 #, c-format

978 msgid "inconsistent header lines %d and %d"

971 -msgstr "不一致的檔案頭，%d 行和 %d 行"

979 +msgstr "不一致的檔案標頭（%d 列和 %d 列）"

980

981 #: apply.c

982 #, c-format

@@ -978,22 +986,22 @@ msgid ""

986 msgid_plural ""

987 "git diff header lacks filename information when removing %d leading pathname "

988 "components (line %d)"

981 -msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"

989 +msgstr[0] "移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（第 %d 列）"

990

991 #: apply.c

992 #, c-format

993 msgid "git diff header lacks filename information (line %d)"

986 -msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"

994 +msgstr "git diff 標頭缺少檔案名稱資訊（第 %d 列）"

995

996 #: apply.c

997 #, c-format

998 msgid "recount: unexpected line: %.*s"

991 -msgstr "recount：意外的行：%.*s"

999 +msgstr "recount：遇到非預期的列：%.*s"

1000

1001 #: apply.c

1002 #, c-format

1003 msgid "patch fragment without header at line %d: %.*s"

996 -msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"

1004 +msgstr "第 %d 列的修補檔區段沒有標頭：%.*s"

1005

1006 #: apply.c

1007 msgid "new file depends on old contents"

@@ -1006,7 +1014,7 @@ msgstr "刪除的檔案仍有內容"

1014 #: apply.c

1015 #, c-format

1016 msgid "corrupt patch at line %d"

1009 -msgstr "修補檔在第 %d 行發現損壞"

1017 +msgstr "修補檔在第 %d 列發現損壞"

1018

1019 #: apply.c

1020 #, c-format

@@ -1026,17 +1034,17 @@ msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"

1034 #: apply.c

1035 #, c-format

1036 msgid "corrupt binary patch at line %d: %.*s"

1029 -msgstr "二進位修補檔在第 %d 行損壞：%.*s"

1037 +msgstr "二進位修補檔在第 %d 列損壞：%.*s"

1038

1039 #: apply.c

1040 #, c-format

1041 msgid "unrecognized binary patch at line %d"

1034 -msgstr "無法識別的二進位修補檔位於第 %d 行"

1042 +msgstr "第 %d 列的二進位修補檔無法識別"

1043

1044 #: apply.c

1045 #, c-format

1046 msgid "patch with only garbage at line %d"

1039 -msgstr "修補檔案的第 %d 行只有垃圾資料"

1047 +msgstr "修補檔案的第 %d 列只有垃圾資料"

1048

1049 #: apply.c

1050 #, c-format

@@ -1046,23 +1054,23 @@ msgstr "無法讀取符號連結 %s"

1054 #: apply.c

1055 #, c-format

1056 msgid "unable to open or read %s"

1049 -msgstr "不能開啟或讀取 %s"

1057 +msgstr "無法開啟或讀取 %s"

1058

1059 #: apply.c

1060 #, c-format

1061 msgid "invalid start of line: '%c'"

1054 -msgstr "無效的行首字元：'%c'"

1062 +msgstr "無效的列首字元：“%c”"

1063

1064 #: apply.c

1065 #, c-format

1066 msgid "Hunk #%d succeeded at %d (offset %d line)."

1067 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1060 -msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"

1068 +msgstr[0] "區塊 #%d 成功套用於 %d（偏移 %d 列）。"

1069

1070 #: apply.c

1071 #, c-format

1072 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1065 -msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"

1073 +msgstr "上下文減少到（%ld/%ld）以在第 %d 列套用修補檔區塊"

1074

1075 #: apply.c

1076 #, c-format

@@ -1076,53 +1084,53 @@ msgstr ""

1084 #: apply.c

1085 #, c-format

1086 msgid "missing binary patch data for '%s'"

1079 -msgstr "缺少 '%s' 的二進位修補檔資料"

1087 +msgstr "缺少 “%s” 的二進位修補檔資料"

1088

1089 #: apply.c

1090 #, c-format

1091 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1084 -msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"

1092 +msgstr "無法反向套用一個缺少至 “%s” 的反向資料區塊的二進位修補檔"

1093

1094 #: apply.c

1095 #, c-format

1096 msgid "cannot apply binary patch to '%s' without full index line"

1089 -msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"

1097 +msgstr "無法在 “%s” 上套用沒有完整索引列的二進位修補檔"

1098

1099 #: apply.c

1100 #, c-format

1101 msgid ""

1102 "the patch applies to '%s' (%s), which does not match the current contents."

1095 -msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"

1103 +msgstr "修補檔要套用到 “%s”（%s），但與目前內容不符。"

1104

1105 #: apply.c

1106 #, c-format

1107 msgid "the patch applies to an empty '%s' but it is not empty"

1100 -msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"

1108 +msgstr "修補檔要套用至空檔案 “%s”，但其非空檔案"

1109

1110 #: apply.c

1111 #, c-format

1112 msgid "the necessary postimage %s for '%s' cannot be read"

1105 -msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"

1113 +msgstr "無法讀取 “%2$s” 必須的目標檔案 %1$s"

1114

1115 #: apply.c

1116 #, c-format

1117 msgid "binary patch does not apply to '%s'"

1110 -msgstr "二進位修補檔未套用到 '%s'"

1118 +msgstr "二進位修補檔未套用到 “%s”"

1119

1120 #: apply.c

1121 #, c-format

1122 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1115 -msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"

1123 +msgstr "修補 “%s” 的二進位修補檔，產生了不正確的結果（預期 %s，卻為 %s）"

1124

1125 #: apply.c

1126 #, c-format

1127 msgid "patch failed: %s:%ld"

1120 -msgstr "打修補檔失敗：%s:%ld"

1128 +msgstr "修補失敗：%s:%ld"

1129

1130 #: apply.c builtin/mv.c

1131 #, c-format

1132 msgid "cannot checkout %s"

1125 -msgstr "不能簽出 %s"

1133 +msgstr "無法簽出 %s"

1134

1135 #: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c

1136 #, c-format

@@ -1132,51 +1140,51 @@ msgstr "無法讀取 %s"

1140 #: apply.c

1141 #, c-format

1142 msgid "reading from '%s' beyond a symbolic link"

1135 -msgstr "讀取位於符號連結中的 '%s'"

1143 +msgstr "讀取符號連結背後的 “%s”"

1144

1145 #: apply.c

1146 #, c-format

1147 msgid "path %s has been renamed/deleted"

1140 -msgstr "路徑 %s 已經被重新命名/刪除"

1148 +msgstr "路徑 %s 已被重新命名或刪除"

1149

1150 #: apply.c

1151 #, c-format

1152 msgid "%s: does not exist in index"

1145 -msgstr "%s：不存在於索引中"

1153 +msgstr "%s：不在索引中"

1154

1155 #: apply.c

1156 #, c-format

1157 msgid "%s: does not match index"

1150 -msgstr "%s：和索引不符合"

1158 +msgstr "%s：與索引不符"

1159

1160 #: apply.c

1161 msgid "repository lacks the necessary blob to perform 3-way merge."

1154 -msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"

1162 +msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。"

1163

1164 #: apply.c

1165 #, c-format

1166 msgid "Performing three-way merge...\n"

1159 -msgstr "正在進行三方合併⋯⋯\n"

1167 +msgstr "正在進行三方合併……\n"

1168

1169 #: apply.c

1170 #, c-format

1171 msgid "cannot read the current contents of '%s'"

1164 -msgstr "無法讀取 '%s' 的目前內容"

1172 +msgstr "無法讀取 “%s” 目前的內容"

1173

1174 #: apply.c

1175 #, c-format

1176 msgid "Failed to perform three-way merge...\n"

1169 -msgstr "無法進行三方合併⋯⋯\n"

1177 +msgstr "無法進行三方合併……\n"

1178

1179 #: apply.c

1180 #, c-format

1181 msgid "Applied patch to '%s' with conflicts.\n"

1174 -msgstr "套用修補檔到 '%s' 存在衝突。\n"

1182 +msgstr "已套用對 “%s” 的修補檔，但有衝突。\n"

1183

1184 #: apply.c

1185 #, c-format

1186 msgid "Applied patch to '%s' cleanly.\n"

1179 -msgstr "成功套用修補檔到 '%s'。\n"

1187 +msgstr "已完全套用對 “%s” 的修補檔。\n"

1188

1189 #: apply.c

1190 #, c-format

@@ -1185,7 +1193,7 @@ msgstr "回復至直接套用模式⋯⋯\n"

1193

1194 #: apply.c

1195 msgid "removal patch leaves file contents"

1188 -msgstr "移除修補檔仍留下了檔案內容"

1196 +msgstr "移除性的修補檔仍有留下檔案內容"

1197

1198 #: apply.c

1199 #, c-format

@@ -1195,117 +1203,117 @@ msgstr "%s：錯誤類型"

1203 #: apply.c

1204 #, c-format

1205 msgid "%s has type %o, expected %o"

1198 -msgstr "%s 的類型是 %o，應為 %o"

1206 +msgstr "%s 的類型是 %o，預期是 %o"

1207

1208 #: apply.c read-cache.c

1209 #, c-format

1210 msgid "invalid path '%s'"

1203 -msgstr "無效路徑 '%s'"

1211 +msgstr "路徑 “%s” 無效"

1212

1213 #: apply.c

1214 #, c-format

1215 msgid "%s: already exists in index"

1208 -msgstr "%s：已經存在於索引中"

1216 +msgstr "%s：已存在於索引中"

1217

1218 #: apply.c

1219 #, c-format

1220 msgid "%s: already exists in working directory"

1213 -msgstr "%s：已經存在於工作區中"

1221 +msgstr "%s：已存在於工作區中"

1222

1223 #: apply.c

1224 #, c-format

1225 msgid "new mode (%o) of %s does not match old mode (%o)"

1218 -msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"

1226 +msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符"

1227

1228 #: apply.c

1229 #, c-format

1230 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1223 -msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"

1231 +msgstr "%2$s 的新模式 (%1$o) 和 %4$s 的舊模式 (%3$o) 不符"

1232

1233 #: apply.c

1234 #, c-format

1235 msgid "affected file '%s' is beyond a symbolic link"

1228 -msgstr "受影響的檔案 '%s' 位於符號連結中"

1236 +msgstr "受影響的檔案 “%s” 在符號連結後"

1237

1238 #: apply.c

1239 #, c-format

1240 msgid "%s: patch does not apply"

1233 -msgstr "%s：修補檔未套用"

1241 +msgstr "%s：未套用修補檔"

1242

1243 #: apply.c

1244 #, c-format

1245 msgid "Checking patch %s..."

1238 -msgstr "正在檢查修補檔 %s..."

1246 +msgstr "正在檢查修補檔 %s……"

1247

1248 #: apply.c

1249 #, c-format

1250 msgid "sha1 information is lacking or useless for submodule %s"

1243 -msgstr "子模組 %s 的 sha1 訊息缺少或無效"

1251 +msgstr "%s 子模組缺少 sha1 資訊或沒有幫助"

1252

1253 #: apply.c

1254 #, c-format

1255 msgid "mode change for %s, which is not in current HEAD"

1248 -msgstr "%s 的模式變更，但它不在目前 HEAD 中"

1256 +msgstr "%s 的模式有更動，但其不在目前 HEAD 中"

1257

1258 #: apply.c

1259 #, c-format

1260 msgid "sha1 information is lacking or useless (%s)."

1253 -msgstr "sha1 訊息缺少或無效（%s）。"

1261 +msgstr "缺少 sha1 資訊或沒有幫助 (%s)。"

1262

1263 #: apply.c

1264 #, c-format

1265 msgid "could not add %s to temporary index"

1258 -msgstr "不能在暫時索引中新增 %s"

1266 +msgstr "無法將 %s 加進暫存索引"

1267

1268 #: apply.c

1269 #, c-format

1270 msgid "could not write temporary index to %s"

1263 -msgstr "不能把暫時索引寫入到 %s"

1271 +msgstr "無法將暫存索引寫入 %s"

1272

1273 #: apply.c

1274 #, c-format

1275 msgid "unable to remove %s from index"

1268 -msgstr "不能從索引中移除 %s"

1276 +msgstr "無法從索引移除 %s"

1277

1278 #: apply.c

1279 #, c-format

1280 msgid "corrupt patch for submodule %s"

1273 -msgstr "子模組 %s 損壞的修補檔"

1281 +msgstr "修補 %s 子模組的修補檔損壞"

1282

1283 #: apply.c

1284 #, c-format

1285 msgid "unable to stat newly created file '%s'"

1278 -msgstr "不能對建立檔案 '%s' 呼叫 stat"

1286 +msgstr "無法對剛建立的檔案 “%s” 執行 stat"

1287

1288 #: apply.c

1289 #, c-format

1290 msgid "unable to create backing store for newly created file %s"

1283 -msgstr "不能為建立檔案 %s 建立後端儲存"

1291 +msgstr "無法對剛建立的檔案 %s 建立後端儲存"

1292

1293 #: apply.c

1294 #, c-format

1295 msgid "unable to add cache entry for %s"

1288 -msgstr "無法為 %s 新增快取條目"

1296 +msgstr "無法為 %s 加入快取項目"

1297

1298 #: apply.c builtin/bisect--helper.c builtin/gc.c

1299 #, c-format

1300 msgid "failed to write to '%s'"

1293 -msgstr "寫入 '%s' 失敗"

1301 +msgstr "無法寫入 “%s”"

1302

1303 #: apply.c

1304 #, c-format

1305 msgid "closing file '%s'"

1298 -msgstr "關閉檔案 '%s'"

1306 +msgstr "關閉檔案 “%s”"

1307

1308 #: apply.c

1309 #, c-format

1310 msgid "unable to write file '%s' mode %o"

1303 -msgstr "不能寫入檔案 '%s' 權限 %o"

1311 +msgstr "無法以模式 %2$o 寫入 “%1$s” 檔案"

1312

1313 #: apply.c

1314 #, c-format

1315 msgid "Applied patch %s cleanly."

1308 -msgstr "成功套用修補檔 %s。"

1316 +msgstr "已完全套用 %s 修補檔。"

1317

1318 #: apply.c

1319 msgid "internal error"

@@ -1315,22 +1323,22 @@ msgstr "內部錯誤"

1323 #, c-format

1324 msgid "Applying patch %%s with %d reject..."

1325 msgid_plural "Applying patch %%s with %d rejects..."

1318 -msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."

1326 +msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕……"

1327

1328 #: apply.c

1329 #, c-format

1330 msgid "truncating .rej filename to %.*s.rej"

1323 -msgstr "截短 .rej 檔案名為 %.*s.rej"

1331 +msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"

1332

1333 #: apply.c

1334 #, c-format

1335 msgid "cannot open %s"

1328 -msgstr "不能開啟 %s"

1336 +msgstr "無法開啟 %s"

1337

1338 #: apply.c

1339 #, c-format

1340 msgid "Hunk #%d applied cleanly."

1333 -msgstr "成功套用第 #%d 個區塊。"

1341 +msgstr "成功完全套用第 #%d 個區塊。"

1342

1343 #: apply.c

1344 #, c-format

@@ -1340,20 +1348,20 @@ msgstr "拒絕第 #%d 個區塊。"

1348 #: apply.c

1349 #, c-format

1350 msgid "Skipped patch '%s'."

1343 -msgstr "略過修補檔 '%s'。"

1351 +msgstr "略過修補檔 “%s”。"

1352

1353 #: apply.c

1354 msgid "No valid patches in input (allow with \"--allow-empty\")"

1347 -msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）"

1355 +msgstr "輸入沒有有效的修補檔內容（傳入 “--allow-empty” 允許此行為）"

1356

1349 -#: apply.c

1357 +#: apply.c t/helper/test-cache-tree.c

1358 msgid "unable to read index file"

1359 msgstr "無法讀取索引檔案"

1360

1361 #: apply.c

1362 #, c-format

1363 msgid "can't open patch '%s': %s"

1356 -msgstr "不能開啟修補檔 '%s'：%s"

1364 +msgstr "無法開啟修補檔 “%s”：%s"

1365

1366 #: apply.c

1367 #, c-format

@@ -1365,13 +1373,13 @@ msgstr[0] "抑制下仍有 %d 個空白字元誤用"

1373 #, c-format

1374 msgid "%d line adds whitespace errors."

1375 msgid_plural "%d lines add whitespace errors."

1368 -msgstr[0] "%d 行新增了空白字元誤用。"

1376 +msgstr[0] "%d 列加入了空白字元誤用。"

1377

1378 #: apply.c

1379 #, c-format

1380 msgid "%d line applied after fixing whitespace errors."

1381 msgid_plural "%d lines applied after fixing whitespace errors."

1374 -msgstr[0] "修復空白錯誤後，套用了 %d 行。"

1382 +msgstr[0] "修正空白誤用後，套用了 %d 列。"

1383

1384 #: apply.c builtin/add.c builtin/mv.c builtin/rm.c

1385 msgid "Unable to write new index file"

@@ -1379,11 +1387,11 @@ msgstr "無法寫入新索引檔案"

1387

1388 #: apply.c

1389 msgid "don't apply changes matching the given path"

1382 -msgstr "不要套用符合提供路徑的變更"

1390 +msgstr "不要套用符合提供路徑的更動"

1391

1392 #: apply.c

1393 msgid "apply changes matching the given path"

1386 -msgstr "套用符合提供路徑的變更"

1394 +msgstr "套用符合提供路徑的更動"

1395

1396 #: apply.c builtin/am.c

1397 msgid "num"

@@ -1391,19 +1399,19 @@ msgstr "數字"

1399

1400 #: apply.c

1401 msgid "remove <num> leading slashes from traditional diff paths"

1394 -msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"

1402 +msgstr "從傳統的 diff 路徑中移除 <num> 個前導斜線"

1403

1404 #: apply.c

1405 msgid "ignore additions made by the patch"

1398 -msgstr "忽略修補檔中的新增的檔案"

1406 +msgstr "忽略修補檔中的加入內容"

1407

1408 #: apply.c

1409 msgid "instead of applying the patch, output diffstat for the input"

1402 -msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"

1410 +msgstr "不套用修補檔，而是顯示輸入的差異統計 (diffstat)"

1411

1412 #: apply.c

1413 msgid "show number of added and deleted lines in decimal notation"

1406 -msgstr "以十進位數顯示新增和刪除的行數"

1414 +msgstr "以十進位數字，顯示加入和刪除的列數"

1415

1416 #: apply.c

1417 msgid "instead of applying the patch, output a summary for the input"

@@ -1419,7 +1427,7 @@ msgstr "確認修補檔可以套用到目前索引"

1427

1428 #: apply.c

1429 msgid "mark new files with `git add --intent-to-add`"

1422 -msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"

1430 +msgstr "使用 `git add --intent-to-add` 命令標記新檔案"

1431

1432 #: apply.c

1433 msgid "apply a patch without touching the working tree"

@@ -1431,15 +1439,15 @@ msgstr "接受修改工作區之外檔案的修補檔"

1439

1440 #: apply.c

1441 msgid "also apply the patch (use with --stat/--summary/--check)"

1434 -msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"

1442 +msgstr "亦套用修補檔（與 --stat/--summary/--check 選項同時使用）"

1443

1444 #: apply.c

1445 msgid "attempt three-way merge, fall back on normal patch if that fails"

1438 -msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"

1446 +msgstr "嘗試三方合併，若失敗則回到正常修補模式"

1447

1448 #: apply.c

1449 msgid "build a temporary index based on embedded index information"

1442 -msgstr "建立一個暫時索引基於嵌入的索引訊息"

1450 +msgstr "組建以嵌入索引資訊為基礎的暫存索引"

1451

1452 #: apply.c builtin/checkout-index.c

1453 msgid "paths are separated with NUL character"

@@ -1447,7 +1455,7 @@ msgstr "路徑以 NUL 字元分隔"

1455

1456 #: apply.c

1457 msgid "ensure at least <n> lines of context match"

1450 -msgstr "確保至少符合 <n> 行上下文"

1458 +msgstr "確保至少符合 <n> 列上下文"

1459

1460 #: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c

1461 #: builtin/rebase.c

@@ -1456,11 +1464,11 @@ msgstr "動作"

1464

1465 #: apply.c

1466 msgid "detect new or modified lines that have whitespace errors"

1459 -msgstr "檢查新增和修改的行中間的空白字元濫用"

1467 +msgstr "檢查新增和修改的列中間，是否有空白字元誤用"

1468

1469 #: apply.c

1470 msgid "ignore changes in whitespace when finding context"

1463 -msgstr "尋找上下文時忽略空白字元的變更"

1471 +msgstr "尋找上下文時忽略空白字元更動"

1472

1473 #: apply.c

1474 msgid "apply the patch in reverse"

@@ -1468,23 +1476,23 @@ msgstr "反向套用修補檔"

1476

1477 #: apply.c

1478 msgid "don't expect at least one line of context"

1471 -msgstr "無需至少一行上下文"

1479 +msgstr "無需至少一列上下文"

1480

1481 #: apply.c

1482 msgid "leave the rejected hunks in corresponding *.rej files"

1475 -msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"

1483 +msgstr "將拒絕的修補檔區塊，留在對應的 *.rej 檔案中"

1484

1485 #: apply.c

1486 msgid "allow overlapping hunks"

1479 -msgstr "允許重疊的修補檔區塊"

1487 +msgstr "允許重疊區塊"

1488

1489 #: apply.c

1490 msgid "tolerate incorrectly detected missing new-line at the end of file"

1483 -msgstr "允許不正確的檔案末尾換行符號"

1491 +msgstr "允許不正確的檔案末尾換列符號"

1492

1493 #: apply.c

1494 msgid "do not trust the line counts in the hunk headers"

1487 -msgstr "不信任修補檔區塊的標頭訊息中的行號"

1495 +msgstr "不信任區塊標頭中的列號"

1496

1497 #: apply.c builtin/am.c

1498 msgid "root"

@@ -1492,21 +1500,21 @@ msgstr "根目錄"

1500

1501 #: apply.c

1502 msgid "prepend <root> to all filenames"

1495 -msgstr "為所有檔案名前新增 <根目錄>"

1503 +msgstr "在所有檔案名稱前加上 <root>"

1504

1505 #: apply.c

1506 msgid "don't return error for empty patches"

1499 -msgstr "遇到空白修補檔時不回傳錯誤"

1507 +msgstr "遇到空白修補檔時，不回傳錯誤"

1508

1509 #: archive-tar.c archive-zip.c

1510 #, c-format

1511 msgid "cannot stream blob %s"

1504 -msgstr "不能開啟資料物件 %s"

1512 +msgstr "無法串流資料物件 %s"

1513

1514 #: archive-tar.c archive-zip.c

1515 #, c-format

1516 msgid "unsupported file mode: 0%o (SHA1: %s)"

1509 -msgstr "不支援的檔案模式：0%o (SHA1: %s)"

1517 +msgstr "不支援的檔案模式：0%o (SHA1：%s)"

1518

1519 #: archive-tar.c archive-zip.c builtin/pack-objects.c

1520 #, c-format

@@ -1516,16 +1524,16 @@ msgstr "壓縮錯誤 (%d)"

1524 #: archive-tar.c

1525 #, c-format

1526 msgid "unable to start '%s' filter"

1519 -msgstr "無法啟動 '%s' 過濾器"

1527 +msgstr "無法啟動 “%s” 過濾器"

1528

1529 #: archive-tar.c

1530 msgid "unable to redirect descriptor"

1523 -msgstr "無法重定向描述符"

1531 +msgstr "無法重新導向描述元"

1532

1533 #: archive-tar.c

1534 #, c-format

1535 msgid "'%s' filter reported error"

1528 -msgstr "'%s' 過濾器報告了錯誤"

1536 +msgstr "“%s” 過濾器回報錯誤"

1537

1538 #: archive-zip.c

1539 #, c-format

@@ -1535,36 +1543,36 @@ msgstr "路徑不是有效的 UTF-8：%s"

1543 #: archive-zip.c

1544 #, c-format

1545 msgid "path too long (%d chars, SHA1: %s): %s"

1538 -msgstr "路徑太長（%d 字元，SHA1：%s）：%s"

1546 +msgstr "路徑太長（%d 個字元，SHA1：%s）：%s"

1547

1548 #: archive-zip.c

1549 #, c-format

1550 msgid "timestamp too large for this system: %<PRIuMAX>"

1543 -msgstr "對於本系統時間戳太大：%<PRIuMAX>"

1551 +msgstr "對本系統而言時間戳太大：%<PRIuMAX>"

1552

1553 #: archive.c

1554 msgid "git archive [<options>] <tree-ish> [<path>...]"

1547 -msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"

1555 +msgstr "git archive [<options>] <tree-ish> [<path>...]"

1556

1557 #: archive.c

1558 msgid ""

1559 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

1560 msgstr ""

1553 -"git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]"

1561 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

1562

1563 #: archive.c

1564 msgid "git archive --remote <repo> [--exec <cmd>] --list"

1557 -msgstr "git archive --remote <版本庫> [--exec <命令>] --list"

1565 +msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1566

1567 #: archive.c builtin/gc.c builtin/notes.c builtin/tag.c

1568 #, c-format

1569 msgid "cannot read '%s'"

1562 -msgstr "不能讀取 '%s'"

1570 +msgstr "無法讀取 “%s”"

1571

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

1573 #, c-format

1574 msgid "pathspec '%s' did not match any files"

1567 -msgstr "路徑規格 '%s' 未符合任何檔案"

1575 +msgstr "路徑規格 “%s” 未符合任何檔案"

1576

1577 #: archive.c

1578 #, c-format

@@ -1574,16 +1582,16 @@ msgstr "無此引用：%.*s"

1582 #: archive.c

1583 #, c-format

1584 msgid "not a valid object name: %s"

1577 -msgstr "不是一個有效的物件名：%s"

1585 +msgstr "非有效物件名稱：%s"

1586

1579 -#: archive.c

1587 +#: archive.c t/helper/test-cache-tree.c

1588 #, c-format

1589 msgid "not a tree object: %s"

1582 -msgstr "不是一個樹狀物件：%s"

1590 +msgstr "非樹狀物件：%s"

1591

1592 #: archive.c

1593 msgid "current working directory is untracked"

1586 -msgstr "目前工作目錄未被追蹤"

1594 +msgstr "尚未追蹤目前的工作目錄"

1595

1596 #: archive.c

1597 #, c-format

@@ -1598,25 +1606,25 @@ msgstr "不是一般檔案：%s"

1606 #: archive.c

1607 #, c-format

1608 msgid "unclosed quote: '%s'"

1601 -msgstr "未閉合的引號：「%s」"

1609 +msgstr "未閉合的引號：“%s”"

1610

1611 #: archive.c

1612 #, c-format

1613 msgid "missing colon: '%s'"

1606 -msgstr "缺少冒號：「%s」"

1614 +msgstr "缺少冒號：“%s”"

1615

1616 #: archive.c

1617 #, c-format

1618 msgid "empty file name: '%s'"

1611 -msgstr "檔案名稱空白：「%s」"

1619 +msgstr "檔案名稱空白：“%s”"

1620

1621 #: archive.c

1622 msgid "fmt"

1615 -msgstr "格式"

1623 +msgstr "fmt"

1624

1625 #: archive.c

1626 msgid "archive format"

1619 -msgstr "歸檔格式"

1627 +msgstr "封存格式"

1628

1629 #: archive.c builtin/log.c

1630 msgid "prefix"

@@ -1624,33 +1632,33 @@ msgstr "前綴"

1632

1633 #: archive.c

1634 msgid "prepend prefix to each pathname in the archive"

1627 -msgstr "為歸檔中每個路徑名加上前綴"

1635 +msgstr "為封存中的每個路徑名稱加上前綴"

1636

1637 #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c

1630 -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c

1638 +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c

1639 #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h

1640 msgid "file"

1633 -msgstr "檔案"

1641 +msgstr "file"

1642

1643 #: archive.c

1644 msgid "add untracked file to archive"

1637 -msgstr "將未追蹤檔案加入歸檔"

1645 +msgstr "將未追蹤檔案加進封存"

1646

1647 #: archive.c

1648 msgid "path:content"

1641 -msgstr "路徑:內容"

1649 +msgstr "path:content"

1650

1651 #: archive.c builtin/archive.c

1652 msgid "write the archive to this file"

1645 -msgstr "歸檔寫入此檔案"

1653 +msgstr "將封存寫入此檔案"

1654

1655 #: archive.c

1656 msgid "read .gitattributes in working directory"

1649 -msgstr "讀取工作區中的 .gitattributes"

1657 +msgstr "讀取工作目錄中的 .gitattributes"

1658

1659 #: archive.c

1660 msgid "report archived files on stderr"

1653 -msgstr "在標準錯誤上報告歸檔檔案"

1661 +msgstr "在 stderr 上回報封存的檔案"

1662

1663 #: archive.c

1664 msgid "set compression level"

@@ -1658,27 +1666,27 @@ msgstr "設定壓縮級別"

1666

1667 #: archive.c

1668 msgid "list supported archive formats"

1661 -msgstr "列出支援的歸檔格式"

1669 +msgstr "列出支援的封存格式"

1670

1671 #: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c

1672 msgid "repo"

1665 -msgstr "版本庫"

1673 +msgstr "repo"

1674

1675 #: archive.c builtin/archive.c

1676 msgid "retrieve the archive from remote repository <repo>"

1669 -msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"

1677 +msgstr "從遠端版本庫 <repo> 擷取封存檔案"

1678

1679 #: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c

1680 msgid "command"

1673 -msgstr "指令"

1681 +msgstr "command"

1682

1683 #: archive.c builtin/archive.c

1684 msgid "path to the remote git-upload-archive command"

1677 -msgstr "遠端 git-upload-archive 指令的路徑"

1685 +msgstr "遠端 git-upload-archive 命令的路徑"

1686

1687 #: archive.c

1688 msgid "Unexpected option --remote"

1681 -msgstr "未知參數 --remote"

1689 +msgstr "非預期選項 --remote"

1690

1691 #: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c

1692 #: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c

@@ -1686,26 +1694,26 @@ msgstr "未知參數 --remote"

1694 #: revision.c

1695 #, c-format

1696 msgid "the option '%s' requires '%s'"

1689 -msgstr "「%s」選項需要「%s」"

1697 +msgstr "“%s” 選項需要 “%s”"

1698

1699 #: archive.c

1700 msgid "Unexpected option --output"

1693 -msgstr "未知參數 --output"

1701 +msgstr "非預期選項 --output"

1702

1703 #: archive.c

1704 #, c-format

1705 msgid "Unknown archive format '%s'"

1698 -msgstr "未知歸檔格式 '%s'"

1706 +msgstr "封存格式 “%s” 未知"

1707

1708 #: archive.c

1709 #, c-format

1710 msgid "Argument not supported for format '%s': -%d"

1703 -msgstr "參數不支援此格式 '%s'：-%d"

1711 +msgstr "引數不支援 “%s” 格式：-%d"

1712

1713 #: attr.c

1714 #, c-format

1715 msgid "%.*s is not a valid attribute name"

1708 -msgstr "%.*s 不是一個有效的屬性名"

1716 +msgstr "%.*s 不是有效的屬性名稱"

1717

1718 #: attr.c

1719 #, c-format

@@ -1717,23 +1725,23 @@ msgid ""

1725 "Negative patterns are ignored in git attributes\n"

1726 "Use '\\!' for literal leading exclamation."

1727 msgstr ""

1720 -"反向模式在 git attributes 中被忽略\n"

1721 -"當字串確定要以驚嘆號開始時，使用 '\\!'。"

1728 +"git attributes 會忽略反向模式\n"

1729 +"當字串確定要以驚嘆號開始時，請使用 “\\!”。"

1730

1731 #: bisect.c

1732 #, c-format

1733 msgid "Badly quoted content in file '%s': %s"

1726 -msgstr "檔案 '%s' 包含錯誤的引用格式：%s"

1734 +msgstr "檔案 “%s” 包含無效的引用內容：%s"

1735

1736 #: bisect.c

1737 #, c-format

1738 msgid "We cannot bisect more!\n"

1731 -msgstr "我們無法進行更多的二分搜尋！\n"

1739 +msgstr "已經無法繼續二分搜尋！\n"

1740

1741 #: bisect.c

1742 #, c-format

1743 msgid "Not a valid commit name %s"

1736 -msgstr "不是一個有效的提交名 %s"

1744 +msgstr "%s 不是有效的提交名稱"

1745

1746 #: bisect.c

1747 #, c-format

@@ -1742,7 +1750,7 @@ msgid ""

1750 "This means the bug has been fixed between %s and [%s].\n"

1751 msgstr ""

1752 "合併基礎 %s 是壞的。\n"

1745 -"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"

1753 +"這意味著 bug 已經在 %s 和 [%s] 之間被修正。\n"

1754

1755 #: bisect.c

1756 #, c-format

@@ -1751,7 +1759,7 @@ msgid ""

1759 "The property has changed between %s and [%s].\n"

1760 msgstr ""

1761 "合併基礎 %s 是新的。\n"

1754 -"介於 %s 和 [%s] 之間的屬性已經被修改。\n"

1762 +"介於 %s 和 [%s] 之間的屬性已被修改。\n"

1763

1764 #: bisect.c

1765 #, c-format

@@ -1760,7 +1768,7 @@ msgid ""

1768 "This means the first '%s' commit is between %s and [%s].\n"

1769 msgstr ""

1770 "合併基礎 %s 是 %s。\n"

1763 -"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"

1771 +"這意味著第一個 “%s” 提交位於 %s 和 [%s] 之間。\n"

1772

1773 #: bisect.c

1774 #, c-format

@@ -1769,9 +1777,9 @@ msgid ""

1777 "git bisect cannot work properly in this case.\n"

1778 "Maybe you mistook %s and %s revs?\n"

1779 msgstr ""

1772 -"一些 %s 版本不是 %s 版本的祖先。\n"

1773 -"這種情況下 git 二分搜尋無法正常工作。\n"

1774 -"您可能弄錯了 %s 和 %s 版本？\n"

1780 +"部分 %s 修訂版不是 %s 修訂版的祖先。\n"

1781 +"這種情況下 git bisect 無法正常運作。\n"

1782 +"您可能弄錯了 %s 和 %s 修訂版？\n"

1783

1784 #: bisect.c

1785 #, c-format

@@ -1780,33 +1788,33 @@ msgid ""

1788 "So we cannot be sure the first %s commit is between %s and %s.\n"

1789 "We continue anyway."

1790 msgstr ""

1783 -"介於 %s 和 [%s] 的合併基礎一定被忽略了。\n"

1791 +"介於 %s 和 [%s] 的合併基礎一定被略過了。\n"

1792 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"

1793 "我們仍舊繼續。"

1794

1795 #: bisect.c

1796 #, c-format

1797 msgid "Bisecting: a merge base must be tested\n"

1790 -msgstr "二分搜尋中：合併基礎必須是經過測試的\n"

1798 +msgstr "二分搜尋中：合併基礎必須經過測試\n"

1799

1800 #: bisect.c

1801 #, c-format

1802 msgid "a %s revision is needed"

1795 -msgstr "需要一個 %s 版本"

1803 +msgstr "需要一個 %s 修訂版"

1804

1805 #: bisect.c

1806 #, c-format

1807 msgid "could not create file '%s'"

1800 -msgstr "不能建立檔案 '%s'"

1808 +msgstr "無法建立 “%s” 檔案"

1809

1810 #: bisect.c builtin/merge.c

1811 #, c-format

1812 msgid "could not read file '%s'"

1805 -msgstr "不能讀取檔案 '%s'"

1813 +msgstr "無法讀取 “%s” 檔案"

1814

1815 #: bisect.c

1816 msgid "reading bisect refs failed"

1809 -msgstr "讀取二分搜尋引用失敗"

1817 +msgstr "無法讀取二分搜尋的引用"

1818

1819 #: bisect.c

1820 #, c-format

@@ -1820,13 +1828,13 @@ msgid ""

1828 "Maybe you started with bad path arguments?\n"

1829 msgstr ""

1830 "沒找到能夠測試的提交。\n"

1823 -"可能是執行傳入的路徑引數是錯誤的？\n"

1831 +"可能是傳入的路徑引數有誤？\n"

1832

1833 #: bisect.c

1834 #, c-format

1835 msgid "(roughly %d step)"

1836 msgid_plural "(roughly %d steps)"

1829 -msgstr[0] "（大概 %d 步）"

1837 +msgstr[0] "（大約 %d 步）"

1838

1839 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1840 #. steps)" translation.

@@ -1835,7 +1843,7 @@ msgstr[0] "（大概 %d 步）"

1843 #, c-format

1844 msgid "Bisecting: %d revision left to test after this %s\n"

1845 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1838 -msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"

1846 +msgstr[0] "二分搜尋中：在此 (%2$s) 之後，尚餘 %1$d 個版本待測試\n"

1847

1848 #: blame.c

1849 msgid "--contents and --reverse do not blend well."

@@ -1843,7 +1851,7 @@ msgstr "--contents 和 --reverse 不能混用。"

1851

1852 #: blame.c

1853 msgid "cannot use --contents with final commit object name"

1846 -msgstr "不能將 --contents 和最終的提交物件名共用"

1854 +msgstr "無法將 --contents 與最終的提交物件名稱共用"

1855

1856 #: blame.c

1857 msgid "--reverse and --first-parent together require specified latest commit"

@@ -1853,48 +1861,48 @@ msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1861 #: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c

1862 #: ref-filter.c remote.c sequencer.c submodule.c

1863 msgid "revision walk setup failed"

1856 -msgstr "版本遍歷設定失敗"

1864 +msgstr "修訂版遍歷設定失敗"

1865

1866 #: blame.c

1867 msgid ""

1868 "--reverse --first-parent together require range along first-parent chain"

1861 -msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"

1869 +msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍"

1870

1871 #: blame.c

1872 #, c-format

1873 msgid "no such path %s in %s"

1866 -msgstr "在 %2$s 中無此路徑 %1$s"

1874 +msgstr "在 %2$s 中，沒有路徑 %1$s"

1875

1876 #: blame.c

1877 #, c-format

1878 msgid "cannot read blob %s for path %s"

1871 -msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"

1879 +msgstr "無法為 %2$s 路徑讀取資料物件 %1$s"

1880

1881 #: branch.c

1882 msgid ""

1883 "cannot inherit upstream tracking configuration of multiple refs when "

1884 "rebasing is requested"

1877 -msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"

1885 +msgstr "請求重定基底時，無法繼承多個引用的上游追蹤設定"

1886

1887 #: branch.c

1888 #, c-format

1889 msgid "not setting branch '%s' as its own upstream"

1882 -msgstr "未將「%s」分支設定為其自己的上游"

1890 +msgstr "未將 “%s” 分支設為其自己的上游"

1891

1892 #: branch.c

1893 #, c-format

1894 msgid "branch '%s' set up to track '%s' by rebasing."

1887 -msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"

1895 +msgstr "已藉由重訂基底，將 “%s” 分支設定為追蹤 “%s”。"

1896

1897 #: branch.c

1898 #, c-format

1899 msgid "branch '%s' set up to track '%s'."

1892 -msgstr "已將「%s」分支設定為追蹤「%s」。"

1900 +msgstr "已將 “%s” 分支設定為追蹤 “%s”。"

1901

1902 #: branch.c

1903 #, c-format

1904 msgid "branch '%s' set up to track:"

1897 -msgstr "「%s」分支已設定追蹤："

1905 +msgstr "“%s” 分支已設定追蹤："

1906

1907 #: branch.c

1908 msgid "unable to write upstream branch configuration"

@@ -1907,23 +1915,23 @@ msgid ""

1915 "the remote tracking information by invoking:"

1916 msgstr ""

1917 "\n"

1910 -"修正錯誤後，您可以執行下述命令\n"

1911 -"命令修正遠端追蹤資訊："

1918 +"修正病灶後，您可以執行下述命令\n"

1919 +"修正遠端追蹤資訊："

1920

1921 #: branch.c

1922 #, c-format

1923 msgid "asked to inherit tracking from '%s', but no remote is set"

1916 -msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"

1924 +msgstr "請求繼承 “%s” 的追蹤設定，但未設定遠端"

1925

1926 #: branch.c

1927 #, c-format

1928 msgid "asked to inherit tracking from '%s', but no merge configuration is set"

1921 -msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"

1929 +msgstr "請求繼承 “%s” 的追蹤設定，但未設定合併設定"

1930

1931 #: branch.c

1932 #, c-format

1933 msgid "not tracking: ambiguous information for ref '%s'"

1926 -msgstr "未追蹤：「%s」引用有歧義"

1934 +msgstr "未追蹤：“%s” 引用有歧義"

1935

1936 # 譯者：為保證在輸出中對齊，注意調整句中空格！

1937 #. #-#-#-#-# branch.c.po #-#-#-#-#

@@ -1957,37 +1965,38 @@ msgid ""

1965 "different remotes' fetch refspecs map into different\n"

1966 "tracking namespaces."

1967 msgstr ""

1960 -"有多個遠端的抓取引用規格映射到遠端追蹤引用「%s」的規格：\n"

1968 +"有多個遠端的抓取引用規格，映射到\n"

1969 +"遠端追蹤引用 “%s” 的規格：\n"

1970 "%s\n"

1971 "這通常是設定錯誤。\n"

1972 "\n"

1964 -"若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n"

1965 -"映射到不同的追蹤命名空間。"

1973 +"若要支援設定追蹤分支，請確定不同遠端的\n"

1974 +"抓取引用規格，映射到不同的追蹤命名空間。"

1975

1976 #: branch.c

1977 #, c-format

1978 msgid "'%s' is not a valid branch name"

1970 -msgstr "「%s」不是一個有效的分支名稱"

1979 +msgstr "“%s” 不是有效的分支名稱"

1980

1981 #: branch.c

1982 #, c-format

1983 msgid "a branch named '%s' already exists"

1975 -msgstr "已有同名「%s」分支"

1984 +msgstr "已有同名 “%s” 分支"

1985

1986 #: branch.c

1987 #, c-format

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

1980 -msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"

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

1990

1991 #: branch.c

1992 #, c-format

1993 msgid "cannot set up tracking information; starting point '%s' is not a branch"

1985 -msgstr "無法設定追蹤資訊：起始點「%s」不是分支"

1994 +msgstr "無法設定追蹤資訊：起始點 “%s” 不是分支"

1995

1996 #: branch.c

1997 #, c-format

1998 msgid "the requested upstream branch '%s' does not exist"

1990 -msgstr "請求的上游分支 '%s' 不存在"

1999 +msgstr "請求的上游分支 “%s” 不存在"

2000

2001 #: branch.c

2002 msgid ""

@@ -2002,31 +2011,31 @@ msgid ""

2011 msgstr ""

2012 "\n"

2013 "如果您打算以遠端現存的上游分支為基礎進行修改，\n"

2005 -"您或許需要執行「git fetch」取得分支。\n"

2014 +"您或許需要執行 `git fetch` 取得分支。\n"

2015 "\n"

2007 -"如果您打算將新建立的本機分支推送至對應的遠端分支，\n"

2008 -"且建立兩個分支間的追蹤關係，\n"

2009 -"您可能需要使用「git push -u」推送分支並設定和上游的關聯。"

2016 +"如果您打算將新建立的本機分支，推送至對應的遠端分支，\n"

2017 +"並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n"

2018 +"推送分支並設定和上游的關聯。"

2019

2020 #: branch.c builtin/replace.c

2021 #, c-format

2022 msgid "not a valid object name: '%s'"

2014 -msgstr "不是一個有效的物件名：'%s'"

2023 +msgstr "物件名稱無效：“%s”"

2024

2025 #: branch.c

2026 #, c-format

2027 msgid "ambiguous object name: '%s'"

2019 -msgstr "物件名稱有歧義：「%s」"

2028 +msgstr "物件名稱有歧義：“%s”"

2029

2030 #: branch.c

2031 #, c-format

2032 msgid "not a valid branch point: '%s'"

2024 -msgstr "無效的分支點：「%s」"

2033 +msgstr "分支點無效：“%s”"

2034

2035 #: branch.c

2036 #, c-format

2037 msgid "submodule '%s': unable to find submodule"

2029 -msgstr "「%s」子模組：找不到子模組"

2038 +msgstr "“%s” 子模組：找不到子模組"

2039

2040 #: branch.c

2041 #, c-format

@@ -2034,37 +2043,37 @@ msgid ""

2043 "You may try updating the submodules using 'git checkout %s && git submodule "

2044 "update --init'"

2045 msgstr ""

2037 -"您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"

2038 -"組"

2046 +"您可以嘗試使用 “git checkout %s && git submodule update --init” 命令，更新子"

2047 +"模組"

2048

2049 #: branch.c

2050 #, c-format

2051 msgid "submodule '%s': cannot create branch '%s'"

2043 -msgstr "「%s」子模組：無法建立「%s」分支"

2052 +msgstr "“%s” 子模組：無法建立 “%s” 分支"

2053

2054 #: branch.c

2055 #, c-format

2056 msgid "'%s' is already checked out at '%s'"

2048 -msgstr "'%s' 已經簽出到 '%s'"

2057 +msgstr "“%s” 已在 “%s” 點簽出"

2058

2059 #: branch.c

2060 #, c-format

2061 msgid "HEAD of working tree %s is not updated"

2053 -msgstr "工作區 %s 的 HEAD 指向沒有被更新"

2062 +msgstr "%s 工作區的 HEAD 指針未被更新"

2063

2064 #: builtin/add.c

2065 msgid "git add [<options>] [--] <pathspec>..."

2057 -msgstr "git add [<選項>] [--] <路徑規格>..."

2066 +msgstr "git add [<options>] [--] <pathspec>..."

2067

2068 #: builtin/add.c

2069 #, c-format

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

2062 -msgstr "無法 chmod %cx ‘%s’"

2071 +msgstr "無法 chmod %cx '%s'"

2072

2073 #: builtin/add.c

2074 #, c-format

2075 msgid "unexpected diff status %c"

2067 -msgstr "意外的差異狀態 %c"

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

2077

2078 #: builtin/add.c builtin/commit.c

2079 msgid "updating files failed"

@@ -2073,19 +2082,19 @@ msgstr "更新檔案失敗"

2082 #: builtin/add.c

2083 #, c-format

2084 msgid "remove '%s'\n"

2076 -msgstr "刪除 '%s'\n"

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

2086

2087 #: builtin/add.c

2088 msgid "Unstaged changes after refreshing the index:"

2080 -msgstr "重新整理索引之後尚未被暫存的變更："

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

2090

2091 #: builtin/add.c builtin/rev-parse.c

2092 msgid "Could not read the index"

2084 -msgstr "不能讀取索引"

2093 +msgstr "無法讀取索引"

2094

2095 #: builtin/add.c

2096 msgid "Could not write patch"

2088 -msgstr "不能生成修補檔"

2097 +msgstr "無法寫入修補檔"

2098

2099 #: builtin/add.c

2100 msgid "editing patch failed"

@@ -2094,20 +2103,20 @@ msgstr "編輯修補檔失敗"

2103 #: builtin/add.c

2104 #, c-format

2105 msgid "Could not stat '%s'"

2097 -msgstr "不能對 '%s' 呼叫 stat"

2106 +msgstr "不能對 “%s” 執行 stat"

2107

2108 #: builtin/add.c

2109 msgid "Empty patch. Aborted."

2101 -msgstr "空修補檔。異常終止。"

2110 +msgstr "修補檔空白。中止。"

2111

2112 #: builtin/add.c

2113 #, c-format

2114 msgid "Could not apply '%s'"

2106 -msgstr "不能套用 '%s'"

2115 +msgstr "無法套用 “%s”"

2116

2117 #: builtin/add.c

2118 msgid "The following paths are ignored by one of your .gitignore files:\n"

2110 -msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"

2119 +msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n"

2120

2121 #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c

2122 #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c

@@ -2123,11 +2132,11 @@ msgstr "詳細輸出"

2132

2133 #: builtin/add.c

2134 msgid "interactive picking"

2126 -msgstr "互動式揀選"

2135 +msgstr "互動式挑選"

2136

2137 #: builtin/add.c builtin/checkout.c builtin/reset.c

2138 msgid "select hunks interactively"

2130 -msgstr "互動式挑選資料區塊"

2139 +msgstr "互動式選取區塊"

2140

2141 #: builtin/add.c

2142 msgid "edit current diff and apply"

@@ -2135,7 +2144,7 @@ msgstr "編輯目前差異並套用"

2144

2145 #: builtin/add.c

2146 msgid "allow adding otherwise ignored files"

2138 -msgstr "允許新增忽略的檔案"

2147 +msgstr "允許加入原先被忽略的檔案"

2148

2149 #: builtin/add.c

2150 msgid "update tracked files"

@@ -2143,15 +2152,15 @@ msgstr "更新已追蹤的檔案"

2152

2153 #: builtin/add.c

2154 msgid "renormalize EOL of tracked files (implies -u)"

2146 -msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"

2155 +msgstr "對已追蹤檔案（隱含 -u）重新標準化 EOL"

2156

2157 #: builtin/add.c

2158 msgid "record only the fact that the path will be added later"

2150 -msgstr "只記錄，該路徑稍後再新增"

2159 +msgstr "只記錄「路徑稍後會再加入」"

2160

2161 #: builtin/add.c

2162 msgid "add changes from all tracked and untracked files"

2154 -msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"

2163 +msgstr "從所有已追蹤和未追蹤檔案加入更動"

2164

2165 #: builtin/add.c

2166 msgid "ignore paths removed in the working tree (same as --no-all)"

@@ -2167,7 +2176,7 @@ msgstr "略過因發生錯誤不能新增的檔案"

2176

2177 #: builtin/add.c

2178 msgid "check if - even missing - files are ignored in dry run"

2170 -msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"

2179 +msgstr "檢查（即使不存在的）檔案是否在測試執行模式中被忽略"

2180

2181 #: builtin/add.c builtin/mv.c builtin/rm.c

2182 msgid "allow updating entries outside of the sparse-checkout cone"

@@ -2175,11 +2184,11 @@ msgstr "允許更新稀疏簽出 cone 外的項目"

2184

2185 #: builtin/add.c builtin/update-index.c

2186 msgid "override the executable bit of the listed files"

2178 -msgstr "覆蓋列表裡檔案的可執行位"

2187 +msgstr "覆寫列出檔案中的可執行位元"

2188

2189 #: builtin/add.c

2190 msgid "warn when adding an embedded repository"

2182 -msgstr "建立一個嵌入式版本庫時給予警告"

2191 +msgstr "嵌入版本庫時發出警告"

2192

2193 #: builtin/add.c

2194 #, c-format

@@ -2198,22 +2207,24 @@ msgid ""

2207 "\n"

2208 "See \"git help submodule\" for more information."

2209 msgstr ""

2201 -"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫"

2202 -"的內容，並且不知道該如何取得它。\n"

2203 -"如果您要新增一個子模組，使用：\n"

2210 +"您在目前的版本庫中加進另一個 Git 版本庫。\n"

2211 +"複製外層的版本庫，將不包含嵌入版本庫的內容，\n"

2212 +"並且不包含取得此版本庫的方式。\n"

2213 +"如果您要加入子模組，請使用：\n"

2214 "\n"

2215 "\tgit submodule add <url> %s\n"

2216 "\n"

2207 -"如果您不小心新增了這個路徑，可以用下面的指令將其從索引中刪除：\n"

2217 +"如果您不小心加入了這個路徑，\n"

2218 +"可以用下面的命令，將其從索引中移除：\n"

2219 "\n"

2220 "\tgit rm --cached %s\n"

2221 "\n"

2211 -"參見 \"git help submodule\" 取得更多訊息。"

2222 +"參見 “git help submodule” 深入了解。"

2223

2224 #: builtin/add.c

2225 #, c-format

2226 msgid "adding embedded git repository: %s"

2216 -msgstr "正在新增嵌入式 git 版本庫：%s"

2227 +msgstr "正在加入嵌入式 git 版本庫：%s"

2228

2229 #: builtin/add.c

2230 msgid ""

@@ -2221,29 +2232,29 @@ msgid ""

2232 "Turn this message off by running\n"

2233 "\"git config advice.addIgnoredFile false\""

2234 msgstr ""

2224 -"如果您真的想加入，請使用 -f。\n"

2235 +"若您真的想加入，請傳入 -f。\n"

2236 "如要關閉此訊息，請執行\n"

2226 -"\"git config advice.addIgnoredFile false\""

2237 +"“git config advice.addIgnoredFile false”"

2238

2239 #: builtin/add.c

2240 msgid "adding files failed"

2230 -msgstr "新增檔案失敗"

2241 +msgstr "加入檔案失敗"

2242

2243 #: builtin/add.c

2244 #, c-format

2245 msgid "--chmod param '%s' must be either -x or +x"

2235 -msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"

2246 +msgstr "--chmod 的參數 “%s” 必須是 -x 或 +x"

2247

2248 #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2249 #: builtin/rm.c builtin/stash.c

2250 #, c-format

2251 msgid "'%s' and pathspec arguments cannot be used together"

2241 -msgstr "「%s」和路徑規格引數不得同時使用"

2252 +msgstr "“%s” 和路徑規格引數不得同時使用"

2253

2254 #: builtin/add.c

2255 #, c-format

2256 msgid "Nothing specified, nothing added.\n"

2246 -msgstr "沒有指定檔案，也沒有檔案被新增。\n"

2257 +msgstr "沒有指定，亦未加入檔案。\n"

2258

2259 #: builtin/add.c

2260 msgid ""

@@ -2251,9 +2262,9 @@ msgid ""

2262 "Turn this message off by running\n"

2263 "\"git config advice.addEmptyPathspec false\""

2264 msgstr ""

2254 -"可能你要做的是 'git add .'？\n"

2265 +"可能您想做 “git add .”？\n"

2266 "如要關閉此訊息，請執行\n"

2256 -"\"git config advice.addEmptyPathspec false\""

2267 +"“git config advice.addEmptyPathspec false”"

2268

2269 #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c

2270 #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c

@@ -2265,43 +2276,43 @@ msgstr "索引檔案損壞"

2276 #: builtin/am.c builtin/mailinfo.c mailinfo.c

2277 #, c-format

2278 msgid "bad action '%s' for '%s'"

2268 -msgstr "「%s」動作對「%s」無效"

2279 +msgstr "“%s” 動作對 “%s” 無效"

2280

2281 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2282 #: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c

2283 #: sequencer.c setup.c

2284 #, c-format

2285 msgid "invalid value for '%s': '%s'"

2275 -msgstr "「%s」的值無效：「%s」"

2286 +msgstr "“%s” 的值無效：“%s”"

2287

2288 #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2289 #, c-format

2290 msgid "could not read '%s'"

2280 -msgstr "不能讀取 '%s'"

2291 +msgstr "無法讀取 “%s”"

2292

2293 #: builtin/am.c

2294 msgid "could not parse author script"

2284 -msgstr "不能解析作者腳本"

2295 +msgstr "無法解析作者文稿"

2296

2297 #: builtin/am.c builtin/replace.c commit.c sequencer.c

2298 #, c-format

2299 msgid "could not parse %s"

2289 -msgstr "不能解析 %s"

2300 +msgstr "無法解析 %s"

2301

2302 #: builtin/am.c

2303 #, c-format

2304 msgid "'%s' was deleted by the applypatch-msg hook"

2294 -msgstr "'%s' 被 applypatch-msg 掛鉤刪除"

2305 +msgstr "“%s” 被 applypatch-msg 掛鉤刪除"

2306

2307 #: builtin/am.c

2308 #, c-format

2309 msgid "Malformed input line: '%s'."

2299 -msgstr "非法的輸入行：'%s'。"

2310 +msgstr "格式錯誤的輸入列：“%s”。"

2311

2312 #: builtin/am.c

2313 #, c-format

2314 msgid "Failed to copy notes from '%s' to '%s'"

2304 -msgstr "從 '%s' 複製註解到 '%s' 時失敗"

2315 +msgstr "從 “%s” 拷貝註解到 “%s” 失敗"

2316

2317 #: builtin/am.c

2318 msgid "fseek failed"

@@ -2310,21 +2321,21 @@ msgstr "fseek 失敗"

2321 #: builtin/am.c builtin/rebase.c sequencer.c wrapper.c

2322 #, c-format

2323 msgid "could not open '%s' for reading"

2313 -msgstr "無法開啟 '%s' 進行讀取"

2324 +msgstr "無法開啟 “%s” 進行讀取"

2325

2326 #: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c

2327 #, c-format

2328 msgid "could not open '%s' for writing"

2318 -msgstr "無法開啟 '%s' 進行寫入"

2329 +msgstr "無法開啟 “%s” 進行寫入"

2330

2331 #: builtin/am.c

2332 #, c-format

2333 msgid "could not parse patch '%s'"

2323 -msgstr "無法解析修補檔 '%s'"

2334 +msgstr "無法解析修補檔 “%s”"

2335

2336 #: builtin/am.c

2337 msgid "Only one StGIT patch series can be applied at once"

2327 -msgstr "一次只能有一個 StGIT 修補檔佇列被套用"

2338 +msgstr "一次只能套用一個 StGIT 修補檔序列"

2339

2340 #: builtin/am.c

2341 msgid "invalid timestamp"

@@ -2332,11 +2343,11 @@ msgstr "無效的時間戳"

2343

2344 #: builtin/am.c

2345 msgid "invalid Date line"

2335 -msgstr "無效的日期行"

2346 +msgstr "無效的 Date 列"

2347

2348 #: builtin/am.c

2349 msgid "invalid timezone offset"

2339 -msgstr "無效的時區位移值"

2350 +msgstr "無效的時區偏移"

2351

2352 #: builtin/am.c

2353 msgid "Patch format detection failed."

@@ -2345,74 +2356,74 @@ msgstr "修補檔格式偵測失敗。"

2356 #: builtin/am.c builtin/clone.c

2357 #, c-format

2358 msgid "failed to create directory '%s'"

2348 -msgstr "建立目錄 '%s' 失敗"

2359 +msgstr "無法建立目錄 “%s”"

2360

2361 #: builtin/am.c

2362 msgid "Failed to split patches."

2352 -msgstr "分割修補檔失敗。"

2363 +msgstr "無法切割修補檔。"

2364

2365 #: builtin/am.c

2366 #, c-format

2367 msgid "When you have resolved this problem, run \"%s --continue\"."

2357 -msgstr "當您解決這一問題，執行 \"%s --continue\"。"

2368 +msgstr "解決此問題後，請執行 “%s --continue”。"

2369

2370 #: builtin/am.c

2371 #, c-format

2372 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2362 -msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"

2373 +msgstr "若要略過此修補，請改執行 “%s --skip”。"

2374

2375 #: builtin/am.c

2376 #, c-format

2377 msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."

2367 -msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。"

2378 +msgstr "若要將空白修補檔錄入為空白提交，請執行 “%s --allow-empty”。"

2379

2380 #: builtin/am.c

2381 #, c-format

2382 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2372 -msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"

2383 +msgstr "若要還原至原始分支，並停止修補動作，請執行 “%s --abort”。"

2384

2385 #: builtin/am.c

2386 msgid "Patch sent with format=flowed; space at the end of lines might be lost."

2376 -msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"

2387 +msgstr "修補檔使用 format=flowed 格式傳送：列尾的空格可能會遺失。"

2388

2389 #: builtin/am.c

2390 #, c-format

2391 msgid "missing author line in commit %s"

2381 -msgstr "在提交 %s 中缺少作者行"

2392 +msgstr "在提交 %s 中缺少作者列"

2393

2394 #: builtin/am.c

2395 #, c-format

2396 msgid "invalid ident line: %.*s"

2386 -msgstr "無效的身份標記：%.*s"

2397 +msgstr "ident 列無效：%.*s"

2398

2399 #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c

2400 #, c-format

2401 msgid "unable to parse commit %s"

2391 -msgstr "不能解析提交 %s"

2402 +msgstr "無法解析 %s 提交"

2403

2404 #: builtin/am.c

2405 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2395 -msgstr "版本庫缺乏必要的資料物件以進行三方合併。"

2406 +msgstr "版本庫缺少必要的資料物件，無法進行三方合併。"

2407

2408 #: builtin/am.c

2409 msgid "Using index info to reconstruct a base tree..."

2399 -msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."

2410 +msgstr "正在使用索引資訊重建基礎樹……"

2411

2412 #: builtin/am.c

2413 msgid ""

2414 "Did you hand edit your patch?\n"

2415 "It does not apply to blobs recorded in its index."

2416 msgstr ""

2406 -"您是否曾手動編輯過您的修補檔？\n"

2407 -"無法套用修補檔到索引中的資料物件上。"

2417 +"您是否曾自行編輯過您的修補檔？\n"

2418 +"未能套用至索引錄入的資料物件。"

2419

2420 #: builtin/am.c

2421 msgid "Falling back to patching base and 3-way merge..."

2411 -msgstr "回落到基礎版本上修補及進行三方合併..."

2422 +msgstr "正在回復到修補基礎處，並進行三方合併……"

2423

2424 #: builtin/am.c

2425 msgid "Failed to merge in the changes."

2415 -msgstr "無法合併變更。"

2426 +msgstr "無法合併更動。"

2427

2428 #: builtin/am.c builtin/merge.c sequencer.c

2429 msgid "git write-tree failed to write a tree"

@@ -2420,12 +2431,12 @@ msgstr "git write-tree 無法寫入樹狀物件"

2431

2432 #: builtin/am.c

2433 msgid "applying to an empty history"

2423 -msgstr "正套用到一個空歷史上"

2434 +msgstr "正在套用至空白歷史記錄上"

2435

2436 #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2437 #: t/helper/test-fast-rebase.c

2438 msgid "failed to write commit object"

2428 -msgstr "寫提交物件失敗"

2439 +msgstr "無法寫入提交物件"

2440

2441 #: builtin/am.c

2442 #, c-format

@@ -2434,7 +2445,7 @@ msgstr "無法繼續：%s 不存在。"

2445

2446 #: builtin/am.c

2447 msgid "Commit Body is:"

2437 -msgstr "提交內容為："

2448 +msgstr "提交內文為："

2449

2450 # 譯者：請維持句尾空格

2451 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

@@ -2444,7 +2455,7 @@ msgstr "提交內容為："

2455 #: builtin/am.c

2456 #, c-format

2457 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2447 -msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： "

2458 +msgstr "是否套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]: "

2459

2460 #: builtin/am.c builtin/commit.c

2461 msgid "unable to write index file"

@@ -2453,7 +2464,7 @@ msgstr "無法寫入索引檔案"

2464 #: builtin/am.c

2465 #, c-format

2466 msgid "Dirty index: cannot apply patches (dirty: %s)"

2456 -msgstr "髒索引：不能套用修補檔（髒檔案：%s）"

2467 +msgstr "有異動索引：無法套用修補檔（異動處：%s）"

2468

2469 #: builtin/am.c

2470 #, c-format

@@ -2467,7 +2478,7 @@ msgstr "建立空白提交：%.*s"

2478

2479 #: builtin/am.c

2480 msgid "Patch is empty."

2470 -msgstr "修補檔為空。"

2481 +msgstr "修補檔空白。"

2482

2483 #: builtin/am.c

2484 #, c-format

@@ -2476,20 +2487,20 @@ msgstr "套用：%.*s"

2487

2488 #: builtin/am.c

2489 msgid "No changes -- Patch already applied."

2479 -msgstr "沒有變更——修補檔已經套用過。"

2490 +msgstr "沒有變更——修補檔已套用過。"

2491

2492 #: builtin/am.c

2493 #, c-format

2494 msgid "Patch failed at %s %.*s"

2484 -msgstr "打修補檔失敗於 %s %.*s"

2495 +msgstr "在 %s %.*s 處修補失敗"

2496

2497 #: builtin/am.c

2498 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"

2488 -msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"

2499 +msgstr "使用 “git am --show-current-patch=diff” 命令檢視失敗的修補檔"

2500

2501 #: builtin/am.c

2502 msgid "No changes - recorded it as an empty commit."

2492 -msgstr "沒有變更－將其錄製為空白提交。"

2503 +msgstr "沒有變更：將其錄入為空白提交。"

2504

2505 #: builtin/am.c

2506 msgid ""

@@ -2497,9 +2508,9 @@ msgid ""

2508 "If there is nothing left to stage, chances are that something else\n"

2509 "already introduced the same changes; you might want to skip this patch."

2510 msgstr ""

2500 -"沒有變更 —— 您是不是忘了執行 'git add'？\n"

2501 -"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"

2502 -"您也許想要略過這個修補檔。"

2511 +"沒有變更：是否忘記執行 “git add”？\n"

2512 +"如果沒有其他要新增到暫存區的，則很可能是其它提交\n"

2513 +"已經引入了相同的變更。您也許想要略過這個修補檔。"

2514

2515 #: builtin/am.c

2516 msgid ""

@@ -2508,59 +2519,61 @@ msgid ""

2519 "such.\n"

2520 "You might run `git rm` on a file to accept \"deleted by them\" for it."

2521 msgstr ""

2511 -"在您的索引中仍存在未合併的路徑。\n"

2512 -"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"

2513 -"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"

2522 +"索引中仍有未合併路徑。\n"

2523 +"您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n"

2524 +"你可以對「由他們刪除」的檔案，執行 `git rm` 指令。"

2525

2526 #: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c

2527 #: rerere.c

2528 msgid "unable to write new index file"

2518 -msgstr "無法寫新的索引檔案"

2529 +msgstr "無法寫入新的索引檔案"

2530

2531 #: builtin/am.c builtin/reset.c

2532 #, c-format

2533 msgid "Could not parse object '%s'."

2523 -msgstr "不能解析物件 '%s'。"

2534 +msgstr "無法解析 “%s” 物件。"

2535

2536 #: builtin/am.c

2537 msgid "failed to clean index"

2527 -msgstr "清空索引失敗"

2538 +msgstr "無法清除索引"

2539

2540 #: builtin/am.c

2541 msgid ""

2542 "You seem to have moved HEAD since the last 'am' failure.\n"

2543 "Not rewinding to ORIG_HEAD"

2533 -msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"

2544 +msgstr ""

2545 +"您似乎在上一次 “am” 失敗後移動了 HEAD。\n"

2546 +"未倒轉回 ORIG_HEAD"

2547

2548 #: builtin/am.c builtin/bisect--helper.c worktree.c

2549 #, c-format

2550 msgid "failed to read '%s'"

2538 -msgstr "讀取 '%s' 失敗"

2551 +msgstr "無法讀取 “%s”"

2552

2553 #: builtin/am.c

2554 #, c-format

2555 msgid "options '%s=%s' and '%s=%s' cannot be used together"

2543 -msgstr "「%s=%s」和「%s=%s」選項不得同時使用"

2556 +msgstr "“%s=%s” 和 “%s=%s” 選項不得同時使用"

2557

2558 #: builtin/am.c

2559 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

2547 -msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"

2560 +msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"

2561

2562 #: builtin/am.c

2563 msgid "git am [<options>] (--continue | --skip | --abort)"

2551 -msgstr "git am [<選項>] (--continue | --skip | --abort)"

2564 +msgstr "git am [<options>] (--continue | --skip | --abort)"

2565

2566 #: builtin/am.c

2567 msgid "run interactively"

2555 -msgstr "以互動式方式執行"

2568 +msgstr "互動式執行"

2569

2570 #: builtin/am.c

2571 msgid "historical option -- no-op"

2559 -msgstr "老的參數 —— 無作用"

2572 +msgstr "歷史遺留選項——無作用"

2573

2574 #: builtin/am.c

2575 msgid "allow fall back on 3way merging if needed"

2563 -msgstr "如果必要，允許使用三方合併"

2576 +msgstr "必要時允許回復至三方合併"

2577

2578 #: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c

2579 #: builtin/stash.c

@@ -2569,7 +2582,7 @@ msgstr "靜默模式"

2582

2583 #: builtin/am.c

2584 msgid "add a Signed-off-by trailer to the commit message"

2572 -msgstr "在提交說明結尾加入 Signed-off-by"

2585 +msgstr "在提交說明結尾處加入 Signed-off-by"

2586

2587 #: builtin/am.c

2588 msgid "recode into utf8 (default)"

@@ -2577,35 +2590,35 @@ msgstr "使用 utf8 字元集（預設）"

2590

2591 #: builtin/am.c

2592 msgid "pass -k flag to git-mailinfo"

2580 -msgstr "向 git-mailinfo 傳遞 -k 參數"

2593 +msgstr "向 git-mailinfo 傳入 -k 參數"

2594

2595 #: builtin/am.c

2596 msgid "pass -b flag to git-mailinfo"

2584 -msgstr "向 git-mailinfo 傳遞 -b 參數"

2597 +msgstr "向 git-mailinfo 傳入 -b 參數"

2598

2599 #: builtin/am.c

2600 msgid "pass -m flag to git-mailinfo"

2588 -msgstr "向 git-mailinfo 傳遞 -m 參數"

2601 +msgstr "向 git-mailinfo 傳入 -m 參數"

2602

2603 #: builtin/am.c

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

2592 -msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"

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

2606

2607 #: builtin/am.c

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

2596 -msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"

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

2610

2611 #: builtin/am.c

2612 msgid "strip everything before a scissors line"

2600 -msgstr "捨棄裁切線前的所有內容"

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

2614

2615 #: builtin/am.c

2616 msgid "pass it through git-mailinfo"

2604 -msgstr "透過 git-mailinfo 傳遞"

2617 +msgstr "透過 git-mailinfo 傳入"

2618

2619 #: builtin/am.c

2620 msgid "pass it through git-apply"

2608 -msgstr "傳遞給 git-apply"

2621 +msgstr "透過 git-apply 傳入"

2622

2623 #: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c

2624 #: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c

@@ -2617,7 +2630,7 @@ msgstr "n"

2630 #: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c

2631 #: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c

2632 msgid "format"

2620 -msgstr "格式"

2633 +msgstr "format"

2634

2635 #: builtin/am.c

2636 msgid "format the patch(es) are in"

@@ -2625,7 +2638,7 @@ msgstr "修補檔的格式"

2638

2639 #: builtin/am.c

2640 msgid "override error message when patch failure occurs"

2628 -msgstr "打修補檔失敗時顯示的錯誤訊息"

2641 +msgstr "覆蓋修補失敗時顯示的錯誤訊息"

2642

2643 #: builtin/am.c

2644 msgid "continue applying patches after resolving a conflict"

@@ -2645,7 +2658,7 @@ msgstr "還原原始分支並中止修補動作"

2658

2659 #: builtin/am.c

2660 msgid "abort the patching operation but keep HEAD where it is"

2648 -msgstr "終止修補動作但保持 HEAD 不變"

2661 +msgstr "中止修補動作但保持 HEAD 不變"

2662

2663 #: builtin/am.c

2664 msgid "show the patch being applied"

@@ -2653,15 +2666,15 @@ msgstr "顯示正在套用的修補檔"

2666

2667 #: builtin/am.c

2668 msgid "record the empty patch as an empty commit"

2656 -msgstr "將空白修補檔錄製為空白提交"

2669 +msgstr "將空白修補檔錄入為空白提交"

2670

2671 #: builtin/am.c

2672 msgid "lie about committer date"

2660 -msgstr "將作者日期作為提交日期"

2673 +msgstr "將作者日期當作提交日期"

2674

2675 #: builtin/am.c

2676 msgid "use current timestamp for author date"

2664 -msgstr "用目前時間作為作者日期"

2677 +msgstr "把目前時間戳當作是作者日期"

2678

2679 #: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c

2680 #: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c

@@ -2685,8 +2698,8 @@ msgid ""

2698 "The -b/--binary option has been a no-op for long time, and\n"

2699 "it will be removed. Please do not use it anymore."

2700 msgstr ""

2688 -"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"

2689 -"請不要再使用它了。"

2701 +"-b/--binary 選項已經有很長時間不做任何實質動作了，\n"

2702 +"並且將被移除。請不要再使用它了。"

2703

2704 #: builtin/am.c

2705 msgid "failed to read the index"

@@ -2703,49 +2716,49 @@ msgid ""

2716 "Stray %s directory found.\n"

2717 "Use \"git am --abort\" to remove it."

2718 msgstr ""

2706 -"發現了錯誤的 %s 目錄。\n"

2707 -"使用 \"git am --abort\" 刪除它。"

2719 +"發現失散的 %s 目錄。\n"

2720 +"使用 “git am --abort” 移除。"

2721

2722 #: builtin/am.c

2723 msgid "Resolve operation not in progress, we are not resuming."

2711 -msgstr "解決動作未進行，我們不會繼續。"

2724 +msgstr "未在進行解決動作，不會繼續。"

2725

2726 #: builtin/am.c

2727 msgid "interactive mode requires patches on the command line"

2715 -msgstr "互動式模式需要指令列上提供修補檔"

2728 +msgstr "互動模式需要命令列上提供修補檔"

2729

2730 #: builtin/apply.c

2731 msgid "git apply [<options>] [<patch>...]"

2719 -msgstr "git apply [<選項>] [<修補檔>...]"

2732 +msgstr "git apply [<options>] [<patch>...]"

2733

2734 #: builtin/archive.c diagnose.c

2735 msgid "could not redirect output"

2723 -msgstr "不能重定向輸出"

2736 +msgstr "無法重新導向輸出"

2737

2738 #: builtin/archive.c

2739 msgid "git archive: Remote with no URL"

2727 -msgstr "git archive：未提供遠端 URL"

2740 +msgstr "git archive: 未提供遠端 URL"

2741

2742 #: builtin/archive.c

2743 msgid "git archive: expected ACK/NAK, got a flush packet"

2731 -msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包"

2744 +msgstr "git archive：預期是 ACK/NAK，卻收到 flush 封包"

2745

2746 #: builtin/archive.c

2747 #, c-format

2748 msgid "git archive: NACK %s"

2736 -msgstr "git archive：NACK %s"

2749 +msgstr "git archive: NACK %s"

2750

2751 #: builtin/archive.c

2752 msgid "git archive: protocol error"

2740 -msgstr "git archive：協定錯誤"

2753 +msgstr "git archive：通訊協定錯誤"

2754

2755 #: builtin/archive.c

2756 msgid "git archive: expected a flush"

2744 -msgstr "git archive：應有一個 flush 包"

2757 +msgstr "git archive：預期收到 flush 封包"

2758

2759 #: builtin/bisect--helper.c

2760 msgid "git bisect--helper --bisect-reset [<commit>]"

2748 -msgstr "git bisect--helper --bisect-reset [<提交>]"

2761 +msgstr "git bisect--helper --bisect-reset [<commit>]"

2762

2763 #: builtin/bisect--helper.c

2764 msgid ""

@@ -2753,24 +2766,25 @@ msgid ""

2766 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "

2767 "[<paths>...]"

2768 msgstr ""

2756 -"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"

2757 -"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"

2769 +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"

2770 +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "

2771 +"[<paths>...]"

2772

2773 #: builtin/bisect--helper.c

2774 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"

2761 -msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"

2775 +msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"

2776

2777 #: builtin/bisect--helper.c

2778 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"

2765 -msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]"

2779 +msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"

2780

2781 #: builtin/bisect--helper.c

2782 msgid "git bisect--helper --bisect-replay <filename>"

2769 -msgstr "git bisect--helper --bisect-replay <檔名>"

2783 +msgstr "git bisect--helper --bisect-replay <filename>"

2784

2785 #: builtin/bisect--helper.c

2786 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"

2773 -msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"

2787 +msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"

2788

2789 #: builtin/bisect--helper.c

2790 msgid "git bisect--helper --bisect-run <cmd>..."

@@ -2779,32 +2793,32 @@ msgstr "git bisect--helper --bisect-run <cmd>..."

2793 #: builtin/bisect--helper.c

2794 #, c-format

2795 msgid "cannot open file '%s' in mode '%s'"

2782 -msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"

2796 +msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"

2797

2798 #: builtin/bisect--helper.c

2799 #, c-format

2800 msgid "could not write to file '%s'"

2787 -msgstr "無法寫入 '%s' 檔案"

2801 +msgstr "無法寫入 “%s” 檔案"

2802

2803 #: builtin/bisect--helper.c

2804 #, c-format

2805 msgid "cannot open file '%s' for reading"

2792 -msgstr "無法開啟「%s」檔案進行讀取"

2806 +msgstr "無法開啟 “%s” 檔案進行讀取"

2807

2808 #: builtin/bisect--helper.c

2809 #, c-format

2810 msgid "'%s' is not a valid term"

2797 -msgstr "'%s' 不是一個有效的術語"

2811 +msgstr "“%s” 不是有效術語"

2812

2813 #: builtin/bisect--helper.c

2814 #, c-format

2815 msgid "can't use the builtin command '%s' as a term"

2802 -msgstr "不能使用內建指令 '%s' 作為術語"

2816 +msgstr "不能將內建命令 “%s” 當作術語使用"

2817

2818 #: builtin/bisect--helper.c

2819 #, c-format

2820 msgid "can't change the meaning of the term '%s'"

2807 -msgstr "不能修改術語 '%s' 的含義"

2821 +msgstr "不能變更術語 “%s” 的含義"

2822

2823 #: builtin/bisect--helper.c

2824 msgid "please use two different terms"

@@ -2818,33 +2832,33 @@ msgstr "我們沒有在二分搜尋。\n"

2832 #: builtin/bisect--helper.c

2833 #, c-format

2834 msgid "'%s' is not a valid commit"

2821 -msgstr "'%s' 不是一個有效的提交"

2835 +msgstr "“%s” 不是有效的提交"

2836

2837 #: builtin/bisect--helper.c

2838 #, c-format

2839 msgid ""

2840 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."

2827 -msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"

2841 +msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。"

2842

2843 #: builtin/bisect--helper.c

2844 #, c-format

2845 msgid "Bad bisect_write argument: %s"

2832 -msgstr "壞的 bisect_write 參數：%s"

2846 +msgstr "bisect_write 引數無效：%s"

2847

2848 #: builtin/bisect--helper.c

2849 #, c-format

2850 msgid "couldn't get the oid of the rev '%s'"

2837 -msgstr "無法取得版本 '%s' 的物件 ID"

2851 +msgstr "無法取得修訂版 “%s” 的物件 ID"

2852

2853 #: builtin/bisect--helper.c

2854 #, c-format

2855 msgid "couldn't open the file '%s'"

2842 -msgstr "無法開啟檔案 '%s'"

2856 +msgstr "無法開啟檔案 “%s”"

2857

2858 #: builtin/bisect--helper.c

2859 #, c-format

2860 msgid "Invalid command: you're currently in a %s/%s bisect"

2847 -msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"

2861 +msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態"

2862

2863 #: builtin/bisect--helper.c

2864 #, c-format

@@ -2852,8 +2866,8 @@ msgid ""

2866 "You need to give me at least one %s and %s revision.\n"

2867 "You can use \"git bisect %s\" and \"git bisect %s\" for that."

2868 msgstr ""

2855 -"您需要給我至少一個 %s 和一個 %s 版本。\n"

2856 -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"

2869 +"需指定至少一個 %s 和一個 %s 修訂版。\n"

2870 +"為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2871

2872 #: builtin/bisect--helper.c

2873 #, c-format

@@ -2862,9 +2876,9 @@ msgid ""

2876 "You then need to give me at least one %s and %s revision.\n"

2877 "You can use \"git bisect %s\" and \"git bisect %s\" for that."

2878 msgstr ""

2865 -"您需要執行 \"git bisect start\" 來開始。\n"

2866 -"然後需要提供我至少一個 %s 和一個 %s 版本。\n"

2867 -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"

2879 +"要開始，請執行 “git bisect start”。\n"

2880 +"接著提供至少一個 %s 和一個 %s 修訂版。\n"

2881 +"為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2882

2883 #: builtin/bisect--helper.c

2884 #, c-format

@@ -2878,7 +2892,7 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋"

2892 #.

2893 #: builtin/bisect--helper.c

2894 msgid "Are you sure [Y/n]? "

2881 -msgstr "您確認嗎[Y/n]？ "

2895 +msgstr "是否確定 [Y/n]? "

2896

2897 #: builtin/bisect--helper.c

2898 msgid "status: waiting for both good and bad commits\n"

@@ -2903,7 +2917,9 @@ msgstr "未定義術語"

2917 msgid ""

2918 "Your current terms are %s for the old state\n"

2919 "and %s for the new state.\n"

2906 -msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n"

2920 +msgstr ""

2921 +"您目前針對舊狀態的術語是 %s；\n"

2922 +"對新狀態的術語是 %s。\n"

2923

2924 #: builtin/bisect--helper.c

2925 #, c-format

@@ -2911,57 +2927,57 @@ msgid ""

2927 "invalid argument %s for 'git bisect terms'.\n"

2928 "Supported options are: --term-good|--term-old and --term-bad|--term-new."

2929 msgstr ""

2914 -"指令 'git bisect terms' 的參數 %s 無效。\n"

2930 +"傳入 “git bisect terms” 的 %s 引數無效。\n"

2931 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"

2932

2933 #: builtin/bisect--helper.c

2934 msgid "revision walk setup failed\n"

2919 -msgstr "版本遍歷設定失敗\n"

2935 +msgstr "修訂版遍歷設定失敗\n"

2936

2937 #: builtin/bisect--helper.c

2938 #, c-format

2939 msgid "could not open '%s' for appending"

2924 -msgstr "無法開啟 '%s' 進行附加"

2940 +msgstr "無法開啟 “%s” 進行附加"

2941

2942 #: builtin/bisect--helper.c

2943 msgid "'' is not a valid term"

2928 -msgstr "'' 不是一個有效的術語"

2944 +msgstr "“ ” 不是有效術語"

2945

2946 #: builtin/bisect--helper.c

2947 #, c-format

2948 msgid "unrecognized option: '%s'"

2933 -msgstr "未識別的選項：'%s'"

2949 +msgstr "無法識別選項：“%s”"

2950

2951 #: builtin/bisect--helper.c

2952 #, c-format

2953 msgid "'%s' does not appear to be a valid revision"

2938 -msgstr "'%s' 看起來不是一個有效的版本"

2954 +msgstr "“%s” 似乎不是有效修訂版"

2955

2956 #: builtin/bisect--helper.c

2957 msgid "bad HEAD - I need a HEAD"

2942 -msgstr "壞的 HEAD - 我需要一個 HEAD"

2958 +msgstr "HEAD 無效 — 需要一個 HEAD"

2959

2960 #: builtin/bisect--helper.c

2961 #, c-format

2962 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

2947 -msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"

2963 +msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。"

2964

2965 #: builtin/bisect--helper.c

2966 msgid "won't bisect on cg-seek'ed tree"

2951 -msgstr "不會在做了 cg-seek 的樹上做二分搜尋"

2967 +msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"

2968

2969 #: builtin/bisect--helper.c

2970 msgid "bad HEAD - strange symbolic ref"

2955 -msgstr "壞的 HEAD - 奇怪的符號引用"

2971 +msgstr "HEAD 無效 — 異常符號引用"

2972

2973 #: builtin/bisect--helper.c

2974 #, c-format

2975 msgid "invalid ref: '%s'"

2960 -msgstr "無效的引用：'%s'"

2976 +msgstr "引用無效：“%s”"

2977

2978 #: builtin/bisect--helper.c

2979 msgid "You need to start by \"git bisect start\"\n"

2964 -msgstr "您需要執行 \"git bisect start\" 來開始\n"

2980 +msgstr "要開始，請執行 “git bisect start”\n"

2981

2982 # 譯者：請維持句尾空格

2983 #. TRANSLATORS: Make sure to include [Y] and [n] in your

@@ -2970,7 +2986,7 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n"

2986 #.

2987 #: builtin/bisect--helper.c

2988 msgid "Do you want me to do it for you [Y/n]? "

2973 -msgstr "您想讓我為您這樣做嗎[Y/n]？ "

2989 +msgstr "是否要這麼做 [Y/n]? "

2990

2991 #: builtin/bisect--helper.c

2992 msgid "Please call `--bisect-state` with at least one argument"

@@ -2979,17 +2995,17 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"

2995 #: builtin/bisect--helper.c

2996 #, c-format

2997 msgid "'git bisect %s' can take only one argument."

2982 -msgstr "'git bisect %s' 只能有一個參數。"

2998 +msgstr "“git bisect %s” 只取一個引數。"

2999

3000 #: builtin/bisect--helper.c

3001 #, c-format

3002 msgid "Bad rev input: %s"

2987 -msgstr "<修訂版> 輸入格式錯誤：%s"

3003 +msgstr "rev 輸入格式錯誤：%s"

3004

3005 #: builtin/bisect--helper.c

3006 #, c-format

3007 msgid "Bad rev input (not a commit): %s"

2992 -msgstr "修訂版輸入有誤（不是提交）：%s"

3008 +msgstr "rev 輸入有誤（不是提交）：%s"

3009

3010 #: builtin/bisect--helper.c

3011 msgid "We are not bisecting."

@@ -3003,7 +3019,7 @@ msgstr "「%s」？？您在說什麼？"

3019 #: builtin/bisect--helper.c

3020 #, c-format

3021 msgid "cannot read file '%s' for replaying"

3006 -msgstr "無法讀取「%s」檔案來重放"

3022 +msgstr "無法讀取「%s」檔案進行重放"

3023

3024 #: builtin/bisect--helper.c

3025 #, c-format

@@ -3012,27 +3028,27 @@ msgstr "正在執行 %s\n"

3028

3029 #: builtin/bisect--helper.c

3030 msgid "bisect run failed: no command provided."

3015 -msgstr "二分搜尋執行失敗：沒有提供指令。"

3031 +msgstr "二分搜尋執行失敗：沒有提供命令。"

3032

3033 #: builtin/bisect--helper.c

3034 #, c-format

3035 msgid "unable to verify '%s' on good revision"

3020 -msgstr "無法在正確修訂版上驗證「%s」"

3036 +msgstr "無法在好的修訂版上驗證 “%s”"

3037

3038 #: builtin/bisect--helper.c

3039 #, c-format

3040 msgid "bogus exit code %d for good revision"

3025 -msgstr "正確修訂版回傳偽造的錯誤代碼 %d"

3041 +msgstr "好的修訂版回傳偽造的錯誤碼 %d"

3042

3043 #: builtin/bisect--helper.c

3044 #, c-format

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

3030 -msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128"

3046 +msgstr "二分搜尋執行失敗：“%2$s” 回傳的離開碼 %1$d 小於 0 或 >= 128"

3047

3048 #: builtin/bisect--helper.c

3049 #, c-format

3050 msgid "cannot open file '%s' for writing"

3035 -msgstr "無法開啟「%s」檔案進行寫入"

3051 +msgstr "無法開啟 “%s” 檔案進行寫入"

3052

3053 #: builtin/bisect--helper.c

3054 msgid "bisect run cannot continue any more"

@@ -3054,63 +3070,15 @@ msgid ""

3070 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "

3071 "code %d"

3072 msgstr ""

3057 -"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"

3058 -

3059 -#: builtin/bisect--helper.c

3060 -msgid "reset the bisection state"

3061 -msgstr "清除二分搜尋狀態"

3062 -

3063 -#: builtin/bisect--helper.c

3064 -msgid "check whether bad or good terms exist"

3065 -msgstr "檢查壞的或好的術語是否存在"

3066 -

3067 -#: builtin/bisect--helper.c

3068 -msgid "print out the bisect terms"

3069 -msgstr "列印二分搜尋術語"

3070 -

3071 -#: builtin/bisect--helper.c

3072 -msgid "start the bisect session"

3073 -msgstr "啟動二分搜尋過程"

3074 -

3075 -#: builtin/bisect--helper.c

3076 -msgid "find the next bisection commit"

3077 -msgstr "尋找下一個二分搜尋提交"

3078 -

3079 -#: builtin/bisect--helper.c

3080 -msgid "mark the state of ref (or refs)"

3081 -msgstr "標記 ref (或 refs) 的狀態"

3082 -

3083 -#: builtin/bisect--helper.c

3084 -msgid "list the bisection steps so far"

3085 -msgstr "列出迄今的二分搜尋步驟"

3086 -

3087 -#: builtin/bisect--helper.c

3088 -msgid "replay the bisection process from the given file"

3089 -msgstr "從指定檔案重放二分搜尋過程"

3090 -

3091 -#: builtin/bisect--helper.c

3092 -msgid "skip some commits for checkout"

3093 -msgstr "略過要簽出的部分提交"

3094 -

3095 -#: builtin/bisect--helper.c

3096 -msgid "visualize the bisection"

3097 -msgstr "視覺化二分搜尋過程"

3098 -

3099 -#: builtin/bisect--helper.c

3100 -msgid "use <cmd>... to automatically bisect"

3101 -msgstr "使用 <cmd>... 自動進行二分搜尋"

3102 -

3103 -#: builtin/bisect--helper.c

3104 -msgid "no log for BISECT_WRITE"

3105 -msgstr "BISECT_WRITE 無日誌"

3073 +"二分搜尋執行失敗：“git bisect--helper --bisect-state %s” 以錯誤碼 %d 離開"

3074

3075 #: builtin/bisect--helper.c

3076 msgid "--bisect-reset requires either no argument or a commit"

3109 -msgstr "--bisect-reset 無需參數或者需要一個提交"

3077 +msgstr "--bisect-reset 可以不需要引數，或者得傳入一個提交"

3078

3079 #: builtin/bisect--helper.c

3080 msgid "--bisect-terms requires 0 or 1 argument"

3113 -msgstr "--bisect-terms 需要 0 或 1 個參數"

3081 +msgstr "--bisect-terms 需要 0 或 1 個引數"

3082

3083 #: builtin/bisect--helper.c

3084 msgid "--bisect-next requires 0 arguments"

@@ -3128,6 +3096,10 @@ msgstr "未提供日誌檔案"

3096 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3097 msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"

3098

3099 +#: builtin/blame.c

3100 +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"

3101 +msgstr "git annotate [<選項>] [<版本選項>] [<版本>] [--] <檔案>"

3102 +

3103 #: builtin/blame.c

3104 msgid "<rev-opts> are documented in git-rev-list(1)"

3105 msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"

@@ -3366,10 +3338,6 @@ msgstr "更新設定檔案失敗"

3338 msgid "cannot use -a with -d"

3339 msgstr "不能將 -a 和 -d 同時使用"

3340

3369 -#: builtin/branch.c

3370 -msgid "Couldn't look up commit object for HEAD"

3371 -msgstr "無法查詢 HEAD 指向的提交物件"

3372 -

3341 #: builtin/branch.c

3342 #, c-format

3343 msgid "Cannot delete branch '%s' checked out at '%s'"

@@ -3419,17 +3387,19 @@ msgid "Branch %s is being bisected at %s"

3387 msgstr "分支 %s 正被二分搜尋於 %s"

3388

3389 #: builtin/branch.c

3422 -msgid "cannot copy the current branch while not on any."

3423 -msgstr "無法複製目前分支因為不處於任何分支上。"

3390 +#, c-format

3391 +msgid "Invalid branch name: '%s'"

3392 +msgstr "無效的分支名：'%s'"

3393

3394 #: builtin/branch.c

3426 -msgid "cannot rename the current branch while not on any."

3427 -msgstr "無法重新命名目前分支因為不處於任何分支上。"

3395 +#, c-format

3396 +msgid "No commit on branch '%s' yet."

3397 +msgstr "分支 '%s' 尚無提交。"

3398

3399 #: builtin/branch.c

3400 #, c-format

3431 -msgid "Invalid branch name: '%s'"

3432 -msgstr "無效的分支名：'%s'"

3401 +msgid "No branch named '%s'."

3402 +msgstr "沒有分支 '%s'。"

3403

3404 #: builtin/branch.c

3405 msgid "Branch rename failed"

@@ -3638,14 +3608,12 @@ msgid "cannot edit description of more than one branch"

3608 msgstr "不能為一個以上的分支編輯描述"

3609

3610 #: builtin/branch.c

3641 -#, c-format

3642 -msgid "No commit on branch '%s' yet."

3643 -msgstr "分支 '%s' 尚無提交。"

3611 +msgid "cannot copy the current branch while not on any."

3612 +msgstr "無法複製目前分支因為不處於任何分支上。"

3613

3614 #: builtin/branch.c

3646 -#, c-format

3647 -msgid "No branch named '%s'."

3648 -msgstr "沒有分支 '%s'。"

3615 +msgid "cannot rename the current branch while not on any."

3616 +msgstr "無法重新命名目前分支因為不處於任何分支上。"

3617

3618 #: builtin/branch.c

3619 msgid "too many branches for a copy operation"

@@ -3726,11 +3694,11 @@ msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"

3694

3695 #: builtin/bugreport.c

3696 msgid ""

3729 -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"

3730 -"diagnose[=<mode>]"

3697 +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"

3698 +" [--diagnose[=<mode>]]"

3699 msgstr ""

3732 -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"

3733 -"diagnose[=<mode>]"

3700 +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"

3701 +" [--diagnose[=<mode>]]"

3702

3703 #: builtin/bugreport.c

3704 msgid ""

@@ -3778,7 +3746,7 @@ msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “sta

3746

3747 #: builtin/bugreport.c

3748 msgid "specify a destination for the bugreport file(s)"

3781 -msgstr "指定錯誤報告檔案的目的地"

3749 +msgstr "請指定臭蟲報告檔案的目的地"

3750

3751 #: builtin/bugreport.c

3752 msgid "specify a strftime format suffix for the filename(s)"

@@ -3813,20 +3781,26 @@ msgid "Created new report at '%s'.\n"

3781 msgstr "已在「%s」建立新報告。\n"

3782

3783 #: builtin/bundle.c

3816 -msgid "git bundle create [<options>] <file> <git-rev-list args>"

3817 -msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>"

3784 +msgid ""

3785 +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3786 +"progress-implied]\n"

3787 +" [--version=<version>] <file> <git-rev-list-args>"

3788 +msgstr ""

3789 +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3790 +"progress-implied]\n"

3791 +" [--version=<version>] <file> <git-rev-list-args>"

3792

3793 #: builtin/bundle.c

3820 -msgid "git bundle verify [<options>] <file>"

3821 -msgstr "git bundle verify [<選項>] <檔案>"

3794 +msgid "git bundle verify [-q | --quiet] <file>"

3795 +msgstr "git bundle verify [-q | --quiet] <file>"

3796

3797 #: builtin/bundle.c

3798 msgid "git bundle list-heads <file> [<refname>...]"

3799 msgstr "git bundle list-heads <檔案> [<引用名稱>...]"

3800

3801 #: builtin/bundle.c

3828 -msgid "git bundle unbundle <file> [<refname>...]"

3829 -msgstr "git bundle unbundle <檔案> [<引用名稱>...]"

3802 +msgid "git bundle unbundle [--progress] <file> [<refname>...]"

3803 +msgstr "git bundle unbundle [--progress] <file> [<refname>...]"

3804

3805 #: builtin/bundle.c builtin/pack-objects.c

3806 msgid "do not show progress meter"

@@ -3846,15 +3820,15 @@ msgstr "當進度表顯示時類似於 --all-progress"

3820

3821 #: builtin/bundle.c

3822 msgid "specify bundle format version"

3849 -msgstr "指定套件的格式版本"

3823 +msgstr "指定套件包的格式版本"

3824

3825 #: builtin/bundle.c

3826 msgid "Need a repository to create a bundle."

3853 -msgstr "需要版本庫來建立套件。"

3827 +msgstr "需要版本庫來建立套件包。"

3828

3829 #: builtin/bundle.c

3830 msgid "do not show bundle details"

3857 -msgstr "不顯示套件詳細資訊"

3831 +msgstr "不顯示套件包的詳細資訊"

3832

3833 #: builtin/bundle.c

3834 #, c-format

@@ -3863,7 +3837,7 @@ msgstr "%s 可以\n"

3837

3838 #: builtin/bundle.c

3839 msgid "Need a repository to unbundle."

3866 -msgstr "需要版本庫才能拆分套件。"

3840 +msgstr "需要版本庫才能拆分套件包。"

3841

3842 #: builtin/bundle.c

3843 msgid "Unbundling objects"

@@ -3923,12 +3897,12 @@ msgid ""

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

3898 "objects]\n"

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

3926 -" [--textconv | --filters]"

3900 +" [--textconv | --filters] [-z]"

3901 msgstr ""

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

3903 "objects]\n"

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

3931 -" [--textconv | --filters]"

3905 +" [--textconv | --filters] [-z]"

3906

3907 #: builtin/cat-file.c

3908 msgid ""

@@ -3984,7 +3958,7 @@ msgstr "類似 --batch 但不輸出 <contents>"

3958

3959 #: builtin/cat-file.c

3960 msgid "stdin is NUL-terminated"

3987 -msgstr "標準輸入的結尾是 NUL"

3961 +msgstr "標準輸入以 NUL 字元終止"

3962

3963 #: builtin/cat-file.c

3964 msgid "read commands from stdin"

@@ -4065,11 +4039,6 @@ msgstr "<rev> 需要搭配「%s」"

4039 msgid "<object> required with '-%c'"

4040 msgstr "<object> 需要搭配「-%c」"

4041

4068 -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c

4069 -#: builtin/receive-pack.c builtin/tag.c

4070 -msgid "too many arguments"

4071 -msgstr "太多參數"

4072 -

4042 #: builtin/cat-file.c

4043 #, c-format

4044 msgid "only two arguments allowed in <type> <object> mode, not %d"

@@ -4714,9 +4683,10 @@ msgstr "使用疊加模式"

4683

4684 #: builtin/clean.c

4685 msgid ""

4717 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

4686 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "

4687 +"[<pathspec>...]"

4688 msgstr ""

4719 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..."

4689 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路徑規格>...]"

4690

4691 #: builtin/clean.c

4692 #, c-format

@@ -5059,7 +5029,7 @@ msgstr "uri"

5029

5030 #: builtin/clone.c

5031 msgid "a URI for downloading bundles before fetching from origin remote"

5062 -msgstr "在從 origin 遠端抓取前，用來下載套件的 URI"

5032 +msgstr "在從 origin 遠端抓取前，用來下載套件包的 URI"

5033

5034 #: builtin/clone.c

5035 #, c-format

@@ -5081,6 +5051,11 @@ msgstr "%s 存在且不是一個目錄"

5051 msgid "failed to start iterator over '%s'"

5052 msgstr "無法在 '%s' 上啟動疊代器"

5053

5054 +#: builtin/clone.c

5055 +#, c-format

5056 +msgid "symlink '%s' exists, refusing to clone with --local"

5057 +msgstr "「%s」符號連結已存在，拒絕使用 --local 複製"

5058 +

5059 #: builtin/clone.c compat/precompose_utf8.c

5060 #, c-format

5061 msgid "failed to unlink '%s'"

@@ -5136,7 +5111,7 @@ msgstr "無法初始化稀疏簽出"

5111

5112 #: builtin/clone.c

5113 msgid "remote HEAD refers to nonexistent ref, unable to checkout"

5139 -msgstr "遠端 HEAD 指向不存在的引用，無法簽出"

5114 +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出"

5115

5116 #: builtin/clone.c

5117 msgid "unable to checkout working tree"

@@ -5162,11 +5137,6 @@ msgstr "太多參數。"

5137 msgid "You must specify a repository to clone."

5138 msgstr "您必須指定要複製的版本庫。"

5139

5165 -#: builtin/clone.c

5166 -#, c-format

5167 -msgid "options '%s' and '%s %s' cannot be used together"

5168 -msgstr "「%s」和「%s %s」選項不得同時使用"

5169 -

5140 #: builtin/clone.c

5141 msgid ""

5142 "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"

@@ -5259,16 +5229,16 @@ msgstr "--local 被忽略"

5229

5230 #: builtin/clone.c

5231 msgid "cannot clone from filtered bundle"

5262 -msgstr "無法從過濾後的套件複製"

5232 +msgstr "無法從過濾後的套件包複製"

5233

5234 #: builtin/clone.c

5235 msgid "failed to initialize the repo, skipping bundle URI"

5266 -msgstr "無法初始化版本庫，略過套件 URI"

5236 +msgstr "無法初始化版本庫，略過套件包 URI"

5237

5238 #: builtin/clone.c

5239 #, c-format

5240 msgid "failed to fetch objects from bundle URI '%s'"

5271 -msgstr "無法從套件 URL “%s” 抓取物件"

5241 +msgstr "無法從套件包 URL “%s” 抓取物件"

5242

5243 #: builtin/clone.c

5244 msgid "remote transport reported error"

@@ -5317,22 +5287,27 @@ msgstr "--command 必須是第一個參數"

5287

5288 #: builtin/commit-graph.c

5289 msgid ""

5320 -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"

5290 +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"

5291 msgstr ""

5322 -"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"

5323 -"[no-]progress]"

5292 +"git commit-graph verify [--object-dir <目錄>] [--shallow] [--[no-]progress]"

5293

5294 #: builtin/commit-graph.c

5295 msgid ""

5327 -"git commit-graph write [--object-dir <objdir>] [--append] [--"

5328 -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

5329 -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"

5330 -msgstr ""

5331 -"git commit-graph write [--object-dir <objdir>] [--append] [--"

5332 -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"

5333 -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"

5334 -

5335 -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c

5296 +"git commit-graph write [--object-dir <dir>] [--append]\n"

5297 +" [--split[=<strategy>]] [--reachable | --stdin-packs | "

5298 +"--stdin-commits]\n"

5299 +" [--changed-paths] [--[no-]max-new-filters <n>] [--"

5300 +"[no-]progress]\n"

5301 +" <split options>"

5302 +msgstr ""

5303 +"git commit-graph write [--object-dir <dir>] [--append]\n"

5304 +" [--split[=<strategy>]] [--reachable | --stdin-packs | "

5305 +"--stdin-commits]\n"

5306 +" [--changed-paths] [--[no-]max-new-filters <n>] [--"

5307 +"[no-]progress]\n"

5308 +" <split options>"

5309 +

5310 +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c

5311 msgid "dir"

5312 msgstr "目錄"

5313

@@ -5417,13 +5392,17 @@ msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"

5392 msgid "Collecting commits from input"

5393 msgstr "正在從輸入收集提交"

5394

5395 +#: builtin/commit-tree.c

5396 +msgid "git commit-tree <tree> [(-p <parent>)...]"

5397 +msgstr "git commit-tree <tree> [(-p <parent>)...]"

5398 +

5399 #: builtin/commit-tree.c

5400 msgid ""

5422 -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "

5423 -"<file>)...] <tree>"

5401 +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"

5402 +" [(-F <file>)...] <tree>"

5403 msgstr ""

5425 -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <檔案"

5426 -">)...] <樹>"

5404 +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"

5405 +" [(-F <file>)...] <tree>"

5406

5407 #: builtin/commit-tree.c

5408 #, c-format

@@ -5480,12 +5459,30 @@ msgid "git commit-tree: failed to read"

5459 msgstr "git commit-tree：讀取失敗"

5460

5461 #: builtin/commit.c

5483 -msgid "git commit [<options>] [--] <pathspec>..."

5484 -msgstr "git commit [<選項>] [--] <路徑規格>..."

5462 +msgid ""

5463 +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"

5464 +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"

5465 +"reword):]<commit>)]\n"

5466 +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"

5467 +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"

5468 +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"

5469 +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

5470 +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"

5471 +" [--] [<pathspec>...]"

5472 +msgstr ""

5473 +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"

5474 +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"

5475 +"reword):]<commit>)]\n"

5476 +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"

5477 +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"

5478 +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"

5479 +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

5480 +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"

5481 +" [--] [<pathspec>...]"

5482

5483 #: builtin/commit.c

5487 -msgid "git status [<options>] [--] <pathspec>..."

5488 -msgstr "git status [<選項>] [--] <路徑規格>..."

5484 +msgid "git status [<options>] [--] [<pathspec>...]"

5485 +msgstr "git status [<選項>] [--] [<路徑規格>...]"

5486

5487 #: builtin/commit.c

5488 msgid ""

@@ -5827,7 +5824,7 @@ msgstr "顯示分支訊息"

5824

5825 #: builtin/commit.c

5826 msgid "show stash information"

5830 -msgstr "顯示儲藏區訊息"

5827 +msgstr "顯示貯存區訊息"

5828

5829 #: builtin/commit.c

5830 msgid "compute full ahead/behind values"

@@ -6100,7 +6097,7 @@ msgstr "使用版本庫級設定檔案"

6097 msgid "use per-worktree config file"

6098 msgstr "使用工作區級別的設定檔案"

6099

6103 -#: builtin/config.c

6100 +#: builtin/config.c builtin/gc.c

6101 msgid "use given config file"

6102 msgstr "使用指定的設定檔案"

6103

@@ -6226,11 +6223,11 @@ msgstr "只顯示變數名"

6223

6224 #: builtin/config.c

6225 msgid "respect include directives on lookup"

6229 -msgstr "查詢時參照 include 指令遞迴尋找"

6226 +msgstr "查詢時引用 include 指令遞迴尋找"

6227

6228 #: builtin/config.c

6229 msgid "show origin of config (file, standard input, blob, command line)"

6233 -msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）"

6230 +msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或命令列）"

6231

6232 #: builtin/config.c

6233 msgid "show scope of config (worktree, local, global, system, command)"

@@ -6323,7 +6320,7 @@ msgstr "--blob 只能在一個版本庫內使用"

6320 msgid "--worktree can only be used inside a git repository"

6321 msgstr "--worktree 只能在 git 版本庫中使用"

6322

6326 -#: builtin/config.c

6323 +#: builtin/config.c builtin/gc.c

6324 msgid "$HOME not set"

6325 msgstr "$HOME 未設定"

6326

@@ -6433,12 +6430,20 @@ msgid "unable to get credential storage lock in %d ms"

6430 msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖"

6431

6432 #: builtin/describe.c

6436 -msgid "git describe [<options>] [<commit-ish>...]"

6437 -msgstr "git describe [<選項>] [<提交號>...]"

6433 +msgid ""

6434 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"

6435 +msgstr ""

6436 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"

6437 +

6438 +#: builtin/describe.c

6439 +msgid ""

6440 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"

6441 +msgstr ""

6442 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"

6443

6444 #: builtin/describe.c

6440 -msgid "git describe [<options>] --dirty"

6441 -msgstr "git describe [<選項>] --dirty"

6445 +msgid "git describe <blob>"

6446 +msgstr "git describe <blob>"

6447

6448 #: builtin/describe.c

6449 msgid "head"

@@ -6591,15 +6596,15 @@ msgstr "「%s」選項和提交號不得同時使用"

6596

6597 #: builtin/diagnose.c

6598 msgid ""

6594 -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"

6595 -"mode=<mode>]"

6599 +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"

6600 +" [--mode=<mode>]"

6601 msgstr ""

6597 -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"

6598 -"mode=<mode>]"

6602 +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"

6603 +" [--mode=<mode>]"

6604

6605 #: builtin/diagnose.c

6606 msgid "specify a destination for the diagnostics archive"

6602 -msgstr "指定診斷封存檔的目的地"

6607 +msgstr "請指定診斷封存檔的目的地"

6608

6609 #: builtin/diagnose.c

6610 msgid "specify a strftime format suffix for the filename"

@@ -6618,6 +6623,10 @@ msgstr "--merge-base 只對 2 個以上的提交有用"

6623 msgid "'%s': not a regular file or symlink"

6624 msgstr "'%s'：不是一個正規檔案或符號連結"

6625

6626 +#: builtin/diff.c

6627 +msgid "no merge given, only parents."

6628 +msgstr "沒有提供合併提交，只有提供父提交。"

6629 +

6630 #: builtin/diff.c

6631 #, c-format

6632 msgid "invalid option: %s"

@@ -6781,8 +6790,8 @@ msgstr "選項「--default」預期收到「--type=bool」的布林值，而非

6790 #: builtin/env--helper.c

6791 #, c-format

6792 msgid ""

6784 -"option `--default' expects an unsigned long value with `--type=ulong`, not `"

6785 -"%s`"

6793 +"option `--default' expects an unsigned long value with `--type=ulong`, not "

6794 +"`%s`"

6795 msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"

6796

6797 #: builtin/fast-export.c

@@ -7410,8 +7419,8 @@ msgid "print only refs which don't contain the commit"

7419 msgstr "只列印不包含該提交的引用"

7420

7421 #: builtin/for-each-repo.c

7413 -msgid "git for-each-repo --config=<config> <command-args>"

7414 -msgstr "git for-each-repo --config=<設定> <命令引數>"

7422 +msgid "git for-each-repo --config=<config> [--] <arguments>"

7423 +msgstr "git for-each-repo --config=<config> [--] <arguments>"

7424

7425 #: builtin/for-each-repo.c

7426 msgid "config"

@@ -7628,8 +7637,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo"

7637 msgstr "%s：resolve-undo 的 sha1 指針無效"

7638

7639 #: builtin/fsck.c

7631 -msgid "git fsck [<options>] [<object>...]"

7632 -msgstr "git fsck [<選項>] [<物件>...]"

7640 +msgid ""

7641 +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"

7642 +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"

7643 +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"

7644 +" [--[no-]name-objects] [<object>...]"

7645 +msgstr ""

7646 +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"

7647 +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"

7648 +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"

7649 +" [--[no-]name-objects] [<object>...]"

7650

7651 #: builtin/fsck.c

7652 msgid "show unreachable objects"

@@ -7701,14 +7718,6 @@ msgstr "git fsmonitor--daemon start [<options>]"

7718 msgid "git fsmonitor--daemon run [<options>]"

7719 msgstr "git fsmonitor--daemon run [<options>]"

7720

7704 -#: builtin/fsmonitor--daemon.c

7705 -msgid "git fsmonitor--daemon stop"

7706 -msgstr "git fsmonitor--daemon stop"

7707 -

7708 -#: builtin/fsmonitor--daemon.c

7709 -msgid "git fsmonitor--daemon status"

7710 -msgstr "git fsmonitor--daemon status"

7711 -

7721 #: builtin/fsmonitor--daemon.c

7722 #, c-format

7723 msgid "value of '%s' out of range: %d"

@@ -7809,7 +7818,7 @@ msgstr "要等待背景守護程式啟動的最長秒數"

7818 msgid "invalid 'ipc-threads' value (%d)"

7819 msgstr "無效的「ipc-threads」數值（%d）"

7820

7812 -#: builtin/fsmonitor--daemon.c

7821 +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c

7822 #, c-format

7823 msgid "Unhandled subcommand '%s'"

7824 msgstr "未處理的子命令「%s」"

@@ -7857,7 +7866,7 @@ msgstr "清除未引用的物件"

7866

7867 #: builtin/gc.c

7868 msgid "pack unreferenced objects separately"

7860 -msgstr "獨立封裝無參照物件"

7869 +msgstr "獨立封裝無引用物件"

7870

7871 #: builtin/gc.c

7872 msgid "be more thorough (increased runtime)"

@@ -8008,8 +8017,23 @@ msgid "use at most one of --auto and --schedule=<frequency>"

8017 msgstr "--auto 和 --schedule=<頻率> 請任選一"

8018

8019 #: builtin/gc.c

8011 -msgid "failed to run 'git config'"

8012 -msgstr "無法執行 ‘git config’"

8020 +#, c-format

8021 +msgid "unable to add '%s' value of '%s'"

8022 +msgstr "無法為「%2$s」的值加上「%1$s」"

8023 +

8024 +#: builtin/gc.c

8025 +msgid "return success even if repository was not registered"

8026 +msgstr "即便版本庫未註冊仍回傳成功狀態"

8027 +

8028 +#: builtin/gc.c

8029 +#, c-format

8030 +msgid "unable to unset '%s' value of '%s'"

8031 +msgstr "無法取消設定「%2$s」的「%1$s」值"

8032 +

8033 +#: builtin/gc.c

8034 +#, c-format

8035 +msgid "repository '%s' is not registered"

8036 +msgstr "版本庫「%s」未註冊"

8037

8038 #: builtin/gc.c

8039 #, c-format

@@ -8386,11 +8410,15 @@ msgstr "同時給出了 --cached 和樹狀物件"

8410

8411 #: builtin/hash-object.c

8412 msgid ""

8389 -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

8390 -"[--] <file>..."

8413 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"

8414 +" [--stdin [--literally]] [--] <file>..."

8415 msgstr ""

8392 -"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "

8393 -"[--] <檔案>..."

8416 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"

8417 +" [--stdin [--literally]] [--] <file>..."

8418 +

8419 +#: builtin/hash-object.c

8420 +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"

8421 +msgstr "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"

8422

8423 #: builtin/hash-object.c

8424 msgid "object type"

@@ -8918,11 +8946,15 @@ msgstr "已初始化空的 Git 版本庫於 %s%s\n"

8946

8947 #: builtin/init-db.c

8948 msgid ""

8921 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

8922 -"shared[=<permissions>]] [<directory>]"

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

8950 +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"

8951 +" [-b <branch-name> | --initial-branch=<branch-name>]\n"

8952 +" [--shared[=<permissions>]] [<directory>]"

8953 msgstr ""

8924 -"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "

8925 -"[<目錄>]"

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

8955 +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"

8956 +" [-b <branch-name> | --initial-branch=<branch-name>]\n"

8957 +" [--shared[=<permissions>]] [<directory>]"

8958

8959 #: builtin/init-db.c

8960 msgid "permissions"

@@ -8972,11 +9004,13 @@ msgstr "--separate-git-dir 與純版本庫不相容"

9004

9005 #: builtin/interpret-trailers.c

9006 msgid ""

8975 -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "

8976 -"<token>[(=|:)<value>])...] [<file>...]"

9007 +"git interpret-trailers [--in-place] [--trim-empty]\n"

9008 +" [(--trailer <token>[(=|:)<value>])...]\n"

9009 +" [--parse] [<file>...]"

9010 msgstr ""

8978 -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <鍵>[(=|:)<值"

8979 -">])...] [<檔案>...]"

9011 +"git interpret-trailers [--in-place] [--trim-empty]\n"

9012 +" [(--trailer <token>[(=|:)<value>])...]\n"

9013 +" [--parse] [<file>...]"

9014

9015 #: builtin/interpret-trailers.c

9016 msgid "edit files in place"

@@ -9594,12 +9628,12 @@ msgstr ""

9628 #: builtin/ls-remote.c

9629 msgid ""

9630 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9597 -" [-q | --quiet] [--exit-code] [--get-url]\n"

9631 +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9632 " [--symref] [<repository> [<refs>...]]"

9633 msgstr ""

9634 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9601 -" [-q | --quiet] [--exit-code] [--get-url]\n"

9602 -" [--symref] [<版本庫> [<引用>...]]"

9635 +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9636 +" [--symref] [<repository> [<refs>...]]"

9637

9638 #: builtin/ls-remote.c

9639 msgid "do not print remote URL"

@@ -9752,7 +9786,7 @@ msgstr "在訊息內文中使用標頭"

9786

9787 #: builtin/mailsplit.c

9788 msgid "reading patches from stdin/tty..."

9755 -msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯"

9789 +msgstr "正在從標準輸入或 tty 讀取修補檔內容……"

9790

9791 #: builtin/mailsplit.c

9792 #, c-format

@@ -9767,14 +9801,14 @@ msgstr "git merge-base [-a | --all] <提交> <提交>..."

9801 msgid "git merge-base [-a | --all] --octopus <commit>..."

9802 msgstr "git merge-base [-a | --all] --octopus <提交>..."

9803

9770 -#: builtin/merge-base.c

9771 -msgid "git merge-base --independent <commit>..."

9772 -msgstr "git merge-base --independent <提交>..."

9773 -

9804 #: builtin/merge-base.c

9805 msgid "git merge-base --is-ancestor <commit> <commit>"

9806 msgstr "git merge-base --is-ancestor <提交> <提交>"

9807

9808 +#: builtin/merge-base.c

9809 +msgid "git merge-base --independent <commit>..."

9810 +msgstr "git merge-base --independent <提交>..."

9811 +

9812 #: builtin/merge-base.c

9813 msgid "git merge-base --fork-point <ref> [<commit>]"

9814 msgstr "git merge-base --fork-point <引用> [<提交>]"

@@ -9913,10 +9947,24 @@ msgstr "列出檔名，但不附加 modes/oids/stages"

9947 msgid "allow merging unrelated histories"

9948 msgstr "允許合並不相關的歷史"

9949

9950 +#: builtin/merge-tree.c

9951 +msgid "perform multiple merges, one per line of input"

9952 +msgstr "執行多次合併，一次執行輸入一列"

9953 +

9954 #: builtin/merge-tree.c

9955 msgid "--trivial-merge is incompatible with all other options"

9956 msgstr "--trivial-merge 和其他所有選項都不相容"

9957

9958 +#: builtin/merge-tree.c builtin/notes.c

9959 +#, c-format

9960 +msgid "malformed input line: '%s'."

9961 +msgstr "格式錯誤的輸入行：'%s'。"

9962 +

9963 +#: builtin/merge-tree.c

9964 +#, c-format

9965 +msgid "merging cannot continue; got unclean result of %d"

9966 +msgstr "無法繼續合併：從 %d 收到的結果不乾淨"

9967 +

9968 #: builtin/merge.c

9969 msgid "git merge [<options>] [<commit>...]"

9970 msgstr "git merge [<選項>] [<提交>...]"

@@ -10029,11 +10077,11 @@ msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"

10077

10078 #: builtin/merge.c

10079 msgid "could not run stash."

10032 -msgstr "不能執行儲藏。"

10080 +msgstr "不能執行貯存。"

10081

10082 #: builtin/merge.c

10083 msgid "stash failed"

10036 -msgstr "儲藏失敗"

10084 +msgstr "貯存失敗"

10085

10086 #: builtin/merge.c

10087 #, c-format

@@ -10286,7 +10334,7 @@ msgstr "自動合併進展順利，按要求在提交前停止\n"

10334 #: builtin/merge.c

10335 #, c-format

10336 msgid "When finished, apply stashed changes with `git stash pop`\n"

10289 -msgstr "完成時，使用 `git stash pop` 套用儲藏更改\n"

10337 +msgstr "完成時，使用 `git stash pop` 套用貯存更改\n"

10338

10339 #: builtin/mktag.c

10340 #, c-format

@@ -10406,7 +10454,7 @@ msgstr "目錄 %s 在索引中並且不是子模組？"

10454

10455 #: builtin/mv.c

10456 msgid "Please stage your changes to .gitmodules or stash them to proceed"

10409 -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"

10457 +msgstr "請將您的修改暫存到 .gitmodules 中或貯存後再繼續"

10458

10459 #: builtin/mv.c

10460 #, c-format

@@ -10490,7 +10538,7 @@ msgstr "%s，來源=%s，目的地=%s"

10538 msgid "Renaming %s to %s\n"

10539 msgstr "重新命名 %s 至 %s\n"

10540

10493 -#: builtin/mv.c builtin/remote.c builtin/repack.c

10541 +#: builtin/mv.c builtin/remote.c

10542 #, c-format

10543 msgid "renaming '%s' failed"

10544 msgstr "重新命名 '%s' 失敗"

@@ -10691,11 +10739,6 @@ msgstr "讀取物件 '%s' 失敗。"

10739 msgid "cannot read note data from non-blob object '%s'."

10740 msgstr "不能從非資料物件 '%s' 中讀取註解資料。"

10741

10694 -#: builtin/notes.c

10695 -#, c-format

10696 -msgid "malformed input line: '%s'."

10697 -msgstr "格式錯誤的輸入行：'%s'。"

10698 -

10742 #: builtin/notes.c

10743 #, c-format

10744 msgid "failed to copy notes from '%s' to '%s'"

@@ -10928,14 +10971,13 @@ msgid "unknown subcommand: `%s'"

10971 msgstr "未知子指令：「%s」"

10972

10973 #: builtin/pack-objects.c

10931 -msgid ""

10932 -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"

10933 -msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]"

10974 +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"

10975 +msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"

10976

10977 #: builtin/pack-objects.c

10978 msgid ""

10937 -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"

10938 -msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"

10979 +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"

10980 +msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"

10981

10982 #: builtin/pack-objects.c

10983 #, c-format

@@ -11406,8 +11448,8 @@ msgstr ""

11448 "感謝。\n"

11449

11450 #: builtin/pack-refs.c

11409 -msgid "git pack-refs [<options>]"

11410 -msgstr "git pack-refs [<選項>]"

11451 +msgid "git pack-refs [--all] [--no-prune]"

11452 +msgstr "git pack-refs [--all] [--no-prune]"

11453

11454 #: builtin/pack-refs.c

11455 msgid "pack everything"

@@ -11417,6 +11459,22 @@ msgstr "打包一切"

11459 msgid "prune loose refs (default)"

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

11461

11462 +#: builtin/patch-id.c

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

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

11465 +

11466 +#: builtin/patch-id.c

11467 +msgid "use the unstable patch-id algorithm"

11468 +msgstr "使用不穩定的 patch-id 演算法"

11469 +

11470 +#: builtin/patch-id.c

11471 +msgid "use the stable patch-id algorithm"

11472 +msgstr "使用穩定的 patch-id 演算法"

11473 +

11474 +#: builtin/patch-id.c

11475 +msgid "don't strip whitespace from the patch"

11476 +msgstr "不要去除修補檔的空白字元"

11477 +

11478 #: builtin/prune.c

11479 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"

11480 msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"

@@ -11463,7 +11521,7 @@ msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"

11521

11522 #: builtin/pull.c parse-options.h

11523 msgid "automatically stash/stash pop before and after"

11466 -msgstr "在動作前後執行自動儲藏和彈出儲藏"

11524 +msgstr "在動作前後執行自動貯存和彈出貯存"

11525

11526 #: builtin/pull.c

11527 msgid "Options related to fetching"

@@ -11502,7 +11560,7 @@ msgid ""

11560 "for your current branch, you must specify a branch on the command line."

11561 msgstr ""

11562 "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"

11505 -"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"

11563 +"分支預設的遠端版本庫，您必須在命令列中指定一個分支名。"

11564

11565 #: builtin/pull.c builtin/rebase.c

11566 msgid "You are not currently on a branch."

@@ -11594,7 +11652,7 @@ msgstr "重定基底式拉取"

11652

11653 #: builtin/pull.c

11654 msgid "please commit or stash them."

11597 -msgstr "請提交或儲藏它們。"

11655 +msgstr "請提交或貯存它們。"

11656

11657 #: builtin/pull.c

11658 #, c-format

@@ -11666,14 +11724,14 @@ msgstr ""

11724 #: builtin/push.c

11725 msgid ""

11726 "\n"

11669 -"To avoid automatically configuring upstream branches when their name\n"

11670 -"doesn't match the local branch, see option 'simple' of branch."

11671 -"autoSetupMerge\n"

11727 +"To avoid automatically configuring an upstream branch when its name\n"

11728 +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n"

11729 "in 'git help config'.\n"

11730 msgstr ""

11731 "\n"

11675 -"為了避免自動在上游分支的名稱與本機不符時，設定上游的分支，請參閱\n"

11676 -"“git help config” 中 branch.autoSetupMerge 的 “simple” 選項。\n"

11732 +"若要避免在名稱與本機分支不同時自動設定上游分支，\n"

11733 +"請參閱 “git help config” 中 branch.autoSetupMerge 的\n"

11734 +"“simple” 選項。\n"

11735

11736 #: builtin/push.c

11737 #, c-format

@@ -11827,6 +11885,12 @@ msgstr "推送到 %s\n"

11885 msgid "failed to push some refs to '%s'"

11886 msgstr "推送一些引用到 '%s' 失敗"

11887

11888 +#: builtin/push.c

11889 +msgid ""

11890 +"recursing into submodule with push.recurseSubmodules=only; using on-demand "

11891 +"instead"

11892 +msgstr "在有 push.recurseSubmodules=only; 的情況嘗試遞迴子模組；改用 on-demand"

11893 +

11894 #: builtin/push.c builtin/send-pack.c submodule-config.c

11895 #, c-format

11896 msgid "invalid value for '%s'"

@@ -11999,13 +12063,15 @@ msgstr "需要兩個提交範圍"

12063

12064 #: builtin/read-tree.c

12065 msgid ""

12002 -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "

12003 -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"

12004 -"ish1> [<tree-ish2> [<tree-ish3>]])"

12066 +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"

12067 +"prefix=<prefix>)\n"

12068 +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"

12069 +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"

12070 msgstr ""

12006 -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前綴>) [-"

12007 -"u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件"

12008 -"1> [<樹狀物件2> [<樹狀物件3>]])"

12071 +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"

12072 +"prefix=<prefix>)\n"

12073 +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"

12074 +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"

12075

12076 #: builtin/read-tree.c

12077 msgid "write resulting index to <file>"

@@ -12122,8 +12188,8 @@ msgstr "%s 需要合併後端"

12188

12189 #: builtin/rebase.c

12190 #, c-format

12125 -msgid "could not get 'onto': '%s'"

12126 -msgstr "無法取得 'onto'：'%s'"

12191 +msgid "invalid onto: '%s'"

12192 +msgstr "無效的 onto：「%s」"

12193

12194 #: builtin/rebase.c

12195 #, c-format

@@ -12179,8 +12245,8 @@ msgstr "無法切換到 %s"

12245 #: builtin/rebase.c

12246 #, c-format

12247 msgid ""

12182 -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"

12183 -"\"."

12248 +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "

12249 +"\"ask\"."

12250 msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"

12251

12252 #: builtin/rebase.c

@@ -12488,8 +12554,8 @@ msgid "No such ref: %s"

12554 msgstr "沒有這樣的引用：%s"

12555

12556 #: builtin/rebase.c

12491 -msgid "Could not resolve HEAD to a revision"

12492 -msgstr "無法將 HEAD 解析為一個版本"

12557 +msgid "Could not resolve HEAD to a commit"

12558 +msgstr "無法將 HEAD 解析成提交"

12559

12560 #: builtin/rebase.c

12561 #, c-format

@@ -12508,7 +12574,7 @@ msgstr "沒有指向一個有效的提交 '%s'"

12574

12575 #: builtin/rebase.c

12576 msgid "Please commit or stash them."

12511 -msgstr "請提交或儲藏修改。"

12577 +msgstr "請提交或貯存修改。"

12578

12579 #: builtin/rebase.c

12580 msgid "HEAD is up to date."

@@ -13287,6 +13353,11 @@ msgstr "無法開啟 '%s' 暫存檔進行寫入"

13353 msgid "could not close refs snapshot tempfile"

13354 msgstr "無法關閉 refs 的快照暫存檔"

13355

13356 +#: builtin/repack.c

13357 +#, c-format

13358 +msgid "could not remove stale bitmap: %s"

13359 +msgstr "無法移除過時位圖：%s"

13360 +

13361 #: builtin/repack.c

13362 msgid "pack everything in a single pack"

13363 msgstr "所有內容打包到一個包檔案中"

@@ -13383,6 +13454,10 @@ msgstr "尋找因數是 <N> 的等比數列"

13454 msgid "write a multi-pack index of the resulting packs"

13455 msgstr "寫入結果包的多包索引"

13456

13457 +#: builtin/repack.c

13458 +msgid "pack prefix to store a pack containing pruned objects"

13459 +msgstr "封裝前綴，儲存為包含過時物件的套件包"

13460 +

13461 #: builtin/repack.c

13462 msgid "cannot delete packs in a precious-objects repo"

13463 msgstr "不能刪除珍品版本庫中的封包"

@@ -13398,11 +13473,16 @@ msgstr "封包前綴 %s 不以 objdir %s 開頭"

13473

13474 #: builtin/repack.c

13475 #, c-format

13401 -msgid "missing required file: %s"

13402 -msgstr "缺少必要檔案：%s"

13476 +msgid "renaming pack to '%s' failed"

13477 +msgstr "無法將包重新命名為「%s」"

13478

13479 #: builtin/repack.c

13480 #, c-format

13481 +msgid "pack-objects did not write a '%s' file for pack %s-%s"

13482 +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s” 檔案"

13483 +

13484 +#: builtin/repack.c sequencer.c

13485 +#, c-format

13486 msgid "could not unlink: %s"

13487 msgstr "無法取消連結：%s"

13488

@@ -13643,8 +13723,10 @@ msgid "only one pattern can be given with -l"

13723 msgstr "只能為 -l 提供一個模式"

13724

13725 #: builtin/rerere.c

13726 +msgid ""

13728 +msgstr ""

13730

13731 #: builtin/rerere.c

13732 msgid "register clean resolutions in index"

@@ -13902,6 +13984,18 @@ msgstr "--prefix 需要 1 個引數"

13984 msgid "unknown mode for --abbrev-ref: %s"

13985 msgstr "--abbrev-ref 的模式未知：%s"

13986

13987 +#: builtin/rev-parse.c revision.c

13988 +msgid "--exclude-hidden cannot be used together with --branches"

13989 +msgstr "--exclude-hidden 無法與 --branches 同時使用"

13990 +

13991 +#: builtin/rev-parse.c revision.c

13992 +msgid "--exclude-hidden cannot be used together with --tags"

13993 +msgstr "--exclude-hidden 無法與 --tags 同時使用"

13994 +

13995 +#: builtin/rev-parse.c revision.c

13996 +msgid "--exclude-hidden cannot be used together with --remotes"

13997 +msgstr "--exclude-hidden 無法與 --remotes 同時使用"

13998 +

13999 #: builtin/rev-parse.c setup.c

14000 msgid "this operation must be run in a work tree"

14001 msgstr "該動作必須在一個工作區中執行"

@@ -13912,20 +14006,28 @@ msgid "unknown mode for --show-object-format: %s"

14006 msgstr "--show-object-format 的模式未知：%s"

14007

14008 #: builtin/revert.c

13915 -msgid "git revert [<options>] <commit-ish>..."

13916 -msgstr "git revert [<選項>] <提交號>..."

14009 +msgid ""

14010 +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "

14011 +"<commit>..."

14012 +msgstr ""

14013 +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "

14014 +"<commit>..."

14015

14016 #: builtin/revert.c

13919 -msgid "git revert <subcommand>"

13920 -msgstr "git revert <子指令>"

14017 +msgid "git revert (--continue | --skip | --abort | --quit)"

14018 +msgstr "git revert (--continue | --skip | --abort | --quit)"

14019

14020 #: builtin/revert.c

13923 -msgid "git cherry-pick [<options>] <commit-ish>..."

13924 -msgstr "git cherry-pick [<選項>] <提交號>..."

14021 +msgid ""

14022 +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"

14023 +" [-S[<keyid>]] <commit>..."

14024 +msgstr ""

14025 +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"

14026 +" [-S[<keyid>]] <commit>..."

14027

14028 #: builtin/revert.c

13927 -msgid "git cherry-pick <subcommand>"

13928 -msgstr "git cherry-pick <子指令>"

14029 +msgid "git cherry-pick (--continue | --skip | --abort | --quit)"

14030 +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)"

14031

14032 #: builtin/revert.c

14033 #, c-format

@@ -14006,8 +14108,14 @@ msgid "cherry-pick failed"

14108 msgstr "揀選失敗"

14109

14110 #: builtin/rm.c

14009 -msgid "git rm [<options>] [--] <file>..."

14010 -msgstr "git rm [<選項>] [--] <檔案>..."

14111 +msgid ""

14112 +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"

14113 +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

14114 +" [--] [<pathspec>...]"

14115 +msgstr ""

14116 +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"

14117 +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

14118 +" [--] [<pathspec>...]"

14119

14120 #: builtin/rm.c

14121 msgid ""

@@ -14070,7 +14178,7 @@ msgstr "沒有提供路徑規格。我該移除哪個檔案？"

14178

14179 #: builtin/rm.c

14180 msgid "please stage your changes to .gitmodules or stash them to proceed"

14073 -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"

14181 +msgstr "請將您的修改暫存到 .gitmodules 中或貯存後再繼續"

14182

14183 #: builtin/rm.c

14184 #, c-format

@@ -14087,12 +14195,14 @@ msgid ""

14195 "git send-pack [--mirror] [--dry-run] [--force]\n"

14196 " [--receive-pack=<git-receive-pack>]\n"

14197 " [--verbose] [--thin] [--atomic]\n"

14198 +" [--[no-]signed | --signed=(true|false|if-asked)]\n"

14199 " [<host>:]<directory> (--all | <ref>...)"

14200 msgstr ""

14201 "git send-pack [--mirror] [--dry-run] [--force]\n"

14202 " [--receive-pack=<git-receive-pack>]\n"

14203 " [--verbose] [--thin] [--atomic]\n"

14095 -" [<主機>:]<目錄> (--all | <引用>...)"

14204 +" [--[no-]signed | --signed=(true|false|if-asked)]\n"

14205 +" [<host>:]<directory> (--all | <ref>...)"

14206

14207 #: builtin/send-pack.c

14208 msgid "remote name"

@@ -14123,8 +14233,9 @@ msgid "using multiple --group options with stdin is not supported"

14233 msgstr "不支援在標準輸入使用多個 --group 選項"

14234

14235 #: builtin/shortlog.c

14126 -msgid "using --group=trailer with stdin is not supported"

14127 -msgstr "不支援在標準輸入使用 --group=trailer"

14236 +#, c-format

14237 +msgid "using %s with stdin is not supported"

14238 +msgstr "不支援對 %s 使用 stdin"

14239

14240 #: builtin/shortlog.c

14241 #, c-format

@@ -14172,13 +14283,14 @@ msgid ""

14283 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

14284 " [--current] [--color[=<when>] | --no-color] [--sparse]\n"

14285 " [--more=<n> | --list | --independent | --merge-base]\n"

14175 -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"

14286 +" [--no-name | --sha1-name] [--topics]\n"

14287 +" [(<rev> | <glob>)...]"

14288 msgstr ""

14289 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

14178 -" [--current] [--color[=<何時>] | --no-color] [--sparse]\n"

14290 +" [--current] [--color[=<when>] | --no-color] [--sparse]\n"

14291 " [--more=<n> | --list | --independent | --merge-base]\n"

14180 -" [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元"

14181 -">)...]"

14292 +" [--no-name | --sha1-name] [--topics]\n"

14293 +" [(<rev> | <glob>)...]"

14294

14295 #: builtin/show-branch.c

14296 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"

@@ -14304,11 +14416,13 @@ msgstr "未知的雜湊算法"

14416

14417 #: builtin/show-ref.c

14418 msgid ""

14307 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

14308 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"

14419 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"

14420 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14421 +" [--heads] [--] [<pattern>...]"

14422 msgstr ""

14310 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

14311 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"

14423 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"

14424 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14425 +" [--heads] [--] [<pattern>...]"

14426

14427 #: builtin/show-ref.c

14428 msgid "git show-ref --exclude-existing[=<pattern>]"

@@ -14347,8 +14461,10 @@ msgid "show refs from stdin that aren't in local repository"

14461 msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"

14462

14463 #: builtin/sparse-checkout.c

14464 +msgid ""

14466 +msgstr ""

14468

14469 #: builtin/sparse-checkout.c

14470 msgid "this worktree is not sparse"

@@ -14490,83 +14606,71 @@ msgid "error while refreshing working directory"

14606 msgstr "重新整理工作目錄時發生錯誤"

14607

14608 #: builtin/stash.c

14493 -msgid "git stash list [<options>]"

14494 -msgstr "git stash list [<選項>]"

14609 +msgid "git stash list [<log-options>]"

14610 +msgstr "git stash list [<log-options>]"

14611

14612 #: builtin/stash.c

14497 -msgid "git stash show [<options>] [<stash>]"

14498 -msgstr "git stash show [<選項>] [<stash>]"

14613 +msgid ""

14614 +"git stash show [-u | --include-untracked | --only-untracked] [<diff-"

14615 +"options>] [<stash>]"

14616 +msgstr ""

14617 +"git stash show [-u | --include-untracked | --only-untracked] [<diff-"

14618 +"options>] [<stash>]"

14619

14620 #: builtin/stash.c

14501 -msgid "git stash drop [-q|--quiet] [<stash>]"

14502 -msgstr "git stash drop [-q|--quiet] [<stash>]"

14621 +msgid "git stash drop [-q | --quiet] [<stash>]"

14622 +msgstr "git stash drop [-q | --quiet] [<stash>]"

14623

14624 #: builtin/stash.c

14505 -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

14506 -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

14625 +msgid "git stash pop [--index] [-q | --quiet] [<stash>]"

14626 +msgstr "git stash pop [--index] [-q | --quiet] [<stash>]"

14627 +

14628 +#: builtin/stash.c

14629 +msgid "git stash apply [--index] [-q | --quiet] [<stash>]"

14630 +msgstr "git stash apply [--index] [-q | --quiet] [<stash>]"

14631

14632 #: builtin/stash.c

14633 msgid "git stash branch <branchname> [<stash>]"

14634 msgstr "git stash branch <分支名> [<stash>]"

14635

14636 #: builtin/stash.c

14513 -msgid ""

14514 -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"

14515 -"quiet]\n"

14516 -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

14517 -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

14518 -" [--] [<pathspec>...]]"

14519 -msgstr ""

14520 -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"

14521 -"quiet]\n"

14522 -" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n"

14523 -" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"

14524 -" [--] [<路徑規格>...]]"

14637 +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"

14638 +msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"

14639

14640 #: builtin/stash.c

14641 msgid ""

14528 -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"

14529 -"quiet]\n"

14530 -" [-u|--include-untracked] [-a|--all] [<message>]"

14642 +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

14643 +"| --quiet]\n"

14644 +" [-u | --include-untracked] [-a | --all] [(-m | --message) "

14645 +"<message>]\n"

14646 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

14647 +" [--] [<pathspec>...]]"

14648 msgstr ""

14532 -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"

14533 -"quiet]\n"

14534 -" [-u|--include-untracked] [-a|--all] [<訊息>]"

14535 -

14536 -#: builtin/stash.c

14537 -msgid "git stash pop [--index] [-q|--quiet] [<stash>]"

14538 -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"

14539 -

14540 -#: builtin/stash.c

14541 -msgid "git stash apply [--index] [-q|--quiet] [<stash>]"

14542 -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"

14543 -

14544 -#: builtin/stash.c

14545 -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"

14546 -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"

14649 +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

14650 +"| --quiet]\n"

14651 +" [-u | --include-untracked] [-a | --all] [(-m | --message) "

14652 +"<message>]\n"

14653 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

14654 +" [--] [<pathspec>...]]"

14655

14656 #: builtin/stash.c

14657 msgid ""

14550 -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

14551 -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

14552 -" [--] [<pathspec>...]]"

14658 +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "

14659 +"--quiet]\n"

14660 +" [-u | --include-untracked] [-a | --all] [<message>]"

14661 msgstr ""

14554 -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

14555 -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"

14556 -" [--] [<路徑規格>...]]"

14662 +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "

14663 +"--quiet]\n"

14664 +" [-u | --include-untracked] [-a | --all] [<message>]"

14665

14666 #: builtin/stash.c

14559 -msgid ""

14560 -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

14561 -" [-u|--include-untracked] [-a|--all] [<message>]"

14562 -msgstr ""

14563 -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

14564 -" [-u|--include-untracked] [-a|--all] [<消息>]"

14667 +msgid "git stash create [<message>]"

14668 +msgstr "git stash create [<message>]"

14669

14670 #: builtin/stash.c

14671 #, c-format

14672 msgid "'%s' is not a stash-like commit"

14569 -msgstr "'%s' 不像是一個儲藏提交"

14673 +msgstr "'%s' 不像是一個貯存提交"

14674

14675 #: builtin/stash.c

14676 #, c-format

@@ -14575,7 +14679,7 @@ msgstr "指定了太多的版本：%s"

14679

14680 #: builtin/stash.c

14681 msgid "No stash entries found."

14578 -msgstr "未發現儲藏條目。"

14682 +msgstr "未發現貯存條目。"

14683

14684 #: builtin/stash.c

14685 #, c-format

@@ -14599,7 +14703,7 @@ msgstr ""

14703

14704 #: builtin/stash.c

14705 msgid "cannot apply a stash in the middle of a merge"

14602 -msgstr "無法在合併過程套用儲藏"

14706 +msgstr "無法在合併過程套用貯存"

14707

14708 #: builtin/stash.c

14709 #, c-format

@@ -14621,11 +14725,11 @@ msgstr "正在合併 %s 和 %s"

14725

14726 #: builtin/stash.c

14727 msgid "Index was not unstashed."

14624 -msgstr "索引未從儲藏中復原。"

14728 +msgstr "索引未從貯存中復原。"

14729

14730 #: builtin/stash.c

14731 msgid "could not restore untracked files from stash"

14628 -msgstr "無法從儲藏條目中復原未追蹤檔案"

14732 +msgstr "無法從貯存條目中復原未追蹤檔案"

14733

14734 #: builtin/stash.c

14735 msgid "attempt to recreate the index"

@@ -14639,16 +14743,16 @@ msgstr "捨棄了 %s（%s）"

14743 #: builtin/stash.c

14744 #, c-format

14745 msgid "%s: Could not drop stash entry"

14642 -msgstr "%s：無法捨棄儲藏條目"

14746 +msgstr "%s：無法捨棄貯存條目"

14747

14748 #: builtin/stash.c

14749 #, c-format

14750 msgid "'%s' is not a stash reference"

14647 -msgstr "'%s' 不是一個儲藏引用"

14751 +msgstr "'%s' 不是一個貯存引用"

14752

14753 #: builtin/stash.c

14754 msgid "The stash entry is kept in case you need it again."

14651 -msgstr "儲藏條目被保留以備您再次需要。"

14755 +msgstr "貯存條目被保留以備您再次需要。"

14756

14757 #: builtin/stash.c

14758 msgid "No branch name specified"

@@ -14664,11 +14768,11 @@ msgstr "無法解包樹"

14768

14769 #: builtin/stash.c

14770 msgid "include untracked files in the stash"

14667 -msgstr "在儲藏區包含未追蹤檔案"

14771 +msgstr "在貯存區包含未追蹤檔案"

14772

14773 #: builtin/stash.c

14774 msgid "only show untracked files in the stash"

14671 -msgstr "只在儲藏區顯示未追蹤檔案"

14775 +msgstr "只在貯存區顯示未追蹤檔案"

14776

14777 #: builtin/stash.c

14778 #, c-format

@@ -14677,7 +14781,7 @@ msgstr "無法用 %2$s 更新 %1$s"

14781

14782 #: builtin/stash.c

14783 msgid "stash message"

14680 -msgstr "儲藏說明"

14784 +msgstr "貯存說明"

14785

14786 #: builtin/stash.c

14787 msgid "\"git stash store\" requires one <commit> argument"

@@ -14733,7 +14837,7 @@ msgstr "沒有要儲存的本機修改"

14837

14838 #: builtin/stash.c

14839 msgid "Cannot initialize stash"

14736 -msgstr "無法初始化儲藏"

14840 +msgstr "無法初始化貯存"

14841

14842 #: builtin/stash.c

14843 msgid "Cannot save the current status"

@@ -14754,11 +14858,11 @@ msgstr "保持索引"

14858

14859 #: builtin/stash.c

14860 msgid "stash staged changes only"

14757 -msgstr "只儲藏暫存變更"

14861 +msgstr "只貯存暫存變更"

14862

14863 #: builtin/stash.c

14864 msgid "stash in patch mode"

14761 -msgstr "以修補檔模式儲藏"

14865 +msgstr "以修補檔模式貯存"

14866

14867 #: builtin/stash.c

14868 msgid "quiet mode"

@@ -14766,7 +14870,7 @@ msgstr "靜默模式"

14870

14871 #: builtin/stash.c

14872 msgid "include untracked files in stash"

14769 -msgstr "儲藏中包含未追蹤檔案"

14873 +msgstr "貯存中包含未追蹤檔案"

14874

14875 #: builtin/stash.c

14876 msgid "include ignore files"

@@ -15248,10 +15352,6 @@ msgstr "遞迴遍歷子模組"

15352 msgid "don't fetch new objects from the remote site"

15353 msgstr "不從遠端站台取得新物件"

15354

15251 -#: builtin/submodule--helper.c

15252 -msgid "path into the working tree"

15253 -msgstr "到工作區的路徑"

15254 -

15355 #: builtin/submodule--helper.c

15356 msgid "use the 'checkout' update strategy (default)"

15357 msgstr "使用 “checkout” 更新策略（預設值）"

@@ -15296,34 +15396,10 @@ msgstr ""

15396 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "

15397 "[--] [<path>...]"

15398

15299 -#: builtin/submodule--helper.c

15300 -msgid "recurse into submodules"

15301 -msgstr "在子模組中遞迴"

15302 -

15399 #: builtin/submodule--helper.c

15400 msgid "git submodule absorbgitdirs [<options>] [<path>...]"

15401 msgstr "git submodule absorbgitdirs [<options>] [<path>...]"

15402

15307 -#: builtin/submodule--helper.c

15308 -msgid "check if it is safe to write to the .gitmodules file"

15309 -msgstr "檢查寫入 .gitmodules 檔案是否安全"

15310 -

15311 -#: builtin/submodule--helper.c

15312 -msgid "unset the config in the .gitmodules file"

15313 -msgstr "取消 .gitmodules 檔案中的設定"

15314 -

15315 -#: builtin/submodule--helper.c

15316 -msgid "git submodule--helper config <name> [<value>]"

15317 -msgstr "git submodule--helper config <名稱> [<值>]"

15318 -

15319 -#: builtin/submodule--helper.c

15320 -msgid "git submodule--helper config --unset <name>"

15321 -msgstr "git submodule--helper config --unset <名稱>"

15322 -

15323 -#: builtin/submodule--helper.c

15324 -msgid "please make sure that the .gitmodules file is in the working tree"

15325 -msgstr "請確認 .gitmodules 檔案在工作區裡"

15326 -

15403 #: builtin/submodule--helper.c

15404 msgid "suppress output for setting url of a submodule"

15405 msgstr "隱藏子模組設定 URL 的輸出"

@@ -15417,6 +15493,10 @@ msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"

15493 msgid "unable to checkout submodule '%s'"

15494 msgstr "無法簽出「%s」子模組"

15495

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

15497 +msgid "please make sure that the .gitmodules file is in the working tree"

15498 +msgstr "請確認 .gitmodules 檔案在工作區裡"

15499 +

15500 #: builtin/submodule--helper.c

15501 #, c-format

15502 msgid "Failed to add submodule '%s'"

@@ -15478,23 +15558,26 @@ msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../"

15558 msgid "'%s' is not a valid submodule name"

15559 msgstr "「%s」不是有效的子模組名稱"

15560

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

15562 +msgid "git submodule--helper <command>"

15563 +msgstr "git submodule--helper <command>"

15564 +

15565 #: builtin/submodule--helper.c git.c

15566 #, c-format

15567 msgid "%s doesn't support --super-prefix"

15568 msgstr "%s 不支援 --super-prefix"

15569

15486 -#: builtin/submodule--helper.c

15487 -#, c-format

15488 -msgid "'%s' is not a valid submodule--helper subcommand"

15489 -msgstr "'%s' 不是一個有效的 submodule--helper 子指令"

15570 +#: builtin/symbolic-ref.c

15571 +msgid "git symbolic-ref [-m <reason>] <name> <ref>"

15572 +msgstr "git symbolic-ref [-m <reason>] <name> <ref>"

15573

15574 #: builtin/symbolic-ref.c

15492 -msgid "git symbolic-ref [<options>] <name> [<ref>]"

15493 -msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]"

15575 +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>"

15576 +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <name>"

15577

15578 #: builtin/symbolic-ref.c

15496 -msgid "git symbolic-ref -d [-q] <name>"

15497 -msgstr "git symbolic-ref -d [-q] <名稱>"

15579 +msgid "git symbolic-ref --delete [-q] <name>"

15580 +msgstr "git symbolic-ref --delete [-q] <name>"

15581

15582 #: builtin/symbolic-ref.c

15583 msgid "suppress error message for non-symbolic (detached) refs"

@@ -15508,6 +15591,10 @@ msgstr "刪除符號引用"

15591 msgid "shorten ref output"

15592 msgstr "縮短引用輸出"

15593

15594 +#: builtin/symbolic-ref.c

15595 +msgid "recursively dereference (default)"

15596 +msgstr "遞迴反解引用（預設）"

15597 +

15598 #: builtin/symbolic-ref.c builtin/update-ref.c

15599 msgid "reason"

15600 msgstr "原因"

@@ -15518,11 +15605,11 @@ msgstr "更新的原因"

15605

15606 #: builtin/tag.c

15607 msgid ""

15521 -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"

15522 -" <tagname> [<head>]"

15608 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"

15609 +" <tagname> [<commit> | <object>]"

15610 msgstr ""

15524 -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n"

15525 -" <標籤名> [<head>]"

15611 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"

15612 +" <tagname> [<commit> | <object>]"

15613

15614 #: builtin/tag.c

15615 msgid "git tag -d <tagname>..."

@@ -15530,14 +15617,15 @@ msgstr "git tag -d <標籤名>..."

15617

15618 #: builtin/tag.c

15619 msgid ""

15533 -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"

15534 -"points-at <object>]\n"

15535 -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "

15536 -"[<pattern>...]"

15620 +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"

15621 +" [--points-at <object>] [--column[=<options>] | --no-column]\n"

15622 +" [--create-reflog] [--sort=<key>] [--format=<format>]\n"

15623 +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]"

15624 msgstr ""

15538 -"git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-"

15539 -"at <物件>]\n"

15540 -" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"

15625 +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"

15626 +" [--points-at <object>] [--column[=<options>] | --no-column]\n"

15627 +" [--create-reflog] [--sort=<key>] [--format=<format>]\n"

15628 +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]"

15629

15630 #: builtin/tag.c

15631 msgid "git tag -v [--format=<format>] <tagname>..."

@@ -16007,8 +16095,12 @@ msgid "update the info files from scratch"

16095 msgstr "從頭開始更新檔案訊息"

16096

16097 #: builtin/upload-pack.c

16010 -msgid "git upload-pack [<options>] <dir>"

16011 -msgstr "git upload-pack [<選項>] <目錄>"

16098 +msgid ""

16099 +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"

16100 +" [--advertise-refs] <directory>"

16101 +msgstr ""

16102 +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"

16103 +" [--advertise-refs] <directory>"

16104

16105 #: builtin/upload-pack.c t/helper/test-serve-v2.c

16106 msgid "quit after a single request/response exchange"

@@ -16027,8 +16119,8 @@ msgid "interrupt transfer after <n> seconds of inactivity"

16119 msgstr "不活動 <n> 秒鐘後終止傳輸"

16120

16121 #: builtin/verify-commit.c

16030 -msgid "git verify-commit [-v | --verbose] <commit>..."

16031 -msgstr "git verify-commit [-v | --verbose] <提交>..."

16122 +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."

16123 +msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..."

16124

16125 #: builtin/verify-commit.c

16126 msgid "print commit contents"

@@ -16039,8 +16131,8 @@ msgid "print raw gpg status output"

16131 msgstr "列印原始 gpg 狀態輸出"

16132

16133 #: builtin/verify-pack.c

16042 -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."

16043 -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."

16134 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."

16135 +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."

16136

16137 #: builtin/verify-pack.c

16138 msgid "verbose"

@@ -16051,44 +16143,48 @@ msgid "show statistics only"

16143 msgstr "只顯示統計"

16144

16145 #: builtin/verify-tag.c

16054 -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."

16055 -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <標籤>..."

16146 +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."

16147 +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."

16148

16149 #: builtin/verify-tag.c

16150 msgid "print tag contents"

16151 msgstr "列印標籤內容"

16152

16153 #: builtin/worktree.c

16062 -msgid "git worktree add [<options>] <path> [<commit-ish>]"

16063 -msgstr "git worktree add [<選項>] <路徑> [<提交>]"

16154 +msgid ""

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

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

16157 +msgstr ""

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

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

16160

16161 #: builtin/worktree.c

16066 -msgid "git worktree list [<options>]"

16067 -msgstr "git worktree list [<選項>]"

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

16163 +msgstr "git worktree list [-v | --porcelain [-z]]"

16164

16165 #: builtin/worktree.c

16070 -msgid "git worktree lock [<options>] <path>"

16071 -msgstr "git worktree lock [<選項>] <路徑>"

16166 +msgid "git worktree lock [--reason <string>] <worktree>"

16167 +msgstr "git worktree lock [--reason <string>] <worktree>"

16168

16169 #: builtin/worktree.c

16170 msgid "git worktree move <worktree> <new-path>"

16171 msgstr "git worktree move <工作區> <新路徑>"

16172

16173 #: builtin/worktree.c

16078 -msgid "git worktree prune [<options>]"

16079 -msgstr "git worktree prune [<選項>]"

16174 +msgid "git worktree prune [-n] [-v] [--expire <expire>]"

16175 +msgstr "git worktree prune [-n] [-v] [--expire <expire>]"

16176

16177 #: builtin/worktree.c

16082 -msgid "git worktree remove [<options>] <worktree>"

16083 -msgstr "git worktree remove [<選項>] <工作區>"

16178 +msgid "git worktree remove [-f] <worktree>"

16179 +msgstr "git worktree remove [-f] <worktree>"

16180

16181 #: builtin/worktree.c

16182 msgid "git worktree repair [<path>...]"

16183 msgstr "git worktree repair [<路徑>...]"

16184

16185 #: builtin/worktree.c

16090 -msgid "git worktree unlock <path>"

16091 -msgstr "git worktree unlock <路徑>"

16186 +msgid "git worktree unlock <worktree>"

16187 +msgstr "git worktree unlock <worktree>"

16188

16189 #: builtin/worktree.c

16190 #, c-format

@@ -16372,6 +16468,11 @@ msgstr "只對除錯有用"

16468 msgid "core.fsyncMethod = batch is unsupported on this platform"

16469 msgstr "core.fsyncMethod = batch 不支援本平台"

16470

16471 +#: bundle-uri.c

16472 +#, c-format

16473 +msgid "bundle list at '%s' has no mode"

16474 +msgstr "位於 “%s” 的套件包清單沒有模式"

16475 +

16476 #: bundle-uri.c

16477 msgid "failed to create temporary file"

16478 msgstr "無法建立暫存檔"

@@ -16382,23 +16483,40 @@ msgstr "功能不足"

16483

16484 #: bundle-uri.c

16485 #, c-format

16385 -msgid "failed to download bundle from URI '%s'"

16386 -msgstr "無法從 “%s” URI 下載套件"

16486 +msgid "unrecognized bundle mode from URI '%s'"

16487 +msgstr "無法識別從 URI “%s” 取回的套件包模式"

16488 +

16489 +#: bundle-uri.c

16490 +#, c-format

16491 +msgid "exceeded bundle URI recursion limit (%d)"

16492 +msgstr "超出套件包 URI 遞迴限制 (%d)"

16493

16494 #: bundle-uri.c

16495 #, c-format

16390 -msgid "file at URI '%s' is not a bundle"

16391 -msgstr "位於 URI “%s” 的檔案不是套件"

16496 +msgid "failed to download bundle from URI '%s'"

16497 +msgstr "無法從 “%s” URI 下載套件包"

16498

16499 #: bundle-uri.c

16500 #, c-format

16395 -msgid "failed to unbundle bundle from URI '%s'"

16396 -msgstr "無法解開源自 URI “%s” 的套件"

16501 +msgid "file at URI '%s' is not a bundle or bundle list"

16502 +msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"

16503 +

16504 +#: bundle-uri.c

16505 +msgid "bundle-uri: got an empty line"

16506 +msgstr "bundle-uri: 收到空白列"

16507 +

16508 +#: bundle-uri.c

16509 +msgid "bundle-uri: line is not of the form 'key=value'"

16510 +msgstr "bundle-uri: 列的格式不是 “key=value”"

16511 +

16512 +#: bundle-uri.c

16513 +msgid "bundle-uri: line has empty key or value"

16514 +msgstr "bundle-uri: 列有空鍵或空值"

16515

16516 #: bundle.c

16517 #, c-format

16518 msgid "unrecognized bundle hash algorithm: %s"

16401 -msgstr "無法識別的套件雜湊演算法：%s"

16519 +msgstr "無法識別的套件包雜湊演算法：%s"

16520

16521 #: bundle.c

16522 #, c-format

@@ -16408,7 +16526,7 @@ msgstr "未知功能 '%s'"

16526 #: bundle.c

16527 #, c-format

16528 msgid "'%s' does not look like a v2 or v3 bundle file"

16411 -msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"

16529 +msgstr "“%s” 不像是一個 v2 或 v3 版本的套件包檔案"

16530

16531 #: bundle.c

16532 #, c-format

@@ -16421,27 +16539,27 @@ msgstr "版本庫中缺少這些必備的提交："

16539

16540 #: bundle.c

16541 msgid "need a repository to verify a bundle"

16424 -msgstr "需要版本庫驗證套件"

16542 +msgstr "需要版本庫驗證套件包"

16543

16544 #: bundle.c

16545 #, c-format

16546 msgid "The bundle contains this ref:"

16547 msgid_plural "The bundle contains these %<PRIuMAX> refs:"

16430 -msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："

16548 +msgstr[0] "這個套件包，含有這 %<PRIuMAX> 個引用："

16549

16550 #: bundle.c

16551 msgid "The bundle records a complete history."

16434 -msgstr "這個套件記錄完整歷史紀錄。"

16552 +msgstr "這個套件包記下了完整歷史紀錄。"

16553

16554 #: bundle.c

16555 #, c-format

16556 msgid "The bundle requires this ref:"

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

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

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

16559

16560 #: bundle.c

16561 msgid "unable to dup bundle descriptor"

16444 -msgstr "無法複製套件描述符"

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

16563

16564 #: bundle.c

16565 msgid "Could not spawn pack-objects"

@@ -16459,16 +16577,16 @@ msgstr "引用 '%s' 被 rev-list 選項排除"

16577 #: bundle.c

16578 #, c-format

16579 msgid "unsupported bundle version %d"

16462 -msgstr "不支援的套件版本 %d"

16580 +msgstr "不支援的套件包版本 %d"

16581

16582 #: bundle.c

16583 #, c-format

16584 msgid "cannot write bundle version %d with algorithm %s"

16467 -msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"

16585 +msgstr "無法寫入使用 %2$s 演算法的套件包版本 %1$d"

16586

16587 #: bundle.c

16588 msgid "Refusing to create empty bundle."

16471 -msgstr "不能建立空套件。"

16589 +msgstr "不能建立空套件包。"

16590

16591 #: bundle.c

16592 #, c-format

@@ -17015,7 +17133,7 @@ msgstr "將檔案內容新增到索引"

17133

17134 #: command-list.h

17135 msgid "Stash the changes in a dirty working directory away"

17018 -msgstr "儲藏髒工作區中的修改"

17136 +msgstr "貯存髒工作區中的修改"

17137

17138 #: command-list.h

17139 msgid "Show the working tree status"

@@ -17111,7 +17229,7 @@ msgstr "定義路徑的屬性"

17229

17230 #: command-list.h

17231 msgid "Git command-line interface and conventions"

17114 -msgstr "Git 指令列介面和約定"

17232 +msgstr "Git 命令列介面和約定"

17233

17234 #: command-list.h

17235 msgid "A Git core tutorial for developers"

@@ -17139,14 +17257,14 @@ msgstr "Git 使用的常見問題"

17257

17258 #: command-list.h

17259 msgid "The bundle file format"

17142 -msgstr "套件檔案格式"

17260 +msgstr "套件包檔案格式"

17261

17262 #: command-list.h

17263 msgid "Chunk-based file formats"

17264 msgstr "以區塊為基礎的檔案格式"

17265

17266 #: command-list.h

17149 -msgid "Git commit graph format"

17267 +msgid "Git commit-graph format"

17268 msgstr "Git 提交圖格式"

17269

17270 #: command-list.h

@@ -17571,6 +17689,11 @@ msgstr "“has_worktree_moved” 中有未處置的情況：%d"

17689 msgid "health thread wait failed [GLE %ld]"

17690 msgstr "健康監聽執行緒等待失敗 [GLE %ld]"

17691

17692 +#: compat/fsmonitor/fsm-ipc-darwin.c

17693 +#, c-format

17694 +msgid "Invalid path: %s"

17695 +msgstr "無效路徑：%s"

17696 +

17697 #: compat/fsmonitor/fsm-listen-darwin.c

17698 msgid "Unable to create FSEventStream."

17699 msgstr "無法建立 FSEventStream。"

@@ -17609,12 +17732,32 @@ msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]"

17732 msgid "could not read directory changes [GLE %ld]"

17733 msgstr "無法讀取目錄變化 [GLE %ld]"

17734

17612 -#: compat/fsmonitor/fsm-settings-win32.c

17735 +#: compat/fsmonitor/fsm-path-utils-darwin.c

17736 +#, c-format

17737 +msgid "opendir('%s') failed"

17738 +msgstr "opendir('%s') 失敗"

17739 +

17740 +#: compat/fsmonitor/fsm-path-utils-darwin.c

17741 +#, c-format

17742 +msgid "lstat('%s') failed"

17743 +msgstr "lstat('%s') 失敗"

17744 +

17745 +#: compat/fsmonitor/fsm-path-utils-darwin.c

17746 +#, c-format

17747 +msgid "strbuf_readlink('%s') failed"

17748 +msgstr "strbuf_readlink('%s') 失敗"

17749 +

17750 +#: compat/fsmonitor/fsm-path-utils-darwin.c

17751 +#, c-format

17752 +msgid "closedir('%s') failed"

17753 +msgstr "closedir('%s') 失敗"

17754 +

17755 +#: compat/fsmonitor/fsm-path-utils-win32.c

17756 #, c-format

17757 msgid "[GLE %ld] unable to open for read '%ls'"

17758 msgstr "[GLE %ld] 無法開啟以讀取「%ls」"

17759

17617 -#: compat/fsmonitor/fsm-settings-win32.c

17760 +#: compat/fsmonitor/fsm-path-utils-win32.c

17761 #, c-format

17762 msgid "[GLE %ld] unable to get protocol information for '%ls'"

17763 msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊"

@@ -17879,7 +18022,7 @@ msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"

18022 #: config.c

18023 #, c-format

18024 msgid "bad config line %d in command line %s"

17882 -msgstr "指令列 %2$s 中錯誤的設定行 %1$d"

18025 +msgstr "命令列 %2$s 中錯誤的設定行 %1$d"

18026

18027 #: config.c

18028 #, c-format

@@ -17922,7 +18065,7 @@ msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$

18065 #: config.c

18066 #, c-format

18067 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

17925 -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

18068 +msgstr "命令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

18069

18070 #: config.c

18071 #, c-format

@@ -18018,7 +18161,7 @@ msgstr "解析 %s 失敗"

18161

18162 #: config.c

18163 msgid "unable to parse command-line config"

18021 -msgstr "無法解析指令列中的設定"

18164 +msgstr "無法解析命令列中的設定"

18165

18166 #: config.c

18167 msgid "unknown error occurred while reading the configuration files"

@@ -18037,7 +18180,7 @@ msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間

18180 #: config.c

18181 #, c-format

18182 msgid "unable to parse '%s' from command-line config"

18040 -msgstr "無法解析指令列設定中的 '%s'"

18183 +msgstr "無法解析命令列設定中的 '%s'"

18184

18185 #: config.c

18186 #, c-format

@@ -19242,7 +19385,7 @@ msgid ""

19385 "Please specify a directory on the command line"

19386 msgstr ""

19387 "無法猜到目錄名。\n"

19245 -"請在指令列指定一個目錄"

19388 +"請在命令列指定一個目錄"

19389

19390 #: dir.c

19391 #, c-format

@@ -19573,8 +19716,9 @@ msgstr "虛擬版本庫 “%s” 與 fsmonitor 不相容"

19716 #: fsmonitor-settings.c

19717 #, c-format

19718 msgid ""

19576 -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"

19577 -msgstr "版本庫 “%s” 因缺少 Unix 通訊端而與 fsmonitor 不相容"

19719 +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix "

19720 +"sockets support"

19721 +msgstr "通訊端 “%s” 因缺少 Unix 通訊端支援，而與 fsmonitor 不相容"

19722

19723 #: git.c

19724 msgid ""

@@ -19609,7 +19753,7 @@ msgstr ""

19753 #: git.c help.c

19754 #, c-format

19755 msgid "unsupported command listing type '%s'"

19612 -msgstr "不支援的指令列表類型 '%s'"

19756 +msgstr "不支援的命令列表類型 '%s'"

19757

19758 #: git.c

19759 #, c-format

@@ -19958,8 +20102,8 @@ msgstr[0] ""

20102 "最類似的指令有"

20103

20104 #: help.c

19961 -msgid "git version [<options>]"

19962 -msgstr "git version [<選項>]"

20105 +msgid "git version [--build-options]"

20106 +msgstr "git version [--build-options]"

20107

20108 #: help.c

20109 #, c-format

@@ -20642,8 +20786,8 @@ msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"

20786 #: merge-recursive.c

20787 #, c-format

20788 msgid ""

20645 -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

20646 -"\"->\"%s\" in \"%s\"%s"

20789 +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "

20790 +"\"%s\"->\"%s\" in \"%s\"%s"

20791 msgstr ""

20792 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"

20793 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"

@@ -21032,11 +21176,6 @@ msgstr "無法規範化備用物件路徑：%s"

21176 msgid "%s: ignoring alternate object stores, nesting too deep"

21177 msgstr "%s：忽略備用物件庫，嵌套太深"

21178

21035 -#: object-file.c

21036 -#, c-format

21037 -msgid "unable to normalize object directory: %s"

21038 -msgstr "無法規範化物件目錄: %s"

21039 -

21179 #: object-file.c

21180 msgid "unable to fdopen alternates lockfile"

21181 msgstr "無法 fdopen 取代鎖檔案"

@@ -22047,6 +22186,11 @@ msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

22186 msgid "promisor remote name cannot begin with '/': %s"

22187 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

22188

22189 +#: promisor-remote.c

22190 +#, c-format

22191 +msgid "could not fetch %s from promisor remote"

22192 +msgstr "無法從承諾者遠端抓取 %s"

22193 +

22194 #: protocol-caps.c

22195 msgid "object-info: expected flush after arguments"

22196 msgstr "object-info：引數後預期要有 flush"

@@ -23318,6 +23462,15 @@ msgstr "不能確定 HEAD 版本"

23462 msgid "failed to find tree of %s"

23463 msgstr "無法找到 %s 指向的樹"

23464

23465 +#: revision.c

23466 +#, c-format

23467 +msgid "unsupported section for hidden refs: %s"

23468 +msgstr "不支援的隱藏引用區塊：%s"

23469 +

23470 +#: revision.c

23471 +msgid "--exclude-hidden= passed more than once"

23472 +msgstr "--exclude-hidden= 傳入了不止一次"

23473 +

23474 #: revision.c

l10n: zh_TW.po: Git 2.39-rc2