cb57f25021 · matheusbsbs/matheus-bagliano

@@ -17,32 +17,32 @@

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

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

19 #

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

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

21 msgid ""

22 msgstr ""

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

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

25 -"POT-Creation-Date: 2021-11-10 08:55+0800\n"

26 -"PO-Revision-Date: 2021-11-11 06:38+0800\n"

25 +"POT-Creation-Date: 2022-01-11 09:38+0800\n"

26 +"PO-Revision-Date: 2022-01-12 17:01+0000\n"

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

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

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

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

29 +"git-po/git-cli/zh_Hant/>\n"

30 "Language: zh_TW\n"

31 "MIME-Version: 1.0\n"

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

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

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

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

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

37 -"zhconvert.org\n"

35 +"X-Generator: Weblate 4.8.1\n"

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

37 +"https://zhconvert.org\n"

38

39 #: add-interactive.c:380

40 #, c-format

41 msgid "Huh (%s)?"

42 msgstr "嗯（%s）？"

43

44 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

45 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

44 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509

45 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233

46 #: builtin/rebase.c:1642

47 msgid "could not read index"

48 msgstr "無法讀取索引"

@@ -71,7 +71,7 @@ msgstr "更新"

71 msgid "could not stage '%s'"

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

73

74 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

74 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713

75 msgid "could not write index"

76 msgstr "無法寫入索引"

77

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

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

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

88

89 -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

90 -#: builtin/reset.c:151

89 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306

90 +#: builtin/reset.c:167

91 #, c-format

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

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

@@ -126,21 +126,21 @@ msgstr[0] "增加了 %d 個路徑\n"

126 msgid "ignoring unmerged: %s"

127 msgstr "忽略未合併：%s"

128

129 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

129 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371

130 #, c-format

131 msgid "Only binary files changed.\n"

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

133

134 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

134 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373

135 #, c-format

136 msgid "No changes.\n"

137 msgstr "沒有修改。\n"

138

139 -#: add-interactive.c:947 git-add--interactive.perl:1379

139 +#: add-interactive.c:947 git-add--interactive.perl:1381

140 msgid "Patch update"

141 msgstr "修補檔更新"

142

143 -#: add-interactive.c:986 git-add--interactive.perl:1792

143 +#: add-interactive.c:986 git-add--interactive.perl:1794

144 msgid "Review diff"

145 msgstr "檢視 diff"

146

@@ -208,11 +208,11 @@ msgstr "選擇編號過的項目"

208 msgid "(empty) select nothing"

209 msgstr "（空）全不選取"

210

211 -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

211 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898

212 msgid "*** Commands ***"

213 msgstr "*** 指令 ***"

214

215 -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

215 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895

216 msgid "What now"

217 msgstr "請選擇"

218

@@ -224,13 +224,13 @@ msgstr "快取"

224 msgid "unstaged"

225 msgstr "未快取"

226

227 -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

228 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

229 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194

230 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

231 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

232 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

233 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

227 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367

228 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128

229 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194

230 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858

231 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504

232 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574

233 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812

234 #: git-add--interactive.perl:213

235 msgid "path"

236 msgstr "路徑"

@@ -239,27 +239,27 @@ msgstr "路徑"

239 msgid "could not refresh index"

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

241

242 -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

242 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805

243 #, c-format

244 msgid "Bye.\n"

245 msgstr "再見。\n"

246

247 -#: add-patch.c:34 git-add--interactive.perl:1431

247 +#: add-patch.c:34 git-add--interactive.perl:1433

248 #, c-format, perl-format

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

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

251

252 -#: add-patch.c:35 git-add--interactive.perl:1432

252 +#: add-patch.c:35 git-add--interactive.perl:1434

253 #, c-format, perl-format

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

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

256

257 -#: add-patch.c:36 git-add--interactive.perl:1433

257 +#: add-patch.c:36 git-add--interactive.perl:1435

258 #, c-format, perl-format

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

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

261

262 -#: add-patch.c:37 git-add--interactive.perl:1434

262 +#: add-patch.c:37 git-add--interactive.perl:1436

263 #, c-format, perl-format

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

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

@@ -284,22 +284,22 @@ msgstr ""

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

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

286

287 -#: add-patch.c:56 git-add--interactive.perl:1437

287 +#: add-patch.c:56 git-add--interactive.perl:1439

288 #, c-format, perl-format

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

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

291

292 -#: add-patch.c:57 git-add--interactive.perl:1438

292 +#: add-patch.c:57 git-add--interactive.perl:1440

293 #, c-format, perl-format

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

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

296

297 -#: add-patch.c:58 git-add--interactive.perl:1439

297 +#: add-patch.c:58 git-add--interactive.perl:1441

298 #, c-format, perl-format

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

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

301

302 -#: add-patch.c:59 git-add--interactive.perl:1440

302 +#: add-patch.c:59 git-add--interactive.perl:1442

303 #, c-format, perl-format

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

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

@@ -324,22 +324,22 @@ msgstr ""

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

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

326

327 -#: add-patch.c:80 git-add--interactive.perl:1443

327 +#: add-patch.c:80 git-add--interactive.perl:1445

328 #, c-format, perl-format

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

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

331

332 -#: add-patch.c:81 git-add--interactive.perl:1444

332 +#: add-patch.c:81 git-add--interactive.perl:1446

333 #, c-format, perl-format

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

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

336

337 -#: add-patch.c:82 git-add--interactive.perl:1445

337 +#: add-patch.c:82 git-add--interactive.perl:1447

338 #, c-format, perl-format

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

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

341

342 -#: add-patch.c:83 git-add--interactive.perl:1446

342 +#: add-patch.c:83 git-add--interactive.perl:1448

343 #, c-format, perl-format

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

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

@@ -364,22 +364,22 @@ msgstr ""

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

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

366

367 -#: add-patch.c:103 git-add--interactive.perl:1449

367 +#: add-patch.c:103 git-add--interactive.perl:1451

368 #, c-format, perl-format

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

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

371

372 -#: add-patch.c:104 git-add--interactive.perl:1450

372 +#: add-patch.c:104 git-add--interactive.perl:1452

373 #, c-format, perl-format

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

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

376

377 -#: add-patch.c:105 git-add--interactive.perl:1451

377 +#: add-patch.c:105 git-add--interactive.perl:1453

378 #, c-format, perl-format

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

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

381

382 -#: add-patch.c:106 git-add--interactive.perl:1452

382 +#: add-patch.c:106 git-add--interactive.perl:1454

383 #, c-format, perl-format

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

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

@@ -404,26 +404,26 @@ msgstr ""

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

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

406

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

408 -#: git-add--interactive.perl:1473

407 +#: add-patch.c:126 git-add--interactive.perl:1457

408 +#: git-add--interactive.perl:1475

409 #, c-format, perl-format

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

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

412

413 -#: add-patch.c:127 git-add--interactive.perl:1456

414 -#: git-add--interactive.perl:1474

413 +#: add-patch.c:127 git-add--interactive.perl:1458

414 +#: git-add--interactive.perl:1476

415 #, c-format, perl-format

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

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

418

419 -#: add-patch.c:128 git-add--interactive.perl:1457

420 -#: git-add--interactive.perl:1475

419 +#: add-patch.c:128 git-add--interactive.perl:1459

420 +#: git-add--interactive.perl:1477

421 #, c-format, perl-format

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

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

424

425 -#: add-patch.c:129 git-add--interactive.perl:1458

426 -#: git-add--interactive.perl:1476

425 +#: add-patch.c:129 git-add--interactive.perl:1460

426 +#: git-add--interactive.perl:1478

427 #, c-format, perl-format

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

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

@@ -448,22 +448,22 @@ msgstr ""

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

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

450

451 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

451 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

452 #, c-format, perl-format

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

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

455

456 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

456 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

457 #, c-format, perl-format

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

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

460

461 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

461 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

462 #, c-format, perl-format

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

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

465

466 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

467 #, c-format, perl-format

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

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

@@ -482,22 +482,22 @@ msgstr ""

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

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

484

485 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

485 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

486 #, c-format, perl-format

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

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

489

490 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

490 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

491 #, c-format, perl-format

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

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

494

495 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

495 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

496 #, c-format, perl-format

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

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

499

500 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

500 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

501 #, c-format, perl-format

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

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

@@ -635,7 +635,7 @@ msgstr "「git apply --cached」失敗"

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

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

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

638 -#: add-patch.c:1247 git-add--interactive.perl:1242

638 +#: add-patch.c:1247 git-add--interactive.perl:1244

639 msgid ""

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

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

@@ -644,11 +644,11 @@ msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！

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

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

646

647 -#: add-patch.c:1291 git-add--interactive.perl:1346

647 +#: add-patch.c:1291 git-add--interactive.perl:1348

648 msgid "Apply them to the worktree anyway? "

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

650

651 -#: add-patch.c:1298 git-add--interactive.perl:1349

651 +#: add-patch.c:1298 git-add--interactive.perl:1351

652 msgid "Nothing was applied.\n"

653 msgstr "未套用。\n"

654

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

686 msgid "No other hunks to goto"

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

688

689 -#: add-patch.c:1549 git-add--interactive.perl:1606

689 +#: add-patch.c:1549 git-add--interactive.perl:1608

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

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

692

693 -#: add-patch.c:1550 git-add--interactive.perl:1608

693 +#: add-patch.c:1550 git-add--interactive.perl:1610

694 msgid "go to which hunk? "

695 msgstr "跳轉到哪個區塊？ "

696

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

709 msgid "No other hunks to search"

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

711

712 -#: add-patch.c:1581 git-add--interactive.perl:1661

712 +#: add-patch.c:1581 git-add--interactive.perl:1663

713 msgid "search for regex? "

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

715

@@ -790,7 +790,7 @@ msgstr ""

790 msgid "Exiting because of an unresolved conflict."

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

792

793 -#: advice.c:209 builtin/merge.c:1379

793 +#: advice.c:209 builtin/merge.c:1382

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

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

796

@@ -885,21 +885,33 @@ msgstr "無法識別的空白字元選項 '%s'"

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

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

887

888 -#: apply.c:136

889 -msgid "--reject and --3way cannot be used together."

890 -msgstr "--reject 和 --3way 不能同時使用。"

891 -

892 -#: apply.c:139

893 -msgid "--3way outside a repository"

894 -msgstr "--3way 在版本庫之外"

895 -

896 -#: apply.c:150

897 -msgid "--index outside a repository"

898 -msgstr "--index 在版本庫之外"

899 -

900 -#: apply.c:153

901 -msgid "--cached outside a repository"

902 -msgstr "--cached 在版本庫之外"

888 +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307

889 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870

890 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885

891 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541

892 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470

893 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757

894 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361

895 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155

896 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033

897 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560

898 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778

899 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073

900 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

901 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199

902 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426

903 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710

904 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316

905 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572

906 +#: builtin/worktree.c:702

907 +#, c-format

908 +msgid "options '%s' and '%s' cannot be used together"

909 +msgstr "不能同時使用 '%s' 和 '%s' 選項"

910 +

911 +#: apply.c:139 apply.c:150 apply.c:153

912 +#, c-format

913 +msgid "'%s' outside a repository"

914 +msgstr "'%s' 在版本庫之外"

915

916 #: apply.c:800

917 #, c-format

@@ -1100,8 +1112,8 @@ msgstr "打修補檔失敗：%s:%ld"

1112 msgid "cannot checkout %s"

1113 msgstr "不能簽出 %s"

1114

1103 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1104 -#: setup.c:308

1115 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214

1116 +#: setup.c:309

1117 #, c-format

1118 msgid "failed to read %s"

1119 msgstr "無法讀取 %s"

@@ -1111,376 +1123,374 @@ msgstr "無法讀取 %s"

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

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

1125

1114 -#: apply.c:3442 apply.c:3709

1126 +#: apply.c:3442 apply.c:3711

1127 #, c-format

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

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

1130

1119 -#: apply.c:3549 apply.c:3724

1131 +#: apply.c:3549 apply.c:3726

1132 #, c-format

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

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

1135

1124 -#: apply.c:3558 apply.c:3732 apply.c:3976

1136 +#: apply.c:3558 apply.c:3734 apply.c:3978

1137 #, c-format

1138 msgid "%s: does not match index"

1139 msgstr "%s：和索引不符合"

1140

1129 -#: apply.c:3593

1141 +#: apply.c:3595

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

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

1144

1133 -#: apply.c:3596

1145 +#: apply.c:3598

1146 #, c-format

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

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

1149

1138 -#: apply.c:3612 apply.c:3616

1150 +#: apply.c:3614 apply.c:3618

1151 #, c-format

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

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

1154

1143 -#: apply.c:3628

1155 +#: apply.c:3630

1156 #, c-format

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

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

1159

1148 -#: apply.c:3642

1160 +#: apply.c:3644

1161 #, c-format

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

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

1164

1153 -#: apply.c:3647

1165 +#: apply.c:3649

1166 #, c-format

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

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

1169

1158 -#: apply.c:3664

1170 +#: apply.c:3666

1171 #, c-format

1172 msgid "Falling back to direct application...\n"

1173 msgstr "回復至直接套用模式⋯⋯\n"

1174

1163 -#: apply.c:3676

1175 +#: apply.c:3678

1176 msgid "removal patch leaves file contents"

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

1178

1167 -#: apply.c:3749

1179 +#: apply.c:3751

1180 #, c-format

1181 msgid "%s: wrong type"

1182 msgstr "%s：錯誤類型"

1183

1172 -#: apply.c:3751

1184 +#: apply.c:3753

1185 #, c-format

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

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

1188

1177 -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1178 -#: read-cache.c:1368

1189 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918

1190 +#: read-cache.c:1381

1191 #, c-format

1192 msgid "invalid path '%s'"

1193 msgstr "無效路徑 '%s'"

1194

1183 -#: apply.c:3974

1195 +#: apply.c:3976

1196 #, c-format

1197 msgid "%s: already exists in index"

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

1199

1188 -#: apply.c:3978

1200 +#: apply.c:3980

1201 #, c-format

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

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

1204

1193 -#: apply.c:3998

1205 +#: apply.c:4000

1206 #, c-format

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

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

1209

1198 -#: apply.c:4003

1210 +#: apply.c:4005

1211 #, c-format

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

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

1214

1203 -#: apply.c:4023

1215 +#: apply.c:4025

1216 #, c-format

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

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

1219

1208 -#: apply.c:4027

1220 +#: apply.c:4029

1221 #, c-format

1222 msgid "%s: patch does not apply"

1223 msgstr "%s：修補檔未套用"

1224

1213 -#: apply.c:4042

1225 +#: apply.c:4044

1226 #, c-format

1227 msgid "Checking patch %s..."

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

1229

1218 -#: apply.c:4134

1230 +#: apply.c:4136

1231 #, c-format

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

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

1234

1223 -#: apply.c:4141

1235 +#: apply.c:4143

1236 #, c-format

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

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

1239

1228 -#: apply.c:4144

1240 +#: apply.c:4146

1241 #, c-format

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

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

1244

1233 -#: apply.c:4153

1245 +#: apply.c:4155

1246 #, c-format

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

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

1249

1238 -#: apply.c:4163

1250 +#: apply.c:4165

1251 #, c-format

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

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

1254

1243 -#: apply.c:4301

1255 +#: apply.c:4303

1256 #, c-format

1257 msgid "unable to remove %s from index"

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

1259

1248 -#: apply.c:4335

1260 +#: apply.c:4337

1261 #, c-format

1262 msgid "corrupt patch for submodule %s"

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

1264

1253 -#: apply.c:4341

1265 +#: apply.c:4343

1266 #, c-format

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

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

1269

1258 -#: apply.c:4349

1270 +#: apply.c:4351

1271 #, c-format

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

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

1274

1263 -#: apply.c:4355 apply.c:4500

1275 +#: apply.c:4357 apply.c:4502

1276 #, c-format

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

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

1279

1268 -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1269 -#: builtin/gc.c:2276

1280 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258

1281 +#: builtin/gc.c:2293

1282 #, c-format

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

1284 msgstr "寫入 '%s' 失敗"

1285

1274 -#: apply.c:4402

1286 +#: apply.c:4404

1287 #, c-format

1288 msgid "closing file '%s'"

1289 msgstr "關閉檔案 '%s'"

1290

1279 -#: apply.c:4472

1291 +#: apply.c:4474

1292 #, c-format

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

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

1295

1284 -#: apply.c:4570

1296 +#: apply.c:4572

1297 #, c-format

1298 msgid "Applied patch %s cleanly."

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

1300

1289 -#: apply.c:4578

1301 +#: apply.c:4580

1302 msgid "internal error"

1303 msgstr "內部錯誤"

1304

1293 -#: apply.c:4581

1305 +#: apply.c:4583

1306 #, c-format

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

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

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

1310

1299 -#: apply.c:4592

1311 +#: apply.c:4594

1312 #, c-format

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

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

1315

1304 -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1316 +#: apply.c:4602

1317 #, c-format

1318 msgid "cannot open %s"

1319 msgstr "不能開啟 %s"

1320

1309 -#: apply.c:4614

1321 +#: apply.c:4616

1322 #, c-format

1323 msgid "Hunk #%d applied cleanly."

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

1325

1314 -#: apply.c:4618

1326 +#: apply.c:4620

1327 #, c-format

1328 msgid "Rejected hunk #%d."

1329 msgstr "拒絕第 #%d 個區塊。"

1330

1319 -#: apply.c:4747

1331 +#: apply.c:4749

1332 #, c-format

1333 msgid "Skipped patch '%s'."

1334 msgstr "略過修補檔 '%s'。"

1335

1324 -#: apply.c:4755

1325 -msgid "unrecognized input"

1326 -msgstr "無法識別的輸入"

1336 +#: apply.c:4758

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

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

1339

1328 -#: apply.c:4775

1340 +#: apply.c:4779

1341 msgid "unable to read index file"

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

1343

1332 -#: apply.c:4932

1344 +#: apply.c:4936

1345 #, c-format

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

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

1348

1337 -#: apply.c:4959

1349 +#: apply.c:4963

1350 #, c-format

1351 msgid "squelched %d whitespace error"

1352 msgid_plural "squelched %d whitespace errors"

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

1354

1343 -#: apply.c:4965 apply.c:4980

1355 +#: apply.c:4969 apply.c:4984

1356 #, c-format

1357 msgid "%d line adds whitespace errors."

1358 msgid_plural "%d lines add whitespace errors."

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

1360

1349 -#: apply.c:4973

1361 +#: apply.c:4977

1362 #, c-format

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

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

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

1366

1355 -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1367 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430

1368 msgid "Unable to write new index file"

1369 msgstr "無法寫入新索引檔案"

1370

1359 -#: apply.c:5017

1371 +#: apply.c:5021

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

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

1374

1363 -#: apply.c:5020

1375 +#: apply.c:5024

1376 msgid "apply changes matching the given path"

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

1378

1367 -#: apply.c:5022 builtin/am.c:2320

1379 +#: apply.c:5026 builtin/am.c:2376

1380 msgid "num"

1381 msgstr "數字"

1382

1371 -#: apply.c:5023

1383 +#: apply.c:5027

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

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

1386

1375 -#: apply.c:5026

1387 +#: apply.c:5030

1388 msgid "ignore additions made by the patch"

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

1390

1379 -#: apply.c:5028

1391 +#: apply.c:5032

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

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

1394

1383 -#: apply.c:5032

1395 +#: apply.c:5036

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

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

1398

1387 -#: apply.c:5034

1399 +#: apply.c:5038

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

1401 msgstr "不套用修補檔，而是顯示輸入的概要"

1402

1391 -#: apply.c:5036

1403 +#: apply.c:5040

1404 msgid "instead of applying the patch, see if the patch is applicable"

1405 msgstr "不套用修補檔，而是檢視修補檔是否可套用"

1406

1395 -#: apply.c:5038

1407 +#: apply.c:5042

1408 msgid "make sure the patch is applicable to the current index"

1409 msgstr "確認修補檔可以套用到目前索引"

1410

1399 -#: apply.c:5040

1411 +#: apply.c:5044

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

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

1414

1403 -#: apply.c:5042

1415 +#: apply.c:5046

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

1417 msgstr "套用修補檔而不修改工作區"

1418

1407 -#: apply.c:5044

1419 +#: apply.c:5048

1420 msgid "accept a patch that touches outside the working area"

1421 msgstr "接受修改工作區之外檔案的修補檔"

1422

1411 -#: apply.c:5047

1423 +#: apply.c:5051

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

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

1426

1415 -#: apply.c:5049

1427 +#: apply.c:5053

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

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

1430

1419 -#: apply.c:5051

1431 +#: apply.c:5055

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

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

1434

1423 -#: apply.c:5054 builtin/checkout-index.c:196

1435 +#: apply.c:5058 builtin/checkout-index.c:196

1436 msgid "paths are separated with NUL character"

1437 msgstr "路徑以 NUL 字元分隔"

1438

1427 -#: apply.c:5056

1439 +#: apply.c:5060

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

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

1442

1431 -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1443 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355

1444 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1445 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1446 #: builtin/rebase.c:1051

1447 msgid "action"

