4c27fcb576 · matheusbsbs/matheus-bagliano

@@ -138,8 +138,8 @@ msgid ""

138 msgstr ""

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

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

141 -"POT-Creation-Date: 2018-09-04 08:50+0800\n"

142 -"PO-Revision-Date: 2018-09-09 21:07+0800\n"

141 +"POT-Creation-Date: 2018-12-02 10:55+0800\n"

142 +"PO-Revision-Date: 2018-12-03 18:08+0800\n"

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

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

145 "Language: zh_CN\n"

@@ -148,37 +148,37 @@ msgstr ""

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

149 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

150

151 -#: advice.c:97

151 +#: advice.c:99

152 #, c-format

153 msgid "%shint: %.*s%s\n"

154 msgstr "%s提示：%.*s%s\n"

155

156 -#: advice.c:150

156 +#: advice.c:152

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

158 msgstr "无法拣选，因为您有未合并的文件。"

159

160 -#: advice.c:152

160 +#: advice.c:154

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

162 msgstr "无法提交，因为您有未合并的文件。"

163

164 -#: advice.c:154

164 +#: advice.c:156

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

166 msgstr "无法合并，因为您有未合并的文件。"

167

168 -#: advice.c:156

168 +#: advice.c:158

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

170 msgstr "无法拉取，因为您有未合并的文件。"

171

172 -#: advice.c:158

172 +#: advice.c:160

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

174 msgstr "无法回退，因为您有未合并的文件。"

175

176 -#: advice.c:160

176 +#: advice.c:162

177 #, c-format

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

179 msgstr "无法 %s，因为您有未合并的文件。"

180

181 -#: advice.c:168

181 +#: advice.c:170

182 msgid ""

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

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

@@ -186,23 +186,23 @@ msgstr ""

186 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

187 "解决方案并提交。"

188

189 -#: advice.c:176

189 +#: advice.c:178

190 msgid "Exiting because of an unresolved conflict."

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

192

193 -#: advice.c:181 builtin/merge.c:1286

193 +#: advice.c:183 builtin/merge.c:1289

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

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

196

197 -#: advice.c:183

197 +#: advice.c:185

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

199 msgstr "请在合并前先提交您的修改。"

200

201 -#: advice.c:184

201 +#: advice.c:186

202 msgid "Exiting because of unfinished merge."

203 msgstr "因为存在未完成的合并而退出。"

204

205 -#: advice.c:190

205 +#: advice.c:192

206 #, c-format

207 msgid ""

208 "Note: checking out '%s'.\n"

@@ -299,22 +299,22 @@ msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

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

300 msgstr "第 %d 行包含无效文件模式：%s"

301

302 -#: apply.c:1306

302 +#: apply.c:1307

303 #, c-format

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

305 msgstr "不一致的文件头，%d 行和 %d 行"

306

307 -#: apply.c:1478

307 +#: apply.c:1479

308 #, c-format

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

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

311

312 -#: apply.c:1547

312 +#: apply.c:1548

313 #, c-format

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

315 msgstr "第 %d 行的补丁片段没有头信息：%.*s"

316

317 -#: apply.c:1567

317 +#: apply.c:1568

318 #, c-format

319 msgid ""

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

@@ -325,82 +325,82 @@ msgid_plural ""

325 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

326 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

327

328 -#: apply.c:1580

328 +#: apply.c:1581

329 #, c-format

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

331 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

332

333 -#: apply.c:1768

333 +#: apply.c:1769

334 msgid "new file depends on old contents"

335 msgstr "新文件依赖旧内容"

336

337 -#: apply.c:1770

337 +#: apply.c:1771

338 msgid "deleted file still has contents"

339 msgstr "删除的文件仍有内容"

340

341 -#: apply.c:1804

341 +#: apply.c:1805

342 #, c-format

343 msgid "corrupt patch at line %d"

344 msgstr "补丁在第 %d 行损坏"

345

346 -#: apply.c:1841

346 +#: apply.c:1842

347 #, c-format

348 msgid "new file %s depends on old contents"

349 msgstr "新文件 %s 依赖旧内容"

350

351 -#: apply.c:1843

351 +#: apply.c:1844

352 #, c-format

353 msgid "deleted file %s still has contents"

354 msgstr "删除的文件 %s 仍有内容"

355

356 -#: apply.c:1846

356 +#: apply.c:1847

357 #, c-format

358 msgid "** warning: file %s becomes empty but is not deleted"

359 msgstr "** 警告：文件 %s 成为空文件但并未删除"

360

361 -#: apply.c:1993

361 +#: apply.c:1994

362 #, c-format

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

364 msgstr "二进制补丁在第 %d 行损坏：%.*s"

365

366 -#: apply.c:2030

366 +#: apply.c:2031

367 #, c-format

368 msgid "unrecognized binary patch at line %d"

369 msgstr "未能识别的二进制补丁位于第 %d 行"

370

371 -#: apply.c:2190

371 +#: apply.c:2193

372 #, c-format

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

374 msgstr "补丁文件的第 %d 行只有垃圾数据"

375

376 -#: apply.c:2276

376 +#: apply.c:2279

377 #, c-format

378 msgid "unable to read symlink %s"

379 msgstr "无法读取符号链接 %s"

380

381 -#: apply.c:2280

381 +#: apply.c:2283

382 #, c-format

383 msgid "unable to open or read %s"

384 msgstr "不能打开或读取 %s"

385

386 -#: apply.c:2939

386 +#: apply.c:2942

387 #, c-format

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

389 msgstr "无效的行首字符：'%c'"

390

391 -#: apply.c:3060

391 +#: apply.c:3063

392 #, c-format

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

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

395 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

396 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

397

398 -#: apply.c:3072

398 +#: apply.c:3075

399 #, c-format

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

401 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

402

403 -#: apply.c:3078

403 +#: apply.c:3081

404 #, c-format

405 msgid ""

406 "while searching for:\n"

@@ -409,444 +409,445 @@ msgstr ""

409 "当查询：\n"

410 "%.*s"

411

412 -#: apply.c:3100

412 +#: apply.c:3103

413 #, c-format

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

415 msgstr "缺失 '%s' 的二进制补丁数据"

416

417 -#: apply.c:3108

417 +#: apply.c:3111

418 #, c-format

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

420 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

421

422 -#: apply.c:3154

422 +#: apply.c:3158

423 #, c-format

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

425 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

426

427 -#: apply.c:3164

427 +#: apply.c:3168

428 #, c-format

429 msgid ""

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

431 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

432

433 -#: apply.c:3172

433 +#: apply.c:3176

434 #, c-format

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

436 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

437

438 -#: apply.c:3190

438 +#: apply.c:3194

439 #, c-format

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

441 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"

442

443 -#: apply.c:3203

443 +#: apply.c:3207

444 #, c-format

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

446 msgstr "二进制补丁未应用到 '%s'"

447

448 -#: apply.c:3209

448 +#: apply.c:3213

449 #, c-format

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

451 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

452

453 -#: apply.c:3230

453 +#: apply.c:3234

454 #, c-format

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

456 msgstr "打补丁失败：%s:%ld"

457

458 -#: apply.c:3352

458 +#: apply.c:3356

459 #, c-format

460 msgid "cannot checkout %s"

461 msgstr "不能检出 %s"

462

463 -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

463 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

464 #, c-format

465 msgid "failed to read %s"

466 msgstr "无法读取 %s"

467

468 -#: apply.c:3412

468 +#: apply.c:3416

469 #, c-format

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

471 msgstr "读取位于符号链接中的 '%s'"

472

473 -#: apply.c:3441 apply.c:3681

473 +#: apply.c:3445 apply.c:3688

474 #, c-format

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

476 msgstr "路径 %s 已经被重命名/删除"

477

478 -#: apply.c:3524 apply.c:3696

478 +#: apply.c:3531 apply.c:3703

479 #, c-format

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

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

482

483 -#: apply.c:3533 apply.c:3704

483 +#: apply.c:3540 apply.c:3711

484 #, c-format

485 msgid "%s: does not match index"

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

487

488 -#: apply.c:3568

488 +#: apply.c:3575

489 msgid "repository lacks the necessary blob to fall back on 3-way merge."

490 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

491

492 -#: apply.c:3571

492 +#: apply.c:3578

493 #, c-format

494 msgid "Falling back to three-way merge...\n"

495 msgstr "回落到三方合并...\n"

496

497 -#: apply.c:3587 apply.c:3591

497 +#: apply.c:3594 apply.c:3598

498 #, c-format

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

500 msgstr "无法读取 '%s' 的当前内容"

501

502 -#: apply.c:3603

502 +#: apply.c:3610

503 #, c-format

504 msgid "Failed to fall back on three-way merge...\n"

505 msgstr "无法回落到三方合并...\n"

506

507 -#: apply.c:3617

507 +#: apply.c:3624

508 #, c-format

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

510 msgstr "应用补丁到 '%s' 存在冲突。\n"

511

512 -#: apply.c:3622

512 +#: apply.c:3629

513 #, c-format

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

515 msgstr "成功应用补丁到 '%s'。\n"

516

517 -#: apply.c:3648

517 +#: apply.c:3655

518 msgid "removal patch leaves file contents"

519 msgstr "移除补丁仍留下了文件内容"

520

521 -#: apply.c:3721

521 +#: apply.c:3728

522 #, c-format

523 msgid "%s: wrong type"

524 msgstr "%s：错误类型"

525

526 -#: apply.c:3723

526 +#: apply.c:3730

527 #, c-format

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

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

530

531 -#: apply.c:3874 apply.c:3876

531 +#: apply.c:3881 apply.c:3883

532 #, c-format

533 msgid "invalid path '%s'"

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

535

536 -#: apply.c:3932

536 +#: apply.c:3939

537 #, c-format

538 msgid "%s: already exists in index"

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

540

541 -#: apply.c:3935

541 +#: apply.c:3942

542 #, c-format

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

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

545

546 -#: apply.c:3955

546 +#: apply.c:3962

547 #, c-format

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

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

550

551 -#: apply.c:3960

551 +#: apply.c:3967

552 #, c-format

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

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

555

556 -#: apply.c:3980

556 +#: apply.c:3987

557 #, c-format

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

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

560

561 -#: apply.c:3984

561 +#: apply.c:3991

562 #, c-format

563 msgid "%s: patch does not apply"

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

565

566 -#: apply.c:3999

566 +#: apply.c:4006

567 #, c-format

568 msgid "Checking patch %s..."

569 msgstr "检查补丁 %s..."

570

571 -#: apply.c:4091

571 +#: apply.c:4098

572 #, c-format

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

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

575

576 -#: apply.c:4098

576 +#: apply.c:4105

577 #, c-format

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

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

580

581 -#: apply.c:4101

581 +#: apply.c:4108

582 #, c-format

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

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

585

586 -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

586 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

587 #, c-format

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

589 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

590

591 -#: apply.c:4110

591 +#: apply.c:4117

592 #, c-format

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

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

595

596 -#: apply.c:4120

596 +#: apply.c:4127

597 #, c-format

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

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

600

601 -#: apply.c:4258

601 +#: apply.c:4265

602 #, c-format

603 msgid "unable to remove %s from index"

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

605

606 -#: apply.c:4292

606 +#: apply.c:4299

607 #, c-format

608 msgid "corrupt patch for submodule %s"

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

610

611 -#: apply.c:4298

611 +#: apply.c:4305

612 #, c-format

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

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

615

616 -#: apply.c:4306

616 +#: apply.c:4313

617 #, c-format

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

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

620

621 -#: apply.c:4312 apply.c:4457

621 +#: apply.c:4319 apply.c:4464

622 #, c-format

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

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

625

626 -#: apply.c:4355

626 +#: apply.c:4362

627 #, c-format

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

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

630

631 -#: apply.c:4359

631 +#: apply.c:4366

632 #, c-format

633 msgid "closing file '%s'"

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

635

636 -#: apply.c:4429

636 +#: apply.c:4436

637 #, c-format

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

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

640

641 -#: apply.c:4527

641 +#: apply.c:4534

642 #, c-format

643 msgid "Applied patch %s cleanly."

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

645

646 -#: apply.c:4535

646 +#: apply.c:4542

647 msgid "internal error"

648 msgstr "内部错误"

649

650 -#: apply.c:4538

650 +#: apply.c:4545

651 #, c-format

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

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

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

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

656

657 -#: apply.c:4549

657 +#: apply.c:4556

658 #, c-format

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

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

661

662 -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

662 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

663 #, c-format

664 msgid "cannot open %s"

665 msgstr "不能打开 %s"

666

667 -#: apply.c:4571

667 +#: apply.c:4578

668 #, c-format

669 msgid "Hunk #%d applied cleanly."

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

671

672 -#: apply.c:4575

672 +#: apply.c:4582

673 #, c-format

674 msgid "Rejected hunk #%d."

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

676

677 -#: apply.c:4685

677 +#: apply.c:4692

678 #, c-format

679 msgid "Skipped patch '%s'."

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

681

682 -#: apply.c:4693

682 +#: apply.c:4700

683 msgid "unrecognized input"

684 msgstr "未能识别的输入"

685

686 -#: apply.c:4712

686 +#: apply.c:4719

687 msgid "unable to read index file"

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

689

690 -#: apply.c:4849

690 +#: apply.c:4874

691 #, c-format

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

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

694

695 -#: apply.c:4876

695 +#: apply.c:4901

696 #, c-format

697 msgid "squelched %d whitespace error"

698 msgid_plural "squelched %d whitespace errors"

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

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

701

702 -#: apply.c:4882 apply.c:4897

702 +#: apply.c:4907 apply.c:4922

703 #, c-format

704 msgid "%d line adds whitespace errors."

705 msgid_plural "%d lines add whitespace errors."

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

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

708

709 -#: apply.c:4890

709 +#: apply.c:4915

710 #, c-format

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

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

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

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

715

716 -#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

716 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

717 msgid "Unable to write new index file"

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

719

720 -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

721 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

722 -#: builtin/pull.c:198 builtin/submodule--helper.c:406

723 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

724 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

725 -#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

720 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

721 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

722 +#: builtin/pull.c:199 builtin/submodule--helper.c:406

723 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

724 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

725 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

726 msgid "path"

727 msgstr "路径"

728

729 -#: apply.c:4934

729 +#: apply.c:4959

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

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

732

733 -#: apply.c:4937

733 +#: apply.c:4962

734 msgid "apply changes matching the given path"

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

736

737 -#: apply.c:4939 builtin/am.c:2263

737 +#: apply.c:4964 builtin/am.c:2218

738 msgid "num"

739 msgstr "数字"

740

741 -#: apply.c:4940

741 +#: apply.c:4965

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

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

744

745 -#: apply.c:4943

745 +#: apply.c:4968

746 msgid "ignore additions made by the patch"

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

748

749 -#: apply.c:4945

749 +#: apply.c:4970

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

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

752

753 -#: apply.c:4949

753 +#: apply.c:4974

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

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

756

757 -#: apply.c:4951

757 +#: apply.c:4976

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

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

760

761 -#: apply.c:4953

761 +#: apply.c:4978

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

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

764

765 -#: apply.c:4955

765 +#: apply.c:4980

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

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

768

769 -#: apply.c:4957

769 +#: apply.c:4982

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

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

772

773 -#: apply.c:4959

773 +#: apply.c:4984

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

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

776

777 -#: apply.c:4961

777 +#: apply.c:4986

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

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

780

781 -#: apply.c:4964

781 +#: apply.c:4989

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

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

784

785 -#: apply.c:4966

785 +#: apply.c:4991

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

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

788

789 -#: apply.c:4968

789 +#: apply.c:4993

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

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

792

793 -#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

793 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

794 msgid "paths are separated with NUL character"

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

796

797 -#: apply.c:4973

797 +#: apply.c:4998

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

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

800

801 -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

802 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

803 -#: builtin/pack-objects.c:3202

801 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

802 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

803 +#: builtin/pack-objects.c:3312 builtin/rebase.c:857

804 msgid "action"

805 msgstr "动作"

806

807 -#: apply.c:4975

807 +#: apply.c:5000

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

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

810

811 -#: apply.c:4978 apply.c:4981

811 +#: apply.c:5003 apply.c:5006

812 msgid "ignore changes in whitespace when finding context"

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

814

815 -#: apply.c:4984

815 +#: apply.c:5009

816 msgid "apply the patch in reverse"

817 msgstr "反向应用补丁"

818

819 -#: apply.c:4986

819 +#: apply.c:5011

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

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

822

823 -#: apply.c:4988

823 +#: apply.c:5013

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

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

826

827 -#: apply.c:4990

827 +#: apply.c:5015

828 msgid "allow overlapping hunks"

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

830

831 -#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

832 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

833 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

831 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

832 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

833 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

834 +#: builtin/rebase--interactive.c:157

835 msgid "be verbose"

836 msgstr "冗长输出"

837

837 -#: apply.c:4993

838 +#: apply.c:5018

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

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

841

841 -#: apply.c:4996

842 +#: apply.c:5021

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

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

845

845 -#: apply.c:4998 builtin/am.c:2251

846 +#: apply.c:5023 builtin/am.c:2206

847 msgid "root"

848 msgstr "根目录"

849

849 -#: apply.c:4999

850 +#: apply.c:5024

851 msgid "prepend <root> to all filenames"

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

853

@@ -868,114 +869,114 @@ msgstr ""

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

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

871

871 -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

872 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

873 #, c-format

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

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

876

876 -#: archive.c:446

877 +#: archive.c:453

878 msgid "fmt"

879 msgstr "格式"

880

880 -#: archive.c:446

881 +#: archive.c:453

882 msgid "archive format"

883 msgstr "归档格式"

884

884 -#: archive.c:447 builtin/log.c:1473

885 +#: archive.c:454 builtin/log.c:1536

886 msgid "prefix"

887 msgstr "前缀"

888

888 -#: archive.c:448

889 +#: archive.c:455

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

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

892

892 -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

893 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

894 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

895 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

896 -#: parse-options.h:165

893 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

894 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

895 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

896 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

897 +#: parse-options.h:162

898 msgid "file"

899 msgstr "文件"

900

900 -#: archive.c:450 builtin/archive.c:89

901 +#: archive.c:457 builtin/archive.c:89

902 msgid "write the archive to this file"

903 msgstr "归档写入此文件"

904

904 -#: archive.c:452

905 +#: archive.c:459

906 msgid "read .gitattributes in working directory"

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

908

908 -#: archive.c:453

909 +#: archive.c:460

910 msgid "report archived files on stderr"

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

912

912 -#: archive.c:454

913 +#: archive.c:461

914 msgid "store only"

915 msgstr "只存储"

916

916 -#: archive.c:455

917 +#: archive.c:462

918 msgid "compress faster"

919 msgstr "压缩速度更快"

920

920 -#: archive.c:463

921 +#: archive.c:470

922 msgid "compress better"

923 msgstr "压缩效果更好"

924

924 -#: archive.c:466

925 +#: archive.c:473

926 msgid "list supported archive formats"

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

928

928 -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

929 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

929 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

930 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

931 msgid "repo"

932 msgstr "仓库"

933

933 -#: archive.c:469 builtin/archive.c:91

934 +#: archive.c:476 builtin/archive.c:91

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

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

937

937 -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

938 -#: builtin/notes.c:491

938 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

939 +#: builtin/notes.c:496

940 msgid "command"

941 msgstr "命令"

942

942 -#: archive.c:471 builtin/archive.c:93

943 +#: archive.c:478 builtin/archive.c:93

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

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

946

946 -#: archive.c:478

947 +#: archive.c:485

948 msgid "Unexpected option --remote"

949 msgstr "未知参数 --remote"

950

950 -#: archive.c:480

951 +#: archive.c:487

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

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

954

954 -#: archive.c:482

955 +#: archive.c:489

956 msgid "Unexpected option --output"

957 msgstr "未知参数 --output"

958

958 -#: archive.c:504

959 +#: archive.c:511

960 #, c-format

961 msgid "Unknown archive format '%s'"

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

963

963 -#: archive.c:511

964 +#: archive.c:518

965 #, c-format

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

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

968

968 -#: archive-tar.c:125 archive-zip.c:344

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

970 #, c-format

