5bb01d4f02 · 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: 2015-06-27 19:17+0800\n"

16 -"PO-Revision-Date: 2015-07-05 23:12+0800\n"

15 +"POT-Creation-Date: 2015-07-14 07:19+0800\n"

16 +"PO-Revision-Date: 2015-07-14 07:32+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -653,8 +653,8 @@ msgstr "BUG: 重新打开一个已提交的锁文件"

653 msgid "failed to read the cache"

654 msgstr "无法读取缓存"

655

656 -#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

657 -#: builtin/clone.c:654

656 +#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

657 +#: builtin/clone.c:647

658 msgid "unable to write new index file"

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

660

@@ -701,7 +701,7 @@ msgstr "不能读取对象 %s '%s'"

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

702 msgstr "%s '%s' 应为数据（blob）对象"

703

704 -#: merge-recursive.c:788 builtin/clone.c:313

704 +#: merge-recursive.c:788 builtin/clone.c:306

705 #, c-format

706 msgid "failed to open '%s'"

707 msgstr "无法打开 '%s'"

@@ -2034,7 +2034,7 @@ msgstr "丢失"

2034 msgid "behind "

2035 msgstr "落后 "

2036

2037 -#: compat/precompose_utf8.c:55 builtin/clone.c:352

2037 +#: compat/precompose_utf8.c:55 builtin/clone.c:345

2038 #, c-format

2039 msgid "failed to unlink '%s'"

2040 msgstr "无法删除 '%s'"

@@ -2112,7 +2112,7 @@ msgstr "冗长输出"

2112 msgid "interactive picking"

2113 msgstr "交互式拣选"

2114

2115 -#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2115 +#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2116 msgid "select hunks interactively"

2117 msgstr "交互式挑选数据块"

2118

@@ -2446,7 +2446,7 @@ msgstr "%s：补丁未应用"

2446 msgid "Checking patch %s..."

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

2448

2449 -#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2449 +#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

2450 #, c-format

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

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

@@ -3141,7 +3141,7 @@ msgstr "以列的方式显示分支"

3141 msgid "Failed to resolve HEAD as a valid ref."

3142 msgstr "无法将 HEAD 解析为有效引用。"

3143

3144 -#: builtin/branch.c:878 builtin/clone.c:629

3144 +#: builtin/branch.c:878 builtin/clone.c:622

3145 msgid "HEAD not found below refs/heads!"

3146 msgstr "HEAD 没有位于 /refs/heads 之下！"

3147

@@ -3337,7 +3337,7 @@ msgstr "从标准输入读出文件名"

3337 msgid "terminate input and output records by a NUL character"

3338 msgstr "输入和输出的记录使用 NUL 字符终结"

3339

3340 -#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3340 +#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3341 msgid "suppress progress reporting"

3342 msgstr "不显示进度报告"

3343

@@ -3434,114 +3434,114 @@ msgstr "在创建文件时，在前面加上<字符串>"

3434 msgid "copy out the files from named stage"

3435 msgstr "从指定暂存区中拷出文件"

3436

3437 -#: builtin/checkout.c:26

3437 +#: builtin/checkout.c:24

3438 msgid "git checkout [<options>] <branch>"

3439 msgstr "git checkout [<选项>] <分支>"

3440

3441 -#: builtin/checkout.c:27

3441 +#: builtin/checkout.c:25

3442 msgid "git checkout [<options>] [<branch>] -- <file>..."

3443 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."

3444

3445 -#: builtin/checkout.c:138 builtin/checkout.c:171

3445 +#: builtin/checkout.c:134 builtin/checkout.c:167

3446 #, c-format

3447 msgid "path '%s' does not have our version"

3448 msgstr "路径 '%s' 没有我们的版本"

3449

3450 -#: builtin/checkout.c:140 builtin/checkout.c:173

3450 +#: builtin/checkout.c:136 builtin/checkout.c:169

3451 #, c-format

3452 msgid "path '%s' does not have their version"

3453 msgstr "路径 '%s' 没有他们的版本"

3454

3455 -#: builtin/checkout.c:156

3455 +#: builtin/checkout.c:152

3456 #, c-format

3457 msgid "path '%s' does not have all necessary versions"

3458 msgstr "路径 '%s' 没有全部必须的版本"

3459

3460 -#: builtin/checkout.c:200