1448 msgstr "動作"

1449

1438 -#: apply.c:5058

1450 +#: apply.c:5062

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

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

1453

1442 -#: apply.c:5061 apply.c:5064

1454 +#: apply.c:5065 apply.c:5068

1455 msgid "ignore changes in whitespace when finding context"

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

1457

1446 -#: apply.c:5067

1458 +#: apply.c:5071

1459 msgid "apply the patch in reverse"

1460 msgstr "反向套用修補檔"

1461

1450 -#: apply.c:5069

1462 +#: apply.c:5073

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

1464 msgstr "無需至少一行上下文"

1465

1454 -#: apply.c:5071

1466 +#: apply.c:5075

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

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

1469

1458 -#: apply.c:5073

1470 +#: apply.c:5077

1471 msgid "allow overlapping hunks"

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

1473

1462 -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1463 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1464 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1465 -msgid "be verbose"

1466 -msgstr "詳細輸出"

1467 -

1468 -#: apply.c:5076

1474 +#: apply.c:5080

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

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

1477

1472 -#: apply.c:5079

1478 +#: apply.c:5083

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

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

1481

1476 -#: apply.c:5081 builtin/am.c:2308

1482 +#: apply.c:5085 builtin/am.c:2364

1483 msgid "root"

1484 msgstr "根目錄"

1485

1480 -#: apply.c:5082

1486 +#: apply.c:5086

1487 msgid "prepend <root> to all filenames"

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

1489

1490 +#: apply.c:5089

1491 +msgid "don't return error for empty patches"

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

1493 +

1494 #: archive-tar.c:125 archive-zip.c:345

1495 #, c-format

1496 msgid "cannot stream blob %s"

@@ -1491,16 +1501,16 @@ msgstr "不能開啟資料物件 %s"

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

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

1503

1494 -#: archive-tar.c:450

1504 +#: archive-tar.c:447

1505 #, c-format

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

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

1508

1499 -#: archive-tar.c:453

1509 +#: archive-tar.c:450

1510 msgid "unable to redirect descriptor"

1511 msgstr "無法重定向描述符"

1512

1503 -#: archive-tar.c:460

1513 +#: archive-tar.c:457

1514 #, c-format

1515 msgid "'%s' filter reported error"

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

@@ -1543,19 +1553,13 @@ msgstr ""

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

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

1555

1546 -#: archive.c:188

1547 -#, c-format

1548 -msgid "cannot read %s"

1549 -msgstr "不能讀取 %s"

1550 -

1551 -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1552 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1553 -#: builtin/merge.c:1145

1556 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238

1557 +#: builtin/tag.c:578

1558 #, c-format

1555 -msgid "could not read '%s'"

1559 +msgid "cannot read '%s'"

1560 msgstr "不能讀取 '%s'"

1561

1558 -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1562 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334

1563 #, c-format

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

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

@@ -1597,7 +1601,7 @@ msgstr "格式"

1601 msgid "archive format"

1602 msgstr "歸檔格式"

1603

1600 -#: archive.c:552 builtin/log.c:1775

1604 +#: archive.c:552 builtin/log.c:1790

1605 msgid "prefix"

1606 msgstr "前綴"

1607

@@ -1607,9 +1611,9 @@ msgstr "為歸檔中每個路徑名加上前綴"

1611

1612 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1613 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1610 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1611 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1612 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1614 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183

1615 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103

1616 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410

1617 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1618 msgid "file"

1619 msgstr "檔案"

@@ -1639,7 +1643,7 @@ msgid "list supported archive formats"

1643 msgstr "列出支援的歸檔格式"

1644

1645 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1642 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1646 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513

1647 msgid "repo"

1648 msgstr "版本庫"

1649

@@ -1647,7 +1651,7 @@ msgstr "版本庫"

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

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

1653

1650 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1654 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708

1655 #: builtin/notes.c:496

1656 msgid "command"

1657 msgstr "指令"

@@ -1660,18 +1664,20 @@ msgstr "遠端 git-upload-archive 指令的路徑"

1664 msgid "Unexpected option --remote"

1665 msgstr "未知參數 --remote"

1666

1663 -#: archive.c:580

1664 -msgid "Option --exec can only be used together with --remote"

1665 -msgstr "選項 --exec 只能和 --remote 同時使用"

1667 +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544

1668 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370

1669 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115

1670 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281

1671 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144

1672 +#: http-fetch.c:153

1673 +#, c-format

1674 +msgid "the option '%s' requires '%s'"

1675 +msgstr "「%s」選項需要「%s」"

1676

1677 #: archive.c:582

1678 msgid "Unexpected option --output"

1679 msgstr "未知參數 --output"

1680

1671 -#: archive.c:584

1672 -msgid "Options --add-file and --remote cannot be used together"

1673 -msgstr "--add-file 和 --remote 選項不能同時使用"

1674 -

1681 #: archive.c:606

1682 #, c-format

1683 msgid "Unknown archive format '%s'"

@@ -1779,7 +1785,7 @@ msgstr "需要一個 %s 版本"

1785 msgid "could not create file '%s'"

1786 msgstr "不能建立檔案 '%s'"

1787

1782 -#: bisect.c:985 builtin/merge.c:154

1788 +#: bisect.c:985 builtin/merge.c:155

1789 #, c-format

1790 msgid "could not read file '%s'"

1791 msgstr "不能讀取檔案 '%s'"

@@ -1829,10 +1835,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用"

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

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

1837

1832 -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1833 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

1834 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1835 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1838 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158

1839 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114

1840 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071

1841 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373

1842 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1843 #: builtin/shortlog.c:255

1844 msgid "revision walk setup failed"

@@ -1853,98 +1859,87 @@ msgstr "在 %2$s 中無此路徑 %1$s"

1859 msgid "cannot read blob %s for path %s"

1860 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"

1861

1856 -#: branch.c:53

1857 -#, c-format

1862 +#: branch.c:77

1863 msgid ""

1859 -"\n"

1860 -"After fixing the error cause you may try to fix up\n"

1861 -"the remote tracking information by invoking\n"

1862 -"\"git branch --set-upstream-to=%s%s%s\"."

1863 -msgstr ""

1864 -"\n"

1865 -"修正錯誤後，您可以執行\n"

1866 -"\"git branch --set-upstream-to=%s%s%s\"\n"

1867 -"命令修正遠端追蹤資訊。"

1864 +"cannot inherit upstream tracking configuration of multiple refs when "

1865 +"rebasing is requested"

1866 +msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"

1867

1869 -#: branch.c:67

1868 +#: branch.c:88

1869 #, c-format

1871 -msgid "Not setting branch %s as its own upstream."

1872 -msgstr "未設定分支 %s 作為它自己的上游。"

1870 +msgid "not setting branch '%s' as its own upstream"

1871 +msgstr "未將「%s」分支設定為其自己的上游"

1872

1874 -#: branch.c:93

1873 +#: branch.c:144

1874 #, c-format

1876 -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1877 -msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。"

1875 +msgid "branch '%s' set up to track '%s' by rebasing."

1876 +msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"

1877

1879 -#: branch.c:94

1878 +#: branch.c:145

1879 #, c-format

1881 -msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1882 -msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。"

1880 +msgid "branch '%s' set up to track '%s'."

1881 +msgstr "已將「%s」分支設定為追蹤「%s」。"

1882

1884 -#: branch.c:98

1883 +#: branch.c:148

1884 #, c-format

1886 -msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1887 -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。"

1885 +msgid "branch '%s' set up to track:"

1886 +msgstr "「%s」分支已設定追蹤："

1887

1889 -#: branch.c:99

1890 -#, c-format

1891 -msgid "Branch '%s' set up to track local branch '%s'."

1892 -msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"

1888 +#: branch.c:160

1889 +msgid "unable to write upstream branch configuration"

1890 +msgstr "無法寫入上游分支設定"

1891

1894 -#: branch.c:104

1895 -#, c-format

1896 -msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1897 -msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。"

1892 +#: branch.c:162

1893 +msgid ""

1894 +"\n"

1895 +"After fixing the error cause you may try to fix up\n"

1896 +"the remote tracking information by invoking:"

1897 +msgstr ""

1898 +"\n"

1899 +"修正錯誤後，您可以執行下述命令\n"

1900 +"命令修正遠端追蹤資訊："

1901

1899 -#: branch.c:105

1902 +#: branch.c:203

1903 #, c-format

1901 -msgid "Branch '%s' set up to track remote ref '%s'."

1902 -msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。"

1904 +msgid "asked to inherit tracking from '%s', but no remote is set"

1905 +msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"

1906

1904 -#: branch.c:109

1907 +#: branch.c:209

1908 #, c-format

1906 -msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1907 -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機引用 '%s'。"

1909 +msgid "asked to inherit tracking from '%s', but no merge configuration is set"

1910 +msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"

1911

1909 -#: branch.c:110

1912 +#: branch.c:252

1913 #, c-format

1911 -msgid "Branch '%s' set up to track local ref '%s'."

1912 -msgstr "分支 '%s' 設定為追蹤本機引用 '%s'。"

1914 +msgid "not tracking: ambiguous information for ref %s"

1915 +msgstr "未追蹤：%s 引用有歧義"

1916

1914 -#: branch.c:119

1915 -msgid "Unable to write upstream branch configuration"

1916 -msgstr "無法寫入上游分支設定"

1917 -

1918 -#: branch.c:156

1917 +#: branch.c:287

1918 #, c-format

1920 -msgid "Not tracking: ambiguous information for ref %s"

1921 -msgstr "未追蹤：引用 %s 有歧義"

1919 +msgid "'%s' is not a valid branch name"

1920 +msgstr "「%s」不是一個有效的分支名稱"

1921

1923 -#: branch.c:189

1922 +#: branch.c:307

1923 #, c-format

1925 -msgid "'%s' is not a valid branch name."

1926 -msgstr "'%s' 不是一個有效的分支名稱。"

1924 +msgid "a branch named '%s' already exists"

1925 +msgstr "已有同名「%s」分支"

1926

1928 -#: branch.c:208

1927 +#: branch.c:313

1928 #, c-format

1930 -msgid "A branch named '%s' already exists."

1931 -msgstr "一個分支名 '%s' 已經存在。"

1929 +msgid "cannot force update the branch '%s'checked out at '%s'"

1930 +msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"

1931

1933 -#: branch.c:213

1934 -msgid "Cannot force update the current branch."

1935 -msgstr "無法強制更新目前分支。"

1936 -

1937 -#: branch.c:233

1932 +#: branch.c:336

1933 #, c-format

1939 -msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1940 -msgstr "無法設定追蹤訊息；起始點 '%s' 不是一個分支。"

1934 +msgid "cannot set up tracking information; starting point '%s' is not a branch"

1935 +msgstr "無法設定追蹤資訊：起始點「%s」不是分支"

1936

1942 -#: branch.c:235

1937 +#: branch.c:338

1938 #, c-format

1939 msgid "the requested upstream branch '%s' does not exist"

1940 msgstr "請求的上游分支 '%s' 不存在"

1941

1947 -#: branch.c:237

1942 +#: branch.c:340

1943 msgid ""

1944 "\n"

1945 "If you are planning on basing your work on an upstream\n"

@@ -1963,27 +1958,28 @@ msgstr ""

1958 "且建立兩個分支間的追蹤關係，\n"

1959 "您可能需要使用「git push -u」推送分支並設定和上游的關聯。"

1960

1966 -#: branch.c:281

1961 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377

1962 +#: builtin/replace.c:423 builtin/replace.c:453

1963 #, c-format

1968 -msgid "Not a valid object name: '%s'."

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

1964 +msgid "not a valid object name: '%s'"

1965 +msgstr "不是一個有效的物件名：'%s'"

1966

1971 -#: branch.c:301

1967 +#: branch.c:404

1968 #, c-format

1973 -msgid "Ambiguous object name: '%s'."

1974 -msgstr "歧義的物件名：'%s'。"

1969 +msgid "ambiguous object name: '%s'"

1970 +msgstr "物件名稱有歧義：「%s」"

1971

1976 -#: branch.c:306

1972 +#: branch.c:409

1973 #, c-format

1978 -msgid "Not a valid branch point: '%s'."

1979 -msgstr "無效的分支點：'%s'。"

1974 +msgid "not a valid branch point: '%s'"

1975 +msgstr "無效的分支點：「%s」"

1976

1981 -#: branch.c:366

1977 +#: branch.c:469

1978 #, c-format

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

1980 msgstr "'%s' 已經簽出到 '%s'"

1981

1986 -#: branch.c:389

1982 +#: branch.c:494

1983 #, c-format

1984 msgid "HEAD of working tree %s is not updated"

1985 msgstr "工作區 %s 的 HEAD 指向沒有被更新"

@@ -2008,7 +2004,7 @@ msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

2004 msgid "unrecognized header: %s%s (%d)"

2005 msgstr "無法識別的包頭：%s%s (%d)"

2006

2011 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2007 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406

2008 #: builtin/commit.c:862

2009 #, c-format

2010 msgid "could not open '%s'"

@@ -2065,7 +2061,7 @@ msgstr "不支援的包版本 %d"

2061 msgid "cannot write bundle version %d with algorithm %s"

2062 msgstr "無法寫入 %2$s 演算法的包版本 %1$d"

2063

2068 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2064 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399

2065 #, c-format

2066 msgid "unrecognized argument: %s"

2067 msgstr "無法識別的參數：%s"

@@ -2102,7 +2098,7 @@ msgstr "找到重複的區塊 ID %<PRIx32>"

2098 msgid "final chunk has non-zero id %<PRIx32>"

2099 msgstr "最終區塊有非零 ID %<PRIx32>"

2100

2105 -#: color.c:329

2101 +#: color.c:354

2102 #, c-format

2103 msgid "invalid color value: %.*s"

2104 msgstr "無效的顏色值：%.*s"

@@ -2152,205 +2148,205 @@ msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"

2148 msgid "unable to find all commit-graph files"

2149 msgstr "無法找到所有提交圖形檔案"

2150

2155 -#: commit-graph.c:746 commit-graph.c:783

2151 +#: commit-graph.c:749 commit-graph.c:786

2152 msgid "invalid commit position. commit-graph is likely corrupt"

2153 msgstr "無效的提交位置。提交圖形可能已損壞"

2154

2159 -#: commit-graph.c:767

2155 +#: commit-graph.c:770

2156 #, c-format

2157 msgid "could not find commit %s"

2158 msgstr "無法找到提交 %s"

2159

2164 -#: commit-graph.c:800

2160 +#: commit-graph.c:803

2161 msgid "commit-graph requires overflow generation data but has none"

2162 msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"

2163

2168 -#: commit-graph.c:1105 builtin/am.c:1342

2164 +#: commit-graph.c:1108 builtin/am.c:1369

2165 #, c-format

2166 msgid "unable to parse commit %s"

2167 msgstr "不能解析提交 %s"

2168

2173 -#: commit-graph.c:1367 builtin/pack-objects.c:3070

2169 +#: commit-graph.c:1370 builtin/pack-objects.c:3070

2170 #, c-format

2171 msgid "unable to get type of object %s"

2172 msgstr "無法獲得物件 %s 類型"

2173

2178 -#: commit-graph.c:1398

2174 +#: commit-graph.c:1401

2175 msgid "Loading known commits in commit graph"

2176 msgstr "正在載入提交圖中的已知提交"

2177

2182 -#: commit-graph.c:1415

2178 +#: commit-graph.c:1418

2179 msgid "Expanding reachable commits in commit graph"

2180 msgstr "正在展開提交圖中的可以取得的提交"

2181

2186 -#: commit-graph.c:1435

2182 +#: commit-graph.c:1438

2183 msgid "Clearing commit marks in commit graph"

2184 msgstr "正在清除提交圖中的提交標記"

2185

2190 -#: commit-graph.c:1454

2186 +#: commit-graph.c:1457

2187 msgid "Computing commit graph topological levels"

2188 msgstr "正在計算提交圖拓樸級別"

2189

2194 -#: commit-graph.c:1507

2190 +#: commit-graph.c:1510

2191 msgid "Computing commit graph generation numbers"

2192 msgstr "正在計算提交圖世代數字"

2193

2198 -#: commit-graph.c:1588

2194 +#: commit-graph.c:1591

2195 msgid "Computing commit changed paths Bloom filters"

2196 msgstr "正在計算提交變更路徑的布隆過濾器"

2197

2202 -#: commit-graph.c:1665

2198 +#: commit-graph.c:1668

2199 msgid "Collecting referenced commits"

2200 msgstr "正在收集引用提交"

2201

2206 -#: commit-graph.c:1690

2202 +#: commit-graph.c:1693

2203 #, c-format

2204 msgid "Finding commits for commit graph in %d pack"

2205 msgid_plural "Finding commits for commit graph in %d packs"

2206 msgstr[0] "正在 %d 個包中尋找提交圖的提交"

2207

2212 -#: commit-graph.c:1703

2208 +#: commit-graph.c:1706

2209 #, c-format

2210 msgid "error adding pack %s"

2211 msgstr "新增包 %s 發生錯誤"

2212

2217 -#: commit-graph.c:1707

2213 +#: commit-graph.c:1710

2214 #, c-format

2215 msgid "error opening index for %s"

2216 msgstr "為 %s 開啟索引發生錯誤"

2217

2222 -#: commit-graph.c:1744

2218 +#: commit-graph.c:1747

2219 msgid "Finding commits for commit graph among packed objects"

2220 msgstr "正在打包物件中尋找提交圖的提交"

2221

2226 -#: commit-graph.c:1762

2222 +#: commit-graph.c:1765

2223 msgid "Finding extra edges in commit graph"

2224 msgstr "正在尋找提交圖中額外的邊"

2225

2230 -#: commit-graph.c:1811

2226 +#: commit-graph.c:1814

2227 msgid "failed to write correct number of base graph ids"

2228 msgstr "無法寫入正確數量的基礎圖形 ID"

2229

2234 -#: commit-graph.c:1842 midx.c:1146

2230 +#: commit-graph.c:1845 midx.c:1149

2231 #, c-format

2232 msgid "unable to create leading directories of %s"

2233 msgstr "不能為 %s 建立先導目錄"

2234

2239 -#: commit-graph.c:1855

2235 +#: commit-graph.c:1858

2236 msgid "unable to create temporary graph layer"

2237 msgstr "無法建立暫時的圖形層"

2238

2243 -#: commit-graph.c:1860

2239 +#: commit-graph.c:1863

2240 #, c-format

2241 msgid "unable to adjust shared permissions for '%s'"

2242 msgstr "無法調整「%s」的共用權限"

2243

2248 -#: commit-graph.c:1917

2244 +#: commit-graph.c:1920

2245 #, c-format

2246 msgid "Writing out commit graph in %d pass"

2247 msgid_plural "Writing out commit graph in %d passes"

2248 msgstr[0] "正在用 %d 步寫出提交圖"

2249

2254 -#: commit-graph.c:1953

2250 +#: commit-graph.c:1956

2251 msgid "unable to open commit-graph chain file"

2252 msgstr "無法開啟提交圖形鏈檔案"

2253

2258 -#: commit-graph.c:1969

2254 +#: commit-graph.c:1972

2255 msgid "failed to rename base commit-graph file"

2256 msgstr "無法重新命名基礎提交圖形檔案"

2257

2262 -#: commit-graph.c:1989

2258 +#: commit-graph.c:1992

2259 msgid "failed to rename temporary commit-graph file"

2260 msgstr "無法重新命名暫時提交圖形檔案"

2261

2266 -#: commit-graph.c:2122

2262 +#: commit-graph.c:2125

2263 msgid "Scanning merged commits"

2264 msgstr "正在掃描合併提交"

2265

2270 -#: commit-graph.c:2166

2266 +#: commit-graph.c:2169

2267 msgid "Merging commit-graph"

2268 msgstr "正在合併提交圖形"

2269

2274 -#: commit-graph.c:2274

2270 +#: commit-graph.c:2277

2271 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2272 msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"

2273

2278 -#: commit-graph.c:2381

2274 +#: commit-graph.c:2384

2275 msgid "too many commits to write graph"

2276 msgstr "提交太多不能畫圖"

2277

2282 -#: commit-graph.c:2479

2278 +#: commit-graph.c:2482

2279 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2280 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

2281

2286 -#: commit-graph.c:2489

2282 +#: commit-graph.c:2492

2283 #, c-format

2284 msgid "commit-graph has incorrect OID order: %s then %s"

2285 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"

2286

2291 -#: commit-graph.c:2499 commit-graph.c:2514

2287 +#: commit-graph.c:2502 commit-graph.c:2517

2288 #, c-format

2289 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2290 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

2291

2296 -#: commit-graph.c:2506

2292 +#: commit-graph.c:2509

2293 #, c-format

2294 msgid "failed to parse commit %s from commit-graph"

2295 msgstr "無法從提交圖形中解析提交 %s"

2296

2301 -#: commit-graph.c:2524

2297 +#: commit-graph.c:2527

2298 msgid "Verifying commits in commit graph"

2299 msgstr "正在驗證提交圖中的提交"