971 msgid "cannot stream blob %s"

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

973

973 -#: archive-tar.c:260 archive-zip.c:361

974 +#: archive-tar.c:260 archive-zip.c:363

975 #, c-format

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

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

978

978 -#: archive-tar.c:287 archive-zip.c:352

979 +#: archive-tar.c:287 archive-zip.c:353

980 #, c-format

981 msgid "cannot read %s"

982 msgstr "不能读取 %s"

@@ -994,32 +995,32 @@ msgstr "无法重定向描述符"

995 msgid "'%s' filter reported error"

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

997

997 -#: archive-zip.c:313

998 +#: archive-zip.c:314

999 #, c-format

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

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

1002

1002 -#: archive-zip.c:317

1003 +#: archive-zip.c:318

1004 #, c-format

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

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

1007

1007 -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

1008 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

1009 #, c-format

1010 msgid "deflate error (%d)"

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

1012

1012 -#: archive-zip.c:605

1013 +#: archive-zip.c:609

1014 #, c-format

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

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

1017

1017 -#: attr.c:218

1018 +#: attr.c:212

1019 #, c-format

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

1021 msgstr "%.*s 不是一个有效的属性名"

1022

1022 -#: attr.c:415

1023 +#: attr.c:409

1024 msgid ""

1025 "Negative patterns are ignored in git attributes\n"

1026 "Use '\\!' for literal leading exclamation."

@@ -1027,22 +1028,22 @@ msgstr ""

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

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

1030

1030 -#: bisect.c:467

1031 +#: bisect.c:468

1032 #, c-format

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

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

1035

1035 -#: bisect.c:675

1036 +#: bisect.c:676

1037 #, c-format

1038 msgid "We cannot bisect more!\n"

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

1040

1040 -#: bisect.c:729

1041 +#: bisect.c:730

1042 #, c-format

1043 msgid "Not a valid commit name %s"

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

1045

1045 -#: bisect.c:753

1046 +#: bisect.c:754

1047 #, c-format

1048 msgid ""

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

@@ -1051,7 +1052,7 @@ msgstr ""

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

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

1054

1054 -#: bisect.c:758

1055 +#: bisect.c:759

1056 #, c-format

1057 msgid ""

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

@@ -1060,7 +1061,7 @@ msgstr ""

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

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

1063

1063 -#: bisect.c:763

1064 +#: bisect.c:764

1065 #, c-format

1066 msgid ""

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

@@ -1069,7 +1070,7 @@ msgstr ""

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

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

1072

1072 -#: bisect.c:771

1073 +#: bisect.c:772

1074 #, c-format

1075 msgid ""

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

@@ -1080,7 +1081,7 @@ msgstr ""

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

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

1083

1083 -#: bisect.c:784

1084 +#: bisect.c:785

1085 #, c-format

1086 msgid ""

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

@@ -1091,36 +1092,36 @@ msgstr ""

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

1093 "我们仍旧继续。"

1094

1094 -#: bisect.c:817

1095 +#: bisect.c:818

1096 #, c-format

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

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

1099

1099 -#: bisect.c:857

1100 +#: bisect.c:858

1101 #, c-format

1102 msgid "a %s revision is needed"

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

1104

1104 -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

1105 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1106 #, c-format

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

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

1109

1109 -#: bisect.c:927 builtin/merge.c:137

1110 +#: bisect.c:928 builtin/merge.c:138

1111 #, c-format

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

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

1114

1114 -#: bisect.c:957

1115 +#: bisect.c:958

1116 msgid "reading bisect refs failed"

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

1118

1118 -#: bisect.c:976

1119 +#: bisect.c:977

1120 #, c-format

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

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

1123

1123 -#: bisect.c:984

1124 +#: bisect.c:985

1125 #, c-format

1126 msgid ""

1127 "No testable commit found.\n"

@@ -1129,7 +1130,7 @@ msgstr ""

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

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

1132

1132 -#: bisect.c:1003

1133 +#: bisect.c:1004

1134 #, c-format

1135 msgid "(roughly %d step)"

1136 msgid_plural "(roughly %d steps)"

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

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

1141 #. steps)" translation.

1142 #.

1142 -#: bisect.c:1009

1143 +#: bisect.c:1010

1144 #, c-format

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

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

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

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

1149

1149 -#: blame.c:1784

1150 +#: blame.c:1787

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

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

1153

1153 -#: blame.c:1798

1154 +#: blame.c:1801

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

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

1157

1157 -#: blame.c:1819

1158 +#: blame.c:1822

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

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

1161

1161 -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1162 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1163 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1164 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1162 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1163 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1164 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1165 +#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1166 #: builtin/shortlog.c:192

1167 msgid "revision walk setup failed"

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

1169

1169 -#: blame.c:1846

1170 +#: blame.c:1849

1171 msgid ""

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

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

1174

1174 -#: blame.c:1857

1175 +#: blame.c:1860

1176 #, c-format

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

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

1179

1179 -#: blame.c:1868

1180 +#: blame.c:1871

1181 #, c-format

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

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

@@ -1324,7 +1325,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

1327

1327 -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1328 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1329 +#: builtin/commit.c:774

1330 #, c-format

1331 msgid "could not open '%s'"

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

@@ -1351,38 +1353,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1355

1354 -#: bundle.c:260

1356 +#: bundle.c:267

1357 +msgid "unable to dup bundle descriptor"

1358 +msgstr "无法复制 bundle 描述符"

1359 +

1360 +#: bundle.c:274

1361 msgid "Could not spawn pack-objects"

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

1363

1358 -#: bundle.c:271

1364 +#: bundle.c:285

1365 msgid "pack-objects died"

1366 msgstr "pack-objects 终止"

1367

1362 -#: bundle.c:313

1368 +#: bundle.c:327

1369 msgid "rev-list died"

1370 msgstr "rev-list 终止"

1371

1366 -#: bundle.c:362

1372 +#: bundle.c:376

1373 #, c-format

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

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

1376

1371 -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1377 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1378 #, c-format

1379 msgid "unrecognized argument: %s"

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

1381

1376 -#: bundle.c:461

1382 +#: bundle.c:464

1383 msgid "Refusing to create empty bundle."

1384 msgstr "不能创建空包。"

1385

1380 -#: bundle.c:473

1386 +#: bundle.c:474

1387 #, c-format

1388 msgid "cannot create '%s'"

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

1390

1385 -#: bundle.c:501

1391 +#: bundle.c:498

1392 msgid "index-pack died"

1393 msgstr "index-pack 终止"

1394

@@ -1391,19 +1397,19 @@ msgstr "index-pack 终止"

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

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

1399

1394 -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1395 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1400 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1401 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1402 #: builtin/replace.c:448

1403 #, c-format

1404 msgid "could not parse %s"

1405 msgstr "不能解析 %s"

1406

1401 -#: commit.c:50

1407 +#: commit.c:52

1408 #, c-format

1409 msgid "%s %s is not a commit!"

1410 msgstr "%s %s 不是一个提交！"

1411

1406 -#: commit.c:191

1412 +#: commit.c:193

1413 msgid ""

1414 "Support for <GIT_DIR>/info/grafts is deprecated\n"

1415 "and will be removed in a future Git version.\n"

@@ -1423,7 +1429,27 @@ msgstr ""

1429 "设置 \"git config advice.graftFileDeprecated false\"\n"

1430 "可关闭本消息"

1431

1426 -#: commit.c:1629

1432 +#: commit.c:1115

1433 +#, c-format

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

1435 +msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

1436 +

1437 +#: commit.c:1118

1438 +#, c-format

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

1440 +msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

1441 +

1442 +#: commit.c:1121

1443 +#, c-format

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

1445 +msgstr "提交 %s 没有 GPG 签名。"

1446 +

1447 +#: commit.c:1124

1448 +#, c-format

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

1450 +msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

1451 +

1452 +#: commit.c:1378

1453 msgid ""

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

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

@@ -1433,73 +1459,89 @@ msgstr ""

1459 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

1460 "设置为您项目所用的字符编码。\n"

1461

1436 -#: commit-graph.c:83

1462 +#: commit-graph.c:108

1463 #, c-format

1464 msgid "graph file %s is too small"

1465 msgstr "图形文件 %s 太小"

1466

1441 -#: commit-graph.c:90

1467 +#: commit-graph.c:115

1468 #, c-format

1469 msgid "graph signature %X does not match signature %X"

1470 msgstr "图形签名 %X 和签名 %X 不匹配"

1471

1446 -#: commit-graph.c:97

1472 +#: commit-graph.c:122

1473 #, c-format

1474 msgid "graph version %X does not match version %X"

1475 msgstr "图形版本 %X 和版本 %X 不匹配"

1476

1451 -#: commit-graph.c:104

1477 +#: commit-graph.c:129

1478 #, c-format

1479 msgid "hash version %X does not match version %X"

1480 msgstr "散列版本 %X 和版本 %X 不匹配"

1481

1456 -#: commit-graph.c:128

1482 +#: commit-graph.c:153

1483 #, c-format

1484 msgid "improper chunk offset %08x%08x"

1485 msgstr "不正确的块偏移 %08x%08x"

1486

1461 -#: commit-graph.c:164

1487 +#: commit-graph.c:189

1488 #, c-format

1489 msgid "chunk id %08x appears multiple times"

1490 msgstr "块 id %08x 出现了多次"

1491

1466 -#: commit-graph.c:261

1492 +#: commit-graph.c:308

1493 #, c-format

1494 msgid "could not find commit %s"

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

1496

1471 -#: commit-graph.c:565 builtin/pack-objects.c:2568

1497 +#: commit-graph.c:617 builtin/pack-objects.c:2652

1498 #, c-format

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

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

1501

1476 -#: commit-graph.c:730

1502 +#: commit-graph.c:651

1503 +msgid "Annotating commits in commit graph"

1504 +msgstr "正在注解提交图中的提交"

1505 +

1506 +#: commit-graph.c:691

1507 +msgid "Computing commit graph generation numbers"

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

1509 +

1510 +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1511 +msgid "Finding commits for commit graph"

1512 +msgstr "正在查找提交图的提交"

1513 +

1514 +#: commit-graph.c:812

1515 #, c-format

1516 msgid "error adding pack %s"

1517 msgstr "添加包 %s 出错"

1518

1481 -#: commit-graph.c:732

1519 +#: commit-graph.c:814

1520 #, c-format

1521 msgid "error opening index for %s"

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

1523

1486 -#: commit-graph.c:773

1524 +#: commit-graph.c:868

1525 #, c-format

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

1489 -msgstr "提交图形格式不能写入 %d 个提交"

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

1528

1491 -#: commit-graph.c:800

1529 +#: commit-graph.c:895

1530 msgid "too many commits to write graph"

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

1532

1495 -#: commit-graph.c:806

1533 +#: commit-graph.c:902 midx.c:769

1534 #, c-format

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

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

1537

1500 -#: commit-graph.c:904

1538 +#: commit-graph.c:1002

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

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

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

1541 +

1542 +#: commit-graph.c:1046

1543 +msgid "Verifying commits in commit graph"

1544 +msgstr "校验提交图中的提交"

1545

1546 #: compat/obstack.c:405 compat/obstack.c:407

1547 msgid "memory exhausted"

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

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

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

1587

1546 -#: config.c:378 sequencer.c:2206

1588 +#: config.c:378 sequencer.c:2296

1589 #, c-format

1590 msgid "invalid key: %s"

1591 msgstr "无效键名：%s"

@@ -1665,149 +1707,149 @@ msgstr "core.commentChar 应该是一个字符"

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

1708 msgstr "无效的对象创建模式：%s"

1709

1668 -#: config.c:1403

1710 +#: config.c:1395

1711 #, c-format

1712 msgid "malformed value for %s"

1713 msgstr "%s 的取值格式错误"

1714

1673 -#: config.c:1429

1715 +#: config.c:1421

1716 #, c-format

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

1718 msgstr "%s 的取值格式错误：%s"

1719

1678 -#: config.c:1430

1720 +#: config.c:1422

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

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

1723

1682 -#: config.c:1489 builtin/pack-objects.c:3279

1724 +#: config.c:1481 builtin/pack-objects.c:3391

1725 #, c-format

1726 msgid "bad pack compression level %d"

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

1728

1687 -#: config.c:1610

1729 +#: config.c:1602

1730 #, c-format

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

1732 msgstr "无法从数据对象 '%s' 加载配置"

1733

1692 -#: config.c:1613

1734 +#: config.c:1605

1735 #, c-format

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

1737 msgstr "引用 '%s' 没有指向一个数据对象"

1738

1697 -#: config.c:1630

1739 +#: config.c:1622

1740 #, c-format

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

1742 msgstr "不能解析配置对象 '%s'"

1743

1702 -#: config.c:1660

1744 +#: config.c:1652

1745 #, c-format

1746 msgid "failed to parse %s"

1747 msgstr "解析 %s 失败"

1748

1707 -#: config.c:1700

1749 +#: config.c:1705

1750 msgid "unable to parse command-line config"

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

1752

1711 -#: config.c:2032

1753 +#: config.c:2037

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

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

1756

1715 -#: config.c:2202

1757 +#: config.c:2207

1758 #, c-format

1759 msgid "Invalid %s: '%s'"

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

1761

1720 -#: config.c:2245

1762 +#: config.c:2250

1763 #, c-format

1764 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1765 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"

1766

1725 -#: config.c:2271

1767 +#: config.c:2276

1768 #, c-format

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

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

1771

1730 -#: config.c:2296

1772 +#: config.c:2322

1773 #, c-format

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

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

1776

1735 -#: config.c:2298

1777 +#: config.c:2324

1778 #, c-format

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

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

1781

1740 -#: config.c:2379

1782 +#: config.c:2405

1783 #, c-format

1784 msgid "invalid section name '%s'"

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

1786

1745 -#: config.c:2411

1787 +#: config.c:2437

1788 #, c-format

1789 msgid "%s has multiple values"

1790 msgstr "%s 有多个取值"

1791

1750 -#: config.c:2440

1792 +#: config.c:2466

1793 #, c-format

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

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

1796

1755 -#: config.c:2691 config.c:3015

1797 +#: config.c:2717 config.c:3041

1798 #, c-format

1799 msgid "could not lock config file %s"

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

1801

1760 -#: config.c:2702

1802 +#: config.c:2728

1803 #, c-format

1804 msgid "opening %s"

1805 msgstr "打开 %s"

1806

1765 -#: config.c:2737 builtin/config.c:324

1807 +#: config.c:2763 builtin/config.c:327

1808 #, c-format

1809 msgid "invalid pattern: %s"

1810 msgstr "无效模式：%s"

1811

1770 -#: config.c:2762

1812 +#: config.c:2788

1813 #, c-format

1814 msgid "invalid config file %s"

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

1816

1775 -#: config.c:2775 config.c:3028

1817 +#: config.c:2801 config.c:3054

1818 #, c-format

1819 msgid "fstat on %s failed"

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

1821

1780 -#: config.c:2786

1822 +#: config.c:2812

1823 #, c-format

1824 msgid "unable to mmap '%s'"

1825 msgstr "不能 mmap '%s'"

1826

1785 -#: config.c:2795 config.c:3033

1827 +#: config.c:2821 config.c:3059

1828 #, c-format

1829 msgid "chmod on %s failed"

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

1831

1790 -#: config.c:2880 config.c:3130

1832 +#: config.c:2906 config.c:3156

1833 #, c-format

1834 msgid "could not write config file %s"

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

1836

1795 -#: config.c:2914

1837 +#: config.c:2940

1838 #, c-format

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

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

1841

1800 -#: config.c:2916 builtin/remote.c:781

1842 +#: config.c:2942 builtin/remote.c:782

1843 #, c-format

1844 msgid "could not unset '%s'"

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

1846

1805 -#: config.c:3006

1847 +#: config.c:3032

1848 #, c-format

1849 msgid "invalid section name: %s"

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

1851

1810 -#: config.c:3173

1852 +#: config.c:3199

1853 #, c-format

1854 msgid "missing value for '%s'"

1855 msgstr "%s 的取值缺失"

@@ -1859,7 +1901,7 @@ msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"

1901 msgid "repository on the other end cannot be shallow"

1902 msgstr "另一端的仓库不能是浅克隆仓库"

1903

1862 -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1904 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1905 #, c-format

1906 msgid "remote error: %s"

1907 msgstr "远程错误：%s"

@@ -1975,7 +2017,7 @@ msgstr "已阻止奇怪的路径名 '%s'"

2017 msgid "unable to fork"

2018 msgstr "无法 fork"

2019

1978 -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

2020 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2021 msgid "Checking connectivity"

2022 msgstr "检查连接中"

2023

@@ -2104,12 +2146,12 @@ msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"

2146 msgid "true/false are no valid working-tree-encodings"

2147 msgstr "true/false 不是有效的工作区编码"

2148

2107 -#: convert.c:1402 convert.c:1436

2149 +#: convert.c:1398 convert.c:1432

2150 #, c-format

2151 msgid "%s: clean filter '%s' failed"

2152 msgstr "%s：clean 过滤器 '%s' 失败"

2153

2112 -#: convert.c:1480

2154 +#: convert.c:1476

2155 #, c-format

2156 msgid "%s: smudge filter %s failed"

2157 msgstr "%s：smudge 过滤器 %s 失败"

@@ -2182,12 +2224,36 @@ msgid_plural "%<PRIuMAX> years ago"

2224 msgstr[0] "%<PRIuMAX> 年前"

2225 msgstr[1] "%<PRIuMAX> 年前"

2226

2227 +#: delta-islands.c:268

2228 +msgid "Propagating island marks"

2229 +msgstr "正在传播数据岛标记"

2230 +

2231 +#: delta-islands.c:286

2232 +#, c-format

2233 +msgid "bad tree object %s"

2234 +msgstr "坏的树对象 %s"

2235 +

2236 +#: delta-islands.c:330

2237 +#, c-format

2238 +msgid "failed to load island regex for '%s': %s"

2239 +msgstr "未能加载 '%s' 的数据岛正则表达式：%s"

2240 +

2241 +#: delta-islands.c:386

2242 +#, c-format

2243 +msgid "island regex from config has too many capture groups (max=%d)"

2244 +msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"

2245 +

2246 +#: delta-islands.c:462

2247 +#, c-format

2248 +msgid "Marked %d islands, done.\n"

2249 +msgstr "已标记 %d 个数据岛，结束。\n"

2250 +

2251 #: diffcore-order.c:24

2252 #, c-format

2253 msgid "failed to read orderfile '%s'"

2254 msgstr "读取排序文件 '%s' 失败"

2255

2190 -#: diffcore-rename.c:536

2256 +#: diffcore-rename.c:544

2257 msgid "Performing inexact rename detection"

2258 msgstr "正在进行非精确的重命名探测"

2259

@@ -2241,24 +2307,24 @@ msgstr ""

2307 "发现配置变量 'diff.dirstat' 中的错误：\n"

2308 "%s"

2309

2244 -#: diff.c:4096

2310 +#: diff.c:4140

2311 #, c-format

2312 msgid "external diff died, stopping at %s"

2313 msgstr "外部 diff 退出，停止在 %s"

2314

2249 -#: diff.c:4427

2315 +#: diff.c:4482

2316 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

2317 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

2318

2253 -#: diff.c:4430

2319 +#: diff.c:4485

2320 msgid "-G, -S and --find-object are mutually exclusive"

2321 msgstr "-G、-S 和 --find-object 是互斥的"

2322

2257 -#: diff.c:4508

2323 +#: diff.c:4563

2324 msgid "--follow requires exactly one pathspec"

2325 msgstr "--follow 明确要求只跟一个路径规格"

2326

2261 -#: diff.c:4674

2327 +#: diff.c:4729

2328 #, c-format

2329 msgid ""

2330 "Failed to parse --dirstat/-X option parameter:\n"

@@ -2267,64 +2333,64 @@ msgstr ""

2333 "无法解析 --dirstat/-X 选项的参数：\n"

2334 "%s"

2335

2270 -#: diff.c:4688

2336 +#: diff.c:4743

2337 #, c-format

2338 msgid "Failed to parse --submodule option parameter: '%s'"