3460 +#: builtin/checkout.c:196

3461 #, c-format

3462 msgid "path '%s' does not have necessary versions"

3463 msgstr "路径 '%s' 没有必须的版本"

3464

3465 -#: builtin/checkout.c:217

3465 +#: builtin/checkout.c:213

3466 #, c-format

3467 msgid "path '%s': cannot merge"

3468 msgstr "path '%s'：无法合并"

3469

3470 -#: builtin/checkout.c:234

3470 +#: builtin/checkout.c:230

3471 #, c-format

3472 msgid "Unable to add merge result for '%s'"

3473 msgstr "无法为 '%s' 添加合并结果"

3474

3475 -#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3476 -#: builtin/checkout.c:264 builtin/checkout.c:277

3475 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3476 +#: builtin/checkout.c:260

3477 #, c-format

3478 msgid "'%s' cannot be used with updating paths"

3479 msgstr "'%s' 不能在更新路径时使用"

3480

3481 -#: builtin/checkout.c:267 builtin/checkout.c:270

3481 +#: builtin/checkout.c:263 builtin/checkout.c:266

3482 #, c-format

3483 msgid "'%s' cannot be used with %s"

3484 msgstr "'%s' 不能和 %s 同时使用"

3485

3486 -#: builtin/checkout.c:273

3486 +#: builtin/checkout.c:269

3487 #, c-format

3488 msgid "Cannot update paths and switch to branch '%s' at the same time."

3489 msgstr "不能同时更新路径并切换到分支'%s'。"

3490

3491 -#: builtin/checkout.c:287 builtin/checkout.c:481

3491 +#: builtin/checkout.c:280 builtin/checkout.c:474

3492 msgid "corrupt index file"

3493 msgstr "损坏的索引文件"

3494

3495 -#: builtin/checkout.c:347 builtin/checkout.c:354

3495 +#: builtin/checkout.c:340 builtin/checkout.c:347

3496 #, c-format

3497 msgid "path '%s' is unmerged"

3498 msgstr "路径 '%s' 未合并"

3499

3500 -#: builtin/checkout.c:503

3500 +#: builtin/checkout.c:496

3501 msgid "you need to resolve your current index first"

3502 msgstr "您需要先解决当前索引的冲突"

3503

3504 -#: builtin/checkout.c:634

3504 +#: builtin/checkout.c:627

3505 #, c-format

3506 msgid "Can not do reflog for '%s'\n"

3507 msgstr "不能对 '%s' 执行 reflog 操作\n"

3508

3509 -#: builtin/checkout.c:670

3509 +#: builtin/checkout.c:663

3510 msgid "HEAD is now at"

3511 msgstr "HEAD 目前位于"

3512

3513 -#: builtin/checkout.c:677

3513 +#: builtin/checkout.c:670

3514 #, c-format

3515 msgid "Reset branch '%s'\n"

3516 msgstr "重置分支 '%s'\n"

3517

3518 -#: builtin/checkout.c:680

3518 +#: builtin/checkout.c:673

3519 #, c-format

3520 msgid "Already on '%s'\n"

3521 msgstr "已经位于 '%s'\n"

3522

3523 -#: builtin/checkout.c:684

3523 +#: builtin/checkout.c:677

3524 #, c-format

3525 msgid "Switched to and reset branch '%s'\n"

3526 msgstr "切换并重置分支 '%s'\n"

3527

3528 -#: builtin/checkout.c:686 builtin/checkout.c:1285

3528 +#: builtin/checkout.c:679 builtin/checkout.c:1134

3529 #, c-format

3530 msgid "Switched to a new branch '%s'\n"

3531 msgstr "切换到一个新分支 '%s'\n"

3532

3533 -#: builtin/checkout.c:688

3533 +#: builtin/checkout.c:681

3534 #, c-format

3535 msgid "Switched to branch '%s'\n"

3536 msgstr "切换到分支 '%s'\n"

3537

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

3539 -#: builtin/checkout.c:740

3539 +#: builtin/checkout.c:733

3540 #, c-format

3541 msgid " ... and %d more.\n"

3542 msgstr " ... 及其它 %d 个。\n"

3543

3544 -#: builtin/checkout.c:746

3544 +#: builtin/checkout.c:739

3545 #, c-format

3546 msgid ""

3547 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3562,7 +3562,7 @@ msgstr[1] ""

