6937cb4e3a · matheusbsbs/matheus-bagliano

@@ -121,6 +121,7 @@

121 # tagger | 打标签者

122 # topic branch | 主题分支

123 # track | 跟踪

124 +# trailer | 尾部署名

125 # tree | 树（工作区或树对象）

126 # tree object | 树对象

127 # tree-ish (also treeish) | 树对象（或可以解析为一树对象）

@@ -136,8 +137,8 @@ msgid ""

137 msgstr ""

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

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

139 -"POT-Creation-Date: 2017-07-24 21:54+0800\n"

140 -"PO-Revision-Date: 2017-08-02 08:00+0800\n"

140 +"POT-Creation-Date: 2017-10-17 09:44+0800\n"

141 +"PO-Revision-Date: 2017-10-24 09:43+0800\n"

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

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

144 "Language: zh_CN\n"

@@ -188,7 +189,7 @@ msgstr ""

189 msgid "Exiting because of an unresolved conflict."

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

191

191 -#: advice.c:117 builtin/merge.c:1184

192 +#: advice.c:117 builtin/merge.c:1211

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

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

195

@@ -237,82 +238,82 @@ msgstr "未能识别的空白字符选项 '%s'"

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

239 msgstr "未能识别的空白字符忽略选项 '%s'"

240

240 -#: apply.c:126

241 +#: apply.c:125

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

243 msgstr "--reject 和 --3say 不能同时使用。"

244

244 -#: apply.c:128

245 +#: apply.c:127

246 msgid "--cached and --3way cannot be used together."

247 msgstr "--cached 和 --3way 不能同时使用。"

248

248 -#: apply.c:131

249 +#: apply.c:130

250 msgid "--3way outside a repository"

251 msgstr "--3way 在一个仓库之外"

252

252 -#: apply.c:142

253 +#: apply.c:141

254 msgid "--index outside a repository"

255 msgstr "--index 在一个仓库之外"

256

256 -#: apply.c:145

257 +#: apply.c:144

258 msgid "--cached outside a repository"

259 msgstr "--cached 在一个仓库之外"

260

260 -#: apply.c:836

261 +#: apply.c:845

262 #, c-format

263 msgid "Cannot prepare timestamp regexp %s"

264 msgstr "无法准备时间戳正则表达式 %s"

265

265 -#: apply.c:845

266 +#: apply.c:854

267 #, c-format

268 msgid "regexec returned %d for input: %s"

269 msgstr "regexec 返回 %d，输入为：%s"

270

270 -#: apply.c:929

271 +#: apply.c:928

272 #, c-format

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

274 msgstr "不能在补丁的第 %d 行找到文件名"

275

275 -#: apply.c:967

276 +#: apply.c:966

277 #, c-format

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

279 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

280

280 -#: apply.c:973

281 +#: apply.c:972

282 #, c-format

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

284 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

285

285 -#: apply.c:974

286 +#: apply.c:973

287 #, c-format

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

289 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

290

290 -#: apply.c:979

291 +#: apply.c:978

292 #, c-format

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

294 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

295

295 -#: apply.c:1008

296 +#: apply.c:1007

297 #, c-format

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

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

300

300 -#: apply.c:1326

301 +#: apply.c:1325

302 #, c-format

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

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

305

305 -#: apply.c:1498

306 +#: apply.c:1497

307 #, c-format

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

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

310

310 -#: apply.c:1567

311 +#: apply.c:1566

312 #, c-format

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

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

315

315 -#: apply.c:1587

316 +#: apply.c:1586

317 #, c-format

318 msgid ""

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

@@ -323,82 +324,82 @@ msgid_plural ""

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

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

326

326 -#: apply.c:1600

327 +#: apply.c:1599

328 #, c-format

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

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

331

331 -#: apply.c:1770

332 +#: apply.c:1787

333 msgid "new file depends on old contents"

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

335

335 -#: apply.c:1772

336 +#: apply.c:1789

337 msgid "deleted file still has contents"

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

339

339 -#: apply.c:1806

340 +#: apply.c:1823

341 #, c-format

342 msgid "corrupt patch at line %d"

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

344

344 -#: apply.c:1843

345 +#: apply.c:1860

346 #, c-format

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

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

349

349 -#: apply.c:1845

350 +#: apply.c:1862

351 #, c-format

352 msgid "deleted file %s still has contents"

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

354

354 -#: apply.c:1848

355 +#: apply.c:1865

356 #, c-format

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

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

359

359 -#: apply.c:1995

360 +#: apply.c:2012

361 #, c-format

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

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

364

364 -#: apply.c:2032

365 +#: apply.c:2049

366 #, c-format

367 msgid "unrecognized binary patch at line %d"

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

369

369 -#: apply.c:2193

370 +#: apply.c:2209

371 #, c-format

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

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

374

374 -#: apply.c:2276

375 +#: apply.c:2295

376 #, c-format

377 msgid "unable to read symlink %s"

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

379

379 -#: apply.c:2280

380 +#: apply.c:2299

381 #, c-format

382 msgid "unable to open or read %s"

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

384

384 -#: apply.c:2933

385 +#: apply.c:2958

386 #, c-format

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

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

389

389 -#: apply.c:3052

390 +#: apply.c:3077

391 #, c-format

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

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

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

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

396

396 -#: apply.c:3064

397 +#: apply.c:3089

398 #, c-format

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

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

401

401 -#: apply.c:3070

402 +#: apply.c:3095

403 #, c-format

404 msgid ""

405 "while searching for:\n"

@@ -407,438 +408,439 @@ msgstr ""

408 "当查询：\n"

409 "%.*s"

410

410 -#: apply.c:3092

411 +#: apply.c:3117

412 #, c-format

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

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

415

415 -#: apply.c:3100

416 +#: apply.c:3125

417 #, c-format

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

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

420

420 -#: apply.c:3146

421 +#: apply.c:3171

422 #, c-format

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

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

425

425 -#: apply.c:3156

426 +#: apply.c:3181

427 #, c-format

428 msgid ""

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

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

431

431 -#: apply.c:3164

432 +#: apply.c:3189

433 #, c-format

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

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

436

436 -#: apply.c:3182

437 +#: apply.c:3207

438 #, c-format

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

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

441

441 -#: apply.c:3195

442 +#: apply.c:3220

443 #, c-format

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

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

446

446 -#: apply.c:3201

447 +#: apply.c:3226

448 #, c-format

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

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

451

451 -#: apply.c:3222

452 +#: apply.c:3247

453 #, c-format

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

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

456

456 -#: apply.c:3344

457 +#: apply.c:3369

458 #, c-format

459 msgid "cannot checkout %s"

460 msgstr "不能检出 %s"

461

461 -#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277

462 +#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277

463 #, c-format

464 msgid "failed to read %s"

465 msgstr "无法读取 %s"

466

466 -#: apply.c:3400

467 +#: apply.c:3426

468 #, c-format

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

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

471

471 -#: apply.c:3429 apply.c:3669

472 +#: apply.c:3455 apply.c:3695

473 #, c-format

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

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

476

476 -#: apply.c:3512 apply.c:3683

477 +#: apply.c:3538 apply.c:3709

478 #, c-format

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

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

481

481 -#: apply.c:3521 apply.c:3691

482 +#: apply.c:3547 apply.c:3717

483 #, c-format

484 msgid "%s: does not match index"

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

486

486 -#: apply.c:3556

487 +#: apply.c:3582

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

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

490

490 -#: apply.c:3559

491 +#: apply.c:3585

492 #, c-format

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

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

495

495 -#: apply.c:3575 apply.c:3579

496 +#: apply.c:3601 apply.c:3605

497 #, c-format

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

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

500

500 -#: apply.c:3591

501 +#: apply.c:3617

502 #, c-format

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

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

505

505 -#: apply.c:3605

506 +#: apply.c:3631

507 #, c-format

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

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

510

510 -#: apply.c:3610

511 +#: apply.c:3636

512 #, c-format

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

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

515

515 -#: apply.c:3636

516 +#: apply.c:3662

517 msgid "removal patch leaves file contents"

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

519

519 -#: apply.c:3708

520 +#: apply.c:3734

521 #, c-format

522 msgid "%s: wrong type"

523 msgstr "%s：错误类型"

524

524 -#: apply.c:3710

525 +#: apply.c:3736

526 #, c-format

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

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

529

529 -#: apply.c:3860 apply.c:3862

530 +#: apply.c:3886 apply.c:3888

531 #, c-format

532 msgid "invalid path '%s'"

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

534

534 -#: apply.c:3918

535 +#: apply.c:3944

536 #, c-format

537 msgid "%s: already exists in index"

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

539

539 -#: apply.c:3921

540 +#: apply.c:3947

541 #, c-format

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

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

544

544 -#: apply.c:3941

545 +#: apply.c:3967

546 #, c-format

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

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

549

549 -#: apply.c:3946

550 +#: apply.c:3972

551 #, c-format

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

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

554

554 -#: apply.c:3966

555 +#: apply.c:3992

556 #, c-format

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

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

559

559 -#: apply.c:3970

560 +#: apply.c:3996

561 #, c-format

562 msgid "%s: patch does not apply"

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

564

564 -#: apply.c:3985

565 +#: apply.c:4011

566 #, c-format

567 msgid "Checking patch %s..."

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

569

569 -#: apply.c:4076

570 +#: apply.c:4102

571 #, c-format

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

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

574

574 -#: apply.c:4083

575 +#: apply.c:4109

576 #, c-format

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

578 msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

579

579 -#: apply.c:4086

580 +#: apply.c:4112

581 #, c-format

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

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

584

584 -#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138

585 +#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148

586 #, c-format

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

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

589

589 -#: apply.c:4095

590 +#: apply.c:4121

591 #, c-format

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

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

594

594 -#: apply.c:4105

595 +#: apply.c:4131

596 #, c-format

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

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

599

599 -#: apply.c:4243

600 +#: apply.c:4269

601 #, c-format

602 msgid "unable to remove %s from index"

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

604

604 -#: apply.c:4278

605 +#: apply.c:4304

606 #, c-format

607 msgid "corrupt patch for submodule %s"

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

609

609 -#: apply.c:4284

610 +#: apply.c:4310

611 #, c-format

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

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

614

614 -#: apply.c:4292

615 +#: apply.c:4318

616 #, c-format

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

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

619

619 -#: apply.c:4298 apply.c:4442

620 +#: apply.c:4324 apply.c:4468

621 #, c-format

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

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

624

624 -#: apply.c:4339

625 +#: apply.c:4365

626 #, c-format

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

628 msgstr "无法写入 '%s'"

629

629 -#: apply.c:4343

630 +#: apply.c:4369

631 #, c-format

632 msgid "closing file '%s'"

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

634

634 -#: apply.c:4413

635 +#: apply.c:4439

636 #, c-format

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

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

639

639 -#: apply.c:4511

640 +#: apply.c:4537

641 #, c-format

642 msgid "Applied patch %s cleanly."

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

644

644 -#: apply.c:4519

645 +#: apply.c:4545

646 msgid "internal error"

647 msgstr "内部错误"

648

648 -#: apply.c:4522

649 +#: apply.c:4548

650 #, c-format

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

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

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

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

655

655 -#: apply.c:4533

656 +#: apply.c:4559

657 #, c-format

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

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

660

660 -#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988

661 +#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010

662 #, c-format

663 msgid "cannot open %s"

664 msgstr "不能打开 %s"

665

665 -#: apply.c:4555

666 +#: apply.c:4581

667 #, c-format

668 msgid "Hunk #%d applied cleanly."

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

670

670 -#: apply.c:4559

671 +#: apply.c:4585

672 #, c-format

673 msgid "Rejected hunk #%d."

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

675

675 -#: apply.c:4669

676 +#: apply.c:4695

677 #, c-format

678 msgid "Skipped patch '%s'."

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

680

680 -#: apply.c:4677

681 +#: apply.c:4703

682 msgid "unrecognized input"

683 msgstr "未能识别的输入"

684

684 -#: apply.c:4696

685 +#: apply.c:4722

686 msgid "unable to read index file"

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

688

688 -#: apply.c:4833

689 +#: apply.c:4859

690 #, c-format

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

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

693

693 -#: apply.c:4860

694 +#: apply.c:4886

695 #, c-format

696 msgid "squelched %d whitespace error"

697 msgid_plural "squelched %d whitespace errors"

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

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

700

700 -#: apply.c:4866 apply.c:4881

701 +#: apply.c:4892 apply.c:4907

702 #, c-format

703 msgid "%d line adds whitespace errors."

704 msgid_plural "%d lines add whitespace errors."

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

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

707

707 -#: apply.c:4874

708 +#: apply.c:4900

709 #, c-format

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

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

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

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

714

714 -#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391

715 +#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390

716 msgid "Unable to write new index file"

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

718

718 -#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260

719 -#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187

720 -#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

721 -#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

722 -#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161

719 +#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259

720 +#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187

721 +#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622

722 +#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992

723 +#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212

724 #: git-add--interactive.perl:197

725 msgid "path"

726 msgstr "路径"

727

727 -#: apply.c:4922

728 +#: apply.c:4948

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

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

731

731 -#: apply.c:4925

732 +#: apply.c:4951

733 msgid "apply changes matching the given path"

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

735

735 -#: apply.c:4927 builtin/am.c:2266

736 +#: apply.c:4953 builtin/am.c:2265

737 msgid "num"

738 msgstr "数字"

739

739 -#: apply.c:4928

740 +#: apply.c:4954

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

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

743

743 -#: apply.c:4931

744 +#: apply.c:4957

745 msgid "ignore additions made by the patch"

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

747

747 -#: apply.c:4933

748 +#: apply.c:4959

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

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

751

751 -#: apply.c:4937

752 +#: apply.c:4963

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

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

755

755 -#: apply.c:4939

756 +#: apply.c:4965

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

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

759

759 -#: apply.c:4941

760 +#: apply.c:4967

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

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

763

763 -#: apply.c:4943

764 +#: apply.c:4969

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

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

767

767 -#: apply.c:4945

768 +#: apply.c:4971

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

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

771

771 -#: apply.c:4947

772 +#: apply.c:4973

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

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

775

775 -#: apply.c:4949

776 +#: apply.c:4975

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

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

779

779 -#: apply.c:4951

780 +#: apply.c:4977

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

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

783

783 -#: apply.c:4953

784 +#: apply.c:4979

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

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

787

787 -#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515

788 +#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513

789 msgid "paths are separated with NUL character"

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

791

791 -#: apply.c:4958

792 +#: apply.c:4984

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

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

795

795 -#: apply.c:4959 builtin/am.c:2245

796 +#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95

797 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

798 msgid "action"

799 msgstr "动作"

800

799 -#: apply.c:4960

801 +#: apply.c:4986

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

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

804

803 -#: apply.c:4963 apply.c:4966

805 +#: apply.c:4989 apply.c:4992

806 msgid "ignore changes in whitespace when finding context"

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

808

807 -#: apply.c:4969

809 +#: apply.c:4995

810 msgid "apply the patch in reverse"

811 msgstr "反向应用补丁"

812

811 -#: apply.c:4971

813 +#: apply.c:4997

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

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

816

815 -#: apply.c:4973

817 +#: apply.c:4999

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

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

820

819 -#: apply.c:4975

821 +#: apply.c:5001

822 msgid "allow overlapping hunks"

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

824

823 -#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21

824 -#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651

825 -#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125

825 +#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21

826 +#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640

827 +#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125

828 msgid "be verbose"

829 msgstr "冗长输出"

830

829 -#: apply.c:4978

831 +#: apply.c:5004

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

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

834

833 -#: apply.c:4981

835 +#: apply.c:5007

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

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

838

837 -#: apply.c:4983 builtin/am.c:2254

839 +#: apply.c:5009 builtin/am.c:2253

840 msgid "root"

841 msgstr "根目录"

842

841 -#: apply.c:4984

843 +#: apply.c:5010

844 msgid "prepend <root> to all filenames"

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

846

@@ -860,108 +862,108 @@ msgstr ""

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

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

864

863 -#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300

865 +#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299

866 #, c-format

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

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

869

868 -#: archive.c:418

870 +#: archive.c:436

871 msgid "fmt"

872 msgstr "格式"

873

872 -#: archive.c:418

874 +#: archive.c:436

875 msgid "archive format"

876 msgstr "归档格式"

877

876 -#: archive.c:419 builtin/log.c:1446

878 +#: archive.c:437 builtin/log.c:1452

879 msgid "prefix"

880 msgstr "前缀"

881

880 -#: archive.c:420

882 +#: archive.c:438

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

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

885

884 -#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

885 -#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080

886 -#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552

887 -#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120

886 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61

887 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859

888 +#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550

889 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

890 #: parse-options.h:153

891 msgid "file"

892 msgstr "文件"

893

892 -#: archive.c:422 builtin/archive.c:89

894 +#: archive.c:440 builtin/archive.c:89

895 msgid "write the archive to this file"

896 msgstr "归档写入此文件"

897

896 -#: archive.c:424

898 +#: archive.c:442

899 msgid "read .gitattributes in working directory"

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

901

900 -#: archive.c:425

902 +#: archive.c:443

903 msgid "report archived files on stderr"

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

905

904 -#: archive.c:426

906 +#: archive.c:444

907 msgid "store only"

908 msgstr "只存储"

909

908 -#: archive.c:427

910 +#: archive.c:445

911 msgid "compress faster"

912 msgstr "压缩速度更快"

913

912 -#: archive.c:435

914 +#: archive.c:453

915 msgid "compress better"

916 msgstr "压缩效果更好"

917

916 -#: archive.c:438

918 +#: archive.c:456

919 msgid "list supported archive formats"

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

921

920 -#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108

921 -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982

922 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

923 +#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001

924 msgid "repo"

925 msgstr "仓库"

926

925 -#: archive.c:441 builtin/archive.c:91

927 +#: archive.c:459 builtin/archive.c:91

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

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

930

929 -#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488

931 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

932 msgid "command"

933 msgstr "命令"

934

933 -#: archive.c:443 builtin/archive.c:93

935 +#: archive.c:461 builtin/archive.c:93

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

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

938

937 -#: archive.c:450

939 +#: archive.c:468

940 msgid "Unexpected option --remote"

941 msgstr "未知参数 --remote"

942

941 -#: archive.c:452

943 +#: archive.c:470

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

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

946

945 -#: archive.c:454

947 +#: archive.c:472

948 msgid "Unexpected option --output"

949 msgstr "未知参数 --output"

950

949 -#: archive.c:476

951 +#: archive.c:494

952 #, c-format

953 msgid "Unknown archive format '%s'"

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

955

954 -#: archive.c:483

956 +#: archive.c:501

957 #, c-format

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

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

960

959 -#: attr.c:214

961 +#: attr.c:218

962 #, c-format

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

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

965

964 -#: attr.c:410

966 +#: attr.c:415

967 msgid ""

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

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

@@ -1038,31 +1040,31 @@ msgstr ""

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

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

1042

1041 -#: bisect.c:849

1043 +#: bisect.c:850

1044 #, c-format

1045 msgid "a %s revision is needed"

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

1047

1046 -#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256

1048 +#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234

1049 #, c-format

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

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

1052

1051 -#: bisect.c:917

1053 +#: bisect.c:918

1054 #, c-format

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

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

1057

1056 -#: bisect.c:947

1058 +#: bisect.c:948

