@matheusbsbs / matheus-bagliano / commits / b18943845c

l10n: zh_CN.po: translate 5 messages (2135t0f0u)

Translate 5 new messages came from git.pot update in b8ecf23 (l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Aug 6, 2013 at 14:49 UTC b18943845c71bf4792436c541e342361e2483249
1 file changed +182 -164
po/zh_CN.po
+182 -164
@@ -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: 2013-07-26 14:19+0800\n"
16 -"PO-Revision-Date: 2013-08-03 14:13+0800\n"
15 +"POT-Creation-Date: 2013-08-06 14:10+0800\n"
16 +"PO-Revision-Date: 2013-08-06 14:45+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"
@@ -266,7 +266,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
266 msgid "unrecognized header: %s%s (%d)"
267 msgstr "未能识别的包头：%s%s (%d)"
268
269 -#: bundle.c:89 builtin/commit.c:683
269 +#: bundle.c:89 builtin/commit.c:697
270 #, c-format
271 msgid "could not open '%s'"
272 msgstr "不能打开 '%s'"
@@ -506,20 +506,20 @@ msgstr "'%s'：%s"
506 msgid "'%s': short read %s"
507 msgstr "'%s'：读取不完整 %s"
508
509 -#: help.c:213
509 +#: help.c:210
510 #, c-format
511 msgid "available git commands in '%s'"
512 msgstr "在 '%s' 下可用的 git 命令"
513
514 -#: help.c:220
514 +#: help.c:217
515 msgid "git commands available from elsewhere on your $PATH"
516 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
517
518 -#: help.c:236
518 +#: help.c:233
519 msgid "The most commonly used git commands are:"
520 msgstr "最常用的 git 命令有："
521
522 -#: help.c:293
522 +#: help.c:290
523 #, c-format
524 msgid ""
525 "'%s' appears to be a git command, but we were not\n"
@@ -528,11 +528,11 @@ msgstr ""
528 "'%s' 像是一个 git 命令，但却无法运行。\n"
529 "可能是 git-%s 受损？"
530
531 -#: help.c:350
531 +#: help.c:347
532 msgid "Uh oh. Your system reports no Git commands at all."
533 msgstr "唉呀，您的系统中未发现 Git 命令。"
534
535 -#: help.c:372
535 +#: help.c:369
536 #, c-format
537 msgid ""
538 "WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -541,17 +541,17 @@ msgstr ""
541 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
542 "是 '%s'"
543
544 -#: help.c:377
544 +#: help.c:374
545 #, c-format
546 msgid "in %0.1f seconds automatically..."
547 msgstr "在 %0.1f 秒钟后自动运行..."
548
549 -#: help.c:384
549 +#: help.c:381
550 #, c-format
551 msgid "git: '%s' is not a git command. See 'git --help'."
552 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
553
554 -#: help.c:388 help.c:447
554 +#: help.c:385 help.c:444
555 msgid ""
556 "\n"
557 "Did you mean this?"
@@ -565,7 +565,7 @@ msgstr[1] ""
565 "\n"
566 "您指的是这其中的某一个么？"
567
568 -#: help.c:443
568 +#: help.c:440
569 #, c-format
570 msgid "%s: %s - %s"
571 msgstr "%s：%s - %s"
@@ -1204,7 +1204,7 @@ msgid ""
1204 "\n"
1205 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1206 "examine these refs and maybe delete them. Turn this message off by\n"
1207 -"running \"git config advice.object_name_warning false\""
1207 +"running \"git config advice.objectNameWarning false\""
1208 msgstr ""
1209 "Git 通常不会创建一个以40位十六进制字符命名的引用，因为当你提供40位\n"
1210 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
@@ -1212,7 +1212,7 @@ msgstr ""
1212 " git checkout -b $br $(git rev-parse ...)\n"
1213 "\n"
1214 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用，\n"
1215 -"可能需要删除它们。用 \"git config advice.object_name_warning false\""
1215 +"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1216 "命令关闭本消息通知。"
1217
1218 #: sha1_name.c:1097
@@ -1786,7 +1786,7 @@ msgstr ""
1786 msgid "unexpected diff status %c"
1787 msgstr "意外的差异状态 %c"
1788
1789 -#: builtin/add.c:149 builtin/commit.c:238
1789 +#: builtin/add.c:149 builtin/commit.c:252
1790 msgid "updating files failed"
1791 msgstr "更新文件失败"
1792
@@ -1835,14 +1835,14 @@ msgstr "不能应用 '%s'"
1835 msgid "The following paths are ignored by one of your .gitignore files:\n"
1836 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
1837
1838 -#: builtin/add.c:394 builtin/clean.c:851 builtin/fetch.c:78 builtin/mv.c:63
1838 +#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
1839 #: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
1840 #: builtin/rm.c:268
1841 msgid "dry run"
1842 msgstr "演习"
1843
1844 #: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
1845 -#: builtin/commit.c:1201 builtin/count-objects.c:95 builtin/fsck.c:613
1845 +#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
1846 #: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
1847 msgid "be verbose"
1848 msgstr "冗长输出"
@@ -1923,8 +1923,8 @@ msgstr "没有指定文件，也没有文件被添加。\n"
1923 msgid "Maybe you wanted to say 'git add .'?\n"
1924 msgstr "也许您想要执行 'git add .'？\n"
1925
1926 -#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:895
1927 -#: builtin/commit.c:298 builtin/mv.c:82 builtin/rm.c:297
1926 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
1927 +#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
1928 msgid "index file corrupt"
1929 msgstr "索引文件损坏"
1930
@@ -2777,8 +2777,8 @@ msgid "act on remote-tracking branches"
2777 msgstr "作用于远程跟踪分支"
2778
2779 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2780 -#: builtin/branch.c:838 builtin/commit.c:1414 builtin/commit.c:1415
2781 -#: builtin/commit.c:1416 builtin/commit.c:1417 builtin/tag.c:468
2780 +#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
2781 +#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
2782 msgid "commit"
2783 msgstr "提交"
2784
@@ -2959,43 +2959,43 @@ msgstr "需要一个版本库来创建包。"
2959 msgid "Need a repository to unbundle."
2960 msgstr "需要一个版本库来解包。"
2961
2962 -#: builtin/cat-file.c:303
2962 +#: builtin/cat-file.c:285
2963 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2964 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2965
2966 -#: builtin/cat-file.c:304
2966 +#: builtin/cat-file.c:286
2967 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2968 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2969
2970 -#: builtin/cat-file.c:341
2970 +#: builtin/cat-file.c:323
2971 msgid "<type> can be one of: blob, tree, commit, tag"
2972 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
2973
2974 -#: builtin/cat-file.c:342
2974 +#: builtin/cat-file.c:324
2975 msgid "show object type"
2976 msgstr "显示对象类型"
2977
2978 -#: builtin/cat-file.c:343
2978 +#: builtin/cat-file.c:325
2979 msgid "show object size"
2980 msgstr "显示对象大小"
2981
2982 -#: builtin/cat-file.c:345
2982 +#: builtin/cat-file.c:327
2983 msgid "exit with zero when there's no error"
2984 msgstr "当没有错误时退出并返回零"
2985
2986 -#: builtin/cat-file.c:346
2986 +#: builtin/cat-file.c:328
2987 msgid "pretty-print object's content"
2988 msgstr "美观地打印对象的内容"
2989
2990 -#: builtin/cat-file.c:348
2990 +#: builtin/cat-file.c:330
2991 msgid "for blob objects, run textconv on object's content"
2992 msgstr "对于数据（blob）对象，对其内容执行 textconv"
2993
2994 -#: builtin/cat-file.c:350
2994 +#: builtin/cat-file.c:332
2995 msgid "show info and content of objects fed from the standard input"
2996 msgstr "显示从标准输入提供的对象的信息和内容"
2997
2998 -#: builtin/cat-file.c:353
2998 +#: builtin/cat-file.c:335
2999 msgid "show info about objects fed from the standard input"
3000 msgstr "显示从标准输入提供的对象的信息"
3001
@@ -3473,35 +3473,35 @@ msgstr ""
3473 "* - 选择所有选项\n"
3474 " - （空）结束选择"
3475
3476 -#: builtin/clean.c:491
3476 +#: builtin/clean.c:515
3477 #, c-format
3478 msgid "Huh (%s)?"
3479 msgstr "嗯（%s）？"
3480
3481 -#: builtin/clean.c:634
3481 +#: builtin/clean.c:658
3482 #, c-format
3483 msgid "Input ignore patterns>> "
3484 msgstr "输入模版以排除条目>> "
3485
3486 -#: builtin/clean.c:671
3486 +#: builtin/clean.c:695
3487 #, c-format
3488 msgid "WARNING: Cannot find items matched by: %s"
3489 msgstr "警告：无法找到和 %s 匹配的条目"
3490
3491 -#: builtin/clean.c:692
3491 +#: builtin/clean.c:716
3492 msgid "Select items to delete"
3493 msgstr "选择要删除的条目"
3494
3495 -#: builtin/clean.c:732
3495 +#: builtin/clean.c:756
3496 #, c-format
3497 msgid "remove %s? "
3498 msgstr "删除 %s？"
3499
3500 -#: builtin/clean.c:757
3500 +#: builtin/clean.c:781
3501 msgid "Bye."
3502 msgstr "再见。"
3503
3504 -#: builtin/clean.c:765
3504 +#: builtin/clean.c:789
3505 msgid ""
3506 "clean - start cleaning\n"
3507 "filter by pattern - exclude items from deletion\n"
@@ -3519,69 +3519,69 @@ msgstr ""
3519 "help - 显示本帮助\n"
3520 "? - 显示如何在提示符下选择的帮助"
3521
3522 -#: builtin/clean.c:792
3522 +#: builtin/clean.c:816
3523 msgid "*** Commands ***"
3524 msgstr "*** 命令 ***"
3525
3526 -#: builtin/clean.c:793
3526 +#: builtin/clean.c:817
3527 msgid "What now"
3528 msgstr "请选择"
3529
3530 -#: builtin/clean.c:801
3530 +#: builtin/clean.c:825
3531 msgid "Would remove the following item:"
3532 msgid_plural "Would remove the following items:"
3533 msgstr[0] "将删除如下条目："
3534 msgstr[1] "将删除如下条目："
3535
3536 -#: builtin/clean.c:818
3536 +#: builtin/clean.c:842
3537 msgid "No more files to clean, exiting."
3538 msgstr "没有要清理的文件，退出。"
3539
3540 -#: builtin/clean.c:850
3540 +#: builtin/clean.c:874
3541 msgid "do not print names of files removed"
3542 msgstr "不打印删除文件的名称"
3543
3544 -#: builtin/clean.c:852
3544 +#: builtin/clean.c:876
3545 msgid "force"
3546 msgstr "强制"
3547
3548 -#: builtin/clean.c:853
3548 +#: builtin/clean.c:877
3549 msgid "interactive cleaning"
3550 msgstr "交互式清除"
3551
3552 -#: builtin/clean.c:855
3552 +#: builtin/clean.c:879
3553 msgid "remove whole directories"
3554 msgstr "删除整个目录"
3555
3556 -#: builtin/clean.c:856 builtin/describe.c:420 builtin/grep.c:716
3556 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
3557 #: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
3558 msgid "pattern"
3559 msgstr "模式"
3560
3561 -#: builtin/clean.c:857
3561 +#: builtin/clean.c:881
3562 msgid "add <pattern> to ignore rules"
3563 msgstr "添加<模式>到忽略规则"
3564
3565 -#: builtin/clean.c:858
3565 +#: builtin/clean.c:882
3566 msgid "remove ignored files, too"
3567 msgstr "也删除忽略的文件"
3568
3569 -#: builtin/clean.c:860
3569 +#: builtin/clean.c:884
3570 msgid "remove only ignored files"
3571 msgstr "只删除忽略的文件"
3572
3573 -#: builtin/clean.c:878
3573 +#: builtin/clean.c:902
3574 msgid "-x and -X cannot be used together"
3575 msgstr "-x 和 -X 不能同时使用"
3576
3577 -#: builtin/clean.c:882
3577 +#: builtin/clean.c:906
3578 msgid ""
3579 "clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3580 "clean"
3581 msgstr ""
3582 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
3583
3584 -#: builtin/clean.c:885
3584 +#: builtin/clean.c:909
3585 msgid ""
3586 "clean.requireForce defaults to true and neither -i, -n nor -f given; "
3587 "refusing to clean"
@@ -3911,102 +3911,120 @@ msgid ""
3911 "\n"
3912 " git commit --allow-empty\n"
3913 "\n"
3914 -"Otherwise, please use 'git reset'\n"
3914 msgstr ""
3915 "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n"
3916 "也要提交，使用命令：\n"
3917 "\n"
3918 " git commit --allow-empty\n"
3919 "\n"
3921 -"否则，请使用命令 'git reset'\n"
3920
3923 -#: builtin/commit.c:265
3921 +#: builtin/commit.c:69
3922 +msgid "Otherwise, please use 'git reset'\n"
3923 +msgstr "否则，请使用命令 'git reset'\n"
3924 +
3925 +#: builtin/commit.c:72
3926 +msgid ""
3927 +"If you wish to skip this commit, use:\n"
3928 +"\n"
3929 +" git reset\n"
3930 +"\n"
3931 +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3932 +"the remaining commits.\n"
3933 +msgstr ""
3934 +"如果您想跳过这个提交，使用命令：\n"
3935 +"\n"
3936 +" git reset\n"
3937 +"\n"
3938 +"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
3939 +"操作。\n"
3940 +
3941 +#: builtin/commit.c:279
3942 msgid "failed to unpack HEAD tree object"
3943 msgstr "无法解包 HEAD 树对象"
3944
3927 -#: builtin/commit.c:307
3945 +#: builtin/commit.c:321
3946 msgid "unable to create temporary index"
3947 msgstr "不能创建临时索引"
3948
3931 -#: builtin/commit.c:313
3949 +#: builtin/commit.c:327
3950 msgid "interactive add failed"
3951 msgstr "交互式添加失败"
3952
3935 -#: builtin/commit.c:346 builtin/commit.c:367 builtin/commit.c:417
3953 +#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
3954 msgid "unable to write new_index file"
3955 msgstr "无法写 new_index 文件"
3956
3939 -#: builtin/commit.c:398
3957 +#: builtin/commit.c:412
3958 msgid "cannot do a partial commit during a merge."
3959 msgstr "在合并过程中不能做部分提交。"
3960
3943 -#: builtin/commit.c:400
3961 +#: builtin/commit.c:414
3962 msgid "cannot do a partial commit during a cherry-pick."
3963 msgstr "在拣选过程中不能做部分提交。"
3964
3947 -#: builtin/commit.c:410
3965 +#: builtin/commit.c:424
3966 msgid "cannot read the index"
3967 msgstr "无法读取索引"
3968
3951 -#: builtin/commit.c:430
3969 +#: builtin/commit.c:444
3970 msgid "unable to write temporary index file"
3971 msgstr "无法写临时索引文件"
3972
3955 -#: builtin/commit.c:521 builtin/commit.c:527
3973 +#: builtin/commit.c:535 builtin/commit.c:541
3974 #, c-format
3975 msgid "invalid commit: %s"
3976 msgstr "无效的提交：%s"
3977
3960 -#: builtin/commit.c:549
3978 +#: builtin/commit.c:563
3979 msgid "malformed --author parameter"
3980 msgstr "非法的 --author 参数"
3981
3964 -#: builtin/commit.c:569
3982 +#: builtin/commit.c:583
3983 #, c-format
3984 msgid "Malformed ident string: '%s'"
3985 msgstr "非法的身份字符串：'%s'"
3986
3969 -#: builtin/commit.c:607 builtin/commit.c:640 builtin/commit.c:963
3987 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
3988 #, c-format
3989 msgid "could not lookup commit %s"
3990 msgstr "不能查询提交 %s"
3991
3974 -#: builtin/commit.c:619 builtin/shortlog.c:271
3992 +#: builtin/commit.c:633 builtin/shortlog.c:271
3993 #, c-format
3994 msgid "(reading log message from standard input)\n"
3995 msgstr "（正从标准输入中读取日志信息）\n"
3996
3979 -#: builtin/commit.c:621
3997 +#: builtin/commit.c:635
3998 msgid "could not read log from standard input"
3999 msgstr "不能从标准输入中读取日志信息"
4000
3983 -#: builtin/commit.c:625
4001 +#: builtin/commit.c:639
4002 #, c-format
4003 msgid "could not read log file '%s'"
4004 msgstr "不能读取日志文件 '%s'"
4005
3988 -#: builtin/commit.c:631
4006 +#: builtin/commit.c:645
4007 msgid "commit has empty message"
4008 msgstr "提交说明为空"
4009
3992 -#: builtin/commit.c:647
4010 +#: builtin/commit.c:661
4011 msgid "could not read MERGE_MSG"
4012 msgstr "不能读取 MERGE_MSG"
4013
3996 -#: builtin/commit.c:651
4014 +#: builtin/commit.c:665
4015 msgid "could not read SQUASH_MSG"
4016 msgstr "不能读取 SQUASH_MSG"
4017
4000 -#: builtin/commit.c:655
4018 +#: builtin/commit.c:669
4019 #, c-format
4020 msgid "could not read '%s'"
4021 msgstr "不能读取 '%s'"
4022
4005 -#: builtin/commit.c:716
4023 +#: builtin/commit.c:730
4024 msgid "could not write commit template"
4025 msgstr "不能写提交模版"
4026
4009 -#: builtin/commit.c:727
4027 +#: builtin/commit.c:741
4028 #, c-format
4029 msgid ""
4030 "\n"
@@ -4020,7 +4038,7 @@ msgstr ""
4038 "\t%s\n"
4039 "然后重试。\n"
4040
4023 -#: builtin/commit.c:732
4041 +#: builtin/commit.c:746
4042 #, c-format
4043 msgid ""
4044 "\n"
@@ -4034,7 +4052,7 @@ msgstr ""
4052 "\t%s\n"
4053 "然后重试。\n"
4054
4037 -#: builtin/commit.c:744
4055 +#: builtin/commit.c:758
4056 #, c-format
4057 msgid ""
4058 "Please enter the commit message for your changes. Lines starting\n"
@@ -4043,7 +4061,7 @@ msgstr ""
4061 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
4062 "说明将会终止提交。\n"
4063
4046 -#: builtin/commit.c:749
4064 +#: builtin/commit.c:763
4065 #, c-format
4066 msgid ""
4067 "Please enter the commit message for your changes. Lines starting\n"
@@ -4054,355 +4072,355 @@ msgstr ""
4072 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4073
4074 # 译者：为保证在输出中对齐，注意调整句中空格！
4057 -#: builtin/commit.c:762
4075 +#: builtin/commit.c:776
4076 #, c-format
4077 msgid "%sAuthor: %s"
4078 msgstr "%s作者： %s"
4079
4080 # 译者：为保证在输出中对齐，注意调整句中空格！
4063 -#: builtin/commit.c:769
4081 +#: builtin/commit.c:783
4082 #, c-format
4083 msgid "%sCommitter: %s"
4084 msgstr "%s提交者： %s"
4085
4068 -#: builtin/commit.c:789
4086 +#: builtin/commit.c:803
4087 msgid "Cannot read index"
4088 msgstr "无法读取索引"
4089
4072 -#: builtin/commit.c:826
4090 +#: builtin/commit.c:845
4091 msgid "Error building trees"
4092 msgstr "无法创建树对象"
4093
4076 -#: builtin/commit.c:841 builtin/tag.c:359
4094 +#: builtin/commit.c:860 builtin/tag.c:359
4095 #, c-format
4096 msgid "Please supply the message using either -m or -F option.\n"
4097 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4098
4081 -#: builtin/commit.c:938
4099 +#: builtin/commit.c:957
4100 #, c-format
4101 msgid "No existing author found with '%s'"
4102 msgstr "没有找到匹配 '%s' 的作者"
4103
4086 -#: builtin/commit.c:953 builtin/commit.c:1189
4104 +#: builtin/commit.c:972 builtin/commit.c:1208
4105 #, c-format
4106 msgid "Invalid untracked files mode '%s'"
4107 msgstr "无效的未追踪文件参数 '%s'"
4108
4091 -#: builtin/commit.c:990
4109 +#: builtin/commit.c:1009
4110 msgid "--long and -z are incompatible"
4111 msgstr "--long 和 -z 选项不兼容"
4112
4095 -#: builtin/commit.c:1020
4113 +#: builtin/commit.c:1039
4114 msgid "Using both --reset-author and --author does not make sense"
4115 msgstr "同时使用 --reset-author 和 --author 没有意义"
4116
4099 -#: builtin/commit.c:1031
4117 +#: builtin/commit.c:1050
4118 msgid "You have nothing to amend."
4119 msgstr "您没有可修补的提交。"
4120
4103 -#: builtin/commit.c:1034
4121 +#: builtin/commit.c:1053
4122 msgid "You are in the middle of a merge -- cannot amend."
4123 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4124
4107 -#: builtin/commit.c:1036
4125 +#: builtin/commit.c:1055
4126 msgid "You are in the middle of a cherry-pick -- cannot amend."
4127 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4128
4111 -#: builtin/commit.c:1039
4129 +#: builtin/commit.c:1058
4130 msgid "Options --squash and --fixup cannot be used together"
4131 msgstr "选项 --squash 和 --fixup 不能同时使用"
4132
4115 -#: builtin/commit.c:1049
4133 +#: builtin/commit.c:1068
4134 msgid "Only one of -c/-C/-F/--fixup can be used."
4135 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4136
4119 -#: builtin/commit.c:1051
4137 +#: builtin/commit.c:1070
4138 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4139 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4140
4123 -#: builtin/commit.c:1059
4141 +#: builtin/commit.c:1078
4142 msgid "--reset-author can be used only with -C, -c or --amend."
4143 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4144
4127 -#: builtin/commit.c:1076
4145 +#: builtin/commit.c:1095
4146 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4147 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4148
4131 -#: builtin/commit.c:1078
4149 +#: builtin/commit.c:1097
4150 msgid "No paths with --include/--only does not make sense."
4151 msgstr "参数 --include/--only 不跟路径没有意义。"
4152
4135 -#: builtin/commit.c:1080
4153 +#: builtin/commit.c:1099
4154 msgid "Clever... amending the last one with dirty index."
4155 msgstr "聪明... 在索引不干净下修补最后的提交。"
4156
4139 -#: builtin/commit.c:1082
4157 +#: builtin/commit.c:1101
4158 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
4159 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
4160
4143 -#: builtin/commit.c:1092 builtin/tag.c:575
4161 +#: builtin/commit.c:1111 builtin/tag.c:575
4162 #, c-format
4163 msgid "Invalid cleanup mode %s"
4164 msgstr "无效的清理模式 %s"
4165
4148 -#: builtin/commit.c:1097
4166 +#: builtin/commit.c:1116
4167 msgid "Paths with -a does not make sense."
4168 msgstr "路径和 -a 选项同时使用没有意义。"
4169
4152 -#: builtin/commit.c:1203 builtin/commit.c:1436
4170 +#: builtin/commit.c:1222 builtin/commit.c:1455
4171 msgid "show status concisely"
4172 msgstr "以简洁的格式显示状态"
4173
4156 -#: builtin/commit.c:1205 builtin/commit.c:1438
4174 +#: builtin/commit.c:1224 builtin/commit.c:1457
4175 msgid "show branch information"
4176 msgstr "显示分支信息"
4177
4160 -#: builtin/commit.c:1207 builtin/commit.c:1440 builtin/push.c:452
4178 +#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
4179 msgid "machine-readable output"
4180 msgstr "机器可读的输出"
4181
4164 -#: builtin/commit.c:1210 builtin/commit.c:1442
4182 +#: builtin/commit.c:1229 builtin/commit.c:1461
4183 msgid "show status in long format (default)"
4184 msgstr "以长格式显示状态（默认）"
4185
4168 -#: builtin/commit.c:1213 builtin/commit.c:1445
4186 +#: builtin/commit.c:1232 builtin/commit.c:1464
4187 msgid "terminate entries with NUL"
4188 msgstr "条目以NUL字符结尾"
4189
4172 -#: builtin/commit.c:1215 builtin/commit.c:1448 builtin/fast-export.c:667
4190 +#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
4191 #: builtin/fast-export.c:670 builtin/tag.c:459
4192 msgid "mode"
4193 msgstr "模式"
4194
4177 -#: builtin/commit.c:1216 builtin/commit.c:1448
4195 +#: builtin/commit.c:1235 builtin/commit.c:1467
4196 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4197 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
4198
4181 -#: builtin/commit.c:1219
4199 +#: builtin/commit.c:1238
4200 msgid "show ignored files"
4201 msgstr "显示忽略的文件"
4202
4185 -#: builtin/commit.c:1220 parse-options.h:154
4203 +#: builtin/commit.c:1239 parse-options.h:154
4204 msgid "when"
4205 msgstr "何时"
4206
4189 -#: builtin/commit.c:1221
4207 +#: builtin/commit.c:1240
4208 msgid ""
4209 "ignore changes to submodules, optional when: all, dirty, untracked. "
4210 "(Default: all)"
4211 msgstr ""
4212 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
4213
4196 -#: builtin/commit.c:1223
4214 +#: builtin/commit.c:1242
4215 msgid "list untracked files in columns"
4216 msgstr "以列的方式显示未跟踪的文件"
4217
4200 -#: builtin/commit.c:1294
4218 +#: builtin/commit.c:1313
4219 msgid "couldn't look up newly created commit"
4220 msgstr "无法找到新创建的提交"
4221
4204 -#: builtin/commit.c:1296
4222 +#: builtin/commit.c:1315
4223 msgid "could not parse newly created commit"
4224 msgstr "不能解析新创建的提交"
4225
4208 -#: builtin/commit.c:1337
4226 +#: builtin/commit.c:1356
4227 msgid "detached HEAD"
4228 msgstr "分离头指针"
4229
4230 # 译者：中文字符串拼接，可删除前导空格
4213 -#: builtin/commit.c:1339
4231 +#: builtin/commit.c:1358
4232 msgid " (root-commit)"
4233 msgstr "（根提交）"
4234
4217 -#: builtin/commit.c:1406
4235 +#: builtin/commit.c:1425
4236 msgid "suppress summary after successful commit"
4237 msgstr "提交成功后不显示概述信息"
4238
4221 -#: builtin/commit.c:1407
4239 +#: builtin/commit.c:1426
4240 msgid "show diff in commit message template"
4241 msgstr "在提交说明模板里显示差异"
4242
4225 -#: builtin/commit.c:1409
4243 +#: builtin/commit.c:1428
4244 msgid "Commit message options"
4245 msgstr "提交说明选项"
4246
4229 -#: builtin/commit.c:1410 builtin/tag.c:457
4247 +#: builtin/commit.c:1429 builtin/tag.c:457
4248 msgid "read message from file"
4249 msgstr "从文件中读取提交说明"
4250
4233 -#: builtin/commit.c:1411
4251 +#: builtin/commit.c:1430
4252 msgid "author"
4253 msgstr "作者"
4254
4237 -#: builtin/commit.c:1411
4255 +#: builtin/commit.c:1430
4256 msgid "override author for commit"
4257 msgstr "提交时覆盖作者"
4258
4241 -#: builtin/commit.c:1412 builtin/gc.c:178
4259 +#: builtin/commit.c:1431 builtin/gc.c:178
4260 msgid "date"
4261 msgstr "日期"
4262
4245 -#: builtin/commit.c:1412
4263 +#: builtin/commit.c:1431
4264 msgid "override date for commit"
4265 msgstr "提交时覆盖日期"
4266
4249 -#: builtin/commit.c:1413 builtin/merge.c:223 builtin/notes.c:405
4267 +#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
4268 #: builtin/notes.c:562 builtin/tag.c:455
4269 msgid "message"
4270 msgstr "说明"
4271
4254 -#: builtin/commit.c:1413
4272 +#: builtin/commit.c:1432
4273 msgid "commit message"
4274 msgstr "提交说明"
4275
4258 -#: builtin/commit.c:1414
4276 +#: builtin/commit.c:1433
4277 msgid "reuse and edit message from specified commit"
4278 msgstr "重用并编辑指定提交的提交说明"
4279
4262 -#: builtin/commit.c:1415
4280 +#: builtin/commit.c:1434
4281 msgid "reuse message from specified commit"
4282 msgstr "重用指定提交的提交说明"
4283
4266 -#: builtin/commit.c:1416
4284 +#: builtin/commit.c:1435
4285 msgid "use autosquash formatted message to fixup specified commit"
4286 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4287
4270 -#: builtin/commit.c:1417
4288 +#: builtin/commit.c:1436
4289 msgid "use autosquash formatted message to squash specified commit"
4290 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4291
4274 -#: builtin/commit.c:1418
4292 +#: builtin/commit.c:1437
4293 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4294 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
4295
4278 -#: builtin/commit.c:1419 builtin/log.c:1160 builtin/revert.c:111
4296 +#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
4297 msgid "add Signed-off-by:"
4298 msgstr "添加 Signed-off-by: 签名"
4299
4282 -#: builtin/commit.c:1420
4300 +#: builtin/commit.c:1439
4301 msgid "use specified template file"
4302 msgstr "使用指定的模板文件"
4303
4286 -#: builtin/commit.c:1421
4304 +#: builtin/commit.c:1440
4305 msgid "force edit of commit"
4306 msgstr "强制编辑提交"
4307
4308 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
4291 -#: builtin/commit.c:1422
4309 +#: builtin/commit.c:1441
4310 msgid "default"
4311 msgstr "default"
4312
4295 -#: builtin/commit.c:1422 builtin/tag.c:460
4313 +#: builtin/commit.c:1441 builtin/tag.c:460
4314 msgid "how to strip spaces and #comments from message"
4315 msgstr "设置如何删除提交说明里的空格和#注释"
4316
4299 -#: builtin/commit.c:1423
4317 +#: builtin/commit.c:1442
4318 msgid "include status in commit message template"
4319 msgstr "在提交说明模板里包含状态信息"
4320
4303 -#: builtin/commit.c:1424 builtin/merge.c:230 builtin/tag.c:461
4321 +#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
4322 msgid "key id"
4323 msgstr "key id"
4324
4307 -#: builtin/commit.c:1425 builtin/merge.c:231
4325 +#: builtin/commit.c:1444 builtin/merge.c:231
4326 msgid "GPG sign commit"
4327 msgstr "GPG 提交签名"
4328
4329 #. end commit message options
4312 -#: builtin/commit.c:1428
4330 +#: builtin/commit.c:1447
4331 msgid "Commit contents options"
4332 msgstr "提交内容选项"
4333
4316 -#: builtin/commit.c:1429
4334 +#: builtin/commit.c:1448
4335 msgid "commit all changed files"
4336 msgstr "提交所有改动的文件"
4337
4320 -#: builtin/commit.c:1430
4338 +#: builtin/commit.c:1449
4339 msgid "add specified files to index for commit"
4340 msgstr "添加指定的文件到索引区等待提交"
4341
4324 -#: builtin/commit.c:1431
4342 +#: builtin/commit.c:1450
4343 msgid "interactively add files"
4344 msgstr "交互式添加文件"
4345
4328 -#: builtin/commit.c:1432
4346 +#: builtin/commit.c:1451
4347 msgid "interactively add changes"
4348 msgstr "交互式添加变更"
4349
4332 -#: builtin/commit.c:1433
4350 +#: builtin/commit.c:1452
4351 msgid "commit only specified files"
4352 msgstr "只提交指定的文件"
4353
4336 -#: builtin/commit.c:1434
4354 +#: builtin/commit.c:1453
4355 msgid "bypass pre-commit hook"
4356 msgstr "绕过 pre-commit 钩子"
4357
4340 -#: builtin/commit.c:1435
4358 +#: builtin/commit.c:1454
4359 msgid "show what would be committed"
4360 msgstr "显示将要提交的内容"
4361
4344 -#: builtin/commit.c:1446
4362 +#: builtin/commit.c:1465
4363 msgid "amend previous commit"
4364 msgstr "修改先前的提交"
4365
4348 -#: builtin/commit.c:1447
4366 +#: builtin/commit.c:1466
4367 msgid "bypass post-rewrite hook"
4368 msgstr "绕过 post-rewrite 钩子"
4369
4352 -#: builtin/commit.c:1452
4370 +#: builtin/commit.c:1471
4371 msgid "ok to record an empty change"
4372 msgstr "允许一个空提交"
4373
4356 -#: builtin/commit.c:1455
4374 +#: builtin/commit.c:1474
4375 msgid "ok to record a change with an empty message"
4376 msgstr "允许空的提交说明"
4377
4360 -#: builtin/commit.c:1488
4378 +#: builtin/commit.c:1507
4379 msgid "could not parse HEAD commit"
4380 msgstr "不能解析 HEAD 提交"
4381
4364 -#: builtin/commit.c:1526 builtin/merge.c:525
4382 +#: builtin/commit.c:1545 builtin/merge.c:525
4383 #, c-format
4384 msgid "could not open '%s' for reading"
4385 msgstr "不能为读入打开 '%s'"
4386
4369 -#: builtin/commit.c:1533
4387 +#: builtin/commit.c:1552
4388 #, c-format
4389 msgid "Corrupt MERGE_HEAD file (%s)"
4390 msgstr "损坏的 MERGE_HEAD 文件（%s）"
4391
4374 -#: builtin/commit.c:1540
4392 +#: builtin/commit.c:1559
4393 msgid "could not read MERGE_MODE"
4394 msgstr "不能读取 MERGE_MODE"
4395
4378 -#: builtin/commit.c:1559
4396 +#: builtin/commit.c:1578
4397 #, c-format
4398 msgid "could not read commit message: %s"
4399 msgstr "不能读取提交说明：%s"
4400
4383 -#: builtin/commit.c:1573
4401 +#: builtin/commit.c:1592
4402 #, c-format
4403 msgid "Aborting commit; you did not edit the message.\n"
4404 msgstr "终止提交；您未更改来自模版的提交说明。\n"
4405
4388 -#: builtin/commit.c:1578
4406 +#: builtin/commit.c:1597
4407 #, c-format
4408 msgid "Aborting commit due to empty commit message.\n"
4409 msgstr "终止提交因为提交说明为空。\n"
4410
4393 -#: builtin/commit.c:1593 builtin/merge.c:861 builtin/merge.c:886
4411 +#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
4412 msgid "failed to write commit object"
4413 msgstr "无法写提交对象"
4414
4397 -#: builtin/commit.c:1614
4415 +#: builtin/commit.c:1633
4416 msgid "cannot lock HEAD ref"
4417 msgstr "无法锁定 HEAD 引用"
4418
4401 -#: builtin/commit.c:1618
4419 +#: builtin/commit.c:1637
4420 msgid "cannot update HEAD ref"
4421 msgstr "无法更新 HEAD 引用"
4422
4405 -#: builtin/commit.c:1629
4423 +#: builtin/commit.c:1648
4424 msgid ""
4425 "Repository has been updated, but unable to write\n"
4426 "new_index file. Check that disk is not full or quota is\n"
@@ -9722,7 +9740,7 @@ msgstr "无法保存 $stash_sha1"
9740 msgid ""
9741 "Applying autostash resulted in conflicts.\n"
9742 "Your changes are safe in the stash.\n"
9725 -"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
9743 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
9744 msgstr ""
9745 "应用 autostash 导致冲突。\n"
9746 "您的修改安全地保存在 stash 中。\n"