@matheusbsbs / matheus-bagliano / commits / 6792b93b19

l10n: zh_CN.po: translate 29 new messages

Translate 29 new messages came from git.pot update in 11b9017 (l10n: Update git.pot (29 new messages)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Jul 4, 2012 at 17:20 UTC 6792b93b1965561e85be3733bb3ab00b2e598119
1 file changed +351 -215
po/zh_CN.po
+351 -215
@@ -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-06-08 10:20+0800\n"
16 -"PO-Revision-Date: 2012-06-08 12:24+0800\n"
15 +"POT-Creation-Date: 2012-07-03 10:23+0800\n"
16 +"PO-Revision-Date: 2012-07-04 22:38+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"
@@ -61,8 +61,8 @@ msgstr "不能打开 '%s'"
61 msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交："
63
64 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289
65 -#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347
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
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
68 msgstr "版本遍历设置失败"
@@ -75,44 +75,48 @@ msgstr[0] "这个包中含有 %d 个引用"
75 msgstr[1] "这个包中含有 %d 个引用"
76
77 #: bundle.c:192
78 +msgid "The bundle records a complete history."
79 +msgstr "这个包记录一个完整历史。"
80 +
81 +#: bundle.c:195
82 #, c-format
83 msgid "The bundle requires this ref"
84 msgid_plural "The bundle requires these %d refs"
85 msgstr[0] "这个包需要这个引用"
86 msgstr[1] "这个包需要 %d 个这些引用"
87
84 -#: bundle.c:290
88 +#: bundle.c:294
89 msgid "rev-list died"
90 msgstr "rev-list 终止"
91
88 -#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284
92 +#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284
93 #, c-format
94 msgid "unrecognized argument: %s"
95 msgstr "未能识别的参数：%s"
96
93 -#: bundle.c:331
97 +#: bundle.c:335
98 #, c-format
99 msgid "ref '%s' is excluded by the rev-list options"
100 msgstr "引用 '%s' 被 rev-list 选项排除"
101
98 -#: bundle.c:376
102 +#: bundle.c:380
103 msgid "Refusing to create empty bundle."
104 msgstr "不能创建空包。"
105
102 -#: bundle.c:394
106 +#: bundle.c:398
107 msgid "Could not spawn pack-objects"
108 msgstr "不能生成 pack-objects 进程"
109
106 -#: bundle.c:412
110 +#: bundle.c:416
111 msgid "pack-objects died"
112 msgstr "pack-objects 终止"
113
110 -#: bundle.c:415
114 +#: bundle.c:419
115 #, c-format
116 msgid "cannot create '%s'"
117 msgstr "不能创建 '%s'"
118
115 -#: bundle.c:437
119 +#: bundle.c:441
120 msgid "index-pack died"
121 msgstr "index-pack 终止"
122
@@ -293,16 +297,16 @@ msgstr "'%s'：%s"
297 msgid "'%s': short read %s"
298 msgstr "'%s'：读取不完整 %s"
299
296 -#: help.c:207
300 +#: help.c:208
301 #, c-format
302 msgid "available git commands in '%s'"
303 msgstr "在 '%s' 下可用的 git 命令"
304
301 -#: help.c:214
305 +#: help.c:215
306 msgid "git commands available from elsewhere on your $PATH"
307 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
308
305 -#: help.c:270
309 +#: help.c:271
310 #, c-format
311 msgid ""
312 "'%s' appears to be a git command, but we were not\n"
@@ -311,11 +315,11 @@ msgstr ""
315 "'%s' 像是一个 git 命令，但却无法运行。\n"
316 "可能是 git-%s 受损？"
317
314 -#: help.c:327
318 +#: help.c:328
319 msgid "Uh oh. Your system reports no Git commands at all."
320 msgstr "唉呀，您的系统中未发现 Git 命令。"
321
318 -#: help.c:349
322 +#: help.c:350
323 #, c-format
324 msgid ""
325 "WARNING: You called a Git command named '%s', which does not exist.\n"
@@ -324,17 +328,17 @@ msgstr ""
328 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
329 "是 '%s'"
330
327 -#: help.c:354
331 +#: help.c:355
332 #, c-format
333 msgid "in %0.1f seconds automatically..."
334 msgstr "在 %0.1f 秒钟后自动运行..."
335
332 -#: help.c:361
336 +#: help.c:362
337 #, c-format
338 msgid "git: '%s' is not a git command. See 'git --help'."
339 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
340
337 -#: help.c:365
341 +#: help.c:366
342 msgid ""
343 "\n"
344 "Did you mean this?"
@@ -668,261 +672,379 @@ msgstr "无法在 passwd 文件中查询到当前用户：%s"
672 msgid "no such user"
673 msgstr "无此用户"
674
671 -#: wt-status.c:135
675 +#: wt-status.c:141
676 msgid "Unmerged paths:"
677 msgstr "未合并的路径："
678
679 # 译者：注意保持前导空格
676 -#: wt-status.c:141 wt-status.c:158
680 +#: wt-status.c:168 wt-status.c:195
681 #, c-format
682 msgid " (use \"git reset %s <file>...\" to unstage)"
683 msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"
684
685 # 译者：注意保持前导空格
682 -#: wt-status.c:143 wt-status.c:160
686 +#: wt-status.c:170 wt-status.c:197
687 msgid " (use \"git rm --cached <file>...\" to unstage)"
688 msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"
689
690 # 译者：注意保持前导空格
687 -#: wt-status.c:144
691 +#: wt-status.c:174
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
697 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
698 msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
699
691 -#: wt-status.c:152
700 +# 译者：注意保持前导空格
701 +#: wt-status.c:178
702 +msgid " (use \"git rm <file>...\" to mark resolution)"
703 +msgstr " （使用 \"git rm <file>...\" 标记解决方案）"
704 +
705 +#: wt-status.c:189
706 msgid "Changes to be committed:"
707 msgstr "要提交的变更："
708
695 -#: wt-status.c:170
709 +#: wt-status.c:207
710 msgid "Changes not staged for commit:"
711 msgstr "尚未暂存以备提交的变更："
712
713 # 译者：注意保持前导空格
700 -#: wt-status.c:174
714 +#: wt-status.c:211
715 msgid " (use \"git add <file>...\" to update what will be committed)"
716 msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"
717
718 # 译者：注意保持前导空格
705 -#: wt-status.c:176
719 +#: wt-status.c:213
720 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
721 msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"
722
723 # 译者：注意保持前导空格
710 -#: wt-status.c:177
724 +#: wt-status.c:214
725 msgid ""
726 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
727 msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
728
729 # 译者：注意保持前导空格
716 -#: wt-status.c:179
730 +#: wt-status.c:216
731 msgid " (commit or discard the untracked or modified content in submodules)"
732 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
733
720 -#: wt-status.c:188
734 +#: wt-status.c:225
735 #, c-format
736 msgid "%s files:"
737 msgstr "%s文件："
738
739 # 译者：注意保持前导空格
726 -#: wt-status.c:191
740 +#: wt-status.c:228
741 #, c-format
742 msgid " (use \"git %s <file>...\" to include in what will be committed)"
743 msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"
744
731 -#: wt-status.c:208
745 +#: wt-status.c:245
746 msgid "bug"
747 msgstr "bug"
748
735 -#: wt-status.c:213
749 +#: wt-status.c:250
750 msgid "both deleted:"
751 msgstr "双方删除："
752
739 -#: wt-status.c:214
753 +#: wt-status.c:251
754 msgid "added by us:"
755 msgstr "由我们添加："
756
743 -#: wt-status.c:215
757 +#: wt-status.c:252
758 msgid "deleted by them:"
759 msgstr "由他们删除："
760
747 -#: wt-status.c:216
761 +#: wt-status.c:253
762 msgid "added by them:"
763 msgstr "由他们添加："
764
751 -#: wt-status.c:217
765 +#: wt-status.c:254
766 msgid "deleted by us:"
767 msgstr "由我们删除："
768
755 -#: wt-status.c:218
769 +#: wt-status.c:255
770 msgid "both added:"
771 msgstr "双方添加："
772
759 -#: wt-status.c:219
773 +#: wt-status.c:256
774 msgid "both modified:"
775 msgstr "双方修改："
776
777 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
764 -#: wt-status.c:249
778 +#: wt-status.c:286
779 msgid "new commits, "
780 msgstr "新提交, "
781
782 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
769 -#: wt-status.c:251
783 +#: wt-status.c:288
784 msgid "modified content, "
785 msgstr "修改的内容, "
786
787 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
774 -#: wt-status.c:253
788 +#: wt-status.c:290
789 msgid "untracked content, "
790 msgstr "未跟踪的内容, "
791
792 # 译者：为保证在输出中对齐，注意调整句中空格！
779 -#: wt-status.c:267
793 +#: wt-status.c:304
794 #, c-format
795 msgid "new file: %s"
796 msgstr "新文件： %s"
797
798 # 译者：为保证在输出中对齐，注意调整句中空格！
785 -#: wt-status.c:270
799 +#: wt-status.c:307
800 #, c-format
801 msgid "copied: %s -> %s"
802 msgstr "拷贝： %s -> %s"
803
804 # 译者：为保证在输出中对齐，注意调整句中空格！
791 -#: wt-status.c:273
805 +#: wt-status.c:310
806 #, c-format
807 msgid "deleted: %s"
808 msgstr "删除： %s"
809
810 # 译者：为保证在输出中对齐，注意调整句中空格！
797 -#: wt-status.c:276
811 +#: wt-status.c:313
812 #, c-format
813 msgid "modified: %s"
814 msgstr "修改： %s"
815
816 # 译者：为保证在输出中对齐，注意调整句中空格！
803 -#: wt-status.c:279
817 +#: wt-status.c:316
818 #, c-format
819 msgid "renamed: %s -> %s"
820 msgstr "重命名： %s -> %s"
821
822 # 译者：为保证在输出中对齐，注意调整句中空格！
809 -#: wt-status.c:282
823 +#: wt-status.c:319
824 #, c-format
825 msgid "typechange: %s"
826 msgstr "类型变更： %s"
827
828 # 译者：为保证在输出中对齐，注意调整句中空格！
815 -#: wt-status.c:285
829 +#: wt-status.c:322
830 #, c-format
831 msgid "unknown: %s"
832 msgstr "未知： %s"
833
834 # 译者：为保证在输出中对齐，注意调整句中空格！
821 -#: wt-status.c:288
835 +#: wt-status.c:325
836 #, c-format
837 msgid "unmerged: %s"
838 msgstr "未合并： %s"
839
826 -#: wt-status.c:291
840 +#: wt-status.c:328
841 #, c-format
842 msgid "bug: unhandled diff status %c"
843 msgstr "bug：未处理的差异状态 %c"
844
831 -#: wt-status.c:737
845 +#: wt-status.c:786
846 +msgid "You have unmerged paths."
847 +msgstr "您有路径尚未合并。"
848 +
849 +# 译者：注意保持前导空格
850 +#: wt-status.c:789 wt-status.c:913
851 +msgid " (fix conflicts and run \"git commit\")"
852 +msgstr " （解决冲突并运行 \"git commit\"）"
853 +
854 +#: wt-status.c:792
855 +msgid "All conflicts fixed but you are still merging."
856 +msgstr "所有冲突已解决但您仍处于合并中。"
857 +
858 +# 译者：注意保持前导空格
859 +#: wt-status.c:795
860 +msgid " (use \"git commit\" to conclude merge)"
861 +msgstr " （使用 \"git commit\" 结束合并）"
862 +
863 +#: wt-status.c:805
864 +msgid "You are in the middle of an am session."
865 +msgstr "您正处于一个 am 过程中。"
866 +
867 +#: wt-status.c:808
868 +msgid "The current patch is empty."
869 +msgstr "当前的补丁为空。"
870 +
871 +# 译者：注意保持前导空格
872 +#: wt-status.c:812
873 +msgid " (fix conflicts and then run \"git am --resolved\")"
874 +msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
875 +
876 +# 译者：注意保持前导空格
877 +#: wt-status.c:814
878 +msgid " (use \"git am --skip\" to skip this patch)"
879 +msgstr " （使用 \"git am --skip\" 跳过此补丁）"
880 +
881 +# 译者：注意保持前导空格
882 +#: wt-status.c:816
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
887 +msgid "You are currently rebasing."
888 +msgstr "您正在变基。"
889 +
890 +# 译者：注意保持前导空格
891 +#: wt-status.c:877
892 +msgid " (fix conflicts and then run \"git rebase --continue\")"
893 +msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
894 +
895 +# 译者：注意保持前导空格
896 +#: wt-status.c:879
897 +msgid " (use \"git rebase --skip\" to skip this patch)"
898 +msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
899 +
900 +# 译者：注意保持前导空格
901 +#: wt-status.c:881
902 +msgid " (use \"git rebase --abort\" to check out the original branch)"
903 +msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
904 +
905 +# 译者：注意保持前导空格
906 +#: wt-status.c:887
907 +msgid " (all conflicts fixed: run \"git rebase --continue\")"
908 +msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
909 +
910 +#: wt-status.c:889
911 +msgid "You are currently splitting a commit during a rebase."
912 +msgstr "您正在变基过程中拆分一个提交。"
913 +
914 +# 译者：注意保持前导空格
915 +#: wt-status.c:892
916 +msgid " (Once your working directory is clean, run \"git rebase --continue\")"
917 +msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
918 +
919 +#: wt-status.c:894
920 +msgid "You are currently editing a commit during a rebase."
921 +msgstr "您正在变基过程中编辑一个提交。"
922 +
923 +# 译者：注意保持前导空格
924 +#: wt-status.c:897
925 +msgid " (use \"git commit --amend\" to amend the current commit)"
926 +msgstr " （使用 \"git commit --amend\" 修补当前提交）"
927 +
928 +# 译者：注意保持前导空格
929 +#: wt-status.c:899
930 +msgid ""
931 +" (use \"git rebase --continue\" once you are satisfied with your changes)"
932 +msgstr ""
933 +" （执行 \"git rebase --continue\" 一旦您满意您的修改）"
934 +
935 +#: wt-status.c:909
936 +msgid "You are currently cherry-picking."
937 +msgstr "您正在做拣选操作。"
938 +
939 +# 译者：注意保持前导空格
940 +#: wt-status.c:916
941 +msgid " (all conflicts fixed: run \"git commit\")"
942 +msgstr " （解决所有冲突后，执行 \"git commit\"）"
943 +
944 +#: wt-status.c:925
945 +msgid "You are currently bisecting."
946 +msgstr "您正在做二分查找。"
947 +
948 +# 译者：注意保持前导空格
949 +#: wt-status.c:928
950 +msgid " (use \"git bisect reset\" to get back to the original branch)"
951 +msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
952 +
953 +#: wt-status.c:979
954 msgid "On branch "
955 msgstr "位于分支 "
956
835 -#: wt-status.c:744
957 +#: wt-status.c:986
958 msgid "Not currently on any branch."
959 msgstr "当前不在任何分支上。"
960
839 -#: wt-status.c:755
961 +#: wt-status.c:998
962 msgid "Initial commit"
963 msgstr "初始提交"
964
843 -#: wt-status.c:769
965 +#: wt-status.c:1012
966 msgid "Untracked"
967 msgstr "未跟踪的"
968
847 -#: wt-status.c:771
969 +#: wt-status.c:1014
970 msgid "Ignored"
971 msgstr "忽略的"
972
851 -#: wt-status.c:773
973 +#: wt-status.c:1016
974 #, c-format
975 msgid "Untracked files not listed%s"
976 msgstr "未跟踪的文件没有列出%s"
977
978 # 译者：中文字符串拼接，可删除前导空格
857 -#: wt-status.c:775
979 +#: wt-status.c:1018
980 msgid " (use -u option to show untracked files)"
981 msgstr "（使用 -u 参数显示未跟踪的文件）"
982
861 -#: wt-status.c:781
983 +#: wt-status.c:1024
984 msgid "No changes"
985 msgstr "没有修改"
986
865 -#: wt-status.c:785
987 +#: wt-status.c:1028
988 #, c-format
989 msgid "no changes added to commit%s\n"
990 msgstr "修改尚未加入提交%s\n"
991
992 # 译者：中文字符串拼接，可删除前导空格
871 -#: wt-status.c:787
993 +#: wt-status.c:1030
994 msgid " (use \"git add\" and/or \"git commit -a\")"
995 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
996
875 -#: wt-status.c:789
997 +#: wt-status.c:1032
998 #, c-format
999 msgid "nothing added to commit but untracked files present%s\n"
1000 msgstr "空提交但存在未跟踪文件%s\n"
1001
1002 # 译者：中文字符串拼接，可删除前导空格
881 -#: wt-status.c:791
1003 +#: wt-status.c:1034
1004 msgid " (use \"git add\" to track)"
1005 msgstr "（使用 \"git add\" 建立跟踪）"
1006
885 -#: wt-status.c:793 wt-status.c:796 wt-status.c:799
1007 +#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042
1008 #, c-format
1009 msgid "nothing to commit%s\n"
1010 msgstr "无须提交%s\n"
1011
1012 # 译者：中文字符串拼接，可删除前导空格
891 -#: wt-status.c:794
1013 +#: wt-status.c:1037
1014 msgid " (create/copy files and use \"git add\" to track)"
1015 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
1016
1017 # 译者：中文字符串拼接，可删除前导空格
896 -#: wt-status.c:797
1018 +#: wt-status.c:1040
1019 msgid " (use -u to show untracked files)"
1020 msgstr "（使用 -u 显示未跟踪文件）"
1021
1022 # 译者：中文字符串拼接，可删除前导空格
901 -#: wt-status.c:800
1023 +#: wt-status.c:1043
1024 msgid " (working directory clean)"
1025 msgstr "（干净的工作区）"
1026
905 -#: wt-status.c:908
1027 +#: wt-status.c:1151
1028 msgid "HEAD (no branch)"
1029 msgstr "HEAD（非分支）"
1030
1031 # 译者：注意保持句尾空格
910 -#: wt-status.c:914
1032 +#: wt-status.c:1157
1033 msgid "Initial commit on "
1034 msgstr "初始提交于 "
1035
1036 # 译者：注意保持句尾空格
915 -#: wt-status.c:929
1037 +#: wt-status.c:1172
1038 msgid "behind "
1039 msgstr "落后 "
1040
1041 # 译者：注意保持句尾空格
920 -#: wt-status.c:932 wt-status.c:935
1042 +#: wt-status.c:1175 wt-status.c:1178
1043 msgid "ahead "
1044 msgstr "领先 "
1045
1046 # 译者：注意保持句尾空格
925 -#: wt-status.c:937
1047 +#: wt-status.c:1180
1048 msgid ", behind "
1049 msgstr "，落后 "
1050
@@ -949,7 +1071,7 @@ msgstr "路径 '%s' 属于模组 '%.*s'"
1071 msgid "Unstaged changes after refreshing the index:"
1072 msgstr "刷新索引之后尚未被暂存的变更："
1073
952 -#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
1074 +#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
1075 #, c-format
1076 msgid "pathspec '%s' did not match any files"
1077 msgstr "路径 '%s' 未匹配任何文件"
@@ -1026,7 +1148,7 @@ msgstr "也许您想要执行 'git add .'？\n"
1148 msgid "index file corrupt"
1149 msgstr "索引文件损坏"
1150
1029 -#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1151 +#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260
1152 msgid "Unable to write new index file"
1153 msgstr "无法写入新索引文件"
1154
@@ -2558,22 +2680,22 @@ msgstr "无效选项：%s"
2680 msgid "Not a git repository"
2681 msgstr "不是一个 git 版本库"
2682
2561 -#: builtin/diff.c:347
2683 +#: builtin/diff.c:341
2684 #, c-format
2685 msgid "invalid object '%s' given."
2686 msgstr "提供了无效对象 '%s'。"
2687
2566 -#: builtin/diff.c:352
2688 +#: builtin/diff.c:346
2689 #, c-format
2690 msgid "more than %d trees given: '%s'"
2691 msgstr "提供了超过 %d 个树对象：'%s'"
2692
2571 -#: builtin/diff.c:362
2693 +#: builtin/diff.c:356
2694 #, c-format
2695 msgid "more than two blobs given: '%s'"
2696 msgstr "提供了超过两个 blob 对象：'%s'"
2697
2576 -#: builtin/diff.c:370
2698 +#: builtin/diff.c:364
2699 #, c-format
2700 msgid "unhandled object '%s' given."
2701 msgstr "提供了无法处理的对象 '%s'。"
@@ -2822,30 +2944,30 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
2944 msgid "both --cached and trees are given."
2945 msgstr "同时给出了 --cached 和树对象。"
2946
2825 -#: builtin/help.c:59
2947 +#: builtin/help.c:63
2948 #, c-format
2949 msgid "unrecognized help format '%s'"
2950 msgstr "未能识别的帮助格式 '%s'"
2951
2830 -#: builtin/help.c:87
2952 +#: builtin/help.c:91
2953 msgid "Failed to start emacsclient."
2954 msgstr "无法启动 emacsclient。"
2955
2834 -#: builtin/help.c:100
2956 +#: builtin/help.c:104
2957 msgid "Failed to parse emacsclient version."
2958 msgstr "无法解析 emacsclient 版本。"
2959
2838 -#: builtin/help.c:108
2960 +#: builtin/help.c:112
2961 #, c-format
2962 msgid "emacsclient version '%d' too old (< 22)."
2963 msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
2964
2843 -#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
2965 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
2966 #, c-format
2967 msgid "failed to exec '%s': %s"
2968 msgstr "无法执行 '%s'：%s"
2969
2848 -#: builtin/help.c:211
2970 +#: builtin/help.c:215
2971 #, c-format
2972 msgid ""
2973 "'%s': path for unsupported man viewer.\n"
@@ -2854,7 +2976,7 @@ msgstr ""
2976 "'%s'：不支持的 man 手册查看器的路径。\n"
2977 "请使用 'man.<tool>.cmd'。"
2978
2857 -#: builtin/help.c:223
2979 +#: builtin/help.c:227
2980 #, c-format
2981 msgid ""
2982 "'%s': cmd for supported man viewer.\n"
@@ -2863,266 +2985,277 @@ msgstr ""
2985 "'%s': 支持的 man 手册查看器命令。\n"
2986 "请使用 'man.<tool>.path'。"
2987
2866 -#: builtin/help.c:287
2988 +#: builtin/help.c:291
2989 msgid "The most commonly used git commands are:"
2990 msgstr "最常用的 git 命令有："
2991
2870 -#: builtin/help.c:355
2992 +#: builtin/help.c:359
2993 #, c-format
2994 msgid "'%s': unknown man viewer."
2995 msgstr "'%s'：未知的 man 查看器。"
2996
2875 -#: builtin/help.c:372
2997 +#: builtin/help.c:376
2998 msgid "no man viewer handled the request"
2999 msgstr "没有 man 查看器处理此请求"
3000
2879 -#: builtin/help.c:380
3001 +#: builtin/help.c:384
3002 msgid "no info viewer handled the request"
3003 msgstr "没有 info 查看器处理此请求"
3004
2883 -#: builtin/help.c:391
3005 +#: builtin/help.c:395
3006 #, c-format
3007 msgid "'%s': not a documentation directory."
3008 msgstr "'%s'：不是一个文档目录。"
3009
2888 -#: builtin/help.c:432 builtin/help.c:439
3010 +#: builtin/help.c:436 builtin/help.c:443
3011 #, c-format
3012 msgid "usage: %s%s"
3013 msgstr "用法：%s%s"
3014
2893 -#: builtin/help.c:453
3015 +#: builtin/help.c:459
3016 #, c-format
3017 msgid "`git %s' is aliased to `%s'"
3018 msgstr "`git %s' 是 `%s' 的别名"
3019
2898 -#: builtin/index-pack.c:169
3020 +#: builtin/index-pack.c:170
3021 #, c-format
3022 msgid "object type mismatch at %s"
3023 msgstr "%s 的对象类型不匹配"
3024
2903 -#: builtin/index-pack.c:189
3025 +#: builtin/index-pack.c:190
3026 msgid "object of unexpected type"
3027 msgstr "意外的类型的对象"
3028
2907 -#: builtin/index-pack.c:226
3029 +#: builtin/index-pack.c:227
3030 #, c-format
3031 msgid "cannot fill %d byte"
3032 msgid_plural "cannot fill %d bytes"
3033 msgstr[0] "无法填充 %d 字节"
3034 msgstr[1] "无法填充 %d 字节"
3035
2914 -#: builtin/index-pack.c:236
3036 +#: builtin/index-pack.c:237
3037 msgid "early EOF"
3038 msgstr "过早的文件结束符（EOF）"
3039
2918 -#: builtin/index-pack.c:237
3040 +#: builtin/index-pack.c:238
3041 msgid "read error on input"
3042 msgstr "输入上的读错误"
3043
2922 -#: builtin/index-pack.c:249
3044 +#: builtin/index-pack.c:250
3045 msgid "used more bytes than were available"
3046 msgstr "用掉了超过可用的字节"
3047
2926 -#: builtin/index-pack.c:256
3048 +#: builtin/index-pack.c:257
3049 msgid "pack too large for current definition of off_t"
3050 msgstr "包太大超过了当前 off_t 的定义"
3051
2930 -#: builtin/index-pack.c:272
3052 +#: builtin/index-pack.c:273
3053 #, c-format
3054 msgid "unable to create '%s'"
3055 msgstr "不能创建 '%s'"
3056
2935 -#: builtin/index-pack.c:277
3057 +#: builtin/index-pack.c:278
3058 #, c-format
3059 msgid "cannot open packfile '%s'"
3060 msgstr "无法打开包文件 '%s'"
3061
2940 -#: builtin/index-pack.c:291
3062 +#: builtin/index-pack.c:292
3063 msgid "pack signature mismatch"
3064 msgstr "包签名不匹配"
3065
2944 -#: builtin/index-pack.c:311
3066 +#: builtin/index-pack.c:312
3067 #, c-format
3068 msgid "pack has bad object at offset %lu: %s"
3069 msgstr "包中有错误的对象位于 %lu：%s"
3070
2949 -#: builtin/index-pack.c:405
3071 +#: builtin/index-pack.c:434
3072 #, c-format
3073 msgid "inflate returned %d"
3074 msgstr "解压缩返回 %d"
3075
2954 -#: builtin/index-pack.c:450
3076 +#: builtin/index-pack.c:483
3077 msgid "offset value overflow for delta base object"
3078 msgstr "偏移值覆盖了 delta 基准对象"
3079
2958 -#: builtin/index-pack.c:458
3080 +#: builtin/index-pack.c:491
3081 msgid "delta base offset is out of bound"
3082 msgstr "delta 基准偏移越界"
3083
2962 -#: builtin/index-pack.c:466
3084 +#: builtin/index-pack.c:499
3085 #, c-format
3086 msgid "unknown object type %d"
3087 msgstr "未知对象类型 %d"
3088
2967 -#: builtin/index-pack.c:495
3089 +#: builtin/index-pack.c:531
3090 msgid "cannot pread pack file"
3091 msgstr "无法读取包文件"
3092
2971 -#: builtin/index-pack.c:497
3093 +#: builtin/index-pack.c:533
3094 #, c-format
3095 msgid "premature end of pack file, %lu byte missing"
3096 msgid_plural "premature end of pack file, %lu bytes missing"
3097 msgstr[0] "包文件过早结束，缺少 %lu 字节"
3098 msgstr[1] "包文件过早结束，缺少 %lu 字节"
3099
2978 -#: builtin/index-pack.c:510
3100 +#: builtin/index-pack.c:555
3101 msgid "serious inflate inconsistency"
3102 msgstr "解压缩严重的不一致"
3103
2982 -#: builtin/index-pack.c:583
2983 -#, c-format
2984 -msgid "cannot read existing object %s"
2985 -msgstr "不能读取现存对象 %s"
2986 -
2987 -#: builtin/index-pack.c:586
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 #, c-format
3107 msgid "SHA1 COLLISION FOUND WITH %s !"
3108 msgstr "发现 %s 出现 SHA1 冲突！"
3109
2992 -#: builtin/index-pack.c:598
3110 +#: builtin/index-pack.c:649 builtin/pack-objects.c:170
3111 +#: builtin/pack-objects.c:262
3112 +#, c-format
3113 +msgid "unable to read %s"
3114 +msgstr "不能读 %s"
3115 +
3116 +#: builtin/index-pack.c:715
3117 +#, c-format
3118 +msgid "cannot read existing object %s"
3119 +msgstr "不能读取现存对象 %s"
3120 +
3121 +#: builtin/index-pack.c:729
3122 #, c-format
3123 msgid "invalid blob object %s"
3124 msgstr "无效的 blob 对象 %s"
3125
2997 -#: builtin/index-pack.c:610
3126 +#: builtin/index-pack.c:744
3127 #, c-format
3128 msgid "invalid %s"
3129 msgstr "无效的 %s"
3130
3002 -#: builtin/index-pack.c:612
3131 +#: builtin/index-pack.c:746
3132 msgid "Error in object"
3133 msgstr "对象中出错"
3134
3006 -#: builtin/index-pack.c:614
3135 +#: builtin/index-pack.c:748
3136 #, c-format
3137 msgid "Not all child objects of %s are reachable"
3138 msgstr "%s 的所有子对象并非都可达"
3139
3011 -#: builtin/index-pack.c:687 builtin/index-pack.c:713
3140 +#: builtin/index-pack.c:818 builtin/index-pack.c:844
3141 msgid "failed to apply delta"
3142 msgstr "无法应用 delta"
3143
3015 -#: builtin/index-pack.c:850
3144 +#: builtin/index-pack.c:983
3145 msgid "Receiving objects"
3146 msgstr "接收对象中"
3147
3019 -#: builtin/index-pack.c:850
3148 +#: builtin/index-pack.c:983
3149 msgid "Indexing objects"
3150 msgstr "索引对象中"
3151
3023 -#: builtin/index-pack.c:872
3152 +#: builtin/index-pack.c:1009
3153 msgid "pack is corrupted (SHA1 mismatch)"
3154 msgstr "包冲突（SHA1 不匹配）"
3155
3027 -#: builtin/index-pack.c:877
3156 +#: builtin/index-pack.c:1014
3157 msgid "cannot fstat packfile"
3158 msgstr "不能枚举包文件状态"
3159
3031 -#: builtin/index-pack.c:880
3160 +#: builtin/index-pack.c:1017
3161 msgid "pack has junk at the end"
3162 msgstr "包的结尾有垃圾数据"
3163
3035 -#: builtin/index-pack.c:903
3164 +#: builtin/index-pack.c:1028
3165 +msgid "confusion beyond insanity in parse_pack_objects()"
3166 +msgstr "parse_pack_objects() 中遇到不可理喻的问题"
3167 +
3168 +#: builtin/index-pack.c:1051
3169 msgid "Resolving deltas"
3170 msgstr "处理 delta 中"
3171
3039 -#: builtin/index-pack.c:954
3172 +#: builtin/index-pack.c:1102
3173 msgid "confusion beyond insanity"
3174 msgstr "不可理喻"
3175
3043 -#: builtin/index-pack.c:973
3176 +#: builtin/index-pack.c:1121
3177 #, c-format
3178 msgid "pack has %d unresolved delta"
3179 msgid_plural "pack has %d unresolved deltas"
3180 msgstr[0] "包有 %d 个未解决的 delta"
3181 msgstr[1] "包有 %d 个未解决的 delta"
3182
3050 -#: builtin/index-pack.c:998
3183 +#: builtin/index-pack.c:1146
3184 #, c-format
3185 msgid "unable to deflate appended object (%d)"
3186 msgstr "不能缩小附加对象（%d）"
3187
3055 -#: builtin/index-pack.c:1077
3188 +#: builtin/index-pack.c:1225
3189 #, c-format
3190 msgid "local object %s is corrupt"
3191 msgstr "本地对象 %s 已损坏"
3192
3060 -#: builtin/index-pack.c:1101
3193 +#: builtin/index-pack.c:1249
3194 msgid "error while closing pack file"
3195 msgstr "关闭包文件时出错"
3196
3064 -#: builtin/index-pack.c:1114
3197 +#: builtin/index-pack.c:1262
3198 #, c-format
3199 msgid "cannot write keep file '%s'"
3200 msgstr "无法写保留文件 '%s'"
3201
3069 -#: builtin/index-pack.c:1122
3202 +#: builtin/index-pack.c:1270
3203 #, c-format
3204 msgid "cannot close written keep file '%s'"
3205 msgstr "无法关闭保留文件 '%s'"
3206
3074 -#: builtin/index-pack.c:1135
3207 +#: builtin/index-pack.c:1283
3208 msgid "cannot store pack file"
3209 msgstr "无法存储包文件"
3210
3078 -#: builtin/index-pack.c:1146
3211 +#: builtin/index-pack.c:1294
3212 msgid "cannot store index file"
3213 msgstr "无法存储索引文件"
3214
3082 -#: builtin/index-pack.c:1247
3215 +#: builtin/index-pack.c:1395
3216 #, c-format
3217 msgid "Cannot open existing pack file '%s'"
3218 msgstr "无法打开现存包文件 '%s'"
3219
3087 -#: builtin/index-pack.c:1249
3220 +#: builtin/index-pack.c:1397
3221 #, c-format
3222 msgid "Cannot open existing pack idx file for '%s'"
3223 msgstr "无法为 %s 打开包索引文件"
3224
3092 -#: builtin/index-pack.c:1296
3225 +#: builtin/index-pack.c:1444
3226 #, c-format
3227 msgid "non delta: %d object"
3228 msgid_plural "non delta: %d objects"
3229 msgstr[0] "非 delta：%d 个对象"
3230 msgstr[1] "非 delta：%d 个对象"
3231
3099 -#: builtin/index-pack.c:1303
3232 +#: builtin/index-pack.c:1451
3233 #, c-format
3234 msgid "chain length = %d: %lu object"
3235 msgid_plural "chain length = %d: %lu objects"
3236 msgstr[0] "链长 = %d: %lu 对象"
3237 msgstr[1] "链长 = %d: %lu 对象"
3238
3106 -#: builtin/index-pack.c:1330
3239 +#: builtin/index-pack.c:1478
3240 msgid "Cannot come back to cwd"
3241 msgstr "无法返回当前工作目录"
3242
3110 -#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
3111 -#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
3243 +#: builtin/index-pack.c:1522 builtin/index-pack.c:1525
3244 +#: builtin/index-pack.c:1537 builtin/index-pack.c:1541
3245 #, c-format
3246 msgid "bad %s"
3247 msgstr "错误选项 %s"
3248
3116 -#: builtin/index-pack.c:1407
3249 +#: builtin/index-pack.c:1555
3250 msgid "--fix-thin cannot be used without --stdin"
3251 msgstr "--fix-thin 不能和 --stdin 共用"
3252
3120 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
3253 +#: builtin/index-pack.c:1559 builtin/index-pack.c:1569
3254 #, c-format
3255 msgid "packfile name '%s' does not end with '.pack'"
3256 msgstr "包名 '%s' 没有以 '.pack' 结尾"
3257
3125 -#: builtin/index-pack.c:1430
3258 +#: builtin/index-pack.c:1578
3259 msgid "--verify with no packfile name given"
3260 msgstr "--verify 没有提供包名参数"
3261
@@ -3271,100 +3404,100 @@ msgstr "不能访问当前工作目录"
3404 msgid "Cannot access work tree '%s'"
3405 msgstr "不能访问工作区 '%s'"
3406
3274 -#: builtin/log.c:188
3407 +#: builtin/log.c:189
3408 #, c-format
3409 msgid "Final output: %d %s\n"
3410 msgstr "最终输出：%d %s\n"
3411
3279 -#: builtin/log.c:401 builtin/log.c:489
3412 +#: builtin/log.c:402 builtin/log.c:490
3413 #, c-format
3414 msgid "Could not read object %s"
3415 msgstr "不能读取对象 %s"
3416
3284 -#: builtin/log.c:513
3417 +#: builtin/log.c:514
3418 #, c-format
3419 msgid "Unknown type: %d"
3420 msgstr "未知类型：%d"
3421
3289 -#: builtin/log.c:602
3422 +#: builtin/log.c:603
3423 msgid "format.headers without value"
3424 msgstr "format.headers 没有值"
3425
3293 -#: builtin/log.c:676
3426 +#: builtin/log.c:677
3427 msgid "name of output directory is too long"
3428 msgstr "输出目录名太长"
3429
3297 -#: builtin/log.c:687
3430 +#: builtin/log.c:688
3431 #, c-format
3432 msgid "Cannot open patch file %s"
3433 msgstr "无法打开补丁文件 %s"
3434
3302 -#: builtin/log.c:701
3435 +#: builtin/log.c:702
3436 msgid "Need exactly one range."
3437 msgstr "只需要一个范围。"
3438
3306 -#: builtin/log.c:709
3439 +#: builtin/log.c:710
3440 msgid "Not a range."
3441 msgstr "不是一个范围。"
3442
3310 -#: builtin/log.c:786
3443 +#: builtin/log.c:787
3444 msgid "Cover letter needs email format"
3445 msgstr "信封需要邮件地址格式"
3446
3314 -#: builtin/log.c:859
3447 +#: builtin/log.c:860
3448 #, c-format
3449 msgid "insane in-reply-to: %s"
3450 msgstr "不正常的 in-reply-to：%s"
3451
3319 -#: builtin/log.c:932
3452 +#: builtin/log.c:933
3453 msgid "Two output directories?"
3454 msgstr "两个输出目录？"
3455
3323 -#: builtin/log.c:1153
3456 +#: builtin/log.c:1154
3457 #, c-format
3458 msgid "bogus committer info %s"
3459 msgstr "虚假的提交者信息 %s"
3460
3328 -#: builtin/log.c:1198
3461 +#: builtin/log.c:1199
3462 msgid "-n and -k are mutually exclusive."
3463 msgstr "-n 和 -k 互斥。"
3464
3332 -#: builtin/log.c:1200
3465 +#: builtin/log.c:1201
3466 msgid "--subject-prefix and -k are mutually exclusive."
3467 msgstr "--subject-prefix 和 -k 互斥。"
3468
3336 -#: builtin/log.c:1208
3469 +#: builtin/log.c:1209
3470 msgid "--name-only does not make sense"
3471 msgstr "--name-only 无意义"
3472
3340 -#: builtin/log.c:1210
3473 +#: builtin/log.c:1211
3474 msgid "--name-status does not make sense"
3475 msgstr "--name-status 无意义"
3476
3344 -#: builtin/log.c:1212
3477 +#: builtin/log.c:1213
3478 msgid "--check does not make sense"
3479 msgstr "--check 无意义"
3480
3348 -#: builtin/log.c:1235
3481 +#: builtin/log.c:1236
3482 msgid "standard output, or directory, which one?"
3483 msgstr "标准输出或目录，哪一个？"
3484
3352 -#: builtin/log.c:1237
3485 +#: builtin/log.c:1238
3486 #, c-format
3487 msgid "Could not create directory '%s'"
3488 msgstr "不能创建目录 '%s'"
3489
3357 -#: builtin/log.c:1390
3490 +#: builtin/log.c:1391
3491 msgid "Failed to create output files"
3492 msgstr "无法创建输出文件"
3493
3361 -#: builtin/log.c:1494
3494 +#: builtin/log.c:1495
3495 #, c-format
3496 msgid ""
3497 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3498 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
3499
3367 -#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524
3500 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3501 #, c-format
3502 msgid "Unknown commit %s"
3503 msgstr "未知提交 %s"
@@ -3845,22 +3978,27 @@ msgstr "对象 %s 没有注解\n"
3978 msgid "Unknown subcommand: %s"
3979 msgstr "未知子命令：%s"
3980
3848 -#: builtin/pack-objects.c:2337
3981 +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
3982 +#, c-format
3983 +msgid "deflate error (%d)"
3984 +msgstr "压缩错误 (%d)"
3985 +
3986 +#: builtin/pack-objects.c:2398
3987 #, c-format
3988 msgid "unsupported index version %s"
3989 msgstr "不支持的索引版本 %s"
3990
3853 -#: builtin/pack-objects.c:2341
3991 +#: builtin/pack-objects.c:2402
3992 #, c-format
3993 msgid "bad index version '%s'"
3994 msgstr "坏的索引版本 '%s'"
3995
3858 -#: builtin/pack-objects.c:2364
3996 +#: builtin/pack-objects.c:2425
3997 #, c-format
3998 msgid "option %s does not accept negative form"
3999 msgstr "选项 %s 不接受否定格式"
4000
3863 -#: builtin/pack-objects.c:2368
4001 +#: builtin/pack-objects.c:2429
4002 #, c-format
4003 msgid "unable to parse value '%s' for option %s"
4004 msgstr "不能解析选项 %1$s 的值 '%2$s'"
@@ -4810,8 +4948,7 @@ msgstr "您需要先设置你的提交者信息"
4948 msgid ""
4949 "You seem to have moved HEAD since the last 'am' failure.\n"
4950 "Not rewinding to ORIG_HEAD"
4813 -msgstr ""
4814 -"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4951 +msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4952
4953 #: git-am.sh:105
4954 #, sh-format
@@ -4929,8 +5066,7 @@ msgstr ""
5066 msgid ""
5067 "You still have unmerged paths in your index\n"
5068 "did you forget to use 'git add'?"
4932 -msgstr ""
4933 -"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
5069 +msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"
5070
5071 #: git-am.sh:847
5072 msgid "No changes -- Patch already applied."
@@ -5271,37 +5407,37 @@ msgstr "未指定分支名"
5407 msgid "(To restore them type \"git stash apply\")"
5408 msgstr "（为恢复数据输入 \"git stash apply\"）"
5409
5274 -#: git-submodule.sh:56
5410 +#: git-submodule.sh:88
5411 #, sh-format
5412 msgid "cannot strip one component off url '$remoteurl'"
5413 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5414
5279 -#: git-submodule.sh:109
5415 +#: git-submodule.sh:145
5416 #, sh-format
5417 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5418 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5419
5284 -#: git-submodule.sh:150
5420 +#: git-submodule.sh:186
5421 #, sh-format
5422 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5423 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5424
5289 -#: git-submodule.sh:160
5425 +#: git-submodule.sh:196
5426 #, sh-format
5427 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5428 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5429
5294 -#: git-submodule.sh:249
5430 +#: git-submodule.sh:285
5431 #, sh-format
5432 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5433 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
5434
5299 -#: git-submodule.sh:266
5435 +#: git-submodule.sh:302
5436 #, sh-format
5437 msgid "'$sm_path' already exists in the index"
5438 msgstr "'$sm_path' 已经存在于索引中"
5439
5304 -#: git-submodule.sh:270
5440 +#: git-submodule.sh:306
5441 #, sh-format
5442 msgid ""
5443 "The following path is ignored by one of your .gitignore files:\n"
@@ -5312,62 +5448,62 @@ msgstr ""
5448 "$sm_path\n"
5449 "如果您确实想添加它，使用 -f 参数。"
5450
5315 -#: git-submodule.sh:281
5451 +#: git-submodule.sh:317
5452 #, sh-format
5453 msgid "Adding existing repo at '$sm_path' to the index"
5454 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5455
5320 -#: git-submodule.sh:283
5456 +#: git-submodule.sh:319
5457 #, sh-format
5458 msgid "'$sm_path' already exists and is not a valid git repo"
5459 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5460
5325 -#: git-submodule.sh:297
5461 +#: git-submodule.sh:333
5462 #, sh-format
5463 msgid "Unable to checkout submodule '$sm_path'"
5464 msgstr "不能检出子模组 '$sm_path'"
5465
5330 -#: git-submodule.sh:302
5466 +#: git-submodule.sh:338
5467 #, sh-format
5468 msgid "Failed to add submodule '$sm_path'"
5469 msgstr "无法添加子模组 '$sm_path'"
5470
5335 -#: git-submodule.sh:307
5471 +#: git-submodule.sh:343
5472 #, sh-format
5473 msgid "Failed to register submodule '$sm_path'"
5474 msgstr "无法注册子模组 '$sm_path'"
5475
5340 -#: git-submodule.sh:349
5476 +#: git-submodule.sh:385
5477 #, sh-format
5478 msgid "Entering '$prefix$sm_path'"
5479 msgstr "正在进入 '$prefix$sm_path'"
5480
5345 -#: git-submodule.sh:363
5481 +#: git-submodule.sh:399
5482 #, sh-format
5483 msgid "Stopping at '$sm_path'; script returned non-zero status."
5484 msgstr "停止于 '$sm_path'，脚本返回非零值。"
5485
5350 -#: git-submodule.sh:406
5486 +#: git-submodule.sh:442
5487 #, sh-format
5488 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5489 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5490
5355 -#: git-submodule.sh:415
5491 +#: git-submodule.sh:451
5492 #, sh-format
5493 msgid "Failed to register url for submodule path '$sm_path'"
5494 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5495
5360 -#: git-submodule.sh:417
5496 +#: git-submodule.sh:453
5497 #, sh-format
5498 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5499 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5500
5365 -#: git-submodule.sh:425
5501 +#: git-submodule.sh:461
5502 #, sh-format
5503 msgid "Failed to register update mode for submodule path '$sm_path'"
5504 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5505
5370 -#: git-submodule.sh:524
5506 +#: git-submodule.sh:560
5507 #, sh-format
5508 msgid ""
5509 "Submodule path '$sm_path' not initialized\n"
@@ -5376,96 +5512,96 @@ msgstr ""
5512 "子模组路径 '$sm_path' 没有初始化\n"
5513 "也许您想用 'update --init'？"
5514
5379 -#: git-submodule.sh:537
5515 +#: git-submodule.sh:573
5516 #, sh-format
5517 msgid "Unable to find current revision in submodule path '$sm_path'"
5518 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5519
5384 -#: git-submodule.sh:556
5520 +#: git-submodule.sh:592
5521 #, sh-format
5522 msgid "Unable to fetch in submodule path '$sm_path'"
5523 msgstr "无法在子模组路径 '$sm_path' 中获取"
5524
5389 -#: git-submodule.sh:570
5525 +#: git-submodule.sh:606
5526 #, sh-format
5527 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5528 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5529
5394 -#: git-submodule.sh:571
5530 +#: git-submodule.sh:607
5531 #, sh-format
5532 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5533 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
5534
5399 -#: git-submodule.sh:576
5535 +#: git-submodule.sh:612
5536 #, sh-format
5537 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5538 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5539
5404 -#: git-submodule.sh:577
5540 +#: git-submodule.sh:613
5541 #, sh-format
5542 msgid "Submodule path '$sm_path': merged in '$sha1'"
5543 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
5544
5409 -#: git-submodule.sh:582
5545 +#: git-submodule.sh:618
5546 #, sh-format
5547 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5548 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5549
5414 -#: git-submodule.sh:583
5550 +#: git-submodule.sh:619
5551 #, sh-format
5552 msgid "Submodule path '$sm_path': checked out '$sha1'"
5553 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
5554
5419 -#: git-submodule.sh:605 git-submodule.sh:928
5555 +#: git-submodule.sh:641 git-submodule.sh:964
5556 #, sh-format
5557 msgid "Failed to recurse into submodule path '$sm_path'"
5558 msgstr "无法递归进子模组路径 '$sm_path'"
5559
5424 -#: git-submodule.sh:713
5560 +#: git-submodule.sh:749
5561 msgid "--cached cannot be used with --files"
5562 msgstr "--cached 不能和 --files 共用"
5563
5564 #. unexpected type
5429 -#: git-submodule.sh:753
5565 +#: git-submodule.sh:789
5566 #, sh-format
5567 msgid "unexpected mode $mod_dst"
5568 msgstr "意外的模式 $mod_dst"
5569
5570 # 译者：注意保持前导空格
5435 -#: git-submodule.sh:771
5571 +#: git-submodule.sh:807
5572 #, sh-format
5573 msgid " Warn: $name doesn't contain commit $sha1_src"
5574 msgstr " 警告：$name 未包含提交 $sha1_src"
5575
5576 # 译者：注意保持前导空格
5441 -#: git-submodule.sh:774
5577 +#: git-submodule.sh:810
5578 #, sh-format
5579 msgid " Warn: $name doesn't contain commit $sha1_dst"
5580 msgstr " 警告：$name 未包含提交 $sha1_dst"
5581
5582 # 译者：注意保持前导空格
5447 -#: git-submodule.sh:777
5583 +#: git-submodule.sh:813
5584 #, sh-format
5585 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5586 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
5587
5452 -#: git-submodule.sh:802
5588 +#: git-submodule.sh:838
5589 msgid "blob"
5590 msgstr "blob"
5591
5456 -#: git-submodule.sh:803
5592 +#: git-submodule.sh:839
5593 msgid "submodule"
5594 msgstr "子模组"
5595
5460 -#: git-submodule.sh:840
5596 +#: git-submodule.sh:876
5597 msgid "# Submodules changed but not updated:"
5598 msgstr "# 子模组已修改但尚未更新："
5599
5464 -#: git-submodule.sh:842
5600 +#: git-submodule.sh:878
5601 msgid "# Submodule changes to be committed:"
5602 msgstr "要提交的子模组变更："
5603
5468 -#: git-submodule.sh:974
5604 +#: git-submodule.sh:1022
5605 #, sh-format
5606 msgid "Synchronizing submodule url for '$name'"
5607 msgstr "为 '$name' 同步子模组 url"