3562 "\n"

3563 "%s\n"

3564

3565 -#: builtin/checkout.c:765

3565 +#: builtin/checkout.c:758

3566 #, c-format

3567 msgid ""

3568 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -3589,177 +3589,149 @@ msgstr[1] ""

3589 " git branch <新分支名> %s\n"

3590 "\n"

3591

3592 -#: builtin/checkout.c:801

3592 +#: builtin/checkout.c:794

3593 msgid "internal error in revision walk"

3594 msgstr "在版本遍历时遇到内部错误"

3595

3596 -#: builtin/checkout.c:805

3596 +#: builtin/checkout.c:798

3597 msgid "Previous HEAD position was"

3598 msgstr "之前的 HEAD 位置是"

3599

3600 -#: builtin/checkout.c:832 builtin/checkout.c:1280

3600 +#: builtin/checkout.c:825 builtin/checkout.c:1129

3601 msgid "You are on a branch yet to be born"

3602 msgstr "您位于一个尚未初始化的分支"

3603

3604 -#: builtin/checkout.c:893

3605 -msgid "no branch specified"

3606 -msgstr "未指定分支名"

3607 -

3608 -#: builtin/checkout.c:895

3609 -#, c-format

3610 -msgid "'%s' already exists"

3611 -msgstr "'%s' 已经存在"

3612 -

3613 -#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3614 -#: builtin/clone.c:853

3615 -#, c-format

3616 -msgid "could not create leading directories of '%s'"

3617 -msgstr "不能为 '%s' 创建先导目录"

3618 -

3619 -#: builtin/checkout.c:924

3620 -#, c-format

3621 -msgid "could not create directory of '%s'"

3622 -msgstr "不能创建目录 '%s'"

3623 -

3624 -#: builtin/checkout.c:960

3625 -#, c-format

3626 -msgid "Enter %s (identifier %s)"

3627 -msgstr "输入 %s （标识符 %s）"

3628 -

3629 -#: builtin/checkout.c:1070

3604 +#: builtin/checkout.c:931

3605 #, c-format

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

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

3608

3634 -#: builtin/checkout.c:1176

3609 +#: builtin/checkout.c:1036

3610 #, c-format

3611 msgid "only one reference expected, %d given."

3612 msgstr "只要一个引用，却给出了 %d 个"

3613

3639 -#: builtin/checkout.c:1215

3614 +#: builtin/checkout.c:1075

3615 #, c-format

3616 msgid "invalid reference: %s"

3617 msgstr "无效引用：%s"

3618

3644 -#: builtin/checkout.c:1255

3619 +#: builtin/checkout.c:1104

3620 #, c-format

3621 msgid "reference is not a tree: %s"

3622 msgstr "引用不是一个树：%s"

3623

3649 -#: builtin/checkout.c:1294

3624 +#: builtin/checkout.c:1143

3625 msgid "paths cannot be used with switching branches"

3626 msgstr "路径不能和切换分支同时使用"

3627

3653 -#: builtin/checkout.c:1297 builtin/checkout.c:1301

3628 +#: builtin/checkout.c:1146 builtin/checkout.c:1150

3629 #, c-format

3630 msgid "'%s' cannot be used with switching branches"

3631 msgstr "'%s' 不能和切换分支同时使用"

3632

3658 -#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3659 -#: builtin/checkout.c:1316

3633 +#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3634 +#: builtin/checkout.c:1165

3635 #, c-format

3636 msgid "'%s' cannot be used with '%s'"

3637 msgstr "'%s' 不能和 '%s' 同时使用"

3638

3664 -#: builtin/checkout.c:1321

3639 +#: builtin/checkout.c:1170

3640 #, c-format

3641 msgid "Cannot switch branch to a non-commit '%s'"

3642 msgstr "不能切换分支到一个非提交 '%s'"

3643

3669 -#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3670 -#: builtin/remote.c:159 builtin/remote.c:161

3644 +#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3645 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3646 +#: builtin/worktree.c:284

3647 msgid "branch"

3648 msgstr "分支"

3649

3674 -#: builtin/checkout.c:1347

3650 +#: builtin/checkout.c:1204

3651 msgid "create and checkout a new branch"

3652 msgstr "创建并检出一个新的分支"

3653

3678 -#: builtin/checkout.c:1349

3654 +#: builtin/checkout.c:1206