1059 msgid "reading bisect refs failed"

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

1061

1060 -#: bisect.c:967

1062 +#: bisect.c:968

1063 #, c-format

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

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

1066

1065 -#: bisect.c:975

1067 +#: bisect.c:976

1068 #, c-format

1069 msgid ""

1070 "No testable commit found.\n"

@@ -1071,7 +1073,7 @@ msgstr ""

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

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

1075

1074 -#: bisect.c:994

1076 +#: bisect.c:995

1077 #, c-format

1078 msgid "(roughly %d step)"

1079 msgid_plural "(roughly %d steps)"

@@ -1081,7 +1083,7 @@ msgstr[1] "（大概 %d 步）"

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

1084 #. steps)" translation.

1085 #.

1084 -#: bisect.c:1000

1086 +#: bisect.c:1001

1087 #, c-format

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

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

@@ -1100,10 +1102,10 @@ msgstr "不能将 --contents 和最终的提交对象名共用"

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

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

1104

1103 -#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166

1104 -#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907

1105 -#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360

1106 -#: builtin/shortlog.c:177

1105 +#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168

1106 +#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911

1107 +#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369

1108 +#: builtin/shortlog.c:191

1109 msgid "revision walk setup failed"

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

1111

@@ -1141,43 +1143,43 @@ msgstr "未设置分支 %s 作为它自己的上游。"

1143

1144 #: branch.c:93

1145 #, c-format

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

1145 -msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

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

1147 +msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"

1148

1149 #: branch.c:94

1150 #, c-format

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

1150 -msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

1151 +msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1152 +msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"

1153

1154 #: branch.c:98

1155 #, c-format

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

1155 -msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

1156 +msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1157 +msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"

1158

1159 #: branch.c:99

1160 #, c-format

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

1160 -msgstr "分支 %s 设置为跟踪本地分支 %s。"

1161 +msgid "Branch '%s' set up to track local branch '%s'."

1162 +msgstr "分支 '%s' 设置为跟踪本地分支 '%s。"

1163

1164 #: branch.c:104

1165 #, c-format

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

1165 -msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

1166 +msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1167 +msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"

1168

1169 #: branch.c:105

1170 #, c-format

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

1170 -msgstr "分支 %s 设置为跟踪远程引用 %s。"

1171 +msgid "Branch '%s' set up to track remote ref '%s'."

1172 +msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"

1173

1174 #: branch.c:109

1175 #, c-format

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

1175 -msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

1176 +msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1177 +msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"

1178

1179 #: branch.c:110

1180 #, c-format

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

1180 -msgstr "分支 %s 设置为跟踪本地引用 %s。"

1181 +msgid "Branch '%s' set up to track local ref '%s'."

1182 +msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"

1183

1184 #: branch.c:119

1185 msgid "Unable to write upstream branch configuration"

@@ -1198,21 +1200,21 @@ msgstr "'%s' 不是一个有效的分支名称。"

1200 msgid "A branch named '%s' already exists."

1201 msgstr "一个分支名 '%s' 已经存在。"

1202

1201 -#: branch.c:198

1203 +#: branch.c:197

1204 msgid "Cannot force update the current branch."

1205 msgstr "无法强制更新当前分支。"

1206

1205 -#: branch.c:218

1207 +#: branch.c:217

1208 #, c-format

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

1210 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

1211

1210 -#: branch.c:220

1212 +#: branch.c:219

1213 #, c-format

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

1215 msgstr "请求的上游分支 '%s' 不存在"

1216

1215 -#: branch.c:222

1217 +#: branch.c:221

1218 msgid ""

1219 "\n"

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

@@ -1230,22 +1232,22 @@ msgstr ""

1232 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

1233 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

1234

1233 -#: branch.c:265

1235 +#: branch.c:264

1236 #, c-format

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

1238 msgstr "不是一个有效的对象名：'%s'。"

1239

1238 -#: branch.c:285

1240 +#: branch.c:284

1241 #, c-format

1242 msgid "Ambiguous object name: '%s'."

1243 msgstr "歧义的对象名：'%s'。"

1244

1243 -#: branch.c:290

1245 +#: branch.c:289

1246 #, c-format

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

1248 msgstr "无效的分支点：'%s'。"

1249

1248 -#: branch.c:344

1250 +#: branch.c:343

1251 #, c-format

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

1253 msgstr "'%s' 已经检出到 '%s'"

@@ -1265,7 +1267,9 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

1269

1268 -#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778

1270 +#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500

1271 +#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807

1272 +#: sequencer.c:2949 builtin/commit.c:782

1273 #, c-format

1274 msgid "could not open '%s'"

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

@@ -1274,56 +1278,56 @@ msgstr "不能打开 '%s'"

1278 msgid "Repository lacks these prerequisite commits:"

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

1280

1277 -#: bundle.c:186

1281 +#: bundle.c:193

1282 #, c-format

1283 msgid "The bundle contains this ref:"

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

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

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

1287

1284 -#: bundle.c:193

1288 +#: bundle.c:200

1289 msgid "The bundle records a complete history."

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

1291

1288 -#: bundle.c:195

1292 +#: bundle.c:202

1293 #, c-format

1294 msgid "The bundle requires this ref:"

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

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

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

1298

1295 -#: bundle.c:254

1299 +#: bundle.c:261

1300 msgid "Could not spawn pack-objects"

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

1302

1299 -#: bundle.c:265

1303 +#: bundle.c:272

1304 msgid "pack-objects died"

1305 msgstr "pack-objects 终止"

1306

1303 -#: bundle.c:307

1307 +#: bundle.c:314

1308 msgid "rev-list died"

1309 msgstr "rev-list 终止"

1310

1307 -#: bundle.c:356

1311 +#: bundle.c:363

1312 #, c-format

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

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

1315

1312 -#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282

1316 +#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296

1317 #, c-format

1318 msgid "unrecognized argument: %s"

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

1320

1317 -#: bundle.c:454

1321 +#: bundle.c:461

1322 msgid "Refusing to create empty bundle."

1323 msgstr "不能创建空包。"

1324

1321 -#: bundle.c:466

1325 +#: bundle.c:473

1326 #, c-format

1327 msgid "cannot create '%s'"

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

1329

1326 -#: bundle.c:494

1330 +#: bundle.c:501

1331 msgid "index-pack died"

1332 msgstr "index-pack 终止"

1333

@@ -1332,8 +1336,8 @@ msgstr "index-pack 终止"

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

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

1338

1335 -#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456

1336 -#: builtin/am.c:1469 builtin/am.c:2107

1339 +#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465

1340 +#: builtin/am.c:1467 builtin/am.c:2105

1341 #, c-format

1342 msgid "could not parse %s"

1343 msgstr "不能解析 %s"

@@ -1343,7 +1347,7 @@ msgstr "不能解析 %s"

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

1348 msgstr "%s %s 不是一个提交!"

1349

1346 -#: commit.c:1511

1350 +#: commit.c:1517

1351 msgid ""

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

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

@@ -1357,152 +1361,152 @@ msgstr ""

1361 msgid "memory exhausted"

1362 msgstr "内存耗尽"

1363

1360 -#: config.c:186

1364 +#: config.c:187

1365 msgid "relative config include conditionals must come from files"

1366 msgstr "包含相对路径的条件引用必须来自于文件"

1367

1364 -#: config.c:720

1368 +#: config.c:721

1369 #, c-format

1370 msgid "bad config line %d in blob %s"

1371 msgstr "数据对象 %2$s 中错误的配置行 %1$d"

1372

1369 -#: config.c:724

1373 +#: config.c:725

1374 #, c-format

1375 msgid "bad config line %d in file %s"

1376 msgstr "文件 %2$s 中错误的配置行 %1$d"

1377

1374 -#: config.c:728

1378 +#: config.c:729

1379 #, c-format

1380 msgid "bad config line %d in standard input"

1381 msgstr "标准输入中错误的配置行 %d"

1382

1379 -#: config.c:732

1383 +#: config.c:733

1384 #, c-format

1385 msgid "bad config line %d in submodule-blob %s"

1386 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"

1387

1384 -#: config.c:736

1388 +#: config.c:737

1389 #, c-format

1390 msgid "bad config line %d in command line %s"

1391 msgstr "命令行 %2$s 中错误的配置行 %1$d"

1392

1389 -#: config.c:740

1393 +#: config.c:741

1394 #, c-format

1395 msgid "bad config line %d in %s"

1396 msgstr "在 %2$s 中错误的配置行 %1$d"

1397

1394 -#: config.c:868

1398 +#: config.c:869

1399 msgid "out of range"

1400 msgstr "超出范围"

1401

1398 -#: config.c:868

1402 +#: config.c:869

1403 msgid "invalid unit"

1404 msgstr "无效的单位"

1405

1402 -#: config.c:874

1406 +#: config.c:875

1407 #, c-format

1408 msgid "bad numeric config value '%s' for '%s': %s"

1409 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"

1410

1407 -#: config.c:879

1411 +#: config.c:880

1412 #, c-format

1413 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1414 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1415

1412 -#: config.c:882

1416 +#: config.c:883

1417 #, c-format

1418 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1419 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1420

1417 -#: config.c:885

1421 +#: config.c:886

1422 #, c-format

1423 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1424 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"

1425

1422 -#: config.c:888

1426 +#: config.c:889

1427 #, c-format

1428 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1429 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1430

1427 -#: config.c:891

1431 +#: config.c:892

1432 #, c-format

1433 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1434 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1435

1432 -#: config.c:894

1436 +#: config.c:895

1437 #, c-format

1438 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1439 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

1440

1437 -#: config.c:989

1441 +#: config.c:990

1442 #, c-format

1443 msgid "failed to expand user dir in: '%s'"

1444 msgstr "无法扩展 '%s' 中的用户目录"

1445

1442 -#: config.c:1084 config.c:1095

1446 +#: config.c:1085 config.c:1096

1447 #, c-format

1448 msgid "bad zlib compression level %d"

1449 msgstr "错误的 zlib 压缩级别 %d"

1450

1447 -#: config.c:1212

1451 +#: config.c:1213

1452 #, c-format

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

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

1455

1452 -#: config.c:1368

1456 +#: config.c:1372

1457 #, c-format

1458 msgid "bad pack compression level %d"

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

1460

1457 -#: config.c:1564

1461 +#: config.c:1568

1462 msgid "unable to parse command-line config"

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

1464

1461 -#: config.c:1894

1465 +#: config.c:1900

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

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

1468

1465 -#: config.c:2064

1469 +#: config.c:2087

1470 #, c-format

1471 msgid "Invalid %s: '%s'"

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

1473

1470 -#: config.c:2085

1474 +#: config.c:2130

1475 #, c-format

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

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

1478

1475 -#: config.c:2111

1479 +#: config.c:2156

1480 #, c-format

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

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

1483

1480 -#: config.c:2122

1484 +#: config.c:2167

1485 #, c-format

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

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

1488

1485 -#: config.c:2124

1489 +#: config.c:2169

1490 #, c-format

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

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

1493

1490 -#: config.c:2183

1494 +#: config.c:2228

1495 #, c-format

1496 msgid "%s has multiple values"

1497 msgstr "%s 有多个取值"

1498

1495 -#: config.c:2517 config.c:2745

1499 +#: config.c:2571 config.c:2789

1500 #, c-format

1501 msgid "fstat on %s failed"

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

1503

1500 -#: config.c:2635

1504 +#: config.c:2678

1505 #, c-format

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

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

1508

1505 -#: config.c:2637 builtin/remote.c:775

1509 +#: config.c:2680 builtin/remote.c:776

1510 #, c-format

1511 msgid "could not unset '%s'"

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

@@ -1522,19 +1526,19 @@ msgstr ""

1526 "\n"

1527 "请确认您有正确的访问权限并且仓库存在。"

1528

1525 -#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141

1529 +#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1530 msgid "Checking connectivity"

1531 msgstr "检查连接中"

1532

1529 -#: connected.c:75

1533 +#: connected.c:76

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

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

1536

1533 -#: connected.c:95

1537 +#: connected.c:96

1538 msgid "failed write to rev-list"

1539 msgstr "无法写入 rev-list"

1540

1537 -#: connected.c:102

1541 +#: connected.c:103

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

1543 msgstr "无法关闭 rev-list 的标准输入"

1544

@@ -1643,29 +1647,35 @@ msgstr "无法读取排序文件 '%s'"

1647 msgid "Performing inexact rename detection"

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

1649

1646 -#: diff.c:63

1650 +#: diff.c:74

1651 #, c-format

1652 msgid "option '%s' requires a value"

1653 msgstr "选项 '%s' 需要一个值"

1654

1655 # 译者：注意保持前导空格

1652 -#: diff.c:125

1656 +#: diff.c:152

1657 #, c-format

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

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

1660

1661 # 译者：注意保持前导空格

1658 -#: diff.c:130

1662 +#: diff.c:157

1663 #, c-format

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

1665 msgstr " 未知的 dirstat 参数 '%s'\n"

1666

1663 -#: diff.c:282

1667 +#: diff.c:281

1668 +msgid ""

1669 +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "

1670 +"'plain'"

1671 +msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"

1672 +

1673 +#: diff.c:341

1674 #, c-format

1675 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1676 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

1677

1668 -#: diff.c:342

1678 +#: diff.c:398

1679 #, c-format

1680 msgid ""

1681 "Found errors in 'diff.dirstat' config variable:\n"

@@ -1674,20 +1684,20 @@ msgstr ""

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

1685 "%s"

1686

1677 -#: diff.c:3101

1687 +#: diff.c:3861

1688 #, c-format

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

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

1691

1682 -#: diff.c:3427

1692 +#: diff.c:4189

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

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

1695

1686 -#: diff.c:3517

1696 +#: diff.c:4279

1697 msgid "--follow requires exactly one pathspec"

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

1699

1690 -#: diff.c:3680

1700 +#: diff.c:4445

1701 #, c-format

1702 msgid ""

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

@@ -1696,226 +1706,230 @@ msgstr ""

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

1707 "%s"

1708

1699 -#: diff.c:3694

1709 +#: diff.c:4459

1710 #, c-format

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

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

1713

1704 -#: diff.c:4716

1714 +#: diff.c:5505

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

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

1717

1708 -#: diff.c:4719

1718 +#: diff.c:5508

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

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

1721

1712 -#: diff.c:4722

1722 +#: diff.c:5511

1723 #, c-format

1724 msgid ""

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

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

1727

1718 -#: dir.c:1948

1728 +#: dir.c:1983

1729 msgid "failed to get kernel name and information"

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

1731

1722 -#: dir.c:2067

1732 +#: dir.c:2102

1733 msgid "Untracked cache is disabled on this system or location."

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

1735

1726 -#: dir.c:2846 dir.c:2851

1736 +#: dir.c:2885 dir.c:2890

1737 #, c-format

1738 msgid "could not create directories for %s"

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

1740

1731 -#: dir.c:2876

1741 +#: dir.c:2915

1742 #, c-format

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

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

1745

1736 -#: entry.c:281

1746 +#: entry.c:176

1747 +msgid "Filtering content"

1748 +msgstr "过滤内容"

1749 +

1750 +#: entry.c:433

1751 #, c-format

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

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

1754

1741 -#: fetch-pack.c:251

1755 +#: fetch-pack.c:252

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

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

1758

1745 -#: fetch-pack.c:263

1759 +#: fetch-pack.c:264

1760 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1761 msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"

1762

1749 -#: fetch-pack.c:282 builtin/archive.c:63

1763 +#: fetch-pack.c:283 builtin/archive.c:63

1764 #, c-format

1765 msgid "remote error: %s"

1766 msgstr "远程错误：%s"

1767

1754 -#: fetch-pack.c:283

1768 +#: fetch-pack.c:284

1769 #, c-format

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

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

1772

1759 -#: fetch-pack.c:335

1773 +#: fetch-pack.c:336

1774 msgid "--stateless-rpc requires multi_ack_detailed"

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

1776

1763 -#: fetch-pack.c:421

1777 +#: fetch-pack.c:422

1778 #, c-format

1779 msgid "invalid shallow line: %s"

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

1781

1768 -#: fetch-pack.c:427

1782 +#: fetch-pack.c:428

1783 #, c-format

1784 msgid "invalid unshallow line: %s"

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

1786

1773 -#: fetch-pack.c:429

1787 +#: fetch-pack.c:430

1788 #, c-format

1789 msgid "object not found: %s"

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

1791

1778 -#: fetch-pack.c:432

1792 +#: fetch-pack.c:433

1793 #, c-format

1794 msgid "error in object: %s"

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

1796

1783 -#: fetch-pack.c:434

1797 +#: fetch-pack.c:435

1798 #, c-format

1799 msgid "no shallow found: %s"

1800 msgstr "未发现 shallow：%s"

1801

1788 -#: fetch-pack.c:437

1802 +#: fetch-pack.c:438

1803 #, c-format

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

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

1806

1793 -#: fetch-pack.c:476

1807 +#: fetch-pack.c:477

1808 #, c-format

1809 msgid "got %s %d %s"

1810 msgstr "得到 %s %d %s"

1811

1798 -#: fetch-pack.c:490

1812 +#: fetch-pack.c:491

1813 #, c-format

1814 msgid "invalid commit %s"

1815 msgstr "无效提交 %s"

1816

1803 -#: fetch-pack.c:523

1817 +#: fetch-pack.c:524

1818 msgid "giving up"

1819 msgstr "放弃"

1820

1807 -#: fetch-pack.c:533 progress.c:237

1821 +#: fetch-pack.c:534 progress.c:242

1822 msgid "done"

1823 msgstr "完成"

1824

1811 -#: fetch-pack.c:545

1825 +#: fetch-pack.c:546

1826 #, c-format

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

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

1829

1816 -#: fetch-pack.c:591

1830 +#: fetch-pack.c:592

1831 #, c-format

1832 msgid "Marking %s as complete"

1833 msgstr "标记 %s 为完成"

1834

1821 -#: fetch-pack.c:775

1835 +#: fetch-pack.c:776

1836 #, c-format

1837 msgid "already have %s (%s)"

1838 msgstr "已经有 %s（%s）"

1839

1826 -#: fetch-pack.c:813

1840 +#: fetch-pack.c:814

1841 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1842 msgstr "fetch-pack：无法派生 sideband 多路输出"

1843

1830 -#: fetch-pack.c:821

1844 +#: fetch-pack.c:822

1845 msgid "protocol error: bad pack header"

1846 msgstr "协议错误：坏的包头"

1847

1834 -#: fetch-pack.c:877

1848 +#: fetch-pack.c:878

1849 #, c-format

1850 msgid "fetch-pack: unable to fork off %s"

1851 msgstr "fetch-pack：无法派生进程 %s"

1852

1839 -#: fetch-pack.c:893

1853 +#: fetch-pack.c:894

1854 #, c-format

1855 msgid "%s failed"

1856 msgstr "%s 失败"

1857

1844 -#: fetch-pack.c:895

1858 +#: fetch-pack.c:896

1859 msgid "error in sideband demultiplexer"

1860 msgstr "sideband 多路输出出错"

1861

1848 -#: fetch-pack.c:922

1862 +#: fetch-pack.c:923

1863 msgid "Server does not support shallow clients"

1864 msgstr "服务器不支持 shalllow 客户端"

1865

1852 -#: fetch-pack.c:926

1866 +#: fetch-pack.c:927