2339 msgstr "无法解析 --submodule 选项的参数：'%s'"

2340

2275 -#: diff.c:5766

2341 +#: diff.c:5823

2342 msgid "inexact rename detection was skipped due to too many files."

2343 msgstr "因为文件太多，略过不严格的重命名检查。"

2344

2279 -#: diff.c:5769

2345 +#: diff.c:5826

2346 msgid "only found copies from modified paths due to too many files."

2347 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

2348

2283 -#: diff.c:5772

2349 +#: diff.c:5829

2350 #, c-format

2351 msgid ""

2352 "you may want to set your %s variable to at least %d and retry the command."

2353 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

2354

2289 -#: dir.c:569

2355 +#: dir.c:576

2356 #, c-format

2357 msgid "pathspec '%s' did not match any file(s) known to git"

2358 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

2359

2294 -#: dir.c:958

2360 +#: dir.c:965

2361 #, c-format

2362 msgid "cannot use %s as an exclude file"

2363 msgstr "不能将 %s 用作排除文件"

2364

2299 -#: dir.c:1873

2365 +#: dir.c:1880

2366 #, c-format

2367 msgid "could not open directory '%s'"

2368 msgstr "不能打开目录 '%s'"

2369

2304 -#: dir.c:2115

2370 +#: dir.c:2122

2371 msgid "failed to get kernel name and information"

2372 msgstr "无法获得内核名称和信息"

2373

2308 -#: dir.c:2239

2374 +#: dir.c:2246

2375 msgid "untracked cache is disabled on this system or location"

2376 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

2377

2312 -#: dir.c:3037

2378 +#: dir.c:3047

2379 #, c-format

2380 msgid "index file corrupt in repo %s"

2381 msgstr "仓库 %s 中的索引文件损坏"

2382

2317 -#: dir.c:3082 dir.c:3087

2383 +#: dir.c:3092 dir.c:3097

2384 #, c-format

2385 msgid "could not create directories for %s"

2386 msgstr "不能为 %s 创建目录"

2387

2322 -#: dir.c:3116

2388 +#: dir.c:3126

2389 #, c-format

2390 msgid "could not migrate git directory from '%s' to '%s'"

2391 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

2392

2327 -#: editor.c:61

2393 +#: editor.c:73

2394 #, c-format

2395 msgid "hint: Waiting for your editor to close the file...%c"

2396 msgstr "提示：等待您的编辑器关闭文件...%c"

@@ -2333,7 +2399,7 @@ msgstr "提示：等待您的编辑器关闭文件...%c"

2399 msgid "Filtering content"

2400 msgstr "过滤内容"

2401

2336 -#: entry.c:437

2402 +#: entry.c:465

2403 #, c-format

2404 msgid "could not stat file '%s'"

2405 msgstr "不能对文件 '%s' 调用 stat"

@@ -2357,77 +2423,77 @@ msgstr "执行 %s 的参数太多"

2423 msgid "Remote with no URL"

2424 msgstr "远程未设置 URL"

2425

2360 -#: fetch-pack.c:152

2426 +#: fetch-pack.c:151

2427 msgid "git fetch-pack: expected shallow list"

2428 msgstr "git fetch-pack：应为 shallow 列表"

2429

2364 -#: fetch-pack.c:164

2430 +#: fetch-pack.c:163

2431 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2432 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

2433

2368 -#: fetch-pack.c:184

2434 +#: fetch-pack.c:183

2435 #, c-format

2436 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2437 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

2438

2373 -#: fetch-pack.c:254

2439 +#: fetch-pack.c:253

2440 msgid "--stateless-rpc requires multi_ack_detailed"

2441 msgstr "--stateless-rpc 需要 multi_ack_detailed"

2442

2377 -#: fetch-pack.c:342 fetch-pack.c:1257

2443 +#: fetch-pack.c:347 fetch-pack.c:1277

2444 #, c-format

2445 msgid "invalid shallow line: %s"

2446 msgstr "无效的 shallow 信息：%s"

2447

2382 -#: fetch-pack.c:348 fetch-pack.c:1263

2448 +#: fetch-pack.c:353 fetch-pack.c:1283

2449 #, c-format

2450 msgid "invalid unshallow line: %s"

2451 msgstr "无效的 unshallow 信息：%s"

2452

2387 -#: fetch-pack.c:350 fetch-pack.c:1265

2453 +#: fetch-pack.c:355 fetch-pack.c:1285

2454 #, c-format

2455 msgid "object not found: %s"

2456 msgstr "对象未找到：%s"

2457

2392 -#: fetch-pack.c:353 fetch-pack.c:1268

2458 +#: fetch-pack.c:358 fetch-pack.c:1288

2459 #, c-format

2460 msgid "error in object: %s"

2461 msgstr "对象中出错：%s"

2462

2397 -#: fetch-pack.c:355 fetch-pack.c:1270

2463 +#: fetch-pack.c:360 fetch-pack.c:1290

2464 #, c-format

2465 msgid "no shallow found: %s"

2466 msgstr "未发现 shallow：%s"

2467

2402 -#: fetch-pack.c:358 fetch-pack.c:1273

2468 +#: fetch-pack.c:363 fetch-pack.c:1293

2469 #, c-format

2470 msgid "expected shallow/unshallow, got %s"

2471 msgstr "应为 shallow/unshallow，却得到 %s"

2472

2407 -#: fetch-pack.c:399

2473 +#: fetch-pack.c:404

2474 #, c-format

2475 msgid "got %s %d %s"

2476 msgstr "得到 %s %d %s"

2477

2412 -#: fetch-pack.c:416

2478 +#: fetch-pack.c:421

2479 #, c-format

2480 msgid "invalid commit %s"

2481 msgstr "无效提交 %s"

2482

2417 -#: fetch-pack.c:447

2483 +#: fetch-pack.c:452

2484 msgid "giving up"

2485 msgstr "放弃"

2486

2421 -#: fetch-pack.c:459 progress.c:229

2487 +#: fetch-pack.c:464 progress.c:229

2488 msgid "done"

2489 msgstr "完成"

2490

2425 -#: fetch-pack.c:471

2491 +#: fetch-pack.c:476

2492 #, c-format

2493 msgid "got %s (%d) %s"

2494 msgstr "得到 %s (%d) %s"

2495

2430 -#: fetch-pack.c:517

2496 +#: fetch-pack.c:522

2497 #, c-format

2498 msgid "Marking %s as complete"

2499 msgstr "标记 %s 为完成"

@@ -2495,7 +2561,7 @@ msgstr "服务器支持 allow-reachable-sha1-in-want"

2561 msgid "Server supports ofs-delta"

2562 msgstr "服务器支持 ofs-delta"

2563

2498 -#: fetch-pack.c:971 fetch-pack.c:1150

2564 +#: fetch-pack.c:971 fetch-pack.c:1158

2565 msgid "Server supports filter"

2566 msgstr "服务器支持 filter"

2567

@@ -2516,85 +2582,93 @@ msgstr "服务器不支持 --shallow-exclude"

2582 msgid "Server does not support --deepen"

2583 msgstr "服务器不支持 --deepen"

2584

2519 -#: fetch-pack.c:1004

2585 +#: fetch-pack.c:1008

2586 msgid "no common commits"

2587 msgstr "没有共同的提交"

2588

2523 -#: fetch-pack.c:1016 fetch-pack.c:1393

2589 +#: fetch-pack.c:1020 fetch-pack.c:1418

2590 msgid "git fetch-pack: fetch failed."

2591 msgstr "git fetch-pack：获取失败。"

2592

2527 -#: fetch-pack.c:1145

2593 +#: fetch-pack.c:1153

2594 msgid "Server does not support shallow requests"

2595 msgstr "服务器不支持 shalllow 请求"

2596

2531 -#: fetch-pack.c:1191

2597 +#: fetch-pack.c:1199

2598 #, c-format

2599 msgid "error reading section header '%s'"

2600 msgstr "读取节标题 '%s' 出错"

2601

2536 -#: fetch-pack.c:1197

2602 +#: fetch-pack.c:1205

2603 #, c-format

2604 msgid "expected '%s', received '%s'"

2605 msgstr "预期 '%s'，得到 '%s'"

2606

2541 -#: fetch-pack.c:1236

2607 +#: fetch-pack.c:1244

2608 #, c-format

2609 msgid "unexpected acknowledgment line: '%s'"

2610 msgstr "意外的确认行：'%s'"

2611

2546 -#: fetch-pack.c:1241

2612 +#: fetch-pack.c:1249

2613 #, c-format

2614 msgid "error processing acks: %d"

2615 msgstr "处理 ack 出错：%d"

2616

2551 -#: fetch-pack.c:1278

2617 +#: fetch-pack.c:1259

2618 +msgid "expected packfile to be sent after 'ready'"

2619 +msgstr "预期在 'ready' 之后发送 packfile"

2620 +

2621 +#: fetch-pack.c:1261

2622 +msgid "expected no other sections to be sent after no 'ready'"

2623 +msgstr "在没有 'ready' 不应该发送其它小节"

2624 +

2625 +#: fetch-pack.c:1298

2626 #, c-format

2627 msgid "error processing shallow info: %d"

2628 msgstr "处理浅克隆信息出错：%d"

2629

2556 -#: fetch-pack.c:1294

2630 +#: fetch-pack.c:1314

2631 #, c-format

2632 msgid "expected wanted-ref, got '%s'"

2633 msgstr "预期 wanted-ref，得到 '%s'"

2634

2561 -#: fetch-pack.c:1304

2635 +#: fetch-pack.c:1324

2636 #, c-format

2637 msgid "unexpected wanted-ref: '%s'"

2638 msgstr "意外的 wanted-ref：'%s'"

2639

2566 -#: fetch-pack.c:1308

2640 +#: fetch-pack.c:1328

2641 #, c-format

2642 msgid "error processing wanted refs: %d"

2643 msgstr "处理要获取的引用出错：%d"

2644

2571 -#: fetch-pack.c:1603

2645 +#: fetch-pack.c:1642

2646 msgid "no matching remote head"

2647 msgstr "没有匹配的远程分支"

2648

2575 -#: fetch-pack.c:1621 builtin/clone.c:664

2649 +#: fetch-pack.c:1660 builtin/clone.c:664

2650 msgid "remote did not send all necessary objects"

2651 msgstr "远程没有发送所有必需的对象"

2652

2579 -#: fetch-pack.c:1647

2653 +#: fetch-pack.c:1686

2654 #, c-format

2655 msgid "no such remote ref %s"

2656 msgstr "没有这样的远程引用 %s"

2657

2584 -#: fetch-pack.c:1650

2658 +#: fetch-pack.c:1689

2659 #, c-format

2660 msgid "Server does not allow request for unadvertised object %s"

2661 msgstr "服务器不允许请求未公开的对象 %s"

2662

2589 -#: gpg-interface.c:253

2663 +#: gpg-interface.c:318

2664 msgid "gpg failed to sign the data"

2665 msgstr "gpg 无法为数据签名"

2666

2593 -#: gpg-interface.c:279

2667 +#: gpg-interface.c:344

2668 msgid "could not create temporary file"

2669 msgstr "不能创建临时文件"

2670

2597 -#: gpg-interface.c:282

2671 +#: gpg-interface.c:347

2672 #, c-format

2673 msgid "failed writing detached signature to '%s'"

2674 msgstr "无法将分离式签名写入 '%s'"

@@ -2604,18 +2678,18 @@ msgstr "无法将分离式签名写入 '%s'"

2678 msgid "ignore invalid color '%.*s' in log.graphColors"

2679 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

2680

2607 -#: grep.c:2115

2681 +#: grep.c:2113

2682 #, c-format

2683 msgid "'%s': unable to read %s"

2684 msgstr "'%s'：无法读取 %s"

2685

2612 -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2686 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2687 #: builtin/rm.c:134

2688 #, c-format

2689 msgid "failed to stat '%s'"

2690 msgstr "对 '%s' 调用 stat 失败"

2691

2618 -#: grep.c:2143

2692 +#: grep.c:2141

2693 #, c-format

2694 msgid "'%s': short read"

2695 msgstr "'%s'：读取不完整"

@@ -2672,29 +2746,41 @@ msgstr "低级命令/同步仓库"

2746 msgid "Low-level Commands / Internal Helpers"

2747 msgstr "低级命令/内部助手"

2748

2675 -#: help.c:293

2749 +#: help.c:296

2750 #, c-format

2751 msgid "available git commands in '%s'"

2752 msgstr "在 '%s' 下可用的 git 命令"

2753

2680 -#: help.c:300

2754 +#: help.c:303

2755 msgid "git commands available from elsewhere on your $PATH"

2756 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

2757

2684 -#: help.c:309

2758 +#: help.c:312

2759 msgid "These are common Git commands used in various situations:"

2760 msgstr "这些是各种场合常见的 Git 命令："

2761

2688 -#: help.c:358 git.c:90

2762 +#: help.c:361 git.c:90

2763 #, c-format

2764 msgid "unsupported command listing type '%s'"

2765 msgstr "不支持的命令列表类型 '%s'"

2766

2693 -#: help.c:405

2767 +#: help.c:408

2768 msgid "The common Git guides are:"

2769 msgstr "最常用的 Git 向导有："

2770

2697 -#: help.c:552

2771 +#: help.c:517

2772 +msgid "See 'git help <command>' to read about a specific subcommand"

2773 +msgstr "执行　'git help <command>' 来查看特定子命令"

2774 +

2775 +#: help.c:522

2776 +msgid "External commands"

2777 +msgstr "外部命令"

2778 +

2779 +#: help.c:530

2780 +msgid "Command aliases"

2781 +msgstr "命令别名"

2782 +

2783 +#: help.c:594

2784 #, c-format

2785 msgid ""

2786 "'%s' appears to be a git command, but we were not\n"

@@ -2703,31 +2789,31 @@ msgstr ""

2789 "'%s' 像是一个 git 命令，但却无法运行。\n"

2790 "可能是 git-%s 受损？"

2791

2706 -#: help.c:611

2792 +#: help.c:653

2793 msgid "Uh oh. Your system reports no Git commands at all."

2794 msgstr "唉呀，您的系统中未发现 Git 命令。"

2795

2710 -#: help.c:633

2796 +#: help.c:675

2797 #, c-format

2798 msgid "WARNING: You called a Git command named '%s', which does not exist."

2799 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

2800

2715 -#: help.c:638

2801 +#: help.c:680

2802 #, c-format

2803 msgid "Continuing under the assumption that you meant '%s'."

2804 msgstr "假定你想要的是 '%s' 并继续。"

2805

2720 -#: help.c:643

2806 +#: help.c:685

2807 #, c-format

2808 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2809 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

2810

2725 -#: help.c:651

2811 +#: help.c:693

2812 #, c-format

2813 msgid "git: '%s' is not a git command. See 'git --help'."

2814 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

2815

2730 -#: help.c:655

2816 +#: help.c:697

2817 msgid ""

2818 "\n"

2819 "The most similar command is"

@@ -2741,16 +2827,16 @@ msgstr[1] ""

2827 "\n"

2828 "最相似的命令是"

2829

2744 -#: help.c:670

2830 +#: help.c:712

2831 msgid "git version [<options>]"

2832 msgstr "git version [<选项>]"

2833

2748 -#: help.c:738

2834 +#: help.c:780

2835 #, c-format

2836 msgid "%s: %s - %s"

2837 msgstr "%s：%s - %s"

2838

2753 -#: help.c:742

2839 +#: help.c:784

2840 msgid ""

2841 "\n"

2842 "Did you mean this?"

@@ -2764,7 +2850,7 @@ msgstr[1] ""

2850 "\n"

2851 "您指的是这其中的某一个么？"

2852

2767 -#: ident.c:342

2853 +#: ident.c:345

2854 msgid ""

2855 "\n"

2856 "*** Please tell me who you are.\n"

@@ -2789,44 +2875,48 @@ msgstr ""

2875 "来设置您账号的缺省身份标识。\n"

2876 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"

2877

2792 -#: ident.c:366

2878 +#: ident.c:369

2879 msgid "no email was given and auto-detection is disabled"

2880 msgstr "未提供邮件地址且自动探测被禁用"

2881

2796 -#: ident.c:371

2882 +#: ident.c:374

2883 #, c-format

2884 msgid "unable to auto-detect email address (got '%s')"

2885 msgstr "无法自动探测邮件地址（得到 '%s'）"

2886

2801 -#: ident.c:381

2887 +#: ident.c:384

2888 msgid "no name was given and auto-detection is disabled"

2889 msgstr "未提供姓名且自动探测被禁用"

2890

2805 -#: ident.c:387

2891 +#: ident.c:390

2892 #, c-format

2893 msgid "unable to auto-detect name (got '%s')"

2894 msgstr "无法自动探测姓名（得到 '%s'）"

2895

2810 -#: ident.c:395

2896 +#: ident.c:398

2897 #, c-format

2898 msgid "empty ident name (for <%s>) not allowed"

2899 msgstr "不允许空的姓名（对于 <%s>）"

2900

2815 -#: ident.c:401

2901 +#: ident.c:404

2902 #, c-format

2903 msgid "name consists only of disallowed characters: %s"

2904 msgstr "姓名中仅包含禁用字符：%s"

2905

2820 -#: ident.c:416 builtin/commit.c:600

2906 +#: ident.c:419 builtin/commit.c:606

2907 #, c-format

2908 msgid "invalid date format: %s"

2909 msgstr "无效的日期格式：%s"

2910

2825 -#: list-objects-filter-options.c:36

2911 +#: list-objects-filter-options.c:35

2912 msgid "multiple filter-specs cannot be combined"

2913 msgstr "不能混用多种过滤规格"

2914

2829 -#: list-objects-filter-options.c:126

2915 +#: list-objects-filter-options.c:58

2916 +msgid "only 'tree:0' is supported"

2917 +msgstr "只支持 'tree:0'"

2918 +

2919 +#: list-objects-filter-options.c:137

2920 msgid "cannot change partial clone promisor remote"

2921 msgstr "无法修改部分克隆的 promisor 远程仓库"

2922

@@ -2853,117 +2943,117 @@ msgstr ""

2943 msgid "Unable to create '%s.lock': %s"

2944 msgstr "不能创建 '%s.lock'：%s"

2945

2856 -#: merge.c:40

2946 +#: merge.c:41

2947 msgid "failed to read the cache"

2948 msgstr "读取缓存失败"

2949

2860 -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2861 -#: builtin/checkout.c:608 builtin/clone.c:763

2950 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2951 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2952 msgid "unable to write new index file"

2953 msgstr "无法写新的索引文件"

2954

2865 -#: merge-recursive.c:303

2955 +#: merge-recursive.c:323

2956 msgid "(bad commit)\n"

2957 msgstr "（坏提交）\n"

2958

2869 -#: merge-recursive.c:325

2959 +#: merge-recursive.c:345

2960 #, c-format

2961 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2962 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

2963

2874 -#: merge-recursive.c:333

2964 +#: merge-recursive.c:353

2965 #, c-format

2966 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2967 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

2968

2879 -#: merge-recursive.c:415

2969 +#: merge-recursive.c:435

2970 msgid "error building trees"

2971 msgstr "创建树出错"

2972

2883 -#: merge-recursive.c:886

2973 +#: merge-recursive.c:906

2974 #, c-format

2975 msgid "failed to create path '%s'%s"

2976 msgstr "创建路径 '%s'%s 失败"

2977

2888 -#: merge-recursive.c:897

2978 +#: merge-recursive.c:917

2979 #, c-format

2980 msgid "Removing %s to make room for subdirectory\n"

2981 msgstr "删除 %s 以便为子目录留出空间\n"

2982

2893 -#: merge-recursive.c:911 merge-recursive.c:930

2983 +#: merge-recursive.c:931 merge-recursive.c:950

2984 msgid ": perhaps a D/F conflict?"

2985 msgstr "：可能是一个目录/文件冲突？"

2986

2897 -#: merge-recursive.c:920

2987 +#: merge-recursive.c:940

2988 #, c-format

2989 msgid "refusing to lose untracked file at '%s'"

2990 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

2991

2902 -#: merge-recursive.c:962 builtin/cat-file.c:39

2992 +#: merge-recursive.c:982 builtin/cat-file.c:39

