f86de088f8 · matheusbsbs/matheus-bagliano

@@ -19,14 +19,14 @@

19 # - Yichao Yu <yyc1992 AT gmail.com>

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

21 #

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

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

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

24 msgid ""

25 msgstr ""

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

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

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

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

28 +"POT-Creation-Date: 2023-05-19 19:57+0000\n"

29 +"PO-Revision-Date: 2023-05-31 23:41+0800\n"

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

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

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

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

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

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

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

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

38 +"X-Generator: Poedit 3.3.1\n"

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

40 "zhconvert.org\n"

41

@@ -48,19 +48,19 @@ msgstr "嗯（%s）？"

48 msgid "could not read index"

49 msgstr "無法讀取索引"

50

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

51 +#: add-interactive.c

52 msgid "binary"

53 msgstr "二進位"

54

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

55 +#: add-interactive.c

56 msgid "nothing"

57 msgstr "無"

58

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

59 +#: add-interactive.c

60 msgid "unchanged"

61 msgstr "未變更"

62

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

63 +#: add-interactive.c

64 msgid "Update"

65 msgstr "更新"

66

@@ -73,14 +73,14 @@ msgstr "無法暫存 “%s”"

73 msgid "could not write index"

74 msgstr "無法寫入索引"

75

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

77 -#, c-format, perl-format

76 +#: add-interactive.c

77 +#, c-format

78 msgid "updated %d path\n"

79 msgid_plural "updated %d paths\n"

80 msgstr[0] "已更新 %d 個路徑\n"

81

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

83 -#, c-format, perl-format

82 +#: add-interactive.c

83 +#, c-format

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

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

86

@@ -89,7 +89,7 @@ msgstr "註：現已不再追蹤 %s。\n"

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

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

91

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

92 +#: add-interactive.c

93 msgid "Revert"

94 msgstr "還原"

95

@@ -97,23 +97,23 @@ msgstr "還原"

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

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

99

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

101 -#, c-format, perl-format

100 +#: add-interactive.c

101 +#, c-format

102 msgid "reverted %d path\n"

103 msgid_plural "reverted %d paths\n"

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

105

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

106 +#: add-interactive.c

107 #, c-format

108 msgid "No untracked files.\n"

109 msgstr "沒有未追蹤的檔案。\n"

110

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

111 +#: add-interactive.c

112 msgid "Add untracked"

113 msgstr "加入未追蹤項目"

114

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

116 -#, c-format, perl-format

115 +#: add-interactive.c

116 +#, c-format

117 msgid "added %d path\n"

118 msgid_plural "added %d paths\n"

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

@@ -123,21 +123,21 @@ msgstr[0] "已加入 %d 個路徑\n"

123 msgid "ignoring unmerged: %s"

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

125

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

126 +#: add-interactive.c add-patch.c

127 #, c-format

128 msgid "Only binary files changed.\n"

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

130

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

131 +#: add-interactive.c add-patch.c

132 #, c-format

133 msgid "No changes.\n"

134 msgstr "沒有更動。\n"

135

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

136 +#: add-interactive.c

137 msgid "Patch update"

138 msgstr "修補檔更新"

139

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

140 +#: add-interactive.c

141 msgid "Review diff"

142 msgstr "檢閱差異"

143

@@ -205,25 +205,25 @@ msgstr "選取編號過的項目"

205 msgid "(empty) select nothing"

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

207

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

208 +#: add-interactive.c builtin/clean.c

209 msgid "*** Commands ***"

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

211

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

212 +#: add-interactive.c builtin/clean.c

213 msgid "What now"

214 msgstr "請選擇"

215

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

216 +#: add-interactive.c

217 msgid "staged"

218 msgstr "已暫存"

219

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

220 +#: add-interactive.c

221 msgid "unstaged"

222 msgstr "未暫存"

223

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

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

226 -#: builtin/submodule--helper.c git-add--interactive.perl

225 +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c

226 +#: builtin/pull.c builtin/submodule--helper.c

227 msgid "path"

228 msgstr "路徑"

229

@@ -231,28 +231,28 @@ msgstr "路徑"

231 msgid "could not refresh index"

232 msgstr "無法重新整理索引"

233

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

234 +#: add-interactive.c builtin/clean.c

235 #, c-format

236 msgid "Bye.\n"

237 msgstr "再見。\n"

238

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

240 -#, c-format, perl-format

239 +#: add-patch.c

240 +#, c-format

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

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

243

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

245 -#, c-format, perl-format

244 +#: add-patch.c

245 +#, c-format

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

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

248

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

250 -#, c-format, perl-format

249 +#: add-patch.c

250 +#, c-format

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

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

253

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

255 -#, c-format, perl-format

254 +#: add-patch.c

255 +#, c-format

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

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

258

@@ -276,23 +276,23 @@ msgstr ""

276 "a - 暫存此區塊和本檔案中後面的全部區塊\n"

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

278

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

280 -#, c-format, perl-format

279 +#: add-patch.c

280 +#, c-format

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

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

283

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

285 -#, c-format, perl-format

284 +#: add-patch.c

285 +#, c-format

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

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

288

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

290 -#, c-format, perl-format

289 +#: add-patch.c

290 +#, c-format

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

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

293

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

295 -#, c-format, perl-format

294 +#: add-patch.c

295 +#, c-format

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

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

298

@@ -316,23 +316,23 @@ msgstr ""

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

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

318

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

320 -#, c-format, perl-format

319 +#: add-patch.c

320 +#, c-format

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

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

323

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

325 -#, c-format, perl-format

324 +#: add-patch.c

325 +#, c-format

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

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

328

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

330 -#, c-format, perl-format

329 +#: add-patch.c

330 +#, c-format

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

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

333

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

335 -#, c-format, perl-format

334 +#: add-patch.c

335 +#, c-format

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

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

338

@@ -356,23 +356,23 @@ msgstr ""

356 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"

357 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"

358

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

360 -#, c-format, perl-format

359 +#: add-patch.c

360 +#, c-format

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

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

363

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

365 -#, c-format, perl-format

364 +#: add-patch.c

365 +#, c-format

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

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

368

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

370 -#, c-format, perl-format

369 +#: add-patch.c

370 +#, c-format

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

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

373

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

375 -#, c-format, perl-format

374 +#: add-patch.c

375 +#, c-format

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

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

378

@@ -396,23 +396,23 @@ msgstr ""

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

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

398

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

400 -#, c-format, perl-format

399 +#: add-patch.c

400 +#, c-format

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

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

403

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

405 -#, c-format, perl-format

404 +#: add-patch.c

405 +#, c-format

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

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

408

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

410 -#, c-format, perl-format

409 +#: add-patch.c

410 +#, c-format

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

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

413

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

415 -#, c-format, perl-format

414 +#: add-patch.c

415 +#, c-format

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

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

418

@@ -436,23 +436,23 @@ msgstr ""

436 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

437 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"

438

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

440 -#, c-format, perl-format

439 +#: add-patch.c

440 +#, c-format

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

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

443

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

445 -#, c-format, perl-format

444 +#: add-patch.c

445 +#, c-format

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

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

448

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

450 -#, c-format, perl-format

449 +#: add-patch.c

450 +#, c-format

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

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

453

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

455 -#, c-format, perl-format

454 +#: add-patch.c

455 +#, c-format

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

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

458

@@ -470,23 +470,23 @@ msgstr ""

470 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

471 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"

472

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

474 -#, c-format, perl-format

473 +#: add-patch.c

474 +#, c-format

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

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

477

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

479 -#, c-format, perl-format

478 +#: add-patch.c

479 +#, c-format

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

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

482

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

484 -#, c-format, perl-format

483 +#: add-patch.c

484 +#, c-format

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

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

487

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

489 -#, c-format, perl-format

488 +#: add-patch.c

489 +#, c-format

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

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

492

@@ -504,23 +504,23 @@ msgstr ""

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

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

506

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

508 -#, c-format, perl-format

507 +#: add-patch.c

508 +#, c-format

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

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

511

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

513 -#, c-format, perl-format

512 +#: add-patch.c

513 +#, c-format

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

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

516

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

518 -#, c-format, perl-format

517 +#: add-patch.c

518 +#, c-format

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

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

521

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

523 -#, c-format, perl-format

522 +#: add-patch.c

523 +#, c-format

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

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

526

@@ -590,7 +590,7 @@ msgstr ""

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

591 "%.*s"

592

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

593 +#: add-patch.c

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

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

596

@@ -607,9 +607,7 @@ msgstr ""

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

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

609

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

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

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

610 +#: add-patch.c

611 msgid ""

612 "If it does not apply cleanly, you will be given an opportunity to\n"

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

@@ -627,21 +625,13 @@ msgstr "無法解析區塊標頭"

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

626 msgstr "“git apply --cached” 失敗"

627

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

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

629 #. The program will only accept that input at this point.

630 #. Consider translating (saying "no" discards!) as

631 #. (saying "n" for "no" discards!) if the translation

632 #. of the word "no" does not start with n.

633 #.

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

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

639 -#. The program will only accept that input

640 -#. at this point.

641 -#. Consider translating (saying "no" discards!) as

642 -#. (saying "n" for "no" discards!) if the translation

643 -#. of the word "no" does not start with n.

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

634 +#: add-patch.c

635 msgid ""

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

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

@@ -650,11 +640,11 @@ msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨

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

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

642

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

643 +#: add-patch.c

644 msgid "Apply them to the worktree anyway? "

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

646

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

647 +#: add-patch.c

648 msgid "Nothing was applied.\n"

649 msgstr "未套用。\n"

650

@@ -692,11 +682,11 @@ msgstr "沒有下一個區塊"

682 msgid "No other hunks to goto"

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

684

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

685 +#: add-patch.c

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

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

688

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

689 +#: add-patch.c

690 msgid "go to which hunk? "

691 msgstr "跳轉到哪個區塊? "

692

@@ -715,7 +705,7 @@ msgstr[0] "對不起，只有 %d 個可用區塊。"

705 msgid "No other hunks to search"

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

707

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

708 +#: add-patch.c

709 msgid "search for regex? "

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

711

@@ -808,6 +798,24 @@ msgstr "請在合併前先提交您的更動。"

798 msgid "Exiting because of unfinished merge."

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

800

801 +#: advice.c

802 +msgid ""

803 +"Diverging branches can't be fast-forwarded, you need to either:\n"

804 +"\n"

805 +"\tgit merge --no-ff\n"

806 +"\n"

807 +"or:\n"

808 +"\n"

809 +"\tgit rebase\n"

810 +msgstr ""

811 +"岔開的分支不能快轉，您得執行：\n"

812 +"\n"

813 +"\tgit merge --no-ff\n"

814 +"\n"

815 +"或者：\n"

816 +"\n"

817 +"\tgit rebase\n"

818 +

819 #: advice.c

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

821 msgstr "無法快轉，中止。"

@@ -1295,7 +1303,7 @@ msgstr "無法對剛建立的檔案 %s 建立後端儲存"

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

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

1305

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

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

1307 #, c-format

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

1309 msgstr "無法寫入 “%s”"

@@ -1335,6 +1343,11 @@ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"

1343 msgid "cannot open %s"

1344 msgstr "無法開啟 %s"

1345

1346 +#: apply.c rerere.c

1347 +#, c-format

1348 +msgid "cannot unlink '%s'"

1349 +msgstr "無法刪除 “%s”"

1350 +

1351 #: apply.c

1352 #, c-format

1353 msgid "Hunk #%d applied cleanly."

@@ -1569,6 +1582,11 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1582 msgid "cannot read '%s'"

1583 msgstr "無法讀取 “%s”"

1584

1585 +#: archive.c

1586 +#, c-format

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

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

1589 +

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

1591 #, c-format

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

@@ -1589,10 +1607,6 @@ msgstr "非有效物件名稱：%s"

1607 msgid "not a tree object: %s"

1608 msgstr "非樹狀物件：%s"

1609

1592 -#: archive.c

1593 -msgid "current working directory is untracked"

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

1595 -

1610 #: archive.c

1611 #, c-format

1612 msgid "File not found: %s"

@@ -1626,7 +1640,7 @@ msgstr "fmt"

1640 msgid "archive format"

1641 msgstr "封存格式"

1642

1629 -#: archive.c builtin/log.c

1643 +#: archive.c builtin/log.c parse-options.h

1644 msgid "prefix"

1645 msgstr "前綴"

1646

@@ -1660,6 +1674,15 @@ msgstr "讀取工作目錄中的 .gitattributes"

1674 msgid "report archived files on stderr"

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

1676

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

1678 +#: builtin/pull.c

1679 +msgid "time"

1680 +msgstr "time"

1681 +

1682 +#: archive.c

1683 +msgid "set modification time of archive entries"

1684 +msgstr "設定封存項目的修改時間"

1685 +

1686 #: archive.c

1687 msgid "set compression level"

1688 msgstr "設定壓縮級別"

@@ -1715,6 +1738,15 @@ msgstr "引數不支援 “%s” 格式：-%d"

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

1739 msgstr "%.*s 不是有效的屬性名稱"

1740

1741 +#: attr.c

1742 +msgid "unable to add additional attribute"

1743 +msgstr "無法加入其他屬性"

1744 +

1745 +#: attr.c

1746 +#, c-format

1747 +msgid "ignoring overly long attributes line %d"

1748 +msgstr "忽略過長的屬性列 (第 %d 列)"

1749 +

1750 #: attr.c

1751 #, c-format

1752 msgid "%s not allowed: %s:%d"

@@ -1728,6 +1760,25 @@ msgstr ""

1760 "git attributes 會忽略反向模式\n"

1761 "當字串確定要以驚嘆號開始時，請使用 “\\!”。"

1762

1763 +#: attr.c

1764 +#, c-format

1765 +msgid "cannot fstat gitattributes file '%s'"

1766 +msgstr "無法 fstat gitattributes 檔案 “%s”"

1767 +

1768 +#: attr.c

1769 +#, c-format

1770 +msgid "ignoring overly large gitattributes file '%s'"

1771 +msgstr "忽略過大的 gitattributes 檔案 “%s”"

1772 +

1773 +#: attr.c

1774 +#, c-format

1775 +msgid "ignoring overly large gitattributes blob '%s'"

1776 +msgstr "忽略過大的 gitattributes 資料物件 “%s”"

1777 +

1778 +#: attr.c

1779 +msgid "bad --attr-source or GIT_ATTR_SOURCE"

1780 +msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"

1781 +

1782 #: bisect.c

1783 #, c-format

1784 msgid "Badly quoted content in file '%s': %s"

@@ -1849,17 +1900,13 @@ msgstr[0] "二分搜尋中：在此 (%2$s) 之後，尚餘 %1$d 個版本待測

1900 msgid "--contents and --reverse do not blend well."

1901 msgstr "--contents 和 --reverse 不能混用。"

1902

1852 -#: blame.c

1853 -msgid "cannot use --contents with final commit object name"

1854 -msgstr "無法將 --contents 與最終的提交物件名稱共用"

1855 -

1903 #: blame.c

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

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

1906

1907 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c

1861 -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c

1862 -#: ref-filter.c remote.c sequencer.c submodule.c

1908 +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c

1909 +#: sequencer.c submodule.c

1910 msgid "revision walk setup failed"

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

1912

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

1981 msgstr "未追蹤：“%s” 引用有歧義"

1982

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

1937 -#. #-#-#-#-# branch.c.po #-#-#-#-#

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

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

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

1987 #.

1942 -#. #-#-#-#-# object-name.c.po #-#-#-#-#

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

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

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

@@ -2040,11 +2085,11 @@ msgstr "“%s” 子模組：找不到子模組"

2085 #: branch.c

2086 #, c-format

2087 msgid ""

2043 -"You may try updating the submodules using 'git checkout %s && git submodule "

2044 -"update --init'"

2088 +"You may try updating the submodules using 'git checkout --no-recurse-"

2089 +"submodules %s && git submodule update --init'"

2090 msgstr ""

2046 -"您可以嘗試使用 “git checkout %s && git submodule update --init” 命令，更新子"

2047 -"模組"

2091 +"您可以使用 “git checkout --no-recurse-submodules %s && git submodule update "

2092 +"--init” 命令嘗試更新子模組"

2093

2094 #: branch.c

2095 #, c-format

@@ -2056,11 +2101,6 @@ msgstr "“%s” 子模組：無法建立 “%s” 分支"

2101 msgid "'%s' is already checked out at '%s'"

2102 msgstr "“%s” 已在 “%s” 點簽出"

2103

2059 -#: branch.c

2060 -#, c-format

2061 -msgid "HEAD of working tree %s is not updated"

2062 -msgstr "%s 工作區的 HEAD 指針未被更新"

2063 -

2104 #: builtin/add.c

2105 msgid "git add [<options>] [--] <pathspec>..."

2106 msgstr "git add [<options>] [--] <pathspec>..."

@@ -2088,6 +2128,14 @@ msgstr "移除 “%s”\n"

2128 msgid "Unstaged changes after refreshing the index:"

2129 msgstr "重新整理索引之後，尚未被暫存的更動："

2130

2131 +#: builtin/add.c

2132 +msgid ""

2133 +"the add.interactive.useBuiltin setting has been removed!\n"

2134 +"See its entry in 'git help config' for details."

2135 +msgstr ""

2136 +"add.interactive.useBuiltin 設定已被移除！\n"

2137 +"深入了解請參閱 “git help config” 中的對應條目。"

2138 +

2139 #: builtin/add.c builtin/rev-parse.c

2140 msgid "Could not read the index"

2141 msgstr "無法讀取索引"

@@ -2323,7 +2371,7 @@ msgstr "fseek 失敗"

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

2372 msgstr "無法開啟 “%s” 進行讀取"

2373

2326 -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c

2374 +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c

2375 #, c-format

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

2377 msgstr "無法開啟 “%s” 進行寫入"

@@ -2545,7 +2593,7 @@ msgstr ""

2593 "您似乎在上一次 “am” 失敗後移動了 HEAD。\n"

2594 "未倒轉回 ORIG_HEAD"

2595

2548 -#: builtin/am.c builtin/bisect--helper.c worktree.c

2596 +#: builtin/am.c builtin/bisect.c worktree.c

2597 #, c-format

2598 msgid "failed to read '%s'"

2599 msgstr "無法讀取 “%s”"

@@ -2567,6 +2615,10 @@ msgstr "git am [<options>] (--continue | --skip | --abort)"

2615 msgid "run interactively"

2616 msgstr "互動式執行"

2617

2618 +#: builtin/am.c

2619 +msgid "bypass pre-applypatch and applypatch-msg hooks"

2620 +msgstr "繞過 pre-applypatch 和 applypatch-msg 掛鉤"

2621 +

2622 #: builtin/am.c

2623 msgid "historical option -- no-op"

2624 msgstr "歷史遺留選項——無作用"

@@ -2586,7 +2638,7 @@ msgstr "在提交說明結尾處加入 Signed-off-by"

2638

2639 #: builtin/am.c

2640 msgid "recode into utf8 (default)"

2589 -msgstr "使用 utf8 字元集（預設）"

2641 +msgstr "使用 utf8 字元集（預設值）"

2642

2643 #: builtin/am.c

2644 msgid "pass -k flag to git-mailinfo"

@@ -2756,111 +2808,105 @@ msgstr "git archive：通訊協定錯誤"

2808 msgid "git archive: expected a flush"

2809 msgstr "git archive：預期收到 flush 封包"

2810

2759 -#: builtin/bisect--helper.c

2760 -msgid "git bisect--helper --bisect-reset [<commit>]"

2761 -msgstr "git bisect--helper --bisect-reset [<commit>]"

2762 -

2763 -#: builtin/bisect--helper.c

2811 +#: builtin/bisect.c

2812 msgid ""

2765 -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"

2766 -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "

2767 -"[<paths>...]"

2813 +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"

2814 +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"

2815 msgstr ""

2769 -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"

2770 -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "

2771 -"[<paths>...]"

2816 +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"

2817 +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"

2818

2773 -#: builtin/bisect--helper.c

2774 -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"

2775 -msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"

2819 +#: builtin/bisect.c

2820 +msgid "git bisect (good|bad) [<rev>...]"

2821 +msgstr "git bisect (good|bad) [<rev>...]"

2822

2777 -#: builtin/bisect--helper.c

2778 -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"

2779 -msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"

2823 +#: builtin/bisect.c

2824 +msgid "git bisect skip [(<rev>|<range>)...]"

2825 +msgstr "git bisect skip [(<rev>|<range>)...]"

2826

2781 -#: builtin/bisect--helper.c

2782 -msgid "git bisect--helper --bisect-replay <filename>"

2783 -msgstr "git bisect--helper --bisect-replay <filename>"

2827 +#: builtin/bisect.c

2828 +msgid "git bisect reset [<commit>]"

2829 +msgstr "git bisect reset [<commit>]"

2830

2785 -#: builtin/bisect--helper.c

2786 -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"

2787 -msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"

2831 +#: builtin/bisect.c

2832 +msgid "git bisect replay <logfile>"

2833 +msgstr "git bisect replay <logfile>"

2834

2789 -#: builtin/bisect--helper.c

2790 -msgid "git bisect--helper --bisect-run <cmd>..."

2791 -msgstr "git bisect--helper --bisect-run <cmd>..."

2835 +#: builtin/bisect.c

2836 +msgid "git bisect run <cmd>..."

2837 +msgstr "git bisect run <cmd>..."

2838

2793 -#: builtin/bisect--helper.c

2839 +#: builtin/bisect.c

2840 #, c-format

2841 msgid "cannot open file '%s' in mode '%s'"

2842 msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"

2843

2798 -#: builtin/bisect--helper.c

2844 +#: builtin/bisect.c

2845 #, c-format

2846 msgid "could not write to file '%s'"

2847 msgstr "無法寫入 “%s” 檔案"

2848

2803 -#: builtin/bisect--helper.c

2849 +#: builtin/bisect.c

2850 #, c-format

2851 msgid "cannot open file '%s' for reading"

2852 msgstr "無法開啟 “%s” 檔案進行讀取"

2853

2808 -#: builtin/bisect--helper.c

2854 +#: builtin/bisect.c

2855 #, c-format

2856 msgid "'%s' is not a valid term"

2857 msgstr "“%s” 不是有效術語"

2858

2813 -#: builtin/bisect--helper.c

2859 +#: builtin/bisect.c

2860 #, c-format

2861 msgid "can't use the builtin command '%s' as a term"

2862 msgstr "不能將內建命令 “%s” 當作術語使用"

2863

2818 -#: builtin/bisect--helper.c

2864 +#: builtin/bisect.c

2865 #, c-format

2866 msgid "can't change the meaning of the term '%s'"

2867 msgstr "不能變更術語 “%s” 的含義"

2868

2823 -#: builtin/bisect--helper.c

2869 +#: builtin/bisect.c

2870 msgid "please use two different terms"

2871 msgstr "請使用兩個不同的術語"

2872

2827 -#: builtin/bisect--helper.c

2873 +#: builtin/bisect.c

2874 #, c-format

2875 msgid "We are not bisecting.\n"

2876 msgstr "我們沒有在二分搜尋。\n"

2877

2832 -#: builtin/bisect--helper.c

2878 +#: builtin/bisect.c

2879 #, c-format

2880 msgid "'%s' is not a valid commit"

2881 msgstr "“%s” 不是有效的提交"

2882

2837 -#: builtin/bisect--helper.c

2883 +#: builtin/bisect.c

2884 #, c-format

2885 msgid ""

2886 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."

2887 msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。"

2888

2843 -#: builtin/bisect--helper.c

2889 +#: builtin/bisect.c

2890 #, c-format

2891 msgid "Bad bisect_write argument: %s"

2892 msgstr "bisect_write 引數無效：%s"

2893

2848 -#: builtin/bisect--helper.c

2894 +#: builtin/bisect.c

2895 #, c-format

2896 msgid "couldn't get the oid of the rev '%s'"

2897 msgstr "無法取得修訂版 “%s” 的物件 ID"

2898

2853 -#: builtin/bisect--helper.c

2899 +#: builtin/bisect.c

2900 #, c-format

2901 msgid "couldn't open the file '%s'"

2902 msgstr "無法開啟檔案 “%s”"

