@matheusbsbs / matheus-bagliano / commits / 170e989983

l10n: Update Simplified Chinese translation

Translate new messages for git master branch. - sha1_name.c: 4 new messages. - builtin/push.c: 3 new messages. - git-submodule.sh: variable name changed from '$path' to '$sm_path'. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Apr 30, 2012 at 00:06 UTC 170e98998310e9751764734ee9af6f3cfdfdea66
1 file changed +351 -306
po/zh_CN.po
+351 -306
@@ -12,7 +12,7 @@ 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-04-28 20:33+0800\n"
15 +"POT-Creation-Date: 2012-04-28 20:17+0800\n"
16 "PO-Revision-Date: 2012-01-30 00:00+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
@@ -22,7 +22,7 @@ msgstr ""
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=1; plural=0;\n"
24
25 -#: advice.c:34
25 +#: advice.c:40
26 #, c-format
27 msgid "hint: %.*s\n"
28 msgstr "提示：%.*s\n"
@@ -31,7 +31,7 @@ msgstr "提示：%.*s\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
33 #.
34 -#: advice.c:64
34 +#: advice.c:70
35 msgid ""
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
@@ -42,12 +42,12 @@ msgstr ""
42 "'git add/rm <file>' 标记解决方案，\n"
43 "或使用 'git commit -a'。"
44
45 -#: commit.c:47
45 +#: commit.c:48
46 #, c-format
47 msgid "could not parse %s"
48 msgstr "不能解析 %s"
49
50 -#: commit.c:49
50 +#: commit.c:50
51 #, c-format
52 msgid "%s %s is not a commit!"
53 msgstr "%s %s 不是一个提交!"
@@ -183,14 +183,14 @@ msgstr[0] ""
183 "您的分支和 '%s' 出现了偏离，\n"
184 "并且各自分别有 %d 和 %d 处不同的提交。\n"
185
186 -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
187 -#: builtin/merge.c:1095 builtin/merge.c:1105
186 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
187 +#: builtin/merge.c:1088 builtin/merge.c:1098
188 #, c-format
189 msgid "Could not open '%s' for writing"
190 msgstr "不能为写入打开 '%s'"
191
192 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
193 -#: builtin/merge.c:1097 builtin/merge.c:1110
192 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
193 +#: builtin/merge.c:1090 builtin/merge.c:1103
194 #, c-format
195 msgid "Could not write to '%s'"
196 msgstr "不能写入 '%s'"
@@ -285,8 +285,8 @@ msgstr "不能还原 %s... %s"
285 msgid "could not apply %s... %s"
286 msgstr "不能应用 %s... %s"
287
288 -#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
289 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
288 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719
289 +#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
290 #: builtin/shortlog.c:181
291 msgid "revision walk setup failed"
292 msgstr "版本遍历设置失败"
@@ -411,6 +411,25 @@ msgstr "不能作为初始提交还原"
411 msgid "Can't cherry-pick into empty head"
412 msgstr "不能拣选到空分支"
413
414 +#: sha1_name.c:864
415 +msgid "HEAD does not point to a branch"
416 +msgstr "HEAD 没有指向一个分支"
417 +
418 +#: sha1_name.c:867
419 +#, c-format
420 +msgid "No such branch: '%s'"
421 +msgstr "没有此分支：'%s'"
422 +
423 +#: sha1_name.c:869
424 +#, c-format
425 +msgid "No upstream configured for branch '%s'"
426 +msgstr "尚未给分支 '%s' 设置上游"
427 +
428 +#: sha1_name.c:872
429 +#, c-format
430 +msgid "Upstream branch '%s' not stored as a remote-tracking branch"
431 +msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
432 +
433 #: wt-status.c:134
434 msgid "Unmerged paths:"
435 msgstr "未合并的路径："
@@ -830,34 +849,34 @@ msgstr ""
849
850 # 译者：汉字之间无空格，故删除尾部空格
851 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
833 -#: builtin/branch.c:163
852 +#: builtin/branch.c:164
853 msgid "remote "
854 msgstr "远程"
855
837 -#: builtin/branch.c:171
856 +#: builtin/branch.c:172
857 msgid "cannot use -a with -d"
858 msgstr "不能将 -a 和 -d 共用"
859
841 -#: builtin/branch.c:177
860 +#: builtin/branch.c:178
861 msgid "Couldn't look up commit object for HEAD"
862 msgstr "无法查询 HEAD 指向的提交对象"
863
845 -#: builtin/branch.c:182
864 +#: builtin/branch.c:183
865 #, c-format
866 msgid "Cannot delete the branch '%s' which you are currently on."
867 msgstr "无法删除您当前所在的分支 '%s'。"
868
850 -#: builtin/branch.c:192
869 +#: builtin/branch.c:193
870 #, c-format
871 msgid "%sbranch '%s' not found."
872 msgstr "%s分支 '%s' 未发现。"
873
855 -#: builtin/branch.c:200
874 +#: builtin/branch.c:201
875 #, c-format
876 msgid "Couldn't look up commit object for '%s'"
877 msgstr "无法查询 '%s' 指向的提交对象"
878
860 -#: builtin/branch.c:206
879 +#: builtin/branch.c:207
880 #, c-format
881 msgid ""
882 "The branch '%s' is not fully merged.\n"
@@ -866,97 +885,97 @@ msgstr ""
885 "分支 '%s' 没有完全合并。\n"
886 "如果您确认要删除它，执行 'git branch -D %s'。"
887
869 -#: builtin/branch.c:214
888 +#: builtin/branch.c:215
889 #, c-format
890 msgid "Error deleting %sbranch '%s'"
891 msgstr "删除 %s分支 '%s' 时出错"
892
874 -#: builtin/branch.c:219
893 +#: builtin/branch.c:221
894 #, c-format
895 msgid "Deleted %sbranch %s (was %s).\n"
896 msgstr "已删除 %s分支 %s（曾为 %s）。\n"
897
879 -#: builtin/branch.c:224
898 +#: builtin/branch.c:226
899 msgid "Update of config-file failed"
900 msgstr "无法更新 config 文件"
901
883 -#: builtin/branch.c:322
902 +#: builtin/branch.c:324
903 #, c-format
904 msgid "branch '%s' does not point at a commit"
905 msgstr "分支 '%s' 未指向一个提交"
906
907 # 译者：注意保持句尾空格
889 -#: builtin/branch.c:394
908 +#: builtin/branch.c:396
909 #, c-format
910 msgid "behind %d] "
911 msgstr "落后 %d] "
912
913 # 译者：注意保持句尾空格
895 -#: builtin/branch.c:396
914 +#: builtin/branch.c:398
915 #, c-format
916 msgid "ahead %d] "
917 msgstr "领先 %d] "
918
919 # 译者：注意保持句尾空格
901 -#: builtin/branch.c:398
920 +#: builtin/branch.c:400
921 #, c-format
922 msgid "ahead %d, behind %d] "
923 msgstr "领先 %d，落后 %d] "
924
906 -#: builtin/branch.c:501
925 +#: builtin/branch.c:503
926 msgid "(no branch)"
927 msgstr "（非分支）"
928
910 -#: builtin/branch.c:566
929 +#: builtin/branch.c:568
930 msgid "some refs could not be read"
931 msgstr "一些引用不能读取"
932
914 -#: builtin/branch.c:579
933 +#: builtin/branch.c:581
934 msgid "cannot rename the current branch while not on any."
935 msgstr "无法重命名当前分支因为不处于任何分支上。"
936
918 -#: builtin/branch.c:589
937 +#: builtin/branch.c:591
938 #, c-format
939 msgid "Invalid branch name: '%s'"
940 msgstr "无效的分支名：'%s'"
941
923 -#: builtin/branch.c:604
942 +#: builtin/branch.c:606
943 msgid "Branch rename failed"
944 msgstr "分支重命名失败"
945
927 -#: builtin/branch.c:608
946 +#: builtin/branch.c:610
947 #, c-format
948 msgid "Renamed a misnamed branch '%s' away"
949 msgstr "重命名掉一个错误命名的旧分支 '%s'"
950
932 -#: builtin/branch.c:612
951 +#: builtin/branch.c:614
952 #, c-format
953 msgid "Branch renamed to %s, but HEAD is not updated!"
954 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
955
937 -#: builtin/branch.c:619
956 +#: builtin/branch.c:621
957 msgid "Branch is renamed, but update of config-file failed"
958 msgstr "分支被重命名，但更新 config 文件失败"
959
941 -#: builtin/branch.c:634
960 +#: builtin/branch.c:636
961 #, c-format
962 msgid "malformed object name %s"
963 msgstr "非法的对象名 %s"
964
946 -#: builtin/branch.c:658
965 +#: builtin/branch.c:660
966 #, c-format
967 msgid "could not write branch description template: %s\n"
968 msgstr "不能写分支描述模版：%s\n"
969
951 -#: builtin/branch.c:746
970 +#: builtin/branch.c:750
971 msgid "Failed to resolve HEAD as a valid ref."
972 msgstr "无法将 HEAD 解析为有效引用。"
973
955 -#: builtin/branch.c:751 builtin/clone.c:558
974 +#: builtin/branch.c:755 builtin/clone.c:558
975 msgid "HEAD not found below refs/heads!"
976 msgstr "HEAD 没有位于 /refs/heads 之下！"
977
959 -#: builtin/branch.c:809
978 +#: builtin/branch.c:813
979 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
980 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
981
@@ -1018,7 +1037,7 @@ msgid "path '%s' is unmerged"
1037 msgstr "路径 '%s' 未合并"
1038
1039 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
1021 -#: builtin/merge.c:811
1040 +#: builtin/merge.c:812
1041 msgid "unable to write new index file"
1042 msgstr "无法写新的索引文件"
1043
@@ -1035,43 +1054,43 @@ msgstr "您需要先解决当前索引的冲突"
1054 msgid "Can not do reflog for '%s'\n"
1055 msgstr "不能对 '%s' 执行 reflog 操作\n"
1056
1038 -#: builtin/checkout.c:565
1057 +#: builtin/checkout.c:566
1058 msgid "HEAD is now at"
1059 msgstr "HEAD 目前位于"
1060
1042 -#: builtin/checkout.c:572
1061 +#: builtin/checkout.c:573
1062 #, c-format
1063 msgid "Reset branch '%s'\n"
1064 msgstr "重置分支 '%s'\n"
1065
1047 -#: builtin/checkout.c:575
1066 +#: builtin/checkout.c:576
1067 #, c-format
1068 msgid "Already on '%s'\n"
1069 msgstr "已经位于 '%s'\n"
1070
1052 -#: builtin/checkout.c:579
1071 +#: builtin/checkout.c:580
1072 #, c-format
1073 msgid "Switched to and reset branch '%s'\n"
1074 msgstr "切换并重置分支 '%s'\n"
1075
1057 -#: builtin/checkout.c:581
1076 +#: builtin/checkout.c:582
1077 #, c-format
1078 msgid "Switched to a new branch '%s'\n"
1079 msgstr "切换到一个新分支 '%s'\n"
1080
1062 -#: builtin/checkout.c:583
1081 +#: builtin/checkout.c:584
1082 #, c-format
1083 msgid "Switched to branch '%s'\n"
1084 msgstr "切换到分支 '%s'\n"
1085
1086 # 译者：注意保持前导空格
1068 -#: builtin/checkout.c:639
1087 +#: builtin/checkout.c:640
1088 #, c-format
1089 msgid " ... and %d more.\n"
1090 msgstr " ... 及其它 %d 个。\n"
1091
1092 #. The singular version
1074 -#: builtin/checkout.c:645
1093 +#: builtin/checkout.c:646
1094 #, c-format
1095 msgid ""
1096 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -1088,7 +1107,7 @@ msgstr[0] ""
1107 "\n"
1108 "%s\n"
1109
1091 -#: builtin/checkout.c:663
1110 +#: builtin/checkout.c:664
1111 #, c-format
1112 msgid ""
1113 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -1103,71 +1122,71 @@ msgstr ""
1122 " git branch new_branch_name %s\n"
1123 "\n"
1124
1106 -#: builtin/checkout.c:692
1125 +#: builtin/checkout.c:693
1126 msgid "internal error in revision walk"
1127 msgstr "在版本遍历时遇到内部错误"
1128
1110 -#: builtin/checkout.c:696
1129 +#: builtin/checkout.c:697
1130 msgid "Previous HEAD position was"
1131 msgstr "之前的 HEAD 位置是"
1132
1114 -#: builtin/checkout.c:722
1133 +#: builtin/checkout.c:723
1134 msgid "You are on a branch yet to be born"
1135 msgstr "您位于一个尚未初始化的分支"
1136
1137 #. case (1)
1119 -#: builtin/checkout.c:853
1138 +#: builtin/checkout.c:854
1139 #, c-format
1140 msgid "invalid reference: %s"
1141 msgstr "无效引用：%s"
1142
1143 #. case (1): want a tree
1125 -#: builtin/checkout.c:892
1144 +#: builtin/checkout.c:893
1145 #, c-format
1146 msgid "reference is not a tree: %s"
1147 msgstr "引用不是一个树：%s"
1148
1130 -#: builtin/checkout.c:972
1149 +#: builtin/checkout.c:973
1150 msgid "-B cannot be used with -b"
1151 msgstr "-B 不能和 -b 共用"
1152
1134 -#: builtin/checkout.c:981
1153 +#: builtin/checkout.c:982
1154 msgid "--patch is incompatible with all other options"
1155 msgstr "--patch 选项和其他选项不兼容"
1156
1138 -#: builtin/checkout.c:984
1157 +#: builtin/checkout.c:985
1158 msgid "--detach cannot be used with -b/-B/--orphan"
1159 msgstr "--detach 不能和 -b/-B/--orphan 共用"
1160
1142 -#: builtin/checkout.c:986
1161 +#: builtin/checkout.c:987
1162 msgid "--detach cannot be used with -t"
1163 msgstr "--detach 不能和 -t 共用"
1164
1146 -#: builtin/checkout.c:992
1165 +#: builtin/checkout.c:993
1166 msgid "--track needs a branch name"
1167 msgstr "--track 需要一个分支名"
1168
1150 -#: builtin/checkout.c:999
1169 +#: builtin/checkout.c:1000
1170 msgid "Missing branch name; try -b"
1171 msgstr "缺少分支名；尝试 -b"
1172
1154 -#: builtin/checkout.c:1005
1173 +#: builtin/checkout.c:1006
1174 msgid "--orphan and -b|-B are mutually exclusive"
1175 msgstr "--orphan 和 -b|-B 互斥"
1176
1158 -#: builtin/checkout.c:1007
1177 +#: builtin/checkout.c:1008
1178 msgid "--orphan cannot be used with -t"
1179 msgstr "--orphan 不能和 -t 共用"
1180
1162 -#: builtin/checkout.c:1017
1181 +#: builtin/checkout.c:1018
1182 msgid "git checkout: -f and -m are incompatible"
1183 msgstr "git checkout：-f 和 -m 不兼容"
1184
1166 -#: builtin/checkout.c:1051
1185 +#: builtin/checkout.c:1052
1186 msgid "invalid path specification"
1187 msgstr "无效的路径规格"
1188
1170 -#: builtin/checkout.c:1059
1189 +#: builtin/checkout.c:1060
1190 #, c-format
1191 msgid ""
1192 "git checkout: updating paths is incompatible with switching branches.\n"
@@ -1176,26 +1195,26 @@ msgstr ""
1195 "git checkout：更新路径和切换分支不兼容。\n"
1196 "您是想要检出 '%s' 但未能将其解析为提交么？"
1197
1179 -#: builtin/checkout.c:1061
1198 +#: builtin/checkout.c:1062
1199 msgid "git checkout: updating paths is incompatible with switching branches."
1200 msgstr "git checkout：更新路径和切换分支不兼容。"
1201
1183 -#: builtin/checkout.c:1066
1202 +#: builtin/checkout.c:1067
1203 msgid "git checkout: --detach does not take a path argument"
1204 msgstr "git checkout：--detach 不跟路径参数"
1205
1187 -#: builtin/checkout.c:1069
1206 +#: builtin/checkout.c:1070
1207 msgid ""
1208 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1209 "checking out of the index."
1210 msgstr ""
1211 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
1212
1194 -#: builtin/checkout.c:1088
1213 +#: builtin/checkout.c:1089
1214 msgid "Cannot switch branch to a non-commit."
1215 msgstr "无法切换分支到一个非提交。"
1216
1198 -#: builtin/checkout.c:1091
1217 +#: builtin/checkout.c:1092
1218 msgid "--ours/--theirs is incompatible with switching branches."
1219 msgstr "--ours/--theirs 和切换分支不兼容。"
1220
@@ -1691,7 +1710,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n"
1710 msgid "Aborting commit due to empty commit message.\n"
1711 msgstr "终止提交因为提交说明为空。\n"
1712
1694 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:968
1713 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
1714 msgid "failed to write commit object"
1715 msgstr "无法写提交对象"
1716
@@ -1834,69 +1853,73 @@ msgstr "提供了无法处理的对象 '%s'。"
1853 msgid "Couldn't find remote ref HEAD"
1854 msgstr "无法发现远程 HEAD 引用"
1855
1837 -#: builtin/fetch.c:252
1856 +#: builtin/fetch.c:253
1857 #, c-format
1858 msgid "object %s not found"
1859 msgstr "对象 %s 未发现"
1860
1842 -#: builtin/fetch.c:258
1861 +#: builtin/fetch.c:259
1862 msgid "[up to date]"
1863 msgstr "[最新]"
1864
1846 -#: builtin/fetch.c:272
1865 +#: builtin/fetch.c:273
1866 #, c-format
1867 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1868 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
1869
1851 -#: builtin/fetch.c:273 builtin/fetch.c:351
1870 +#: builtin/fetch.c:274 builtin/fetch.c:360
1871 msgid "[rejected]"
1872 msgstr "[已拒绝]"
1873
1855 -#: builtin/fetch.c:284
1874 +#: builtin/fetch.c:285
1875 msgid "[tag update]"
1876 msgstr "[tag更新]"
1877
1878 # 译者：注意保持前导空格
1860 -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
1879 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
1880 msgid " (unable to update local ref)"
1881 msgstr " （不能更新本地引用）"
1882
1864 -#: builtin/fetch.c:298
1883 +#: builtin/fetch.c:305
1884 msgid "[new tag]"
1885 msgstr "[新tag]"
1886
1868 -#: builtin/fetch.c:302
1887 +#: builtin/fetch.c:308
1888 msgid "[new branch]"
1889 msgstr "[新分支]"
1890
1872 -#: builtin/fetch.c:347
1891 +#: builtin/fetch.c:311
1892 +msgid "[new ref]"
1893 +msgstr "[新引用]"
1894 +
1895 +#: builtin/fetch.c:356
1896 msgid "unable to update local ref"
1897 msgstr "不能更新本地引用"
1898
1876 -#: builtin/fetch.c:347
1899 +#: builtin/fetch.c:356
1900 msgid "forced update"
1901 msgstr "强制更新"
1902
1880 -#: builtin/fetch.c:353
1903 +#: builtin/fetch.c:362
1904 msgid "(non-fast-forward)"
1905 msgstr "（非快进式）"
1906
1884 -#: builtin/fetch.c:384 builtin/fetch.c:676
1907 +#: builtin/fetch.c:393 builtin/fetch.c:685
1908 #, c-format
1909 msgid "cannot open %s: %s\n"
1910 msgstr "无法打开 %s：%s\n"
1911
1889 -#: builtin/fetch.c:393
1912 +#: builtin/fetch.c:402
1913 #, c-format
1914 msgid "%s did not send all necessary objects\n"
1915 msgstr "%s 未发送所有必须的对象\n"
1916
1894 -#: builtin/fetch.c:479
1917 +#: builtin/fetch.c:488
1918 #, c-format
1919 msgid "From %.*s\n"
1920 msgstr "来自 %.*s\n"
1921
1899 -#: builtin/fetch.c:490
1922 +#: builtin/fetch.c:499
1923 #, c-format
1924 msgid ""
1925 "some local refs could not be updated; try running\n"
@@ -1906,79 +1929,79 @@ msgstr ""
1929 " 'git remote prune %s' 来删除旧的、有冲突的分支"
1930
1931 # 译者：注意保持前导空格
1909 -#: builtin/fetch.c:540
1932 +#: builtin/fetch.c:549
1933 #, c-format
1934 msgid " (%s will become dangling)\n"
1935 msgstr " （%s 将成为悬空状态）\n"
1936
1937 # 译者：注意保持前导空格
1915 -#: builtin/fetch.c:541
1938 +#: builtin/fetch.c:550
1939 #, c-format
1940 msgid " (%s has become dangling)\n"
1941 msgstr " （%s 已成为悬空状态）\n"
1942
1920 -#: builtin/fetch.c:548
1943 +#: builtin/fetch.c:557
1944 msgid "[deleted]"
1945 msgstr "[已删除]"
1946
1924 -#: builtin/fetch.c:549
1947 +#: builtin/fetch.c:558
1948 msgid "(none)"
1949 msgstr "（无）"
1950
1928 -#: builtin/fetch.c:666
1951 +#: builtin/fetch.c:675
1952 #, c-format
1953 msgid "Refusing to fetch into current branch %s of non-bare repository"
1954 msgstr "拒绝获取到非裸版本库的当前分支 %s"
1955
1933 -#: builtin/fetch.c:700
1956 +#: builtin/fetch.c:709
1957 #, c-format
1958 msgid "Don't know how to fetch from %s"
1959 msgstr "不知道如何从 %s 获取"
1960
1938 -#: builtin/fetch.c:777
1961 +#: builtin/fetch.c:786
1962 #, c-format
1963 msgid "Option \"%s\" value \"%s\" is not valid for %s"
1964 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
1965
1943 -#: builtin/fetch.c:780
1966 +#: builtin/fetch.c:789
1967 #, c-format
1968 msgid "Option \"%s\" is ignored for %s\n"
1969 msgstr "选项 \"%s\" 对于 %s 被忽略\n"
1970
1948 -#: builtin/fetch.c:879
1971 +#: builtin/fetch.c:888
1972 #, c-format
1973 msgid "Fetching %s\n"
1974 msgstr "正在获取 %s\n"
1975
1953 -#: builtin/fetch.c:881
1976 +#: builtin/fetch.c:890
1977 #, c-format
1978 msgid "Could not fetch %s"
1979 msgstr "不能获取 %s"
1980
1958 -#: builtin/fetch.c:898
1981 +#: builtin/fetch.c:907
1982 msgid ""
1983 "No remote repository specified. Please, specify either a URL or a\n"
1984 "remote name from which new revisions should be fetched."
1985 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
1986
1964 -#: builtin/fetch.c:918
1987 +#: builtin/fetch.c:927
1988 msgid "You need to specify a tag name."
1989 msgstr "您需要指定一个 tag 名称。"
1990
1968 -#: builtin/fetch.c:970
1991 +#: builtin/fetch.c:979
1992 msgid "fetch --all does not take a repository argument"
1993 msgstr "fetch --all 不能带一个版本库参数"
1994
1972 -#: builtin/fetch.c:972
1995 +#: builtin/fetch.c:981
1996 msgid "fetch --all does not make sense with refspecs"
1997 msgstr "fetch --all 带引用表达式没有任何意义"
1998
1976 -#: builtin/fetch.c:983
1999 +#: builtin/fetch.c:992
2000 #, c-format
2001 msgid "No such remote or remote group: %s"
2002 msgstr "没有这样的远程或远程组：%s"
2003
1981 -#: builtin/fetch.c:991
2004 +#: builtin/fetch.c:1000
2005 msgid "Fetching a group and specifying refspecs does not make sense"
2006 msgstr "获取组并指定引用表达式没有意义"
2007
@@ -2219,164 +2242,164 @@ msgstr "不能访问当前工作目录"
2242 msgid "Cannot access work tree '%s'"
2243 msgstr "不能访问工作区 '%s'"
2244
2222 -#: builtin/log.c:187
2245 +#: builtin/log.c:188
2246 #, c-format
2247 msgid "Final output: %d %s\n"
2248 msgstr "最终输出：%d %s\n"
2249
2227 -#: builtin/log.c:395 builtin/log.c:483
2250 +#: builtin/log.c:401 builtin/log.c:489
2251 #, c-format
2252 msgid "Could not read object %s"
2253 msgstr "不能读取对象 %s"
2254
2232 -#: builtin/log.c:507
2255 +#: builtin/log.c:513
2256 #, c-format
2257 msgid "Unknown type: %d"
2258 msgstr "未知类型：%d"
2259
2237 -#: builtin/log.c:596
2260 +#: builtin/log.c:602
2261 msgid "format.headers without value"
2262 msgstr "format.headers 没有值"
2263
2241 -#: builtin/log.c:669
2264 +#: builtin/log.c:675
2265 msgid "name of output directory is too long"
2266 msgstr "输出目录名太长"
2267
2245 -#: builtin/log.c:680
2268 +#: builtin/log.c:686
2269 #, c-format
2270 msgid "Cannot open patch file %s"
2271 msgstr "无法打开补丁文件 %s"
2272
2250 -#: builtin/log.c:694
2273 +#: builtin/log.c:700
2274 msgid "Need exactly one range."
2275 msgstr "只需要一个范围。"
2276
2254 -#: builtin/log.c:702
2277 +#: builtin/log.c:708
2278 msgid "Not a range."
2279 msgstr "不是一个范围。"
2280
2258 -#: builtin/log.c:739
2281 +#: builtin/log.c:745
2282 msgid "Could not extract email from committer identity."
2283 msgstr "不能从提交者身份中提取邮件地址。"
2284
2262 -#: builtin/log.c:785
2285 +#: builtin/log.c:791
2286 msgid "Cover letter needs email format"
2287 msgstr "信封需要邮件地址格式"
2288
2266 -#: builtin/log.c:879
2289 +#: builtin/log.c:885
2290 #, c-format
2291 msgid "insane in-reply-to: %s"
2292 msgstr "不正常的 in-reply-to：%s"
2293
2271 -#: builtin/log.c:952
2294 +#: builtin/log.c:958
2295 msgid "Two output directories?"
2296 msgstr "两个输出目录？"
2297
2275 -#: builtin/log.c:1173
2298 +#: builtin/log.c:1179
2299 #, c-format
2300 msgid "bogus committer info %s"
2301 msgstr "虚假的提交者信息 %s"
2302
2280 -#: builtin/log.c:1218
2303 +#: builtin/log.c:1224
2304 msgid "-n and -k are mutually exclusive."
2305 msgstr "-n 和 -k 互斥。"
2306
2284 -#: builtin/log.c:1220
2307 +#: builtin/log.c:1226
2308 msgid "--subject-prefix and -k are mutually exclusive."
2309 msgstr "--subject-prefix 和 -k 互斥。"
2310
2288 -#: builtin/log.c:1225 builtin/shortlog.c:284
2311 +#: builtin/log.c:1231 builtin/shortlog.c:284
2312 #, c-format
2313 msgid "unrecognized argument: %s"
2314 msgstr "未识别的参数：%s"
2315
2293 -#: builtin/log.c:1228
2316 +#: builtin/log.c:1234
2317 msgid "--name-only does not make sense"
2318 msgstr "--name-only 无意义"
2319
2297 -#: builtin/log.c:1230
2320 +#: builtin/log.c:1236
2321 msgid "--name-status does not make sense"
2322 msgstr "--name-status 无意义"
2323
2301 -#: builtin/log.c:1232
2324 +#: builtin/log.c:1238
2325 msgid "--check does not make sense"
2326 msgstr "--check 无意义"
2327
2305 -#: builtin/log.c:1255
2328 +#: builtin/log.c:1261
2329 msgid "standard output, or directory, which one?"
2330 msgstr "标准输出或目录，哪一个？"
2331
2309 -#: builtin/log.c:1257
2332 +#: builtin/log.c:1263
2333 #, c-format
2334 msgid "Could not create directory '%s'"
2335 msgstr "不能创建目录 '%s'"
2336
2314 -#: builtin/log.c:1410
2337 +#: builtin/log.c:1416
2338 msgid "Failed to create output files"
2339 msgstr "无法创建输出文件"
2340
2318 -#: builtin/log.c:1514
2341 +#: builtin/log.c:1520
2342 #, c-format
2343 msgid ""
2344 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
2345 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
2346
2324 -#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
2347 +#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
2348 #, c-format
2349 msgid "Unknown commit %s"
2350 msgstr "未知提交 %s"
2351
2329 -#: builtin/merge.c:91
2352 +#: builtin/merge.c:90
2353 msgid "switch `m' requires a value"
2354 msgstr "开关 `m' 需要一个值"
2355
2333 -#: builtin/merge.c:128
2356 +#: builtin/merge.c:127
2357 #, c-format
2358 msgid "Could not find merge strategy '%s'.\n"
2359 msgstr "不能找到合并策略 '%s'。\n"
2360
2338 -#: builtin/merge.c:129
2361 +#: builtin/merge.c:128
2362 #, c-format
2363 msgid "Available strategies are:"
2364 msgstr "可用的策略有："
2365
2343 -#: builtin/merge.c:134
2366 +#: builtin/merge.c:133
2367 #, c-format
2368 msgid "Available custom strategies are:"
2369 msgstr "可用的自定义策略有："
2370
2348 -#: builtin/merge.c:241
2371 +#: builtin/merge.c:240
2372 msgid "could not run stash."
2373 msgstr "不能进行进度保存。"
2374
2352 -#: builtin/merge.c:246
2375 +#: builtin/merge.c:245
2376 msgid "stash failed"
2377 msgstr "进度保存失败"
2378
2356 -#: builtin/merge.c:251
2379 +#: builtin/merge.c:250
2380 #, c-format
2381 msgid "not a valid object: %s"
2382 msgstr "不是一个有效对象：%s"
2383
2361 -#: builtin/merge.c:270 builtin/merge.c:287
2384 +#: builtin/merge.c:269 builtin/merge.c:286
2385 msgid "read-tree failed"
2386 msgstr "读取树失败"
2387
2388 # 译者：注意保持前导空格
2366 -#: builtin/merge.c:317
2389 +#: builtin/merge.c:316
2390 msgid " (nothing to squash)"
2391 msgstr " （无可压缩）"
2392
2370 -#: builtin/merge.c:330
2393 +#: builtin/merge.c:329
2394 #, c-format
2395 msgid "Squash commit -- not updating HEAD\n"
2396 msgstr "压缩提交 -- 未更新 HEAD\n"
2397
2375 -#: builtin/merge.c:362
2398 +#: builtin/merge.c:361
2399 msgid "Writing SQUASH_MSG"
2400 msgstr "写入 SQUASH_MSG"
2401
2379 -#: builtin/merge.c:364
2402 +#: builtin/merge.c:363
2403 msgid "Finishing SQUASH_MSG"
2404 msgstr "完成 SQUASH_MSG"
2405
@@ -2403,35 +2426,35 @@ msgstr "git write-tree 无法写入一树对象"
2426 msgid "failed to read the cache"
2427 msgstr "无法读取缓存"
2428
2406 -#: builtin/merge.c:696
2429 +#: builtin/merge.c:697
2430 msgid "Unable to write index."
2431 msgstr "不能写索引。"
2432
2410 -#: builtin/merge.c:709
2433 +#: builtin/merge.c:710
2434 msgid "Not handling anything other than two heads merge."
2435 msgstr "不能处理两个头合并之外的任何操作。"
2436
2414 -#: builtin/merge.c:723
2437 +#: builtin/merge.c:724
2438 #, c-format
2439 msgid "Unknown option for merge-recursive: -X%s"
2440 msgstr "merge-recursive 的未知选项：-X%s"
2441
2419 -#: builtin/merge.c:737
2442 +#: builtin/merge.c:738
2443 #, c-format
2444 msgid "unable to write %s"
2445 msgstr "不能写 %s"
2446
2424 -#: builtin/merge.c:876
2447 +#: builtin/merge.c:877
2448 #, c-format
2449 msgid "Could not read from '%s'"
2450 msgstr "不能从 '%s' 读取"
2451
2429 -#: builtin/merge.c:885
2452 +#: builtin/merge.c:886
2453 #, c-format
2454 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2455 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
2456
2434 -#: builtin/merge.c:891
2457 +#: builtin/merge.c:892
2458 msgid ""
2459 "Please enter a commit message to explain why this merge is necessary,\n"
2460 "especially if it merges an updated upstream into a topic branch.\n"
@@ -2444,47 +2467,52 @@ msgstr ""
2467 "\n"
2468 "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
2469
2447 -#: builtin/merge.c:915
2470 +#: builtin/merge.c:916
2471 msgid "Empty commit message."
2472 msgstr "空提交信息。"
2473
2451 -#: builtin/merge.c:927
2474 +#: builtin/merge.c:928
2475 #, c-format
2476 msgid "Wonderful.\n"
2477 msgstr "太棒了。\n"
2478
2456 -#: builtin/merge.c:1000
2479 +#: builtin/merge.c:993
2480 #, c-format
2481 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2482 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
2483
2461 -#: builtin/merge.c:1016
2484 +#: builtin/merge.c:1009
2485 #, c-format
2486 msgid "'%s' is not a commit"
2487 msgstr "'%s' 不是一个提交"
2488
2466 -#: builtin/merge.c:1057
2489 +#: builtin/merge.c:1050
2490 msgid "No current branch."
2491 msgstr "没有当前分支。"
2492
2470 -#: builtin/merge.c:1059
2493 +#: builtin/merge.c:1052
2494 msgid "No remote for the current branch."
2495 msgstr "当前分支没有对应的远程版本库。"
2496
2474 -#: builtin/merge.c:1061
2497 +#: builtin/merge.c:1054
2498 msgid "No default upstream defined for the current branch."
2499 msgstr "当前分支没有定义默认的上游分支。"
2500
2478 -#: builtin/merge.c:1066
2501 +#: builtin/merge.c:1059
2502 #, c-format
2503 msgid "No remote tracking branch for %s from %s"
2504 msgstr "%s 没有来自 %s 的远程跟踪分支"
2505
2483 -#: builtin/merge.c:1188
2506 +#: builtin/merge.c:1146 builtin/merge.c:1303
2507 +#, c-format
2508 +msgid "%s - not something we can merge"
2509 +msgstr "%s - 不能被合并"
2510 +
2511 +#: builtin/merge.c:1214
2512 msgid "There is no merge to abort (MERGE_HEAD missing)."
2513 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
2514
2487 -#: builtin/merge.c:1204 git-pull.sh:31
2515 +#: builtin/merge.c:1230 git-pull.sh:31
2516 msgid ""
2517 "You have not concluded your merge (MERGE_HEAD exists).\n"
2518 "Please, commit your changes before you can merge."
@@ -2492,11 +2520,11 @@ msgstr ""
2520 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
2521 "请在合并前先提交您的修改。"
2522
2495 -#: builtin/merge.c:1207 git-pull.sh:34
2523 +#: builtin/merge.c:1233 git-pull.sh:34
2524 msgid "You have not concluded your merge (MERGE_HEAD exists)."
2525 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
2526
2499 -#: builtin/merge.c:1211
2527 +#: builtin/merge.c:1237
2528 msgid ""
2529 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2530 "Please, commit your changes before you can merge."
@@ -2504,84 +2532,79 @@ msgstr ""
2532 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
2533 "请在合并前先提交您的修改。"
2534
2507 -#: builtin/merge.c:1214
2535 +#: builtin/merge.c:1240
2536 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2537 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
2538
2511 -#: builtin/merge.c:1223
2539 +#: builtin/merge.c:1249
2540 msgid "You cannot combine --squash with --no-ff."
2541 msgstr "您不能将 --squash 与 --no-ff 共用。"
2542
2515 -#: builtin/merge.c:1228
2543 +#: builtin/merge.c:1254
2544 msgid "You cannot combine --no-ff with --ff-only."
2545 msgstr "您不能将 --no-ff 与 --ff-only 共用。"
2546
2519 -#: builtin/merge.c:1235
2547 +#: builtin/merge.c:1261
2548 msgid "No commit specified and merge.defaultToUpstream not set."
2549 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
2550
2523 -#: builtin/merge.c:1266
2551 +#: builtin/merge.c:1293
2552 msgid "Can merge only exactly one commit into empty head"
2553 msgstr "只能将一个提交合并到空分支上"
2554
2527 -#: builtin/merge.c:1269
2555 +#: builtin/merge.c:1296
2556 msgid "Squash commit into empty head not supported yet"
2557 msgstr "尚不支持到空分支的压缩提交"
2558
2531 -#: builtin/merge.c:1271
2559 +#: builtin/merge.c:1298
2560 msgid "Non-fast-forward commit does not make sense into an empty head"
2561 msgstr "到空分支的非快进式提交没有意义"
2562
2535 -#: builtin/merge.c:1275 builtin/merge.c:1319
2536 -#, c-format
2537 -msgid "%s - not something we can merge"
2538 -msgstr "%s - 不能被合并"
2539 -
2540 -#: builtin/merge.c:1382
2563 +#: builtin/merge.c:1413
2564 #, c-format
2565 msgid "Updating %s..%s\n"
2566 msgstr "更新 %s..%s\n"
2567
2545 -#: builtin/merge.c:1420
2568 +#: builtin/merge.c:1451
2569 #, c-format
2570 msgid "Trying really trivial in-index merge...\n"
2571 msgstr "尝试非常小的索引内合并...\n"
2572
2550 -#: builtin/merge.c:1427
2573 +#: builtin/merge.c:1458
2574 #, c-format
2575 msgid "Nope.\n"
2576 msgstr "无。\n"
2577
2555 -#: builtin/merge.c:1459
2578 +#: builtin/merge.c:1490
2579 msgid "Not possible to fast-forward, aborting."
2580 msgstr "无法快进，终止。"
2581
2559 -#: builtin/merge.c:1482 builtin/merge.c:1559
2582 +#: builtin/merge.c:1513 builtin/merge.c:1592
2583 #, c-format
2584 msgid "Rewinding the tree to pristine...\n"
2585 msgstr "将树回滚至原始状态...\n"
2586
2564 -#: builtin/merge.c:1486
2587 +#: builtin/merge.c:1517
2588 #, c-format
2589 msgid "Trying merge strategy %s...\n"
2590 msgstr "尝试合并策略 %s...\n"
2591
2569 -#: builtin/merge.c:1550
2592 +#: builtin/merge.c:1583
2593 #, c-format
2594 msgid "No merge strategy handled the merge.\n"
2595 msgstr "没有合并策略处理此合并。\n"
2596
2574 -#: builtin/merge.c:1552
2597 +#: builtin/merge.c:1585
2598 #, c-format
2599 msgid "Merge with strategy %s failed.\n"
2600 msgstr "使用策略 %s 合并失败。\n"
2601
2579 -#: builtin/merge.c:1561
2602 +#: builtin/merge.c:1594
2603 #, c-format
2604 msgid "Using the %s to prepare resolving by hand.\n"
2605 msgstr "使用 %s 以准备手工解决。\n"
2606
2584 -#: builtin/merge.c:1572
2607 +#: builtin/merge.c:1606
2608 #, c-format
2609 msgid "Automatic merge went well; stopped before committing as requested\n"
2610 msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -2822,15 +2845,15 @@ msgstr "选项 %s 不接受否定格式"
2845 msgid "unable to parse value '%s' for option %s"
2846 msgstr "不能解析值 '%s' 针对于选项 %s"
2847
2825 -#: builtin/push.c:44
2848 +#: builtin/push.c:45
2849 msgid "tag shorthand without <tag>"
2850 msgstr "tag 简写没有跟 <tag> 参数"
2851
2829 -#: builtin/push.c:63
2852 +#: builtin/push.c:64
2853 msgid "--delete only accepts plain target ref names"
2854 msgstr "--delete 只接受简单的目标引用名"
2855
2833 -#: builtin/push.c:83
2856 +#: builtin/push.c:84
2857 #, c-format
2858 msgid ""
2859 "You are not currently on a branch.\n"
@@ -2844,7 +2867,7 @@ msgstr ""
2867 "\n"
2868 " git push %s HEAD:<name-of-remote-branch>\n"
2869
2847 -#: builtin/push.c:90
2870 +#: builtin/push.c:91
2871 #, c-format
2872 msgid ""
2873 "The current branch %s has no upstream branch.\n"
@@ -2857,12 +2880,12 @@ msgstr ""
2880 "\n"
2881 " git push --set-upstream %s %s\n"
2882
2860 -#: builtin/push.c:98
2883 +#: builtin/push.c:99
2884 #, c-format
2885 msgid "The current branch %s has multiple upstream branches, refusing to push."
2886 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
2887
2865 -#: builtin/push.c:101
2888 +#: builtin/push.c:102
2889 #, c-format
2890 msgid ""
2891 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -2872,38 +2895,60 @@ msgstr ""
2895 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
2896 "而没有告诉我要推送什么、更新哪个远程分支。"
2897
2875 -#: builtin/push.c:127
2898 +#: builtin/push.c:131
2899 msgid ""
2900 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
2901 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
2902
2880 -#: builtin/push.c:147
2903 +#: builtin/push.c:138
2904 +msgid ""
2905 +"Updates were rejected because the tip of your current branch is behind\n"
2906 +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2907 +"before pushing again.\n"
2908 +"See the 'Note about fast-forwards' in 'git push --help' for details."
2909 +msgstr ""
2910 +"更新被拒绝，因为您当前分支落后于对应的远程分支。再次推送前先与远程变更\n"
2911 +"合并（如 'git pull'）。\n"
2912 +"详见 'git push --help' 中的 'Note about fast-forwards' 的内容。"
2913 +
2914 +#: builtin/push.c:144
2915 +msgid ""
2916 +"Updates were rejected because a pushed branch tip is behind its remote\n"
2917 +"counterpart. If you did not intend to push that branch, you may want to\n"
2918 +"specify branches to push or set the 'push.default' configuration\n"
2919 +"variable to 'current' or 'upstream' to push only the current branch."
2920 +msgstr ""
2921 +"更新被拒绝，因为推送的一个分支落后于对应的远程分支。如果您并非有意推送\n"
2922 +"该分支，您可以指定要推送的分支或者设置 'push.default' 配置变量为\n"
2923 +"'current' 或 'upstream' 以便只推送当前分支。"
2924 +
2925 +#: builtin/push.c:150
2926 +msgid ""
2927 +"Updates were rejected because a pushed branch tip is behind its remote\n"
2928 +"counterpart. Check out this branch and merge the remote changes\n"
2929 +"(e.g. 'git pull') before pushing again.\n"
2930 +"See the 'Note about fast-forwards' in 'git push --help' for details."
2931 +msgstr ""
2932 +"更新被拒绝，因为推送的一个分支落后于对应的远程分支。检出该分支并在再次\n"
2933 +"推送之前与远程变更合并（如 'git pull'）。\n"
2934 +"详见 'git push --help' 中的 'Note about fast-forwards' 的内容。"
2935 +
2936 +#: builtin/push.c:190
2937 #, c-format
2938 msgid "Pushing to %s\n"
2939 msgstr "推送到 %s\n"
2940
2885 -#: builtin/push.c:151
2941 +#: builtin/push.c:194
2942 #, c-format
2943 msgid "failed to push some refs to '%s'"
2944 msgstr "无法推送一些引用到 '%s'"
2945
2890 -#: builtin/push.c:159
2891 -#, c-format
2892 -msgid ""
2893 -"To prevent you from losing history, non-fast-forward updates were rejected\n"
2894 -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2895 -"'Note about fast-forwards' section of 'git push --help' for details.\n"
2896 -msgstr ""
2897 -"为了防止您丢失提交历史，非快进式更新被拒绝。\n"
2898 -"再次推送前先与远程变更合并（如 'git pull'）。详见\n"
2899 -"'git push --help' 中的 'Note about fast-forwards' 小节。\n"
2900 -
2901 -#: builtin/push.c:176
2946 +#: builtin/push.c:226
2947 #, c-format
2948 msgid "bad repository '%s'"
2949 msgstr "坏的版本库 '%s'"
2950
2906 -#: builtin/push.c:177
2951 +#: builtin/push.c:227
2952 msgid ""
2953 "No configured push destination.\n"
2954 "Either specify the URL from the command-line or configure a remote "
@@ -2924,31 +2969,31 @@ msgstr ""
2969 "\n"
2970 " git push <name>\n"
2971
2927 -#: builtin/push.c:192
2972 +#: builtin/push.c:242
2973 msgid "--all and --tags are incompatible"
2974 msgstr "--all 和 --tags 不兼容"
2975
2931 -#: builtin/push.c:193
2976 +#: builtin/push.c:243
2977 msgid "--all can't be combined with refspecs"
2978 msgstr "--all 不能和引用表达式共用"
2979
2935 -#: builtin/push.c:198
2980 +#: builtin/push.c:248
2981 msgid "--mirror and --tags are incompatible"
2982 msgstr "--mirror 和 --tags 不兼容"
2983
2939 -#: builtin/push.c:199
2984 +#: builtin/push.c:249
2985 msgid "--mirror can't be combined with refspecs"
2986 msgstr "--mirror 不能和引用表达式共用"
2987
2943 -#: builtin/push.c:204
2988 +#: builtin/push.c:254
2989 msgid "--all and --mirror are incompatible"
2990 msgstr "--all 和 --mirror 不兼容"
2991
2947 -#: builtin/push.c:284
2992 +#: builtin/push.c:342
2993 msgid "--delete is incompatible with --all, --mirror and --tags"
2994 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
2995
2951 -#: builtin/push.c:286
2996 +#: builtin/push.c:344
2997 msgid "--delete doesn't make sense without any refs"
2998 msgstr "--delete 未接任何引用没有意义"
2999
@@ -3034,20 +3079,20 @@ msgstr "不能对裸版本库进行%s重置"
3079 msgid "Could not reset index file to revision '%s'."
3080 msgstr "不能重置索引文件至版本 '%s'。"
3081
3037 -#: builtin/revert.c:70 builtin/revert.c:91
3082 +#: builtin/revert.c:70 builtin/revert.c:92
3083 #, c-format
3084 msgid "%s: %s cannot be used with %s"
3085 msgstr "%s：%s 不能和 %s 共用"
3086
3042 -#: builtin/revert.c:126
3087 +#: builtin/revert.c:127
3088 msgid "program error"
3089 msgstr "程序错误"
3090
3046 -#: builtin/revert.c:209
3091 +#: builtin/revert.c:213
3092 msgid "revert failed"
3093 msgstr "还原失败"
3094
3050 -#: builtin/revert.c:224
3095 +#: builtin/revert.c:228
3096 msgid "cherry-pick failed"
3097 msgstr "拣选失败"
3098
@@ -3226,15 +3271,15 @@ msgstr "%s：不能更新引用"
3271 msgid "Updated tag '%s' (was %s)\n"
3272 msgstr "已更新tag '%s'（曾为 %s）\n"
3273
3229 -#: git-am.sh:49
3274 +#: git-am.sh:50
3275 msgid "You need to set your committer info first"
3276 msgstr "您需要先设置你的提交者信息"
3277
3233 -#: git-am.sh:136
3278 +#: git-am.sh:137
3279 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3280 msgstr "版本库缺乏必要的 blob 数据以进行三路合并。"
3281
3237 -#: git-am.sh:147
3282 +#: git-am.sh:154
3283 msgid ""
3284 "Did you hand edit your patch?\n"
3285 "It does not apply to blobs recorded in its index."
@@ -3242,46 +3287,46 @@ msgstr ""
3287 "您是否曾手动编辑过您的补丁？\n"
3288 "无法应用补丁到索引中的数据上。"
3289
3245 -#: git-am.sh:156
3290 +#: git-am.sh:163
3291 msgid "Falling back to patching base and 3-way merge..."
3292 msgstr "回退到补丁基础版本并使用三路合并..."
3293
3249 -#: git-am.sh:268
3294 +#: git-am.sh:275
3295 msgid "Only one StGIT patch series can be applied at once"
3296 msgstr "一次只能有一个 StGIT 补丁队列被应用"
3297
3253 -#: git-am.sh:355
3298 +#: git-am.sh:362
3299 #, sh-format
3300 msgid "Patch format $patch_format is not supported."
3301 msgstr "不支持 $patch_format 补丁格式。"
3302
3258 -#: git-am.sh:357
3303 +#: git-am.sh:364
3304 msgid "Patch format detection failed."
3305 msgstr "补丁格式检测失败。"
3306
3262 -#: git-am.sh:411
3307 +#: git-am.sh:418
3308 msgid "-d option is no longer supported. Do not use."
3309 msgstr "不再支持 -d 选项。不要使用。"
3310
3266 -#: git-am.sh:474
3311 +#: git-am.sh:481
3312 #, sh-format
3313 msgid "previous rebase directory $dotest still exists but mbox given."
3314 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
3315
3271 -#: git-am.sh:479
3316 +#: git-am.sh:486
3317 msgid "Please make up your mind. --skip or --abort?"
3318 msgstr "请下决心。--skip 或是 --abort ？"
3319
3275 -#: git-am.sh:506
3320 +#: git-am.sh:513
3321 msgid "Resolve operation not in progress, we are not resuming."
3322 msgstr "解决操作未进行，我们不会继续。"
3323
3279 -#: git-am.sh:572
3324 +#: git-am.sh:579
3325 #, sh-format
3326 msgid "Dirty index: cannot apply patches (dirty: $files)"
3327 msgstr "脏的索引：不能应用补丁（脏文件：$files）"
3328
3284 -#: git-am.sh:748
3329 +#: git-am.sh:755
3330 msgid "cannot be interactive without stdin connected to a terminal."
3331 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
3332
@@ -3289,20 +3334,20 @@ msgstr "标准输入没有和终端关联，不能进行交互式操作。"
3334 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3335 #. in your translation. The program will only accept English
3336 #. input at this point.
3292 -#: git-am.sh:759
3337 +#: git-am.sh:766
3338 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3339 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3340
3296 -#: git-am.sh:795
3341 +#: git-am.sh:802
3342 #, sh-format
3343 msgid "Applying: $FIRSTLINE"
3344 msgstr "正应用：$FIRSTLINE"
3345
3301 -#: git-am.sh:840
3346 +#: git-am.sh:847
3347 msgid "No changes -- Patch already applied."
3348 msgstr "没有变更 -- 补丁已经应用过。"
3349
3305 -#: git-am.sh:866
3350 +#: git-am.sh:873
3351 msgid "applying to an empty history"
3352 msgstr "正应用到一个空历史上"
3353
@@ -3541,166 +3586,166 @@ msgstr "（为恢复数据输入 \"git stash apply\"）"
3586 msgid "cannot strip one component off url '$remoteurl'"
3587 msgstr "无法从 url '$remoteurl' 剥离一个组件"
3588
3544 -#: git-submodule.sh:108
3589 +#: git-submodule.sh:109
3590 #, sh-format
3546 -msgid "No submodule mapping found in .gitmodules for path '$path'"
3547 -msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
3591 +msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
3592 +msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
3593
3549 -#: git-submodule.sh:149
3594 +#: git-submodule.sh:150
3595 #, sh-format
3551 -msgid "Clone of '$url' into submodule path '$path' failed"
3552 -msgstr "无法克隆 '$url' 到子模组路径 '$path'"
3596 +msgid "Clone of '$url' into submodule path '$sm_path' failed"
3597 +msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
3598
3554 -#: git-submodule.sh:159
3599 +#: git-submodule.sh:160
3600 #, sh-format
3601 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3602 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
3603
3559 -#: git-submodule.sh:247
3604 +#: git-submodule.sh:249
3605 #, sh-format
3606 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3607 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
3608
3564 -#: git-submodule.sh:264
3609 +#: git-submodule.sh:266
3610 #, sh-format
3566 -msgid "'$path' already exists in the index"
3567 -msgstr "'$path' 已经存在于索引中"
3611 +msgid "'$sm_path' already exists in the index"
3612 +msgstr "'$sm_path' 已经存在于索引中"
3613
3569 -#: git-submodule.sh:281
3614 +#: git-submodule.sh:283
3615 #, sh-format
3571 -msgid "'$path' already exists and is not a valid git repo"
3572 -msgstr "'$path' 已存在且不是一个有效的 git 版本库"
3616 +msgid "'$sm_path' already exists and is not a valid git repo"
3617 +msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
3618
3574 -#: git-submodule.sh:295
3619 +#: git-submodule.sh:297
3620 #, sh-format
3576 -msgid "Unable to checkout submodule '$path'"
3577 -msgstr "不能检出子模组 '$path'"
3621 +msgid "Unable to checkout submodule '$sm_path'"
3622 +msgstr "不能检出子模组 '$sm_path'"
3623
3579 -#: git-submodule.sh:300
3624 +#: git-submodule.sh:302
3625 #, sh-format
3581 -msgid "Failed to add submodule '$path'"
3582 -msgstr "无法添加子模组 '$path'"
3626 +msgid "Failed to add submodule '$sm_path'"
3627 +msgstr "无法添加子模组 '$sm_path'"
3628
3584 -#: git-submodule.sh:305
3629 +#: git-submodule.sh:307
3630 #, sh-format
3586 -msgid "Failed to register submodule '$path'"
3587 -msgstr "无法注册子模组 '$path'"
3631 +msgid "Failed to register submodule '$sm_path'"
3632 +msgstr "无法注册子模组 '$sm_path'"
3633
3589 -#: git-submodule.sh:347
3634 +#: git-submodule.sh:349
3635 #, sh-format
3591 -msgid "Entering '$prefix$path'"
3592 -msgstr "正在进入 '$prefix$path'"
3636 +msgid "Entering '$prefix$sm_path'"
3637 +msgstr "正在进入 '$prefix$sm_path'"
3638
3594 -#: git-submodule.sh:359
3639 +#: git-submodule.sh:363
3640 #, sh-format
3596 -msgid "Stopping at '$path'; script returned non-zero status."
3597 -msgstr "停止于 '$path'，脚本返回非零值。"
3641 +msgid "Stopping at '$sm_path'; script returned non-zero status."
3642 +msgstr "停止于 '$sm_path'，脚本返回非零值。"
3643
3599 -#: git-submodule.sh:401
3644 +#: git-submodule.sh:405
3645 #, sh-format
3601 -msgid "No url found for submodule path '$path' in .gitmodules"
3602 -msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url"
3646 +msgid "No url found for submodule path '$sm_path' in .gitmodules"
3647 +msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
3648
3604 -#: git-submodule.sh:410
3649 +#: git-submodule.sh:414
3650 #, sh-format
3606 -msgid "Failed to register url for submodule path '$path'"
3607 -msgstr "无法为子模组路径 '$path' 注册 url"
3651 +msgid "Failed to register url for submodule path '$sm_path'"
3652 +msgstr "无法为子模组路径 '$sm_path' 注册 url"
3653
3609 -#: git-submodule.sh:418
3654 +#: git-submodule.sh:422
3655 #, sh-format
3611 -msgid "Failed to register update mode for submodule path '$path'"
3612 -msgstr "无法为子模组路径 '$path' 注册更新模式"
3656 +msgid "Failed to register update mode for submodule path '$sm_path'"
3657 +msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
3658
3614 -#: git-submodule.sh:420
3659 +#: git-submodule.sh:424
3660 #, sh-format
3616 -msgid "Submodule '$name' ($url) registered for path '$path'"
3617 -msgstr "子模组 '$name' ($url) 已为路径 '$path' 注册"
3661 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
3662 +msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
3663
3619 -#: git-submodule.sh:519
3664 +#: git-submodule.sh:523
3665 #, sh-format
3666 msgid ""
3622 -"Submodule path '$path' not initialized\n"
3667 +"Submodule path '$sm_path' not initialized\n"
3668 "Maybe you want to use 'update --init'?"
3669 msgstr ""
3625 -"子模组路径 '$path' 没有初始化\n"
3670 +"子模组路径 '$sm_path' 没有初始化\n"
3671 "也许您想用 'update --init'？"
3672
3628 -#: git-submodule.sh:532
3673 +#: git-submodule.sh:536
3674 #, sh-format
3630 -msgid "Unable to find current revision in submodule path '$path'"
3631 -msgstr "无法在子模组路径 '$path' 中找到当前版本"
3675 +msgid "Unable to find current revision in submodule path '$sm_path'"
3676 +msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
3677
3633 -#: git-submodule.sh:551
3678 +#: git-submodule.sh:555
3679 #, sh-format
3635 -msgid "Unable to fetch in submodule path '$path'"
3636 -msgstr "无法在子模组路径 '$path' 中获取"
3680 +msgid "Unable to fetch in submodule path '$sm_path'"
3681 +msgstr "无法在子模组路径 '$sm_path' 中获取"
3682
3638 -#: git-submodule.sh:565
3683 +#: git-submodule.sh:569
3684 #, sh-format
3640 -msgid "Unable to rebase '$sha1' in submodule path '$path'"
3641 -msgstr "无法在子模组路径 '$path' 中变基 '$sha1'"
3685 +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
3686 +msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
3687
3643 -#: git-submodule.sh:566
3688 +#: git-submodule.sh:570
3689 #, sh-format
3645 -msgid "Submodule path '$path': rebased into '$sha1'"
3646 -msgstr "子模组路径 '$path'：变基至 '$sha1'"
3690 +msgid "Submodule path '$sm_path': rebased into '$sha1'"
3691 +msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
3692
3648 -#: git-submodule.sh:571
3693 +#: git-submodule.sh:575
3694 #, sh-format
3650 -msgid "Unable to merge '$sha1' in submodule path '$path'"
3651 -msgstr "无法合并 '$sha1' 到子模组路径 '$path' 中"
3695 +msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
3696 +msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
3697
3653 -#: git-submodule.sh:572
3698 +#: git-submodule.sh:576
3699 #, sh-format
3655 -msgid "Submodule path '$path': merged in '$sha1'"
3656 -msgstr "子模组路径 '$path'：已合并入 '$sha1'"
3700 +msgid "Submodule path '$sm_path': merged in '$sha1'"
3701 +msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
3702
3658 -#: git-submodule.sh:577
3703 +#: git-submodule.sh:581
3704 #, sh-format
3660 -msgid "Unable to checkout '$sha1' in submodule path '$path'"
3661 -msgstr "无法在子模组路径 '$path' 中检出 '$sha1'"
3705 +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
3706 +msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
3707
3663 -#: git-submodule.sh:578
3708 +#: git-submodule.sh:582
3709 #, sh-format
3665 -msgid "Submodule path '$path': checked out '$sha1'"
3666 -msgstr "子模组路径 '$path'：检出 '$sha1'"
3710 +msgid "Submodule path '$sm_path': checked out '$sha1'"
3711 +msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
3712
3668 -#: git-submodule.sh:600 git-submodule.sh:923
3713 +#: git-submodule.sh:604 git-submodule.sh:927
3714 #, sh-format
3670 -msgid "Failed to recurse into submodule path '$path'"
3671 -msgstr "无法递归进子模组路径 '$path'"
3715 +msgid "Failed to recurse into submodule path '$sm_path'"
3716 +msgstr "无法递归进子模组路径 '$sm_path'"
3717
3673 -#: git-submodule.sh:708
3718 +#: git-submodule.sh:712
3719 msgid "--"
3720 msgstr "--"
3721
3722 # 译者：注意保持前导空格
3678 -#: git-submodule.sh:766
3723 +#: git-submodule.sh:770
3724 #, sh-format
3725 msgid " Warn: $name doesn't contain commit $sha1_src"
3726 msgstr " 警告：$name 未包含提交 $sha1_src"
3727
3728 # 译者：注意保持前导空格
3684 -#: git-submodule.sh:769
3729 +#: git-submodule.sh:773
3730 #, sh-format
3731 msgid " Warn: $name doesn't contain commit $sha1_dst"
3732 msgstr " 警告：$name 未包含提交 $sha1_dst"
3733
3734 # 译者：注意保持前导空格
3690 -#: git-submodule.sh:772
3735 +#: git-submodule.sh:776
3736 #, sh-format
3737 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3738 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
3739
3695 -#: git-submodule.sh:797
3740 +#: git-submodule.sh:801
3741 msgid "blob"
3742 msgstr "blob"
3743
3699 -#: git-submodule.sh:798
3744 +#: git-submodule.sh:802
3745 msgid "submodule"
3746 msgstr "子模组"
3747
3703 -#: git-submodule.sh:969
3748 +#: git-submodule.sh:973
3749 #, sh-format
3750 msgid "Synchronizing submodule url for '$name'"
3751 msgstr "为 '$name' 同步子模组 url"