033775a967 · matheusbsbs/matheus-bagliano

@@ -30,8 +30,8 @@ msgid ""

30 msgstr ""

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

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

33 -"POT-Creation-Date: 2026-01-28 22:23+0800\n"

34 -"PO-Revision-Date: 2026-01-28 22:42+0800\n"

33 +"POT-Creation-Date: 2026-04-19 19:19+0800\n"

34 +"PO-Revision-Date: 2026-04-19 13:40+0000\n"

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

36 "Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/"

37 "projects/git-po/git-cli/zh_Hant/>\n"

@@ -40,21 +40,18 @@ msgstr ""

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

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

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

43 -"X-Generator: Poedit 3.8\n"

43 +"X-Generator: Weblate 5.16.2\n"

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

45 "zhconvert.org\n"

46

47 -#: add-interactive.c

48 -#, c-format

49 -msgid "%s cannot be negative"

50 -msgstr "%s 不能是負數"

51 -

47 #: add-interactive.c

48 #, c-format

49 msgid "Huh (%s)?"

50 msgstr "嗯（%s）？"

51

57 -#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c

52 +#: add-interactive.c add-interactive.c builtin/merge.c

53 +#: builtin/rebase.c builtin/rebase.c reset.c sequencer.c

54 +#: sequencer.c sequencer.c

55 msgid "could not read index"

56 msgstr "無法讀取索引"

57

@@ -74,12 +71,14 @@ msgstr "未變更"

71 msgid "Update"

72 msgstr "更新"

73

77 -#: add-interactive.c

74 +#: add-interactive.c add-interactive.c add-interactive.c

75 #, c-format

76 msgid "could not stage '%s'"

77 msgstr "無法暫存「%s」"

78

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

79 +#: add-interactive.c add-interactive.c builtin/stash.c

80 +#: builtin/stash.c builtin/stash.c builtin/stash.c

81 +#: builtin/stash.c reset.c sequencer.c

82 msgid "could not write index"

83 msgstr "無法寫入索引"

84

@@ -94,7 +93,8 @@ msgstr[0] "已更新 %d 個路徑\n"

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

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

95

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

96 +#: add-interactive.c apply.c builtin/checkout.c

97 +#: builtin/reset.c

98 #, c-format

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

100 msgstr "對「%s」路徑執行 make_cache_entry 失敗"

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

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

176 msgstr "將未追蹤檔案的內容加入至變更暫存集"

177

178 -#: add-interactive.c

178 +#: add-interactive.c add-interactive.c

179 msgid "Prompt help:"

180 msgstr "提示說明："

181

@@ -191,7 +191,7 @@ msgstr "選取範圍中項目"

191 msgid "select multiple ranges"

192 msgstr "選取多個範圍"

193

194 -#: add-interactive.c

194 +#: add-interactive.c add-interactive.c

195 msgid "select item based on unique prefix"

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

197

@@ -231,9 +231,11 @@ msgstr "已暫存"

231 msgid "unstaged"

232 msgstr "未暫存"

233

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

235 -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c

236 -#: builtin/pull.c builtin/submodule--helper.c

234 +#: add-interactive.c apply.c apply.c builtin/am.c

235 +#: builtin/am.c builtin/bugreport.c builtin/clone.c

236 +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c

237 +#: builtin/merge.c builtin/pull.c builtin/submodule--helper.c

238 +#: builtin/submodule--helper.c

239 msgid "path"

240 msgstr "路徑"

241

@@ -248,31 +250,31 @@ msgstr "再見。\n"

250

251 #: add-patch.c

252 #, c-format

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

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

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

254 +msgstr "暫存模式變更%s [y,n,q,a,d%s,?]？ "

255

256 #: add-patch.c

257 #, c-format

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

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

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

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

260

261 #: add-patch.c

262 #, c-format

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

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

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

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

265

266 #: add-patch.c

267 #, c-format

266 -msgid "Stage this hunk [y,n,q,a,d%s,?]? "

267 -msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "

268 +msgid "Stage this hunk%s [y,n,q,a,d%s,?]? "

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

270

269 -#: add-patch.c

271 +#: add-patch.c add-patch.c

272 msgid ""

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

274 "staging."

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

276

275 -#: add-patch.c

277 +#: add-patch.c add-patch.c

278 msgid ""

279 "y - stage this hunk\n"

280 "n - do not stage this hunk\n"

@@ -288,23 +290,23 @@ msgstr ""

290

291 #: add-patch.c

292 #, c-format

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

292 -msgstr "貯存模式變更 [y,n,q,a,d%s,?]？ "

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

294 +msgstr "貯存模式變更%s [y,n,q,a,d%s,?]？ "

295

296 #: add-patch.c

297 #, c-format

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

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

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

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

300

301 #: add-patch.c

302 #, c-format

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

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

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

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

305

306 #: add-patch.c

307 #, c-format

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

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

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

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

310

311 #: add-patch.c

312 msgid ""

@@ -328,23 +330,23 @@ msgstr ""

330

331 #: add-patch.c

332 #, c-format

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

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

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

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

335

336 #: add-patch.c

337 #, c-format

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

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

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

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

340

341 #: add-patch.c

342 #, c-format

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

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

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

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

345

346 #: add-patch.c

347 #, c-format

346 -msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

347 -msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "

348 +msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? "

349 +msgstr "取消暫存此區塊%s [y,n,q,a,d%s,?]? "

350

351 #: add-patch.c

352 msgid ""

@@ -368,25 +370,25 @@ msgstr ""

370

371 #: add-patch.c

372 #, c-format

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

372 -msgstr "將模式變更套用至索引區 [y,n,q,a,d%s,?]？ "

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

374 +msgstr "將模式變更套用至索引區%s [y,n,q,a,d%s,?]？ "

375

376 #: add-patch.c

377 #, c-format

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

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

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

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

380

381 #: add-patch.c

382 #, c-format

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

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

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

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

385

386 #: add-patch.c

387 #, c-format

386 -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

387 -msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "

388 +msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? "

389 +msgstr "將此區塊套用到索引%s [y,n,q,a,d%s,?]? "

390

389 -#: add-patch.c

391 +#: add-patch.c add-patch.c add-patch.c

392 msgid ""

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

394 "applying."

@@ -406,33 +408,33 @@ msgstr ""

408 "a - 套用此區塊和本檔案中後面的全部區塊\n"

409 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

410

409 -#: add-patch.c

411 +#: add-patch.c add-patch.c

412 #, c-format

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

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

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

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

415

414 -#: add-patch.c

416 +#: add-patch.c add-patch.c

417 #, c-format

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

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

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

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

420

419 -#: add-patch.c

421 +#: add-patch.c add-patch.c

422 #, c-format

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

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

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

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

425

424 -#: add-patch.c

426 +#: add-patch.c add-patch.c

427 #, c-format

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

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

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

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

430

429 -#: add-patch.c

431 +#: add-patch.c add-patch.c add-patch.c

432 msgid ""

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

434 "discarding."

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

436

435 -#: add-patch.c

437 +#: add-patch.c add-patch.c

438 msgid ""

439 "y - discard this hunk from worktree\n"

440 "n - do not discard this hunk from worktree\n"

@@ -448,23 +450,23 @@ msgstr ""

450

451 #: add-patch.c

452 #, c-format

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

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

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

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

455

456 #: add-patch.c

457 #, c-format

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

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

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

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

460

461 #: add-patch.c

462 #, c-format

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

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

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

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

465

466 #: add-patch.c

467 #, c-format

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

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

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

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

470

471 #: add-patch.c

472 msgid ""

@@ -482,23 +484,23 @@ msgstr ""

484

485 #: add-patch.c

486 #, c-format

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

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

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

488 +msgstr "將模式變更套用至索引區和工作區%s [y,n,q,a,d%s,?]？ "

489

490 #: add-patch.c

491 #, c-format

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

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

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

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

494

495 #: add-patch.c

496 #, c-format

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

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

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

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

499

500 #: add-patch.c

501 #, c-format

500 -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

501 -msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "

502 +msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? "

503 +msgstr "將此區塊套用到索引和工作區%s [y,n,q,a,d%s,?]? "

504

505 #: add-patch.c

506 msgid ""

@@ -516,23 +518,23 @@ msgstr ""

518

519 #: add-patch.c

520 #, c-format

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

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

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

522 +msgstr "將模式變更套用至工作區%s [y,n,q,a,d%s,?]？ "

523

524 #: add-patch.c

525 #, c-format

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

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

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

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

528

529 #: add-patch.c

530 #, c-format

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

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

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

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

533

534 #: add-patch.c

535 #, c-format

534 -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "

535 -msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "

536 +msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? "

537 +msgstr "將此區塊套用到工作區%s [y,n,q,a,d%s,?]? "

538

539 #: add-patch.c

540 msgid ""

@@ -548,6 +550,11 @@ msgstr ""

550 "a - 套用此區塊和本檔案中後面的全部區塊\n"

551 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

552

553 +#: add-patch.c add-patch.c add-patch.c add-patch.c

554 +#, c-format

555 +msgid "%s cannot be negative"

556 +msgstr "%s 不能是負數"

557 +

558 #: add-patch.c

559 #, c-format

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

@@ -659,6 +666,7 @@ msgid "Nothing was applied.\n"

666 msgstr "未套用。\n"

667

668 #: add-patch.c

669 +#, c-format

670 msgid ""

671 "j - go to the next undecided hunk, roll over at the bottom\n"

672 "J - go to the next hunk, roll over at the bottom\n"

@@ -670,19 +678,37 @@ msgid ""

678 "e - manually edit the current hunk\n"

679 "p - print the current hunk\n"

680 "P - print the current hunk using the pager\n"

681 +"> - go to the next file, roll over at the bottom\n"

682 +"< - go to the previous file, roll over at the top\n"

683 "? - print help\n"

684 +"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n"

685 msgstr ""

675 -"j - 前往下一個未決區塊，在結尾時回到開頭\n"

676 -"J - 前往下一個區塊，在結尾時回到開頭\n"

677 -"k - 前往上一個未決區塊，在開頭時回到結尾\n"

678 -"K - 前往上一個區塊，在開頭時回到結尾\n"

686 +"j - 前往下一個未決區塊，在最後一個時回到第一個未決區塊\n"

687 +"J - 前往下一個區塊，在最後一個時回到第一個區塊\n"

688 +"k - 前往上一個未決區塊，在第一個時回到最後一個未決區塊\n"

689 +"K - 前往上一個區塊，在第一個時回到最後一個區塊\n"

690 "g - 選擇要跳轉至的區塊\n"

691 "/ - 尋找符合提供之常規表示式的區塊\n"

692 "s - 分割目前區塊為更小的區塊\n"

693 "e - 手動編輯目前區塊\n"

694 "p - 輸出目前區塊\n"

695 "P - 分頁輸出目前區塊\n"

696 +"> - 前往下一個檔案，在最後一個時回到第一個檔案\n"

697 +"< - 前往上一個檔案，在第一個時回到最後一個檔案\n"

698 "? - 顯示說明\n"

699 +"區塊摘要 - 區塊數：%d，選取數：%d，略過數：%d\n"

700 +

701 +#: add-patch.c

702 +msgid "'git apply' failed"

703 +msgstr "「git apply」失敗"

704 +

705 +#: add-patch.c

706 +msgid " (was: y)"

707 +msgstr " （原本是：y）"

708 +

709 +#: add-patch.c

710 +msgid " (was: n)"

711 +msgstr " （原本是：n）"

712

713 #: add-patch.c

714 #, c-format

@@ -690,10 +716,18 @@ msgid "Only one letter is expected, got '%s'"

716 msgstr "預期收到一個字母，卻收到「%s」"

717

718 #: add-patch.c

719 +msgid "No next file"

720 +msgstr "沒有下一個檔案"

721 +

722 +#: add-patch.c

723 +msgid "No previous file"

724 +msgstr "沒有上一個檔案"

725 +

726 +#: add-patch.c add-patch.c

727 msgid "No other hunk"

728 msgstr "沒有其他區塊"

729

696 -#: add-patch.c

730 +#: add-patch.c add-patch.c

731 msgid "No other undecided hunk"

732 msgstr "沒有其他未決區塊"

733

@@ -755,10 +789,6 @@ msgstr "對不起，無法編輯這個區塊"

789 msgid "Unknown command '%s' (use '?' for help)"

790 msgstr "未知命令「%s」（使用「?」獲取幫助）"

791

758 -#: add-patch.c

759 -msgid "'git apply' failed"

760 -msgstr "「git apply」失敗"

761 -

792 #: add-patch.c

793 msgid "No changes."

794 msgstr "沒有變更。"

@@ -767,6 +797,30 @@ msgstr "沒有變更。"

797 msgid "Only binary files changed."

798 msgstr "只有二進位檔案變更了。"

799

800 +#: add-patch.c

801 +#, c-format

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

803 +msgstr "暫存模式變更 [y,n,q,a,d%s,?]？ "

804 +

805 +#: add-patch.c

806 +#, c-format

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

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

809 +

810 +#: add-patch.c

811 +#, c-format

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

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

814 +

815 +#: add-patch.c

816 +#, c-format

817 +msgid "Stage this hunk [y,n,q,a,d%s,?]? "

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

819 +

820 +#: add-patch.c

821 +msgid "Revision does not refer to a commit"

822 +msgstr "修訂版指向的不是提交"

823 +

824 #: advice.c

825 #, c-format

826 msgid ""

@@ -940,8 +994,11 @@ msgstr "命令列以 \\ 結尾"

994 msgid "unclosed quote"

995 msgstr "未閉合的引號"

996

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

944 -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c

997 +#: alias.c builtin/cat-file.c builtin/notes.c builtin/notes.c

998 +#: builtin/notes.c builtin/notes.c builtin/notes.c

999 +#: builtin/notes.c builtin/notes.c builtin/notes.c

1000 +#: builtin/notes.c builtin/prune-packed.c builtin/receive-pack.c

1001 +#: builtin/refs.c builtin/repo.c builtin/tag.c

1002 #: t/helper/test-pkt-line.c

1003 msgid "too many arguments"

1004 msgstr "引數過多"

@@ -956,20 +1013,37 @@ msgstr "無法識別空白字元選項「%s」"

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

1014 msgstr "無法辨識空白字元忽略選項「%s」"

1015

959 -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c

960 -#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c

961 -#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c

962 -#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c

963 -#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c

964 -#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c

965 -#: builtin/reset.c builtin/rev-parse.c builtin/show-branch.c builtin/stash.c

966 -#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c

967 -#: range-diff.c revision.c

1016 +#: apply.c archive.c builtin/add.c builtin/add.c

1017 +#: builtin/add.c builtin/add.c builtin/branch.c

1018 +#: builtin/checkout-index.c builtin/checkout.c builtin/checkout.c

1019 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

1020 +#: builtin/clean.c builtin/clone.c builtin/clone.c

1021 +#: builtin/commit.c builtin/commit.c builtin/commit.c

1022 +#: builtin/commit.c builtin/commit.c builtin/describe.c

1023 +#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c

1024 +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

1025 +#: builtin/fetch.c builtin/help.c builtin/index-pack.c

1026 +#: builtin/init-db.c builtin/log.c builtin/log.c

1027 +#: builtin/ls-files.c builtin/merge-base.c builtin/merge-base.c

1028 +#: builtin/merge-tree.c builtin/merge.c builtin/merge.c

1029 +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

1030 +#: builtin/repack.c builtin/reset.c builtin/reset.c

1031 +#: builtin/rev-parse.c builtin/rev-parse.c builtin/rev-parse.c

1032 +#: builtin/show-branch.c builtin/show-branch.c builtin/stash.c

1033 +#: builtin/stash.c builtin/submodule--helper.c

1034 +#: builtin/submodule--helper.c builtin/tag.c builtin/tag.c

1035 +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

1036 +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

1037 +#: parse-options.c parse-options.c range-diff.c revision.c

1038 +#: revision.c revision.c revision.c revision.c

1039 +#: revision.c revision.c revision.c revision.c

1040 +#: revision.c revision.c revision.c revision.c

1041 +#: revision.c

1042 #, c-format

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

1044 msgstr "無法同時使用「%s」和「%s」選項"

1045

972 -#: apply.c

1046 +#: apply.c apply.c apply.c

1047 #, c-format

1048 msgid "'%s' outside a repository"

1049 msgstr "「%s」在版本庫之外"

@@ -994,14 +1068,30 @@ msgstr "regexec 回傳 %d，輸入為：%s"

1068

1069 #: apply.c

1070 #, c-format

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

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

1071 +msgid "unable to find filename in patch at %s:%d"

1072 +msgstr "無法在修補檔的 %s:%d 處找到檔案名稱"

1073 +

1074 +#: apply.c

1075 +#, c-format

1076 +msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d"

1077 +msgstr ""

1078 +"git apply：無效的 git-diff — 應為 /dev/null，但在 %2$s:%3$d 處得到 %1$s"

1079

1080 #: apply.c

1081 #, c-format

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

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

1084

1085 +#: apply.c

1086 +#, c-format

1087 +msgid "git apply: bad git-diff - inconsistent new filename at %s:%d"

1088 +msgstr "git apply：無效的 git-diff — %s:%d 處的新檔案名稱不一致"

1089 +

1090 +#: apply.c

1091 +#, c-format

1092 +msgid "git apply: bad git-diff - inconsistent old filename at %s:%d"

1093 +msgstr "git apply：無效的 git-diff — %s:%d 處的舊檔案名稱不一致"

1094 +

1095 #: apply.c

1096 #, c-format

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

@@ -1012,11 +1102,21 @@ msgstr "git apply：無效的 git-diff — 第 %d 列的新檔案名稱不一致

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

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

1104

1105 +#: apply.c

1106 +#, c-format

1107 +msgid "git apply: bad git-diff - expected /dev/null at %s:%d"

1108 +msgstr "git apply：無效的 git-diff — %s:%d 處預期是 /dev/null"

1109 +

1110 #: apply.c

1111 #, c-format

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

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

1114

1115 +#: apply.c

1116 +#, c-format

1117 +msgid "invalid mode at %s:%d: %s"

1118 +msgstr "%s:%d 處包含無效檔案模式：%s"

1119 +

1120 #: apply.c

1121 #, c-format

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

@@ -1027,6 +1127,17 @@ msgstr "第 %d 列包含無效檔案模式：%s"

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

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

1129

1130 +#: apply.c

1131 +#, c-format

1132 +msgid ""

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

1134 +"component at %s:%d"

1135 +msgid_plural ""

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

1137 +"components at %s:%d"

1138 +msgstr[0] ""

1139 +"移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（位置：%s:%d）"

1140 +

1141 #: apply.c

1142 #, c-format

1143 msgid ""

@@ -1037,6 +1148,11 @@ msgid_plural ""

1148 "components (line %d)"

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

1150

1151 +#: apply.c

1152 +#, c-format

1153 +msgid "git diff header lacks filename information at %s:%d"

1154 +msgstr "git diff 標頭缺少檔案名稱資訊（位置：%s:%d）"

1155 +

1156 #: apply.c

1157 #, c-format

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

@@ -1049,8 +1165,8 @@ msgstr "recount：遇到非預期的列：%.*s"

1165

1166 #: apply.c

1167 #, c-format

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

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

1168 +msgid "patch fragment without header at %s:%d: %.*s"

1169 +msgstr "%s:%d 處的修補檔區段沒有標頭：%.*s"

1170

1171 #: apply.c

1172 msgid "new file depends on old contents"

@@ -1062,8 +1178,8 @@ msgstr "刪除的檔案仍有內容"

1178

1179 #: apply.c

1180 #, c-format

1065 -msgid "corrupt patch at line %d"

1066 -msgstr "修補檔在第 %d 列發現損壞"

1181 +msgid "corrupt patch at %s:%d"

1182 +msgstr "修補檔在 %s:%d 處發現損壞"

1183

1184 #: apply.c

1185 #, c-format

@@ -1082,18 +1198,18 @@ msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"

1198

1199 #: apply.c

1200 #, c-format

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

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

1201 +msgid "corrupt binary patch at %s:%d: %.*s"

1202 +msgstr "二進位修補檔在 %s:%d 處有損壞：%.*s"

1203

1204 #: apply.c

1205 #, c-format

1090 -msgid "unrecognized binary patch at line %d"

1091 -msgstr "無法辨識第 %d 列的二進位修補檔"

1206 +msgid "unrecognized binary patch at %s:%d"

1207 +msgstr "無法辨識 %s:%d 處的二進位修補檔"

1208

1209 #: apply.c

1210 #, c-format

1095 -msgid "patch with only garbage at line %d"

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

1211 +msgid "patch with only garbage at %s:%d"

1212 +msgstr "修補檔案的 %s:%d 處只有垃圾資料"

1213

1214 #: apply.c

1215 #, c-format

@@ -1181,7 +1297,8 @@ msgstr "修補失敗：%s:%ld"

1297 msgid "cannot checkout %s"

1298 msgstr "無法簽出 %s"

1299

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

1300 +#: apply.c apply.c apply.c midx.c pack-mtimes.c

1301 +#: pack-revindex.c setup.c

1302 #, c-format

1303 msgid "failed to read %s"

1304 msgstr "無法讀取 %s"

@@ -1191,17 +1308,17 @@ msgstr "無法讀取 %s"

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

1309 msgstr "讀取符號連結背後的「%s」"

1310

1194 -#: apply.c

1311 +#: apply.c apply.c

1312 #, c-format

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

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

1315

1199 -#: apply.c

1316 +#: apply.c apply.c

1317 #, c-format

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

1319 msgstr "%s：不在索引中"

1320

1204 -#: apply.c

1321 +#: apply.c apply.c apply.c

1322 #, c-format

1323 msgid "%s: does not match index"

1324 msgstr "%s：與索引不符"

@@ -1215,7 +1332,7 @@ msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。"

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

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

1334

1218 -#: apply.c

1335 +#: apply.c apply.c

1336 #, c-format

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

1338 msgstr "無法讀取「%s」目前的內容"

@@ -1254,7 +1371,9 @@ msgstr "%s：錯誤類型"

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

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

1373

1257 -#: apply.c builtin/fast-import.c read-cache.c

1374 +#: apply.c apply.c builtin/fast-import.c

1375 +#: builtin/fast-import.c read-cache.c read-cache.c

1376 +#: read-cache.c

1377 #, c-format

1378 msgid "invalid path '%s'"

1379 msgstr "路徑「%s」無效"

@@ -1279,7 +1398,7 @@ msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符"

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

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

1400

1282 -#: apply.c

1401 +#: apply.c apply.c

1402 #, c-format

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

1404 msgstr "受影響的檔案「%s」在符號連結後"

@@ -1339,12 +1458,12 @@ msgstr "無法對剛建立的檔案「%s」執行 stat"

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

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

1460

1342 -#: apply.c

1461 +#: apply.c apply.c

1462 #, c-format

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

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

1465

1347 -#: apply.c builtin/bisect.c builtin/gc.c

1466 +#: apply.c builtin/bisect.c builtin/gc.c builtin/gc.c

1467 #, c-format

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

1469 msgstr "無法寫入「%s」"

@@ -1374,7 +1493,7 @@ msgid "Applying patch %%s with %d reject..."

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

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

1495

1377 -#: apply.c

1496 +#: apply.c apply.c apply.c

1497 #, c-format

1498 msgid "cannot open %s"

1499 msgstr "無法開啟 %s"

@@ -1407,6 +1526,16 @@ msgstr "輸入沒有有效的修補檔內容（傳入「--allow-empty」允許

1526 msgid "unable to read index file"

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

1528

1529 +#: apply.c

1530 +#, c-format

1531 +msgid "option -p expects a non-negative integer, got '%s'"

1532 +msgstr "選項 -p 預期是一個非負數整數，但卻得到「%s」"

1533 +

1534 +#: apply.c

1535 +#, c-format

1536 +msgid "unable to normalize directory: '%s'"

1537 +msgstr "無法標準化目錄：「%s」"

1538 +

1539 #: apply.c

1540 #, c-format

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

@@ -1418,7 +1547,7 @@ msgid "squelched %d whitespace error"

1547 msgid_plural "squelched %d whitespace errors"

1548 msgstr[0] "抑制下仍有 %d 個空白字元誤用"

1549

1421 -#: apply.c

1550 +#: apply.c apply.c

1551 #, c-format

1552 msgid "%d line adds whitespace errors."

1553 msgid_plural "%d lines add whitespace errors."

@@ -1518,8 +1647,9 @@ msgstr "路徑以 NUL 字元分隔"

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

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

1649

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

1522 -#: builtin/rebase.c

1650 +#: apply.c builtin/am.c builtin/am.c

1651 +#: builtin/interpret-trailers.c builtin/interpret-trailers.c

1652 +#: builtin/pack-objects.c builtin/rebase.c

1653 msgid "action"

1654 msgstr "動作"

1655

@@ -1527,7 +1657,7 @@ msgstr "動作"

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

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

1659

1530 -#: apply.c

1660 +#: apply.c apply.c

1661 msgid "ignore changes in whitespace when finding context"

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

1663

@@ -1582,6 +1712,7 @@ msgid "unsupported file mode: 0%o (SHA1: %s)"

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

1713

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

1715 +#: builtin/pack-objects.c

1716 #, c-format