2903

2858 -#: builtin/bisect--helper.c

2904 +#: builtin/bisect.c

2905 #, c-format

2906 msgid "Invalid command: you're currently in a %s/%s bisect"

2907 msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態"

2908

2863 -#: builtin/bisect--helper.c

2909 +#: builtin/bisect.c

2910 #, c-format

2911 msgid ""

2912 "You need to give me at least one %s and %s revision.\n"

@@ -2869,7 +2915,7 @@ msgstr ""

2915 "需指定至少一個 %s 和一個 %s 修訂版。\n"

2916 "為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2917

2872 -#: builtin/bisect--helper.c

2918 +#: builtin/bisect.c

2919 #, c-format

2920 msgid ""

2921 "You need to start by \"git bisect start\".\n"

@@ -2880,7 +2926,7 @@ msgstr ""

2926 "接著提供至少一個 %s 和一個 %s 修訂版。\n"

2927 "為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2928

2883 -#: builtin/bisect--helper.c

2929 +#: builtin/bisect.c

2930 #, c-format

2931 msgid "bisecting only with a %s commit"

2932 msgstr "在只有一個 %s 提交的情況下二分搜尋"

@@ -2890,29 +2936,29 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋"

2936 #. translation. The program will only accept English input

2937 #. at this point.

2938 #.

2893 -#: builtin/bisect--helper.c

2939 +#: builtin/bisect.c

2940 msgid "Are you sure [Y/n]? "

2941 msgstr "是否確定 [Y/n]? "

2942

2897 -#: builtin/bisect--helper.c

2943 +#: builtin/bisect.c

2944 msgid "status: waiting for both good and bad commits\n"

2945 msgstr "狀態：正在等待好和壞的提交\n"

2946

2901 -#: builtin/bisect--helper.c

2947 +#: builtin/bisect.c

2948 #, c-format

2949 msgid "status: waiting for bad commit, %d good commit known\n"

2950 msgid_plural "status: waiting for bad commit, %d good commits known\n"

2951 msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n"

2952

2907 -#: builtin/bisect--helper.c

2953 +#: builtin/bisect.c

2954 msgid "status: waiting for good commit(s), bad commit known\n"

2955 msgstr "狀態：正在等待好的提交，已知有壞的提交\n"

2956

2911 -#: builtin/bisect--helper.c

2957 +#: builtin/bisect.c

2958 msgid "no terms defined"

2959 msgstr "未定義術語"

2960

2915 -#: builtin/bisect--helper.c

2961 +#: builtin/bisect.c

2962 #, c-format

2963 msgid ""

2964 "Your current terms are %s for the old state\n"

@@ -2921,7 +2967,7 @@ msgstr ""

2967 "您目前針對舊狀態的術語是 %s；\n"

2968 "對新狀態的術語是 %s。\n"

2969

2924 -#: builtin/bisect--helper.c

2970 +#: builtin/bisect.c

2971 #, c-format

2972 msgid ""

2973 "invalid argument %s for 'git bisect terms'.\n"

@@ -2930,52 +2976,48 @@ msgstr ""

2976 "傳入 “git bisect terms” 的 %s 引數無效。\n"

2977 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"

2978

2933 -#: builtin/bisect--helper.c

2979 +#: builtin/bisect.c

2980 msgid "revision walk setup failed\n"

2981 msgstr "修訂版遍歷設定失敗\n"

2982

2937 -#: builtin/bisect--helper.c

2983 +#: builtin/bisect.c

2984 #, c-format

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

2986 msgstr "無法開啟 “%s” 進行附加"

2987

2942 -#: builtin/bisect--helper.c

2988 +#: builtin/bisect.c

2989 msgid "'' is not a valid term"

2990 msgstr "“ ” 不是有效術語"

2991

2946 -#: builtin/bisect--helper.c

2992 +#: builtin/bisect.c

2993 #, c-format

2994 msgid "unrecognized option: '%s'"

2995 msgstr "無法識別選項：“%s”"

2996

2951 -#: builtin/bisect--helper.c

2997 +#: builtin/bisect.c

2998 #, c-format

2999 msgid "'%s' does not appear to be a valid revision"

3000 msgstr "“%s” 似乎不是有效修訂版"

3001

2956 -#: builtin/bisect--helper.c

3002 +#: builtin/bisect.c

3003 msgid "bad HEAD - I need a HEAD"

3004 msgstr "HEAD 無效 — 需要一個 HEAD"

3005

2960 -#: builtin/bisect--helper.c

3006 +#: builtin/bisect.c

3007 #, c-format

3008 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

3009 msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。"

3010

2965 -#: builtin/bisect--helper.c

2966 -msgid "won't bisect on cg-seek'ed tree"

2967 -msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"

2968 -

2969 -#: builtin/bisect--helper.c

3011 +#: builtin/bisect.c

3012 msgid "bad HEAD - strange symbolic ref"

3013 msgstr "HEAD 無效 — 異常符號引用"

3014

2973 -#: builtin/bisect--helper.c

3015 +#: builtin/bisect.c

3016 #, c-format

3017 msgid "invalid ref: '%s'"

3018 msgstr "引用無效：“%s”"

3019

2978 -#: builtin/bisect--helper.c

3020 +#: builtin/bisect.c

3021 msgid "You need to start by \"git bisect start\"\n"

3022 msgstr "要開始，請執行 “git bisect start”\n"

3023

@@ -2984,151 +3026,159 @@ msgstr "要開始，請執行 “git bisect start”\n"

3026 #. translation. The program will only accept English input

3027 #. at this point.

3028 #.

2987 -#: builtin/bisect--helper.c

3029 +#: builtin/bisect.c

3030 msgid "Do you want me to do it for you [Y/n]? "

3031 msgstr "是否要這麼做 [Y/n]? "

3032

2991 -#: builtin/bisect--helper.c

3033 +#: builtin/bisect.c

3034 msgid "Please call `--bisect-state` with at least one argument"

3035 msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"

3036

2995 -#: builtin/bisect--helper.c

3037 +#: builtin/bisect.c

3038 #, c-format

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

3040 msgstr "“git bisect %s” 只取一個引數。"

3041

3000 -#: builtin/bisect--helper.c

3042 +#: builtin/bisect.c

3043 #, c-format

3044 msgid "Bad rev input: %s"

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

3046

3005 -#: builtin/bisect--helper.c

3047 +#: builtin/bisect.c

3048 #, c-format

3049 msgid "Bad rev input (not a commit): %s"

3050 msgstr "rev 輸入有誤（不是提交）：%s"

3051

3010 -#: builtin/bisect--helper.c

3052 +#: builtin/bisect.c

3053 msgid "We are not bisecting."

3054 msgstr "我們沒有在二分搜尋。"

3055

3014 -#: builtin/bisect--helper.c

3056 +#: builtin/bisect.c

3057 #, c-format

3058 msgid "'%s'?? what are you talking about?"

3059 msgstr "「%s」？？您在說什麼？"

3060

3019 -#: builtin/bisect--helper.c

3061 +#: builtin/bisect.c

3062 #, c-format

3063 msgid "cannot read file '%s' for replaying"

3064 msgstr "無法讀取「%s」檔案進行重放"

3065

3024 -#: builtin/bisect--helper.c

3066 +#: builtin/bisect.c

3067 #, c-format

3068 msgid "running %s\n"

3069 msgstr "正在執行 %s\n"

3070

3029 -#: builtin/bisect--helper.c

3071 +#: builtin/bisect.c

3072 msgid "bisect run failed: no command provided."

3073 msgstr "二分搜尋執行失敗：沒有提供命令。"

3074

3033 -#: builtin/bisect--helper.c

3075 +#: builtin/bisect.c

3076 #, c-format

3035 -msgid "unable to verify '%s' on good revision"

3036 -msgstr "無法在好的修訂版上驗證 “%s”"

3077 +msgid "unable to verify %s on good revision"

3078 +msgstr "無法在好的修訂版上驗證 %s"

3079

3038 -#: builtin/bisect--helper.c

3080 +#: builtin/bisect.c

3081 #, c-format

3082 msgid "bogus exit code %d for good revision"

3083 msgstr "好的修訂版回傳偽造的錯誤碼 %d"

3084

3043 -#: builtin/bisect--helper.c

3085 +#: builtin/bisect.c

3086 #, c-format

3045 -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"

3046 -msgstr "二分搜尋執行失敗：“%2$s” 回傳的離開碼 %1$d 小於 0 或 >= 128"

3087 +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"

3088 +msgstr "二分搜尋執行失敗：%2$s 回傳的離開碼 %1$d 小於 0 或大於 128"

3089

3048 -#: builtin/bisect--helper.c

3090 +#: builtin/bisect.c

3091 #, c-format

3092 msgid "cannot open file '%s' for writing"

3093 msgstr "無法開啟 “%s” 檔案進行寫入"

3094

3053 -#: builtin/bisect--helper.c

3095 +#: builtin/bisect.c

3096 msgid "bisect run cannot continue any more"

3097 msgstr "二分搜尋不能繼續執行"

3098

3057 -#: builtin/bisect--helper.c

3058 -#, c-format

3099 +#: builtin/bisect.c

3100 msgid "bisect run success"

3101 msgstr "二分搜尋執行成功"

3102

3062 -#: builtin/bisect--helper.c

3063 -#, c-format

3103 +#: builtin/bisect.c

3104 msgid "bisect found first bad commit"

3105 msgstr "二分搜尋發現到第一個有問題的提交"

3106

3067 -#: builtin/bisect--helper.c

3107 +#: builtin/bisect.c

3108 #, c-format

3069 -msgid ""

3070 -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "

3071 -"code %d"

3072 -msgstr ""

3073 -"二分搜尋執行失敗：“git bisect--helper --bisect-state %s” 以錯誤碼 %d 離開"

3109 +msgid "bisect run failed: 'git bisect %s' exited with error code %d"

3110 +msgstr "二分搜尋執行失敗：“git bisect %s” 以錯誤碼 %d 離開"

3111

3075 -#: builtin/bisect--helper.c

3076 -msgid "--bisect-reset requires either no argument or a commit"

3077 -msgstr "--bisect-reset 可以不需要引數，或者得傳入一個提交"

3078 -

3079 -#: builtin/bisect--helper.c

3080 -msgid "--bisect-terms requires 0 or 1 argument"

3081 -msgstr "--bisect-terms 需要 0 或 1 個引數"

3112 +#: builtin/bisect.c

3113 +#, c-format

3114 +msgid "'%s' requires either no argument or a commit"

3115 +msgstr "“%s” 不需要引數，或者得傳入一個提交"

3116

3083 -#: builtin/bisect--helper.c

3084 -msgid "--bisect-next requires 0 arguments"

3085 -msgstr "--bisect-next 需要 0 個引數"

3117 +#: builtin/bisect.c

3118 +#, c-format

3119 +msgid "'%s' requires 0 or 1 argument"

3120 +msgstr "“%s” 需要 0 或 1 個引數"

3121

3087 -#: builtin/bisect--helper.c

3088 -msgid "--bisect-log requires 0 arguments"

3089 -msgstr "--bisect-log 需要 0 個引數"

3122 +#: builtin/bisect.c

3123 +#, c-format

3124 +msgid "'%s' requires 0 arguments"

3125 +msgstr "“%s” 不需引數"

3126

3091 -#: builtin/bisect--helper.c

3127 +#: builtin/bisect.c

3128 msgid "no logfile given"

3129 msgstr "未提供日誌檔案"

3130

3131 +#: builtin/bisect.c

3132 +#, c-format

3133 +msgid "'%s' failed: no command provided."

3134 +msgstr "“%s” 失敗：沒有提供命令。"

3135 +

3136 +#: builtin/bisect.c

3137 +msgid "need a command"

3138 +msgstr "需要提供命令"

3139 +

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

3141 +#, c-format

3142 +msgid "unknown command: '%s'"

3143 +msgstr "未知命令：“%s”"

3144 +

3145 #: builtin/blame.c

3146 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3097 -msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"

3147 +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3148

3149 #: builtin/blame.c

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

3101 -msgstr "git annotate [<選項>] [<版本選項>] [<版本>] [--] <檔案>"

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

3152

3153 #: builtin/blame.c

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

3105 -msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"

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

3156

3157 #: builtin/blame.c

3158 #, c-format

3159 msgid "expecting a color: %s"

3110 -msgstr "期望一個顏色：%s"

3160 +msgstr "預期是個顏色：%s"

3161

3162 #: builtin/blame.c

3163 msgid "must end with a color"

3114 -msgstr "必須以一個顏色結尾"

3164 +msgstr "結尾必須是一個顏色"

3165

3166 #: builtin/blame.c

3167 #, c-format

3168 msgid "cannot find revision %s to ignore"

3119 -msgstr "不能找到要忽略的版本 %s"

3169 +msgstr "不能找到要忽略的 %s 修訂版"

3170

3171 #: builtin/blame.c

3172 msgid "show blame entries as we find them, incrementally"

3123 -msgstr "增量式顯示發現的 blame 條目"

3173 +msgstr "漸進式顯示發現的溯源項目"

3174

3175 #: builtin/blame.c

3176 msgid "do not show object names of boundary commits (Default: off)"

3127 -msgstr "不要顯示邊界提交的物件名稱（預設值: off）"

3177 +msgstr "不要顯示邊界提交的物件名稱（預設值：off）"

3178

3179 #: builtin/blame.c

3180 msgid "do not treat root commits as boundaries (Default: off)"

3131 -msgstr "不將根提交看作邊界（預設值：off）"

3181 +msgstr "不把根提交當作邊界（預設值：off）"

3182

3183 #: builtin/blame.c

3184 msgid "show work cost statistics"

@@ -3142,7 +3192,7 @@ msgstr "強制顯示進度報告"

3192

3193 #: builtin/blame.c

3194 msgid "show output score for blame entries"

3145 -msgstr "顯示判斷 blame 條目位移的得分診斷訊息"

3195 +msgstr "顯示溯源項目的輸出得分"

3196

3197 #: builtin/blame.c

3198 msgid "show original filename (Default: auto)"

@@ -3150,7 +3200,7 @@ msgstr "顯示原始檔案名稱（預設值：auto）"

3200

3201 #: builtin/blame.c

3202 msgid "show original linenumber (Default: off)"

3153 -msgstr "顯示原始檔案名稱（預設值：off）"

3203 +msgstr "顯示原始列碼（預設值：off）"

3204

3205 #: builtin/blame.c

3206 msgid "show in a format designed for machine consumption"

@@ -3158,7 +3208,7 @@ msgstr "顯示成適合機器讀取的格式"

3208

3209 #: builtin/blame.c

3210 msgid "show porcelain format with per-line commit information"

3161 -msgstr "顯示每一列適合機器的提交說明"

3211 +msgstr "顯示包含每一列提交資訊，適合機器讀取的格式"

3212

3213 #: builtin/blame.c

3214 msgid "use the same output mode as git-annotate (Default: off)"

@@ -3186,15 +3236,15 @@ msgstr "忽略空白差異"

3236

3237 #: builtin/blame.c builtin/log.c

3238 msgid "rev"

3189 -msgstr "版本"

3239 +msgstr "rev"

3240

3241 #: builtin/blame.c

3242 msgid "ignore <rev> when blaming"

3193 -msgstr "在執行 blame 動作時忽略 <修訂版>"

3243 +msgstr "在執行溯源動作時忽略 <rev>"

3244

3245 #: builtin/blame.c

3246 msgid "ignore revisions from <file>"

3197 -msgstr "忽略 <檔案> 中的修訂版"

3247 +msgstr "忽略 <file> 中的修訂版"

3248

3249 #: builtin/blame.c

3250 msgid "color redundant metadata from previous line differently"

@@ -3202,31 +3252,31 @@ msgstr "使用顏色間隔輸出與前一行不同的重複中介資料"

3252

3253 #: builtin/blame.c

3254 msgid "color lines by age"

3205 -msgstr "依據時間著色"

3255 +msgstr "根據時間著色"

3256

3257 #: builtin/blame.c

3258 msgid "spend extra cycles to find better match"

3209 -msgstr "循環更多次以找到更佳符合"

3259 +msgstr "循環更多次來找到更佳符合項目"

3260

3261 #: builtin/blame.c

3262 msgid "use revisions from <file> instead of calling git-rev-list"

3213 -msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"

3263 +msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"

3264

3265 #: builtin/blame.c

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

3217 -msgstr "將 <檔案> 的內容當成是最終 image"

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

3268

3269 #: builtin/blame.c

3270 msgid "score"

3221 -msgstr "得分"

3271 +msgstr "score"

3272

3273 #: builtin/blame.c

3274 msgid "find line copies within and across files"

3225 -msgstr "找到檔案內及跨檔案的複製列"

3275 +msgstr "找到檔案內及跨檔案的列拷貝動作"

3276

3277 #: builtin/blame.c

3278 msgid "find line movements within and across files"

3229 -msgstr "找到檔案內及跨檔案的移動列"

3279 +msgstr "找到檔案內及跨檔案的列移動動作"

3280

3281 #: builtin/blame.c

3282 msgid "range"

@@ -3256,45 +3306,47 @@ msgstr "4 年 11 個月前"

3306 #, c-format

3307 msgid "file %s has only %lu line"

3308 msgid_plural "file %s has only %lu lines"

3259 -msgstr[0] "檔案 %s 只有 %lu 行"

3309 +msgstr[0] "檔案 %s 只有 %lu 列"

3310

3311 #: builtin/blame.c

3312 msgid "Blaming lines"

3263 -msgstr "追蹤程式碼行"

3313 +msgstr "溯源文字列"

3314

3315 #: builtin/branch.c

3316 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"

3267 -msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"

3317 +msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]"

3318

3319 #: builtin/branch.c

3320 msgid ""

3321 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"

3322 "point>]"

3273 -msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"

3323 +msgstr ""

3324 +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"

3325 +"point>]"

3326

3327 #: builtin/branch.c

3328 msgid "git branch [<options>] [-l] [<pattern>...]"

3277 -msgstr "git branch [<選項>] [-l] [<模式>...]"

3329 +msgstr "git branch [<options>] [-l] [<pattern>...]"

3330

3331 #: builtin/branch.c

3332 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3281 -msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."

3333 +msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3334

3335 #: builtin/branch.c

3336 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3285 -msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"

3337 +msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3338

3339 #: builtin/branch.c

3340 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

3289 -msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"

3341 +msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

3342

3343 #: builtin/branch.c

3344 msgid "git branch [<options>] [-r | -a] [--points-at]"

3293 -msgstr "git branch [<選項>] [-r | -a] [--points-at]"

3345 +msgstr "git branch [<options>] [-r | -a] [--points-at]"

3346

3347 #: builtin/branch.c

3348 msgid "git branch [<options>] [-r | -a] [--format]"

3297 -msgstr "git branch [<選項>] [-r | -a] [--format]"

3349 +msgstr "git branch [<options>] [-r | -a] [--format]"

3350

3351 # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長

3352 #: builtin/branch.c

@@ -3303,8 +3355,8 @@ msgid ""

3355 "deleting branch '%s' that has been merged to\n"

3356 " '%s', but not yet merged to HEAD."

3357 msgstr ""

3306 -"將要刪除的分支 '%s' 已經被合併到\n"

3307 -" '%s'，但未合併到 HEAD。"

3358 +"將要刪除的 “%s” 分支已經被合併到\n"

3359 +" “%s”，但尚未合併到 HEAD。"

3360

3361 # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長

3362 #: builtin/branch.c

@@ -3313,13 +3365,13 @@ msgid ""

3365 "not deleting branch '%s' that is not yet merged to\n"

3366 " '%s', even though it is merged to HEAD."

3367 msgstr ""

3316 -"並未刪除分支 '%s'，雖然它已經合併到 HEAD，\n"

3317 -" 然而卻尚未被合併到分支 '%s' 。"

3368 +"並未刪除分支 “%s”，雖然已經合併到 HEAD，\n"

3369 +" 卻尚未被合併至 “%s” 分支。"

3370

3371 #: builtin/branch.c

3372 #, c-format

3373 msgid "Couldn't look up commit object for '%s'"

3322 -msgstr "無法查詢 '%s' 指向的提交物件"

3374 +msgstr "無法查詢 “%s” 指向的提交物件"

3375

3376 #: builtin/branch.c

3377 #, c-format

@@ -3327,12 +3379,12 @@ msgid ""

3379 "The branch '%s' is not fully merged.\n"

3380 "If you are sure you want to delete it, run 'git branch -D %s'."

3381 msgstr ""

3330 -"分支 '%s' 沒有完全合併。\n"

3331 -"如果您確認要刪除它，執行 'git branch -D %s'。"

3382 +"分支 “%s” 沒有完全合併。\n"

3383 +"如果確定要刪除它，請執行 “git branch -D %s”。"

3384

3385 #: builtin/branch.c

3386 msgid "Update of config-file failed"

3335 -msgstr "更新設定檔案失敗"

3387 +msgstr "更新組態檔案失敗"

3388

3389 #: builtin/branch.c

3390 msgid "cannot use -a with -d"

@@ -3341,17 +3393,26 @@ msgstr "不能將 -a 和 -d 同時使用"

3393 #: builtin/branch.c

3394 #, c-format

3395 msgid "Cannot delete branch '%s' checked out at '%s'"

3344 -msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"

3396 +msgstr "無法刪除在 “%2$s” 簽出的 “%1$s” 分支"

3397

3398 #: builtin/branch.c

3399 #, c-format

3400 msgid "remote-tracking branch '%s' not found."

3349 -msgstr "未能找到遠端追蹤分支 '%s'。"

3401 +msgstr "找不到 “%s” 遠端追蹤分支。"

3402 +

3403 +#: builtin/branch.c

3404 +#, c-format

3405 +msgid ""

3406 +"branch '%s' not found.\n"

3407 +"Did you forget --remote?"

3408 +msgstr ""

3409 +"找不到 “%s” 分支。\n"

3410 +"您可能要加上 --remote？"

3411

3412 #: builtin/branch.c

3413 #, c-format

3414 msgid "branch '%s' not found."

3354 -msgstr "分支 '%s' 未發現。"

3415 +msgstr "找不到 “%s” 分支。"

3416

3417 #: builtin/branch.c

3418 #, c-format

@@ -3365,41 +3426,46 @@ msgstr "已刪除分支 %s（曾為 %s）。\n"

3426

3427 #: builtin/branch.c builtin/tag.c

3428 msgid "unable to parse format string"

3368 -msgstr "不能解析格式化字串"

3429 +msgstr "無法解析格式化字串"

3430

3431 #: builtin/branch.c

3432 msgid "could not resolve HEAD"

3372 -msgstr "不能解析 HEAD 提交"

3433 +msgstr "無法解析 HEAD 指針"

3434

3435 #: builtin/branch.c

3436 #, c-format

3437 msgid "HEAD (%s) points outside of refs/heads/"

3377 -msgstr "HEAD (%s) 指向 refs/heads/ 之外"

3438 +msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外"

3439

3440 #: builtin/branch.c

3441 #, c-format

3442 msgid "Branch %s is being rebased at %s"

3382 -msgstr "分支 %s 正被重定基底到 %s"

3443 +msgstr "%s 分支正在重定基底至 %s"

3444

3445 #: builtin/branch.c

3446 #, c-format

3447 msgid "Branch %s is being bisected at %s"

3387 -msgstr "分支 %s 正被二分搜尋於 %s"

3448 +msgstr "%s 分支正於 %s 進行二分搜尋"

3449 +

3450 +#: builtin/branch.c

3451 +#, c-format

3452 +msgid "HEAD of working tree %s is not updated"

3453 +msgstr "%s 工作區的 HEAD 指針未被更新"

3454

3455 #: builtin/branch.c

3456 #, c-format

3457 msgid "Invalid branch name: '%s'"

3392 -msgstr "無效的分支名：'%s'"

3458 +msgstr "分支名稱無效：“%s”"

3459

3460 #: builtin/branch.c

3461 #, c-format

3462 msgid "No commit on branch '%s' yet."

3397 -msgstr "分支 '%s' 尚無提交。"

3463 +msgstr "分支 “%s” 尚無提交。"