2300

2305 -#: commit-graph.c:2539

2301 +#: commit-graph.c:2542

2302 #, c-format

2303 msgid "failed to parse commit %s from object database for commit-graph"

2304 msgstr "無法從提交圖形的物件庫中解析提交 %s"

2305

2310 -#: commit-graph.c:2546

2306 +#: commit-graph.c:2549

2307 #, c-format

2308 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2309 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"

2310

2315 -#: commit-graph.c:2556

2311 +#: commit-graph.c:2559

2312 #, c-format

2313 msgid "commit-graph parent list for commit %s is too long"

2314 msgstr "提交 %s 的提交圖形父提交列表太長了"

2315

2320 -#: commit-graph.c:2565

2316 +#: commit-graph.c:2568

2317 #, c-format

2318 msgid "commit-graph parent for %s is %s != %s"

2319 msgstr "%s 的提交圖形父提交是 %s != %s"

2320

2325 -#: commit-graph.c:2579

2321 +#: commit-graph.c:2582

2322 #, c-format

2323 msgid "commit-graph parent list for commit %s terminates early"

2324 msgstr "提交 %s 的提交圖形父提交列表過早終止"

2325

2330 -#: commit-graph.c:2584

2326 +#: commit-graph.c:2587

2327 #, c-format

2328 msgid ""

2329 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2330 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"

2331

2336 -#: commit-graph.c:2588

2332 +#: commit-graph.c:2591

2333 #, c-format

2334 msgid ""

2335 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2336 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"

2337

2342 -#: commit-graph.c:2605

2338 +#: commit-graph.c:2608

2339 #, c-format

2340 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2341 msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

2342

2347 -#: commit-graph.c:2611

2343 +#: commit-graph.c:2614

2344 #, c-format

2345 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2346 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

2347

2352 -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2353 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2348 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444

2349 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456

2350 #, c-format

2351 msgid "could not parse %s"

2352 msgstr "不能解析 %s"

@@ -2380,27 +2376,27 @@ msgstr ""

2376 "設定 \"git config advice.graftFileDeprecated false\"\n"

2377 "可關閉本消息"

2378

2383 -#: commit.c:1239

2379 +#: commit.c:1241

2380 #, c-format

2381 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2382 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"

2383

2388 -#: commit.c:1243

2384 +#: commit.c:1245

2385 #, c-format

2386 msgid "Commit %s has a bad GPG signature allegedly by %s."

2387 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"

2388

2393 -#: commit.c:1246

2389 +#: commit.c:1248

2390 #, c-format

2391 msgid "Commit %s does not have a GPG signature."

2392 msgstr "提交 %s 沒有 GPG 簽名。"

2393

2398 -#: commit.c:1249

2394 +#: commit.c:1251

2395 #, c-format

2396 msgid "Commit %s has a good GPG signature by %s\n"

2397 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"

2398

2403 -#: commit.c:1503

2399 +#: commit.c:1505

2400 msgid ""

2401 "Warning: commit message did not conform to UTF-8.\n"

2402 "You may want to amend it after fixing the message, or set the config\n"

@@ -2467,7 +2463,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s"

2463 msgid "key does not contain variable name: %s"

2464 msgstr "鍵名沒有包含變數名：%s"

2465

2470 -#: config.c:470 sequencer.c:2804

2466 +#: config.c:470 sequencer.c:2806

2467 #, c-format

2468 msgid "invalid key: %s"

2469 msgstr "無效鍵名：%s"

@@ -2618,144 +2614,144 @@ msgstr "core.commentChar 應該是一個字元"

2614 msgid "invalid mode for object creation: %s"

2615 msgstr "無效的物件建立模式：%s"

2616

2621 -#: config.c:1581

2617 +#: config.c:1584

2618 #, c-format

2619 msgid "malformed value for %s"

2620 msgstr "%s 的取值格式錯誤"

2621

2626 -#: config.c:1607

2622 +#: config.c:1610

2623 #, c-format

2624 msgid "malformed value for %s: %s"

2625 msgstr "%s 的取值格式錯誤：%s"

2626

2631 -#: config.c:1608

2627 +#: config.c:1611

2628 msgid "must be one of nothing, matching, simple, upstream or current"

2629 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"

2630

2635 -#: config.c:1669 builtin/pack-objects.c:4053

2631 +#: config.c:1672 builtin/pack-objects.c:4053

2632 #, c-format

2633 msgid "bad pack compression level %d"

2634 msgstr "錯誤的打包壓縮級別 %d"

2635

2640 -#: config.c:1792

2636 +#: config.c:1795

2637 #, c-format

2638 msgid "unable to load config blob object '%s'"

2639 msgstr "無法從資料物件 '%s' 載入設定"

2640

2645 -#: config.c:1795

2641 +#: config.c:1798

2642 #, c-format

2643 msgid "reference '%s' does not point to a blob"

2644 msgstr "引用 '%s' 沒有指向一個資料物件"

2645

2650 -#: config.c:1813

2646 +#: config.c:1816

2647 #, c-format

2648 msgid "unable to resolve config blob '%s'"

2649 msgstr "不能解析設定物件 '%s'"

2650

2655 -#: config.c:1858

2651 +#: config.c:1861

2652 #, c-format

2653 msgid "failed to parse %s"

2654 msgstr "解析 %s 失敗"

2655

2660 -#: config.c:1914

2656 +#: config.c:1917

2657 msgid "unable to parse command-line config"

2658 msgstr "無法解析指令列中的設定"

2659

2664 -#: config.c:2282

2660 +#: config.c:2285

2661 msgid "unknown error occurred while reading the configuration files"

2662 msgstr "在讀取設定檔案時遇到未知錯誤"

2663

2668 -#: config.c:2456

2664 +#: config.c:2459

2665 #, c-format

2666 msgid "Invalid %s: '%s'"

2667 msgstr "無效 %s：'%s'"

2668

2673 -#: config.c:2501

2669 +#: config.c:2504

2670 #, c-format

2671 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2672 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"

2673

2678 -#: config.c:2547

2674 +#: config.c:2550

2675 #, c-format

2676 msgid "unable to parse '%s' from command-line config"

2677 msgstr "無法解析指令列設定中的 '%s'"

2678

2683 -#: config.c:2549

2679 +#: config.c:2552

2680 #, c-format

2681 msgid "bad config variable '%s' in file '%s' at line %d"

2682 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"

2683

2688 -#: config.c:2633

2684 +#: config.c:2637

2685 #, c-format

2686 msgid "invalid section name '%s'"

2687 msgstr "無效的小節名稱 '%s'"

2688

2693 -#: config.c:2665

2689 +#: config.c:2669

2690 #, c-format

2691 msgid "%s has multiple values"

2692 msgstr "%s 有多個取值"

2693

2698 -#: config.c:2694

2694 +#: config.c:2698

2695 #, c-format

2696 msgid "failed to write new configuration file %s"

2697 msgstr "寫入新的設定檔案 %s 失敗"

2698

2703 -#: config.c:2946 config.c:3273

2699 +#: config.c:2950 config.c:3277

2700 #, c-format

2701 msgid "could not lock config file %s"

2702 msgstr "不能鎖定設定檔案 %s"

2703

2708 -#: config.c:2957

2704 +#: config.c:2961

2705 #, c-format

2706 msgid "opening %s"

2707 msgstr "開啟 %s"

2708

2713 -#: config.c:2994 builtin/config.c:361

2709 +#: config.c:2998 builtin/config.c:361

2710 #, c-format

2711 msgid "invalid pattern: %s"

2712 msgstr "無效模式：%s"

2713

2718 -#: config.c:3019

2714 +#: config.c:3023

2715 #, c-format

2716 msgid "invalid config file %s"

2717 msgstr "無效的設定檔案 %s"

2718

2723 -#: config.c:3032 config.c:3286

2719 +#: config.c:3036 config.c:3290

2720 #, c-format

2721 msgid "fstat on %s failed"

2722 msgstr "對 %s 呼叫 fstat 失敗"

2723

2728 -#: config.c:3043

2724 +#: config.c:3047

2725 #, c-format

2726 msgid "unable to mmap '%s'%s"

2727 msgstr "無法 mmap '%s'%s"

2728

2733 -#: config.c:3053 config.c:3291

2729 +#: config.c:3057 config.c:3295

2730 #, c-format

2731 msgid "chmod on %s failed"

2732 msgstr "對 %s 呼叫 chmod 失敗"

2733

2738 -#: config.c:3138 config.c:3388

2734 +#: config.c:3142 config.c:3392

2735 #, c-format

2736 msgid "could not write config file %s"

2737 msgstr "不能寫入設定檔案 %s"

2738

2743 -#: config.c:3172

2739 +#: config.c:3176

2740 #, c-format

2741 msgid "could not set '%s' to '%s'"

2742 msgstr "不能設定 '%s' 為 '%s'"

2743

2748 -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2744 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2745 #, c-format

2746 msgid "could not unset '%s'"

2747 msgstr "不能取消設定 '%s'"

2748

2753 -#: config.c:3264

2749 +#: config.c:3268

2750 #, c-format

2751 msgid "invalid section name: %s"

2752 msgstr "無效的小節名稱：%s"

2753

2758 -#: config.c:3431

2754 +#: config.c:3435

2755 #, c-format

2756 msgid "missing value for '%s'"

2757 msgstr "%s 的取值缺少"

@@ -2931,7 +2927,7 @@ msgstr "已阻止奇怪的路徑名 '%s'"

2927 msgid "unable to fork"

2928 msgstr "無法 fork"

2929

2934 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

2930 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57

2931 msgid "Checking connectivity"

2932 msgstr "正在檢查連通性"

2933

@@ -3217,18 +3213,18 @@ msgid ""

3213 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"

3214

3215 # 譯者：請維持前導空格

3220 -#: diff.c:157

3216 +#: diff.c:158

3217 #, c-format

3218 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3219 msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"

3220

3221 # 譯者：請維持前導空格

3226 -#: diff.c:162

3222 +#: diff.c:163

3223 #, c-format

3224 msgid " Unknown dirstat parameter '%s'\n"

3225 msgstr " 未知的 dirstat 參數 '%s'\n"

3226

3231 -#: diff.c:298

3227 +#: diff.c:299

3228 msgid ""

3229 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3230 "'dimmed-zebra', 'plain'"

@@ -3236,7 +3232,7 @@ msgstr ""

3232 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"

3233 "zebra'、'plain'"

3234

3239 -#: diff.c:326

3235 +#: diff.c:327

3236 #, c-format

3237 msgid ""

3238 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3245,18 +3241,18 @@ msgstr ""

3241 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"

3242 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"

3243

3248 -#: diff.c:334

3244 +#: diff.c:335

3245 msgid ""

3246 "color-moved-ws: allow-indentation-change cannot be combined with other "

3247 "whitespace modes"

3248 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"

3249

3254 -#: diff.c:411

3250 +#: diff.c:412

3251 #, c-format

3252 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

3253 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"

3254

3259 -#: diff.c:471

3255 +#: diff.c:472

3256 #, c-format

3257 msgid ""

3258 "Found errors in 'diff.dirstat' config variable:\n"

@@ -3265,47 +3261,48 @@ msgstr ""

3261 "發現設定變數 'diff.dirstat' 中的錯誤：\n"

3262 "%s"

3263

3268 -#: diff.c:4290

3264 +#: diff.c:4237

3265 #, c-format

3266 msgid "external diff died, stopping at %s"

3267 msgstr "外部 diff 離開，停止在 %s"

3268

3273 -#: diff.c:4642

3274 -msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3275 -msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3269 +#: diff.c:4589

3270 +#, c-format

3271 +msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

3272 +msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"

3273

3277 -#: diff.c:4645

3278 -msgid "-G, -S and --find-object are mutually exclusive"

3279 -msgstr "-G、-S 和 --find-object 是互斥的"

3274 +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506

3275 +#, c-format

3276 +msgid "options '%s', '%s', and '%s' cannot be used together"

3277 +msgstr "「%s」、「%s」和「%s」選項不得同時使用"

3278

3281 -#: diff.c:4648

3282 -msgid ""

3283 -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3284 -msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"

3279 +#: diff.c:4597

3280 +#, c-format

3281 +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"

3282 +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"

3283

3286 -#: diff.c:4651

3284 +#: diff.c:4601

3285 +#, c-format

3286 msgid ""

3288 -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3289 -"with -G and -S"

3290 -msgstr ""

3291 -"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"

3287 +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

3288 +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"

3289

3293 -#: diff.c:4730

3290 +#: diff.c:4681

3291 msgid "--follow requires exactly one pathspec"

3292 msgstr "--follow 明確要求只跟一個路徑規格"

3293

3297 -#: diff.c:4778

3294 +#: diff.c:4729

3295 #, c-format

3296 msgid "invalid --stat value: %s"

3297 msgstr "無效的 --stat 值：%s"

3298

3302 -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3299 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277

3300 #: parse-options.c:217 parse-options.c:221

3301 #, c-format

3302 msgid "%s expects a numerical value"

3303 msgstr "%s 期望一個數字值"

3304

3308 -#: diff.c:4815

3305 +#: diff.c:4766

3306 #, c-format

3307 msgid ""

3308 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3314,200 +3311,200 @@ msgstr ""

3311 "無法解析 --dirstat/-X 選項的參數：\n"

3312 "%s"

3313

3317 -#: diff.c:4900

3314 +#: diff.c:4851

3315 #, c-format

3316 msgid "unknown change class '%c' in --diff-filter=%s"

3317 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"

3318

3322 -#: diff.c:4924

3319 +#: diff.c:4875

3320 #, c-format

3321 msgid "unknown value after ws-error-highlight=%.*s"

3322 msgstr "ws-error-highlight=%.*s 之後未知的值"

3323

3327 -#: diff.c:4938

3324 +#: diff.c:4889

3325 #, c-format

3326 msgid "unable to resolve '%s'"

3327 msgstr "不能解析 '%s'"

3328

3332 -#: diff.c:4988 diff.c:4994

3329 +#: diff.c:4939 diff.c:4945

3330 #, c-format

3331 msgid "%s expects <n>/<m> form"

3332 msgstr "%s 期望 <n>/<m> 格式"

3333

3337 -#: diff.c:5006

3334 +#: diff.c:4957

3335 #, c-format

3336 msgid "%s expects a character, got '%s'"

3337 msgstr "%s 期望一個字元，得到 '%s'"

3338

3342 -#: diff.c:5027

3339 +#: diff.c:4978

3340 #, c-format

3341 msgid "bad --color-moved argument: %s"

3342 msgstr "壞的 --color-moved 參數：%s"

3343

3347 -#: diff.c:5046

3344 +#: diff.c:4997

3345 #, c-format

3346 msgid "invalid mode '%s' in --color-moved-ws"

3347 msgstr "--color-moved-ws 中的無效模式 '%s'"

3348

3352 -#: diff.c:5086

3349 +#: diff.c:5037

3350 msgid ""

3351 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3352 "\"histogram\""

3353 msgstr ""

3354 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3355

3359 -#: diff.c:5122 diff.c:5142

3356 +#: diff.c:5073 diff.c:5093

3357 #, c-format

3358 msgid "invalid argument to %s"

3359 msgstr "%s 的參數無效"

3360

3364 -#: diff.c:5246

3361 +#: diff.c:5197

3362 #, c-format

3363 msgid "invalid regex given to -I: '%s'"

3364 msgstr "傳入 -I 的常規表示式無效：「%s」"

3365

3369 -#: diff.c:5295

3366 +#: diff.c:5246

3367 #, c-format

3368 msgid "failed to parse --submodule option parameter: '%s'"

3369 msgstr "無法解析 --submodule 選項的參數：'%s'"

3370

3374 -#: diff.c:5351

3371 +#: diff.c:5302

3372 #, c-format

3373 msgid "bad --word-diff argument: %s"

3374 msgstr "壞的 --word-diff 參數：%s"

3375

3379 -#: diff.c:5387

3376 +#: diff.c:5338

3377 msgid "Diff output format options"

3378 msgstr "差異輸出格式化選項"

3379

3383 -#: diff.c:5389 diff.c:5395

3380 +#: diff.c:5340 diff.c:5346

3381 msgid "generate patch"

3382 msgstr "生成修補檔"

3383

3387 -#: diff.c:5392 builtin/log.c:179

3384 +#: diff.c:5343 builtin/log.c:179

3385 msgid "suppress diff output"

3386 msgstr "不顯示差異輸出"

3387

3391 -#: diff.c:5397 diff.c:5511 diff.c:5518

3388 +#: diff.c:5348 diff.c:5462 diff.c:5469

3389 msgid "<n>"

3390 msgstr "<n>"

3391

3395 -#: diff.c:5398 diff.c:5401

3392 +#: diff.c:5349 diff.c:5352

3393 msgid "generate diffs with <n> lines context"

3394 msgstr "生成含 <n> 行上下文的差異"

3395

3399 -#: diff.c:5403

3396 +#: diff.c:5354

3397 msgid "generate the diff in raw format"

3398 msgstr "生成原始格式的差異"

3399

3403 -#: diff.c:5406

3400 +#: diff.c:5357

3401 msgid "synonym for '-p --raw'"

3402 msgstr "和 '-p --raw' 同義"

3403

3407 -#: diff.c:5410

3404 +#: diff.c:5361

3405 msgid "synonym for '-p --stat'"

3406 msgstr "和 '-p --stat' 同義"

3407

3411 -#: diff.c:5414

3408 +#: diff.c:5365

3409 msgid "machine friendly --stat"

3410 msgstr "機器友好的 --stat"

3411

3415 -#: diff.c:5417

3412 +#: diff.c:5368

3413 msgid "output only the last line of --stat"

3414 msgstr "只輸出 --stat 的最後一行"

3415

3419 -#: diff.c:5419 diff.c:5427

3416 +#: diff.c:5370 diff.c:5378

3417 msgid "<param1,param2>..."

3418 msgstr "<參數1,參數2>..."

3419

3423 -#: diff.c:5420

3420 +#: diff.c:5371

3421 msgid ""

3422 "output the distribution of relative amount of changes for each sub-directory"

3423 msgstr "輸出每個子目錄相對變更的分布"

3424

3428 -#: diff.c:5424

3425 +#: diff.c:5375

3426 msgid "synonym for --dirstat=cumulative"

3427 msgstr "和 --dirstat=cumulative 同義"

3428

3432 -#: diff.c:5428

3429 +#: diff.c:5379

3430 msgid "synonym for --dirstat=files,param1,param2..."

3431 msgstr "是 --dirstat=files,param1,param2... 的同義詞"

3432

3436 -#: diff.c:5432

3433 +#: diff.c:5383

3434 msgid "warn if changes introduce conflict markers or whitespace errors"

3435 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"

3436

3440 -#: diff.c:5435

3437 +#: diff.c:5386

3438 msgid "condensed summary such as creations, renames and mode changes"

3439 msgstr "精簡摘要，例如建立、重新命名和模式變更"

3440

3444 -#: diff.c:5438

3441 +#: diff.c:5389

3442 msgid "show only names of changed files"

3443 msgstr "只顯示變更檔案的檔案名"

3444

3448 -#: diff.c:5441

3445 +#: diff.c:5392

3446 msgid "show only names and status of changed files"

3447 msgstr "只顯示變更檔案的檔案名和狀態"

3448

3452 -#: diff.c:5443

3449 +#: diff.c:5394

3450 msgid "<width>[,<name-width>[,<count>]]"

3451 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

3452

3456 -#: diff.c:5444

3453 +#: diff.c:5395

3454 msgid "generate diffstat"

3455 msgstr "生成差異統計（diffstat）"

3456

3460 -#: diff.c:5446 diff.c:5449 diff.c:5452

3457 +#: diff.c:5397 diff.c:5400 diff.c:5403

3458 msgid "<width>"

3459 msgstr "<寬度>"

3460

3464 -#: diff.c:5447

3461 +#: diff.c:5398

3462 msgid "generate diffstat with a given width"

3463 msgstr "使用提供的長度生成差異統計"

3464

3468 -#: diff.c:5450

3465 +#: diff.c:5401

3466 msgid "generate diffstat with a given name width"

3467 msgstr "使用提供的檔案名長度生成差異統計"

3468

3472 -#: diff.c:5453

3469 +#: diff.c:5404

3470 msgid "generate diffstat with a given graph width"

3471 msgstr "使用提供的圖形長度生成差異統計"

3472

3476 -#: diff.c:5455

3473 +#: diff.c:5406

3474 msgid "<count>"

3475 msgstr "<次數>"

3476

3480 -#: diff.c:5456

3477 +#: diff.c:5407

3478 msgid "generate diffstat with limited lines"

3479 msgstr "生成有限行數的差異統計"

3480

3484 -#: diff.c:5459

3481 +#: diff.c:5410

3482 msgid "generate compact summary in diffstat"

3483 msgstr "生成差異統計的簡潔摘要"

3484

3488 -#: diff.c:5462

3485 +#: diff.c:5413

3486 msgid "output a binary diff that can be applied"

3487 msgstr "輸出一個可以套用的二進位差異"

3488

3492 -#: diff.c:5465