1717 msgid "deflate error (%d)"

1718 msgstr "壓縮錯誤 (%d)"

@@ -1629,7 +1760,9 @@ msgstr ""

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

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

1762

1632 -#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c

1763 +#: archive.c archive.c builtin/fast-import.c

1764 +#: builtin/fast-import.c builtin/gc.c builtin/notes.c

1765 +#: builtin/tag.c

1766 #, c-format

1767 msgid "cannot read '%s'"

1768 msgstr "無法讀取「%s」"

@@ -1639,7 +1772,7 @@ msgstr "無法讀取「%s」"

1772 msgid "pathspec '%s' matches files outside the current directory"

1773 msgstr "符合路徑規格「%s」的檔案在目前目錄之外"

1774

1642 -#: archive.c builtin/add.c builtin/rm.c

1775 +#: archive.c builtin/add.c builtin/add.c builtin/rm.c

1776 #, c-format

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

1778 msgstr "路徑規格「%s」未符合任何檔案"

@@ -1705,13 +1838,17 @@ msgstr "前綴"

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

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

1840

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

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

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

1841 +#: archive.c archive.c builtin/blame.c builtin/blame.c

1842 +#: builtin/blame.c builtin/commit-tree.c builtin/config.c

1843 +#: builtin/fast-export.c builtin/fast-export.c

1844 +#: builtin/fast-export.c builtin/gc.c builtin/gc.c

1845 +#: builtin/grep.c builtin/hash-object.c builtin/ls-files.c

1846 +#: builtin/ls-files.c builtin/notes.c builtin/notes.c

1847 +#: builtin/read-tree.c parse-options.h

1848 msgid "file"

1849 msgstr "file"

1850

1714 -#: archive.c

1851 +#: archive.c archive.c

1852 msgid "add untracked file to archive"

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

1854

@@ -1731,8 +1868,8 @@ msgstr "讀取工作目錄中的 .gitattributes"

1868 msgid "report archived files on stderr"

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

1870

1734 -#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c

1735 -#: builtin/pull.c

1871 +#: archive.c builtin/clone.c builtin/fetch.c

1872 +#: builtin/pack-objects.c builtin/pack-objects.c builtin/pull.c

1873 msgid "time"

1874 msgstr "time"

1875

@@ -1748,7 +1885,8 @@ msgstr "設定壓縮級別"

1885 msgid "list supported archive formats"

1886 msgstr "列出支援的封存格式"

1887

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

1888 +#: archive.c builtin/archive.c builtin/clone.c builtin/clone.c

1889 +#: builtin/submodule--helper.c builtin/submodule--helper.c

1890 msgid "repo"

1891 msgstr "repo"

1892

@@ -1756,7 +1894,8 @@ msgstr "repo"

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

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

1896

1759 -#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c

1897 +#: archive.c builtin/archive.c builtin/difftool.c

1898 +#: builtin/notes.c

1899 msgid "command"

1900 msgstr "command"

1901

@@ -1768,10 +1907,18 @@ msgstr "遠端 git-upload-archive 命令的路徑"

1907 msgid "Unexpected option --remote"

1908 msgstr "非預期選項 --remote"

1909

1771 -#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c

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

1773 -#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c

1774 -#: revision.c

1910 +#: archive.c builtin/add.c builtin/add.c builtin/add.c

1911 +#: builtin/add.c builtin/add.c builtin/checkout.c

1912 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

1913 +#: builtin/clone.c builtin/clone.c builtin/commit.c

1914 +#: builtin/commit.c builtin/commit.c builtin/fast-export.c

1915 +#: builtin/index-pack.c builtin/log.c builtin/reset.c

1916 +#: builtin/reset.c builtin/reset.c builtin/reset.c

1917 +#: builtin/reset.c builtin/rm.c builtin/stash.c

1918 +#: builtin/stash.c builtin/stash.c builtin/stash.c

1919 +#: builtin/stash.c builtin/stash.c builtin/stash.c

1920 +#: builtin/worktree.c builtin/worktree.c fetch-pack.c

1921 +#: http-fetch.c http-fetch.c revision.c

1922 #, c-format

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

1924 msgstr "「%s」選項需要「%s」"

@@ -1850,8 +1997,10 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"

1997 msgid "unable to stat '%s'"

1998 msgstr "無法 stat「%s」"

1999

1853 -#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c

1854 -#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c

2000 +#: bisect.c builtin/cat-file.c builtin/cat-file.c

2001 +#: builtin/index-pack.c builtin/notes.c builtin/pack-objects.c

2002 +#: builtin/pack-objects.c builtin/pack-objects.c combine-diff.c

2003 +#: object-file.c object-file.c rerere.c

2004 #, c-format

2005 msgid "unable to read %s"

2006 msgstr "無法讀取 %s"

@@ -1986,9 +2135,14 @@ msgstr "--contents 和 --reverse 不能混用。"

2135 msgid "--reverse and --first-parent together require specified latest commit"

2136 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

2137

1989 -#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c

1990 -#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c

1991 -#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c

2138 +#: blame.c builtin/bisect.c builtin/bisect.c

2139 +#: builtin/commit.c builtin/fast-export.c builtin/log.c

2140 +#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c

2141 +#: builtin/merge.c builtin/pack-objects.c builtin/pack-objects.c

2142 +#: builtin/pack-objects.c builtin/pack-objects.c

2143 +#: builtin/shortlog.c midx-write.c pack-bitmap.c

2144 +#: pack-bitmap.c remote.c sequencer.c sequencer.c

2145 +#: submodule.c

2146 msgid "revision walk setup failed"

2147 msgstr "修訂版遍歷設定失敗"

2148

@@ -2063,10 +2217,12 @@ msgid "not tracking: ambiguous information for ref '%s'"

2217 msgstr "未追蹤：「%s」引用有歧義"

2218

2219 # 譯者：為保證在輸出中對齊，注意調整句中空格！

2220 +#. #-#-#-#-# branch.c.po #-#-#-#-#

2221 #. TRANSLATORS: This is a line listing a remote with duplicate

2222 #. refspecs in the advice message below. For RTL languages you'll

2223 #. probably want to swap the "%s" and leading " " space around.

2224 #.

2225 +#. #-#-#-#-# object-name.c.po #-#-#-#-#

2226 #. TRANSLATORS: This is line item of ambiguous object output

2227 #. from describe_ambiguous_object() above. For RTL languages

2228 #. you'll probably want to swap the "%s" and leading " " space

@@ -2148,7 +2304,8 @@ msgstr ""

2304 "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n"

2305 "推送分支並設定和上游的關聯。"

2306

2151 -#: branch.c builtin/replace.c

2307 +#: branch.c builtin/replace.c builtin/replace.c

2308 +#: builtin/replace.c builtin/replace.c

2309 #, c-format

2310 msgid "not a valid object name: '%s'"

2311 msgstr "物件名稱無效：「%s」"

@@ -2177,7 +2334,7 @@ msgstr ""

2334 "您可以使用「git checkout --no-recurse-submodules %s && git submodule update "

2335 "--init」命令嘗試更新子模組"

2336

2180 -#: branch.c

2337 +#: branch.c branch.c

2338 #, c-format

2339 msgid "submodule '%s': cannot create branch '%s'"

2340 msgstr "「%s」子模組：無法建立「%s」分支"

@@ -2227,14 +2384,15 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2384 msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n"

2385

2386 #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c

2230 -#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c

2231 -#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c

2387 +#: builtin/prune-packed.c builtin/pull.c builtin/push.c

2388 +#: builtin/remote.c builtin/rm.c builtin/send-pack.c

2389 +#: builtin/sparse-checkout.c

2390 msgid "dry run"

2391 msgstr "測試執行"

2392

2393 #: builtin/add.c builtin/check-ignore.c builtin/commit.c

2236 -#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c

2237 -#: builtin/read-tree.c builtin/refs.c

2394 +#: builtin/count-objects.c builtin/fsck.c builtin/log.c

2395 +#: builtin/mv.c builtin/read-tree.c builtin/refs.c

2396 msgid "be verbose"

2397 msgstr "詳細輸出"

2398

@@ -2246,6 +2404,11 @@ msgstr "互動式挑選"

2404 msgid "select hunks interactively"

2405 msgstr "互動式選取區塊"

2406

2407 +#: builtin/add.c builtin/checkout.c builtin/reset.c

2408 +#: builtin/stash.c builtin/stash.c

2409 +msgid "auto advance to the next file when selecting hunks interactively"

2410 +msgstr "在互動式選取區塊時自動前往下一個檔案"

2411 +

2412 #: builtin/add.c

2413 msgid "edit current diff and apply"

2414 msgstr "編輯目前差異並套用"

@@ -2342,8 +2505,10 @@ msgstr "如果您確定想要加入它們，請使用 -f。"

2505 msgid "adding files failed"

2506 msgstr "加入檔案失敗"

2507

2345 -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2346 -#: builtin/stash.c

2508 +#: builtin/add.c builtin/add.c builtin/checkout.c

2509 +#: builtin/checkout.c builtin/commit.c builtin/commit.c

2510 +#: builtin/reset.c builtin/reset.c builtin/stash.c

2511 +#: builtin/stash.c builtin/stash.c builtin/stash.c

2512 #, c-format

2513 msgid "'%s' cannot be negative"

2514 msgstr "「%s」不能是負數"

@@ -2353,8 +2518,8 @@ msgstr "「%s」不能是負數"

2518 msgid "--chmod param '%s' must be either -x or +x"

2519 msgstr "--chmod 的參數「%s」必須是 -x 或 +x"

2520

2356 -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2357 -#: builtin/rm.c builtin/stash.c

2521 +#: builtin/add.c builtin/checkout.c builtin/commit.c

2522 +#: builtin/reset.c builtin/rm.c builtin/stash.c

2523 #, c-format

2524 msgid "'%s' and pathspec arguments cannot be used together"

2525 msgstr "「%s」和路徑規格引數不得同時使用"

@@ -2368,15 +2533,19 @@ msgstr "沒有指定，亦未加入檔案。\n"

2533 msgid "Maybe you wanted to say 'git add .'?"

2534 msgstr "也許您想要執行的是「git add .」？"

2535

2371 -#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c

2372 -#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c

2373 -#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c

2374 -#: rerere.c submodule.c

2536 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c

2537 +#: builtin/checkout.c builtin/clean.c builtin/commit.c

2538 +#: builtin/diff-tree.c builtin/grep.c builtin/mv.c

2539 +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c

2540 +#: builtin/submodule--helper.c read-cache.c read-cache.c

2541 +#: rerere.c rerere.c rerere.c submodule.c

2542 msgid "index file corrupt"

2543 msgstr "索引檔案損壞"

2544

2378 -#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c

2379 -#: builtin/commit.c builtin/stash.c merge.c rerere.c

2545 +#: builtin/add.c builtin/am.c builtin/am.c builtin/checkout.c

2546 +#: builtin/checkout.c builtin/clone.c builtin/commit.c

2547 +#: builtin/commit.c builtin/commit.c builtin/history.c

2548 +#: builtin/stash.c merge.c rerere.c

2549 msgid "unable to write new index file"

2550 msgstr "無法寫入新的索引檔案"

2551

@@ -2385,14 +2554,18 @@ msgstr "無法寫入新的索引檔案"

2554 msgid "bad action '%s' for '%s'"

2555 msgstr "「%s」動作對「%s」無效"

2556

2388 -#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2389 -#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c

2390 -#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c

2557 +#: builtin/am.c builtin/am.c builtin/am.c builtin/blame.c

2558 +#: builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2559 +#: builtin/pack-objects.c builtin/pull.c builtin/pull.c

2560 +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c

2561 +#: environment.c gpg-interface.c gpg-interface.c ls-refs.c

2562 +#: parallel-checkout.c sequencer.c setup.c setup.c setup.c

2563 #, c-format

2564 msgid "invalid value for '%s': '%s'"

2565 msgstr "「%s」的值無效：「%s」"

2566

2567 #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2568 +#: sequencer.c sequencer.c sequencer.c trailer.c

2569 #, c-format

2570 msgid "could not read '%s'"

2571 msgstr "無法讀取「%s」"

@@ -2401,6 +2574,7 @@ msgstr "無法讀取「%s」"

2574 msgid "could not parse author script"

2575 msgstr "無法解析作者文稿"

2576

2577 +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2578 #: builtin/am.c builtin/replace.c commit.c sequencer.c

2579 #, c-format

2580 msgid "could not parse %s"

@@ -2425,12 +2599,14 @@ msgstr "從「%s」複製註解到「%s」失敗"

2599 msgid "fseek failed"

2600 msgstr "fseek 失敗"

2601

2428 -#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c

2602 +#: builtin/am.c builtin/am.c builtin/rebase.c sequencer.c

2603 +#: wrapper.c wrapper.c

2604 #, c-format

2605 msgid "could not open '%s' for reading"

2606 msgstr "無法開啟「%s」進行讀取"

2607

2433 -#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c

2608 +#: builtin/am.c builtin/rebase.c editor.c sequencer.c

2609 +#: wrapper.c wrapper.c

2610 #, c-format

2611 msgid "could not open '%s' for writing"

2612 msgstr "無法開啟「%s」進行寫入"

@@ -2448,7 +2624,7 @@ msgstr "一次只能套用一個 StGIT 修補檔序列"

2624 msgid "invalid timestamp"

2625 msgstr "無效的時間戳"

2626

2451 -#: builtin/am.c

2627 +#: builtin/am.c builtin/am.c

2628 msgid "invalid Date line"

2629 msgstr "無效的 Date 列"

2630

@@ -2504,7 +2680,8 @@ msgstr "在提交 %s 中缺少作者列"

2680 msgid "invalid ident line: %.*s"

2681 msgstr "ident 列無效：%.*s"

2682

2507 -#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c

2683 +#: builtin/am.c builtin/checkout.c builtin/clone.c

2684 +#: commit-graph.c

2685 #, c-format

2686 msgid "unable to parse commit %s"

2687 msgstr "無法解析 %s 提交"

@@ -2541,11 +2718,12 @@ msgstr "git write-tree 無法寫入樹狀物件"

2718 msgid "applying to an empty history"

2719 msgstr "正在套用至空白歷史記錄上"

2720

2544 -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c

2721 +#: builtin/am.c builtin/commit.c builtin/merge.c

2722 +#: builtin/merge.c replay.c sequencer.c

2723 msgid "failed to write commit object"

2724 msgstr "無法寫入提交物件"

2725

2548 -#: builtin/am.c

2726 +#: builtin/am.c builtin/am.c

2727 #, c-format

2728 msgid "cannot resume: %s does not exist."

2729 msgstr "無法繼續：%s 不存在。"

@@ -2587,7 +2765,7 @@ msgstr "建立空白提交：%.*s"

2765 msgid "Patch is empty."

2766 msgstr "修補檔空白。"

2767

2590 -#: builtin/am.c

2768 +#: builtin/am.c builtin/am.c

2769 #, c-format

2770 msgid "Applying: %.*s"

2771 msgstr "套用：%.*s"

@@ -2630,12 +2808,13 @@ msgstr ""

2808 "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n"

2809 "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。"

2810

2633 -#: builtin/am.c builtin/reset.c

2811 +#: builtin/am.c builtin/am.c builtin/am.c builtin/reset.c

2812 +#: builtin/reset.c

2813 #, c-format

2814 msgid "Could not parse object '%s'."

2815 msgstr "無法解析物件「%s」。"

2816

2638 -#: builtin/am.c

2817 +#: builtin/am.c builtin/am.c

2818 msgid "failed to clean index"

2819 msgstr "無法清除索引"

2820

@@ -2676,8 +2855,8 @@ msgstr "歷史遺留選項——無作用"

2855 msgid "allow fall back on 3way merging if needed"

2856 msgstr "必要時允許回復至三方合併"

2857

2679 -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c

2680 -#: builtin/stash.c

2858 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c

2859 +#: builtin/repack.c builtin/stash.c

2860 msgid "be quiet"

2861 msgstr "靜默模式"

2862

@@ -2713,21 +2892,30 @@ msgstr "截掉裁切線前的所有內容"

2892 msgid "pass it through git-mailinfo"

2893 msgstr "透過 git-mailinfo 傳入"

2894

2895 +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2896 +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2897 #: builtin/am.c

2898 msgid "pass it through git-apply"

2899 msgstr "透過 git-apply 傳入"

2900

2720 -#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c

2721 -#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c

2722 -#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h

2901 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c

2902 +#: builtin/fmt-merge-msg.c builtin/grep.c builtin/merge.c

2903 +#: builtin/pull.c builtin/pull.c builtin/pull.c

2904 +#: builtin/rebase.c builtin/repack.c builtin/repack.c

2905 +#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c

2906 +#: builtin/tag.c parse-options.h parse-options.h

2907 +#: parse-options.h

2908 msgid "n"

2909 msgstr "n"

2910

2726 -#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c

2727 -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c

2728 -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c

2729 -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c

2730 -#: builtin/verify-tag.c

2911 +#: builtin/am.c builtin/branch.c builtin/bugreport.c

2912 +#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c

2913 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c

2914 +#: builtin/init-db.c builtin/ls-files.c builtin/ls-tree.c

2915 +#: builtin/refs.c builtin/replace.c builtin/repo.c

2916 +#: builtin/repo.c builtin/submodule--helper.c

2917 +#: builtin/submodule--helper.c builtin/submodule--helper.c

2918 +#: builtin/tag.c builtin/verify-tag.c

2919 msgid "format"

2920 msgstr "format"

2921

@@ -2779,8 +2967,9 @@ msgstr "將作者日期當作提交日期"

2967 msgid "use current timestamp for author date"

2968 msgstr "把目前時間戳當作是作者日期"

2969

2782 -#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c

2783 -#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c

2970 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c

2971 +#: builtin/merge.c builtin/pull.c builtin/rebase.c

2972 +#: builtin/revert.c builtin/tag.c

2973 msgid "key-id"

2974 msgstr "key-id"

2975

@@ -2871,6 +3060,12 @@ msgstr "一次請求的最小物件數量"

3060 msgid "Restrict the missing objects to the current sparse-checkout"

3061 msgstr "將缺少的物件限制於目前的稀疏簽出"

3062

3063 +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c

3064 +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c

3065 +#, c-format

3066 +msgid "unrecognized argument: %s"

3067 +msgstr "不認識的引數：%s"

3068 +

3069 #: builtin/bisect.c

3070 msgid ""

3071 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"

@@ -3050,7 +3245,7 @@ msgstr ""

3245 msgid "could not open '%s' for appending"

3246 msgstr "無法開啟「%s」進行附加"

3247

3053 -#: builtin/bisect.c

3248 +#: builtin/bisect.c builtin/bisect.c

3249 msgid "'' is not a valid term"

3250 msgstr "「」不是有效術語"

3251

@@ -3104,7 +3299,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"

3299 msgid "'git bisect %s' can take only one argument."

3300 msgstr "「git bisect %s」只取一個引數。"

3301

3107 -#: builtin/bisect.c

3302 +#: builtin/bisect.c builtin/bisect.c

3303 #, c-format

3304 msgid "Bad rev input: %s"

3305 msgstr "rev 輸入格式錯誤：%s"

@@ -3215,7 +3410,7 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3410 msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"

3411 msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"

3412

3218 -#: builtin/blame.c

3413 +#: builtin/blame.c builtin/blame.c

3414 msgid "<rev-opts> are documented in git-rev-list(1)"

3415 msgstr "<rev-opts> 的文件在 git-rev-list(1)"

3416

@@ -3228,7 +3423,7 @@ msgstr "預期是個顏色：%s"

3423 msgid "must end with a color"

3424 msgstr "結尾必須是一個顏色"

3425

3231 -#: builtin/blame.c diff.c merge-ort.c transport.c

3426 +#: builtin/blame.c diff.c diff.c merge-ort.c transport.c

3427 #, c-format

3428 msgid "unknown value for config '%s': %s"

3429 msgstr "設定 '%s' 的取值未知：%s"

@@ -3261,8 +3456,9 @@ msgstr "不把根提交當作邊界（預設值：off）"

3456 msgid "show work cost statistics"

3457 msgstr "顯示工作量統計"

3458

3264 -#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c

3265 -#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c

3459 +#: builtin/blame.c builtin/checkout.c builtin/clone.c

3460 +#: builtin/commit-graph.c builtin/commit-graph.c builtin/fetch.c

3461 +#: builtin/merge.c builtin/multi-pack-index.c builtin/pull.c

3462 #: builtin/push.c builtin/remote.c builtin/send-pack.c

3463 msgid "force progress reporting"

3464 msgstr "強制顯示進度報告"

@@ -3351,7 +3547,7 @@ msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"

3547 msgid "use <file>'s contents as the final image"

3548 msgstr "將 <file> 的內容當成是最終印象"

3549

3354 -#: builtin/blame.c

3550 +#: builtin/blame.c builtin/blame.c

3551 msgid "score"

3552 msgstr "score"

3553

@@ -3543,12 +3739,12 @@ msgstr "%s 工作區的 HEAD 指標未被更新"

3739 msgid "invalid branch name: '%s'"

3740 msgstr "分支名稱無效：「%s」"

3741

3546 -#: builtin/branch.c

3742 +#: builtin/branch.c builtin/branch.c builtin/branch.c

3743 #, c-format

3744 msgid "no commit on branch '%s' yet"

3745 msgstr "分支「%s」尚無提交"

3746

3551 -#: builtin/branch.c

3747 +#: builtin/branch.c builtin/branch.c

3748 #, c-format

3749 msgid "no branch named '%s'"

3750 msgstr "沒有名為「%s」的分支"

@@ -3607,7 +3803,8 @@ msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支"

3803 msgid "suppress informational messages"

3804 msgstr "不顯示資訊訊息"

3805

3610 -#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c

3806 +#: builtin/branch.c builtin/checkout.c

3807 +#: builtin/submodule--helper.c

3808 msgid "set branch tracking configuration"

3809 msgstr "設定分支追蹤組態"

3810

@@ -3635,11 +3832,11 @@ msgstr "使用彩色輸出"

3832 msgid "act on remote-tracking branches"

3833 msgstr "作用於遠端追蹤分支"

3834

3638 -#: builtin/branch.c

3835 +#: builtin/branch.c builtin/branch.c

3836 msgid "print only branches that contain the commit"

3837 msgstr "只輸出包含此提交的分支"

3838

3642 -#: builtin/branch.c

3839 +#: builtin/branch.c builtin/branch.c

3840 msgid "print only branches that don't contain the commit"

3841 msgstr "只輸出不包含此提交的分支"

3842

@@ -3711,7 +3908,9 @@ msgstr "只輸出尚未合併的分支"

3908 msgid "list branches in columns"

3909 msgstr "以行的形式列出分支"

3910

3714 -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c

3911 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c

3912 +#: builtin/notes.c builtin/notes.c builtin/notes.c

3913 +#: builtin/tag.c

3914 msgid "object"

3915 msgstr "object"

3916

@@ -3727,8 +3926,8 @@ msgstr "排序和過濾不區分大小寫"

3926 msgid "recurse through submodules"

3927 msgstr "在子模組中遞迴"

3928

3730 -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c

3731 -#: builtin/tag.c builtin/verify-tag.c

3929 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c

3930 +#: builtin/ls-tree.c builtin/tag.c builtin/verify-tag.c

3931 msgid "format to use for the output"

3932 msgstr "輸出格式"

3933

@@ -3751,7 +3950,7 @@ msgstr ""

3950 msgid "--recurse-submodules can only be used to create branches"

3951 msgstr "--recurse-submodules 只能用來建立分支"

3952

3754 -#: builtin/branch.c

3953 +#: builtin/branch.c builtin/branch.c

3954 msgid "branch name required"

3955 msgstr "必須提供分支名稱"

3956

@@ -3789,7 +3988,7 @@ msgid ""

3988 "could not set upstream of HEAD to %s when it does not point to any branch"

3989 msgstr "HEAD 不指向任何分支時無法將其上游設為 %s"

3990

3792 -#: builtin/branch.c

3991 +#: builtin/branch.c builtin/branch.c

3992 #, c-format

3993 msgid "no such branch '%s'"

3994 msgstr "無「%s」分支"

@@ -3887,8 +4086,11 @@ msgstr ""

4086 "請檢閱臭蟲報告下方的剩餘部分。\n"

4087 "您可刪除任何您不想分享的地方。\n"

4088

3890 -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c

3891 -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h

4089 +#: builtin/bugreport.c builtin/commit.c builtin/commit.c

4090 +#: builtin/commit.c builtin/fast-export.c builtin/fast-export.c

4091 +#: builtin/fast-export.c builtin/fast-export.c

4092 +#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c

4093 +#: parse-options.h

4094 msgid "mode"

4095 msgstr "mode"

4096

@@ -3966,7 +4168,7 @@ msgstr "需要提供 <file> 引數"

4168 msgid "do not show progress meter"

4169 msgstr "不顯示進度列"

4170

3969 -#: builtin/bundle.c builtin/pack-objects.c

4171 +#: builtin/bundle.c builtin/bundle.c builtin/pack-objects.c

4172 msgid "show progress meter"

4173 msgstr "顯示進度列"

4174

@@ -4180,7 +4382,8 @@ msgstr "「%s=<%s>」需要「%s」或「%s」"