1867 msgid "Server supports multi_ack_detailed"

1868 msgstr "服务器支持 multi_ack_detailed"

1869

1856 -#: fetch-pack.c:929

1870 +#: fetch-pack.c:930

1871 msgid "Server supports no-done"

1872 msgstr "服务器支持 no-done"

1873

1860 -#: fetch-pack.c:935

1874 +#: fetch-pack.c:936

1875 msgid "Server supports multi_ack"

1876 msgstr "服务器支持 multi_ack"

1877

1864 -#: fetch-pack.c:939

1878 +#: fetch-pack.c:940

1879 msgid "Server supports side-band-64k"

1880 msgstr "服务器支持 side-band-64k"

1881

1868 -#: fetch-pack.c:943

1882 +#: fetch-pack.c:944

1883 msgid "Server supports side-band"

1884 msgstr "服务器支持 side-band"

1885

1872 -#: fetch-pack.c:947

1886 +#: fetch-pack.c:948

1887 msgid "Server supports allow-tip-sha1-in-want"

1888 msgstr "服务器支持 allow-tip-sha1-in-want"

1889

1876 -#: fetch-pack.c:951

1890 +#: fetch-pack.c:952

1891 msgid "Server supports allow-reachable-sha1-in-want"

1892 msgstr "服务器支持 allow-reachable-sha1-in-want"

1893

1880 -#: fetch-pack.c:961

1894 +#: fetch-pack.c:962

1895 msgid "Server supports ofs-delta"

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

1897

1884 -#: fetch-pack.c:968

1898 +#: fetch-pack.c:969

1899 #, c-format

1900 msgid "Server version is %.*s"

1901 msgstr "服务器版本 %.*s"

1902

1889 -#: fetch-pack.c:974

1903 +#: fetch-pack.c:975

1904 msgid "Server does not support --shallow-since"

1905 msgstr "服务器不支持 --shallow-since"

1906

1893 -#: fetch-pack.c:978

1907 +#: fetch-pack.c:979

1908 msgid "Server does not support --shallow-exclude"

1909 msgstr "服务器不支持 --shallow-exclude"

1910

1897 -#: fetch-pack.c:980

1911 +#: fetch-pack.c:981

1912 msgid "Server does not support --deepen"

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

1914

1901 -#: fetch-pack.c:991

1915 +#: fetch-pack.c:992

1916 msgid "no common commits"

1917 msgstr "没有共同的提交"

1918

1905 -#: fetch-pack.c:1003

1919 +#: fetch-pack.c:1004

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

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

1922

1909 -#: fetch-pack.c:1165

1923 +#: fetch-pack.c:1166

1924 msgid "no matching remote head"

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

1926

1913 -#: fetch-pack.c:1187

1927 +#: fetch-pack.c:1188

1928 #, c-format

1929 msgid "no such remote ref %s"

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

1931

1918 -#: fetch-pack.c:1190

1932 +#: fetch-pack.c:1191

1933 #, c-format

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

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

@@ -1928,7 +1942,7 @@ msgstr "gpg 无法为数据签名"

1942 msgid "could not create temporary file"

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

1944

1931 -#: gpg-interface.c:213

1945 +#: gpg-interface.c:214

1946 #, c-format

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

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

@@ -1938,17 +1952,17 @@ msgstr "无法将分离式签名写入 '%s'"

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

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

1954

1941 -#: grep.c:1981

1955 +#: grep.c:1970

1956 #, c-format

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

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

1959

1946 -#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134

1960 +#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1961 #, c-format

1962 msgid "failed to stat '%s'"

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

1964

1951 -#: grep.c:2009

1965 +#: grep.c:1998

1966 #, c-format

1967 msgid "'%s': short read"

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

@@ -2006,8 +2020,12 @@ msgid ""

2020 msgid_plural ""

2021 "\n"

2022 "The most similar commands are"

2009 -msgstr[0] "\n最相似的命令是"

2010 -msgstr[1] "\n最相似的命令是"

2023 +msgstr[0] ""

2024 +"\n"

2025 +"最相似的命令是"

2026 +msgstr[1] ""

2027 +"\n"

2028 +"最相似的命令是"

2029

2030 #: help.c:395

2031 msgid "git version [<options>]"

@@ -2085,12 +2103,12 @@ msgstr "不允许空的姓名（对于 <%s>）"

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

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

2105

2088 -#: ident.c:416 builtin/commit.c:612

2106 +#: ident.c:416 builtin/commit.c:616

2107 #, c-format

2108 msgid "invalid date format: %s"

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

2110

2093 -#: lockfile.c:152

2111 +#: lockfile.c:151

2112 #, c-format

2113 msgid ""

2114 "Unable to create '%s.lock': %s.\n"

@@ -2108,7 +2126,7 @@ msgstr ""

2126 "可能之前有一个 git 进程在这个仓库中异常退出：\n"

2127 "手动删除这个文件再继续。"

2128

2111 -#: lockfile.c:160

2129 +#: lockfile.c:159

2130 #, c-format

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

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

@@ -2117,78 +2135,78 @@ msgstr "不能创建 '%s.lock'：%s"

2135 msgid "failed to read the cache"

2136 msgstr "无法读取缓存"

2137

2120 -#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377

2121 -#: builtin/checkout.c:591 builtin/clone.c:753

2138 +#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380

2139 +#: builtin/checkout.c:595 builtin/clone.c:754

2140 msgid "unable to write new index file"

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

2142

2125 -#: merge-recursive.c:210

2143 +#: merge-recursive.c:235

2144 msgid "(bad commit)\n"

2145 msgstr "（坏提交）\n"

2146

2129 -#: merge-recursive.c:232 merge-recursive.c:240

2147 +#: merge-recursive.c:257 merge-recursive.c:265

2148 #, c-format

2149 msgid "addinfo_cache failed for path '%s'"

2150 msgstr "为路径 '%s' addinfo_cache 失败"

2151

2134 -#: merge-recursive.c:304

2152 +#: merge-recursive.c:329

2153 msgid "error building trees"

2154 msgstr "无法创建树"

2155

2138 -#: merge-recursive.c:728

2156 +#: merge-recursive.c:752

2157 #, c-format

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

2159 msgstr "无法创建路径 '%s'%s"

2160

2143 -#: merge-recursive.c:739

2161 +#: merge-recursive.c:763

2162 #, c-format

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

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

2165

2148 -#: merge-recursive.c:753 merge-recursive.c:772

2166 +#: merge-recursive.c:777 merge-recursive.c:796

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

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

2169

2152 -#: merge-recursive.c:762

2170 +#: merge-recursive.c:786

2171 #, c-format

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

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

2174

2157 -#: merge-recursive.c:804 builtin/cat-file.c:36

2175 +#: merge-recursive.c:828 builtin/cat-file.c:37

2176 #, c-format

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

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

2179

2162 -#: merge-recursive.c:806

2180 +#: merge-recursive.c:830

2181 #, c-format

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

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

2184

2167 -#: merge-recursive.c:830

2185 +#: merge-recursive.c:854

2186 #, c-format

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

2188 msgstr "无法打开 '%s'：%s"

2189

2172 -#: merge-recursive.c:841

2190 +#: merge-recursive.c:865

2191 #, c-format

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

2193 msgstr "无法创建符号链接 '%s'：%s"

2194

2177 -#: merge-recursive.c:846

2195 +#: merge-recursive.c:870

2196 #, c-format

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

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

2199

2182 -#: merge-recursive.c:986

2200 +#: merge-recursive.c:1010

2201 msgid "Failed to execute internal merge"

2202 msgstr "无法执行内部合并"

2203

2186 -#: merge-recursive.c:990

2204 +#: merge-recursive.c:1014

2205 #, c-format

2206 msgid "Unable to add %s to database"

2207 msgstr "不能添加 %s 至对象库"

2208

2191 -#: merge-recursive.c:1093

2209 +#: merge-recursive.c:1117

2210 #, c-format

2211 msgid ""

2212 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2197,7 +2215,7 @@ msgstr ""

2215 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

2216 "本被保留。"

2217

2200 -#: merge-recursive.c:1098

2218 +#: merge-recursive.c:1122

2219 #, c-format

2220 msgid ""

2221 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2206,7 +2224,7 @@ msgstr ""

2224 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2225 "%7$s 版本被保留。"

2226

2209 -#: merge-recursive.c:1105

2227 +#: merge-recursive.c:1129

2228 #, c-format

2229 msgid ""

2230 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -2215,7 +2233,7 @@ msgstr ""

2233 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

2234 "本保留在 %8$s 中。"

2235

2218 -#: merge-recursive.c:1110

2236 +#: merge-recursive.c:1134

2237 #, c-format

2238 msgid ""

2239 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2224,20 +2242,20 @@ msgstr ""

2242 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

2243 "%7$s 版本保留在 %9$s 中。"

2244

2227 -#: merge-recursive.c:1144

2245 +#: merge-recursive.c:1168

2246 msgid "rename"

2247 msgstr "重命名"

2248

2231 -#: merge-recursive.c:1144

2249 +#: merge-recursive.c:1168

2250 msgid "renamed"

2251 msgstr "重命名"

2252

2235 -#: merge-recursive.c:1201

2253 +#: merge-recursive.c:1225

2254 #, c-format

2255 msgid "%s is a directory in %s adding as %s instead"

2256 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

2257

2240 -#: merge-recursive.c:1226

2258 +#: merge-recursive.c:1250

2259 #, c-format

2260 msgid ""

2261 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -2246,139 +2264,139 @@ msgstr ""

2264 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

2265 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

2266

2249 -#: merge-recursive.c:1231

2267 +#: merge-recursive.c:1255

2268 msgid " (left unresolved)"

2269 msgstr "（留下未解决）"

2270

2253 -#: merge-recursive.c:1293

2271 +#: merge-recursive.c:1317

2272 #, c-format

2273 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2274 msgstr ""

2275 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

2276 "%5$s"

2277

2260 -#: merge-recursive.c:1326

2278 +#: merge-recursive.c:1350

2279 #, c-format

2280 msgid "Renaming %s to %s and %s to %s instead"

2281 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

2282

2265 -#: merge-recursive.c:1529

2283 +#: merge-recursive.c:1553

2284 #, c-format

2285 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2286 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

2287

2270 -#: merge-recursive.c:1544

2288 +#: merge-recursive.c:1568

2289 #, c-format

2290 msgid "Adding merged %s"

2291 msgstr "添加合并后的 %s"

2292

2275 -#: merge-recursive.c:1551 merge-recursive.c:1781

2293 +#: merge-recursive.c:1575 merge-recursive.c:1805

2294 #, c-format

2295 msgid "Adding as %s instead"

2296 msgstr "而是以 %s 为名添加"

2297

2280 -#: merge-recursive.c:1608

2298 +#: merge-recursive.c:1632

2299 #, c-format

2300 msgid "cannot read object %s"

2301 msgstr "不能读取对象 %s"

2302

2285 -#: merge-recursive.c:1611

2303 +#: merge-recursive.c:1635

2304 #, c-format

2305 msgid "object %s is not a blob"

2306 msgstr "对象 %s 不是一个数据对象"

2307

2290 -#: merge-recursive.c:1680

2308 +#: merge-recursive.c:1704

2309 msgid "modify"

2310 msgstr "修改"

2311

2294 -#: merge-recursive.c:1680

2312 +#: merge-recursive.c:1704

2313 msgid "modified"

2314 msgstr "修改"

2315

2298 -#: merge-recursive.c:1690

2316 +#: merge-recursive.c:1714

2317 msgid "content"

2318 msgstr "内容"

2319

2302 -#: merge-recursive.c:1697

2320 +#: merge-recursive.c:1721

2321 msgid "add/add"

2322 msgstr "添加/添加"

2323

2306 -#: merge-recursive.c:1733

2324 +#: merge-recursive.c:1757

2325 #, c-format

2326 msgid "Skipped %s (merged same as existing)"

2327 msgstr "略过 %s（已经做过相同合并）"

2328

2311 -#: merge-recursive.c:1747

2329 +#: merge-recursive.c:1771

2330 #, c-format

2331 msgid "Auto-merging %s"

2332 msgstr "自动合并 %s"

2333

2316 -#: merge-recursive.c:1751 git-submodule.sh:945

2334 +#: merge-recursive.c:1775 git-submodule.sh:944

2335 msgid "submodule"

2336 msgstr "子模组"

2337

2320 -#: merge-recursive.c:1752

2338 +#: merge-recursive.c:1776

2339 #, c-format

2340 msgid "CONFLICT (%s): Merge conflict in %s"

2341 msgstr "冲突（%s）：合并冲突于 %s"

2342

2325 -#: merge-recursive.c:1846

2343 +#: merge-recursive.c:1870

2344 #, c-format

2345 msgid "Removing %s"

2346 msgstr "删除 %s"

2347

2330 -#: merge-recursive.c:1872

2348 +#: merge-recursive.c:1896

2349 msgid "file/directory"

2350 msgstr "文件/目录"

2351

2334 -#: merge-recursive.c:1878

2352 +#: merge-recursive.c:1902

2353 msgid "directory/file"

2354 msgstr "目录/文件"

2355

2338 -#: merge-recursive.c:1884

2356 +#: merge-recursive.c:1908

2357 #, c-format

2358 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2359 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

2360

2343 -#: merge-recursive.c:1893

2361 +#: merge-recursive.c:1917

2362 #, c-format

2363 msgid "Adding %s"

2364 msgstr "添加 %s"

2365

2348 -#: merge-recursive.c:1930

2349 -msgid "Already up-to-date!"

2366 +#: merge-recursive.c:1954

2367 +msgid "Already up to date!"

2368 msgstr "已经是最新的！"

2369

2352 -#: merge-recursive.c:1939

2370 +#: merge-recursive.c:1963

2371 #, c-format

2372 msgid "merging of trees %s and %s failed"

2373 msgstr "无法合并树 %s 和 %s"

2374

2357 -#: merge-recursive.c:2022

2375 +#: merge-recursive.c:2060

2376 msgid "Merging:"

2377 msgstr "合并："

2378

2361 -#: merge-recursive.c:2035

2379 +#: merge-recursive.c:2073

2380 #, c-format

2381 msgid "found %u common ancestor:"

2382 msgid_plural "found %u common ancestors:"

2383 msgstr[0] "发现 %u 个共同祖先："

2384 msgstr[1] "发现 %u 个共同祖先："

2385

2368 -#: merge-recursive.c:2074

2386 +#: merge-recursive.c:2112

2387 msgid "merge returned no commit"

2388 msgstr "合并未返回提交"

2389

2372 -#: merge-recursive.c:2137

2390 +#: merge-recursive.c:2175

2391 #, c-format

2392 msgid "Could not parse object '%s'"

2393 msgstr "不能解析对象 '%s'"

2394

2377 -#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793

2395 +#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814

2396 msgid "Unable to write index."

2397 msgstr "不能写入索引。"

2398

2381 -#: notes-merge.c:273

2399 +#: notes-merge.c:272

2400 #, c-format

2401 msgid ""

2402 "You have not concluded your previous notes merge (%s exists).\n"

@@ -2389,7 +2407,7 @@ msgstr ""

2407 "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "

2408 "notes merge --abort' 来提交/终止前一次合并。"

2409

2392 -#: notes-merge.c:280

2410 +#: notes-merge.c:279

2411 #, c-format

2412 msgid "You have not concluded your notes merge (%s exists)."

2413 msgstr "您尚未结束注释合并（存在 %s）。"

@@ -2417,16 +2435,30 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

2435 msgid "Bad %s value: '%s'"

2436 msgstr "坏的 %s 值：'%s'"

2437

2420 -#: object.c:240

2438 +#: object.c:239

2439 #, c-format

2440 msgid "unable to parse object: %s"

2441 msgstr "不能解析对象：%s"

2442

2443 +#: packfile.c:556

2444 +msgid "offset before end of packfile (broken .idx?)"

2445 +msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

2446 +

2447 +#: packfile.c:1683

2448 +#, c-format

2449 +msgid "offset before start of pack index for %s (corrupt index?)"

2450 +msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

2451 +

2452 +#: packfile.c:1687

2453 +#, c-format

2454 +msgid "offset beyond end of pack index for %s (truncated index?)"

2455 +msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

2456 +

2457 #: parse-options.c:573

2458 msgid "..."

2459 msgstr "..."

2460

2429 -#: parse-options.c:591

2461 +#: parse-options.c:592

2462 #, c-format

2463 msgid "usage: %s"

2464 msgstr "用法：%s"

@@ -2434,18 +2466,18 @@ msgstr "用法：%s"

2466 #. TRANSLATORS: the colon here should align with the

2467 #. one in "usage: %s" translation.

2468 #.

2437 -#: parse-options.c:597

2469 +#: parse-options.c:598

2470 #, c-format

2471 msgid " or: %s"

2472 msgstr " 或：%s"

2473

2474 # 译者：为保证在输出中对齐，注意调整句中空格！

2443 -#: parse-options.c:600

2475 +#: parse-options.c:601

2476 #, c-format

2477 msgid " %s"

2478 msgstr " %s"

2479

2448 -#: parse-options.c:634

2480 +#: parse-options.c:640

2481 msgid "-NUM"

2482 msgstr "-数字"

2483

@@ -2454,7 +2486,7 @@ msgstr "-数字"

2486 msgid "malformed object name '%s'"

2487 msgstr "非法的对象名 '%s'"

2488

2457 -#: path.c:890

2489 +#: path.c:891

2490 #, c-format

2491 msgid "Could not make %s writable by group"

2492 msgstr "不能设置 %s 为组可写"

@@ -2525,7 +2557,7 @@ msgstr "'%s'（助记符：'%c'）"

2557 msgid "%s: pathspec magic not supported by this command: %s"

2558 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

2559

2528 -#: pathspec.c:575

2560 +#: pathspec.c:571

2561 msgid ""

2562 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2563 "use . instead if you meant to match all paths"

@@ -2533,12 +2565,12 @@ msgstr ""

2565 "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"

2566 "请代之以 ."

2567

2536 -#: pathspec.c:599

2568 +#: pathspec.c:595

2569 #, c-format

2570 msgid "pathspec '%s' is beyond a symbolic link"

2571 msgstr "路径规格 '%s' 位于符号链接中"

2572

2541 -#: pretty.c:963

2573 +#: pretty.c:962

2574 msgid "unable to parse --pretty format"

2575 msgstr "不能解析 --pretty 格式"

2576

@@ -2560,50 +2592,51 @@ msgstr ""

2592 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

2593 "使用版本 %i"

2594

2563 -#: read-cache.c:2308 builtin/merge.c:1019

2595 +#: read-cache.c:2316 builtin/merge.c:1046

2596 #, c-format

2597 msgid "could not close '%s'"

2598 msgstr "不能关闭 '%s'"

2599

2568 -#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054

2600 +#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077

2601 #, c-format

2602 msgid "could not stat '%s'"

2603 msgstr "不能对 '%s' 调用 stat"

2604

2573 -#: read-cache.c:2396

2605 +#: read-cache.c:2407

2606 #, c-format

2607 msgid "unable to open git dir: %s"

2608 msgstr "不能打开 git 目录：%s"

2609

2578 -#: read-cache.c:2408

2610 +#: read-cache.c:2419

2611 #, c-format

2612 msgid "unable to unlink: %s"

2613 msgstr "无法删除：%s"

2614

