d9488fea41 · matheusbsbs/matheus-bagliano

@@ -28,8 +28,9 @@

28 # bare repository | 纯仓库

29 # bisect | 二分查找

30 # blob object | 数据对象

31 +# bloom filter | 布隆过滤器

32 # branch | 分支

32 -# bundle | 包

33 +# bundle | 归档包

34 # bypass | 绕过

35 # cache | 索引（的别称）

36 # chain | （提交）链

@@ -139,8 +140,8 @@ msgid ""

140 msgstr ""

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

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

142 -"POT-Creation-Date: 2020-07-10 09:53+0800\n"

143 -"PO-Revision-Date: 2020-07-17 10:27+0800\n"

143 +"POT-Creation-Date: 2020-10-10 09:32+0800\n"

144 +"PO-Revision-Date: 2020-10-10 09:43+0800\n"

145 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

146 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"

147 "Language: zh_CN\n"

@@ -154,9 +155,9 @@ msgstr ""

155 msgid "Huh (%s)?"

156 msgstr "嗯（%s）？"

157

157 -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

158 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

159 -#: builtin/rebase.c:1919

158 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250

159 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

160 +#: builtin/rebase.c:1944

161 msgid "could not read index"

162 msgstr "不能读取索引"

163

@@ -184,7 +185,7 @@ msgstr "更新"

185 msgid "could not stage '%s'"

186 msgstr "不能暂存 '%s'"

187

187 -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

188 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444

189 msgid "could not write index"

190 msgstr "不能写入索引"

191

@@ -200,7 +201,7 @@ msgstr[1] "更新了 %d 个路径\n"

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

202 msgstr "说明：%s 现已成为未跟踪的。\n"

203

203 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

204 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

205 #: builtin/reset.c:145

206 #, c-format

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

@@ -242,21 +243,21 @@ msgstr[1] "增加了 %d 个路径\n"

243 msgid "ignoring unmerged: %s"

244 msgstr "忽略未合入的：%s"

245

245 -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

246 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

247 #, c-format

248 msgid "Only binary files changed.\n"

249 msgstr "只有二进制文件被修改。\n"

250

250 -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

251 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

252 #, c-format

253 msgid "No changes.\n"

254 msgstr "没有修改。\n"

255

255 -#: add-interactive.c:935 git-add--interactive.perl:1378

256 +#: add-interactive.c:935 git-add--interactive.perl:1381

257 msgid "Patch update"

258 msgstr "补丁更新"

259

259 -#: add-interactive.c:974 git-add--interactive.perl:1771

260 +#: add-interactive.c:974 git-add--interactive.perl:1794

261 msgid "Review diff"

262 msgstr "检视 diff"

263

@@ -324,11 +325,11 @@ msgstr "选择一个编号条目"

325 msgid "(empty) select nothing"

326 msgstr "（空）不选择任何内容"

327

327 -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868

328 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891

329 msgid "*** Commands ***"

330 msgstr "*** 命令 ***"

331

331 -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865

332 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888

333 msgid "What now"

334 msgstr "请选择"

335

@@ -340,12 +341,12 @@ msgstr "缓存"

341 msgid "unstaged"

342 msgstr "未缓存"

343

343 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

344 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

345 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

346 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

347 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

348 -#: builtin/submodule--helper.c:2148 bugreport.c:135

344 +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

345 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

346 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

347 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

348 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

349 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

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

351 msgid "path"

352 msgstr "路径"

@@ -354,27 +355,27 @@ msgstr "路径"

355 msgid "could not refresh index"

356 msgstr "不能刷新索引"

357

357 -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782

358 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805

359 #, c-format

360 msgid "Bye.\n"

361 msgstr "再见。\n"

362

362 -#: add-patch.c:34 git-add--interactive.perl:1430

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

364 #, c-format, perl-format

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

366 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "

367

367 -#: add-patch.c:35 git-add--interactive.perl:1431

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

369 #, c-format, perl-format

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

371 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "

372

372 -#: add-patch.c:36 git-add--interactive.perl:1432

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

374 #, c-format, perl-format

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

376 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "

377

377 -#: add-patch.c:37 git-add--interactive.perl:1433

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

379 #, c-format, perl-format

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

381 msgstr "暂存该块 [y,n,q,a,d%s,?]? "

@@ -399,22 +400,22 @@ msgstr ""

400 "a - 暂存该块和本文件中后面的全部块\n"

401 "d - 不暂存该块和本文件中后面的全部块\n"

402

402 -#: add-patch.c:56 git-add--interactive.perl:1436

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

404 #, c-format, perl-format

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

406 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "

407

407 -#: add-patch.c:57 git-add--interactive.perl:1437

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

409 #, c-format, perl-format

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

411 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "

412

412 -#: add-patch.c:58 git-add--interactive.perl:1438

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

414 #, c-format, perl-format

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

416 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "

417

417 -#: add-patch.c:59 git-add--interactive.perl:1439

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

419 #, c-format, perl-format

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

421 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "

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

440 "a - 贮藏该块和本文件中后面的全部块\n"

441 "d - 不贮藏该块和本文件中后面的全部块\n"

442

442 -#: add-patch.c:80 git-add--interactive.perl:1442

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

444 #, c-format, perl-format

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

446 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "

447

447 -#: add-patch.c:81 git-add--interactive.perl:1443

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

449 #, c-format, perl-format

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

451 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "

452

452 -#: add-patch.c:82 git-add--interactive.perl:1444

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

454 #, c-format, perl-format

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

456 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "

457

457 -#: add-patch.c:83 git-add--interactive.perl:1445

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

459 #, c-format, perl-format

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

461 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "

@@ -479,22 +480,22 @@ msgstr ""

480 "a - 取消暂存该块和本文件中后面的全部块\n"

481 "d - 不要取消暂存该块和本文件中后面的全部块\n"

482

482 -#: add-patch.c:103 git-add--interactive.perl:1448

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

484 #, c-format, perl-format

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

486 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "

487

487 -#: add-patch.c:104 git-add--interactive.perl:1449

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

489 #, c-format, perl-format

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

491 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "

492

492 -#: add-patch.c:105 git-add--interactive.perl:1450

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

494 #, c-format, perl-format

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

496 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "

497

497 -#: add-patch.c:106 git-add--interactive.perl:1451

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

499 #, c-format, perl-format

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

501 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "

@@ -519,26 +520,26 @@ msgstr ""

520 "a - 应用该块和本文件中后面的全部块\n"

521 "d - 不要应用该块和本文件中后面的全部块\n"

522

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

523 -#: git-add--interactive.perl:1472

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

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

525 #, c-format, perl-format

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

527 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

528

528 -#: add-patch.c:127 git-add--interactive.perl:1455

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

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

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

531 #, c-format, perl-format

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

533 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

534

534 -#: add-patch.c:128 git-add--interactive.perl:1456

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

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

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

537 #, c-format, perl-format

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

539 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

540

540 -#: add-patch.c:129 git-add--interactive.perl:1457

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

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

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

543 #, c-format, perl-format

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

545 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "

@@ -563,22 +564,22 @@ msgstr ""

564 "a - 丢弃该块和本文件中后面的全部块\n"

565 "d - 不要丢弃该块和本文件中后面的全部块\n"

566

566 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

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

568 #, c-format, perl-format

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

570 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

571

571 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

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

573 #, c-format, perl-format

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

575 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

576

576 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

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

578 #, c-format, perl-format

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

580 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

581

581 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

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

583 #, c-format, perl-format

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

585 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "

@@ -597,22 +598,22 @@ msgstr ""

598 "a - 丢弃该块和本文件中后面的全部块\n"

599 "d - 不要丢弃该块和本文件中后面的全部块\n"

600

600 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

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

602 #, c-format, perl-format

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

604 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "

605

605 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

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

607 #, c-format, perl-format

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

609 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

610

610 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

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

612 #, c-format, perl-format

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

614 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "

615

615 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

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

617 #, c-format, perl-format

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

619 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "

@@ -645,40 +646,40 @@ msgstr ""

646 "a - 应用该块和本文件中后面的全部块\n"

647 "d - 不要应用该块和本文件中后面的全部块\n"

648

648 -#: add-patch.c:328

649 +#: add-patch.c:342

650 #, c-format

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

652 msgstr "无法解析数据块头信息 '%.*s'"

653

653 -#: add-patch.c:347 add-patch.c:351

654 +#: add-patch.c:361 add-patch.c:365

655 #, c-format

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

657 msgstr "无法解析彩色数据块头信息 '%.*s'"

658

658 -#: add-patch.c:405

659 +#: add-patch.c:419

660 msgid "could not parse diff"

661 msgstr "不能解析差异信息"

662

662 -#: add-patch.c:424

663 +#: add-patch.c:438

664 msgid "could not parse colored diff"

665 msgstr "不能解析彩色差异信息"

666

666 -#: add-patch.c:438

667 +#: add-patch.c:452

668 #, c-format

669 msgid "failed to run '%s'"

670 msgstr "运行 '%s' 失败"

671

671 -#: add-patch.c:602

672 +#: add-patch.c:611

673 msgid "mismatched output from interactive.diffFilter"

674 msgstr "interactive.diffFilter 的输出不匹配"

675

675 -#: add-patch.c:603

676 +#: add-patch.c:612

677 msgid ""

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

679 "between its input and output lines."

680 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"

681

681 -#: add-patch.c:776

682 +#: add-patch.c:785

683 #, c-format

684 msgid ""

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

@@ -687,7 +688,7 @@ msgstr ""

688 "预期上下文行 #%d 于\n"

689 "%.*s"

690

690 -#: add-patch.c:791

691 +#: add-patch.c:800

692 #, c-format

693 msgid ""

694 "hunks do not overlap:\n"

@@ -700,11 +701,11 @@ msgstr ""

701 "\t不是结尾于：\n"

702 "%.*s"

703

703 -#: add-patch.c:1067 git-add--interactive.perl:1114

704 +#: add-patch.c:1076 git-add--interactive.perl:1117

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

706 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"

707

707 -#: add-patch.c:1071

708 +#: add-patch.c:1080

709 #, c-format

710 msgid ""

711 "---\n"

@@ -718,7 +719,7 @@ msgstr ""

719 "以 %c 开始的行将被删除。\n"

720

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

721 -#: add-patch.c:1085 git-add--interactive.perl:1128

722 +#: add-patch.c:1094 git-add--interactive.perl:1131

723 msgid ""

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

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

@@ -727,11 +728,11 @@ msgstr ""

728 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"

729 "此次编辑被终止，该块不会被修改。\n"

730

730 -#: add-patch.c:1118

731 +#: add-patch.c:1127

732 msgid "could not parse hunk header"

733 msgstr "无法解析数据块头信息"

734

734 -#: add-patch.c:1163

735 +#: add-patch.c:1172

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

737 msgstr "'git apply --cached' 失败"

738

@@ -747,24 +748,24 @@ msgstr "'git apply --cached' 失败"

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

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

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

750 -#: add-patch.c:1232 git-add--interactive.perl:1241

751 +#: add-patch.c:1241 git-add--interactive.perl:1244

752 msgid ""

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

754 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

755

755 -#: add-patch.c:1275

756 +#: add-patch.c:1284

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

758 msgstr "选中的块不能应用到索引！"

759

759 -#: add-patch.c:1276 git-add--interactive.perl:1345

760 +#: add-patch.c:1285 git-add--interactive.perl:1348

761 msgid "Apply them to the worktree anyway? "

762 msgstr "无论如何都要应用到工作区么？"

763

763 -#: add-patch.c:1283 git-add--interactive.perl:1348

764 +#: add-patch.c:1292 git-add--interactive.perl:1351

765 msgid "Nothing was applied.\n"

766 msgstr "未应用。\n"

767

767 -#: add-patch.c:1340

768 +#: add-patch.c:1349

769 msgid ""

770 "j - leave this hunk undecided, see next undecided hunk\n"

771 "J - leave this hunk undecided, see next hunk\n"

@@ -786,69 +787,69 @@ msgstr ""

787 "e - 手动编辑当前块\n"

788 "? - 显示帮助\n"

789

789 -#: add-patch.c:1463 add-patch.c:1473

790 +#: add-patch.c:1511 add-patch.c:1521

791 msgid "No previous hunk"

792 msgstr "没有前一个块"

793

793 -#: add-patch.c:1468 add-patch.c:1478

794 +#: add-patch.c:1516 add-patch.c:1526

795 msgid "No next hunk"

796 msgstr "没有下一个块"

797

797 -#: add-patch.c:1484

798 +#: add-patch.c:1532

799 msgid "No other hunks to goto"

800 msgstr "没有其它可供跳转的块"

801

801 -#: add-patch.c:1495 git-add--interactive.perl:1594

802 +#: add-patch.c:1543 git-add--interactive.perl:1608

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

804 msgstr "跳转到哪个块（<回车> 查看更多）？ "

805

805 -#: add-patch.c:1496 git-add--interactive.perl:1596

806 +#: add-patch.c:1544 git-add--interactive.perl:1610

807 msgid "go to which hunk? "

808 msgstr "跳转到哪个块？"

809

809 -#: add-patch.c:1507

810 +#: add-patch.c:1555

811 #, c-format

812 msgid "Invalid number: '%s'"

813 msgstr "无效数字：'%s'"

814

814 -#: add-patch.c:1512

815 +#: add-patch.c:1560

816 #, c-format

817 msgid "Sorry, only %d hunk available."

818 msgid_plural "Sorry, only %d hunks available."

819 msgstr[0] "对不起，只有 %d 个可用块。"

820 msgstr[1] "对不起，只有 %d 个可用块。"

821

821 -#: add-patch.c:1521

822 +#: add-patch.c:1569

823 msgid "No other hunks to search"

824 msgstr "没有其它可供查找的块"

825

825 -#: add-patch.c:1527 git-add--interactive.perl:1640

826 +#: add-patch.c:1575 git-add--interactive.perl:1663

827 msgid "search for regex? "

828 msgstr "使用正则表达式搜索？"

829

829 -#: add-patch.c:1542

830 +#: add-patch.c:1590

831 #, c-format

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

833 msgstr "错误的正则表达式 %s：%s"

834

834 -#: add-patch.c:1559

835 +#: add-patch.c:1607

836 msgid "No hunk matches the given pattern"

837 msgstr "没有和给定模式相匹配的块"

838

838 -#: add-patch.c:1566

839 +#: add-patch.c:1614

840 msgid "Sorry, cannot split this hunk"

841 msgstr "对不起，不能拆分这个块"

842

842 -#: add-patch.c:1570

843 +#: add-patch.c:1618

844 #, c-format

845 msgid "Split into %d hunks."

846 msgstr "拆分为 %d 块。"

847

847 -#: add-patch.c:1574

848 +#: add-patch.c:1622

849 msgid "Sorry, cannot edit this hunk"

850 msgstr "对不起，不能编辑这个块"

851

851 -#: add-patch.c:1625

852 +#: add-patch.c:1674

853 msgid "'git apply' failed"

854 msgstr "'git apply' 失败"

855

@@ -903,7 +904,7 @@ msgstr ""

904 msgid "Exiting because of an unresolved conflict."

905 msgstr "因为存在未解决的冲突而退出。"

906

906 -#: advice.c:278 builtin/merge.c:1353

907 +#: advice.c:278 builtin/merge.c:1349

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

909 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

910

@@ -1193,7 +1194,7 @@ msgstr "打补丁失败：%s:%ld"

1194 msgid "cannot checkout %s"

1195 msgstr "不能检出 %s"

1196

1196 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1197 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

1198 #, c-format

1199 msgid "failed to read %s"

1200 msgstr "无法读取 %s"

@@ -1213,7 +1214,7 @@ msgstr "路径 %s 已经被重命名/删除"

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

1215 msgstr "%s：不存在于索引中"

1216

1216 -#: apply.c:3537 apply.c:3708

1217 +#: apply.c:3537 apply.c:3708 apply.c:3953

1218 #, c-format

1219 msgid "%s: does not match index"

1220 msgstr "%s：和索引不匹配"

@@ -1261,360 +1262,355 @@ msgstr "%s：错误类型"

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

1263 msgstr "%s 的类型是 %o，应为 %o"

1264

1264 -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1265 -#: read-cache.c:1325

1265 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1266 +#: read-cache.c:1313

1267 #, c-format

1268 msgid "invalid path '%s'"

1269 msgstr "无效路径 '%s'"

1270

1270 -#: apply.c:3936

1271 +#: apply.c:3950

1272 #, c-format

1273 msgid "%s: already exists in index"

1274 msgstr "%s：已经存在于索引中"

1275

1275 -#: apply.c:3939

1276 +#: apply.c:3956

1277 #, c-format

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

1279 msgstr "%s：已经存在于工作区中"

1280

1280 -#: apply.c:3959

1281 +#: apply.c:3976

1282 #, c-format

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

1284 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

1285

1285 -#: apply.c:3964

1286 +#: apply.c:3981

1287 #, c-format

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

1289 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

1290

1290 -#: apply.c:3984

1291 +#: apply.c:4001

1292 #, c-format

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

1294 msgstr "受影响的文件 '%s' 位于符号链接中"

1295

1295 -#: apply.c:3988

1296 +#: apply.c:4005

1297 #, c-format

1298 msgid "%s: patch does not apply"

1299 msgstr "%s：补丁未应用"

1300

1300 -#: apply.c:4003

1301 +#: apply.c:4020

1302 #, c-format

1303 msgid "Checking patch %s..."

1304 msgstr "正在检查补丁 %s..."

1305

1305 -#: apply.c:4095

1306 +#: apply.c:4112

1307 #, c-format

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

1309 msgstr "子模组 %s 的 sha1 信息缺失或无效"

1310

1310 -#: apply.c:4102

1311 +#: apply.c:4119

1312 #, c-format

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

1314 msgstr "%s 的模式变更，但它不在当前 HEAD 中"

1315

1315 -#: apply.c:4105

1316 +#: apply.c:4122

1317 #, c-format

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

1319 msgstr "sha1 信息缺失或无效（%s）。"

1320

1320 -#: apply.c:4114

1321 +#: apply.c:4131

1322 #, c-format

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

1324 msgstr "不能在临时索引中添加 %s"

1325

1325 -#: apply.c:4124

1326 +#: apply.c:4141

1327 #, c-format

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

1329 msgstr "不能把临时索引写入到 %s"

1330

1330 -#: apply.c:4262

1331 +#: apply.c:4279

1332 #, c-format

1333 msgid "unable to remove %s from index"

1334 msgstr "不能从索引中移除 %s"

1335

1335 -#: apply.c:4296

1336 +#: apply.c:4313

1337 #, c-format

1338 msgid "corrupt patch for submodule %s"

1339 msgstr "子模组 %s 损坏的补丁"

1340

1340 -#: apply.c:4302

1341 +#: apply.c:4319

1342 #, c-format

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

1344 msgstr "不能对新建文件 '%s' 调用 stat"

1345

1345 -#: apply.c:4310

1346 +#: apply.c:4327

1347 #, c-format

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

1349 msgstr "不能为新建文件 %s 创建后端存储"

1350

1350 -#: apply.c:4316 apply.c:4461

1351 +#: apply.c:4333 apply.c:4478

1352 #, c-format

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

1354 msgstr "无法为 %s 添加缓存条目"

1355

1355 -#: apply.c:4359

1356 +#: apply.c:4376 builtin/bisect--helper.c:537

1357 #, c-format

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

1359 msgstr "写入 '%s' 失败"

1360

1360 -#: apply.c:4363

1361 +#: apply.c:4380

1362 #, c-format

1363 msgid "closing file '%s'"

1364 msgstr "关闭文件 '%s'"

1365

1365 -#: apply.c:4433

1366 +#: apply.c:4450

1367 #, c-format

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

1369 msgstr "不能写文件 '%s' 权限 %o"

1370

1370 -#: apply.c:4531

1371 +#: apply.c:4548

1372 #, c-format

1373 msgid "Applied patch %s cleanly."

1374 msgstr "成功应用补丁 %s。"

1375

1375 -#: apply.c:4539

1376 +#: apply.c:4556

1377 msgid "internal error"

1378 msgstr "内部错误"

1379

1379 -#: apply.c:4542

1380 +#: apply.c:4559

1381 #, c-format

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

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

1384 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1385 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1386

1386 -#: apply.c:4553

1387 +#: apply.c:4570

1388 #, c-format

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

1390 msgstr "截短 .rej 文件名为 %.*s.rej"

1391

1391 -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1392 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228

1393 #, c-format

1394 msgid "cannot open %s"

1395 msgstr "不能打开 %s"

1396

1396 -#: apply.c:4575

1397 +#: apply.c:4592

1398 #, c-format

1399 msgid "Hunk #%d applied cleanly."

1400 msgstr "第 #%d 个片段成功应用。"

1401

1401 -#: apply.c:4579

1402 +#: apply.c:4596

1403 #, c-format

1404 msgid "Rejected hunk #%d."

1405 msgstr "拒绝第 #%d 个片段。"

1406

1406 -#: apply.c:4698