4382 msgid "path|tree-ish"

4383 msgstr "path|tree-ish"

4384

4183 -#: builtin/cat-file.c

4385 +#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c

4386 +#: builtin/cat-file.c builtin/cat-file.c

4387 #, c-format

4388 msgid "'%s' requires a batch mode"

4389 msgstr "「%s」需要批次處理模式"

@@ -4194,7 +4397,7 @@ msgstr "「-%c」與批次處理模式不相容"

4397 msgid "batch modes take no arguments"

4398 msgstr "批次處理模式不取引數"

4399

4197 -#: builtin/cat-file.c

4400 +#: builtin/cat-file.c builtin/cat-file.c

4401 #, c-format

4402 msgid "<rev> required with '%s'"

4403 msgstr "「%s」需要 <rev>"

@@ -4247,7 +4450,8 @@ msgstr "<tree-ish>"

4450 msgid "which tree-ish to check attributes at"

4451 msgstr "要檢查屬性的樹狀物件指示元"

4452

4250 -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c

4453 +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c

4454 +#: builtin/worktree.c

4455 msgid "suppress progress reporting"

4456 msgstr "不顯示進度報告"

4457

@@ -4311,8 +4515,10 @@ msgstr "未指定聯絡地址"

4515 msgid "git checkout--worker [<options>]"

4516 msgstr "git checkout--worker [<options>]"

4517

4314 -#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c

4518 +#: builtin/checkout--worker.c builtin/checkout-index.c

4519 +#: builtin/column.c builtin/column.c builtin/submodule--helper.c

4520 #: builtin/submodule--helper.c builtin/worktree.c

4521 +#: builtin/worktree.c

4522 msgid "string"

4523 msgstr "string"

4524

@@ -4364,28 +4570,12 @@ msgstr "將內容寫入暫存檔"

4570 msgid "copy out the files from named stage"

4571 msgstr "從指定暫存區中拷出檔案"

4572

4367 -#: builtin/checkout.c

4368 -msgid "git checkout [<options>] <branch>"

4369 -msgstr "git checkout [<options>] <branch>"

4370 -

4371 -#: builtin/checkout.c

4372 -msgid "git checkout [<options>] [<branch>] -- <file>..."

4373 -msgstr "git checkout [<options>] [<branch>] -- <file>..."

4374 -

4375 -#: builtin/checkout.c

4376 -msgid "git switch [<options>] [<branch>]"

4377 -msgstr "git switch [<options>] [<branch>]"

4378 -

4379 -#: builtin/checkout.c

4380 -msgid "git restore [<options>] [--source=<branch>] <file>..."

4381 -msgstr "git restore [<options>] [--source=<branch>] <file>..."

4382 -

4383 -#: builtin/checkout.c

4573 +#: builtin/checkout.c builtin/checkout.c

4574 #, c-format

4575 msgid "path '%s' does not have our version"

4576 msgstr "「%s」路徑沒有我們的版本"

4577

4388 -#: builtin/checkout.c

4578 +#: builtin/checkout.c builtin/checkout.c

4579 #, c-format

4580 msgid "path '%s' does not have their version"

4581 msgstr "「%s」路徑沒有他們的版本"

@@ -4428,6 +4618,7 @@ msgid "Updated %d path from the index"

4618 msgid_plural "Updated %d paths from the index"

4619 msgstr[0] "已從索引區更新 %d 個路徑"

4620

4621 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4622 #: builtin/checkout.c

4623 #, c-format

4624 msgid "'%s' cannot be used with updating paths"

@@ -4448,7 +4639,7 @@ msgstr "「%s」或「%s」皆未指定"

4639 msgid "'%s' must be used when '%s' is not specified"

4640 msgstr "未指定「%2$s」時，必須使用「%1$s」"

4641

4451 -#: builtin/checkout.c

4642 +#: builtin/checkout.c builtin/checkout.c

4643 #, c-format

4644 msgid "'%s' or '%s' cannot be used with %s"

4645 msgstr "「%s」或「%s」不能與 %s 同時使用"

@@ -4458,13 +4649,16 @@ msgstr "「%s」或「%s」不能與 %s 同時使用"

4649 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"

4650 msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用"

4651

4461 -#: builtin/checkout.c

4652 +#: builtin/checkout.c builtin/checkout.c

4653 #, c-format

4654 msgid "path '%s' is unmerged"

4655 msgstr "路徑「%s」未合併"

4656

4466 -#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c

4467 -#: merge-ort.c reset.c sequencer.c tree-walk.c

4657 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4658 +#: builtin/grep.c builtin/grep.c builtin/grep.c

4659 +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

4660 +#: builtin/reset.c merge-ort.c reset.c sequencer.c

4661 +#: sequencer.c tree-walk.c

4662 #, c-format

4663 msgid "unable to read tree (%s)"

4664 msgstr "無法讀取樹狀物件（%s）"

@@ -4491,7 +4685,7 @@ msgstr "無法對「%s」執行 reflog 動作：%s\n"

4685 msgid "HEAD is now at"

4686 msgstr "HEAD 目前位於"

4687

4494 -#: builtin/checkout.c builtin/clone.c

4688 +#: builtin/checkout.c builtin/clone.c builtin/clone.c

4689 msgid "unable to update HEAD"

4690 msgstr "無法更新 HEAD"

4691

@@ -4510,7 +4704,7 @@ msgstr "已經位於「%s」\n"

4704 msgid "Switched to and reset branch '%s'\n"

4705 msgstr "已切換並重設分支「%s」\n"

4706

4513 -#: builtin/checkout.c

4707 +#: builtin/checkout.c builtin/checkout.c

4708 #, c-format

4709 msgid "Switched to a new branch '%s'\n"

4710 msgstr "已切換至新分支「%s」\n"

@@ -4573,7 +4767,7 @@ msgstr "在修訂版遍歷時遇到內部錯誤"

4767 msgid "Previous HEAD position was"

4768 msgstr "之前的 HEAD 指標位置在"

4769

4576 -#: builtin/checkout.c

4770 +#: builtin/checkout.c builtin/checkout.c

4771 msgid "You are on a branch yet to be born"

4772 msgstr "您正位於一個尚未初始化的分支"

4773

@@ -4587,11 +4781,12 @@ msgstr ""

4781 "請使用 --（和可選的 --no-guess）來消除歧義"

4782

4783 #: builtin/checkout.c

4784 +#, c-format

4785 msgid ""

4786 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

4787 "you can do so by fully qualifying the name with the --track option:\n"

4788 "\n"

4594 -" git checkout --track origin/<name>\n"

4789 +" git %s --track origin/<name>\n"

4790 "\n"

4791 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"

4792 "one remote, e.g. the 'origin' remote, consider setting\n"

@@ -4600,7 +4795,7 @@ msgstr ""

4795 "如果您想要簽出遠端追蹤分支，例如「origin」，\n"

4796 "您可以使用 --track 選項寫出全名：\n"

4797 "\n"

4603 -" git checkout --track origin/<name>\n"

4798 +" git %s --track origin/<name>\n"

4799 "\n"

4800 "如果您平時比較想要使用模糊的簡短分支名稱 <name>，\n"

4801 "而不太想寫如「origin」的遠端版本庫名稱，\n"

@@ -4620,12 +4815,12 @@ msgstr "預期只有一個引用"

4815 msgid "only one reference expected, %d given."

4816 msgstr "預期只有一個引用，卻提供了 %d 個。"

4817

4623 -#: builtin/checkout.c builtin/worktree.c

4818 +#: builtin/checkout.c builtin/worktree.c builtin/worktree.c

4819 #, c-format

4820 msgid "invalid reference: %s"

4821 msgstr "無效引用：%s"

4822

4628 -#: builtin/checkout.c

4823 +#: builtin/checkout.c builtin/checkout.c

4824 #, c-format

4825 msgid "reference is not a tree: %s"

4826 msgstr "引用不是樹狀物件：%s"

@@ -4640,7 +4835,7 @@ msgstr "預期收到分支，卻收到標籤「%s」"

4835 msgid "a branch is expected, got remote branch '%s'"

4836 msgstr "預期收到分支，卻收到遠端分支「%s」"

4837

4643 -#: builtin/checkout.c

4838 +#: builtin/checkout.c builtin/checkout.c

4839 #, c-format

4840 msgid "a branch is expected, got '%s'"

4841 msgstr "預期收到分支，卻收到「%s」"

@@ -4703,7 +4898,7 @@ msgstr "在進行二分搜尋時切換分支"

4898 msgid "paths cannot be used with switching branches"

4899 msgstr "切換分支時不能指定路徑"

4900

4706 -#: builtin/checkout.c

4901 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4902 #, c-format

4903 msgid "'%s' cannot be used with switching branches"

4904 msgstr "切換分支時不能指定「%s」"

@@ -4713,7 +4908,8 @@ msgstr "切換分支時不能指定「%s」"

4908 msgid "'%s' needs the paths to check out"

4909 msgstr "「%s」需要指定要簽出的路徑"

4910

4716 -#: builtin/checkout.c

4911 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4912 +#: builtin/checkout.c builtin/checkout.c

4913 #, c-format

4914 msgid "'%s' cannot be used with '%s'"

4915 msgstr "「%s」不能與「%s」同時使用"

@@ -4741,7 +4937,8 @@ msgstr "未知的衝突輸出風格「%s」"

4937 msgid "perform a 3-way merge with the new branch"

4938 msgstr "和新分支進行三方合併"

4939

4744 -#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h

4940 +#: builtin/checkout.c builtin/log.c builtin/range-diff.c

4941 +#: parse-options.h

4942 msgid "style"

4943 msgstr "style"

4944

@@ -4785,6 +4982,22 @@ msgstr "簽出未合併檔案的他方版本"

4982 msgid "do not limit pathspecs to sparse entries only"

4983 msgstr "不將路徑規格限制為僅稀疏項目"

4984

4985 +#: builtin/checkout.c

4986 +msgid "git checkout [<options>] <branch>"

4987 +msgstr "git checkout [<options>] <branch>"

4988 +

4989 +#: builtin/checkout.c

4990 +msgid "git checkout [<options>] [<branch>] -- <file>..."

4991 +msgstr "git checkout [<options>] [<branch>] -- <file>..."

4992 +

4993 +#: builtin/checkout.c

4994 +msgid "git switch [<options>] [<branch>]"

4995 +msgstr "git switch [<options>] [<branch>]"

4996 +

4997 +#: builtin/checkout.c

4998 +msgid "git restore [<options>] [--source=<branch>] <file>..."

4999 +msgstr "git restore [<options>] [--source=<branch>] <file>..."

5000 +

5001 #: builtin/checkout.c

5002 #, c-format

5003 msgid "options '-%c', '-%c', and '%s' cannot be used together"

@@ -4829,8 +5042,12 @@ msgstr ""

5042 msgid "you must specify path(s) to restore"

5043 msgstr "您必須指定要還原的路徑"

5044

4832 -#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c

5045 +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

5046 +#: builtin/checkout.c builtin/clone.c builtin/remote.c

5047 +#: builtin/remote.c builtin/replay.c builtin/replay.c

5048 +#: builtin/replay.c builtin/submodule--helper.c

5049 #: builtin/submodule--helper.c builtin/worktree.c

5050 +#: builtin/worktree.c

5051 msgid "branch"

5052 msgstr "branch"

5053

@@ -5038,9 +5255,11 @@ msgstr "互動式清除"

5255 msgid "remove whole directories"

5256 msgstr "移除整個目錄"

5257

5041 -#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c

5042 -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c

5043 -#: pack-refs.c ref-filter.h

5258 +#: builtin/clean.c builtin/config.c builtin/config.c

5259 +#: builtin/config.c builtin/describe.c builtin/describe.c

5260 +#: builtin/grep.c builtin/log.c builtin/log.c

5261 +#: builtin/ls-files.c builtin/name-rev.c builtin/name-rev.c

5262 +#: builtin/show-ref.c pack-refs.c pack-refs.c ref-filter.h

5263 msgid "pattern"

5264 msgstr "pattern"

5265

@@ -5065,7 +5284,8 @@ msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理"

5284 msgid "info: Could not add alternate for '%s': %s\n"

5285 msgstr "info: 不能為「%s」新增一個備用：%s\n"

5286

5068 -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c

5287 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c

5288 +#: setup.c

5289 #, c-format

5290 msgid "failed to stat '%s'"

5291 msgstr "對「%s」呼叫 stat 失敗"

@@ -5176,7 +5396,7 @@ msgstr "不要拓製淺層版本庫"

5396 msgid "don't create a checkout"

5397 msgstr "不要建立簽出"

5398

5179 -#: builtin/clone.c builtin/init-db.c

5399 +#: builtin/clone.c builtin/clone.c builtin/init-db.c

5400 msgid "create a bare repository"

5401 msgstr "建立裸版本庫"

5402

@@ -5216,17 +5436,21 @@ msgstr "模板目錄"

5436 msgid "directory from which templates will be used"

5437 msgstr "將被使用的模板目錄"

5438

5219 -#: builtin/clone.c builtin/submodule--helper.c

5439 +#: builtin/clone.c builtin/clone.c builtin/submodule--helper.c

5440 +#: builtin/submodule--helper.c builtin/submodule--helper.c

5441 msgid "reference repository"

5442 msgstr "引用版本庫"

5443

5444 #: builtin/clone.c builtin/submodule--helper.c

5445 +#: builtin/submodule--helper.c

5446 msgid "use --reference only while cloning"

5447 msgstr "僅在拓製時使用 --reference"

5448

5227 -#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c

5228 -#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c

5449 +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c

5450 +#: builtin/init-db.c builtin/merge-file.c builtin/merge.c

5451 +#: builtin/pack-objects.c builtin/repack.c

5452 #: builtin/submodule--helper.c t/helper/test-simple-ipc.c

5453 +#: t/helper/test-simple-ipc.c

5454 msgid "name"

5455 msgstr "name"

5456

@@ -5267,6 +5491,7 @@ msgid "deepen history of shallow clone, excluding ref"

5491 msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版"

5492

5493 #: builtin/clone.c builtin/submodule--helper.c

5494 +#: builtin/submodule--helper.c

5495 msgid "clone only one branch, HEAD or --branch"

5496 msgstr "只拓製一個分支、HEAD 或 --branch"

5497

@@ -5287,6 +5512,7 @@ msgid "separate git dir from working tree"

5512 msgstr "git 目錄和工作區分離"

5513

5514 #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c

5515 +#: builtin/submodule--helper.c builtin/submodule--helper.c

5516 msgid "specify the reference format to use"

5517 msgstr "指定要使用的引用格式"

5518

@@ -5298,13 +5524,13 @@ msgstr "key=value"

5524 msgid "set config inside the new repository"

5525 msgstr "在新版本庫中設定設定訊息"

5526

5301 -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5302 -#: builtin/push.c builtin/send-pack.c

5527 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c

5528 +#: builtin/pull.c builtin/push.c builtin/send-pack.c

5529 msgid "server-specific"

5530 msgstr "server-specific"

5531

5306 -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5307 -#: builtin/push.c builtin/send-pack.c

5532 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c

5533 +#: builtin/pull.c builtin/push.c builtin/send-pack.c

5534 msgid "option to transmit"

5535 msgstr "傳輸選項"

5536

@@ -5340,8 +5566,9 @@ msgstr "太多參數。"

5566 msgid "You must specify a repository to clone."

5567 msgstr "您必須指定要拓製的版本庫。"

5568

5343 -#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c

5344 -#: setup.c

5569 +#: builtin/clone.c builtin/init-db.c builtin/refs.c

5570 +#: builtin/submodule--helper.c builtin/submodule--helper.c

5571 +#: builtin/submodule--helper.c setup.c setup.c

5572 #, c-format

5573 msgid "unknown ref storage format '%s'"

5574 msgstr "未知的引用儲存格式「%s」"

@@ -5371,7 +5598,8 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"

5598 msgid "working tree '%s' already exists."

5599 msgstr "工作區 '%s' 已經存在。"

5600

5374 -#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c

5601 +#: builtin/clone.c builtin/clone.c builtin/difftool.c

5602 +#: builtin/log.c builtin/worktree.c builtin/worktree.c

5603 #, c-format

5604 msgid "could not create leading directories of '%s'"

5605 msgstr "無法為「%s」建立前導目錄"

@@ -5397,7 +5625,7 @@ msgid ""

5625 "able"

5626 msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"

5627

5400 -#: builtin/clone.c builtin/remote.c

5628 +#: builtin/clone.c builtin/remote.c builtin/remote.c

5629 #, c-format

5630 msgid "'%s' is not a valid remote name"

5631 msgstr "'%s' 不是一個有效的遠端名稱"

@@ -5418,7 +5646,7 @@ msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。"

5646 msgid "--filter is ignored in local clones; use file:// instead."

5647 msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。"

5648

5421 -#: builtin/clone.c fetch-pack.c

5649 +#: builtin/clone.c fetch-pack.c fetch-pack.c

5650 msgid "source repository is shallow, reject to clone."

5651 msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。"

5652

@@ -5434,7 +5662,7 @@ msgstr "--local 被忽略"

5662 msgid "cannot clone from filtered bundle"

5663 msgstr "無法從過濾後的套件包拓製"

5664

5437 -#: builtin/clone.c

5665 +#: builtin/clone.c builtin/clone.c

5666 msgid "failed to initialize the repo, skipping bundle URI"

5667 msgstr "無法初始化版本庫，略過套件包 URI"

5668

@@ -5447,7 +5675,7 @@ msgstr "無法從套件包 URL「%s」抓取物件"

5675 msgid "failed to fetch advertised bundles"

5676 msgstr "無法抓取公佈的套件包"

5677

5450 -#: builtin/clone.c

5678 +#: builtin/clone.c builtin/clone.c

5679 msgid "remote transport reported error"

5680 msgstr "遠端傳輸回報錯誤"

5681

@@ -5473,7 +5701,7 @@ msgstr "git column [<選項>]"

5701 msgid "lookup config vars"

5702 msgstr "尋找設定變數"

5703

5476 -#: builtin/column.c

5704 +#: builtin/column.c builtin/column.c

5705 msgid "layout to use"

5706 msgstr "要使用的配置"

5707

@@ -5524,8 +5752,8 @@ msgstr ""

5752 "[no-]progress]\n"

5753 " <split-options>"

5754

5527 -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c

5528 -#: builtin/repack.c

5755 +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c

5756 +#: builtin/log.c builtin/repack.c builtin/repack.c

5757 msgid "dir"

5758 msgstr "目錄"

5759

@@ -5562,7 +5790,7 @@ msgstr "非期望的非十六進位物件 ID：%s"

5790 msgid "invalid object: %s"

5791 msgstr "物件無效：%s"

5792

5565 -#: builtin/commit-graph.c parse-options-cb.c

5793 +#: builtin/commit-graph.c parse-options-cb.c parse-options-cb.c

5794 #, c-format

5795 msgid "option `%s' expects a numerical value"

5796 msgstr "選項 `%s' 期望一個數字值"

@@ -5632,7 +5860,7 @@ msgstr ""

5860 msgid "duplicate parent %s ignored"

5861 msgstr "忽略重複的父提交 %s"

5862

5635 -#: builtin/commit-tree.c builtin/log.c

5863 +#: builtin/commit-tree.c builtin/commit-tree.c builtin/log.c

5864 #, c-format

5865 msgid "not a valid object name %s"

5866 msgstr "不是一個有效的物件名 %s"

@@ -5655,8 +5883,9 @@ msgstr "父提交"

5883 msgid "id of a parent commit object"

5884 msgstr "父提交物件 ID"

5885

5658 -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c

5659 -#: builtin/stash.c builtin/tag.c

5886 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c

5887 +#: builtin/notes.c builtin/notes.c builtin/stash.c

5888 +#: builtin/tag.c

5889 msgid "message"

5890 msgstr "訊息"

5891

@@ -5668,8 +5897,8 @@ msgstr "提交說明"

5897 msgid "read commit log message from file"

5898 msgstr "從檔案中讀取提交說明"

5899

5671 -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c

5672 -#: builtin/revert.c

5900 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c

5901 +#: builtin/pull.c builtin/revert.c

5902 msgid "GPG sign commit"

5903 msgstr "GPG 提交簽名"

5904

@@ -5832,7 +6061,7 @@ msgid ""

6061 "in the current commit message"

6062 msgstr "無法選擇一個未被目前提交說明使用的備註字元"

6063

5835 -#: builtin/commit.c

6064 +#: builtin/commit.c builtin/commit.c builtin/commit.c

6065 #, c-format

6066 msgid "could not lookup commit '%s'"

6067 msgstr "無法查詢提交「%s」"

@@ -5856,7 +6085,7 @@ msgstr "無法讀取日誌檔案「%s」"

6085 msgid "options '%s' and '%s:%s' cannot be used together"

6086 msgstr "「%s」和「%s:%s」選項不得同時使用"

6087

5859 -#: builtin/commit.c

6088 +#: builtin/commit.c builtin/commit.c

6089 msgid "could not read SQUASH_MSG"

6090 msgstr "無法讀取 SQUASH_MSG"

6091

@@ -5864,7 +6093,8 @@ msgstr "無法讀取 SQUASH_MSG"

6093 msgid "could not read MERGE_MSG"

6094 msgstr "無法讀取 MERGE_MSG"

6095

5867 -#: builtin/commit.c bundle.c rerere.c sequencer.c

6096 +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c

6097 +#: bundle.c rerere.c rerere.c sequencer.c sequencer.c

6098 #, c-format

6099 msgid "could not open '%s'"

6100 msgstr "無法開啟「%s」"

@@ -5963,7 +6193,7 @@ msgstr "無法讀取索引"

6193

6194 #: builtin/commit.c builtin/tag.c

6195 msgid "unable to pass trailers to --trailers"

5966 -msgstr "無法將尾部署名傳遞至 --trailers"

6196 +msgstr "無法將結尾資訊傳遞至 --trailers"

6197

6198 #: builtin/commit.c

6199 msgid "Error building trees"

@@ -5984,28 +6214,28 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者

6214 msgid "Invalid ignored mode '%s'"

6215 msgstr "無效的忽略模式 '%s'"

6216

5987 -#: builtin/commit.c

6217 +#: builtin/commit.c builtin/commit.c

6218 #, c-format

6219 msgid "Invalid untracked files mode '%s'"

6220 msgstr "無效的未追蹤檔案參數 '%s'"

6221

6222 #: builtin/commit.c

6223 msgid "You are in the middle of a merge -- cannot reword."

5994 -msgstr "正在合併中——不能重新輸入。"

6224 +msgstr "正在合併中——不能改寫說明。"

6225

6226 #: builtin/commit.c

6227 msgid "You are in the middle of a cherry-pick -- cannot reword."

5998 -msgstr "正在揀選中——不能重新輸入。"

6228 +msgstr "正在揀選中——不能改寫說明。"

6229

6230 #: builtin/commit.c

6231 #, c-format

6232 msgid "reword option of '%s' and path '%s' cannot be used together"

6003 -msgstr "「%s」的改寫選項和「%s」路徑不得同時使用"

6233 +msgstr "「%s」的改寫說明選項和「%s」路徑不得同時使用"

6234

6235 #: builtin/commit.c

6236 #, c-format

6237 msgid "reword option of '%s' and '%s' cannot be used together"

6008 -msgstr "「%s」的改寫選項和「%s」不得同時使用"

6238 +msgstr "「%s」的改寫說明選項和「%s」不得同時使用"

6239

6240 #: builtin/commit.c

6241 msgid "You have nothing to amend."

@@ -6037,11 +6267,11 @@ msgstr "未知選項：--fixup=%s:%s"

6267 msgid "paths '%s ...' with -a does not make sense"

6268 msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"

6269

6040 -#: builtin/commit.c

6270 +#: builtin/commit.c builtin/commit.c

6271 msgid "show status concisely"

6272 msgstr "以簡潔的格式顯示狀態"

6273

6044 -#: builtin/commit.c

6274 +#: builtin/commit.c builtin/commit.c

6275 msgid "show branch information"

6276 msgstr "顯示分支訊息"

6277

@@ -6049,7 +6279,7 @@ msgstr "顯示分支訊息"

6279 msgid "show stash information"

6280 msgstr "顯示貯存區訊息"

6281

6052 -#: builtin/commit.c

6282 +#: builtin/commit.c builtin/commit.c

6283 msgid "compute full ahead/behind values"

6284 msgstr "計算完整的領先/落後值"

6285

@@ -6057,19 +6287,20 @@ msgstr "計算完整的領先/落後值"

6287 msgid "version"

6288 msgstr "版本"

6289

6060 -#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c

6290 +#: builtin/commit.c builtin/commit.c builtin/fetch.c

6291 +#: builtin/push.c builtin/worktree.c

6292 msgid "machine-readable output"

6293 msgstr "機器可讀的輸出"

6294

6064 -#: builtin/commit.c

6295 +#: builtin/commit.c builtin/commit.c

6296 msgid "show status in long format (default)"

6297 msgstr "以長格式顯示狀態（預設值）"

6298

6068 -#: builtin/commit.c

6299 +#: builtin/commit.c builtin/commit.c

6300 msgid "terminate entries with NUL"

6301 msgstr "條目以 NUL 字元結尾"