3655 msgid "create/reset and checkout a branch"

3656 msgstr "创建/重置并检出一个分支"

3657

3682 -#: builtin/checkout.c:1350

3658 +#: builtin/checkout.c:1207

3659 msgid "create reflog for new branch"

3660 msgstr "为新的分支创建引用日志"

3661

3686 -#: builtin/checkout.c:1351

3662 +#: builtin/checkout.c:1208

3663 msgid "detach the HEAD at named commit"

3664 msgstr "成为指向该提交的分离头指针"

3665

3690 -#: builtin/checkout.c:1352

3666 +#: builtin/checkout.c:1209

3667 msgid "set upstream info for new branch"

3668 msgstr "为新的分支设置上游信息"

3669

3694 -#: builtin/checkout.c:1354

3670 +#: builtin/checkout.c:1211

3671 msgid "new-branch"

3672 msgstr "新分支"

3673

3698 -#: builtin/checkout.c:1354

3674 +#: builtin/checkout.c:1211

3675 msgid "new unparented branch"

3676 msgstr "新的没有父提交的分支"

3677

3702 -#: builtin/checkout.c:1355

3678 +#: builtin/checkout.c:1212

3679 msgid "checkout our version for unmerged files"

3680 msgstr "对尚未合并的文件检出我们的版本"

3681

3706 -#: builtin/checkout.c:1357

3682 +#: builtin/checkout.c:1214

3683 msgid "checkout their version for unmerged files"

3684 msgstr "对尚未合并的文件检出他们的版本"

3685

3710 -#: builtin/checkout.c:1359

3686 +#: builtin/checkout.c:1216

3687 msgid "force checkout (throw away local modifications)"

3688 msgstr "强制检出（丢弃本地修改）"

3689

3714 -#: builtin/checkout.c:1360

3690 +#: builtin/checkout.c:1217

3691 msgid "perform a 3-way merge with the new branch"

3692 msgstr "和新的分支执行三路合并"

3693

3718 -#: builtin/checkout.c:1361 builtin/merge.c:227

3694 +#: builtin/checkout.c:1218 builtin/merge.c:227

3695 msgid "update ignored files (default)"

3696 msgstr "更新忽略的文件（默认）"

3697

3722 -#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3698 +#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

3699 msgid "style"

3700 msgstr "风格"

3701

3726 -#: builtin/checkout.c:1363

3702 +#: builtin/checkout.c:1220

3703 msgid "conflict style (merge or diff3)"

3704 msgstr "冲突输出风格（merge 或 diff3）"

3705

3730 -#: builtin/checkout.c:1366

3706 +#: builtin/checkout.c:1223

3707 msgid "do not limit pathspecs to sparse entries only"

3708 msgstr "对路径不做稀疏检出的限制"

3709

3734 -#: builtin/checkout.c:1368

3710 +#: builtin/checkout.c:1225

3711 msgid "second guess 'git checkout <no-such-branch>'"

3712 msgstr "二次猜测'git checkout <无此分支>'"

3713

3738 -#: builtin/checkout.c:1370

3739 -msgid "check a branch out in a separate working directory"

3740 -msgstr "检出一个分支到单独的工作目录"

3741 -

3742 -#: builtin/checkout.c:1372

3714 +#: builtin/checkout.c:1227

3715 msgid "do not check if another worktree is holding the given ref"

3716 msgstr "不检查指定的引用是否被其他工作区所占用"

3717

3746 -#: builtin/checkout.c:1406

3718 +#: builtin/checkout.c:1252

3719 msgid "-b, -B and --orphan are mutually exclusive"

3720 msgstr "-b、-B 和 --orphan 是互斥的"

3721

3750 -#: builtin/checkout.c:1423

3722 +#: builtin/checkout.c:1269

3723 msgid "--track needs a branch name"

3724 msgstr "--track 需要一个分支名"

3725

3754 -#: builtin/checkout.c:1428

3726 +#: builtin/checkout.c:1274

3727 msgid "Missing branch name; try -b"

3728 msgstr "缺少分支名；尝试 -b"

3729

3758 -#: builtin/checkout.c:1464

3730 +#: builtin/checkout.c:1310

3731 msgid "invalid path specification"

3732 msgstr "无效的路径规格"

3733

3762 -#: builtin/checkout.c:1471