2583 -#: refs.c:622

2615 +#: refs.c:638

2616 #, c-format

2617 msgid "Could not open '%s' for writing"

2618 msgstr "无法打开 '%s' 进行写入"

2619

2588 -#: refs.c:1769

2620 +#: refs.c:1792

2621 msgid "ref updates forbidden inside quarantine environment"

2622 msgstr "在隔离环境中禁止更新引用"

2623

2592 -#: refs/files-backend.c:1664

2624 +#: refs/files-backend.c:1136

2625 +#, c-format

2626 +msgid "could not remove reference %s"

2627 +msgstr "无法删除引用 %s"

2628 +

2629 +#: refs/files-backend.c:1150 refs/packed-backend.c:1430

2630 +#: refs/packed-backend.c:1440

2631 #, c-format

2632 msgid "could not delete reference %s: %s"

2633 msgstr "无法删除引用 %s：%s"

2634

2597 -#: refs/files-backend.c:1667

2635 +#: refs/files-backend.c:1153 refs/packed-backend.c:1443

2636 #, c-format

2637 msgid "could not delete references: %s"

2638 msgstr "无法删除引用：%s"

2639

2602 -#: refs/files-backend.c:1676

2603 -#, c-format

2604 -msgid "could not remove reference %s"

2605 -msgstr "无法删除引用 %s"

2606 -

2640 #: ref-filter.c:35 wt-status.c:1811

2641 msgid "gone"

2642 msgstr "丢失"

@@ -2633,147 +2666,147 @@ msgstr "期望的格式：%%(color:<color>)"

2666 msgid "unrecognized color: %%(color:%s)"

2667 msgstr "未能识别的颜色：%%(color:%s)"

2668

2636 -#: ref-filter.c:121

2669 +#: ref-filter.c:127

2670 #, c-format

2671 msgid "Integer value expected refname:lstrip=%s"

2672 msgstr "期望整数值 refname:lstrip=%s"

2673

2641 -#: ref-filter.c:125

2674 +#: ref-filter.c:131

2675 #, c-format

2676 msgid "Integer value expected refname:rstrip=%s"

2677 msgstr "期望整数值 refname:rstrip=%s"

2678

2646 -#: ref-filter.c:127

2679 +#: ref-filter.c:133

2680 #, c-format

2681 msgid "unrecognized %%(%s) argument: %s"

2682 msgstr "未能识别的 %%(%s) 参数：%s"

2683

2651 -#: ref-filter.c:167

2684 +#: ref-filter.c:173

2685 #, c-format

2686 msgid "%%(body) does not take arguments"

2687 msgstr "%%(body) 不带参数"

2688

2656 -#: ref-filter.c:174

2689 +#: ref-filter.c:180

2690 #, c-format

2691 msgid "%%(subject) does not take arguments"

2692 msgstr "%%(subject) 不带参数"

2693

2661 -#: ref-filter.c:181

2694 +#: ref-filter.c:198

2695 #, c-format

2663 -msgid "%%(trailers) does not take arguments"

2664 -msgstr "%%(trailers) 不带参数"

2696 +msgid "unknown %%(trailers) argument: %s"

2697 +msgstr "未知的 %%(trailers) 参数：%s"

2698

2666 -#: ref-filter.c:200

2699 +#: ref-filter.c:221

2700 #, c-format

2701 msgid "positive value expected contents:lines=%s"

2702 msgstr "期望一个正数 contents:lines=%s"

2703

2671 -#: ref-filter.c:202

2704 +#: ref-filter.c:223

2705 #, c-format

2706 msgid "unrecognized %%(contents) argument: %s"

2707 msgstr "未能识别的 %%(contents) 参数：%s"

2708

2676 -#: ref-filter.c:215

2709 +#: ref-filter.c:236

2710 #, c-format

2711 msgid "positive value expected objectname:short=%s"

2712 msgstr "期望一个正数 objectname:short=%s"

2713

2681 -#: ref-filter.c:219

2714 +#: ref-filter.c:240

2715 #, c-format

2716 msgid "unrecognized %%(objectname) argument: %s"

2717 msgstr "未能识别的 %%(objectname) 参数：%s"

2718

2686 -#: ref-filter.c:246

2719 +#: ref-filter.c:267

2720 #, c-format

2721 msgid "expected format: %%(align:<width>,<position>)"

2722 msgstr "期望的格式：%%(align:<width>,<position>)"

2723

2691 -#: ref-filter.c:258

2724 +#: ref-filter.c:279

2725 #, c-format

2726 msgid "unrecognized position:%s"

2727 msgstr "未能识别的位置：%s"

2728

2696 -#: ref-filter.c:262

2729 +#: ref-filter.c:283

2730 #, c-format

2731 msgid "unrecognized width:%s"

2732 msgstr "未能识别的宽度：%s"

2733

2701 -#: ref-filter.c:268

2734 +#: ref-filter.c:289

2735 #, c-format

2736 msgid "unrecognized %%(align) argument: %s"

2737 msgstr "未能识别的 %%(align) 参数：%s"

2738

2706 -#: ref-filter.c:272

2739 +#: ref-filter.c:293

2740 #, c-format

2741 msgid "positive width expected with the %%(align) atom"

2742 msgstr "元素 %%(align) 需要一个正数的宽度"

2743

2711 -#: ref-filter.c:287

2744 +#: ref-filter.c:308

2745 #, c-format

2746 msgid "unrecognized %%(if) argument: %s"

2747 msgstr "未能识别的 %%(if) 参数：%s"

2748

2716 -#: ref-filter.c:378

2749 +#: ref-filter.c:398

2750 #, c-format

2751 msgid "malformed field name: %.*s"

2752 msgstr "非法的字段名：%.*s"

2753

2721 -#: ref-filter.c:404

2754 +#: ref-filter.c:424

2755 #, c-format

2756 msgid "unknown field name: %.*s"

2757 msgstr "未知的字段名：%.*s"

2758

2726 -#: ref-filter.c:508

2759 +#: ref-filter.c:536

2760 #, c-format

2761 msgid "format: %%(if) atom used without a %%(then) atom"

2762 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

2763

2731 -#: ref-filter.c:568

2764 +#: ref-filter.c:596

2765 #, c-format

2766 msgid "format: %%(then) atom used without an %%(if) atom"

2767 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

2768

2736 -#: ref-filter.c:570

2769 +#: ref-filter.c:598

2770 #, c-format

2771 msgid "format: %%(then) atom used more than once"

2772 msgstr "格式：%%(then) 元素用了多次"

2773

2741 -#: ref-filter.c:572

2774 +#: ref-filter.c:600

2775 #, c-format

2776 msgid "format: %%(then) atom used after %%(else)"

2777 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

2778

2746 -#: ref-filter.c:598

2779 +#: ref-filter.c:626

2780 #, c-format

2781 msgid "format: %%(else) atom used without an %%(if) atom"

2782 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

2783

2751 -#: ref-filter.c:600

2784 +#: ref-filter.c:628

2785 #, c-format

2786 msgid "format: %%(else) atom used without a %%(then) atom"

2787 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

2788

2756 -#: ref-filter.c:602

2789 +#: ref-filter.c:630

2790 #, c-format

2791 msgid "format: %%(else) atom used more than once"

2792 msgstr "格式：%%(else) 元素用了多次"

2793

2761 -#: ref-filter.c:615

2794 +#: ref-filter.c:643

2795 #, c-format

2796 msgid "format: %%(end) atom used without corresponding atom"

2797 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

2798

2766 -#: ref-filter.c:670

2799 +#: ref-filter.c:698

2800 #, c-format

2801 msgid "malformed format string %s"

2802 msgstr "非法的格式化字符串 %s"

2803

2771 -#: ref-filter.c:1254

2804 +#: ref-filter.c:1283

2805 #, c-format

2806 msgid "(no branch, rebasing %s)"

2807 msgstr "（非分支，正变基 %s）"

2808

2776 -#: ref-filter.c:1257

2809 +#: ref-filter.c:1286

2810 #, c-format

2811 msgid "(no branch, bisect started on %s)"

2812 msgstr "（非分支，二分查找开始于 %s）"

@@ -2781,7 +2814,7 @@ msgstr "（非分支，二分查找开始于 %s）"

2814 #. TRANSLATORS: make sure this matches "HEAD

2815 #. detached at " in wt-status.c

2816 #.

2784 -#: ref-filter.c:1265

2817 +#: ref-filter.c:1294

2818 #, c-format

2819 msgid "(HEAD detached at %s)"

2820 msgstr "（头指针分离于 %s）"

@@ -2789,108 +2822,108 @@ msgstr "（头指针分离于 %s）"

2822 #. TRANSLATORS: make sure this matches "HEAD

2823 #. detached from " in wt-status.c

2824 #.

2792 -#: ref-filter.c:1272

2825 +#: ref-filter.c:1301

2826 #, c-format

2827 msgid "(HEAD detached from %s)"

2828 msgstr "（头指针分离自 %s）"

2829

2797 -#: ref-filter.c:1276

2830 +#: ref-filter.c:1305

2831 msgid "(no branch)"

2832 msgstr "（非分支）"

2833

2801 -#: ref-filter.c:1426 ref-filter.c:1457

2834 +#: ref-filter.c:1454 ref-filter.c:1485

2835 #, c-format

2836 msgid "missing object %s for %s"

2837 msgstr "缺失 %2$s 的对象 %1$s"

2838

2806 -#: ref-filter.c:1429 ref-filter.c:1460

2839 +#: ref-filter.c:1457 ref-filter.c:1488

2840 #, c-format

2841 msgid "parse_object_buffer failed on %s for %s"

2842 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

2843

2811 -#: ref-filter.c:1760

2844 +#: ref-filter.c:1788

2845 #, c-format

2846 msgid "malformed object at '%s'"

2847 msgstr "非法的对象于 '%s'"

2848

2816 -#: ref-filter.c:1827

2849 +#: ref-filter.c:1855

2850 #, c-format

2851 msgid "ignoring ref with broken name %s"

2852 msgstr "忽略带有错误名称 %s 的引用"

2853

2821 -#: ref-filter.c:1832

2854 +#: ref-filter.c:1860

2855 #, c-format

2856 msgid "ignoring broken ref %s"

2857 msgstr "忽略损坏的引用 %s"

2858

2826 -#: ref-filter.c:2095

2859 +#: ref-filter.c:2122

2860 #, c-format

2861 msgid "format: %%(end) atom missing"

2862 msgstr "格式：缺少 %%(end) 元素"

2863

2831 -#: ref-filter.c:2176

2864 +#: ref-filter.c:2216

2865 #, c-format

2866 msgid "malformed object name %s"

2867 msgstr "非法的对象名 %s"

2868

2836 -#: remote.c:747

2869 +#: remote.c:750

2870 #, c-format

2871 msgid "Cannot fetch both %s and %s to %s"

2872 msgstr "不能同时获取 %s 和 %s 至 %s"

2873

2841 -#: remote.c:751

2874 +#: remote.c:754

2875 #, c-format

2876 msgid "%s usually tracks %s, not %s"

2877 msgstr "%s 通常跟踪 %s，而非 %s"

2878

2846 -#: remote.c:755

2879 +#: remote.c:758

2880 #, c-format

2881 msgid "%s tracks both %s and %s"

2882 msgstr "%s 同时跟踪 %s 和 %s"

2883

2851 -#: remote.c:763

2884 +#: remote.c:766

2885 msgid "Internal error"

2886 msgstr "内部错误"

2887

2855 -#: remote.c:1680 remote.c:1782

2888 +#: remote.c:1681 remote.c:1783

2889 msgid "HEAD does not point to a branch"

2890 msgstr "HEAD 没有指向一个分支"

2891

2859 -#: remote.c:1689

2892 +#: remote.c:1690

2893 #, c-format

2894 msgid "no such branch: '%s'"

2895 msgstr "没有此分支：'%s'"

2896

2864 -#: remote.c:1692

2897 +#: remote.c:1693

2898 #, c-format

2899 msgid "no upstream configured for branch '%s'"

2900 msgstr "尚未给分支 '%s' 设置上游"

2901

2869 -#: remote.c:1698

2902 +#: remote.c:1699

2903 #, c-format

2904 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2905 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

2906

2874 -#: remote.c:1713

2907 +#: remote.c:1714

2908 #, c-format

2909 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2910 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

2911

2879 -#: remote.c:1725

2912 +#: remote.c:1726

2913 #, c-format

2914 msgid "branch '%s' has no remote for pushing"

2915 msgstr "分支 '%s' 没有设置要推送的远程服务器"

2916

2884 -#: remote.c:1736

2917 +#: remote.c:1737

2918 #, c-format

2919 msgid "push refspecs for '%s' do not include '%s'"

2920 msgstr "向 '%s' 推送引用规格未包含 '%s'"

2921

2889 -#: remote.c:1749

2922 +#: remote.c:1750

2923 msgid "push has no destination (push.default is 'nothing')"

2924 msgstr "推送无目标（push.default 是 'nothing'）"

2925

2893 -#: remote.c:1771

2926 +#: remote.c:1772

2927 msgid "cannot resolve 'simple' push to a single destination"

2928 msgstr "无法解析 'simple' 推送至一个单独的目标"

2929

@@ -2905,7 +2938,7 @@ msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

2938

2939 #: remote.c:2083

2940 #, c-format

2908 -msgid "Your branch is up-to-date with '%s'.\n"

2941 +msgid "Your branch is up to date with '%s'.\n"

2942 msgstr "您的分支与上游分支 '%s' 一致。\n"

2943

2944 #: remote.c:2087

@@ -2952,16 +2985,16 @@ msgstr[1] ""

2985 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2986 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

2987

2955 -#: revision.c:2187

2988 +#: revision.c:2256

2989 msgid "your current branch appears to be broken"

2990 msgstr "您的当前分支好像被损坏"

2991

2959 -#: revision.c:2190

2992 +#: revision.c:2259

2993 #, c-format

2994 msgid "your current branch '%s' does not have any commits yet"

2995 msgstr "您的当前分支 '%s' 尚无任何提交"

2996

2964 -#: revision.c:2384

2997 +#: revision.c:2453

2998 msgid "--first-parent is incompatible with --bisect"

2999 msgstr "--first-parent 与 --bisect 不兼容"

3000

@@ -3001,24 +3034,24 @@ msgstr "接收端不支持原子推送"

3034 msgid "the receiving end does not support push options"

3035 msgstr "接收端不支持推送选项"

3036

3004 -#: sequencer.c:216

3037 +#: sequencer.c:218

3038 msgid "revert"

3039 msgstr "还原"

3040

3008 -#: sequencer.c:218

3041 +#: sequencer.c:220

3042 msgid "cherry-pick"

3043 msgstr "拣选"

3044

3012 -#: sequencer.c:220

3045 +#: sequencer.c:222

3046 msgid "rebase -i"

3047 msgstr "rebase -i"

3048

3016 -#: sequencer.c:222

3049 +#: sequencer.c:224

3050 #, c-format

3051 msgid "Unknown action: %d"

3052 msgstr "未知动作：%d"

3053

3021 -#: sequencer.c:279

3054 +#: sequencer.c:281

3055 msgid ""

3056 "after resolving the conflicts, mark the corrected paths\n"

3057 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3026,7 +3059,7 @@ msgstr ""

3059 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

3060 "命令标记修正后的文件"

3061

3029 -#: sequencer.c:282

3062 +#: sequencer.c:284

3063 msgid ""

3064 "after resolving the conflicts, mark the corrected paths\n"

3065 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3035,42 +3068,43 @@ msgstr ""

3068 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

3069 "对修正后的文件做标记，然后用 'git commit' 提交"

3070

3038 -#: sequencer.c:295 sequencer.c:1685

3071 +#: sequencer.c:297 sequencer.c:1704

3072 #, c-format

3073 msgid "could not lock '%s'"

3074 msgstr "不能锁定 '%s'"

3075

3043 -#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704

3076 +#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723

3077 +#: sequencer.c:2733 sequencer.c:2749

3078 #, c-format

3079 msgid "could not write to '%s'"

3080 msgstr "不能写入 '%s'"

3081

3048 -#: sequencer.c:302

3082 +#: sequencer.c:304

3083 #, c-format

3084 msgid "could not write eol to '%s'"

3085 msgstr "不能将换行符写入 '%s'"

3086

3053 -#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692

3087 +#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711

3088 #, c-format

3089 msgid "failed to finalize '%s'."

3090 msgstr "无法完成 '%s'。"

3091

3058 -#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258

3059 -#: builtin/commit.c:750 builtin/merge.c:1017

3092 +#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259

3093 +#: builtin/commit.c:754 builtin/merge.c:1044

3094 #, c-format

3095 msgid "could not read '%s'"

3096 msgstr "不能读取 '%s'"

3097

3064 -#: sequencer.c:356

3098 +#: sequencer.c:358

3099 #, c-format

3100 msgid "your local changes would be overwritten by %s."

3101 msgstr "您的本地修改将被%s覆盖。"

3102

3069 -#: sequencer.c:360

3103 +#: sequencer.c:362

3104 msgid "commit your changes or stash them to proceed."

3105 msgstr "提交您的修改或贮藏后再继续。"

3106

3073 -#: sequencer.c:389

3107 +#: sequencer.c:391

3108 #, c-format

3109 msgid "%s: fast-forward"

3110 msgstr "%s：快进"

@@ -3078,20 +3112,20 @@ msgstr "%s：快进"

3112 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3113 #. "rebase -i".

3114 #.

3081 -#: sequencer.c:472

3115 +#: sequencer.c:474

3116 #, c-format

3117 msgid "%s: Unable to write new index file"

3118 msgstr "%s：无法写入新索引文件"

3119

3086 -#: sequencer.c:491

3120 +#: sequencer.c:493

3121 msgid "could not resolve HEAD commit\n"

3122 msgstr "不能解析 HEAD 提交\n"

3123

3090 -#: sequencer.c:511

3124 +#: sequencer.c:513

3125 msgid "unable to update cache tree\n"

3126 msgstr "不能更新缓存树\n"

3127

3094 -#: sequencer.c:595

3128 +#: sequencer.c:597

3129 #, c-format

3130 msgid ""

3131 "you have staged changes in your working tree\n"

@@ -3120,17 +3154,17 @@ msgstr ""

3154 "\n"

3155 " git rebase --continue\n"

3156

3123 -#: sequencer.c:697

3157 +#: sequencer.c:699

3158 #, c-format

3159 msgid "could not parse commit %s\n"

3160 msgstr "不能解析提交 %s\n"

3161

3128 -#: sequencer.c:702

3162 +#: sequencer.c:704

3163 #, c-format

3164 msgid "could not parse parent commit %s\n"

3165 msgstr "不能解析父提交 %s\n"

3166

3133 -#: sequencer.c:824

3167 +#: sequencer.c:826

3168 #, c-format

3169 msgid ""

3170 "unexpected 1st line of squash message:\n"

@@ -3141,7 +3175,7 @@ msgstr ""

3175 "\n"

3176 "\t%.*s"

3177

3144 -#: sequencer.c:830

3178 +#: sequencer.c:832

3179 #, c-format

3180 msgid ""

3181 "invalid 1st line of squash message:\n"

@@ -3152,230 +3186,231 @@ msgstr ""

3186 "\n"

3187 "\t%.*s"

3188

3155 -#: sequencer.c:836 sequencer.c:861

