@matheusbsbs / matheus-bagliano / commits / 23ff333803

l10n: zh_CN.po: translate 4 new messages

Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jul 31, 2012 at 06:45 UTC 23ff3338034f0f9086f80c02458306f74eab4e0f
1 file changed +776 -483
po/zh_CN.po
+776 -483
@@ -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-03 10:23+0800\n"
16 -"PO-Revision-Date: 2012-07-04 22:38+0800\n"
15 +"POT-Creation-Date: 2012-07-30 09:18+0800\n"
16 +"PO-Revision-Date: 2012-07-31 06:31+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"
@@ -52,7 +52,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
52 msgid "unrecognized header: %s%s (%d)"
53 msgstr "未能识别的包头：%s%s (%d)"
54
55 -#: bundle.c:89 builtin/commit.c:696
55 +#: bundle.c:89 builtin/commit.c:699
56 #, c-format
57 msgid "could not open '%s'"
58 msgstr "不能打开 '%s'"
@@ -62,7 +62,7 @@ msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交："
63
64 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
65 -#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347
65 +#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
68 msgstr "版本遍历设置失败"
@@ -89,7 +89,7 @@ msgstr[1] "这个包需要 %d 个这些引用"
89 msgid "rev-list died"
90 msgstr "rev-list 终止"
91
92 -#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
92 +#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
93 #, c-format
94 msgid "unrecognized argument: %s"
95 msgstr "未能识别的参数：%s"
@@ -261,7 +261,7 @@ msgid_plural ", %d deletions(-)"
261 msgstr[0] "，删除 %d 行(-)"
262 msgstr[1] "，删除 %d 行(-)"
263
264 -#: diff.c:3478
264 +#: diff.c:3461
265 #, c-format
266 msgid ""
267 "Failed to parse --dirstat/-X option parameter:\n"
@@ -297,16 +297,16 @@ msgstr "'%s'：%s"
297 msgid "'%s': short read %s"
298 msgstr "'%s'：读取不完整 %s"
299
300 -#: help.c:208
300 +#: help.c:212
301 #, c-format
302 msgid "available git commands in '%s'"
303 msgstr "在 '%s' 下可用的 git 命令"
304
305 -#: help.c:215
305 +#: help.c:219
306 msgid "git commands available from elsewhere on your $PATH"
307 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
308
309 -#: help.c:271
309 +#: help.c:275
310 #, c-format
311 msgid ""
312 "'%s' appears to be a git command, but we were not\n"
@@ -315,11 +315,11 @@ msgstr ""
315 "'%s' 像是一个 git 命令，但却无法运行。\n"
316 "可能是 git-%s 受损？"
317
318 -#: help.c:328
318 +#: help.c:332
319 msgid "Uh oh. Your system reports no Git commands at all."
320 msgstr "唉呀，您的系统中未发现 Git 命令。"
321
322 -#: help.c:350
322 +#: help.c:354
323 #, c-format
324 msgid ""
325 "WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -328,17 +328,17 @@ msgstr ""
328 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
329 "是 '%s'"
330
331 -#: help.c:355
331 +#: help.c:359
332 #, c-format
333 msgid "in %0.1f seconds automatically..."
334 msgstr "在 %0.1f 秒钟后自动运行..."
335
336 -#: help.c:362
336 +#: help.c:366
337 #, c-format
338 msgid "git: '%s' is not a git command. See 'git --help'."
339 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
340
341 -#: help.c:366
341 +#: help.c:370
342 msgid ""
343 "\n"
344 "Did you mean this?"
@@ -352,36 +352,36 @@ msgstr[1] ""
352 "\n"
353 "您指的是这些其中一个么？"
354
355 -#: parse-options.c:493
355 +#: parse-options.c:494
356 msgid "..."
357 msgstr "..."
358
359 -#: parse-options.c:511
359 +#: parse-options.c:512
360 #, c-format
361 msgid "usage: %s"
362 msgstr "用法：%s"
363
364 #. TRANSLATORS: the colon here should align with the
365 #. one in "usage: %s" translation
366 -#: parse-options.c:515
366 +#: parse-options.c:516
367 #, c-format
368 msgid " or: %s"
369 msgstr " 或：%s"
370
371 # 译者：为保证在输出中对齐，注意调整句中空格！
372 -#: parse-options.c:518
372 +#: parse-options.c:519
373 #, c-format
374 msgid " %s"
375 msgstr " %s"
376
377 -#: remote.c:1629
377 +#: remote.c:1632
378 #, c-format
379 msgid "Your branch is ahead of '%s' by %d commit.\n"
380 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
381 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
382 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
383
384 -#: remote.c:1635
384 +#: remote.c:1638
385 #, c-format
386 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
387 msgid_plural ""
@@ -389,7 +389,7 @@ msgid_plural ""
389 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
390 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
391
392 -#: remote.c:1643
392 +#: remote.c:1646
393 #, c-format
394 msgid ""
395 "Your branch and '%s' have diverged,\n"
@@ -612,7 +612,7 @@ msgstr "不能解析 HEAD"
612 msgid "cannot abort from a branch yet to be born"
613 msgstr "不能从尚未建立的分支终止"
614
615 -#: sequencer.c:805 builtin/apply.c:3697
615 +#: sequencer.c:805 builtin/apply.c:3988
616 #, c-format
617 msgid "cannot open %s: %s"
618 msgstr "不能打开 %s：%s"
@@ -644,21 +644,21 @@ msgstr "不能作为初始提交还原"
644 msgid "Can't cherry-pick into empty head"
645 msgstr "不能拣选到空分支"
646
647 -#: sha1_name.c:864
647 +#: sha1_name.c:1044
648 msgid "HEAD does not point to a branch"
649 msgstr "HEAD 没有指向一个分支"
650
651 -#: sha1_name.c:867
651 +#: sha1_name.c:1047
652 #, c-format
653 msgid "No such branch: '%s'"
654 msgstr "没有此分支：'%s'"
655
656 -#: sha1_name.c:869
656 +#: sha1_name.c:1049
657 #, c-format
658 msgid "No upstream configured for branch '%s'"
659 msgstr "尚未给分支 '%s' 设置上游"
660
661 -#: sha1_name.c:872
661 +#: sha1_name.c:1052
662 #, c-format
663 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
664 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
@@ -672,379 +672,378 @@ msgstr "无法在 passwd 文件中查询到当前用户：%s"
672 msgid "no such user"
673 msgstr "无此用户"
674
675 -#: wt-status.c:141
675 +#: wt-status.c:140
676 msgid "Unmerged paths:"
677 msgstr "未合并的路径："
678
679 # 译者：注意保持前导空格
680 -#: wt-status.c:168 wt-status.c:195
680 +#: wt-status.c:167 wt-status.c:194
681 #, c-format
682 msgid " (use \"git reset %s <file>...\" to unstage)"
683 msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
684
685 # 译者：注意保持前导空格
686 -#: wt-status.c:170 wt-status.c:197
686 +#: wt-status.c:169 wt-status.c:196
687 msgid " (use \"git rm --cached <file>...\" to unstage)"
688 msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
689
690 # 译者：注意保持前导空格
691 -#: wt-status.c:174
691 +#: wt-status.c:173
692 msgid " (use \"git add <file>...\" to mark resolution)"
693 msgstr " （使用 \"git add <file>...\" 标记解决方案）"
694
695 # 译者：注意保持前导空格
696 -#: wt-status.c:176 wt-status.c:180
696 +#: wt-status.c:175 wt-status.c:179
697 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
698 msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
699
700 # 译者：注意保持前导空格
701 -#: wt-status.c:178
701 +#: wt-status.c:177
702 msgid " (use \"git rm <file>...\" to mark resolution)"
703 msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
704
705 -#: wt-status.c:189
705 +#: wt-status.c:188
706 msgid "Changes to be committed:"
707 msgstr "要提交的变更："
708
709 -#: wt-status.c:207
709 +#: wt-status.c:206
710 msgid "Changes not staged for commit:"
711 msgstr "尚未暂存以备提交的变更："
712
713 # 译者：注意保持前导空格
714 -#: wt-status.c:211
714 +#: wt-status.c:210
715 msgid " (use \"git add <file>...\" to update what will be committed)"
716 msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
717
718 # 译者：注意保持前导空格
719 -#: wt-status.c:213
719 +#: wt-status.c:212
720 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
721 msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
722
723 # 译者：注意保持前导空格
724 -#: wt-status.c:214
724 +#: wt-status.c:213
725 msgid ""
726 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
727 msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
728
729 # 译者：注意保持前导空格
730 -#: wt-status.c:216
730 +#: wt-status.c:215
731 msgid " (commit or discard the untracked or modified content in submodules)"
732 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
733
734 -#: wt-status.c:225
734 +#: wt-status.c:224
735 #, c-format
736 msgid "%s files:"
737 msgstr "%s文件："
738
739 # 译者：注意保持前导空格
740 -#: wt-status.c:228
740 +#: wt-status.c:227
741 #, c-format
742 msgid " (use \"git %s <file>...\" to include in what will be committed)"
743 msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
744
745 -#: wt-status.c:245
745 +#: wt-status.c:244
746 msgid "bug"
747 msgstr "bug"
748
749 -#: wt-status.c:250
749 +#: wt-status.c:249
750 msgid "both deleted:"
751 msgstr "双方删除："
752
753 -#: wt-status.c:251
753 +#: wt-status.c:250
754 msgid "added by us:"
755 msgstr "由我们添加："
756
757 -#: wt-status.c:252
757 +#: wt-status.c:251
758 msgid "deleted by them:"
759 msgstr "由他们删除："
760
761 -#: wt-status.c:253
761 +#: wt-status.c:252
762 msgid "added by them:"
763 msgstr "由他们添加："
764
765 -#: wt-status.c:254
765 +#: wt-status.c:253
766 msgid "deleted by us:"
767 msgstr "由我们删除："
768
769 -#: wt-status.c:255
769 +#: wt-status.c:254
770 msgid "both added:"
771 msgstr "双方添加："
772
773 -#: wt-status.c:256
773 +#: wt-status.c:255
774 msgid "both modified:"
775 msgstr "双方修改："
776
777 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
778 -#: wt-status.c:286
778 +#: wt-status.c:285
779 msgid "new commits, "
780 msgstr "新提交, "
781
782 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
783 -#: wt-status.c:288
783 +#: wt-status.c:287
784 msgid "modified content, "
785 msgstr "修改的内容, "
786
787 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
788 -#: wt-status.c:290
788 +#: wt-status.c:289
789 msgid "untracked content, "
790 msgstr "未跟踪的内容, "
791
792 # 译者：为保证在输出中对齐，注意调整句中空格！
793 -#: wt-status.c:304
793 +#: wt-status.c:303
794 #, c-format
795 msgid "new file: %s"
796 msgstr "新文件： %s"
797
798 # 译者：为保证在输出中对齐，注意调整句中空格！
799 -#: wt-status.c:307
799 +#: wt-status.c:306
800 #, c-format
801 msgid "copied: %s -> %s"
802 msgstr "拷贝： %s -> %s"
803
804 # 译者：为保证在输出中对齐，注意调整句中空格！
805 -#: wt-status.c:310
805 +#: wt-status.c:309
806 #, c-format
807 msgid "deleted: %s"
808 msgstr "删除： %s"
809
810 # 译者：为保证在输出中对齐，注意调整句中空格！
811 -#: wt-status.c:313
811 +#: wt-status.c:312
812 #, c-format
813 msgid "modified: %s"
814 msgstr "修改： %s"
815
816 # 译者：为保证在输出中对齐，注意调整句中空格！
817 -#: wt-status.c:316
817 +#: wt-status.c:315
818 #, c-format
819 msgid "renamed: %s -> %s"
820 msgstr "重命名： %s -> %s"
821
822 # 译者：为保证在输出中对齐，注意调整句中空格！
823 -#: wt-status.c:319
823 +#: wt-status.c:318
824 #, c-format
825 msgid "typechange: %s"
826 msgstr "类型变更： %s"
827
828 # 译者：为保证在输出中对齐，注意调整句中空格！
829 -#: wt-status.c:322
829 +#: wt-status.c:321
830 #, c-format
831 msgid "unknown: %s"
832 msgstr "未知： %s"
833
834 # 译者：为保证在输出中对齐，注意调整句中空格！
835 -#: wt-status.c:325
835 +#: wt-status.c:324
836 #, c-format
837 msgid "unmerged: %s"
838 msgstr "未合并： %s"
839
840 -#: wt-status.c:328
840 +#: wt-status.c:327
841 #, c-format
842 msgid "bug: unhandled diff status %c"
843 msgstr "bug：未处理的差异状态 %c"
844
845 -#: wt-status.c:786
845 +#: wt-status.c:785
846 msgid "You have unmerged paths."
847 msgstr "您有路径尚未合并。"
848
849 # 译者：注意保持前导空格
850 -#: wt-status.c:789 wt-status.c:913
850 +#: wt-status.c:788 wt-status.c:912
851 msgid " (fix conflicts and run \"git commit\")"
852 msgstr " （解决冲突并运行 \"git commit\"）"
853
854 -#: wt-status.c:792
854 +#: wt-status.c:791
855 msgid "All conflicts fixed but you are still merging."
856 msgstr "所有冲突已解决但您仍处于合并中。"
857
858 # 译者：注意保持前导空格
859 -#: wt-status.c:795
859 +#: wt-status.c:794
860 msgid " (use \"git commit\" to conclude merge)"
861 msgstr " （使用 \"git commit\" 结束合并）"
862
863 -#: wt-status.c:805
863 +#: wt-status.c:804
864 msgid "You are in the middle of an am session."
865 msgstr "您正处于一个 am 过程中。"
866
867 -#: wt-status.c:808
867 +#: wt-status.c:807
868 msgid "The current patch is empty."
869 msgstr "当前的补丁为空。"
870
871 # 译者：注意保持前导空格
872 -#: wt-status.c:812
872 +#: wt-status.c:811
873 msgid " (fix conflicts and then run \"git am --resolved\")"
874 msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
875
876 # 译者：注意保持前导空格
877 -#: wt-status.c:814
877 +#: wt-status.c:813
878 msgid " (use \"git am --skip\" to skip this patch)"
879 msgstr " （使用 \"git am --skip\" 跳过此补丁）"
880
881 # 译者：注意保持前导空格
882 -#: wt-status.c:816
882 +#: wt-status.c:815
883 msgid " (use \"git am --abort\" to restore the original branch)"
884 msgstr " （使用 \"git am --abort\" 恢复原有分支）"
885
886 -#: wt-status.c:874 wt-status.c:884
886 +#: wt-status.c:873 wt-status.c:883
887 msgid "You are currently rebasing."
888 msgstr "您正在变基。"
889
890 # 译者：注意保持前导空格
891 -#: wt-status.c:877
891 +#: wt-status.c:876
892 msgid " (fix conflicts and then run \"git rebase --continue\")"
893 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
894
895 # 译者：注意保持前导空格
896 -#: wt-status.c:879
896 +#: wt-status.c:878
897 msgid " (use \"git rebase --skip\" to skip this patch)"
898 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
899
900 # 译者：注意保持前导空格
901 -#: wt-status.c:881
901 +#: wt-status.c:880
902 msgid " (use \"git rebase --abort\" to check out the original branch)"
903 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
904
905 # 译者：注意保持前导空格
906 -#: wt-status.c:887
906 +#: wt-status.c:886
907 msgid " (all conflicts fixed: run \"git rebase --continue\")"
908 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
909
910 -#: wt-status.c:889
910 +#: wt-status.c:888
911 msgid "You are currently splitting a commit during a rebase."
912 msgstr "您正在变基过程中拆分一个提交。"
913
914 # 译者：注意保持前导空格
915 -#: wt-status.c:892
915 +#: wt-status.c:891
916 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
917 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
918
919 -#: wt-status.c:894
919 +#: wt-status.c:893
920 msgid "You are currently editing a commit during a rebase."
921 msgstr "您正在变基过程中编辑一个提交。"
922
923 # 译者：注意保持前导空格
924 -#: wt-status.c:897
924 +#: wt-status.c:896
925 msgid " (use \"git commit --amend\" to amend the current commit)"
926 msgstr " （使用 \"git commit --amend\" 修补当前提交）"
927
928 # 译者：注意保持前导空格
929 -#: wt-status.c:899
929 +#: wt-status.c:898
930 msgid ""
931 " (use \"git rebase --continue\" once you are satisfied with your changes)"
932 -msgstr ""
933 -" （执行 \"git rebase --continue\" 一旦您满意您的修改）"
932 +msgstr " （执行 \"git rebase --continue\" 一旦您满意您的修改）"
933
935 -#: wt-status.c:909
934 +#: wt-status.c:908
935 msgid "You are currently cherry-picking."
936 msgstr "您正在做拣选操作。"
937
938 # 译者：注意保持前导空格
940 -#: wt-status.c:916
939 +#: wt-status.c:915
940 msgid " (all conflicts fixed: run \"git commit\")"
941 msgstr " （解决所有冲突后，执行 \"git commit\"）"
942
944 -#: wt-status.c:925
943 +#: wt-status.c:924
944 msgid "You are currently bisecting."
945 msgstr "您正在做二分查找。"
946
947 # 译者：注意保持前导空格
949 -#: wt-status.c:928
948 +#: wt-status.c:927
949 msgid " (use \"git bisect reset\" to get back to the original branch)"
950 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
951
953 -#: wt-status.c:979
952 +#: wt-status.c:978
953 msgid "On branch "
954 msgstr "位于分支 "
955
957 -#: wt-status.c:986
956 +#: wt-status.c:985
957 msgid "Not currently on any branch."
958 msgstr "当前不在任何分支上。"
959
961 -#: wt-status.c:998
960 +#: wt-status.c:997
961 msgid "Initial commit"
962 msgstr "初始提交"
963
965 -#: wt-status.c:1012
964 +#: wt-status.c:1011
965 msgid "Untracked"
966 msgstr "未跟踪的"
967
969 -#: wt-status.c:1014
968 +#: wt-status.c:1013
969 msgid "Ignored"
970 msgstr "忽略的"
971
973 -#: wt-status.c:1016
972 +#: wt-status.c:1015
973 #, c-format
974 msgid "Untracked files not listed%s"
975 msgstr "未跟踪的文件没有列出%s"
976
977 # 译者：中文字符串拼接，可删除前导空格
979 -#: wt-status.c:1018
978 +#: wt-status.c:1017
979 msgid " (use -u option to show untracked files)"
980 msgstr "（使用 -u 参数显示未跟踪的文件）"
981
983 -#: wt-status.c:1024
982 +#: wt-status.c:1023
983 msgid "No changes"
984 msgstr "没有修改"
985
987 -#: wt-status.c:1028
986 +#: wt-status.c:1027
987 #, c-format
988 msgid "no changes added to commit%s\n"
989 msgstr "修改尚未加入提交%s\n"
990
991 # 译者：中文字符串拼接，可删除前导空格
993 -#: wt-status.c:1030
992 +#: wt-status.c:1029
993 msgid " (use \"git add\" and/or \"git commit -a\")"
994 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
995
997 -#: wt-status.c:1032
996 +#: wt-status.c:1031
997 #, c-format
998 msgid "nothing added to commit but untracked files present%s\n"
999 msgstr "空提交但存在未跟踪文件%s\n"
1000
1001 # 译者：中文字符串拼接，可删除前导空格
1003 -#: wt-status.c:1034
1002 +#: wt-status.c:1033
1003 msgid " (use \"git add\" to track)"
1004 msgstr "（使用 \"git add\" 建立跟踪）"
1005
1007 -#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
1006 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
1007 #, c-format
1008 msgid "nothing to commit%s\n"
1009 msgstr "无须提交%s\n"
1010
1011 # 译者：中文字符串拼接，可删除前导空格
1013 -#: wt-status.c:1037
1012 +#: wt-status.c:1036
1013 msgid " (create/copy files and use \"git add\" to track)"
1014 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
1015
1016 # 译者：中文字符串拼接，可删除前导空格
1018 -#: wt-status.c:1040
1017 +#: wt-status.c:1039
1018 msgid " (use -u to show untracked files)"
1019 msgstr "（使用 -u 显示未跟踪文件）"
1020
1021 # 译者：中文字符串拼接，可删除前导空格
1023 -#: wt-status.c:1043
1022 +#: wt-status.c:1042
1023 msgid " (working directory clean)"
1024 msgstr "（干净的工作区）"
1025
1027 -#: wt-status.c:1151
1026 +#: wt-status.c:1150
1027 msgid "HEAD (no branch)"
1028 msgstr "HEAD（非分支）"
1029
1030 # 译者：注意保持句尾空格
1032 -#: wt-status.c:1157
1031 +#: wt-status.c:1156
1032 msgid "Initial commit on "
1033 msgstr "初始提交于 "
1034
1035 # 译者：注意保持句尾空格
1037 -#: wt-status.c:1172
1036 +#: wt-status.c:1171
1037 msgid "behind "
1038 msgstr "落后 "
1039
1040 # 译者：注意保持句尾空格
1042 -#: wt-status.c:1175 wt-status.c:1178
1041 +#: wt-status.c:1174 wt-status.c:1177
1042 msgid "ahead "
1043 msgstr "领先 "
1044
1045 # 译者：注意保持句尾空格
1047 -#: wt-status.c:1180
1046 +#: wt-status.c:1179
1047 msgid ", behind "
1048 msgstr "，落后 "
1049
@@ -1053,7 +1052,7 @@ msgstr "，落后 "
1052 msgid "unexpected diff status %c"
1053 msgstr "意外的差异状态 %c"
1054
1056 -#: builtin/add.c:67 builtin/commit.c:226
1055 +#: builtin/add.c:67 builtin/commit.c:229
1056 msgid "updating files failed"
1057 msgstr "更新文件失败"
1058
@@ -1143,75 +1142,75 @@ msgstr "没有指定文件，也没有文件被添加。\n"
1142 msgid "Maybe you wanted to say 'git add .'?\n"
1143 msgstr "也许您想要执行 'git add .'？\n"
1144
1146 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
1145 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
1146 #: builtin/rm.c:162
1147 msgid "index file corrupt"
1148 msgstr "索引文件损坏"
1149
1151 -#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1150 +#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1151 msgid "Unable to write new index file"
1152 msgstr "无法写入新索引文件"
1153
1155 -#: builtin/apply.c:53
1154 +#: builtin/apply.c:57
1155 msgid "git apply [options] [<patch>...]"
1156 msgstr "git apply [选项] [<补丁>...]"
1157
1159 -#: builtin/apply.c:106
1158 +#: builtin/apply.c:110
1159 #, c-format
1160 msgid "unrecognized whitespace option '%s'"
1161 msgstr "未能识别的空白字符选项 '%s'"
1162
1164 -#: builtin/apply.c:121
1163 +#: builtin/apply.c:125
1164 #, c-format
1165 msgid "unrecognized whitespace ignore option '%s'"
1166 msgstr "未能识别的空白字符忽略选项 '%s'"
1167
1169 -#: builtin/apply.c:815
1168 +#: builtin/apply.c:824
1169 #, c-format
1170 msgid "Cannot prepare timestamp regexp %s"
1171 msgstr "无法准备时间戳正则表达式 %s"
1172
1174 -#: builtin/apply.c:824
1173 +#: builtin/apply.c:833
1174 #, c-format
1175 msgid "regexec returned %d for input: %s"
1176 msgstr "regexec 返回 %d，输入为：%s"
1177
1179 -#: builtin/apply.c:905
1178 +#: builtin/apply.c:914
1179 #, c-format
1180 msgid "unable to find filename in patch at line %d"
1181 msgstr "不能在补丁的第 %d 行找到文件名"
1182
1184 -#: builtin/apply.c:937
1183 +#: builtin/apply.c:946
1184 #, c-format
1185 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1186 msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
1187
1189 -#: builtin/apply.c:941
1188 +#: builtin/apply.c:950
1189 #, c-format
1190 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1191 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1192
1194 -#: builtin/apply.c:942
1193 +#: builtin/apply.c:951
1194 #, c-format
1195 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1196 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1197
1199 -#: builtin/apply.c:949
1198 +#: builtin/apply.c:958
1199 #, c-format
1200 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1201 msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
1202
1204 -#: builtin/apply.c:1394
1203 +#: builtin/apply.c:1403
1204 #, c-format
1205 msgid "recount: unexpected line: %.*s"
1206 msgstr "recount：意外的行：%.*s"
1207
1209 -#: builtin/apply.c:1451
1208 +#: builtin/apply.c:1460
1209 #, c-format
1210 msgid "patch fragment without header at line %d: %.*s"
1211 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1212
1214 -#: builtin/apply.c:1468
1213 +#: builtin/apply.c:1477
1214 #, c-format
1215 msgid ""
1216 "git diff header lacks filename information when removing %d leading pathname "
@@ -1222,82 +1221,82 @@ msgid_plural ""
1221 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1222 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1223
1225 -#: builtin/apply.c:1628
1224 +#: builtin/apply.c:1637
1225 msgid "new file depends on old contents"
1226 msgstr "新文件依赖旧内容"
1227
1229 -#: builtin/apply.c:1630
1228 +#: builtin/apply.c:1639
1229 msgid "deleted file still has contents"
1230 msgstr "删除的文件仍有内容"
1231
1233 -#: builtin/apply.c:1656
1232 +#: builtin/apply.c:1665
1233 #, c-format
1234 msgid "corrupt patch at line %d"
1235 msgstr "补丁损坏位于第 %d 行"
1236
1238 -#: builtin/apply.c:1692
1237 +#: builtin/apply.c:1701
1238 #, c-format
1239 msgid "new file %s depends on old contents"
1240 msgstr "新文件 %s 依赖旧内容"
1241
1243 -#: builtin/apply.c:1694
1242 +#: builtin/apply.c:1703
1243 #, c-format
1244 msgid "deleted file %s still has contents"
1245 msgstr "删除的文件 %s 仍有内容"
1246
1248 -#: builtin/apply.c:1697
1247 +#: builtin/apply.c:1706
1248 #, c-format
1249 msgid "** warning: file %s becomes empty but is not deleted"
1250 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1251
1253 -#: builtin/apply.c:1843
1252 +#: builtin/apply.c:1852
1253 #, c-format
1254 msgid "corrupt binary patch at line %d: %.*s"
1255 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1256
1257 #. there has to be one hunk (forward hunk)
1259 -#: builtin/apply.c:1872
1258 +#: builtin/apply.c:1881
1259 #, c-format
1260 msgid "unrecognized binary patch at line %d"
1261 msgstr "未能识别的二进制补丁位于第 %d 行"
1262
1264 -#: builtin/apply.c:1958
1263 +#: builtin/apply.c:1967
1264 #, c-format
1265 msgid "patch with only garbage at line %d"
1266 msgstr "补丁文件的第 %d 行只有垃圾数据"
1267
1269 -#: builtin/apply.c:2048
1268 +#: builtin/apply.c:2057
1269 #, c-format
1270 msgid "unable to read symlink %s"
1271 msgstr "无法读取符号链接 %s"
1272
1274 -#: builtin/apply.c:2052
1273 +#: builtin/apply.c:2061
1274 #, c-format
1275 msgid "unable to open or read %s"
1276 msgstr "不能打开或读取 %s"
1277
1279 -#: builtin/apply.c:2123
1278 +#: builtin/apply.c:2132
1279 msgid "oops"
1280 msgstr "哎哟"
1281
1283 -#: builtin/apply.c:2645
1282 +#: builtin/apply.c:2654
1283 #, c-format
1284 msgid "invalid start of line: '%c'"
1285 msgstr "无效的行首字符：'%c'"
1286
1288 -#: builtin/apply.c:2763
1287 +#: builtin/apply.c:2772
1288 #, c-format
1289 msgid "Hunk #%d succeeded at %d (offset %d line)."
1290 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1291 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）"
1292 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）"
1293
1295 -#: builtin/apply.c:2775
1294 +#: builtin/apply.c:2784
1295 #, c-format
1296 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1297 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1298
1300 -#: builtin/apply.c:2781
1299 +#: builtin/apply.c:2790
1300 #, c-format
1301 msgid ""
1302 "while searching for:\n"
@@ -1306,313 +1305,321 @@ msgstr ""
1305 "当查询：\n"
1306 "%.*s"
1307
1309 -#: builtin/apply.c:2800
1308 +#: builtin/apply.c:2809
1309 #, c-format
1310 msgid "missing binary patch data for '%s'"
1311 msgstr "缺失 '%s' 的二进制补丁数据"
1312
1314 -#: builtin/apply.c:2903
1313 +#: builtin/apply.c:2912
1314 #, c-format
1315 msgid "binary patch does not apply to '%s'"
1316 msgstr "二进制补丁未应用到 '%s'"
1317
1319 -#: builtin/apply.c:2909
1318 +#: builtin/apply.c:2918
1319 #, c-format
1320 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1321 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
1322
1324 -#: builtin/apply.c:2930
1323 +#: builtin/apply.c:2939
1324 #, c-format
1325 msgid "patch failed: %s:%ld"
1326 msgstr "打补丁失败：%s:%ld"
1327
1329 -#: builtin/apply.c:3045
1328 +#: builtin/apply.c:3061
1329 #, c-format
1331 -msgid "patch %s has been renamed/deleted"
1332 -msgstr "补丁 %s 已经被重命名/删除"
1330 +msgid "cannot checkout %s"
1331 +msgstr "不能检出 %s"
1332
1334 -#: builtin/apply.c:3052 builtin/apply.c:3069
1333 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1334 #, c-format
1335 msgid "read of %s failed"
1336 msgstr "读取 %s 失败"
1337
1339 -#: builtin/apply.c:3084
1340 -msgid "removal patch leaves file contents"
1341 -msgstr "移除补丁仍留下了文件内容"
1342 -
1343 -#: builtin/apply.c:3105
1338 +#: builtin/apply.c:3139 builtin/apply.c:3361
1339 #, c-format
1345 -msgid "%s: already exists in working directory"
1346 -msgstr "%s：已经存在于工作区中"
1340 +msgid "path %s has been renamed/deleted"
1341 +msgstr "路径 %s 已经被重命名/删除"
1342
1348 -#: builtin/apply.c:3143
1343 +#: builtin/apply.c:3220 builtin/apply.c:3375
1344 #, c-format
1350 -msgid "%s: has been deleted/renamed"
1351 -msgstr "%s：已经被删除/重命名"
1345 +msgid "%s: does not exist in index"
1346 +msgstr "%s：不存在于索引中"
1347
1353 -#: builtin/apply.c:3148 builtin/apply.c:3179
1348 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1349 #, c-format
1350 msgid "%s: %s"
1351 msgstr "%s：%s"
1352
1358 -#: builtin/apply.c:3159
1359 -#, c-format
1360 -msgid "%s: does not exist in index"
1361 -msgstr "%s：不存在于索引中"
1362 -
1363 -#: builtin/apply.c:3173
1353 +#: builtin/apply.c:3229 builtin/apply.c:3383
1354 #, c-format
1355 msgid "%s: does not match index"
1356 msgstr "%s：和索引不匹配"
1357
1368 -#: builtin/apply.c:3190
1358 +#: builtin/apply.c:3331
1359 +msgid "removal patch leaves file contents"
1360 +msgstr "移除补丁仍留下了文件内容"
1361 +
1362 +#: builtin/apply.c:3400
1363 #, c-format
1364 msgid "%s: wrong type"
1365 msgstr "%s：错误类型"
1366
1373 -#: builtin/apply.c:3192
1367 +#: builtin/apply.c:3402
1368 #, c-format
1369 msgid "%s has type %o, expected %o"
1370 msgstr "%s 的类型是 %o，预期是 %o"
1371
1378 -#: builtin/apply.c:3247
1372 +#: builtin/apply.c:3503
1373 #, c-format
1374 msgid "%s: already exists in index"
1375 msgstr "%s：已经存在于索引中"
1376
1383 -#: builtin/apply.c:3267
1377 +#: builtin/apply.c:3506
1378 +#, c-format
1379 +msgid "%s: already exists in working directory"
1380 +msgstr "%s：已经存在于工作区中"
1381 +
1382 +#: builtin/apply.c:3526
1383 #, c-format
1384 msgid "new mode (%o) of %s does not match old mode (%o)"
1385 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1386
1388 -#: builtin/apply.c:3272
1387 +#: builtin/apply.c:3531
1388 #, c-format
1389 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1390 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1391
1393 -#: builtin/apply.c:3280
1392 +#: builtin/apply.c:3539
1393 #, c-format
1394 msgid "%s: patch does not apply"
1395 msgstr "%s：补丁未应用"
1396
1398 -#: builtin/apply.c:3293
1397 +#: builtin/apply.c:3552
1398 #, c-format
1399 msgid "Checking patch %s..."
1400 msgstr "检查补丁 %s..."
1401
1403 -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158
1402 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1403 #, c-format
1404 msgid "make_cache_entry failed for path '%s'"
1405 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1406
1408 -#: builtin/apply.c:3491
1407 +#: builtin/apply.c:3750
1408 #, c-format
1409 msgid "unable to remove %s from index"
1410 msgstr "不能从索引中移除 %s"
1411
1413 -#: builtin/apply.c:3518
1412 +#: builtin/apply.c:3778
1413 #, c-format
1414 msgid "corrupt patch for subproject %s"
1415 msgstr "子项目 %s 损坏的补丁"
1416
1418 -#: builtin/apply.c:3522
1417 +#: builtin/apply.c:3782
1418 #, c-format
1419 msgid "unable to stat newly created file '%s'"
1420 msgstr "不能枚举新建文件 '%s' 的状态"
1421
1423 -#: builtin/apply.c:3527
1422 +#: builtin/apply.c:3787
1423 #, c-format
1424 msgid "unable to create backing store for newly created file %s"
1425 msgstr "不能为新建文件 %s 创建后端存储"
1426
1428 -#: builtin/apply.c:3530
1427 +#: builtin/apply.c:3790 builtin/apply.c:3898
1428 #, c-format
1429 msgid "unable to add cache entry for %s"
1430 msgstr "无法为 %s 添加缓存条目"
1431
1433 -#: builtin/apply.c:3563
1432 +#: builtin/apply.c:3823
1433 #, c-format
1434 msgid "closing file '%s'"
1435 msgstr "关闭文件 '%s'"
1436
1438 -#: builtin/apply.c:3612
1437 +#: builtin/apply.c:3872
1438 #, c-format
1439 msgid "unable to write file '%s' mode %o"
1440 msgstr "不能写文件 '%s' 权限 %o"
1441
1443 -#: builtin/apply.c:3668
1442 +#: builtin/apply.c:3959
1443 #, c-format
1444 msgid "Applied patch %s cleanly."
1445 msgstr "成功应用补丁 %s。"
1446
1448 -#: builtin/apply.c:3676
1447 +#: builtin/apply.c:3967
1448 msgid "internal error"
1449 msgstr "内部错误"
1450
1451 #. Say this even without --verbose
1453 -#: builtin/apply.c:3679
1452 +#: builtin/apply.c:3970
1453 #, c-format
1454 msgid "Applying patch %%s with %d reject..."
1455 msgid_plural "Applying patch %%s with %d rejects..."
1456 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1457 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1458
1460 -#: builtin/apply.c:3689
1459 +#: builtin/apply.c:3980
1460 #, c-format
1461 msgid "truncating .rej filename to %.*s.rej"
1462 msgstr "截短 .rej 文件名为 %.*s.rej"
1463
1465 -#: builtin/apply.c:3710
1464 +#: builtin/apply.c:4001
1465 #, c-format
1466 msgid "Hunk #%d applied cleanly."
1467 msgstr "第 #%d 个片段成功应用。"
1468
1470 -#: builtin/apply.c:3713
1469 +#: builtin/apply.c:4004
1470 #, c-format
1471 msgid "Rejected hunk #%d."
1472 msgstr "拒绝第 #%d 个片段。"
1473
1475 -#: builtin/apply.c:3844
1474 +#: builtin/apply.c:4154
1475 msgid "unrecognized input"
1476 msgstr "未能识别的输入"
1477
1479 -#: builtin/apply.c:3855
1478 +#: builtin/apply.c:4165
1479 msgid "unable to read index file"
1480 msgstr "无法读取索引文件"
1481
1483 -#: builtin/apply.c:3970 builtin/apply.c:3973
1482 +#: builtin/apply.c:4284 builtin/apply.c:4287
1483 msgid "path"
1484 msgstr "路径"
1485
1487 -#: builtin/apply.c:3971
1486 +#: builtin/apply.c:4285
1487 msgid "don't apply changes matching the given path"
1488 msgstr "不要应用与给出路径向匹配的变更"
1489
1491 -#: builtin/apply.c:3974
1490 +#: builtin/apply.c:4288
1491 msgid "apply changes matching the given path"
1492 msgstr "应用与给出路径向匹配的变更"
1493
1495 -#: builtin/apply.c:3976
1494 +#: builtin/apply.c:4290
1495 msgid "num"
1496 msgstr "数字"
1497
1499 -#: builtin/apply.c:3977
1498 +#: builtin/apply.c:4291
1499 msgid "remove <num> leading slashes from traditional diff paths"
1500 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1501
1503 -#: builtin/apply.c:3980
1502 +#: builtin/apply.c:4294
1503 msgid "ignore additions made by the patch"
1504 msgstr "忽略补丁中的添加的文件"
1505
1507 -#: builtin/apply.c:3982
1506 +#: builtin/apply.c:4296
1507 msgid "instead of applying the patch, output diffstat for the input"
1508 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1509
1511 -#: builtin/apply.c:3986
1510 +#: builtin/apply.c:4300
1511 msgid "shows number of added and deleted lines in decimal notation"
1512 msgstr "以数字方式显示添加或删除行的数量"
1513
1515 -#: builtin/apply.c:3988
1514 +#: builtin/apply.c:4302
1515 msgid "instead of applying the patch, output a summary for the input"
1516 msgstr "不应用补丁，而是显示输入的概要"
1517
1519 -#: builtin/apply.c:3990
1518 +#: builtin/apply.c:4304
1519 msgid "instead of applying the patch, see if the patch is applicable"
1520 msgstr "不应用补丁，而是查看补丁是否可应用"
1521
1523 -#: builtin/apply.c:3992
1522 +#: builtin/apply.c:4306
1523 msgid "make sure the patch is applicable to the current index"
1524 msgstr "确认补丁可以应用到当前索引"
1525
1527 -#: builtin/apply.c:3994
1526 +#: builtin/apply.c:4308
1527 msgid "apply a patch without touching the working tree"
1528 msgstr "应用补丁而不修改工作区"
1529
1531 -#: builtin/apply.c:3996
1530 +#: builtin/apply.c:4310
1531 msgid "also apply the patch (use with --stat/--summary/--check)"
1532 msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）"
1533
1535 -#: builtin/apply.c:3998
1534 +#: builtin/apply.c:4312
1535 +msgid "attempt three-way merge if a patch does not apply"
1536 +msgstr "如果一个补丁不能应用则尝试三路合并"
1537 +
1538 +#: builtin/apply.c:4314
1539 msgid "build a temporary index based on embedded index information"
1540 msgstr "创建一个临时索引基于嵌入的索引信息"
1541
1539 -#: builtin/apply.c:4000
1542 +#: builtin/apply.c:4316
1543 msgid "paths are separated with NUL character"
1544 msgstr "路径以 NUL 字符分隔"
1545
1543 -#: builtin/apply.c:4003
1546 +#: builtin/apply.c:4319
1547 msgid "ensure at least <n> lines of context match"
1548 msgstr "确保至少匹配 <n> 行上下文"
1549
1547 -#: builtin/apply.c:4004
1550 +#: builtin/apply.c:4320
1551 msgid "action"
1552 msgstr "动作"
1553
1551 -#: builtin/apply.c:4005
1554 +#: builtin/apply.c:4321
1555 msgid "detect new or modified lines that have whitespace errors"
1556 msgstr "检查新增和修改的行中间的空白字符滥用"
1557
1555 -#: builtin/apply.c:4008 builtin/apply.c:4011
1558 +#: builtin/apply.c:4324 builtin/apply.c:4327
1559 msgid "ignore changes in whitespace when finding context"
1560 msgstr "查找上下文时忽略空白字符的变更"
1561
1559 -#: builtin/apply.c:4014
1562 +#: builtin/apply.c:4330
1563 msgid "apply the patch in reverse"
1564 msgstr "反向应用补丁"
1565
1563 -#: builtin/apply.c:4016
1566 +#: builtin/apply.c:4332
1567 msgid "don't expect at least one line of context"
1568 msgstr "无需至少一行上下文"
1569
1567 -#: builtin/apply.c:4018
1570 +#: builtin/apply.c:4334
1571 msgid "leave the rejected hunks in corresponding *.rej files"
1572 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1573
1571 -#: builtin/apply.c:4020
1574 +#: builtin/apply.c:4336
1575 msgid "allow overlapping hunks"
1576 msgstr "允许重叠的补丁片段"
1577
1575 -#: builtin/apply.c:4021
1578 +#: builtin/apply.c:4337
1579 msgid "be verbose"
1580 msgstr "冗长输出"
1581
1579 -#: builtin/apply.c:4023
1582 +#: builtin/apply.c:4339
1583 msgid "tolerate incorrectly detected missing new-line at the end of file"
1584 msgstr "宽容不正确的文件末尾换行符"
1585
1583 -#: builtin/apply.c:4026
1586 +#: builtin/apply.c:4342
1587 msgid "do not trust the line counts in the hunk headers"
1588 msgstr "不信任补丁片段的头信息中的行号"
1589
1587 -#: builtin/apply.c:4028
1590 +#: builtin/apply.c:4344
1591 msgid "root"
1592 msgstr "根目录"
1593
1591 -#: builtin/apply.c:4029
1594 +#: builtin/apply.c:4345
1595 msgid "prepend <root> to all filenames"
1596 msgstr "为所有文件名前添加 <根目录>"
1597
1595 -#: builtin/apply.c:4050
1598 +#: builtin/apply.c:4367
1599 +msgid "--3way outside a repository"
1600 +msgstr "--3way 在一个版本库之外"
1601 +
1602 +#: builtin/apply.c:4375
1603 msgid "--index outside a repository"
1604 msgstr "--index 在一个版本库之外"
1605
1599 -#: builtin/apply.c:4053
1606 +#: builtin/apply.c:4378
1607 msgid "--cached outside a repository"
1608 msgstr "--cached 在一个版本库之外"
1609
1603 -#: builtin/apply.c:4069
1610 +#: builtin/apply.c:4394
1611 #, c-format
1612 msgid "can't open patch '%s'"
1613 msgstr "不能打开补丁 '%s'"
1614
1608 -#: builtin/apply.c:4083
1615 +#: builtin/apply.c:4408
1616 #, c-format
1617 msgid "squelched %d whitespace error"
1618 msgid_plural "squelched %d whitespace errors"
1619 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1620 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1621
1615 -#: builtin/apply.c:4089 builtin/apply.c:4099
1622 +#: builtin/apply.c:4414 builtin/apply.c:4424
1623 #, c-format
1624 msgid "%d line adds whitespace errors."
1625 msgid_plural "%d lines add whitespace errors."
@@ -1819,7 +1826,7 @@ msgstr "不能写分支描述模版：%s"
1826 msgid "Failed to resolve HEAD as a valid ref."
1827 msgstr "无法将 HEAD 解析为有效引用。"
1828
1822 -#: builtin/branch.c:788 builtin/clone.c:558
1829 +#: builtin/branch.c:788 builtin/clone.c:561
1830 msgid "HEAD not found below refs/heads!"
1831 msgstr "HEAD 没有位于 /refs/heads 之下！"
1832
@@ -1844,100 +1851,100 @@ msgstr "需要一个版本库来创建包。"
1851 msgid "Need a repository to unbundle."
1852 msgstr "需要一个版本库来解包。"
1853
1847 -#: builtin/checkout.c:113 builtin/checkout.c:146
1854 +#: builtin/checkout.c:114 builtin/checkout.c:147
1855 #, c-format
1856 msgid "path '%s' does not have our version"
1857 msgstr "路径 '%s' 没有我们的版本"
1858
1852 -#: builtin/checkout.c:115 builtin/checkout.c:148
1859 +#: builtin/checkout.c:116 builtin/checkout.c:149
1860 #, c-format
1861 msgid "path '%s' does not have their version"
1862 msgstr "路径 '%s' 没有他们的版本"
1863
1857 -#: builtin/checkout.c:131
1864 +#: builtin/checkout.c:132
1865 #, c-format
1866 msgid "path '%s' does not have all necessary versions"
1867 msgstr "路径 '%s' 没有全部必须的版本"
1868
1862 -#: builtin/checkout.c:175
1869 +#: builtin/checkout.c:176
1870 #, c-format
1871 msgid "path '%s' does not have necessary versions"
1872 msgstr "路径 '%s' 没有必须的版本"
1873
1867 -#: builtin/checkout.c:192
1874 +#: builtin/checkout.c:193
1875 #, c-format
1876 msgid "path '%s': cannot merge"
1877 msgstr "path '%s'：无法合并"
1878
1872 -#: builtin/checkout.c:209
1879 +#: builtin/checkout.c:210
1880 #, c-format
1881 msgid "Unable to add merge result for '%s'"
1882 msgstr "无法为 '%s' 添加合并结果"
1883
1877 -#: builtin/checkout.c:234 builtin/checkout.c:392
1884 +#: builtin/checkout.c:235 builtin/checkout.c:393
1885 msgid "corrupt index file"
1886 msgstr "损坏的索引文件"
1887
1881 -#: builtin/checkout.c:264 builtin/checkout.c:271
1888 +#: builtin/checkout.c:265 builtin/checkout.c:272
1889 #, c-format
1890 msgid "path '%s' is unmerged"
1891 msgstr "路径 '%s' 未合并"
1892
1886 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1893 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
1894 #: builtin/merge.c:812
1895 msgid "unable to write new index file"
1896 msgstr "无法写新的索引文件"
1897
1891 -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
1898 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
1899 msgid "diff_setup_done failed"
1900 msgstr "diff_setup_done 失败"
1901
1895 -#: builtin/checkout.c:414
1902 +#: builtin/checkout.c:415
1903 msgid "you need to resolve your current index first"
1904 msgstr "您需要先解决当前索引的冲突"
1905
1899 -#: builtin/checkout.c:533
1906 +#: builtin/checkout.c:534
1907 #, c-format
1908 msgid "Can not do reflog for '%s'\n"
1909 msgstr "不能对 '%s' 执行 reflog 操作\n"
1910
1904 -#: builtin/checkout.c:566
1911 +#: builtin/checkout.c:567
1912 msgid "HEAD is now at"
1913 msgstr "HEAD 目前位于"
1914
1908 -#: builtin/checkout.c:573
1915 +#: builtin/checkout.c:574
1916 #, c-format
1917 msgid "Reset branch '%s'\n"
1918 msgstr "重置分支 '%s'\n"
1919
1913 -#: builtin/checkout.c:576
1920 +#: builtin/checkout.c:577
1921 #, c-format
1922 msgid "Already on '%s'\n"
1923 msgstr "已经位于 '%s'\n"
1924
1918 -#: builtin/checkout.c:580
1925 +#: builtin/checkout.c:581
1926 #, c-format
1927 msgid "Switched to and reset branch '%s'\n"
1928 msgstr "切换并重置分支 '%s'\n"
1929
1923 -#: builtin/checkout.c:582
1930 +#: builtin/checkout.c:583
1931 #, c-format
1932 msgid "Switched to a new branch '%s'\n"
1933 msgstr "切换到一个新分支 '%s'\n"
1934
1928 -#: builtin/checkout.c:584
1935 +#: builtin/checkout.c:585
1936 #, c-format
1937 msgid "Switched to branch '%s'\n"
1938 msgstr "切换到分支 '%s'\n"
1939
1940 # 译者：注意保持前导空格
1934 -#: builtin/checkout.c:640
1941 +#: builtin/checkout.c:641
1942 #, c-format
1943 msgid " ... and %d more.\n"
1944 msgstr " ... 及其它 %d 个。\n"
1945
1946 #. The singular version
1940 -#: builtin/checkout.c:646
1947 +#: builtin/checkout.c:647
1948 #, c-format
1949 msgid ""
1950 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -1958,7 +1965,7 @@ msgstr[1] ""
1965 "\n"
1966 "%s\n"
1967
1961 -#: builtin/checkout.c:664
1968 +#: builtin/checkout.c:665
1969 #, c-format
1970 msgid ""
1971 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -1973,71 +1980,71 @@ msgstr ""
1980 " git branch new_branch_name %s\n"
1981 "\n"
1982
1976 -#: builtin/checkout.c:694
1983 +#: builtin/checkout.c:695
1984 msgid "internal error in revision walk"
1985 msgstr "在版本遍历时遇到内部错误"
1986
1980 -#: builtin/checkout.c:698
1987 +#: builtin/checkout.c:699
1988 msgid "Previous HEAD position was"
1989 msgstr "之前的 HEAD 位置是"
1990
1984 -#: builtin/checkout.c:724
1991 +#: builtin/checkout.c:725 builtin/checkout.c:920
1992 msgid "You are on a branch yet to be born"
1993 msgstr "您位于一个尚未初始化的分支"
1994
1995 #. case (1)
1989 -#: builtin/checkout.c:855
1996 +#: builtin/checkout.c:856
1997 #, c-format
1998 msgid "invalid reference: %s"
1999 msgstr "无效引用：%s"
2000
2001 #. case (1): want a tree
1995 -#: builtin/checkout.c:894
2002 +#: builtin/checkout.c:895
2003 #, c-format
2004 msgid "reference is not a tree: %s"
2005 msgstr "引用不是一个树：%s"
2006
2000 -#: builtin/checkout.c:974
2007 +#: builtin/checkout.c:977
2008 msgid "-B cannot be used with -b"
2009 msgstr "-B 不能和 -b 共用"
2010
2004 -#: builtin/checkout.c:983
2011 +#: builtin/checkout.c:986
2012 msgid "--patch is incompatible with all other options"
2013 msgstr "--patch 选项和其他选项不兼容"
2014
2008 -#: builtin/checkout.c:986
2015 +#: builtin/checkout.c:989
2016 msgid "--detach cannot be used with -b/-B/--orphan"
2017 msgstr "--detach 不能和 -b/-B/--orphan 共用"
2018
2012 -#: builtin/checkout.c:988
2019 +#: builtin/checkout.c:991
2020 msgid "--detach cannot be used with -t"
2021 msgstr "--detach 不能和 -t 共用"
2022
2016 -#: builtin/checkout.c:994
2023 +#: builtin/checkout.c:997
2024 msgid "--track needs a branch name"
2025 msgstr "--track 需要一个分支名"
2026
2020 -#: builtin/checkout.c:1001
2027 +#: builtin/checkout.c:1004
2028 msgid "Missing branch name; try -b"
2029 msgstr "缺少分支名；尝试 -b"
2030
2024 -#: builtin/checkout.c:1007
2031 +#: builtin/checkout.c:1010
2032 msgid "--orphan and -b|-B are mutually exclusive"
2033 msgstr "--orphan 和 -b|-B 互斥"
2034
2028 -#: builtin/checkout.c:1009
2035 +#: builtin/checkout.c:1012
2036 msgid "--orphan cannot be used with -t"
2037 msgstr "--orphan 不能和 -t 共用"
2038
2032 -#: builtin/checkout.c:1019
2039 +#: builtin/checkout.c:1022
2040 msgid "git checkout: -f and -m are incompatible"
2041 msgstr "git checkout：-f 和 -m 不兼容"
2042
2036 -#: builtin/checkout.c:1053
2043 +#: builtin/checkout.c:1056
2044 msgid "invalid path specification"
2045 msgstr "无效的路径规格"
2046
2040 -#: builtin/checkout.c:1061
2047 +#: builtin/checkout.c:1064
2048 #, c-format
2049 msgid ""
2050 "git checkout: updating paths is incompatible with switching branches.\n"
@@ -2046,26 +2053,26 @@ msgstr ""
2053 "git checkout：更新路径和切换分支不兼容。\n"
2054 "您是想要检出 '%s' 但未能将其解析为提交么？"
2055
2049 -#: builtin/checkout.c:1063
2056 +#: builtin/checkout.c:1066
2057 msgid "git checkout: updating paths is incompatible with switching branches."
2058 msgstr "git checkout：更新路径和切换分支不兼容。"
2059
2053 -#: builtin/checkout.c:1068
2060 +#: builtin/checkout.c:1071
2061 msgid "git checkout: --detach does not take a path argument"
2062 msgstr "git checkout：--detach 不跟路径参数"
2063
2057 -#: builtin/checkout.c:1071
2064 +#: builtin/checkout.c:1074
2065 msgid ""
2066 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2067 "checking out of the index."
2068 msgstr ""
2069 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
2070
2064 -#: builtin/checkout.c:1090
2071 +#: builtin/checkout.c:1093
2072 msgid "Cannot switch branch to a non-commit."
2073 msgstr "无法切换分支到一个非提交。"
2074
2068 -#: builtin/checkout.c:1093
2075 +#: builtin/checkout.c:1096
2076 msgid "--ours/--theirs is incompatible with switching branches."
2077 msgstr "--ours/--theirs 和切换分支不兼容。"
2078
@@ -2161,78 +2168,78 @@ msgstr "无法拷贝文件至 '%s'"
2168 msgid "done.\n"
2169 msgstr "完成。\n"
2170
2164 -#: builtin/clone.c:440
2171 +#: builtin/clone.c:443
2172 #, c-format
2173 msgid "Could not find remote branch %s to clone."
2174 msgstr "不能发现要克隆的远程分支 %s。"
2175
2169 -#: builtin/clone.c:549
2176 +#: builtin/clone.c:552
2177 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
2178 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
2179
2173 -#: builtin/clone.c:639
2180 +#: builtin/clone.c:642
2181 msgid "Too many arguments."
2182 msgstr "太多参数。"
2183
2177 -#: builtin/clone.c:643
2184 +#: builtin/clone.c:646
2185 msgid "You must specify a repository to clone."
2186 msgstr "您必须指定一个版本库来克隆。"
2187
2181 -#: builtin/clone.c:654
2188 +#: builtin/clone.c:657
2189 #, c-format
2190 msgid "--bare and --origin %s options are incompatible."
2191 msgstr "--bare 和 --origin %s 选项不兼容。"
2192
2186 -#: builtin/clone.c:668
2193 +#: builtin/clone.c:671
2194 #, c-format
2195 msgid "repository '%s' does not exist"
2196 msgstr "版本库 '%s' 不存在"
2197
2191 -#: builtin/clone.c:673
2198 +#: builtin/clone.c:676
2199 msgid "--depth is ignored in local clones; use file:// instead."
2200 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
2201
2195 -#: builtin/clone.c:683
2202 +#: builtin/clone.c:686
2203 #, c-format
2204 msgid "destination path '%s' already exists and is not an empty directory."
2205 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
2206
2200 -#: builtin/clone.c:693
2207 +#: builtin/clone.c:696
2208 #, c-format
2209 msgid "working tree '%s' already exists."
2210 msgstr "工作区 '%s' 已经存在。"
2211
2205 -#: builtin/clone.c:706 builtin/clone.c:720
2212 +#: builtin/clone.c:709 builtin/clone.c:723
2213 #, c-format
2214 msgid "could not create leading directories of '%s'"
2215 msgstr "不能为 '%s' 创建先导目录"
2216
2210 -#: builtin/clone.c:709
2217 +#: builtin/clone.c:712
2218 #, c-format
2219 msgid "could not create work tree dir '%s'."
2220 msgstr "不能为 '%s' 创建工作区目录。"
2221
2215 -#: builtin/clone.c:728
2222 +#: builtin/clone.c:731
2223 #, c-format
2224 msgid "Cloning into bare repository '%s'...\n"
2225 msgstr "克隆到裸版本库 '%s'...\n"
2226
2220 -#: builtin/clone.c:730
2227 +#: builtin/clone.c:733
2228 #, c-format
2229 msgid "Cloning into '%s'...\n"
2230 msgstr "正克隆到 '%s'...\n"
2231
2225 -#: builtin/clone.c:786
2232 +#: builtin/clone.c:789
2233 #, c-format
2234 msgid "Don't know how to clone %s"
2235 msgstr "不知道如何克隆 %s"
2236
2230 -#: builtin/clone.c:835
2237 +#: builtin/clone.c:838
2238 #, c-format
2239 msgid "Remote branch %s not found in upstream %s"
2240 msgstr "远程分支 %s 在上游 %s 未发现"
2241
2235 -#: builtin/clone.c:842
2242 +#: builtin/clone.c:845
2243 msgid "You appear to have cloned an empty repository."
2244 msgstr "您似乎克隆了一个空版本库。"
2245
@@ -2288,93 +2295,93 @@ msgstr ""
2295 "\n"
2296 "否则，请使用命令 'git reset'\n"
2297
2291 -#: builtin/commit.c:253
2298 +#: builtin/commit.c:256
2299 msgid "failed to unpack HEAD tree object"
2300 msgstr "无法解包 HEAD 树对象"
2301
2295 -#: builtin/commit.c:295
2302 +#: builtin/commit.c:298
2303 msgid "unable to create temporary index"
2304 msgstr "不能创建临时索引"
2305
2299 -#: builtin/commit.c:301
2306 +#: builtin/commit.c:304
2307 msgid "interactive add failed"
2308 msgstr "交互式添加失败"
2309
2303 -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405
2310 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
2311 msgid "unable to write new_index file"
2312 msgstr "无法写 new_index 文件"
2313
2307 -#: builtin/commit.c:386
2314 +#: builtin/commit.c:389
2315 msgid "cannot do a partial commit during a merge."
2316 msgstr "在合并过程中不能做部分提交。"
2317
2311 -#: builtin/commit.c:388
2318 +#: builtin/commit.c:391
2319 msgid "cannot do a partial commit during a cherry-pick."
2320 msgstr "在拣选过程中不能做部分提交。"
2321
2315 -#: builtin/commit.c:398
2322 +#: builtin/commit.c:401
2323 msgid "cannot read the index"
2324 msgstr "无法读取索引"
2325
2319 -#: builtin/commit.c:418
2326 +#: builtin/commit.c:421
2327 msgid "unable to write temporary index file"
2328 msgstr "无法写临时索引文件"
2329
2323 -#: builtin/commit.c:493 builtin/commit.c:499
2330 +#: builtin/commit.c:496 builtin/commit.c:502
2331 #, c-format
2332 msgid "invalid commit: %s"
2333 msgstr "无效的提交：%s"
2334
2328 -#: builtin/commit.c:522
2335 +#: builtin/commit.c:525
2336 msgid "malformed --author parameter"
2337 msgstr "非法的 --author 参数"
2338
2332 -#: builtin/commit.c:582
2339 +#: builtin/commit.c:585
2340 #, c-format
2341 msgid "Malformed ident string: '%s'"
2342 msgstr "非法的身份字符串：'%s'"
2343
2337 -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967
2344 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
2345 #, c-format
2346 msgid "could not lookup commit %s"
2347 msgstr "不能查询提交 %s"
2348
2342 -#: builtin/commit.c:632 builtin/shortlog.c:296
2349 +#: builtin/commit.c:635 builtin/shortlog.c:296
2350 #, c-format
2351 msgid "(reading log message from standard input)\n"
2352 msgstr "（正从标准输入中读取日志信息）\n"
2353
2347 -#: builtin/commit.c:634
2354 +#: builtin/commit.c:637
2355 msgid "could not read log from standard input"
2356 msgstr "不能从标准输入中读取日志信息"
2357
2351 -#: builtin/commit.c:638
2358 +#: builtin/commit.c:641
2359 #, c-format
2360 msgid "could not read log file '%s'"
2361 msgstr "不能读取日志文件 '%s'"
2362
2356 -#: builtin/commit.c:644
2363 +#: builtin/commit.c:647
2364 msgid "commit has empty message"
2365 msgstr "提交说明为空"
2366
2360 -#: builtin/commit.c:660
2367 +#: builtin/commit.c:663
2368 msgid "could not read MERGE_MSG"
2369 msgstr "不能读取 MERGE_MSG"
2370
2364 -#: builtin/commit.c:664
2371 +#: builtin/commit.c:667
2372 msgid "could not read SQUASH_MSG"
2373 msgstr "不能读取 SQUASH_MSG"
2374
2368 -#: builtin/commit.c:668
2375 +#: builtin/commit.c:671
2376 #, c-format
2377 msgid "could not read '%s'"
2378 msgstr "不能读取 '%s'"
2379
2373 -#: builtin/commit.c:720
2380 +#: builtin/commit.c:723
2381 msgid "could not write commit template"
2382 msgstr "不能写提交模版"
2383
2377 -#: builtin/commit.c:731
2384 +#: builtin/commit.c:734
2385 #, c-format
2386 msgid ""
2387 "\n"
@@ -2388,7 +2395,7 @@ msgstr ""
2395 "\t%s\n"
2396 "然后重试。\n"
2397
2391 -#: builtin/commit.c:736
2398 +#: builtin/commit.c:739
2399 #, c-format
2400 msgid ""
2401 "\n"
@@ -2402,7 +2409,7 @@ msgstr ""
2409 "\t%s\n"
2410 "然后重试。\n"
2411
2405 -#: builtin/commit.c:748
2412 +#: builtin/commit.c:751
2413 msgid ""
2414 "Please enter the commit message for your changes. Lines starting\n"
2415 "with '#' will be ignored, and an empty message aborts the commit.\n"
@@ -2410,7 +2417,7 @@ msgstr ""
2417 "请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"
2418 "说明将会终止提交。\n"
2419
2413 -#: builtin/commit.c:753
2420 +#: builtin/commit.c:756
2421 msgid ""
2422 "Please enter the commit message for your changes. Lines starting\n"
2423 "with '#' will be kept; you may remove them yourself if you want to.\n"
@@ -2420,160 +2427,160 @@ msgstr ""
2427 "如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
2428
2429 # 译者：为保证在输出中对齐，注意调整句中空格！
2423 -#: builtin/commit.c:766
2430 +#: builtin/commit.c:769
2431 #, c-format
2432 msgid "%sAuthor: %s"
2433 msgstr "%s作者： %s"
2434
2435 # 译者：为保证在输出中对齐，注意调整句中空格！
2429 -#: builtin/commit.c:773
2436 +#: builtin/commit.c:776
2437 #, c-format
2438 msgid "%sCommitter: %s"
2439 msgstr "%s提交者： %s"
2440
2434 -#: builtin/commit.c:793
2441 +#: builtin/commit.c:796
2442 msgid "Cannot read index"
2443 msgstr "无法读取索引"
2444
2438 -#: builtin/commit.c:830
2445 +#: builtin/commit.c:833
2446 msgid "Error building trees"
2447 msgstr "无法创建树对象"
2448
2442 -#: builtin/commit.c:845 builtin/tag.c:361
2449 +#: builtin/commit.c:848 builtin/tag.c:361
2450 #, c-format
2451 msgid "Please supply the message using either -m or -F option.\n"
2452 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
2453
2447 -#: builtin/commit.c:942
2454 +#: builtin/commit.c:945
2455 #, c-format
2456 msgid "No existing author found with '%s'"
2457 msgstr "没有找到匹配 '%s' 的作者"
2458
2452 -#: builtin/commit.c:957 builtin/commit.c:1157
2459 +#: builtin/commit.c:960 builtin/commit.c:1160
2460 #, c-format
2461 msgid "Invalid untracked files mode '%s'"
2462 msgstr "无效的未追踪文件参数 '%s'"
2463
2457 -#: builtin/commit.c:997
2464 +#: builtin/commit.c:1000
2465 msgid "Using both --reset-author and --author does not make sense"
2466 msgstr "同时使用 --reset-author 和 --author 没有意义"
2467
2461 -#: builtin/commit.c:1008
2468 +#: builtin/commit.c:1011
2469 msgid "You have nothing to amend."
2470 msgstr "您没有可修补的提交。"
2471
2465 -#: builtin/commit.c:1011
2472 +#: builtin/commit.c:1014
2473 msgid "You are in the middle of a merge -- cannot amend."
2474 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
2475
2469 -#: builtin/commit.c:1013
2476 +#: builtin/commit.c:1016
2477 msgid "You are in the middle of a cherry-pick -- cannot amend."
2478 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
2479
2473 -#: builtin/commit.c:1016
2480 +#: builtin/commit.c:1019
2481 msgid "Options --squash and --fixup cannot be used together"
2482 msgstr "选项 --squash 和 --fixup 不能共用"
2483
2477 -#: builtin/commit.c:1026
2484 +#: builtin/commit.c:1029
2485 msgid "Only one of -c/-C/-F/--fixup can be used."
2486 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
2487
2481 -#: builtin/commit.c:1028
2488 +#: builtin/commit.c:1031
2489 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2490 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
2491
2485 -#: builtin/commit.c:1036
2492 +#: builtin/commit.c:1039
2493 msgid "--reset-author can be used only with -C, -c or --amend."
2494 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
2495
2489 -#: builtin/commit.c:1053
2496 +#: builtin/commit.c:1056
2497 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2498 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
2499
2493 -#: builtin/commit.c:1055
2500 +#: builtin/commit.c:1058
2501 msgid "No paths with --include/--only does not make sense."
2502 msgstr "参数 --include/--only 不跟路径没有意义。"
2503
2497 -#: builtin/commit.c:1057
2504 +#: builtin/commit.c:1060
2505 msgid "Clever... amending the last one with dirty index."
2506 msgstr "聪明... 在索引不干净下修补最后的提交。"
2507
2501 -#: builtin/commit.c:1059
2508 +#: builtin/commit.c:1062
2509 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2510 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
2511
2505 -#: builtin/commit.c:1069 builtin/tag.c:577
2512 +#: builtin/commit.c:1072 builtin/tag.c:577
2513 #, c-format
2514 msgid "Invalid cleanup mode %s"
2515 msgstr "无效的清理模式 %s"
2516
2510 -#: builtin/commit.c:1074
2517 +#: builtin/commit.c:1077
2518 msgid "Paths with -a does not make sense."
2519 msgstr "路径和 -a 选项共用没有意义。"
2520
2514 -#: builtin/commit.c:1257
2521 +#: builtin/commit.c:1260
2522 msgid "couldn't look up newly created commit"
2523 msgstr "无法找到新创建的提交"
2524
2518 -#: builtin/commit.c:1259
2525 +#: builtin/commit.c:1262
2526 msgid "could not parse newly created commit"
2527 msgstr "不能解析新创建的提交"
2528
2522 -#: builtin/commit.c:1300
2529 +#: builtin/commit.c:1303
2530 msgid "detached HEAD"
2531 msgstr "分离头指针"
2532
2533 # 译者：中文字符串拼接，可删除前导空格
2527 -#: builtin/commit.c:1302
2534 +#: builtin/commit.c:1305
2535 msgid " (root-commit)"
2536 msgstr "（根提交）"
2537
2531 -#: builtin/commit.c:1446
2538 +#: builtin/commit.c:1449
2539 msgid "could not parse HEAD commit"
2540 msgstr "不能解析 HEAD 提交"
2541
2535 -#: builtin/commit.c:1484 builtin/merge.c:509
2542 +#: builtin/commit.c:1487 builtin/merge.c:509
2543 #, c-format
2544 msgid "could not open '%s' for reading"
2545 msgstr "不能为读入打开 '%s'"
2546
2540 -#: builtin/commit.c:1491
2547 +#: builtin/commit.c:1494
2548 #, c-format
2549 msgid "Corrupt MERGE_HEAD file (%s)"
2550 msgstr "损坏的 MERGE_HEAD 文件（%s）"
2551
2545 -#: builtin/commit.c:1498
2552 +#: builtin/commit.c:1501
2553 msgid "could not read MERGE_MODE"
2554 msgstr "不能读取 MERGE_MODE"
2555
2549 -#: builtin/commit.c:1517
2556 +#: builtin/commit.c:1520
2557 #, c-format
2558 msgid "could not read commit message: %s"
2559 msgstr "不能读取提交说明：%s"
2560
2554 -#: builtin/commit.c:1531
2561 +#: builtin/commit.c:1534
2562 #, c-format
2563 msgid "Aborting commit; you did not edit the message.\n"
2564 msgstr "终止提交；您未更改来自模版的提交说明。\n"
2565
2559 -#: builtin/commit.c:1536
2566 +#: builtin/commit.c:1539
2567 #, c-format
2568 msgid "Aborting commit due to empty commit message.\n"
2569 msgstr "终止提交因为提交说明为空。\n"
2570
2564 -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961
2571 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2572 msgid "failed to write commit object"
2573 msgstr "无法写提交对象"
2574
2568 -#: builtin/commit.c:1572
2575 +#: builtin/commit.c:1575
2576 msgid "cannot lock HEAD ref"
2577 msgstr "无法锁定 HEAD 引用"
2578
2572 -#: builtin/commit.c:1576
2579 +#: builtin/commit.c:1579
2580 msgid "cannot update HEAD ref"
2581 msgstr "无法更新 HEAD 引用"
2582
2576 -#: builtin/commit.c:1587
2583 +#: builtin/commit.c:1590
2584 msgid ""
2585 "Repository has been updated, but unable to write\n"
2586 "new_index file. Check that disk is not full or quota is\n"
@@ -2944,30 +2951,30 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2951 msgid "both --cached and trees are given."
2952 msgstr "同时给出了 --cached 和树对象。"
2953
2947 -#: builtin/help.c:63
2954 +#: builtin/help.c:65
2955 #, c-format
2956 msgid "unrecognized help format '%s'"
2957 msgstr "未能识别的帮助格式 '%s'"
2958
2952 -#: builtin/help.c:91
2959 +#: builtin/help.c:93
2960 msgid "Failed to start emacsclient."
2961 msgstr "无法启动 emacsclient。"
2962
2956 -#: builtin/help.c:104
2963 +#: builtin/help.c:106
2964 msgid "Failed to parse emacsclient version."
2965 msgstr "无法解析 emacsclient 版本。"
2966
2960 -#: builtin/help.c:112
2967 +#: builtin/help.c:114
2968 #, c-format
2969 msgid "emacsclient version '%d' too old (< 22)."
2970 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2971
2965 -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2972 +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
2973 #, c-format
2974 msgid "failed to exec '%s': %s"
2975 msgstr "无法执行 '%s'：%s"
2976
2970 -#: builtin/help.c:215
2977 +#: builtin/help.c:217
2978 #, c-format
2979 msgid ""
2980 "'%s': path for unsupported man viewer.\n"
@@ -2976,7 +2983,7 @@ msgstr ""
2983 "'%s'：不支持的 man 手册查看器的路径。\n"
2984 "请使用 'man.<tool>.cmd'。"
2985
2979 -#: builtin/help.c:227
2986 +#: builtin/help.c:229
2987 #, c-format
2988 msgid ""
2989 "'%s': cmd for supported man viewer.\n"
@@ -2985,34 +2992,29 @@ msgstr ""
2992 "'%s': 支持的 man 手册查看器命令。\n"
2993 "请使用 'man.<tool>.path'。"
2994
2988 -#: builtin/help.c:291
2995 +#: builtin/help.c:299
2996 msgid "The most commonly used git commands are:"
2997 msgstr "最常用的 git 命令有："
2998
2992 -#: builtin/help.c:359
2999 +#: builtin/help.c:367
3000 #, c-format
3001 msgid "'%s': unknown man viewer."
3002 msgstr "'%s'：未知的 man 查看器。"
3003
2997 -#: builtin/help.c:376
3004 +#: builtin/help.c:384
3005 msgid "no man viewer handled the request"
3006 msgstr "没有 man 查看器处理此请求"
3007
3001 -#: builtin/help.c:384
3008 +#: builtin/help.c:392
3009 msgid "no info viewer handled the request"
3010 msgstr "没有 info 查看器处理此请求"
3011
3005 -#: builtin/help.c:395
3006 -#, c-format
3007 -msgid "'%s': not a documentation directory."
3008 -msgstr "'%s'：不是一个文档目录。"
3009 -
3010 -#: builtin/help.c:436 builtin/help.c:443
3012 +#: builtin/help.c:447 builtin/help.c:454
3013 #, c-format
3014 msgid "usage: %s%s"
3015 msgstr "用法：%s%s"
3016
3015 -#: builtin/help.c:459
3017 +#: builtin/help.c:470
3018 #, c-format
3019 msgid "`git %s' is aliased to `%s'"
3020 msgstr "`git %s' 是 `%s' 的别名"
@@ -3086,176 +3088,176 @@ msgstr "delta 基准偏移越界"
3088 msgid "unknown object type %d"
3089 msgstr "未知对象类型 %d"
3090
3089 -#: builtin/index-pack.c:531
3091 +#: builtin/index-pack.c:530
3092 msgid "cannot pread pack file"
3093 msgstr "无法读取包文件"
3094
3093 -#: builtin/index-pack.c:533
3095 +#: builtin/index-pack.c:532
3096 #, c-format
3097 msgid "premature end of pack file, %lu byte missing"
3098 msgid_plural "premature end of pack file, %lu bytes missing"
3099 msgstr[0] "包文件过早结束，缺少 %lu 字节"
3100 msgstr[1] "包文件过早结束，缺少 %lu 字节"
3101
3100 -#: builtin/index-pack.c:555
3102 +#: builtin/index-pack.c:558
3103 msgid "serious inflate inconsistency"
3104 msgstr "解压缩严重的不一致"
3105
3104 -#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675
3105 -#: builtin/index-pack.c:709 builtin/index-pack.c:718
3106 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
3107 +#: builtin/index-pack.c:712 builtin/index-pack.c:721
3108 #, c-format
3109 msgid "SHA1 COLLISION FOUND WITH %s !"
3110 msgstr "发现 %s 出现 SHA1 冲突！"
3111
3110 -#: builtin/index-pack.c:649 builtin/pack-objects.c:170
3112 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170
3113 #: builtin/pack-objects.c:262
3114 #, c-format
3115 msgid "unable to read %s"
3116 msgstr "不能读 %s"
3117
3116 -#: builtin/index-pack.c:715
3118 +#: builtin/index-pack.c:718
3119 #, c-format
3120 msgid "cannot read existing object %s"
3121 msgstr "不能读取现存对象 %s"
3122
3121 -#: builtin/index-pack.c:729
3123 +#: builtin/index-pack.c:732
3124 #, c-format
3125 msgid "invalid blob object %s"
3126 msgstr "无效的 blob 对象 %s"
3127
3126 -#: builtin/index-pack.c:744
3128 +#: builtin/index-pack.c:747
3129 #, c-format
3130 msgid "invalid %s"
3131 msgstr "无效的 %s"
3132
3131 -#: builtin/index-pack.c:746
3133 +#: builtin/index-pack.c:749
3134 msgid "Error in object"
3135 msgstr "对象中出错"
3136
3135 -#: builtin/index-pack.c:748
3137 +#: builtin/index-pack.c:751
3138 #, c-format
3139 msgid "Not all child objects of %s are reachable"
3140 msgstr "%s 的所有子对象并非都可达"
3141
3140 -#: builtin/index-pack.c:818 builtin/index-pack.c:844
3142 +#: builtin/index-pack.c:821 builtin/index-pack.c:847
3143 msgid "failed to apply delta"
3144 msgstr "无法应用 delta"
3145
3144 -#: builtin/index-pack.c:983
3146 +#: builtin/index-pack.c:986
3147 msgid "Receiving objects"
3148 msgstr "接收对象中"
3149
3148 -#: builtin/index-pack.c:983
3150 +#: builtin/index-pack.c:986
3151 msgid "Indexing objects"
3152 msgstr "索引对象中"
3153
3152 -#: builtin/index-pack.c:1009
3154 +#: builtin/index-pack.c:1012
3155 msgid "pack is corrupted (SHA1 mismatch)"
3156 msgstr "包冲突（SHA1 不匹配）"
3157
3156 -#: builtin/index-pack.c:1014
3158 +#: builtin/index-pack.c:1017
3159 msgid "cannot fstat packfile"
3160 msgstr "不能枚举包文件状态"
3161
3160 -#: builtin/index-pack.c:1017
3162 +#: builtin/index-pack.c:1020
3163 msgid "pack has junk at the end"
3164 msgstr "包的结尾有垃圾数据"
3165
3164 -#: builtin/index-pack.c:1028
3166 +#: builtin/index-pack.c:1031
3167 msgid "confusion beyond insanity in parse_pack_objects()"
3168 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
3169
3168 -#: builtin/index-pack.c:1051
3170 +#: builtin/index-pack.c:1054
3171 msgid "Resolving deltas"
3172 msgstr "处理 delta 中"
3173
3172 -#: builtin/index-pack.c:1102
3174 +#: builtin/index-pack.c:1105
3175 msgid "confusion beyond insanity"
3176 msgstr "不可理喻"
3177
3176 -#: builtin/index-pack.c:1121
3178 +#: builtin/index-pack.c:1124
3179 #, c-format
3180 msgid "pack has %d unresolved delta"
3181 msgid_plural "pack has %d unresolved deltas"
3182 msgstr[0] "包有 %d 个未解决的 delta"
3183 msgstr[1] "包有 %d 个未解决的 delta"
3184
3183 -#: builtin/index-pack.c:1146
3185 +#: builtin/index-pack.c:1149
3186 #, c-format
3187 msgid "unable to deflate appended object (%d)"
3188 msgstr "不能缩小附加对象（%d）"
3189
3188 -#: builtin/index-pack.c:1225
3190 +#: builtin/index-pack.c:1228
3191 #, c-format
3192 msgid "local object %s is corrupt"
3193 msgstr "本地对象 %s 已损坏"
3194
3193 -#: builtin/index-pack.c:1249
3195 +#: builtin/index-pack.c:1252
3196 msgid "error while closing pack file"
3197 msgstr "关闭包文件时出错"
3198
3197 -#: builtin/index-pack.c:1262
3199 +#: builtin/index-pack.c:1265
3200 #, c-format
3201 msgid "cannot write keep file '%s'"
3202 msgstr "无法写保留文件 '%s'"
3203
3202 -#: builtin/index-pack.c:1270
3204 +#: builtin/index-pack.c:1273
3205 #, c-format
3206 msgid "cannot close written keep file '%s'"
3207 msgstr "无法关闭保留文件 '%s'"
3208
3207 -#: builtin/index-pack.c:1283
3209 +#: builtin/index-pack.c:1286
3210 msgid "cannot store pack file"
3211 msgstr "无法存储包文件"
3212
3211 -#: builtin/index-pack.c:1294
3213 +#: builtin/index-pack.c:1297
3214 msgid "cannot store index file"
3215 msgstr "无法存储索引文件"
3216
3215 -#: builtin/index-pack.c:1395
3217 +#: builtin/index-pack.c:1398
3218 #, c-format
3219 msgid "Cannot open existing pack file '%s'"
3220 msgstr "无法打开现存包文件 '%s'"
3221
3220 -#: builtin/index-pack.c:1397
3222 +#: builtin/index-pack.c:1400
3223 #, c-format
3224 msgid "Cannot open existing pack idx file for '%s'"
3225 msgstr "无法为 %s 打开包索引文件"
3226
3225 -#: builtin/index-pack.c:1444
3227 +#: builtin/index-pack.c:1447
3228 #, c-format
3229 msgid "non delta: %d object"
3230 msgid_plural "non delta: %d objects"
3231 msgstr[0] "非 delta：%d 个对象"
3232 msgstr[1] "非 delta：%d 个对象"
3233
3232 -#: builtin/index-pack.c:1451
3234 +#: builtin/index-pack.c:1454
3235 #, c-format
3236 msgid "chain length = %d: %lu object"
3237 msgid_plural "chain length = %d: %lu objects"
3238 msgstr[0] "链长 = %d: %lu 对象"
3239 msgstr[1] "链长 = %d: %lu 对象"
3240
3239 -#: builtin/index-pack.c:1478
3241 +#: builtin/index-pack.c:1481
3242 msgid "Cannot come back to cwd"
3243 msgstr "无法返回当前工作目录"
3244
3243 -#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3244 -#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3245 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
3246 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
3247 #, c-format
3248 msgid "bad %s"
3249 msgstr "错误选项 %s"
3250
3249 -#: builtin/index-pack.c:1555
3251 +#: builtin/index-pack.c:1558
3252 msgid "--fix-thin cannot be used without --stdin"
3253 msgstr "--fix-thin 不能和 --stdin 共用"
3254
3253 -#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3255 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
3256 #, c-format
3257 msgid "packfile name '%s' does not end with '.pack'"
3258 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3259
3258 -#: builtin/index-pack.c:1578
3260 +#: builtin/index-pack.c:1581
3261 msgid "--verify with no packfile name given"
3262 msgstr "--verify 没有提供包名参数"
3263
@@ -3329,22 +3331,22 @@ msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
3331 msgid "insane git directory %s"
3332 msgstr "不正常的 git 目录 %s"
3333
3332 -#: builtin/init-db.c:322 builtin/init-db.c:325
3334 +#: builtin/init-db.c:323 builtin/init-db.c:326
3335 #, c-format
3336 msgid "%s already exists"
3337 msgstr "%s 已经存在"
3338
3337 -#: builtin/init-db.c:354
3339 +#: builtin/init-db.c:355
3340 #, c-format
3341 msgid "unable to handle file type %d"
3342 msgstr "不能处理 %d 类型的文件"
3343
3342 -#: builtin/init-db.c:357
3344 +#: builtin/init-db.c:358
3345 #, c-format
3346 msgid "unable to move %s to %s"
3347 msgstr "不能移动 %s 至 %s"
3348
3347 -#: builtin/init-db.c:362
3349 +#: builtin/init-db.c:363
3350 #, c-format
3351 msgid "Could not create git link %s"
3352 msgstr "不能创建 git link %s"
@@ -3354,39 +3356,39 @@ msgstr "不能创建 git link %s"
3356 #. * existing" or "Initialized empty", the second " shared" or
3357 #. * "", and the last '%s%s' is the verbatim directory name.
3358 #.
3357 -#: builtin/init-db.c:419
3359 +#: builtin/init-db.c:420
3360 #, c-format
3361 msgid "%s%s Git repository in %s%s\n"
3362 msgstr "%s%s Git 版本库于 %s%s\n"
3363
3362 -#: builtin/init-db.c:420
3364 +#: builtin/init-db.c:421
3365 msgid "Reinitialized existing"
3366 msgstr "重新初始化现存的"
3367
3366 -#: builtin/init-db.c:420
3368 +#: builtin/init-db.c:421
3369 msgid "Initialized empty"
3370 msgstr "初始化空的"
3371
3372 # 译者：中文字符串拼接，可删除前导空格
3371 -#: builtin/init-db.c:421
3373 +#: builtin/init-db.c:422
3374 msgid " shared"
3375 msgstr "共享"
3376
3375 -#: builtin/init-db.c:440
3377 +#: builtin/init-db.c:441
3378 msgid "cannot tell cwd"
3379 msgstr "无法获知当前路径"
3380
3379 -#: builtin/init-db.c:521 builtin/init-db.c:528
3381 +#: builtin/init-db.c:522 builtin/init-db.c:529
3382 #, c-format
3383 msgid "cannot mkdir %s"
3384 msgstr "不能创建目录 %s"
3385
3384 -#: builtin/init-db.c:532
3386 +#: builtin/init-db.c:533
3387 #, c-format
3388 msgid "cannot chdir to %s"
3389 msgstr "不能切换目录到 %s"
3390
3389 -#: builtin/init-db.c:554
3391 +#: builtin/init-db.c:555
3392 #, c-format
3393 msgid ""
3394 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -3395,11 +3397,11 @@ msgstr ""
3397 "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"
3398 "dir=<directory>）"
3399
3398 -#: builtin/init-db.c:578
3400 +#: builtin/init-db.c:579
3401 msgid "Cannot access current working directory"
3402 msgstr "不能访问当前工作目录"
3403
3402 -#: builtin/init-db.c:585
3404 +#: builtin/init-db.c:586
3405 #, c-format
3406 msgid "Cannot access work tree '%s'"
3407 msgstr "不能访问工作区 '%s'"
@@ -3409,95 +3411,95 @@ msgstr "不能访问工作区 '%s'"
3411 msgid "Final output: %d %s\n"
3412 msgstr "最终输出：%d %s\n"
3413
3412 -#: builtin/log.c:402 builtin/log.c:490
3414 +#: builtin/log.c:403 builtin/log.c:494
3415 #, c-format
3416 msgid "Could not read object %s"
3417 msgstr "不能读取对象 %s"
3418
3417 -#: builtin/log.c:514
3419 +#: builtin/log.c:518
3420 #, c-format
3421 msgid "Unknown type: %d"
3422 msgstr "未知类型：%d"
3423
3422 -#: builtin/log.c:603
3424 +#: builtin/log.c:608
3425 msgid "format.headers without value"
3426 msgstr "format.headers 没有值"
3427
3426 -#: builtin/log.c:677
3428 +#: builtin/log.c:682
3429 msgid "name of output directory is too long"
3430 msgstr "输出目录名太长"
3431
3430 -#: builtin/log.c:688
3432 +#: builtin/log.c:693
3433 #, c-format
3434 msgid "Cannot open patch file %s"
3435 msgstr "无法打开补丁文件 %s"
3436
3435 -#: builtin/log.c:702
3437 +#: builtin/log.c:707
3438 msgid "Need exactly one range."
3439 msgstr "只需要一个范围。"
3440
3439 -#: builtin/log.c:710
3441 +#: builtin/log.c:715
3442 msgid "Not a range."
3443 msgstr "不是一个范围。"
3444
3443 -#: builtin/log.c:787
3445 +#: builtin/log.c:792
3446 msgid "Cover letter needs email format"
3447 msgstr "信封需要邮件地址格式"
3448
3447 -#: builtin/log.c:860
3449 +#: builtin/log.c:865
3450 #, c-format
3451 msgid "insane in-reply-to: %s"
3452 msgstr "不正常的 in-reply-to：%s"
3453
3452 -#: builtin/log.c:933
3454 +#: builtin/log.c:938
3455 msgid "Two output directories?"
3456 msgstr "两个输出目录？"
3457
3456 -#: builtin/log.c:1154
3458 +#: builtin/log.c:1160
3459 #, c-format
3460 msgid "bogus committer info %s"
3461 msgstr "虚假的提交者信息 %s"
3462
3461 -#: builtin/log.c:1199
3463 +#: builtin/log.c:1205
3464 msgid "-n and -k are mutually exclusive."
3465 msgstr "-n 和 -k 互斥。"
3466
3465 -#: builtin/log.c:1201
3467 +#: builtin/log.c:1207
3468 msgid "--subject-prefix and -k are mutually exclusive."
3469 msgstr "--subject-prefix 和 -k 互斥。"
3470
3469 -#: builtin/log.c:1209
3471 +#: builtin/log.c:1215
3472 msgid "--name-only does not make sense"
3473 msgstr "--name-only 无意义"
3474
3473 -#: builtin/log.c:1211
3475 +#: builtin/log.c:1217
3476 msgid "--name-status does not make sense"
3477 msgstr "--name-status 无意义"
3478
3477 -#: builtin/log.c:1213
3479 +#: builtin/log.c:1219
3480 msgid "--check does not make sense"
3481 msgstr "--check 无意义"
3482
3481 -#: builtin/log.c:1236
3483 +#: builtin/log.c:1242
3484 msgid "standard output, or directory, which one?"
3485 msgstr "标准输出或目录，哪一个？"
3486
3485 -#: builtin/log.c:1238
3487 +#: builtin/log.c:1244
3488 #, c-format
3489 msgid "Could not create directory '%s'"
3490 msgstr "不能创建目录 '%s'"
3491
3490 -#: builtin/log.c:1391
3492 +#: builtin/log.c:1397
3493 msgid "Failed to create output files"
3494 msgstr "无法创建输出文件"
3495
3494 -#: builtin/log.c:1495
3496 +#: builtin/log.c:1501
3497 #, c-format
3498 msgid ""
3499 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3500 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
3501
3500 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3502 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3503 #, c-format
3504 msgid "Unknown commit %s"
3505 msgstr "未知提交 %s"
@@ -4594,32 +4596,32 @@ msgstr "重置后撤出暂存区的变更："
4596 msgid "Cannot do a %s reset in the middle of a merge."
4597 msgstr "在合并过程中不能做%s重置操作。"
4598
4597 -#: builtin/reset.c:297
4599 +#: builtin/reset.c:303
4600 #, c-format
4601 msgid "Could not parse object '%s'."
4602 msgstr "不能解析对象 '%s'。"
4603
4602 -#: builtin/reset.c:302
4604 +#: builtin/reset.c:308
4605 msgid "--patch is incompatible with --{hard,mixed,soft}"
4606 msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
4607
4606 -#: builtin/reset.c:311
4608 +#: builtin/reset.c:317
4609 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
4608 -msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。"
4610 +msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。"
4611
4612 # 译者：汉字之间无空格，故删除%s前后空格
4611 -#: builtin/reset.c:313
4613 +#: builtin/reset.c:319
4614 #, c-format
4615 msgid "Cannot do %s reset with paths."
4616 msgstr "不能带路径进行%s重置。"
4617
4618 # 译者：汉字之间无空格，故删除%s前后空格
4617 -#: builtin/reset.c:325
4619 +#: builtin/reset.c:331
4620 #, c-format
4621 msgid "%s reset is not allowed in a bare repository"
4622 msgstr "不能对裸版本库进行%s重置"
4623
4622 -#: builtin/reset.c:341
4624 +#: builtin/reset.c:347
4625 #, c-format
4626 msgid "Could not reset index file to revision '%s'."
4627 msgstr "不能重置索引文件至版本 '%s'。"
@@ -5016,7 +5018,7 @@ msgstr "解决操作未进行，我们不会继续。"
5018 msgid "Dirty index: cannot apply patches (dirty: $files)"
5019 msgstr "脏的索引：不能应用补丁（脏文件：$files）"
5020
5019 -#: git-am.sh:671
5021 +#: git-am.sh:683
5022 #, sh-format
5023 msgid ""
5024 "Patch is empty. Was it split wrong?\n"
@@ -5027,15 +5029,15 @@ msgstr ""
5029 "如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n"
5030 "要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
5031
5030 -#: git-am.sh:708
5032 +#: git-am.sh:710
5033 msgid "Patch does not have a valid e-mail address."
5034 msgstr "补丁中没有一个有效的邮件地址。"
5035
5034 -#: git-am.sh:755
5036 +#: git-am.sh:757
5037 msgid "cannot be interactive without stdin connected to a terminal."
5038 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
5039
5038 -#: git-am.sh:759
5040 +#: git-am.sh:761
5041 msgid "Commit Body is:"
5042 msgstr "提交内容为："
5043
@@ -5043,16 +5045,16 @@ msgstr "提交内容为："
5045 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5046 #. in your translation. The program will only accept English
5047 #. input at this point.
5046 -#: git-am.sh:766
5048 +#: git-am.sh:768
5049 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5050 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
5051
5050 -#: git-am.sh:802
5052 +#: git-am.sh:804
5053 #, sh-format
5054 msgid "Applying: $FIRSTLINE"
5055 msgstr "正应用：$FIRSTLINE"
5056
5055 -#: git-am.sh:823
5057 +#: git-am.sh:825
5058 msgid ""
5059 "No changes - did you forget to use 'git add'?\n"
5060 "If there is nothing left to stage, chances are that something else\n"
@@ -5062,22 +5064,22 @@ msgstr ""
5064 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
5065 "您也许想要跳过这个补丁。"
5066
5065 -#: git-am.sh:831
5067 +#: git-am.sh:833
5068 msgid ""
5069 "You still have unmerged paths in your index\n"
5070 "did you forget to use 'git add'?"
5071 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
5072
5071 -#: git-am.sh:847
5073 +#: git-am.sh:849
5074 msgid "No changes -- Patch already applied."
5075 msgstr "没有变更 -- 补丁已经应用过。"
5076
5075 -#: git-am.sh:857
5077 +#: git-am.sh:859
5078 #, sh-format
5079 msgid "Patch failed at $msgnum $FIRSTLINE"
5080 msgstr "补丁失败于 $msgnum $FIRSTLINE"
5081
5080 -#: git-am.sh:873
5082 +#: git-am.sh:880
5083 msgid "applying to an empty history"
5084 msgstr "正应用到一个空历史上"
5085
@@ -5417,27 +5419,27 @@ msgstr "无法从 url '$remoteurl' 剥离一个组件"
5419 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5420 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5421
5420 -#: git-submodule.sh:186
5422 +#: git-submodule.sh:189
5423 #, sh-format
5424 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5425 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5426
5425 -#: git-submodule.sh:196
5427 +#: git-submodule.sh:201
5428 #, sh-format
5429 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5430 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5431
5430 -#: git-submodule.sh:285
5432 +#: git-submodule.sh:290
5433 #, sh-format
5434 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5435 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
5436
5435 -#: git-submodule.sh:302
5437 +#: git-submodule.sh:307
5438 #, sh-format
5439 msgid "'$sm_path' already exists in the index"
5440 msgstr "'$sm_path' 已经存在于索引中"
5441
5440 -#: git-submodule.sh:306
5442 +#: git-submodule.sh:311
5443 #, sh-format
5444 msgid ""
5445 "The following path is ignored by one of your .gitignore files:\n"
@@ -5448,62 +5450,62 @@ msgstr ""
5450 "$sm_path\n"
5451 "如果您确实想添加它，使用 -f 参数。"
5452
5451 -#: git-submodule.sh:317
5453 +#: git-submodule.sh:322
5454 #, sh-format
5455 msgid "Adding existing repo at '$sm_path' to the index"
5456 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5457
5456 -#: git-submodule.sh:319
5458 +#: git-submodule.sh:324
5459 #, sh-format
5460 msgid "'$sm_path' already exists and is not a valid git repo"
5461 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5462
5461 -#: git-submodule.sh:333
5463 +#: git-submodule.sh:338
5464 #, sh-format
5465 msgid "Unable to checkout submodule '$sm_path'"
5466 msgstr "不能检出子模组 '$sm_path'"
5467
5466 -#: git-submodule.sh:338
5468 +#: git-submodule.sh:343
5469 #, sh-format
5470 msgid "Failed to add submodule '$sm_path'"
5471 msgstr "无法添加子模组 '$sm_path'"
5472
5471 -#: git-submodule.sh:343
5473 +#: git-submodule.sh:348
5474 #, sh-format
5475 msgid "Failed to register submodule '$sm_path'"
5476 msgstr "无法注册子模组 '$sm_path'"
5477
5476 -#: git-submodule.sh:385
5478 +#: git-submodule.sh:390
5479 #, sh-format
5480 msgid "Entering '$prefix$sm_path'"
5481 msgstr "正在进入 '$prefix$sm_path'"
5482
5481 -#: git-submodule.sh:399
5483 +#: git-submodule.sh:404
5484 #, sh-format
5485 msgid "Stopping at '$sm_path'; script returned non-zero status."
5486 msgstr "停止于 '$sm_path'，脚本返回非零值。"
5487
5486 -#: git-submodule.sh:442
5488 +#: git-submodule.sh:447
5489 #, sh-format
5490 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5491 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5492
5491 -#: git-submodule.sh:451
5493 +#: git-submodule.sh:456
5494 #, sh-format
5495 msgid "Failed to register url for submodule path '$sm_path'"
5496 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5497
5496 -#: git-submodule.sh:453
5498 +#: git-submodule.sh:458
5499 #, sh-format
5500 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5501 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5502
5501 -#: git-submodule.sh:461
5503 +#: git-submodule.sh:466
5504 #, sh-format
5505 msgid "Failed to register update mode for submodule path '$sm_path'"
5506 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5507
5506 -#: git-submodule.sh:560
5508 +#: git-submodule.sh:565
5509 #, sh-format
5510 msgid ""
5511 "Submodule path '$sm_path' not initialized\n"
@@ -5512,96 +5514,387 @@ msgstr ""
5514 "子模组路径 '$sm_path' 没有初始化\n"
5515 "也许您想用 'update --init'？"
5516
5515 -#: git-submodule.sh:573
5517 +#: git-submodule.sh:578
5518 #, sh-format
5519 msgid "Unable to find current revision in submodule path '$sm_path'"
5520 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5521
5520 -#: git-submodule.sh:592
5522 +#: git-submodule.sh:597
5523 #, sh-format
5524 msgid "Unable to fetch in submodule path '$sm_path'"
5525 msgstr "无法在子模组路径 '$sm_path' 中获取"
5526
5525 -#: git-submodule.sh:606
5527 +#: git-submodule.sh:611
5528 #, sh-format
5529 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5530 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5531
5530 -#: git-submodule.sh:607
5532 +#: git-submodule.sh:612
5533 #, sh-format
5534 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5535 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
5536
5535 -#: git-submodule.sh:612
5537 +#: git-submodule.sh:617
5538 #, sh-format
5539 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5540 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5541
5540 -#: git-submodule.sh:613
5542 +#: git-submodule.sh:618
5543 #, sh-format
5544 msgid "Submodule path '$sm_path': merged in '$sha1'"
5545 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
5546
5545 -#: git-submodule.sh:618
5547 +#: git-submodule.sh:623
5548 #, sh-format
5549 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5550 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5551
5550 -#: git-submodule.sh:619
5552 +#: git-submodule.sh:624
5553 #, sh-format
5554 msgid "Submodule path '$sm_path': checked out '$sha1'"
5555 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
5556
5555 -#: git-submodule.sh:641 git-submodule.sh:964
5557 +#: git-submodule.sh:646 git-submodule.sh:969
5558 #, sh-format
5559 msgid "Failed to recurse into submodule path '$sm_path'"
5560 msgstr "无法递归进子模组路径 '$sm_path'"
5561
5560 -#: git-submodule.sh:749
5562 +#: git-submodule.sh:754
5563 msgid "--cached cannot be used with --files"
5564 msgstr "--cached 不能和 --files 共用"
5565
5566 #. unexpected type
5565 -#: git-submodule.sh:789
5567 +#: git-submodule.sh:794
5568 #, sh-format
5569 msgid "unexpected mode $mod_dst"
5570 msgstr "意外的模式 $mod_dst"
5571
5572 # 译者：注意保持前导空格
5571 -#: git-submodule.sh:807
5573 +#: git-submodule.sh:812
5574 #, sh-format
5575 msgid " Warn: $name doesn't contain commit $sha1_src"
5576 msgstr " 警告：$name 未包含提交 $sha1_src"
5577
5578 # 译者：注意保持前导空格
5577 -#: git-submodule.sh:810
5579 +#: git-submodule.sh:815
5580 #, sh-format
5581 msgid " Warn: $name doesn't contain commit $sha1_dst"
5582 msgstr " 警告：$name 未包含提交 $sha1_dst"
5583
5584 # 译者：注意保持前导空格
5583 -#: git-submodule.sh:813
5585 +#: git-submodule.sh:818
5586 #, sh-format
5587 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5588 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
5589
5588 -#: git-submodule.sh:838
5590 +#: git-submodule.sh:843
5591 msgid "blob"
5592 msgstr "blob"
5593
5592 -#: git-submodule.sh:839
5594 +#: git-submodule.sh:844
5595 msgid "submodule"
5596 msgstr "子模组"
5597
5596 -#: git-submodule.sh:876
5598 +#: git-submodule.sh:881
5599 msgid "# Submodules changed but not updated:"
5600 msgstr "# 子模组已修改但尚未更新："
5601
5600 -#: git-submodule.sh:878
5602 +#: git-submodule.sh:883
5603 msgid "# Submodule changes to be committed:"
5604 msgstr "要提交的子模组变更："
5605
5604 -#: git-submodule.sh:1022
5606 +#: git-submodule.sh:1027
5607 #, sh-format
5608 msgid "Synchronizing submodule url for '$name'"
5609 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'：不是一个文档目录。"