6302

6072 -#: builtin/commit.c

6303 +#: builtin/commit.c builtin/commit.c

6304 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6305 msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"

6306

@@ -6140,7 +6371,8 @@ msgstr "日期"

6371 msgid "override date for commit"

6372 msgstr "提交時覆蓋日期"

6373

6143 -#: builtin/commit.c parse-options.h ref-filter.h

6374 +#: builtin/commit.c builtin/commit.c builtin/commit.c

6375 +#: parse-options.h ref-filter.h

6376 msgid "commit"

6377 msgstr "提交"

6378

@@ -6172,16 +6404,17 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"

6404 msgid "the commit is authored by me now (used with -C/-c/--amend)"

6405 msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"

6406

6175 -#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c

6407 +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c

6408 +#: builtin/tag.c

6409 msgid "trailer"

6177 -msgstr "尾部署名"

6410 +msgstr "結尾資訊"

6411

6179 -#: builtin/commit.c builtin/tag.c

6412 +#: builtin/commit.c builtin/rebase.c builtin/tag.c

6413 msgid "add custom trailer(s)"

6181 -msgstr "加入自訂尾部署名"

6414 +msgstr "加入自訂結尾資訊"

6415

6183 -#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c

6184 -#: builtin/revert.c

6416 +#: builtin/commit.c builtin/log.c builtin/merge.c

6417 +#: builtin/pull.c builtin/revert.c

6418 msgid "add a Signed-off-by trailer"

6419 msgstr "在結尾加入 Signed-off-by"

6420

@@ -6245,7 +6478,7 @@ msgstr "允許一個空提交"

6478 msgid "ok to record a change with an empty message"

6479 msgstr "允許空的提交說明"

6480

6248 -#: builtin/commit.c sequencer.c

6481 +#: builtin/commit.c sequencer.c sequencer.c

6482 msgid "could not parse HEAD commit"

6483 msgstr "無法解析 HEAD 提交"

6484

@@ -6263,7 +6496,7 @@ msgstr "無法讀取 MERGE_MODE"

6496 msgid "could not read commit message: %s"

6497 msgstr "無法讀取提交說明：%s"

6498

6266 -#: builtin/commit.c

6499 +#: builtin/commit.c builtin/history.c

6500 #, c-format

6501 msgid "Aborting commit due to empty commit message.\n"

6502 msgstr "終止提交因為提交說明為空。\n"

@@ -6287,7 +6520,7 @@ msgstr ""

6520 "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n"

6521 "已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。"

6522

6290 -#: builtin/config.c

6523 +#: builtin/config.c builtin/config.c

6524 msgid "git config list [<file-option>] [<display-option>] [--includes]"

6525 msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]"

6526

@@ -6309,7 +6542,7 @@ msgstr ""

6542 "git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "

6543 "[--fixed-value] <name> <value>"

6544

6312 -#: builtin/config.c

6545 +#: builtin/config.c builtin/config.c

6546 msgid ""

6547 "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "

6548 "<name>"

@@ -6317,15 +6550,15 @@ msgstr ""

6550 "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "

6551 "<name>"

6552

6320 -#: builtin/config.c

6553 +#: builtin/config.c builtin/config.c

6554 msgid "git config rename-section [<file-option>] <old-name> <new-name>"

6555 msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>"

6556

6324 -#: builtin/config.c

6557 +#: builtin/config.c builtin/config.c

6558 msgid "git config remove-section [<file-option>] <name>"

6559 msgstr "git config remove-section [<檔案選項>] <名稱>"

6560

6328 -#: builtin/config.c

6561 +#: builtin/config.c builtin/config.c

6562 msgid "git config edit [<file-option>]"

6563 msgstr "git config edit [<檔案選項>]"

6564

@@ -6371,7 +6604,7 @@ msgstr "使用版本庫級設定檔案"

6604 msgid "use per-worktree config file"

6605 msgstr "使用工作區級別的設定檔案"

6606

6374 -#: builtin/config.c builtin/gc.c

6607 +#: builtin/config.c builtin/gc.c builtin/gc.c

6608 msgid "use given config file"

6609 msgstr "使用指定的設定檔案"

6610

@@ -6488,7 +6721,7 @@ msgstr "無法解析顏色 '%s'"

6721 msgid "unable to parse default color value"

6722 msgstr "無法解析預設顏色值"

6723

6491 -#: builtin/config.c

6724 +#: builtin/config.c builtin/config.c

6725 msgid "not in a git directory"

6726 msgstr "不在 git 版本庫中"

6727

@@ -6531,7 +6764,7 @@ msgstr "--blob 只能在一個版本庫內使用"

6764 msgid "--worktree can only be used inside a git repository"

6765 msgstr "--worktree 只能在 git 版本庫中使用"

6766

6534 -#: builtin/config.c builtin/gc.c

6767 +#: builtin/config.c builtin/gc.c builtin/gc.c

6768 msgid "$HOME not set"

6769 msgstr "$HOME 未設定"

6770

@@ -6544,20 +6777,21 @@ msgstr ""

6777 "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n"

6778 "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"

6779

6780 +#: builtin/config.c builtin/config.c builtin/config.c

6781 #: builtin/config.c

6782 msgid "Other"

6783 msgstr "其他"

6784

6551 -#: builtin/config.c

6785 +#: builtin/config.c builtin/config.c builtin/config.c

6786 msgid "respect include directives on lookup"

6787 msgstr "查詢時引用 include 指令遞迴尋找"

6788

6555 -#: builtin/config.c

6789 +#: builtin/config.c builtin/config.c

6790 #, c-format

6791 msgid "unable to read config file '%s'"

6792 msgstr "無法讀取設定檔案 '%s'"

6793

6560 -#: builtin/config.c

6794 +#: builtin/config.c builtin/config.c

6795 msgid "error processing config file(s)"

6796 msgstr "處理設定檔案發生錯誤"

6797

@@ -6573,10 +6807,11 @@ msgstr "回傳有多項值之組態選項的所有值"

6807 msgid "interpret the name as a regular expression"

6808 msgstr "將名稱當作常規表示式解讀"

6809

6576 -#: builtin/config.c

6810 +#: builtin/config.c builtin/config.c

6811 msgid "show config with values matching the pattern"

6812 msgstr "顯示值符合模式的組態"

6813

6814 +#: builtin/config.c builtin/config.c builtin/config.c

6815 #: builtin/config.c

6816 msgid "use string equality when comparing values to value pattern"

6817 msgstr "使用字串相等比較值和模式"

@@ -6589,6 +6824,7 @@ msgstr "URL"

6824 msgid "show config matching the given URL"

6825 msgstr "顯示符合提供 URL 的組態"

6826

6827 +#: builtin/config.c builtin/config.c builtin/config.c

6828 #: builtin/config.c

6829 msgid "value"

6830 msgstr "取值"

@@ -6597,7 +6833,7 @@ msgstr "取值"

6833 msgid "use default value when missing entry"

6834 msgstr "未指定參數時所使用的預設值"

6835

6600 -#: builtin/config.c

6836 +#: builtin/config.c builtin/config.c builtin/config.c

6837 msgid "--fixed-value only applies with 'value-pattern'"

6838 msgstr "--fixed-value 僅套用至 'value-pattern'"

6839

@@ -6609,7 +6845,7 @@ msgstr "--default= 無法和 --all 或 --url= 一起使用"

6845 msgid "--url= cannot be used with --all, --regexp or --value"

6846 msgstr "--url= 無法和 --all、--regexp、--value 一起使用"

6847

6612 -#: builtin/config.c

6848 +#: builtin/config.c builtin/config.c

6849 msgid "Filter"

6850 msgstr "過濾器"

6851

@@ -6617,7 +6853,7 @@ msgstr "過濾器"

6853 msgid "replace multi-valued config option with new value"

6854 msgstr "以新值取代有多項值的組態選項"

6855

6620 -#: builtin/config.c

6856 +#: builtin/config.c builtin/config.c

6857 msgid "human-readable comment string (# will be prepended as needed)"

6858 msgstr "人類可讀的備註字串（將按需插入 # 至前方）"

6859

@@ -6650,6 +6886,7 @@ msgstr "取消設定所有多值組態選項"

6886 msgid "unset multi-valued config options with matching values"

6887 msgstr "取消設定其值相符的多值組態選項"

6888

6889 +#: builtin/config.c builtin/config.c builtin/config.c

6890 #: builtin/config.c

6891 #, c-format

6892 msgid "no such section: %s"

@@ -6788,11 +7025,12 @@ msgstr ""

7025 msgid "print debugging messages to stderr"

7026 msgstr "除錯訊息輸出到標準錯誤"

7027

7028 +#: builtin/credential-cache--daemon.c

7029 #: builtin/credential-cache--daemon.c

7030 msgid "credential-cache--daemon unavailable; no unix socket support"

7031 msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援"

7032

6795 -#: builtin/credential-cache.c

7033 +#: builtin/credential-cache.c builtin/credential-cache.c

7034 msgid "credential-cache unavailable; no unix socket support"

7035 msgstr "credential-cache 無法使用；缺少 unix socket 支援"

7036

@@ -6951,7 +7189,7 @@ msgstr "不考慮符合 <模式> 的標籤"

7189 msgid "show abbreviated commit object as fallback"

7190 msgstr "顯示簡寫的提交號作為後備"

7191

6954 -#: builtin/describe.c

7192 +#: builtin/describe.c builtin/describe.c

7193 msgid "mark"

7194 msgstr "標記"

7195

@@ -6967,10 +7205,10 @@ msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"）

7205 msgid "No names found, cannot describe anything."

7206 msgstr "沒有發現名稱，無法描述任何東西。"

7207

6970 -#: builtin/describe.c

7208 +#: builtin/describe.c builtin/describe.c

7209 #, c-format

7210 msgid "option '%s' and commit-ishes cannot be used together"

6973 -msgstr "「%s」選項和提交號不得同時使用"

7211 +msgstr "「%s」選項和提交指示元不得同時使用"

7212

7213 #: builtin/diagnose.c

7214 msgid ""

@@ -7006,12 +7244,6 @@ msgstr "無法解析物件 ID：%s"

7244 msgid "git diff-pairs -z [<diff-options>]"

7245 msgstr "git diff-pairs -z [<diff-options>]"

7246

7009 -#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c

7010 -#: bundle.c

7011 -#, c-format

7012 -msgid "unrecognized argument: %s"

7013 -msgstr "不認識的引數：%s"

7014 -

7247 #: builtin/diff-pairs.c

7248 msgid "working without -z is not supported"

7249 msgstr "不支援在無 -z 的情況下運作"

@@ -7073,7 +7305,8 @@ msgstr "無效選項：%s"

7305 msgid "%s...%s: no merge base"

7306 msgstr "%s...%s: 無合併基底"

7307

7076 -#: builtin/diff.c setup.c

7308 +#: builtin/diff.c setup.c setup.c setup.c setup.c

7309 +#: setup.c

7310 msgid "cannot come back to cwd"

7311 msgstr "無法返回目前工作目錄"

7312

@@ -7137,7 +7370,7 @@ msgstr "兩個檔案都被修改：'%s' 和 '%s'。"

7370 msgid "working tree file has been left."

7371 msgstr "工作區檔案被留了下來。"

7372

7140 -#: builtin/difftool.c sequencer.c

7373 +#: builtin/difftool.c sequencer.c sequencer.c sequencer.c

7374 #, c-format

7375 msgid "could not copy '%s' to '%s'"

7376 msgstr "無法將「%s」複製至「%s」"

@@ -7229,7 +7462,7 @@ msgstr "標籤之物件濾除者的模式未知：%s"

7462 msgid "unknown reencoding mode: %s"

7463 msgstr "重新編碼的模式未知：%s"

7464

7232 -#: builtin/fast-export.c

7465 +#: builtin/fast-export.c builtin/fast-export.c

7466 #, c-format

7467 msgid "could not read blob %s"

7468 msgstr "無法讀取資料物件 %s"

@@ -7249,7 +7482,7 @@ msgstr "無法寫入資料物件「%s」"

7482 msgid "unexpected comparison status '%c' for %s, %s"

7483 msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」"

7484

7252 -#: builtin/fast-export.c

7485 +#: builtin/fast-export.c builtin/fast-export.c

7486 msgid "none"

7487 msgstr "無"

7488

@@ -7286,14 +7519,6 @@ msgstr "去除提交 %s 的簽章"

7519 msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"

7520 msgstr "發現已簽署的提交 %s；使用 --signed-commits=<mode> 來處理"

7521

7289 -#: builtin/fast-export.c

7290 -msgid ""

7291 -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"

7292 -"commits=<mode>"

7293 -msgstr ""

7294 -"「strip-if-invalid」不是搭配 --signed-commits=<mode> 使用 git fast-export 的"

7295 -"有效模式"

7296 -

7522 #: builtin/fast-export.c

7523 #, c-format

7524 msgid ""

@@ -7323,14 +7548,6 @@ msgstr "去除標籤 %s 的簽章"

7548 msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"

7549 msgstr "發現已簽署的標籤 %s；使用 --signed-tags=<mode> 來處理"

7550

7326 -#: builtin/fast-export.c

7327 -msgid ""

7328 -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"

7329 -"tags=<mode>"

7330 -msgstr ""

7331 -"「strip-if-invalid」不是搭配 --signed-tags=<mode> 使用 git fast-export 的有效"

7332 -"模式"

7333 -

7551 #: builtin/fast-export.c

7552 #, c-format

7553 msgid ""

@@ -7367,12 +7584,14 @@ msgstr "無法為寫入開啟標記檔案 %s。"

7584 msgid "unable to write marks file %s."

7585 msgstr "無法寫入標記檔案 %s。"

7586

7370 -#: builtin/fast-export.c builtin/fast-import.c

7587 +#: builtin/fast-export.c builtin/fast-export.c

7588 +#: builtin/fast-import.c builtin/fast-import.c

7589 #, c-format

7590 msgid "corrupt mark line: %s"

7591 msgstr "損壞的標記列：%s"

7592

7375 -#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c

7593 +#: builtin/fast-export.c builtin/fast-import.c

7594 +#: builtin/fast-import.c fetch-pack.c fetch-pack.c

7595 #, c-format

7596 msgid "object not found: %s"

7597 msgstr "物件未找到：%s"

@@ -7545,7 +7764,7 @@ msgstr "非預期的壓縮失敗：%d"

7764 msgid "not a tree: %s"

7765 msgstr "非樹狀物件：%s"

7766

7548 -#: builtin/fast-import.c

7767 +#: builtin/fast-import.c builtin/fast-import.c

7768 #, c-format

7769 msgid "can't load tree %s"

7770 msgstr "無法載入樹狀物件 %s"

@@ -7559,7 +7778,7 @@ msgstr "%s 中有損壞的模式"

7778 msgid "root cannot be a non-directory"

7779 msgstr "根不能不是目錄"

7780

7562 -#: builtin/fast-import.c

7781 +#: builtin/fast-import.c builtin/fast-import.c

7782 msgid "empty path component found in input"

7783 msgstr "輸入中有空的路徑部分"

7784

@@ -7582,8 +7801,8 @@ msgstr "分支 %s 缺少提交。"

7801 msgid "not updating %s (new tip %s does not contain %s)"

7802 msgstr "沒有更新 %s（提示：%s 不包含 %s）"

7803

7585 -#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c

7586 -#: sequencer.c

7804 +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c

7805 +#: midx-write.c sequencer.c

7806 #, c-format

7807 msgid "unable to create leading directories of %s"

7808 msgstr "不能為 %s 建立先導目錄"

@@ -7642,7 +7861,7 @@ msgstr "身分字串中缺少 >：%s"

7861 msgid "missing space after > in ident string: %s"

7862 msgstr "身分字串的 > 後面缺少空格：%s"

7863

7645 -#: builtin/fast-import.c

7864 +#: builtin/fast-import.c builtin/fast-import.c

7865 #, c-format

7866 msgid "invalid raw date \"%s\" in ident: %s"

7867 msgstr "身分中有無效的原始日期「%s」：%s"

@@ -7702,17 +7921,18 @@ msgstr "%s 後有垃圾：%s"

7921 msgid "missing space after %s: %s"

7922 msgstr "%s 後缺少空格：%s"

7923

7705 -#: builtin/fast-import.c

7924 +#: builtin/fast-import.c builtin/fast-import.c

7925 #, c-format

7926 msgid "corrupt mode: %s"

7927 msgstr "損壞的模式：%s"

7928

7710 -#: builtin/fast-import.c

7929 +#: builtin/fast-import.c builtin/fast-import.c

7930 +#: builtin/fast-import.c builtin/fast-import.c

7931 #, c-format

7932 msgid "invalid dataref: %s"

7933 msgstr "無效的資料引用：%s"

7934

7715 -#: builtin/fast-import.c

7935 +#: builtin/fast-import.c builtin/fast-import.c

7936 #, c-format

7937 msgid "missing space after SHA1: %s"

7938 msgstr "SHA1 值後缺少空格：%s"

@@ -7755,22 +7975,25 @@ msgstr "分支中沒有路徑 %s"

7975 msgid "can't add a note on empty branch."

7976 msgstr "不能在空分支上附加註記。"

7977

7978 +#: builtin/fast-import.c builtin/fast-import.c

7979 #: builtin/fast-import.c

7980 #, c-format

7981 msgid "mark :%<PRIuMAX> not a commit"

7982 msgstr "標記 :%<PRIuMAX> 不是提交"

7983

7984 +#: builtin/fast-import.c builtin/fast-import.c

7985 #: builtin/fast-import.c

7986 #, c-format

7987 msgid "not a valid commit: %s"

7988 msgstr "不是有效的提交：%s"

7989

7768 -#: builtin/fast-import.c

7990 +#: builtin/fast-import.c builtin/fast-import.c

7991 +#: builtin/fast-import.c builtin/fast-import.c

7992 #, c-format

7993 msgid "invalid ref name or SHA1 expression: %s"

7994 msgstr "無效的引用名稱或 SHA1 表示式：%s"

7995

7773 -#: builtin/fast-import.c

7996 +#: builtin/fast-import.c builtin/fast-import.c

7997 #, c-format

7998 msgid "not a blob (actually a %s): %s"

7999 msgstr "不是資料物件（而是 %s）：%s"

@@ -7822,7 +8045,8 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章"

8045 msgid "parse_one_signature() returned unknown hash algo"

8046 msgstr "parse_one_signature() 回傳了未知的雜湊演算法"

8047

7825 -#: builtin/fast-import.c builtin/fsck.c

8048 +#: builtin/fast-import.c builtin/fsck.c builtin/fsck.c

8049 +#: builtin/fsck.c

8050 msgid "unknown"

8051 msgstr "未知"

8052

@@ -7853,6 +8077,45 @@ msgstr ""

8077 "正在去除提交的無效簽章\n"

8078 " 據稱由 %s 所簽"

8079

8080 +#: builtin/fast-import.c

8081 +#, c-format

8082 +msgid ""

8083 +"replacing invalid signature for commit '%.100s...'\n"

8084 +" allegedly by %s"

8085 +msgstr ""

8086 +"正在取代提交「%.100s...」的無效簽章\n"

8087 +" 據稱由 %s 所簽"

8088 +

8089 +#: builtin/fast-import.c

8090 +#, c-format

8091 +msgid ""

8092 +"replacing invalid signature for commit '%.*s'\n"

8093 +" allegedly by %s"

8094 +msgstr ""

8095 +"正在取代提交「%.*s」的無效簽章\n"

8096 +" 據稱由 %s 所簽"

8097 +

8098 +#: builtin/fast-import.c

8099 +#, c-format

8100 +msgid ""

8101 +"replacing invalid signature for commit\n"

8102 +" allegedly by %s"

8103 +msgstr ""

8104 +"正在取代提交的無效簽章\n"

8105 +" 據稱由 %s 所簽"

8106 +

8107 +#: builtin/fast-import.c builtin/fast-import.c

8108 +msgid "aborting due to invalid signature"

8109 +msgstr "因為簽章無效而中止"

8110 +

8111 +#: builtin/fast-import.c

8112 +msgid "signing commits in interoperability mode is unsupported"

8113 +msgstr "不支援在互通模式下簽署提交"

8114 +

8115 +#: builtin/fast-import.c

8116 +msgid "failed to sign commit object"

8117 +msgstr "無法簽署提交物件"

8118 +

8119 #: builtin/fast-import.c

8120 msgid "expected committer but didn't get one"

8121 msgstr "預期有提交者，卻沒收到"

@@ -7869,6 +8132,10 @@ msgstr "去除提交簽章"

8132 msgid "importing a commit signature verbatim"

8133 msgstr "按原樣匯入提交簽章"

8134

8135 +#: builtin/fast-import.c

8136 +msgid "failed to sign tag object"

8137 +msgstr "無法簽署標籤物件"

8138 +

8139 #: builtin/fast-import.c

8140 #, c-format

8141 msgid "importing a tag signature verbatim for tag '%s'"

@@ -7883,14 +8150,6 @@ msgstr "去除標籤「%s」的簽章"

8150 msgid "encountered signed tag; use --signed-tags=<mode> to handle it"

8151 msgstr "發現已簽署的標籤；使用 --signed-tags=<mode> 來處理"

8152

7886 -#: builtin/fast-import.c

7887 -msgid ""

7888 -"'strip-if-invalid' is not a valid mode for git fast-import with --signed-"

7889 -"tags=<mode>"

7890 -msgstr ""

7891 -"「strip-if-invalid」不是搭配 --signed-tags=<mode> 使用 git fast-import 的有效"

7892 -"模式"

7893 -

8153 #: builtin/fast-import.c

8154 #, c-format

8155 msgid "expected 'from' command, got '%s'"

@@ -7924,6 +8183,7 @@ msgstr "物件 %s 是 %s，但預期是資料物件。"

8183 msgid "not a mark: %s"

8184 msgstr "不是標記：%s"

8185

8186 +#: builtin/fast-import.c builtin/fast-import.c

8187 #: builtin/fast-import.c

8188 #, c-format

8189 msgid "unknown mark: %s"

@@ -8118,7 +8378,7 @@ msgstr "找不到物件 %s"

8378 msgid "[up to date]"

8379 msgstr "[最新]"

8380

8121 -#: builtin/fetch.c

8381 +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

8382 msgid "[rejected]"

8383 msgstr "[已拒絕]"

8384

@@ -8130,6 +8390,7 @@ msgstr "無法抓取至已簽出分支"

8390 msgid "[tag update]"

8391 msgstr "[標籤更新]"

8392

8393 +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

8394 #: builtin/fetch.c

8395 msgid "unable to update local ref"

8396 msgstr "不能更新本機引用"

@@ -8158,7 +8419,8 @@ msgstr "強制更新"

8419 msgid "non-fast-forward"

8420 msgstr "非快轉"

8421

8161 -#: builtin/fetch.c builtin/grep.c sequencer.c

8422 +#: builtin/fetch.c builtin/fetch.c builtin/grep.c

8423 +#: sequencer.c

8424 #, c-format

8425 msgid "cannot open '%s'"

8426 msgstr "不能開啟 '%s'"

@@ -8314,12 +8576,12 @@ msgstr ""

8576 "找不到來源分支。\n"

8577 "您得使用 --set-upstream 選項明確指定一個分支"

8578

8317 -#: builtin/fetch.c

8579 +#: builtin/fetch.c builtin/fetch.c

8580 #, c-format

8581 msgid "Fetching %s\n"

8582 msgstr "正在取得 %s\n"

8583

8322 -#: builtin/fetch.c

8584 +#: builtin/fetch.c builtin/fetch.c

8585 #, c-format

8586 msgid "could not fetch %s"

8587 msgstr "無法取得 %s"

@@ -8394,7 +8656,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"

8656 msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"

8657

8658 # 譯者：可選值，不能翻譯

8397 -#: builtin/fetch.c builtin/pull.c

8659 +#: builtin/fetch.c builtin/fetch.c builtin/pull.c

8660 msgid "on-demand"

8661 msgstr "on-demand"

8662

@@ -8414,7 +8676,8 @@ msgstr "保持下載包"

8676 msgid "allow updating of HEAD ref"

8677 msgstr "允許更新 HEAD 引用"

8678

8417 -#: builtin/fetch.c builtin/pull.c

8679 +#: builtin/fetch.c builtin/fetch.c builtin/pull.c

8680 +#: builtin/pull.c

8681 msgid "deepen history of shallow clone"

8682 msgstr "取得淺拓製的更多過去歷史記錄"

8683

@@ -8452,7 +8715,8 @@ msgstr "引用映射"

8715 msgid "specify fetch refmap"

8716 msgstr "指定取得動作的引用映射"

8717

8455 -#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c

8718 +#: builtin/fetch.c builtin/pull.c builtin/rebase.c

8719 +#: builtin/replay.c

8720 msgid "revision"

8721 msgstr "revision"

8722

@@ -8464,7 +8728,7 @@ msgstr "報告我們只擁有從該物件開始可以取得的物件"

8728 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

8729 msgstr "不取得 packfile，而是輸出協商的祖先提交"

8730

8467 -#: builtin/fetch.c

8731 +#: builtin/fetch.c builtin/fetch.c

8732 msgid "run 'maintenance --auto' after fetching"