3734 +#: builtin/checkout.c:1317

3735 #, c-format

3736 msgid ""

3737 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3768,12 +3740,12 @@ msgstr ""

3740 "不能同时更新路径并切换到分支'%s'。\n"

3741 "您是想要检出 '%s' 但其未能解析为提交么？"

3742

3771 -#: builtin/checkout.c:1476

3743 +#: builtin/checkout.c:1322

3744 #, c-format

3745 msgid "git checkout: --detach does not take a path argument '%s'"

3746 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3747

3776 -#: builtin/checkout.c:1480

3748 +#: builtin/checkout.c:1326

3749 msgid ""

3750 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3751 "checking out of the index."

@@ -4056,57 +4028,57 @@ msgstr "key=value"

4028 msgid "set config inside the new repository"

4029 msgstr "在新版本库中设置配置信息"

4030

4059 -#: builtin/clone.c:247

4031 +#: builtin/clone.c:240

4032 #, c-format

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

4034 msgstr "参考版本库 '%s' 不是一个本地版本库。"

4035

4064 -#: builtin/clone.c:251

4036 +#: builtin/clone.c:244

4037 #, c-format

4038 msgid "reference repository '%s' is shallow"

4039 msgstr "参考版本库 '%s' 是一个浅克隆"

4040

4069 -#: builtin/clone.c:254

4041 +#: builtin/clone.c:247

4042 #, c-format

4043 msgid "reference repository '%s' is grafted"

4044 msgstr "参考版本库 '%s' 已被嫁接"

4045

4074 -#: builtin/clone.c:317

4046 +#: builtin/clone.c:310

4047 #, c-format

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

4049 msgstr "无法创建目录 '%s'"

4050

4079 -#: builtin/clone.c:319 builtin/diff.c:84

4051 +#: builtin/clone.c:312 builtin/diff.c:84

4052 #, c-format

4053 msgid "failed to stat '%s'"

4054 msgstr "无法枚举 '%s' 状态"

4055

4084 -#: builtin/clone.c:321

4056 +#: builtin/clone.c:314

4057 #, c-format

4058 msgid "%s exists and is not a directory"

4059 msgstr "%s 存在且不是一个目录"

4060

4089 -#: builtin/clone.c:335

4061 +#: builtin/clone.c:328

4062 #, c-format

4063 msgid "failed to stat %s\n"

4064 msgstr "无法枚举 %s 状态\n"

4065

4094 -#: builtin/clone.c:357

4066 +#: builtin/clone.c:350

4067 #, c-format

4068 msgid "failed to create link '%s'"

4069 msgstr "无法创建链接 '%s'"

4070

4099 -#: builtin/clone.c:361

4071 +#: builtin/clone.c:354

4072 #, c-format

4073 msgid "failed to copy file to '%s'"

4074 msgstr "无法拷贝文件至 '%s'"

4075

4104 -#: builtin/clone.c:384 builtin/clone.c:558

4076 +#: builtin/clone.c:377 builtin/clone.c:551

4077 #, c-format

4078 msgid "done.\n"

4079 msgstr "完成。\n"

4080

4109 -#: builtin/clone.c:396

4081 +#: builtin/clone.c:389

4082 msgid ""

4083 "Clone succeeded, but checkout failed.\n"

4084 "You can inspect what was checked out with 'git status'\n"

@@ -4116,115 +4088,121 @@ msgstr ""

4088 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

4089 "'git checkout -f HEAD' 重试\n"

4090

4119 -#: builtin/clone.c:473

4091 +#: builtin/clone.c:466

4092 #, c-format

4093 msgid "Could not find remote branch %s to clone."

4094 msgstr "不能发现要克隆的远程分支 %s。"

4095

4124 -#: builtin/clone.c:553

4096 +#: builtin/clone.c:546

4097 #, c-format

4098 msgid "Checking connectivity... "

4099 msgstr "检查连接... "

4100

4129 -#: builtin/clone.c:556

4101 +#: builtin/clone.c:549

4102 msgid "remote did not send all necessary objects"

4103 msgstr "远程没有发送所有必须的对象"

4104

4133 -#: builtin/clone.c:620

4105 +#: builtin/clone.c:613

4106 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4107 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

4108

4137 -#: builtin/clone.c:651

4109 +#: builtin/clone.c:644

4110 msgid "unable to checkout working tree"