3189 +#: sequencer.c:838 sequencer.c:863

3190 #, c-format

3191 msgid "This is a combination of %d commits."

3192 msgstr "这是一个 %d 个提交的组合。"

3193

3160 -#: sequencer.c:845

3194 +#: sequencer.c:847 sequencer.c:2681

3195 msgid "need a HEAD to fixup"

3196 msgstr "需要一个 HEAD 来修复"

3197

3164 -#: sequencer.c:847

3198 +#: sequencer.c:849

3199 msgid "could not read HEAD"

3200 msgstr "不能读取 HEAD"

3201

3168 -#: sequencer.c:849

3202 +#: sequencer.c:851

3203 msgid "could not read HEAD's commit message"

3204 msgstr "不能读取 HEAD 的提交说明"

3205

3172 -#: sequencer.c:855

3206 +#: sequencer.c:857

3207 #, c-format

3208 msgid "cannot write '%s'"

3209 msgstr "不能写 '%s'"

3210

3177 -#: sequencer.c:864 git-rebase--interactive.sh:445

3211 +#: sequencer.c:866 git-rebase--interactive.sh:446

3212 msgid "This is the 1st commit message:"

3213 msgstr "这是第一个提交说明："

3214

3181 -#: sequencer.c:872

3215 +#: sequencer.c:874

3216 #, c-format

3217 msgid "could not read commit message of %s"

3218 msgstr "不能读取 %s 的提交说明"

3219

3186 -#: sequencer.c:879

3220 +#: sequencer.c:881

3221 #, c-format

3222 msgid "This is the commit message #%d:"

3223 msgstr "这是提交说明 #%d："

3224

3191 -#: sequencer.c:884

3225 +#: sequencer.c:886

3226 #, c-format

3227 msgid "The commit message #%d will be skipped:"

3228 msgstr "提交说明 #%d 将被跳过："

3229

3196 -#: sequencer.c:889

3230 +#: sequencer.c:891

3231 #, c-format

3232 msgid "unknown command: %d"

3233 msgstr "未知命令：%d"

3234

3201 -#: sequencer.c:955

3235 +#: sequencer.c:957

3236 msgid "your index file is unmerged."

3237 msgstr "您的索引文件未完成合并。"

3238

3205 -#: sequencer.c:973

3239 +#: sequencer.c:975

3240 #, c-format

3241 msgid "commit %s is a merge but no -m option was given."

3242 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

3243

3210 -#: sequencer.c:981

3244 +#: sequencer.c:983

3245 #, c-format

3246 msgid "commit %s does not have parent %d"

3247 msgstr "提交 %s 没有第 %d 个父提交"

3248

3215 -#: sequencer.c:985

3249 +#: sequencer.c:987

3250 #, c-format

3251 msgid "mainline was specified but commit %s is not a merge."

3252 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"

3253

3220 -#: sequencer.c:991

3254 +#: sequencer.c:993

3255 #, c-format

3256 msgid "cannot get commit message for %s"

3257 msgstr "不能得到 %s 的提交说明"

3258

3259 #. TRANSLATORS: The first %s will be a "todo" command like

3260 #. "revert" or "pick", the second %s a SHA1.

3227 -#: sequencer.c:1012

3261 +#: sequencer.c:1014

3262 #, c-format

3263 msgid "%s: cannot parse parent commit %s"

3264 msgstr "%s：不能解析父提交 %s"

3265

3232 -#: sequencer.c:1075 sequencer.c:1830

3266 +#: sequencer.c:1077 sequencer.c:1853

3267 #, c-format

3268 msgid "could not rename '%s' to '%s'"

3269 msgstr "不能将 '%s' 重命名为 '%s'"

3270

3237 -#: sequencer.c:1126

3271 +#: sequencer.c:1128

3272 #, c-format

3273 msgid "could not revert %s... %s"

3274 msgstr "不能还原 %s... %s"

3275

3242 -#: sequencer.c:1127

3276 +#: sequencer.c:1129

3277 #, c-format

3278 msgid "could not apply %s... %s"

3279 msgstr "不能应用 %s... %s"

3280

3247 -#: sequencer.c:1169

3281 +#: sequencer.c:1171

3282 msgid "empty commit set passed"

3283 msgstr "提供了空的提交集"

3284

3251 -#: sequencer.c:1179

3285 +#: sequencer.c:1181

3286 #, c-format

3287 msgid "git %s: failed to read the index"

3288 msgstr "git %s：无法读取索引"

3289

3256 -#: sequencer.c:1186

3290 +#: sequencer.c:1188

3291 #, c-format

3292 msgid "git %s: failed to refresh the index"

3293 msgstr "git %s：无法刷新索引"

3294

3261 -#: sequencer.c:1306

3295 +#: sequencer.c:1308

3296 #, c-format

3297 msgid "invalid line %d: %.*s"

3298 msgstr "无效行 %d：%.*s"

3299

3266 -#: sequencer.c:1314

3300 +#: sequencer.c:1316

3301 #, c-format

3302 msgid "cannot '%s' without a previous commit"

3303 msgstr "没有父提交的情况下不能 '%s'"

3304

3271 -#: sequencer.c:1347

3305 +#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614

3306 +#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951

3307 #, c-format

3308 msgid "could not read '%s'."

3309 msgstr "不能读取 '%s'。"

3310

3276 -#: sequencer.c:1359

3311 +#: sequencer.c:1361

3312 msgid "please fix this using 'git rebase --edit-todo'."

3313 msgstr "请用 'git rebase --edit-todo' 来修改。"

3314

3280 -#: sequencer.c:1361

3315 +#: sequencer.c:1363

3316 #, c-format

3317 msgid "unusable instruction sheet: '%s'"

3318 msgstr "不可用的指令清单：'%s'"

3319

3285 -#: sequencer.c:1366

3320 +#: sequencer.c:1368

3321 msgid "no commits parsed."

3322 msgstr "没有解析提交。"

3323

3289 -#: sequencer.c:1377

3324 +#: sequencer.c:1379

3325 msgid "cannot cherry-pick during a revert."

3326 msgstr "不能在回退中执行拣选。"

3327

3293 -#: sequencer.c:1379

3328 +#: sequencer.c:1381

3329 msgid "cannot revert during a cherry-pick."

3330 msgstr "不能在拣选中执行回退。"

3331

3297 -#: sequencer.c:1442

3332 +#: sequencer.c:1448

3333 #, c-format

3334 msgid "invalid key: %s"

3335 msgstr "无效键名：%s"

3336

3302 -#: sequencer.c:1445

3337 +#: sequencer.c:1451

3338 #, c-format

3339 msgid "invalid value for %s: %s"

3340 msgstr "%s 的值无效：%s"

3341

3307 -#: sequencer.c:1502

3342 +#: sequencer.c:1517

3343 #, c-format

3344 msgid "malformed options sheet: '%s'"

3345 msgstr "非法的选项清单：'%s'"

3346

3312 -#: sequencer.c:1540

3347 +#: sequencer.c:1555

3348 msgid "a cherry-pick or revert is already in progress"

3349 msgstr "一个拣选或还原操作已在进行"

3350

3316 -#: sequencer.c:1541

3351 +#: sequencer.c:1556

3352 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3353 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

3354

3320 -#: sequencer.c:1544

3355 +#: sequencer.c:1559

3356 #, c-format

3357 msgid "could not create sequencer directory '%s'"

3358 msgstr "不能创建序列目录 '%s'"

3359

3325 -#: sequencer.c:1558

3360 +#: sequencer.c:1574

3361 msgid "could not lock HEAD"

3362 msgstr "不能锁定 HEAD"

3363

3329 -#: sequencer.c:1614 sequencer.c:2188

3364 +#: sequencer.c:1632 sequencer.c:2211

3365 msgid "no cherry-pick or revert in progress"

3366 msgstr "拣选或还原操作并未进行"

3367

3333 -#: sequencer.c:1616

3368 +#: sequencer.c:1634

3369 msgid "cannot resolve HEAD"

3370 msgstr "不能解析 HEAD"

3371

3337 -#: sequencer.c:1618 sequencer.c:1652

3372 +#: sequencer.c:1636 sequencer.c:1671

3373 msgid "cannot abort from a branch yet to be born"

3374 msgstr "不能从尚未建立的分支终止"

3375

3341 -#: sequencer.c:1638 builtin/grep.c:929

3376 +#: sequencer.c:1657 builtin/grep.c:711

3377 #, c-format

3378 msgid "cannot open '%s'"

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

3380

3346 -#: sequencer.c:1640

3381 +#: sequencer.c:1659

3382 #, c-format

3383 msgid "cannot read '%s': %s"

3384 msgstr "不能读取 '%s'：%s"

3385

3351 -#: sequencer.c:1641

3386 +#: sequencer.c:1660

3387 msgid "unexpected end of file"

3388 msgstr "意外的文件结束"

3389

3355 -#: sequencer.c:1647

3390 +#: sequencer.c:1666

3391 #, c-format

3392 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3393 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

3394

3360 -#: sequencer.c:1658

3395 +#: sequencer.c:1677

3396 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3397 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

3398

3364 -#: sequencer.c:1795 sequencer.c:2086

3399 +#: sequencer.c:1818 sequencer.c:2109

3400 msgid "cannot read HEAD"

3401 msgstr "不能读取 HEAD"

3402

3368 -#: sequencer.c:1835 builtin/difftool.c:633

3403 +#: sequencer.c:1858 builtin/difftool.c:640

3404 #, c-format

3405 msgid "could not copy '%s' to '%s'"

3406 msgstr "不能拷贝 '%s' 至 '%s'"

3407

3373 -#: sequencer.c:1851

3408 +#: sequencer.c:1874

3409 msgid "could not read index"

3410 msgstr "不能读取索引"

3411

3412 # 译者：注意保持前导空格

3378 -#: sequencer.c:1856

3413 +#: sequencer.c:1879

3414 #, c-format

3415 msgid ""

3416 "execution failed: %s\n"

@@ -3390,11 +3425,11 @@ msgstr ""

3425 " git rebase --continue\n"

3426 "\n"

3427

3393 -#: sequencer.c:1862

3428 +#: sequencer.c:1885

3429 msgid "and made changes to the index and/or the working tree\n"

3430 msgstr "并且修改索引和/或工作区\n"

3431

3397 -#: sequencer.c:1868

3432 +#: sequencer.c:1891

3433 #, c-format

3434 msgid ""

3435 "execution succeeded: %s\n"

@@ -3411,17 +3446,17 @@ msgstr ""

3446 " git rebase --continue\n"

3447 "\n"

3448

3414 -#: sequencer.c:1925

3449 +#: sequencer.c:1948

3450 #, c-format

3451 msgid "Applied autostash.\n"

3452 msgstr "已应用 autostash。\n"

3453

3419 -#: sequencer.c:1937

3454 +#: sequencer.c:1960

3455 #, c-format

3456 msgid "cannot store %s"

3457 msgstr "不能存储 %s"

3458

3424 -#: sequencer.c:1940 git-rebase.sh:173

3459 +#: sequencer.c:1963 git-rebase.sh:175

3460 #, c-format

3461 msgid ""

3462 "Applying autostash resulted in conflicts.\n"

@@ -3432,57 +3467,57 @@ msgstr ""

3467 "您的修改安全地保存在贮藏区中。\n"

3468 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

3469

3435 -#: sequencer.c:2022

3470 +#: sequencer.c:2045

3471 #, c-format

3472 msgid "Stopped at %s... %.*s\n"

3473 msgstr "停止在 %s... %.*s\n"

3474

3440 -#: sequencer.c:2064

3475 +#: sequencer.c:2087

3476 #, c-format

3477 msgid "unknown command %d"

3478 msgstr "未知命令 %d"

3479

3445 -#: sequencer.c:2094

3480 +#: sequencer.c:2117

3481 msgid "could not read orig-head"

3482 msgstr "不能读取 orig-head"

3483

3449 -#: sequencer.c:2099

3484 +#: sequencer.c:2122 sequencer.c:2678

3485 msgid "could not read 'onto'"

3486 msgstr "不能读取 'onto'"

3487

3453 -#: sequencer.c:2106

3488 +#: sequencer.c:2129

3489 #, c-format

3490 msgid "could not update %s"

3491 msgstr "不能更新 %s"

3492

3458 -#: sequencer.c:2113

3493 +#: sequencer.c:2136

3494 #, c-format

3495 msgid "could not update HEAD to %s"

3496 msgstr "不能更新 HEAD 为 %s"

3497

3463 -#: sequencer.c:2197

3498 +#: sequencer.c:2220

3499 msgid "cannot rebase: You have unstaged changes."

3500 msgstr "不能变基：您有未暂存的变更。"

3501

3467 -#: sequencer.c:2202

3502 +#: sequencer.c:2225

3503 msgid "could not remove CHERRY_PICK_HEAD"

3504 msgstr "不能删除 CHERRY_PICK_HEAD"

3505

3471 -#: sequencer.c:2211

3506 +#: sequencer.c:2234

3507 msgid "cannot amend non-existing commit"

3508 msgstr "不能修补不存在的提交"

3509

3475 -#: sequencer.c:2213

3510 +#: sequencer.c:2236

3511 #, c-format

3512 msgid "invalid file: '%s'"

3513 msgstr "无效文件：'%s'"

3514

3480 -#: sequencer.c:2215

3515 +#: sequencer.c:2238

3516 #, c-format

3517 msgid "invalid contents: '%s'"

3518 msgstr "无效内容：'%s'"

3519

3485 -#: sequencer.c:2218

3520 +#: sequencer.c:2241

3521 msgid ""

3522 "\n"

3523 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3491,24 +3526,108 @@ msgstr ""

3526 "\n"

3527 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

3528

3494 -#: sequencer.c:2228

3529 +#: sequencer.c:2251

3530 msgid "could not commit staged changes."

3531 msgstr "不能提交暂存的修改。"

3532

3498 -#: sequencer.c:2308

3533 +#: sequencer.c:2331

3534 #, c-format

3535 msgid "%s: can't cherry-pick a %s"

3536 msgstr "%s：不能拣选一个%s"

3537

3503 -#: sequencer.c:2312

3538 +#: sequencer.c:2335

3539 #, c-format

3540 msgid "%s: bad revision"

3541 msgstr "%s：错误的版本"

3542

3508 -#: sequencer.c:2345

3543 +#: sequencer.c:2368

3544 msgid "can't revert as initial commit"

3545 msgstr "不能作为初始提交回退"

3546

3547 +#: sequencer.c:2471

3548 +msgid "make_script: unhandled options"

3549 +msgstr "make_script：有未能处理的选项"

3550 +

3551 +#: sequencer.c:2474

3552 +msgid "make_script: error preparing revisions"

3553 +msgstr "make_script：准备版本时错误"

3554 +

3555 +#: sequencer.c:2510

3556 +#, c-format

3557 +msgid "unusable todo list: '%s'"

3558 +msgstr "不可用的待办列表：'%s'"

3559 +

3560 +#: sequencer.c:2516

3561 +#, c-format

3562 +msgid "unable to open '%s' for writing"

3563 +msgstr "无法以写入方式打开 '%s'"

3564 +

3565 +#: sequencer.c:2561

3566 +#, c-format

3567 +msgid ""

3568 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3569 +msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

3570 +

3571 +#: sequencer.c:2641

3572 +#, c-format

3573 +msgid ""

3574 +"Warning: some commits may have been dropped accidentally.\n"

3575 +"Dropped commits (newer to older):\n"

3576 +msgstr ""

3577 +"警告：一些提交可能被意外丢弃。\n"

3578 +"丢弃的提交（从新到旧）：\n"

3579 +

3580 +#: sequencer.c:2648

3581 +#, c-format

3582 +msgid ""

3583 +"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

3584 +"\n"

3585 +"Use 'git config rebase.missingCommitsCheck' to change the level of "

3586 +"warnings.\n"

3587 +"The possible behaviours are: ignore, warn, error.\n"

3588 +"\n"

3589 +msgstr ""

3590 +"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"

3591 +"\n"

3592 +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"

3593 +"可选值有：ignore、warn、error。\n"

3594 +"\n"

3595 +

3596 +#: sequencer.c:2660

3597 +#, c-format

3598 +msgid ""

3599 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

3600 +"continue'.\n"

3601 +"Or you can abort the rebase with 'git rebase --abort'.\n"

3602 +msgstr ""

3603 +"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

3604 +"或者您可以用 'git rebase --abort' 终止变基。\n"

3605 +

3606 +#: sequencer.c:2708

3607 +#, c-format

3608 +msgid "could not parse commit '%s'"

3609 +msgstr "不能解析提交 '%s'"

3610 +

3611 +#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395

3612 +#: builtin/am.c:775

3613 +#, c-format

3614 +msgid "could not open '%s' for writing"

3615 +msgstr "无法打开 '%s' 进行写入"

3616 +

3617 +#: sequencer.c:2756

3618 +#, c-format

3619 +msgid "could not truncate '%s'"

3620 +msgstr "无法截断 '%s'"

3621 +

3622 +#: sequencer.c:2848

3623 +msgid "the script was already rearranged."

3624 +msgstr "脚本已经重新编排。"

3625 +

3626 +#: sequencer.c:2953

3627 +#, c-format

3628 +msgid "could not finish '%s'"

3629 +msgstr "无法结束 '%s'"

3630 +

3631 #: setup.c:171

3632 #, c-format

3633 msgid ""

@@ -3540,34 +3659,34 @@ msgstr ""

3659 "使用 '--' 来分隔版本和路径，例如：\n"

3660 "'git <command> [<revision>...] -- [<file>...]'"

3661

3543 -#: setup.c:504

3662 +#: setup.c:499

3663 #, c-format

3664 msgid "Expected git repo version <= %d, found %d"

3665 msgstr "期望 git 仓库版本 <= %d，却得到 %d"

3666

3548 -#: setup.c:512

3667 +#: setup.c:507

3668 msgid "unknown repository extensions found:"

3669 msgstr "发现未知的仓库扩展："

3670

3552 -#: setup.c:810

3671 +#: setup.c:806

3672 #, c-format

3673 msgid "Not a git repository (or any of the parent directories): %s"

3674 msgstr "不是一个 git 仓库（或者任何父目录）：%s"

3675

3557 -#: setup.c:812 builtin/index-pack.c:1652

3676 +#: setup.c:808 builtin/index-pack.c:1653

3677 msgid "Cannot come back to cwd"

3678 msgstr "无法返回当前工作目录"

3679

3561 -#: setup.c:1050

3680 +#: setup.c:1046

3681 msgid "Unable to read current working directory"

3682 msgstr "不能读取当前工作目录"

3683

3565 -#: setup.c:1062 setup.c:1068

3684 +#: setup.c:1058 setup.c:1064

3685 #, c-format

3686 msgid "Cannot change to '%s'"

3687 msgstr "不能切换到 '%s'"

3688

3570 -#: setup.c:1081

3689 +#: setup.c:1077

3690 #, c-format

3691 msgid ""

3692 "Not a git repository (or any parent up to mount point %s)\n"

@@ -3576,7 +3695,7 @@ msgstr ""

3695 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"

3696 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

3697

3579 -#: setup.c:1173

3698 +#: setup.c:1159

3699 #, c-format

3700 msgid ""

3701 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3585,55 +3704,41 @@ msgstr ""

3704 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"

3705 "文件属主必须始终拥有读写权限。"

3706