3464

3465 #: builtin/branch.c

3466 #, c-format

3467 msgid "No branch named '%s'."

3402 -msgstr "沒有分支 '%s'。"

3468 +msgstr "沒有名為 “%s” 的分支。"

3469

3470 #: builtin/branch.c

3471 msgid "Branch rename failed"

@@ -3407,30 +3473,30 @@ msgstr "分支重新命名失敗"

3473

3474 #: builtin/branch.c

3475 msgid "Branch copy failed"

3410 -msgstr "分支複製失敗"

3476 +msgstr "分支拷貝失敗"

3477

3478 #: builtin/branch.c

3479 #, c-format

3480 msgid "Created a copy of a misnamed branch '%s'"

3415 -msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"

3481 +msgstr "已為誤命名的 “%s” 分支建立拷貝"

3482

3483 #: builtin/branch.c

3484 #, c-format

3485 msgid "Renamed a misnamed branch '%s' away"

3420 -msgstr "已將錯誤命名的分支 '%s' 重新命名"

3486 +msgstr "已更改誤命名的 “%s” 分支的名稱"

3487

3488 #: builtin/branch.c

3489 #, c-format

3490 msgid "Branch renamed to %s, but HEAD is not updated!"

3425 -msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"

3491 +msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新！"

3492

3493 #: builtin/branch.c

3494 msgid "Branch is renamed, but update of config-file failed"

3429 -msgstr "分支被重新命名，但更新設定檔案失敗"

3495 +msgstr "分支已重新命名，但無法更新組態檔案"

3496

3497 #: builtin/branch.c

3498 msgid "Branch is copied, but update of config-file failed"

3433 -msgstr "分支已複製，但更新設定檔案失敗"

3499 +msgstr "分支已拷貝，但無法更新組態檔案"

3500

3501 #: builtin/branch.c

3502 #, c-format

@@ -3439,41 +3505,41 @@ msgid ""

3505 " %s\n"

3506 "Lines starting with '%c' will be stripped.\n"

3507 msgstr ""

3442 -"請編輯分支的描述\n"

3508 +"請編輯下述分支的描述\n"

3509 " %s\n"

3444 -"以 '%c' 開頭的行將被過濾。\n"

3510 +"開頭是 “%c” 的列將被刪除。\n"

3511

3512 #: builtin/branch.c

3513 msgid "Generic options"

3448 -msgstr "通用選項"

3514 +msgstr "一般性選項"

3515

3516 #: builtin/branch.c

3517 msgid "show hash and subject, give twice for upstream branch"

3452 -msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"

3518 +msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支"

3519

3520 #: builtin/branch.c

3521 msgid "suppress informational messages"

3456 -msgstr "不顯示訊息"

3522 +msgstr "不顯示資訊訊息"

3523

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

3525 msgid "set branch tracking configuration"

3460 -msgstr "設定分支追蹤設定"

3526 +msgstr "設定分支追蹤組態"

3527

3528 #: builtin/branch.c

3529 msgid "do not use"

3464 -msgstr "不要使用"

3530 +msgstr "請勿使用"

3531

3532 #: builtin/branch.c

3533 msgid "upstream"

3468 -msgstr "上游"

3534 +msgstr "upstream"

3535

3536 #: builtin/branch.c

3537 msgid "change the upstream info"

3472 -msgstr "改變上游訊息"

3538 +msgstr "變更上游資訊"

3539

3540 #: builtin/branch.c

3541 msgid "unset the upstream info"

3476 -msgstr "取消上游資訊設定"

3542 +msgstr "取消設定上游資訊"

3543

3544 #: builtin/branch.c

3545 msgid "use colored output"

@@ -3485,19 +3551,19 @@ msgstr "作用於遠端追蹤分支"

3551

3552 #: builtin/branch.c

3553 msgid "print only branches that contain the commit"

3488 -msgstr "只列印包含該提交的分支"

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

3555

3556 #: builtin/branch.c

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

3492 -msgstr "只列印不包含該提交的分支"

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

3559

3560 #: builtin/branch.c

3561 msgid "Specific git-branch actions:"

3496 -msgstr "具體的 git-branch 動作："

3562 +msgstr "特定的 git-branch 動作："

3563

3564 #: builtin/branch.c

3565 msgid "list both remote-tracking and local branches"

3500 -msgstr "列出遠端追蹤及本機分支"

3566 +msgstr "列出遠端追蹤和本機分支"

3567

3568 #: builtin/branch.c

3569 msgid "delete fully merged branch"

@@ -3505,31 +3571,35 @@ msgstr "刪除完全合併的分支"

3571

3572 #: builtin/branch.c

3573 msgid "delete branch (even if not merged)"

3508 -msgstr "刪除分支（即使沒有合併）"

3574 +msgstr "刪除分支（即使尚未合併）"

3575

3576 #: builtin/branch.c

3577 msgid "move/rename a branch and its reflog"

3512 -msgstr "移動/重新命名一個分支，以及它的引用日誌"

3578 +msgstr "移動或重新命名分支及其引用日誌"

3579

3580 #: builtin/branch.c

3581 msgid "move/rename a branch, even if target exists"

3516 -msgstr "移動/重新命名一個分支，即使目標已存在"

3582 +msgstr "即使目標已存在，仍移動或重新命名分支"

3583 +

3584 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c

3585 +msgid "do not output a newline after empty formatted refs"

3586 +msgstr "在格式化引用結果為空之後，不要輸出換列符號"

3587

3588 #: builtin/branch.c

3589 msgid "copy a branch and its reflog"

3520 -msgstr "複製分支及其引用日誌"

3590 +msgstr "拷貝分支及其引用日誌"

3591

3592 #: builtin/branch.c

3593 msgid "copy a branch, even if target exists"

3524 -msgstr "複製一個分支，即使目標已存在"

3594 +msgstr "即使目標已存在仍拷貝分支"

3595

3596 #: builtin/branch.c

3597 msgid "list branch names"

3528 -msgstr "列出分支名"

3598 +msgstr "列出分支名稱"

3599

3600 #: builtin/branch.c

3601 msgid "show current branch name"

3532 -msgstr "顯示目前分支名"

3602 +msgstr "顯示目前分支名稱"

3603

3604 #: builtin/branch.c builtin/submodule--helper.c

3605 msgid "create the branch's reflog"

@@ -3537,7 +3607,7 @@ msgstr "建立分支的引用日誌"

3607

3608 #: builtin/branch.c

3609 msgid "edit the description for the branch"

3540 -msgstr "標記分支的描述"

3610 +msgstr "編輯分支的描述"

3611

3612 #: builtin/branch.c

3613 msgid "force creation, move/rename, deletion"

@@ -3545,27 +3615,27 @@ msgstr "強制建立、移動/重新命名、刪除"

3615

3616 #: builtin/branch.c

3617 msgid "print only branches that are merged"

3548 -msgstr "只列印已經合併的分支"

3618 +msgstr "只輸出已經合併的分支"

3619

3620 #: builtin/branch.c

3621 msgid "print only branches that are not merged"

3552 -msgstr "只列印尚未合併的分支"

3622 +msgstr "只輸出尚未合併的分支"

3623

3624 #: builtin/branch.c

3625 msgid "list branches in columns"

3556 -msgstr "以列的方式顯示分支"

3626 +msgstr "以行的形式列出分支"

3627

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

3629 msgid "object"

3560 -msgstr "物件"

3630 +msgstr "object"

3631

3632 #: builtin/branch.c

3633 msgid "print only branches of the object"

3564 -msgstr "只列印指向該物件的分支"

3634 +msgstr "只輸出指向此物件的分支"

3635

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

3637 msgid "sorting and filtering are case insensitive"

3568 -msgstr "排序和過濾屬於大小寫不敏感"

3638 +msgstr "排序和過濾不區分大小寫"

3639

3640 #: builtin/branch.c builtin/ls-files.c

3641 msgid "recurse through submodules"

@@ -3582,14 +3652,14 @@ msgstr "無法將 HEAD 解析為有效引用。"

3652

3653 #: builtin/branch.c builtin/clone.c

3654 msgid "HEAD not found below refs/heads!"

3585 -msgstr "HEAD 沒有位於 /refs/heads 之下！"

3655 +msgstr "HEAD 指針不在 /refs/heads 中！"

3656

3657 #: builtin/branch.c

3658 msgid ""

3659 "branch with --recurse-submodules can only be used if submodule."

3660 "propagateBranches is enabled"

3661 msgstr ""

3592 -"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"

3662 +"有 --recurse-submodules 的分支，只能在啟用 submodule.propagateBranches 時使用"

3663

3664 #: builtin/branch.c

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

@@ -3597,79 +3667,79 @@ msgstr "--recurse-submodules 只能用來建立分支"

3667

3668 #: builtin/branch.c

3669 msgid "branch name required"

3600 -msgstr "必須提供分支名"

3670 +msgstr "必須提供分支名稱"

3671

3672 #: builtin/branch.c

3673 msgid "Cannot give description to detached HEAD"

3604 -msgstr "不能向分離開頭指標提供描述"

3674 +msgstr "無法向分離 HEAD 指針提供描述"

3675

3676 #: builtin/branch.c

3677 msgid "cannot edit description of more than one branch"

3608 -msgstr "不能為一個以上的分支編輯描述"

3678 +msgstr "無法編輯超過一個分支的描述"

3679

3680 #: builtin/branch.c

3681 msgid "cannot copy the current branch while not on any."

3612 -msgstr "無法複製目前分支因為不處於任何分支上。"

3682 +msgstr "不在任何分支上，無法拷貝目前分支。"

3683

3684 #: builtin/branch.c

3685 msgid "cannot rename the current branch while not on any."

3616 -msgstr "無法重新命名目前分支因為不處於任何分支上。"

3686 +msgstr "不在任何分支上，無法重新命名目前分支。"

3687

3688 #: builtin/branch.c

3689 msgid "too many branches for a copy operation"

3620 -msgstr "為複製動作提供了太多的分支名"

3690 +msgstr "要進行拷貝動作的分支太多"

3691

3692 #: builtin/branch.c

3693 msgid "too many arguments for a rename operation"

3624 -msgstr "為重新命名動作提供了太多的參數"

3694 +msgstr "傳入重新命名動作的引數太多"

3695

3696 #: builtin/branch.c

3697 msgid "too many arguments to set new upstream"

3628 -msgstr "為設定新上游提供了太多的參數"

3698 +msgstr "要設定新上游的引數太多"

3699

3700 #: builtin/branch.c

3701 #, c-format

3702 msgid ""

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

3634 -msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。"

3704 +msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支。"

3705

3706 #: builtin/branch.c

3707 #, c-format

3708 msgid "no such branch '%s'"

3639 -msgstr "沒有此分支 '%s'"

3709 +msgstr "無 “%s” 分支"

3710

3711 #: builtin/branch.c

3712 #, c-format

3713 msgid "branch '%s' does not exist"

3644 -msgstr "分支 '%s' 不存在"

3714 +msgstr "沒有 “%s” 分支"

3715

3716 #: builtin/branch.c

3717 msgid "too many arguments to unset upstream"

3648 -msgstr "為取消上游設定動作提供了太多的參數"

3718 +msgstr "要取消設定上游的引數太多"

3719

3720 #: builtin/branch.c

3721 msgid "could not unset upstream of HEAD when it does not point to any branch."

3652 -msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"

3722 +msgstr "無法取消設定 HEAD 的上游：其未指向任何分支。"

3723

3724 #: builtin/branch.c

3725 #, c-format

3726 msgid "Branch '%s' has no upstream information"

3657 -msgstr "分支 '%s' 沒有上游訊息"

3727 +msgstr "分支 “%s” 沒有上游資訊"

3728

3729 #: builtin/branch.c

3730 msgid ""

3731 "The -a, and -r, options to 'git branch' do not take a branch name.\n"

3732 "Did you mean to use: -a|-r --list <pattern>?"

3733 msgstr ""

3664 -"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"

3665 -"您是否想要使用：-a|-r --list <模式>？"

3734 +"“git branch” 的 -a 和 -r 選項不取分支名稱。\n"

3735 +"您是想使用：-a|-r --list <pattern> 嗎？"

3736

3737 #: builtin/branch.c

3738 msgid ""

3739 "the '--set-upstream' option is no longer supported. Please use '--track' or "

3740 "'--set-upstream-to' instead."

3741 msgstr ""

3672 -"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"

3742 +"不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”。"

3743

3744 #: builtin/bugreport.c

3745 msgid "git version:\n"

@@ -3678,7 +3748,7 @@ msgstr "git 版本：\n"

3748 #: builtin/bugreport.c

3749 #, c-format

3750 msgid "uname() failed with error '%s' (%d)\n"

3681 -msgstr "uname() 失敗，錯誤：「%s」(%d)\n"

3751 +msgstr "uname() 失敗，錯誤：“%s” (%d)\n"

3752

3753 #: builtin/bugreport.c

3754 msgid "compiler info: "

@@ -3690,7 +3760,7 @@ msgstr "libc 資訊： "

3760

3761 #: builtin/bugreport.c

3762 msgid "not run from a git repository - no hooks to show\n"

3693 -msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"

3763 +msgstr "不是在 git 版本庫執行 — 沒有可顯示的掛鉤\n"

3764

3765 #: builtin/bugreport.c

3766 msgid ""

@@ -3719,15 +3789,15 @@ msgid ""

3789 "You can delete any lines you don't wish to share.\n"

3790 msgstr ""

3791 "感謝您填寫 Git 臭蟲報告！\n"

3722 -"請回答下列問題，以讓我們能夠了解您的問題。\n"

3792 +"請回答下列詢問，協助我們了解您的問題。\n"

3793 "\n"

3794 "臭蟲發生前，您做了什麼？（重現問題的步驟）\n"

3795 "\n"

3726 -"你原本期望發生什麼？（期望行為）\n"

3796 +"原本您預期發生什麼？（預期行為）\n"

3797 "\n"

3798 "那實際上發生了什麼？（實際行為）\n"

3799 "\n"

3730 -"期望行為跟實際發生的行為有什麼不同？\n"

3800 +"預期發生的行為，跟實際發生的行為有什麼不同？\n"

3801 "\n"

3802 "其他您想加入的：\n"

3803 "\n"

@@ -3737,25 +3807,25 @@ msgstr ""

3807 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c

3808 #: parse-options.h

3809 msgid "mode"

3740 -msgstr "模式"

3810 +msgstr "mode"

3811

3812 #: builtin/bugreport.c

3813 msgid ""

3814 "create an additional zip archive of detailed diagnostics (default 'stats')"

3745 -msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “stats”）"

3815 +msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值 “stats”）"

3816

3817 #: builtin/bugreport.c

3818 msgid "specify a destination for the bugreport file(s)"

3749 -msgstr "請指定臭蟲報告檔案的目的地"

3819 +msgstr "指定臭蟲報告檔案的目的地"

3820

3821 #: builtin/bugreport.c

3822 msgid "specify a strftime format suffix for the filename(s)"

3753 -msgstr "指定檔名，strftime 格式的後綴"

3823 +msgstr "指定用於檔名的 strftime 格式後綴"

3824

3825 #: builtin/bugreport.c builtin/diagnose.c

3826 #, c-format

3827 msgid "could not create leading directories for '%s'"

3758 -msgstr "無法建立 '%s' 的前置目錄"

3828 +msgstr "無法建立 “%s” 的前置目錄"

3829

3830 #: builtin/bugreport.c builtin/diagnose.c

3831 #, c-format

@@ -3778,16 +3848,14 @@ msgstr "無法寫入 %s"

3848 #: builtin/bugreport.c

3849 #, c-format

3850 msgid "Created new report at '%s'.\n"

3781 -msgstr "已在「%s」建立新報告。\n"

3851 +msgstr "已在 “%s” 建立新報告。\n"

3852

3853 #: builtin/bundle.c

3854 msgid ""

3785 -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3786 -"progress-implied]\n"

3855 +"git bundle create [-q | --quiet | --progress]\n"

3856 " [--version=<version>] <file> <git-rev-list-args>"

3857 msgstr ""

3789 -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3790 -"progress-implied]\n"

3858 +"git bundle create [-q | --quiet | --progress]\n"

3859 " [--version=<version>] <file> <git-rev-list-args>"

3860

3861 #: builtin/bundle.c

@@ -3796,27 +3864,31 @@ msgstr "git bundle verify [-q | --quiet] <file>"

3864

3865 #: builtin/bundle.c

3866 msgid "git bundle list-heads <file> [<refname>...]"

3799 -msgstr "git bundle list-heads <檔案> [<引用名稱>...]"

3867 +msgstr "git bundle list-heads <file> [<refname>...]"

3868

3869 #: builtin/bundle.c

3870 msgid "git bundle unbundle [--progress] <file> [<refname>...]"

3871 msgstr "git bundle unbundle [--progress] <file> [<refname>...]"

3872

3873 +#: builtin/bundle.c

3874 +msgid "need a <file> argument"

3875 +msgstr "需要提供 <file> 引數"

3876 +

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

3878 msgid "do not show progress meter"

3807 -msgstr "不顯示進度表"

3879 +msgstr "不顯示進度列"

3880

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

3882 msgid "show progress meter"

3811 -msgstr "顯示進度表"

3883 +msgstr "顯示進度列"

3884

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

3814 -msgid "show progress meter during object writing phase"

3815 -msgstr "在物件寫入階段顯示進度表"

3885 +#: builtin/bundle.c

3886 +msgid "historical; same as --progress"

3887 +msgstr "歷史遺留選項；和 --progress 相同"

3888

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

3818 -msgid "similar to --all-progress when progress meter is shown"

3819 -msgstr "當進度表顯示時類似於 --all-progress"

3889 +#: builtin/bundle.c

3890 +msgid "historical; does nothing"

3891 +msgstr "歷史遺留選項；沒有作用"

3892

3893 #: builtin/bundle.c

3894 msgid "specify bundle format version"

@@ -3841,12 +3913,12 @@ msgstr "需要版本庫才能拆分套件包。"

3913

3914 #: builtin/bundle.c

3915 msgid "Unbundling objects"

3844 -msgstr "正在解包物件"

3916 +msgstr "正在拆分物件"

3917

3918 #: builtin/cat-file.c merge-recursive.c

3919 #, c-format

3920 msgid "cannot read object %s '%s'"

3849 -msgstr "不能讀取物件 %s '%s'"

3921 +msgstr "無法讀取物件 %s “%s”"

3922

3923 #: builtin/cat-file.c

3924 msgid "flush is only for --buffer mode"

@@ -3859,7 +3931,7 @@ msgstr "輸入中沒有命令"

3931 #: builtin/cat-file.c

3932 #, c-format

3933 msgid "whitespace before command: '%s'"

3862 -msgstr "命令前空格：「%s」"

3934 +msgstr "命令前有空格：“%s”"

3935

3936 #: builtin/cat-file.c

3937 #, c-format

@@ -3871,11 +3943,6 @@ msgstr "%s 需要引數"

3943 msgid "%s takes no arguments"

3944 msgstr "%s 不取引數"

3945

3874 -#: builtin/cat-file.c

3875 -#, c-format

3876 -msgid "unknown command: '%s'"

3877 -msgstr "未知命令：「%s」"

3878 -

3946 #: builtin/cat-file.c

3947 msgid "only one batch option may be specified"

3948 msgstr "只能指定一個批次處理選項"

@@ -3926,7 +3993,7 @@ msgstr "美化輸出 <object> 的內容"

3993

3994 #: builtin/cat-file.c

3995 msgid "Emit [broken] object attributes"

3929 -msgstr "輸出 [損壞的] 物件屬性"

3996 +msgstr "輸出 [損壞的] ([broken]) 物件屬性"

3997

3998 #: builtin/cat-file.c

3999 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"

@@ -3958,15 +4025,15 @@ msgstr "類似 --batch 但不輸出 <contents>"

4025

4026 #: builtin/cat-file.c

4027 msgid "stdin is NUL-terminated"

3961 -msgstr "標準輸入以 NUL 字元終止"

4028 +msgstr "stdin 以 NUL 字元終止"

4029

4030 #: builtin/cat-file.c

4031 msgid "read commands from stdin"

3965 -msgstr "從標準輸入讀取命令"

4032 +msgstr "從 stdin 讀取命令"

4033

4034 #: builtin/cat-file.c

4035 msgid "with --batch[-check]: ignores stdin, batches all known objects"

3969 -msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件"

4036 +msgstr "傳入 --batch[-check]：忽略 stdin，批次處理所有已知物件"

4037

4038 #: builtin/cat-file.c

4039 msgid "Change or optimize batch output"

@@ -3978,21 +4045,21 @@ msgstr "緩衝 --batch 的輸出"

4045

4046 #: builtin/cat-file.c

4047 msgid "follow in-tree symlinks"

3981 -msgstr "追蹤樹中的符號連結"

4048 +msgstr "追蹤樹狀物件中的符號連結"

4049

4050 #: builtin/cat-file.c

4051 msgid "do not order objects before emitting them"

3985 -msgstr "不要在輸出物件前排序"

4052 +msgstr "不要在輸出前排序物件"

4053

4054 #: builtin/cat-file.c

4055 msgid ""

4056 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "

4057 "batch)"

3991 -msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）"

4058 +msgstr "轉換或過濾後輸出物件 (blob 或 tree)（單獨或批次處理）"

4059

4060 #: builtin/cat-file.c

4061 msgid "run textconv on object's content"

3995 -msgstr "在物件內容執行 textconv"

4062 +msgstr "對物件內容進行文字轉換 (textconv)"

4063

4064 #: builtin/cat-file.c

4065 msgid "run filters on object's content"

@@ -4009,7 +4076,7 @@ msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”"

4076 #: builtin/cat-file.c

4077 #, c-format

4078 msgid "'%s=<%s>' needs '%s' or '%s'"

4012 -msgstr "「%s=<%s>」需要「%s」或「%s」"

4079 +msgstr "“%s=<%s>” 需要 “%s” 或 “%s”"

4080

4081 #: builtin/cat-file.c

4082 msgid "path|tree-ish"

@@ -4018,12 +4085,12 @@ msgstr "path|tree-ish"

4085 #: builtin/cat-file.c

4086 #, c-format

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

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

4088 +msgstr "“%s” 需要批次處理模式"

4089

4090 #: builtin/cat-file.c

4091 #, c-format

4092 msgid "'-%c' is incompatible with batch mode"

4026 -msgstr "「-%c」與批次處理模式不相容"

4093 +msgstr "“-%c” 與批次處理模式不相容"

4094

4095 #: builtin/cat-file.c

4096 msgid "batch modes take no arguments"

@@ -4032,12 +4099,12 @@ msgstr "批次處理模式不取引數"

4099 #: builtin/cat-file.c

4100 #, c-format

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

4035 -msgstr "<rev> 需要搭配「%s」"

4102 +msgstr "“%s” 需要 <rev>"

4103

4104 #: builtin/cat-file.c

4105 #, c-format

4106 msgid "<object> required with '-%c'"

4040 -msgstr "<object> 需要搭配「-%c」"

4107 +msgstr "“-%c” 需要 <object>"

4108

4109 #: builtin/cat-file.c

4110 #, c-format

@@ -4045,16 +4112,22 @@ msgid "only two arguments allowed in <type> <object> mode, not %d"

4112 msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個"

4113

4114 #: builtin/check-attr.c

4048 -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

4049 -msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."

4115 +msgid ""

4116 +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "

4117 +"<pathname>..."

4118 +msgstr ""

4119 +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "

4120 +"<pathname>..."

4121

4122 #: builtin/check-attr.c

4052 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

4053 -msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"

4123 +msgid ""

4124 +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"

4125 +msgstr ""

4126 +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"

4127

4128 #: builtin/check-attr.c

4129 msgid "report all attributes set on file"

4057 -msgstr "報告設定在檔案上的所有屬性"

4130 +msgstr "回報設定在檔案上的所有屬性"

4131

4132 #: builtin/check-attr.c

4133 msgid "use .gitattributes only from the index"

@@ -4062,11 +4135,19 @@ msgstr "只使用索引中的 .gitattributes"

4135

4136 #: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c

