649900bc12 · matheusbsbs/matheus-bagliano

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

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2012-07-30 09:18+0800\n"

16 -"PO-Revision-Date: 2012-07-31 06:31+0800\n"

15 +"POT-Creation-Date: 2012-08-02 09:26+0800\n"

16 +"PO-Revision-Date: 2012-08-05 07:08+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -237,8 +237,8 @@ msgstr ""

237 "%s"

238

239 #: diff.c:1400

240 -msgid " 0 files changed\n"

241 -msgstr " 0 个文件被修改\n"

240 +msgid " 0 files changed"

241 +msgstr " 0 个文件被修改"

242

243 #: diff.c:1404

244 #, c-format

@@ -352,6 +352,266 @@ msgstr[1] ""

352 "\n"

353 "您指的是这些其中一个么？"

354

355 +#: merge-recursive.c:190

356 +#, c-format

357 +msgid "(bad commit)\n"

358 +msgstr "（坏提交）\n"

359 +

360 +#: merge-recursive.c:206

361 +#, c-format

362 +msgid "addinfo_cache failed for path '%s'"

363 +msgstr "为路径 '%s' addinfo_cache 失败"

364 +

365 +#: merge-recursive.c:268

366 +msgid "error building trees"

367 +msgstr "无法创建树"

368 +

369 +#: merge-recursive.c:497

370 +msgid "diff setup failed"

371 +msgstr "diff 设置失败"

372 +

373 +#: merge-recursive.c:627

374 +msgid "merge-recursive: disk full?"

375 +msgstr "merge-recursive：磁盘已满？"

376 +

377 +#: merge-recursive.c:690

378 +#, c-format

379 +msgid "failed to create path '%s'%s"

380 +msgstr "无法创建路径 '%s'%s"

381 +

382 +#: merge-recursive.c:701

383 +#, c-format

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

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

386 +

387 +#. something else exists

388 +#. .. but not some other error (who really cares what?)

389 +#: merge-recursive.c:715 merge-recursive.c:736

390 +msgid ": perhaps a D/F conflict?"

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

392 +

393 +#: merge-recursive.c:726

394 +#, c-format

395 +msgid "refusing to lose untracked file at '%s'"

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

397 +

398 +#: merge-recursive.c:766

399 +#, c-format

400 +msgid "cannot read object %s '%s'"

401 +msgstr "不能读取对象 %s '%s'"

402 +

403 +#: merge-recursive.c:768

404 +#, c-format

405 +msgid "blob expected for %s '%s'"

406 +msgstr "%s '%s' 应为二进制对象（blob）"

407 +

408 +#: merge-recursive.c:791 builtin/clone.c:302

409 +#, c-format

410 +msgid "failed to open '%s'"

411 +msgstr "无法打开 '%s'"

412 +

413 +#: merge-recursive.c:799

414 +#, c-format

415 +msgid "failed to symlink '%s'"

416 +msgstr "无法创建符号链接 '%s'"

417 +

418 +#: merge-recursive.c:802

419 +#, c-format

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

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

422 +

423 +#: merge-recursive.c:939

424 +msgid "Failed to execute internal merge"

425 +msgstr "无法执行内部合并"

426 +

427 +#: merge-recursive.c:943

428 +#, c-format

429 +msgid "Unable to add %s to database"

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

431 +

432 +#: merge-recursive.c:959

433 +msgid "unsupported object type in the tree"

434 +msgstr "在树中有不支持的对象类型"

435 +

436 +#: merge-recursive.c:1038 merge-recursive.c:1052

437 +#, c-format

438 +msgid ""

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

440 +"in tree."

441 +msgstr ""

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

443 +"的版本被保留。"

444 +

445 +#: merge-recursive.c:1044 merge-recursive.c:1057

446 +#, c-format

447 +msgid ""

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

449 +"in tree at %s."

450 +msgstr ""

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

452 +"的版本保留于 %8$s 中。"

453 +

454 +#: merge-recursive.c:1098

455 +msgid "rename"

456 +msgstr "重命名"

457 +

458 +#: merge-recursive.c:1098

459 +msgid "renamed"

460 +msgstr "重命名"

461 +

462 +#: merge-recursive.c:1154

463 +#, c-format

464 +msgid "%s is a directory in %s adding as %s instead"

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

466 +

467 +#: merge-recursive.c:1176

468 +#, c-format

469 +msgid ""

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

471 +"\"->\"%s\" in \"%s\"%s"

472 +msgstr ""

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

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

475 +

476 +#: merge-recursive.c:1181

477 +msgid " (left unresolved)"

478 +msgstr "（留下未解决）"

479 +

480 +#: merge-recursive.c:1235

481 +#, c-format

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

483 +msgstr ""

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

485 +"%5$s"

486 +

487 +#: merge-recursive.c:1265

488 +#, c-format

489 +msgid "Renaming %s to %s and %s to %s instead"

490 +msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"

491 +

492 +#: merge-recursive.c:1464

493 +#, c-format

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

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

496 +

497 +#: merge-recursive.c:1474

498 +#, c-format

499 +msgid "Adding merged %s"

500 +msgstr "添加合并后的 %s"

501 +

502 +#: merge-recursive.c:1479 merge-recursive.c:1677

503 +#, c-format

504 +msgid "Adding as %s instead"

505 +msgstr "而是以 %s 为名添加"

506 +

507 +#: merge-recursive.c:1530

508 +#, c-format

509 +msgid "cannot read object %s"

510 +msgstr "不能读取对象 %s"

511 +

512 +#: merge-recursive.c:1533

513 +#, c-format

514 +msgid "object %s is not a blob"

515 +msgstr "对象 %s 不是一个二进制对象（blob）"

516 +

517 +#: merge-recursive.c:1581

518 +msgid "modify"

519 +msgstr "修改"