4111 msgstr "不能检出工作区"

4112

4141 -#: builtin/clone.c:738

4113 +#: builtin/clone.c:731

4114 msgid "cannot repack to clean up"

4115 msgstr "无法执行 repack 来清理"

4116

4145 -#: builtin/clone.c:740

4117 +#: builtin/clone.c:733

4118 msgid "cannot unlink temporary alternates file"

4119 msgstr "无法删除临时的 alternates 文件"

4120

4149 -#: builtin/clone.c:770

4121 +#: builtin/clone.c:763

4122 msgid "Too many arguments."

4123 msgstr "太多参数。"

4124

4153 -#: builtin/clone.c:774

4125 +#: builtin/clone.c:767

4126 msgid "You must specify a repository to clone."

4127 msgstr "您必须指定一个版本库来克隆。"

4128

4157 -#: builtin/clone.c:785

4129 +#: builtin/clone.c:778

4130 #, c-format

4131 msgid "--bare and --origin %s options are incompatible."

4132 msgstr "--bare 和 --origin %s 选项不兼容。"

4133

4162 -#: builtin/clone.c:788

4134 +#: builtin/clone.c:781

4135 msgid "--bare and --separate-git-dir are incompatible."

4136 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

4137

4166 -#: builtin/clone.c:801

4138 +#: builtin/clone.c:794

4139 #, c-format

4140 msgid "repository '%s' does not exist"

4141 msgstr "版本库 '%s' 不存在"

4142

4171 -#: builtin/clone.c:807 builtin/fetch.c:1160

4143 +#: builtin/clone.c:800 builtin/fetch.c:1160

4144 #, c-format

4145 msgid "depth %s is not a positive number"

4146 msgstr "深度 %s 不是一个正数"

4147

4176 -#: builtin/clone.c:817

4148 +#: builtin/clone.c:810

4149 #, c-format

4150 msgid "destination path '%s' already exists and is not an empty directory."

4151 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

4152

4181 -#: builtin/clone.c:827

4153 +#: builtin/clone.c:820

4154 #, c-format

4155 msgid "working tree '%s' already exists."

4156 msgstr "工作区 '%s' 已经存在。"

4157

4186 -#: builtin/clone.c:845

4158 +#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4159 +#: builtin/worktree.c:220

4160 +#, c-format

4161 +msgid "could not create leading directories of '%s'"

4162 +msgstr "不能为 '%s' 创建先导目录"

4163 +

4164 +#: builtin/clone.c:838

4165 #, c-format

4166 msgid "could not create work tree dir '%s'"

4167 msgstr "不能创建工作区目录 '%s'"

4168

4191 -#: builtin/clone.c:863

4169 +#: builtin/clone.c:856

4170 #, c-format

4171 msgid "Cloning into bare repository '%s'...\n"

4172 msgstr "克隆到纯版本库 '%s'...\n"

4173

4196 -#: builtin/clone.c:865

4174 +#: builtin/clone.c:858

4175 #, c-format

4176 msgid "Cloning into '%s'...\n"

4177 msgstr "正克隆到 '%s'...\n"

4178

4201 -#: builtin/clone.c:890

4179 +#: builtin/clone.c:883

4180 msgid "--dissociate given, but there is no --reference"

4181 msgstr "提供了参数 --dissociate，但未提供 --reference"

4182

4205 -#: builtin/clone.c:907

4183 +#: builtin/clone.c:900

4184 msgid "--depth is ignored in local clones; use file:// instead."

4185 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

4186

4209 -#: builtin/clone.c:910

4187 +#: builtin/clone.c:903

4188 msgid "source repository is shallow, ignoring --local"

4189 msgstr "源版本库是浅克隆，忽略 --local"

4190

4213 -#: builtin/clone.c:915

4191 +#: builtin/clone.c:908

4192 msgid "--local is ignored"

4193 msgstr "--local 被忽略"

4194

4217 -#: builtin/clone.c:919

4195 +#: builtin/clone.c:912

4196 #, c-format

4197 msgid "Don't know how to clone %s"

4198 msgstr "不知道如何克隆 %s"

4199

4222 -#: builtin/clone.c:968 builtin/clone.c:976

4200 +#: builtin/clone.c:961 builtin/clone.c:969

4201 #, c-format

4202 msgid "Remote branch %s not found in upstream %s"