4137 msgid "read file names from stdin"

4065 -msgstr "從標準輸入讀出檔案名"

4138 +msgstr "從 stdin 讀出檔案名稱"

4139

4140 #: builtin/check-attr.c builtin/check-ignore.c

4141 msgid "terminate input and output records by a NUL character"

4069 -msgstr "輸入和輸出的紀錄使用 NUL 字元終結"

4142 +msgstr "輸入和輸出的紀錄使用 NUL 字元終止"

4143 +

4144 +#: builtin/check-attr.c

4145 +msgid "<tree-ish>"

4146 +msgstr "<tree-ish>"

4147 +

4148 +#: builtin/check-attr.c

4149 +msgid "which tree-ish to check attributes at"

4150 +msgstr "要用哪一個樹狀物件檢查屬性"

4151

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

4153 msgid "suppress progress reporting"

@@ -4074,7 +4155,7 @@ msgstr "不顯示進度報告"

4155

4156 #: builtin/check-ignore.c

4157 msgid "show non-matching input paths"

4077 -msgstr "顯示未符合的輸入路徑"

4158 +msgstr "顯示不符合的輸入路徑"

4159

4160 #: builtin/check-ignore.c

4161 msgid "ignore index when checking"

@@ -4082,11 +4163,11 @@ msgstr "檢查時忽略索引"

4163

4164 #: builtin/check-ignore.c

4165 msgid "cannot specify pathnames with --stdin"

4085 -msgstr "不能同時指定路徑及 --stdin 參數"

4166 +msgstr "無法同時指定路徑名稱及 --stdin"

4167

4168 #: builtin/check-ignore.c

4169 msgid "-z only makes sense with --stdin"

4089 -msgstr "-z 需要和 --stdin 參數共用才有意義"

4170 +msgstr "-z 需要和 --stdin 同時使用才有意義"

4171

4172 #: builtin/check-ignore.c

4173 msgid "no path specified"

@@ -4094,11 +4175,11 @@ msgstr "未指定路徑"

4175

4176 #: builtin/check-ignore.c

4177 msgid "--quiet is only valid with a single pathname"

4097 -msgstr "參數 --quiet 只在提供一個路徑名時有效"

4178 +msgstr "引數 --quiet 只在提供一個路徑名稱時有效"

4179

4180 #: builtin/check-ignore.c

4181 msgid "cannot have both --quiet and --verbose"

4101 -msgstr "不能同時提供 --quiet 和 --verbose 參數"

4182 +msgstr "無法同時傳入 --quiet 和 --verbose"

4183

4184 #: builtin/check-ignore.c

4185 msgid "--non-matching is only valid with --verbose"

@@ -4106,41 +4187,41 @@ msgstr "--non-matching 選項只在使用 --verbose 時有效"

4187

4188 #: builtin/check-mailmap.c

4189 msgid "git check-mailmap [<options>] <contact>..."

4109 -msgstr "git check-mailmap [<選項>] <聯繫位址>..."

4190 +msgstr "git check-mailmap [<options>] <contact>..."

4191

4192 #: builtin/check-mailmap.c

4193 msgid "also read contacts from stdin"

4113 -msgstr "還從標準輸入讀取聯繫位址"

4194 +msgstr "亦從 stdin 讀取聯絡地址"

4195

4196 #: builtin/check-mailmap.c

4197 #, c-format

4198 msgid "unable to parse contact: %s"

4118 -msgstr "不能解析聯繫位址：%s"

4199 +msgstr "無法解析聯絡地址：%s"

4200

4201 #: builtin/check-mailmap.c

4202 msgid "no contacts specified"

4122 -msgstr "未指定聯繫位址"

4203 +msgstr "未指定聯絡地址"

4204

4205 #: builtin/checkout--worker.c

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

4126 -msgstr "git checkout--worker [<選項>]"

4207 +msgstr "git checkout--worker [<options>]"

4208

4209 #: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c

4210 #: builtin/submodule--helper.c builtin/worktree.c

4211 msgid "string"

4131 -msgstr "字串"

4212 +msgstr "string"

4213

4214 #: builtin/checkout--worker.c builtin/checkout-index.c

4215 msgid "when creating files, prepend <string>"

4135 -msgstr "在建立檔案時，在前面加上 <字串>"

4216 +msgstr "建立檔案時，在前面加上 <string>"

4217

4218 #: builtin/checkout-index.c

4219 msgid "git checkout-index [<options>] [--] [<file>...]"

4139 -msgstr "git checkout-index [<選項>] [--] [<檔案>...]"

4220 +msgstr "git checkout-index [<options>] [--] [<file>...]"

4221

4222 #: builtin/checkout-index.c

4223 msgid "stage should be between 1 and 3 or all"

4143 -msgstr "索引值應該取值 1 到 3 或者 all"

4224 +msgstr "stage 應該是 1 到 3 的值，或者是 all"

4225

4226 #: builtin/checkout-index.c

4227 msgid "check out all files in the index"

@@ -4164,11 +4245,11 @@ msgstr "不簽出新檔案"

4245

4246 #: builtin/checkout-index.c

4247 msgid "update stat information in the index file"

4167 -msgstr "更新索引中檔案的狀態訊息"

4248 +msgstr "更新索引檔案的狀態訊息"

4249

4250 #: builtin/checkout-index.c

4251 msgid "read list of paths from the standard input"

4171 -msgstr "從標準輸入讀取路徑列表"

4252 +msgstr "從標準輸入讀取路徑清單"

4253

4254 #: builtin/checkout-index.c

4255 msgid "write the content to temporary files"

@@ -4180,49 +4261,49 @@ msgstr "從指定暫存區中拷出檔案"

4261

4262 #: builtin/checkout.c

4263 msgid "git checkout [<options>] <branch>"

4183 -msgstr "git checkout [<選項>] <分支>"

4264 +msgstr "git checkout [<options>] <branch>"

4265

4266 #: builtin/checkout.c

4267 msgid "git checkout [<options>] [<branch>] -- <file>..."

4187 -msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."

4268 +msgstr "git checkout [<options>] [<branch>] -- <file>..."

4269

4270 #: builtin/checkout.c

4271 msgid "git switch [<options>] [<branch>]"

4191 -msgstr "git switch [<選項>] [<分支>]"

4272 +msgstr "git switch [<options>] [<branch>]"

4273

4274 #: builtin/checkout.c

4275 msgid "git restore [<options>] [--source=<branch>] <file>..."

4195 -msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."

4276 +msgstr "git restore [<options>] [--source=<branch>] <file>..."

4277

4278 #: builtin/checkout.c

4279 #, c-format

4280 msgid "path '%s' does not have our version"

4200 -msgstr "路徑 '%s' 沒有我們的版本"

4281 +msgstr "“%s” 路徑沒有我們的版本"

4282

4283 #: builtin/checkout.c

4284 #, c-format

4285 msgid "path '%s' does not have their version"

4205 -msgstr "路徑 '%s' 沒有他們的版本"

4286 +msgstr "“%s” 路徑沒有他們的版本"

4287

4288 #: builtin/checkout.c

4289 #, c-format

4290 msgid "path '%s' does not have all necessary versions"

4210 -msgstr "路徑 '%s' 沒有全部必需的版本"

4291 +msgstr "“%s” 路徑沒有所有必須的版本"

4292

4293 #: builtin/checkout.c

4294 #, c-format

4295 msgid "path '%s' does not have necessary versions"

4215 -msgstr "路徑 '%s' 沒有必需的版本"

4296 +msgstr "“%s” 路徑沒有必須的版本"

4297

4298 #: builtin/checkout.c

4299 #, c-format

4300 msgid "path '%s': cannot merge"

4220 -msgstr "path '%s'：無法合併"

4301 +msgstr "path “%s”：無法合併"

4302

4303 #: builtin/checkout.c

4304 #, c-format

4305 msgid "Unable to add merge result for '%s'"

4225 -msgstr "無法為 '%s' 新增合併結果"

4306 +msgstr "無法為 “%s” 加上合併結果"

4307

4308 #: builtin/checkout.c

4309 #, c-format

@@ -4240,41 +4321,41 @@ msgstr[0] "從 %2$s 更新了 %1$d 個路徑"

4321 #, c-format

4322 msgid "Updated %d path from the index"

4323 msgid_plural "Updated %d paths from the index"

4243 -msgstr[0] "從索引區更新了 %d 個路徑"

4324 +msgstr[0] "已從索引區更新 %d 個路徑"

4325

4326 #: builtin/checkout.c

4327 #, c-format

4328 msgid "'%s' cannot be used with updating paths"

4248 -msgstr "'%s' 不能在更新路徑時使用"

4329 +msgstr "無法在更新路徑時使用 “%s”"

4330

4331 #: builtin/checkout.c

4332 #, c-format

4333 msgid "Cannot update paths and switch to branch '%s' at the same time."

4253 -msgstr "不能同時更新路徑並切換到分支'%s'。"

4334 +msgstr "無法同時更新路徑和切換至 “%s” 分支。"

4335

4336 #: builtin/checkout.c

4337 #, c-format

4338 msgid "neither '%s' or '%s' is specified"

4258 -msgstr "'%s' 或 '%s' 都沒有指定"

4339 +msgstr "“%s” 或 “%s” 皆未指定"

4340

4341 #: builtin/checkout.c

4342 #, c-format

4343 msgid "'%s' must be used when '%s' is not specified"

4263 -msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"

4344 +msgstr "未指定 “%2$s” 時，必須使用 “%1$s”"

4345

4346 #: builtin/checkout.c

4347 #, c-format

4348 msgid "'%s' or '%s' cannot be used with %s"

4268 -msgstr "'%s' 或 '%s' 不能和 %s 一起使用"

4349 +msgstr "“%s” 或 “%s” 無法與 %s 一起使用"

4350

4351 #: builtin/checkout.c

4352 #, c-format

4353 msgid "path '%s' is unmerged"

4273 -msgstr "路徑 '%s' 未合併"

4354 +msgstr "路徑 “%s” 未合併"

4355

4356 #: builtin/checkout.c

4357 msgid "you need to resolve your current index first"

4277 -msgstr "您需要先解決目前索引的衝突"

4358 +msgstr "您需要先解決目前索引區的衝突"

4359

4360 #: builtin/checkout.c

4361 #, c-format

@@ -4282,13 +4363,13 @@ msgid ""

4363 "cannot continue with staged changes in the following files:\n"

4364 "%s"

4365 msgstr ""

4285 -"不能繼續，下列檔案有暫存的修改：\n"

4366 +"無法繼續，下列檔案有暫存的更動：\n"

4367 "%s"

4368

4369 #: builtin/checkout.c

4370 #, c-format

4371 msgid "Can not do reflog for '%s': %s\n"

4291 -msgstr "不能對 '%s' 執行 reflog 動作：%s\n"

4372 +msgstr "無法對 “%s” 執行 reflog 動作：%s\n"

4373

4374 #: builtin/checkout.c

4375 msgid "HEAD is now at"

@@ -4296,38 +4377,38 @@ msgstr "HEAD 目前位於"

4377

4378 #: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c

4379 msgid "unable to update HEAD"

4299 -msgstr "不能更新 HEAD"

4380 +msgstr "無法更新 HEAD"

4381

4382 #: builtin/checkout.c

4383 #, c-format

4384 msgid "Reset branch '%s'\n"

4304 -msgstr "重設分支 '%s'\n"

4385 +msgstr "重設分支 “%s”\n"

4386

4387 #: builtin/checkout.c

4388 #, c-format

4389 msgid "Already on '%s'\n"

4309 -msgstr "已經位於 '%s'\n"

4390 +msgstr "已經位於 “%s”\n"

4391

4392 #: builtin/checkout.c

4393 #, c-format

4394 msgid "Switched to and reset branch '%s'\n"

4314 -msgstr "切換並重設分支 '%s'\n"

4395 +msgstr "已切換並重設分支 “%s”\n"

4396

4397 #: builtin/checkout.c

4398 #, c-format

4399 msgid "Switched to a new branch '%s'\n"

4319 -msgstr "切換到一個新分支 '%s'\n"

4400 +msgstr "已切換至新分支 “%s”\n"

4401

4402 #: builtin/checkout.c

4403 #, c-format

4404 msgid "Switched to branch '%s'\n"

4324 -msgstr "切換到分支 '%s'\n"

4405 +msgstr "已切換至分支 “%s”\n"

4406

4407 # 譯者：請維持前導空格

4408 #: builtin/checkout.c

4409 #, c-format

4410 msgid " ... and %d more.\n"

4330 -msgstr " ... 及其它 %d 個。\n"

4411 +msgstr " …… 及其它 %d 個。\n"

4412

4413 #: builtin/checkout.c

4414 #, c-format

@@ -4342,7 +4423,8 @@ msgid_plural ""

4423 "\n"

4424 "%s\n"

4425 msgstr[0] ""

4345 -"警告：您正丟下 %d 個提交，未和任何分支關聯：\n"

4426 +"警告：您正丟下 %d 個\n"

4427 +"未和任何分支關聯的提交：\n"

4428 "\n"

4429 "%s\n"

4430

@@ -4361,23 +4443,23 @@ msgid_plural ""

4443 " git branch <new-branch-name> %s\n"

4444 "\n"

4445 msgstr[0] ""

4364 -"如果您想要透過建立新分支儲存它，這可能是一個好時候。\n"

4365 -"如下動作：\n"

4446 +"如果您想要透過建立新分支留下這些提交，\n"

4447 +"現在很適合執行：\n"

4448 "\n"

4367 -" git branch <新分支名> %s\n"

4449 +" git branch <新分支名稱> %s\n"

4450 "\n"

4451

4452 #: builtin/checkout.c

4453 msgid "internal error in revision walk"

4372 -msgstr "在版本遍歷時遇到內部錯誤"

4454 +msgstr "在修訂版遍歷時遇到內部錯誤"

4455

4456 #: builtin/checkout.c

4457 msgid "Previous HEAD position was"

4376 -msgstr "之前的 HEAD 位置是"

4458 +msgstr "之前的 HEAD 指針位置在"

4459

4460 #: builtin/checkout.c

4461 msgid "You are on a branch yet to be born"

4380 -msgstr "您位於一個尚未初始化的分支"

4462 +msgstr "您正位於一個尚未初始化的分支"

4463

4464 #: builtin/checkout.c

4465 #, c-format

@@ -4385,7 +4467,7 @@ msgid ""

4467 "'%s' could be both a local file and a tracking branch.\n"

4468 "Please use -- (and optionally --no-guess) to disambiguate"

4469 msgstr ""

4388 -"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"

4470 +"“%s” 既可以是本機檔案，也可以是追蹤分支。\n"

4471 "請使用 --（和可選的 --no-guess）來消除歧義"

4472

4473 #: builtin/checkout.c

@@ -4399,18 +4481,19 @@ msgid ""

4481 "one remote, e.g. the 'origin' remote, consider setting\n"

4482 "checkout.defaultRemote=origin in your config."

4483 msgstr ""

4402 -"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n"

4403 -"使用 --track 選項寫出全名：\n"

4484 +"如果您想要簽出遠端追蹤分支，例如 “origin”，\n"

4485 +"您可以使用 --track 選項寫出全名：\n"

4486 "\n"

4487 " git checkout --track origin/<name>\n"

4488 "\n"

4407 -"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"

4408 -"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"

4489 +"如果您平時比較想要使用模糊的簡短分支名稱 <name>，\n"

4490 +"而不太想寫如 “origin” 的遠端版本庫名稱，\n"

4491 +"可以在組態中設定 checkout.defaultRemote=origin。"

4492

4493 #: builtin/checkout.c

4494 #, c-format

4495 msgid "'%s' matched multiple (%d) remote tracking branches"

4413 -msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"

4496 +msgstr "“%s” 符合多個 (%d) 遠端追蹤分支"

4497

4498 #: builtin/checkout.c

4499 msgid "only one reference expected"

@@ -4419,7 +4502,7 @@ msgstr "預期只有一個引用"

4502 #: builtin/checkout.c

4503 #, c-format

4504 msgid "only one reference expected, %d given."

4422 -msgstr "應只有一個引用，卻提供了 %d 個。"

4505 +msgstr "預期只有一個引用，卻提供了 %d 個。"

4506

4507 #: builtin/checkout.c builtin/worktree.c

4508 #, c-format

@@ -4429,112 +4512,112 @@ msgstr "無效引用：%s"

4512 #: builtin/checkout.c

4513 #, c-format

4514 msgid "reference is not a tree: %s"

4432 -msgstr "引用不是一個樹：%s"

4515 +msgstr "引用不是樹狀物件：%s"

4516

4517 #: builtin/checkout.c

4518 #, c-format

4519 msgid "a branch is expected, got tag '%s'"

4437 -msgstr "期望一個分支，得到標籤 '%s'"

4520 +msgstr "預期收到分支，卻收到標籤 “%s”"

4521

4522 #: builtin/checkout.c

4523 #, c-format

4524 msgid "a branch is expected, got remote branch '%s'"

4442 -msgstr "期望一個分支，得到遠端分支 '%s'"

4525 +msgstr "預期收到分支，卻收到遠端分支 “%s”"

4526

4527 #: builtin/checkout.c

4528 #, c-format

4529 msgid "a branch is expected, got '%s'"

4447 -msgstr "期望一個分支，得到 '%s'"

4530 +msgstr "預期收到分支，卻收到 “%s”"

4531

4532 #: builtin/checkout.c

4533 #, c-format

4534 msgid "a branch is expected, got commit '%s'"

4452 -msgstr "期望一個分支，得到提交 '%s'"

4535 +msgstr "預期收到分支，卻收到提交 “%s”"

4536

4537 #: builtin/checkout.c

4538 msgid ""

4539 "If you want to detach HEAD at the commit, try again with the --detach option."

4457 -msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。"

4540 +msgstr "若您想要在此提交分離 HEAD 指針，請傳入 --detach 選項重試。"

4541

4542 #: builtin/checkout.c

4543 msgid ""

4544 "cannot switch branch while merging\n"

4545 "Consider \"git merge --quit\" or \"git worktree add\"."

4546 msgstr ""

4464 -"不能在合併時切換分支\n"

4465 -"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"

4547 +"無法在合併時切換分支\n"

4548 +"請試試 “git merge --quit” 或 “git worktree add”。"

4549

4550 #: builtin/checkout.c

4551 msgid ""

4552 "cannot switch branch in the middle of an am session\n"

4553 "Consider \"git am --quit\" or \"git worktree add\"."

4554 msgstr ""

4472 -"不能在 am 工作階段期間切換分支\n"

4473 -"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"

4555 +"無法在 am 工作階段期間時切換分支\n"

4556 +"請試試 “git am --quit” 或 “git worktree add”。"

4557

4558 #: builtin/checkout.c

4559 msgid ""

4560 "cannot switch branch while rebasing\n"

4561 "Consider \"git rebase --quit\" or \"git worktree add\"."

4562 msgstr ""

4480 -"不能在重定基底時切換分支\n"

4481 -"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"

4563 +"無法在重定基底時切換分支\n"

4564 +"請試試 “git rebase --quit” 或 “git worktree add”。"

4565

4566 #: builtin/checkout.c

4567 msgid ""

4568 "cannot switch branch while cherry-picking\n"

4569 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

4570 msgstr ""

4488 -"不能在揀選時切換分支\n"

4489 -"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"

4571 +"無法在揀選時切換分支\n"

4572 +"請試試 “git cherry-pick --quit” 或 “git worktree add”。"

4573

4574 #: builtin/checkout.c

4575 msgid ""

4576 "cannot switch branch while reverting\n"

4577 "Consider \"git revert --quit\" or \"git worktree add\"."

4578 msgstr ""

4496 -"不能在還原時切換分支\n"

4497 -"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"

4579 +"無法在還原時切換分支\n"

4580 +"請試試 “git revert --quit” 或 “git worktree add”。"

4581

4582 #: builtin/checkout.c

4583 msgid "you are switching branch while bisecting"

4501 -msgstr "您在執行二分搜尋時切換分支"

4584 +msgstr "您在進行二分搜尋時切換分支"

4585

4586 #: builtin/checkout.c

4587 msgid "paths cannot be used with switching branches"

4505 -msgstr "路徑不能和切換分支同時使用"

4588 +msgstr "路徑不能與切換分支同時使用"

4589

4590 #: builtin/checkout.c

4591 #, c-format

4592 msgid "'%s' cannot be used with switching branches"

4510 -msgstr "'%s' 不能和切換分支同時使用"

4593 +msgstr "“%s” 不能與切換分支同時使用"

4594

4595 #: builtin/checkout.c

4596 #, c-format

4597 msgid "'%s' cannot be used with '%s'"

4515 -msgstr "'%s' 不能和 '%s' 同時使用"

4598 +msgstr "“%s” 不能與 “%s” 同時使用"

4599

4600 #: builtin/checkout.c

4601 #, c-format

4602 msgid "'%s' cannot take <start-point>"

4520 -msgstr "'%s' 不帶 <起始點>"

4603 +msgstr "“%s” 不取 <start-point>"

4604

4605 #: builtin/checkout.c

4606 #, c-format

4607 msgid "Cannot switch branch to a non-commit '%s'"

4525 -msgstr "不能切換分支到一個非提交 '%s'"

4608 +msgstr "無法將分支切換至非提交項目 “%s”"

4609

4610 #: builtin/checkout.c

4611 msgid "missing branch or commit argument"

4529 -msgstr "缺少分支或提交參數"

4612 +msgstr "缺少分支或提交引數"

4613

4614 #: builtin/checkout.c

4615 msgid "perform a 3-way merge with the new branch"

4533 -msgstr "和新的分支執行三方合併"

4616 +msgstr "和新分支進行三方合併"

4617

4618 #: builtin/checkout.c builtin/log.c parse-options.h

4619 msgid "style"

4537 -msgstr "風格"

4620 +msgstr "style"

4621

4622 #: builtin/checkout.c

4623 msgid "conflict style (merge, diff3, or zdiff3)"

@@ -4542,7 +4625,7 @@ msgstr "衝突輸出風格（merge、diff3 或 zdiff3）"

4625

4626 #: builtin/checkout.c builtin/worktree.c

4627 msgid "detach HEAD at named commit"

4545 -msgstr "HEAD 從指定的提交分離"

4628 +msgstr "自指定提交分離 HEAD 指針"

4629

4630 #: builtin/checkout.c

4631 msgid "force checkout (throw away local modifications)"

@@ -4550,19 +4633,19 @@ msgstr "強制簽出（捨棄本機修改）"

4633

4634 #: builtin/checkout.c

4635 msgid "new-branch"

4553 -msgstr "新分支"

4636 +msgstr "new-branch"

4637

4638 #: builtin/checkout.c

4639 msgid "new unparented branch"

4557 -msgstr "新的沒有父提交的分支"

4640 +msgstr "新的，沒有父提交的分支"

4641

4642 #: builtin/checkout.c builtin/merge.c

4643 msgid "update ignored files (default)"

4561 -msgstr "更新忽略的檔案（預設）"

4644 +msgstr "更新忽略的檔案（預設值）"

4645

4646 #: builtin/checkout.c

4647 msgid "do not check if another worktree is holding the given ref"

4565 -msgstr "不檢查指定的引用是否被其他工作區所占用"

4648 +msgstr "不檢查其他工作區是否正在佔用指定的引用"

4649

4650 #: builtin/checkout.c

4651 msgid "checkout our version for unmerged files"

@@ -4574,16 +4657,16 @@ msgstr "對尚未合併的檔案簽出他們的版本"

4657

4658 #: builtin/checkout.c

4659 msgid "do not limit pathspecs to sparse entries only"

4577 -msgstr "對路徑不做稀疏簽出的限制"

4660 +msgstr "對路徑規格不做稀疏簽出的限制"

4661

4662 #: builtin/checkout.c

4663 #, c-format

4664 msgid "options '-%c', '-%c', and '%s' cannot be used together"

4582 -msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"

4665 +msgstr "“-%c”、“-%c” 和 “%s” 選項不得同時使用"

4666

4667 #: builtin/checkout.c

4668 msgid "--track needs a branch name"

4586 -msgstr "--track 需要一個分支名"

4669 +msgstr "--track 需要分支名稱"