520 +

521 +#: merge-recursive.c:1581

522 +msgid "modified"

523 +msgstr "修改"

524 +

525 +#: merge-recursive.c:1591

526 +msgid "content"

527 +msgstr "内容"

528 +

529 +#: merge-recursive.c:1598

530 +msgid "add/add"

531 +msgstr "添加/添加"

532 +

533 +#: merge-recursive.c:1632

534 +#, c-format

535 +msgid "Skipped %s (merged same as existing)"

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

537 +

538 +#: merge-recursive.c:1646

539 +#, c-format

540 +msgid "Auto-merging %s"

541 +msgstr "自动合并 %s"

542 +

543 +#: merge-recursive.c:1650 git-submodule.sh:844

544 +msgid "submodule"

545 +msgstr "子模组"

546 +

547 +#: merge-recursive.c:1651

548 +#, c-format

549 +msgid "CONFLICT (%s): Merge conflict in %s"

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

551 +

552 +#: merge-recursive.c:1741

553 +#, c-format

554 +msgid "Removing %s"

555 +msgstr "删除 %s"

556 +

557 +#: merge-recursive.c:1766

558 +msgid "file/directory"

559 +msgstr "文件/目录"

560 +

561 +#: merge-recursive.c:1772

562 +msgid "directory/file"

563 +msgstr "目录/文件"

564 +

565 +#: merge-recursive.c:1777

566 +#, c-format

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

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

569 +

570 +#: merge-recursive.c:1787

571 +#, c-format

572 +msgid "Adding %s"

573 +msgstr "添加 %s"

574 +

575 +#: merge-recursive.c:1804

576 +msgid "Fatal merge failure, shouldn't happen."

577 +msgstr "严重的合并错误，不应发生。"

578 +

579 +#: merge-recursive.c:1823

580 +msgid "Already up-to-date!"

581 +msgstr "已经是最新的！"

582 +

583 +#: merge-recursive.c:1832

584 +#, c-format

585 +msgid "merging of trees %s and %s failed"

586 +msgstr "无法合并树 %s 和 %s"

587 +

588 +#: merge-recursive.c:1862

589 +#, c-format

590 +msgid "Unprocessed path??? %s"

591 +msgstr "未处理的路径??? %s"

592 +

593 +#: merge-recursive.c:1907

594 +msgid "Merging:"

595 +msgstr "合并："

596 +

597 +#: merge-recursive.c:1918

598 +#, c-format

599 +msgid "found %u common ancestor(s):"

600 +msgstr "发现 %u 个共同祖先："

601 +

602 +#: merge-recursive.c:1954

603 +msgid "merge returned no commit"

604 +msgstr "合并未返回提交"

605 +

606 +#: merge-recursive.c:2011

607 +#, c-format

608 +msgid "Could not parse object '%s'"

609 +msgstr "不能解析对象 '%s'"

610 +

611 +#: merge-recursive.c:2023 builtin/merge.c:697

612 +msgid "Unable to write index."

613 +msgstr "不能写入索引。"

614 +

615 #: parse-options.c:494

616 msgid "..."

617 msgstr "..."

@@ -1130,7 +1390,7 @@ msgstr "-A 和 -u 选项互斥"

1390

1391 #: builtin/add.c:393

1392 msgid "Option --ignore-missing can only be used together with --dry-run"

1133 -msgstr "选项 --ignore-missing 只能和 --dry-run 共用"

1393 +msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

1394

1395 #: builtin/add.c:413

1396 #, c-format

@@ -1529,7 +1789,7 @@ msgstr "应用补丁而不修改工作区"

1789

1790 #: builtin/apply.c:4310

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

1532 -msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）"

1792 +msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）"

1793

1794 #: builtin/apply.c:4312

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

@@ -1683,7 +1943,7 @@ msgstr ""

1943

1944 #: builtin/branch.c:180

1945 msgid "cannot use -a with -d"

1686 -msgstr "不能将 -a 和 -d 共用"

1946 +msgstr "不能将 -a 和 -d 同时使用"

1947

1948 #: builtin/branch.c:186

1949 msgid "Couldn't look up commit object for HEAD"

@@ -2006,7 +2266,7 @@ msgstr "引用不是一个树：%s"

2266

2267 #: builtin/checkout.c:977

2268 msgid "-B cannot be used with -b"

2009 -msgstr "-B 不能和 -b 共用"

2269 +msgstr "-B 不能和 -b 同时使用"

2270

2271 #: builtin/checkout.c:986

2272 msgid "--patch is incompatible with all other options"

@@ -2014,11 +2274,11 @@ msgstr "--patch 选项和其他选项不兼容"

2274

2275 #: builtin/checkout.c:989

2276 msgid "--detach cannot be used with -b/-B/--orphan"

2017 -msgstr "--detach 不能和 -b/-B/--orphan 共用"

2277 +msgstr "--detach 不能和 -b/-B/--orphan 同时使用"

2278

2279 #: builtin/checkout.c:991

2280 msgid "--detach cannot be used with -t"

2021 -msgstr "--detach 不能和 -t 共用"

2281 +msgstr "--detach 不能和 -t 同时使用"

2282

2283 #: builtin/checkout.c:997

2284 msgid "--track needs a branch name"

@@ -2034,7 +2294,7 @@ msgstr "--orphan 和 -b|-B 互斥"

2294

2295 #: builtin/checkout.c:1012

2296 msgid "--orphan cannot be used with -t"

2037 -msgstr "--orphan 不能和 -t 共用"

2297 +msgstr "--orphan 不能和 -t 同时使用"

2298

2299 #: builtin/checkout.c:1022

2300 msgid "git checkout: -f and -m are incompatible"

@@ -2078,7 +2338,7 @@ msgstr "--ours/--theirs 和切换分支不兼容。"

2338