2993 #, c-format

2994 msgid "cannot read object %s '%s'"

2995 msgstr "不能读取对象 %s '%s'"

2996

2907 -#: merge-recursive.c:964

2997 +#: merge-recursive.c:984

2998 #, c-format

2999 msgid "blob expected for %s '%s'"

3000 msgstr "%s '%s' 应为数据对象"

3001

2912 -#: merge-recursive.c:988

3002 +#: merge-recursive.c:1008

3003 #, c-format

3004 msgid "failed to open '%s': %s"

3005 msgstr "打开 '%s' 失败：%s"

3006

2917 -#: merge-recursive.c:999

3007 +#: merge-recursive.c:1019

3008 #, c-format

3009 msgid "failed to symlink '%s': %s"

3010 msgstr "创建符号链接 '%s' 失败：%s"

3011

2922 -#: merge-recursive.c:1004

3012 +#: merge-recursive.c:1024

3013 #, c-format

3014 msgid "do not know what to do with %06o %s '%s'"

3015 msgstr "不知道如何处理 %06o %s '%s'"

3016

2927 -#: merge-recursive.c:1191

3017 +#: merge-recursive.c:1212

3018 #, c-format

3019 msgid "Failed to merge submodule %s (not checked out)"

3020 msgstr "无法合并子模组 %s （没有检出）"

3021

2932 -#: merge-recursive.c:1198

3022 +#: merge-recursive.c:1219

3023 #, c-format

3024 msgid "Failed to merge submodule %s (commits not present)"

3025 msgstr "无法合并子模组 %s（提交不存在）"

3026

2937 -#: merge-recursive.c:1205

3027 +#: merge-recursive.c:1226

3028 #, c-format

3029 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3030 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

3031

2942 -#: merge-recursive.c:1213 merge-recursive.c:1225

3032 +#: merge-recursive.c:1234 merge-recursive.c:1246

3033 #, c-format

3034 msgid "Fast-forwarding submodule %s to the following commit:"

3035 msgstr "子模组 %s 快进到如下提交："

3036

2947 -#: merge-recursive.c:1216 merge-recursive.c:1228

3037 +#: merge-recursive.c:1237 merge-recursive.c:1249

3038 #, c-format

3039 msgid "Fast-forwarding submodule %s"

3040 msgstr "快进子模组 %s"

3041

2952 -#: merge-recursive.c:1250

3042 +#: merge-recursive.c:1271

3043 #, c-format

3044 msgid "Failed to merge submodule %s (merge following commits not found)"

3045 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"

3046

2957 -#: merge-recursive.c:1254

3047 +#: merge-recursive.c:1275

3048 #, c-format

3049 msgid "Failed to merge submodule %s (not fast-forward)"

3050 msgstr "无法合并子模组 %s（非快进）"

3051

2962 -#: merge-recursive.c:1255

3052 +#: merge-recursive.c:1276

3053 msgid "Found a possible merge resolution for the submodule:\n"

3054 msgstr "找到子模组的一个可能的合并方案：\n"

3055

2966 -#: merge-recursive.c:1258

3056 +#: merge-recursive.c:1279

3057 #, c-format

3058 msgid ""

3059 "If this is correct simply add it to the index for example\n"

@@ -2979,31 +3069,31 @@ msgstr ""

3069 "\n"

3070 "以接受此建议。\n"

3071

2982 -#: merge-recursive.c:1267

3072 +#: merge-recursive.c:1288

3073 #, c-format

3074 msgid "Failed to merge submodule %s (multiple merges found)"

3075 msgstr "无法合并子模组 %s （发现多个合并）"

3076

2987 -#: merge-recursive.c:1326

3077 +#: merge-recursive.c:1358

3078 msgid "Failed to execute internal merge"

3079 msgstr "无法执行内部合并"

3080

2991 -#: merge-recursive.c:1331

3081 +#: merge-recursive.c:1363

3082 #, c-format

3083 msgid "Unable to add %s to database"

3084 msgstr "不能添加 %s 至对象库"

3085

2996 -#: merge-recursive.c:1363

3086 +#: merge-recursive.c:1395

3087 #, c-format

3088 msgid "Auto-merging %s"

3089 msgstr "自动合并 %s"

3090

3001 -#: merge-recursive.c:1434

3091 +#: merge-recursive.c:1416

3092 #, c-format

3093 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3094 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3095

3006 -#: merge-recursive.c:1501

3096 +#: merge-recursive.c:1483

3097 #, c-format

3098 msgid ""

3099 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -3012,7 +3102,7 @@ msgstr ""

3102 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

3103 "本被保留。"

3104

3015 -#: merge-recursive.c:1506

3105 +#: merge-recursive.c:1488

3106 #, c-format

3107 msgid ""

3108 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3021,7 +3111,7 @@ msgstr ""

3111 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

3112 "%7$s 版本被保留。"

3113

3024 -#: merge-recursive.c:1513

3114 +#: merge-recursive.c:1495

3115 #, c-format

3116 msgid ""

3117 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -3030,7 +3120,7 @@ msgstr ""

3120 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

3121 "本保留在 %8$s 中。"

3122

3033 -#: merge-recursive.c:1518

3123 +#: merge-recursive.c:1500

3124 #, c-format

3125 msgid ""

3126 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3039,31 +3129,31 @@ msgstr ""

3129 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

3130 "%7$s 版本保留在 %9$s 中。"

3131

3042 -#: merge-recursive.c:1552

3132 +#: merge-recursive.c:1534

3133 msgid "rename"

3134 msgstr "重命名"

3135

3046 -#: merge-recursive.c:1552

3136 +#: merge-recursive.c:1534

3137 msgid "renamed"

3138 msgstr "重命名"

3139

3050 -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

3051 -#: merge-recursive.c:3129

3140 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3141 +#: merge-recursive.c:3124

3142 #, c-format

3143 msgid "Refusing to lose dirty file at %s"

3144 msgstr "拒绝丢失脏文件 '%s'"

3145

3056 -#: merge-recursive.c:1620

3146 +#: merge-recursive.c:1602

3147 #, c-format

3148 msgid "%s is a directory in %s adding as %s instead"

3149 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

3150

3061 -#: merge-recursive.c:1625

3151 +#: merge-recursive.c:1607

3152 #, c-format

3153 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3154 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3155

3066 -#: merge-recursive.c:1651

3156 +#: merge-recursive.c:1633

3157 #, c-format

3158 msgid ""

3159 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -3072,28 +3162,28 @@ msgstr ""

3162 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

3163 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

3164

3075 -#: merge-recursive.c:1656

3165 +#: merge-recursive.c:1638

3166 msgid " (left unresolved)"

3167 msgstr "（留下未解决）"

3168

3079 -#: merge-recursive.c:1720

3169 +#: merge-recursive.c:1699

3170 #, c-format

3171 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

3172 msgstr ""

3173 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

3174 "%5$s"

3175

3086 -#: merge-recursive.c:1759

3176 +#: merge-recursive.c:1734

3177 #, c-format

3178 msgid "Renaming %s to %s and %s to %s instead"

3179 msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"

3180

3091 -#: merge-recursive.c:1771

3181 +#: merge-recursive.c:1746

3182 #, c-format

3183 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3184 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3185

3096 -#: merge-recursive.c:1977

3186 +#: merge-recursive.c:1952

3187 #, c-format

3188 msgid ""

3189 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3103,7 +3193,7 @@ msgstr ""

3193 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3194 "其它目录，没有目录包含大部分文件。"

3195

3106 -#: merge-recursive.c:2009

3196 +#: merge-recursive.c:1984

3197 #, c-format

3198 msgid ""

3199 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3112,7 +3202,7 @@ msgstr ""

3202 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3203 "在：%s。"

3204

3115 -#: merge-recursive.c:2019

3205 +#: merge-recursive.c:1994

3206 #, c-format

3207 msgid ""

3208 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3121,7 +3211,7 @@ msgstr ""

3211 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3212 "径放置于此：%s"

3213

3124 -#: merge-recursive.c:2111

3214 +#: merge-recursive.c:2086

3215 #, c-format

3216 msgid ""

3217 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3130,92 +3220,92 @@ msgstr ""

3220 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "

3221 "%4$s->%5$s"

3222

3133 -#: merge-recursive.c:2356

3223 +#: merge-recursive.c:2331

3224 #, c-format

3225 msgid ""

3226 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3227 "renamed."

3228 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3229

3140 -#: merge-recursive.c:2762

3230 +#: merge-recursive.c:2737

3231 #, c-format

3232 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

3233 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

3234

3145 -#: merge-recursive.c:2777

3235 +#: merge-recursive.c:2763

3236 #, c-format

3237 msgid "Adding merged %s"

3238 msgstr "添加合并后的 %s"

3239

3150 -#: merge-recursive.c:2784 merge-recursive.c:3132

3240 +#: merge-recursive.c:2770 merge-recursive.c:3127

3241 #, c-format

3242 msgid "Adding as %s instead"

3243 msgstr "而是以 %s 为名添加"

3244

3155 -#: merge-recursive.c:2941

3245 +#: merge-recursive.c:2934

3246 #, c-format

3247 msgid "cannot read object %s"

3248 msgstr "不能读取对象 %s"

3249

3160 -#: merge-recursive.c:2944

3250 +#: merge-recursive.c:2937

3251 #, c-format

3252 msgid "object %s is not a blob"

3253 msgstr "对象 %s 不是一个数据对象"

3254

3165 -#: merge-recursive.c:3013

3255 +#: merge-recursive.c:3006

3256 msgid "modify"

3257 msgstr "修改"

3258

3169 -#: merge-recursive.c:3013

3259 +#: merge-recursive.c:3006

3260 msgid "modified"

3261 msgstr "修改"

3262

3173 -#: merge-recursive.c:3024

3263 +#: merge-recursive.c:3017

3264 msgid "content"

3265 msgstr "内容"

3266

3177 -#: merge-recursive.c:3031

3267 +#: merge-recursive.c:3024

3268 msgid "add/add"

3269 msgstr "添加/添加"

3270

3181 -#: merge-recursive.c:3076

3271 +#: merge-recursive.c:3071

3272 #, c-format

3273 msgid "Skipped %s (merged same as existing)"

3274 msgstr "略过 %s（已经做过相同合并）"

3275

3186 -#: merge-recursive.c:3098 git-submodule.sh:865

3276 +#: merge-recursive.c:3093 git-submodule.sh:858

3277 msgid "submodule"

3278 msgstr "子模组"

3279

3190 -#: merge-recursive.c:3099

3280 +#: merge-recursive.c:3094

3281 #, c-format

3282 msgid "CONFLICT (%s): Merge conflict in %s"

3283 msgstr "冲突（%s）：合并冲突于 %s"

3284

3195 -#: merge-recursive.c:3221

3285 +#: merge-recursive.c:3216

3286 #, c-format

3287 msgid "Removing %s"

3288 msgstr "删除 %s"

3289

3200 -#: merge-recursive.c:3247

3290 +#: merge-recursive.c:3242

3291 msgid "file/directory"

3292 msgstr "文件/目录"

3293

3204 -#: merge-recursive.c:3253

3294 +#: merge-recursive.c:3248

3295 msgid "directory/file"

3296 msgstr "目录/文件"

3297

3208 -#: merge-recursive.c:3260

3298 +#: merge-recursive.c:3255

3299 #, c-format

3300 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

3301 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

3302

3213 -#: merge-recursive.c:3269

3303 +#: merge-recursive.c:3264

3304 #, c-format

3305 msgid "Adding %s"

3306 msgstr "添加 %s"

3307

3218 -#: merge-recursive.c:3303

3308 +#: merge-recursive.c:3300

3309 #, c-format

3310 msgid ""

3311 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3224,40 +3314,167 @@ msgstr ""

3314 "您对下列文件的本地修改将被合并操作覆盖：\n"

3315 " %s"

3316

3227 -#: merge-recursive.c:3314

3317 +#: merge-recursive.c:3311

3318 msgid "Already up to date!"

3319 msgstr "已经是最新的！"

3320

3231 -#: merge-recursive.c:3323

3321 +#: merge-recursive.c:3320

3322 #, c-format

3323 msgid "merging of trees %s and %s failed"

3324 msgstr "无法合并树 %s 和 %s"

3325

3236 -#: merge-recursive.c:3422

3326 +#: merge-recursive.c:3419

3327 msgid "Merging:"

3328 msgstr "合并："

3329

3240 -#: merge-recursive.c:3435

3330 +#: merge-recursive.c:3432

3331 #, c-format

3332 msgid "found %u common ancestor:"

3333 msgid_plural "found %u common ancestors:"

3334 msgstr[0] "发现 %u 个共同祖先："

3335 msgstr[1] "发现 %u 个共同祖先："

3336

3247 -#: merge-recursive.c:3474

3337 +#: merge-recursive.c:3471

3338 msgid "merge returned no commit"

3339 msgstr "合并未返回提交"

3340

3251 -#: merge-recursive.c:3540

3341 +#: merge-recursive.c:3537

3342 #, c-format

3343 msgid "Could not parse object '%s'"

3344 msgstr "不能解析对象 '%s'"

3345

3256 -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3346 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3347 msgid "Unable to write index."

3348 msgstr "不能写入索引。"

3349

3260 -#: notes-merge.c:274

3350 +#: midx.c:65

3351 +#, c-format

3352 +msgid "multi-pack-index file %s is too small"

3353 +msgstr "多包索引文件 %s 太小"

3354 +

3355 +#: midx.c:81

3356 +#, c-format

3357 +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3358 +msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"

3359 +

3360 +#: midx.c:86

3361 +#, c-format

3362 +msgid "multi-pack-index version %d not recognized"

3363 +msgstr "multi-pack-index 版本 %d 不能被识别"

3364 +

3365 +#: midx.c:91

3366 +#, c-format

3367 +msgid "hash version %u does not match"

3368 +msgstr "散列版本 %u 不匹配"

3369 +

3370 +#: midx.c:105

3371 +msgid "invalid chunk offset (too large)"

3372 +msgstr "无效的块偏移（太大）"

3373 +

3374 +#: midx.c:129

3375 +msgid "terminating multi-pack-index chunk id appears earlier than expected"

3376 +msgstr "终止多包索引块 id 出现时间早于预期"

3377 +

3378 +#: midx.c:142

3379 +msgid "multi-pack-index missing required pack-name chunk"

3380 +msgstr "多包索引缺少必需的包名块"

3381 +

3382 +#: midx.c:144

3383 +msgid "multi-pack-index missing required OID fanout chunk"

3384 +msgstr "多包索引缺少必需的 OID 扇出块"

3385 +

3386 +#: midx.c:146

3387 +msgid "multi-pack-index missing required OID lookup chunk"

3388 +msgstr "多包索引缺少必需的 OID 查询块"

3389 +

3390 +#: midx.c:148

3391 +msgid "multi-pack-index missing required object offsets chunk"

3392 +msgstr "多包索引缺少必需的对象偏移块"

3393 +

3394 +#: midx.c:162

3395 +#, c-format

3396 +msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3397 +msgstr "多包索引包名无序：'%s' 在 '%s' 之前"

3398 +

3399 +#: midx.c:205

3400 +#, c-format

3401 +msgid "bad pack-int-id: %u (%u total packs)"

3402 +msgstr "错的 pack-int-id：%u（共有 %u 个包）"

3403 +

3404 +#: midx.c:246

3405 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3406 +msgstr "多包索引存储一个64位偏移，但是 off_t 太小"

3407 +

3408 +#: midx.c:271

3409 +msgid "error preparing packfile from multi-pack-index"

3410 +msgstr "从多包索引准备 packfile 出错"

3411 +

3412 +#: midx.c:407

3413 +#, c-format

3414 +msgid "failed to add packfile '%s'"

3415 +msgstr "添加包文件 '%s' 失败"

3416 +

3417 +#: midx.c:413

3418 +#, c-format

3419 +msgid "failed to open pack-index '%s'"

3420 +msgstr "打开包索引 '%s' 失败"

3421 +

3422 +#: midx.c:507

3423 +#, c-format

3424 +msgid "failed to locate object %d in packfile"

3425 +msgstr "在包文件中定位对象 %d 失败"

3426 +

3427 +#: midx.c:943

3428 +#, c-format

3429 +msgid "failed to clear multi-pack-index at %s"

3430 +msgstr "清理位于 %s 的多包索引失败"

3431 +

3432 +#: midx.c:981

3433 +#, c-format

3434 +msgid ""

3435 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3436 +msgstr "oid 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3437 +

3438 +#: midx.c:992

3439 +#, c-format

3440 +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3441 +msgstr "oid 查询无序：oid[%d] = %s >= %s = oid[%d]"

3442 +

3443 +#: midx.c:996

3444 +msgid "Verifying object offsets"

3445 +msgstr "校验对象偏移"

3446 +

3447 +#: midx.c:1004

3448 +#, c-format

3449 +msgid "failed to load pack entry for oid[%d] = %s"

3450 +msgstr "为 oid[%d] = %s 加载包条目失败"

3451 +

3452 +#: midx.c:1010

3453 +#, c-format

3454 +msgid "failed to load pack-index for packfile %s"

3455 +msgstr "为包文件 %s 加载包索引失败"

3456 +

3457 +#: midx.c:1019

3458 +#, c-format

3459 +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3460 +msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

3461 +

3462 +#: name-hash.c:532

3463 +#, c-format

3464 +msgid "unable to create lazy_dir thread: %s"

3465 +msgstr "不能创建 lazy_dir 线程：%s"

3466 +

3467 +#: name-hash.c:554

3468 +#, c-format

3469 +msgid "unable to create lazy_name thread: %s"

3470 +msgstr "不能创建 lazy_name 线程：%s"

3471 +

3472 +#: name-hash.c:560

3473 +#, c-format

3474 +msgid "unable to join lazy_name thread: %s"

3475 +msgstr "不能加入 lasy_name 线程：%s"

3476 +

3477 +#: notes-merge.c:275

3478 #, c-format

3479 msgid ""

3480 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3268,7 +3485,7 @@ msgstr ""

3485 "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "

3486 "notes merge --abort' 来提交/终止前一次合并。"

3487

3271 -#: notes-merge.c:281

3488 +#: notes-merge.c:282

3489 #, c-format

3490 msgid "You have not concluded your notes merge (%s exists)."

3491 msgstr "您尚未结束注释合并（存在 %s）。"

@@ -3321,16 +3538,16 @@ msgstr "不能解析对象：%s"

3538 msgid "sha1 mismatch %s"

3539 msgstr "sha1 与 %s 不匹配"

3540

3324 -#: packfile.c:563

3541 +#: packfile.c:607

3542 msgid "offset before end of packfile (broken .idx?)"

3543 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3544

3328 -#: packfile.c:1745

3545 +#: packfile.c:1864

3546 #, c-format

3547 msgid "offset before start of pack index for %s (corrupt index?)"

3548 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3549

3333 -#: packfile.c:1749

3550 +#: packfile.c:1868

3551 #, c-format

3552 msgid "offset beyond end of pack index for %s (truncated index?)"

3553 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

@@ -3362,17 +3579,17 @@ msgstr " %s"

3579 msgid "-NUM"

3580 msgstr "-数字"

3581

3365 -#: parse-options-cb.c:44

3582 +#: parse-options-cb.c:37

3583 #, c-format

3584 msgid "malformed expiration date '%s'"

3585 msgstr "格式错误的到期时间：'%s'"

3586

3370 -#: parse-options-cb.c:112

3587 +#: parse-options-cb.c:109

3588 #, c-format

3589 msgid "malformed object name '%s'"

3590 msgstr "格式错误的对象名 '%s'"

3591

3375 -#: path.c:892

3592 +#: path.c:894

3593 #, c-format

3594 msgid "Could not make %s writable by group"

3595 msgstr "不能设置 %s 为组可写"

@@ -3486,33 +3703,46 @@ msgstr "协议错误：错误的行长度字符串：%.4s"

3703 msgid "protocol error: bad line length %d"

3704 msgstr "协议错误：错误的行长度 %d"

3705

3706 +#: preload-index.c:118

3707 +msgid "Refreshing index"

3708 +msgstr "正在刷新索引"