3588 -#: sha1_file.c:560

3707 +#: sha1_file.c:528

3708 #, c-format

3709 msgid "path '%s' does not exist"

3710 msgstr "路径 '%s' 不存在"

3711

3593 -#: sha1_file.c:586

3712 +#: sha1_file.c:554

3713 #, c-format

3714 msgid "reference repository '%s' as a linked checkout is not supported yet."

3715 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

3716

3598 -#: sha1_file.c:592

3717 +#: sha1_file.c:560

3718 #, c-format

3719 msgid "reference repository '%s' is not a local repository."

3720 msgstr "参考仓库 '%s' 不是一个本地仓库。"

3721

3603 -#: sha1_file.c:598

3722 +#: sha1_file.c:566

3723 #, c-format

3724 msgid "reference repository '%s' is shallow"

3725 msgstr "参考仓库 '%s' 是一个浅克隆"

3726

3608 -#: sha1_file.c:606

3727 +#: sha1_file.c:574

3728 #, c-format

3729 msgid "reference repository '%s' is grafted"

3730 msgstr "参考仓库 '%s' 已被嫁接"

3731

3613 -#: sha1_file.c:1245

3614 -msgid "offset before end of packfile (broken .idx?)"

3615 -msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3616 -

3617 -#: sha1_file.c:2729

3618 -#, c-format

3619 -msgid "offset before start of pack index for %s (corrupt index?)"

3620 -msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3621 -

3622 -#: sha1_file.c:2733

3623 -#, c-format

3624 -msgid "offset beyond end of pack index for %s (truncated index?)"

3625 -msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

3626 -

3627 -#: sha1_name.c:419

3732 +#: sha1_name.c:420

3733 #, c-format

3734 msgid "short SHA1 %s is ambiguous"

3735 msgstr "短 SHA1 %s 存在歧义"

3736

3632 -#: sha1_name.c:430

3737 +#: sha1_name.c:431

3738 msgid "The candidates are:"

3739 msgstr "候选者有："

3740

3636 -#: sha1_name.c:589

3741 +#: sha1_name.c:590

3742 msgid ""

3743 "Git normally never creates a ref that ends with 40 hex characters\n"

3744 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3654,81 +3759,86 @@ msgstr ""

3759 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

3760 "命令关闭本消息通知。"

3761

3657 -#: submodule.c:70 submodule.c:104

3762 +#: submodule.c:93 submodule.c:127

3763 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3764 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

3765

3661 -#: submodule.c:74 submodule.c:108

3766 +#: submodule.c:97 submodule.c:131

3767 #, c-format

3768 msgid "Could not find section in .gitmodules where path=%s"

3769 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

3770

3666 -#: submodule.c:82

3771 +#: submodule.c:105

3772 #, c-format

3773 msgid "Could not update .gitmodules entry %s"

3774 msgstr "不能更新 .gitmodules 条目 %s"

3775

3671 -#: submodule.c:115

3776 +#: submodule.c:138

3777 #, c-format

3778 msgid "Could not remove .gitmodules entry for %s"

3779 msgstr "无法移除 %s 的 .gitmodules 条目"

3780

3676 -#: submodule.c:126

3781 +#: submodule.c:149

3782 msgid "staging updated .gitmodules failed"

3783 msgstr "将更新后 .gitmodules 添加暂存区失败"

3784

3680 -#: submodule.c:165

3681 -msgid "negative values not allowed for submodule.fetchJobs"

3682 -msgstr "submodule.fetchJobs 不允许为负值"

3683 -

3684 -#: submodule.c:376

3785 +#: submodule.c:309

3786 #, c-format

3787 msgid "in unpopulated submodule '%s'"

3788 msgstr "位于未检出的子模组 '%s'"

3789

3689 -#: submodule.c:407

3790 +#: submodule.c:340

3791 #, c-format

3792 msgid "Pathspec '%s' is in submodule '%.*s'"

3793 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"

3794

3694 -#: submodule.c:1337

3795 +#: submodule.c:799

3796 +#, c-format

3797 +msgid "submodule entry '%s' (%s) is a %s, not a commit"

3798 +msgstr "子模组条目 '%s' (%s) 是一个 %s，不是一个提交"

3799 +

3800 +#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149

3801 +msgid "Failed to resolve HEAD as a valid ref."

3802 +msgstr "无法将 HEAD 解析为有效引用。"

3803 +

3804 +#: submodule.c:1304

3805 #, c-format

3806 msgid "'%s' not recognized as a git repository"

3807 msgstr "无法将 '%s' 识别为一个 git 仓库"

3808

3699 -#: submodule.c:1475

3809 +#: submodule.c:1442

3810 #, c-format

3811 msgid "could not start 'git status' in submodule '%s'"

3812 msgstr "无法在子模组 '%s' 中启动 'git status'"

3813

3704 -#: submodule.c:1488

3814 +#: submodule.c:1455

3815 #, c-format

3816 msgid "could not run 'git status' in submodule '%s'"

3817 msgstr "无法在子模组 '%s' 中执行 'git status'"

3818

3709 -#: submodule.c:1581

3819 +#: submodule.c:1548

3820 #, c-format

3821 msgid "submodule '%s' has dirty index"

3822 msgstr "子模组 '%s' 中有脏索引"

3823

3714 -#: submodule.c:1845

3824 +#: submodule.c:1809

3825 #, c-format

3826 msgid ""

3827 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

3828 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"

3829

3720 -#: submodule.c:1857 submodule.c:1913

3830 +#: submodule.c:1821 submodule.c:1877

3831 #, c-format

3832 msgid "could not lookup name for submodule '%s'"

3833 msgstr "不能查询子模组 '%s' 的名称"

3834

3725 -#: submodule.c:1861 builtin/submodule--helper.c:678

3726 -#: builtin/submodule--helper.c:688

3835 +#: submodule.c:1825 builtin/submodule--helper.c:671

3836 +#: builtin/submodule--helper.c:681

3837 #, c-format

3838 msgid "could not create directory '%s'"

3839 msgstr "不能创建目录 '%s'"

3840

3731 -#: submodule.c:1864

3841 +#: submodule.c:1828

3842 #, c-format

3843 msgid ""

3844 "Migrating git directory of '%s%s' from\n"

@@ -3739,101 +3849,105 @@ msgstr ""

3849 "'%s' 迁移至\n"

3850 "'%s'\n"

3851

3742 -#: submodule.c:1948

3852 +#: submodule.c:1912

3853 #, c-format

3854 msgid "could not recurse into submodule '%s'"

3855 msgstr "无法递归进子模组路径 '%s'"

3856

3747 -#: submodule.c:1992

3857 +#: submodule.c:1956

3858 msgid "could not start ls-files in .."

3859 msgstr "无法在 .. 中启动 ls-files"

3860

3751 -#: submodule.c:2012

3861 +#: submodule.c:1976

3862 msgid "BUG: returned path string doesn't match cwd?"

3863 msgstr "BUG：返回的路径和当前路径不匹配？"

3864

3755 -#: submodule.c:2031

3865 +#: submodule.c:1995

3866 #, c-format

3867 msgid "ls-tree returned unexpected return code %d"

3868 msgstr "ls-tree 返回未知返回值 %d"

3869

3760 -#: submodule-config.c:420

3870 +#: submodule-config.c:263

3871 +msgid "negative values not allowed for submodule.fetchjobs"

3872 +msgstr "submodule.fetchjobs 不允许为负值"

3873 +

3874 +#: submodule-config.c:436

3875 #, c-format

3876 msgid "invalid value for %s"

3877 msgstr "%s 的值无效"

3878

3765 -#: trailer.c:241

3879 +#: trailer.c:238

3880 #, c-format

3881 msgid "running trailer command '%s' failed"

3882 msgstr "执行 trailer 命令 '%s' 失败"

3883

3770 -#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540

3771 -#: trailer.c:544

3884 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553

3885 +#: trailer.c:557

3886 #, c-format

3887 msgid "unknown value '%s' for key '%s'"

3888 msgstr "键 '%2$s' 的未知取值 '%1$s'"

3889

3776 -#: trailer.c:526 trailer.c:531 builtin/remote.c:290

3890 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290

3891 #, c-format

3892 msgid "more than one %s"

3893 msgstr "多于一个 %s"

3894

3781 -#: trailer.c:703

3895 +#: trailer.c:730

3896 #, c-format

3897 msgid "empty trailer token in trailer '%.*s'"

3898 msgstr "签名 '%.*s' 的键为空"

3899

3786 -#: trailer.c:723

3900 +#: trailer.c:750

3901 #, c-format

3902 msgid "could not read input file '%s'"

3903 msgstr "不能读取输入文件 '%s'"

3904

3791 -#: trailer.c:726

3905 +#: trailer.c:753

3906 msgid "could not read from stdin"

3907 msgstr "不能自标准输入读取"

3908

3795 -#: trailer.c:950 builtin/am.c:45

3909 +#: trailer.c:1008 builtin/am.c:46

3910 #, c-format

3911 msgid "could not stat %s"

3912 msgstr "不能对 %s 调用 stat"

3913

3800 -#: trailer.c:952

3914 +#: trailer.c:1010

3915 #, c-format

3916 msgid "file %s is not a regular file"

3917 msgstr "文件 %s 不是一个正规文件"

3918

3805 -#: trailer.c:954

3919 +#: trailer.c:1012

3920 #, c-format

3921 msgid "file %s is not writable by user"

3922 msgstr "文件 %s 用户不可写"

3923

3810 -#: trailer.c:966

3924 +#: trailer.c:1024

3925 msgid "could not open temporary file"

3926 msgstr "不能打开临时文件"

3927

3814 -#: trailer.c:1002

3928 +#: trailer.c:1064

3929 #, c-format

3930 msgid "could not rename temporary file to %s"

3931 msgstr "不能重命名临时文件为 %s"

3932

3819 -#: transport.c:63

3933 +#: transport.c:62

3934 #, c-format

3935 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

3936 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"

3937

3824 -#: transport.c:152

3938 +#: transport.c:151

3939 #, c-format

3940 msgid "transport: invalid depth option '%s'"

3941 msgstr "传输：无效的深度选项 '%s'"

3942

3829 -#: transport.c:890

3943 +#: transport.c:888

3944 #, c-format

3945 msgid ""

3946 "The following submodule paths contain changes that can\n"

3947 "not be found on any remote:\n"

3948 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"

3949

3836 -#: transport.c:894

3950 +#: transport.c:892

3951 #, c-format

3952 msgid ""

3953 "\n"

@@ -3860,7 +3974,7 @@ msgstr ""

3974 "以推送至远程。\n"

3975 "\n"

3976

3863 -#: transport.c:902

3977 +#: transport.c:900

3978 msgid "Aborting."

3979 msgstr "正在终止。"

3980

@@ -3881,11 +3995,11 @@ msgstr "树对象中的条目模式错误"

3995 msgid "empty filename in tree entry"

3996 msgstr "树对象条目中空的文件名"

3997

3884 -#: tree-walk.c:113

3998 +#: tree-walk.c:114

3999 msgid "too-short tree file"

4000 msgstr "太短的树文件"

4001

3888 -#: unpack-trees.c:105

4002 +#: unpack-trees.c:106

4003 #, c-format

4004 msgid ""

4005 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3894,7 +4008,7 @@ msgstr ""

4008 "您对下列文件的本地修改将被检出操作覆盖：\n"

4009 "%%s请在切换分支前提交或贮藏您的修改。"

4010

3897 -#: unpack-trees.c:107

4011 +#: unpack-trees.c:108

4012 #, c-format

4013 msgid ""

4014 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3903,7 +4017,7 @@ msgstr ""

4017 "您对下列文件的本地修改将被检出操作覆盖：\n"

4018 "%%s"

4019

3906 -#: unpack-trees.c:110

4020 +#: unpack-trees.c:111

4021 #, c-format

4022 msgid ""

4023 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3912,7 +4026,7 @@ msgstr ""

4026 "您对下列文件的本地修改将被合并操作覆盖：\n"

4027 "%%s请在合并前提交或贮藏您的修改。"

4028

3915 -#: unpack-trees.c:112

4029 +#: unpack-trees.c:113

4030 #, c-format

4031 msgid ""

4032 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3921,7 +4035,7 @@ msgstr ""

4035 "您对下列文件的本地修改将被合并操作覆盖：\n"

4036 "%%s"

4037

3924 -#: unpack-trees.c:115

4038 +#: unpack-trees.c:116

4039 #, c-format

4040 msgid ""

4041 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3930,7 +4044,7 @@ msgstr ""

4044 "您对下列文件的本地修改将被 %s 覆盖：\n"

4045 "%%s请在 %s 之前提交或贮藏您的修改。"

4046

3933 -#: unpack-trees.c:117

4047 +#: unpack-trees.c:118

4048 #, c-format

4049 msgid ""

4050 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3939,7 +4053,7 @@ msgstr ""

4053 "您对下列文件的本地修改将被 %s 覆盖：\n"

4054 "%%s"

4055

3942 -#: unpack-trees.c:122

4056 +#: unpack-trees.c:123

4057 #, c-format

4058 msgid ""

4059 "Updating the following directories would lose untracked files in them:\n"

@@ -3948,7 +4062,7 @@ msgstr ""

4062 "更新如下目录将会丢失其中未跟踪的文件：\n"

4063 "%s"

4064

3951 -#: unpack-trees.c:126

4065 +#: unpack-trees.c:127

4066 #, c-format

4067 msgid ""

4068 "The following untracked working tree files would be removed by checkout:\n"

@@ -3957,7 +4071,7 @@ msgstr ""

4071 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4072 "%%s请在切换分支之前移动或删除。"

4073

3960 -#: unpack-trees.c:128

4074 +#: unpack-trees.c:129

4075 #, c-format

4076 msgid ""

4077 "The following untracked working tree files would be removed by checkout:\n"

@@ -3966,7 +4080,7 @@ msgstr ""

4080 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"

4081 "%%s"

4082

3969 -#: unpack-trees.c:131

4083 +#: unpack-trees.c:132

4084 #, c-format

4085 msgid ""

4086 "The following untracked working tree files would be removed by merge:\n"

@@ -3975,7 +4089,7 @@ msgstr ""

4089 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4090 "%%s请在合并前移动或删除。"

4091

3978 -#: unpack-trees.c:133

4092 +#: unpack-trees.c:134

4093 #, c-format

4094 msgid ""

4095 "The following untracked working tree files would be removed by merge:\n"

@@ -3984,7 +4098,7 @@ msgstr ""

4098 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"

4099 "%%s"

4100

3987 -#: unpack-trees.c:136

4101 +#: unpack-trees.c:137

4102 #, c-format

4103 msgid ""

4104 "The following untracked working tree files would be removed by %s:\n"

@@ -3993,7 +4107,7 @@ msgstr ""

4107 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4108 "%%s请在 %s 前移动或删除。"

4109

3996 -#: unpack-trees.c:138

4110 +#: unpack-trees.c:139

4111 #, c-format

4112 msgid ""

4113 "The following untracked working tree files would be removed by %s:\n"

@@ -4002,7 +4116,7 @@ msgstr ""

4116 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"

4117 "%%s"

4118

4005 -#: unpack-trees.c:143

4119 +#: unpack-trees.c:144

4120 #, c-format

4121 msgid ""

4122 "The following untracked working tree files would be overwritten by "

@@ -4012,7 +4126,7 @@ msgstr ""

4126 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4127 "%%s请在切换分支前移动或删除。"

4128

4015 -#: unpack-trees.c:145

4129 +#: unpack-trees.c:146

4130 #, c-format

4131 msgid ""

4132 "The following untracked working tree files would be overwritten by "

@@ -4022,7 +4136,7 @@ msgstr ""

4136 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"

4137 "%%s"

4138

4025 -#: unpack-trees.c:148

4139 +#: unpack-trees.c:149

4140 #, c-format

4141 msgid ""

4142 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4031,7 +4145,7 @@ msgstr ""

4145 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4146 "%%s请在合并前移动或删除。"

4147

4034 -#: unpack-trees.c:150

4148 +#: unpack-trees.c:151

4149 #, c-format

4150 msgid ""

4151 "The following untracked working tree files would be overwritten by merge:\n"

@@ -4040,7 +4154,7 @@ msgstr ""

4154 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"

4155 "%%s"

4156

4043 -#: unpack-trees.c:153

4157 +#: unpack-trees.c:154

4158 #, c-format

4159 msgid ""

4160 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4049,7 +4163,7 @@ msgstr ""

4163 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4164 "%%s请在 %s 前移动或删除。"

4165

4052 -#: unpack-trees.c:155

4166 +#: unpack-trees.c:156

4167 #, c-format

4168 msgid ""

4169 "The following untracked working tree files would be overwritten by %s:\n"

@@ -4058,21 +4172,21 @@ msgstr ""

4172 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"

4173 "%%s"

4174

4061 -#: unpack-trees.c:162

4175 +#: unpack-trees.c:163

4176 #, c-format

4177 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

4178 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"

4179

4066 -#: unpack-trees.c:165

4180 +#: unpack-trees.c:166

4181 #, c-format

4182 msgid ""

4069 -"Cannot update sparse checkout: the following entries are not up-to-date:\n"

4183 +"Cannot update sparse checkout: the following entries are not up to date:\n"

4184 "%s"

4185 msgstr ""

4186 "无法更新稀疏检出：如下条目不是最新：\n"

4187 "%s"

4188

4075 -#: unpack-trees.c:167

4189 +#: unpack-trees.c:168

4190 #, c-format

4191 msgid ""

4192 "The following working tree files would be overwritten by sparse checkout "

@@ -4082,7 +4196,7 @@ msgstr ""

4196 "工作区中下列文件将被稀疏检出更新所覆盖：\n"

4197 "%s"

4198

4085 -#: unpack-trees.c:169

4199 +#: unpack-trees.c:170

4200 #, c-format

4201 msgid ""

4202 "The following working tree files would be removed by sparse checkout "

@@ -4092,7 +4206,7 @@ msgstr ""

4206 "工作区中下列文件将被稀疏检出更新所删除：\n"

4207 "%s"

4208

4095 -#: unpack-trees.c:171

4209 +#: unpack-trees.c:172

4210 #, c-format

4211 msgid ""

4212 "Cannot update submodule:\n"

@@ -4101,17 +4215,12 @@ msgstr ""

4215 "无法更新子模组：\n"

4216 "%s"

4217

4104 -#: unpack-trees.c:248

4218 +#: unpack-trees.c:249

4219 #, c-format

4220 msgid "Aborting\n"

4221 msgstr "终止中\n"

4222

4109 -#: unpack-trees.c:277

4110 -#, c-format

4111 -msgid "submodule update strategy not supported for submodule '%s'"

4112 -msgstr "子模组 %s 不支持子模组更新策略"

4113 -

4114 -#: unpack-trees.c:346

4223 +#: unpack-trees.c:331

4224 msgid "Checking out files"

4225 msgstr "正在检出文件"

4226

@@ -4154,13 +4263,8 @@ msgstr "无法读取 '%s'"

4263 msgid "could not open '%s' for reading and writing"

4264 msgstr "无法打开 '%s' 进行读写"

4265

4157 -#: wrapper.c:225 wrapper.c:395 builtin/am.c:766

4158 -#, c-format

4159 -msgid "could not open '%s' for writing"

4160 -msgstr "无法打开 '%s' 进行写入"