4203 msgstr "远程分支 %s 在上游 %s 未发现"

4204

4227 -#: builtin/clone.c:979

4205 +#: builtin/clone.c:972

4206 msgid "You appear to have cloned an empty repository."

4207 msgstr "您似乎克隆了一个空版本库。"

4208

@@ -5585,7 +5563,7 @@ msgstr "key"

5563 msgid "field name to sort on"

5564 msgstr "排序的字段名"

5565

5588 -#: builtin/fsck.c:147 builtin/prune.c:236

5566 +#: builtin/fsck.c:147 builtin/prune.c:137

5567 msgid "Checking connectivity"

5568 msgstr "检查连接中"

5569

@@ -5633,7 +5611,7 @@ msgstr "启用更严格的检查"

5611 msgid "write dangling objects in .git/lost-found"

5612 msgstr "将摇摆对象写入 .git/lost-found 中"

5613

5636 -#: builtin/fsck.c:627 builtin/prune.c:198

5614 +#: builtin/fsck.c:627 builtin/prune.c:107

5615 msgid "show progress"

5616 msgstr "显示进度"

5617

@@ -8062,60 +8040,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"

8040 msgid "Removing duplicate objects"

8041 msgstr "正在删除重复对象"

8042

8065 -#: builtin/prune.c:12

8043 +#: builtin/prune.c:11

8044 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

8045 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"

8046

8069 -#: builtin/prune.c:86

8070 -#, c-format

8071 -msgid "Removing worktrees/%s: not a valid directory"

8072 -msgstr "删除工作区/%s：不是一个有效的目录"

8073 -

8074 -#: builtin/prune.c:92

8075 -#, c-format

8076 -msgid "Removing worktrees/%s: gitdir file does not exist"

8077 -msgstr "删除 worktrees/%s：gitdir 文件不存在"

8078 -

8079 -#: builtin/prune.c:97

8080 -#, c-format

8081 -msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

8082 -msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"

8083 -

8084 -#: builtin/prune.c:108

8085 -#, c-format

8086 -msgid "Removing worktrees/%s: invalid gitdir file"

8087 -msgstr "删除 worktrees/%s：无效的 gitdir 文件"

8088 -

8089 -#: builtin/prune.c:124

8090 -#, c-format

8091 -msgid "Removing worktrees/%s: gitdir file points to non-existent location"

8092 -msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"

8093 -

8094 -#: builtin/prune.c:159

8095 -#, c-format

8096 -msgid "failed to remove: %s"

8097 -msgstr "无法删除：%s"

8098 -

8099 -#: builtin/prune.c:196

8047 +#: builtin/prune.c:105 builtin/worktree.c:112

8048 msgid "do not remove, show only"

8049 msgstr "不删除，只显示"

8050

8103 -#: builtin/prune.c:197

8051 +#: builtin/prune.c:106 builtin/worktree.c:113

8052 msgid "report pruned objects"

8053 msgstr "报告清除的对象"

8054

8107 -#: builtin/prune.c:199

8108 -msgid "prune .git/worktrees"

8109 -msgstr "清理 .git/worktrees"

8110 -

8111 -#: builtin/prune.c:201

8055 +#: builtin/prune.c:109 builtin/worktree.c:115

8056 msgid "expire objects older than <time>"

8057 msgstr "使早于给定时间的对象过期"

8058

8115 -#: builtin/prune.c:216

8116 -msgid "--worktrees does not take extra arguments"

8117 -msgstr "--worktrees 没有附加参数"

8118 -

8059 #: builtin/push.c:14

8060 msgid "git push [<options>] [<repository> [<refspec>...]]"

8061 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"

@@ -10165,6 +10105,83 @@ msgstr "git verify-tag [-v | --verbose] <标签>..."

10105 msgid "print tag contents"

10106 msgstr "打印 tag 内容"

10107

10108 +#: builtin/worktree.c:11

10109 +msgid "git worktree add [<options>] <path> <branch>"

10110 +msgstr "git worktree add [<选项>] <路径> <分支>"

10111 +

10112 +#: builtin/worktree.c:12

10113 +msgid "git worktree prune [<options>]"

10114 +msgstr "git worktree prune [<选项>]"

10115 +

10116 +#: builtin/worktree.c:27

10117 +#, c-format