3709 +

3710 +#: preload-index.c:137

3711 +#, c-format

3712 +msgid "unable to create threaded lstat: %s"

3713 +msgstr "无法创建线程 lstat：%s"

3714 +

3715 #: pretty.c:962

3716 msgid "unable to parse --pretty format"

3717 msgstr "不能解析 --pretty 格式"

3718

3493 -#: range-diff.c:48

3719 +#: range-diff.c:56

3720 msgid "could not start `log`"

3721 msgstr "不能启动 `log`"

3722

3497 -#: range-diff.c:51

3723 +#: range-diff.c:59

3724 msgid "could not read `log` output"

3725 msgstr "不能读取 `log` 的输出"

3726

3501 -#: range-diff.c:66 sequencer.c:4540

3727 +#: range-diff.c:74 sequencer.c:4764

3728 #, c-format

3729 msgid "could not parse commit '%s'"

3730 msgstr "不能解析提交 '%s'"

3731

3506 -#: range-diff.c:196

3732 +#: range-diff.c:224

3733 msgid "failed to generate diff"

3734 msgstr "生成 diff 失败"

3735

3510 -#: range-diff.c:421 range-diff.c:423

3736 +#: range-diff.c:455 range-diff.c:457

3737 #, c-format

3738 msgid "could not parse log for '%s'"

3739 msgstr "不能解析 '%s' 的日志"

3740

3515 -#: read-cache.c:1579

3741 +#: read-cache.c:1490

3742 +msgid "Refresh index"

3743 +msgstr "刷新索引"

3744 +

3745 +#: read-cache.c:1604

3746 #, c-format

3747 msgid ""

3748 "index.version set, but the value is invalid.\n"

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

3751 "设置了 index.version，但是取值无效。\n"

3752 "使用版本 %i"

3753

3524 -#: read-cache.c:1589

3754 +#: read-cache.c:1614

3755 #, c-format

3756 msgid ""

3757 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -3530,135 +3760,258 @@ msgstr ""

3760 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

3761 "使用版本 %i"

3762

3533 -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3763 +#: read-cache.c:1792

3764 +#, c-format

3765 +msgid "malformed name field in the index, near path '%s'"

3766 +msgstr "索引中靠近路径 '%s' 有错误的名称字段"

3767 +

3768 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3769 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3770 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3771 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3772 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3773 +msgid "index file corrupt"

3774 +msgstr "索引文件损坏"

3775 +

3776 +#: read-cache.c:2101

3777 +#, c-format

3778 +msgid "unable to create load_cache_entries thread: %s"

3779 +msgstr "无法创建 load_cache_entries 线程：%s"

3780 +

3781 +#: read-cache.c:2114

3782 +#, c-format

3783 +msgid "unable to join load_cache_entries thread: %s"

3784 +msgstr "无法加入 load_cache_entries 线程：%s"

3785 +

3786 +#: read-cache.c:2201

3787 +#, c-format

3788 +msgid "unable to create load_index_extensions thread: %s"

3789 +msgstr "无法创建 load_index_extensions 线程：%s"

3790 +

3791 +#: read-cache.c:2228

3792 +#, c-format

3793 +msgid "unable to join load_index_extensions thread: %s"

3794 +msgstr "无法加入 load_index_extensions 线程：%s"

3795 +

3796 +#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3797 #, c-format

3798 msgid "could not close '%s'"

3799 msgstr "不能关闭 '%s'"

3800

3538 -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3801 +#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

3802 #, c-format

3803 msgid "could not stat '%s'"

3804 msgstr "不能对 '%s' 调用 stat"

3805

3543 -#: read-cache.c:2666

3806 +#: read-cache.c:3068

3807 #, c-format

3808 msgid "unable to open git dir: %s"

3809 msgstr "不能打开 git 目录：%s"

3810

3548 -#: read-cache.c:2678

3811 +#: read-cache.c:3080

3812 #, c-format

3813 msgid "unable to unlink: %s"

3814 msgstr "无法删除：%s"

3815

3816 +#: rebase-interactive.c:10

3817 +msgid ""

3818 +"\n"

3819 +"Commands:\n"

3820 +"p, pick <commit> = use commit\n"

3821 +"r, reword <commit> = use commit, but edit the commit message\n"

3822 +"e, edit <commit> = use commit, but stop for amending\n"

3823 +"s, squash <commit> = use commit, but meld into previous commit\n"

3824 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

3825 +"x, exec <command> = run command (the rest of the line) using shell\n"

3826 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

3827 +"d, drop <commit> = remove commit\n"

3828 +"l, label <label> = label current HEAD with a name\n"

3829 +"t, reset <label> = reset HEAD to a label\n"

3830 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3831 +". create a merge commit using the original merge commit's\n"

3832 +". message (or the oneline, if no original merge commit was\n"

3833 +". specified). Use -c <commit> to reword the commit message.\n"

3834 +"\n"

3835 +"These lines can be re-ordered; they are executed from top to bottom.\n"

3836 +msgstr ""

3837 +"\n"

3838 +"命令:\n"

3839 +"p, pick <提交> = 使用提交\n"

3840 +"r, reword <提交> = 使用提交，但修改提交说明\n"

3841 +"e, edit <提交> = 使用提交，进入 shell 以便进行提交修补\n"

3842 +"s, squash <提交> = 使用提交，但融合到前一个提交\n"

3843 +"f, fixup <提交> = 类似于 \"squash\"，但丢弃提交说明日志\n"

3844 +"x, exec <命令> = 使用 shell 运行命令（此行剩余部分）\n"

3845 +"b, break = 在此处停止（使用 'git rebase --continue' 继续变基）\n"

3846 +"d, drop <提交> = 删除提交\n"

3847 +"l, label <label> = 为当前 HEAD 打上标记\n"

3848 +"t, reset <label> = 重置 HEAD 到该标记\n"

3849 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3850 +". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"

3851 +". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"

3852 +". -c <提交> 可以编辑提交说明。\n"

3853 +"\n"

3854 +"可以对这些行重新排序，将从上至下执行。\n"

3855 +

3856 +#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

3857 +msgid ""

3858 +"\n"

3859 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

3860 +msgstr ""

3861 +"\n"

3862 +"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"

3863 +

3864 +#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

3865 +msgid ""

3866 +"\n"

3867 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

3868 +msgstr ""

3869 +"\n"

3870 +"如果您在这里删除一行，对应的提交将会丢失。\n"

3871 +

3872 +#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

3873 +msgid ""

3874 +"\n"

3875 +"You are editing the todo file of an ongoing interactive rebase.\n"

3876 +"To continue rebase after editing, run:\n"

3877 +" git rebase --continue\n"

3878 +"\n"

3879 +msgstr ""

3880 +"\n"

3881 +"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"

3882 +"请执行：\n"

3883 +" git rebase --continue\n"

3884 +"\n"

3885 +

3886 +#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

3887 +msgid ""

3888 +"\n"

3889 +"However, if you remove everything, the rebase will be aborted.\n"

3890 +"\n"

3891 +msgstr ""

3892 +"\n"

3893 +"然而，如果您删除全部内容，变基操作将会终止。\n"

3894 +"\n"

3895 +

3896 +#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

3897 +msgid "Note that empty commits are commented out"

3898 +msgstr "注意空提交已被注释掉"

3899 +

3900 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3901 +#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3902 +#, c-format

3903 +msgid "could not read '%s'."

3904 +msgstr "不能读取 '%s'。"

3905 +

3906 #: refs.c:192

3907 #, c-format

3908 msgid "%s does not point to a valid object!"

3909 msgstr "%s 没有指向一个有效的对象！"

3910

3558 -#: refs.c:579

3911 +#: refs.c:583

3912 #, c-format

3913 msgid "ignoring dangling symref %s"

3914 msgstr "忽略悬空符号引用 %s"

3915

3563 -#: refs.c:581 ref-filter.c:2067

3916 +#: refs.c:585 ref-filter.c:1951

3917 #, c-format

3918 msgid "ignoring broken ref %s"

3919 msgstr "忽略损坏的引用 %s"

3920

3568 -#: refs.c:685

3921 +#: refs.c:711

3922 #, c-format

3923 msgid "could not open '%s' for writing: %s"

3924 msgstr "无法为写入打开 '%s'：%s"

3925

3573 -#: refs.c:695 refs.c:746

3926 +#: refs.c:721 refs.c:772

3927 #, c-format

3928 msgid "could not read ref '%s'"

3929 msgstr "无法读取引用 '%s'"

3930

3578 -#: refs.c:701

3931 +#: refs.c:727

3932 #, c-format

3933 msgid "ref '%s' already exists"

3934 msgstr "引用 '%s' 已经存在"

3935

3583 -#: refs.c:706

3936 +#: refs.c:732

3937 #, c-format

3938 msgid "unexpected object ID when writing '%s'"

3939 msgstr "写入 '%s' 时意外的对象 ID"

3940

3588 -#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3589 -#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3941 +#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3942 +#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

3943 #: wrapper.c:656

3944 #, c-format

3945 msgid "could not write to '%s'"

3946 msgstr "不能写入 '%s'"

3947

3595 -#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3596 -#: builtin/am.c:780

3948 +#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3949 +#: builtin/am.c:728

3950 #, c-format

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

3952 msgstr "无法打开 '%s' 进行写入"

3953

3601 -#: refs.c:748

3954 +#: refs.c:774

3955 #, c-format

3956 msgid "unexpected object ID when deleting '%s'"

3957 msgstr "删除 '%s' 时意外的对象 ID"

3958

3606 -#: refs.c:879

3959 +#: refs.c:905

3960 #, c-format

3961 msgid "log for ref %s has gap after %s"

3962 msgstr "引用 %s 的日志在 %s 之后有缺口"

3963

3611 -#: refs.c:885

3964 +#: refs.c:911

3965 #, c-format

3966 msgid "log for ref %s unexpectedly ended on %s"

3967 msgstr "引用 %s 的日志意外终止于 %s "

3968

3616 -#: refs.c:943

3969 +#: refs.c:969

3970 #, c-format

3971 msgid "log for %s is empty"

3972 msgstr "%s 的日志为空"

3973

3621 -#: refs.c:1035

3974 +#: refs.c:1061

3975 #, c-format

3976 msgid "refusing to update ref with bad name '%s'"

3977 msgstr "拒绝更新有错误名称 '%s' 的引用"

3978

3626 -#: refs.c:1111

3979 +#: refs.c:1137

3980 #, c-format

3981 msgid "update_ref failed for ref '%s': %s"

3982 msgstr "对引用 '%s' 执行 update_ref 失败：%s"

3983

3631 -#: refs.c:1853

3984 +#: refs.c:1911

3985 #, c-format

3986 msgid "multiple updates for ref '%s' not allowed"

3987 msgstr "不允许对引用 '%s' 多次更新"

3988

3636 -#: refs.c:1885

3989 +#: refs.c:1943

3990 msgid "ref updates forbidden inside quarantine environment"

3991 msgstr "在隔离环境中禁止更新引用"

3992

3640 -#: refs.c:1981 refs.c:2011

3993 +#: refs.c:2039 refs.c:2069

3994 #, c-format

3995 msgid "'%s' exists; cannot create '%s'"

3996 msgstr "'%s' 已存在，无法创建 '%s'"

3997

3645 -#: refs.c:1987 refs.c:2022

3998 +#: refs.c:2045 refs.c:2080

3999 #, c-format

4000 msgid "cannot process '%s' and '%s' at the same time"

4001 msgstr "无法同时处理 '%s' 和 '%s'"

4002

3650 -#: refs/files-backend.c:1191

4003 +#: refs/files-backend.c:1228

4004 #, c-format

4005 msgid "could not remove reference %s"

4006 msgstr "无法删除引用 %s"

4007

3655 -#: refs/files-backend.c:1205 refs/packed-backend.c:1532

4008 +#: refs/files-backend.c:1242 refs/packed-backend.c:1532

4009 #: refs/packed-backend.c:1542

4010 #, c-format

4011 msgid "could not delete reference %s: %s"

4012 msgstr "无法删除引用 %s：%s"

4013

3661 -#: refs/files-backend.c:1208 refs/packed-backend.c:1545

4014 +#: refs/files-backend.c:1245 refs/packed-backend.c:1545

4015 #, c-format

4016 msgid "could not delete references: %s"

4017 msgstr "无法删除引用：%s"

@@ -3668,191 +4021,197 @@ msgstr "无法删除引用：%s"

4021 msgid "invalid refspec '%s'"

4022 msgstr "无效的引用表达式：'%s'"

4023

3671 -#: ref-filter.c:38 wt-status.c:1850

4024 +#: ref-filter.c:39 wt-status.c:1855

4025 msgid "gone"

4026 msgstr "丢失"

4027

3675 -#: ref-filter.c:39

4028 +#: ref-filter.c:40

4029 #, c-format

4030 msgid "ahead %d"

4031 msgstr "领先 %d"

4032

3680 -#: ref-filter.c:40

4033 +#: ref-filter.c:41

4034 #, c-format

4035 msgid "behind %d"

4036 msgstr "落后 %d"

4037

3685 -#: ref-filter.c:41

4038 +#: ref-filter.c:42

4039 #, c-format

4040 msgid "ahead %d, behind %d"

4041 msgstr "领先 %d，落后 %d"

4042

3690 -#: ref-filter.c:137

4043 +#: ref-filter.c:138

4044 #, c-format

4045 msgid "expected format: %%(color:<color>)"

4046 msgstr "期望的格式：%%(color:<颜色>)"

4047

3695 -#: ref-filter.c:139

4048 +#: ref-filter.c:140

4049 #, c-format

4050 msgid "unrecognized color: %%(color:%s)"

4051 msgstr "未能识别的颜色：%%(color:%s)"

4052

3700 -#: ref-filter.c:161

4053 +#: ref-filter.c:162

4054 #, c-format

4055 msgid "Integer value expected refname:lstrip=%s"

4056 msgstr "期望整数值 refname:lstrip=%s"

4057

3705 -#: ref-filter.c:165

4058 +#: ref-filter.c:166

4059 #, c-format

4060 msgid "Integer value expected refname:rstrip=%s"

4061 msgstr "期望整数值 refname:rstrip=%s"

4062

3710 -#: ref-filter.c:167

4063 +#: ref-filter.c:168

4064 #, c-format

4065 msgid "unrecognized %%(%s) argument: %s"

4066 msgstr "未能识别的 %%(%s) 参数：%s"

4067

3715 -#: ref-filter.c:222

4068 +#: ref-filter.c:223

4069 #, c-format

4070 msgid "%%(objecttype) does not take arguments"

4071 msgstr "%%(objecttype) 不带参数"

4072

3720 -#: ref-filter.c:234

4073 +#: ref-filter.c:235

4074 #, c-format

4075 msgid "%%(objectsize) does not take arguments"

4076 msgstr "%%(objectsize) 不带参数"

4077

3725 -#: ref-filter.c:246

4078 +#: ref-filter.c:247

4079 #, c-format

4080 msgid "%%(body) does not take arguments"

4081 msgstr "%%(body) 不带参数"

4082

3730 -#: ref-filter.c:255

4083 +#: ref-filter.c:256

4084 #, c-format

4085 msgid "%%(subject) does not take arguments"

4086 msgstr "%%(subject) 不带参数"

4087

3735 -#: ref-filter.c:275

4088 +#: ref-filter.c:278

4089 #, c-format

4090 msgid "unknown %%(trailers) argument: %s"

4091 msgstr "未知的 %%(trailers) 参数：%s"

4092

3740 -#: ref-filter.c:304

4093 +#: ref-filter.c:307

4094 #, c-format

4095 msgid "positive value expected contents:lines=%s"

4096 msgstr "期望一个正数 contents:lines=%s"

4097

3745 -#: ref-filter.c:306

4098 +#: ref-filter.c:309

4099 #, c-format

4100 msgid "unrecognized %%(contents) argument: %s"

4101 msgstr "未能识别的 %%(contents) 参数：%s"

4102

3750 -#: ref-filter.c:321

4103 +#: ref-filter.c:324

4104 #, c-format

4105 msgid "positive value expected objectname:short=%s"

4106 msgstr "期望一个正数 objectname:short=%s"

4107

3755 -#: ref-filter.c:325

4108 +#: ref-filter.c:328

4109 #, c-format

4110 msgid "unrecognized %%(objectname) argument: %s"

4111 msgstr "未能识别的 %%(objectname) 参数：%s"

4112

3760 -#: ref-filter.c:355

4113 +#: ref-filter.c:358

4114 #, c-format

4115 msgid "expected format: %%(align:<width>,<position>)"

4116 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

4117

3765 -#: ref-filter.c:367

4118 +#: ref-filter.c:370

4119 #, c-format

4120 msgid "unrecognized position:%s"

4121 msgstr "未能识别的位置：%s"

4122

3770 -#: ref-filter.c:374

4123 +#: ref-filter.c:377

4124 #, c-format

4125 msgid "unrecognized width:%s"

4126 msgstr "未能识别的宽度：%s"

4127

3775 -#: ref-filter.c:383

4128 +#: ref-filter.c:386

4129 #, c-format

4130 msgid "unrecognized %%(align) argument: %s"

4131 msgstr "未能识别的 %%(align) 参数：%s"

4132

3780 -#: ref-filter.c:391

4133 +#: ref-filter.c:394

4134 #, c-format

4135 msgid "positive width expected with the %%(align) atom"

4136 msgstr "元素 %%(align) 需要一个正数的宽度"

4137

3785 -#: ref-filter.c:409

4138 +#: ref-filter.c:412

4139 #, c-format

4140 msgid "unrecognized %%(if) argument: %s"

4141 msgstr "未能识别的 %%(if) 参数：%s"

4142

3790 -#: ref-filter.c:505

4143 +#: ref-filter.c:508

4144 #, c-format

4145 msgid "malformed field name: %.*s"

4146 msgstr "格式错误的字段名：%.*s"

4147

3795 -#: ref-filter.c:532

4148 +#: ref-filter.c:535

4149 #, c-format

4150 msgid "unknown field name: %.*s"

4151 msgstr "未知的字段名：%.*s"

4152

3800 -#: ref-filter.c:656

4153 +#: ref-filter.c:539

4154 +#, c-format

4155 +msgid ""

4156 +"not a git repository, but the field '%.*s' requires access to object data"

4157 +msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

4158 +

4159 +#: ref-filter.c:663

4160 #, c-format

4161 msgid "format: %%(if) atom used without a %%(then) atom"

4162 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

4163

3805 -#: ref-filter.c:719

4164 +#: ref-filter.c:726

4165 #, c-format

4166 msgid "format: %%(then) atom used without an %%(if) atom"

4167 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

4168

3810 -#: ref-filter.c:721

4169 +#: ref-filter.c:728

4170 #, c-format

4171 msgid "format: %%(then) atom used more than once"

4172 msgstr "格式：%%(then) 元素用了多次"

4173

3815 -#: ref-filter.c:723

4174 +#: ref-filter.c:730

4175 #, c-format

4176 msgid "format: %%(then) atom used after %%(else)"

4177 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

4178

3820 -#: ref-filter.c:751

4179 +#: ref-filter.c:758

4180 #, c-format

4181 msgid "format: %%(else) atom used without an %%(if) atom"

4182 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

4183

3825 -#: ref-filter.c:753

4184 +#: ref-filter.c:760

4185 #, c-format

4186 msgid "format: %%(else) atom used without a %%(then) atom"

4187 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

4188

3830 -#: ref-filter.c:755

4189 +#: ref-filter.c:762

4190 #, c-format

4191 msgid "format: %%(else) atom used more than once"

4192 msgstr "格式：%%(else) 元素用了多次"

4193

3835 -#: ref-filter.c:770

4194 +#: ref-filter.c:777

4195 #, c-format

4196 msgid "format: %%(end) atom used without corresponding atom"

4197 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

4198

3840 -#: ref-filter.c:827

4199 +#: ref-filter.c:834

4200 #, c-format

4201 msgid "malformed format string %s"

4202 msgstr "错误的格式化字符串 %s"

4203

3845 -#: ref-filter.c:1416

4204 +#: ref-filter.c:1424

4205 #, c-format