3489 +#: diff.c:5416

3490 msgid "show full pre- and post-image object names on the \"index\" lines"

3491 msgstr "在 \"index\" 行顯示完整的前後物件名稱"

3492

3496 -#: diff.c:5467

3493 +#: diff.c:5418

3494 msgid "show colored diff"

3495 msgstr "顯示帶顏色的差異"

3496

3500 -#: diff.c:5468

3497 +#: diff.c:5419

3498 msgid "<kind>"

3499 msgstr "<類型>"

3500

3504 -#: diff.c:5469

3501 +#: diff.c:5420

3502 msgid ""

3503 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3504 "diff"

3505 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"

3506

3510 -#: diff.c:5472

3507 +#: diff.c:5423

3508 msgid ""

3509 "do not munge pathnames and use NULs as output field terminators in --raw or "

3510 "--numstat"

@@ -3515,311 +3512,311 @@ msgstr ""

3512 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

3513 "符"

3514

3518 -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3515 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541

3516 msgid "<prefix>"

3517 msgstr "<前綴>"

3518

3522 -#: diff.c:5476

3519 +#: diff.c:5427

3520 msgid "show the given source prefix instead of \"a/\""

3521 msgstr "顯示提供的來源前綴，而非 \"a/\""

3522

3526 -#: diff.c:5479

3523 +#: diff.c:5430

3524 msgid "show the given destination prefix instead of \"b/\""

3525 msgstr "顯示提供的目的地前綴取代 \"b/\""

3526

3530 -#: diff.c:5482

3527 +#: diff.c:5433

3528 msgid "prepend an additional prefix to every line of output"

3529 msgstr "輸出的每一行附加前綴"

3530

3534 -#: diff.c:5485

3531 +#: diff.c:5436

3532 msgid "do not show any source or destination prefix"

3533 msgstr "不顯示任何來源和目的地前綴"

3534

3538 -#: diff.c:5488

3535 +#: diff.c:5439

3536 msgid "show context between diff hunks up to the specified number of lines"

3537 msgstr "顯示指定行數的差異區塊間的上下文"

3538

3542 -#: diff.c:5492 diff.c:5497 diff.c:5502

3539 +#: diff.c:5443 diff.c:5448 diff.c:5453

3540 msgid "<char>"

3541 msgstr "<字元>"

3542

3546 -#: diff.c:5493

3543 +#: diff.c:5444

3544 msgid "specify the character to indicate a new line instead of '+'"

3545 msgstr "指定一個字元取代 '+' 來表示新的一行"

3546

3550 -#: diff.c:5498

3547 +#: diff.c:5449

3548 msgid "specify the character to indicate an old line instead of '-'"

3549 msgstr "指定一個字元取代 '-' 來表示舊的一行"

3550

3554 -#: diff.c:5503

3551 +#: diff.c:5454

3552 msgid "specify the character to indicate a context instead of ' '"

3553 msgstr "指定一個字元取代 ' ' 來表示一行上下文"

3554

3558 -#: diff.c:5506

3555 +#: diff.c:5457

3556 msgid "Diff rename options"

3557 msgstr "差異重新命名選項"

3558

3562 -#: diff.c:5507

3559 +#: diff.c:5458

3560 msgid "<n>[/<m>]"

3561 msgstr "<n>[/<m>]"

3562

3566 -#: diff.c:5508

3563 +#: diff.c:5459

3564 msgid "break complete rewrite changes into pairs of delete and create"

3565 msgstr "將完全重寫的變更打破為成對的刪除和建立"

3566

3570 -#: diff.c:5512

3567 +#: diff.c:5463

3568 msgid "detect renames"

3569 msgstr "檢測重新命名"

3570

3574 -#: diff.c:5516

3571 +#: diff.c:5467

3572 msgid "omit the preimage for deletes"

3573 msgstr "省略刪除變更的差異輸出"

3574

3578 -#: diff.c:5519

3575 +#: diff.c:5470

3576 msgid "detect copies"

3577 msgstr "檢測複製"

3578

3582 -#: diff.c:5523

3579 +#: diff.c:5474

3580 msgid "use unmodified files as source to find copies"

3581 msgstr "使用未修改的檔案做為發現拷貝的來源"

3582

3586 -#: diff.c:5525

3583 +#: diff.c:5476

3584 msgid "disable rename detection"

3585 msgstr "停用重新命名偵測"

3586

3590 -#: diff.c:5528

3587 +#: diff.c:5479

3588 msgid "use empty blobs as rename source"

3589 msgstr "使用空的資料物件做為重新命名的來源"

3590

3594 -#: diff.c:5530

3591 +#: diff.c:5481

3592 msgid "continue listing the history of a file beyond renames"

3593 msgstr "繼續列出檔案重新命名以外的歷史記錄"

3594

3598 -#: diff.c:5533

3595 +#: diff.c:5484

3596 msgid ""

3597 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3598 "given limit"

3599 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"

3600

3604 -#: diff.c:5535

3601 +#: diff.c:5486

3602 msgid "Diff algorithm options"

3603 msgstr "差異演算法選項"

3604

3608 -#: diff.c:5537

3605 +#: diff.c:5488

3606 msgid "produce the smallest possible diff"

3607 msgstr "生成儘可能小的差異"

3608

3612 -#: diff.c:5540

3609 +#: diff.c:5491

3610 msgid "ignore whitespace when comparing lines"

3611 msgstr "行比較時忽略空白字元"

3612

3616 -#: diff.c:5543

3613 +#: diff.c:5494

3614 msgid "ignore changes in amount of whitespace"

3615 msgstr "忽略空白字元的變更"

3616

3620 -#: diff.c:5546

3617 +#: diff.c:5497

3618 msgid "ignore changes in whitespace at EOL"

3619 msgstr "忽略行尾的空白字元變更"

3620

3624 -#: diff.c:5549

3621 +#: diff.c:5500

3622 msgid "ignore carrier-return at the end of line"

3623 msgstr "忽略行尾的Enter符（CR）"

3624

3628 -#: diff.c:5552

3625 +#: diff.c:5503

3626 msgid "ignore changes whose lines are all blank"

3627 msgstr "忽略整行都是空白的變更"

3628

3632 -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3629 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575

3630 msgid "<regex>"

3631 msgstr "<正則>"

3632

3636 -#: diff.c:5555

3633 +#: diff.c:5506

3634 msgid "ignore changes whose all lines match <regex>"

3635 msgstr "忽略整行符合 <regex> 的變更"

3636

3640 -#: diff.c:5558

3637 +#: diff.c:5509

3638 msgid "heuristic to shift diff hunk boundaries for easy reading"

3639 msgstr "啟發式轉換差異邊界以便閱讀"

3640

3644 -#: diff.c:5561

3641 +#: diff.c:5512

3642 msgid "generate diff using the \"patience diff\" algorithm"

3643 msgstr "使用 \"patience diff\" 演算法生成差異"

3644

3648 -#: diff.c:5565

3645 +#: diff.c:5516

3646 msgid "generate diff using the \"histogram diff\" algorithm"

3647 msgstr "使用 \"histogram diff\" 演算法生成差異"

3648

3652 -#: diff.c:5567

3649 +#: diff.c:5518

3650 msgid "<algorithm>"

3651 msgstr "<演算法>"

3652

3656 -#: diff.c:5568

3653 +#: diff.c:5519

3654 msgid "choose a diff algorithm"

3655 msgstr "選擇一個差異演算法"

3656

3660 -#: diff.c:5570

3657 +#: diff.c:5521

3658 msgid "<text>"

3659 msgstr "<文字>"

3660

3664 -#: diff.c:5571

3661 +#: diff.c:5522

3662 msgid "generate diff using the \"anchored diff\" algorithm"

3663 msgstr "使用 \"anchored diff\" 演算法生成差異"

3664

3668 -#: diff.c:5573 diff.c:5582 diff.c:5585

3665 +#: diff.c:5524 diff.c:5533 diff.c:5536

3666 msgid "<mode>"

3667 msgstr "<模式>"

3668

3672 -#: diff.c:5574

3669 +#: diff.c:5525

3670 msgid "show word diff, using <mode> to delimit changed words"

3671 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"

3672

3676 -#: diff.c:5577

3673 +#: diff.c:5528

3674 msgid "use <regex> to decide what a word is"

3675 msgstr "使用 <常規表示式> 確定何為一個詞"

3676

3680 -#: diff.c:5580

3677 +#: diff.c:5531

3678 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3679 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"

3680

3684 -#: diff.c:5583

3681 +#: diff.c:5534

3682 msgid "moved lines of code are colored differently"

3683 msgstr "移動的程式碼行用不同方式著色"

3684

3688 -#: diff.c:5586

3685 +#: diff.c:5537

3686 msgid "how white spaces are ignored in --color-moved"

3687 msgstr "在 --color-moved 下如何忽略空白字元"

3688

3692 -#: diff.c:5589

3689 +#: diff.c:5540

3690 msgid "Other diff options"

3691 msgstr "其它差異選項"

3692

3696 -#: diff.c:5591

3693 +#: diff.c:5542

3694 msgid "when run from subdir, exclude changes outside and show relative paths"

3695 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"

3696

3700 -#: diff.c:5595

3697 +#: diff.c:5546

3698 msgid "treat all files as text"

3699 msgstr "把所有檔案當做文字處理"

3700

3704 -#: diff.c:5597

3701 +#: diff.c:5548

3702 msgid "swap two inputs, reverse the diff"

3703 msgstr "交換兩個輸入，反轉差異"

3704

3708 -#: diff.c:5599

3705 +#: diff.c:5550

3706 msgid "exit with 1 if there were differences, 0 otherwise"

3707 msgstr "有差異時離開碼為 1，否則為 0"

3708

3712 -#: diff.c:5601

3709 +#: diff.c:5552

3710 msgid "disable all output of the program"

3711 msgstr "停用本程式的所有輸出"

3712

3716 -#: diff.c:5603

3713 +#: diff.c:5554

3714 msgid "allow an external diff helper to be executed"

3715 msgstr "允許執行一個外部的差異協助工具"

3716

3720 -#: diff.c:5605

3717 +#: diff.c:5556

3718 msgid "run external text conversion filters when comparing binary files"

3719 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"

3720

3724 -#: diff.c:5607

3721 +#: diff.c:5558

3722 msgid "<when>"

3723 msgstr "<何時>"

3724

3728 -#: diff.c:5608

3725 +#: diff.c:5559

3726 msgid "ignore changes to submodules in the diff generation"

3727 msgstr "在生成差異時，忽略子模組的更改"

3728

3732 -#: diff.c:5611

3729 +#: diff.c:5562

3730 msgid "<format>"

3731 msgstr "<格式>"

3732

3736 -#: diff.c:5612

3733 +#: diff.c:5563

3734 msgid "specify how differences in submodules are shown"

3735 msgstr "指定子模組的差異如何顯示"

3736

3740 -#: diff.c:5616

3737 +#: diff.c:5567

3738 msgid "hide 'git add -N' entries from the index"

3739 msgstr "隱藏索引中 'git add -N' 條目"

3740

3744 -#: diff.c:5619

3741 +#: diff.c:5570

3742 msgid "treat 'git add -N' entries as real in the index"

3743 msgstr "將索引中 'git add -N' 條目當做真實的"

3744

3748 -#: diff.c:5621

3745 +#: diff.c:5572

3746 msgid "<string>"

3747 msgstr "<字串>"

3748

3752 -#: diff.c:5622

3749 +#: diff.c:5573

3750 msgid ""

3751 "look for differences that change the number of occurrences of the specified "

3752 "string"

3753 msgstr "尋找改變了指定字串出現次數的差異"

3754

3758 -#: diff.c:5625

3755 +#: diff.c:5576

3756 msgid ""

3757 "look for differences that change the number of occurrences of the specified "

3758 "regex"

3759 msgstr "尋找改變指定正則符合出現次數的差異"

3760

3764 -#: diff.c:5628

3761 +#: diff.c:5579

3762 msgid "show all changes in the changeset with -S or -G"

3763 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"

3764

3768 -#: diff.c:5631

3765 +#: diff.c:5582

3766 msgid "treat <string> in -S as extended POSIX regular expression"

3767 msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"

3768

3772 -#: diff.c:5634

3769 +#: diff.c:5585

3770 msgid "control the order in which files appear in the output"

3771 msgstr "控制輸出中的檔案顯示順序"

3772

3776 -#: diff.c:5635 diff.c:5638

3773 +#: diff.c:5586 diff.c:5589

3774 msgid "<path>"

3775 msgstr "<路徑>"

3776

3780 -#: diff.c:5636

3777 +#: diff.c:5587

3778 msgid "show the change in the specified path first"

3779 msgstr "先顯示指定路徑的變更"

3780

3784 -#: diff.c:5639

3781 +#: diff.c:5590

3782 msgid "skip the output to the specified path"

3783 msgstr "略過輸出至指定路徑"

3784

3788 -#: diff.c:5641

3785 +#: diff.c:5592

3786 msgid "<object-id>"

3787 msgstr "<物件 ID>"

3788

3792 -#: diff.c:5642

3789 +#: diff.c:5593

3790 msgid ""

3791 "look for differences that change the number of occurrences of the specified "

3792 "object"

3793 msgstr "尋找改變指定物件出現次數的差異"

3794

3798 -#: diff.c:5644

3795 +#: diff.c:5595

3796 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3797 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3798

3802 -#: diff.c:5645

3799 +#: diff.c:5596

3800 msgid "select files by diff type"

3801 msgstr "透過差異類型選擇檔案"

3802

3806 -#: diff.c:5647

3803 +#: diff.c:5598

3804 msgid "<file>"

3805 msgstr "<檔案>"

3806

3810 -#: diff.c:5648

3807 +#: diff.c:5599

3808 msgid "Output to a specific file"

3809 msgstr "輸出到一個指定的檔案"

3810

3814 -#: diff.c:6306

3811 +#: diff.c:6257

3812 msgid "exhaustive rename detection was skipped due to too many files."

3813 msgstr "因為檔案太多，已略過詳細重新命名偵測。"

3814

3818 -#: diff.c:6309

3815 +#: diff.c:6260

3816 msgid "only found copies from modified paths due to too many files."

3817 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"

3818

3822 -#: diff.c:6312

3819 +#: diff.c:6263

3820 #, c-format

3821 msgid ""

3822 "you may want to set your %s variable to at least %d and retry the command."

@@ -3859,29 +3856,29 @@ msgstr "無法識別反向模式：「%s」"

3856 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3857 msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"

3858

3862 -#: dir.c:830

3859 +#: dir.c:828

3860 msgid "disabling cone pattern matching"

3861 msgstr "停用 cone 樣式符合模式"

3862

3866 -#: dir.c:1214

3863 +#: dir.c:1212

3864 #, c-format

3865 msgid "cannot use %s as an exclude file"

3866 msgstr "不能將 %s 用作排除檔案"

3867

3871 -#: dir.c:2464

3868 +#: dir.c:2418

3869 #, c-format

3870 msgid "could not open directory '%s'"

3871 msgstr "不能開啟目錄 '%s'"

3872

3876 -#: dir.c:2766

3873 +#: dir.c:2720

3874 msgid "failed to get kernel name and information"

3875 msgstr "無法獲得核心名稱和訊息"

3876

3880 -#: dir.c:2890

3877 +#: dir.c:2844

3878 msgid "untracked cache is disabled on this system or location"

3879 msgstr "快取未追蹤檔案在本系統或位置中被停用"

3880

3884 -#: dir.c:3158

3881 +#: dir.c:3112

3882 msgid ""

3883 "No directory name could be guessed.\n"

3884 "Please specify a directory on the command line"

@@ -3889,36 +3886,36 @@ msgstr ""

3886 "無法猜到目錄名。\n"

3887 "請在指令列指定一個目錄"

3888

3892 -#: dir.c:3837

3889 +#: dir.c:3800

3890 #, c-format

3891 msgid "index file corrupt in repo %s"

3892 msgstr "版本庫 %s 中的索引檔案損壞"

3893

3897 -#: dir.c:3884 dir.c:3889

3894 +#: dir.c:3847 dir.c:3852

3895 #, c-format

3896 msgid "could not create directories for %s"

3897 msgstr "不能為 %s 建立目錄"

3898

3902 -#: dir.c:3918

3899 +#: dir.c:3881

3900 #, c-format

3901 msgid "could not migrate git directory from '%s' to '%s'"

3902 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

3903

3907 -#: editor.c:77

3904 +#: editor.c:74

3905 #, c-format

3906 msgid "hint: Waiting for your editor to close the file...%c"

3907 msgstr "提示：等待您的編輯器關閉檔案...%c"

3908

3912 -#: entry.c:177

3909 +#: entry.c:179

3910 msgid "Filtering content"

3911 msgstr "過濾內容"

3912

3916 -#: entry.c:498

3913 +#: entry.c:500

3914 #, c-format

3915 msgid "could not stat file '%s'"

3916 msgstr "不能對檔案 '%s' 呼叫 stat"

3917

3921 -#: environment.c:143

3918 +#: environment.c:145

3919 #, c-format

3920 msgid "bad git namespace path \"%s\""

3921 msgstr "錯誤的 git 名字空間路徑 \"%s\""

@@ -3928,278 +3925,274 @@ msgstr "錯誤的 git 名字空間路徑 \"%s\""

3925 msgid "too many args to run %s"

3926 msgstr "執行 %s 的參數太多"

3927

3931 -#: fetch-pack.c:193

3928 +#: fetch-pack.c:194

3929 msgid "git fetch-pack: expected shallow list"

3930 msgstr "git fetch-pack：應為 shallow 列表"

3931

3935 -#: fetch-pack.c:196

3932 +#: fetch-pack.c:197

3933 msgid "git fetch-pack: expected a flush packet after shallow list"

3934 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"

3935

3939 -#: fetch-pack.c:207

3936 +#: fetch-pack.c:208

3937 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3938 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"

3939

3943 -#: fetch-pack.c:227

3940 +#: fetch-pack.c:228

3941 #, c-format

3942 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3943 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"

3944

3948 -#: fetch-pack.c:238

3945 +#: fetch-pack.c:239

3946 msgid "unable to write to remote"

3947 msgstr "無法寫到遠端"

3948

3952 -#: fetch-pack.c:299

3953 -msgid "--stateless-rpc requires multi_ack_detailed"

3954 -msgstr "--stateless-rpc 需要 multi_ack_detailed"

3955 -

3956 -#: fetch-pack.c:394 fetch-pack.c:1434

3949 +#: fetch-pack.c:395 fetch-pack.c:1439

3950 #, c-format

3951 msgid "invalid shallow line: %s"

3952 msgstr "無效的 shallow 訊息：%s"

3953

3961 -#: fetch-pack.c:400 fetch-pack.c:1440

3954 +#: fetch-pack.c:401 fetch-pack.c:1445

3955 #, c-format

3956 msgid "invalid unshallow line: %s"

3957 msgstr "無效的 unshallow 訊息：%s"

3958

3966 -#: fetch-pack.c:402 fetch-pack.c:1442

3959 +#: fetch-pack.c:403 fetch-pack.c:1447

3960 #, c-format

3961 msgid "object not found: %s"

3962 msgstr "物件未找到：%s"

3963

3971 -#: fetch-pack.c:405 fetch-pack.c:1445

3964 +#: fetch-pack.c:406 fetch-pack.c:1450

3965 #, c-format

3966 msgid "error in object: %s"

3967 msgstr "物件中發生錯誤：%s"

3968

3976 -#: fetch-pack.c:407 fetch-pack.c:1447

3969 +#: fetch-pack.c:408 fetch-pack.c:1452

3970 #, c-format

3971 msgid "no shallow found: %s"

3972 msgstr "未發現 shallow：%s"

3973

3981 -#: fetch-pack.c:410 fetch-pack.c:1451

3974 +#: fetch-pack.c:411 fetch-pack.c:1456

3975 #, c-format

3976 msgid "expected shallow/unshallow, got %s"

3977 msgstr "應為 shallow/unshallow，卻得到 %s"

3978

3986 -#: fetch-pack.c:450

3979 +#: fetch-pack.c:451

3980 #, c-format

3981 msgid "got %s %d %s"

3982 msgstr "得到 %s %d %s"

3983

3991 -#: fetch-pack.c:467

3984 +#: fetch-pack.c:468

3985 #, c-format

3986 msgid "invalid commit %s"

3987 msgstr "無效提交 %s"

3988

3996 -#: fetch-pack.c:498

3989 +#: fetch-pack.c:499

3990 msgid "giving up"

3991 msgstr "放棄"

3992

4000 -#: fetch-pack.c:511 progress.c:339

3993 +#: fetch-pack.c:512 progress.c:339

3994 msgid "done"

3995 msgstr "完成"

3996

4004 -#: fetch-pack.c:523

3997 +#: fetch-pack.c:524

3998 #, c-format

3999 msgid "got %s (%d) %s"

4000 msgstr "得到 %s (%d) %s"

4001

4009 -#: fetch-pack.c:559

4002 +#: fetch-pack.c:560

4003 #, c-format

4004 msgid "Marking %s as complete"