2339 #: builtin/clean.c:78

2340 msgid "-x and -X cannot be used together"

2081 -msgstr "-x 和 -X 不能共用"

2341 +msgstr "-x 和 -X 不能同时使用"

2342

2343 #: builtin/clean.c:82

2344 msgid ""

@@ -2123,11 +2383,6 @@ msgstr "未删除 %s\n"

2383 msgid "reference repository '%s' is not a local directory."

2384 msgstr "引用版本库 '%s' 不是一个本地目录。"

2385

2126 -#: builtin/clone.c:302

2127 -#, c-format

2128 -msgid "failed to open '%s'"

2129 -msgstr "无法打开 '%s'"

2130 -

2386 #: builtin/clone.c:306

2387 #, c-format

2388 msgid "failed to create directory '%s'"

@@ -2391,7 +2646,7 @@ msgid ""

2646 "and try again.\n"

2647 msgstr ""

2648 "\n"

2394 -"看起来您正在做一个合并提交。如果不对，请删除文件\n"

2649 +"似乎您正在做一个合并提交。如果不对，请删除文件\n"

2650 "\t%s\n"

2651 "然后重试。\n"

2652

@@ -2405,7 +2660,7 @@ msgid ""

2660 "and try again.\n"

2661 msgstr ""

2662 "\n"

2408 -"看起来您正在做一个拣选提交。如果不对，请删除文件\n"

2663 +"似乎您正在做一个拣选提交。如果不对，请删除文件\n"

2664 "\t%s\n"

2665 "然后重试。\n"

2666

@@ -2479,7 +2734,7 @@ msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

2734

2735 #: builtin/commit.c:1019

2736 msgid "Options --squash and --fixup cannot be used together"

2482 -msgstr "选项 --squash 和 --fixup 不能共用"

2737 +msgstr "选项 --squash 和 --fixup 不能同时使用"

2738

2739 #: builtin/commit.c:1029

2740 msgid "Only one of -c/-C/-F/--fixup can be used."

@@ -2487,11 +2742,11 @@ msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

2742

2743 #: builtin/commit.c:1031

2744 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

2490 -msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"

2745 +msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

2746

2747 #: builtin/commit.c:1039

2748 msgid "--reset-author can be used only with -C, -c or --amend."

2494 -msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"

2749 +msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

2750

2751 #: builtin/commit.c:1056

2752 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

@@ -2516,7 +2771,7 @@ msgstr "无效的清理模式 %s"

2771

2772 #: builtin/commit.c:1077

2773 msgid "Paths with -a does not make sense."

2519 -msgstr "路径和 -a 选项共用没有意义。"

2774 +msgstr "路径和 -a 选项同时使用没有意义。"

2775

2776 #: builtin/commit.c:1260

2777 msgid "couldn't look up newly created commit"

@@ -2671,7 +2926,7 @@ msgstr "没有发现名称，无法描述任何东西。"

2926

2927 #: builtin/describe.c:482

2928 msgid "--dirty is incompatible with committishes"

2674 -msgstr "--dirty 不能与提交共用"

2929 +msgstr "--dirty 不能与提交同时使用"

2930

2931 #: builtin/diff.c:77

2932 #, c-format

@@ -2700,7 +2955,7 @@ msgstr "提供了超过 %d 个树对象：'%s'"

2955 #: builtin/diff.c:356

2956 #, c-format

2957 msgid "more than two blobs given: '%s'"

2703 -msgstr "提供了超过两个 blob 对象：'%s'"

2958 +msgstr "提供了超过两个二进制对象（blob）：'%s'"

2959

2960 #: builtin/diff.c:364

2961 #, c-format

@@ -2937,11 +3192,11 @@ msgstr "--open-files-in-pager 仅用于工作区"

3192

3193 #: builtin/grep.c:963

3194 msgid "--cached or --untracked cannot be used with --no-index."

2940 -msgstr "--cached 或 --untracked 不能与 --no-index 共用。"

3195 +msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

3196

3197 #: builtin/grep.c:968

3198 msgid "--no-index or --untracked cannot be used with revs."

2944 -msgstr "--no-index 或 --untracked 不能和版本共用。"

3199 +msgstr "--no-index 或 --untracked 不能和版本同时使用。"

3200

3201 #: builtin/grep.c:971

3202 msgid "--[no-]exclude-standard cannot be used for tracked contents."

@@ -3123,7 +3378,7 @@ msgstr "不能读取现存对象 %s"

3378 #: builtin/index-pack.c:732

3379 #, c-format

3380 msgid "invalid blob object %s"

3126 -msgstr "无效的 blob 对象 %s"

3381 +msgstr "无效的二进制对象（blob）%s"

3382

3383 #: builtin/index-pack.c:747

3384 #, c-format

@@ -3250,7 +3505,7 @@ msgstr "错误选项 %s"

3505

3506 #: builtin/index-pack.c:1558

3507 msgid "--fix-thin cannot be used without --stdin"

3253 -msgstr "--fix-thin 不能和 --stdin 共用"

3508 +msgstr "--fix-thin 不能和 --stdin 同时使用"

3509

3510 #: builtin/index-pack.c:1562 builtin/index-pack.c:1572

3511 #, c-format

@@ -3581,10 +3836,6 @@ msgstr "git write-tree 无法写入一树对象"

3836 msgid "failed to read the cache"

3837 msgstr "无法读取缓存"

3838

3584 -#: builtin/merge.c:697

3585 -msgid "Unable to write index."

3586 -msgstr "不能写索引。"

3587 -

3839 #: builtin/merge.c:710

3840 msgid "Not handling anything other than two heads merge."

3841 msgstr "不能处理两个头合并之外的任何操作。"

@@ -3693,11 +3944,11 @@ msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

3944

3945 #: builtin/merge.c:1249