8733 msgstr "取得 (fetch) 後執行 'maintenance --auto'"

8734

@@ -8667,7 +8931,7 @@ msgid "got bad config --config=%s"

8931 msgstr "收到無效的組態 --config=%s"

8932

8933 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>

8670 -#: builtin/fsck.c

8934 +#: builtin/fsck.c builtin/fsck.c

8935 #, c-format

8936 msgid "error in %s %s: %s"

8937 msgstr "%s %s 錯誤：%s"

@@ -8678,7 +8942,7 @@ msgstr "%s %s 錯誤：%s"

8942 msgid "warning in %s %s: %s"

8943 msgstr "%s %s 警告：%s"

8944

8681 -#: builtin/fsck.c

8945 +#: builtin/fsck.c builtin/fsck.c

8946 #, c-format

8947 msgid "broken link from %7s %s"

8948 msgstr "來自 %7s %s 的損壞的連結"

@@ -8719,7 +8983,8 @@ msgstr "懸空 %s %s"

8983 msgid "could not create lost-found"

8984 msgstr "無法建立 lost-found"

8985

8722 -#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c

8986 +#: builtin/fsck.c builtin/gc.c builtin/rebase.c

8987 +#: rebase-interactive.c rerere.c rerere.c sequencer.c

8988 #: sequencer.c

8989 #, c-format

8990 msgid "could not write '%s'"

@@ -8850,7 +9115,7 @@ msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)"

9115 msgid "invalid rev-index for pack '%s'"

9116 msgstr "「%s」封裝的修訂版索引 (rev-index) 無效"

9117

8853 -#: builtin/fsck.c

9118 +#: builtin/fsck.c builtin/fsck.c

9119 msgid "Checking ref database"

9120 msgstr "正在檢查引用資料庫"

9121

@@ -8930,7 +9195,7 @@ msgstr "git fsmonitor--daemon start [<options>]"

9195 msgid "git fsmonitor--daemon run [<options>]"

9196 msgstr "git fsmonitor--daemon run [<options>]"

9197

8933 -#: builtin/fsmonitor--daemon.c

9198 +#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c

9199 #, c-format

9200 msgid "value of '%s' out of range: %d"

9201 msgstr "「%s」的數值超出範圍：%d"

@@ -8986,7 +9251,7 @@ msgstr "無法初始化健康檢查執行緒"

9251 msgid "could not cd home '%s'"

9252 msgstr "無法 cd home '%s'"

9253

8989 -#: builtin/fsmonitor--daemon.c

9254 +#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c

9255 #, c-format

9256 msgid "fsmonitor--daemon is already running '%s'"

9257 msgstr "fsmonitor--daemon 已在執行「%s」"

@@ -9225,7 +9490,7 @@ msgstr "'%s' 非有效作業"

9490 msgid "task '%s' cannot be selected multiple times"

9491 msgstr "不能多次選取 '%s' 作業"

9492

9228 -#: builtin/gc.c

9493 +#: builtin/gc.c builtin/gc.c

9494 msgid "run tasks based on the state of the repository"

9495 msgstr "基於版本庫狀態執行作業"

9496

@@ -9245,7 +9510,7 @@ msgstr "依據頻率執行工作"

9510 msgid "do not report progress or other information over stderr"

9511 msgstr "不要在 stderr 輸出進度或其他資訊"

9512

9248 -#: builtin/gc.c

9513 +#: builtin/gc.c builtin/gc.c

9514 msgid "task"

9515 msgstr "作業"

9516

@@ -9277,11 +9542,11 @@ msgstr "版本庫「%s」未註冊"

9542 msgid "failed to expand path '%s'"

9543 msgstr "無法展開「%s」路徑"

9544

9280 -#: builtin/gc.c

9545 +#: builtin/gc.c builtin/gc.c

9546 msgid "failed to start launchctl"

9547 msgstr "無法啟動 launchctl"

9548

9284 -#: builtin/gc.c

9549 +#: builtin/gc.c builtin/gc.c builtin/gc.c

9550 #, c-format

9551 msgid "failed to create directories for '%s'"

9552 msgstr "無法建立「%s」的目錄"

@@ -9319,12 +9584,13 @@ msgstr "無法執行「crontab」；您的系統可能不支援「cron」"

9584 msgid "'crontab' died"

9585 msgstr "「crontab」結束運作"

9586

9322 -#: builtin/gc.c builtin/worktree.c

9587 +#: builtin/gc.c builtin/gc.c builtin/gc.c builtin/worktree.c

9588 +#: builtin/worktree.c

9589 #, c-format

9590 msgid "failed to delete '%s'"

9591 msgstr "刪除 '%s' 失敗"

9592

9327 -#: builtin/gc.c rerere.c

9593 +#: builtin/gc.c builtin/gc.c rerere.c

9594 #, c-format

9595 msgid "failed to flush '%s'"

9596 msgstr "排清 '%s' 失敗"

@@ -9415,11 +9681,13 @@ msgstr "grep：無法建立執行緒：%s"

9681 msgid "invalid number of threads specified (%d) for %s"

9682 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"

9683

9684 +#. #-#-#-#-# grep.c.po #-#-#-#-#

9685 #. TRANSLATORS: %s is the configuration

9686 #. variable for tweaking threads, currently

9687 #. grep.threads

9688 #.

9422 -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c

9689 +#: builtin/grep.c builtin/index-pack.c builtin/index-pack.c

9690 +#: builtin/pack-objects.c

9691 #, c-format

9692 msgid "no threads support, ignoring %s"

9693 msgstr "沒有執行緒支援，忽略 %s"

@@ -9777,7 +10045,7 @@ msgstr "無法解析 emacsclient 版本。"

10045 msgid "emacsclient version '%d' too old (< 22)."

10046 msgstr "emacsclient 版本 '%d' 太老（< 22）。"

10047

9780 -#: builtin/help.c

10048 +#: builtin/help.c builtin/help.c builtin/help.c builtin/help.c

10049 #, c-format

10050 msgid "failed to exec '%s'"

10051 msgstr "執行 '%s' 失敗"

@@ -9813,7 +10081,7 @@ msgstr "沒有 man 檢視器處理此請求"

10081 msgid "no info viewer handled the request"

10082 msgstr "沒有 info 檢視器處理此請求"

10083

9816 -#: builtin/help.c git.c

10084 +#: builtin/help.c builtin/help.c git.c

10085 #, c-format

10086 msgid "'%s' is aliased to '%s'"

10087 msgstr "'%s' 是 '%s' 的別名"

@@ -9833,7 +10101,7 @@ msgid ""

10101 "the '--no-[external-commands|aliases]' options can only be used with '--all'"

10102 msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用"

10103

9836 -#: builtin/help.c

10104 +#: builtin/help.c builtin/help.c

10105 #, c-format

10106 msgid "usage: %s%s"

10107 msgstr "用法：%s%s"

@@ -9842,13 +10110,195 @@ msgstr "用法：%s%s"

10110 msgid "'git help config' for more information"

10111 msgstr "'git help config' 取得更多訊息"

10112

10113 +#: builtin/history.c

10114 +msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"

10115 +msgstr ""

10116 +"git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"

10117 +

10118 +#: builtin/history.c

10119 +msgid ""

10120 +"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "

10121 +"[<pathspec>...]"

10122 +msgstr ""

10123 +"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "

10124 +"[<pathspec>...]"

10125 +

10126 +#: builtin/history.c

10127 +#, c-format

10128 +msgid ""

10129 +"Please enter the commit message for the %s changes. Lines starting\n"

10130 +"with '%s' will be ignored, and an empty message aborts the commit.\n"

10131 +msgstr ""

10132 +"請輸入描述 %s 變更的提交訊息。開頭是「%s」的列\n"

10133 +"皆會忽略。提交訊息空白則取消本次提交作業。\n"

10134 +

10135 +#: builtin/history.c

10136 +#, c-format

10137 +msgid "Aborting commit as launching the editor failed.\n"

10138 +msgstr "中止提交，因為無法開啟編輯器。\n"

10139 +

10140 +#: builtin/history.c builtin/history.c

10141 +#, c-format

10142 +msgid "unable to parse parent commit %s"

10143 +msgstr "無法解析上級提交 %s"

10144 +

10145 +#: builtin/history.c

10146 +#, c-format

10147 +msgid "%s expects one of 'branches' or 'head'"

10148 +msgstr "%s 預期是「branches」或「head」之一"

10149 +

10150 +#: builtin/history.c replay.c

10151 +msgid "error preparing revisions"

10152 +msgstr "無法準備修訂集"

10153 +

10154 +#: builtin/history.c replay.c

10155 +msgid "replaying merge commits is not supported yet!"

10156 +msgstr "尚不支援重放合併提交！"

10157 +

10158 +#: builtin/history.c

10159 +msgid "cannot look up HEAD"

10160 +msgstr "無法查詢 HEAD"

10161 +

10162 +#: builtin/history.c

10163 +msgid "cannot determine descendance"

10164 +msgstr "無法判定繼承關係"

10165 +

10166 +#: builtin/history.c

10167 +msgid ""

10168 +"rewritten commit must be an ancestor of HEAD when using --update-refs=head"

10169 +msgstr "使用 --update-refs=head 時，重寫後的提交必須是 HEAD 的祖先"

10170 +

10171 +#: builtin/history.c builtin/replay.c

10172 +#, c-format

10173 +msgid "failed to begin ref transaction: %s"

10174 +msgstr "無法開始引用事務：%s"

10175 +

10176 +#: builtin/history.c builtin/history.c builtin/replay.c

10177 +#, c-format

10178 +msgid "failed to update ref '%s': %s"

10179 +msgstr "無法更新「%s」引用：%s"

10180 +

10181 +#: builtin/history.c builtin/replay.c

10182 +#, c-format

10183 +msgid "failed to commit ref transaction: %s"

10184 +msgstr "無法提交引用事務：%s"

10185 +

10186 +#: builtin/history.c

10187 +msgid "control which refs should be updated"

10188 +msgstr "控制要更新的引用"

10189 +

10190 +#: builtin/history.c builtin/history.c

10191 +msgid "perform a dry-run without updating any refs"

10192 +msgstr "進行測試執行，不更新任何引用"

10193 +

10194 +#: builtin/history.c

10195 +msgid "command expects a single revision"

10196 +msgstr "命令預期只有一個修訂版"

10197 +

10198 +#: builtin/history.c builtin/history.c

10199 +#, c-format

10200 +msgid "commit cannot be found: %s"

10201 +msgstr "找不到提交：%s"

10202 +

10203 +#: builtin/history.c

10204 +msgid "failed writing reworded commit"

10205 +msgstr "無法寫入改寫說明後的提交"

10206 +

10207 +#: builtin/history.c builtin/history.c

10208 +msgid "failed replaying descendants"

10209 +msgstr "重放後代失敗"

10210 +

10211 +#: builtin/history.c

10212 +msgid "unable to populate index with tree"

10213 +msgstr "無法以樹狀物件填入索引"

10214 +

10215 +#: builtin/history.c

10216 +msgid "unable to acquire index lock"

10217 +msgstr "無法取得索引鎖"

10218 +

10219 +#: builtin/history.c

10220 +msgid "failed reading temporary index"

10221 +msgstr "無法讀取暫存索引"

10222 +

10223 +#: builtin/history.c

10224 +msgid "failed split tree"

10225 +msgstr "無法拆分樹狀物件"

10226 +

10227 +#: builtin/history.c

10228 +msgid "split commit is empty"

10229 +msgstr "拆出的提交是空白的"

10230 +

10231 +#: builtin/history.c

10232 +msgid "split commit tree matches original commit"

10233 +msgstr "拆分提交的樹狀物件和原始提交相同"

10234 +

10235 +#: builtin/history.c

10236 +msgid "failed writing first commit"

10237 +msgstr "無法寫入第一個提交"

10238 +

10239 +#: builtin/history.c

10240 +msgid "failed writing second commit"

10241 +msgstr "無法寫入第二個提交"

10242 +

10243 +#: builtin/history.c

10244 +msgid "control ref update behavior"

10245 +msgstr "控制引用的更新行為"

10246 +

10247 +#: builtin/history.c

10248 +msgid "command expects a committish"

10249 +msgstr "命令預期有一個提交指示元"

10250 +

10251 +#: builtin/history.c

10252 +msgid "cannot split up merge commit"

10253 +msgstr "無法拆分合併提交"

10254 +

10255 +#: builtin/hook.c

10256 +msgid ""

10257 +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"

10258 +"stdin=<path>] <hook-name> [-- <hook-args>]"

10259 +msgstr ""

10260 +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"

10261 +"stdin=<path>] <hook-name> [-- <hook-args>]"

10262 +

10263 +#: builtin/hook.c

10264 +msgid ""

10265 +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"

10266 +msgstr ""

10267 +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"

10268 +

10269 +#: builtin/hook.c

10270 +msgid "use NUL as line terminator"

10271 +msgstr "使用 NUL 作為列終止符"

10272 +

10273 #: builtin/hook.c

10274 +msgid "show the config scope that defined each hook"

10275 +msgstr "顯示定義每個掛鉤的組態範圍"

10276 +

10277 +#: builtin/hook.c builtin/hook.c

10278 +msgid "allow running a hook with a non-native hook name"

10279 +msgstr "允許執行非原生名稱的掛鉤"

10280 +

10281 +#: builtin/hook.c

10282 +msgid "you must specify a hook event name to list"

10283 +msgstr "您必須指定要列出的掛鉤事件名稱"

10284 +

10285 +#: builtin/hook.c builtin/hook.c

10286 +#, c-format

10287 msgid ""

9847 -"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"

9848 -"args>]"

10288 +"unknown hook event '%s';\n"

10289 +"use --allow-unknown-hook-name to allow non-native hook names"

10290 msgstr ""

9850 -"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"

9851 -"args>]"

10291 +"未知的掛鉤事件「%s」，\n"

10292 +"請使用 --allow-unknown-hook-name 以允許指定非原生的掛鉤名稱"

10293 +

10294 +#: builtin/hook.c

10295 +#, c-format

10296 +msgid "no hooks found for event '%s'"

10297 +msgstr "找不到事件「%s」的掛鉤"

10298 +

10299 +#: builtin/hook.c

10300 +msgid "hook from hookdir"

10301 +msgstr "來自 hookdir 的掛鉤"

10302

10303 #: builtin/hook.c

10304 msgid "silently ignore missing requested <hook-name>"

@@ -9946,7 +10396,8 @@ msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組"

10396 msgid "serious inflate inconsistency"

10397 msgstr "解壓縮嚴重的不一致"

10398

9949 -#: builtin/index-pack.c

10399 +#: builtin/index-pack.c builtin/index-pack.c builtin/index-pack.c

10400 +#: builtin/index-pack.c builtin/index-pack.c

10401 #, c-format

10402 msgid "SHA1 COLLISION FOUND WITH %s !"

10403 msgstr "發現 %s 出現 SHA1 衝突！"

@@ -9966,7 +10417,7 @@ msgstr "不能讀取現存物件 %s"

10417 msgid "invalid blob object %s"

10418 msgstr "無效的資料物件 %s"

10419

9969 -#: builtin/index-pack.c

10420 +#: builtin/index-pack.c builtin/index-pack.c

10421 msgid "fsck error in packed object"

10422 msgstr "對打包物件 fsck 檢查發生錯誤"

10423

@@ -9980,7 +10431,7 @@ msgstr "無效的 %s"

10431 msgid "Not all child objects of %s are reachable"

10432 msgstr "%s 的所有子物件並非都可以取得"

10433

9983 -#: builtin/index-pack.c

10434 +#: builtin/index-pack.c builtin/index-pack.c

10435 msgid "failed to apply delta"

10436 msgstr "套用 delta 失敗"

10437

@@ -10013,6 +10464,7 @@ msgid "Resolving deltas"

10464 msgstr "處理 delta 中"

10465

10466 #: builtin/index-pack.c builtin/pack-objects.c

10467 +#: builtin/pack-objects.c

10468 #, c-format

10469 msgid "unable to create thread: %s"

10470 msgstr "不能建立執行緒：%s"

@@ -10030,7 +10482,7 @@ msgstr[0] "完成 %d 個本機物件"

10482 #: builtin/index-pack.c

10483 #, c-format

10484 msgid "Unexpected tail checksum for %s (disk corruption?)"

10033 -msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）"

10485 +msgstr "%s 的尾部總和檢查碼與預期不符（磁碟損壞？）"

10486

10487 #: builtin/index-pack.c

10488 #, c-format

@@ -10124,12 +10576,12 @@ msgstr "無法返回目前工作目錄"

10576 msgid "bad --pack_header: %s"

10577 msgstr "無效的 --pack_header：%s"

10578

10127 -#: builtin/index-pack.c

10579 +#: builtin/index-pack.c builtin/index-pack.c

10580 #, c-format

10581 msgid "bad %s"

10582 msgstr "錯誤選項 %s"

10583

10132 -#: builtin/index-pack.c builtin/init-db.c setup.c

10584 +#: builtin/index-pack.c builtin/init-db.c setup.c setup.c

10585 #, c-format

10586 msgid "unknown hash algorithm '%s'"

10587 msgstr "未知的「%s」雜湊算法"

@@ -10188,12 +10640,12 @@ msgstr "雜湊"

10640 msgid "specify the hash algorithm to use"

10641 msgstr "指定要使用的雜湊算法"

10642

10191 -#: builtin/init-db.c

10643 +#: builtin/init-db.c builtin/init-db.c

10644 #, c-format

10645 msgid "cannot mkdir %s"

10646 msgstr "不能建立目錄 %s"

10647

10196 -#: builtin/init-db.c

10648 +#: builtin/init-db.c builtin/init-db.c

10649 #, c-format

10650 msgid "cannot chdir to %s"

10651 msgstr "不能切換目錄到 %s"

@@ -10224,25 +10676,6 @@ msgstr ""

10676 " [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"

10677 " [--parse] [<file>...]"

10678

10227 -#: builtin/interpret-trailers.c wrapper.c

10228 -#, c-format

10229 -msgid "could not stat %s"

10230 -msgstr "無法 stat %s"

10231 -

10232 -#: builtin/interpret-trailers.c

10233 -#, c-format

10234 -msgid "file %s is not a regular file"

10235 -msgstr "檔案 %s 不是一個正規檔案"

10236 -

10237 -#: builtin/interpret-trailers.c

10238 -#, c-format

10239 -msgid "file %s is not writable by user"

10240 -msgstr "檔案 %s 使用者不可寫"

10241 -

10242 -#: builtin/interpret-trailers.c

10243 -msgid "could not open temporary file"

10244 -msgstr "無法開啟暫存檔"

10245 -

10679 #: builtin/interpret-trailers.c

10680 #, c-format

10681 msgid "could not read input file '%s'"

@@ -10254,6 +10687,11 @@ msgstr "無法從標準輸入讀取"

10687

10688 #: builtin/interpret-trailers.c

10689 #, c-format

10690 +msgid "could not write to temporary file '%s'"

10691 +msgstr "無法寫入暫存檔案「%s」"

10692 +

10693 +#: builtin/interpret-trailers.c trailer.c

10694 +#, c-format

10695 msgid "could not rename temporary file to %s"

10696 msgstr "無法將暫存檔重新命名為 %s"

10697

@@ -10263,7 +10701,7 @@ msgstr "在原位編輯檔案"

10701

10702 #: builtin/interpret-trailers.c

10703 msgid "trim empty trailers"

10266 -msgstr "刪除空的尾部署名"

10704 +msgstr "刪除空的結尾資訊"

10705

10706 #: builtin/interpret-trailers.c

10707 msgid "placement"

@@ -10271,27 +10709,27 @@ msgstr "placement"

10709

10710 #: builtin/interpret-trailers.c

10711 msgid "where to place the new trailer"

10274 -msgstr "在哪裡放置新的尾部署名"

10712 +msgstr "放置新結尾資訊的位置"

10713

10714 #: builtin/interpret-trailers.c

10715 msgid "action if trailer already exists"

10278 -msgstr "當尾部署名已經存在時所採取的動作"

10716 +msgstr "當結尾資訊已經存在時應採取的動作"

10717

10718 #: builtin/interpret-trailers.c

10719 msgid "action if trailer is missing"

10282 -msgstr "當尾部署名缺少時所採取的動作"

10720 +msgstr "當結尾資訊缺少時應採取的動作"

10721

10722 #: builtin/interpret-trailers.c

10723 msgid "output only the trailers"

10286 -msgstr "只輸出尾部署名"

10724 +msgstr "只輸出結尾資訊"

10725

10726 #: builtin/interpret-trailers.c

10289 -msgid "do not apply trailer.* configuration variables"

10290 -msgstr "不套用 trailer.* 組態變數"

10727 +msgid "do not apply trailer.<key-alias> configuration variables"

10728 +msgstr "不要套用 trailer.<key-alias> 組態變數"

10729

10730 #: builtin/interpret-trailers.c

10731 msgid "reformat multiline trailer values as single-line values"

10294 -msgstr "將多列尾注值 (trailer values) 重新格式化為單列值"

10732 +msgstr "將多列結尾資訊值重新格式化為單列值"

10733

10734 #: builtin/interpret-trailers.c

10735 msgid "alias for --only-trailers --only-input --unfold"

@@ -10303,7 +10741,7 @@ msgstr "不要把「---」當作輸入結尾"

10741

10742 #: builtin/interpret-trailers.c

10743 msgid "trailer(s) to add"

10306 -msgstr "要新增的尾部署名"

10744 +msgstr "要加入的結尾資訊"

10745

10746 #: builtin/interpret-trailers.c

10747 msgid "--trailer with --only-input does not make sense"

@@ -10314,25 +10752,26 @@ msgid "no input file given for in-place editing"

10752 msgstr "沒有給出要原位編輯的檔案"

10753

10754 #: builtin/last-modified.c

10317 -msgid "last-modified can only operate on one tree at a time"

10318 -msgstr "last-modified 一次只能操作一個樹狀物件"

10755 +msgid "last-modified can only operate on one commit at a time"

10756 +msgstr "last-modified 一次只能操作一個提交"

10757

10758 #: builtin/last-modified.c

10759 #, c-format

10322 -msgid "unknown last-modified argument: %s"

10323 -msgstr "未知的 last-modified 引數：%s"

10760 +msgid "revision argument '%s' is a %s, not a commit-ish"

10761 +msgstr "修訂版本引數「%s」是 %s，而非提交指示元"

10762

10763 #: builtin/last-modified.c

10326 -msgid "unable to setup last-modified"

10327 -msgstr "無法設定 last-modified"

10764 +#, c-format

10765 +msgid "unknown last-modified argument: %s"

10766 +msgstr "未知的 last-modified 引數：%s"

10767

10768 #: builtin/last-modified.c

10769 msgid ""

10331 -"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "

10332 -"<path>...]"

10770 +"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"

10771 +" [<revision-range>] [[--] <pathspec>...]"

10772 msgstr ""

10334 -"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "

10335 -"<path>...]"

10773 +"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"

10774 +" [<revision-range>] [[--] <pathspec>...]"

10775

10776 #: builtin/last-modified.c builtin/ls-tree.c

10777 msgid "recurse into subtrees"

@@ -10342,6 +10781,14 @@ msgstr "遞迴到子樹"

10781 msgid "show tree entries when recursing into subtrees"

10782 msgstr "遞迴子樹時顯示樹狀物件項目"

10783

10784 +#: builtin/last-modified.c diff.c

10785 +msgid "maximum tree depth to recurse"

10786 +msgstr "樹狀物件的遞迴最大深度"

10787 +

10788 +#: builtin/last-modified.c

10789 +msgid "lines are separated with NUL character"

10790 +msgstr "列以 NUL 字元分隔"

10791 +

10792 #: builtin/log.c

10793 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"

10794 msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"

@@ -10410,7 +10857,7 @@ msgstr ""

10857 msgid "git show %s: bad file"

10858 msgstr "git show %s: 損壞的檔案"

10859

10413 -#: builtin/log.c

10860 +#: builtin/log.c builtin/log.c

10861 #, c-format

10862 msgid "could not read object %s"

10863 msgstr "無法讀取物件 %s"

@@ -10429,6 +10876,20 @@ msgstr "%s：從描述產生附函的模式無效"

10876 msgid "format.headers without value"

10877 msgstr "format.headers 沒有值"

10878

10879 +#: builtin/log.c config.c

10880 +#, c-format

10881 +msgid "bad boolean config value '%s' for '%s'"

10882 +msgstr "「%2$s」的「%1$s」布林設定值無效"

10883 +

10884 +#: builtin/log.c

10885 +#, c-format

10886 +msgid ""

10887 +"'%s' used to accept any value and treat that as 'true'.\n"

10888 +"Now it only accepts boolean values, like what '%s' does.\n"

10889 +msgstr ""

10890 +"「%s」過去接受任何值，並將其視為「true」。\n"

10891 +"現在它只接受布林值，符合「%s」的行為。\n"

10892 +

10893 #: builtin/log.c

10894 #, c-format

10895 msgid "cannot open patch file %s"

@@ -10455,6 +10916,11 @@ msgstr "附函需要信件位址格式"

10916 msgid "failed to create cover-letter file"

10917 msgstr "無法建立附函檔案"

10918

10919 +#: builtin/log.c

10920 +#, c-format