10118 +msgid "Removing worktrees/%s: not a valid directory"

10119 +msgstr "删除工作区/%s：不是一个有效的目录"

10120 +

10121 +#: builtin/worktree.c:33

10122 +#, c-format

10123 +msgid "Removing worktrees/%s: gitdir file does not exist"

10124 +msgstr "删除 worktrees/%s：gitdir 文件不存在"

10125 +

10126 +#: builtin/worktree.c:38

10127 +#, c-format

10128 +msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

10129 +msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"

10130 +

10131 +#: builtin/worktree.c:49

10132 +#, c-format

10133 +msgid "Removing worktrees/%s: invalid gitdir file"

10134 +msgstr "删除 worktrees/%s：无效的 gitdir 文件"

10135 +

10136 +#: builtin/worktree.c:65

10137 +#, c-format

10138 +msgid "Removing worktrees/%s: gitdir file points to non-existent location"

10139 +msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"

10140 +

10141 +#: builtin/worktree.c:100

10142 +#, c-format

10143 +msgid "failed to remove: %s"

10144 +msgstr "无法删除：%s"

10145 +

10146 +#: builtin/worktree.c:186

10147 +#, c-format

10148 +msgid "'%s' already exists"

10149 +msgstr "'%s' 已经存在"

10150 +

10151 +#: builtin/worktree.c:207

10152 +#, c-format

10153 +msgid "could not create directory of '%s'"

10154 +msgstr "不能创建目录 '%s'"

10155 +

10156 +#: builtin/worktree.c:241

10157 +msgid "unable to resolve HEAD"

10158 +msgstr "不能解析 HEAD"

10159 +

10160 +#: builtin/worktree.c:249

10161 +#, c-format

10162 +msgid "Enter %s (identifier %s)"

10163 +msgstr "输入 %s （标识符 %s）"

10164 +

10165 +#: builtin/worktree.c:281

10166 +msgid "checkout <branch> even if already checked out in other worktree"

10167 +msgstr "检出分支 <branch> 即使已经被检出到其它工作区"

10168 +

10169 +#: builtin/worktree.c:283

10170 +msgid "create a new branch"

10171 +msgstr "创建一个新分支"

10172 +

10173 +#: builtin/worktree.c:285

10174 +msgid "create or reset a branch"

10175 +msgstr "创建或重置一个分支"

10176 +

10177 +#: builtin/worktree.c:286

10178 +msgid "detach HEAD at named commit"

10179 +msgstr "HEAD 从指定的提交分离"

10180 +

10181 +#: builtin/worktree.c:292

10182 +msgid "-b and -B are mutually exclusive"

10183 +msgstr "-b 和 -B 互斥"

10184 +

10185 #: builtin/write-tree.c:13

10186 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"

10187 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"

@@ -10228,8 +10245,8 @@ msgid "List, create, or delete branches"

10245 msgstr "列出、创建或删除分支"

10246

10247 #: common-cmds.h:21

10231 -msgid "Checkout a branch or paths to the working tree"

10232 -msgstr "检出一个分支或路径到工作区"

10248 +msgid "Switch branches or restore working tree files"

10249 +msgstr "切换分支或恢复工作区文件"

10250

10251 #: common-cmds.h:22

10252 msgid "Clone a repository into a new directory"

@@ -11261,18 +11278,3 @@ msgstr "无法递归进子模组路径 '$sm_path'"

11278 #, sh-format

11279 msgid "Synchronizing submodule url for '$displaypath'"

11280 msgstr "为 '$displaypath' 同步子模组 url"

11264 -

11265 -#~ msgid "Cannot apply stash: Your index contains uncommitted changes."

11266 -#~ msgstr "无法应用 stash：您的索引中包含未提交的变更。"

11267 -

11268 -#~ msgid "The most commonly used git commands are:"

11269 -#~ msgstr "最常用的 git 命令有："

11270 -

11271 -#~ msgid "No such branch: '%s'"

11272 -#~ msgstr "没有此分支：'%s'"

11273 -

11274 -#~ msgid "Could not create git link %s"

11275 -#~ msgstr "不能创建 git link %s"

11276 -

11277 -#~ msgid "Invalid gc.pruneexpire: '%s'"

11278 -#~ msgstr "无效的 gc.pruneexpire：'%s'"

l10n: zh_CN: for git v2.5.0 l10n round 2