3946 msgid "You cannot combine --squash with --no-ff."

3696 -msgstr "您不能将 --squash 与 --no-ff 共用。"

3947 +msgstr "您不能将 --squash 与 --no-ff 同时使用。"

3948

3949 #: builtin/merge.c:1254

3950 msgid "You cannot combine --no-ff with --ff-only."

3700 -msgstr "您不能将 --no-ff 与 --ff-only 共用。"

3951 +msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"

3952

3953 #: builtin/merge.c:1261

3954 msgid "No commit specified and merge.defaultToUpstream not set."

@@ -4167,7 +4418,7 @@ msgstr "--all 和 --tags 不兼容"

4418

4419 #: builtin/push.c:286

4420 msgid "--all can't be combined with refspecs"

4170 -msgstr "--all 不能和引用表达式共用"

4421 +msgstr "--all 不能和引用表达式同时使用"

4422

4423 #: builtin/push.c:291

4424 msgid "--mirror and --tags are incompatible"

@@ -4175,7 +4426,7 @@ msgstr "--mirror 和 --tags 不兼容"

4426

4427 #: builtin/push.c:292

4428 msgid "--mirror can't be combined with refspecs"

4178 -msgstr "--mirror 不能和引用表达式共用"

4429 +msgstr "--mirror 不能和引用表达式同时使用"

4430

4431 #: builtin/push.c:297

4432 msgid "--all and --mirror are incompatible"

@@ -4213,7 +4464,7 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"

4464

4465 #: builtin/remote.c:187

4466 msgid "specifying branches to track makes sense only with fetch mirrors"

4216 -msgstr "指定要跟踪的分支只在与获取镜像共用才有意义"

4467 +msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"

4468

4469 #: builtin/remote.c:195 builtin/remote.c:646

4470 #, c-format

@@ -4629,7 +4880,7 @@ msgstr "不能重置索引文件至版本 '%s'。"

4880 #: builtin/revert.c:70 builtin/revert.c:92

4881 #, c-format

4882 msgid "%s: %s cannot be used with %s"

4632 -msgstr "%s：%s 不能和 %s 共用"

4883 +msgstr "%s：%s 不能和 %s 同时使用"

4884

4885 #: builtin/revert.c:131

4886 msgid "program error"

@@ -4779,15 +5030,15 @@ msgstr "--column 和 -n 不兼容"

5030

5031 #: builtin/tag.c:523

5032 msgid "-n option is only allowed with -l."

4782 -msgstr "-n 选项只允许和 -l 共用。"

5033 +msgstr "-n 选项只允许和 -l 同时使用。"

5034

5035 #: builtin/tag.c:525

5036 msgid "--contains option is only allowed with -l."

4786 -msgstr "--contains 选项只允许和 -l 共用。"

5037 +msgstr "--contains 选项只允许和 -l 同时使用。"

5038

5039 #: builtin/tag.c:527

5040 msgid "--points-at option is only allowed with -l."

4790 -msgstr "--points-at 选项只允许和 -l 共用。"

5041 +msgstr "--points-at 选项只允许和 -l 同时使用。"

5042

5043 #: builtin/tag.c:535

5044 msgid "only one -F or -m option is allowed."

@@ -4955,9 +5206,9 @@ msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_H

5206 #: git-am.sh:105

5207 #, sh-format

5208 msgid ""

4958 -"When you have resolved this problem run \"$cmdline --resolved\".\n"

4959 -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"

4960 -"To restore the original branch and stop patching run \"$cmdline --abort\"."

5209 +"When you have resolved this problem, run \"$cmdline --resolved\".\n"

5210 +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"

5211 +"To restore the original branch and stop patching, run \"$cmdline --abort\"."

5212 msgstr ""

5213 "当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"

5214 "如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"

@@ -4969,7 +5220,11 @@ msgstr "无法求助于三路合并。"

5220

5221 #: git-am.sh:137

5222 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

4972 -msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"

5223 +msgstr "版本库缺乏必要的二进制对象（blob）以进行三路合并。"

5224 +

5225 +#: git-am.sh:139

5226 +msgid "Using index info to reconstruct a base tree..."

5227 +msgstr "更新索引信息以重建基树..."

5228

5229 #: git-am.sh:154

5230 msgid ""

@@ -4977,48 +5232,56 @@ msgid ""

5232 "It does not apply to blobs recorded in its index."

5233 msgstr ""

5234 "您是否曾手动编辑过您的补丁？\n"

4980 -"无法应用补丁到索引中的数据上。"

5235 +"无法应用补丁到索引中的二进制对象（blob）上。"

5236

5237 #: git-am.sh:163

5238 msgid "Falling back to patching base and 3-way merge..."

5239 msgstr "转而在基础版本上打补丁及进行三路合并..."

5240

4986 -#: git-am.sh:275

5241 +#: git-am.sh:179

5242 +msgid "Failed to merge in the changes."

5243 +msgstr "无法合并变更。"

5244 +

5245 +#: git-am.sh:274

5246 msgid "Only one StGIT patch series can be applied at once"

5247 msgstr "一次只能有一个 StGIT 补丁队列被应用"

5248

4990 -#: git-am.sh:362

5249 +#: git-am.sh:361

5250 #, sh-format

5251 msgid "Patch format $patch_format is not supported."

5252 msgstr "不支持 $patch_format 补丁格式。"

5253

4995 -#: git-am.sh:364

5254 +#: git-am.sh:363

5255 msgid "Patch format detection failed."

5256 msgstr "补丁格式检测失败。"

5257

4999 -#: git-am.sh:418

5000 -msgid "-d option is no longer supported. Do not use."

5001 -msgstr "不再支持 -d 选项。不要使用。"

5258 +#: git-am.sh:389

5259 +msgid ""

5260 +"The -b/--binary option has been a no-op for long time, and\n"