1407 +#: apply.c:4715

1408 #, c-format

1409 msgid "Skipped patch '%s'."

1410 msgstr "略过补丁 '%s'。"

1411

1411 -#: apply.c:4706

1412 +#: apply.c:4723

1413 msgid "unrecognized input"

1414 msgstr "未能识别的输入"

1415

1415 -#: apply.c:4726

1416 +#: apply.c:4743

1417 msgid "unable to read index file"

1418 msgstr "无法读取索引文件"

1419

1419 -#: apply.c:4883

1420 +#: apply.c:4900

1421 #, c-format

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

1423 msgstr "不能打开补丁 '%s'：%s"

1424

1424 -#: apply.c:4910

1425 +#: apply.c:4927

1426 #, c-format

1427 msgid "squelched %d whitespace error"

1428 msgid_plural "squelched %d whitespace errors"

1429 msgstr[0] "抑制下仍有 %d 个空白字符误用"

1430 msgstr[1] "抑制下仍有 %d 个空白字符误用"

1431

1431 -#: apply.c:4916 apply.c:4931

1432 +#: apply.c:4933 apply.c:4948

1433 #, c-format

1434 msgid "%d line adds whitespace errors."

1435 msgid_plural "%d lines add whitespace errors."

1436 msgstr[0] "%d 行新增了空白字符误用。"

1437 msgstr[1] "%d 行新增了空白字符误用。"

1438

1438 -#: apply.c:4924

1439 +#: apply.c:4941

1440 #, c-format

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

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

1443 msgstr[0] "修复空白错误后，应用了 %d 行。"

1444 msgstr[1] "修复空白错误后，应用了 %d 行。"

1445

1445 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1446 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1447 msgid "Unable to write new index file"

1448 msgstr "无法写入新索引文件"

1449

1449 -#: apply.c:4968

1450 +#: apply.c:4985

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

1452 msgstr "不要应用与给出路径向匹配的变更"

1453

1453 -#: apply.c:4971

1454 +#: apply.c:4988

1455 msgid "apply changes matching the given path"

1456 msgstr "应用与给出路径向匹配的变更"

1457

1457 -#: apply.c:4973 builtin/am.c:2259

1458 +#: apply.c:4990 builtin/am.c:2279

1459 msgid "num"

1460 msgstr "数字"

1461

1461 -#: apply.c:4974

1462 +#: apply.c:4991

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

1464 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

1465

1465 -#: apply.c:4977

1466 +#: apply.c:4994

1467 msgid "ignore additions made by the patch"

1468 msgstr "忽略补丁中的添加的文件"

1469

1469 -#: apply.c:4979

1470 +#: apply.c:4996

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

1472 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

1473

1473 -#: apply.c:4983

1474 +#: apply.c:5000

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

1476 msgstr "以十进制数显示添加和删除的行数"

1477

1477 -#: apply.c:4985

1478 +#: apply.c:5002

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

1480 msgstr "不应用补丁，而是显示输入的概要"

1481

1481 -#: apply.c:4987

1482 +#: apply.c:5004

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

1484 msgstr "不应用补丁，而是查看补丁是否可应用"

1485

1485 -#: apply.c:4989

1486 +#: apply.c:5006

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

1488 msgstr "确认补丁可以应用到当前索引"

1489

1489 -#: apply.c:4991

1490 +#: apply.c:5008

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

1492 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

1493

1493 -#: apply.c:4993

1494 +#: apply.c:5010

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

1496 msgstr "应用补丁而不修改工作区"

1497

1497 -#: apply.c:4995

1498 +#: apply.c:5012

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

1500 msgstr "接受修改工作区之外文件的补丁"

1501

1501 -#: apply.c:4998

1502 +#: apply.c:5015

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

1504 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

1505

1505 -#: apply.c:5000

1506 +#: apply.c:5017

1507 msgid "attempt three-way merge if a patch does not apply"

1508 msgstr "如果一个补丁不能应用则尝试三方合并"

1509

1509 -#: apply.c:5002

1510 +#: apply.c:5019

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

1512 msgstr "创建一个临时索引基于嵌入的索引信息"

1513

1513 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1514 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1515 msgid "paths are separated with NUL character"

1516 msgstr "路径以 NUL 字符分隔"

1517

1517 -#: apply.c:5007

1518 +#: apply.c:5024

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

1520 msgstr "确保至少匹配 <n> 行上下文"

1521

1521 -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

1522 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

1523 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1523 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1524 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1525 msgid "action"

1526 msgstr "动作"

1527

1527 -#: apply.c:5009

1528 +#: apply.c:5026

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

1530 msgstr "检查新增和修改的行中间的空白字符滥用"

1531

1531 -#: apply.c:5012 apply.c:5015

1532 +#: apply.c:5029 apply.c:5032

1533 msgid "ignore changes in whitespace when finding context"

1534 msgstr "查找上下文时忽略空白字符的变更"

1535

1535 -#: apply.c:5018

1536 +#: apply.c:5035

1537 msgid "apply the patch in reverse"

1538 msgstr "反向应用补丁"

1539

1539 -#: apply.c:5020

1540 +#: apply.c:5037

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

1542 msgstr "无需至少一行上下文"

1543

1543 -#: apply.c:5022

1544 +#: apply.c:5039

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

1546 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1547

1547 -#: apply.c:5024

1548 +#: apply.c:5041

1549 msgid "allow overlapping hunks"

1550 msgstr "允许重叠的补丁片段"

1551

1551 -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1552 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

1553 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1552 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1553 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1554 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1555 msgid "be verbose"

1556 msgstr "冗长输出"

1557

1557 -#: apply.c:5027

1558 +#: apply.c:5044

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

1560 msgstr "允许不正确的文件末尾换行符"

1561

1561 -#: apply.c:5030

1562 +#: apply.c:5047

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

1564 msgstr "不信任补丁片段的头信息中的行号"

1565

1565 -#: apply.c:5032 builtin/am.c:2247

1566 +#: apply.c:5049 builtin/am.c:2267

1567 msgid "root"

1568 msgstr "根目录"

1569

1569 -#: apply.c:5033

1570 +#: apply.c:5050

1571 msgid "prepend <root> to all filenames"

1572 msgstr "为所有文件名前添加 <根目录>"

1573

1573 -#: archive-tar.c:125 archive-zip.c:351

1574 +#: archive-tar.c:125 archive-zip.c:345

1575 #, c-format

1576 msgid "cannot stream blob %s"

1577 msgstr "不能打开数据对象 %s"

1578

1578 -#: archive-tar.c:266 archive-zip.c:369

1579 +#: archive-tar.c:265 archive-zip.c:358

1580 #, c-format

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

1582 msgstr "不支持的文件模式：0%o (SHA1: %s)"

1583

1583 -#: archive-tar.c:293 archive-zip.c:359

1584 -#, c-format

1585 -msgid "cannot read %s"

1586 -msgstr "不能读取 %s"

1587 -

1588 -#: archive-tar.c:465

1584 +#: archive-tar.c:449

1585 #, c-format

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

1587 msgstr "无法启动 '%s' 过滤器"

1588

1593 -#: archive-tar.c:468

1589 +#: archive-tar.c:452

1590 msgid "unable to redirect descriptor"

1591 msgstr "无法重定向描述符"

1592

1597 -#: archive-tar.c:475

1593 +#: archive-tar.c:459

1594 #, c-format

1595 msgid "'%s' filter reported error"

1596 msgstr "'%s' 过滤器报告了错误"

1597

1602 -#: archive-zip.c:319

1598 +#: archive-zip.c:318

1599 #, c-format

1600 msgid "path is not valid UTF-8: %s"

1601 msgstr "路径不是有效的 UTF-8：%s"

1602

1607 -#: archive-zip.c:323

1603 +#: archive-zip.c:322

1604 #, c-format

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

1606 msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1607

1612 -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1608 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1609 #, c-format

1610 msgid "deflate error (%d)"

1611 msgstr "压缩错误 (%d)"

1612

1617 -#: archive-zip.c:615

1613 +#: archive-zip.c:603

1614 #, c-format

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

1616 msgstr "对于本系统时间戳太大：%<PRIuMAX>"

@@ -1637,119 +1633,149 @@ msgstr ""

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

1634 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1635

1640 -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1636 +#: archive.c:192

1637 +#, c-format

1638 +msgid "cannot read %s"

1639 +msgstr "不能读取 %s"

1640 +

1641 +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1642 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1643 +#: builtin/merge.c:1124

1644 +#, c-format

1645 +msgid "could not read '%s'"

1646 +msgstr "不能读取 '%s'"

1647 +

1648 +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1649 #, c-format

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

1651 msgstr "路径规格 '%s' 未匹配任何文件"

1652

1645 -#: archive.c:401

1653 +#: archive.c:454

1654 #, c-format

1655 msgid "no such ref: %.*s"

1656 msgstr "无此引用：%.*s"

1657

1650 -#: archive.c:407

1658 +#: archive.c:460

1659 #, c-format

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

1661 msgstr "不是一个有效的对象名：%s"

1662

1655 -#: archive.c:420

1663 +#: archive.c:473

1664 #, c-format

1665 msgid "not a tree object: %s"

1666 msgstr "不是一个树对象：%s"

1667

1660 -#: archive.c:432

1668 +#: archive.c:485

1669 msgid "current working directory is untracked"

1670 msgstr "当前工作目录未被跟踪"

1671

1664 -#: archive.c:464

1672 +#: archive.c:526

1673 +#, c-format

1674 +msgid "File not found: %s"

1675 +msgstr "文件未找到：%s"

1676 +

1677 +#: archive.c:528

1678 +#, c-format

1679 +msgid "Not a regular file: %s"

1680 +msgstr "不是一个常规文件：%s"

1681 +

1682 +#: archive.c:553

1683 msgid "fmt"

1684 msgstr "格式"

1685

1668 -#: archive.c:464

1686 +#: archive.c:553

1687 msgid "archive format"

1688 msgstr "归档格式"

1689

1672 -#: archive.c:465 builtin/log.c:1674

1690 +#: archive.c:554 builtin/log.c:1760

1691 msgid "prefix"

1692 msgstr "前缀"

1693

1676 -#: archive.c:466

1694 +#: archive.c:555

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

1696 msgstr "为归档中每个路径名加上前缀"

1697

1680 -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1681 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1682 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

1683 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1684 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1685 -#: parse-options.h:190

1698 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1699 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1700 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1701 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1702 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1703 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1704 msgid "file"

1705 msgstr "文件"

1706

1689 -#: archive.c:468 builtin/archive.c:90

1707 +#: archive.c:557

1708 +msgid "add untracked file to archive"

1709 +msgstr "将未跟踪文件添加到归档"

1710 +

1711 +#: archive.c:560 builtin/archive.c:90

1712 msgid "write the archive to this file"

1713 msgstr "归档写入此文件"

1714

1693 -#: archive.c:470

1715 +#: archive.c:562

1716 msgid "read .gitattributes in working directory"

1717 msgstr "读取工作区中的 .gitattributes"

1718

1697 -#: archive.c:471

1719 +#: archive.c:563

1720 msgid "report archived files on stderr"

1721 msgstr "在标准错误上报告归档文件"

1722

1701 -#: archive.c:472

1723 +#: archive.c:564

1724 msgid "store only"

1725 msgstr "只存储"

1726

1705 -#: archive.c:473

1727 +#: archive.c:565

1728 msgid "compress faster"

1729 msgstr "压缩速度更快"

1730

1709 -#: archive.c:481

1731 +#: archive.c:573

1732 msgid "compress better"

1733 msgstr "压缩效果更好"

1734

1713 -#: archive.c:484

1735 +#: archive.c:576

1736 msgid "list supported archive formats"

1737 msgstr "列出支持的归档格式"

1738

1717 -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1718 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1739 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1740 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1741 msgid "repo"

1742 msgstr "仓库"

1743

1722 -#: archive.c:487 builtin/archive.c:92

1744 +#: archive.c:579 builtin/archive.c:92

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

1746 msgstr "从远程仓库（<仓库>）提取归档文件"

1747

1726 -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1748 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1749 #: builtin/notes.c:498

1750 msgid "command"

1751 msgstr "命令"

1752

1731 -#: archive.c:489 builtin/archive.c:94

1753 +#: archive.c:581 builtin/archive.c:94

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

1755 msgstr "远程 git-upload-archive 命令的路径"

1756

1735 -#: archive.c:496

1757 +#: archive.c:588

1758 msgid "Unexpected option --remote"

1759 msgstr "未知参数 --remote"

1760

1739 -#: archive.c:498

1761 +#: archive.c:590

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

1763 msgstr "选项 --exec 只能和 --remote 同时使用"

1764

1743 -#: archive.c:500

1765 +#: archive.c:592

1766 msgid "Unexpected option --output"

1767 msgstr "未知参数 --output"

1768

1747 -#: archive.c:522

1769 +#: archive.c:594

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

1771 +msgstr "选项 --add-file 和 --remote 不能同时使用"

1772 +

1773 +#: archive.c:616

1774 #, c-format

1775 msgid "Unknown archive format '%s'"

1776 msgstr "未知归档格式 '%s'"

1777

1752 -#: archive.c:529

1778 +#: archive.c:623

1779 #, c-format

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

1781 msgstr "参数不支持此格式 '%s'：-%d"

@@ -1772,22 +1798,22 @@ msgstr ""

1798 "负值模版在 git attributes 中被忽略\n"

1799 "当字符串确实要以感叹号开始时，使用 '\\!'。"

1800

1775 -#: bisect.c:468

1801 +#: bisect.c:476

1802 #, c-format

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

1804 msgstr "文件 '%s' 包含错误的引用格式：%s"

1805

1780 -#: bisect.c:678

1806 +#: bisect.c:686

1807 #, c-format

1808 msgid "We cannot bisect more!\n"

1809 msgstr "我们无法进行更多的二分查找！\n"

1810

1785 -#: bisect.c:745

1811 +#: bisect.c:753

1812 #, c-format

1813 msgid "Not a valid commit name %s"

1814 msgstr "不是一个有效的提交名 %s"

1815

1790 -#: bisect.c:770

1816 +#: bisect.c:778

1817 #, c-format

1818 msgid ""

1819 "The merge base %s is bad.\n"

@@ -1796,7 +1822,7 @@ msgstr ""

1822 "合并基线 %s 是坏的。\n"

1823 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

1824

1799 -#: bisect.c:775

1825 +#: bisect.c:783

1826 #, c-format

1827 msgid ""

1828 "The merge base %s is new.\n"

@@ -1805,7 +1831,7 @@ msgstr ""

1831 "合并基线 %s 是新的。\n"

1832 "介于 %s 和 [%s] 之间的属性已经被修改。\n"

1833

1808 -#: bisect.c:780

1834 +#: bisect.c:788

1835 #, c-format

1836 msgid ""

1837 "The merge base %s is %s.\n"

@@ -1814,7 +1840,7 @@ msgstr ""

1840 "合并基线 %s 是 %s。\n"

1841 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1842

1817 -#: bisect.c:788

1843 +#: bisect.c:796

1844 #, c-format

1845 msgid ""

1846 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1825,7 +1851,7 @@ msgstr ""

1851 "这种情况下 git 二分查找无法正常工作。\n"

1852 "您可能弄错了 %s 和 %s 版本？\n"

1853

1828 -#: bisect.c:801

1854 +#: bisect.c:809

1855 #, c-format

1856 msgid ""

1857 "the merge base between %s and [%s] must be skipped.\n"

@@ -1836,36 +1862,36 @@ msgstr ""

1862 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

1863 "我们仍旧继续。"

1864

1839 -#: bisect.c:840

1865 +#: bisect.c:848

1866 #, c-format

1867 msgid "Bisecting: a merge base must be tested\n"

1868 msgstr "二分查找中：合并基线必须是经过测试的\n"

1869

1844 -#: bisect.c:890

1870 +#: bisect.c:898

1871 #, c-format

1872 msgid "a %s revision is needed"

1873 msgstr "需要一个 %s 版本"

1874

1849 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1875 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1876 #, c-format

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

1878 msgstr "不能创建文件 '%s'"

1879

1854 -#: bisect.c:966 builtin/merge.c:151

1880 +#: bisect.c:974 builtin/merge.c:150

1881 #, c-format

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

1883 msgstr "不能读取文件 '%s'"

1884

1859 -#: bisect.c:997

1885 +#: bisect.c:1014

1886 msgid "reading bisect refs failed"

1887 msgstr "读取二分查找引用失败"

1888

1863 -#: bisect.c:1019

1889 +#: bisect.c:1044

1890 #, c-format

1891 msgid "%s was both %s and %s\n"

1892 msgstr "%s 同时为 %s 和 %s\n"

1893

1868 -#: bisect.c:1028

1894 +#: bisect.c:1053

1895 #, c-format

1896 msgid ""

1897 "No testable commit found.\n"

@@ -1874,7 +1900,7 @@ msgstr ""

1900 "没有发现可测试的提交。\n"

1901 "可能您在运行时使用了错误的路径参数？\n"

1902

1877 -#: bisect.c:1057

1903 +#: bisect.c:1082

1904 #, c-format

1905 msgid "(roughly %d step)"

1906 msgid_plural "(roughly %d steps)"

@@ -1884,44 +1910,44 @@ msgstr[1] "（大概 %d 步）"

1910 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1911 #. steps)" translation.

1912 #.

1887 -#: bisect.c:1063

1913 +#: bisect.c:1088

1914 #, c-format

1915 msgid "Bisecting: %d revision left to test after this %s\n"

1916 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1917 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1918 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1919

1894 -#: blame.c:2777

1920 +#: blame.c:2778

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

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

1923

1898 -#: blame.c:2791

1924 +#: blame.c:2792

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

1926 msgstr "不能将 --contents 和最终的提交对象名共用"

1927

1902 -#: blame.c:2812

1928 +#: blame.c:2813

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

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

1931

1906 -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1907 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1908 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1909 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1910 -#: builtin/shortlog.c:192

1932 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1933 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1934 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1935 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1936 +#: builtin/shortlog.c:320

1937 msgid "revision walk setup failed"

1938 msgstr "版本遍历设置失败"

1939

1914 -#: blame.c:2839

1940 +#: blame.c:2840

1941 msgid ""

1942 "--reverse --first-parent together require range along first-parent chain"

1943 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1944

1919 -#: blame.c:2850

1945 +#: blame.c:2851

1946 #, c-format

1947 msgid "no such path %s in %s"

1948 msgstr "在 %2$s 中无此路径 %1$s"

1949

1924 -#: blame.c:2861

1950 +#: blame.c:2862

1951 #, c-format

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

1953 msgstr "不能为路径 %2$s 读取数据对象 %1$s"

@@ -2059,88 +2085,104 @@ msgstr "'%s' 已经检出到 '%s'"

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

2086 msgstr "工作区 %s 的 HEAD 指向没有被更新"

2087

2062 -#: bundle.c:47

2088 +#: bundle.c:41

2089 +#, c-format

2090 +msgid "unrecognized bundle hash algorithm: %s"

2091 +msgstr "未能识别的归档包哈希算法：%s"

2092 +

2093 +#: bundle.c:45

2094 #, c-format

2064 -msgid "'%s' does not look like a v2 bundle file"

2065 -msgstr "'%s' 不像是一个 v2 版本的包文件"

2095 +msgid "unknown capability '%s'"

2096 +msgstr "未知能力 '%s'"

2097

2067 -#: bundle.c:69

2068 -msgid "unknown hash algorithm length"

2069 -msgstr "未知的哈希算法长度"

2098 +#: bundle.c:71

2099 +#, c-format

2100 +msgid "'%s' does not look like a v2 or v3 bundle file"

2101 +msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"

2102

2071 -#: bundle.c:84

2103 +#: bundle.c:110

2104 #, c-format

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

2106 msgstr "未能识别的包头：%s%s (%d)"

2107

2076 -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2108 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

2109 #: builtin/commit.c:814

2110 #, c-format

2111 msgid "could not open '%s'"

2112 msgstr "不能打开 '%s'"

2113

2082 -#: bundle.c:163

2114 +#: bundle.c:189

2115 msgid "Repository lacks these prerequisite commits:"

2116 msgstr "仓库中缺少这些必备的提交："

2117

2086 -#: bundle.c:166

2118 +#: bundle.c:192

2119 msgid "need a repository to verify a bundle"

2088 -msgstr "需要一个仓库来校验一个包"

2120 +msgstr "需要一个仓库来校验一个归档包"

2121

2090 -#: bundle.c:217

2122 +#: bundle.c:243

2123 #, c-format

2124 msgid "The bundle contains this ref:"

2125 msgid_plural "The bundle contains these %d refs:"

2094 -msgstr[0] "这个包中含有这个引用："

2095 -msgstr[1] "这个包中含有 %d 个引用："

2126 +msgstr[0] "这个归档包中含有这个引用："

2127 +msgstr[1] "这个归档包中含有 %d 个引用："

2128

2097 -#: bundle.c:224

2129 +#: bundle.c:250

2130 msgid "The bundle records a complete history."