4670

4671 #: builtin/checkout.c

4672 #, c-format

@@ -4602,60 +4685,61 @@ msgstr "無效的路徑規格"

4685 #: builtin/checkout.c

4686 #, c-format

4687 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

4605 -msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"

4688 +msgstr "“%s” 不是提交，因此不能以這為基礎建立 “%s” 分支"

4689

4690 #: builtin/checkout.c

4691 #, c-format

4692 msgid "git checkout: --detach does not take a path argument '%s'"

4610 -msgstr "git checkout：--detach 不能接收路徑參數 '%s'"

4693 +msgstr "git checkout：--detach 不取路徑引數 “%s”"

4694

4695 #: builtin/checkout.c

4696 msgid ""

4697 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4698 "checking out of the index."

4699 msgstr ""

4617 -"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"

4700 +"git checkout：在從索引簽出時，--ours/--theirs、--force\n"

4701 +"和 --merge 不相容。"

4702

4703 #: builtin/checkout.c

4704 msgid "you must specify path(s) to restore"

4621 -msgstr "您必須指定一個要復原的路徑"

4705 +msgstr "您必須指定要還原的路徑"

4706

4707 #: builtin/checkout.c builtin/clone.c builtin/remote.c

4708 #: builtin/submodule--helper.c builtin/worktree.c

4709 msgid "branch"

4626 -msgstr "分支"

4710 +msgstr "branch"

4711

4712 #: builtin/checkout.c

4713 msgid "create and checkout a new branch"

4630 -msgstr "建立並簽出一個新的分支"

4714 +msgstr "建立並簽出新分支"

4715

4716 #: builtin/checkout.c

4717 msgid "create/reset and checkout a branch"

4634 -msgstr "建立/重設並簽出一個分支"

4718 +msgstr "建立/重設並簽出分支"

4719

4720 #: builtin/checkout.c

4721 msgid "create reflog for new branch"

4638 -msgstr "為新的分支建立引用日誌"

4722 +msgstr "為新分支建立引用日誌"

4723

4724 #: builtin/checkout.c

4725 msgid "second guess 'git checkout <no-such-branch>' (default)"

4642 -msgstr "二次猜測 'git checkout <無此分支>'（預設）"

4726 +msgstr "二次猜測 “git checkout <無此分支>”（預設值）"

4727

4728 #: builtin/checkout.c

4729 msgid "use overlay mode (default)"

4646 -msgstr "使用疊加模式（預設）"

4730 +msgstr "使用疊加模式（預設值）"

4731

4732 #: builtin/checkout.c

4733 msgid "create and switch to a new branch"

4650 -msgstr "建立並切換一個新分支"

4734 +msgstr "建立並切換至新分支"

4735

4736 #: builtin/checkout.c

4737 msgid "create/reset and switch to a branch"

4654 -msgstr "建立/重設並切換一個分支"

4738 +msgstr "建立/重設並切換至指定分支"

4739

4740 #: builtin/checkout.c

4741 msgid "second guess 'git switch <no-such-branch>'"

4658 -msgstr "二次猜測 'git switch <無此分支>'"

4742 +msgstr "二次猜測 “git switch <無此分支>”"

4743

4744 #: builtin/checkout.c

4745 msgid "throw away local modifications"

@@ -4663,19 +4747,19 @@ msgstr "捨棄本機修改"

4747

4748 #: builtin/checkout.c

4749 msgid "which tree-ish to checkout from"

4666 -msgstr "要簽出哪一個樹"

4750 +msgstr "要自哪一個樹狀物件指示元簽出"

4751

4752 #: builtin/checkout.c

4753 msgid "restore the index"

4670 -msgstr "復原索引"

4754 +msgstr "還原索引"

4755

4756 #: builtin/checkout.c

4757 msgid "restore the working tree (default)"

4674 -msgstr "復原工作區（預設）"

4758 +msgstr "還原工作區（預設值）"

4759

4760 #: builtin/checkout.c

4761 msgid "ignore unmerged entries"

4678 -msgstr "忽略未合併條目"

4762 +msgstr "忽略未合併項目"

4763

4764 #: builtin/checkout.c

4765 msgid "use overlay mode"

@@ -4686,17 +4770,18 @@ msgid ""

4770 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "

4771 "[<pathspec>...]"

4772 msgstr ""

4689 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路徑規格>...]"

4773 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "

4774 +"[<pathspec>...]"

4775

4776 #: builtin/clean.c

4777 #, c-format

4778 msgid "Removing %s\n"

4694 -msgstr "正刪除 %s\n"

4779 +msgstr "正在刪除 %s\n"

4780

4781 #: builtin/clean.c

4782 #, c-format

4783 msgid "Would remove %s\n"

4699 -msgstr "將刪除 %s\n"

4784 +msgstr "將會刪除 %s\n"

4785

4786 #: builtin/clean.c

4787 #, c-format

@@ -4711,12 +4796,12 @@ msgstr "將忽略版本庫 %s\n"

4796 #: builtin/clean.c midx.c

4797 #, c-format

4798 msgid "failed to remove %s"

4714 -msgstr "刪除 %s 失敗"

4799 +msgstr "無法移除 %s"

4800

4801 #: builtin/clean.c

4802 #, c-format

4803 msgid "could not lstat %s\n"

4719 -msgstr "不能對 %s 呼叫 lstat\n"

4804 +msgstr "不能對 %s 進行 lstat\n"

4805

4806 #: builtin/clean.c

4807 msgid "Refusing to remove current working directory\n"

@@ -4726,7 +4811,7 @@ msgstr "拒絕移除目前工作目錄\n"

4811 msgid "Would refuse to remove current working directory\n"

4812 msgstr "會拒絕移除目前的工作目錄\n"

4813

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

4814 +#: builtin/clean.c

4815 #, c-format

4816 msgid ""

4817 "Prompt help:\n"

@@ -4734,12 +4819,12 @@ msgid ""

4819 "foo - select item based on unique prefix\n"

4820 " - (empty) select nothing\n"

4821 msgstr ""

4737 -"協助：\n"

4738 -"1 - 透過編號選擇一個選項\n"

4739 -"foo - 透過唯一前綴選擇一個選項\n"

4822 +"提示說明：\n"

4823 +"1 - 透過編號選擇項目\n"

4824 +"foo - 根據獨特前綴選擇項目\n"

4825 " - （空）什麼也不選擇\n"

4826

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

4827 +#: builtin/clean.c

4828 #, c-format

4829 msgid ""

4830 "Prompt help:\n"

@@ -4751,39 +4836,39 @@ msgid ""

4836 "* - choose all items\n"

4837 " - (empty) finish selecting\n"

4838 msgstr ""

4754 -"協助：\n"

4755 -"1 - 選擇一個選項\n"

4756 -"3-5 - 選擇一個範圍內的所有選項\n"

4757 -"2-3,6-9 - 選擇多個範圍內的所有選項\n"

4758 -"foo - 透過唯一前綴選擇一個選項\n"

4759 -"-... - 反選特定的選項\n"

4760 -"* - 選擇所有選項\n"

4761 -" - （空）結束選擇\n"

4762 -

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

4764 -#, c-format, perl-format

4839 +"提示說明：\n"

4840 +"1 - 選擇一個項目\n"

4841 +"3-5 - 選擇一個項目範圍\n"

4842 +"2-3,6-9 - 選擇多個項目範圍\n"

4843 +"foo - 根據獨特前綴選擇項目\n"

4844 +"-... - 取消選取指定項目\n"

4845 +"* - 選擇所有項目\n"

4846 +" - （空）完成選擇\n"

4847 +

4848 +#: builtin/clean.c

4849 +#, c-format

4850 msgid "Huh (%s)?\n"

4766 -msgstr "嗯（%s）？\n"

4851 +msgstr "嗯（%s）?\n"

4852

4853 #: builtin/clean.c

4854 #, c-format

4855 msgid "Input ignore patterns>> "

4771 -msgstr "輸入範本以排除條目>> "

4856 +msgstr "輸入要忽略的模式項目>> "

4857

4858 #: builtin/clean.c

4859 #, c-format

4860 msgid "WARNING: Cannot find items matched by: %s"

4776 -msgstr "警告：無法找到和 %s 符合的條目"

4861 +msgstr "警告：無法找到和 %s 符合的項目"

4862

4863 #: builtin/clean.c

4864 msgid "Select items to delete"

4780 -msgstr "選擇要刪除的條目"

4865 +msgstr "選擇要刪除的項目"

4866

4867 #. TRANSLATORS: Make sure to keep [y/N] as is

4868 #: builtin/clean.c

4869 #, c-format

4870 msgid "Remove %s [y/N]? "

4786 -msgstr "移除 %s [y/N]？ "

4871 +msgstr "移除 %s [y/N]? "

4872

4873 #: builtin/clean.c

4874 msgid ""

@@ -4798,15 +4883,15 @@ msgstr ""

4883 "clean - 開始清理\n"

4884 "filter by pattern - 透過範本排除要刪除的條目\n"

4885 "select by numbers - 透過數字選擇要刪除的條目\n"

4801 -"ask each - 針對刪除逐一詢問（就像 \"rm -i\"）\n"

4886 +"ask each - 針對刪除逐一詢問（就像 “rm -i”）\n"

4887 "quit - 停止刪除並離開\n"

4803 -"help - 顯示本協助\n"

4804 -"? - 顯示如何在提示符下選擇的協助"

4888 +"help - 顯示本輔助說明\n"

4889 +"? - 顯示如何在提示下選擇的協助"

4890

4891 #: builtin/clean.c

4892 msgid "Would remove the following item:"

4893 msgid_plural "Would remove the following items:"

4809 -msgstr[0] "將刪除如下條目："

4894 +msgstr[0] "將移除以下項目："

4895

4896 #: builtin/clean.c

4897 msgid "No more files to clean, exiting."

@@ -4814,11 +4899,11 @@ msgstr "沒有要清理的檔案，離開。"

4899

4900 #: builtin/clean.c

4901 msgid "do not print names of files removed"

4817 -msgstr "不列印刪除檔案的名稱"

4902 +msgstr "不輸出移除的檔案的名稱"

4903

4904 #: builtin/clean.c

4905 msgid "force"

4821 -msgstr "強制"

4906 +msgstr "force"

4907

4908 #: builtin/clean.c

4909 msgid "interactive cleaning"

@@ -4826,24 +4911,24 @@ msgstr "互動式清除"

4911

4912 #: builtin/clean.c

4913 msgid "remove whole directories"

4829 -msgstr "刪除整個目錄"

4914 +msgstr "移除整個目錄"

4915

4916 #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c

4917 #: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c

4918 msgid "pattern"

4834 -msgstr "模式"

4919 +msgstr "pattern"

4920

4921 #: builtin/clean.c

4922 msgid "add <pattern> to ignore rules"

4838 -msgstr "新增 <模式> 到忽略規則"

4923 +msgstr "將 <pattern> 加到忽略規則"

4924

4925 #: builtin/clean.c

4926 msgid "remove ignored files, too"

4842 -msgstr "也刪除忽略的檔案"

4927 +msgstr "亦移除忽略的檔案"

4928

4929 #: builtin/clean.c

4930 msgid "remove only ignored files"

4846 -msgstr "只刪除忽略的檔案"

4931 +msgstr "只移除忽略的檔案"

4932

4933 #: builtin/clean.c

4934 msgid ""

@@ -4865,23 +4950,23 @@ msgstr "-x 和 -X 不能同時使用"

4950

4951 #: builtin/clone.c

4952 msgid "git clone [<options>] [--] <repo> [<dir>]"

4868 -msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"

4953 +msgstr "git clone [<options>] [--] <repo> [<dir>]"

4954

4955 #: builtin/clone.c

4956 msgid "don't clone shallow repository"

4872 -msgstr "不要複製淺版本庫"

4957 +msgstr "不要複製淺層版本庫"

4958

4959 #: builtin/clone.c

4960 msgid "don't create a checkout"

4876 -msgstr "不建立一個簽出"

4961 +msgstr "不要建立簽出"

4962

4963 #: builtin/clone.c builtin/init-db.c

4964 msgid "create a bare repository"

4880 -msgstr "建立一個純版本庫"

4965 +msgstr "建立裸版本庫"

4966

4967 #: builtin/clone.c

4968 msgid "create a mirror repository (implies bare)"

4884 -msgstr "建立一個鏡像版本庫（也是純版本庫）"

4969 +msgstr "建立鏡像版本庫（亦即裸版本庫）"

4970

4971 #: builtin/clone.c

4972 msgid "to clone from a local repository"

@@ -4889,7 +4974,7 @@ msgstr "從本機版本庫複製"

4974

4975 #: builtin/clone.c

4976 msgid "don't use local hardlinks, always copy"

4892 -msgstr "不使用本機硬連結，始終複製"

4977 +msgstr "不使用本機硬連結，始終拷貝"

4978

4979 #: builtin/clone.c

4980 msgid "setup as shared repository"

@@ -4905,15 +4990,15 @@ msgstr "在複製時初始化子模組"

4990

4991 #: builtin/clone.c

4992 msgid "number of submodules cloned in parallel"

4908 -msgstr "並行複製的子模組數"

4993 +msgstr "平行複製的子模組數量"

4994

4995 #: builtin/clone.c builtin/init-db.c

4996 msgid "template-directory"

4912 -msgstr "範本目錄"

4997 +msgstr "模板目錄"

4998

4999 #: builtin/clone.c builtin/init-db.c

5000 msgid "directory from which templates will be used"

4916 -msgstr "範本目錄將被使用"

5001 +msgstr "將被使用的模板目錄"

5002

5003 #: builtin/clone.c builtin/submodule--helper.c

5004 msgid "reference repository"

@@ -4921,21 +5006,21 @@ msgstr "引用版本庫"

5006

5007 #: builtin/clone.c builtin/submodule--helper.c

5008 msgid "use --reference only while cloning"

4924 -msgstr "僅在複製時參考 --reference 指向的本機版本庫"

5009 +msgstr "僅在複製時使用 --reference"

5010

5011 #: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c

5012 #: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c

5013 #: builtin/submodule--helper.c t/helper/test-simple-ipc.c

5014 msgid "name"

4930 -msgstr "名稱"

5015 +msgstr "name"

5016

5017 #: builtin/clone.c

5018 msgid "use <name> instead of 'origin' to track upstream"

4934 -msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"

5019 +msgstr "使用 <name> 而不是 “origin” 追蹤上游"

5020

5021 #: builtin/clone.c

5022 msgid "checkout <branch> instead of the remote's HEAD"

4938 -msgstr "簽出 <分支> 而不是遠端 HEAD"

5023 +msgstr "簽出 <branch> 而不是遠端 HEAD"

5024

5025 #: builtin/clone.c

5026 msgid "path to git-upload-pack on the remote"

@@ -4943,27 +5028,23 @@ msgstr "遠端 git-upload-pack 路徑"

5028

5029 #: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c

5030 msgid "depth"

4946 -msgstr "深度"

5031 +msgstr "depth"

5032

5033 #: builtin/clone.c

5034 msgid "create a shallow clone of that depth"

4950 -msgstr "建立一個指定深度的淺複製"

4951 -

4952 -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c

4953 -msgid "time"

4954 -msgstr "時間"

5035 +msgstr "建立指定深度的淺層複製"

5036

5037 #: builtin/clone.c

5038 msgid "create a shallow clone since a specific time"

4958 -msgstr "建立從指定時間到現在的淺複製"

5039 +msgstr "建立從指定時間到現在的淺層複製"

5040

5041 #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c

5042 msgid "revision"

4962 -msgstr "修訂版"

5043 +msgstr "revision"

5044

5045 #: builtin/clone.c builtin/fetch.c builtin/pull.c

5046 msgid "deepen history of shallow clone, excluding rev"

4966 -msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"

5047 +msgstr "取得更多淺層複製的過去歷史記錄，除了特定修訂版"

5048

5049 #: builtin/clone.c builtin/submodule--helper.c

5050 msgid "clone only one branch, HEAD or --branch"

@@ -4979,11 +5060,11 @@ msgstr "子模組將以淺下載模式複製"

5060

5061 #: builtin/clone.c builtin/init-db.c

5062 msgid "gitdir"

4982 -msgstr "git目錄"

5063 +msgstr "gitdir"

5064

5065 #: builtin/clone.c builtin/init-db.c

5066 msgid "separate git dir from working tree"

4986 -msgstr "git目錄和工作區分離"

5067 +msgstr "git 目錄和工作區分離"

5068

5069 #: builtin/clone.c

5070 msgid "key=value"

@@ -5046,6 +5127,11 @@ msgstr "對 '%s' 呼叫 stat 失敗"

5127 msgid "%s exists and is not a directory"

5128 msgstr "%s 存在且不是一個目錄"

5129

5130 +#: builtin/clone.c

5131 +#, c-format

5132 +msgid "'%s' is a symlink, refusing to clone with --local"

5133 +msgstr "“%s” 是個符號連結，故不能使用 --local 複製"

5134 +

5135 #: builtin/clone.c

5136 #, c-format

5137 msgid "failed to start iterator over '%s'"

@@ -5059,7 +5145,7 @@ msgstr "「%s」符號連結已存在，拒絕使用 --local 複製"

5145 #: builtin/clone.c compat/precompose_utf8.c

5146 #, c-format

5147 msgid "failed to unlink '%s'"

5062 -msgstr "刪除 '%s' 失敗"

5148 +msgstr "無法刪除 “%s”"

5149

5150 #: builtin/clone.c

5151 #, c-format

@@ -5127,7 +5213,7 @@ msgstr "無法執行 repack 來清理"

5213

5214 #: builtin/clone.c

5215 msgid "cannot unlink temporary alternates file"

5130 -msgstr "無法刪除暫時的 alternates 檔案"

5216 +msgstr "無法刪除暫存 alternates 檔案"

5217

5218 #: builtin/clone.c

5219 msgid "Too many arguments."

@@ -5240,6 +5326,10 @@ msgstr "無法初始化版本庫，略過套件包 URI"

5326 msgid "failed to fetch objects from bundle URI '%s'"

5327 msgstr "無法從套件包 URL “%s” 抓取物件"

5328

5329 +#: builtin/clone.c

5330 +msgid "failed to fetch advertised bundles"

5331 +msgstr "無法抓取公佈的套件包"

5332 +

5333 #: builtin/clone.c

5334 msgid "remote transport reported error"

5335 msgstr "遠端傳輸回報錯誤"

@@ -5609,7 +5699,7 @@ msgid ""

5699 "in the current commit message"

5700 msgstr "無法選擇一個未被目前提交說明使用的備註字元"

5701

5612 -#: builtin/commit.c

5702 +#: builtin/commit.c builtin/merge-tree.c

5703 #, c-format

5704 msgid "could not lookup commit %s"

5705 msgstr "不能查詢提交 %s"

@@ -5834,13 +5924,13 @@ msgstr "計算完整的領先/落後值"

5924 msgid "version"

5925 msgstr "版本"

5926

5837 -#: builtin/commit.c builtin/push.c builtin/worktree.c

5927 +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c

5928 msgid "machine-readable output"

5929 msgstr "機器可讀的輸出"

5930

5931 #: builtin/commit.c

5932 msgid "show status in long format (default)"

5843 -msgstr "以長格式顯示狀態（預設）"

5933 +msgstr "以長格式顯示狀態（預設值）"

5934

5935 #: builtin/commit.c

5936 msgid "terminate entries with NUL"

@@ -5917,7 +6007,7 @@ msgstr "日期"

6007 msgid "override date for commit"

6008 msgstr "提交時覆蓋日期"

6009

5920 -#: builtin/commit.c parse-options.h ref-filter.h

6010 +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h

6011 msgid "commit"

6012 msgstr "提交"

6013

@@ -6068,7 +6158,7 @@ msgstr ""

6158 msgid "git config [<options>]"

6159 msgstr "git config [<選項>]"

6160

6071 -#: builtin/config.c builtin/env--helper.c

6161 +#: builtin/config.c

6162 #, c-format

6163 msgid "unrecognized --type argument, %s"

6164 msgstr "無法識別的 --type 參數，%s"

@@ -6167,7 +6257,7 @@ msgstr "開啟一個編輯器"

6257

6258 #: builtin/config.c

6259 msgid "find the color configured: slot [default]"

6170 -msgstr "獲得設定的顏色：設定 [預設]"

6260 +msgstr "獲得設定的顏色：設定 [預設值]"

6261

6262 #: builtin/config.c

6263 msgid "find the color setting: slot [stdout-is-tty]"

@@ -6177,11 +6267,11 @@ msgstr "獲得顏色設定：設定 [stdout-is-tty]"

6267 msgid "Type"

6268 msgstr "類型"

6269

6180 -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c

6270 +#: builtin/config.c builtin/hash-object.c

6271 msgid "type"

6272 msgstr "類型"

6273

6184 -#: builtin/config.c builtin/env--helper.c

6274 +#: builtin/config.c

6275 msgid "value is given this type"

6276 msgstr "取值為該類型"

6277

@@ -6235,7 +6325,7 @@ msgstr ""

6325 "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"

6326 "令 command)"

6327

6238 -#: builtin/config.c builtin/env--helper.c

6328 +#: builtin/config.c

6329 msgid "value"

6330 msgstr "取值"

6331

@@ -6770,30 +6860,6 @@ msgstr "沒有為 --tool=<工具> 參數提供 <工具>"

6860 msgid "no <cmd> given for --extcmd=<cmd>"

6861 msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"

6862

6773 -#: builtin/env--helper.c

6774 -msgid "git env--helper --type=[bool|ulong] <options> <env-var>"

6775 -msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"

6776 -

6777 -#: builtin/env--helper.c

6778 -msgid "default for git_env_*(...) to fall back on"

6779 -msgstr "git_env_*(...) 的預設值"

6780 -

6781 -#: builtin/env--helper.c

6782 -msgid "be quiet only use git_env_*() value as exit code"

6783 -msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼"

6784 -

6785 -#: builtin/env--helper.c

6786 -#, c-format

6787 -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"

6788 -msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」"

6789 -

6790 -#: builtin/env--helper.c

6791 -#, c-format

6792 -msgid ""

6793 -"option `--default' expects an unsigned long value with `--type=ulong`, not "

6794 -"`%s`"

6795 -msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"

6796 -

6863 #: builtin/fast-export.c

6864 msgid "git fast-export [<rev-list-opts>]"

6865 msgstr "git fast-export [<rev-list-opts>]"

@@ -6936,144 +7002,14 @@ msgstr "git fetch --all [<選項>]"

7002 msgid "fetch.parallel cannot be negative"

7003 msgstr "fetch.parallel 不能為負數"

7004

6939 -#: builtin/fetch.c builtin/pull.c

6940 -msgid "fetch from all remotes"

6941 -msgstr "從所有的遠端抓取"

6942 -

6943 -#: builtin/fetch.c builtin/pull.c

6944 -msgid "set upstream for git pull/fetch"

6945 -msgstr "為 git pull/fetch 設定上游"

6946 -

6947 -#: builtin/fetch.c builtin/pull.c

6948 -msgid "append to .git/FETCH_HEAD instead of overwriting"

6949 -msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"

6950 -

7005 #: builtin/fetch.c

6952 -msgid "use atomic transaction to update references"

6953 -msgstr "使用 atomic 事務更新引用"

6954 -

6955 -#: builtin/fetch.c builtin/pull.c

6956 -msgid "path to upload pack on remote end"

6957 -msgstr "上傳包到遠端的路徑"

7006 +msgid "couldn't find remote ref HEAD"

7007 +msgstr "找不到遠端 HEAD 引用"

7008

7009 #: builtin/fetch.c

6960 -msgid "force overwrite of local reference"

6961 -msgstr "強制覆蓋本機引用"

6962 -

6963 -#: builtin/fetch.c

6964 -msgid "fetch from multiple remotes"

6965 -msgstr "從多個遠端抓取"

6966 -

6967 -#: builtin/fetch.c builtin/pull.c

6968 -msgid "fetch all tags and associated objects"

6969 -msgstr "抓取所有的標籤和關聯物件"

6970 -

6971 -#: builtin/fetch.c