5261 +"it will be removed. Please do not use it anymore."

5262 +msgstr ""

5263 +"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被删除。\n"

5264 +"请不要再使用它了。"

5265

5003 -#: git-am.sh:481

5266 +#: git-am.sh:477

5267 #, sh-format

5268 msgid "previous rebase directory $dotest still exists but mbox given."

5269 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"

5270

5008 -#: git-am.sh:486

5271 +#: git-am.sh:482

5272 msgid "Please make up your mind. --skip or --abort?"

5273 msgstr "请下决心。--skip 或是 --abort ？"

5274

5012 -#: git-am.sh:513

5275 +#: git-am.sh:509

5276 msgid "Resolve operation not in progress, we are not resuming."

5277 msgstr "解决操作未进行，我们不会继续。"

5278

5016 -#: git-am.sh:579

5279 +#: git-am.sh:575

5280 #, sh-format

5281 msgid "Dirty index: cannot apply patches (dirty: $files)"

5282 msgstr "脏的索引：不能应用补丁（脏文件：$files）"

5283

5021 -#: git-am.sh:683

5284 +#: git-am.sh:679

5285 #, sh-format

5286 msgid ""

5287 "Patch is empty. Was it split wrong?\n"

@@ -5029,15 +5292,15 @@ msgstr ""

5292 "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"

5293 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"

5294

5032 -#: git-am.sh:710

5295 +#: git-am.sh:706

5296 msgid "Patch does not have a valid e-mail address."

5297 msgstr "补丁中没有一个有效的邮件地址。"

5298

5036 -#: git-am.sh:757

5299 +#: git-am.sh:753

5300 msgid "cannot be interactive without stdin connected to a terminal."

5301 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

5302

5040 -#: git-am.sh:761

5303 +#: git-am.sh:757

5304 msgid "Commit Body is:"

5305 msgstr "提交内容为："

5306

@@ -5045,16 +5308,16 @@ msgstr "提交内容为："

5308 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

5309 #. in your translation. The program will only accept English

5310 #. input at this point.

5048 -#: git-am.sh:768

5311 +#: git-am.sh:764

5312 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

5313 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

5314

5052 -#: git-am.sh:804

5315 +#: git-am.sh:800

5316 #, sh-format

5317 msgid "Applying: $FIRSTLINE"

5318 msgstr "正应用：$FIRSTLINE"

5319

5057 -#: git-am.sh:825

5320 +#: git-am.sh:821

5321 msgid ""

5322 "No changes - did you forget to use 'git add'?\n"

5323 "If there is nothing left to stage, chances are that something else\n"

@@ -5064,22 +5327,22 @@ msgstr ""

5327 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

5328 "您也许想要跳过这个补丁。"

5329

5067 -#: git-am.sh:833

5330 +#: git-am.sh:829

5331 msgid ""

5332 "You still have unmerged paths in your index\n"

5333 "did you forget to use 'git add'?"

5334 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"

5335

5073 -#: git-am.sh:849

5336 +#: git-am.sh:845

5337 msgid "No changes -- Patch already applied."

5338 msgstr "没有变更 -- 补丁已经应用过。"

5339

5077 -#: git-am.sh:859

5340 +#: git-am.sh:855

5341 #, sh-format

5342 msgid "Patch failed at $msgnum $FIRSTLINE"

5343 msgstr "补丁失败于 $msgnum $FIRSTLINE"

5344

5082 -#: git-am.sh:880

5345 +#: git-am.sh:876

5346 msgid "applying to an empty history"

5347 msgstr "正应用到一个空历史上"

5348

@@ -5280,6 +5543,123 @@ msgstr "无法将多个分支合并到空分支"

5543 msgid "Cannot rebase onto multiple branches"

5544 msgstr "无法变基到多个分支"

5545

5546 +#: git-rebase.sh:52

5547 +msgid ""

5548 +"When you have resolved this problem, run \"git rebase --continue\".\n"

5549 +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

5550 +"To check out the original branch and stop rebasing, run \"git rebase --abort"

5551 +"\"."

5552 +msgstr ""

5553 +"当您解决了此问题后，执行 \"git rebase --continue\"。\n"

5554 +"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"

5555 +"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"

5556 +

5557 +#: git-rebase.sh:159

5558 +msgid "The pre-rebase hook refused to rebase."

5559 +msgstr "钩子 pre-rebase 拒绝变基。"

5560 +

5561 +#: git-rebase.sh:164

5562 +msgid "It looks like git-am is in progress. Cannot rebase."

5563 +msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"

5564 +

5565 +#: git-rebase.sh:295

5566 +msgid "The --exec option must be used with the --interactive option"

5567 +msgstr "选项 --exec 必须和选项 --interactive 同时使用"

5568 +

5569 +#: git-rebase.sh:300

5570 +msgid "No rebase in progress?"

5571 +msgstr "没有正在进行的变基？"

5572 +

5573 +#: git-rebase.sh:313

5574 +msgid "Cannot read HEAD"

5575 +msgstr "不能读取 HEAD"

5576 +

5577 +#: git-rebase.sh:316

5578 +msgid ""

5579 +"You must edit all merge conflicts and then\n"

5580 +"mark them as resolved using git add"

5581 +msgstr ""

5582 +"您必须编辑所有的合并冲突，然后通过 git add\n"

5583 +"命令将它们标记为已解决"

5584 +

5585 +#: git-rebase.sh:334

5586 +#, sh-format

5587 +msgid "Could not move back to $head_name"

5588 +msgstr "无法移回 $head_name"

5589 +

5590 +#: git-rebase.sh:350

5591 +#, sh-format

5592 +msgid ""

5593 +"It seems that there is already a $state_dir_base directory, and\n"

5594 +"I wonder if you are in the middle of another rebase. If that is the\n"