10921 +msgid "'%s' is not a valid format string"

10922 +msgstr "「%s」不是有效的格式字串"

10923 +

10924 #: builtin/log.c

10925 #, c-format

10926 msgid "insane in-reply-to: %s"

@@ -10468,12 +10934,13 @@ msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"

10934 msgid "two output directories?"

10935 msgstr "兩個輸出目錄？"

10936

10471 -#: builtin/log.c

10937 +#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c

10938 #, c-format

10939 msgid "unknown commit %s"

10940 msgstr "未知提交 %s"

10941

10476 -#: builtin/log.c builtin/replace.c

10942 +#: builtin/log.c builtin/replace.c builtin/replace.c

10943 +#: builtin/replace.c

10944 #, c-format

10945 msgid "failed to resolve '%s' as a valid ref"

10946 msgstr "無法將 '%s' 解析為一個有效引用"

@@ -10533,6 +11000,14 @@ msgstr "列印修補檔到標準輸出"

11000 msgid "generate a cover letter"

11001 msgstr "生成一封附函"

11002

11003 +#: builtin/log.c

11004 +msgid "format-spec"

11005 +msgstr "format-spec"

11006 +

11007 +#: builtin/log.c

11008 +msgid "format spec used for the commit list in the cover letter"

11009 +msgstr "用於附函中提交列表的格式規格"

11010 +

11011 #: builtin/log.c

11012 msgid "use simple number sequence for output file names"

11013 msgstr "使用簡單的數字序列作為輸出檔案名"

@@ -10621,7 +11096,7 @@ msgstr "header"

11096 msgid "add email header"

11097 msgstr "新增信件頭"

11098

10624 -#: builtin/log.c

11099 +#: builtin/log.c builtin/log.c

11100 msgid "email"

11101 msgstr "信箱"

11102

@@ -10649,7 +11124,7 @@ msgstr "信件標記"

11124 msgid "make first mail a reply to <message-id>"

11125 msgstr "使第一封信件作為對 <信件標記> 的回覆"

11126

10652 -#: builtin/log.c

11127 +#: builtin/log.c builtin/log.c

11128 msgid "boundary"

11129 msgstr "邊界"

11130

@@ -10730,7 +11205,8 @@ msgstr "--check 無意義"

11205 msgid "--remerge-diff does not make sense"

11206 msgstr "--remerge-diff 無意義"

11207

10733 -#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c

11208 +#: builtin/log.c builtin/submodule--helper.c

11209 +#: builtin/submodule--helper.c rerere.c submodule.c

11210 #, c-format

11211 msgid "could not create directory '%s'"

11212 msgstr "無法建立「%s」目錄"

@@ -10922,11 +11398,11 @@ msgstr ""

11398 msgid "do not print remote URL"

11399 msgstr "不列印遠端 URL"

11400

10925 -#: builtin/ls-remote.c builtin/rebase.c

11401 +#: builtin/ls-remote.c builtin/ls-remote.c builtin/rebase.c

11402 msgid "exec"

11403 msgstr "exec"

11404

10929 -#: builtin/ls-remote.c

11405 +#: builtin/ls-remote.c builtin/ls-remote.c

11406 msgid "path of git-upload-pack on the remote host"

11407 msgstr "遠端主機上的 git-upload-pack 路徑"

11408

@@ -10978,7 +11454,7 @@ msgstr "條目以 NUL 字元終止"

11454 msgid "include object size"

11455 msgstr "包括物件大小"

11456

10981 -#: builtin/ls-tree.c

11457 +#: builtin/ls-tree.c builtin/ls-tree.c

11458 msgid "list only filenames"

11459 msgstr "只列出檔案名"

11460

@@ -11156,7 +11632,7 @@ msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。"

11632 msgid "not handling anything other than two heads merge."

11633 msgstr "不能處理兩個頭合併之外的任何動作。"

11634

11159 -#: builtin/merge-recursive.c

11635 +#: builtin/merge-recursive.c builtin/merge-recursive.c

11636 #, c-format

11637 msgid "could not resolve ref '%s'"

11638 msgstr "無法解析引用「%s」"

@@ -11166,12 +11642,12 @@ msgstr "無法解析引用「%s」"

11642 msgid "Merging %s with %s\n"

11643 msgstr "合併 %s 和 %s\n"

11644

11169 -#: builtin/merge-tree.c

11645 +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

11646 #, c-format

11647 msgid "could not parse as tree '%s'"

11648 msgstr "無法解析為樹狀物件「%s」"

11649

11174 -#: builtin/merge-tree.c builtin/merge.c

11650 +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge.c

11651 msgid "not something we can merge"

11652 msgstr "不能合併"

11653

@@ -11231,7 +11707,7 @@ msgstr "option=value"

11707 msgid "option for selected merge strategy"

11708 msgstr "所選的合併策略的選項"

11709

11234 -#: builtin/merge-tree.c

11710 +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

11711 msgid "--trivial-merge is incompatible with all other options"

11712 msgstr "--trivial-merge 和其他所有選項都不相容"

11713

@@ -11240,7 +11716,7 @@ msgstr "--trivial-merge 和其他所有選項都不相容"

11716 msgid "unknown strategy option: -X%s"

11717 msgstr "未知的策略選項：-X%s"

11718

11243 -#: builtin/merge-tree.c builtin/notes.c

11719 +#: builtin/merge-tree.c builtin/merge-tree.c builtin/notes.c

11720 #, c-format

11721 msgid "malformed input line: '%s'."

11722 msgstr "格式錯誤的輸入行：'%s'。"

@@ -11317,8 +11793,8 @@ msgstr "如果不能快轉就放棄合併"

11793 msgid "verify that the named commit has a valid GPG signature"

11794 msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"

11795

11320 -#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c

11321 -#: builtin/revert.c

11796 +#: builtin/merge.c builtin/notes.c builtin/pull.c

11797 +#: builtin/rebase.c builtin/revert.c

11798 msgid "strategy"

11799 msgstr "策略"

11800

@@ -11359,7 +11835,7 @@ msgstr "無法執行貯存。"

11835 msgid "stash failed"

11836 msgstr "貯存失敗"

11837

11362 -#: builtin/merge.c

11838 +#: builtin/merge.c builtin/merge.c

11839 msgid "read-tree failed"

11840 msgstr "讀取樹失敗"

11841

@@ -11392,7 +11868,7 @@ msgstr "'%s' 沒有指向一個提交"

11868 msgid "Bad branch.%s.mergeoptions string: %s"

11869 msgstr "壞的 branch.%s.mergeoptions 字串：%s"

11870

11395 -#: builtin/merge.c merge-ort-wrappers.c

11871 +#: builtin/merge.c builtin/merge.c merge-ort-wrappers.c

11872 msgid "Unable to write index."

11873 msgstr "不能寫入索引。"

11874

@@ -11567,7 +12043,7 @@ msgstr "嘗試非常小的索引內合併...\n"

12043 msgid "Nope.\n"

12044 msgstr "無。\n"

12045

11570 -#: builtin/merge.c

12046 +#: builtin/merge.c builtin/merge.c

12047 #, c-format

12048 msgid "Rewinding the tree to pristine...\n"

12049 msgstr "將樹回滾至原始狀態...\n"

@@ -11648,11 +12124,21 @@ msgstr "允許建立一個以上的樹"

12124

12125 #: builtin/multi-pack-index.c

12126 msgid ""

11651 -"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"

11652 -"snapshot=<path>]"

12127 +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"

12128 +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"

12129 +" [--refs-snapshot=<path>]"

12130 +msgstr ""

12131 +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"

12132 +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"

12133 +" [--refs-snapshot=<path>]"

12134 +

12135 +#: builtin/multi-pack-index.c

12136 +msgid ""

12137 +"git multi-pack-index [<options>] compact [--[no-]incremental]\n"

12138 +" [--[no-]bitmap] <from> <to>"

12139 msgstr ""

11654 -"git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-"

11655 -"snapshot=<路徑>]"

12140 +"git multi-pack-index [<options>] compact [--[no-]incremental]\n"

12141 +" [--[no-]bitmap] <from> <to>"

12142

12143 #: builtin/multi-pack-index.c

12144 msgid "git multi-pack-index [<options>] verify"

@@ -11682,11 +12168,11 @@ msgstr "偏好包"

12168 msgid "pack for reuse when computing a multi-pack bitmap"

12169 msgstr "計算多包位圖時要重複使用的包"

12170

11685 -#: builtin/multi-pack-index.c

12171 +#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12172 msgid "write multi-pack bitmap"

12173 msgstr "寫入多包位圖"

12174

11689 -#: builtin/multi-pack-index.c

12175 +#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12176 msgid "write a new incremental MIDX"

12177 msgstr "寫入新的增量 MIDX"

12178

@@ -11698,6 +12184,20 @@ msgstr "寫入只包含指定索引的多包索引"

12184 msgid "refs snapshot for selecting bitmap commits"

12185 msgstr "用來選取位圖提交的引用快照"

12186

12187 +#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12188 +#, c-format

12189 +msgid "could not find MIDX: %s"

12190 +msgstr "找不到 MIDX：%s"

12191 +

12192 +#: builtin/multi-pack-index.c

12193 +msgid "MIDX compaction endpoints must be unique"

12194 +msgstr "MIDX 壓縮端點必須唯一"

12195 +

12196 +#: builtin/multi-pack-index.c

12197 +#, c-format

12198 +msgid "MIDX %s must be an ancestor of %s"

12199 +msgstr "MIDX %s 必須是 %s 的祖先"

12200 +

12201 #: builtin/multi-pack-index.c

12202 msgid ""

12203 "during repack, collect pack-files of smaller size into a batch that is "

@@ -11744,11 +12244,11 @@ msgstr "目的地「%s」不是目錄"

12244 msgid "Checking rename of '%s' to '%s'\n"

12245 msgstr "檢查 '%s' 到 '%s' 的重新命名\n"

12246

11747 -#: builtin/mv.c

12247 +#: builtin/mv.c builtin/mv.c

12248 msgid "bad source"

12249 msgstr "來源損壞"

12250

11751 -#: builtin/mv.c

12251 +#: builtin/mv.c builtin/mv.c

12252 msgid "destination exists"

12253 msgstr "目的地已存在"

12254

@@ -11772,7 +12272,7 @@ msgstr "不在版本控制之下"

12272 msgid "conflicted"

12273 msgstr "衝突"

12274

11775 -#: builtin/mv.c

12275 +#: builtin/mv.c builtin/mv.c

12276 #, c-format

12277 msgid "overwriting '%s'"

12278 msgstr "覆蓋 '%s'"

@@ -11993,7 +12493,9 @@ msgstr "註解內容被留在 %s 中"

12493 msgid "could not open or read '%s'"

12494 msgstr "無法開啟或讀取「%s」"

12495

11996 -#: builtin/notes.c

12496 +#: builtin/notes.c builtin/notes.c builtin/notes.c

12497 +#: builtin/notes.c builtin/notes.c builtin/notes.c

12498 +#: builtin/notes.c builtin/notes.c builtin/notes.c

12499 #, c-format

12500 msgid "failed to resolve '%s' as a valid ref."

12501 msgstr "無法解析 '%s' 為一個有效引用。"

@@ -12021,48 +12523,48 @@ msgstr "將註解從「%s」複製至「%s」失敗"

12523 msgid "refusing to %s notes in %s (outside of refs/notes/)"

12524 msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解"

12525

12024 -#: builtin/notes.c

12526 +#: builtin/notes.c builtin/notes.c

12527 #, c-format

12528 msgid "no note found for object %s."

12529 msgstr "未發現物件 %s 的註解。"

12530

12029 -#: builtin/notes.c

12531 +#: builtin/notes.c builtin/notes.c

12532 msgid "note contents as a string"

12533 msgstr "註解內容作為一個字串"

12534

12033 -#: builtin/notes.c

12535 +#: builtin/notes.c builtin/notes.c

12536 msgid "note contents in a file"

12537 msgstr "註解內容到一個檔案中"

12538

12037 -#: builtin/notes.c

12539 +#: builtin/notes.c builtin/notes.c

12540 msgid "reuse and edit specified note object"

12541 msgstr "重用和編輯指定的註解物件"

12542

12041 -#: builtin/notes.c

12543 +#: builtin/notes.c builtin/notes.c

12544 msgid "edit note message in editor"

12545 msgstr "在編輯器中編輯備註訊息"

12546

12045 -#: builtin/notes.c

12547 +#: builtin/notes.c builtin/notes.c

12548 msgid "reuse specified note object"

12549 msgstr "重用指定的註解物件"

12550

12049 -#: builtin/notes.c

12551 +#: builtin/notes.c builtin/notes.c

12552 msgid "allow storing empty note"

12553 msgstr "允許儲存空白備註"

12554

12053 -#: builtin/notes.c

12555 +#: builtin/notes.c builtin/notes.c

12556 msgid "replace existing notes"

12557 msgstr "取代已存在的註解"

12558

12057 -#: builtin/notes.c

12559 +#: builtin/notes.c builtin/notes.c

12560 msgid "<paragraph-break>"

12561 msgstr "<paragraph-break>"

12562

12061 -#: builtin/notes.c

12563 +#: builtin/notes.c builtin/notes.c

12564 msgid "insert <paragraph-break> between paragraphs"

12565 msgstr "在段落間插入 <paragraph-break>"

12566

12065 -#: builtin/notes.c

12567 +#: builtin/notes.c builtin/notes.c

12568 msgid "remove unnecessary whitespace"

12569 msgstr "移除不必要的空白字元"

12570

@@ -12073,12 +12575,12 @@ msgid ""

12575 "existing notes"

12576 msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"

12577

12076 -#: builtin/notes.c

12578 +#: builtin/notes.c builtin/notes.c

12579 #, c-format

12580 msgid "Overwriting existing notes for object %s\n"

12581 msgstr "覆蓋物件 %s 現存註解\n"

12582

12081 -#: builtin/notes.c

12583 +#: builtin/notes.c builtin/notes.c builtin/notes.c

12584 #, c-format

12585 msgid "Removing note for object %s\n"

12586 msgstr "刪除物件 %s 的註解\n"

@@ -12364,7 +12866,7 @@ msgstr "%s 的 delta 基準位移越界"

12866 msgid "Counting objects"

12867 msgstr "正在計算物件數量"

12868

12367 -#: builtin/pack-objects.c pack-bitmap.c

12869 +#: builtin/pack-objects.c pack-bitmap.c pack-bitmap.c

12870 #, c-format

12871 msgid "unable to get size of %s"

12872 msgstr "不能得到 %s 的大小"

@@ -12374,12 +12876,13 @@ msgstr "不能得到 %s 的大小"

12876 msgid "unable to parse object header of %s"

12877 msgstr "無法解析物件 %s 標頭訊息"

12878

12879 +#: builtin/pack-objects.c builtin/pack-objects.c

12880 #: builtin/pack-objects.c

12881 #, c-format

12882 msgid "object %s cannot be read"

12883 msgstr "物件 %s 無法讀取"

12884

12382 -#: builtin/pack-objects.c

12885 +#: builtin/pack-objects.c builtin/pack-objects.c

12886 #, c-format

12887 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"

12888 msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"

@@ -12403,7 +12906,7 @@ msgstr "無法為標籤 %s 壓縮物件"

12906 msgid "unable to get type of object %s"

12907 msgstr "無法獲得物件 %s 類型"

12908

12406 -#: builtin/pack-objects.c

12909 +#: builtin/pack-objects.c builtin/pack-objects.c

12910 msgid "Compressing objects by path"

12911 msgstr "正在根據路徑壓縮物件"

12912

@@ -12446,22 +12949,22 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')

12949 msgid "could not get type of object %s in pack %s"

12950 msgstr "無法取得 %2$s 包中 %1$s 物件的類型"

12951

12449 -#: builtin/pack-objects.c

12952 +#: builtin/pack-objects.c builtin/pack-objects.c

12953 #, c-format

12451 -msgid "packfile %s is a promisor but --exclude-promisor-objects was given"

12452 -msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-objects"

12954 +msgid "could not find pack '%s'"

12955 +msgstr "找不到「%s」包"

12956

12957 #: builtin/pack-objects.c

12958 #, c-format

12456 -msgid "could not find pack '%s'"

12457 -msgstr "找不到「%s」包"

12959 +msgid "packfile %s is a promisor but --exclude-promisor-objects was given"

12960 +msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-objects"

12961

12962 #: builtin/pack-objects.c

12963 #, c-format

12964 msgid "packfile %s cannot be accessed"

12965 msgstr "無法存取封包檔案 %s"

12966

12464 -#: builtin/pack-objects.c

12967 +#: builtin/pack-objects.c builtin/pack-objects.c

12968 msgid "Enumerating cruft objects"

12969 msgstr "正在枚舉無用物件"

12970

@@ -12491,11 +12994,7 @@ msgstr ""

12994 "預期物件 ID，卻得到垃圾資料：\n"

12995 " %s"

12996

12494 -#: builtin/pack-objects.c reachable.c

12495 -msgid "could not load cruft pack .mtimes"

12496 -msgstr "無法載入無用包 .mtimes"

12497 -

12498 -#: builtin/pack-objects.c

12997 +#: builtin/pack-objects.c builtin/pack-objects.c

12998 msgid "cannot open pack index"

12999 msgstr "無法開啟包檔案索引"

13000

@@ -12848,23 +13347,24 @@ msgstr ""

13347 msgid "You are not currently on a branch."

13348 msgstr "您目前不在一個分支上。"

13349

12851 -#: builtin/pull.c

13350 +#: builtin/pull.c builtin/pull.c

13351 msgid "Please specify which branch you want to rebase against."

13352 msgstr "請指定您要重定基底到哪一個分支。"

13353

12855 -#: builtin/pull.c

13354 +#: builtin/pull.c builtin/pull.c

13355 msgid "Please specify which branch you want to merge with."

13356 msgstr "請指定您要合併哪一個分支。"

13357

12859 -#: builtin/pull.c

13358 +#: builtin/pull.c builtin/pull.c

13359 msgid "See git-pull(1) for details."

13360 msgstr "詳見 git-pull(1)。"

13361

12863 -#: builtin/pull.c builtin/rebase.c

13362 +#: builtin/pull.c builtin/pull.c builtin/pull.c

13363 +#: builtin/rebase.c

13364 msgid "<remote>"

13365 msgstr "<遠端>"

13366

12867 -#: builtin/pull.c scalar.c

13367 +#: builtin/pull.c builtin/pull.c builtin/pull.c scalar.c

13368 msgid "<branch>"

13369 msgstr "<分支>"

13370

@@ -13271,7 +13771,8 @@ msgstr "控制子模組的遞迴推送"

13771 msgid "use thin pack"

13772 msgstr "使用精簡打包"

13773

13274 -#: builtin/push.c builtin/send-pack.c

13774 +#: builtin/push.c builtin/push.c builtin/send-pack.c

13775 +#: builtin/send-pack.c

13776 msgid "receive pack program"

13777 msgstr "接收包程式"

13778

@@ -13366,7 +13867,7 @@ msgstr "使用簡單差異顏色"

13867 msgid "notes"

13868 msgstr "註解"

13869

13369 -#: builtin/range-diff.c

13870 +#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c

13871 msgid "passed to 'git log'"

13872 msgstr "傳遞給 'git log'"

13873

@@ -13386,12 +13887,12 @@ msgstr "只發出跟第一個範圍相關的輸出"

13887 msgid "only emit output related to the second range"

13888 msgstr "只發出跟第二個範圍相關的輸出"

13889

13389 -#: builtin/range-diff.c

13890 +#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c

13891 #, c-format

13892 msgid "not a revision: '%s'"

13893 msgstr "非修訂版：「%s」"

13894

13394 -#: builtin/range-diff.c

13895 +#: builtin/range-diff.c builtin/range-diff.c

13896 #, c-format

13897 msgid "not a commit range: '%s'"

13898 msgstr "不是提交範圍：「%s」"

@@ -13545,7 +14046,8 @@ msgstr "無效的原始 head：'%s'"

14046 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"

14047 msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"

14048

13548 -#: builtin/rebase.c builtin/rm.c sequencer.c

14049 +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

14050 +#: builtin/rm.c sequencer.c sequencer.c

14051 #, c-format

14052 msgid "could not remove '%s'"

14053 msgstr "無法刪除「%s」"

@@ -13578,6 +14080,7 @@ msgstr "未知的 rebase-merges 模式：%s"

14080 msgid "could not switch to %s"

14081 msgstr "無法切換到 %s"

14082

14083 +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

14084 #: builtin/rebase.c

14085 msgid "apply options and merge options cannot be used together"

14086 msgstr "套用選項與合併選項不得同時使用"

@@ -13680,7 +14183,7 @@ msgstr "忽略製作日期而使用日前日期"

14183 msgid "synonym of --reset-author-date"

14184 msgstr "和 --reset-author-date 同義"

14185

13683 -#: builtin/rebase.c

14186 +#: builtin/rebase.c builtin/rebase.c

14187 msgid "passed to 'git apply'"

14188 msgstr "傳遞給 'git apply'"

14189

@@ -13688,7 +14191,7 @@ msgstr "傳遞給 'git apply'"

14191 msgid "ignore changes in whitespace"

14192 msgstr "忽略空白字元中的變更"

14193

13691 -#: builtin/rebase.c

14194 +#: builtin/rebase.c builtin/rebase.c

14195 msgid "cherry-pick all commits, even if unchanged"

14196 msgstr "揀選所有提交，即使未修改"

14197

@@ -14067,7 +14570,7 @@ msgstr ""

14570 " [--dry-run | -n] [--verbose] [--all [--single-worktree] | "

14571 "<refs>...]"

14572

14070 -#: builtin/reflog.c

14573 +#: builtin/reflog.c builtin/reflog.c

14574 #, c-format

14575 msgid "invalid timestamp '%s' given to '--%s'"

14576 msgstr "傳入「--%s」的時間戳「%s」無效"

@@ -14077,24 +14580,24 @@ msgstr "傳入「--%s」的時間戳「%s」無效"

14580 msgid "%s does not accept arguments: '%s'"

14581 msgstr "%s 不接受參數：'%s'"

14582

14080 -#: builtin/reflog.c

14583 +#: builtin/reflog.c builtin/reflog.c

14584 msgid "do not actually prune any entries"

14585 msgstr "不實際剪除任何項目"

14586

14084 -#: builtin/reflog.c

14587 +#: builtin/reflog.c builtin/reflog.c

14588 msgid ""

14589 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"

14590 msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1"

14591

14089 -#: builtin/reflog.c

14592 +#: builtin/reflog.c builtin/reflog.c

14593 msgid "update the reference to the value of the top reflog entry"

14594 msgstr "更新引用至首個引用日誌項目的值"

14595

14093 -#: builtin/reflog.c

14596 +#: builtin/reflog.c builtin/reflog.c

14597 msgid "print extra information on screen"

14598 msgstr "在螢幕上輸出額外資訊"

14599

14097 -#: builtin/reflog.c

14600 +#: builtin/reflog.c builtin/reflog.c

14601 msgid "timestamp"

14602 msgstr "時間戳"

14603

@@ -14125,7 +14628,7 @@ msgstr "限制只處理目前工作區的引用日誌"

14628 msgid "Marking reachable objects..."

14629 msgstr "正在標記可以取得物件..."

14630

14128 -#: builtin/reflog.c

14631 +#: builtin/reflog.c builtin/reflog.c

14632 #, c-format

14633 msgid "reflog could not be found: '%s'"

14634 msgstr "找不到引用日誌：「%s」"

@@ -14260,15 +14763,15 @@ msgstr ""

14763 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"

14764 "mirror=<fetch|push>] <名稱> <位址>"

14765

14263 -#: builtin/remote.c

14766 +#: builtin/remote.c builtin/remote.c

14767 msgid "git remote rename [--[no-]progress] <old> <new>"

14768 msgstr "git remote rename [--[no-]progress] <old> <new>"

14769

14267 -#: builtin/remote.c

14770 +#: builtin/remote.c builtin/remote.c

14771 msgid "git remote remove <name>"

14772 msgstr "git remote remove <名稱>"

14773

14271 -#: builtin/remote.c

14774 +#: builtin/remote.c builtin/remote.c

14775 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

14776 msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)"

14777

@@ -14289,19 +14792,19 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...

14792 msgid "git remote set-branches [--add] <name> <branch>..."

14793 msgstr "git remote set-branches [--add] <名稱> <分支>..."

14794

14292 -#: builtin/remote.c

14795 +#: builtin/remote.c builtin/remote.c

14796 msgid "git remote get-url [--push] [--all] <name>"

14797 msgstr "git remote get-url [--push] [--all] <名稱>"

14798

14296 -#: builtin/remote.c

14799 +#: builtin/remote.c builtin/remote.c

14800 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"

14801 msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]"

14802

14300 -#: builtin/remote.c

14803 +#: builtin/remote.c builtin/remote.c

14804 msgid "git remote set-url --add <name> <newurl>"

14805 msgstr "git remote set-url --add <名稱> <新的位址>"

14806

14304 -#: builtin/remote.c

14807 +#: builtin/remote.c builtin/remote.c

14808 msgid "git remote set-url --delete <name> <url>"

14809 msgstr "git remote set-url --delete <名稱> <位址>"