4005 msgstr "標記 %s 為完成"

4006

4014 -#: fetch-pack.c:774

4007 +#: fetch-pack.c:775

4008 #, c-format

4009 msgid "already have %s (%s)"

4010 msgstr "已經有 %s（%s）"

4011

4019 -#: fetch-pack.c:860

4012 +#: fetch-pack.c:861

4013 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4014 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

4015

4023 -#: fetch-pack.c:868

4016 +#: fetch-pack.c:869

4017 msgid "protocol error: bad pack header"

4018 msgstr "協定錯誤：壞的包頭"

4019

4027 -#: fetch-pack.c:962

4020 +#: fetch-pack.c:965

4021 #, c-format

4022 msgid "fetch-pack: unable to fork off %s"

4023 msgstr "fetch-pack：無法 fork %s 處理程序"

4024

4032 -#: fetch-pack.c:968

4025 +#: fetch-pack.c:971

4026 msgid "fetch-pack: invalid index-pack output"

4027 msgstr "fetch-pack：無效的 index-pack 輸出"

4028

4036 -#: fetch-pack.c:985

4029 +#: fetch-pack.c:988

4030 #, c-format

4031 msgid "%s failed"

4032 msgstr "%s 失敗"

4033

4041 -#: fetch-pack.c:987

4034 +#: fetch-pack.c:990

4035 msgid "error in sideband demultiplexer"

4036 msgstr "sideband 多路輸出發生錯誤"

4037

4045 -#: fetch-pack.c:1030

4038 +#: fetch-pack.c:1035

4039 #, c-format

4040 msgid "Server version is %.*s"

4041 msgstr "伺服器版本 %.*s"

4042

4050 -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4051 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4052 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4053 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4043 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058

4044 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4045 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090

4046 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112

4047 #, c-format

4048 msgid "Server supports %s"

4049 msgstr "伺服器支援 %s"

4050

4058 -#: fetch-pack.c:1040

4051 +#: fetch-pack.c:1045

4052 msgid "Server does not support shallow clients"

4053 msgstr "伺服器不支援 shallow 用戶端"

4054

4062 -#: fetch-pack.c:1100

4055 +#: fetch-pack.c:1105

4056 msgid "Server does not support --shallow-since"

4057 msgstr "伺服器不支援 --shallow-since"

4058

4066 -#: fetch-pack.c:1105

4059 +#: fetch-pack.c:1110

4060 msgid "Server does not support --shallow-exclude"

4061 msgstr "伺服器不支援 --shallow-exclude"

4062

4070 -#: fetch-pack.c:1109

4063 +#: fetch-pack.c:1114

4064 msgid "Server does not support --deepen"

4065 msgstr "伺服器不支援 --deepen"

4066

4074 -#: fetch-pack.c:1111

4067 +#: fetch-pack.c:1116

4068 msgid "Server does not support this repository's object format"

4069 msgstr "伺服器不支援此版本庫的物件格式"

4070

4078 -#: fetch-pack.c:1124

4071 +#: fetch-pack.c:1129

4072 msgid "no common commits"

4073 msgstr "沒有共同的提交"

4074

4082 -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4075 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130

4076 msgid "source repository is shallow, reject to clone."

4077 msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"

4078

4086 -#: fetch-pack.c:1139 fetch-pack.c:1671

4079 +#: fetch-pack.c:1144 fetch-pack.c:1681

4080 msgid "git fetch-pack: fetch failed."

4081 msgstr "git fetch-pack：取得失敗。"

4082

4090 -#: fetch-pack.c:1253

4083 +#: fetch-pack.c:1258

4084 #, c-format

4085 msgid "mismatched algorithms: client %s; server %s"

4086 msgstr "算法不一致：用戶端 %s；伺服器 %s"

4087

4095 -#: fetch-pack.c:1257

4088 +#: fetch-pack.c:1262

4089 #, c-format

4090 msgid "the server does not support algorithm '%s'"

4091 msgstr "伺服器不支援「%s」算法"

4092

4100 -#: fetch-pack.c:1290

4093 +#: fetch-pack.c:1295

4094 msgid "Server does not support shallow requests"

4095 msgstr "伺服器不支援 shallow 請求"

4096

4104 -#: fetch-pack.c:1297

4097 +#: fetch-pack.c:1302

4098 msgid "Server supports filter"

4099 msgstr "伺服器支援 filter"

4100

4108 -#: fetch-pack.c:1340 fetch-pack.c:2053

4101 +#: fetch-pack.c:1345 fetch-pack.c:2063

4102 msgid "unable to write request to remote"

4103 msgstr "無法將請求寫到遠端"

4104

4112 -#: fetch-pack.c:1358

4105 +#: fetch-pack.c:1363

4106 #, c-format

4107 msgid "error reading section header '%s'"

4108 msgstr "讀取節標題 '%s' 發生錯誤"

4109

4117 -#: fetch-pack.c:1364

4110 +#: fetch-pack.c:1369

4111 #, c-format

4112 msgid "expected '%s', received '%s'"

4113 msgstr "預期 '%s'，得到 '%s'"

4114

4122 -#: fetch-pack.c:1398

4115 +#: fetch-pack.c:1403

4116 #, c-format

4117 msgid "unexpected acknowledgment line: '%s'"

4118 msgstr "意外的確認行：'%s'"

4119

4127 -#: fetch-pack.c:1403

4120 +#: fetch-pack.c:1408

4121 #, c-format

4122 msgid "error processing acks: %d"

4123 msgstr "處理 ack 發生錯誤：%d"

4124

4132 -#: fetch-pack.c:1413

4125 +#: fetch-pack.c:1418

4126 msgid "expected packfile to be sent after 'ready'"

4127 msgstr "預期在 'ready' 之後傳送 packfile"

4128

4136 -#: fetch-pack.c:1415

4129 +#: fetch-pack.c:1420

4130 msgid "expected no other sections to be sent after no 'ready'"

4131 msgstr "在沒有 'ready' 不應該傳送其它小節"

4132

4140 -#: fetch-pack.c:1456

4133 +#: fetch-pack.c:1461

4134 #, c-format

4135 msgid "error processing shallow info: %d"

4136 msgstr "處理淺複製訊息發生錯誤：%d"

4137

4145 -#: fetch-pack.c:1505

4138 +#: fetch-pack.c:1510

4139 #, c-format

4140 msgid "expected wanted-ref, got '%s'"

4141 msgstr "預期 wanted-ref，得到 '%s'"

4142

4150 -#: fetch-pack.c:1510

4143 +#: fetch-pack.c:1515

4144 #, c-format

4145 msgid "unexpected wanted-ref: '%s'"

4146 msgstr "意外的 wanted-ref：'%s'"

4147

4155 -#: fetch-pack.c:1515

4148 +#: fetch-pack.c:1520

4149 #, c-format

4150 msgid "error processing wanted refs: %d"

4151 msgstr "處理要取得的引用發生錯誤：%d"

4152

4160 -#: fetch-pack.c:1545

4153 +#: fetch-pack.c:1550

4154 msgid "git fetch-pack: expected response end packet"

4155 msgstr "git fetch-pack: 預期要有回應結束封包"

4156

4164 -#: fetch-pack.c:1949

4157 +#: fetch-pack.c:1959

4158 msgid "no matching remote head"

4159 msgstr "沒有符合的遠端分支"

4160

4168 -#: fetch-pack.c:1972 builtin/clone.c:581

4161 +#: fetch-pack.c:1982 builtin/clone.c:581

4162 msgid "remote did not send all necessary objects"

4163 msgstr "遠端沒有傳送所有必需的物件"

4164

4172 -#: fetch-pack.c:2075

4165 +#: fetch-pack.c:2085

4166 msgid "unexpected 'ready' from remote"

4167 msgstr "從遠端收到非預期的 ‘ready’"

4168

4176 -#: fetch-pack.c:2098

4169 +#: fetch-pack.c:2108

4170 #, c-format

4171 msgid "no such remote ref %s"

4172 msgstr "沒有這樣的遠端引用 %s"

4173

4181 -#: fetch-pack.c:2101

4174 +#: fetch-pack.c:2111

4175 #, c-format

4176 msgid "Server does not allow request for unadvertised object %s"

4177 msgstr "伺服器不允許請求未公開的物件 %s"

4178

4186 -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4187 -#: gpg-interface.c:918

4179 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974

4180 +#: gpg-interface.c:990

4181 msgid "could not create temporary file"

4182 msgstr "不能建立暫存檔"

4183

4191 -#: gpg-interface.c:332 gpg-interface.c:454

4184 +#: gpg-interface.c:332 gpg-interface.c:460

4185 #, c-format

4186 msgid "failed writing detached signature to '%s'"

4187 msgstr "無法將分離式簽名寫入 '%s'"

4188

4196 -#: gpg-interface.c:445

4189 +#: gpg-interface.c:451

4190 msgid ""

4191 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4192 "signature verification"

4193 msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"

4194

4202 -#: gpg-interface.c:469

4195 +#: gpg-interface.c:480

4196 msgid ""

4197 "ssh-keygen -Y find-principals/verify is needed for ssh signature "

4198 "verification (available in openssh version 8.2p1+)"

@@ -4207,61 +4200,61 @@ msgstr ""

4200 "SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ "

4201 "版本使用）"

4202

4210 -#: gpg-interface.c:523

4203 +#: gpg-interface.c:536

4204 #, c-format

4205 msgid "ssh signing revocation file configured but not found: %s"

4206 msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"

4207

4215 -#: gpg-interface.c:576

4208 +#: gpg-interface.c:624

4209 #, c-format

4210 msgid "bad/incompatible signature '%s'"

4211 msgstr "簽名「%s」損壞或者不相容"

4212

4220 -#: gpg-interface.c:735 gpg-interface.c:740

4213 +#: gpg-interface.c:801 gpg-interface.c:806

4214 #, c-format

4215 msgid "failed to get the ssh fingerprint for key '%s'"

4216 msgstr "無法取得「%s」金鑰的 SSH 指紋"

4217

4225 -#: gpg-interface.c:762

4218 +#: gpg-interface.c:829

4219 msgid ""

4220 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4221 msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"

4222

4230 -#: gpg-interface.c:780

4223 +#: gpg-interface.c:851

4224 #, c-format

4225 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4226 msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"

4227

4235 -#: gpg-interface.c:786

4228 +#: gpg-interface.c:857

4229 #, c-format

4230 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4231 msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"

4232

4240 -#: gpg-interface.c:874

4233 +#: gpg-interface.c:945

4234 msgid "gpg failed to sign the data"

4235 msgstr "gpg 無法為資料簽名"

4236

4244 -#: gpg-interface.c:895

4237 +#: gpg-interface.c:967

4238 msgid "user.signingkey needs to be set for ssh signing"

4239 msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"

4240

4248 -#: gpg-interface.c:906

4241 +#: gpg-interface.c:978

4242 #, c-format

4243 msgid "failed writing ssh signing key to '%s'"

4244 msgstr "無法將 SSH 簽名金鑰寫入「%s」"

4245

4253 -#: gpg-interface.c:924

4246 +#: gpg-interface.c:996

4247 #, c-format

4248 msgid "failed writing ssh signing key buffer to '%s'"

4249 msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"

4250

4258 -#: gpg-interface.c:942

4251 +#: gpg-interface.c:1014

4252 msgid ""

4253 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4254 "8.2p1+)"

4255 msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）"

4256

4264 -#: gpg-interface.c:954

4257 +#: gpg-interface.c:1026

4258 #, c-format

4259 msgid "failed reading ssh signing data buffer from '%s'"

4260 msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"

@@ -4271,7 +4264,7 @@ msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"

4264 msgid "ignored invalid color '%.*s' in log.graphColors"

4265 msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"

4266

4274 -#: grep.c:533

4267 +#: grep.c:531

4268 msgid ""

4269 "given pattern contains NULL byte (via -f <file>). This is only supported "

4270 "with -P under PCRE v2"

@@ -4279,18 +4272,18 @@ msgstr ""

4272 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"

4273 "功能"

4274

4282 -#: grep.c:1928

4275 +#: grep.c:1942

4276 #, c-format

4277 msgid "'%s': unable to read %s"

4278 msgstr "'%s'：無法讀取 %s"

4279

4287 -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4280 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90

4281 #: builtin/rm.c:136

4282 #, c-format

4283 msgid "failed to stat '%s'"

4284 msgstr "對 '%s' 呼叫 stat 失敗"

4285

4293 -#: grep.c:1956

4286 +#: grep.c:1970

4287 #, c-format

4288 msgid "'%s': short read"

4289 msgstr "'%s'：讀取不完整"

@@ -4411,8 +4404,8 @@ msgstr "假定你想要的是 '%s' 並繼續。"

4404

4405 #: help.c:646

4406 #, c-format

4414 -msgid "Run '%s' instead? (y/N)"

4415 -msgstr "改執行「%s」？(y/N)"

4407 +msgid "Run '%s' instead [y/N]? "

4408 +msgstr "改執行「%s」[y/N]？ "

4409

4410 #: help.c:654

4411 #, c-format

@@ -4628,7 +4621,7 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4621 msgid "quoted CRLF detected"

4622 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"

4623

4631 -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4624 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46

4625 #, c-format

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

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

@@ -4851,7 +4844,7 @@ msgstr "子模組"

4844 msgid "CONFLICT (%s): Merge conflict in %s"

4845 msgstr "衝突（%s）：合併衝突於 %s"

4846

4854 -#: merge-ort.c:3856

4847 +#: merge-ort.c:3869

4848 #, c-format

4849 msgid ""

4850 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4860,7 +4853,7 @@ msgstr ""

4853 "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"

4854 "上。"

4855

4863 -#: merge-ort.c:4152

4856 +#: merge-ort.c:4165

4857 #, c-format

4858 msgid ""

4859 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4870,7 +4863,7 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重

4863 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4864 #. base, and 2-3) the trees for the two trees we're merging.

4865 #.

4873 -#: merge-ort.c:4521

4866 +#: merge-ort.c:4534

4867 #, c-format

4868 msgid "collecting merge info failed for trees %s, %s, %s"

4869 msgstr "%s, %s, %s 樹的合併資訊收集失敗"

@@ -4884,7 +4877,7 @@ msgstr ""

4877 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

4878 " %s"

4879

4887 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

4880 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405

4881 msgid "Already up to date."

4882 msgstr "已經是最新的。"

4883

@@ -5159,7 +5152,7 @@ msgstr "合併未返回提交"

5152 msgid "Could not parse object '%s'"

5153 msgstr "不能解析物件 '%s'"

5154

5162 -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5155 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906

5156 #: builtin/stash.c:489

5157 msgid "Unable to write index."

5158 msgstr "不能寫入索引。"

@@ -5168,8 +5161,8 @@ msgstr "不能寫入索引。"

5161 msgid "failed to read the cache"

5162 msgstr "讀取快取失敗"

5163

5171 -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5172 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5164 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022

5165 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706

5166 #: builtin/stash.c:269

5167 msgid "unable to write new index file"

5168 msgstr "無法寫新的索引檔案"

@@ -5178,211 +5171,211 @@ msgstr "無法寫新的索引檔案"

5171 msgid "multi-pack-index OID fanout is of the wrong size"

5172 msgstr "多包索引的物件 ID fanout 大小錯誤"

5173

5181 -#: midx.c:109

5174 +#: midx.c:111

5175 #, c-format

5176 msgid "multi-pack-index file %s is too small"

5177 msgstr "多包索引檔案 %s 太小"

5178

5186 -#: midx.c:125

5179 +#: midx.c:127

5180 #, c-format

5181 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5182 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5183

5191 -#: midx.c:130

5184 +#: midx.c:132

5185 #, c-format

5186 msgid "multi-pack-index version %d not recognized"

5187 msgstr "multi-pack-index 版本 %d 不能被識別"

5188

5196 -#: midx.c:135

5189 +#: midx.c:137

5190 #, c-format

5191 msgid "multi-pack-index hash version %u does not match version %u"

5192 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5193

5201 -#: midx.c:152

5194 +#: midx.c:154

5195 msgid "multi-pack-index missing required pack-name chunk"

5196 msgstr "多包索引缺少必需的包名區塊"

5197

5205 -#: midx.c:154

5198 +#: midx.c:156

5199 msgid "multi-pack-index missing required OID fanout chunk"

5200 msgstr "多包索引缺少必需的物件 ID fanout 區塊"

5201

5209 -#: midx.c:156

5202 +#: midx.c:158

5203 msgid "multi-pack-index missing required OID lookup chunk"

5204 msgstr "多包索引缺少必需的物件 ID 查詢區塊"

5205

5213 -#: midx.c:158

5206 +#: midx.c:160

5207 msgid "multi-pack-index missing required object offsets chunk"

5208 msgstr "多包索引缺少必需的物件位移區塊"

5209

5217 -#: midx.c:174

5210 +#: midx.c:176

5211 #, c-format

5212 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5213 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5214

5222 -#: midx.c:221

5215 +#: midx.c:224

5216 #, c-format

5217 msgid "bad pack-int-id: %u (%u total packs)"

5218 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5219

5227 -#: midx.c:271

5220 +#: midx.c:274

5221 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5222 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5223

5231 -#: midx.c:502

5224 +#: midx.c:505

5225 #, c-format

5226 msgid "failed to add packfile '%s'"

5227 msgstr "新增 packfile '%s' 失敗"

5228

5236 -#: midx.c:508

5229 +#: midx.c:511

5230 #, c-format

5231 msgid "failed to open pack-index '%s'"

5232 msgstr "開啟包索引 '%s' 失敗"

5233

5241 -#: midx.c:576

5234 +#: midx.c:579

5235 #, c-format

5236 msgid "failed to locate object %d in packfile"

5237 msgstr "在 packfile 中定位物件 %d 失敗"

5238

5246 -#: midx.c:892

5239 +#: midx.c:895

5240 msgid "cannot store reverse index file"

5241 msgstr "無法儲存倒排索引檔案"

5242

5250 -#: midx.c:990

5243 +#: midx.c:993

5244 #, c-format

5245 msgid "could not parse line: %s"

5246 msgstr "無法解析橫列：%s"

5247

5255 -#: midx.c:992

5248 +#: midx.c:995

5249 #, c-format

5250 msgid "malformed line: %s"

5251 msgstr "橫列格式錯誤：%s"

5252

5260 -#: midx.c:1159

5253 +#: midx.c:1162

5254 msgid "ignoring existing multi-pack-index; checksum mismatch"

5255 msgstr "忽略現有的多包索引：總和檢查碼不符"

5256

5264 -#: midx.c:1184

5257 +#: midx.c:1187

5258 msgid "could not load pack"

5259 msgstr "無法載入包"

5260

5268 -#: midx.c:1190

5261 +#: midx.c:1193

5262 #, c-format

5263 msgid "could not open index for %s"

5264 msgstr "無法開啟 %s 的索引"

5265

5273 -#: midx.c:1201

5266 +#: midx.c:1204

5267 msgid "Adding packfiles to multi-pack-index"

5268 msgstr "正在新增 packfile 至多包索引"

5269

5277 -#: midx.c:1244

5270 +#: midx.c:1247

5271 #, c-format

5272 msgid "unknown preferred pack: '%s'"

5273 msgstr "未知偏好包：「%s」"

5274

5282 -#: midx.c:1289

5275 +#: midx.c:1292

5276 #, c-format

5277 msgid "cannot select preferred pack %s with no objects"

5278 msgstr "無法選取偏好，沒有物件的 %s 包"

5279

5287 -#: midx.c:1321

5280 +#: midx.c:1324

5281 #, c-format

5282 msgid "did not see pack-file %s to drop"

5283 msgstr "沒有看到要捨棄的包檔案 %s"

5284

5292 -#: midx.c:1367

5285 +#: midx.c:1370

5286 #, c-format

5287 msgid "preferred pack '%s' is expired"

5288 msgstr "偏好包「%s」已經過期"

5289

5297 -#: midx.c:1380

5290 +#: midx.c:1383

5291 msgid "no pack files to index."

5292 msgstr "沒有要索引的 pack 檔案。"

5293

5301 -#: midx.c:1417

5294 +#: midx.c:1420

5295 msgid "could not write multi-pack bitmap"

5296 msgstr "無法寫入多包位圖"

5297

5305 -#: midx.c:1427

5298 +#: midx.c:1430

5299 msgid "could not write multi-pack-index"

5300 msgstr "無法寫入多包索引"

5301

5309 -#: midx.c:1486 builtin/clean.c:37

5302 +#: midx.c:1489 builtin/clean.c:37

5303 #, c-format

5304 msgid "failed to remove %s"

5305 msgstr "刪除 %s 失敗"

5306

5314 -#: midx.c:1517

5307 +#: midx.c:1522

5308 #, c-format

5309 msgid "failed to clear multi-pack-index at %s"

5310 msgstr "清理位於 %s 的多包索引失敗"

5311

5319 -#: midx.c:1577

5312 +#: midx.c:1585

5313 msgid "multi-pack-index file exists, but failed to parse"

5314 msgstr "有 multi-pack-index 檔案，但無法解析"