4206 msgid "(no branch, rebasing %s)"

4207 msgstr "（非分支，正变基 %s）"

4208

3850 -#: ref-filter.c:1419

4209 +#: ref-filter.c:1427

4210 #, c-format

4211 msgid "(no branch, rebasing detached HEAD %s)"

4212 msgstr "（非分支，正变基分离头指针 %s）"

4213

3855 -#: ref-filter.c:1422

4214 +#: ref-filter.c:1430

4215 #, c-format

4216 msgid "(no branch, bisect started on %s)"

4217 msgstr "（非分支，二分查找开始于 %s）"

@@ -3860,7 +4219,7 @@ msgstr "（非分支，二分查找开始于 %s）"

4219 #. TRANSLATORS: make sure this matches "HEAD

4220 #. detached at " in wt-status.c

4221 #.

3863 -#: ref-filter.c:1430

4222 +#: ref-filter.c:1438

4223 #, c-format

4224 msgid "(HEAD detached at %s)"

4225 msgstr "（头指针分离于 %s）"

@@ -3868,142 +4227,142 @@ msgstr "（头指针分离于 %s）"

4227 #. TRANSLATORS: make sure this matches "HEAD

4228 #. detached from " in wt-status.c

4229 #.

3871 -#: ref-filter.c:1437

4230 +#: ref-filter.c:1445

4231 #, c-format

4232 msgid "(HEAD detached from %s)"

4233 msgstr "（头指针分离自 %s）"

4234

3876 -#: ref-filter.c:1441

4235 +#: ref-filter.c:1449

4236 msgid "(no branch)"

4237 msgstr "（非分支）"

4238

3880 -#: ref-filter.c:1475 ref-filter.c:1623

4239 +#: ref-filter.c:1483 ref-filter.c:1638

4240 #, c-format

4241 msgid "missing object %s for %s"

4242 msgstr "缺失 %2$s 的对象 %1$s"

4243

3885 -#: ref-filter.c:1483

4244 +#: ref-filter.c:1491

4245 #, c-format

4246 msgid "parse_object_buffer failed on %s for %s"

4247 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

4248

3890 -#: ref-filter.c:1980

4249 +#: ref-filter.c:1857

4250 #, c-format

4251 msgid "malformed object at '%s'"

4252 msgstr "格式错误的对象 '%s'"

4253

3895 -#: ref-filter.c:2062

4254 +#: ref-filter.c:1946

4255 #, c-format

4256 msgid "ignoring ref with broken name %s"

4257 msgstr "忽略带有错误名称 %s 的引用"

4258

3900 -#: ref-filter.c:2340

4259 +#: ref-filter.c:2232

4260 #, c-format

4261 msgid "format: %%(end) atom missing"

4262 msgstr "格式：缺少 %%(end) 元素"

4263

3905 -#: ref-filter.c:2444

4264 +#: ref-filter.c:2338

4265 #, c-format

4266 msgid "malformed object name %s"

4267 msgstr "格式错误的对象名 %s"

4268

3910 -#: remote.c:606

4269 +#: remote.c:607

4270 #, c-format

4271 msgid "Cannot fetch both %s and %s to %s"

4272 msgstr "不能同时获取 %s 和 %s 至 %s"

4273

3915 -#: remote.c:610

4274 +#: remote.c:611

4275 #, c-format

4276 msgid "%s usually tracks %s, not %s"

4277 msgstr "%s 通常跟踪 %s，而非 %s"

4278

3920 -#: remote.c:614

4279 +#: remote.c:615

4280 #, c-format

4281 msgid "%s tracks both %s and %s"

4282 msgstr "%s 同时跟踪 %s 和 %s"

4283

3925 -#: remote.c:622

4284 +#: remote.c:623

4285 msgid "Internal error"

4286 msgstr "内部错误"

4287

3929 -#: remote.c:1536 remote.c:1637

4288 +#: remote.c:1569 remote.c:1670

4289 msgid "HEAD does not point to a branch"

4290 msgstr "HEAD 没有指向一个分支"

4291

3933 -#: remote.c:1545

4292 +#: remote.c:1578

4293 #, c-format

4294 msgid "no such branch: '%s'"

4295 msgstr "没有此分支：'%s'"

4296

3938 -#: remote.c:1548

4297 +#: remote.c:1581

4298 #, c-format

4299 msgid "no upstream configured for branch '%s'"

4300 msgstr "尚未给分支 '%s' 设置上游"

4301

3943 -#: remote.c:1554

4302 +#: remote.c:1587

4303 #, c-format

4304 msgid "upstream branch '%s' not stored as a remote-tracking branch"

4305 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

4306

3948 -#: remote.c:1569

4307 +#: remote.c:1602

4308 #, c-format

4309 msgid "push destination '%s' on remote '%s' has no local tracking branch"

4310 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

4311

3953 -#: remote.c:1581

4312 +#: remote.c:1614

4313 #, c-format

4314 msgid "branch '%s' has no remote for pushing"

4315 msgstr "分支 '%s' 没有设置要推送的远程服务器"

4316

3958 -#: remote.c:1591

4317 +#: remote.c:1624

4318 #, c-format

4319 msgid "push refspecs for '%s' do not include '%s'"

4320 msgstr "向 '%s' 推送引用规格未包含 '%s'"

4321

3963 -#: remote.c:1604

4322 +#: remote.c:1637

4323 msgid "push has no destination (push.default is 'nothing')"

4324 msgstr "推送无目标（push.default 是 'nothing'）"

4325

3967 -#: remote.c:1626

4326 +#: remote.c:1659

4327 msgid "cannot resolve 'simple' push to a single destination"

4328 msgstr "无法解析 'simple' 推送至一个单独的目标"

4329

3971 -#: remote.c:1951

4330 +#: remote.c:1935

4331 #, c-format

4332 msgid "Your branch is based on '%s', but the upstream is gone.\n"

4333 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

4334

3976 -#: remote.c:1955

4335 +#: remote.c:1939

4336 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

4337 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

4338

3980 -#: remote.c:1958

4339 +#: remote.c:1942

4340 #, c-format

4341 msgid "Your branch is up to date with '%s'.\n"

4342 msgstr "您的分支与上游分支 '%s' 一致。\n"

4343

3985 -#: remote.c:1962

4344 +#: remote.c:1946

4345 #, c-format

4346 msgid "Your branch and '%s' refer to different commits.\n"

4347 msgstr "您的分支和 '%s' 指向不同的提交。\n"

4348

3990 -#: remote.c:1965

4349 +#: remote.c:1949

4350 #, c-format

4351 msgid " (use \"%s\" for details)\n"

4352 msgstr " （使用 \"%s\" 查看详情）\n"

4353

3995 -#: remote.c:1969

4354 +#: remote.c:1953

4355 #, c-format

4356 msgid "Your branch is ahead of '%s' by %d commit.\n"

4357 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

4358 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

4359 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

4360

4002 -#: remote.c:1975

4361 +#: remote.c:1959

4362 msgid " (use \"git push\" to publish your local commits)\n"

4363 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

4364

4006 -#: remote.c:1978

4365 +#: remote.c:1962

4366 #, c-format

4367 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

4368 msgid_plural ""

@@ -4012,11 +4371,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

4371 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

4372

4373 # 译者：注意保持前导空格

4015 -#: remote.c:1986

4374 +#: remote.c:1970

4375 msgid " (use \"git pull\" to update your local branch)\n"

4376 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

4377

4019 -#: remote.c:1989

4378 +#: remote.c:1973

4379 #, c-format

4380 msgid ""

4381 "Your branch and '%s' have diverged,\n"

@@ -4032,115 +4391,218 @@ msgstr[1] ""

4391 "并且分别有 %d 和 %d 处不同的提交。\n"

4392

4393 # 译者：注意保持前导空格

4035 -#: remote.c:1999

4394 +#: remote.c:1983

4395 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

4396 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

4397

4039 -#: replace-object.c:20

4398 +#: replace-object.c:21

4399 #, c-format

4400 msgid "bad replace ref name: %s"

4401 msgstr "错误的替换引用名称：%s"

4402

4044 -#: replace-object.c:29

4403 +#: replace-object.c:30

4404 #, c-format

4405 msgid "duplicate replace ref: %s"

4406 msgstr "重复的替换引用：%s"

4407

4049 -#: replace-object.c:72

4408 +#: replace-object.c:73

4409 #, c-format

4410 msgid "replace depth too high for object %s"

4411 msgstr "对象 %s 的替换层级太深"

4412

4054 -#: revision.c:2305

4055 -msgid "your current branch appears to be broken"

4056 -msgstr "您的当前分支好像被损坏"

4413 +#: rerere.c:217 rerere.c:226 rerere.c:229

4414 +msgid "corrupt MERGE_RR"

4415 +msgstr "损坏的 MERGE_RR"

4416 +

4417 +#: rerere.c:264 rerere.c:269

4418 +msgid "unable to write rerere record"

4419 +msgstr "无法写入 rerere 记录"

4420

4058 -#: revision.c:2308

4421 +#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4422 #, c-format

4060 -msgid "your current branch '%s' does not have any commits yet"

4061 -msgstr "您的当前分支 '%s' 尚无任何提交"

4423 +msgid "could not write '%s'"

4424 +msgstr "不能写入 '%s'"

4425

4063 -#: revision.c:2505

4064 -msgid "--first-parent is incompatible with --bisect"

4065 -msgstr "--first-parent 与 --bisect 不兼容"

4426 +#: rerere.c:495

4427 +#, c-format

4428 +msgid "there were errors while writing '%s' (%s)"

4429 +msgstr "写入 '%s' (%s) 时出错"

4430

4067 -#: run-command.c:728

4068 -msgid "open /dev/null failed"

4069 -msgstr "不能打开 /dev/null"

4431 +#: rerere.c:498

4432 +#, c-format

4433 +msgid "failed to flush '%s'"

4434 +msgstr "刷新 '%s' 失败"

4435

4071 -#: run-command.c:1271

4436 +#: rerere.c:503 rerere.c:1039

4437 #, c-format

4073 -msgid ""

4074 -"The '%s' hook was ignored because it's not set as executable.\n"

4075 -"You can disable this warning with `git config advice.ignoredHook false`."

4076 -msgstr ""

4077 -"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

4078 -"配置 `git config advice.ignoredHook false` 来关闭这条警告。"

4438 +msgid "could not parse conflict hunks in '%s'"

4439 +msgstr "不能解析 '%s' 中的冲突块"

4440

4080 -#: send-pack.c:142

4081 -msgid "unexpected flush packet while reading remote unpack status"

4082 -msgstr "读取远程解包状态时收到意外的 flush 包"

4441 +#: rerere.c:684

4442 +#, c-format

4443 +msgid "failed utime() on '%s'"

4444 +msgstr "在 '%s' 上调用 utime() 失败"

4445

4084 -#: send-pack.c:144

4446 +#: rerere.c:694

4447 #, c-format

4086 -msgid "unable to parse remote unpack status: %s"

4087 -msgstr "不能解析远程解包状态：%s"

4448 +msgid "writing '%s' failed"

4449 +msgstr "写入 '%s' 失败"

4450

4089 -#: send-pack.c:146

4451 +#: rerere.c:714

4452 #, c-format

4091 -msgid "remote unpack failed: %s"

4092 -msgstr "远程解包失败：%s"

4453 +msgid "Staged '%s' using previous resolution."

4454 +msgstr "使用之前的解决方案暂存 '%s'。"

4455

4094 -#: send-pack.c:309

4095 -msgid "failed to sign the push certificate"

4096 -msgstr "为推送证书签名失败"

4456 +#: rerere.c:753

4457 +#, c-format

4458 +msgid "Recorded resolution for '%s'."

4459 +msgstr "已记录 '%s' 的解决方案。"

4460

4098 -#: send-pack.c:422

4461 +#: rerere.c:788

4462 +#, c-format

4463 +msgid "Resolved '%s' using previous resolution."

4464 +msgstr "使用之前的解决方案解决 '%s'。"

4465 +

4466 +#: rerere.c:803

4467 +#, c-format

4468 +msgid "cannot unlink stray '%s'"

4469 +msgstr "不能删除 stray '%s'"

4470 +

4471 +#: rerere.c:807

4472 +#, c-format

4473 +msgid "Recorded preimage for '%s'"

4474 +msgstr "为 '%s' 记录 preimage"

4475 +

4476 +#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4477 +#: builtin/submodule--helper.c:1423

4478 +#, c-format

4479 +msgid "could not create directory '%s'"

4480 +msgstr "不能创建目录 '%s'"

4481 +

4482 +#: rerere.c:1057

4483 +#, c-format

4484 +msgid "failed to update conflicted state in '%s'"

4485 +msgstr "更新 '%s' 中的冲突状态失败"

4486 +

4487 +#: rerere.c:1068 rerere.c:1075

4488 +#, c-format

4489 +msgid "no remembered resolution for '%s'"

4490 +msgstr "没有为 '%s' 记忆的解决方案"

4491 +

4492 +#: rerere.c:1077

4493 +#, c-format

4494 +msgid "cannot unlink '%s'"

4495 +msgstr "不能删除 '%s'"

4496 +

4497 +#: rerere.c:1087

4498 +#, c-format

4499 +msgid "Updated preimage for '%s'"

4500 +msgstr "已为 '%s' 更新 preimage"

4501 +

4502 +#: rerere.c:1096

4503 +#, c-format

4504 +msgid "Forgot resolution for '%s'\n"

4505 +msgstr "忘记 '%s' 的解决方案\n"

4506 +

4507 +#: rerere.c:1199

4508 +msgid "unable to open rr-cache directory"

4509 +msgstr "不能打开 rr-cache 目录"

4510 +

4511 +#: revision.c:2324

4512 +msgid "your current branch appears to be broken"

4513 +msgstr "您的当前分支好像被损坏"

4514 +

4515 +#: revision.c:2327

4516 +#, c-format

4517 +msgid "your current branch '%s' does not have any commits yet"

4518 +msgstr "您的当前分支 '%s' 尚无任何提交"

4519 +

4520 +#: revision.c:2523

4521 +msgid "--first-parent is incompatible with --bisect"

4522 +msgstr "--first-parent 与 --bisect 不兼容"

4523 +

4524 +#: run-command.c:740

4525 +msgid "open /dev/null failed"

4526 +msgstr "不能打开 /dev/null"

4527 +

4528 +#: run-command.c:1229

4529 +#, c-format

4530 +msgid "cannot create async thread: %s"

4531 +msgstr "不能创建 async 线程：%s"

4532 +

4533 +#: run-command.c:1293

4534 +#, c-format

4535 +msgid ""

4536 +"The '%s' hook was ignored because it's not set as executable.\n"

4537 +"You can disable this warning with `git config advice.ignoredHook false`."

4538 +msgstr ""

4539 +"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

4540 +"配置 `git config advice.ignoredHook false` 来关闭这条警告。"

4541 +

4542 +#: send-pack.c:142

4543 +msgid "unexpected flush packet while reading remote unpack status"

4544 +msgstr "读取远程解包状态时收到意外的 flush 包"

4545 +

4546 +#: send-pack.c:144

4547 +#, c-format

4548 +msgid "unable to parse remote unpack status: %s"

4549 +msgstr "不能解析远程解包状态：%s"

4550 +

4551 +#: send-pack.c:146

4552 +#, c-format

4553 +msgid "remote unpack failed: %s"

4554 +msgstr "远程解包失败：%s"

4555 +

4556 +#: send-pack.c:308

4557 +msgid "failed to sign the push certificate"

4558 +msgstr "为推送证书签名失败"

4559 +

4560 +#: send-pack.c:421

4561 msgid "the receiving end does not support --signed push"

4562 msgstr "接收端不支持签名推送"

4563

4102 -#: send-pack.c:424

4564 +#: send-pack.c:423

4565 msgid ""

4566 "not sending a push certificate since the receiving end does not support --"

4567 "signed push"

4568 msgstr "未发送推送证书，因为接收端不支持签名推送"

4569

4108 -#: send-pack.c:436

4570 +#: send-pack.c:435

4571 msgid "the receiving end does not support --atomic push"

4572 msgstr "接收端不支持原子推送"

4573

4112 -#: send-pack.c:441

4574 +#: send-pack.c:440

4575 msgid "the receiving end does not support push options"

4576 msgstr "接收端不支持推送选项"

4577

4116 -#: sequencer.c:177

4578 +#: sequencer.c:183

4579 #, c-format

4580 msgid "invalid commit message cleanup mode '%s'"

4581 msgstr "无效的提交信息清理模式 '%s'"

4582

4121 -#: sequencer.c:278

4583 +#: sequencer.c:287

4584 #, c-format

4585 msgid "could not delete '%s'"

4586 msgstr "无法删除 '%s'"

4587

4126 -#: sequencer.c:304

4588 +#: sequencer.c:313

4589 msgid "revert"

4590 msgstr "还原"

4591

4130 -#: sequencer.c:306

4592 +#: sequencer.c:315

4593 msgid "cherry-pick"

4594 msgstr "拣选"

4595

4134 -#: sequencer.c:308

4596 +#: sequencer.c:317

4597 msgid "rebase -i"

4598 msgstr "rebase -i"

4599

4138 -#: sequencer.c:310

4600 +#: sequencer.c:319

4601 #, c-format

4602 msgid "unknown action: %d"

4603 msgstr "未知动作：%d"

4604

4143 -#: sequencer.c:367

4605 +#: sequencer.c:376

4606 msgid ""

4607 "after resolving the conflicts, mark the corrected paths\n"

4608 "with 'git add <paths>' or 'git rm <paths>'"

@@ -4148,7 +4610,7 @@ msgstr ""

4610 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

4611 "命令标记修正后的文件"

4612

4151 -#: sequencer.c:370

4613 +#: sequencer.c:379

4614 msgid ""

4615 "after resolving the conflicts, mark the corrected paths\n"

4616 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -4157,39 +4619,39 @@ msgstr ""

4619 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

4620 "对修正后的文件做标记，然后用 'git commit' 提交"

4621

4160 -#: sequencer.c:383 sequencer.c:2488

4622 +#: sequencer.c:392 sequencer.c:2632

4623 #, c-format

4624 msgid "could not lock '%s'"

4625 msgstr "不能锁定 '%s'"

4626

4165 -#: sequencer.c:390

4627 +#: sequencer.c:399

4628 #, c-format

4629 msgid "could not write eol to '%s'"

4630 msgstr "不能将换行符写入 '%s'"

4631

4170 -#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4171 -#: sequencer.c:2741

4632 +#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4633 +#: sequencer.c:2885

4634 #, c-format

4635 msgid "failed to finalize '%s'"

4636 msgstr "无法完成 '%s'"

4637

4176 -#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4177 -#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4178 -#: builtin/merge.c:1081

4638 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4639 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4640 +#: builtin/merge.c:1084 builtin/rebase.c:152

4641 #, c-format

4642 msgid "could not read '%s'"

4643 msgstr "不能读取 '%s'"

4644

4183 -#: sequencer.c:444

4645 +#: sequencer.c:453

4646 #, c-format

4647 msgid "your local changes would be overwritten by %s."

4648 msgstr "您的本地修改将被%s覆盖。"

4649

4188 -#: sequencer.c:448

4650 +#: sequencer.c:457

4651 msgid "commit your changes or stash them to proceed."

4652 msgstr "提交您的修改或贮藏后再继续。"

4653

4192 -#: sequencer.c:477

4654 +#: sequencer.c:486

4655 #, c-format

4656 msgid "%s: fast-forward"

4657 msgstr "%s：快进"

@@ -4197,35 +4659,70 @@ msgstr "%s：快进"

4659 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

4660 #. "rebase -i".

4661 #.

4200 -#: sequencer.c:566

4662 +#: sequencer.c:575

4663 #, c-format

4664 msgid "%s: Unable to write new index file"

4665 msgstr "%s：无法写入新索引文件"

4666

4205 -#: sequencer.c:582

4667 +#: sequencer.c:591

4668 msgid "unable to update cache tree"

4669 msgstr "不能更新缓存树"

4670

4209 -#: sequencer.c:595

4671 +#: sequencer.c:604

4672 msgid "could not resolve HEAD commit"