6972 -msgid "do not fetch all tags (--no-tags)"

6973 -msgstr "不抓取任何標籤(--no-tags)"

6974 -

6975 -#: builtin/fetch.c

6976 -msgid "number of submodules fetched in parallel"

6977 -msgstr "並行取得的子模組數量"

6978 -

6979 -#: builtin/fetch.c

6980 -msgid "modify the refspec to place all refs within refs/prefetch/"

6981 -msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"

6982 -

6983 -#: builtin/fetch.c builtin/pull.c

6984 -msgid "prune remote-tracking branches no longer on remote"

6985 -msgstr "清除遠端已經不存在的分支的追蹤分支"

6986 -

6987 -#: builtin/fetch.c

6988 -msgid "prune local tags no longer on remote and clobber changed tags"

6989 -msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"

6990 -

6991 -# 譯者：可選值，不能翻譯

6992 -#: builtin/fetch.c builtin/pull.c

6993 -msgid "on-demand"

6994 -msgstr "on-demand"

6995 -

6996 -#: builtin/fetch.c

6997 -msgid "control recursive fetching of submodules"

6998 -msgstr "控制子模組的遞迴抓取"

6999 -

7000 -#: builtin/fetch.c

7001 -msgid "write fetched references to the FETCH_HEAD file"

7002 -msgstr "將取得的引用寫入 FETCH_HEAD 檔案"

7003 -

7004 -#: builtin/fetch.c builtin/pull.c

7005 -msgid "keep downloaded pack"

7006 -msgstr "保持下載包"

7007 -

7008 -#: builtin/fetch.c

7009 -msgid "allow updating of HEAD ref"

7010 -msgstr "允許更新 HEAD 引用"

7011 -

7012 -#: builtin/fetch.c builtin/pull.c

7013 -msgid "deepen history of shallow clone"

7014 -msgstr "取得淺複製的更多過去歷史記錄"

7015 -

7016 -#: builtin/fetch.c builtin/pull.c

7017 -msgid "deepen history of shallow repository based on time"

7018 -msgstr "基於時間來深化淺複製的歷史"

7019 -

7020 -#: builtin/fetch.c builtin/pull.c

7021 -msgid "convert to a complete repository"

7022 -msgstr "轉換為一個完整的版本庫"

7023 -

7024 -#: builtin/fetch.c

7025 -msgid "re-fetch without negotiating common commits"

7026 -msgstr "重新抓取而不協商共同提交"

7027 -

7028 -#: builtin/fetch.c

7029 -msgid "prepend this to submodule path output"

7030 -msgstr "在子模組路徑輸出的前面加上此目錄"

7031 -

7032 -#: builtin/fetch.c

7033 -msgid ""

7034 -"default for recursive fetching of submodules (lower priority than config "

7035 -"files)"

7036 -msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"

7037 -

7038 -#: builtin/fetch.c builtin/pull.c

7039 -msgid "accept refs that update .git/shallow"

7040 -msgstr "接受更新 .git/shallow 的引用"

7041 -

7042 -#: builtin/fetch.c builtin/pull.c

7043 -msgid "refmap"

7044 -msgstr "引用映射"

7045 -

7046 -#: builtin/fetch.c builtin/pull.c

7047 -msgid "specify fetch refmap"

7048 -msgstr "指定取得動作的引用映射"

7049 -

7050 -#: builtin/fetch.c builtin/pull.c

7051 -msgid "report that we have only objects reachable from this object"

7052 -msgstr "報告我們只擁有從該物件開始可以取得的物件"

7053 -

7054 -#: builtin/fetch.c

7055 -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

7056 -msgstr "不取得 packfile，而是輸出協商的祖先提交"

7057 -

7058 -#: builtin/fetch.c

7059 -msgid "run 'maintenance --auto' after fetching"

7060 -msgstr "取得 (fetch) 後執行 'maintenance --auto'"

7061 -

7062 -#: builtin/fetch.c builtin/pull.c

7063 -msgid "check for forced-updates on all updated branches"

7064 -msgstr "在所有更新分支上檢查強制更新"

7065 -

7066 -#: builtin/fetch.c

7067 -msgid "write the commit-graph after fetching"

7068 -msgstr "抓取後寫入分支圖"

7069 -

7070 -#: builtin/fetch.c

7071 -msgid "accept refspecs from stdin"

7072 -msgstr "從標準輸入中接受引用規格"

7073 -

7074 -#: builtin/fetch.c

7075 -msgid "couldn't find remote ref HEAD"

7076 -msgstr "找不到遠端 HEAD 引用"

7010 +#, c-format

7011 +msgid "From %.*s\n"

7012 +msgstr "來自 %.*s\n"

7013

7014 #: builtin/fetch.c

7015 #, c-format

@@ -7160,11 +7096,6 @@ msgstr "%s 未傳送所有必需的物件\n"

7096 msgid "rejected %s because shallow roots are not allowed to be updated"

7097 msgstr "已拒絕 %s，不允許更新淺複製"

7098

7163 -#: builtin/fetch.c

7164 -#, c-format

7165 -msgid "From %.*s\n"

7166 -msgstr "來自 %.*s\n"

7167 -

7099 #: builtin/fetch.c

7100 #, c-format

7101 msgid ""

@@ -7278,6 +7209,141 @@ msgstr ""

7209 msgid "you need to specify a tag name"

7210 msgstr "您需要指定標籤名稱"

7211

7212 +#: builtin/fetch.c builtin/pull.c

7213 +msgid "fetch from all remotes"

7214 +msgstr "從所有的遠端抓取"

7215 +

7216 +#: builtin/fetch.c builtin/pull.c

7217 +msgid "set upstream for git pull/fetch"

7218 +msgstr "為 git pull/fetch 設定上游"

7219 +

7220 +#: builtin/fetch.c builtin/pull.c

7221 +msgid "append to .git/FETCH_HEAD instead of overwriting"

7222 +msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"

7223 +

7224 +#: builtin/fetch.c

7225 +msgid "use atomic transaction to update references"

7226 +msgstr "使用 atomic 事務更新引用"

7227 +

7228 +#: builtin/fetch.c builtin/pull.c

7229 +msgid "path to upload pack on remote end"

7230 +msgstr "上傳包到遠端的路徑"

7231 +

7232 +#: builtin/fetch.c

7233 +msgid "force overwrite of local reference"

7234 +msgstr "強制覆蓋本機引用"

7235 +

7236 +#: builtin/fetch.c

7237 +msgid "fetch from multiple remotes"

7238 +msgstr "從多個遠端抓取"

7239 +

7240 +#: builtin/fetch.c builtin/pull.c

7241 +msgid "fetch all tags and associated objects"

7242 +msgstr "抓取所有的標籤和關聯物件"

7243 +

7244 +#: builtin/fetch.c

7245 +msgid "do not fetch all tags (--no-tags)"

7246 +msgstr "不抓取任何標籤(--no-tags)"

7247 +

7248 +#: builtin/fetch.c

7249 +msgid "number of submodules fetched in parallel"

7250 +msgstr "並行取得的子模組數量"

7251 +

7252 +#: builtin/fetch.c

7253 +msgid "modify the refspec to place all refs within refs/prefetch/"

7254 +msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"

7255 +

7256 +#: builtin/fetch.c builtin/pull.c

7257 +msgid "prune remote-tracking branches no longer on remote"

7258 +msgstr "清除遠端已經不存在的分支的追蹤分支"

7259 +

7260 +#: builtin/fetch.c

7261 +msgid "prune local tags no longer on remote and clobber changed tags"

7262 +msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"

7263 +

7264 +# 譯者：可選值，不能翻譯

7265 +#: builtin/fetch.c builtin/pull.c

7266 +msgid "on-demand"

7267 +msgstr "on-demand"

7268 +

7269 +#: builtin/fetch.c

7270 +msgid "control recursive fetching of submodules"

7271 +msgstr "控制子模組的遞迴抓取"

7272 +

7273 +#: builtin/fetch.c

7274 +msgid "write fetched references to the FETCH_HEAD file"

7275 +msgstr "將取得的引用寫入 FETCH_HEAD 檔案"

7276 +

7277 +#: builtin/fetch.c builtin/pull.c

7278 +msgid "keep downloaded pack"

7279 +msgstr "保持下載包"

7280 +

7281 +#: builtin/fetch.c

7282 +msgid "allow updating of HEAD ref"

7283 +msgstr "允許更新 HEAD 引用"

7284 +

7285 +#: builtin/fetch.c builtin/pull.c

7286 +msgid "deepen history of shallow clone"

7287 +msgstr "取得淺複製的更多過去歷史記錄"

7288 +

7289 +#: builtin/fetch.c builtin/pull.c

7290 +msgid "deepen history of shallow repository based on time"

7291 +msgstr "基於時間來深化淺複製的歷史"

7292 +

7293 +#: builtin/fetch.c builtin/pull.c

7294 +msgid "convert to a complete repository"

7295 +msgstr "轉換為一個完整的版本庫"

7296 +

7297 +#: builtin/fetch.c

7298 +msgid "re-fetch without negotiating common commits"

7299 +msgstr "重新抓取而不協商共同提交"

7300 +

7301 +#: builtin/fetch.c

7302 +msgid "prepend this to submodule path output"

7303 +msgstr "在子模組路徑輸出的前面加上此目錄"

7304 +

7305 +#: builtin/fetch.c

7306 +msgid ""

7307 +"default for recursive fetching of submodules (lower priority than config "

7308 +"files)"

7309 +msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"

7310 +

7311 +#: builtin/fetch.c builtin/pull.c

7312 +msgid "accept refs that update .git/shallow"

7313 +msgstr "接受更新 .git/shallow 的引用"

7314 +

7315 +#: builtin/fetch.c builtin/pull.c

7316 +msgid "refmap"

7317 +msgstr "引用映射"

7318 +

7319 +#: builtin/fetch.c builtin/pull.c

7320 +msgid "specify fetch refmap"

7321 +msgstr "指定取得動作的引用映射"

7322 +

7323 +#: builtin/fetch.c builtin/pull.c

7324 +msgid "report that we have only objects reachable from this object"

7325 +msgstr "報告我們只擁有從該物件開始可以取得的物件"

7326 +

7327 +#: builtin/fetch.c

7328 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

7329 +msgstr "不取得 packfile，而是輸出協商的祖先提交"

7330 +

7331 +#: builtin/fetch.c

7332 +msgid "run 'maintenance --auto' after fetching"

7333 +msgstr "取得 (fetch) 後執行 'maintenance --auto'"

7334 +

7335 +#: builtin/fetch.c builtin/pull.c

7336 +msgid "check for forced-updates on all updated branches"

7337 +msgstr "在所有更新分支上檢查強制更新"

7338 +

7339 +#: builtin/fetch.c

7340 +msgid "write the commit-graph after fetching"

7341 +msgstr "抓取後寫入分支圖"

7342 +

7343 +#: builtin/fetch.c

7344 +msgid "accept refspecs from stdin"

7345 +msgstr "從標準輸入中接受引用規格"

7346 +

7347 #: builtin/fetch.c

7348 msgid "--negotiate-only needs one or more --negotiation-tip=*"

7349 msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"

@@ -7290,6 +7356,11 @@ msgstr "--deepen 不支援負數深度"

7356 msgid "--unshallow on a complete repository does not make sense"

7357 msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"

7358

7359 +#: builtin/fetch.c

7360 +#, c-format

7361 +msgid "failed to fetch bundles from '%s'"

7362 +msgstr "無法自「%s」抓取套件包"

7363 +

7364 #: builtin/fetch.c

7365 msgid "fetch --all does not take a repository argument"

7366 msgstr "fetch --all 不能帶一個版本庫參數"

@@ -7418,6 +7489,14 @@ msgstr "只列印包含該提交的引用"

7489 msgid "print only refs which don't contain the commit"

7490 msgstr "只列印不包含該提交的引用"

7491

7492 +#: builtin/for-each-ref.c

7493 +msgid "read reference patterns from stdin"

7494 +msgstr "從 stdin 讀取引用模式"

7495 +

7496 +#: builtin/for-each-ref.c

7497 +msgid "unknown arguments supplied with --stdin"

7498 +msgstr "為 --stdin 提供的引數未知"

7499 +

7500 #: builtin/for-each-repo.c

7501 msgid "git for-each-repo --config=<config> [--] <arguments>"

7502 msgstr "git for-each-repo --config=<config> [--] <arguments>"

@@ -7434,6 +7513,11 @@ msgstr "儲存版本庫路徑清單的設定鍵"

7513 msgid "missing --config=<config>"

7514 msgstr "缺少 --config=<設定>"

7515

7516 +#: builtin/for-each-repo.c

7517 +#, c-format

7518 +msgid "got bad config --config=%s"

7519 +msgstr "收到無效的組態 --config=%s"

7520 +

7521 #: builtin/fsck.c

7522 msgid "unknown"

7523 msgstr "未知"

@@ -7619,13 +7703,14 @@ msgid "notice: %s points to an unborn branch (%s)"

7703 msgstr "注意：%s 指向一個尚未誕生的分支（%s）"

7704

7705 #: builtin/fsck.c

7622 -msgid "Checking cache tree"

7623 -msgstr "正在檢查快取樹"

7706 +#, c-format

7707 +msgid "Checking cache tree of %s"

7708 +msgstr "正在檢查 %s 的快取樹"

7709

7710 #: builtin/fsck.c

7711 #, c-format

7627 -msgid "%s: invalid sha1 pointer in cache-tree"

7628 -msgstr "%s：cache-tree 中無效的 sha1 指標"

7712 +msgid "%s: invalid sha1 pointer in cache-tree of %s"

7713 +msgstr "%s：%s 的 cache-tree 中的 sha1 指標無效"

7714

7715 #: builtin/fsck.c

7716 msgid "non-tree in cache-tree"

@@ -7633,8 +7718,18 @@ msgstr "cache-tree 中非樹狀物件"

7718

7719 #: builtin/fsck.c

7720 #, c-format

7636 -msgid "%s: invalid sha1 pointer in resolve-undo"

7637 -msgstr "%s：resolve-undo 的 sha1 指針無效"

7721 +msgid "%s: invalid sha1 pointer in resolve-undo of %s"

7722 +msgstr "%s：%s 的 resolve-undo 中的 sha1 指標無效"

7723 +

7724 +#: builtin/fsck.c

7725 +#, c-format

7726 +msgid "unable to load rev-index for pack '%s'"

7727 +msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)"

7728 +

7729 +#: builtin/fsck.c

7730 +#, c-format

7731 +msgid "invalid rev-index for pack '%s'"

7732 +msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效"

7733

7734 #: builtin/fsck.c

7735 msgid ""

@@ -7670,7 +7765,7 @@ msgstr "將索引亦作為檢查的頭節點"

7765

7766 #: builtin/fsck.c

7767 msgid "make reflogs head nodes (default)"

7673 -msgstr "將引用日誌作為檢查的 HEAD 節點（預設）"

7768 +msgstr "將引用日誌作為檢查的 HEAD 節點（預設值）"

7769

7770 #: builtin/fsck.c

7771 msgid "also consider packs and alternate objects"

@@ -8152,7 +8247,6 @@ msgstr "grep：無法建立執行緒：%s"

8247 msgid "invalid number of threads specified (%d) for %s"

8248 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"

8249

8155 -#. #-#-#-#-# grep.c.po #-#-#-#-#

8250 #. TRANSLATORS: %s is the configuration

8251 #. variable for tweaking threads, currently

8252 #. grep.threads

@@ -8224,7 +8318,7 @@ msgstr "用 textconv 過濾器處理二進位檔案"

8318

8319 #: builtin/grep.c

8320 msgid "search in subdirectories (default)"

8227 -msgstr "在子目錄中尋找（預設）"

8321 +msgstr "在子目錄中尋找（預設值）"

8322

8323 #: builtin/grep.c

8324 msgid "descend at most <depth> levels"

@@ -8236,7 +8330,7 @@ msgstr "使用延伸的 POSIX 常規表示式"

8330

8331 #: builtin/grep.c

8332 msgid "use basic POSIX regular expressions (default)"

8239 -msgstr "使用基本的 POSIX 常規表示式（預設）"

8333 +msgstr "使用基本的 POSIX 常規表示式（預設值）"

8334

8335 #: builtin/grep.c

8336 msgid "interpret patterns as fixed strings"

@@ -8581,13 +8675,21 @@ msgid "'git help config' for more information"

8675 msgstr "'git help config' 取得更多訊息"

8676

8677 #: builtin/hook.c

8584 -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"

8585 -msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"

8678 +msgid ""

8679 +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"

8680 +"args>]"

8681 +msgstr ""

8682 +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"

8683 +"args>]"

8684

8685 #: builtin/hook.c

8686 msgid "silently ignore missing requested <hook-name>"

8687 msgstr "靜默忽略不存在而請求的 <hook-name>"

8688

8689 +#: builtin/hook.c

8690 +msgid "file to read into hooks' stdin"

8691 +msgstr "要讀進掛鉤 stdin 的檔案"

8692 +

8693 #: builtin/index-pack.c

8694 #, c-format

8695 msgid "object type mismatch at %s"

@@ -9314,7 +9416,7 @@ msgstr "不包含已在上游提交中的修補檔"

9416

9417 #: builtin/log.c

9418 msgid "show patch format instead of default (patch + stat)"

9317 -msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）"

9419 +msgstr "顯示純修補檔格式而非預設值（修補檔+狀態）"

9420

9421 #: builtin/log.c

9422 msgid "Messaging"

@@ -9330,7 +9432,7 @@ msgstr "新增信件頭"

9432

9433 #: builtin/log.c

9434 msgid "email"

9333 -msgstr "信件位址"

9435 +msgstr "信箱"

9436

9437 #: builtin/log.c

9438 msgid "add To: header"

@@ -9528,7 +9630,7 @@ msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"

9630

9631 #: builtin/ls-files.c

9632 msgid "show cached files in the output (default)"

9531 -msgstr "顯示快取的檔案（預設）"

9633 +msgstr "顯示快取的檔案（預設值）"

9634

9635 #: builtin/ls-files.c

9636 msgid "show deleted files in the output"

@@ -9629,11 +9731,11 @@ msgstr ""

9731 msgid ""

9732 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9733 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9632 -" [--symref] [<repository> [<refs>...]]"

9734 +" [--symref] [<repository> [<patterns>...]]"

9735 msgstr ""

9736 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9737 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9636 -" [--symref] [<repository> [<refs>...]]"

9738 +" [--symref] [<repository> [<patterns>...]]"

9739

9740 #: builtin/ls-remote.c

9741 msgid "do not print remote URL"

@@ -9951,10 +10053,18 @@ msgstr "允許合並不相關的歷史"

10053 msgid "perform multiple merges, one per line of input"

10054 msgstr "執行多次合併，一次執行輸入一列"

10055

10056 +#: builtin/merge-tree.c

10057 +msgid "specify a merge-base for the merge"

10058 +msgstr "指定用來合併的合併基底"

10059 +

10060 #: builtin/merge-tree.c

10061 msgid "--trivial-merge is incompatible with all other options"

10062 msgstr "--trivial-merge 和其他所有選項都不相容"

10063

10064 +#: builtin/merge-tree.c

10065 +msgid "--merge-base is incompatible with --stdin"

10066 +msgstr "--merge-base 與 --stdin 不相容"

10067 +

10068 #: builtin/merge-tree.c builtin/notes.c

10069 #, c-format

10070 msgid "malformed input line: '%s'."

@@ -10015,7 +10125,7 @@ msgstr "建立一個單獨的提交而不是做一次合併"

10125

10126 #: builtin/merge.c builtin/pull.c

10127 msgid "perform a commit if the merge succeeds (default)"

10018 -msgstr "如果合併成功，執行一次提交（預設）"

10128 +msgstr "如果合併成功，執行一次提交（預設值）"

10129

10130 #: builtin/merge.c builtin/pull.c

10131 msgid "edit message before committing"

@@ -10023,7 +10133,7 @@ msgstr "在提交前編輯提交說明"

10133

10134 #: builtin/merge.c

10135 msgid "allow fast-forward (default)"

10026 -msgstr "允許快轉（預設）"

10136 +msgstr "允許快轉（預設值）"

10137

10138 #: builtin/merge.c builtin/pull.c

10139 msgid "abort if fast-forward is not possible"

@@ -10206,7 +10316,7 @@ msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"

10316 msgid "Bad value '%s' in environment '%s'"

10317 msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"

10318

10209 -#: builtin/merge.c read-cache.c strbuf.c wrapper.c

10319 +#: builtin/merge.c editor.c read-cache.c wrapper.c

10320 #, c-format

10321 msgid "could not close '%s'"

10322 msgstr "不能關閉 '%s'"

@@ -10585,7 +10695,7 @@ msgstr "註解從標準輸入收到的文字"

10695

10696 #: builtin/name-rev.c

10697 msgid "allow to print `undefined` names (default)"

10588 -msgstr "允許列印 `未定義` 的名稱（預設）"

10698 +msgstr "允許列印 `未定義` 的名稱（預設值）"

10699

10700 #: builtin/name-rev.c

10701 msgid "dereference tags in the input (internal use)"

@@ -11039,7 +11149,7 @@ msgstr "無法寫入位圖索引"

11149 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"

11150 msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"

11151

11042 -#: builtin/pack-objects.c

11152 +#: builtin/pack-objects.c builtin/repack.c

11153 msgid "disabling bitmap writing, as some objects are not being packed"

11154 msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"

11155

@@ -11205,6 +11315,14 @@ msgstr "不支援的索引版本 %s"

11315 msgid "bad index version '%s'"

11316 msgstr "壞的索引版本 '%s'"

11317

11318 +#: builtin/pack-objects.c

11319 +msgid "show progress meter during object writing phase"

11320 +msgstr "在物件寫入階段顯示進度列"

11321 +

11322 +#: builtin/pack-objects.c

11323 +msgid "similar to --all-progress when progress meter is shown"

11324 +msgstr "顯示進度列時類似 --all-progress"

11325 +

11326 #: builtin/pack-objects.c

11327 msgid "<version>[,<offset>]"

11328 msgstr "<版本>[,<位移>]"

@@ -11447,6 +11565,10 @@ msgstr ""

11565 "<git@vger.kernel.org> 讓我們知道您還在使用。\n"

11566 "感謝。\n"

11567

11568 +#: builtin/pack-redundant.c

11569 +msgid "refusing to run without --i-still-use-this"

11570 +msgstr "傳入 --i-still-use-this 前拒絕執行"

11571 +

11572 #: builtin/pack-refs.c

11573 msgid "git pack-refs [--all] [--no-prune]"

11574 msgstr "git pack-refs [--all] [--no-prune]"

@@ -11457,7 +11579,7 @@ msgstr "打包一切"

11579

11580 #: builtin/pack-refs.c

11581 msgid "prune loose refs (default)"

11460 -msgstr "剪除鬆散引用（預設）"

11582 +msgstr "剪除鬆散引用（預設值）"

11583

11584 #: builtin/patch-id.c

11585 msgid "git patch-id [--stable | --unstable | --verbatim]"

@@ -11650,9 +11772,9 @@ msgstr "更新尚未誕生的分支，變更新增至索引。"

11772 msgid "pull with rebase"

11773 msgstr "重定基底式拉取"

11774

11653 -#: builtin/pull.c

11654 -msgid "please commit or stash them."

11655 -msgstr "請提交或貯存它們。"

11775 +#: builtin/pull.c builtin/rebase.c

11776 +msgid "Please commit or stash them."

11777 +msgstr "請提交或貯存修改。"

11778

11779 #: builtin/pull.c

11780 #, c-format

@@ -11900,9 +12022,9 @@ msgstr "「%s」的值無效"

12022 msgid "repository"

12023 msgstr "版本庫"

12024

11903 -#: builtin/push.c builtin/send-pack.c

11904 -msgid "push all refs"

11905 -msgstr "推送所有引用"

12025 +#: builtin/push.c

12026 +msgid "push all branches"

12027 +msgstr "推送所有分支"

12028

12029 #: builtin/push.c builtin/send-pack.c

12030 msgid "mirror all refs"

@@ -11913,8 +12035,8 @@ msgid "delete refs"