5315

5323 -#: midx.c:1585

5316 +#: midx.c:1593

5317 msgid "incorrect checksum"

5318 msgstr "總和檢查碼不正確"

5319

5327 -#: midx.c:1588

5320 +#: midx.c:1596

5321 msgid "Looking for referenced packfiles"

5322 msgstr "正在尋找引用的 packfile"

5323

5331 -#: midx.c:1603

5324 +#: midx.c:1611

5325 #, c-format

5326 msgid ""

5327 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5328 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5329

5337 -#: midx.c:1608

5330 +#: midx.c:1616

5331 msgid "the midx contains no oid"

5332 msgstr "midx 沒有 oid"

5333

5341 -#: midx.c:1617

5334 +#: midx.c:1625

5335 msgid "Verifying OID order in multi-pack-index"

5336 msgstr "正在驗證多包索引中的物件 ID 順序"

5337

5345 -#: midx.c:1626

5338 +#: midx.c:1634

5339 #, c-format

5340 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5341 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5342

5350 -#: midx.c:1646

5343 +#: midx.c:1654

5344 msgid "Sorting objects by packfile"

5345 msgstr "透過 packfile 為物件排序"

5346

5354 -#: midx.c:1653

5347 +#: midx.c:1661

5348 msgid "Verifying object offsets"

5349 msgstr "正在驗證物件位移"

5350

5358 -#: midx.c:1669

5351 +#: midx.c:1677

5352 #, c-format

5353 msgid "failed to load pack entry for oid[%d] = %s"

5354 msgstr "為 oid[%d] = %s 載入包條目失敗"

5355

5363 -#: midx.c:1675

5356 +#: midx.c:1683

5357 #, c-format

5358 msgid "failed to load pack-index for packfile %s"

5359 msgstr "為 packfile %s 載入包索引失敗"

5360

5368 -#: midx.c:1684

5361 +#: midx.c:1692

5362 #, c-format

5363 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5364 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5365

5373 -#: midx.c:1709

5366 +#: midx.c:1719

5367 msgid "Counting referenced objects"

5368 msgstr "正在計算引用物件"

5369

5377 -#: midx.c:1719

5370 +#: midx.c:1729

5371 msgid "Finding and deleting unreferenced packfiles"

5372 msgstr "正在尋找並刪除沒有引用的 packfile"

5373

5381 -#: midx.c:1911

5374 +#: midx.c:1921

5375 msgid "could not start pack-objects"

5376 msgstr "不能開始 pack-objects"

5377

5385 -#: midx.c:1931

5378 +#: midx.c:1941

5379 msgid "could not finish pack-objects"

5380 msgstr "不能結束 pack-objects"

5381

@@ -5440,257 +5433,257 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"

5433 msgid "Bad %s value: '%s'"

5434 msgstr "壞的 %s 值：'%s'"

5435

5443 -#: object-file.c:459

5436 +#: object-file.c:456

5437 #, c-format

5438 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5439 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

5440

5448 -#: object-file.c:517

5441 +#: object-file.c:514

5442 #, c-format

5443 msgid "unable to normalize alternate object path: %s"

5444 msgstr "無法規範化備用物件路徑：%s"

5445

5453 -#: object-file.c:591

5446 +#: object-file.c:588

5447 #, c-format

5448 msgid "%s: ignoring alternate object stores, nesting too deep"

5449 msgstr "%s：忽略備用物件庫，嵌套太深"

5450

5458 -#: object-file.c:598

5451 +#: object-file.c:595

5452 #, c-format

5453 msgid "unable to normalize object directory: %s"

5454 msgstr "無法規範化物件目錄: %s"

5455

5463 -#: object-file.c:641

5456 +#: object-file.c:638

5457 msgid "unable to fdopen alternates lockfile"

5458 msgstr "無法 fdopen 取代鎖檔案"

5459

5467 -#: object-file.c:659

5460 +#: object-file.c:656

5461 msgid "unable to read alternates file"

5462 msgstr "無法讀取替代檔案"

5463

5471 -#: object-file.c:666

5464 +#: object-file.c:663

5465 msgid "unable to move new alternates file into place"

5466 msgstr "無法將新的替代檔案移動到位"

5467

5475 -#: object-file.c:701

5468 +#: object-file.c:741

5469 #, c-format

5470 msgid "path '%s' does not exist"

5471 msgstr "路徑 '%s' 不存在"

5472

5480 -#: object-file.c:722

5473 +#: object-file.c:762

5474 #, c-format

5475 msgid "reference repository '%s' as a linked checkout is not supported yet."

5476 msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"

5477

5485 -#: object-file.c:728

5478 +#: object-file.c:768

5479 #, c-format

5480 msgid "reference repository '%s' is not a local repository."

5481 msgstr "引用版本庫 '%s' 不是一個本機版本庫。"

5482

5490 -#: object-file.c:734

5483 +#: object-file.c:774

5484 #, c-format

5485 msgid "reference repository '%s' is shallow"

5486 msgstr "引用版本庫 '%s' 是一個淺複製"

5487

5495 -#: object-file.c:742

5488 +#: object-file.c:782

5489 #, c-format

5490 msgid "reference repository '%s' is grafted"

5491 msgstr "引用版本庫 '%s' 已被移植"

5492

5500 -#: object-file.c:773

5493 +#: object-file.c:813

5494 #, c-format

5495 msgid "could not find object directory matching %s"

5496 msgstr "找不到符合 %s 的物件目錄"

5497

5505 -#: object-file.c:823

5498 +#: object-file.c:863

5499 #, c-format

5500 msgid "invalid line while parsing alternate refs: %s"

5501 msgstr "解析備用引用時無效的行：%s"

5502

5510 -#: object-file.c:973

5503 +#: object-file.c:1013

5504 #, c-format

5505 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5506 msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

5507

5515 -#: object-file.c:1008

5508 +#: object-file.c:1048

5509 #, c-format

5510 msgid "mmap failed%s"

5511 msgstr "mmap 失敗%s"

5512

5520 -#: object-file.c:1174

5513 +#: object-file.c:1214

5514 #, c-format

5515 msgid "object file %s is empty"

5516 msgstr "物件檔案 %s 為空"

5517

5525 -#: object-file.c:1293 object-file.c:2499

5518 +#: object-file.c:1333 object-file.c:2542

5519 #, c-format

5520 msgid "corrupt loose object '%s'"

5521 msgstr "損壞的鬆散物件 '%s'"

5522

5530 -#: object-file.c:1295 object-file.c:2503

5523 +#: object-file.c:1335 object-file.c:2546

5524 #, c-format

5525 msgid "garbage at end of loose object '%s'"

5526 msgstr "鬆散物件 '%s' 後面有垃圾資料"

5527

5535 -#: object-file.c:1417

5528 +#: object-file.c:1457

5529 #, c-format

5530 msgid "unable to parse %s header"

5531 msgstr "無法解析 %s 頭部"

5532

5540 -#: object-file.c:1419

5533 +#: object-file.c:1459

5534 msgid "invalid object type"

5535 msgstr "無效的物件類型"

5536

5544 -#: object-file.c:1430

5537 +#: object-file.c:1470

5538 #, c-format

5539 msgid "unable to unpack %s header"

5540 msgstr "無法解開 %s 頭部"

5541

5549 -#: object-file.c:1434

5542 +#: object-file.c:1474

5543 #, c-format

5544 msgid "header for %s too long, exceeds %d bytes"

5545 msgstr "%s 的標頭過長，超出 %d 位元組"

5546

5554 -#: object-file.c:1664

5547 +#: object-file.c:1704

5548 #, c-format

5549 msgid "failed to read object %s"

5550 msgstr "讀取物件 %s 失敗"

5551

5559 -#: object-file.c:1668

5552 +#: object-file.c:1708

5553 #, c-format

5554 msgid "replacement %s not found for %s"

5555 msgstr "找不到 %2$s 的替代 %1$s"

5556

5564 -#: object-file.c:1672

5557 +#: object-file.c:1712

5558 #, c-format

5559 msgid "loose object %s (stored in %s) is corrupt"

5560 msgstr "鬆散物件 %s（儲存在 %s）已損壞"

5561

5569 -#: object-file.c:1676

5562 +#: object-file.c:1716

5563 #, c-format

5564 msgid "packed object %s (stored in %s) is corrupt"

5565 msgstr "打包物件 %s（儲存在 %s）已損壞"

5566

5574 -#: object-file.c:1781

5567 +#: object-file.c:1821

5568 #, c-format

5569 msgid "unable to write file %s"

5570 msgstr "無法寫檔案 %s"

5571

5579 -#: object-file.c:1788

5572 +#: object-file.c:1828

5573 #, c-format

5574 msgid "unable to set permission to '%s'"

5575 msgstr "無法為 '%s' 設定權限"

5576

5584 -#: object-file.c:1795

5577 +#: object-file.c:1835

5578 msgid "file write error"

5579 msgstr "檔案寫錯誤"

5580

5588 -#: object-file.c:1815

5581 +#: object-file.c:1858

5582 msgid "error when closing loose object file"

5583 msgstr "關閉鬆散物件檔案時發生錯誤"

5584

5592 -#: object-file.c:1882

5585 +#: object-file.c:1925

5586 #, c-format

5587 msgid "insufficient permission for adding an object to repository database %s"

5588 msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"

5589

5597 -#: object-file.c:1884

5590 +#: object-file.c:1927

5591 msgid "unable to create temporary file"

5592 msgstr "無法建立暫存檔"

5593

5601 -#: object-file.c:1908

5594 +#: object-file.c:1951

5595 msgid "unable to write loose object file"

5596 msgstr "不能寫鬆散物件檔案"

5597

5605 -#: object-file.c:1914

5598 +#: object-file.c:1957

5599 #, c-format

5600 msgid "unable to deflate new object %s (%d)"

5601 msgstr "不能壓縮新物件 %s（%d）"

5602

5610 -#: object-file.c:1918

5603 +#: object-file.c:1961

5604 #, c-format

5605 msgid "deflateEnd on object %s failed (%d)"

5606 msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

5607

5615 -#: object-file.c:1922

5608 +#: object-file.c:1965

5609 #, c-format

5610 msgid "confused by unstable object source data for %s"

5611 msgstr "被 %s 的不穩定物件來源資料混淆"

5612

5620 -#: object-file.c:1933 builtin/pack-objects.c:1243

5613 +#: object-file.c:1976 builtin/pack-objects.c:1243

5614 #, c-format

5615 msgid "failed utime() on %s"

5616 msgstr "在 %s 上呼叫 utime() 失敗"

5617

5625 -#: object-file.c:2011

5618 +#: object-file.c:2054

5619 #, c-format

5620 msgid "cannot read object for %s"

5621 msgstr "不能讀取物件 %s"

5622

5630 -#: object-file.c:2062

5623 +#: object-file.c:2105

5624 msgid "corrupt commit"

5625 msgstr "損壞的提交"

5626

5634 -#: object-file.c:2070

5627 +#: object-file.c:2113

5628 msgid "corrupt tag"

5629 msgstr "損壞的標籤"

5630

5638 -#: object-file.c:2170

5631 +#: object-file.c:2213

5632 #, c-format

5633 msgid "read error while indexing %s"

5634 msgstr "索引 %s 時讀取錯誤"

5635

5643 -#: object-file.c:2173

5636 +#: object-file.c:2216

5637 #, c-format

5638 msgid "short read while indexing %s"

5639 msgstr "索引 %s 時讀入不完整"

5640

5648 -#: object-file.c:2246 object-file.c:2256

5641 +#: object-file.c:2289 object-file.c:2299

5642 #, c-format

5643 msgid "%s: failed to insert into database"

5644 msgstr "%s：插入資料庫失敗"

5645

5653 -#: object-file.c:2262

5646 +#: object-file.c:2305

5647 #, c-format

5648 msgid "%s: unsupported file type"

5649 msgstr "%s：不支援的檔案類型"

5650

5658 -#: object-file.c:2286 builtin/fetch.c:1445

5651 +#: object-file.c:2329 builtin/fetch.c:1448

5652 #, c-format

5653 msgid "%s is not a valid object"

5654 msgstr "%s 不是一個有效的物件"

5655

5663 -#: object-file.c:2288

5656 +#: object-file.c:2331

5657 #, c-format

5658 msgid "%s is not a valid '%s' object"

5659 msgstr "%s 不是一個有效的 '%s' 物件"

5660

5668 -#: object-file.c:2315

5661 +#: object-file.c:2358

5662 #, c-format

5663 msgid "unable to open %s"

5664 msgstr "不能開啟 %s"

5665

5673 -#: object-file.c:2510

5666 +#: object-file.c:2553

5667 #, c-format

5668 msgid "hash mismatch for %s (expected %s)"

5669 msgstr "%s 的雜湊值不符合（預期 %s）"

5670

5678 -#: object-file.c:2533

5671 +#: object-file.c:2576

5672 #, c-format

5673 msgid "unable to mmap %s"

5674 msgstr "不能 mmap %s"

5675

5683 -#: object-file.c:2539

5676 +#: object-file.c:2582

5677 #, c-format

5678 msgid "unable to unpack header of %s"

5679 msgstr "無法解壓縮 %s 的頭部"

5680

5688 -#: object-file.c:2544

5681 +#: object-file.c:2587

5682 #, c-format

5683 msgid "unable to parse header of %s"

5684 msgstr "無法解析 %s 的頭部"

5685

5693 -#: object-file.c:2555

5686 +#: object-file.c:2598

5687 #, c-format

5688 msgid "unable to unpack contents of %s"

5689 msgstr "無法解壓縮 %s 的內容"

@@ -5817,25 +5810,25 @@ msgstr "不能解析物件：%s"

5810 msgid "hash mismatch %s"

5811 msgstr "雜湊值與 %s 不符合"

5812

5820 -#: pack-bitmap.c:348

5813 +#: pack-bitmap.c:353

5814 msgid "multi-pack bitmap is missing required reverse index"

5815 msgstr "多包位圖缺少需要的反向索引"

5816

5824 -#: pack-bitmap.c:424

5817 +#: pack-bitmap.c:429

5818 msgid "load_reverse_index: could not open pack"

5819 msgstr "load_reverse_index：無法開啟包"

5820

5828 -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424

5821 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424

5822 #, c-format

5823 msgid "unable to get size of %s"

5824 msgstr "不能得到 %s 的大小"

5825

5833 -#: pack-bitmap.c:1916

5826 +#: pack-bitmap.c:1935

5827 #, c-format

5828 msgid "could not find %s in pack %s at offset %<PRIuMAX>"

5829 msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"

5830

5838 -#: pack-bitmap.c:1952 builtin/rev-list.c:92

5831 +#: pack-bitmap.c:1971 builtin/rev-list.c:92

5832 #, c-format

5833 msgid "unable to get disk usage of %s"

5834 msgstr "無法取得 %s 的磁碟用量"

@@ -5884,45 +5877,50 @@ msgstr "無法讓 %s 能夠寫入"

5877 msgid "could not write '%s' promisor file"

5878 msgstr "無法寫入「%s」promisor 檔案"

5879

5887 -#: packfile.c:626

5880 +#: packfile.c:627

5881 msgid "offset before end of packfile (broken .idx?)"

5882 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5883

5891 -#: packfile.c:656

5884 +#: packfile.c:657

5885 #, c-format

5886 msgid "packfile %s cannot be mapped%s"

5887 msgstr "包檔案 %s 無法映射%s"

5888

5896 -#: packfile.c:1923

5889 +#: packfile.c:1924

5890 #, c-format

5891 msgid "offset before start of pack index for %s (corrupt index?)"

5892 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5893

5901 -#: packfile.c:1927

5894 +#: packfile.c:1928

5895 #, c-format

5896 msgid "offset beyond end of pack index for %s (truncated index?)"

5897 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

5898

5906 -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175

5899 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175

5900 #, c-format

5901 msgid "option `%s' expects a numerical value"

5902 msgstr "選項 `%s' 期望一個數字值"

5903

5911 -#: parse-options-cb.c:41

5904 +#: parse-options-cb.c:42

5905 #, c-format

5906 msgid "malformed expiration date '%s'"

5907 msgstr "格式錯誤的到期時間：'%s'"

5908

5916 -#: parse-options-cb.c:54

5909 +#: parse-options-cb.c:55

5910 #, c-format

5911 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5912 msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5913

5921 -#: parse-options-cb.c:132 parse-options-cb.c:149

5914 +#: parse-options-cb.c:133 parse-options-cb.c:150

5915 #, c-format

5916 msgid "malformed object name '%s'"

5917 msgstr "格式錯誤的物件名 '%s'"

5918

5919 +#: parse-options-cb.c:307

5920 +#, c-format

5921 +msgid "option `%s' expects \"%s\" or \"%s\""

5922 +msgstr "選項「%s」期望「%s」或「%s」"

5923 +

5924 #: parse-options.c:58

5925 #, c-format

5926 msgid "%s requires a value"

@@ -5958,36 +5956,36 @@ msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"

5956 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5957 msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"

5958

5961 -#: parse-options.c:427 parse-options.c:435

5959 +#: parse-options.c:428 parse-options.c:436

5960 #, c-format

5961 msgid "did you mean `--%s` (with two dashes)?"

5962 msgstr "你的意思是 `--%s`（有兩個短線）嗎？"

5963

5966 -#: parse-options.c:677 parse-options.c:1053

5964 +#: parse-options.c:678 parse-options.c:1054

5965 #, c-format

5966 msgid "alias of --%s"

5967 msgstr "--%s 的別名"

5968

5971 -#: parse-options.c:891

5969 +#: parse-options.c:892

5970 #, c-format

5971 msgid "unknown option `%s'"

5972 msgstr "未知選項 `%s'"

5973

5976 -#: parse-options.c:893

5974 +#: parse-options.c:894

5975 #, c-format

5976 msgid "unknown switch `%c'"

5977 msgstr "未知開關 `%c'"

5978

5981 -#: parse-options.c:895

5979 +#: parse-options.c:896

5980 #, c-format

5981 msgid "unknown non-ascii option in string: `%s'"

5982 msgstr "字串中未知的非 ascii 字元選項：`%s'"

5983

5986 -#: parse-options.c:919

5984 +#: parse-options.c:920

5985 msgid "..."

5986 msgstr "..."

5987

5990 -#: parse-options.c:933

5988 +#: parse-options.c:934

5989 #, c-format

5990 msgid "usage: %s"

5991 msgstr "用法：%s"

@@ -5995,7 +5993,7 @@ msgstr "用法：%s"

5993 #. TRANSLATORS: the colon here should align with the

5994 #. one in "usage: %s" translation.

5995 #.

5998 -#: parse-options.c:948

5996 +#: parse-options.c:949

5997 #, c-format

5998 msgid " or: %s"

5999 msgstr " 或：%s"

@@ -6019,18 +6017,18 @@ msgstr " 或：%s"

6017 #. translated) N_() usage string, which contained embedded

6018 #. newlines before we split it up.

6019 #.

6022 -#: parse-options.c:969

6020 +#: parse-options.c:970

6021 #, c-format

6022 msgid "%*s%s"

6023 msgstr "%*s%s"

6024

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

6028 -#: parse-options.c:992

6026 +#: parse-options.c:993

6027 #, c-format

6028 msgid " %s"

6029 msgstr " %s"

6030

6033 -#: parse-options.c:1039

6031 +#: parse-options.c:1040

6032 msgid "-NUM"

6033 msgstr "-數字"

6034

@@ -6156,17 +6154,17 @@ msgstr "讀取錯誤"

6154 msgid "the remote end hung up unexpectedly"

6155 msgstr "遠端意外掛斷了"

6156

6159 -#: pkt-line.c:390 pkt-line.c:392

6157 +#: pkt-line.c:417 pkt-line.c:419

6158 #, c-format

6159 msgid "protocol error: bad line length character: %.4s"

6160 msgstr "協定錯誤：錯誤的行長度字串：%.4s"

6161

6164 -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417

6162 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444

6163 #, c-format

6164 msgid "protocol error: bad line length %d"

6165 msgstr "協定錯誤：錯誤的行長度 %d"

6166

6169 -#: pkt-line.c:434 sideband.c:165

6167 +#: pkt-line.c:472 sideband.c:165

6168 #, c-format

6169 msgid "remote error: %s"

6170 msgstr "遠端錯誤：%s"

@@ -6217,7 +6215,7 @@ msgstr "不能啟動 `log`"

6215 msgid "could not read `log` output"

6216 msgstr "不能讀取 `log` 的輸出"

6217

6220 -#: range-diff.c:97 sequencer.c:5605

6218 +#: range-diff.c:97 sequencer.c:5602

6219 #, c-format

6220 msgid "could not parse commit '%s'"

6221 msgstr "不能解析提交 '%s'"

@@ -6238,59 +6236,55 @@ msgstr "無法解析 git 頭 '%.*s'"

6236 msgid "failed to generate diff"

6237 msgstr "生成 diff 失敗"

6238

6241 -#: range-diff.c:559

6242 -msgid "--left-only and --right-only are mutually exclusive"

6243 -msgstr "--left-only 和 --right-only 互斥"