2099 -msgstr "这个包记录一个完整历史。"

2131 +msgstr "这个归档包记录一个完整历史。"

2132

2101 -#: bundle.c:226

2133 +#: bundle.c:252

2134 #, c-format

2135 msgid "The bundle requires this ref:"

2136 msgid_plural "The bundle requires these %d refs:"

2105 -msgstr[0] "这个包需要这个引用："

2106 -msgstr[1] "这个包需要 %d 个引用："

2137 +msgstr[0] "这个归档包需要这个引用："

2138 +msgstr[1] "这个归档包需要 %d 个引用："

2139

2108 -#: bundle.c:293

2140 +#: bundle.c:319

2141 msgid "unable to dup bundle descriptor"

2110 -msgstr "无法复制 bundle 描述符"

2142 +msgstr "无法复制归档包描述符"

2143

2112 -#: bundle.c:300

2144 +#: bundle.c:326

2145 msgid "Could not spawn pack-objects"

2146 msgstr "不能生成 pack-objects 进程"

2147

2116 -#: bundle.c:311

2148 +#: bundle.c:337

2149 msgid "pack-objects died"

2150 msgstr "pack-objects 终止"

2151

2120 -#: bundle.c:353

2152 +#: bundle.c:379

2153 msgid "rev-list died"

2154 msgstr "rev-list 终止"

2155

2124 -#: bundle.c:402

2156 +#: bundle.c:428

2157 #, c-format

2158 msgid "ref '%s' is excluded by the rev-list options"

2159 msgstr "引用 '%s' 被 rev-list 选项排除"

2160

2129 -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2161 +#: bundle.c:498

2162 +#, c-format

2163 +msgid "unsupported bundle version %d"

2164 +msgstr "不支持的归档包版本 %d"

2165 +

2166 +#: bundle.c:500

2167 +#, c-format

2168 +msgid "cannot write bundle version %d with algorithm %s"

2169 +msgstr "不能写入，归档包版本 %d 不支持算法 %s"

2170 +

2171 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

2172 #, c-format

2173 msgid "unrecognized argument: %s"

2174 msgstr "未能识别的参数：%s"

2175

2134 -#: bundle.c:489

2176 +#: bundle.c:530

2177 msgid "Refusing to create empty bundle."

2136 -msgstr "不能创建空包。"

2178 +msgstr "不能创建空的归档包。"

2179

2138 -#: bundle.c:499

2180 +#: bundle.c:540

2181 #, c-format

2182 msgid "cannot create '%s'"

2183 msgstr "不能创建 '%s'"

2184

2143 -#: bundle.c:524

2185 +#: bundle.c:565

2186 msgid "index-pack died"

2187 msgstr "index-pack 终止"

2188

@@ -2149,267 +2191,264 @@ msgstr "index-pack 终止"

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

2192 msgstr "无效的颜色值：%.*s"

2193

2152 -#: commit-graph.c:238

2194 +#: commit-graph.c:188 midx.c:46

2195 +msgid "invalid hash version"

2196 +msgstr "无效的哈希版本"

2197 +

2198 +#: commit-graph.c:246

2199 msgid "commit-graph file is too small"

2200 msgstr "提交图形文件太小"

2201

2156 -#: commit-graph.c:303

2202 +#: commit-graph.c:311

2203 #, c-format

2204 msgid "commit-graph signature %X does not match signature %X"

2205 msgstr "提交图形签名 %X 和签名 %X 不匹配"

2206

2161 -#: commit-graph.c:310

2207 +#: commit-graph.c:318

2208 #, c-format

2209 msgid "commit-graph version %X does not match version %X"

2210 msgstr "提交图形版本 %X 和版本 %X 不匹配"

2211

2166 -#: commit-graph.c:317

2212 +#: commit-graph.c:325

2213 #, c-format

2214 msgid "commit-graph hash version %X does not match version %X"

2215 msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"

2216

2171 -#: commit-graph.c:339

2172 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2173 -msgstr "提交图形块查找表条目丢失，文件可能不完整"

2217 +#: commit-graph.c:342

2218 +#, c-format

2219 +msgid "commit-graph file is too small to hold %u chunks"

2220 +msgstr "提交图形文件太小，容不下 %u 个块"

2221

2175 -#: commit-graph.c:349

2222 +#: commit-graph.c:361

2223 #, c-format

2224 msgid "commit-graph improper chunk offset %08x%08x"

2225 msgstr "提交图形不正确的块偏移 %08x%08x"

2226

2180 -#: commit-graph.c:417

2227 +#: commit-graph.c:433

2228 #, c-format

2229 msgid "commit-graph chunk id %08x appears multiple times"

2230 msgstr "提交图形块 id %08x 出现了多次"

2231

2185 -#: commit-graph.c:491

2232 +#: commit-graph.c:499

2233 msgid "commit-graph has no base graphs chunk"

2234 msgstr "提交图形没有基础图形块"

2235

2189 -#: commit-graph.c:501

2236 +#: commit-graph.c:509

2237 msgid "commit-graph chain does not match"

2238 msgstr "提交图形链不匹配"

2239

2193 -#: commit-graph.c:549

2240 +#: commit-graph.c:557

2241 #, c-format

2242 msgid "invalid commit-graph chain: line '%s' not a hash"

2243 msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"

2244

2198 -#: commit-graph.c:573

2245 +#: commit-graph.c:581

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

2247 msgstr "无法找到所有提交图形文件"

2248

2202 -#: commit-graph.c:706 commit-graph.c:770

2249 +#: commit-graph.c:721 commit-graph.c:785

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

2251 msgstr "无效的提交位置。提交图形可能已损坏"

2252

2206 -#: commit-graph.c:727

2253 +#: commit-graph.c:742

2254 #, c-format

2255 msgid "could not find commit %s"

2256 msgstr "无法找到提交 %s"

2257

2211 -#: commit-graph.c:1009 builtin/am.c:1292

2258 +#: commit-graph.c:1042 builtin/am.c:1306

2259 #, c-format

2260 msgid "unable to parse commit %s"

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

2262

2216 -#: commit-graph.c:1157

2217 -msgid "Writing changed paths Bloom filters index"

2218 -msgstr "编写变更路径的 Bloom 过滤器索引"

2219 -

2220 -#: commit-graph.c:1182

2221 -msgid "Writing changed paths Bloom filters data"

2222 -msgstr "编写变更路径的 Bloom 过滤器数据"

2223 -

2224 -#: commit-graph.c:1221 builtin/pack-objects.c:2832

2263 +#: commit-graph.c:1265 builtin/pack-objects.c:2864

2264 #, c-format

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

2266 msgstr "无法获得对象 %s 类型"

2267

2229 -#: commit-graph.c:1257

2268 +#: commit-graph.c:1301

2269 msgid "Loading known commits in commit graph"

2270 msgstr "正在加载提交图中的已知提交"

2271

2233 -#: commit-graph.c:1274

2272 +#: commit-graph.c:1318

2273 msgid "Expanding reachable commits in commit graph"

2274 msgstr "正在扩展提交图中的可达提交"

2275

2237 -#: commit-graph.c:1294

2276 +#: commit-graph.c:1338

2277 msgid "Clearing commit marks in commit graph"

2278 msgstr "正在清除提交图中的提交标记"

2279

2241 -#: commit-graph.c:1313

2280 +#: commit-graph.c:1357

2281 msgid "Computing commit graph generation numbers"

2282 msgstr "正在计算提交图世代数字"

2283

2245 -#: commit-graph.c:1367

2284 +#: commit-graph.c:1424

2285 msgid "Computing commit changed paths Bloom filters"

2247 -msgstr "计算提交变更路径的 Bloom 过滤器"

2286 +msgstr "计算提交变更路径的布隆过滤器"

2287

2249 -#: commit-graph.c:1423

2288 +#: commit-graph.c:1501

2289 msgid "Collecting referenced commits"

2290 msgstr "正在收集引用的提交"

2291

2253 -#: commit-graph.c:1447

2292 +#: commit-graph.c:1526

2293 #, c-format

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

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

2296 msgstr[0] "正在 %d 个包中查找提交图的提交"

2297 msgstr[1] "正在 %d 个包中查找提交图的提交"

2298

2260 -#: commit-graph.c:1460

2299 +#: commit-graph.c:1539

2300 #, c-format

2301 msgid "error adding pack %s"

2302 msgstr "添加包 %s 出错"

2303

2265 -#: commit-graph.c:1464

2304 +#: commit-graph.c:1543

2305 #, c-format

2306 msgid "error opening index for %s"

2307 msgstr "为 %s 打开索引出错"

2308

2270 -#: commit-graph.c:1503

2309 +#: commit-graph.c:1582

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

2311 msgstr "正在打包对象中查找提交图的提交"

2312

2274 -#: commit-graph.c:1518

2313 +#: commit-graph.c:1597

2314 msgid "Counting distinct commits in commit graph"

2315 msgstr "正在计算提交图中不同的提交"

2316

2278 -#: commit-graph.c:1550

2317 +#: commit-graph.c:1629

2318 msgid "Finding extra edges in commit graph"

2319 msgstr "正在查找提交图中额外的边"

2320

2282 -#: commit-graph.c:1599

2321 +#: commit-graph.c:1678

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

2323 msgstr "无法写入正确数量的基础图形 ID"

2324

2286 -#: commit-graph.c:1633 midx.c:812

2325 +#: commit-graph.c:1720 midx.c:826

2326 #, c-format

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

2328 msgstr "不能为 %s 创建先导目录"

2329

2291 -#: commit-graph.c:1646

2330 +#: commit-graph.c:1733

2331 msgid "unable to create temporary graph layer"

2332 msgstr "无法创建临时图层"

2333

2295 -#: commit-graph.c:1651

2334 +#: commit-graph.c:1738

2335 #, c-format

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

2337 msgstr "无法为 '%s' 调整共享权限"

2338

2300 -#: commit-graph.c:1728

2339 +#: commit-graph.c:1808

2340 #, c-format

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

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

2343 msgstr[0] "正在用 %d 步写出提交图"

2344 msgstr[1] "正在用 %d 步写出提交图"

2345

2307 -#: commit-graph.c:1773

2346 +#: commit-graph.c:1853

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

2348 msgstr "无法打开提交图形链文件"

2349

2311 -#: commit-graph.c:1789

2350 +#: commit-graph.c:1869

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

2352 msgstr "无法重命名基础提交图形文件"

2353

2315 -#: commit-graph.c:1809

2354 +#: commit-graph.c:1889

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

2356 msgstr "无法重命名临时提交图形文件"

2357

2319 -#: commit-graph.c:1935

2358 +#: commit-graph.c:2015

2359 msgid "Scanning merged commits"

2360 msgstr "正在扫描合并提交"

2361

2323 -#: commit-graph.c:1946

2362 +#: commit-graph.c:2026

2363 #, c-format

2364 msgid "unexpected duplicate commit id %s"

2365 msgstr "意外的重复提交 ID %s"

2366

2328 -#: commit-graph.c:1969

2367 +#: commit-graph.c:2049

2368 msgid "Merging commit-graph"

2369 msgstr "正在合并提交图形"

2370

2332 -#: commit-graph.c:2156

2371 +#: commit-graph.c:2259

2372 #, c-format

2373 msgid "the commit graph format cannot write %d commits"

2374 msgstr "提交图格式不能写入 %d 个提交"

2375

2337 -#: commit-graph.c:2167

2376 +#: commit-graph.c:2270

2377 msgid "too many commits to write graph"

2378 msgstr "提交太多不能画图"

2379

2341 -#: commit-graph.c:2260

2380 +#: commit-graph.c:2363

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

2382 msgstr "提交图文件的校验码错误，可能已经损坏"

2383

2345 -#: commit-graph.c:2270

2384 +#: commit-graph.c:2373

2385 #, c-format

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

2387 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"

2388

2350 -#: commit-graph.c:2280 commit-graph.c:2295

2389 +#: commit-graph.c:2383 commit-graph.c:2398

2390 #, c-format

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

2392 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

2393

2355 -#: commit-graph.c:2287

2394 +#: commit-graph.c:2390

2395 #, c-format

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

2397 msgstr "无法从提交图形中解析提交 %s"

2398

2360 -#: commit-graph.c:2305

2399 +#: commit-graph.c:2408

2400 msgid "Verifying commits in commit graph"

2401 msgstr "正在校验提交图中的提交"

2402

2364 -#: commit-graph.c:2320

2403 +#: commit-graph.c:2423

2404 #, c-format

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

2406 msgstr "无法从提交图形的对象库中解析提交 %s"

2407

2369 -#: commit-graph.c:2327

2408 +#: commit-graph.c:2430

2409 #, c-format

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

2411 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"

2412

2374 -#: commit-graph.c:2337

2413 +#: commit-graph.c:2440

2414 #, c-format

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

2416 msgstr "提交 %s 的提交图形父提交列表太长了"

2417

2379 -#: commit-graph.c:2346

2418 +#: commit-graph.c:2449

2419 #, c-format

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

2421 msgstr "%s 的提交图形父提交是 %s != %s"

2422

2384 -#: commit-graph.c:2360

2423 +#: commit-graph.c:2463

2424 #, c-format

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

2426 msgstr "提交 %s 的提交图形父提交列表过早终止"

2427

2389 -#: commit-graph.c:2365

2428 +#: commit-graph.c:2468

2429 #, c-format

2430 msgid ""

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

2432 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"

2433

2395 -#: commit-graph.c:2369

2434 +#: commit-graph.c:2472

2435 #, c-format

2436 msgid ""

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

2438 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"

2439

2401 -#: commit-graph.c:2385

2440 +#: commit-graph.c:2488

2441 #, c-format

2442 msgid "commit-graph generation for commit %s is %u != %u"

2443 msgstr "提交图形中的提交 %s 的世代号是 %u != %u"

2444

2406 -#: commit-graph.c:2391

2445 +#: commit-graph.c:2494

2446 #, c-format

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

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

2449

2411 -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2412 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2450 +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2451 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2452 #, c-format

2453 msgid "could not parse %s"

2454 msgstr "不能解析 %s"

@@ -2511,7 +2550,7 @@ msgstr "键名没有包含一个小节名称：%s"

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

2551 msgstr "键名没有包含变量名：%s"

2552

2514 -#: config.c:408 sequencer.c:2456

2553 +#: config.c:408 sequencer.c:2547

2554 #, c-format

2555 msgid "invalid key: %s"

2556 msgstr "无效键名：%s"

@@ -2647,7 +2686,7 @@ msgstr "%s 的取值格式错误：%s"

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

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

2688

2650 -#: config.c:1533 builtin/pack-objects.c:3617

2689 +#: config.c:1533 builtin/pack-objects.c:3649

2690 #, c-format

2691 msgid "bad pack compression level %d"

2692 msgstr "错误的打包压缩级别 %d"

@@ -2676,101 +2715,101 @@ msgstr "解析 %s 失败"

2715 msgid "unable to parse command-line config"

2716 msgstr "无法解析命令行中的配置"

2717

2679 -#: config.c:2113

2718 +#: config.c:2122

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

2720 msgstr "在读取配置文件时遇到未知错误"

2721

2683 -#: config.c:2283

2722 +#: config.c:2296

2723 #, c-format

2724 msgid "Invalid %s: '%s'"

2725 msgstr "无效 %s：'%s'"

2726

2688 -#: config.c:2328

2727 +#: config.c:2341

2728 #, c-format

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

2730 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"

2731

2693 -#: config.c:2374

2732 +#: config.c:2387

2733 #, c-format

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

2735 msgstr "无法解析命令行配置中的 '%s'"

2736

2698 -#: config.c:2376

2737 +#: config.c:2389

2738 #, c-format

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

2740 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"

2741

2703 -#: config.c:2457

2742 +#: config.c:2470

2743 #, c-format

2744 msgid "invalid section name '%s'"

2745 msgstr "无效的小节名称 '%s'"

2746

2708 -#: config.c:2489

2747 +#: config.c:2502

2748 #, c-format

2749 msgid "%s has multiple values"

2750 msgstr "%s 有多个取值"

2751

2713 -#: config.c:2518

2752 +#: config.c:2531

2753 #, c-format

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

2755 msgstr "写入新的配置文件 %s 失败"

2756

2718 -#: config.c:2770 config.c:3094

2757 +#: config.c:2783 config.c:3107

2758 #, c-format

2759 msgid "could not lock config file %s"

2760 msgstr "不能锁定配置文件 %s"

2761

2723 -#: config.c:2781

2762 +#: config.c:2794

2763 #, c-format

2764 msgid "opening %s"

2765 msgstr "打开 %s"

2766

2728 -#: config.c:2816 builtin/config.c:344

2767 +#: config.c:2829 builtin/config.c:354

2768 #, c-format

2769 msgid "invalid pattern: %s"

2770 msgstr "无效模式：%s"

2771

2733 -#: config.c:2841

2772 +#: config.c:2854

2773 #, c-format

2774 msgid "invalid config file %s"

2775 msgstr "无效的配置文件 %s"

2776

2738 -#: config.c:2854 config.c:3107

2777 +#: config.c:2867 config.c:3120

2778 #, c-format

2779 msgid "fstat on %s failed"

2780 msgstr "对 %s 调用 fstat 失败"

2781

2743 -#: config.c:2865

2782 +#: config.c:2878

2783 #, c-format

2784 msgid "unable to mmap '%s'"

2785 msgstr "不能 mmap '%s'"

2786

2748 -#: config.c:2874 config.c:3112

2787 +#: config.c:2887 config.c:3125

2788 #, c-format

2789 msgid "chmod on %s failed"

2790 msgstr "对 %s 调用 chmod 失败"

2791

2753 -#: config.c:2959 config.c:3209

2792 +#: config.c:2972 config.c:3222

2793 #, c-format

2794 msgid "could not write config file %s"

2795 msgstr "不能写入配置文件 %s"

2796

2758 -#: config.c:2993

2797 +#: config.c:3006

2798 #, c-format

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

2800 msgstr "不能设置 '%s' 为 '%s'"

2801

2763 -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2802 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2803 #, c-format

2804 msgid "could not unset '%s'"

2805 msgstr "不能取消设置 '%s'"

2806

2768 -#: config.c:3085

2807 +#: config.c:3098

2808 #, c-format

2809 msgid "invalid section name: %s"

2810 msgstr "无效的小节名称：%s"

2811

2773 -#: config.c:3252

2812 +#: config.c:3265

2813 #, c-format

2814 msgid "missing value for '%s'"

2815 msgstr "%s 的取值缺失"

@@ -2938,23 +2977,23 @@ msgstr "ssh 变体 'simple' 不支持设置端口"

2977 msgid "strange pathname '%s' blocked"

2978 msgstr "已阻止奇怪的路径名 '%s'"

2979

2941 -#: connect.c:1407

2980 +#: connect.c:1408

2981 msgid "unable to fork"

2982 msgstr "无法 fork"

2983

2945 -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

2984 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

2985 msgid "Checking connectivity"

2986 msgstr "正在检查连通性"

2987

2949 -#: connected.c:121

2988 +#: connected.c:120

2989 msgid "Could not run 'git rev-list'"

2990 msgstr "不能执行 'git rev-list'"

2991

2953 -#: connected.c:141

2992 +#: connected.c:144

2993 msgid "failed write to rev-list"

2994 msgstr "写入 rev-list 失败"

2995

2957 -#: connected.c:148

2996 +#: connected.c:149

2997 msgid "failed to close rev-list's stdin"

2998 msgstr "关闭 rev-list 的标准输入失败"

2999

@@ -3028,56 +3067,56 @@ msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

3067 msgid "encoding '%s' from %s to %s and back is not the same"

3068 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

3069

3031 -#: convert.c:668

3070 +#: convert.c:665

3071 #, c-format

3072 msgid "cannot fork to run external filter '%s'"

3073 msgstr "不能 fork 以执行外部过滤器 '%s'"

3074

3036 -#: convert.c:688

3075 +#: convert.c:685

3076 #, c-format

3077 msgid "cannot feed the input to external filter '%s'"

3078 msgstr "不能将输入传递给外部过滤器 '%s'"

3079

3041 -#: convert.c:695

3080 +#: convert.c:692

3081 #, c-format

3082 msgid "external filter '%s' failed %d"

3083 msgstr "外部过滤器 '%s' 失败码 %d"

3084

3046 -#: convert.c:730 convert.c:733

3085 +#: convert.c:727 convert.c:730

3086 #, c-format

3087 msgid "read from external filter '%s' failed"

3088 msgstr "从外部过滤器 '%s' 读取失败"

3089

3051 -#: convert.c:736 convert.c:791

3090 +#: convert.c:733 convert.c:788

3091 #, c-format

3092 msgid "external filter '%s' failed"

3093 msgstr "外部过滤器 '%s' 失败"

3094

3056 -#: convert.c:840

3095 +#: convert.c:837

3096 msgid "unexpected filter type"

3097 msgstr "意外的过滤类型"

3098

3060 -#: convert.c:851

3099 +#: convert.c:848