5595 +"case, please try\n"

5596 +"\t$cmd_live_rebase\n"

5597 +"If that is not the case, please\n"

5598 +"\t$cmd_clear_stale_rebase\n"

5599 +"and run me again. I am stopping in case you still have something\n"

5600 +"valuable there."

5601 +msgstr ""

5602 +"好像已有一个 $state_dir_base 目录，我怀疑您正处于另外一个变基过程中。\n"

5603 +"如果是这样，请尝试执行\n"

5604 +"\t$cmd_live_rebase\n"

5605 +"如果不是这样，请执行\n"

5606 +"\t$cmd_clear_stale_rebase\n"

5607 +"然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。"

5608 +

5609 +#: git-rebase.sh:395

5610 +#, sh-format

5611 +msgid "invalid upstream $upstream_name"

5612 +msgstr "无效的上游 $upstream_name"

5613 +

5614 +#: git-rebase.sh:419

5615 +#, sh-format

5616 +msgid "$onto_name: there are more than one merge bases"

5617 +msgstr "$onto_name: 有一个以上的合并基准"

5618 +

5619 +#: git-rebase.sh:422 git-rebase.sh:426

5620 +#, sh-format

5621 +msgid "$onto_name: there is no merge base"

5622 +msgstr "$onto_name: 没有合并基准"

5623 +

5624 +#: git-rebase.sh:431

5625 +#, sh-format

5626 +msgid "Does not point to a valid commit: $onto_name"

5627 +msgstr "没有指向一个有效的提交：$onto_name"

5628 +

5629 +#: git-rebase.sh:454

5630 +#, sh-format

5631 +msgid "fatal: no such branch: $branch_name"

5632 +msgstr "严重错误：无此分支：$branch_name"

5633 +

5634 +#: git-rebase.sh:474

5635 +msgid "Please commit or stash them."

5636 +msgstr "请提交或为它们保存进度。"

5637 +

5638 +#: git-rebase.sh:492

5639 +#, sh-format

5640 +msgid "Current branch $branch_name is up to date."

5641 +msgstr "当前分支 $branch_name 是最新的。"

5642 +

5643 +#: git-rebase.sh:495

5644 +#, sh-format

5645 +msgid "Current branch $branch_name is up to date, rebase forced."

5646 +msgstr "当前分支 $branch_name 是最新的，强制变基。"

5647 +

5648 +#: git-rebase.sh:506

5649 +#, sh-format

5650 +msgid "Changes from $mb to $onto:"

5651 +msgstr "变更从 $mb 到 $onto："

5652 +

5653 +#. Detach HEAD and reset the tree

5654 +#: git-rebase.sh:515

5655 +msgid "First, rewinding head to replay your work on top of it..."

5656 +msgstr "首先，重置头指针以便在上面重放您的工作..."

5657 +

5658 +#: git-rebase.sh:523

5659 +#, sh-format

5660 +msgid "Fast-forwarded $branch_name to $onto_name."

5661 +msgstr "快进 $branch_name 至 $onto_name。"

5662 +

5663 #: git-stash.sh:51

5664 msgid "git stash clear with parameters is unimplemented"

5665 msgstr "git stash clear 不支持参数"

@@ -5560,8 +5940,8 @@ msgid "Failed to recurse into submodule path '$sm_path'"

5940 msgstr "无法递归进子模组路径 '$sm_path'"

5941

5942 #: git-submodule.sh:754

5563 -msgid "--cached cannot be used with --files"

5564 -msgstr "--cached 不能和 --files 共用"

5943 +msgid "The --cached option cannot be used with the --files option"

5944 +msgstr "选项 --cached 不能和选项 --files 同时使用"

5945

5946 #. unexpected type

5947 #: git-submodule.sh:794

@@ -5589,11 +5969,7 @@ msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"

5969

5970 #: git-submodule.sh:843

5971 msgid "blob"

5592 -msgstr "blob"

5593 -

5594 -#: git-submodule.sh:844

5595 -msgid "submodule"

5596 -msgstr "子模组"

5972 +msgstr "二进制对象"

5973

5974 #: git-submodule.sh:881

5975 msgid "# Submodules changed but not updated:"

@@ -5607,294 +5983,3 @@ msgstr "要提交的子模组变更："

5983 #, sh-format

5984 msgid "Synchronizing submodule url for '$name'"

5985 msgstr "为 '$name' 同步子模组 url"

5610 -

5611 -#~ msgid "(bad commit)\n"

5612 -#~ msgstr "（坏提交）\n"

5613 -

5614 -#~ msgid "addinfo_cache failed for path '%s'"

5615 -#~ msgstr "为路径 '%s' addinfo_cache 失败"

5616 -

5617 -#~ msgid "error building trees"

5618 -#~ msgstr "无法创建树"

5619 -

5620 -#~ msgid "diff setup failed"

5621 -#~ msgstr "diff 设置失败"

5622 -

5623 -#~ msgid "merge-recursive: disk full?"

5624 -#~ msgstr "merge-recursive: 磁盘已满？"

5625 -

5626 -#~ msgid "failed to create path '%s'%s"

5627 -#~ msgstr "无法创建路径 '%s'%s"

5628 -

5629 -#~ msgid "Removing %s to make room for subdirectory\n"

5630 -#~ msgstr "删除 %s 以便为子目录留出空间\n"

5631 -

5632 -#~ msgid ": perhaps a D/F conflict?"

5633 -#~ msgstr "：可能是一个 D/F 冲突？"

5634 -

5635 -#~ msgid "refusing to lose untracked file at '%s'"

5636 -#~ msgstr "拒绝丢失 '%s' 下的未跟踪文件"

5637 -

5638 -#~ msgid "cannot read object %s '%s'"

5639 -#~ msgstr "不能读取对象 %s '%s'"

5640 -