6244 -

6239 #: range-diff.c:562 range-diff.c:564

6240 #, c-format

6241 msgid "could not parse log for '%s'"

6242 msgstr "不能解析 '%s' 的日誌"

6243

6250 -#: read-cache.c:710

6244 +#: read-cache.c:723

6245 #, c-format

6246 msgid "will not add file alias '%s' ('%s' already exists in index)"

6247 msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

6248

6255 -#: read-cache.c:726

6249 +#: read-cache.c:739

6250 msgid "cannot create an empty blob in the object database"

6251 msgstr "不能在物件資料庫中建立空的資料物件"

6252

6259 -#: read-cache.c:748

6253 +#: read-cache.c:761

6254 #, c-format

6255 msgid "%s: can only add regular files, symbolic links or git-directories"

6256 msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

6257

6264 -#: read-cache.c:753 builtin/submodule--helper.c:3241

6258 +#: read-cache.c:766 builtin/submodule--helper.c:3242

6259 #, c-format

6260 msgid "'%s' does not have a commit checked out"

6261 msgstr "'%s' 沒有簽出一個提交"

6262

6269 -#: read-cache.c:805

6263 +#: read-cache.c:818

6264 #, c-format

6265 msgid "unable to index file '%s'"

6266 msgstr "無法索引檔案 '%s'"

6267

6274 -#: read-cache.c:824

6268 +#: read-cache.c:837

6269 #, c-format

6270 msgid "unable to add '%s' to index"

6271 msgstr "無法在索引中新增 '%s'"

6272

6279 -#: read-cache.c:835

6273 +#: read-cache.c:848

6274 #, c-format

6275 msgid "unable to stat '%s'"

6276 msgstr "無法對 %s 執行 stat"

6277

6284 -#: read-cache.c:1373

6278 +#: read-cache.c:1386

6279 #, c-format

6280 msgid "'%s' appears as both a file and as a directory"

6281 msgstr "'%s' 看起來既是檔案又是目錄"

6282

6289 -#: read-cache.c:1588

6283 +#: read-cache.c:1601

6284 msgid "Refresh index"

6285 msgstr "重新整理索引"

6286

6293 -#: read-cache.c:1720

6287 +#: read-cache.c:1733

6288 #, c-format

6289 msgid ""

6290 "index.version set, but the value is invalid.\n"

@@ -6299,7 +6293,7 @@ msgstr ""

6293 "設定了 index.version，但是取值無效。\n"

6294 "使用版本 %i"

6295

6302 -#: read-cache.c:1730

6296 +#: read-cache.c:1743

6297 #, c-format

6298 msgid ""

6299 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -6308,144 +6302,144 @@ msgstr ""

6302 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"

6303 "使用版本 %i"

6304

6311 -#: read-cache.c:1786

6305 +#: read-cache.c:1799

6306 #, c-format

6307 msgid "bad signature 0x%08x"

6308 msgstr "壞的簽名 0x%08x"

6309

6316 -#: read-cache.c:1789

6310 +#: read-cache.c:1802

6311 #, c-format

6312 msgid "bad index version %d"

6313 msgstr "壞的索引版本 %d"

6314

6321 -#: read-cache.c:1798

6315 +#: read-cache.c:1811

6316 msgid "bad index file sha1 signature"

6317 msgstr "壞的索引檔案 sha1 簽名"

6318

6325 -#: read-cache.c:1832

6319 +#: read-cache.c:1845

6320 #, c-format

6321 msgid "index uses %.4s extension, which we do not understand"

6322 msgstr "索引使用不被支援的 %.4s 副檔名"

6323

6324 #

6331 -#: read-cache.c:1834

6325 +#: read-cache.c:1847

6326 #, c-format

6327 msgid "ignoring %.4s extension"

6328 msgstr "忽略 %.4s 副檔名"

6329

6336 -#: read-cache.c:1871

6330 +#: read-cache.c:1884

6331 #, c-format

6332 msgid "unknown index entry format 0x%08x"

6333 msgstr "未知的索引條目格式 0x%08x"

6334

6341 -#: read-cache.c:1887

6335 +#: read-cache.c:1900

6336 #, c-format

6337 msgid "malformed name field in the index, near path '%s'"

6338 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

6339

6346 -#: read-cache.c:1944

6340 +#: read-cache.c:1957

6341 msgid "unordered stage entries in index"

6342 msgstr "索引中有未排序的暫存條目"

6343

6350 -#: read-cache.c:1947

6344 +#: read-cache.c:1960

6345 #, c-format

6346 msgid "multiple stage entries for merged file '%s'"

6347 msgstr "合併檔案 '%s' 有多個暫存條目"

6348

6355 -#: read-cache.c:1950

6349 +#: read-cache.c:1963

6350 #, c-format

6351 msgid "unordered stage entries for '%s'"

6352 msgstr "'%s' 的未排序暫存條目"

6353

6360 -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095

6361 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183

6362 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987

6354 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095

6355 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183

6356 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013

6357 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519

6364 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293

6365 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201

6358 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293

6359 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202

6360 msgid "index file corrupt"

6361 msgstr "索引檔案損壞"

6362

6369 -#: read-cache.c:2209

6363 +#: read-cache.c:2222

6364 #, c-format

6365 msgid "unable to create load_cache_entries thread: %s"

6366 msgstr "無法建立 load_cache_entries 執行緒：%s"

6367

6374 -#: read-cache.c:2222

6368 +#: read-cache.c:2235

6369 #, c-format

6370 msgid "unable to join load_cache_entries thread: %s"

6371 msgstr "無法加入 load_cache_entries 執行緒：%s"

6372

6379 -#: read-cache.c:2255

6373 +#: read-cache.c:2268

6374 #, c-format

6375 msgid "%s: index file open failed"

6376 msgstr "%s：開啟索引檔案失敗"

6377

6384 -#: read-cache.c:2259

6378 +#: read-cache.c:2272

6379 #, c-format

6380 msgid "%s: cannot stat the open index"

6381 msgstr "%s：不能對開啟的索引執行 stat 動作"

6382

6389 -#: read-cache.c:2263

6383 +#: read-cache.c:2276

6384 #, c-format

6385 msgid "%s: index file smaller than expected"

6386 msgstr "%s：索引檔案比預期的小"

6387

6394 -#: read-cache.c:2267

6388 +#: read-cache.c:2280

6389 #, c-format

6390 msgid "%s: unable to map index file%s"

6391 msgstr "%s：無法 map 索引檔案%s"

6392

6399 -#: read-cache.c:2310

6393 +#: read-cache.c:2323

6394 #, c-format

6395 msgid "unable to create load_index_extensions thread: %s"

6396 msgstr "無法建立 load_index_extensions 執行緒：%s"

6397

6404 -#: read-cache.c:2337

6398 +#: read-cache.c:2350

6399 #, c-format

6400 msgid "unable to join load_index_extensions thread: %s"

6401 msgstr "無法加入 load_index_extensions 執行緒：%s"

6402

6409 -#: read-cache.c:2375

6403 +#: read-cache.c:2396

6404 #, c-format

6405 msgid "could not freshen shared index '%s'"

6406 msgstr "無法重新整理共享索引 '%s'"

6407

6414 -#: read-cache.c:2434

6408 +#: read-cache.c:2455

6409 #, c-format

6410 msgid "broken index, expect %s in %s, got %s"

6411 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6412

6419 -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147

6413 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150

6414 #, c-format

6415 msgid "could not close '%s'"

6416 msgstr "不能關閉 '%s'"

6417

6424 -#: read-cache.c:3108

6418 +#: read-cache.c:3129

6419 msgid "failed to convert to a sparse-index"

6420 msgstr "無法轉換成稀疏索引"

6421

6428 -#: read-cache.c:3179

6422 +#: read-cache.c:3200

6423 #, c-format

6424 msgid "could not stat '%s'"

6425 msgstr "不能對 '%s' 呼叫 stat"

6426

6433 -#: read-cache.c:3192

6427 +#: read-cache.c:3213

6428 #, c-format

6429 msgid "unable to open git dir: %s"

6430 msgstr "不能開啟 git 目錄：%s"

6431

6438 -#: read-cache.c:3204

6432 +#: read-cache.c:3225

6433 #, c-format

6434 msgid "unable to unlink: %s"

6435 msgstr "無法刪除：%s"

6436

6443 -#: read-cache.c:3233

6437 +#: read-cache.c:3254

6438 #, c-format

6439 msgid "cannot fix permission bits on '%s'"

6440 msgstr "不能修復 '%s' 的權限位"

6441

6448 -#: read-cache.c:3390

6442 +#: read-cache.c:3411

6443 #, c-format

6444 msgid "%s: cannot drop to stage #0"

6445 msgstr "%s：不能落到暫存區 #0"

@@ -6556,8 +6550,8 @@ msgstr ""

6550 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"

6551 "\n"

6552

6559 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888

6560 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789

6553 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883

6554 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791

6555 #: builtin/rebase.c:190

6556 #, c-format

6557 msgid "could not write '%s'"

@@ -6598,7 +6592,7 @@ msgstr ""

6592 msgid "%s: 'preserve' superseded by 'merges'"

6593 msgstr "%s：「preserve」已經改成「merges」"

6594

6601 -#: ref-filter.c:42 wt-status.c:2036

6595 +#: ref-filter.c:42 wt-status.c:2048

6596 msgid "gone"

6597 msgstr "遺失"

6598

@@ -6637,7 +6631,8 @@ msgstr "期望整數值 refname:lstrip=%s"

6631 msgid "Integer value expected refname:rstrip=%s"

6632 msgstr "期望整數值 refname:rstrip=%s"

6633

6640 -#: ref-filter.c:265

6634 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431

6635 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560

6636 #, c-format

6637 msgid "unrecognized %%(%s) argument: %s"

6638 msgstr "無法識別的 %%(%s) 參數：%s"

@@ -6647,11 +6642,6 @@ msgstr "無法識別的 %%(%s) 參數：%s"

6642 msgid "%%(objecttype) does not take arguments"

6643 msgstr "%%(objecttype) 不帶參數"

6644

6650 -#: ref-filter.c:344

6651 -#, c-format

6652 -msgid "unrecognized %%(objectsize) argument: %s"

6653 -msgstr "無法識別的 %%(objectsize) 參數：%s"

6654 -

6645 #: ref-filter.c:352

6646 #, c-format

6647 msgid "%%(deltabase) does not take arguments"

@@ -6662,11 +6652,6 @@ msgstr "%%(deltabase) 不帶參數"

6652 msgid "%%(body) does not take arguments"

6653 msgstr "%%(body) 不帶參數"

6654

6665 -#: ref-filter.c:377

6666 -#, c-format

6667 -msgid "unrecognized %%(subject) argument: %s"

6668 -msgstr "無法識別的 %%(subject) 引數：%s"

6669 -

6655 #: ref-filter.c:396

6656 #, c-format

6657 msgid "expected %%(trailers:key=<value>)"

@@ -6682,26 +6667,11 @@ msgstr "未知的 %%(trailers) 參數：%s"

6667 msgid "positive value expected contents:lines=%s"

6668 msgstr "期望一個正數 contents:lines=%s"

6669

6685 -#: ref-filter.c:431

6686 -#, c-format

6687 -msgid "unrecognized %%(contents) argument: %s"

6688 -msgstr "無法識別的 %%(contents) 參數：%s"

6689 -

6690 -#: ref-filter.c:443

6691 -#, c-format

6692 -msgid "unrecognized %%(raw) argument: %s"

6693 -msgstr "無法識別的 %%(raw) 引數：%s"

6694 -

6670 #: ref-filter.c:458

6671 #, c-format

6672 msgid "positive value expected '%s' in %%(%s)"

6673 msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"

6674

6700 -#: ref-filter.c:462

6701 -#, c-format

6702 -msgid "unrecognized argument '%s' in %%(%s)"

6703 -msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"

6704 -

6675 #: ref-filter.c:476

6676 #, c-format

6677 msgid "unrecognized email option: %s"

@@ -6722,21 +6692,11 @@ msgstr "無法識別的位置：%s"

6692 msgid "unrecognized width:%s"

6693 msgstr "無法識別的寬度：%s"

6694

6725 -#: ref-filter.c:534

6726 -#, c-format

6727 -msgid "unrecognized %%(align) argument: %s"

6728 -msgstr "無法識別的 %%(align) 參數：%s"

6729 -

6695 #: ref-filter.c:542

6696 #, c-format

6697 msgid "positive width expected with the %%(align) atom"

6698 msgstr "元素 %%(align) 需要一個正數的寬度"

6699

6735 -#: ref-filter.c:560

6736 -#, c-format

6737 -msgid "unrecognized %%(if) argument: %s"

6738 -msgstr "無法識別的 %%(if) 參數：%s"

6739 -

6700 #: ref-filter.c:568

6701 #, c-format

6702 msgid "%%(rest) does not take arguments"

@@ -6758,15 +6718,10 @@ msgid ""

6718 "not a git repository, but the field '%.*s' requires access to object data"

6719 msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"

6720

6761 -#: ref-filter.c:844

6762 -#, c-format

6763 -msgid "format: %%(if) atom used without a %%(then) atom"

6764 -msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"

6765 -

6766 -#: ref-filter.c:910

6721 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948

6722 #, c-format

6768 -msgid "format: %%(then) atom used without an %%(if) atom"

6769 -msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"

6723 +msgid "format: %%(%s) atom used without a %%(%s) atom"

6724 +msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素"

6725

6726 #: ref-filter.c:912

6727 #, c-format

@@ -6778,16 +6733,6 @@ msgstr "格式：%%(then) 元素用了多次"

6733 msgid "format: %%(then) atom used after %%(else)"

6734 msgstr "格式：%%(then) 元素用在了 %%(else) 之後"

6735

6781 -#: ref-filter.c:946

6782 -#, c-format

6783 -msgid "format: %%(else) atom used without an %%(if) atom"

6784 -msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"

6785 -

6786 -#: ref-filter.c:948

6787 -#, c-format

6788 -msgid "format: %%(else) atom used without a %%(then) atom"

6789 -msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"

6790 -

6736 #: ref-filter.c:950

6737 #, c-format

6738 msgid "format: %%(else) atom used more than once"

@@ -6862,22 +6807,22 @@ msgstr "格式錯誤的物件 '%s'"

6807 msgid "ignoring ref with broken name %s"

6808 msgstr "忽略帶有錯誤名稱 %s 的引用"

6809

6865 -#: ref-filter.c:2250 refs.c:673

6810 +#: ref-filter.c:2250 refs.c:676

6811 #, c-format

6812 msgid "ignoring broken ref %s"

6813 msgstr "忽略損壞的引用 %s"

6814

6870 -#: ref-filter.c:2623

6815 +#: ref-filter.c:2629

6816 #, c-format

6817 msgid "format: %%(end) atom missing"

6818 msgstr "格式：缺少 %%(end) 元素"

6819

6875 -#: ref-filter.c:2726

6820 +#: ref-filter.c:2740

6821 #, c-format

6822 msgid "malformed object name %s"

6823 msgstr "格式錯誤的物件名 %s"

6824

6880 -#: ref-filter.c:2731

6825 +#: ref-filter.c:2745

6826 #, c-format

6827 msgid "option `%s' must point to a commit"

6828 msgstr "選項 `%s' 必須指向一個提交"

@@ -6922,71 +6867,71 @@ msgstr "無法擷取「%s」"

6867 msgid "invalid branch name: %s = %s"

6868 msgstr "分支名稱無效：%s = %s"

6869

6925 -#: refs.c:671

6870 +#: refs.c:674

6871 #, c-format

6872 msgid "ignoring dangling symref %s"

6873 msgstr "忽略懸空符號引用 %s"

6874

6930 -#: refs.c:920

6875 +#: refs.c:925

6876 #, c-format

6877 msgid "log for ref %s has gap after %s"

6878 msgstr "引用 %s 的日誌在 %s 之後有缺口"

6879

6935 -#: refs.c:927

6880 +#: refs.c:932

6881 #, c-format

6882 msgid "log for ref %s unexpectedly ended on %s"

6883 msgstr "引用 %s 的日誌意外終止於 %s"

6884

6940 -#: refs.c:992

6885 +#: refs.c:997

6886 #, c-format

6887 msgid "log for %s is empty"

6888 msgstr "%s 的日誌為空"

6889

6945 -#: refs.c:1084

6890 +#: refs.c:1090

6891 #, c-format

6892 msgid "refusing to update ref with bad name '%s'"

6893 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

6894

6950 -#: refs.c:1155

6895 +#: refs.c:1168

6896 #, c-format

6897 msgid "update_ref failed for ref '%s': %s"

6898 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"

6899

6955 -#: refs.c:2062

6900 +#: refs.c:2069

6901 #, c-format

6902 msgid "multiple updates for ref '%s' not allowed"

6903 msgstr "不允許對引用 '%s' 多次更新"

6904

6960 -#: refs.c:2142

6905 +#: refs.c:2152

6906 msgid "ref updates forbidden inside quarantine environment"

6907 msgstr "在隔離環境中禁止更新引用"

6908

6964 -#: refs.c:2153

6909 +#: refs.c:2163

6910 msgid "ref updates aborted by hook"

6911 msgstr "引用更新被掛鉤拒絕"

6912

6968 -#: refs.c:2253 refs.c:2283

6913 +#: refs.c:2271 refs.c:2301

6914 #, c-format

6915 msgid "'%s' exists; cannot create '%s'"

6916 msgstr "'%s' 已存在，無法建立 '%s'"

6917

6973 -#: refs.c:2259 refs.c:2294

6918 +#: refs.c:2277 refs.c:2312

6919 #, c-format

6920 msgid "cannot process '%s' and '%s' at the same time"

6921 msgstr "無法同時處理 '%s' 和 '%s'"

6922

6978 -#: refs/files-backend.c:1271

6923 +#: refs/files-backend.c:1268

6924 #, c-format

6925 msgid "could not remove reference %s"

6926 msgstr "無法刪除引用 %s"

6927

6983 -#: refs/files-backend.c:1285 refs/packed-backend.c:1549

6928 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549

6929 #: refs/packed-backend.c:1559

6930 #, c-format

6931 msgid "could not delete reference %s: %s"

6932 msgstr "無法刪除引用 %s：%s"

6933

6989 -#: refs/files-backend.c:1288 refs/packed-backend.c:1562

6934 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562

6935 #, c-format

6936 msgid "could not delete references: %s"

6937 msgstr "無法刪除引用：%s"

@@ -6996,50 +6941,50 @@ msgstr "無法刪除引用：%s"

6941 msgid "invalid refspec '%s'"

6942 msgstr "無效的引用規格：「%s」"

6943

6999 -#: remote.c:351

6944 +#: remote.c:402

6945 #, c-format

6946 msgid "config remote shorthand cannot begin with '/': %s"

6947 msgstr "設定的遠端短名稱不能以 '/' 開始：%s"

6948

7004 -#: remote.c:399

6949 +#: remote.c:450

6950 msgid "more than one receivepack given, using the first"

6951 msgstr "提供了一個以上的 receivepack，使用第一個"

6952

7008 -#: remote.c:407

6953 +#: remote.c:458

6954 msgid "more than one uploadpack given, using the first"

6955 msgstr "提供了一個以上的 uploadpack，使用第一個"

6956

7012 -#: remote.c:590

6957 +#: remote.c:699

6958 #, c-format

6959 msgid "Cannot fetch both %s and %s to %s"

6960 msgstr "不能同時取得 %s 和 %s 至 %s"

6961

7017 -#: remote.c:594

6962 +#: remote.c:703

6963 #, c-format

6964 msgid "%s usually tracks %s, not %s"

6965 msgstr "%s 通常追蹤 %s，而非 %s"

6966

7022 -#: remote.c:598

6967 +#: remote.c:707

6968 #, c-format

6969 msgid "%s tracks both %s and %s"

6970 msgstr "%s 同時追蹤 %s 和 %s"

6971

7027 -#: remote.c:666

6972 +#: remote.c:775

6973 #, c-format

6974 msgid "key '%s' of pattern had no '*'"

6975 msgstr "模式的鍵 '%s' 沒有 '*'"

6976

7032 -#: remote.c:676

6977 +#: remote.c:785

6978 #, c-format

6979 msgid "value '%s' of pattern has no '*'"

6980 msgstr "模式的值 '%s' 沒有 '*'"

6981

7037 -#: remote.c:1083

6982 +#: remote.c:1192

6983 #, c-format

6984 msgid "src refspec %s does not match any"

6985 msgstr "來源引用規格 %s 沒有符合項目"

6986

7042 -#: remote.c:1088

6987 +#: remote.c:1197

6988 #, c-format

6989 msgid "src refspec %s matches more than one"

6990 msgstr "來源引用規格 %s 符合超過一個"

@@ -7048,7 +6993,7 @@ msgstr "來源引用規格 %s 符合超過一個"

6993 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6994 #. the <src>.

6995 #.

7051 -#: remote.c:1103

6996 +#: remote.c:1212

6997 #, c-format

6998 msgid ""

6999 "The destination you provided is not a full refname (i.e.,\n"