3100 msgid "path name too long for external filter"

3101 msgstr "外部过滤器的路径名太长"

3102

3064 -#: convert.c:943

3103 +#: convert.c:940

3104 #, c-format

3105 msgid ""

3106 "external filter '%s' is not available anymore although not all paths have "

3107 "been filtered"

3108 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

3109

3071 -#: convert.c:1243

3110 +#: convert.c:1240

3111 msgid "true/false are no valid working-tree-encodings"

3112 msgstr "true/false 不是有效的工作区编码"

3113

3075 -#: convert.c:1431 convert.c:1465

3114 +#: convert.c:1428 convert.c:1462

3115 #, c-format

3116 msgid "%s: clean filter '%s' failed"

3117 msgstr "%s：clean 过滤器 '%s' 失败"

3118

3080 -#: convert.c:1511

3119 +#: convert.c:1508

3120 #, c-format

3121 msgid "%s: smudge filter %s failed"

3122 msgstr "%s：smudge 过滤器 %s 失败"

@@ -3095,17 +3134,17 @@ msgstr "拒绝使用缺少主机字段的凭据"

3134 msgid "refusing to work with credential missing protocol field"

3135 msgstr "拒绝使用缺少协议字段的凭据"

3136

3098 -#: credential.c:396

3137 +#: credential.c:394

3138 #, c-format

3139 msgid "url contains a newline in its %s component: %s"

3140 msgstr "URL 的 %s 组件中包含换行符：%s"

3141

3103 -#: credential.c:440

3142 +#: credential.c:438

3143 #, c-format

3144 msgid "url has no scheme: %s"

3145 msgstr "URL 没有 scheme：%s"

3146

3108 -#: credential.c:513

3147 +#: credential.c:511

3148 #, c-format

3149 msgid "credential url cannot be parsed: %s"

3150 msgstr "不能解析凭据 URL：%s"

@@ -3210,7 +3249,7 @@ msgstr "git diff --no-index [<选项>] <路径> <路径>"

3249 msgid ""

3250 "Not a git repository. Use --no-index to compare two paths outside a working "

3251 "tree"

3213 -msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"

3252 +msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"

3253

3254 # 译者：注意保持前导空格

3255 #: diff.c:156

@@ -3261,35 +3300,35 @@ msgstr ""

3300 "发现配置变量 'diff.dirstat' 中的错误：\n"

3301 "%s"

3302

3264 -#: diff.c:4243

3303 +#: diff.c:4269

3304 #, c-format

3305 msgid "external diff died, stopping at %s"

3306 msgstr "外部 diff 退出，停止在 %s"

3307

3269 -#: diff.c:4589

3308 +#: diff.c:4618

3309 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3310 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3311

3273 -#: diff.c:4592

3312 +#: diff.c:4621

3313 msgid "-G, -S and --find-object are mutually exclusive"

3314 msgstr "-G、-S 和 --find-object 是互斥的"

3315

3277 -#: diff.c:4670

3316 +#: diff.c:4699

3317 msgid "--follow requires exactly one pathspec"

3318 msgstr "--follow 明确要求只跟一个路径规格"

3319

3281 -#: diff.c:4718

3320 +#: diff.c:4747

3321 #, c-format

3322 msgid "invalid --stat value: %s"

3323 msgstr "无效的 --stat 值：%s"

3324

3286 -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

3287 -#: parse-options.c:197 parse-options.c:201

3325 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3326 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3327 #, c-format

3328 msgid "%s expects a numerical value"

3329 msgstr "%s 期望一个数字值"

3330

3292 -#: diff.c:4755

3331 +#: diff.c:4784

3332 #, c-format

3333 msgid ""

3334 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3298,195 +3337,195 @@ msgstr ""

3337 "无法解析 --dirstat/-X 选项的参数：\n"

3338 "%s"

3339

3301 -#: diff.c:4840

3340 +#: diff.c:4869

3341 #, c-format

3342 msgid "unknown change class '%c' in --diff-filter=%s"

3343 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"

3344

3306 -#: diff.c:4864

3345 +#: diff.c:4893

3346 #, c-format

3347 msgid "unknown value after ws-error-highlight=%.*s"

3348 msgstr "ws-error-highlight=%.*s 之后未知的值"

3349

3311 -#: diff.c:4878

3350 +#: diff.c:4907

3351 #, c-format

3352 msgid "unable to resolve '%s'"

3353 msgstr "不能解析 '%s'"

3354

3316 -#: diff.c:4928 diff.c:4934

3355 +#: diff.c:4957 diff.c:4963

3356 #, c-format

3357 msgid "%s expects <n>/<m> form"

3358 msgstr "%s 期望 <n>/<m> 格式"

3359

3321 -#: diff.c:4946

3360 +#: diff.c:4975

3361 #, c-format

3362 msgid "%s expects a character, got '%s'"

3363 msgstr "%s 期望一个字符，得到 '%s'"

3364

3326 -#: diff.c:4967

3365 +#: diff.c:4996

3366 #, c-format

3367 msgid "bad --color-moved argument: %s"

3368 msgstr "坏的 --color-moved 参数：%s"

3369

3331 -#: diff.c:4986

3370 +#: diff.c:5015

3371 #, c-format

3372 msgid "invalid mode '%s' in --color-moved-ws"

3373 msgstr "--color-moved-ws 中的无效模式 '%s' "

3374

3336 -#: diff.c:5026

3375 +#: diff.c:5055

3376 msgid ""

3377 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3378 "\"histogram\""

3379 msgstr ""

3380 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3381

3343 -#: diff.c:5062 diff.c:5082

3382 +#: diff.c:5091 diff.c:5111

3383 #, c-format

3384 msgid "invalid argument to %s"

3385 msgstr "%s 的参数无效"

3386

3348 -#: diff.c:5219

3387 +#: diff.c:5248

3388 #, c-format

3389 msgid "failed to parse --submodule option parameter: '%s'"

3390 msgstr "无法解析 --submodule 选项的参数：'%s'"

3391

3353 -#: diff.c:5275

3392 +#: diff.c:5304

3393 #, c-format

3394 msgid "bad --word-diff argument: %s"

3395 msgstr "坏的 --word-diff 参数：%s"

3396

3358 -#: diff.c:5298

3397 +#: diff.c:5327

3398 msgid "Diff output format options"

3399 msgstr "差异输出格式化选项"

3400

3362 -#: diff.c:5300 diff.c:5306

3401 +#: diff.c:5329 diff.c:5335

3402 msgid "generate patch"

3403 msgstr "生成补丁"

3404

3366 -#: diff.c:5303 builtin/log.c:177

3405 +#: diff.c:5332 builtin/log.c:176

3406 msgid "suppress diff output"

3407 msgstr "不显示差异输出"

3408

3370 -#: diff.c:5308 diff.c:5422 diff.c:5429

3409 +#: diff.c:5337 diff.c:5451 diff.c:5458

3410 msgid "<n>"

3411 msgstr "<n>"

3412

3374 -#: diff.c:5309 diff.c:5312

3413 +#: diff.c:5338 diff.c:5341

3414 msgid "generate diffs with <n> lines context"

3415 msgstr "生成含 <n> 行上下文的差异"

3416

3378 -#: diff.c:5314

3417 +#: diff.c:5343

3418 msgid "generate the diff in raw format"

3419 msgstr "生成原始格式的差异"

3420

3382 -#: diff.c:5317

3421 +#: diff.c:5346

3422 msgid "synonym for '-p --raw'"

3423 msgstr "和 '-p --raw' 同义"

3424

3386 -#: diff.c:5321

3425 +#: diff.c:5350

3426 msgid "synonym for '-p --stat'"

3427 msgstr "和 '-p --stat' 同义"

3428

3390 -#: diff.c:5325

3429 +#: diff.c:5354

3430 msgid "machine friendly --stat"

3431 msgstr "机器友好的 --stat"

3432

3394 -#: diff.c:5328

3433 +#: diff.c:5357

3434 msgid "output only the last line of --stat"

3435 msgstr "只输出 --stat 的最后一行"

3436

3398 -#: diff.c:5330 diff.c:5338

3437 +#: diff.c:5359 diff.c:5367

3438 msgid "<param1,param2>..."

3439 msgstr "<参数1,参数2>..."

3440

3402 -#: diff.c:5331

3441 +#: diff.c:5360

3442 msgid ""

3443 "output the distribution of relative amount of changes for each sub-directory"

3444 msgstr "输出每个子目录相对变更的分布"

3445

3407 -#: diff.c:5335

3446 +#: diff.c:5364

3447 msgid "synonym for --dirstat=cumulative"

3448 msgstr "和 --dirstat=cumulative 同义"

3449

3411 -#: diff.c:5339

3450 +#: diff.c:5368

3451 msgid "synonym for --dirstat=files,param1,param2..."

3452 msgstr "是 --dirstat=files,param1,param2... 的同义词"

3453

3415 -#: diff.c:5343

3454 +#: diff.c:5372

3455 msgid "warn if changes introduce conflict markers or whitespace errors"

3456 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"

3457

3419 -#: diff.c:5346

3458 +#: diff.c:5375

3459 msgid "condensed summary such as creations, renames and mode changes"

3460 msgstr "精简摘要，例如创建、重命名和模式变更"

3461

3423 -#: diff.c:5349

3462 +#: diff.c:5378

3463 msgid "show only names of changed files"

3464 msgstr "只显示变更文件的文件名"

3465

3427 -#: diff.c:5352

3466 +#: diff.c:5381

3467 msgid "show only names and status of changed files"

3468 msgstr "只显示变更文件的文件名和状态"

3469

3431 -#: diff.c:5354

3470 +#: diff.c:5383

3471 msgid "<width>[,<name-width>[,<count>]]"

3472 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"

3473

3435 -#: diff.c:5355

3474 +#: diff.c:5384

3475 msgid "generate diffstat"

3476 msgstr "生成差异统计（diffstat）"

3477

3439 -#: diff.c:5357 diff.c:5360 diff.c:5363

3478 +#: diff.c:5386 diff.c:5389 diff.c:5392

3479 msgid "<width>"

3480 msgstr "<宽度>"

3481

3443 -#: diff.c:5358

3482 +#: diff.c:5387

3483 msgid "generate diffstat with a given width"

3484 msgstr "使用给定的长度生成差异统计"

3485

3447 -#: diff.c:5361

3486 +#: diff.c:5390

3487 msgid "generate diffstat with a given name width"

3488 msgstr "使用给定的文件名长度生成差异统计"

3489

3451 -#: diff.c:5364

3490 +#: diff.c:5393

3491 msgid "generate diffstat with a given graph width"

3492 msgstr "使用给定的图形长度生成差异统计"

3493

3455 -#: diff.c:5366

3494 +#: diff.c:5395

3495 msgid "<count>"

3496 msgstr "<次数>"

3497

3459 -#: diff.c:5367

3498 +#: diff.c:5396

3499 msgid "generate diffstat with limited lines"

3500 msgstr "生成有限行数的差异统计"

3501

3463 -#: diff.c:5370

3502 +#: diff.c:5399

3503 msgid "generate compact summary in diffstat"

3504 msgstr "生成差异统计的简洁摘要"

3505

3467 -#: diff.c:5373

3506 +#: diff.c:5402

3507 msgid "output a binary diff that can be applied"

3508 msgstr "输出一个可以应用的二进制差异"

3509

3471 -#: diff.c:5376

3510 +#: diff.c:5405

3511 msgid "show full pre- and post-image object names on the \"index\" lines"

3512 msgstr "在 \"index\" 行显示完整的前后对象名称"

3513

3475 -#: diff.c:5378

3514 +#: diff.c:5407

3515 msgid "show colored diff"

3516 msgstr "显示带颜色的差异"

3517

3479 -#: diff.c:5379

3518 +#: diff.c:5408

3519 msgid "<kind>"

3520 msgstr "<类型>"

3521

3483 -#: diff.c:5380

3522 +#: diff.c:5409

3523 msgid ""

3524 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3525 "diff"

3526 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"

3527

3489 -#: diff.c:5383

3528 +#: diff.c:5412

3529 msgid ""

3530 "do not munge pathnames and use NULs as output field terminators in --raw or "

3531 "--numstat"

@@ -3494,295 +3533,295 @@ msgstr ""

3533 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"

3534 "符"

3535

3497 -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3536 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3537 msgid "<prefix>"

3538 msgstr "<前缀>"

3539

3501 -#: diff.c:5387

3540 +#: diff.c:5416

3541 msgid "show the given source prefix instead of \"a/\""

3542 msgstr "显示给定的源前缀取代 \"a/\""

3543

3505 -#: diff.c:5390

3544 +#: diff.c:5419

3545 msgid "show the given destination prefix instead of \"b/\""

3546 msgstr "显示给定的目标前缀取代 \"b/\""

3547

3509 -#: diff.c:5393

3548 +#: diff.c:5422

3549 msgid "prepend an additional prefix to every line of output"

3550 msgstr "输出的每一行附加前缀"

3551

3513 -#: diff.c:5396

3552 +#: diff.c:5425

3553 msgid "do not show any source or destination prefix"

3554 msgstr "不显示任何源和目标前缀"

3555

3517 -#: diff.c:5399

3556 +#: diff.c:5428

3557 msgid "show context between diff hunks up to the specified number of lines"

3558 msgstr "显示指定行数的差异块间的上下文"

3559

3521 -#: diff.c:5403 diff.c:5408 diff.c:5413

3560 +#: diff.c:5432 diff.c:5437 diff.c:5442

3561 msgid "<char>"

3562 msgstr "<字符>"

3563

3525 -#: diff.c:5404

3564 +#: diff.c:5433

3565 msgid "specify the character to indicate a new line instead of '+'"

3566 msgstr "指定一个字符取代 '+' 来表示新的一行"

3567

3529 -#: diff.c:5409

3568 +#: diff.c:5438

3569 msgid "specify the character to indicate an old line instead of '-'"

3570 msgstr "指定一个字符取代 '-' 来表示旧的一行"

3571

3533 -#: diff.c:5414

3572 +#: diff.c:5443

3573 msgid "specify the character to indicate a context instead of ' '"

3574 msgstr "指定一个字符取代 ' ' 来表示一行上下文"

3575

3537 -#: diff.c:5417

3576 +#: diff.c:5446

3577 msgid "Diff rename options"

3578 msgstr "差异重命名选项"

3579

3541 -#: diff.c:5418

3580 +#: diff.c:5447

3581 msgid "<n>[/<m>]"

3582 msgstr "<n>[/<m>]"

3583

3545 -#: diff.c:5419

3584 +#: diff.c:5448

3585 msgid "break complete rewrite changes into pairs of delete and create"

3586 msgstr "将完全重写的变更打破为成对的删除和创建"

3587

3549 -#: diff.c:5423

3588 +#: diff.c:5452

3589 msgid "detect renames"

3590 msgstr "检测重命名"

3591

3553 -#: diff.c:5427

3592 +#: diff.c:5456

3593 msgid "omit the preimage for deletes"

3594 msgstr "省略删除操作的差异输出"

3595

3557 -#: diff.c:5430

3596 +#: diff.c:5459

3597 msgid "detect copies"

3598 msgstr "检测拷贝"

3599

3561 -#: diff.c:5434

3600 +#: diff.c:5463

3601 msgid "use unmodified files as source to find copies"

3602 msgstr "使用未修改的文件做为发现拷贝的源"

3603

3565 -#: diff.c:5436

3604 +#: diff.c:5465

3605 msgid "disable rename detection"

3606 msgstr "禁用重命名探测"

3607

3569 -#: diff.c:5439

3608 +#: diff.c:5468

3609 msgid "use empty blobs as rename source"

3610 msgstr "使用空的数据对象做为重命名的源"

3611

3573 -#: diff.c:5441

3612 +#: diff.c:5470

3613 msgid "continue listing the history of a file beyond renames"

3614 msgstr "继续列出文件重命名以外的历史记录"

3615

3577 -#: diff.c:5444

3616 +#: diff.c:5473

3617 msgid ""

3618 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3619 "given limit"

3620 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"

3621

3583 -#: diff.c:5446

3622 +#: diff.c:5475

3623 msgid "Diff algorithm options"

3624 msgstr "差异算法选项"

3625

3587 -#: diff.c:5448

3626 +#: diff.c:5477

3627 msgid "produce the smallest possible diff"

3628 msgstr "生成尽可能小的差异"

3629

3591 -#: diff.c:5451

3630 +#: diff.c:5480

3631 msgid "ignore whitespace when comparing lines"

3632 msgstr "行比较时忽略空白字符"

3633

3595 -#: diff.c:5454

3634 +#: diff.c:5483

3635 msgid "ignore changes in amount of whitespace"

3636 msgstr "忽略空白字符的变更"

3637

3599 -#: diff.c:5457

3638 +#: diff.c:5486

3639 msgid "ignore changes in whitespace at EOL"

3640 msgstr "忽略行尾的空白字符变更"

3641

3603 -#: diff.c:5460

3642 +#: diff.c:5489

3643 msgid "ignore carrier-return at the end of line"

3644 msgstr "忽略行尾的回车符（CR）"

3645

3607 -#: diff.c:5463

3646 +#: diff.c:5492

3647 msgid "ignore changes whose lines are all blank"

3648 msgstr "忽略整行都是空白的变更"

3649

3611 -#: diff.c:5466

3650 +#: diff.c:5495

3651 msgid "heuristic to shift diff hunk boundaries for easy reading"

3652 msgstr "启发式转换差异边界以便阅读"

3653

3615 -#: diff.c:5469

3654 +#: diff.c:5498

3655 msgid "generate diff using the \"patience diff\" algorithm"

3656 msgstr "使用 \"patience diff\" 算法生成差异"

3657

3619 -#: diff.c:5473

3658 +#: diff.c:5502

3659 msgid "generate diff using the \"histogram diff\" algorithm"

3660 msgstr "使用 \"histogram diff\" 算法生成差异"

3661

3623 -#: diff.c:5475

3662 +#: diff.c:5504

3663 msgid "<algorithm>"

3664 msgstr "<算法>"

3665

3627 -#: diff.c:5476

3666 +#: diff.c:5505

3667 msgid "choose a diff algorithm"

3668 msgstr "选择一个差异算法"

3669

3631 -#: diff.c:5478

3670 +#: diff.c:5507

3671 msgid "<text>"

3672 msgstr "<文本>"

3673

3635 -#: diff.c:5479

3674 +#: diff.c:5508

3675 msgid "generate diff using the \"anchored diff\" algorithm"

3676 msgstr "使用 \"anchored diff\" 算法生成差异"

3677

3639 -#: diff.c:5481 diff.c:5490 diff.c:5493

3678 +#: diff.c:5510 diff.c:5519 diff.c:5522

3679 msgid "<mode>"

3680 msgstr "<模式>"

3681

3643 -#: diff.c:5482

3682 +#: diff.c:5511

3683 msgid "show word diff, using <mode> to delimit changed words"

3684 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"

3685

3647 -#: diff.c:5484 diff.c:5487 diff.c:5532

3686 +#: diff.c:5513 diff.c:5516 diff.c:5561

3687 msgid "<regex>"

3688 msgstr "<正则>"

3689

3651 -#: diff.c:5485

3690 +#: diff.c:5514

3691 msgid "use <regex> to decide what a word is"

3692 msgstr "使用 <正则表达式> 确定何为一个词"

3693

3655 -#: diff.c:5488

3694 +#: diff.c:5517

3695 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3696 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"

3697

3659 -#: diff.c:5491

3698 +#: diff.c:5520

3699 msgid "moved lines of code are colored differently"

3700 msgstr "移动的代码行用不同方式着色"

3701

3663 -#: diff.c:5494

3702 +#: diff.c:5523

3703 msgid "how white spaces are ignored in --color-moved"

3704 msgstr "在 --color-moved 下如何忽略空白字符"

3705

3667 -#: diff.c:5497

3706 +#: diff.c:5526

3707 msgid "Other diff options"

3708 msgstr "其它差异选项"

3709

3671 -#: diff.c:5499

3710 +#: diff.c:5528

3711 msgid "when run from subdir, exclude changes outside and show relative paths"

3712 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"

3713

3675 -#: diff.c:5503

3714 +#: diff.c:5532

3715 msgid "treat all files as text"

3716 msgstr "把所有文件当做文本处理"

3717

3679 -#: diff.c:5505

3718 +#: diff.c:5534

3719 msgid "swap two inputs, reverse the diff"

3720 msgstr "交换两个输入，反转差异"

3721

3683 -#: diff.c:5507

3722 +#: diff.c:5536

3723 msgid "exit with 1 if there were differences, 0 otherwise"

3724 msgstr "有差异时退出码为 1，否则为 0"

3725

3687 -#: diff.c:5509

3726 +#: diff.c:5538

3727 msgid "disable all output of the program"

3728 msgstr "禁用本程序的所有输出"

3729

3691 -#: diff.c:5511

3730 +#: diff.c:5540

3731 msgid "allow an external diff helper to be executed"

3732 msgstr "允许执行一个外置的差异助手"