5641 -#~ msgid "blob expected for %s '%s'"

5642 -#~ msgstr "%s '%s' 应为 blob"

5643 -

5644 -#~ msgid "failed to symlink '%s'"

5645 -#~ msgstr "无法创建符号链接 '%s'"

5646 -

5647 -#~ msgid "do not know what to do with %06o %s '%s'"

5648 -#~ msgstr "不知道如何处理 %06o %s '%s'"

5649 -

5650 -#~ msgid "Failed to execute internal merge"

5651 -#~ msgstr "无法执行内部合并"

5652 -

5653 -#~ msgid "Unable to add %s to database"

5654 -#~ msgstr "不能添加 %s 至对象库"

5655 -

5656 -#~ msgid "unsupported object type in the tree"

5657 -#~ msgstr "在树中有不支持的对象类型"

5658 -

5659 -#~ msgid ""

5660 -#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "

5661 -#~ "left in tree."

5662 -#~ msgstr ""

5663 -#~ "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s "

5664 -#~ "中的版本被保留。"

5665 -

5666 -#~ msgid ""

5667 -#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "

5668 -#~ "left in tree at %s."

5669 -#~ msgstr ""

5670 -#~ "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s "

5671 -#~ "中的版本保留于 %8$s 中。"

5672 -

5673 -#~ msgid "rename"

5674 -#~ msgstr "重命名"

5675 -

5676 -#~ msgid "renamed"

5677 -#~ msgstr "重命名"

5678 -

5679 -#~ msgid "%s is a directory in %s adding as %s instead"

5680 -#~ msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

5681 -

5682 -#~ msgid ""

5683 -#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "

5684 -#~ "\"%s\"->\"%s\" in \"%s\"%s"

5685 -#~ msgstr ""

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

5687 -#~ "\"%6$s\" 重命名 \"%4$s\"->\"%5$s\"%7$s"

5688 -

5689 -#~ msgid " (left unresolved)"

5690 -#~ msgstr "（留下未解决）"

5691 -

5692 -#~ msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5693 -#~ msgstr ""

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

5695 -#~ ">%5$s"

5696 -

5697 -#~ msgid "Renaming %s to %s and %s to %s instead"

5698 -#~ msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"

5699 -

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

5701 -#~ msgstr ""

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

5703 -

5704 -#~ msgid "Adding merged %s"

5705 -#~ msgstr "添加合并后的 %s"

5706 -

5707 -#~ msgid "Adding as %s instead"

5708 -#~ msgstr "而是以 %s 为名添加"

5709 -

5710 -#~ msgid "cannot read object %s"

5711 -#~ msgstr "不能读取对象 %s"

5712 -

5713 -#~ msgid "object %s is not a blob"

5714 -#~ msgstr "对象 %s 不是一个 blob"

5715 -

5716 -#~ msgid "modify"

5717 -#~ msgstr "修改"

5718 -

5719 -#~ msgid "modified"

5720 -#~ msgstr "修改"

5721 -

5722 -#~ msgid "content"

5723 -#~ msgstr "内容"

5724 -

5725 -#~ msgid "add/add"

5726 -#~ msgstr "添加/添加"

5727 -

5728 -#~ msgid "Skipped %s (merged same as existing)"

5729 -#~ msgstr "略过 %s（已经做过相同合并）"

5730 -

5731 -#~ msgid "Auto-merging %s"

5732 -#~ msgstr "自动合并 %s"

5733 -

5734 -#~ msgid "CONFLICT (%s): Merge conflict in %s"

5735 -#~ msgstr "冲突（%s）：合并冲突于 %s"

5736 -

5737 -#~ msgid "Removing %s"

5738 -#~ msgstr "删除 %s"

5739 -

5740 -#~ msgid "file/directory"

5741 -#~ msgstr "文件/目录"

5742 -

5743 -#~ msgid "directory/file"

5744 -#~ msgstr "目录/文件"

5745 -

5746 -#~ msgid ""

5747 -#~ "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5748 -#~ msgstr ""

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

5750 -

5751 -#~ msgid "Adding %s"

5752 -#~ msgstr "添加 %s"

5753 -

5754 -#~ msgid "Fatal merge failure, shouldn't happen."

5755 -#~ msgstr "严重的合并错误，不应发生。"

5756 -

5757 -#~ msgid "Already up-to-date!"

5758 -#~ msgstr "已经是最新的！"

5759 -

5760 -#~ msgid "merging of trees %s and %s failed"

5761 -#~ msgstr "无法合并树 %s 和 %s"

5762 -

5763 -#~ msgid "Unprocessed path??? %s"

5764 -#~ msgstr "未处理的路径??? %s"

5765 -

5766 -#~ msgid "Merging:"

5767 -#~ msgstr "合并："

5768 -

5769 -#~ msgid "found %u common ancestor(s):"

5770 -#~ msgstr "发现 %u 个共同祖先："

5771 -

5772 -#~ msgid "merge returned no commit"

5773 -#~ msgstr "合并未返回提交"

5774 -

5775 -#~ msgid "Could not parse object '%s'"

5776 -#~ msgstr "不能解析对象 '%s'"

5777 -

5778 -#~ msgid "Using index info to reconstruct a base tree..."

5779 -#~ msgstr "更新索引信息以重建基树..."

5780 -

5781 -#~ msgid "Failed to merge in the changes."

5782 -#~ msgstr "无法合并变更。"

5783 -

5784 -#~ msgid ""

5785 -#~ "The -b option has been a no-op for long time, and\n"

5786 -#~ "it will be removed. Please do not use it anymore."

5787 -#~ msgstr ""

5788 -#~ "参数 -b 已经很长时间不做任何实质操作了，并且将被\n"

5789 -#~ "删除。请不要再使用它了。"

5790 -

5791 -#~ msgid ""