4161 -

4162 -#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757

4163 -#: builtin/am.c:849 builtin/merge.c:1014

4266 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766

4267 +#: builtin/am.c:858 builtin/merge.c:1041

4268 #, c-format

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

4270 msgstr "无法打开 '%s' 进行读取"

@@ -4184,212 +4288,212 @@ msgstr "不能写入 %s"

4288 msgid "could not close %s"

4289 msgstr "不能关闭 %s"

4290

4187 -#: wt-status.c:152

4291 +#: wt-status.c:150

4292 msgid "Unmerged paths:"

4293 msgstr "未合并的路径："

4294

4295 # 译者：注意保持前导空格

4192 -#: wt-status.c:179 wt-status.c:206

4296 +#: wt-status.c:177 wt-status.c:204

4297 #, c-format

4298 msgid " (use \"git reset %s <file>...\" to unstage)"

4299 msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"

4300

4301 # 译者：注意保持前导空格

4198 -#: wt-status.c:181 wt-status.c:208

4302 +#: wt-status.c:179 wt-status.c:206

4303 msgid " (use \"git rm --cached <file>...\" to unstage)"

4304 msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"

4305

4306 # 译者：注意保持前导空格

4203 -#: wt-status.c:185

4307 +#: wt-status.c:183

4308 msgid " (use \"git add <file>...\" to mark resolution)"

4309 msgstr " （使用 \"git add <文件>...\" 标记解决方案）"

4310

4311 # 译者：注意保持前导空格

4208 -#: wt-status.c:187 wt-status.c:191

4312 +#: wt-status.c:185 wt-status.c:189

4313 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

4314 msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"

4315

4316 # 译者：注意保持前导空格

4213 -#: wt-status.c:189

4317 +#: wt-status.c:187

4318 msgid " (use \"git rm <file>...\" to mark resolution)"

4319 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"

4320

4217 -#: wt-status.c:200 wt-status.c:981

4321 +#: wt-status.c:198 wt-status.c:979

4322 msgid "Changes to be committed:"

4323 msgstr "要提交的变更："

4324

4221 -#: wt-status.c:218 wt-status.c:990

4325 +#: wt-status.c:216 wt-status.c:988

4326 msgid "Changes not staged for commit:"

4327 msgstr "尚未暂存以备提交的变更："

4328

4329 # 译者：注意保持前导空格

4226 -#: wt-status.c:222

4330 +#: wt-status.c:220

4331 msgid " (use \"git add <file>...\" to update what will be committed)"

4332 msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"

4333

4334 # 译者：注意保持前导空格

4231 -#: wt-status.c:224

4335 +#: wt-status.c:222

4336 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

4337 msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"

4338

4339 # 译者：注意保持前导空格

4236 -#: wt-status.c:225

4340 +#: wt-status.c:223

4341 msgid ""

4342 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

4343 msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"

4344

4345 # 译者：注意保持前导空格

4242 -#: wt-status.c:227

4346 +#: wt-status.c:225

4347 msgid " (commit or discard the untracked or modified content in submodules)"

4348 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

4349

4350 # 译者：注意保持前导空格

4247 -#: wt-status.c:239

4351 +#: wt-status.c:237

4352 #, c-format

4353 msgid " (use \"git %s <file>...\" to include in what will be committed)"

4354 msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"

4355

4252 -#: wt-status.c:254

4356 +#: wt-status.c:252

4357 msgid "both deleted:"

4358 msgstr "双方删除："

4359

4256 -#: wt-status.c:256

4360 +#: wt-status.c:254

4361 msgid "added by us:"

4362 msgstr "由我们添加："

4363

4260 -#: wt-status.c:258

4364 +#: wt-status.c:256

4365 msgid "deleted by them:"

4366 msgstr "由他们删除："

4367

4264 -#: wt-status.c:260

4368 +#: wt-status.c:258

4369 msgid "added by them:"

4370 msgstr "由他们添加："

4371

4268 -#: wt-status.c:262

4372 +#: wt-status.c:260

4373 msgid "deleted by us:"

4374 msgstr "由我们删除："

4375

4272 -#: wt-status.c:264

4376 +#: wt-status.c:262

4377 msgid "both added:"

4378 msgstr "双方添加："

4379

4276 -#: wt-status.c:266

4380 +#: wt-status.c:264

4381 msgid "both modified:"

4382 msgstr "双方修改："

4383

4280 -#: wt-status.c:276

4384 +#: wt-status.c:274

4385 msgid "new file:"

4386 msgstr "新文件："

4387

4284 -#: wt-status.c:278

4388 +#: wt-status.c:276

4389 msgid "copied:"

4390 msgstr "拷贝："

4391

4288 -#: wt-status.c:280

4392 +#: wt-status.c:278

4393 msgid "deleted:"

4394 msgstr "删除："

4395

4292 -#: wt-status.c:282

4396 +#: wt-status.c:280

4397 msgid "modified:"

4398 msgstr "修改："

4399

4296 -#: wt-status.c:284

4400 +#: wt-status.c:282

4401 msgid "renamed:"

4402 msgstr "重命名："

4403

4300 -#: wt-status.c:286

4404 +#: wt-status.c:284

4405 msgid "typechange:"

4406 msgstr "类型变更："

4407

4304 -#: wt-status.c:288

4408 +#: wt-status.c:286

4409 msgid "unknown:"

4410 msgstr "未知："

4411

4308 -#: wt-status.c:290

4412 +#: wt-status.c:288

4413 msgid "unmerged:"

4414 msgstr "未合并："

4415

4416 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4313 -#: wt-status.c:372

4417 +#: wt-status.c:370

4418 msgid "new commits, "

4419 msgstr "新提交, "

4420

4421 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4318 -#: wt-status.c:374

4422 +#: wt-status.c:372

4423 msgid "modified content, "

4424 msgstr "修改的内容, "

4425

4426 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

4323 -#: wt-status.c:376

4427 +#: wt-status.c:374

4428 msgid "untracked content, "

4429 msgstr "未跟踪的内容, "

4430

4327 -#: wt-status.c:821

4431 +#: wt-status.c:819

4432 #, c-format

4433 msgid "Your stash currently has %d entry"

4434 msgid_plural "Your stash currently has %d entries"

4435 msgstr[0] "您的贮藏区当前有 %d 条记录"

4436 msgstr[1] "您的贮藏区当前有 %d 条记录"

4437

4334 -#: wt-status.c:853

4438 +#: wt-status.c:851

4439 msgid "Submodules changed but not updated:"

4440 msgstr "子模组已修改但尚未更新："

4441

4338 -#: wt-status.c:855

4442 +#: wt-status.c:853

4443 msgid "Submodule changes to be committed:"

4444 msgstr "要提交的子模组变更："

4445

4342 -#: wt-status.c:937

4446 +#: wt-status.c:935

4447 msgid ""

4344 -"Do not touch the line above.\n"

4345 -"Everything below will be removed."

4448 +"Do not modify or remove the line above.\n"

4449 +"Everything below it will be ignored."

4450 msgstr ""

4347 -"不要改动上面的一行。\n"

4348 -"下面的所有内容均将被删除。"

4451 +"不要改动或删除上面的一行。\n"

4452 +"其下所有内容都将被忽略。"

4453

4350 -#: wt-status.c:1049

4454 +#: wt-status.c:1048

4455 msgid "You have unmerged paths."

4456 msgstr "您有尚未合并的路径。"

4457

4458 # 译者：注意保持前导空格

4355 -#: wt-status.c:1052

4459 +#: wt-status.c:1051

4460 msgid " (fix conflicts and run \"git commit\")"

4461 msgstr " （解决冲突并运行 \"git commit\"）"

4462

4463 # 译者：注意保持前导空格

4360 -#: wt-status.c:1054

4464 +#: wt-status.c:1053

4465 msgid " (use \"git merge --abort\" to abort the merge)"

4466 msgstr " （使用 \"git merge --abort\" 终止合并）"

4467

4364 -#: wt-status.c:1059

4468 +#: wt-status.c:1058

4469 msgid "All conflicts fixed but you are still merging."

4470 msgstr "所有冲突已解决但您仍处于合并中。"

4471

4472 # 译者：注意保持前导空格

4369 -#: wt-status.c:1062

4473 +#: wt-status.c:1061

4474 msgid " (use \"git commit\" to conclude merge)"

4475 msgstr " （使用 \"git commit\" 结束合并）"

4476

4373 -#: wt-status.c:1072

4477 +#: wt-status.c:1071

4478 msgid "You are in the middle of an am session."

4479 msgstr "您正处于 am 操作过程中。"

4480

4377 -#: wt-status.c:1075

4481 +#: wt-status.c:1074

4482 msgid "The current patch is empty."

4483 msgstr "当前的补丁为空。"

4484

4485 # 译者：注意保持前导空格

4382 -#: wt-status.c:1079

4486 +#: wt-status.c:1078

4487 msgid " (fix conflicts and then run \"git am --continue\")"

4488 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

4489

4490 # 译者：注意保持前导空格

4387 -#: wt-status.c:1081

4491 +#: wt-status.c:1080

4492 msgid " (use \"git am --skip\" to skip this patch)"

4493 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

4494

4495 # 译者：注意保持前导空格

4392 -#: wt-status.c:1083

4496 +#: wt-status.c:1082

4497 msgid " (use \"git am --abort\" to restore the original branch)"

4498 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

4499

@@ -4688,7 +4792,7 @@ msgstr "另外，您的索引中包含未提交的变更。"

4792 msgid "cannot %s: Your index contains uncommitted changes."

4793 msgstr "不能%s：您的索引中包含未提交的变更。"

4794

4691 -#: compat/precompose_utf8.c:58 builtin/clone.c:436

4795 +#: compat/precompose_utf8.c:58 builtin/clone.c:437

4796 #, c-format

4797 msgid "failed to unlink '%s'"

4798 msgstr "无法删除 '%s'"

@@ -4702,7 +4806,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

4806 msgid "unexpected diff status %c"

4807 msgstr "意外的差异状态 %c"

4808

4705 -#: builtin/add.c:87 builtin/commit.c:292

4809 +#: builtin/add.c:87 builtin/commit.c:291

4810 msgid "updating files failed"

4811 msgstr "更新文件失败"

4812

@@ -4711,108 +4815,108 @@ msgstr "更新文件失败"

4815 msgid "remove '%s'\n"

4816 msgstr "删除 '%s'\n"

4817

4714 -#: builtin/add.c:151

4818 +#: builtin/add.c:153

4819 msgid "Unstaged changes after refreshing the index:"

4820 msgstr "刷新索引之后尚未被暂存的变更："

4821

4718 -#: builtin/add.c:211 builtin/rev-parse.c:873

4822 +#: builtin/add.c:213 builtin/rev-parse.c:888

4823 msgid "Could not read the index"

4824 msgstr "不能读取索引"

4825

4722 -#: builtin/add.c:222

4826 +#: builtin/add.c:224

4827 #, c-format

4828 msgid "Could not open '%s' for writing."

4829 msgstr "无法打开 '%s' 进行写入。"

4830

4727 -#: builtin/add.c:226

4831 +#: builtin/add.c:228

4832 msgid "Could not write patch"

4833 msgstr "不能生成补丁"

4834

4731 -#: builtin/add.c:229

4835 +#: builtin/add.c:231

4836 msgid "editing patch failed"

4837 msgstr "编辑补丁失败"

4838

4735 -#: builtin/add.c:232

4839 +#: builtin/add.c:234

4840 #, c-format

4841 msgid "Could not stat '%s'"

4842 msgstr "不能对 '%s' 调用 stat"

4843

4740 -#: builtin/add.c:234

4844 +#: builtin/add.c:236

4845 msgid "Empty patch. Aborted."

4846 msgstr "空补丁。异常终止。"

4847

4744 -#: builtin/add.c:239

4848 +#: builtin/add.c:241

4849 #, c-format

4850 msgid "Could not apply '%s'"

4851 msgstr "不能应用 '%s'"

4852

4749 -#: builtin/add.c:249

4853 +#: builtin/add.c:251

4854 msgid "The following paths are ignored by one of your .gitignore files:\n"

4855 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

4856

4753 -#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124

4857 +#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124

4858 #: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529

4755 -#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164

4859 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

4860 msgid "dry run"

4861 msgstr "演习"

4862

4759 -#: builtin/add.c:272

4863 +#: builtin/add.c:274

4864 msgid "interactive picking"

4865 msgstr "交互式拣选"

4866

4763 -#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299

4867 +#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310

4868 msgid "select hunks interactively"

4869 msgstr "交互式挑选数据块"

4870

4767 -#: builtin/add.c:274

4871 +#: builtin/add.c:276

4872 msgid "edit current diff and apply"

4873 msgstr "编辑当前差异并应用"

4874

4771 -#: builtin/add.c:275

4875 +#: builtin/add.c:277

4876 msgid "allow adding otherwise ignored files"

4877 msgstr "允许添加忽略的文件"

4878

4775 -#: builtin/add.c:276

4879 +#: builtin/add.c:278

4880 msgid "update tracked files"

4881 msgstr "更新已跟踪的文件"

4882

4779 -#: builtin/add.c:277

4883 +#: builtin/add.c:279

4884 msgid "record only the fact that the path will be added later"

4885 msgstr "只记录，该路径稍后再添加"

4886

4783 -#: builtin/add.c:278

4887 +#: builtin/add.c:280

4888 msgid "add changes from all tracked and untracked files"

4889 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

4890

4787 -#: builtin/add.c:281

4891 +#: builtin/add.c:283

4892 msgid "ignore paths removed in the working tree (same as --no-all)"

4893 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

4894

4791 -#: builtin/add.c:283

4895 +#: builtin/add.c:285

4896 msgid "don't add, only refresh the index"

4897 msgstr "不添加，只刷新索引"

4898

4795 -#: builtin/add.c:284

4899 +#: builtin/add.c:286

4900 msgid "just skip files which cannot be added because of errors"

4901 msgstr "跳过因出错不能添加的文件"

4902

4799 -#: builtin/add.c:285

4903 +#: builtin/add.c:287

4904 msgid "check if - even missing - files are ignored in dry run"

4905 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

4906

4803 -#: builtin/add.c:286 builtin/update-index.c:952

4907 +#: builtin/add.c:288 builtin/update-index.c:954

4908 msgid "(+/-)x"

4909 msgstr "(+/-)x"

4910

4807 -#: builtin/add.c:286 builtin/update-index.c:953

4911 +#: builtin/add.c:288 builtin/update-index.c:955

4912 msgid "override the executable bit of the listed files"

4913 msgstr "覆盖列表里文件的可执行位"

4914

4811 -#: builtin/add.c:288

4915 +#: builtin/add.c:290

4916 msgid "warn when adding an embedded repository"

4917 msgstr "创建一个嵌入式仓库时给予警告"

4918

4815 -#: builtin/add.c:303

4919 +#: builtin/add.c:305

4920 #, c-format

4921 msgid ""

4922 "You've added another git repository inside your current repository.\n"

@@ -4829,7 +4933,8 @@ msgid ""

4933 "\n"

4934 "See \"git help submodule\" for more information."

4935 msgstr ""

4832 -"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n"

4936 +"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并"

4937 +"且不知道该如何获取它。\n"

4938 "如果您要添加一个子模组，使用：\n"

4939 "\n"

4940 "\tgit submodule add <url> %s\n"

@@ -4840,149 +4945,149 @@ msgstr ""

4945 "\n"

4946 "参见 \"git help submodule\" 获取更多信息。"

4947

4843 -#: builtin/add.c:331

4948 +#: builtin/add.c:333

4949 #, c-format

4950 msgid "adding embedded git repository: %s"

4951 msgstr "正在添加嵌入式 git 仓库：%s"

4952

4848 -#: builtin/add.c:349

4953 +#: builtin/add.c:351

4954 #, c-format

4955 msgid "Use -f if you really want to add them.\n"

4956 msgstr "使用 -f 参数如果您确实要添加它们。\n"

4957

4853 -#: builtin/add.c:357

4958 +#: builtin/add.c:359

4959 msgid "adding files failed"

4960 msgstr "添加文件失败"

4961

4857 -#: builtin/add.c:394

4962 +#: builtin/add.c:396

4963 msgid "-A and -u are mutually incompatible"

4964 msgstr "-A 和 -u 选项互斥"

4965

4861 -#: builtin/add.c:401

4966 +#: builtin/add.c:403

4967 msgid "Option --ignore-missing can only be used together with --dry-run"

4968 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

4969

4865 -#: builtin/add.c:405

4970 +#: builtin/add.c:407

4971 #, c-format

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

4973 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"

4974

4870 -#: builtin/add.c:420

4975 +#: builtin/add.c:422

4976 #, c-format

4977 msgid "Nothing specified, nothing added.\n"

4978 msgstr "没有指定文件，也没有文件被添加。\n"

4979

4875 -#: builtin/add.c:421

4980 +#: builtin/add.c:423

4981 #, c-format

4982 msgid "Maybe you wanted to say 'git add .'?\n"

4983 msgstr "也许您想要执行 'git add .'？\n"

4984

4880 -#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282

4881 -#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351

4882 -#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272

4883 -#: builtin/submodule--helper.c:244

4985 +#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282

4986 +#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350

4987 +#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271

4988 +#: builtin/submodule--helper.c:243

4989 msgid "index file corrupt"

4990 msgstr "索引文件损坏"

4991

4887 -#: builtin/am.c:413

4992 +#: builtin/am.c:414

4993 msgid "could not parse author script"

4994 msgstr "不能解析作者脚本"

4995

4891 -#: builtin/am.c:489

4996 +#: builtin/am.c:498

4997 #, c-format

4998 msgid "'%s' was deleted by the applypatch-msg hook"

4999 msgstr "'%s' 被 applypatch-msg 钩子删除"

5000

4896 -#: builtin/am.c:530

5001 +#: builtin/am.c:539

5002 #, c-format

5003 msgid "Malformed input line: '%s'."

5004 msgstr "非法的输入行：'%s'。"

5005

4901 -#: builtin/am.c:567

5006 +#: builtin/am.c:576

5007 #, c-format

5008 msgid "Failed to copy notes from '%s' to '%s'"

5009 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

5010

4906 -#: builtin/am.c:593

5011 +#: builtin/am.c:602

5012 msgid "fseek failed"

5013 msgstr "fseek 失败"

5014

4910 -#: builtin/am.c:777

5015 +#: builtin/am.c:786

5016 #, c-format

5017 msgid "could not parse patch '%s'"

5018 msgstr "无法解析补丁 '%s'"

5019

4915 -#: builtin/am.c:842

5020 +#: builtin/am.c:851

5021 msgid "Only one StGIT patch series can be applied at once"

5022 msgstr "一次只能有一个 StGIT 补丁队列被应用"

5023

4919 -#: builtin/am.c:889

5024 +#: builtin/am.c:899

5025 msgid "invalid timestamp"

5026 msgstr "无效的时间戳"

5027

4923 -#: builtin/am.c:892 builtin/am.c:900

5028 +#: builtin/am.c:904 builtin/am.c:916

5029 msgid "invalid Date line"

5030 msgstr "无效的日期行"

5031

4927 -#: builtin/am.c:897

5032 +#: builtin/am.c:911

5033 msgid "invalid timezone offset"

5034 msgstr "无效的时区偏移值"

5035

4931 -#: builtin/am.c:986