3733

3695 -#: diff.c:5513

3734 +#: diff.c:5542

3735 msgid "run external text conversion filters when comparing binary files"

3736 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"

3737

3699 -#: diff.c:5515

3738 +#: diff.c:5544

3739 msgid "<when>"

3740 msgstr "<何时>"

3741

3703 -#: diff.c:5516

3742 +#: diff.c:5545

3743 msgid "ignore changes to submodules in the diff generation"

3744 msgstr "在生成差异时，忽略子模组的更改"

3745

3707 -#: diff.c:5519

3746 +#: diff.c:5548

3747 msgid "<format>"

3748 msgstr "<格式>"

3749

3711 -#: diff.c:5520

3750 +#: diff.c:5549

3751 msgid "specify how differences in submodules are shown"

3752 msgstr "指定子模组的差异如何显示"

3753

3715 -#: diff.c:5524

3754 +#: diff.c:5553

3755 msgid "hide 'git add -N' entries from the index"

3756 msgstr "隐藏索引中 'git add -N' 条目"

3757

3719 -#: diff.c:5527

3758 +#: diff.c:5556

3759 msgid "treat 'git add -N' entries as real in the index"

3760 msgstr "将索引中 'git add -N' 条目当做真实的"

3761

3723 -#: diff.c:5529

3762 +#: diff.c:5558

3763 msgid "<string>"

3764 msgstr "<字符串>"

3765

3727 -#: diff.c:5530

3766 +#: diff.c:5559

3767 msgid ""

3768 "look for differences that change the number of occurrences of the specified "

3769 "string"

3770 msgstr "查找改变了指定字符串出现次数的差异"

3771

3733 -#: diff.c:5533

3772 +#: diff.c:5562

3773 msgid ""

3774 "look for differences that change the number of occurrences of the specified "

3775 "regex"

3776 msgstr "查找改变指定正则匹配出现次数的差异"

3777

3739 -#: diff.c:5536

3778 +#: diff.c:5565

3779 msgid "show all changes in the changeset with -S or -G"

3780 msgstr "显示使用 -S 或 -G 的变更集的所有变更"

3781

3743 -#: diff.c:5539

3782 +#: diff.c:5568

3783 msgid "treat <string> in -S as extended POSIX regular expression"

3784 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"

3785

3747 -#: diff.c:5542

3786 +#: diff.c:5571

3787 msgid "control the order in which files appear in the output"

3788 msgstr "控制输出中的文件显示顺序"

3789

3751 -#: diff.c:5543

3790 +#: diff.c:5572

3791 msgid "<object-id>"

3792 msgstr "<对象 ID>"

3793

3755 -#: diff.c:5544

3794 +#: diff.c:5573

3795 msgid ""

3796 "look for differences that change the number of occurrences of the specified "

3797 "object"

3798 msgstr "查找改变指定对象出现次数的差异"

3799

3761 -#: diff.c:5546

3800 +#: diff.c:5575

3801 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3802 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3803

3765 -#: diff.c:5547

3804 +#: diff.c:5576

3805 msgid "select files by diff type"

3806 msgstr "通过差异类型选择文件"

3807

3769 -#: diff.c:5549

3808 +#: diff.c:5578

3809 msgid "<file>"

3810 msgstr "<文件>"

3811

3773 -#: diff.c:5550

3812 +#: diff.c:5579

3813 msgid "Output to a specific file"

3814 msgstr "输出到一个指定的文件"

3815

3777 -#: diff.c:6205

3816 +#: diff.c:6236

3817 msgid "inexact rename detection was skipped due to too many files."

3818 msgstr "因为文件太多，略过不严格的重命名检查。"

3819

3781 -#: diff.c:6208

3820 +#: diff.c:6239

3821 msgid "only found copies from modified paths due to too many files."

3822 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

3823

3785 -#: diff.c:6211

3824 +#: diff.c:6242

3825 #, c-format

3826 msgid ""

3827 "you may want to set your %s variable to at least %d and retry the command."

@@ -3797,59 +3836,59 @@ msgstr "读取排序文件 '%s' 失败"

3836 msgid "Performing inexact rename detection"

3837 msgstr "正在进行非精确的重命名探测"

3838

3800 -#: dir.c:573

3839 +#: dir.c:578

3840 #, c-format

3841 msgid "pathspec '%s' did not match any file(s) known to git"

3842 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

3843

3805 -#: dir.c:713 dir.c:742 dir.c:755

3844 +#: dir.c:718 dir.c:747 dir.c:760

3845 #, c-format

3846 msgid "unrecognized pattern: '%s'"

3847 msgstr "未识别的模式：'%s'"

3848

3810 -#: dir.c:772 dir.c:786

3849 +#: dir.c:777 dir.c:791

3850 #, c-format

3851 msgid "unrecognized negative pattern: '%s'"

3852 msgstr "未识别的反向模式：'%s'"

3853

3815 -#: dir.c:804

3854 +#: dir.c:809

3855 #, c-format

3856 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3857 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"

3858

3820 -#: dir.c:814

3859 +#: dir.c:819

3860 msgid "disabling cone pattern matching"

3861 msgstr "禁止 cone 模式匹配"

3862

3824 -#: dir.c:1191

3863 +#: dir.c:1198

3864 #, c-format

3865 msgid "cannot use %s as an exclude file"

3866 msgstr "不能将 %s 用作排除文件"

3867

3829 -#: dir.c:2296

3868 +#: dir.c:2305

3869 #, c-format

3870 msgid "could not open directory '%s'"

3871 msgstr "不能打开目录 '%s'"

3872

3834 -#: dir.c:2596

3873 +#: dir.c:2605

3874 msgid "failed to get kernel name and information"

3875 msgstr "无法获得内核名称和信息"

3876

3838 -#: dir.c:2720

3877 +#: dir.c:2729

3878 msgid "untracked cache is disabled on this system or location"

3879 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

3880

3842 -#: dir.c:3502

3881 +#: dir.c:3520

3882 #, c-format

3883 msgid "index file corrupt in repo %s"

3884 msgstr "仓库 %s 中的索引文件损坏"

3885

3847 -#: dir.c:3547 dir.c:3552

3886 +#: dir.c:3565 dir.c:3570

3887 #, c-format

3888 msgid "could not create directories for %s"

3889 msgstr "不能为 %s 创建目录"

3890

3852 -#: dir.c:3581

3891 +#: dir.c:3599

3892 #, c-format

3893 msgid "could not migrate git directory from '%s' to '%s'"

3894 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -3883,245 +3922,245 @@ msgstr "不能设置 GIT_DIR 为 '%s'"

3922 msgid "too many args to run %s"

3923 msgstr "执行 %s 的参数太多"

3924

3886 -#: fetch-pack.c:152

3925 +#: fetch-pack.c:176

3926 msgid "git fetch-pack: expected shallow list"

3927 msgstr "git fetch-pack：应为 shallow 列表"

3928

3890 -#: fetch-pack.c:155

3929 +#: fetch-pack.c:179

3930 msgid "git fetch-pack: expected a flush packet after shallow list"

3931 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

3932

3894 -#: fetch-pack.c:166

3933 +#: fetch-pack.c:190

3934 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3935 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

3936

3898 -#: fetch-pack.c:186

3937 +#: fetch-pack.c:210

3938 #, c-format

3939 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3940 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

3941

3903 -#: fetch-pack.c:197

3942 +#: fetch-pack.c:221

3943 msgid "unable to write to remote"

3944 msgstr "无法写到远程"

3945

3907 -#: fetch-pack.c:259

3946 +#: fetch-pack.c:282

3947 msgid "--stateless-rpc requires multi_ack_detailed"

3948 msgstr "--stateless-rpc 需要 multi_ack_detailed"

3949

3911 -#: fetch-pack.c:358 fetch-pack.c:1408

3950 +#: fetch-pack.c:375 fetch-pack.c:1397

3951 #, c-format

3952 msgid "invalid shallow line: %s"

3953 msgstr "无效的 shallow 信息：%s"

3954

3916 -#: fetch-pack.c:364 fetch-pack.c:1414

3955 +#: fetch-pack.c:381 fetch-pack.c:1403

3956 #, c-format

3957 msgid "invalid unshallow line: %s"

3958 msgstr "无效的 unshallow 信息：%s"

3959

3921 -#: fetch-pack.c:366 fetch-pack.c:1416

3960 +#: fetch-pack.c:383 fetch-pack.c:1405

3961 #, c-format

3962 msgid "object not found: %s"

3963 msgstr "对象未找到：%s"

3964

3926 -#: fetch-pack.c:369 fetch-pack.c:1419

3965 +#: fetch-pack.c:386 fetch-pack.c:1408

3966 #, c-format

3967 msgid "error in object: %s"

3968 msgstr "对象中出错：%s"

3969

3931 -#: fetch-pack.c:371 fetch-pack.c:1421

3970 +#: fetch-pack.c:388 fetch-pack.c:1410

3971 #, c-format

3972 msgid "no shallow found: %s"

3973 msgstr "未发现 shallow：%s"

3974

3936 -#: fetch-pack.c:374 fetch-pack.c:1425

3975 +#: fetch-pack.c:391 fetch-pack.c:1414

3976 #, c-format

3977 msgid "expected shallow/unshallow, got %s"

3978 msgstr "应为 shallow/unshallow，却得到 %s"

3979

3941 -#: fetch-pack.c:416

3980 +#: fetch-pack.c:431

3981 #, c-format

3982 msgid "got %s %d %s"

3983 msgstr "得到 %s %d %s"

3984

3946 -#: fetch-pack.c:433

3985 +#: fetch-pack.c:448

3986 #, c-format

3987 msgid "invalid commit %s"

3988 msgstr "无效提交 %s"

3989

3951 -#: fetch-pack.c:464

3990 +#: fetch-pack.c:479

3991 msgid "giving up"

3992 msgstr "放弃"

3993

3955 -#: fetch-pack.c:477 progress.c:336

3994 +#: fetch-pack.c:492 progress.c:339

3995 msgid "done"

3996 msgstr "完成"

3997

3959 -#: fetch-pack.c:489

3998 +#: fetch-pack.c:504

3999 #, c-format

4000 msgid "got %s (%d) %s"

4001 msgstr "得到 %s (%d) %s"

4002

3964 -#: fetch-pack.c:535

4003 +#: fetch-pack.c:540

4004 #, c-format

4005 msgid "Marking %s as complete"

4006 msgstr "标记 %s 为完成"

4007

3969 -#: fetch-pack.c:756

4008 +#: fetch-pack.c:755

4009 #, c-format

4010 msgid "already have %s (%s)"

4011 msgstr "已经有 %s（%s）"

4012

3974 -#: fetch-pack.c:821

4013 +#: fetch-pack.c:824

4014 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4015 msgstr "fetch-pack：无法派生 sideband 多路输出"

4016

3978 -#: fetch-pack.c:829

4017 +#: fetch-pack.c:832

4018 msgid "protocol error: bad pack header"

4019 msgstr "协议错误：坏的包头"

4020

3982 -#: fetch-pack.c:910

4021 +#: fetch-pack.c:916

4022 #, c-format

4023 msgid "fetch-pack: unable to fork off %s"

4024 msgstr "fetch-pack：无法派生进程 %s"

4025

3987 -#: fetch-pack.c:927

4026 +#: fetch-pack.c:933

4027 #, c-format

4028 msgid "%s failed"

4029 msgstr "%s 失败"

4030

3992 -#: fetch-pack.c:929

4031 +#: fetch-pack.c:935

4032 msgid "error in sideband demultiplexer"

4033 msgstr "sideband 多路输出出错"

4034

3996 -#: fetch-pack.c:976

4035 +#: fetch-pack.c:978

4036 #, c-format

4037 msgid "Server version is %.*s"

4038 msgstr "服务器版本 %.*s"

4039

4001 -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

4002 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

4003 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

4004 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4040 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

4041 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

4042 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

4043 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

4044 #, c-format

4045 msgid "Server supports %s"

4046 msgstr "服务器支持 %s"

4047

4009 -#: fetch-pack.c:983

4048 +#: fetch-pack.c:985

4049 msgid "Server does not support shallow clients"

4050 msgstr "服务器不支持 shalllow 客户端"

4051

4013 -#: fetch-pack.c:1043

4052 +#: fetch-pack.c:1045

4053 msgid "Server does not support --shallow-since"

4054 msgstr "服务器不支持 --shallow-since"

4055

4017 -#: fetch-pack.c:1048

4056 +#: fetch-pack.c:1050

4057 msgid "Server does not support --shallow-exclude"

4058 msgstr "服务器不支持 --shallow-exclude"

4059

4021 -#: fetch-pack.c:1052

4060 +#: fetch-pack.c:1054

4061 msgid "Server does not support --deepen"

4062 msgstr "服务器不支持 --deepen"

4063

4025 -#: fetch-pack.c:1054

4064 +#: fetch-pack.c:1056

4065 msgid "Server does not support this repository's object format"

4066 msgstr "服务器不支持这个仓库的对象格式"

4067

4029 -#: fetch-pack.c:1071

4068 +#: fetch-pack.c:1069

4069 msgid "no common commits"

4070 msgstr "没有共同的提交"

4071

4033 -#: fetch-pack.c:1083 fetch-pack.c:1639

4072 +#: fetch-pack.c:1081 fetch-pack.c:1619

4073 msgid "git fetch-pack: fetch failed."

4074 msgstr "git fetch-pack：获取失败。"

4075

4037 -#: fetch-pack.c:1211

4076 +#: fetch-pack.c:1205

4077 #, c-format

4078 msgid "mismatched algorithms: client %s; server %s"

4079 msgstr "不匹配的算法：客户端 %s，服务端 %s"

4080

4042 -#: fetch-pack.c:1215

4081 +#: fetch-pack.c:1209

4082 #, c-format

4083 msgid "the server does not support algorithm '%s'"

4084 msgstr "服务器不支持算法 '%s'"

4085

4047 -#: fetch-pack.c:1235

4086 +#: fetch-pack.c:1229

4087 msgid "Server does not support shallow requests"

4088 msgstr "服务器不支持 shalllow 请求"

4089

4051 -#: fetch-pack.c:1242

4090 +#: fetch-pack.c:1236

4091 msgid "Server supports filter"

4092 msgstr "服务器支持 filter"

4093

4055 -#: fetch-pack.c:1286

4094 +#: fetch-pack.c:1275

4095 msgid "unable to write request to remote"

4096 msgstr "无法将请求写到远程"

4097

4059 -#: fetch-pack.c:1304

4098 +#: fetch-pack.c:1293

4099 #, c-format

4100 msgid "error reading section header '%s'"

4101 msgstr "读取节标题 '%s' 出错"

4102

4064 -#: fetch-pack.c:1310

4103 +#: fetch-pack.c:1299

4104 #, c-format

4105 msgid "expected '%s', received '%s'"

4106 msgstr "预期 '%s'，得到 '%s'"

4107

4069 -#: fetch-pack.c:1371

4108 +#: fetch-pack.c:1360

4109 #, c-format

4110 msgid "unexpected acknowledgment line: '%s'"

4111 msgstr "意外的确认行：'%s'"

4112

4074 -#: fetch-pack.c:1376

4113 +#: fetch-pack.c:1365

4114 #, c-format

4115 msgid "error processing acks: %d"

4116 msgstr "处理 ack 出错：%d"

4117

4079 -#: fetch-pack.c:1386

4118 +#: fetch-pack.c:1375

4119 msgid "expected packfile to be sent after 'ready'"

4120 msgstr "预期在 'ready' 之后发送 packfile"

4121

4083 -#: fetch-pack.c:1388

4122 +#: fetch-pack.c:1377

4123 msgid "expected no other sections to be sent after no 'ready'"

4124 msgstr "在没有 'ready' 不应该发送其它小节"

4125

4087 -#: fetch-pack.c:1430

4126 +#: fetch-pack.c:1419

4127 #, c-format

4128 msgid "error processing shallow info: %d"

4129 msgstr "处理浅克隆信息出错：%d"

4130

4092 -#: fetch-pack.c:1477

4131 +#: fetch-pack.c:1466

4132 #, c-format

4133 msgid "expected wanted-ref, got '%s'"

4134 msgstr "预期 wanted-ref，得到 '%s'"

4135

4097 -#: fetch-pack.c:1482

4136 +#: fetch-pack.c:1471

4137 #, c-format

4138 msgid "unexpected wanted-ref: '%s'"

4139 msgstr "意外的 wanted-ref：'%s'"

4140

4102 -#: fetch-pack.c:1487

4141 +#: fetch-pack.c:1476

4142 #, c-format

4143 msgid "error processing wanted refs: %d"

4144 msgstr "处理要获取的引用出错：%d"

4145

4107 -#: fetch-pack.c:1517

4146 +#: fetch-pack.c:1506

4147 msgid "git fetch-pack: expected response end packet"

4148 msgstr "git fetch-pack：预期响应结束包"

4149

4111 -#: fetch-pack.c:1921

4150 +#: fetch-pack.c:1887

4151 msgid "no matching remote head"

4152 msgstr "没有匹配的远程分支"

4153

4115 -#: fetch-pack.c:1944 builtin/clone.c:692

4154 +#: fetch-pack.c:1910 builtin/clone.c:692

4155 msgid "remote did not send all necessary objects"

4156 msgstr "远程没有发送所有必需的对象"

4157

4119 -#: fetch-pack.c:1971

4158 +#: fetch-pack.c:1937

4159 #, c-format

4160 msgid "no such remote ref %s"

4161 msgstr "没有这样的远程引用 %s"

4162

4124 -#: fetch-pack.c:1974

4163 +#: fetch-pack.c:1940

4164 #, c-format

4165 msgid "Server does not allow request for unadvertised object %s"

4166 msgstr "服务器不允许请求未公开的对象 %s"

@@ -4220,41 +4259,41 @@ msgstr "低级命令/同步仓库"

4259 msgid "Low-level Commands / Internal Helpers"

4260 msgstr "低级命令/内部助手"

4261

4223 -#: help.c:298

4262 +#: help.c:300

4263 #, c-format

4264 msgid "available git commands in '%s'"

4265 msgstr "在 '%s' 下可用的 git 命令"

4266

4228 -#: help.c:305

4267 +#: help.c:307

4268 msgid "git commands available from elsewhere on your $PATH"

4269 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

4270

4232 -#: help.c:314

4271 +#: help.c:316

4272 msgid "These are common Git commands used in various situations:"

4273 msgstr "这些是各种场合常见的 Git 命令："

4274

4236 -#: help.c:363 git.c:99

4275 +#: help.c:365 git.c:99

4276 #, c-format

4277 msgid "unsupported command listing type '%s'"

4278 msgstr "不支持的命令列表类型 '%s'"

4279

4241 -#: help.c:403

4242 -msgid "The common Git guides are:"

4243 -msgstr "最常用的 Git 向导有："

4280 +#: help.c:405

4281 +msgid "The Git concept guides are:"

4282 +msgstr "Git 概念向导有："

4283

4245 -#: help.c:427

4284 +#: help.c:429

4285 msgid "See 'git help <command>' to read about a specific subcommand"

4286 msgstr "执行　'git help <command>' 来查看特定子命令"

4287

4249 -#: help.c:432

4288 +#: help.c:434

4289 msgid "External commands"

4290 msgstr "外部命令"

4291

4253 -#: help.c:447

4292 +#: help.c:449

4293 msgid "Command aliases"

4294 msgstr "命令别名"

4295

4257 -#: help.c:511

4296 +#: help.c:513

4297 #, c-format

4298 msgid ""

4299 "'%s' appears to be a git command, but we were not\n"

@@ -4263,31 +4302,31 @@ msgstr ""

4302 "'%s' 像是一个 git 命令，但却无法运行。\n"

4303 "可能是 git-%s 受损？"

4304

4266 -#: help.c:570

4305 +#: help.c:572

4306 msgid "Uh oh. Your system reports no Git commands at all."

4307 msgstr "唉呀，您的系统中未发现 Git 命令。"

4308

4270 -#: help.c:592

4309 +#: help.c:594

4310 #, c-format

4311 msgid "WARNING: You called a Git command named '%s', which does not exist."

4312 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

4313

4275 -#: help.c:597

4314 +#: help.c:599

4315 #, c-format

4316 msgid "Continuing under the assumption that you meant '%s'."

4317 msgstr "假定你想要的是 '%s' 并继续。"

4318

4280 -#: help.c:602

4319 +#: help.c:604

4320 #, c-format

4321 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4322 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

4323

4285 -#: help.c:610

4324 +#: help.c:612

4325 #, c-format

4326 msgid "git: '%s' is not a git command. See 'git --help'."

4327 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

4328

4290 -#: help.c:614

4329 +#: help.c:616

4330 msgid ""

4331 "\n"

4332 "The most similar command is"

@@ -4301,16 +4340,16 @@ msgstr[1] ""

4340 "\n"

4341 "最相似的命令是"

4342

4304 -#: help.c:654

4343 +#: help.c:656

4344 msgid "git version [<options>]"