5792 -#~ "\n"

5793 -#~ "When you have resolved this problem run \"git rebase --continue\".\n"

5794 -#~ "If you would prefer to skip this patch, instead run \"git rebase --skip"

5795 -#~ "\".\n"

5796 -#~ "To check out the original branch and stop rebasing run \"git rebase --"

5797 -#~ "abort\".\n"

5798 -#~ msgstr ""

5799 -#~ "\n"

5800 -#~ "当您解决了此问题后，执行 \"git rebase --continue\"。\n"

5801 -#~ "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"

5802 -#~ "要恢复原分支并停止变基，执行 \"git rebase --abort\"。\n"

5803 -

5804 -#~ msgid "The pre-rebase hook refused to rebase."

5805 -#~ msgstr "钩子 pre-rebase 拒绝变基。"

5806 -

5807 -#~ msgid "It looks like git-am is in progress. Cannot rebase."

5808 -#~ msgstr "看起来 git-am 正在进行中。无法变基。"

5809 -

5810 -#~ msgid "The --exec option must be used with the --interactive option"

5811 -#~ msgstr "选项 --exec 必须和选项 --interactive 共用"

5812 -

5813 -#~ msgid "No rebase in progress?"

5814 -#~ msgstr "没有正在进行的变基？"

5815 -

5816 -#~ msgid "Cannot read HEAD"

5817 -#~ msgstr "不能读取 HEAD"

5818 -

5819 -#~ msgid ""

5820 -#~ "You must edit all merge conflicts and then\n"

5821 -#~ "mark them as resolved using git add"

5822 -#~ msgstr ""

5823 -#~ "您必须编辑所有的合并冲突，然后通过 git add\n"

5824 -#~ "命令将它们标记为已解决"

5825 -

5826 -#~ msgid "Could not move back to $head_name"

5827 -#~ msgstr "无法移回 $head_name"

5828 -

5829 -#~ msgid ""

5830 -#~ "\n"

5831 -#~ "It seems that there is already a $state_dir_base directory, and\n"

5832 -#~ "I wonder if you are in the middle of another rebase. If that is the\n"

5833 -#~ "case, please try\n"

5834 -#~ "\tgit rebase (--continue | --abort | --skip)\n"

5835 -#~ "If that is not the case, please\n"

5836 -#~ "\trm -fr \"$state_dir\"\n"

5837 -#~ "and run me again. I am stopping in case you still have something\n"

5838 -#~ "valuable there."

5839 -#~ msgstr ""

5840 -#~ "\n"

5841 -#~ "好像已有一个 $state_dir_base 目录，并且我猜您正处于另一个变基过程\n"

5842 -#~ "中。如果是这样，请尝试执行\n"

5843 -#~ "\tgit rebase (--continue | --abort | --skip)\n"

5844 -#~ "如果不是这样，请执行\n"

5845 -#~ "\trm -fr \"$state_dir\"\n"

5846 -#~ "然后再执行我。我停止以免您在那儿仍有一些重要的数据。"

5847 -

5848 -#~ msgid "invalid upstream $upstream_name"

5849 -#~ msgstr "无效的上游 $upstream_name"

5850 -

5851 -#~ msgid "$onto_name: there are more than one merge bases"

5852 -#~ msgstr "$onto_name: 有一个以上的合并基准"

5853 -

5854 -#~ msgid "$onto_name: there is no merge base"

5855 -#~ msgstr "$onto_name: 没有合并基准"

5856 -

5857 -#~ msgid "Does not point to a valid commit: $onto_name"

5858 -#~ msgstr "没有指向一个有效的提交：$onto_name"

5859 -

5860 -#~ msgid "fatal: no such branch: $branch_name"

5861 -#~ msgstr "严重：无此分支：$branch_name"

5862 -

5863 -#~ msgid "Please commit or stash them."

5864 -#~ msgstr "请提交或为它们保存进度。"

5865 -

5866 -#~ msgid "Current branch $branch_name is up to date."

5867 -#~ msgstr "当前分支 $branch_name 是最新的。"

5868 -

5869 -#~ msgid "Current branch $branch_name is up to date, rebase forced."

5870 -#~ msgstr "当前分支 $branch_name 是最新的，强制变基。"

5871 -

5872 -#~ msgid "Changes from $mb to $onto:"

5873 -#~ msgstr "变更从 $mb 到 $onto："

5874 -

5875 -#~ msgid "First, rewinding head to replay your work on top of it..."

5876 -#~ msgstr "首先，重置头指针以便在上面重放您的工作..."

5877 -

5878 -#~ msgid "Fast-forwarded $branch_name to $onto_name."

5879 -#~ msgstr "快进 $branch_name 至 $onto_name。"

5880 -

5881 -#~ msgid "The --cached option cannot be used with the --files option"

5882 -#~ msgstr "选项 --cached 不能和选项 --files 共用"

5883 -

5884 -#~ msgid "BUG: There are unmerged index entries:\n"

5885 -#~ msgstr "BUG: 有未合并的索引条目：\n"

5886 -

5887 -#~ msgid "Bug in merge-recursive.c"

5888 -#~ msgstr "在 merge-recursive.c 有 bug"

5889 -

5890 -#~ msgid "BUG: unexpected number of arguments left to parse"

5891 -#~ msgstr "BUG: 参数解析后留下意外数目的参数"

5892 -

5893 -#~ msgid "BUG: %d %.*s\n"

5894 -#~ msgstr "BUG: %d %.*s\n"

5895 -

5896 -#~ msgid "%s: has been deleted/renamed"

5897 -#~ msgstr "%s：已经被删除/重命名"

5898 -

5899 -#~ msgid "'%s': not a documentation directory."

5900 -#~ msgstr "'%s'：不是一个文档目录。"

l10n: zh_CN.po: translate 76 new messages