12035 msgstr "刪除引用"

12036

12037 #: builtin/push.c

11916 -msgid "push tags (can't be used with --all or --mirror)"

11917 -msgstr "推送標籤（不能使用 --all or --mirror）"

12038 +msgid "push tags (can't be used with --all or --branches or --mirror)"

12039 +msgstr "推送標籤（不能和 --all、--branches 或 --mirror 一起使用）"

12040

12041 #: builtin/push.c builtin/send-pack.c

12042 msgid "force updates"

@@ -11972,7 +12094,7 @@ msgstr "需要遠端支援 atomic 事務"

12094 msgid "--delete doesn't make sense without any refs"

12095 msgstr "--delete 未接任何引用沒有意義"

12096

11975 -#: builtin/push.c

12097 +#: builtin/push.c t/helper/test-bundle-uri.c

12098 #, c-format

12099 msgid "bad repository '%s'"

12100 msgstr "壞的版本庫 '%s'"

@@ -12237,11 +12359,20 @@ msgstr ""

12359 "\n"

12360 "因此 git 無法對其重定基底。"

12361

12362 +#: builtin/rebase.c

12363 +#, c-format

12364 +msgid "Unknown rebase-merges mode: %s"

12365 +msgstr "未知的 rebase-merges 模式：%s"

12366 +

12367 #: builtin/rebase.c

12368 #, c-format

12369 msgid "could not switch to %s"

12370 msgstr "無法切換到 %s"

12371

12372 +#: builtin/rebase.c

12373 +msgid "apply options and merge options cannot be used together"

12374 +msgstr "套用選項與合併選項不得同時使用"

12375 +

12376 #: builtin/rebase.c

12377 #, c-format

12378 msgid ""

@@ -12249,6 +12380,15 @@ msgid ""

12380 "\"ask\"."

12381 msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"

12382

12383 +#: builtin/rebase.c

12384 +msgid ""

12385 +"--rebase-merges with an empty string argument is deprecated and will stop "

12386 +"working in a future version of Git. Use --rebase-merges without an argument "

12387 +"instead, which does the same thing."

12388 +msgstr ""

12389 +"有字串引數的 --rebase-merges 已被棄用，而且會在未來的 Git 版本停止運作。請改"

12390 +"用無引數的 --rebase-merges，功能相同。"

12391 +

12392 #: builtin/rebase.c

12393 #, c-format

12394 msgid ""

@@ -12512,18 +12652,27 @@ msgstr ""

12652 msgid "switch `C' expects a numerical value"

12653 msgstr "開關 `C' 期望一個數字值"

12654

12515 -#: builtin/rebase.c

12516 -#, c-format

12517 -msgid "Unknown mode: %s"

12518 -msgstr "未知模式：%s"

12519 -

12655 #: builtin/rebase.c

12656 msgid "--strategy requires --merge or --interactive"

12657 msgstr "--strategy 需要 --merge 或 --interactive"

12658

12659 #: builtin/rebase.c

12525 -msgid "apply options and merge options cannot be used together"

12526 -msgstr "套用選項與合併選項不得同時使用"

12660 +msgid ""

12661 +"apply options are incompatible with rebase.autoSquash. Consider adding --no-"

12662 +"autosquash"

12663 +msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"

12664 +

12665 +#: builtin/rebase.c

12666 +msgid ""

12667 +"apply options are incompatible with rebase.rebaseMerges. Consider adding --"

12668 +"no-rebase-merges"

12669 +msgstr "apply 選項與 rebase.rebaseMerges 不相容。請考慮加上 --no-rebase-merges"

12670 +

12671 +#: builtin/rebase.c

12672 +msgid ""

12673 +"apply options are incompatible with rebase.updateRefs. Consider adding --no-"

12674 +"update-refs"

12675 +msgstr "apply 選項與 rebase.updateRefs 不相容。請考慮加上 --no-update-refs"

12676

12677 #: builtin/rebase.c

12678 #, c-format

@@ -12572,10 +12721,6 @@ msgstr "'%s'：只需要一個合併基礎"

12721 msgid "Does not point to a valid commit '%s'"

12722 msgstr "沒有指向一個有效的提交 '%s'"

12723

12575 -#: builtin/rebase.c

12576 -msgid "Please commit or stash them."

12577 -msgstr "請提交或貯存修改。"

12578 -

12724 #: builtin/rebase.c

12725 msgid "HEAD is up to date."

12726 msgstr "HEAD 是最新的。"

@@ -13375,8 +13520,8 @@ msgid "approxidate"

13520 msgstr "近似日期"

13521

13522 #: builtin/repack.c

13378 -msgid "with -C, expire objects older than this"

13379 -msgstr "搭配 -C 會將早於此的物件設為過期"

13523 +msgid "with --cruft, expire objects older than this"

13524 +msgstr "搭配 --cruft 會將早於此的物件標為過期"

13525

13526 #: builtin/repack.c

13527 msgid "remove redundant packs, and run git-prune-packed"

@@ -13484,7 +13629,7 @@ msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s” 檔案"

13629 #: builtin/repack.c sequencer.c

13630 #, c-format

13631 msgid "could not unlink: %s"

13487 -msgstr "無法取消連結：%s"

13632 +msgstr "無法刪除：%s"

13633

13634 #: builtin/replace.c

13635 msgid "git replace [-f] <object> <replacement>"

@@ -14208,6 +14353,10 @@ msgstr ""

14353 msgid "remote name"

14354 msgstr "遠端名稱"

14355

14356 +#: builtin/send-pack.c

14357 +msgid "push all refs"

14358 +msgstr "推送所有引用"

14359 +

14360 #: builtin/send-pack.c

14361 msgid "use stateless RPC protocol"

14362 msgstr "使用無狀態的 RPC 協定"

@@ -14462,9 +14611,11 @@ msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"

14611

14612 #: builtin/sparse-checkout.c

14613 msgid ""

14615 +"rules) [<options>]"

14616 msgstr ""

14618 +"rules) [<options>]"

14619

14620 #: builtin/sparse-checkout.c

14621 msgid "this worktree is not sparse"

@@ -14605,6 +14756,27 @@ msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"

14756 msgid "error while refreshing working directory"

14757 msgstr "重新整理工作目錄時發生錯誤"

14758

14759 +#: builtin/sparse-checkout.c

14760 +msgid ""

14761 +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"

14762 +"file <file>]"

14763 +msgstr ""

14764 +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"

14765 +"file <file>]"

14766 +

14767 +#: builtin/sparse-checkout.c

14768 +msgid "terminate input and output files by a NUL character"

14769 +msgstr "使用 NUL 字元終止輸入和輸出檔案"

14770 +

14771 +#: builtin/sparse-checkout.c

14772 +msgid "when used with --rules-file interpret patterns as cone mode patterns"

14773 +msgstr ""

14774 +"與 --rules-file 搭配使用時，將 patterns (模式) 解釋為 cone 模式的 patterns"

14775 +

14776 +#: builtin/sparse-checkout.c

14777 +msgid "use patterns in <file> instead of the current ones."

14778 +msgstr "使用 <file> 中的（而非目前使用的）模式。"

14779 +

14780 #: builtin/stash.c

14781 msgid "git stash list [<log-options>]"

14782 msgstr "git stash list [<log-options>]"

@@ -15562,11 +15734,6 @@ msgstr "「%s」不是有效的子模組名稱"

15734 msgid "git submodule--helper <command>"

15735 msgstr "git submodule--helper <command>"

15736

15565 -#: builtin/submodule--helper.c git.c

15566 -#, c-format

15567 -msgid "%s doesn't support --super-prefix"

15568 -msgstr "%s 不支援 --super-prefix"

15569 -

15737 #: builtin/symbolic-ref.c

15738 msgid "git symbolic-ref [-m <reason>] <name> <ref>"

15739 msgstr "git symbolic-ref [-m <reason>] <name> <ref>"

@@ -16468,6 +16635,11 @@ msgstr "只對除錯有用"

16635 msgid "core.fsyncMethod = batch is unsupported on this platform"

16636 msgstr "core.fsyncMethod = batch 不支援本平台"

16637

16638 +#: bundle-uri.c

16639 +#, c-format

16640 +msgid "could not parse bundle list key %s with value '%s'"

16641 +msgstr "無法解析套件包清單鍵 %s 的值 “%s”"

16642 +

16643 #: bundle-uri.c

16644 #, c-format

16645 msgid "bundle list at '%s' has no mode"

@@ -16481,6 +16653,15 @@ msgstr "無法建立暫存檔"

16653 msgid "insufficient capabilities"

16654 msgstr "功能不足"

16655

16656 +#: bundle-uri.c

16657 +#, c-format

16658 +msgid "file downloaded from '%s' is not a bundle"

16659 +msgstr "從 “%s” 下載的檔案不是套件包"

16660 +

16661 +#: bundle-uri.c

16662 +msgid "failed to store maximum creation token"

16663 +msgstr "無法儲存最大的建立權杖"

16664 +

16665 #: bundle-uri.c

16666 #, c-format

16667 msgid "unrecognized bundle mode from URI '%s'"

@@ -16501,6 +16682,15 @@ msgstr "無法從 “%s” URI 下載套件包"

16682 msgid "file at URI '%s' is not a bundle or bundle list"

16683 msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"

16684

16685 +#: bundle-uri.c

16686 +#, c-format

16687 +msgid "bundle-uri: unexpected argument: '%s'"

16688 +msgstr "bundle-uri: 非預期的引數：“%s”"

16689 +

16690 +#: bundle-uri.c

16691 +msgid "bundle-uri: expected flush after arguments"

16692 +msgstr "bundle-uri: 引數後應該有一個 flush 包"

16693 +

16694 #: bundle-uri.c

16695 msgid "bundle-uri: got an empty line"

16696 msgstr "bundle-uri: 收到空白列"

@@ -16541,6 +16731,12 @@ msgstr "版本庫中缺少這些必備的提交："

16731 msgid "need a repository to verify a bundle"

16732 msgstr "需要版本庫驗證套件包"

16733

16734 +#: bundle.c

16735 +msgid ""

16736 +"some prerequisite commits exist in the object store, but are not connected "

16737 +"to the repository's history"

16738 +msgstr "一些前提提交存在於物件儲存區，但未連接到版本庫的歷史記錄"

16739 +

16740 #: bundle.c

16741 #, c-format

16742 msgid "The bundle contains this ref:"

@@ -16739,7 +16935,7 @@ msgstr "取得和設定版本庫或者全域選項"

16935

16936 #: command-list.h

16937 msgid "Count unpacked number of objects and their disk consumption"

16742 -msgstr "計算未打包物件的數量和磁碟空間占用"

16938 +msgstr "計算未打包物件的數量和磁碟空間佔用"

16939

16940 #: command-list.h

16941 msgid "Retrieve and store user credentials"

@@ -18108,8 +18304,8 @@ msgid "bad zlib compression level %d"

18304 msgstr "錯誤的 zlib 壓縮級別 %d"

18305

18306 #: config.c

18111 -msgid "core.commentChar should only be one character"

18112 -msgstr "core.commentChar 應該是一個字元"

18307 +msgid "core.commentChar should only be one ASCII character"

18308 +msgstr "core.commentChar 應該是一個 ASCII 字元"

18309

18310 #: config.c

18311 #, c-format

@@ -18247,6 +18443,11 @@ msgstr "不能設定 '%s' 為 '%s'"

18443 msgid "invalid section name: %s"

18444 msgstr "無效的小節名稱：%s"

18445

18446 +#: config.c

18447 +#, c-format

18448 +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"

18449 +msgstr "因為第 %2$<PRIuMAX> 列中 “%1$s” 的文字列太長，故拒絕運作"

18450 +

18451 #: config.c

18452 #, c-format

18453 msgid "missing value for '%s'"

@@ -18315,17 +18516,26 @@ msgstr "伺服器指定的「%s」物件格式無效"

18516

18517 #: connect.c

18518 #, c-format

18318 -msgid "invalid ls-refs response: %s"

18319 -msgstr "無效的 ls-refs 回應：%s"

18519 +msgid "error on bundle-uri response line %d: %s"

18520 +msgstr "在 bundle-uri 回應的第 %d 列發現錯誤：%s"

18521

18522 #: connect.c

18322 -msgid "expected flush after ref listing"

18323 -msgstr "在引用列表之後應該有一個 flush 包"

18523 +msgid "expected flush after bundle-uri listing"

18524 +msgstr "在 bundle-uri 清單後應該有一個 flush 包"

18525

18526 #: connect.c

18527 msgid "expected response end packet after ref listing"

18528 msgstr "在引用列表後預期要有回應結束封包"

18529

18530 +#: connect.c

18531 +#, c-format

18532 +msgid "invalid ls-refs response: %s"

18533 +msgstr "無效的 ls-refs 回應：%s"

18534 +

18535 +#: connect.c

18536 +msgid "expected flush after ref listing"

18537 +msgstr "在引用列表之後應該有一個 flush 包"

18538 +

18539 #: connect.c

18540 #, c-format

18541 msgid "protocol '%s' is not supported"

@@ -18926,7 +19136,7 @@ msgstr "<參數1,參數2>..."

19136 #: diff.c

19137 msgid ""

19138 "output the distribution of relative amount of changes for each sub-directory"

18929 -msgstr "輸出每個子目錄相對變更的分布"

19139 +msgstr "輸出每個子目錄相對變更的分佈"

19140

19141 #: diff.c

19142 msgid "synonym for --dirstat=cumulative"

@@ -19038,6 +19248,10 @@ msgstr "輸出的每一行附加前綴"

19248 msgid "do not show any source or destination prefix"

19249 msgstr "不顯示任何來源和目的地前綴"

19250

19251 +#: diff.c

19252 +msgid "use default prefixes a/ and b/"

19253 +msgstr "使用預設的前置名稱 a/ 和 b/"

19254 +

19255 #: diff.c

19256 msgid "show context between diff hunks up to the specified number of lines"

19257 msgstr "顯示指定行數的差異區塊間的上下文"

@@ -19407,6 +19621,16 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

19621 msgid "hint: Waiting for your editor to close the file...%c"

19622 msgstr "提示：等待您的編輯器關閉檔案...%c"

19623

19624 +#: editor.c sequencer.c wrapper.c

19625 +#, c-format

19626 +msgid "could not write to '%s'"

19627 +msgstr "不能寫入 '%s'"

19628 +

19629 +#: editor.c

19630 +#, c-format

19631 +msgid "could not edit '%s'"

19632 +msgstr "無法編輯 '%s'"

19633 +

19634 #: entry.c

19635 msgid "Filtering content"

19636 msgstr "過濾內容"

@@ -19727,16 +19951,14 @@ msgid ""

19951 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"

19952 "bare]\n"

19953 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"

19730 -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"

19731 -" <command> [<args>]"

19954 +" [--config-env=<name>=<envvar>] <command> [<args>]"

19955 msgstr ""

19956 "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"

19957 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

19958 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"

19959 "bare]\n"

19960 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"

19738 -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"

19739 -" <command> [<args>]"

19961 +" [--config-env=<name>=<envvar>] <command> [<args>]"

19962

19963 #: git.c

19964 msgid ""

@@ -19765,11 +19987,6 @@ msgstr "未傳入目錄至「%s」選項\n"

19987 msgid "no namespace given for --namespace\n"

19988 msgstr "沒有為 --namespace 提供命名空間\n"

19989

19768 -#: git.c

19769 -#, c-format

19770 -msgid "no prefix given for --super-prefix\n"

19771 -msgstr "沒有為 --super-prefix 提供前綴\n"

19772 -

19990 #: git.c

19991 #, c-format

19992 msgid "-c expects a configuration string\n"

@@ -19780,6 +19997,11 @@ msgstr "應為 -c 提供一個設定字串\n"

19997 msgid "no config key given for --config-env\n"

19998 msgstr "未傳入設定鍵至 --config-env\n"

19999

20000 +#: git.c

20001 +#, c-format

20002 +msgid "no attribute source given for --attr-source\n"

20003 +msgstr "沒有為 --attr-source 提供屬性來源\n"

20004 +

20005 #: git.c

20006 #, c-format

20007 msgid "unknown option: %s\n"

@@ -19904,8 +20126,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

20126 msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"

20127

20128 #: gpg-interface.c

19907 -msgid "gpg failed to sign the data"

19908 -msgstr "gpg 無法為資料簽名"

20129 +#, c-format

20130 +msgid ""

20131 +"gpg failed to sign the data:\n"

20132 +"%s"

20133 +msgstr ""

20134 +"gpg 無法簽名資料：\n"

20135 +"%s"

20136

20137 #: gpg-interface.c

20138 msgid "user.signingKey needs to be set for ssh signing"

@@ -20566,7 +20793,7 @@ msgstr ""

20793 #. conflict in a submodule. The first argument is the submodule

20794 #. name, and the second argument is the abbreviated id of the

20795 #. commit that needs to be merged. For example:

20569 -#. - go to submodule (mysubmodule), and either merge commit abc1234"

20796 +#. - go to submodule (mysubmodule), and either merge commit abc1234"

20797 #.

20798 #: merge-ort.c

20799 #, c-format

@@ -20755,7 +20982,7 @@ msgstr "重新命名"

20982

20983 #: merge-recursive.c

20984 msgid "renamed"

20758 -msgstr "重新命名"

20985 +msgstr "已重新命名"

20986

20987 #: merge-recursive.c

20988 #, c-format

@@ -21248,6 +21475,11 @@ msgstr "損壞的鬆散物件 '%s'"

21475 msgid "garbage at end of loose object '%s'"

21476 msgstr "鬆散物件 '%s' 後面有垃圾資料"

21477

21478 +#: object-file.c

21479 +#, c-format

21480 +msgid "unable to open loose object %s"

21481 +msgstr "無法打開鬆散物件 %s"

21482 +

21483 #: object-file.c

21484 #, c-format

21485 msgid "unable to parse %s header"

@@ -21269,19 +21501,14 @@ msgstr "%s 的標頭過長，超出 %d 位元組"

21501

21502 #: object-file.c

21503 #, c-format

21272 -msgid "failed to read object %s"

21273 -msgstr "讀取物件 %s 失敗"

21504 +msgid "loose object %s (stored in %s) is corrupt"

21505 +msgstr "鬆散物件 %s（儲存在 %s）已損壞"

21506

21507 #: object-file.c

21508 #, c-format

21509 msgid "replacement %s not found for %s"

21510 msgstr "找不到 %2$s 的替代 %1$s"

21511

21280 -#: object-file.c

21281 -#, c-format

21282 -msgid "loose object %s (stored in %s) is corrupt"

21283 -msgstr "鬆散物件 %s（儲存在 %s）已損壞"

21284 -

21512 #: object-file.c

21513 #, c-format

21514 msgid "packed object %s (stored in %s) is corrupt"

@@ -21297,10 +21524,6 @@ msgstr "無法寫檔案 %s"

21524 msgid "unable to set permission to '%s'"

21525 msgstr "無法為 '%s' 設定權限"

21526

21300 -#: object-file.c

21301 -msgid "file write error"

21302 -msgstr "檔案寫錯誤"

21303 -

21527 #: object-file.c

21528 msgid "error when closing loose object file"

21529 msgstr "關閉鬆散物件檔案時發生錯誤"

@@ -21359,12 +21582,13 @@ msgid "cannot read object for %s"

21582 msgstr "不能讀取物件 %s"

21583

21584 #: object-file.c

21362 -msgid "corrupt commit"

21363 -msgstr "損壞的提交"

21585 +#, c-format

21586 +msgid "object fails fsck: %s"

21587 +msgstr "物件 fsck 失敗：%s"

21588

21589 #: object-file.c

21366 -msgid "corrupt tag"

21367 -msgstr "損壞的標籤"

21590 +msgid "refusing to create malformed object"

21591 +msgstr "拒絕建立格式錯誤的物件"

21592

21593 #: object-file.c

21594 #, c-format

@@ -21433,7 +21657,7 @@ msgstr "%s [無效物件]"

21657 #. TRANSLATORS: This is a line of ambiguous commit

21658 #. object output. E.g.:

21659 #. *

21436 -#. "deadbeef commit 2021-01-01 - Some Commit Message"

21660 +#. "deadbeef commit 2021-01-01 - Some Commit Message"

21661 #.

21662 #: object-name.c

21663 #, c-format

@@ -21443,7 +21667,7 @@ msgstr "%s 提交 %s - %s"

21667 #. TRANSLATORS: This is a line of ambiguous

21668 #. tag object output. E.g.:

21669 #. *

21446 -#. "deadbeef tag 2022-01-01 - Some Tag Message"

21670 +#. "deadbeef tag 2022-01-01 - Some Tag Message"

21671 #. *

21672 #. The second argument is the YYYY-MM-DD found

21673 #. in the tag.

@@ -21460,7 +21684,7 @@ msgstr "%s 標籤 %s - %s"

21684 #. tag object output where we couldn't parse

21685 #. the tag itself. E.g.:

21686 #. *

21463 -#. "deadbeef [bad tag, could not parse it]"

21687 +#. "deadbeef [bad tag, could not parse it]"

21688 #.

21689 #: object-name.c

21690 #, c-format

@@ -21675,11 +21899,6 @@ msgstr "位圖包索引的 XOR 偏移無效"

21899 msgid "cannot fstat bitmap file"

21900 msgstr "無法 fstat 位圖檔案"

21901

21678 -#: pack-bitmap.c

21679 -#, c-format

21680 -msgid "ignoring extra bitmap file: '%s'"

21681 -msgstr "忽略多出來的位圖檔案：「%s」"

21682 -

21902 #: pack-bitmap.c

21903 msgid "checksum doesn't match in MIDX and bitmap"

21904 msgstr "總和檢查碼在 MIDX 和位圖中無符合項目"

@@ -21763,6 +21982,11 @@ msgstr "在「%2$s」封包，位移 %3$<PRIuMAX> 的地方找不到「%1$s」"

21982 msgid "unable to get disk usage of '%s'"

21983 msgstr "無法取得「%s」的磁碟用量"

21984

21985 +#: pack-bitmap.c

21986 +#, c-format

21987 +msgid "bitmap file '%s' has invalid checksum"

21988 +msgstr "“%s” 位圖檔案的總和檢查碼無效"

21989 +

21990 #: pack-mtimes.c

21991 #, c-format

21992 msgid "mtimes file %s is too small"

@@ -21813,6 +22037,15 @@ msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"

22037 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

22038 msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"

22039

22040 +#: pack-revindex.c

22041 +msgid "invalid checksum"

22042 +msgstr "無效的總和檢查碼"

22043 +

22044 +#: pack-revindex.c

22045 +#, c-format

22046 +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"

22047 +msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<PRIu32> != %<PRIu32>"

22048 +

22049 #: pack-write.c

22050 msgid "cannot both write and verify reverse index"

22051 msgstr "無法同時寫入和驗證倒排索引"

@@ -22006,6 +22239,10 @@ msgstr "更加安靜"

22239 msgid "use <n> digits to display object names"

22240 msgstr "用 <n> 位數字顯示物件名稱"

22241

22242 +#: parse-options.h

22243 +msgid "prefixed path to initial superproject"

22244 +msgstr "初始父專案的前綴路徑"

22245 +

22246 #: parse-options.h

22247 msgid "how to strip spaces and #comments from message"

22248 msgstr "設定如何刪除提交說明裡的空格和 #備註"

@@ -22587,6 +22824,16 @@ msgstr "落後 %d"

22824 msgid "ahead %d, behind %d"

22825 msgstr "領先 %d，落後 %d"

22826

22827 +#: ref-filter.c

22828 +#, c-format

22829 +msgid "%%(%.*s) does not take arguments"

22830 +msgstr "%%(%.*s) 不取引數"

22831 +

22832 +#: ref-filter.c

22833 +#, c-format

22834 +msgid "unrecognized %%(%.*s) argument: %s"

22835 +msgstr "無法識別的 %%(%.*s) 引數：%s"

22836 +

22837 #: ref-filter.c

22838 #, c-format

22839 msgid "expected format: %%(color:<color>)"

@@ -22607,26 +22854,6 @@ msgstr "期望整數值 refname:lstrip=%s"