@@ -7070,7 +7015,7 @@ msgstr ""

7015 "\n"

7016 "由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"

7017

7073 -#: remote.c:1123

7018 +#: remote.c:1232

7019 #, c-format

7020 msgid ""

7021 "The <src> part of the refspec is a commit object.\n"

@@ -7081,7 +7026,7 @@ msgstr ""

7026 "您是想透過推送至「%s:refs/heads/%s」\n"

7027 "來建立新分支嗎？"

7028

7084 -#: remote.c:1128

7029 +#: remote.c:1237

7030 #, c-format

7031 msgid ""

7032 "The <src> part of the refspec is a tag object.\n"

@@ -7092,7 +7037,7 @@ msgstr ""

7037 "您是想透過推送至「%s:refs/tags/%s」\n"

7038 "來建立新標籤嗎？"

7039

7095 -#: remote.c:1133

7040 +#: remote.c:1242

7041 #, c-format

7042 msgid ""

7043 "The <src> part of the refspec is a tree object.\n"

@@ -7103,7 +7048,7 @@ msgstr ""

7048 "您是想透過推送至「%s:refs/tags/%s」\n"

7049 "為新樹狀物件貼上標籤嗎？"

7050

7106 -#: remote.c:1138

7051 +#: remote.c:1247

7052 #, c-format

7053 msgid ""

7054 "The <src> part of the refspec is a blob object.\n"

@@ -7114,113 +7059,113 @@ msgstr ""

7059 "您是想透過推送至「%s:refs/tags/%s」\n"

7060 "為新資料物件貼上標籤嗎？"

7061

7117 -#: remote.c:1174

7062 +#: remote.c:1283

7063 #, c-format

7064 msgid "%s cannot be resolved to branch"

7065 msgstr "%s 無法被解析為分支"

7066

7122 -#: remote.c:1185

7067 +#: remote.c:1294

7068 #, c-format

7069 msgid "unable to delete '%s': remote ref does not exist"

7070 msgstr "無法刪除 '%s'：遠端引用不存在"

7071

7127 -#: remote.c:1197

7072 +#: remote.c:1306

7073 #, c-format

7074 msgid "dst refspec %s matches more than one"

7075 msgstr "目的地引用規格 %s 符合超過一個"

7076

7132 -#: remote.c:1204

7077 +#: remote.c:1313

7078 #, c-format

7079 msgid "dst ref %s receives from more than one src"

7080 msgstr "目的地引用 %s 接收超過一個來源"

7081

7137 -#: remote.c:1724 remote.c:1825

7082 +#: remote.c:1834 remote.c:1941

7083 msgid "HEAD does not point to a branch"

7084 msgstr "HEAD 沒有指向一個分支"

7085

7141 -#: remote.c:1733

7086 +#: remote.c:1843

7087 #, c-format

7088 msgid "no such branch: '%s'"

7089 msgstr "沒有此分支：'%s'"

7090

7146 -#: remote.c:1736

7091 +#: remote.c:1846

7092 #, c-format

7093 msgid "no upstream configured for branch '%s'"

7094 msgstr "尚未給分支 '%s' 設定上游"

7095

7151 -#: remote.c:1742

7096 +#: remote.c:1852

7097 #, c-format

7098 msgid "upstream branch '%s' not stored as a remote-tracking branch"

7099 msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"

7100

7156 -#: remote.c:1757

7101 +#: remote.c:1867

7102 #, c-format

7103 msgid "push destination '%s' on remote '%s' has no local tracking branch"

7104 msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"

7105

7161 -#: remote.c:1769

7106 +#: remote.c:1882

7107 #, c-format

7108 msgid "branch '%s' has no remote for pushing"

7109 msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"

7110

7166 -#: remote.c:1779

7111 +#: remote.c:1892

7112 #, c-format

7113 msgid "push refspecs for '%s' do not include '%s'"

7114 msgstr "向 '%s' 推送引用規格未包含 '%s'"

7115

7171 -#: remote.c:1792

7116 +#: remote.c:1905

7117 msgid "push has no destination (push.default is 'nothing')"

7118 msgstr "推送沒有目的地（push.default 是 'nothing'）"

7119

7175 -#: remote.c:1814

7120 +#: remote.c:1927

7121 msgid "cannot resolve 'simple' push to a single destination"

7122 msgstr "無法解析 'simple' 推送至單獨目的地"

7123

7179 -#: remote.c:1943

7124 +#: remote.c:2060

7125 #, c-format

7126 msgid "couldn't find remote ref %s"

7127 msgstr "無法找到遠端引用 %s"

7128

7184 -#: remote.c:1956

7129 +#: remote.c:2073

7130 #, c-format

7131 msgid "* Ignoring funny ref '%s' locally"

7132 msgstr "* 在本機忽略可笑的引用 '%s'"

7133

7189 -#: remote.c:2119

7134 +#: remote.c:2236

7135 #, c-format

7136 msgid "Your branch is based on '%s', but the upstream is gone.\n"

7137 msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"

7138

7194 -#: remote.c:2123

7139 +#: remote.c:2240

7140 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

7141 msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"

7142

7198 -#: remote.c:2126

7143 +#: remote.c:2243

7144 #, c-format

7145 msgid "Your branch is up to date with '%s'.\n"

7146 msgstr "您的分支與上游分支 '%s' 一致。\n"

7147

7203 -#: remote.c:2130

7148 +#: remote.c:2247

7149 #, c-format

7150 msgid "Your branch and '%s' refer to different commits.\n"

7151 msgstr "您的分支和 '%s' 指向不同的提交。\n"

7152

7208 -#: remote.c:2133

7153 +#: remote.c:2250

7154 #, c-format

7155 msgid " (use \"%s\" for details)\n"

7156 msgstr " （使用 \"%s\" 檢視詳情）\n"

7157

7213 -#: remote.c:2137

7158 +#: remote.c:2254

7159 #, c-format

7160 msgid "Your branch is ahead of '%s' by %d commit.\n"

7161 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

7162 msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"

7163

7219 -#: remote.c:2143

7164 +#: remote.c:2260

7165 msgid " (use \"git push\" to publish your local commits)\n"

7166 msgstr " （使用 \"git push\" 來發布您的本機提交）\n"

7167

7223 -#: remote.c:2146

7168 +#: remote.c:2263

7169 #, c-format

7170 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

7171 msgid_plural ""

@@ -7228,11 +7173,11 @@ msgid_plural ""

7173 msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"

7174

7175 # 譯者：請維持前導空格

7231 -#: remote.c:2154

7176 +#: remote.c:2271

7177 msgid " (use \"git pull\" to update your local branch)\n"

7178 msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"

7179

7235 -#: remote.c:2157

7180 +#: remote.c:2274

7181 #, c-format

7182 msgid ""

7183 "Your branch and '%s' have diverged,\n"

@@ -7245,11 +7190,11 @@ msgstr[0] ""

7190 "並且分別有 %d 和 %d 處不同的提交。\n"

7191

7192 # 譯者：請維持前導空格

7248 -#: remote.c:2167

7193 +#: remote.c:2284

7194 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

7195 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"

7196

7252 -#: remote.c:2359

7197 +#: remote.c:2476

7198 #, c-format

7199 msgid "cannot parse expected object name '%s'"

7200 msgstr "無法解析期望的物件名 '%s'"

@@ -7282,7 +7227,7 @@ msgstr "無法寫入 rerere 記錄"

7227 msgid "there were errors while writing '%s' (%s)"

7228 msgstr "寫入 '%s' (%s) 時發生錯誤"

7229

7285 -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281

7230 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298

7231 #, c-format

7232 msgid "failed to flush '%s'"

7233 msgstr "重新整理 '%s' 失敗"

@@ -7327,8 +7272,8 @@ msgstr "不能刪除 stray '%s'"

7272 msgid "Recorded preimage for '%s'"

7273 msgstr "為 '%s' 記錄 preimage"

7274

7330 -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002

7331 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819

7275 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017

7276 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820

7277 #, c-format

7278 msgid "could not create directory '%s'"

7279 msgstr "不能建立目錄 '%s'"

@@ -7366,37 +7311,29 @@ msgstr "不能開啟 rr-cache 目錄"

7311 msgid "could not determine HEAD revision"

7312 msgstr "不能確定 HEAD 版本"

7313

7369 -#: reset.c:70 reset.c:76 sequencer.c:3705

7314 +#: reset.c:70 reset.c:76 sequencer.c:3700

7315 #, c-format

7316 msgid "failed to find tree of %s"

7317 msgstr "無法找到 %s 指向的樹"

7318

7374 -#: revision.c:2259

7375 -msgid "--unsorted-input is incompatible with --no-walk"

7376 -msgstr "--unsorted-input 與 --no-walk 不相容"

7377 -

7378 -#: revision.c:2346

7319 +#: revision.c:2347

7320 msgid "--unpacked=<packfile> no longer supported"

7321 msgstr "--unpacked=<packfile> 已不受支援"

7322

7382 -#: revision.c:2655 revision.c:2659

7383 -msgid "--no-walk is incompatible with --unsorted-input"

7384 -msgstr "--no-walk 與 --unsorted-input 不相容"

7385 -

7386 -#: revision.c:2690

7323 +#: revision.c:2686

7324 msgid "your current branch appears to be broken"

7325 msgstr "您的目前分支好像被損壞"

7326

7390 -#: revision.c:2693

7327 +#: revision.c:2689

7328 #, c-format

7329 msgid "your current branch '%s' does not have any commits yet"

7330 msgstr "您的目前分支 '%s' 尚無任何提交"

7331

7395 -#: revision.c:2895

7332 +#: revision.c:2891

7333 msgid "-L does not yet support diff formats besides -p and -s"

7334 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

7335

7399 -#: run-command.c:1278

7336 +#: run-command.c:1262

7337 #, c-format

7338 msgid "cannot create async thread: %s"

7339 msgstr "不能建立 async 執行緒：%s"

@@ -7459,8 +7396,8 @@ msgstr "無效的提交說明清理模式 '%s'"

7396 msgid "could not delete '%s'"

7397 msgstr "無法刪除 '%s'"

7398

7462 -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297

7463 -#: builtin/rm.c:408

7399 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297

7400 +#: builtin/rm.c:409

7401 #, c-format

7402 msgid "could not remove '%s'"

7403 msgstr "無法刪除 '%s'"

@@ -7522,13 +7459,13 @@ msgstr ""

7459 "若要取消並返回 \"git revert\" 前的狀態，\n"

7460 "請執行 \"git revert --abort\"。"

7461

7525 -#: sequencer.c:448 sequencer.c:3290

7462 +#: sequencer.c:448 sequencer.c:3292

7463 #, c-format

7464 msgid "could not lock '%s'"

7465 msgstr "不能鎖定 '%s'"

7466

7530 -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308

7531 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639

7467 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310

7468 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639

7469 #, c-format

7470 msgid "could not write to '%s'"

7471 msgstr "不能寫入 '%s'"

@@ -7538,12 +7475,18 @@ msgstr "不能寫入 '%s'"

7475 msgid "could not write eol to '%s'"

7476 msgstr "不能將換行符號寫入 '%s'"

7477

7541 -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310

7542 -#: sequencer.c:3574

7478 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312

7479 +#: sequencer.c:3569

7480 #, c-format

7481 msgid "failed to finalize '%s'"

7482 msgstr "無法完成 '%s'"

7483

7484 +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551

7485 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148

7486 +#, c-format

7487 +msgid "could not read '%s'"

7488 +msgstr "不能讀取 '%s'"

7489 +

7490 #: sequencer.c:499

7491 #, c-format

7492 msgid "your local changes would be overwritten by %s."

@@ -7558,7 +7501,7 @@ msgstr "提交您的修改或儲藏後再繼續。"

7501 msgid "%s: fast-forward"

7502 msgstr "%s：快轉"

7503

7561 -#: sequencer.c:574 builtin/tag.c:610

7504 +#: sequencer.c:574 builtin/tag.c:614

7505 #, c-format

7506 msgid "Invalid cleanup mode %s"

7507 msgstr "無效的清理模式 %s"

@@ -7589,8 +7532,8 @@ msgstr "在 '%.*s' 中沒有 key"

7532 msgid "unable to dequote value of '%s'"

7533 msgstr "無法為 '%s' 的值去引號"

7534

7592 -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730

7593 -#: builtin/am.c:822 builtin/rebase.c:694

7535 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756

7536 +#: builtin/am.c:848 builtin/rebase.c:694

7537 #, c-format

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

7539 msgstr "無法開啟 '%s' 進行讀取"

@@ -7653,11 +7596,11 @@ msgstr ""

7596 "\n"

7597 " git rebase --continue\n"

7598

7656 -#: sequencer.c:1229

7599 +#: sequencer.c:1225

7600 msgid "'prepare-commit-msg' hook failed"

7601 msgstr "'prepare-commit-msg' 掛鉤失敗"

7602

7660 -#: sequencer.c:1235

7603 +#: sequencer.c:1231

7604 msgid ""

7605 "Your name and email address were configured automatically based\n"

7606 "on your username and hostname. Please check that they are accurate.\n"

@@ -7681,7 +7624,7 @@ msgstr ""

7624 "\n"

7625 " git commit --amend --reset-author\n"

7626

7684 -#: sequencer.c:1248

7627 +#: sequencer.c:1244

7628 msgid ""

7629 "Your name and email address were configured automatically based\n"

7630 "on your username and hostname. Please check that they are accurate.\n"

@@ -7704,349 +7647,349 @@ msgstr ""

7647 "\n"

7648 " git commit --amend --reset-author\n"

7649

7707 -#: sequencer.c:1290

7650 +#: sequencer.c:1288

7651 msgid "couldn't look up newly created commit"

7652 msgstr "無法找到新建立的提交"

7653

7711 -#: sequencer.c:1292

7654 +#: sequencer.c:1290

7655 msgid "could not parse newly created commit"

7656 msgstr "不能解析新建立的提交"

7657

7715 -#: sequencer.c:1338

7658 +#: sequencer.c:1339

7659 msgid "unable to resolve HEAD after creating commit"

7660 msgstr "建立提交後，不能解析 HEAD"

7661

7719 -#: sequencer.c:1340

7662 +#: sequencer.c:1342

7663 msgid "detached HEAD"

7664 msgstr "分離 HEAD"

7665

7666 # 譯者：中文字串拼接，可刪除前導空格

7724 -#: sequencer.c:1344

7667 +#: sequencer.c:1346

7668 msgid " (root-commit)"

7669 msgstr " (根提交)"

7670

7728 -#: sequencer.c:1365

7671 +#: sequencer.c:1367

7672 msgid "could not parse HEAD"

7673 msgstr "不能解析 HEAD"

7674

7732 -#: sequencer.c:1367

7675 +#: sequencer.c:1369

7676 #, c-format

7677 msgid "HEAD %s is not a commit!"

7678 msgstr "HEAD %s 不是一個提交！"

7679

7737 -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707

7680 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708

7681 msgid "could not parse HEAD commit"

7682 msgstr "不能解析 HEAD 提交"

7683

7741 -#: sequencer.c:1427 sequencer.c:2312

7684 +#: sequencer.c:1429 sequencer.c:2314

7685 msgid "unable to parse commit author"

7686 msgstr "不能解析提交作者"

7687

7745 -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708

7688 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710

7689 msgid "git write-tree failed to write a tree"

7690 msgstr "git write-tree 無法寫入樹狀物件"

7691

7749 -#: sequencer.c:1471 sequencer.c:1591

7692 +#: sequencer.c:1473 sequencer.c:1593

7693 #, c-format

7694 msgid "unable to read commit message from '%s'"

7695 msgstr "不能從 '%s' 讀取提交說明"

7696

7754 -#: sequencer.c:1502 sequencer.c:1534

7697 +#: sequencer.c:1504 sequencer.c:1536

7698 #, c-format

7699 msgid "invalid author identity '%s'"

7700 msgstr "無效的作者身分 '%s'"

7701

7759 -#: sequencer.c:1508

7702 +#: sequencer.c:1510

7703 msgid "corrupt author: missing date information"

7704 msgstr "作者資訊損壞：缺少日期資訊"

7705

7763 -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913

7764 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78

7706 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915

7707 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78

7708 msgid "failed to write commit object"

7709 msgstr "寫提交物件失敗"

7710

7768 -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199

7711 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199

7712 #: t/helper/test-fast-rebase.c:217

7713 #, c-format

7714 msgid "could not update %s"

7715 msgstr "不能更新 %s"

7716

7774 -#: sequencer.c:1623

7717 +#: sequencer.c:1625

7718 #, c-format

7719 msgid "could not parse commit %s"

7720 msgstr "不能解析提交 %s"

7721

7779 -#: sequencer.c:1628

7722 +#: sequencer.c:1630

7723 #, c-format

7724 msgid "could not parse parent commit %s"

7725 msgstr "不能解析父提交 %s"

7726

7784 -#: sequencer.c:1711 sequencer.c:1992

7727 +#: sequencer.c:1713 sequencer.c:1994

7728 #, c-format

7729 msgid "unknown command: %d"

7730 msgstr "未知指令：%d"

7731

7789 -#: sequencer.c:1753

7732 +#: sequencer.c:1755

7733 msgid "This is the 1st commit message:"

7734 msgstr "這是第一個提交說明："

7735

7793 -#: sequencer.c:1754

7736 +#: sequencer.c:1756

7737 #, c-format

7738 msgid "This is the commit message #%d:"

7739 msgstr "這是提交說明 #%d："

7740

7798 -#: sequencer.c:1755

7741 +#: sequencer.c:1757

7742 msgid "The 1st commit message will be skipped:"

7743 msgstr "略過第 1 個提交說明："

7744

7802 -#: sequencer.c:1756

7745 +#: sequencer.c:1758

7746 #, c-format

7747 msgid "The commit message #%d will be skipped:"

7748 msgstr "略過第 %d 個提交說明："

7749

7807 -#: sequencer.c:1757

7750 +#: sequencer.c:1759

7751 #, c-format

7752 msgid "This is a combination of %d commits."

7753 msgstr "這是整合 %d 個提交的集合提交。"

7754

7812 -#: sequencer.c:1904 sequencer.c:1961

7755 +#: sequencer.c:1906 sequencer.c:1963

7756 #, c-format

7757 msgid "cannot write '%s'"

7758 msgstr "不能寫 '%s'"

7759

7817 -#: sequencer.c:1951

7760 +#: sequencer.c:1953

7761 msgid "need a HEAD to fixup"

7762 msgstr "需要一個 HEAD 來修復"

7763

7821 -#: sequencer.c:1953 sequencer.c:3601

7764 +#: sequencer.c:1955 sequencer.c:3596

7765 msgid "could not read HEAD"

7766 msgstr "不能讀取 HEAD"

7767

7825 -#: sequencer.c:1955

7768 +#: sequencer.c:1957

7769 msgid "could not read HEAD's commit message"

7770 msgstr "不能讀取 HEAD 的提交說明"

7771

7829 -#: sequencer.c:1979

7772 +#: sequencer.c:1981

7773 #, c-format

7774 msgid "could not read commit message of %s"

7775 msgstr "不能讀取 %s 的提交說明"

7776

7834 -#: sequencer.c:2089

7777 +#: sequencer.c:2091

7778 msgid "your index file is unmerged."

7779 msgstr "您的索引檔案未完成合併。"

7780

7838 -#: sequencer.c:2096

7781 +#: sequencer.c:2098

7782 msgid "cannot fixup root commit"

7783 msgstr "不能修復根提交"

7784

7842 -#: sequencer.c:2115

7785 +#: sequencer.c:2117

7786 #, c-format

7787 msgid "commit %s is a merge but no -m option was given."

7788 msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"

7789

7847 -#: sequencer.c:2123 sequencer.c:2131

7790 +#: sequencer.c:2125 sequencer.c:2133

7791 #, c-format

7792 msgid "commit %s does not have parent %d"

7793 msgstr "提交 %s 沒有第 %d 個父提交"

7794

7852 -#: sequencer.c:2137

7795 +#: sequencer.c:2139

7796 #, c-format

7797 msgid "cannot get commit message for %s"

7798 msgstr "不能得到 %s 的提交說明"

7799

7800 #. TRANSLATORS: The first %s will be a "todo" command like

7801 #. "revert" or "pick", the second %s a SHA1.

7859 -#: sequencer.c:2156

7802 +#: sequencer.c:2158

7803 #, c-format

7804 msgid "%s: cannot parse parent commit %s"

7805 msgstr "%s：不能解析父提交 %s"

7806

7864 -#: sequencer.c:2222

7807 +#: sequencer.c:2224

7808 #, c-format

7809 msgid "could not rename '%s' to '%s'"

7810 msgstr "不能將 '%s' 重新命名為 '%s'"

7811

7869 -#: sequencer.c:2282

7812 +#: sequencer.c:2284

7813 #, c-format

7814 msgid "could not revert %s... %s"

7815 msgstr "不能還原 %s... %s"

7816

7874 -#: sequencer.c:2283

l10n: zh_TW: v2.35.0 round 1 (1 fuzzy)