4673 msgstr "不能解析 HEAD 提交"

4674

4213 -#: sequencer.c:723 sequencer.c:740

4675 +#: sequencer.c:684

4676 +#, c-format

4677 +msgid "no key present in '%.*s'"

4678 +msgstr "在 '%.*s' 中没有 key"

4679 +

4680 +#: sequencer.c:695

4681 #, c-format

4215 -msgid "could not parse '%s' (looking for '%s')"

4216 -msgstr "不能解析 '%s'（查找 '%s'）"

4682 +msgid "unable to dequote value of '%s'"

4683 +msgstr "无法为 '%s' 的值去引号"

4684

4218 -#: sequencer.c:731

4685 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4686 +#: builtin/am.c:811 builtin/merge.c:1081

4687 #, c-format

4220 -msgid "bad quoting on %s value in '%s'"

4221 -msgstr "'%2$s' 中的值 %1$s 有错误引用"

4688 +msgid "could not open '%s' for reading"

4689 +msgstr "无法打开 '%s' 进行读取"

4690 +

4691 +#: sequencer.c:742

4692 +msgid "'GIT_AUTHOR_NAME' already given"

4693 +msgstr "已经给出 'GIT_AUTHOR_NAME'"

4694

4695 #: sequencer.c:747

4696 +msgid "'GIT_AUTHOR_EMAIL' already given"

4697 +msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

4698 +

4699 +#: sequencer.c:752

4700 +msgid "'GIT_AUTHOR_DATE' already given"

4701 +msgstr "已经给出 'GIT_AUTHOR_DATE'"

4702 +

4703 +#: sequencer.c:756

4704 +#, c-format

4705 +msgid "unknown variable '%s'"

4706 +msgstr "未知变量 '%s'"

4707 +

4708 +#: sequencer.c:761

4709 +msgid "missing 'GIT_AUTHOR_NAME'"

4710 +msgstr "缺少 'GIT_AUTHOR_NAME'"

4711 +

4712 +#: sequencer.c:763

4713 +msgid "missing 'GIT_AUTHOR_EMAIL'"

4714 +msgstr "缺少 'GIT_AUTHOR_EMAIL'"

4715 +

4716 +#: sequencer.c:765

4717 +msgid "missing 'GIT_AUTHOR_DATE'"

4718 +msgstr "缺少 'GIT_AUTHOR_DATE'"

4719 +

4720 +#: sequencer.c:825

4721 #, c-format

4722 msgid "invalid date format '%s' in '%s'"

4723 msgstr "'%2$s' 中无效的日期格式 '%1$s'"

4724

4228 -#: sequencer.c:761

4725 +#: sequencer.c:842

4726 #, c-format

4727 msgid ""

4728 "you have staged changes in your working tree\n"

@@ -4254,15 +4751,15 @@ msgstr ""

4751 "\n"

4752 " git rebase --continue\n"

4753

4257 -#: sequencer.c:830

4754 +#: sequencer.c:935

4755 msgid "writing root commit"

4756 msgstr "写根提交"

4757

4261 -#: sequencer.c:1055

4758 +#: sequencer.c:1142

4759 msgid "'prepare-commit-msg' hook failed"

4760 msgstr "'prepare-commit-msg' 钩子失败"

4761

4265 -#: sequencer.c:1062

4762 +#: sequencer.c:1149

4763 msgid ""

4764 "Your name and email address were configured automatically based\n"

4765 "on your username and hostname. Please check that they are accurate.\n"

@@ -4286,7 +4783,7 @@ msgstr ""

4783 "\n"

4784 " git commit --amend --reset-author\n"

4785

4289 -#: sequencer.c:1075

4786 +#: sequencer.c:1162

4787 msgid ""

4788 "Your name and email address were configured automatically based\n"

4789 "on your username and hostname. Please check that they are accurate.\n"

@@ -4309,305 +4806,300 @@ msgstr ""

4806 "\n"

4807 " git commit --amend --reset-author\n"

4808

4312 -#: sequencer.c:1115

4809 +#: sequencer.c:1202

4810 msgid "couldn't look up newly created commit"

4811 msgstr "无法找到新创建的提交"

4812

4316 -#: sequencer.c:1117

4813 +#: sequencer.c:1204

4814 msgid "could not parse newly created commit"

4815 msgstr "不能解析新创建的提交"

4816

4320 -#: sequencer.c:1163

4817 +#: sequencer.c:1250

4818 msgid "unable to resolve HEAD after creating commit"

4819 msgstr "创建提交后，不能解析 HEAD"

4820

4324 -#: sequencer.c:1165

4821 +#: sequencer.c:1252

4822 msgid "detached HEAD"

4823 msgstr "分离头指针"

4824

4825 # 译者：中文字符串拼接，可删除前导空格

4329 -#: sequencer.c:1169

4826 +#: sequencer.c:1256

4827 msgid " (root-commit)"

4828 msgstr "（根提交）"

4829

4333 -#: sequencer.c:1190

4830 +#: sequencer.c:1277

4831 msgid "could not parse HEAD"

4832 msgstr "不能解析 HEAD"

4833

4337 -#: sequencer.c:1192

4834 +#: sequencer.c:1279

4835 #, c-format

4836 msgid "HEAD %s is not a commit!"

4837 msgstr "HEAD %s 不是一个提交！"

4838

4342 -#: sequencer.c:1196 builtin/commit.c:1528

4839 +#: sequencer.c:1283 builtin/commit.c:1543

4840 msgid "could not parse HEAD commit"

4841 msgstr "不能解析 HEAD 提交"

4842

4346 -#: sequencer.c:1247 sequencer.c:1845

4843 +#: sequencer.c:1334 sequencer.c:1934

4844 msgid "unable to parse commit author"

4845 msgstr "不能解析提交作者"

4846

4350 -#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4847 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4848 msgid "git write-tree failed to write a tree"

4849 msgstr "git write-tree 无法写入树对象"

4850

4354 -#: sequencer.c:1274 sequencer.c:1329

4851 +#: sequencer.c:1361 sequencer.c:1416

4852 #, c-format

4853 msgid "unable to read commit message from '%s'"

4854 msgstr "不能从 '%s' 读取提交说明"

4855

4359 -#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4360 -#: builtin/merge.c:880

4856 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4857 +#: builtin/merge.c:883

4858 msgid "failed to write commit object"

4859 msgstr "写提交对象失败"

4860

4364 -#: sequencer.c:1356

4861 +#: sequencer.c:1443

4862 #, c-format

4863 msgid "could not parse commit %s"

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

4865

4369 -#: sequencer.c:1361

4866 +#: sequencer.c:1448

4867 #, c-format

4868 msgid "could not parse parent commit %s"

4869 msgstr "不能解析父提交 %s"

4870

4374 -#: sequencer.c:1457 sequencer.c:1565

4871 +#: sequencer.c:1546 sequencer.c:1654

4872 #, c-format

4873 msgid "unknown command: %d"

4874 msgstr "未知命令：%d"

4875

4379 -#: sequencer.c:1512 sequencer.c:1537

4876 +#: sequencer.c:1601 sequencer.c:1626

4877 #, c-format

4878 msgid "This is a combination of %d commits."

4879 msgstr "这是一个 %d 个提交的组合。"

4880

4384 -#: sequencer.c:1522 sequencer.c:4520

4881 +#: sequencer.c:1611 sequencer.c:4744

4882 msgid "need a HEAD to fixup"

4883 msgstr "需要一个 HEAD 来修复"

4884

4388 -#: sequencer.c:1524 sequencer.c:2768

4885 +#: sequencer.c:1613 sequencer.c:2912

4886 msgid "could not read HEAD"

4887 msgstr "不能读取 HEAD"

4888

4392 -#: sequencer.c:1526

4889 +#: sequencer.c:1615

4890 msgid "could not read HEAD's commit message"

4891 msgstr "不能读取 HEAD 的提交说明"

4892

4396 -#: sequencer.c:1532

4893 +#: sequencer.c:1621

4894 #, c-format

4895 msgid "cannot write '%s'"

4896 msgstr "不能写 '%s'"

4897

4401 -#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4898 +#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4899 msgid "This is the 1st commit message:"

4900 msgstr "这是第一个提交说明："

4901

4405 -#: sequencer.c:1547

4902 +#: sequencer.c:1636

4903 #, c-format

4904 msgid "could not read commit message of %s"

4905 msgstr "不能读取 %s 的提交说明"

4906

4410 -#: sequencer.c:1554

4907 +#: sequencer.c:1643

4908 #, c-format

4909 msgid "This is the commit message #%d:"

4910 msgstr "这是提交说明 #%d："

4911

4415 -#: sequencer.c:1560

4912 +#: sequencer.c:1649

4913 #, c-format

4914 msgid "The commit message #%d will be skipped:"

4915 msgstr "提交说明 #%d 将被跳过："

4916

4420 -#: sequencer.c:1643

4917 +#: sequencer.c:1732

4918 msgid "your index file is unmerged."

4919 msgstr "您的索引文件未完成合并。"

4920

4424 -#: sequencer.c:1650

4921 +#: sequencer.c:1739

4922 msgid "cannot fixup root commit"

4923 msgstr "不能修复根提交"

4924

4428 -#: sequencer.c:1669

4925 +#: sequencer.c:1758

4926 #, c-format

4927 msgid "commit %s is a merge but no -m option was given."

4928 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

4929

4433 -#: sequencer.c:1677

4930 +#: sequencer.c:1766

4931 #, c-format

4932 msgid "commit %s does not have parent %d"

4933 msgstr "提交 %s 没有第 %d 个父提交"

4934

4438 -#: sequencer.c:1681

4935 +#: sequencer.c:1770

4936 #, c-format

4937 msgid "mainline was specified but commit %s is not a merge."

4938 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"

4939

4443 -#: sequencer.c:1687

4940 +#: sequencer.c:1776

4941 #, c-format

4942 msgid "cannot get commit message for %s"

4943 msgstr "不能得到 %s 的提交说明"

4944

4945 #. TRANSLATORS: The first %s will be a "todo" command like

4946 #. "revert" or "pick", the second %s a SHA1.

4450 -#: sequencer.c:1706

4947 +#: sequencer.c:1795

4948 #, c-format

4949 msgid "%s: cannot parse parent commit %s"

4950 msgstr "%s：不能解析父提交 %s"

4951

4455 -#: sequencer.c:1771

4952 +#: sequencer.c:1860

4953 #, c-format

4954 msgid "could not rename '%s' to '%s'"

4955 msgstr "不能将 '%s' 重命名为 '%s'"

4956

4460 -#: sequencer.c:1826

4957 +#: sequencer.c:1915

4958 #, c-format

4959 msgid "could not revert %s... %s"

4960 msgstr "不能还原 %s... %s"

4961

4465 -#: sequencer.c:1827

4962 +#: sequencer.c:1916

4963 #, c-format

4964 msgid "could not apply %s... %s"

4965 msgstr "不能应用 %s... %s"

4966

4470 -#: sequencer.c:1885

4967 +#: sequencer.c:1974

4968 #, c-format

4969 msgid "git %s: failed to read the index"

4970 msgstr "git %s：无法读取索引"

4971

4475 -#: sequencer.c:1892

4972 +#: sequencer.c:1981

4973 #, c-format

4974 msgid "git %s: failed to refresh the index"

4975 msgstr "git %s：无法刷新索引"

4976

4480 -#: sequencer.c:1972

4977 +#: sequencer.c:2062

4978 #, c-format

4979 msgid "%s does not accept arguments: '%s'"

4980 msgstr "%s 不接受参数：'%s'"

4981

4485 -#: sequencer.c:1981

4982 +#: sequencer.c:2071

4983 #, c-format

4984 msgid "missing arguments for %s"

4985 msgstr "缺少 %s 的参数"

4986

4490 -#: sequencer.c:2040

4987 +#: sequencer.c:2130

4988 #, c-format

4989 msgid "invalid line %d: %.*s"

4990 msgstr "无效行 %d：%.*s"

4991

4495 -#: sequencer.c:2048

4992 +#: sequencer.c:2138

4993 #, c-format

4994 msgid "cannot '%s' without a previous commit"

4995 msgstr "没有父提交的情况下不能 '%s'"

4996

4500 -#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4501 -#, c-format

4502 -msgid "could not read '%s'."

4503 -msgstr "不能读取 '%s'。"

4504 -

4505 -#: sequencer.c:2119

4997 +#: sequencer.c:2209

4998 msgid "please fix this using 'git rebase --edit-todo'."

4999 msgstr "请用 'git rebase --edit-todo' 来修改。"

5000

4509 -#: sequencer.c:2121

5001 +#: sequencer.c:2211

5002 #, c-format

5003 msgid "unusable instruction sheet: '%s'"

5004 msgstr "不可用的指令清单：'%s'"

5005

4514 -#: sequencer.c:2126

5006 +#: sequencer.c:2216

5007 msgid "no commits parsed."

5008 msgstr "没有解析提交。"

5009

4518 -#: sequencer.c:2137

5010 +#: sequencer.c:2227

5011 msgid "cannot cherry-pick during a revert."

5012 msgstr "不能在回退中执行拣选。"

5013

4522 -#: sequencer.c:2139

5014 +#: sequencer.c:2229

5015 msgid "cannot revert during a cherry-pick."

5016 msgstr "不能在拣选中执行回退。"

5017

4526 -#: sequencer.c:2209

5018 +#: sequencer.c:2299

5019 #, c-format

5020 msgid "invalid value for %s: %s"

5021 msgstr "%s 的值无效：%s"

5022

4531 -#: sequencer.c:2285

5023 +#: sequencer.c:2380

5024 msgid "unusable squash-onto"

5025 msgstr "不可用的 squash-onto"

5026

4535 -#: sequencer.c:2301

5027 +#: sequencer.c:2396

5028 #, c-format

5029 msgid "malformed options sheet: '%s'"

5030 msgstr "格式错误的选项清单：'%s'"

5031

4540 -#: sequencer.c:2335 sequencer.c:3775

5032 +#: sequencer.c:2479 sequencer.c:4005

5033 msgid "empty commit set passed"

5034 msgstr "提供了空的提交集"

5035

4544 -#: sequencer.c:2343

5036 +#: sequencer.c:2487

5037 msgid "a cherry-pick or revert is already in progress"

5038 msgstr "一个拣选或还原操作已在进行"

5039

4548 -#: sequencer.c:2344

5040 +#: sequencer.c:2488

5041 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

5042 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

5043

4552 -#: sequencer.c:2347

5044 +#: sequencer.c:2491

5045 #, c-format

5046 msgid "could not create sequencer directory '%s'"

5047 msgstr "不能创建序列目录 '%s'"

5048

4557 -#: sequencer.c:2361

5049 +#: sequencer.c:2505

5050 msgid "could not lock HEAD"

5051 msgstr "不能锁定 HEAD"

5052

4561 -#: sequencer.c:2416 sequencer.c:3543

5053 +#: sequencer.c:2560 sequencer.c:3761

5054 msgid "no cherry-pick or revert in progress"

5055 msgstr "拣选或还原操作并未进行"

5056

4565 -#: sequencer.c:2418

5057 +#: sequencer.c:2562

5058 msgid "cannot resolve HEAD"

5059 msgstr "不能解析 HEAD"

5060

4569 -#: sequencer.c:2420 sequencer.c:2455

5061 +#: sequencer.c:2564 sequencer.c:2599

5062 msgid "cannot abort from a branch yet to be born"

5063 msgstr "不能从尚未建立的分支终止"

5064

4573 -#: sequencer.c:2441 builtin/grep.c:721

5065 +#: sequencer.c:2585 builtin/grep.c:721

5066 #, c-format

5067 msgid "cannot open '%s'"

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

5069

4578 -#: sequencer.c:2443

5070 +#: sequencer.c:2587

5071 #, c-format

5072 msgid "cannot read '%s': %s"

5073 msgstr "不能读取 '%s'：%s"

5074

4583 -#: sequencer.c:2444

5075 +#: sequencer.c:2588

5076 msgid "unexpected end of file"

5077 msgstr "意外的文件结束"

5078

4587 -#: sequencer.c:2450

5079 +#: sequencer.c:2594

5080 #, c-format

5081 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

5082 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

5083

4592 -#: sequencer.c:2461

5084 +#: sequencer.c:2605

5085 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5086 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

5087

4596 -#: sequencer.c:2565 sequencer.c:3461

5088 +#: sequencer.c:2709 sequencer.c:3679

5089 #, c-format

5090 msgid "could not update %s"

5091 msgstr "不能更新 %s"

5092

4601 -#: sequencer.c:2603 sequencer.c:3441

5093 +#: sequencer.c:2747 sequencer.c:3659

5094 msgid "cannot read HEAD"

5095 msgstr "不能读取 HEAD"

5096

4605 -#: sequencer.c:2618

5097 +#: sequencer.c:2762

5098 #, c-format

5099 msgid "unable to copy '%s' to '%s'"

5100 msgstr "无法拷贝 '%s' 至 '%s'"

5101

4610 -#: sequencer.c:2626

5102 +#: sequencer.c:2770

5103 #, c-format

5104 msgid ""

5105 "You can amend the commit now, with\n"

@@ -4626,27 +5118,28 @@ msgstr ""

5118 "\n"

5119 " git rebase --continue\n"

5120

4629 -#: sequencer.c:2636

5121 +#: sequencer.c:2780

5122 #, c-format

5123 msgid "Could not apply %s... %.*s"

5124 msgstr "不能应用 %s... %.*s"

5125

4634 -#: sequencer.c:2643

5126 +#: sequencer.c:2787

5127 #, c-format

5128 msgid "Could not merge %.*s"

5129 msgstr "不能合并 %.*s"

5130

4639 -#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

5131 +#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5132 #, c-format

5133 msgid "could not copy '%s' to '%s'"

5134 msgstr "不能拷贝 '%s' 至 '%s'"

5135

4644 -#: sequencer.c:2680 sequencer.c:3095

5136 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

5137 +#: builtin/rebase.c:1372 builtin/rebase.c:1426

5138 msgid "could not read index"

5139 msgstr "不能读取索引"

5140

5141 # 译者：注意保持前导空格

4649 -#: sequencer.c:2685

5142 +#: sequencer.c:2829

5143 #, c-format

5144 msgid ""

5145 "execution failed: %s\n"

@@ -4661,11 +5154,11 @@ msgstr ""

5154 " git rebase --continue\n"

5155 "\n"

5156

4664 -#: sequencer.c:2691

5157 +#: sequencer.c:2835

5158 msgid "and made changes to the index and/or the working tree\n"

5159 msgstr "并且修改索引和/或工作区\n"

5160

4668 -#: sequencer.c:2697

5161 +#: sequencer.c:2841

5162 #, c-format

5163 msgid ""

5164 "execution succeeded: %s\n"

@@ -4682,81 +5175,76 @@ msgstr ""

5175 " git rebase --continue\n"

5176 "\n"

5177

4685 -#: sequencer.c:2758

5178 +#: sequencer.c:2902

5179 #, c-format

5180 msgid "illegal label name: '%.*s'"

5181 msgstr "非法的标签名称：'%.*s'"

5182

4690 -#: sequencer.c:2810

5183 +#: sequencer.c:2954

5184 msgid "writing fake root commit"

5185 msgstr "写伪根提交"

5186

4694 -#: sequencer.c:2815

5187 +#: sequencer.c:2959

5188 msgid "writing squash-onto"

5189 msgstr "写入 squash-onto"

5190

4698 -#: sequencer.c:2850

5191 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5192 #, c-format

5193 msgid "failed to find tree of %s"

5194 msgstr "无法找到 %s 指向的树。"

5195

4703 -#: sequencer.c:2868

5196 +#: sequencer.c:3015 builtin/rebase.c:604

5197 msgid "could not write index"

5198 msgstr "不能写入索引"

5199

4707 -#: sequencer.c:2895

5200 +#: sequencer.c:3042

5201 #, c-format

5202 msgid "could not resolve '%s'"

5203 msgstr "无法解析 '%s'"

5204

4712 -#: sequencer.c:2921

5205 +#: sequencer.c:3068

5206 msgid "cannot merge without a current revision"

5207 msgstr "没有当前版本不能合并"