22854 msgid "Integer value expected refname:rstrip=%s"

22855 msgstr "期望整數值 refname:rstrip=%s"

22856

22610 -#: ref-filter.c

22611 -#, c-format

22612 -msgid "unrecognized %%(%s) argument: %s"

22613 -msgstr "無法識別的 %%(%s) 參數：%s"

22614 -

22615 -#: ref-filter.c

22616 -#, c-format

22617 -msgid "%%(objecttype) does not take arguments"

22618 -msgstr "%%(objecttype) 不帶參數"

22619 -

22620 -#: ref-filter.c

22621 -#, c-format

22622 -msgid "%%(deltabase) does not take arguments"

22623 -msgstr "%%(deltabase) 不帶參數"

22624 -

22625 -#: ref-filter.c

22626 -#, c-format

22627 -msgid "%%(body) does not take arguments"

22628 -msgstr "%%(body) 不帶參數"

22629 -

22857 #: ref-filter.c

22858 #, c-format

22859 msgid "expected %%(trailers:key=<value>)"

@@ -22647,11 +22874,6 @@ msgstr "期望一個正數 contents:lines=%s"

22874 msgid "positive value expected '%s' in %%(%s)"

22875 msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"

22876

22650 -#: ref-filter.c

22651 -#, c-format

22652 -msgid "unrecognized email option: %s"

22653 -msgstr "無法識別的 email 選項：%s"

22654 -

22877 #: ref-filter.c

22878 #, c-format

22879 msgid "expected format: %%(align:<width>,<position>)"

@@ -22667,6 +22889,11 @@ msgstr "無法識別的位置：%s"

22889 msgid "unrecognized width:%s"

22890 msgstr "無法識別的寬度：%s"

22891

22892 +#: ref-filter.c

22893 +#, c-format

22894 +msgid "unrecognized %%(%s) argument: %s"

22895 +msgstr "無法識別的 %%(%s) 參數：%s"

22896 +

22897 #: ref-filter.c

22898 #, c-format

22899 msgid "positive width expected with the %%(align) atom"

@@ -22674,8 +22901,8 @@ msgstr "元素 %%(align) 需要一個正數的寬度"

22901

22902 #: ref-filter.c

22903 #, c-format

22677 -msgid "%%(rest) does not take arguments"

22678 -msgstr "%%(rest) 未取引數"

22904 +msgid "expected format: %%(ahead-behind:<committish>)"

22905 +msgstr "預期格式：%%(ahead-behind:<committish>)"

22906

22907 #: ref-filter.c

22908 #, c-format

@@ -23413,7 +23640,7 @@ msgstr "使用之前的解決方案解決 '%s'。"

23640 #: rerere.c

23641 #, c-format

23642 msgid "cannot unlink stray '%s'"

23416 -msgstr "不能刪除 stray '%s'"

23643 +msgstr "無法刪除失散檔案 “%s”"

23644

23645 #: rerere.c

23646 #, c-format

@@ -23430,11 +23657,6 @@ msgstr "更新 '%s' 中的衝突狀態失敗"

23657 msgid "no remembered resolution for '%s'"

23658 msgstr "沒有為 '%s' 記憶的解決方案"

23659

23433 -#: rerere.c

23434 -#, c-format

23435 -msgid "cannot unlink '%s'"

23436 -msgstr "不能刪除 '%s'"

23437 -

23660 #: rerere.c

23661 #, c-format

23662 msgid "Updated preimage for '%s'"

@@ -23851,11 +24073,6 @@ msgstr ""

24073 msgid "could not lock '%s'"

24074 msgstr "不能鎖定 '%s'"

24075

23854 -#: sequencer.c strbuf.c wrapper.c

23855 -#, c-format

23856 -msgid "could not write to '%s'"

23857 -msgstr "不能寫入 '%s'"

23858 -

24076 #: sequencer.c

24077 #, c-format

24078 msgid "could not write eol to '%s'"

@@ -24183,6 +24400,26 @@ msgstr "git %s：無法讀取索引"

24400 msgid "git %s: failed to refresh the index"

24401 msgstr "git %s：無法重新整理索引"

24402

24403 +#: sequencer.c

24404 +#, c-format

24405 +msgid "'%s' is not a valid label"

24406 +msgstr "“%s” 不是有效的標籤"

24407 +

24408 +#: sequencer.c

24409 +#, c-format

24410 +msgid "'%s' is not a valid refname"

24411 +msgstr "“%s” 不是有效的引用名稱"

24412 +

24413 +#: sequencer.c

24414 +#, c-format

24415 +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"

24416 +msgstr "update-ref 需要完全限定的引用名稱，比如：refs/heads/%s"

24417 +

24418 +#: sequencer.c

24419 +#, c-format

24420 +msgid "invalid command '%.*s'"

24421 +msgstr "無效的命令 “%.*s”"

24422 +

24423 #: sequencer.c

24424 #, c-format

24425 msgid "%s does not accept arguments: '%s'"

@@ -24273,10 +24510,6 @@ msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""

24510 msgid "could not create sequencer directory '%s'"

24511 msgstr "不能建立序列目錄 '%s'"

24512

24276 -#: sequencer.c

24277 -msgid "could not lock HEAD"

24278 -msgstr "不能鎖定 HEAD"

24279 -

24513 #: sequencer.c

24514 msgid "no cherry-pick or revert in progress"

24515 msgstr "揀選或還原動作並未進行"

@@ -24392,22 +24625,22 @@ msgstr ""

24625 "\n"

24626

24627 #: sequencer.c

24395 -msgid "and made changes to the index and/or the working tree\n"

24396 -msgstr "並且修改索引和/或工作區\n"

24628 +msgid "and made changes to the index and/or the working tree.\n"

24629 +msgstr "並且更改索引和（或）工作區。\n"

24630

24631 #: sequencer.c

24632 #, c-format

24633 msgid ""

24634 "execution succeeded: %s\n"

24402 -"but left changes to the index and/or the working tree\n"

24635 +"but left changes to the index and/or the working tree.\n"

24636 "Commit or stash your changes, and then run\n"

24637 "\n"

24638 " git rebase --continue\n"

24639 "\n"

24640 msgstr ""

24641 "執行成功：%s\n"

24409 -"但是在索引和/或工作區中存在變更\n"

24410 -"提交或貯存修改，然後執行\n"

24642 +"但是在索引和（或）工作區中存在變更。\n"

24643 +"請提交或貯存修改，然後執行\n"

24644 "\n"

24645 " git rebase --continue\n"

24646 "\n"

@@ -24924,11 +25157,6 @@ msgid "%u byte/s"

25157 msgid_plural "%u bytes/s"

25158 msgstr[0] "%u 位元組/秒"

25159

24927 -#: strbuf.c

24928 -#, c-format

24929 -msgid "could not edit '%s'"

24930 -msgstr "無法編輯 '%s'"

24931 -

25160 #: submodule-config.c

25161 #, c-format

25162 msgid "ignoring suspicious submodule name: %s"

@@ -25139,6 +25367,19 @@ msgstr "ls-tree 返回未知返回值 %d"

25367 msgid "failed to lstat '%s'"

25368 msgstr "無法 lstat “%s”"

25369

25370 +#: t/helper/test-bundle-uri.c

25371 +msgid "no remote configured to get bundle URIs from"

25372 +msgstr "沒有設定可以用來取得套件包 URIs 的遠端"

25373 +

25374 +#: t/helper/test-bundle-uri.c

25375 +#, c-format

25376 +msgid "remote '%s' has no configured URL"

25377 +msgstr "“%s” 遠端未設定 URL"

25378 +

25379 +#: t/helper/test-bundle-uri.c

25380 +msgid "could not get the bundle-uri list"

25381 +msgstr "無法取得 bundle-uri 清單"

25382 +

25383 #: t/helper/test-cache-tree.c

25384 msgid "test-tool cache-tree <options> (control|prime|update)"

25385 msgstr "test-tool cache-tree <options> (control|prime|update)"

@@ -25575,6 +25816,14 @@ msgstr "正在終止。"

25816 msgid "failed to push all needed submodules"

25817 msgstr "不能推送全部需要的子模組"

25818

25819 +#: transport.c

25820 +msgid "bundle-uri operation not supported by protocol"

25821 +msgstr "通訊協定不支援 bundle-uri 動作"

25822 +

25823 +#: transport.c

25824 +msgid "could not retrieve server-advertised bundle-uri list"

25825 +msgstr "無法取得伺服器公佈的 bundle-uri 清單"

25826 +

25827 #: tree-walk.c

25828 msgid "too-short tree object"

25829 msgstr "太短的樹狀物件"

@@ -26489,12 +26738,20 @@ msgstr "忽略的檔案"

26738 #: wt-status.c

26739 #, c-format

26740 msgid ""

26492 -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

26493 -"may speed it up, but you have to be careful not to forget to add\n"

26494 -"new files yourself (see 'git help status')."

26741 +"It took %.2f seconds to enumerate untracked files,\n"

26742 +"but the results were cached, and subsequent runs may be faster."

26743 msgstr ""

26496 -"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"

26497 -"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"

26744 +"列舉未追蹤檔案花費 %.2f 秒，\n"

26745 +"不過已經快取結果，之後執行的速度或許能比較快。"

26746 +

26747 +#: wt-status.c

26748 +#, c-format

26749 +msgid "It took %.2f seconds to enumerate untracked files."

26750 +msgstr "列舉未追蹤檔案花費 %.2f 秒。"

26751 +

26752 +#: wt-status.c

26753 +msgid "See 'git help status' for information on how to improve this."

26754 +msgstr "請參閱 “git help status” 深入了解如何改善。"

26755

26756 #: wt-status.c

26757 #, c-format

@@ -26582,384 +26839,93 @@ msgstr "領先 "

26839 msgid "cannot %s: You have unstaged changes."

26840 msgstr "不能%s：您有未暫存的變更。"

26841

26585 -#: wt-status.c

26586 -msgid "additionally, your index contains uncommitted changes."

26587 -msgstr "另外，您的索引中包含未提交的變更。"

26588 -

26589 -#: wt-status.c

26590 -#, c-format

26591 -msgid "cannot %s: Your index contains uncommitted changes."

26592 -msgstr "不能%s：您的索引中包含未提交的變更。"

26593 -

26594 -#: git-merge-octopus.sh git-merge-resolve.sh

26595 -msgid ""

26596 -"Error: Your local changes to the following files would be overwritten by "

26597 -"merge"

26598 -msgstr "錯誤：您對下列檔案的本機修改將被合併動作覆蓋"

26599 -

26600 -#: git-merge-octopus.sh

26601 -msgid "Automated merge did not work."

26602 -msgstr "自動合併未生效。"

26603 -

26604 -#: git-merge-octopus.sh

26605 -msgid "Should not be doing an octopus."

26606 -msgstr "不應該執行章魚式合併。"

26607 -

26608 -#: git-merge-octopus.sh

26609 -#, sh-format

26610 -msgid "Unable to find common commit with $pretty_name"

26611 -msgstr "無法找到和 $pretty_name 的基礎提交"

26612 -

26613 -#: git-merge-octopus.sh

26614 -#, sh-format

26615 -msgid "Already up to date with $pretty_name"

26616 -msgstr "已經和 $pretty_name 保持一致"

26617 -

26618 -#: git-merge-octopus.sh

26619 -#, sh-format

26620 -msgid "Fast-forwarding to: $pretty_name"

26621 -msgstr "快轉至：$pretty_name"

26622 -

26623 -#: git-merge-octopus.sh

26624 -#, sh-format

26625 -msgid "Trying simple merge with $pretty_name"

26626 -msgstr "嘗試和 $pretty_name 的簡單合併"

26627 -

26628 -#: git-merge-octopus.sh

26629 -msgid "Simple merge did not work, trying automatic merge."

26630 -msgstr "簡單合併未生效，嘗試自動合併。"

26631 -

26632 -#: git-sh-setup.sh

26633 -#, sh-format

26634 -msgid "usage: $dashless $USAGE"

26635 -msgstr "用法：$dashless $USAGE"

26636 -

26637 -#: git-sh-setup.sh

26638 -#, sh-format

26639 -msgid "Cannot chdir to $cdup, the toplevel of the working tree"

26640 -msgstr "不能切換目錄到 $cdup，工作區的頂級目錄"

26641 -

26642 -#: git-sh-setup.sh

26643 -#, sh-format

26644 -msgid "fatal: $program_name cannot be used without a working tree."

26645 -msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。"

26646 -

26647 -#: git-sh-setup.sh

26648 -msgid "Cannot rewrite branches: You have unstaged changes."

26649 -msgstr "不能重寫分支：您有未暫存的變更。"

26650 -

26651 -#: git-sh-setup.sh

26652 -#, sh-format

26653 -msgid "Cannot $action: You have unstaged changes."

26654 -msgstr "不能 $action：您有未暫存的變更。"

26655 -

26656 -#: git-sh-setup.sh

26657 -#, sh-format

26658 -msgid "Cannot $action: Your index contains uncommitted changes."

26659 -msgstr "不能 $action：您的索引中包含未提交的變更。"

26660 -

26661 -#: git-sh-setup.sh

26662 -msgid "Additionally, your index contains uncommitted changes."

26663 -msgstr "而且您的索引中包含未提交的變更。"

26664 -

26665 -#: git-sh-setup.sh

26666 -msgid "You need to run this command from the toplevel of the working tree."

26667 -msgstr "您需要在工作區的頂級目錄中執行這個指令。"

26668 -

26669 -#: git-sh-setup.sh

26670 -msgid "Unable to determine absolute path of git directory"

26671 -msgstr "不能確定 git 目錄的絕對路徑"

26672 -

26673 -#. TRANSLATORS: you can adjust this to align "git add -i" status menu

26674 -#: git-add--interactive.perl

26675 -#, perl-format

26676 -msgid "%12s %12s %s"

26677 -msgstr "%12s %12s %s"

26678 -

26679 -#: git-add--interactive.perl

26680 -#, perl-format

26681 -msgid "touched %d path\n"

26682 -msgid_plural "touched %d paths\n"

26683 -msgstr[0] "建立了 %d 個路徑\n"

26684 -

26685 -#: git-add--interactive.perl

26686 -msgid ""

26687 -"If the patch applies cleanly, the edited hunk will immediately be\n"

26688 -"marked for staging."

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

26690 -

26691 -#: git-add--interactive.perl

26692 -msgid ""

26693 -"If the patch applies cleanly, the edited hunk will immediately be\n"

26694 -"marked for stashing."

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

26696 -

26697 -#: git-add--interactive.perl

26698 -msgid ""

26699 -"If the patch applies cleanly, the edited hunk will immediately be\n"

26700 -"marked for unstaging."

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

26702 -

26703 -#: git-add--interactive.perl

26704 -msgid ""

26705 -"If the patch applies cleanly, the edited hunk will immediately be\n"

26706 -"marked for applying."

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

26708 -

26709 -#: git-add--interactive.perl

26710 -msgid ""

26711 -"If the patch applies cleanly, the edited hunk will immediately be\n"

26712 -"marked for discarding."

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

26714 -

26715 -#: git-add--interactive.perl

26716 -#, perl-format

26717 -msgid "failed to open hunk edit file for writing: %s"

26718 -msgstr "為寫入開啟區塊編輯檔案失敗：%s"

26719 -

26720 -#: git-add--interactive.perl

26721 -#, perl-format

26722 -msgid ""

26723 -"---\n"

26724 -"To remove '%s' lines, make them ' ' lines (context).\n"

26725 -"To remove '%s' lines, delete them.\n"

26726 -"Lines starting with %s will be removed.\n"

26727 -msgstr ""

26728 -"---\n"

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

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

26731 -"以 %s 開始的行將被刪除。\n"

26732 -

26733 -#: git-add--interactive.perl

26734 -#, perl-format

26735 -msgid "failed to open hunk edit file for reading: %s"

26736 -msgstr "無法讀取區塊編輯檔案：%s"

26737 -

26738 -#: git-add--interactive.perl

26739 -msgid ""

26740 -"y - stage this hunk\n"

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

26742 -"q - quit; do not stage this hunk or any of the remaining ones\n"

26743 -"a - stage this hunk and all later hunks in the file\n"

26744 -"d - do not stage this hunk or any of the later hunks in the file"

26745 -msgstr ""

26746 -"y - 暫存此區塊\n"

26747 -"n - 不要暫存此區塊\n"

26748 -"q - 離開。不暫存此區塊及後面的全部區塊\n"

26749 -"a - 暫存此區塊和本檔案中後面的全部區塊\n"

26750 -"d - 不暫存此區塊和本檔案中後面的全部區塊"

26751 -

26752 -#: git-add--interactive.perl

26753 -msgid ""

26754 -"y - stash this hunk\n"

26755 -"n - do not stash this hunk\n"

26756 -"q - quit; do not stash this hunk or any of the remaining ones\n"

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

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

26759 -msgstr ""

26760 -"y - 貯存此區塊\n"

26761 -"n - 不要貯存此區塊\n"

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

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

26764 -"d - 不貯存此區塊和本檔案中後面的全部區塊"

26765 -

26766 -#: git-add--interactive.perl

26767 -msgid ""

26768 -"y - unstage this hunk\n"

26769 -"n - do not unstage this hunk\n"

26770 -"q - quit; do not unstage this hunk or any of the remaining ones\n"

26771 -"a - unstage this hunk and all later hunks in the file\n"

26772 -"d - do not unstage this hunk or any of the later hunks in the file"

26773 -msgstr ""

26774 -"y - 不暫存此區塊\n"

26775 -"n - 不要不暫存此區塊\n"

26776 -"q - 離開。不要不暫存此區塊及後面的全部區塊\n"

26777 -"a - 不暫存此區塊和本檔案中後面的全部區塊\n"

26778 -"d - 不要不暫存此區塊和本檔案中後面的全部區塊"

26779 -

26780 -#: git-add--interactive.perl

26781 -msgid ""

26782 -"y - apply this hunk to index\n"

26783 -"n - do not apply this hunk to index\n"

26784 -"q - quit; do not apply this hunk or any of the remaining ones\n"

26785 -"a - apply this hunk and all later hunks in the file\n"

26786 -"d - do not apply this hunk or any of the later hunks in the file"

26787 -msgstr ""

26788 -"y - 在索引中套用此區塊\n"

26789 -"n - 不要在索引中套用此區塊\n"

26790 -"q - 離開。不要套用此區塊及後面的全部區塊\n"

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

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

26793 -

26794 -#: git-add--interactive.perl

26795 -msgid ""

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

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

26798 -"q - quit; do not discard this hunk or any of the remaining ones\n"

26799 -"a - discard this hunk and all later hunks in the file\n"

26800 -"d - do not discard this hunk or any of the later hunks in the file"

26801 -msgstr ""

26802 -"y - 在工作區中捨棄此區塊\n"

26803 -"n - 不要在工作區中捨棄此區塊\n"

26804 -"q - 離開。不要捨棄此區塊及後面的全部區塊\n"

26805 -"a - 捨棄此區塊和本檔案中後面的全部區塊\n"

26806 -"d - 不要捨棄此區塊和本檔案中後面的全部區塊"

26842 +#: wt-status.c

26843 +msgid "additionally, your index contains uncommitted changes."

26844 +msgstr "另外，您的索引中包含未提交的變更。"

26845

26808 -#: git-add--interactive.perl

26809 -msgid ""

26810 -"y - discard this hunk from index and worktree\n"

26811 -"n - do not discard this hunk from index and worktree\n"

26812 -"q - quit; do not discard this hunk or any of the remaining ones\n"

26813 -"a - discard this hunk and all later hunks in the file\n"

26814 -"d - do not discard this hunk or any of the later hunks in the file"

26815 -msgstr ""

26816 -"y - 在索引和工作區中捨棄此區塊\n"

26817 -"n - 不要在索引和工作區中捨棄此區塊\n"

26818 -"q - 離開。不要捨棄此區塊及後面的全部區塊\n"

26819 -"a - 捨棄此區塊和本檔案中後面的全部區塊\n"

26820 -"d - 不要捨棄此區塊和本檔案中後面的全部區塊"

26846 +#: wt-status.c

26847 +#, c-format

26848 +msgid "cannot %s: Your index contains uncommitted changes."

26849 +msgstr "不能%s：您的索引中包含未提交的變更。"

26850

26822 -#: git-add--interactive.perl

26851 +#: git-merge-octopus.sh git-merge-resolve.sh

26852 msgid ""

26824 -"y - apply this hunk to index and worktree\n"

26825 -"n - do not apply this hunk to index and worktree\n"

26826 -"q - quit; do not apply this hunk or any of the remaining ones\n"

26827 -"a - apply this hunk and all later hunks in the file\n"

26828 -"d - do not apply this hunk or any of the later hunks in the file"

26829 -msgstr ""

26830 -"y - 在索引和工作區中套用此區塊\n"

26831 -"n - 不要在索引和工作區中套用此區塊\n"

26832 -"q - 離開。不要套用此區塊及後面的全部區塊\n"

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

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

26853 +"Error: Your local changes to the following files would be overwritten by "

26854 +"merge"

26855 +msgstr "錯誤：您對下列檔案的本機修改將被合併動作覆蓋"

26856

26836 -#: git-add--interactive.perl

26837 -msgid ""

26838 -"y - apply this hunk to worktree\n"

26839 -"n - do not apply this hunk to worktree\n"

26840 -"q - quit; do not apply this hunk or any of the remaining ones\n"

26841 -"a - apply this hunk and all later hunks in the file\n"

26842 -"d - do not apply this hunk or any of the later hunks in the file"

26843 -msgstr ""

26844 -"y - 在工作區中套用此區塊\n"

26845 -"n - 不要在工作區中套用此區塊\n"

26846 -"q - 離開。不要套用此區塊及後面的全部區塊\n"

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

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

26857 +#: git-merge-octopus.sh

26858 +msgid "Automated merge did not work."

26859 +msgstr "自動合併未生效。"

26860

26850 -#: git-add--interactive.perl

26851 -msgid ""

26852 -"g - select a hunk to go to\n"

26853 -"/ - search for a hunk matching the given regex\n"

26854 -"j - leave this hunk undecided, see next undecided hunk\n"

26855 -"J - leave this hunk undecided, see next hunk\n"

26856 -"k - leave this hunk undecided, see previous undecided hunk\n"

26857 -"K - leave this hunk undecided, see previous hunk\n"

26858 -"s - split the current hunk into smaller hunks\n"

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

26860 -"? - print help\n"

26861 -msgstr ""

26862 -"g - 選擇跳轉到一個區塊\n"

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

26864 -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"

26865 -"J - 維持此區塊未決狀態，檢視下一個區塊\n"

26866 -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"

26867 -"K - 維持此區塊未決狀態，檢視上一個區塊\n"

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

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

26870 -"? - 顯示說明\n"

26861 +#: git-merge-octopus.sh

26862 +msgid "Should not be doing an octopus."

26863 +msgstr "不應該執行章魚式合併。"

26864

26872 -#: git-add--interactive.perl

26873 -msgid "The selected hunks do not apply to the index!\n"

26874 -msgstr "選取區塊不能套用到索引！\n"

26865 +#: git-merge-octopus.sh

26866 +#, sh-format

26867 +msgid "Unable to find common commit with $pretty_name"

26868 +msgstr "無法找到和 $pretty_name 的基礎提交"

26869

26876 -#: git-add--interactive.perl

26877 -#, perl-format

26878 -msgid "ignoring unmerged: %s\n"

26879 -msgstr "忽略未套用的：%s\n"

26870 +#: git-merge-octopus.sh

26871 +#, sh-format

26872 +msgid "Already up to date with $pretty_name"

26873 +msgstr "已經和 $pretty_name 保持一致"

26874

26881 -#: git-add--interactive.perl

26882 -msgid "No other hunks to goto\n"

26883 -msgstr "沒有其它可供跳轉的區塊\n"

26875 +#: git-merge-octopus.sh

26876 +#, sh-format

26877 +msgid "Fast-forwarding to: $pretty_name"

26878 +msgstr "快轉至：$pretty_name"

26879

26885 -#: git-add--interactive.perl

l10n: zh_TW.po: Git 2.41.0