14810

@@ -14394,7 +14897,7 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義"

14897 msgid "specifying branches to track makes sense only with fetch mirrors"

14898 msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"

14899

14397 -#: builtin/remote.c

14900 +#: builtin/remote.c builtin/remote.c

14901 #, c-format

14902 msgid "remote %s already exists."

14903 msgstr "遠端 %s 已經存在。"

@@ -14404,7 +14907,8 @@ msgstr "遠端 %s 已經存在。"

14907 msgid "Could not setup master '%s'"

14908 msgstr "無法配置 master「%s」"

14909

14407 -#: builtin/remote.c trailer.c

14910 +#: builtin/remote.c builtin/remote.c trailer.c trailer.c

14911 +#: trailer.c

14912 #, c-format

14913 msgid "more than one %s"

14914 msgstr "多於一個 %s"

@@ -14419,7 +14923,7 @@ msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"

14923 msgid "Could not get fetch map for refspec %s"

14924 msgstr "無法取得引用規格 %s 的 fetch 映射"

14925

14422 -#: builtin/remote.c

14926 +#: builtin/remote.c builtin/remote.c

14927 msgid "(matching)"

14928 msgstr "（符合）"

14929

@@ -14432,7 +14936,8 @@ msgstr "（刪除）"

14936 msgid "could not set '%s'"

14937 msgstr "無法設定「%s」"

14938

14435 -#: builtin/remote.c config.c

14939 +#: builtin/remote.c builtin/remote.c builtin/remote.c

14940 +#: config.c

14941 #, c-format

14942 msgid "could not unset '%s'"

14943 msgstr "無法取消設定「%s」"

@@ -14464,7 +14969,7 @@ msgstr ""

14969 "\n"

14970 "若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n"

14971

14467 -#: builtin/remote.c

14972 +#: builtin/remote.c builtin/remote.c builtin/remote.c

14973 #, c-format

14974 msgid "No such remote: '%s'"

14975 msgstr "沒有此遠端版本庫：'%s'"

@@ -14627,7 +15132,7 @@ msgstr " 取得位址：%s"

15132 #. with the one in " Fetch URL: %s"

15133 #. translation.

15134 #.

14630 -#: builtin/remote.c

15135 +#: builtin/remote.c builtin/remote.c

15136 #, c-format

15137 msgid " Push URL: %s"

15138 msgstr " 推送位址：%s"

@@ -14636,7 +15141,7 @@ msgstr " 推送位址：%s"

15141 msgid "(no URL)"

15142 msgstr "(無 URL)"

15143

14639 -#: builtin/remote.c

15144 +#: builtin/remote.c builtin/remote.c builtin/remote.c

15145 #, c-format

15146 msgid " HEAD branch: %s"

15147 msgstr " HEAD 分支：%s"

@@ -14663,7 +15168,7 @@ msgid_plural " Remote branches:%s"

15168 msgstr[0] " 遠端分支：%s"

15169

15170 # 譯者：中文字串拼接，可刪除前導空格

14666 -#: builtin/remote.c

15171 +#: builtin/remote.c builtin/remote.c

15172 msgid " (status not queried)"

15173 msgstr " （狀態未查詢）"

15174

@@ -14764,7 +15269,7 @@ msgstr " * [已剪除] %s"

15269 msgid "prune remotes after fetching"

15270 msgstr "抓取後剪除遠端"

15271

14767 -#: builtin/remote.c

15272 +#: builtin/remote.c builtin/remote.c builtin/remote.c

15273 #, c-format

15274 msgid "No such remote '%s'"

15275 msgstr "沒有此遠端 '%s'"

@@ -14849,7 +15354,7 @@ msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"

15354 msgid "same as -a, pack unreachable cruft objects separately"

15355 msgstr "和 -a 相同，會獨立封裝無法存取的無用物件"

15356

14852 -#: builtin/repack.c

15357 +#: builtin/repack.c builtin/repack.c

15358 msgid "approxidate"

15359 msgstr "近似日期"

15360

@@ -15201,60 +15706,48 @@ msgstr "只能為 -l 提供一個模式"

15706

15707 #: builtin/replay.c

15708 #, c-format

15204 -msgid "'%s' is not a valid commit-ish for %s"

15205 -msgstr "「%s」不是 %s 有效的提交指示元"

15206 -

15207 -#: builtin/replay.c

15208 -msgid "need some commits to replay"

15209 -msgstr "需要一些提交才能重放"

15210 -

15211 -#: builtin/replay.c

15212 -msgid "all positive revisions given must be references"

15213 -msgstr "提供的所有正向修訂集必須為引用"

15214 -

15215 -#: builtin/replay.c

15216 -msgid "argument to --advance must be a reference"

15217 -msgstr "傳入 --advance 的引數必須為引用"

15709 +msgid "invalid %s value: '%s'"

15710 +msgstr "無效的 %s 值：「%s」"

15711

15712 #: builtin/replay.c

15713 msgid ""

15221 -"cannot advance target with multiple sources because ordering would be ill-"

15222 -"defined"

15223 -msgstr "無法用多個來源演進目的地，以免無法確定排序"

15714 +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"

15715 +"advance=<branch> | --revert=<branch>)\n"

15716 +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"

15717 +msgstr ""

15718 +"（實驗功能！）git replay ([--contained] --onto=<newbase> | --"

15719 +"advance=<branch> | --revert=<branch>)\n"

15720 +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"

15721

15722 #: builtin/replay.c

15226 -#, c-format

15227 -msgid "invalid %s value: '%s'"

15228 -msgstr "無效的 %s 值：「%s」"

15723 +msgid "update all branches that point at commits in <revision-range>"

15724 +msgstr "更新所有指向 <revision-range> 範圍中提交的分支"

15725

15726 #: builtin/replay.c

15231 -msgid ""

15232 -"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "

15233 -"<branch>) [--ref-action[=<mode>]] <revision-range>"

15234 -msgstr ""

15235 -"(實驗性功能!) git replay ([--contained] --onto <newbase> | --advance "

15236 -"<branch>) [--ref-action[=<mode>]] <revision-range>"

15727 +msgid "replay onto given commit"

15728 +msgstr "重放到指定提交"

15729

15730 #: builtin/replay.c

15731 msgid "make replay advance given branch"

15732 msgstr "在指定分支上進行重放演進"

15733

15734 #: builtin/replay.c

15243 -msgid "replay onto given commit"

15244 -msgstr "重放到指定提交"

15735 +msgid "revert commits onto given branch"

15736 +msgstr "將提交還原至指定的分支"

15737

15738 #: builtin/replay.c

15247 -msgid "update all branches that point at commits in <revision-range>"

15248 -msgstr "更新所有指向 <revision-range> 範圍中提交的分支"

15739 +msgid "reference to update with result"

15740 +msgstr "要以結果更新的引用"

15741

15742 #: builtin/replay.c

15743 msgid "control ref update behavior (update|print)"

15744 msgstr "控制引用的更新行為（update|print）"

15745

15746 #: builtin/replay.c

15255 -msgid "option --onto or --advance is mandatory"

15256 -msgstr "必須傳入 --onto 或 --advance 選項"

15747 +msgid "exactly one of --onto, --advance, or --revert is required"

15748 +msgstr "--onto、--advance 或 --revert 必須三選一"

15749

15750 +#: builtin/replay.c builtin/replay.c builtin/replay.c

15751 #: builtin/replay.c

15752 #, c-format

15753 msgid ""

@@ -15262,48 +15755,25 @@ msgid ""

15755 "will be forced"

15756 msgstr "將覆寫部分修訂版遍歷選項，強制使用「struct rev_info」的「%s」位元"

15757

15265 -#: builtin/replay.c

15266 -#, c-format

15267 -msgid "failed to begin ref transaction: %s"

15268 -msgstr "無法開始引用事務：%s"

15269 -

15270 -#: builtin/replay.c

15271 -msgid "error preparing revisions"

15272 -msgstr "無法準備修訂集"

15273 -

15274 -#: builtin/replay.c

15275 -msgid "replaying down from root commit is not supported yet!"

15276 -msgstr "尚不支援從根提交重放！"

15277 -

15278 -#: builtin/replay.c

15279 -msgid "replaying merge commits is not supported yet!"

15280 -msgstr "尚不支援重放合併提交！"

15281 -

15282 -#: builtin/replay.c

15283 -#, c-format

15284 -msgid "failed to update ref '%s': %s"

15285 -msgstr "無法更新「%s」引用：%s"

15286 -

15287 -#: builtin/replay.c

15288 -#, c-format

15289 -msgid "failed to commit ref transaction: %s"

15290 -msgstr "無法提交引用事務：%s"

15291 -

15758 #: builtin/repo.c

15759 #, c-format

15760 msgid "key '%s' not found"

15761 msgstr "找不到「%s」鍵"

15762

15763 +#: builtin/repo.c

15764 +msgid "--keys can only be used with --format=lines or --format=nul"

15765 +msgstr "--keys 只能與 --format=lines 或 --format=nul 一起使用"

15766 +

15767 #: builtin/repo.c

15768 #, c-format

15769 msgid "invalid format '%s'"

15770 msgstr "「%s」格式無效"

15771

15302 -#: builtin/repo.c

15772 +#: builtin/repo.c builtin/repo.c

15773 msgid "output format"

15774 msgstr "輸出格式"

15775

15306 -#: builtin/repo.c

15776 +#: builtin/repo.c builtin/repo.c

15777 msgid "synonym for --format=nul"

15778 msgstr "和 --format=nul 同義"

15779

@@ -15311,6 +15781,14 @@ msgstr "和 --format=nul 同義"

15781 msgid "print all keys/values"

15782 msgstr "輸出所有鍵值對"

15783

15784 +#: builtin/repo.c

15785 +msgid "show keys"

15786 +msgstr "顯示設定鍵"

15787 +

15788 +#: builtin/repo.c

15789 +msgid "--keys cannot be used with a <key> or --all"

15790 +msgstr "--keys 不能與 <key> 或 --all 一起使用"

15791 +

15792 #: builtin/repo.c

15793 msgid "unsupported output format"

15794 msgstr "不支援的輸出格式"

@@ -15323,7 +15801,7 @@ msgstr "--all 和 <key> 不能同時使用"

15801 msgid "References"

15802 msgstr "引用"

15803

15326 -#: builtin/repo.c

15804 +#: builtin/repo.c builtin/repo.c

15805 msgid "Count"

15806 msgstr "總數"

15807

@@ -15331,6 +15809,7 @@ msgstr "總數"

15809 msgid "Branches"

15810 msgstr "分支"

15811

15812 +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15813 #: builtin/repo.c

15814 msgid "Tags"

15815 msgstr "標籤"

@@ -15347,15 +15826,15 @@ msgstr "其他"

15826 msgid "Reachable objects"

15827 msgstr "可到達物件"

15828

15350 -#: builtin/repo.c

15829 +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15830 msgid "Commits"

15831 msgstr "提交"

15832

15354 -#: builtin/repo.c

15833 +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15834 msgid "Trees"

15835 msgstr "樹狀物件"

15836

15358 -#: builtin/repo.c

15837 +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15838 msgid "Blobs"

15839 msgstr "資料物件"

15840

@@ -15367,6 +15846,22 @@ msgstr "未壓縮大小"

15846 msgid "Disk size"

15847 msgstr "磁碟大小"

15848

15849 +#: builtin/repo.c

15850 +msgid "Largest objects"

15851 +msgstr "最大的物件"

15852 +

15853 +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15854 +msgid "Maximum size"

15855 +msgstr "最大大小"

15856 +

15857 +#: builtin/repo.c

15858 +msgid "Maximum parents"

15859 +msgstr "最大父提交數"

15860 +

15861 +#: builtin/repo.c

15862 +msgid "Maximum entries"

15863 +msgstr "最大項目數"

15864 +

15865 #: builtin/repo.c

15866 msgid "Repository structure"

15867 msgstr "版本庫結構"

@@ -15461,7 +15956,8 @@ msgstr "HEAD 現在位於 %s"

15956 msgid "Cannot do a %s reset in the middle of a merge."

15957 msgstr "在合併過程中不能做%s重設動作。"

15958

15464 -#: builtin/reset.c builtin/stash.c

15959 +#: builtin/reset.c builtin/stash.c builtin/stash.c

15960 +#: builtin/stash.c

15961 msgid "be quiet, only report errors"

15962 msgstr "安靜模式，只報告錯誤"

15963

@@ -15477,7 +15973,7 @@ msgstr "重設 HEAD 和索引"

15973 msgid "reset only HEAD"

15974 msgstr "只重設 HEAD"

15975

15480 -#: builtin/reset.c

15976 +#: builtin/reset.c builtin/reset.c

15977 msgid "reset HEAD, index and working tree"

15978 msgstr "重設 HEAD、索引和工作區"

15979

@@ -15801,7 +16297,7 @@ msgid "the following file has changes staged in the index:"

16297 msgid_plural "the following files have changes staged in the index:"

16298 msgstr[0] "下列檔案有暫存在索引的變更："

16299

15804 -#: builtin/rm.c

16300 +#: builtin/rm.c builtin/rm.c

16301 msgid ""

16302 "\n"

16303 "(use --cached to keep the file, or -f to force removal)"

@@ -15898,7 +16394,7 @@ msgstr "git log --pretty=short | git shortlog [<選項>]"

16394 msgid "using multiple --group options with stdin is not supported"

16395 msgstr "不支援在標準輸入使用多個 --group 選項"

16396

15901 -#: builtin/shortlog.c

16397 +#: builtin/shortlog.c builtin/shortlog.c

16398 #, c-format

16399 msgid "using %s with stdin is not supported"

16400 msgstr "不支援對 %s 使用 stdin"

@@ -16080,6 +16576,55 @@ msgstr "雜湊算法"

16576 msgid "Unknown hash algorithm"

16577 msgstr "未知的雜湊算法"

16578

16579 +#: builtin/show-index.c

16580 +msgid "assuming SHA-1; use --object-format to override"

16581 +msgstr "假設使用 SHA-1，使用 --object-format 可以覆寫"

16582 +

16583 +#: builtin/show-index.c

16584 +msgid "unable to read header"

16585 +msgstr "無法讀取標頭"

16586 +

16587 +#: builtin/show-index.c

16588 +msgid "unknown index version"

16589 +msgstr "未知的索引版本"

16590 +

16591 +#: builtin/show-index.c builtin/show-index.c

16592 +msgid "unable to read index"

16593 +msgstr "無法讀取索引"

16594 +

16595 +#: builtin/show-index.c

16596 +msgid "corrupt index file"

16597 +msgstr "索引檔案損壞"

16598 +

16599 +#: builtin/show-index.c

16600 +#, c-format

16601 +msgid "unable to read entry %u/%u"

16602 +msgstr "無法讀取項目 %u/%u"

16603 +

16604 +#: builtin/show-index.c

16605 +#, c-format

16606 +msgid "unable to read sha1 %u/%u"

16607 +msgstr "無法讀取 sha1 %u/%u"

16608 +

16609 +#: builtin/show-index.c

16610 +#, c-format

16611 +msgid "unable to read crc %u/%u"

16612 +msgstr "無法讀取 crc %u/%u"

16613 +

16614 +#: builtin/show-index.c

16615 +#, c-format

16616 +msgid "unable to read 32b offset %u/%u"

16617 +msgstr "無法讀取 32 位元偏移 %u/%u"

16618 +

16619 +#: builtin/show-index.c

16620 +msgid "inconsistent 64b offset index"

16621 +msgstr "64 位元偏移索引不一致"

16622 +

16623 +#: builtin/show-index.c

16624 +#, c-format

16625 +msgid "unable to read 64b offset %u"

16626 +msgstr "無法讀取 64 位元偏移 %u"

16627 +

16628 #: builtin/show-ref.c

16629 msgid ""

16630 "git show-ref [--head] [-d | --dereference]\n"

@@ -16124,7 +16669,7 @@ msgstr "檢查引用是否存在但不解析"

16669 msgid "stricter reference checking, requires exact ref path"

16670 msgstr "更嚴格的引用檢測，需要精確的引用路徑"

16671

16127 -#: builtin/show-ref.c

16672 +#: builtin/show-ref.c builtin/show-ref.c

16673 msgid "show the HEAD reference, even if it would be filtered out"

16674 msgstr "顯示 HEAD 引用，即使被過濾掉"

16675

@@ -16189,10 +16734,12 @@ msgstr "無法初始化工作區組態"

16734 msgid "failed to modify sparse-index config"

16735 msgstr "無法修改稀疏索引設定"

16736

16737 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16738 #: builtin/sparse-checkout.c

16739 msgid "initialize the sparse-checkout in cone mode"

16740 msgstr "以 cone 模式初始化稀疏簽出"

16741

16742 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16743 #: builtin/sparse-checkout.c

16744 msgid "toggle the use of a sparse index"

16745 msgstr "切換是否使用稀疏索引"

@@ -16207,11 +16754,12 @@ msgstr "無法開啟「%s」"

16754 msgid "could not normalize path %s"

16755 msgstr "無法標準化路徑 %s"

16756

16210 -#: builtin/sparse-checkout.c

16757 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16758 #, c-format

16759 msgid "unable to unquote C-style string '%s'"

16760 msgstr "無法去掉 '%s' C 樣式字串的引號"

16761

16762 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16763 #: builtin/sparse-checkout.c

16764 msgid "unable to load existing sparse-checkout patterns"

16765 msgstr "無法載入現存的稀疏簽出樣式"

@@ -16262,12 +16810,12 @@ msgstr ""

16810 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"

16811 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"

16812

16265 -#: builtin/sparse-checkout.c

16813 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16814 msgid ""

16815 "skip some sanity checks on the given paths that might give false positives"

16816 msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查"

16817

16270 -#: builtin/sparse-checkout.c

16818 +#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16819 msgid "read patterns from standard in"

16820 msgstr "從標準輸入讀取樣式"

16821

@@ -16377,19 +16925,19 @@ msgstr "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"

16925

16926 #: builtin/stash.c

16927 msgid ""

16380 -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

16928 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

16929 "| --quiet]\n"

16930 " [-u | --include-untracked] [-a | --all] [(-m | --message) "

16931 "<message>]\n"

16932 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

16385 -" [--] [<pathspec>...]]"

16933 +" [--] [<pathspec>...]"

16934 msgstr ""

16387 -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

16935 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

16936 "| --quiet]\n"

16937 " [-u | --include-untracked] [-a | --all] [(-m | --message) "

16938 "<message>]\n"

16939 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

16392 -" [--] [<pathspec>...]]"

16940 +" [--] [<pathspec>...]"

16941

16942 #: builtin/stash.c

16943 msgid ""

@@ -16477,7 +17025,7 @@ msgstr "索引未從貯存中復原。"

17025 msgid "could not restore untracked files from stash"

17026 msgstr "無法從貯存條目中復原未追蹤檔案"

17027

16480 -#: builtin/stash.c

17028 +#: builtin/stash.c builtin/stash.c

17029 msgid "attempt to recreate the index"

17030 msgstr "嘗試重建索引"

17031

@@ -16520,12 +17068,12 @@ msgstr "在貯存區包含未追蹤檔案"

17068 msgid "only show untracked files in the stash"

17069 msgstr "只在貯存區顯示未追蹤檔案"

17070

16523 -#: builtin/stash.c

17071 +#: builtin/stash.c builtin/stash.c

17072 #, c-format

17073 msgid "Cannot update %s with %s"

17074 msgstr "無法用 %2$s 更新 %1$s"

17075

16528 -#: builtin/stash.c

17076 +#: builtin/stash.c builtin/stash.c builtin/stash.c

17077 msgid "stash message"

17078 msgstr "貯存說明"

17079

@@ -16553,7 +17101,7 @@ msgstr "無法儲存目前索引狀態"

17101 msgid "Cannot save the untracked files"

17102 msgstr "無法儲存未追蹤檔案"

17103

16556 -#: builtin/stash.c

17104 +#: builtin/stash.c builtin/stash.c

17105 msgid "Cannot save the current worktree state"

17106 msgstr "無法儲存目前工作區狀態"

17107

@@ -16598,30 +17146,31 @@ msgstr "儲存工作目錄和索引狀態 %s"

17146 msgid "Cannot remove worktree changes"

17147 msgstr "無法刪除工作區變更"

17148

16601 -#: builtin/stash.c

17149 +#: builtin/stash.c builtin/stash.c

17150 msgid "keep index"

17151 msgstr "保持索引"

17152

16605 -#: builtin/stash.c

17153 +#: builtin/stash.c builtin/stash.c

17154 msgid "stash staged changes only"

17155 msgstr "只貯存暫存變更"

17156

16609 -#: builtin/stash.c

17157 +#: builtin/stash.c builtin/stash.c

17158 msgid "stash in patch mode"

17159 msgstr "以修補檔模式貯存"

17160

16613 -#: builtin/stash.c

17161 +#: builtin/stash.c builtin/stash.c

17162 msgid "quiet mode"

17163 msgstr "靜默模式"

17164

16617 -#: builtin/stash.c

17165 +#: builtin/stash.c builtin/stash.c

17166 msgid "include untracked files in stash"

17167 msgstr "貯存中包含未追蹤檔案"

17168

16621 -#: builtin/stash.c

17169 +#: builtin/stash.c builtin/stash.c

17170 msgid "include ignore files"

17171 msgstr "包含忽略的檔案"

17172

17173 +#: builtin/stash.c builtin/stash.c builtin/stash.c

17174 #: builtin/stash.c

17175 #, c-format

17176 msgid "cannot parse commit %s"

@@ -16666,7 +17215,7 @@ msgstr "找到 %s 貯存提交，裡面缺少預期的前綴"

17215 msgid "cannot parse parents of commit: %s"

17216 msgstr "無法解析提交的父物件：%s"

17217

16669 -#: builtin/stash.c

17218 +#: builtin/stash.c builtin/stash.c builtin/stash.c

17219 #, c-format

17220 msgid "%s does not look like a stash commit"

17221 msgstr "%s 似乎不是貯存提交"

@@ -16717,11 +17266,16 @@ msgid ""

17266 "authoritative upstream."

17267 msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"

17268

16720 -#: builtin/submodule--helper.c

17269 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17270 #, c-format

17271 msgid "could not get a repository handle for submodule '%s'"

17272 msgstr "無法取得子模組「%s」的版本庫控制代碼"

17273

17274 +#: builtin/submodule--helper.c

17275 +msgid "git submodule--helper get-default-remote <path>"

17276 +msgstr "git submodule--helper get-default-remote <path>"

17277 +

17278 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17279 #: builtin/submodule--helper.c

17280 #, c-format

17281 msgid "No url found for submodule path '%s' in .gitmodules"

@@ -16755,6 +17309,7 @@ msgstr ""

17309 msgid "suppress output of entering each submodule command"

17310 msgstr "隱藏每個子模組進入命令的輸出"

17311

17312 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17313 #: builtin/submodule--helper.c

17314 msgid "recurse into nested submodules"

17315 msgstr "遞迴進入嵌套子模組中"

@@ -16763,6 +17318,17 @@ msgstr "遞迴進入嵌套子模組中"

17318 msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"

17319 msgstr "git submodule foreach [--quiet] [--recursive] [--] <command>"

17320

17321 +#: builtin/submodule--helper.c

17322 +#, c-format

17323 +msgid ""

17324 +"failed to set a valid default config for 'submodule.%s.gitdir'. Please "

17325 +"ensure it is set, for example by running something like: 'git config "

17326 +"submodule.%s.gitdir .git/modules/%s'"

17327 +msgstr ""

17328 +"無法為「submodule.%s.gitdir」設定有效的預設組態。請確定是否設定完成，舉例來"

17329 +"說，可以執行類似這樣的命令進行設定：「git config submodule.%s.gitdir .git/"

17330 +"modules/%s」"

17331 +

17332 #: builtin/submodule--helper.c

17333 #, c-format

17334 msgid "Failed to register url for submodule path '%s'"

@@ -16791,6 +17357,7 @@ msgstr "隱藏初始化子模組的輸出"

17357 msgid "git submodule init [<options>] [<path>]"

17358 msgstr "git submodule init [<options>] [<path>]"

17359

17360 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17361 #: builtin/submodule--helper.c

17362 #, c-format

17363 msgid "no submodule mapping found in .gitmodules for path '%s'"

@@ -16801,12 +17368,12 @@ msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"

17368 msgid "could not resolve HEAD ref inside the submodule '%s'"

17369 msgstr "無法解析子模組「%s」的 HEAD 引用"

17370

16804 -#: builtin/submodule--helper.c

17371 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17372 #, c-format

17373 msgid "failed to recurse into submodule '%s'"

17374 msgstr "遞迴子模組 '%s' 失敗"

17375

16809 -#: builtin/submodule--helper.c

17376 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17377 msgid "suppress submodule status output"

17378 msgstr "隱藏子模組的狀態輸出"

17379

@@ -16869,6 +17436,30 @@ msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]"

17436 msgid "could not fetch a revision for HEAD"

17437 msgstr "無法取得 HEAD 的修訂版"

17438

17439 +#: builtin/submodule--helper.c

17440 +msgid "git submodule--helper gitdir <name>"

17441 +msgstr "git submodule--helper gitdir <name>"

17442 +