5036 +#: builtin/am.c:1004

5037 msgid "Patch format detection failed."

5038 msgstr "补丁格式探测失败。"

5039

4935 -#: builtin/am.c:991 builtin/clone.c:401

5040 +#: builtin/am.c:1009 builtin/clone.c:402

5041 #, c-format

5042 msgid "failed to create directory '%s'"

5043 msgstr "无法创建目录 '%s'"

5044

4940 -#: builtin/am.c:995

5045 +#: builtin/am.c:1013

5046 msgid "Failed to split patches."

5047 msgstr "无法拆分补丁。"

5048

4944 -#: builtin/am.c:1120 builtin/commit.c:377

5049 +#: builtin/am.c:1142 builtin/commit.c:376

5050 msgid "unable to write index file"

5051 msgstr "无法写入索引文件"

5052

4948 -#: builtin/am.c:1171

5053 +#: builtin/am.c:1193

5054 #, c-format

5055 msgid "When you have resolved this problem, run \"%s --continue\"."

5056 msgstr "当您解决这一问题，执行 \"%s --continue\"。"

5057

4953 -#: builtin/am.c:1172

5058 +#: builtin/am.c:1194

5059 #, c-format

5060 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

5061 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

5062

4958 -#: builtin/am.c:1173

5063 +#: builtin/am.c:1195

5064 #, c-format

5065 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

5066 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

5067

4963 -#: builtin/am.c:1304

5068 +#: builtin/am.c:1302

5069 msgid "Patch is empty."

5070 msgstr "补丁为空。"

5071

4967 -#: builtin/am.c:1370

5072 +#: builtin/am.c:1368

5073 #, c-format

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

5075 msgstr "无效的身份标识：%.*s"

5076

4972 -#: builtin/am.c:1392

5077 +#: builtin/am.c:1390

5078 #, c-format

5079 msgid "unable to parse commit %s"

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

5081

4977 -#: builtin/am.c:1586

5082 +#: builtin/am.c:1584

5083 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

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

5085

4981 -#: builtin/am.c:1588

5086 +#: builtin/am.c:1586

5087 msgid "Using index info to reconstruct a base tree..."

5088 msgstr "使用索引来重建一个（三方合并的）基础目录树..."

5089

4985 -#: builtin/am.c:1607

5090 +#: builtin/am.c:1605

5091 msgid ""

5092 "Did you hand edit your patch?\n"

5093 "It does not apply to blobs recorded in its index."

@@ -4990,37 +5095,37 @@ msgstr ""

5095 "您是否曾手动编辑过您的补丁？\n"

5096 "无法应用补丁到索引中的数据对象上。"

5097

4993 -#: builtin/am.c:1613

5098 +#: builtin/am.c:1611

5099 msgid "Falling back to patching base and 3-way merge..."

5100 msgstr "回落到基础版本上打补丁及进行三方合并..."

5101

4997 -#: builtin/am.c:1638

5102 +#: builtin/am.c:1636

5103 msgid "Failed to merge in the changes."

5104 msgstr "无法合并变更。"

5105

5001 -#: builtin/am.c:1662 builtin/merge.c:632

5106 +#: builtin/am.c:1660 builtin/merge.c:641

5107 msgid "git write-tree failed to write a tree"

5108 msgstr "git write-tree 无法写入一树对象"

5109

5005 -#: builtin/am.c:1669

5110 +#: builtin/am.c:1667

5111 msgid "applying to an empty history"

5112 msgstr "正应用到一个空历史上"

5113

5009 -#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803

5010 -#: builtin/merge.c:828

5114 +#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824

5115 +#: builtin/merge.c:849

5116 msgid "failed to write commit object"

5117 msgstr "无法写提交对象"

5118

5014 -#: builtin/am.c:1715 builtin/am.c:1719

5119 +#: builtin/am.c:1713 builtin/am.c:1717

5120 #, c-format

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

5122 msgstr "无法继续：%s 不存在。"

5123

5019 -#: builtin/am.c:1735

5124 +#: builtin/am.c:1733

5125 msgid "cannot be interactive without stdin connected to a terminal."

5126 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

5127

5023 -#: builtin/am.c:1740

5128 +#: builtin/am.c:1738

5129 msgid "Commit Body is:"

5130 msgstr "提交内容为："

5131

@@ -5029,35 +5134,35 @@ msgstr "提交内容为："

5134 #. in your translation. The program will only accept English

5135 #. input at this point.

5136 #.

5032 -#: builtin/am.c:1750

5137 +#: builtin/am.c:1748

5138 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

5139 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

5140

5036 -#: builtin/am.c:1800

5141 +#: builtin/am.c:1798

5142 #, c-format

5143 msgid "Dirty index: cannot apply patches (dirty: %s)"

5144 msgstr "脏索引：不能应用补丁（脏文件：%s）"

5145

5041 -#: builtin/am.c:1840 builtin/am.c:1912

5146 +#: builtin/am.c:1838 builtin/am.c:1910

5147 #, c-format

5148 msgid "Applying: %.*s"

5149 msgstr "应用：%.*s"

5150

5046 -#: builtin/am.c:1856

5151 +#: builtin/am.c:1854

5152 msgid "No changes -- Patch already applied."

5153 msgstr "没有变更 —— 补丁已经应用过。"

5154

5050 -#: builtin/am.c:1864

5155 +#: builtin/am.c:1862

5156 #, c-format

5157 msgid "Patch failed at %s %.*s"

5158 msgstr "打补丁失败于 %s %.*s"

5159

5055 -#: builtin/am.c:1870

5160 +#: builtin/am.c:1868

5161 #, c-format

5162 msgid "The copy of the patch that failed is found in: %s"

5163 msgstr "失败的补丁文件副本位于：%s"

5164

5060 -#: builtin/am.c:1915

5165 +#: builtin/am.c:1913

5166 msgid ""

5167 "No changes - did you forget to use 'git add'?\n"

5168 "If there is nothing left to stage, chances are that something else\n"

@@ -5067,7 +5172,7 @@ msgstr ""

5172 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

5173 "您也许想要跳过这个补丁。"

5174

5070 -#: builtin/am.c:1922

5175 +#: builtin/am.c:1920

5176 msgid ""

5177 "You still have unmerged paths in your index.\n"

5178 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5078,150 +5183,149 @@ msgstr ""

5183 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"

5184 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"

5185

5081 -#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323

5082 -#: builtin/reset.c:331

5186 +#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332

5187 +#: builtin/reset.c:340

5188 #, c-format

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

5190 msgstr "不能解析对象 '%s'。"

5191

5087 -#: builtin/am.c:2083

5192 +#: builtin/am.c:2081

5193 msgid "failed to clean index"

5194 msgstr "无法清空索引"

5195

5091 -#: builtin/am.c:2117

5196 +#: builtin/am.c:2116

5197 msgid ""

5198 "You seem to have moved HEAD since the last 'am' failure.\n"

5199 "Not rewinding to ORIG_HEAD"

5200 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

5201

5097 -#: builtin/am.c:2180

5202 +#: builtin/am.c:2179

5203 #, c-format

5204 msgid "Invalid value for --patch-format: %s"

5205 msgstr "无效的 --patch-format 值：%s"

5206

5102 -#: builtin/am.c:2213

5207 +#: builtin/am.c:2212

5208 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

5209 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"

5210

5106 -#: builtin/am.c:2214

5211 +#: builtin/am.c:2213

5212 msgid "git am [<options>] (--continue | --skip | --abort)"

5213 msgstr "git am [<选项>] (--continue | --skip | --abort)"

5214

5110 -#: builtin/am.c:2220

5215 +#: builtin/am.c:2219

5216 msgid "run interactively"

5217 msgstr "以交互式方式运行"

5218

5114 -#: builtin/am.c:2222

5219 +#: builtin/am.c:2221

5220 msgid "historical option -- no-op"

5221 msgstr "老的参数 —— 无作用"

5222

5118 -#: builtin/am.c:2224

5223 +#: builtin/am.c:2223

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

5225 msgstr "如果必要，允许使用三方合并。"

5226

5122 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5227 +#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57

5228 #: builtin/repack.c:180

5229 msgid "be quiet"

5230 msgstr "静默模式"

5231

5127 -#: builtin/am.c:2227

5232 +#: builtin/am.c:2226

5233 msgid "add a Signed-off-by line to the commit message"

5234 msgstr "在提交说明中添加一个 Signed-off-by 签名"

5235

5131 -#: builtin/am.c:2230

5236 +#: builtin/am.c:2229

5237 msgid "recode into utf8 (default)"

5238 msgstr "使用 utf8 字符集（默认）"

5239

5135 -#: builtin/am.c:2232

5240 +#: builtin/am.c:2231

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

5242 msgstr "向 git-mailinfo 传递 -k 参数"

5243

5139 -#: builtin/am.c:2234

5244 +#: builtin/am.c:2233

5245 msgid "pass -b flag to git-mailinfo"

5246 msgstr "向 git-mailinfo 传递 -b 参数"

5247

5143 -#: builtin/am.c:2236

5248 +#: builtin/am.c:2235

5249 msgid "pass -m flag to git-mailinfo"

5250 msgstr "向 git-mailinfo 传递 -m 参数"

5251

5147 -#: builtin/am.c:2238

5252 +#: builtin/am.c:2237

5253 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

5254 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

5255

5151 -#: builtin/am.c:2241

5256 +#: builtin/am.c:2240

5257 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

5258 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

5259

5155 -#: builtin/am.c:2244

5260 +#: builtin/am.c:2243

5261 msgid "strip everything before a scissors line"

5262 msgstr "丢弃裁切线前的所有内容"

5263

5159 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5160 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5161 -#: builtin/am.c:2273

5264 +#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254

5265 +#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266

5266 +#: builtin/am.c:2272

5267 msgid "pass it through git-apply"

5268 msgstr "传递给 git-apply"

5269

5165 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666

5166 -#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142

5167 -#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193

5168 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169

5169 -#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134

5170 -#: parse-options.h:245

5270 +#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667

5271 +#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197

5272 +#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5273 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5274 +#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5275 msgid "n"

5276 msgstr "n"

5277

5174 -#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38

5175 -#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39

5278 +#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38

5279 +#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5280 msgid "format"

5281 msgstr "格式"

5282

5179 -#: builtin/am.c:2270

5283 +#: builtin/am.c:2269

5284 msgid "format the patch(es) are in"

5285 msgstr "补丁的格式"

5286

5183 -#: builtin/am.c:2276

5287 +#: builtin/am.c:2275

5288 msgid "override error message when patch failure occurs"

5289 msgstr "打补丁失败时显示的错误信息"

5290

5187 -#: builtin/am.c:2278

5291 +#: builtin/am.c:2277

5292 msgid "continue applying patches after resolving a conflict"

5293 msgstr "冲突解决后继续应用补丁"

5294

5191 -#: builtin/am.c:2281

5295 +#: builtin/am.c:2280

5296 msgid "synonyms for --continue"

5297 msgstr "和 --continue 同义"

5298

5195 -#: builtin/am.c:2284

5299 +#: builtin/am.c:2283

5300 msgid "skip the current patch"

5301 msgstr "跳过当前补丁"

5302

5199 -#: builtin/am.c:2287

5303 +#: builtin/am.c:2286

5304 msgid "restore the original branch and abort the patching operation."

5305 msgstr "恢复原始分支并终止打补丁操作。"

5306

5203 -#: builtin/am.c:2291

5307 +#: builtin/am.c:2290

5308 msgid "lie about committer date"

5309 msgstr "将作者日期作为提交日期"

5310

5207 -#: builtin/am.c:2293

5311 +#: builtin/am.c:2292

5312 msgid "use current timestamp for author date"

5313 msgstr "用当前时间作为作者日期"

5314

5211 -#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233

5212 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414

5315 +#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236

5316 +#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392

5317 msgid "key-id"

5318 msgstr "key-id"

5319

5216 -#: builtin/am.c:2296

5320 +#: builtin/am.c:2295

5321 msgid "GPG-sign commits"

5322 msgstr "使用 GPG 签名提交"

5323

5220 -#: builtin/am.c:2299

5324 +#: builtin/am.c:2298

5325 msgid "(internal use for git-rebase)"

5326 msgstr "（内部使用，用于 git-rebase）"

5327

5224 -#: builtin/am.c:2317

5328 +#: builtin/am.c:2316

5329 msgid ""

5330 "The -b/--binary option has been a no-op for long time, and\n"

5331 "it will be removed. Please do not use it anymore."

@@ -5229,16 +5333,16 @@ msgstr ""

5333 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

5334 "请不要再使用它了。"

5335

5232 -#: builtin/am.c:2324

5336 +#: builtin/am.c:2323

5337 msgid "failed to read the index"

5338 msgstr "无法读取索引"

5339

5236 -#: builtin/am.c:2339

5340 +#: builtin/am.c:2338

5341 #, c-format

5342 msgid "previous rebase directory %s still exists but mbox given."

5343 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

5344

5241 -#: builtin/am.c:2363

5345 +#: builtin/am.c:2362

5346 #, c-format

5347 msgid ""

5348 "Stray %s directory found.\n"

@@ -5247,7 +5351,7 @@ msgstr ""

5351 "发现了错误的 %s 目录。\n"

5352 "使用 \"git am --abort\" 删除它。"

5353

5250 -#: builtin/am.c:2369

5354 +#: builtin/am.c:2368

5355 msgid "Resolve operation not in progress, we are not resuming."

5356 msgstr "解决操作未进行，我们不会继续。"

5357

@@ -5449,15 +5553,19 @@ msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

5553 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"

5554

5555 #: builtin/branch.c:31

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

5557 +msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"

5558 +

5559 +#: builtin/branch.c:32

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

5561 msgstr "git branch [<选项>] [-r | -a] [--points-at]"

5562

5455 -#: builtin/branch.c:32

5563 +#: builtin/branch.c:33

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

5565 msgstr "git branch [<选项>] [-r | -a] [--format]"

5566

5567 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

5460 -#: builtin/branch.c:145

5568 +#: builtin/branch.c:146

5569 #, c-format

5570 msgid ""

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

@@ -5467,7 +5575,7 @@ msgstr ""

5575 " '%s'，但未合并到 HEAD。"

5576

5577 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

5470 -#: builtin/branch.c:149

5578 +#: builtin/branch.c:150

5579 #, c-format

5580 msgid ""

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

@@ -5476,12 +5584,12 @@ msgstr ""

5584 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"

5585 " 然而却尚未被合并到分支 '%s' 。"

5586

5479 -#: builtin/branch.c:163

5587 +#: builtin/branch.c:164

5588 #, c-format

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

5590 msgstr "无法查询 '%s' 指向的提交对象"

5591

5484 -#: builtin/branch.c:167

5592 +#: builtin/branch.c:168

5593 #, c-format

5594 msgid ""

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

@@ -5490,91 +5598,112 @@ msgstr ""

5598 "分支 '%s' 没有完全合并。\n"

5599 "如果您确认要删除它，执行 'git branch -D %s'。"

5600

5493 -#: builtin/branch.c:180

5601 +#: builtin/branch.c:181

5602 msgid "Update of config-file failed"

5495 -msgstr "无法更新 config 文件"

5603 +msgstr "更新配置文件失败"

5604

5497 -#: builtin/branch.c:211

5605 +#: builtin/branch.c:212

5606 msgid "cannot use -a with -d"

5607 msgstr "不能将 -a 和 -d 同时使用"

5608

5501 -#: builtin/branch.c:217

5609 +#: builtin/branch.c:218

5610 msgid "Couldn't look up commit object for HEAD"

5611 msgstr "无法查询 HEAD 指向的提交对象"

5612

5505 -#: builtin/branch.c:231

5613 +#: builtin/branch.c:232

5614 #, c-format

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

5616 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"

5617

5510 -#: builtin/branch.c:246

5618 +#: builtin/branch.c:247

5619 #, c-format

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

5621 msgstr "未能找到远程跟踪分支 '%s'。"

5622

5515 -#: builtin/branch.c:247

5623 +#: builtin/branch.c:248

5624 #, c-format

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

5626 msgstr "分支 '%s' 未发现。"

5627

5520 -#: builtin/branch.c:262

5628 +#: builtin/branch.c:263

5629 #, c-format

5630 msgid "Error deleting remote-tracking branch '%s'"

5631 msgstr "无法删除远程跟踪分支 '%s'"

5632

5525 -#: builtin/branch.c:263

5633 +#: builtin/branch.c:264

5634 #, c-format

5635 msgid "Error deleting branch '%s'"

5636 msgstr "无法删除分支 '%s'"

5637

5530 -#: builtin/branch.c:270

5638 +#: builtin/branch.c:271

5639 #, c-format

5640 msgid "Deleted remote-tracking branch %s (was %s).\n"

5641 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"

5642

5535 -#: builtin/branch.c:271

5643 +#: builtin/branch.c:272

5644 #, c-format

5645 msgid "Deleted branch %s (was %s).\n"

5646 msgstr "已删除分支 %s（曾为 %s）。\n"

5647

5540 -#: builtin/branch.c:445

5648 +#: builtin/branch.c:417 builtin/tag.c:58

5649 +msgid "unable to parse format string"

5650 +msgstr "不能解析格式化字符串"

5651 +

5652 +#: builtin/branch.c:450

5653 #, c-format

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

5655 msgstr "分支 %s 正被变基到 %s"

5656

5545 -#: builtin/branch.c:449

5657 +#: builtin/branch.c:454

5658 #, c-format

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

5660 msgstr "分支 %s 正被二分查找于 %s"

5661

5550 -#: builtin/branch.c:464

5662 +#: builtin/branch.c:470

5663 +msgid "cannot copy the current branch while not on any."

5664 +msgstr "无法拷贝当前分支因为不处于任何分支上。"

5665 +

5666 +#: builtin/branch.c:472

5667 msgid "cannot rename the current branch while not on any."

5668 msgstr "无法重命名当前分支因为不处于任何分支上。"

5669

5554 -#: builtin/branch.c:474

5670 +#: builtin/branch.c:483

5671 #, c-format

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

5673 msgstr "无效的分支名：'%s'"

5674

5559 -#: builtin/branch.c:491

5675 +#: builtin/branch.c:504

5676 msgid "Branch rename failed"

5677 msgstr "分支重命名失败"

5678

5563 -#: builtin/branch.c:494

5679 +#: builtin/branch.c:506

5680 +msgid "Branch copy failed"

5681 +msgstr "分支拷贝失败"

5682 +

5683 +#: builtin/branch.c:510

5684 +#, c-format

5685 +msgid "Copied a misnamed branch '%s' away"

5686 +msgstr "已将错误命名的分支 '%s' 复制"

5687 +

5688 +#: builtin/branch.c:513

5689 #, c-format

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

5566 -msgstr "重命名掉一个错误命名的旧分支 '%s'"

5691 +msgstr "已将错误命名的分支 '%s' 重命名"

5692

5568 -#: builtin/branch.c:497

5693 +#: builtin/branch.c:519

5694 #, c-format

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

5696 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

5697

5573 -#: builtin/branch.c:506

5698 +#: builtin/branch.c:528

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

5575 -msgstr "分支被重命名，但更新 config 文件失败"

5700 +msgstr "分支被重命名，但更新配置文件失败"

5701 +

5702 +#: builtin/branch.c:530

l10n: zh_CN: for git v2.15.0 l10n round 2