4345 msgstr "git version [<选项>]"

4346

4308 -#: help.c:709

4347 +#: help.c:711

4348 #, c-format

4349 msgid "%s: %s - %s"

4350 msgstr "%s：%s - %s"

4351

4313 -#: help.c:713

4352 +#: help.c:715

4353 msgid ""

4354 "\n"

4355 "Did you mean this?"

@@ -4324,7 +4363,15 @@ msgstr[1] ""

4363 "\n"

4364 "您指的是这其中的某一个么？"

4365

4327 -#: ident.c:349

4366 +#: ident.c:353

4367 +msgid "Author identity unknown\n"

4368 +msgstr "作者身份未知\n"

4369 +

4370 +#: ident.c:356

4371 +msgid "Committer identity unknown\n"

4372 +msgstr "提交者身份未知\n"

4373 +

4374 +#: ident.c:362

4375 msgid ""

4376 "\n"

4377 "*** Please tell me who you are.\n"

@@ -4349,66 +4396,66 @@ msgstr ""

4396 "来设置您账号的缺省身份标识。\n"

4397 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

4398

4352 -#: ident.c:379

4399 +#: ident.c:397

4400 msgid "no email was given and auto-detection is disabled"

4401 msgstr "未提供邮件地址且自动探测被禁用"

4402

4356 -#: ident.c:384

4403 +#: ident.c:402

4404 #, c-format

4405 msgid "unable to auto-detect email address (got '%s')"

4406 msgstr "无法自动探测邮件地址（得到 '%s'）"

4407

4361 -#: ident.c:401

4408 +#: ident.c:419

4409 msgid "no name was given and auto-detection is disabled"

4410 msgstr "未提供姓名且自动探测被禁用"

4411

4365 -#: ident.c:407

4412 +#: ident.c:425

4413 #, c-format

4414 msgid "unable to auto-detect name (got '%s')"

4415 msgstr "无法自动探测姓名（得到 '%s'）"

4416

4370 -#: ident.c:415

4417 +#: ident.c:433

4418 #, c-format

4419 msgid "empty ident name (for <%s>) not allowed"

4420 msgstr "不允许空的姓名（对于 <%s>）"

4421

4375 -#: ident.c:421

4422 +#: ident.c:439

4423 #, c-format

4424 msgid "name consists only of disallowed characters: %s"

4425 msgstr "姓名中仅包含禁用字符：%s"

4426

4380 -#: ident.c:436 builtin/commit.c:634

4427 +#: ident.c:454 builtin/commit.c:634

4428 #, c-format

4429 msgid "invalid date format: %s"

4430 msgstr "无效的日期格式：%s"

4431

4385 -#: list-objects-filter-options.c:58

4432 +#: list-objects-filter-options.c:81

4433 msgid "expected 'tree:<depth>'"

4434 msgstr "期望 'tree:<深度>'"

4435

4389 -#: list-objects-filter-options.c:73

4436 +#: list-objects-filter-options.c:96

4437 msgid "sparse:path filters support has been dropped"

4438 msgstr "sparse:path 过滤器支持已被删除"

4439

4393 -#: list-objects-filter-options.c:86

4440 +#: list-objects-filter-options.c:109

4441 #, c-format

4442 msgid "invalid filter-spec '%s'"

4443 msgstr "无效的过滤器表达式 '%s'"

4444

4398 -#: list-objects-filter-options.c:102

4445 +#: list-objects-filter-options.c:125

4446 #, c-format

4447 msgid "must escape char in sub-filter-spec: '%c'"

4448 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"

4449

4403 -#: list-objects-filter-options.c:144

4450 +#: list-objects-filter-options.c:167

4451 msgid "expected something after combine:"

4452 msgstr "期望在组合后有一些东西："

4453

4407 -#: list-objects-filter-options.c:226

4454 +#: list-objects-filter-options.c:249

4455 msgid "multiple filter-specs cannot be combined"

4456 msgstr "不能混用多种过滤规格"

4457

4411 -#: list-objects-filter-options.c:330

4458 +#: list-objects-filter-options.c:361

4459 msgid "unable to upgrade repository format to support partial clone"

4460 msgstr "无法升级仓库格式以支持部分克隆"

4461

@@ -4765,7 +4812,7 @@ msgstr "添加/添加"

4812 msgid "Skipped %s (merged same as existing)"

4813 msgstr "略过 %s（已经做过相同合并）"

4814

4768 -#: merge-recursive.c:3101 git-submodule.sh:959

4815 +#: merge-recursive.c:3101

4816 msgid "submodule"

4817 msgstr "子模组"

4818

@@ -4851,22 +4898,22 @@ msgstr "已经是最新的！"

4898 msgid "merging of trees %s and %s failed"

4899 msgstr "无法合并树 %s 和 %s"

4900

4854 -#: merge-recursive.c:3549

4901 +#: merge-recursive.c:3550

4902 msgid "Merging:"

4903 msgstr "合并："

4904

4858 -#: merge-recursive.c:3562

4905 +#: merge-recursive.c:3563

4906 #, c-format

4907 msgid "found %u common ancestor:"

4908 msgid_plural "found %u common ancestors:"

4909 msgstr[0] "发现 %u 个共同祖先："

4910 msgstr[1] "发现 %u 个共同祖先："

4911

4865 -#: merge-recursive.c:3612

4912 +#: merge-recursive.c:3613

4913 msgid "merge returned no commit"

4914 msgstr "合并未返回提交"

4915

4869 -#: merge-recursive.c:3671

4916 +#: merge-recursive.c:3672

4917 #, c-format

4918 msgid ""

4919 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4875,12 +4922,12 @@ msgstr ""

4922 "您对下列文件的本地修改将被合并操作覆盖：\n"

4923 " %s"

4924

4878 -#: merge-recursive.c:3768

4925 +#: merge-recursive.c:3769

4926 #, c-format

4927 msgid "Could not parse object '%s'"

4928 msgstr "不能解析对象 '%s'"

4929

4883 -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4930 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

4931 msgid "Unable to write index."

4932 msgstr "不能写入索引。"

4933

@@ -4888,170 +4935,174 @@ msgstr "不能写入索引。"

4935 msgid "failed to read the cache"

4936 msgstr "读取缓存失败"

4937

4891 -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4892 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4938 +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

4939 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

4940 #: builtin/stash.c:265

4941 msgid "unable to write new index file"

4942 msgstr "无法写新的索引文件"

4943

4897 -#: midx.c:68

4944 +#: midx.c:79

4945 #, c-format

4946 msgid "multi-pack-index file %s is too small"

4947 msgstr "多包索引文件 %s 太小"

4948

4902 -#: midx.c:84

4949 +#: midx.c:95

4950 #, c-format

4951 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4952 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

4953

4907 -#: midx.c:89

4954 +#: midx.c:100

4955 #, c-format

4956 msgid "multi-pack-index version %d not recognized"

4957 msgstr "multi-pack-index 版本 %d 不能被识别"

4958

4912 -#: midx.c:94

4959 +#: midx.c:105

4960 #, c-format

4914 -msgid "hash version %u does not match"

4915 -msgstr "散列版本 %u 不匹配"

4961 +msgid "multi-pack-index hash version %u does not match version %u"

4962 +msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"

4963

4917 -#: midx.c:108

4964 +#: midx.c:122

4965 msgid "invalid chunk offset (too large)"

4966 msgstr "无效的块偏移（太大）"

4967

4921 -#: midx.c:132

4968 +#: midx.c:146

4969 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4970 msgstr "终止多包索引块 id 出现时间早于预期"

4971

4925 -#: midx.c:145

4972 +#: midx.c:159

4973 msgid "multi-pack-index missing required pack-name chunk"

4974 msgstr "多包索引缺少必需的包名块"

4975

4929 -#: midx.c:147

4976 +#: midx.c:161

4977 msgid "multi-pack-index missing required OID fanout chunk"

4978 msgstr "多包索引缺少必需的对象 ID 扇出块"

4979

4933 -#: midx.c:149

4980 +#: midx.c:163

4981 msgid "multi-pack-index missing required OID lookup chunk"

4982 msgstr "多包索引缺少必需的对象 ID 查询块"

4983

4937 -#: midx.c:151

4984 +#: midx.c:165

4985 msgid "multi-pack-index missing required object offsets chunk"

4986 msgstr "多包索引缺少必需的对象偏移块"

4987

4941 -#: midx.c:165

4988 +#: midx.c:179

4989 #, c-format

4990 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4991 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

4992

4946 -#: midx.c:208

4993 +#: midx.c:222

4994 #, c-format

4995 msgid "bad pack-int-id: %u (%u total packs)"

4996 msgstr "错的 pack-int-id：%u（共有 %u 个包）"

4997

4951 -#: midx.c:258

4998 +#: midx.c:272

4999 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5000 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

5001

4955 -#: midx.c:286

5002 +#: midx.c:300

5003 msgid "error preparing packfile from multi-pack-index"

5004 msgstr "从多包索引准备 packfile 出错"

5005

4959 -#: midx.c:470

5006 +#: midx.c:485

5007 #, c-format

5008 msgid "failed to add packfile '%s'"

5009 msgstr "添加包文件 '%s' 失败"

5010

4964 -#: midx.c:476

5011 +#: midx.c:491

5012 #, c-format

5013 msgid "failed to open pack-index '%s'"

5014 msgstr "打开包索引 '%s' 失败"

5015

4969 -#: midx.c:536

5016 +#: midx.c:551

5017 #, c-format

5018 msgid "failed to locate object %d in packfile"

5019 msgstr "在包文件中定位对象 %d 失败"

5020

4974 -#: midx.c:840

5021 +#: midx.c:853

5022 msgid "Adding packfiles to multi-pack-index"

5023 msgstr "添加包文件到多包索引"

5024

4978 -#: midx.c:873

5025 +#: midx.c:886

5026 #, c-format

5027 msgid "did not see pack-file %s to drop"

5028 msgstr "没有看到要丢弃的包文件 %s"

5029

4983 -#: midx.c:925

5030 +#: midx.c:938

5031 msgid "no pack files to index."

5032 msgstr "没有要索引的包文件。"

5033

4987 -#: midx.c:977

5034 +#: midx.c:990

5035 msgid "Writing chunks to multi-pack-index"

5036 msgstr "写入块到多包索引"

5037

4991 -#: midx.c:1056

5038 +#: midx.c:1068

5039 #, c-format

5040 msgid "failed to clear multi-pack-index at %s"

5041 msgstr "清理位于 %s 的多包索引失败"

5042

4996 -#: midx.c:1112

5043 +#: midx.c:1124

5044 +msgid "multi-pack-index file exists, but failed to parse"

5045 +msgstr "多包索引文件存在，但无法解析"

5046 +

5047 +#: midx.c:1132

5048 msgid "Looking for referenced packfiles"

5049 msgstr "正在查找引用的包文件"

5050

5000 -#: midx.c:1127

5051 +#: midx.c:1147

5052 #, c-format

5053 msgid ""

5054 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5055 msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5056

5006 -#: midx.c:1132

5057 +#: midx.c:1152

5058 msgid "the midx contains no oid"

5059 msgstr "midx 不包含 oid"

5060

5010 -#: midx.c:1141

5061 +#: midx.c:1161

5062 msgid "Verifying OID order in multi-pack-index"

5063 msgstr "校验多包索引中的 OID 顺序"

5064

5014 -#: midx.c:1150

5065 +#: midx.c:1170

5066 #, c-format

5067 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5068 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"

5069

5019 -#: midx.c:1170

5070 +#: midx.c:1190

5071 msgid "Sorting objects by packfile"

5072 msgstr "通过包文件为对象排序"

5073

5023 -#: midx.c:1177

5074 +#: midx.c:1197

5075 msgid "Verifying object offsets"

5076 msgstr "校验对象偏移"

5077

5027 -#: midx.c:1193

5078 +#: midx.c:1213

5079 #, c-format

5080 msgid "failed to load pack entry for oid[%d] = %s"

5081 msgstr "为 oid[%d] = %s 加载包条目失败"

5082

5032 -#: midx.c:1199

5083 +#: midx.c:1219

5084 #, c-format

5085 msgid "failed to load pack-index for packfile %s"

5086 msgstr "为包文件 %s 加载包索引失败"

5087

5037 -#: midx.c:1208

5088 +#: midx.c:1228

5089 #, c-format

5090 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5091 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

5092

5042 -#: midx.c:1233

5093 +#: midx.c:1253

5094 msgid "Counting referenced objects"

5095 msgstr "正在对引用对象计数"

5096

5046 -#: midx.c:1243

5097 +#: midx.c:1263

5098 msgid "Finding and deleting unreferenced packfiles"

5099 msgstr "正在查找和删除未引用的包文件"

5100

5050 -#: midx.c:1433

5101 +#: midx.c:1454

5102 msgid "could not start pack-objects"

5103 msgstr "不能开始 pack-objects"

5104

5054 -#: midx.c:1452

5105 +#: midx.c:1474

5106 msgid "could not finish pack-objects"

5107 msgstr "不能结束 pack-objects"

5108

@@ -5134,7 +5185,7 @@ msgstr "不能解析对象：%s"

5185 msgid "hash mismatch %s"

5186 msgstr "哈希值与 %s 不匹配"

5187

5137 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5188 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5189 #, c-format

5190 msgid "unable to get size of %s"

5191 msgstr "无法得到 %s 的大小"

@@ -5143,12 +5194,12 @@ msgstr "无法得到 %s 的大小"

5194 msgid "offset before end of packfile (broken .idx?)"

5195 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

5196

5146 -#: packfile.c:1900

5197 +#: packfile.c:1922

5198 #, c-format

5199 msgid "offset before start of pack index for %s (corrupt index?)"

5200 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

5201

5151 -#: packfile.c:1904

5202 +#: packfile.c:1926

5203 #, c-format

5204 msgid "offset beyond end of pack index for %s (truncated index?)"

5205 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -5168,7 +5219,7 @@ msgstr "格式错误的到期时间：'%s'"

5219 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5220 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5221

5171 -#: parse-options-cb.c:130 parse-options-cb.c:147

5222 +#: parse-options-cb.c:132 parse-options-cb.c:149

5223 #, c-format

5224 msgid "malformed object name '%s'"

5225 msgstr "格式错误的对象名 '%s'"

@@ -5213,31 +5264,31 @@ msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"

5264 msgid "did you mean `--%s` (with two dashes)?"

5265 msgstr "你的意思是 `--%s`（有两个短线）？"

5266

5216 -#: parse-options.c:663 parse-options.c:963

5267 +#: parse-options.c:666 parse-options.c:971

5268 #, c-format

5269 msgid "alias of --%s"

5270 msgstr "--%s 的别名"

5271

5221 -#: parse-options.c:854

5272 +#: parse-options.c:862

5273 #, c-format

5274 msgid "unknown option `%s'"

5275 msgstr "未知选项 `%s'"

5276

5226 -#: parse-options.c:856

5277 +#: parse-options.c:864

5278 #, c-format

5279 msgid "unknown switch `%c'"

5280 msgstr "未知开关 `%c'"

5281

5231 -#: parse-options.c:858

5282 +#: parse-options.c:866

5283 #, c-format

5284 msgid "unknown non-ascii option in string: `%s'"

5285 msgstr "字符串中未知的非 ascii 字符选项：`%s'"

5286

5236 -#: parse-options.c:882

5287 +#: parse-options.c:890

5288 msgid "..."

5289 msgstr "..."

5290

5240 -#: parse-options.c:901

5291 +#: parse-options.c:909

5292 #, c-format

5293 msgid "usage: %s"

5294 msgstr "用法：%s"

@@ -5245,18 +5296,18 @@ msgstr "用法：%s"

5296 #. TRANSLATORS: the colon here should align with the

5297 #. one in "usage: %s" translation.

5298 #.

5248 -#: parse-options.c:907

5299 +#: parse-options.c:915

5300 #, c-format

5301 msgid " or: %s"

5302 msgstr " 或：%s"

5303

5304 # 译者：为保证在输出中对齐，注意调整句中空格！

5254 -#: parse-options.c:910

5305 +#: parse-options.c:918

5306 #, c-format

5307 msgid " %s"

5308 msgstr " %s"

5309

5259 -#: parse-options.c:949

5310 +#: parse-options.c:957

5311 msgid "-NUM"

5312 msgstr "-数字"

5313

@@ -5391,7 +5442,7 @@ msgstr "协议错误：错误的行长度字符串：%.4s"

5442 msgid "protocol error: bad line length %d"

5443 msgstr "协议错误：错误的行长度 %d"

5444

5394 -#: pkt-line.c:373

5445 +#: pkt-line.c:373 sideband.c:150

5446 #, c-format

5447 msgid "remote error: %s"

5448 msgstr "远程错误：%s"

@@ -5405,15 +5456,23 @@ msgstr "正在刷新索引"

5456 msgid "unable to create threaded lstat: %s"

5457 msgstr "无法创建线程 lstat：%s"

5458

5408 -#: pretty.c:982

5459 +#: pretty.c:983

5460 msgid "unable to parse --pretty format"

5461 msgstr "不能解析 --pretty 格式"

5462

5412 -#: promisor-remote.c:23

5413 -msgid "Remote with no URL"

5414 -msgstr "远程未设置 URL"

5463 +#: promisor-remote.c:30

5464 +msgid "promisor-remote: unable to fork off fetch subprocess"

5465 +msgstr "promisor-remote：无法派生 fetch 子进程"

5466 +

5467 +#: promisor-remote.c:35 promisor-remote.c:37

5468 +msgid "promisor-remote: could not write to fetch subprocess"

5469 +msgstr "promisor-remote：无法向 fetch 子进程写入"

5470

5416 -#: promisor-remote.c:58

5471 +#: promisor-remote.c:41

5472 +msgid "promisor-remote: could not close stdin to fetch subprocess"

5473 +msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"

5474 +

5475 +#: promisor-remote.c:53

5476 #, c-format

5477 msgid "promisor remote name cannot begin with '/': %s"

5478 msgstr "promisor 远程名称不能以 '/' 开始：%s"

@@ -5430,7 +5489,7 @@ msgstr "不能启动 `log`"

5489 msgid "could not read `log` output"

5490 msgstr "不能读取 `log` 的输出"

5491

5433 -#: range-diff.c:98 sequencer.c:5143

5492 +#: range-diff.c:98 sequencer.c:5283

5493 #, c-format

5494 msgid "could not parse commit '%s'"

5495 msgstr "不能解析提交 '%s'"

@@ -5456,50 +5515,50 @@ msgstr "生成 diff 失败"

5515 msgid "could not parse log for '%s'"

5516 msgstr "不能解析 '%s' 的日志"

5517

5459 -#: read-cache.c:680

5518 +#: read-cache.c:682

5519 #, c-format

5520 msgid "will not add file alias '%s' ('%s' already exists in index)"

5521 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

5522

5464 -#: read-cache.c:696

5523 +#: read-cache.c:698

5524 msgid "cannot create an empty blob in the object database"

5525 msgstr "不能在对象数据库中创建空的数据对象"

5526

5468 -#: read-cache.c:718

5527 +#: read-cache.c:720

5528 #, c-format

5529 msgid "%s: can only add regular files, symbolic links or git-directories"

5530 msgstr "%s：只能添加常规文件、符号链接或 git 目录"

5531

5473 -#: read-cache.c:723

5532 +#: read-cache.c:725

5533 #, c-format

5534 msgid "'%s' does not have a commit checked out"

5535 msgstr "'%s' 没有检出一个提交"

5536

5478 -#: read-cache.c:775

5537 +#: read-cache.c:777

5538 #, c-format

5539 msgid "unable to index file '%s'"

5540 msgstr "无法索引文件 '%s'"

5541

5483 -#: read-cache.c:794

5542 +#: read-cache.c:796

5543 #, c-format

5544 msgid "unable to add '%s' to index"

5545 msgstr "无法在索引中添加 '%s'"

5546

5488 -#: read-cache.c:805

5547 +#: read-cache.c:807

5548 #, c-format

5549 msgid "unable to stat '%s'"

5550 msgstr "无法对 %s 执行 stat"

5551

5493 -#: read-cache.c:1330

5552 +#: read-cache.c:1318

5553 #, c-format

5554 msgid "'%s' appears as both a file and as a directory"

5555 msgstr "'%s' 看起来既是文件又是目录"

5556

5498 -#: read-cache.c:1536

5557 +#: read-cache.c:1524

5558 msgid "Refresh index"

5559 msgstr "刷新索引"

5560

5502 -#: read-cache.c:1651

5561 +#: read-cache.c:1639

5562 #, c-format

5563 msgid ""

5564 "index.version set, but the value is invalid.\n"

@@ -5508,7 +5567,7 @@ msgstr ""

5567 "设置了 index.version，但是取值无效。\n"

5568 "使用版本 %i"

5569

5511 -#: read-cache.c:1661

5570 +#: read-cache.c:1649

5571 #, c-format

5572 msgid ""

5573 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -5517,140 +5576,140 @@ msgstr ""

5576 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

5577 "使用版本 %i"