17443 +#: builtin/submodule--helper.c

17444 +msgid ""

17445 +"could not set core.repositoryformatversion to 1.\n"

17446 +"Please set it for migration to work, for example:\n"

17447 +"git config core.repositoryformatversion 1"

17448 +msgstr ""

17449 +"無法將 core.repositoryformatversion 設定為 1。\n"

17450 +"請設定以便進行遷移，例如：\n"

17451 +"git config core.repositoryformatversion 1"

17452 +

17453 +#: builtin/submodule--helper.c

17454 +msgid ""

17455 +"could not enable submodulePathConfig extension. It is required\n"

17456 +"for migration to work. Please enable it in the root repo:\n"

17457 +"git config extensions.submodulePathConfig true"

17458 +msgstr ""

17459 +"無法啟用 submodulePathConfig 擴充功能。\n"

17460 +"遷移需要這個功能才能運作，請在根版本庫中啟用：\n"

17461 +"git config extensions.submodulePathConfig true"

17462 +

17463 #: builtin/submodule--helper.c

17464 #, c-format

17465 msgid "Synchronizing submodule url for '%s'\n"

@@ -16962,7 +17553,7 @@ msgstr ""

17553 msgid "could not get a repository handle for gitdir '%s'"

17554 msgstr "無法取得 gitdir「%s」的版本庫控制代碼"

17555

16965 -#: builtin/submodule--helper.c

17556 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17557 #, c-format

17558 msgid "submodule '%s' cannot add alternate: %s"

17559 msgstr "子模組 '%s' 不能新增版本庫備選：%s"

@@ -16977,11 +17568,7 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"

17568 msgid "Value '%s' for submodule.alternateLocation is not recognized"

17569 msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"

17570

16980 -#: builtin/submodule--helper.c submodule.c

16981 -#, c-format

16982 -msgid "refusing to create/use '%s' in another submodule's git dir"

16983 -msgstr "拒絕在其他子模組的 git 目錄中建立/使用「%s」"

16984 -

17571 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17572 #: builtin/submodule--helper.c

17573 #, c-format

17574 msgid "directory not empty: '%s'"

@@ -16992,6 +17579,15 @@ msgstr "目錄不是空的：「%s」"

17579 msgid "clone of '%s' into submodule path '%s' failed"

17580 msgstr "無法拓製「%s」到子模組路徑「%s」"

17581

17582 +#: builtin/submodule--helper.c submodule.c

17583 +#, c-format

17584 +msgid ""

17585 +"refusing to create/use '%s' in another submodule's git dir. Enabling "

17586 +"extensions.submodulePathConfig should fix this."

17587 +msgstr ""

17588 +"拒絕在另一個子模組的 git 目錄中建立或使用「%s」。啟用 "

17589 +"extensions.submodulePathConfig 應當可以修正此問題。"

17590 +

17591 #: builtin/submodule--helper.c

17592 #, c-format

17593 msgid "could not get submodule directory for '%s'"

@@ -17013,10 +17609,11 @@ msgstr "新子模組的名稱"

17609 msgid "url where to clone the submodule from"

17610 msgstr "拓製子模組的 url 位址"

17611

17016 -#: builtin/submodule--helper.c

17612 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17613 msgid "depth for shallow clones"

17614 msgstr "淺拓製的深度"

17615

17616 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17617 #: builtin/submodule--helper.c

17618 msgid "force cloning progress"

17619 msgstr "強制顯示拓製進度"

@@ -17263,7 +17860,7 @@ msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"

17860 msgid "--branch or --default required"

17861 msgstr "需要 --branch 或 --default"

17862

17266 -#: builtin/submodule--helper.c

17863 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17864 msgid "print only error messages"

17865 msgstr "只輸出錯誤訊息"

17866

@@ -17328,7 +17925,7 @@ msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"

17925 msgid "unable to checkout submodule '%s'"

17926 msgstr "無法簽出「%s」子模組"

17927

17331 -#: builtin/submodule--helper.c

17928 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17929 msgid "please make sure that the .gitmodules file is in the working tree"

17930 msgstr "請確認 .gitmodules 檔案在工作區裡"

17931

@@ -17337,6 +17934,7 @@ msgstr "請確認 .gitmodules 檔案在工作區裡"

17934 msgid "Failed to add submodule '%s'"

17935 msgstr "無法加入子模組「%s」"

17936

17937 +#: builtin/submodule--helper.c builtin/submodule--helper.c

17938 #: builtin/submodule--helper.c

17939 #, c-format

17940 msgid "Failed to register submodule '%s'"

@@ -17530,7 +18128,7 @@ msgstr "壞的物件類型。"

18128 msgid "no tag message?"

18129 msgstr "無標籤說明？"

18130

17533 -#: builtin/tag.c

18131 +#: builtin/tag.c builtin/tag.c

18132 #, c-format

18133 msgid "The tag message has been left in %s\n"

18134 msgstr "標籤說明被保留在 %s\n"

@@ -17591,11 +18189,11 @@ msgstr "標籤列表選項"

18189 msgid "show tag list in columns"

18190 msgstr "以列的方式顯示標籤列表"

18191

17594 -#: builtin/tag.c

18192 +#: builtin/tag.c builtin/tag.c

18193 msgid "print only tags that contain the commit"

18194 msgstr "只列印包含該提交的標籤"

18195

17598 -#: builtin/tag.c

18196 +#: builtin/tag.c builtin/tag.c

18197 msgid "print only tags that don't contain the commit"

18198 msgstr "只列印不包含該提交的標籤"

18199

@@ -17671,7 +18269,7 @@ msgstr "建立目錄 %s 失敗"

18269 msgid "failed to delete file %s"

18270 msgstr "刪除檔案 %s 失敗"

18271

17674 -#: builtin/update-index.c

18272 +#: builtin/update-index.c builtin/update-index.c

18273 #, c-format

18274 msgid "failed to delete directory %s"

18275 msgstr "刪除目錄 %s 失敗"

@@ -18089,8 +18687,8 @@ msgid "report pruned working trees"

18687 msgstr "報告剪除的工作區"

18688

18689 #: builtin/worktree.c

18092 -msgid "expire working trees older than <time>"

18093 -msgstr "將早於 <時間> 的工作區過期"

18690 +msgid "prune missing working trees older than <time>"

18691 +msgstr "清除早於 <time> 的遺失工作區"

18692

18693 #: builtin/worktree.c

18694 #, c-format

@@ -18130,7 +18728,7 @@ msgstr "將「%s」複製至「%s」失敗；稀疏簽出可能無法正常運

18728 msgid "failed to copy worktree config from '%s' to '%s'"

18729 msgstr "將工作區組態從「%s」複製至「%s」失敗"

18730

18133 -#: builtin/worktree.c

18731 +#: builtin/worktree.c builtin/worktree.c

18732 #, c-format

18733 msgid "failed to unset '%s' in '%s'"

18734 msgstr "無法取消「%2$s」中「%1$s」的設定"

@@ -18149,7 +18747,7 @@ msgstr "正在初始化"

18747 msgid "could not find created worktree '%s'"

18748 msgstr "找不到建立的工作區「%s」"

18749

18152 -#: builtin/worktree.c

18750 +#: builtin/worktree.c builtin/worktree.c

18751 #, c-format

18752 msgid "Preparing worktree (new branch '%s')"

18753 msgstr "準備工作區（新分支 '%s'）"

@@ -18170,15 +18768,8 @@ msgid "Preparing worktree (detached HEAD %s)"

18768 msgstr "準備工作區（分離開頭指標 %s）"

18769

18770 #: builtin/worktree.c

18173 -#, c-format

18174 -msgid ""

18175 -"HEAD points to an invalid (or orphaned) reference.\n"

18176 -"HEAD path: '%s'\n"

18177 -"HEAD contents: '%s'"

18178 -msgstr ""

18179 -"HEAD 指向無效（或孤立）引用。\n"

18180 -"HEAD 路徑：「%s」\n"

18181 -"HEAD 內容：「%s」"

18771 +msgid "HEAD points to an invalid (or orphaned) reference.\n"

18772 +msgstr "HEAD 指向無效（或孤立）引用。\n"

18773

18774 #: builtin/worktree.c

18775 msgid ""

@@ -18212,7 +18803,7 @@ msgstr "生成新的工作區"

18803 msgid "keep the new working tree locked"

18804 msgstr "鎖定新工作區"

18805

18215 -#: builtin/worktree.c

18806 +#: builtin/worktree.c builtin/worktree.c

18807 msgid "reason for locking"

18808 msgstr "鎖定原因"

18809

@@ -18224,7 +18815,7 @@ msgstr "設定追蹤模式（參見 git-branch(1)）"

18815 msgid "try to match the new branch name with a remote-tracking branch"

18816 msgstr "嘗試為新分支名符合一個遠端追蹤分支"

18817

18227 -#: builtin/worktree.c

18818 +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

18819 msgid "use relative paths for worktrees"

18820 msgstr "對工作區使用相對路徑"

18821

@@ -18236,7 +18827,7 @@ msgstr "「%s」、「%s」和「%s」選項不得同時使用"

18827 #: builtin/worktree.c

18828 #, c-format

18829 msgid "option '%s' and commit-ish cannot be used together"

18239 -msgstr "「%s」選項和提交編號不得同時使用"

18830 +msgstr "「%s」選項和提交指示元不得同時使用"

18831

18832 #: builtin/worktree.c

18833 msgid "added with --lock"

@@ -18251,19 +18842,20 @@ msgid "show extended annotations and reasons, if available"

18842 msgstr "如果有則顯示延伸的註釋和原因"

18843

18844 #: builtin/worktree.c

18254 -msgid "add 'prunable' annotation to worktrees older than <time>"

18255 -msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"

18845 +msgid "add 'prunable' annotation to missing worktrees older than <time>"

18846 +msgstr "對舊於 <time> 的遺失工作區加上「prunable」標示"

18847

18848 #: builtin/worktree.c

18849 msgid "terminate records with a NUL character"

18850 msgstr "以一個 NUL 字元終止記錄"

18851

18852 +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

18853 #: builtin/worktree.c

18854 #, c-format

18855 msgid "'%s' is not a working tree"

18856 msgstr "'%s' 不是一個工作區"

18857

18266 -#: builtin/worktree.c

18858 +#: builtin/worktree.c builtin/worktree.c

18859 msgid "The main working tree cannot be locked or unlocked"

18860 msgstr "主工作區無法被加鎖或解鎖"

18861

@@ -18290,7 +18882,7 @@ msgstr "不能移動或刪除包含子模組的工作區"

18882 msgid "force move even if worktree is dirty or locked"

18883 msgstr "強制移動，即使工作區是髒的或已鎖定"

18884

18293 -#: builtin/worktree.c

18885 +#: builtin/worktree.c builtin/worktree.c

18886 #, c-format

18887 msgid "'%s' is a main working tree"

18888 msgstr "'%s' 是一個主工作區"

@@ -18869,6 +19461,10 @@ msgstr "從一個檔案計算物件 ID，也能順帶建立一個物件"

19461 msgid "Display help information about Git"

19462 msgstr "顯示 Git 的說明訊息"

19463

19464 +#: command-list.h

19465 +msgid "EXPERIMENTAL: Rewrite history"

19466 +msgstr "實驗性：重寫歷史記錄"

19467 +

19468 #: command-list.h

19469 msgid "Run git hooks"

19470 msgstr "執行 git 掛鉤"

@@ -19007,8 +19603,8 @@ msgid "Pack heads and tags for efficient repository access"

19603 msgstr "打包頭和標籤以實現高效的版本庫存取"

19604

19605 #: command-list.h

19010 -msgid "Compute unique ID for a patch"

19011 -msgstr "計算一個修補檔的唯一 ID"

19606 +msgid "Compute unique IDs for patches"

19607 +msgstr "計算修補檔案的唯一 ID"

19608

19609 #: command-list.h

19610 msgid "Prune all unreachable objects from the object database"

@@ -19491,7 +20087,7 @@ msgstr "無效的提交圖鏈：「%s」列不是雜湊值"

20087 msgid "unable to find all commit-graph files"

20088 msgstr "無法找到所有提交圖檔案"

20089

19494 -#: commit-graph.c

20090 +#: commit-graph.c commit-graph.c

20091 msgid "invalid commit position. commit-graph is likely corrupt"

20092 msgstr "無效的提交位置。提交圖可能已損壞"

20093

@@ -19637,7 +20233,7 @@ msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

20233 msgid "commit-graph has incorrect OID order: %s then %s"

20234 msgstr "提交圖的物件 ID 順序不正確：%s 然後 %s"

20235

19640 -#: commit-graph.c

20236 +#: commit-graph.c commit-graph.c

20237 #, c-format

20238 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

20239 msgstr "提交圖有不正確的扇出值：fanout[%d] = %u != %u"

@@ -19693,11 +20289,17 @@ msgstr "提交圖中包含 0 和非 0 兩個世代數（例如提交「%s」和

20289 msgid "Verifying commits in commit graph"

20290 msgstr "正在驗證提交圖中的提交"

20291

19696 -#: commit-reach.c sequencer.c

20292 +#: commit-reach.c commit-reach.c commit-reach.c sequencer.c

20293 +#: sequencer.c

20294 #, c-format

20295 msgid "could not parse commit %s"

20296 msgstr "無法解析提交 %s"

20297

20298 +#: commit.c object.c

20299 +#, c-format

20300 +msgid "object %s is a %s, not a %s"

20301 +msgstr "物件 %s 是一個 %s，不是一個 %s"

20302 +

20303 #: commit.c

20304 #, c-format

20305 msgid "%s %s is not a commit!"

@@ -19766,7 +20368,7 @@ msgstr "沒有可用的編譯器資訊\n"

20368 msgid "no libc information available\n"

20369 msgstr "沒有可用的 libc 資訊\n"

20370

19769 -#: compat/disk.h

20371 +#: compat/disk.h compat/disk.h

20372 #, c-format

20373 msgid "could not determine free disk size for '%s'"

20374 msgstr "無法判斷「%s」的剩餘磁碟大小"

@@ -19786,7 +20388,8 @@ msgstr "[GLE %ld] 健康監聽執行緒無法開啟「%ls」"

20388 msgid "[GLE %ld] health thread getting BHFI for '%ls'"

20389 msgstr "[GLE %ld] 健康監聽執行緒取得「%ls」的 BHFI"

20390

19789 -#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c

20391 +#: compat/fsmonitor/fsm-health-win32.c

20392 +#: compat/fsmonitor/fsm-listen-win32.c

20393 #, c-format

20394 msgid "could not convert to wide characters: '%s'"

20395 msgstr "無法轉換至較寬字元：「%s」"

@@ -19889,7 +20492,7 @@ msgstr "複製 SID 失敗（%ld）"

20492 msgid "failed to get owner for '%s' (%ld)"

20493 msgstr "無法取得「%s」的所有者 (%ld)"

20494

19892 -#: compat/obstack.c

20495 +#: compat/obstack.c compat/obstack.c

20496 msgid "memory exhausted"

20497 msgstr "記憶體耗盡"

20498

@@ -20086,12 +20689,12 @@ msgstr "無效鍵名（有換行符號）：%s"

20689 msgid "empty config key"

20690 msgstr "空白設定鍵"

20691

20089 -#: config.c

20692 +#: config.c config.c

20693 #, c-format

20694 msgid "bogus config parameter: %s"

20695 msgstr "偽設定參數：%s"

20696

20094 -#: config.c

20697 +#: config.c config.c config.c config.c

20698 #, c-format

20699 msgid "bogus format in %s"

20700 msgstr "%s 中格式錯誤"

@@ -20189,11 +20792,6 @@ msgstr "命令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

20792 msgid "bad numeric config value '%s' for '%s' in %s: %s"

20793 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

20794

20192 -#: config.c

20193 -#, c-format

20194 -msgid "bad boolean config value '%s' for '%s'"

20195 -msgstr "「%2$s」的「%1$s」布林設定值無效"

20196 -

20795 #: config.c

20796 #, c-format

20797 msgid "failed to expand user dir in: '%s'"

@@ -20309,7 +20907,7 @@ msgstr "寫入新的設定檔案 %s 失敗"

20907 msgid "no multi-line comment allowed: '%s'"

20908 msgstr "不允許多列備註：「%s」"

20909

20312 -#: config.c

20910 +#: config.c config.c

20911 #, c-format

20912 msgid "could not lock config file %s"

20913 msgstr "無法鎖定組態檔案 %s"

@@ -20324,7 +20922,7 @@ msgstr "開啟 %s"

20922 msgid "invalid config file %s"

20923 msgstr "無效的設定檔案 %s"

20924

20327 -#: config.c

20925 +#: config.c config.c

20926 #, c-format

20927 msgid "fstat on %s failed"

20928 msgstr "對 %s 呼叫 fstat 失敗"

@@ -20334,12 +20932,12 @@ msgstr "對 %s 呼叫 fstat 失敗"

20932 msgid "unable to mmap '%s'%s"

20933 msgstr "無法 mmap '%s'%s"

20934

20337 -#: config.c

20935 +#: config.c config.c

20936 #, c-format

20937 msgid "chmod on %s failed"

20938 msgstr "對 %s 呼叫 chmod 失敗"

20939

20342 -#: config.c

20940 +#: config.c config.c

20941 #, c-format

20942 msgid "could not write config file %s"

20943 msgstr "無法寫入組態檔案 %s"

@@ -20434,7 +21032,7 @@ msgstr "在 bundle-uri 回應的第 %d 列發現錯誤：%s"

21032 msgid "expected flush after bundle-uri listing"

21033 msgstr "在 bundle-uri 清單後應該有一個 flush 包"

21034

20437 -#: connect.c

21035 +#: connect.c connect.c

21036 msgid "expected response end packet after ref listing"

21037 msgstr "在引用列表後預期要有回應結束封包"

21038

@@ -20456,7 +21054,7 @@ msgstr "不支援 '%s' 協定"

21054 msgid "unable to set SO_KEEPALIVE on socket"

21055 msgstr "無法為 socket 設定 SO_KEEPALIVE"

21056

20459 -#: connect.c

21057 +#: connect.c connect.c

21058 #, c-format

21059 msgid "Looking up %s ... "

21060 msgstr "尋找 %s ... "

@@ -20467,7 +21065,7 @@ msgid "unable to look up %s (port %s) (%s)"

21065 msgstr "無法尋找 %s（埠 %s）（%s）"

21066

21067 #. TRANSLATORS: this is the end of "Looking up %s ... "

20470 -#: connect.c

21068 +#: connect.c connect.c

21069 #, c-format

21070 msgid ""

21071 "done.\n"

@@ -20476,7 +21074,7 @@ msgstr ""

21074 "完成。\n"

21075 "連線到 %s（埠 %s）... "

21076

20479 -#: connect.c

21077 +#: connect.c connect.c

21078 #, c-format

21079 msgid ""

21080 "unable to connect to %s:\n"

@@ -20486,7 +21084,7 @@ msgstr ""

21084 "%s"

21085

21086 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

20489 -#: connect.c

21087 +#: connect.c connect.c

21088 msgid "done."

21089 msgstr "完成。"

21090

@@ -20500,7 +21098,7 @@ msgstr "無法尋找 %s（%s）"

21098 msgid "unknown port %s"

21099 msgstr "未知埠 %s"

21100

20503 -#: connect.c

21101 +#: connect.c connect.c

21102 #, c-format

21103 msgid "strange hostname '%s' blocked"

21104 msgstr "已阻止奇怪的主機名稱 '%s'"

@@ -20611,7 +21209,7 @@ msgstr ""

21209 "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"

21210 "字節序）作為工作區編碼。"

21211

20614 -#: convert.c

21212 +#: convert.c convert.c

21213 #, c-format

21214 msgid "failed to encode '%s' from %s to %s"

21215 msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"

@@ -20636,12 +21234,12 @@ msgstr "不能將輸入傳遞給外部過濾器 '%s'"

21234 msgid "external filter '%s' failed %d"

21235 msgstr "外部過濾器 '%s' 失敗碼 %d"

21236

20639 -#: convert.c

21237 +#: convert.c convert.c

21238 #, c-format

21239 msgid "read from external filter '%s' failed"

21240 msgstr "從外部過濾器 '%s' 讀取失敗"

21241

20644 -#: convert.c

21242 +#: convert.c convert.c

21243 #, c-format

21244 msgid "external filter '%s' failed"

21245 msgstr "外部過濾器 '%s' 失敗"

@@ -20665,7 +21263,7 @@ msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"

21263 msgid "true/false are no valid working-tree-encodings"

21264 msgstr "true/false 不是有效的工作區編碼"

21265

20668 -#: convert.c

21266 +#: convert.c convert.c

21267 #, c-format

21268 msgid "%s: clean filter '%s' failed"

21269 msgstr "%s：clean 過濾器 '%s' 失敗"

@@ -20771,7 +21369,7 @@ msgid "%s, %<PRIuMAX> month ago"

21369 msgid_plural "%s, %<PRIuMAX> months ago"

21370 msgstr[0] "%s %<PRIuMAX> 個月前"

21371

20774 -#: date.c

21372 +#: date.c date.c

21373 #, c-format

21374 msgid "%<PRIuMAX> year ago"

21375 msgid_plural "%<PRIuMAX> years ago"

@@ -20966,7 +21564,8 @@ msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「

21564 msgid "invalid --stat value: %s"

21565 msgstr "無效的 --stat 值：%s"

21566

20969 -#: diff.c parse-options.c

21567 +#: diff.c diff.c diff.c diff.c diff.c

21568 +#: parse-options.c parse-options.c

21569 #, c-format

21570 msgid "%s expects a numerical value"

21571 msgstr "%s 期望一個數字值"

@@ -20990,12 +21589,16 @@ msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"

21589 msgid "unknown value after ws-error-highlight=%.*s"

21590 msgstr "ws-error-highlight=%.*s 之後未知的值"

21591

21592 +#: diff.c

21593 +msgid "--find-object requires a git repository"

21594 +msgstr "--find-object 需要一個 git 版本庫"

21595 +

21596 #: diff.c

21597 #, c-format

21598 msgid "unable to resolve '%s'"

21599 msgstr "不能解析 '%s'"

21600

20998 -#: diff.c

21601 +#: diff.c diff.c

21602 #, c-format

21603 msgid "%s expects <n>/<m> form"

21604 msgstr "%s 期望 <n>/<m> 格式"

@@ -21015,7 +21618,7 @@ msgstr "壞的 --color-moved 參數：%s"

21618 msgid "invalid mode '%s' in --color-moved-ws"

21619 msgstr "--color-moved-ws 中的無效模式 '%s'"

21620

21018 -#: diff.c

21621 +#: diff.c diff.c

21622 #, c-format

21623 msgid "invalid argument to %s"

21624 msgstr "%s 的參數無效"

@@ -21047,15 +21650,15 @@ msgstr "壞的 --word-diff 參數：%s"

21650 msgid "Diff output format options"

21651 msgstr "差異輸出格式化選項"

21652

21050 -#: diff.c

21653 +#: diff.c diff.c

21654 msgid "generate patch"

21655 msgstr "生成修補檔"

21656

21054 -#: diff.c

21657 +#: diff.c diff.c diff.c

21658 msgid "<n>"

21659 msgstr "<n>"

21660

21058 -#: diff.c parse-options.h

21661 +#: diff.c diff.c parse-options.h

21662 msgid "generate diffs with <n> lines context"

21663 msgstr "生成含 <n> 行上下文的差異"

21664

@@ -21079,7 +21682,7 @@ msgstr "機器友好的 --stat"

21682 msgid "output only the last line of --stat"

21683 msgstr "只輸出 --stat 的最後一行"

21684

21082 -#: diff.c

21685 +#: diff.c diff.c

21686 msgid "<param1>,<param2>..."

21687 msgstr "<param1>,<param2>..."

21688

@@ -21120,7 +21723,7 @@ msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

21723 msgid "generate diffstat"

21724 msgstr "生成差異統計（diffstat）"

21725

21123 -#: diff.c

21726 +#: diff.c diff.c diff.c

21727 msgid "<width>"

21728 msgstr "<寬度>"

21729

@@ -21178,7 +21781,7 @@ msgstr ""

21781 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

21782 "符"

21783

21181 -#: diff.c

21784 +#: diff.c diff.c diff.c diff.c

21785 msgid "<prefix>"

21786 msgstr "<前綴>"

21787

@@ -21206,7 +21809,7 @@ msgstr "使用預設的前置名稱 a/ 和 b/"

21809 msgid "show context between diff hunks up to the specified number of lines"

21810 msgstr "顯示指定行數的差異區塊間的上下文"

21811

21209 -#: diff.c

21812 +#: diff.c diff.c diff.c

21813 msgid "<char>"

21814 msgstr "<字元>"

21815

@@ -21296,7 +21899,7 @@ msgstr "忽略行尾的Enter符（CR）"

21899 msgid "ignore changes whose lines are all blank"

21900 msgstr "忽略整行都是空白的變更"

21901

21299 -#: diff.c

21902 +#: diff.c diff.c diff.c diff.c

21903 msgid "<regex>"

21904 msgstr "<正則>"

21905

@@ -21324,7 +21927,7 @@ msgstr "<文字>"

l10n: zh_TW: update translation for Git 2.54