5208

4716 -#: sequencer.c:2943

5209 +#: sequencer.c:3090

5210 #, c-format

5211 msgid "unable to parse '%.*s'"

5212 msgstr "无法解析 '%.*s'"

5213

4721 -#: sequencer.c:2952

5214 +#: sequencer.c:3099

5215 #, c-format

5216 msgid "nothing to merge: '%.*s'"

5217 msgstr "无可用合并：'%.*s'"

5218

4726 -#: sequencer.c:2964

5219 +#: sequencer.c:3111

5220 msgid "octopus merge cannot be executed on top of a [new root]"

5221 msgstr "章鱼合并不能在一个新的根提交上执行"

5222

4730 -#: sequencer.c:2979

5223 +#: sequencer.c:3126

5224 #, c-format

5225 msgid "could not get commit message of '%s'"

5226 msgstr "不能获取 '%s' 的提交说明"

5227

4735 -#: sequencer.c:2989 sequencer.c:3015

4736 -#, c-format

4737 -msgid "could not write '%s'"

4738 -msgstr "不能写入 '%s'"

4739 -

4740 -#: sequencer.c:3127

5228 +#: sequencer.c:3274

5229 #, c-format

5230 msgid "could not even attempt to merge '%.*s'"

5231 msgstr "甚至不能尝试合并 '%.*s'"

5232

4745 -#: sequencer.c:3143

5233 +#: sequencer.c:3290

5234 msgid "merge: Unable to write new index file"

5235 msgstr "合并：无法写入新索引文件"

5236

4749 -#: sequencer.c:3211

5237 +#: sequencer.c:3358 builtin/rebase.c:268

5238 #, c-format

5239 msgid "Applied autostash.\n"

5240 msgstr "已应用 autostash。\n"

5241

4754 -#: sequencer.c:3223

5242 +#: sequencer.c:3370

5243 #, c-format

5244 msgid "cannot store %s"

5245 msgstr "不能存储 %s"

5246

4759 -#: sequencer.c:3226 git-rebase.sh:188

5247 +#: sequencer.c:3373 builtin/rebase.c:284

5248 #, c-format

5249 msgid ""

5250 "Applying autostash resulted in conflicts.\n"

@@ -4767,7 +5255,31 @@ msgstr ""

5255 "您的修改安全地保存在贮藏区中。\n"

5256 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

5257

4770 -#: sequencer.c:3257

5258 +#: sequencer.c:3427

5259 +#, c-format

5260 +msgid "could not checkout %s"

5261 +msgstr "不能检出 %s"

5262 +

5263 +#: sequencer.c:3441

5264 +#, c-format

5265 +msgid "%s: not a valid OID"

5266 +msgstr "%s：不是一个有效的 OID"

5267 +

5268 +#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5269 +msgid "could not detach HEAD"

5270 +msgstr "不能分离头指针"

5271 +

5272 +#: sequencer.c:3461

5273 +#, c-format

5274 +msgid "Stopped at HEAD\n"

5275 +msgstr "停止在 HEAD\n"

5276 +

5277 +#: sequencer.c:3463

5278 +#, c-format

5279 +msgid "Stopped at %s\n"

5280 +msgstr "停止在 %s\n"

5281 +

5282 +#: sequencer.c:3471

5283 #, c-format

5284 msgid ""

5285 "Could not execute the todo command\n"

@@ -4787,48 +5299,48 @@ msgstr ""

5299 " git rebase --edit-todo\n"

5300 " git rebase --continue\n"

5301

4790 -#: sequencer.c:3325

5302 +#: sequencer.c:3543

5303 #, c-format

5304 msgid "Stopped at %s... %.*s\n"

5305 msgstr "停止在 %s... %.*s\n"

5306

4795 -#: sequencer.c:3404

5307 +#: sequencer.c:3622

5308 #, c-format

5309 msgid "unknown command %d"

5310 msgstr "未知命令 %d"

5311

4800 -#: sequencer.c:3449

5312 +#: sequencer.c:3667

5313 msgid "could not read orig-head"

5314 msgstr "不能读取 orig-head"

5315

4804 -#: sequencer.c:3454 sequencer.c:4517

5316 +#: sequencer.c:3672 sequencer.c:4741

5317 msgid "could not read 'onto'"

5318 msgstr "不能读取 'onto'"

5319

4808 -#: sequencer.c:3468

5320 +#: sequencer.c:3686

5321 #, c-format

5322 msgid "could not update HEAD to %s"

5323 msgstr "不能更新 HEAD 为 %s"

5324

4813 -#: sequencer.c:3554

5325 +#: sequencer.c:3772

5326 msgid "cannot rebase: You have unstaged changes."

5327 msgstr "不能变基：您有未暂存的变更。"

5328

4817 -#: sequencer.c:3563

5329 +#: sequencer.c:3781

5330 msgid "cannot amend non-existing commit"

5331 msgstr "不能修补不存在的提交"

5332

4821 -#: sequencer.c:3565

5333 +#: sequencer.c:3783

5334 #, c-format

5335 msgid "invalid file: '%s'"

5336 msgstr "无效文件：'%s'"

5337

4826 -#: sequencer.c:3567

5338 +#: sequencer.c:3785

5339 #, c-format

5340 msgid "invalid contents: '%s'"

5341 msgstr "无效内容：'%s'"

5342

4831 -#: sequencer.c:3570

5343 +#: sequencer.c:3788

5344 msgid ""

5345 "\n"

5346 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4837,53 +5349,53 @@ msgstr ""

5349 "\n"

5350 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

5351

4840 -#: sequencer.c:3595 sequencer.c:3633

5352 +#: sequencer.c:3824 sequencer.c:3862

5353 #, c-format

5354 msgid "could not write file: '%s'"

5355 msgstr "不能写入文件：'%s'"

5356

4845 -#: sequencer.c:3648

5357 +#: sequencer.c:3877

5358 msgid "could not remove CHERRY_PICK_HEAD"

5359 msgstr "不能删除 CHERRY_PICK_HEAD"

5360

4849 -#: sequencer.c:3655

5361 +#: sequencer.c:3884

5362 msgid "could not commit staged changes."

5363 msgstr "不能提交暂存的修改。"

5364

4853 -#: sequencer.c:3752

5365 +#: sequencer.c:3982

5366 #, c-format

5367 msgid "%s: can't cherry-pick a %s"

5368 msgstr "%s：不能拣选一个%s"

5369

4858 -#: sequencer.c:3756

5370 +#: sequencer.c:3986

5371 #, c-format

5372 msgid "%s: bad revision"

5373 msgstr "%s：错误的版本"

5374

4863 -#: sequencer.c:3791

5375 +#: sequencer.c:4021

5376 msgid "can't revert as initial commit"

5377 msgstr "不能作为初始提交回退"

5378

4867 -#: sequencer.c:4238

5379 +#: sequencer.c:4466

5380 msgid "make_script: unhandled options"

5381 msgstr "make_script：有未能处理的选项"

5382

4871 -#: sequencer.c:4241

5383 +#: sequencer.c:4469

5384 msgid "make_script: error preparing revisions"

5385 msgstr "make_script：准备版本时错误"

5386

4875 -#: sequencer.c:4281 sequencer.c:4337

5387 +#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5388 #, c-format

5389 msgid "unusable todo list: '%s'"

5390 msgstr "不可用的待办列表：'%s'"

5391

4880 -#: sequencer.c:4396

5392 +#: sequencer.c:4620

5393 #, c-format

5394 msgid ""

5395 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5396 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

5397

4886 -#: sequencer.c:4466

5398 +#: sequencer.c:4690

5399 #, c-format

5400 msgid ""

5401 "Warning: some commits may have been dropped accidentally.\n"

@@ -4892,7 +5404,7 @@ msgstr ""

5404 "警告：一些提交可能被意外丢弃。\n"

5405 "丢弃的提交（从新到旧）：\n"

5406

4895 -#: sequencer.c:4473

5407 +#: sequencer.c:4697

5408 #, c-format

5409 msgid ""

5410 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4908,7 +5420,7 @@ msgstr ""

5420 "可选值有：ignore、warn、error。\n"

5421 "\n"

5422

4911 -#: sequencer.c:4486

5423 +#: sequencer.c:4710

5424 #, c-format

5425 msgid ""

5426 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4918,7 +5430,31 @@ msgstr ""

5430 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

5431 "或者您可以用 'git rebase --abort' 终止变基。\n"

5432

4921 -#: sequencer.c:4660

5433 +#: sequencer.c:4848 sequencer.c:4886

5434 +msgid "nothing to do"

5435 +msgstr "无事可做"

5436 +

5437 +#: sequencer.c:4852

5438 +#, c-format

5439 +msgid "Rebase %s onto %s (%d command)"

5440 +msgid_plural "Rebase %s onto %s (%d commands)"

5441 +msgstr[0] "变基 %s 到 %s（%d 个提交）"

5442 +msgstr[1] "变基 %s 到 %s（%d 个提交）"

5443 +

5444 +#: sequencer.c:4864

5445 +#, c-format

5446 +msgid "could not copy '%s' to '%s'."

5447 +msgstr "不能拷贝 '%s' 至 '%s'。"

5448 +

5449 +#: sequencer.c:4868 sequencer.c:4897

5450 +msgid "could not transform the todo list"

5451 +msgstr "无法改变待办列表"

5452 +

5453 +#: sequencer.c:4900

5454 +msgid "could not skip unnecessary pick commands"

5455 +msgstr "无法跳过不必要的拣选"

5456 +

5457 +#: sequencer.c:4983

5458 msgid "the script was already rearranged."

5459 msgstr "脚本已经重新编排。"

5460

@@ -4971,84 +5507,84 @@ msgstr "无法使用无效配置来创建工作区"

5507 msgid "this operation must be run in a work tree"

5508 msgstr "该操作必须在一个工作区中运行"

5509

4974 -#: setup.c:503

5510 +#: setup.c:527

5511 #, c-format

5512 msgid "Expected git repo version <= %d, found %d"

5513 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

5514

4979 -#: setup.c:511

5515 +#: setup.c:535

5516 msgid "unknown repository extensions found:"

5517 msgstr "发现未知的仓库扩展："

5518

4983 -#: setup.c:530

5519 +#: setup.c:554

5520 #, c-format

5521 msgid "error opening '%s'"

5522 msgstr "打开 '%s' 出错"

5523

4988 -#: setup.c:532

5524 +#: setup.c:556

5525 #, c-format

5526 msgid "too large to be a .git file: '%s'"

5527 msgstr "文件太大，无法作为 .git 文件：'%s'"

5528

4993 -#: setup.c:534

5529 +#: setup.c:558

5530 #, c-format

5531 msgid "error reading %s"

5532 msgstr "读取 %s 出错"

5533

4998 -#: setup.c:536

5534 +#: setup.c:560

5535 #, c-format

5536 msgid "invalid gitfile format: %s"

5537 msgstr "无效的 gitfile 格式：%s"

5538

5003 -#: setup.c:538

5539 +#: setup.c:562

5540 #, c-format

5541 msgid "no path in gitfile: %s"

5542 msgstr "在 gitfile 中没有路径：%s"

5543

5008 -#: setup.c:540

5544 +#: setup.c:564

5545 #, c-format

5546 msgid "not a git repository: %s"

5547 msgstr "不是一个 git 仓库：%s"

5548

5013 -#: setup.c:639

5549 +#: setup.c:663

5550 #, c-format

5551 msgid "'$%s' too big"

5552 msgstr "'$%s' 太大"

5553

5018 -#: setup.c:653

5554 +#: setup.c:677

5555 #, c-format

5556 msgid "not a git repository: '%s'"

5557 msgstr "不是一个 git 仓库：'%s'"

5558

5023 -#: setup.c:682 setup.c:684 setup.c:715

5559 +#: setup.c:706 setup.c:708 setup.c:739

5560 #, c-format

5561 msgid "cannot chdir to '%s'"

5562 msgstr "不能切换目录到 '%s'"

5563

5028 -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

5564 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5565 msgid "cannot come back to cwd"

5566 msgstr "无法返回当前工作目录"

5567

5032 -#: setup.c:813

5568 +#: setup.c:837

5569 #, c-format

5570 msgid "not a git repository (or any of the parent directories): %s"

5571 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

5572

5037 -#: setup.c:824

5573 +#: setup.c:848

5574 #, c-format

5575 msgid "failed to stat '%*s%s%s'"

5576 msgstr "获取 '%*s%s%s' 状态（stat）失败"

5577

5042 -#: setup.c:1054

5578 +#: setup.c:1078

5579 msgid "Unable to read current working directory"

5580 msgstr "不能读取当前工作目录"

5581

5046 -#: setup.c:1066 setup.c:1072

5582 +#: setup.c:1090 setup.c:1096

5583 #, c-format

5584 msgid "cannot change to '%s'"

5585 msgstr "不能切换到 '%s'"

5586

5051 -#: setup.c:1085

5587 +#: setup.c:1109

5588 #, c-format

5589 msgid ""

5590 "not a git repository (or any parent up to mount point %s)\n"

@@ -5057,7 +5593,7 @@ msgstr ""

5593 "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"

5594 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

5595

5060 -#: setup.c:1168

5596 +#: setup.c:1192

5597 #, c-format

5598 msgid ""

5599 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -5066,15 +5602,15 @@ msgstr ""

5602 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"

5603 "文件属主必须始终拥有读写权限。"

5604

5069 -#: setup.c:1211

5605 +#: setup.c:1235

5606 msgid "open /dev/null or dup failed"

5607 msgstr "不能打开或者复制 /dev/null"

5608

5073 -#: setup.c:1226

5609 +#: setup.c:1250

5610 msgid "fork failed"

5611 msgstr "fork 失败"

5612

5077 -#: setup.c:1231

5613 +#: setup.c:1255

5614 msgid "setsid failed"

5615 msgstr "setsid 失败"

5616

@@ -5149,12 +5685,12 @@ msgstr "mmap 失败"

5685 msgid "object file %s is empty"

5686 msgstr "对象文件 %s 为空"

5687

5152 -#: sha1-file.c:1093 sha1-file.c:2206

5688 +#: sha1-file.c:1093 sha1-file.c:2215

5689 #, c-format

5690 msgid "corrupt loose object '%s'"

5691 msgstr "损坏的松散对象 '%s'"

5692

5157 -#: sha1-file.c:1095 sha1-file.c:2210

5693 +#: sha1-file.c:1095 sha1-file.c:2219

5694 #, c-format

5695 msgid "garbage at end of loose object '%s'"

5696 msgstr "松散对象 '%s' 后面有垃圾数据"

@@ -5249,7 +5785,7 @@ msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"

5785 msgid "confused by unstable object source data for %s"

5786 msgstr "被 %s 的不稳定对象源数据搞糊涂了"

5787

5252 -#: sha1-file.c:1685 builtin/pack-objects.c:899

5788 +#: sha1-file.c:1685 builtin/pack-objects.c:918

5789 #, c-format

5790 msgid "failed utime() on %s"

5791 msgstr "在 %s 上调用 utime() 失败"

@@ -5267,76 +5803,76 @@ msgstr "损坏的提交"

5803 msgid "corrupt tag"

5804 msgstr "损坏的标签"

5805

5270 -#: sha1-file.c:1906

5806 +#: sha1-file.c:1912

5807 #, c-format

5808 msgid "read error while indexing %s"

5809 msgstr "索引 %s 时读取错误"

5810

5275 -#: sha1-file.c:1909

5811 +#: sha1-file.c:1915

5812 #, c-format

5813 msgid "short read while indexing %s"

5814 msgstr "索引 %s 时读入不完整"

5815

5280 -#: sha1-file.c:1980 sha1-file.c:1989

5816 +#: sha1-file.c:1988 sha1-file.c:1997

5817 #, c-format

5818 msgid "%s: failed to insert into database"

5819 msgstr "%s：插入数据库失败"

5820

5285 -#: sha1-file.c:1995

5821 +#: sha1-file.c:2003

5822 #, c-format

5823 msgid "%s: unsupported file type"

5824 msgstr "%s：不支持的文件类型"

5825

5290 -#: sha1-file.c:2019

5826 +#: sha1-file.c:2027

5827 #, c-format

5828 msgid "%s is not a valid object"

5829 msgstr "%s 不是一个有效的对象"

5830

5295 -#: sha1-file.c:2021

5831 +#: sha1-file.c:2029

5832 #, c-format

5833 msgid "%s is not a valid '%s' object"

5834 msgstr "%s 不是一个有效的 '%s' 对象"

5835

5300 -#: sha1-file.c:2048 builtin/index-pack.c:158

5836 +#: sha1-file.c:2056 builtin/index-pack.c:154

5837 #, c-format

5838 msgid "unable to open %s"

5839 msgstr "不能打开 %s"

5840

5305 -#: sha1-file.c:2217 sha1-file.c:2269

5841 +#: sha1-file.c:2226 sha1-file.c:2278

5842 #, c-format

5843 msgid "sha1 mismatch for %s (expected %s)"

5844 msgstr "%s 的 sha1 不匹配（预期 %s）"

5845

5310 -#: sha1-file.c:2241

5846 +#: sha1-file.c:2250

5847 #, c-format

5848 msgid "unable to mmap %s"

5849 msgstr "不能 mmap %s"

5850

5315 -#: sha1-file.c:2246

5851 +#: sha1-file.c:2255

5852 #, c-format

5853 msgid "unable to unpack header of %s"

5854 msgstr "无法解压缩 %s 的头部"

5855

5320 -#: sha1-file.c:2252

5856 +#: sha1-file.c:2261

5857 #, c-format

5858 msgid "unable to parse header of %s"

5859 msgstr "无法解析 %s 的头部"

5860

5325 -#: sha1-file.c:2263

5861 +#: sha1-file.c:2272

5862 #, c-format

5863 msgid "unable to unpack contents of %s"

5864 msgstr "无法解压缩 %s 的内容"

5865

5330 -#: sha1-name.c:444

5866 +#: sha1-name.c:476

5867 #, c-format

5868 msgid "short SHA1 %s is ambiguous"

5869 msgstr "短 SHA1 %s 存在歧义"

5870

5335 -#: sha1-name.c:455

5871 +#: sha1-name.c:487

5872 msgid "The candidates are:"

5873 msgstr "候选者有："

5874

5339 -#: sha1-name.c:699

5875 +#: sha1-name.c:770

5876 msgid ""

5877 "Git normally never creates a ref that ends with 40 hex characters\n"

5878 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -5357,96 +5893,80 @@ msgstr ""

5893 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

5894 "命令关闭本消息通知。"

5895

5360 -#: submodule.c:97 submodule.c:131

5896 +#: submodule.c:116 submodule.c:145

5897 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

5898 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

5899

5364 -#: submodule.c:101 submodule.c:135

5900 +#: submodule.c:120 submodule.c:149

5901 #, c-format

5902 msgid "Could not find section in .gitmodules where path=%s"

5903 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

5904

5369 -#: submodule.c:109

5370 -#, c-format

5371 -msgid "Could not update .gitmodules entry %s"

5372 -msgstr "不能更新 .gitmodules 条目 %s"

5373 -

5374 -#: submodule.c:142

5905 +#: submodule.c:156

5906 #, c-format

5907 msgid "Could not remove .gitmodules entry for %s"

5908 msgstr "无法移除 %s 的 .gitmodules 条目"

5909

5379 -#: submodule.c:153

5910 +#: submodule.c:167

5911 msgid "staging updated .gitmodules failed"

5912 msgstr "将更新后 .gitmodules 添加暂存区失败"

5913

5383 -#: submodule.c:315

5914 +#: submodule.c:329

5915 #, c-format

5916 msgid "in unpopulated submodule '%s'"

5917 msgstr "位于未检出的子模组 '%s'"

5918

5388 -#: submodule.c:346

5919 +#: submodule.c:360

5920 #, c-format

5921 msgid "Pathspec '%s' is in submodule '%.*s'"

5922 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

5923

5393 -#: submodule.c:839

5924 +#: submodule.c:857

5925 #, c-format

5926 msgid "submodule entry '%s' (%s) is a %s, not a commit"

l10n: zh_CN: for git v2.20.0 l10n round 1 to 3