5578

5520 -#: read-cache.c:1717

5579 +#: read-cache.c:1705

5580 #, c-format

5581 msgid "bad signature 0x%08x"

5582 msgstr "坏的签名 0x%08x"

5583

5525 -#: read-cache.c:1720

5584 +#: read-cache.c:1708

5585 #, c-format

5586 msgid "bad index version %d"

5587 msgstr "坏的索引版本 %d"

5588

5530 -#: read-cache.c:1729

5589 +#: read-cache.c:1717

5590 msgid "bad index file sha1 signature"

5591 msgstr "坏的索引文件 sha1 签名"

5592

5534 -#: read-cache.c:1759

5593 +#: read-cache.c:1747

5594 #, c-format

5595 msgid "index uses %.4s extension, which we do not understand"

5596 msgstr "索引使用不被支持的 %.4s 扩展"

5597

5598 #

5540 -#: read-cache.c:1761

5599 +#: read-cache.c:1749

5600 #, c-format

5601 msgid "ignoring %.4s extension"

5602 msgstr "忽略 %.4s 扩展"

5603

5545 -#: read-cache.c:1798

5604 +#: read-cache.c:1786

5605 #, c-format

5606 msgid "unknown index entry format 0x%08x"

5607 msgstr "未知的索引条目格式 0x%08x"

5608

5550 -#: read-cache.c:1814

5609 +#: read-cache.c:1802

5610 #, c-format

5611 msgid "malformed name field in the index, near path '%s'"

5612 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

5613

5555 -#: read-cache.c:1871

5614 +#: read-cache.c:1859

5615 msgid "unordered stage entries in index"

5616 msgstr "索引中有未排序的暂存条目"

5617

5559 -#: read-cache.c:1874

5618 +#: read-cache.c:1862

5619 #, c-format

5620 msgid "multiple stage entries for merged file '%s'"

5621 msgstr "合并文件 '%s' 有多个暂存条目"

5622

5564 -#: read-cache.c:1877

5623 +#: read-cache.c:1865

5624 #, c-format

5625 msgid "unordered stage entries for '%s'"

5626 msgstr "'%s' 的未排序暂存条目"

5627

5569 -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5570 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5571 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5628 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5629 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5630 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5631 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5573 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5632 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5633 #: builtin/submodule--helper.c:332

5634 msgid "index file corrupt"

5635 msgstr "索引文件损坏"

5636

5578 -#: read-cache.c:2124

5637 +#: read-cache.c:2115

5638 #, c-format

5639 msgid "unable to create load_cache_entries thread: %s"

5640 msgstr "无法创建 load_cache_entries 线程：%s"

5641

5583 -#: read-cache.c:2137

5642 +#: read-cache.c:2128

5643 #, c-format

5644 msgid "unable to join load_cache_entries thread: %s"

5645 msgstr "无法加入 load_cache_entries 线程：%s"

5646

5588 -#: read-cache.c:2170

5647 +#: read-cache.c:2161

5648 #, c-format

5649 msgid "%s: index file open failed"

5650 msgstr "%s：打开索引文件失败"

5651

5593 -#: read-cache.c:2174

5652 +#: read-cache.c:2165

5653 #, c-format

5654 msgid "%s: cannot stat the open index"

5655 msgstr "%s：不能对打开的索引执行 stat 操作"

5656

5598 -#: read-cache.c:2178

5657 +#: read-cache.c:2169

5658 #, c-format

5659 msgid "%s: index file smaller than expected"

5660 msgstr "%s：索引文件比预期的小"

5661

5603 -#: read-cache.c:2182

5662 +#: read-cache.c:2173

5663 #, c-format

5664 msgid "%s: unable to map index file"

5665 msgstr "%s：无法对索引文件执行 map 操作"

5666

5608 -#: read-cache.c:2224

5667 +#: read-cache.c:2215

5668 #, c-format

5669 msgid "unable to create load_index_extensions thread: %s"

5670 msgstr "无法创建 load_index_extensions 线程：%s"

5671

5613 -#: read-cache.c:2251

5672 +#: read-cache.c:2242

5673 #, c-format

5674 msgid "unable to join load_index_extensions thread: %s"

5675 msgstr "无法加入 load_index_extensions 线程：%s"

5676

5618 -#: read-cache.c:2283

5677 +#: read-cache.c:2274

5678 #, c-format

5679 msgid "could not freshen shared index '%s'"

5680 msgstr "无法刷新共享索引 '%s'"

5681

5623 -#: read-cache.c:2330

5682 +#: read-cache.c:2321

5683 #, c-format

5684 msgid "broken index, expect %s in %s, got %s"

5685 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5686

5628 -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5687 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5688 #, c-format

5689 msgid "could not close '%s'"

5690 msgstr "不能关闭 '%s'"

5691

5633 -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5692 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5693 #, c-format

5694 msgid "could not stat '%s'"

5695 msgstr "不能对 '%s' 调用 stat"

5696

5638 -#: read-cache.c:3142

5697 +#: read-cache.c:3133

5698 #, c-format

5699 msgid "unable to open git dir: %s"

5700 msgstr "不能打开 git 目录：%s"

5701

5643 -#: read-cache.c:3154

5702 +#: read-cache.c:3145

5703 #, c-format

5704 msgid "unable to unlink: %s"

5705 msgstr "无法删除：%s"

5706

5648 -#: read-cache.c:3179

5707 +#: read-cache.c:3170

5708 #, c-format

5709 msgid "cannot fix permission bits on '%s'"

5710 msgstr "不能修复 '%s' 的权限位"

5711

5653 -#: read-cache.c:3328

5712 +#: read-cache.c:3319

5713 #, c-format

5714 msgid "%s: cannot drop to stage #0"

5715 msgstr "%s：不能落到暂存区 #0"

@@ -5717,7 +5776,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

5776 msgstr[0] "变基 %s 到 %s（%d 个提交）"

5777 msgstr[1] "变基 %s 到 %s（%d 个提交）"

5778

5720 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5779 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5780 msgid ""

5781 "\n"

5782 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5725,7 +5784,7 @@ msgstr ""

5784 "\n"

5785 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

5786

5728 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5787 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5788 msgid ""

5789 "\n"

5790 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5733,7 +5792,7 @@ msgstr ""

5792 "\n"

5793 "如果您在这里删除一行，对应的提交将会丢失。\n"

5794

5736 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5795 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5796 msgid ""

5797 "\n"

5798 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5747,7 +5806,7 @@ msgstr ""

5806 " git rebase --continue\n"

5807 "\n"

5808

5750 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5809 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

5810 msgid ""

5811 "\n"

5812 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5757,14 +5816,14 @@ msgstr ""

5816 "然而，如果您删除全部内容，变基操作将会终止。\n"

5817 "\n"

5818

5760 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5761 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5819 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5820 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5821 #, c-format

5822 msgid "could not write '%s'"

5823 msgstr "不能写入 '%s'"

5824

5766 -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5767 -#: builtin/rebase.c:240

5825 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5826 +#: builtin/rebase.c:246

5827 #, c-format

5828 msgid "could not write '%s'."

5829 msgstr "不能写入 '%s'。"

@@ -5794,14 +5853,14 @@ msgstr ""

5853 "可选值有：ignore、warn、error。\n"

5854 "\n"

5855

5797 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5798 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5799 -#: builtin/rebase.c:252

5856 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5857 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5858 +#: builtin/rebase.c:258

5859 #, c-format

5860 msgid "could not read '%s'."

5861 msgstr "不能读取 '%s'。"

5862

5804 -#: ref-filter.c:42 wt-status.c:1977

5863 +#: ref-filter.c:42 wt-status.c:1973

5864 msgid "gone"

5865 msgstr "丢失"

5866

@@ -5820,237 +5879,232 @@ msgstr "落后 %d"

5879 msgid "ahead %d, behind %d"

5880 msgstr "领先 %d，落后 %d"

5881

5823 -#: ref-filter.c:165

5882 +#: ref-filter.c:169

5883 #, c-format

5884 msgid "expected format: %%(color:<color>)"

5885 msgstr "期望的格式：%%(color:<颜色>)"

5886

5828 -#: ref-filter.c:167

5887 +#: ref-filter.c:171

5888 #, c-format

5889 msgid "unrecognized color: %%(color:%s)"

5890 msgstr "未能识别的颜色：%%(color:%s)"

5891

5833 -#: ref-filter.c:189

5892 +#: ref-filter.c:193

5893 #, c-format

5894 msgid "Integer value expected refname:lstrip=%s"

5895 msgstr "期望整数值 refname:lstrip=%s"

5896

5838 -#: ref-filter.c:193

5897 +#: ref-filter.c:197

5898 #, c-format

5899 msgid "Integer value expected refname:rstrip=%s"

5900 msgstr "期望整数值 refname:rstrip=%s"

5901

5843 -#: ref-filter.c:195

5902 +#: ref-filter.c:199

5903 #, c-format

5904 msgid "unrecognized %%(%s) argument: %s"

5905 msgstr "未能识别的 %%(%s) 参数：%s"

5906

5848 -#: ref-filter.c:250

5907 +#: ref-filter.c:254

5908 #, c-format

5909 msgid "%%(objecttype) does not take arguments"

5910 msgstr "%%(objecttype) 不带参数"

5911

5853 -#: ref-filter.c:272

5912 +#: ref-filter.c:276

5913 #, c-format

5914 msgid "unrecognized %%(objectsize) argument: %s"

5915 msgstr "未能识别的 %%(objectsize) 参数：%s"

5916

5858 -#: ref-filter.c:280

5917 +#: ref-filter.c:284

5918 #, c-format

5919 msgid "%%(deltabase) does not take arguments"

5920 msgstr "%%(deltabase) 不带参数"

5921

5863 -#: ref-filter.c:292

5922 +#: ref-filter.c:296

5923 #, c-format

5924 msgid "%%(body) does not take arguments"

5925 msgstr "%%(body) 不带参数"

5926

5868 -#: ref-filter.c:301

5927 +#: ref-filter.c:309

5928 #, c-format

5870 -msgid "%%(subject) does not take arguments"

5871 -msgstr "%%(subject) 不带参数"

5929 +msgid "unrecognized %%(subject) argument: %s"

5930 +msgstr "未能识别的 %%(subject) 参数：%s"

5931

5873 -#: ref-filter.c:323

5932 +#: ref-filter.c:330

5933 #, c-format

5934 msgid "unknown %%(trailers) argument: %s"

5935 msgstr "未知的 %%(trailers) 参数：%s"

5936

5878 -#: ref-filter.c:352

5937 +#: ref-filter.c:363

5938 #, c-format

5939 msgid "positive value expected contents:lines=%s"

5940 msgstr "期望一个正数 contents:lines=%s"

5941

5883 -#: ref-filter.c:354

5942 +#: ref-filter.c:365

5943 #, c-format

5944 msgid "unrecognized %%(contents) argument: %s"

5945 msgstr "未能识别的 %%(contents) 参数：%s"

5946

5888 -#: ref-filter.c:369

5947 +#: ref-filter.c:380

5948 +#, c-format

5949 +msgid "positive value expected '%s' in %%(%s)"

5950 +msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"

5951 +

5952 +#: ref-filter.c:384

5953 #, c-format

5890 -msgid "positive value expected objectname:short=%s"

5891 -msgstr "期望一个正数 objectname:short=%s"

5954 +msgid "unrecognized argument '%s' in %%(%s)"

5955 +msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"

5956

5893 -#: ref-filter.c:373

5957 +#: ref-filter.c:398

5958 #, c-format

5895 -msgid "unrecognized %%(objectname) argument: %s"

5896 -msgstr "未能识别的 %%(objectname) 参数：%s"

5959 +msgid "unrecognized email option: %s"

5960 +msgstr "未识别的邮件选项：%s"

5961

5898 -#: ref-filter.c:403

5962 +#: ref-filter.c:428

5963 #, c-format

5964 msgid "expected format: %%(align:<width>,<position>)"

5965 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

5966

5903 -#: ref-filter.c:415

5967 +#: ref-filter.c:440

5968 #, c-format

5969 msgid "unrecognized position:%s"

5970 msgstr "未能识别的位置：%s"

5971

5908 -#: ref-filter.c:422

5972 +#: ref-filter.c:447

5973 #, c-format

5974 msgid "unrecognized width:%s"

5975 msgstr "未能识别的宽度：%s"

5976

5913 -#: ref-filter.c:431

5977 +#: ref-filter.c:456

5978 #, c-format

5979 msgid "unrecognized %%(align) argument: %s"

5980 msgstr "未能识别的 %%(align) 参数：%s"

5981

5918 -#: ref-filter.c:439

5982 +#: ref-filter.c:464

5983 #, c-format

5984 msgid "positive width expected with the %%(align) atom"

5985 msgstr "元素 %%(align) 需要一个正数的宽度"

5986

5923 -#: ref-filter.c:457

5987 +#: ref-filter.c:482

5988 #, c-format

5989 msgid "unrecognized %%(if) argument: %s"

5990 msgstr "未能识别的 %%(if) 参数：%s"

5991

5928 -#: ref-filter.c:559

5992 +#: ref-filter.c:584

5993 #, c-format

5994 msgid "malformed field name: %.*s"

5995 msgstr "格式错误的字段名：%.*s"

5996

5933 -#: ref-filter.c:586

5997 +#: ref-filter.c:611

5998 #, c-format

5999 msgid "unknown field name: %.*s"

6000 msgstr "未知的字段名：%.*s"

6001

5938 -#: ref-filter.c:590

6002 +#: ref-filter.c:615

6003 #, c-format

6004 msgid ""

6005 "not a git repository, but the field '%.*s' requires access to object data"

5942 -msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

6006 +msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"

6007

5944 -#: ref-filter.c:714

6008 +#: ref-filter.c:739

6009 #, c-format

6010 msgid "format: %%(if) atom used without a %%(then) atom"

6011 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

6012

5949 -#: ref-filter.c:777

6013 +#: ref-filter.c:802

6014 #, c-format

6015 msgid "format: %%(then) atom used without an %%(if) atom"

6016 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

6017

5954 -#: ref-filter.c:779

6018 +#: ref-filter.c:804

6019 #, c-format

6020 msgid "format: %%(then) atom used more than once"

6021 msgstr "格式：%%(then) 元素用了多次"

6022

5959 -#: ref-filter.c:781

6023 +#: ref-filter.c:806

6024 #, c-format

6025 msgid "format: %%(then) atom used after %%(else)"

6026 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

6027

5964 -#: ref-filter.c:809

6028 +#: ref-filter.c:834

6029 #, c-format

6030 msgid "format: %%(else) atom used without an %%(if) atom"

6031 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

6032

5969 -#: ref-filter.c:811

6033 +#: ref-filter.c:836

6034 #, c-format

6035 msgid "format: %%(else) atom used without a %%(then) atom"

6036 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

6037

5974 -#: ref-filter.c:813

6038 +#: ref-filter.c:838

6039 #, c-format

6040 msgid "format: %%(else) atom used more than once"

6041 msgstr "格式：%%(else) 元素用了多次"

6042

5979 -#: ref-filter.c:828

6043 +#: ref-filter.c:853

6044 #, c-format

6045 msgid "format: %%(end) atom used without corresponding atom"

6046 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

6047

5984 -#: ref-filter.c:885

6048 +#: ref-filter.c:910

6049 #, c-format

6050 msgid "malformed format string %s"

6051 msgstr "错误的格式化字符串 %s"

6052

5989 -#: ref-filter.c:1486

6053 +#: ref-filter.c:1541

6054 #, c-format

6055 msgid "no branch, rebasing %s"

6056 msgstr "非分支，正变基 %s"

6057

5994 -#: ref-filter.c:1489

6058 +#: ref-filter.c:1544

6059 #, c-format

6060 msgid "no branch, rebasing detached HEAD %s"

6061 msgstr "非分支，正变基分离头指针 %s"

6062

5999 -#: ref-filter.c:1492

6063 +#: ref-filter.c:1547

6064 #, c-format

6065 msgid "no branch, bisect started on %s"

6066 msgstr "非分支，二分查找开始于 %s"

6067

6004 -#: ref-filter.c:1502

6068 +#: ref-filter.c:1557

6069 msgid "no branch"

6070 msgstr "非分支"

6071

6008 -#: ref-filter.c:1538 ref-filter.c:1747

6072 +#: ref-filter.c:1591 ref-filter.c:1800

6073 #, c-format

6074 msgid "missing object %s for %s"

6075 msgstr "缺失 %2$s 的对象 %1$s"

6076

6013 -#: ref-filter.c:1548

6077 +#: ref-filter.c:1601

6078 #, c-format

6079 msgid "parse_object_buffer failed on %s for %s"

6080 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

6081

6018 -#: ref-filter.c:2001

6082 +#: ref-filter.c:2054

6083 #, c-format

6084 msgid "malformed object at '%s'"

6085 msgstr "格式错误的对象 '%s'"

6086

6023 -#: ref-filter.c:2090

6087 +#: ref-filter.c:2143

6088 #, c-format

6089 msgid "ignoring ref with broken name %s"

6090 msgstr "忽略带有错误名称 %s 的引用"

6091

6028 -#: ref-filter.c:2095 refs.c:657

6092 +#: ref-filter.c:2148 refs.c:657

6093 #, c-format

6094 msgid "ignoring broken ref %s"

6095 msgstr "忽略损坏的引用 %s"

6096

6033 -#: ref-filter.c:2395

6097 +#: ref-filter.c:2464

6098 #, c-format

6099 msgid "format: %%(end) atom missing"

6100 msgstr "格式：缺少 %%(end) 元素"

6101

6038 -#: ref-filter.c:2495

6039 -#, c-format

6040 -msgid "option `%s' is incompatible with --merged"

6041 -msgstr "选项 `%s' 和 --merged 不兼容"

6042 -

6043 -#: ref-filter.c:2498

6044 -#, c-format

6045 -msgid "option `%s' is incompatible with --no-merged"

6046 -msgstr "选项 `%s' 和 --no-merged 不兼容"

6047 -

6048 -#: ref-filter.c:2508

6102 +#: ref-filter.c:2563

6103 #, c-format

6104 msgid "malformed object name %s"

6105 msgstr "格式错误的对象名 %s"

6106

6053 -#: ref-filter.c:2513

6107 +#: ref-filter.c:2568

6108 #, c-format

6109 msgid "option `%s' must point to a commit"

6110 msgstr "选项 `%s' 必须指向一个提交"

@@ -6075,157 +6129,119 @@ msgstr "无效的分支名：%s = %s"

6129 msgid "ignoring dangling symref %s"

6130 msgstr "忽略悬空符号引用 %s"

6131

6078 -#: refs.c:792

6079 -#, c-format

6080 -msgid "could not open '%s' for writing: %s"

6081 -msgstr "无法为写入打开 '%s'：%s"

6082 -

6083 -#: refs.c:802 refs.c:853

6084 -#, c-format

6085 -msgid "could not read ref '%s'"

6086 -msgstr "无法读取引用 '%s'"

6087 -

6088 -#: refs.c:808

6089 -#, c-format

6090 -msgid "ref '%s' already exists"

6091 -msgstr "引用 '%s' 已经存在"

6092 -

6093 -#: refs.c:813

6094 -#, c-format

6095 -msgid "unexpected object ID when writing '%s'"

6096 -msgstr "写入 '%s' 时意外的对象 ID"

6097 -

6098 -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6099 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6100 -#: wrapper.c:628

6101 -#, c-format

6102 -msgid "could not write to '%s'"

6103 -msgstr "不能写入 '%s'"

6104 -

6105 -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6106 -#: builtin/rebase.c:852

6107 -#, c-format

6108 -msgid "could not open '%s' for writing"

6109 -msgstr "无法打开 '%s' 进行写入"

6110 -

6111 -#: refs.c:855

6112 -#, c-format

6113 -msgid "unexpected object ID when deleting '%s'"

6114 -msgstr "删除 '%s' 时意外的对象 ID"

6115 -

6116 -#: refs.c:986

6132 +#: refs.c:892

6133 #, c-format

6134 msgid "log for ref %s has gap after %s"

6135 msgstr "引用 %s 的日志在 %s 之后有缺口"

6136

6121 -#: refs.c:992

6137 +#: refs.c:898

6138 #, c-format

6139 msgid "log for ref %s unexpectedly ended on %s"

6140 msgstr "引用 %s 的日志意外终止于 %s "

6141

6126 -#: refs.c:1051

6142 +#: refs.c:957

6143 #, c-format

6144 msgid "log for %s is empty"

6145 msgstr "%s 的日志为空"

6146

6131 -#: refs.c:1143

6147 +#: refs.c:1049

6148 #, c-format

6149 msgid "refusing to update ref with bad name '%s'"

6150 msgstr "拒绝更新有错误名称 '%s' 的引用"

6151

6136 -#: refs.c:1219

6152 +#: refs.c:1120

6153 #, c-format

6154 msgid "update_ref failed for ref '%s': %s"

6155 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

6156

6141 -#: refs.c:2011

6157 +#: refs.c:1944

6158 #, c-format

6159 msgid "multiple updates for ref '%s' not allowed"

6160 msgstr "不允许对引用 '%s' 多次更新"

6161

6146 -#: refs.c:2098

6162 +#: refs.c:2024

6163 msgid "ref updates forbidden inside quarantine environment"

6164 msgstr "在隔离环境中禁止更新引用"

6165

6150 -#: refs.c:2109

6166 +#: refs.c:2035

6167 msgid "ref updates aborted by hook"

6168 msgstr "引用更新被钩子中止"

6169

6154 -#: refs.c:2209 refs.c:2239

6170 +#: refs.c:2135 refs.c:2165

6171 #, c-format

6172 msgid "'%s' exists; cannot create '%s'"

6173 msgstr "'%s' 已存在，无法创建 '%s'"

6174

6159 -#: refs.c:2215 refs.c:2250

6175 +#: refs.c:2141 refs.c:2176

6176 #, c-format

6177 msgid "cannot process '%s' and '%s' at the same time"

6178 msgstr "无法同时处理 '%s' 和 '%s'"

6179

6164 -#: refs/files-backend.c:1233

6180 +#: refs/files-backend.c:1228

6181 #, c-format

6182 msgid "could not remove reference %s"

6183 msgstr "无法删除引用 %s"

6184

6169 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6170 -#: refs/packed-backend.c:1551

6185 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542

6186 +#: refs/packed-backend.c:1552

6187 #, c-format

6188 msgid "could not delete reference %s: %s"

6189 msgstr "无法删除引用 %s：%s"

6190

6175 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6191 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555

6192 #, c-format

6193 msgid "could not delete references: %s"

6194 msgstr "无法删除引用：%s"

6195

6180 -#: refspec.c:137

6196 +#: refspec.c:167

6197 #, c-format

6198 msgid "invalid refspec '%s'"

6199 msgstr "无效的引用表达式：'%s'"

6200

6185 -#: remote.c:355

6201 +#: remote.c:351

6202 #, c-format

6203 msgid "config remote shorthand cannot begin with '/': %s"

6204 msgstr "配置的远程短名称不能以 '/' 开始：%s"

6205

6190 -#: remote.c:403

6206 +#: remote.c:399

6207 msgid "more than one receivepack given, using the first"

6208 msgstr "提供了一个以上的 receivepack，使用第一个"

6209

6194 -#: remote.c:411

6210 +#: remote.c:407

6211 msgid "more than one uploadpack given, using the first"

6212 msgstr "提供了一个以上的 uploadpack，使用第一个"

6213

6198 -#: remote.c:594

6214 +#: remote.c:590

6215 #, c-format

6216 msgid "Cannot fetch both %s and %s to %s"

6217 msgstr "不能同时获取 %s 和 %s 至 %s"

6218

6203 -#: remote.c:598

6219 +#: remote.c:594

6220 #, c-format

6221 msgid "%s usually tracks %s, not %s"

6222 msgstr "%s 通常跟踪 %s，而非 %s"

6223

6208 -#: remote.c:602

6224 +#: remote.c:598

6225 #, c-format

6226 msgid "%s tracks both %s and %s"

6227 msgstr "%s 同时跟踪 %s 和 %s"

6228

6213 -#: remote.c:670

6229 +#: remote.c:666

6230 #, c-format

6231 msgid "key '%s' of pattern had no '*'"

6232 msgstr "模式的键 '%s' 没有 '*'"

6233

6218 -#: remote.c:680

6234 +#: remote.c:676

6235 #, c-format

6236 msgid "value '%s' of pattern has no '*'"

6237 msgstr "模式的值 '%s' 没有 '*'"

6238

6223 -#: remote.c:986

6239 +#: remote.c:1073

6240 #, c-format

6241 msgid "src refspec %s does not match any"

6242 msgstr "源引用表达式 %s 没有匹配"

6243

6228 -#: remote.c:991

6244 +#: remote.c:1078

6245 #, c-format

6246 msgid "src refspec %s matches more than one"

6247 msgstr "源引用表达式 %s 匹配超过一个"

@@ -6234,7 +6250,7 @@ msgstr "源引用表达式 %s 匹配超过一个"

6250 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6251 #. the <src>.

6252 #.

6237 -#: remote.c:1006

6253 +#: remote.c:1093

6254 #, c-format

6255 msgid ""

6256 "The destination you provided is not a full refname (i.e.,\n"

@@ -6256,7 +6272,7 @@ msgstr ""

6272 "\n"

6273 "都不行，所以我们已放弃。您必须给出完整的引用。"

6274

6259 -#: remote.c:1026

6275 +#: remote.c:1113

6276 #, c-format

6277 msgid ""

6278 "The <src> part of the refspec is a commit object.\n"

@@ -6266,7 +6282,7 @@ msgstr ""

6282 "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

6283 "'%s:refs/heads/%s' 推送么？"

6284

6269 -#: remote.c:1031

6285 +#: remote.c:1118

6286 #, c-format

6287 msgid ""

6288 "The <src> part of the refspec is a tag object.\n"

@@ -6276,7 +6292,7 @@ msgstr ""

6292 "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

6293 "'%s:refs/tags/%s' 推送么？"

6294

6279 -#: remote.c:1036

6295 +#: remote.c:1123

6296 #, c-format

6297 msgid ""

6298 "The <src> part of the refspec is a tree object.\n"

@@ -6286,7 +6302,7 @@ msgstr ""

6302 "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

6303 "'%s:refs/tags/%s' 推送么？"

6304

6289 -#: remote.c:1041

6305 +#: remote.c:1128

6306 #, c-format

6307 msgid ""

6308 "The <src> part of the refspec is a blob object.\n"

@@ -6296,114 +6312,114 @@ msgstr ""

6312 "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

6313 "'%s:refs/tags/%s' 推送么？"

6314

6299 -#: remote.c:1077

6315 +#: remote.c:1164

6316 #, c-format

6317 msgid "%s cannot be resolved to branch"

6318 msgstr "%s 无法被解析为分支"

6319

6304 -#: remote.c:1088

6320 +#: remote.c:1175

6321 #, c-format

6322 msgid "unable to delete '%s': remote ref does not exist"

6323 msgstr "无法删除 '%s'：远程引用不存在"

6324

6309 -#: remote.c:1100

6325 +#: remote.c:1187

6326 #, c-format

6327 msgid "dst refspec %s matches more than one"

6328 msgstr "目标引用表达式 %s 匹配超过一个"

6329

6314 -#: remote.c:1107

6330 +#: remote.c:1194

6331 #, c-format

6332 msgid "dst ref %s receives from more than one src"

6333 msgstr "目标引用 %s 接收超过一个源"

6334

6319 -#: remote.c:1610 remote.c:1711

6335 +#: remote.c:1703 remote.c:1804

6336 msgid "HEAD does not point to a branch"

6337 msgstr "HEAD 没有指向一个分支"

6338

6323 -#: remote.c:1619

6339 +#: remote.c:1712

6340 #, c-format

6341 msgid "no such branch: '%s'"

6342 msgstr "没有此分支：'%s'"

6343

6328 -#: remote.c:1622

6344 +#: remote.c:1715

6345 #, c-format

6346 msgid "no upstream configured for branch '%s'"

6347 msgstr "尚未给分支 '%s' 设置上游"

6348

6333 -#: remote.c:1628

6349 +#: remote.c:1721

6350 #, c-format

6351 msgid "upstream branch '%s' not stored as a remote-tracking branch"

6352 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

6353

6338 -#: remote.c:1643

6354 +#: remote.c:1736

6355 #, c-format

6356 msgid "push destination '%s' on remote '%s' has no local tracking branch"

6357 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

6358

6343 -#: remote.c:1655

6359 +#: remote.c:1748

6360 #, c-format

6361 msgid "branch '%s' has no remote for pushing"

6362 msgstr "分支 '%s' 没有设置要推送的远程服务器"

6363

6348 -#: remote.c:1665

6364 +#: remote.c:1758

6365 #, c-format

6366 msgid "push refspecs for '%s' do not include '%s'"

6367 msgstr "向 '%s' 推送引用规格未包含 '%s'"

6368

6353 -#: remote.c:1678

6369 +#: remote.c:1771

6370 msgid "push has no destination (push.default is 'nothing')"

6371 msgstr "推送无目标（push.default 是 'nothing'）"

6372

6357 -#: remote.c:1700

6373 +#: remote.c:1793

6374 msgid "cannot resolve 'simple' push to a single destination"

6375 msgstr "无法解析 'simple' 推送至一个单独的目标"

6376

6361 -#: remote.c:1826

6377 +#: remote.c:1922

6378 #, c-format

6379 msgid "couldn't find remote ref %s"

6380 msgstr "无法找到远程引用 %s"

6381

6366 -#: remote.c:1839

6382 +#: remote.c:1935

6383 #, c-format

6384 msgid "* Ignoring funny ref '%s' locally"

6385 msgstr "* 在本地忽略可笑的引用 '%s'"

6386

6371 -#: remote.c:2002

6387 +#: remote.c:2098

6388 #, c-format

6389 msgid "Your branch is based on '%s', but the upstream is gone.\n"

6390 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

6391

6376 -#: remote.c:2006

6392 +#: remote.c:2102

6393 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

6394 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

6395

6380 -#: remote.c:2009

6396 +#: remote.c:2105

6397 #, c-format

6398 msgid "Your branch is up to date with '%s'.\n"

6399 msgstr "您的分支与上游分支 '%s' 一致。\n"

6400

6385 -#: remote.c:2013

6401 +#: remote.c:2109

6402 #, c-format

6403 msgid "Your branch and '%s' refer to different commits.\n"

6404 msgstr "您的分支和 '%s' 指向不同的提交。\n"

6405

6390 -#: remote.c:2016

6406 +#: remote.c:2112

6407 #, c-format

6408 msgid " (use \"%s\" for details)\n"

6409 msgstr " （使用 \"%s\" 查看详情）\n"

6410

6395 -#: remote.c:2020

6411 +#: remote.c:2116

6412 #, c-format

6413 msgid "Your branch is ahead of '%s' by %d commit.\n"

6414 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

6415 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

6416 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

6417

6402 -#: remote.c:2026

6418 +#: remote.c:2122

6419 msgid " (use \"git push\" to publish your local commits)\n"

6420 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

6421

6406 -#: remote.c:2029

6422 +#: remote.c:2125

6423 #, c-format

6424 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

6425 msgid_plural ""

@@ -6412,11 +6428,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6428 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

6429

6430 # 译者：注意保持前导空格

6415 -#: remote.c:2037

6431 +#: remote.c:2133

6432 msgid " (use \"git pull\" to update your local branch)\n"

6433 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

6434

6419 -#: remote.c:2040

6435 +#: remote.c:2136

6436 #, c-format

6437 msgid ""

6438 "Your branch and '%s' have diverged,\n"

@@ -6432,11 +6448,11 @@ msgstr[1] ""

6448 "并且分别有 %d 和 %d 处不同的提交。\n"

6449

6450 # 译者：注意保持前导空格

6435 -#: remote.c:2050

6451 +#: remote.c:2146

6452 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

6453 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

6454

6439 -#: remote.c:2241

6455 +#: remote.c:2337

6456 #, c-format

6457 msgid "cannot parse expected object name '%s'"

6458 msgstr "无法解析期望的对象名 '%s'"

@@ -6456,11 +6472,6 @@ msgstr "重复的替换引用：%s"

6472 msgid "replace depth too high for object %s"

6473 msgstr "对象 %s 的替换层级太深"

6474

6459 -#: repository.c:94 builtin/init-db.c:188

6460 -#, c-format

6461 -msgid "The hash algorithm %s is not supported in this build."

6462 -msgstr "这个版本不支持 %s 哈希算法。"

6463 -

6475 #: rerere.c:217 rerere.c:226 rerere.c:229

6476 msgid "corrupt MERGE_RR"

6477 msgstr "损坏的 MERGE_RR"

@@ -6519,8 +6530,8 @@ msgstr "不能删除 stray '%s'"

6530 msgid "Recorded preimage for '%s'"

6531 msgstr "为 '%s' 记录 preimage"

6532

6522 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6523 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6533 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6534 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6535 #, c-format

6536 msgid "could not create directory '%s'"

6537 msgstr "不能创建目录 '%s'"

@@ -6558,25 +6569,30 @@ msgstr "不能打开 rr-cache 目录"

6569 msgid "could not determine HEAD revision"

6570 msgstr "不能确定 HEAD 版本"

6571

6561 -#: reset.c:70 reset.c:76 sequencer.c:3318

6572 +#: reset.c:70 reset.c:76 sequencer.c:3426

6573 #, c-format

6574 msgid "failed to find tree of %s"

6575 msgstr "无法找到 %s 指向的树。"

6576

6566 -#: revision.c:2661

6577 +#: revision.c:2344

6578 +msgid "--unpacked=<packfile> no longer supported"

6579 +msgstr "不再支持 --unpacked=<packfile>"

6580 +

6581 +#: revision.c:2364

6582 +#, c-format

6583 +msgid "unknown value for --diff-merges: %s"

6584 +msgstr "未知的 --diff-merges 取值：%s"

6585 +

6586 +#: revision.c:2702

6587 msgid "your current branch appears to be broken"

6588 msgstr "您的当前分支好像被损坏"

6589

6570 -#: revision.c:2664

6590 +#: revision.c:2705

6591 #, c-format

6592 msgid "your current branch '%s' does not have any commits yet"

6593 msgstr "您的当前分支 '%s' 尚无任何提交"

6594

6575 -#: revision.c:2873

6576 -msgid "--first-parent is incompatible with --bisect"

6577 -msgstr "--first-parent 与 --bisect 不兼容"

6578 -

6579 -#: revision.c:2877

6595 +#: revision.c:2915

6596 msgid "-L does not yet support diff formats besides -p and -s"

6597 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

6598

@@ -6584,12 +6600,12 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"

6600 msgid "open /dev/null failed"

6601 msgstr "不能打开 /dev/null"

6602

6587 -#: run-command.c:1269

6603 +#: run-command.c:1270

6604 #, c-format

6605 msgid "cannot create async thread: %s"

6606 msgstr "不能创建 async 线程：%s"

6607

6592 -#: run-command.c:1333

6608 +#: run-command.c:1334

6609 #, c-format

6610 msgid ""

6611 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6612,65 +6628,65 @@ msgstr "不能解析远程解包状态：%s"

6628 msgid "remote unpack failed: %s"

6629 msgstr "远程解包失败：%s"

6630

6615 -#: send-pack.c:308

6631 +#: send-pack.c:372

6632 msgid "failed to sign the push certificate"

6633 msgstr "为推送证书签名失败"

6634

6619 -#: send-pack.c:394

6635 +#: send-pack.c:460

6636 msgid "the receiving end does not support this repository's hash algorithm"

6637 msgstr "接收端不支持这个仓库的哈希算法"

6638

6623 -#: send-pack.c:403

6639 +#: send-pack.c:469

6640 msgid "the receiving end does not support --signed push"

6641 msgstr "接收端不支持签名推送"

6642

6627 -#: send-pack.c:405

6643 +#: send-pack.c:471

6644 msgid ""

6645 "not sending a push certificate since the receiving end does not support --"

6646 "signed push"

6647 msgstr "未发送推送证书，因为接收端不支持签名推送"

6648

6633 -#: send-pack.c:417

6649 +#: send-pack.c:483

6650 msgid "the receiving end does not support --atomic push"

6651 msgstr "接收端不支持原子推送"

6652

6637 -#: send-pack.c:422

6653 +#: send-pack.c:488

6654 msgid "the receiving end does not support push options"

6655 msgstr "接收端不支持推送选项"

6656

6641 -#: sequencer.c:192

6657 +#: sequencer.c:194

6658 #, c-format

6659 msgid "invalid commit message cleanup mode '%s'"

6660 msgstr "无效的提交信息清理模式 '%s'"

6661

6646 -#: sequencer.c:297

6662 +#: sequencer.c:308

6663 #, c-format

6664 msgid "could not delete '%s'"

6665 msgstr "无法删除 '%s'"

6666

6651 -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6667 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6668 #, c-format

6669 msgid "could not remove '%s'"

6670 msgstr "无法删除 '%s'"

6671

6656 -#: sequencer.c:326

6672 +#: sequencer.c:339

6673 msgid "revert"

6674 msgstr "还原"

6675

6660 -#: sequencer.c:328

6676 +#: sequencer.c:341

6677 msgid "cherry-pick"

6678 msgstr "拣选"

6679

6664 -#: sequencer.c:330

6680 +#: sequencer.c:343

6681 msgid "rebase"

6682 msgstr "变基"

6683

6668 -#: sequencer.c:332

6684 +#: sequencer.c:345

6685 #, c-format

6686 msgid "unknown action: %d"

6687 msgstr "未知动作：%d"

6688

6673 -#: sequencer.c:390

6689 +#: sequencer.c:404

6690 msgid ""

6691 "after resolving the conflicts, mark the corrected paths\n"

6692 "with 'git add <paths>' or 'git rm <paths>'"

@@ -6678,7 +6694,7 @@ msgstr ""

6694 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

6695 "命令标记修正后的文件"

6696

6681 -#: sequencer.c:393

6697 +#: sequencer.c:407

6698 msgid ""

6699 "after resolving the conflicts, mark the corrected paths\n"

6700 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -6687,43 +6703,43 @@ msgstr ""

6703 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

6704 "对修正后的文件做标记，然后用 'git commit' 提交"

6705

6690 -#: sequencer.c:406 sequencer.c:2921

6706 +#: sequencer.c:420 sequencer.c:3028

6707 #, c-format

6708 msgid "could not lock '%s'"

6709 msgstr "不能锁定 '%s'"

6710

6695 -#: sequencer.c:413

6711 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6712 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6713 +#, c-format

6714 +msgid "could not write to '%s'"

6715 +msgstr "不能写入 '%s'"

6716 +

6717 +#: sequencer.c:427

6718 #, c-format

6719 msgid "could not write eol to '%s'"

6720 msgstr "不能将换行符写入 '%s'"

6721

6700 -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6701 -#: sequencer.c:3203

6722 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6723 +#: sequencer.c:3311

6724 #, c-format

6725 msgid "failed to finalize '%s'"

6726 msgstr "无法完成 '%s'"

6727

6706 -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6707 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6708 -#, c-format

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

6710 -msgstr "不能读取 '%s'"

6711 -

6712 -#: sequencer.c:457

6728 +#: sequencer.c:471

6729 #, c-format

6730 msgid "your local changes would be overwritten by %s."

6731 msgstr "您的本地修改将被%s覆盖。"

6732

6717 -#: sequencer.c:461

6733 +#: sequencer.c:475

6734 msgid "commit your changes or stash them to proceed."

6735 msgstr "提交您的修改或贮藏后再继续。"

6736

6721 -#: sequencer.c:493

6737 +#: sequencer.c:507

6738 #, c-format

6739 msgid "%s: fast-forward"

6740 msgstr "%s：快进"

6741

6726 -#: sequencer.c:532 builtin/tag.c:566

6742 +#: sequencer.c:546 builtin/tag.c:566

6743 #, c-format

6744 msgid "Invalid cleanup mode %s"

6745 msgstr "无效的清理模式 %s"

@@ -6731,65 +6747,65 @@ msgstr "无效的清理模式 %s"

6747 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6748 #. "rebase".

6749 #.

6734 -#: sequencer.c:626

6750 +#: sequencer.c:640

6751 #, c-format

6752 msgid "%s: Unable to write new index file"

6753 msgstr "%s：无法写入新索引文件"

6754

6739 -#: sequencer.c:643

6755 +#: sequencer.c:657

6756 msgid "unable to update cache tree"

6757 msgstr "不能更新缓存树"

6758

6743 -#: sequencer.c:657

6759 +#: sequencer.c:671

6760 msgid "could not resolve HEAD commit"

6761 msgstr "不能解析 HEAD 提交"

6762

6747 -#: sequencer.c:737

6763 +#: sequencer.c:751

6764 #, c-format

6765 msgid "no key present in '%.*s'"

6766 msgstr "在 '%.*s' 中没有 key"

6767

6752 -#: sequencer.c:748

6768 +#: sequencer.c:762

6769 #, c-format

6770 msgid "unable to dequote value of '%s'"

6771 msgstr "无法为 '%s' 的值去引号"

6772

6757 -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6758 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6773 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

6774 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902

6775 #, c-format

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

6777 msgstr "无法打开 '%s' 进行读取"

6778

6763 -#: sequencer.c:795

6779 +#: sequencer.c:809

6780 msgid "'GIT_AUTHOR_NAME' already given"

6781 msgstr "已经给出 'GIT_AUTHOR_NAME'"

6782

6767 -#: sequencer.c:800

6783 +#: sequencer.c:814

6784 msgid "'GIT_AUTHOR_EMAIL' already given"

6785 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

6786

6771 -#: sequencer.c:805

l10n: zh_CN: for git v2.29.0 l10n round 1 and 2