@matheusbsbs / matheus-bagliano / commits / 00e5af3f24

l10n: zh_CN v2.36.0 round 1

Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Fangyi Zhou committed Apr 6, 2022 at 10:39 UTC 00e5af3f24f35b95d7a1476c56ffb3b017bb0a0d
1 file changed +4704 -3935
po/zh_CN.po
+4704 -3935
@@ -144,8 +144,8 @@ msgid ""
144 msgstr ""
145 "Project-Id-Version: Git\n"
146 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
147 -"POT-Creation-Date: 2022-01-17 08:34+0800\n"
148 -"PO-Revision-Date: 2022-01-11 18:18+0000\n"
147 +"POT-Creation-Date: 2022-04-06 14:40+0800\n"
148 +"PO-Revision-Date: 2022-04-06 21:16+0100\n"
149 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
150 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
151 "Language: zh_CN\n"
@@ -153,215 +153,214 @@ msgstr ""
153 "Content-Type: text/plain; charset=UTF-8\n"
154 "Content-Transfer-Encoding: 8bit\n"
155 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
156 -"X-Generator: Gtranslator 41.0\n"
156 +"X-Generator: Gtranslator 40.0\n"
157
158 -#: add-interactive.c:380
158 +#: add-interactive.c:382
159 #, c-format
160 msgid "Huh (%s)?"
161 msgstr "嗯（%s）？"
162
163 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
164 -#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
165 -#: builtin/rebase.c:1642
163 +#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
164 +#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
165 +#: builtin/rebase.c:1671
166 msgid "could not read index"
167 msgstr "不能读取索引"
168
169 -#: add-interactive.c:588 git-add--interactive.perl:269
169 +#: add-interactive.c:590 git-add--interactive.perl:269
170 #: git-add--interactive.perl:294
171 msgid "binary"
172 msgstr "二进制"
173
174 -#: add-interactive.c:646 git-add--interactive.perl:278
174 +#: add-interactive.c:648 git-add--interactive.perl:278
175 #: git-add--interactive.perl:332
176 msgid "nothing"
177 msgstr "无"
178
179 -#: add-interactive.c:647 git-add--interactive.perl:314
179 +#: add-interactive.c:649 git-add--interactive.perl:314
180 #: git-add--interactive.perl:329
181 msgid "unchanged"
182 msgstr "没有修改"
183
184 -#: add-interactive.c:684 git-add--interactive.perl:641
184 +#: add-interactive.c:686 git-add--interactive.perl:641
185 msgid "Update"
186 msgstr "更新"
187
188 -#: add-interactive.c:701 add-interactive.c:889
188 +#: add-interactive.c:703 add-interactive.c:891
189 #, c-format
190 msgid "could not stage '%s'"
191 msgstr "不能暂存 '%s'"
192
193 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
193 +#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
194 msgid "could not write index"
195 msgstr "不能写入索引"
196
197 -#: add-interactive.c:710 git-add--interactive.perl:626
197 +#: add-interactive.c:712 git-add--interactive.perl:626
198 #, c-format, perl-format
199 msgid "updated %d path\n"
200 msgid_plural "updated %d paths\n"
201 msgstr[0] "更新了 %d 个路径\n"
202 msgstr[1] "更新了 %d 个路径\n"
203
204 -#: add-interactive.c:728 git-add--interactive.perl:676
204 +#: add-interactive.c:730 git-add--interactive.perl:676
205 #, c-format, perl-format
206 msgid "note: %s is untracked now.\n"
207 msgstr "说明：%s 现已成为未跟踪的。\n"
208
209 -#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
209 +#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
210 #: builtin/reset.c:167
211 #, c-format
212 msgid "make_cache_entry failed for path '%s'"
213 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
214
215 -#: add-interactive.c:763 git-add--interactive.perl:653
215 +#: add-interactive.c:765 git-add--interactive.perl:653
216 msgid "Revert"
217 msgstr "还原"
218
219 -#: add-interactive.c:779
219 +#: add-interactive.c:781
220 msgid "Could not parse HEAD^{tree}"
221 msgstr "不能解析 HEAD^{tree}"
222
223 -#: add-interactive.c:817 git-add--interactive.perl:629
223 +#: add-interactive.c:819 git-add--interactive.perl:629
224 #, c-format, perl-format
225 msgid "reverted %d path\n"
226 msgid_plural "reverted %d paths\n"
227 msgstr[0] "还原了 %d 个路径\n"
228 msgstr[1] "还原了 %d 个路径\n"
229
230 -#: add-interactive.c:868 git-add--interactive.perl:693
230 +#: add-interactive.c:870 git-add--interactive.perl:693
231 #, c-format
232 msgid "No untracked files.\n"
233 msgstr "没有未跟踪的文件。\n"
234
235 -#: add-interactive.c:872 git-add--interactive.perl:687
235 +#: add-interactive.c:874 git-add--interactive.perl:687
236 msgid "Add untracked"
237 msgstr "添加未跟踪的"
238
239 -#: add-interactive.c:899 git-add--interactive.perl:623
239 +#: add-interactive.c:901 git-add--interactive.perl:623
240 #, c-format, perl-format
241 msgid "added %d path\n"
242 msgid_plural "added %d paths\n"
243 msgstr[0] "增加了 %d 个路径\n"
244 msgstr[1] "增加了 %d 个路径\n"
245
246 -#: add-interactive.c:929
246 +#: add-interactive.c:931
247 #, c-format
248 msgid "ignoring unmerged: %s"
249 msgstr "忽略未合入的：%s"
250
251 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
251 +#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
252 #, c-format
253 msgid "Only binary files changed.\n"
254 msgstr "只有二进制文件被修改。\n"
255
256 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
256 +#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
257 #, c-format
258 msgid "No changes.\n"
259 msgstr "没有修改。\n"
260
261 -#: add-interactive.c:947 git-add--interactive.perl:1381
261 +#: add-interactive.c:949 git-add--interactive.perl:1381
262 msgid "Patch update"
263 msgstr "补丁更新"
264
265 -#: add-interactive.c:986 git-add--interactive.perl:1794
265 +#: add-interactive.c:988 git-add--interactive.perl:1794
266 msgid "Review diff"
267 msgstr "检视 diff"
268
269 -#: add-interactive.c:1014
269 +#: add-interactive.c:1016
270 msgid "show paths with changes"
271 msgstr "显示含变更的路径"
272
273 -#: add-interactive.c:1016
273 +#: add-interactive.c:1018
274 msgid "add working tree state to the staged set of changes"
275 msgstr "将工作区状态添加到暂存区修改集中"
276
277 -#: add-interactive.c:1018
277 +#: add-interactive.c:1020
278 msgid "revert staged set of changes back to the HEAD version"
279 msgstr "将暂存的修改集恢复为 HEAD 版本"
280
281 -#: add-interactive.c:1020
281 +#: add-interactive.c:1022
282 msgid "pick hunks and update selectively"
283 msgstr "挑选数据块并有选择地更新"
284
285 -#: add-interactive.c:1022
285 +#: add-interactive.c:1024
286 msgid "view diff between HEAD and index"
287 msgstr "显示 HEAD 和索引的差异"
288
289 -#: add-interactive.c:1024
289 +#: add-interactive.c:1026
290 msgid "add contents of untracked files to the staged set of changes"
291 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
292
293 -#: add-interactive.c:1032 add-interactive.c:1081
293 +#: add-interactive.c:1034 add-interactive.c:1083
294 msgid "Prompt help:"
295 msgstr "帮助："
296
297 -#: add-interactive.c:1034
297 +#: add-interactive.c:1036
298 msgid "select a single item"
299 msgstr "选择一个条目"
300
301 -#: add-interactive.c:1036
301 +#: add-interactive.c:1038
302 msgid "select a range of items"
303 msgstr "选择一系列条目"
304
305 -#: add-interactive.c:1038
305 +#: add-interactive.c:1040
306 msgid "select multiple ranges"
307 msgstr "选择多个范围"
308
309 -#: add-interactive.c:1040 add-interactive.c:1085
309 +#: add-interactive.c:1042 add-interactive.c:1087
310 msgid "select item based on unique prefix"
311 msgstr "基于唯一前缀选择条目"
312
313 -#: add-interactive.c:1042
313 +#: add-interactive.c:1044
314 msgid "unselect specified items"
315 msgstr "反选指定的条目"
316
317 -#: add-interactive.c:1044
317 +#: add-interactive.c:1046
318 msgid "choose all items"
319 msgstr "选择所有条目"
320
321 -#: add-interactive.c:1046
321 +#: add-interactive.c:1048
322 msgid "(empty) finish selecting"
323 msgstr "（空）结束选择"
324
325 -#: add-interactive.c:1083
325 +#: add-interactive.c:1085
326 msgid "select a numbered item"
327 msgstr "选择一个编号条目"
328
329 -#: add-interactive.c:1087
329 +#: add-interactive.c:1089
330 msgid "(empty) select nothing"
331 msgstr "（空）不选择任何内容"
332
333 -#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
333 +#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
334 msgid "*** Commands ***"
335 msgstr "*** 命令 ***"
336
337 -#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
337 +#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
338 msgid "What now"
339 msgstr "请选择"
340
341 -#: add-interactive.c:1148 git-add--interactive.perl:213
341 +#: add-interactive.c:1150 git-add--interactive.perl:213
342 msgid "staged"
343 msgstr "缓存"
344
345 -#: add-interactive.c:1148 git-add--interactive.perl:213
345 +#: add-interactive.c:1150 git-add--interactive.perl:213
346 msgid "unstaged"
347 msgstr "未缓存"
348
349 -#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
350 -#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
351 -#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
352 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
353 -#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
354 -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
355 -#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
349 +#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
350 +#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
351 +#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
352 +#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
353 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
354 +#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
355 #: git-add--interactive.perl:213
356 msgid "path"
357 msgstr "路径"
358
360 -#: add-interactive.c:1155
359 +#: add-interactive.c:1157
360 msgid "could not refresh index"
361 msgstr "不能刷新索引"
362
364 -#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
363 +#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
364 #, c-format
365 msgid "Bye.\n"
366 msgstr "再见。\n"
@@ -662,30 +661,30 @@ msgstr "无法解析数据块头信息 '%.*s'"
661 msgid "could not parse colored hunk header '%.*s'"
662 msgstr "无法解析彩色数据块头信息 '%.*s'"
663
665 -#: add-patch.c:420
664 +#: add-patch.c:431
665 msgid "could not parse diff"
666 msgstr "不能解析差异信息"
667
669 -#: add-patch.c:439
668 +#: add-patch.c:450
669 msgid "could not parse colored diff"
670 msgstr "不能解析彩色差异信息"
671
673 -#: add-patch.c:453
672 +#: add-patch.c:464
673 #, c-format
674 msgid "failed to run '%s'"
675 msgstr "无法运行 '%s'"
676
678 -#: add-patch.c:612
677 +#: add-patch.c:618
678 msgid "mismatched output from interactive.diffFilter"
679 msgstr "interactive.diffFilter 的输出不匹配"
680
682 -#: add-patch.c:613
681 +#: add-patch.c:619
682 msgid ""
683 "Your filter must maintain a one-to-one correspondence\n"
684 "between its input and output lines."
685 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
686
688 -#: add-patch.c:791
687 +#: add-patch.c:797
688 #, c-format
689 msgid ""
690 "expected context line #%d in\n"
@@ -694,7 +693,7 @@ msgstr ""
693 "预期上下文行 #%d 于\n"
694 "%.*s"
695
697 -#: add-patch.c:806
696 +#: add-patch.c:812
697 #, c-format
698 msgid ""
699 "hunks do not overlap:\n"
@@ -707,11 +706,11 @@ msgstr ""
706 "\t不是结尾于：\n"
707 "%.*s"
708
710 -#: add-patch.c:1082 git-add--interactive.perl:1115
709 +#: add-patch.c:1088 git-add--interactive.perl:1115
710 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
711 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
712
714 -#: add-patch.c:1086
713 +#: add-patch.c:1092
714 #, c-format
715 msgid ""
716 "---\n"
@@ -725,7 +724,7 @@ msgstr ""
724 "以 %c 开始的行将被删除。\n"
725
726 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
728 -#: add-patch.c:1100 git-add--interactive.perl:1129
727 +#: add-patch.c:1106 git-add--interactive.perl:1129
728 msgid ""
729 "If it does not apply cleanly, you will be given an opportunity to\n"
730 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -734,11 +733,11 @@ msgstr ""
733 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
734 "此次编辑被终止，该块不会被修改。\n"
735
737 -#: add-patch.c:1133
736 +#: add-patch.c:1139
737 msgid "could not parse hunk header"
738 msgstr "无法解析数据块头信息"
739
741 -#: add-patch.c:1178
740 +#: add-patch.c:1184
741 msgid "'git apply --cached' failed"
742 msgstr "'git apply --cached' 失败"
743
@@ -754,24 +753,24 @@ msgstr "'git apply --cached' 失败"
753 #. Consider translating (saying "no" discards!) as
754 #. (saying "n" for "no" discards!) if the translation
755 #. of the word "no" does not start with n.
757 -#: add-patch.c:1247 git-add--interactive.perl:1244
756 +#: add-patch.c:1253 git-add--interactive.perl:1244
757 msgid ""
758 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
759 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
760
762 -#: add-patch.c:1290
761 +#: add-patch.c:1296
762 msgid "The selected hunks do not apply to the index!"
763 msgstr "选中的块不能应用到索引！"
764
766 -#: add-patch.c:1291 git-add--interactive.perl:1348
765 +#: add-patch.c:1297 git-add--interactive.perl:1348
766 msgid "Apply them to the worktree anyway? "
767 msgstr "无论如何都要应用到工作区么？"
768
770 -#: add-patch.c:1298 git-add--interactive.perl:1351
769 +#: add-patch.c:1304 git-add--interactive.perl:1351
770 msgid "Nothing was applied.\n"
771 msgstr "未应用。\n"
772
774 -#: add-patch.c:1355
773 +#: add-patch.c:1361
774 msgid ""
775 "j - leave this hunk undecided, see next undecided hunk\n"
776 "J - leave this hunk undecided, see next hunk\n"
@@ -793,73 +792,73 @@ msgstr ""
792 "e - 手动编辑当前块\n"
793 "? - 显示帮助\n"
794
796 -#: add-patch.c:1517 add-patch.c:1527
795 +#: add-patch.c:1523 add-patch.c:1533
796 msgid "No previous hunk"
797 msgstr "没有前一个块"
798
800 -#: add-patch.c:1522 add-patch.c:1532
799 +#: add-patch.c:1528 add-patch.c:1538
800 msgid "No next hunk"
801 msgstr "没有下一个块"
802
804 -#: add-patch.c:1538
803 +#: add-patch.c:1544
804 msgid "No other hunks to goto"
805 msgstr "没有其它可供跳转的块"
806
808 -#: add-patch.c:1549 git-add--interactive.perl:1608
807 +#: add-patch.c:1555 git-add--interactive.perl:1608
808 msgid "go to which hunk (<ret> to see more)? "
809 msgstr "跳转到哪个块（<回车> 查看更多）？ "
810
812 -#: add-patch.c:1550 git-add--interactive.perl:1610
811 +#: add-patch.c:1556 git-add--interactive.perl:1610
812 msgid "go to which hunk? "
813 msgstr "跳转到哪个块？"
814
816 -#: add-patch.c:1561
815 +#: add-patch.c:1567
816 #, c-format
817 msgid "Invalid number: '%s'"
818 msgstr "无效数字：'%s'"
819
821 -#: add-patch.c:1566
820 +#: add-patch.c:1572
821 #, c-format
822 msgid "Sorry, only %d hunk available."
823 msgid_plural "Sorry, only %d hunks available."
824 msgstr[0] "对不起，只有 %d 个可用块。"
825 msgstr[1] "对不起，只有 %d 个可用块。"
826
828 -#: add-patch.c:1575
827 +#: add-patch.c:1581
828 msgid "No other hunks to search"
829 msgstr "没有其它可供查找的块"
830
832 -#: add-patch.c:1581 git-add--interactive.perl:1663
831 +#: add-patch.c:1587 git-add--interactive.perl:1663
832 msgid "search for regex? "
833 msgstr "使用正则表达式搜索？"
834
836 -#: add-patch.c:1596
835 +#: add-patch.c:1602
836 #, c-format
837 msgid "Malformed search regexp %s: %s"
838 msgstr "错误的正则表达式 %s：%s"
839
841 -#: add-patch.c:1613
840 +#: add-patch.c:1619
841 msgid "No hunk matches the given pattern"
842 msgstr "没有和给定模式相匹配的块"
843
845 -#: add-patch.c:1620
844 +#: add-patch.c:1626
845 msgid "Sorry, cannot split this hunk"
846 msgstr "对不起，不能拆分这个块"
847
849 -#: add-patch.c:1624
848 +#: add-patch.c:1630
849 #, c-format
850 msgid "Split into %d hunks."
851 msgstr "拆分为 %d 块。"
852
854 -#: add-patch.c:1628
853 +#: add-patch.c:1634
854 msgid "Sorry, cannot edit this hunk"
855 msgstr "对不起，不能编辑这个块"
856
858 -#: add-patch.c:1680
857 +#: add-patch.c:1686
858 msgid "'git apply' failed"
859 msgstr "'git apply' 失败"
860
862 -#: advice.c:78
861 +#: advice.c:81
862 #, c-format
863 msgid ""
864 "\n"
@@ -868,37 +867,37 @@ msgstr ""
867 "\n"
868 "使用 \"git config advice.%s false\" 来关闭此消息"
869
871 -#: advice.c:94
870 +#: advice.c:97
871 #, c-format
872 msgid "%shint: %.*s%s\n"
873 msgstr "%s提示：%.*s%s\n"
874
876 -#: advice.c:178
875 +#: advice.c:181
876 msgid "Cherry-picking is not possible because you have unmerged files."
877 msgstr "无法拣选，因为您有未合并的文件。"
878
880 -#: advice.c:180
879 +#: advice.c:183
880 msgid "Committing is not possible because you have unmerged files."
881 msgstr "无法提交，因为您有未合并的文件。"
882
884 -#: advice.c:182
883 +#: advice.c:185
884 msgid "Merging is not possible because you have unmerged files."
885 msgstr "无法合并，因为您有未合并的文件。"
886
888 -#: advice.c:184
887 +#: advice.c:187
888 msgid "Pulling is not possible because you have unmerged files."
889 msgstr "无法拉取，因为您有未合并的文件。"
890
892 -#: advice.c:186
891 +#: advice.c:189
892 msgid "Reverting is not possible because you have unmerged files."
893 msgstr "无法回退，因为您有未合并的文件。"
894
896 -#: advice.c:188
895 +#: advice.c:191
896 #, c-format
897 msgid "It is not possible to %s because you have unmerged files."
898 msgstr "无法 %s，因为您有未合并的文件。"
899
901 -#: advice.c:196
900 +#: advice.c:199
901 msgid ""
902 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
903 "as appropriate to mark resolution and make a commit."
@@ -906,27 +905,27 @@ msgstr ""
905 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
906 "解决方案并提交。"
907
909 -#: advice.c:204
908 +#: advice.c:207
909 msgid "Exiting because of an unresolved conflict."
910 msgstr "因为存在未解决的冲突而退出。"
911
913 -#: advice.c:209 builtin/merge.c:1382
912 +#: advice.c:212 builtin/merge.c:1388
913 msgid "You have not concluded your merge (MERGE_HEAD exists)."
914 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
915
917 -#: advice.c:211
916 +#: advice.c:214
917 msgid "Please, commit your changes before merging."
918 msgstr "请在合并前先提交您的修改。"
919
921 -#: advice.c:212
920 +#: advice.c:215
921 msgid "Exiting because of unfinished merge."
922 msgstr "因为存在未完成的合并而退出。"
923
925 -#: advice.c:217
924 +#: advice.c:220
925 msgid "Not possible to fast-forward, aborting."
926 msgstr "无法快进，终止。"
927
929 -#: advice.c:227
928 +#: advice.c:230
929 #, c-format
930 msgid ""
931 "The following paths and/or pathspecs matched paths that exist\n"
@@ -936,7 +935,7 @@ msgstr ""
935 "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
936 "所以不会在索引中更新：\n"
937
939 -#: advice.c:234
938 +#: advice.c:237
939 msgid ""
940 "If you intend to update such entries, try one of the following:\n"
941 "* Use the --sparse option.\n"
@@ -946,7 +945,7 @@ msgstr ""
945 "* 使用 --sparse 选项。\n"
946 "* 禁用或者修改稀疏规则。"
947
949 -#: advice.c:242
948 +#: advice.c:245
949 #, c-format
950 msgid ""
951 "Note: switching to '%s'.\n"
@@ -1003,80 +1002,83 @@ msgstr "未能识别的空白字符选项 '%s'"
1002 msgid "unrecognized whitespace ignore option '%s'"
1003 msgstr "未能识别的空白字符忽略选项 '%s'"
1004
1006 -#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
1007 -#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
1008 -#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
1009 -#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
1010 -#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
1011 -#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
1012 -#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
1013 -#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
1014 -#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
1015 -#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
1016 -#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
1017 -#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
1018 -#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
1019 -#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
1020 -#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
1021 -#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
1022 -#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
1023 -#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
1024 -#: builtin/worktree.c:702
1005 +#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
1006 +#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
1007 +#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
1008 +#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
1009 +#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
1010 +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
1011 +#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
1012 +#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
1013 +#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
1014 +#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
1015 +#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
1016 +#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
1017 +#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
1018 +#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
1019 +#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
1020 +#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
1021 +#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
1022 +#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
1023 +#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
1024 +#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
1025 +#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
1026 +#: builtin/worktree.c:779
1027 #, c-format
1028 msgid "options '%s' and '%s' cannot be used together"
1029 msgstr "选项 '%s' 和 '%s' 不能同时使用"
1030
1029 -#: apply.c:139 apply.c:150 apply.c:153
1031 +#: apply.c:141 apply.c:152 apply.c:155
1032 #, c-format
1033 msgid "'%s' outside a repository"
1034 msgstr "'%s' 在仓库之外"
1035
1034 -#: apply.c:800
1036 +#: apply.c:807
1037 #, c-format
1038 msgid "Cannot prepare timestamp regexp %s"
1039 msgstr "无法准备时间戳正则表达式 %s"
1040
1039 -#: apply.c:809
1041 +#: apply.c:816
1042 #, c-format
1043 msgid "regexec returned %d for input: %s"
1044 msgstr "regexec 返回 %d，输入为：%s"
1045
1044 -#: apply.c:883
1046 +#: apply.c:890
1047 #, c-format
1048 msgid "unable to find filename in patch at line %d"
1049 msgstr "不能在补丁的第 %d 行找到文件名"
1050
1049 -#: apply.c:921
1051 +#: apply.c:928
1052 #, c-format
1053 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1054 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
1055
1054 -#: apply.c:927
1056 +#: apply.c:934
1057 #, c-format
1058 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1059 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1060
1059 -#: apply.c:928
1061 +#: apply.c:935
1062 #, c-format
1063 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1064 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1065
1064 -#: apply.c:933
1066 +#: apply.c:940
1067 #, c-format
1068 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1069 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
1070
1069 -#: apply.c:962
1071 +#: apply.c:969
1072 #, c-format
1073 msgid "invalid mode on line %d: %s"
1074 msgstr "第 %d 行包含无效文件模式：%s"
1075
1074 -#: apply.c:1281
1076 +#: apply.c:1288
1077 #, c-format
1078 msgid "inconsistent header lines %d and %d"
1079 msgstr "不一致的文件头，%d 行和 %d 行"
1080
1079 -#: apply.c:1371
1081 +#: apply.c:1378
1082 #, c-format
1083 msgid ""
1084 "git diff header lacks filename information when removing %d leading pathname "
@@ -1087,92 +1089,92 @@ msgid_plural ""
1089 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1090 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1091
1090 -#: apply.c:1384
1092 +#: apply.c:1391
1093 #, c-format
1094 msgid "git diff header lacks filename information (line %d)"
1095 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
1096
1095 -#: apply.c:1480
1097 +#: apply.c:1487
1098 #, c-format
1099 msgid "recount: unexpected line: %.*s"
1100 msgstr "recount：意外的行：%.*s"
1101
1100 -#: apply.c:1549
1102 +#: apply.c:1556
1103 #, c-format
1104 msgid "patch fragment without header at line %d: %.*s"
1105 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1106
1105 -#: apply.c:1752
1107 +#: apply.c:1759
1108 msgid "new file depends on old contents"
1109 msgstr "新文件依赖旧内容"
1110
1109 -#: apply.c:1754
1111 +#: apply.c:1761
1112 msgid "deleted file still has contents"
1113 msgstr "删除的文件仍有内容"
1114
1113 -#: apply.c:1788
1115 +#: apply.c:1795
1116 #, c-format
1117 msgid "corrupt patch at line %d"
1118 msgstr "补丁在第 %d 行损坏"
1119
1118 -#: apply.c:1825
1120 +#: apply.c:1832
1121 #, c-format
1122 msgid "new file %s depends on old contents"
1123 msgstr "新文件 %s 依赖旧内容"
1124
1123 -#: apply.c:1827
1125 +#: apply.c:1834
1126 #, c-format
1127 msgid "deleted file %s still has contents"
1128 msgstr "删除的文件 %s 仍有内容"
1129
1128 -#: apply.c:1830
1130 +#: apply.c:1837
1131 #, c-format
1132 msgid "** warning: file %s becomes empty but is not deleted"
1133 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1134
1133 -#: apply.c:1978
1135 +#: apply.c:1985
1136 #, c-format
1137 msgid "corrupt binary patch at line %d: %.*s"
1138 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1139
1138 -#: apply.c:2015
1140 +#: apply.c:2022
1141 #, c-format
1142 msgid "unrecognized binary patch at line %d"
1143 msgstr "未能识别的二进制补丁位于第 %d 行"
1144
1143 -#: apply.c:2177
1145 +#: apply.c:2184
1146 #, c-format
1147 msgid "patch with only garbage at line %d"
1148 msgstr "补丁文件的第 %d 行只有垃圾数据"
1149
1148 -#: apply.c:2263
1150 +#: apply.c:2270
1151 #, c-format
1152 msgid "unable to read symlink %s"
1153 msgstr "无法读取符号链接 %s"
1154
1153 -#: apply.c:2267
1155 +#: apply.c:2274
1156 #, c-format
1157 msgid "unable to open or read %s"
1158 msgstr "不能打开或读取 %s"
1159
1158 -#: apply.c:2936
1160 +#: apply.c:2943
1161 #, c-format
1162 msgid "invalid start of line: '%c'"
1163 msgstr "无效的行首字符：'%c'"
1164
1163 -#: apply.c:3057
1165 +#: apply.c:3064
1166 #, c-format
1167 msgid "Hunk #%d succeeded at %d (offset %d line)."
1168 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1169 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
1170 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
1171
1170 -#: apply.c:3069
1172 +#: apply.c:3076
1173 #, c-format
1174 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1175 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1176
1175 -#: apply.c:3075
1177 +#: apply.c:3082
1178 #, c-format
1179 msgid ""
1180 "while searching for:\n"
@@ -1181,446 +1183,446 @@ msgstr ""
1183 "当查询：\n"
1184 "%.*s"
1185
1184 -#: apply.c:3097
1186 +#: apply.c:3104
1187 #, c-format
1188 msgid "missing binary patch data for '%s'"
1189 msgstr "缺失 '%s' 的二进制补丁数据"
1190
1189 -#: apply.c:3105
1191 +#: apply.c:3112
1192 #, c-format
1193 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1194 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
1195
1194 -#: apply.c:3152
1196 +#: apply.c:3159
1197 #, c-format
1198 msgid "cannot apply binary patch to '%s' without full index line"
1199 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
1200
1199 -#: apply.c:3163
1201 +#: apply.c:3170
1202 #, c-format
1203 msgid ""
1204 "the patch applies to '%s' (%s), which does not match the current contents."
1205 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
1206
1205 -#: apply.c:3171
1207 +#: apply.c:3178
1208 #, c-format
1209 msgid "the patch applies to an empty '%s' but it is not empty"
1210 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
1211
1210 -#: apply.c:3189
1212 +#: apply.c:3196
1213 #, c-format
1214 msgid "the necessary postimage %s for '%s' cannot be read"
1215 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
1216
1215 -#: apply.c:3202
1217 +#: apply.c:3209
1218 #, c-format
1219 msgid "binary patch does not apply to '%s'"
1220 msgstr "二进制补丁未应用到 '%s'"
1221
1220 -#: apply.c:3209
1222 +#: apply.c:3216
1223 #, c-format
1224 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1225 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
1226
1225 -#: apply.c:3230
1227 +#: apply.c:3237
1228 #, c-format
1229 msgid "patch failed: %s:%ld"
1230 msgstr "打补丁失败：%s:%ld"
1231
1230 -#: apply.c:3353
1232 +#: apply.c:3360
1233 #, c-format
1234 msgid "cannot checkout %s"
1235 msgstr "不能检出 %s"
1236
1235 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1237 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1238 #: setup.c:309
1239 #, c-format
1240 msgid "failed to read %s"
1241 msgstr "无法读取 %s"
1242
1241 -#: apply.c:3413
1243 +#: apply.c:3420
1244 #, c-format
1245 msgid "reading from '%s' beyond a symbolic link"
1246 msgstr "读取位于符号链接中的 '%s'"
1247
1246 -#: apply.c:3442 apply.c:3711
1248 +#: apply.c:3449 apply.c:3721
1249 #, c-format
1250 msgid "path %s has been renamed/deleted"
1251 msgstr "路径 %s 已经被重命名/删除"
1252
1251 -#: apply.c:3549 apply.c:3726
1253 +#: apply.c:3559 apply.c:3736
1254 #, c-format
1255 msgid "%s: does not exist in index"
1256 msgstr "%s：不存在于索引中"
1257
1256 -#: apply.c:3558 apply.c:3734 apply.c:3978
1258 +#: apply.c:3568 apply.c:3744 apply.c:3960
1259 #, c-format
1260 msgid "%s: does not match index"
1261 msgstr "%s：和索引不匹配"
1262
1261 -#: apply.c:3595
1263 +#: apply.c:3605
1264 msgid "repository lacks the necessary blob to perform 3-way merge."
1265 msgstr "仓库缺乏执行三方合并所必需的数据对象。"
1266
1265 -#: apply.c:3598
1267 +#: apply.c:3608
1268 #, c-format
1269 msgid "Performing three-way merge...\n"
1270 msgstr "执行三方合并...\n"
1271
1270 -#: apply.c:3614 apply.c:3618
1272 +#: apply.c:3624 apply.c:3628
1273 #, c-format
1274 msgid "cannot read the current contents of '%s'"
1275 msgstr "无法读取 '%s' 的当前内容"
1276
1275 -#: apply.c:3630
1277 +#: apply.c:3640
1278 #, c-format
1279 msgid "Failed to perform three-way merge...\n"
1280 msgstr "无法执行三方合并...\n"
1281
1280 -#: apply.c:3644
1282 +#: apply.c:3654
1283 #, c-format
1284 msgid "Applied patch to '%s' with conflicts.\n"
1285 msgstr "应用补丁到 '%s' 存在冲突。\n"
1286
1285 -#: apply.c:3649
1287 +#: apply.c:3659
1288 #, c-format
1289 msgid "Applied patch to '%s' cleanly.\n"
1290 msgstr "成功应用补丁到 '%s'。\n"
1291
1290 -#: apply.c:3666
1292 +#: apply.c:3676
1293 #, c-format
1294 msgid "Falling back to direct application...\n"
1295 msgstr "回落到直接应用...\n"
1296
1295 -#: apply.c:3678
1297 +#: apply.c:3688
1298 msgid "removal patch leaves file contents"
1299 msgstr "移除补丁仍留下了文件内容"
1300
1299 -#: apply.c:3751
1301 +#: apply.c:3761
1302 #, c-format
1303 msgid "%s: wrong type"
1304 msgstr "%s：错误类型"
1305
1304 -#: apply.c:3753
1306 +#: apply.c:3763
1307 #, c-format
1308 msgid "%s has type %o, expected %o"
1309 msgstr "%s 的类型是 %o，应为 %o"
1310
1309 -#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1310 -#: read-cache.c:1381
1311 +#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1312 +#: read-cache.c:1399
1313 #, c-format
1314 msgid "invalid path '%s'"
1315 msgstr "无效路径 '%s'"
1316
1315 -#: apply.c:3976
1317 +#: apply.c:3958
1318 #, c-format
1319 msgid "%s: already exists in index"
1320 msgstr "%s：已经存在于索引中"
1321
1320 -#: apply.c:3980
1322 +#: apply.c:3962
1323 #, c-format
1324 msgid "%s: already exists in working directory"
1325 msgstr "%s：已经存在于工作区中"
1326
1325 -#: apply.c:4000
1327 +#: apply.c:3982
1328 #, c-format
1329 msgid "new mode (%o) of %s does not match old mode (%o)"
1330 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1331
1330 -#: apply.c:4005
1332 +#: apply.c:3987
1333 #, c-format
1334 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1335 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1336
1335 -#: apply.c:4025
1337 +#: apply.c:4007
1338 #, c-format
1339 msgid "affected file '%s' is beyond a symbolic link"
1340 msgstr "受影响的文件 '%s' 位于符号链接中"
1341
1340 -#: apply.c:4029
1342 +#: apply.c:4011
1343 #, c-format
1344 msgid "%s: patch does not apply"
1345 msgstr "%s：补丁未应用"
1346
1345 -#: apply.c:4044
1347 +#: apply.c:4026
1348 #, c-format
1349 msgid "Checking patch %s..."
1350 msgstr "正在检查补丁 %s..."
1351
1350 -#: apply.c:4136
1352 +#: apply.c:4118
1353 #, c-format
1354 msgid "sha1 information is lacking or useless for submodule %s"
1355 msgstr "子模组 %s 的 sha1 信息缺失或无效"
1356
1355 -#: apply.c:4143
1357 +#: apply.c:4125
1358 #, c-format
1359 msgid "mode change for %s, which is not in current HEAD"
1360 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
1361
1360 -#: apply.c:4146
1362 +#: apply.c:4128
1363 #, c-format
1364 msgid "sha1 information is lacking or useless (%s)."
1365 msgstr "sha1 信息缺失或无效（%s）。"
1366
1365 -#: apply.c:4155
1367 +#: apply.c:4137
1368 #, c-format
1369 msgid "could not add %s to temporary index"
1370 msgstr "不能在临时索引中添加 %s"
1371
1370 -#: apply.c:4165
1372 +#: apply.c:4147
1373 #, c-format
1374 msgid "could not write temporary index to %s"
1375 msgstr "不能把临时索引写入到 %s"
1376
1375 -#: apply.c:4303
1377 +#: apply.c:4285
1378 #, c-format
1379 msgid "unable to remove %s from index"
1380 msgstr "不能从索引中移除 %s"
1381
1380 -#: apply.c:4337
1382 +#: apply.c:4319
1383 #, c-format
1384 msgid "corrupt patch for submodule %s"
1385 msgstr "子模组 %s 损坏的补丁"
1386
1385 -#: apply.c:4343
1387 +#: apply.c:4325
1388 #, c-format
1389 msgid "unable to stat newly created file '%s'"
1390 msgstr "不能对新建文件 '%s' 调用 stat"
1391
1390 -#: apply.c:4351
1392 +#: apply.c:4333
1393 #, c-format
1394 msgid "unable to create backing store for newly created file %s"
1395 msgstr "不能为新建文件 %s 创建后端存储"
1396
1395 -#: apply.c:4357 apply.c:4502
1397 +#: apply.c:4339 apply.c:4484
1398 #, c-format
1399 msgid "unable to add cache entry for %s"
1400 msgstr "无法为 %s 添加缓存条目"
1401
1400 -#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1402 +#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1403 #: builtin/gc.c:2293
1404 #, c-format
1405 msgid "failed to write to '%s'"
1406 msgstr "无法写入 '%s'"
1407
1406 -#: apply.c:4404
1408 +#: apply.c:4386
1409 #, c-format
1410 msgid "closing file '%s'"
1411 msgstr "关闭文件 '%s'"
1412
1411 -#: apply.c:4474
1413 +#: apply.c:4456
1414 #, c-format
1415 msgid "unable to write file '%s' mode %o"
1416 msgstr "不能写文件 '%s' 权限 %o"
1417
1416 -#: apply.c:4572
1418 +#: apply.c:4554
1419 #, c-format
1420 msgid "Applied patch %s cleanly."
1421 msgstr "成功应用补丁 %s。"
1422
1421 -#: apply.c:4580
1423 +#: apply.c:4562
1424 msgid "internal error"
1425 msgstr "内部错误"
1426
1425 -#: apply.c:4583
1427 +#: apply.c:4565
1428 #, c-format
1429 msgid "Applying patch %%s with %d reject..."
1430 msgid_plural "Applying patch %%s with %d rejects..."
1431 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1432 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1433
1432 -#: apply.c:4594
1434 +#: apply.c:4576
1435 #, c-format
1436 msgid "truncating .rej filename to %.*s.rej"
1437 msgstr "截短 .rej 文件名为 %.*s.rej"
1438
1437 -#: apply.c:4602
1439 +#: apply.c:4584
1440 #, c-format
1441 msgid "cannot open %s"
1442 msgstr "不能打开 %s"
1443
1442 -#: apply.c:4616
1444 +#: apply.c:4598
1445 #, c-format
1446 msgid "Hunk #%d applied cleanly."
1447 msgstr "第 #%d 个片段成功应用。"
1448
1447 -#: apply.c:4620
1449 +#: apply.c:4602
1450 #, c-format
1451 msgid "Rejected hunk #%d."
1452 msgstr "拒绝第 #%d 个片段。"
1453
1452 -#: apply.c:4749
1454 +#: apply.c:4731
1455 #, c-format
1456 msgid "Skipped patch '%s'."
1457 msgstr "略过补丁 '%s'。"
1458
1457 -#: apply.c:4758
1459 +#: apply.c:4740
1460 msgid "No valid patches in input (allow with \"--allow-empty\")"
1461 msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
1462
1461 -#: apply.c:4779
1463 +#: apply.c:4761
1464 msgid "unable to read index file"
1465 msgstr "无法读取索引文件"
1466
1465 -#: apply.c:4936
1467 +#: apply.c:4918
1468 #, c-format
1469 msgid "can't open patch '%s': %s"
1470 msgstr "不能打开补丁 '%s'：%s"
1471
1470 -#: apply.c:4963
1472 +#: apply.c:4945
1473 #, c-format
1474 msgid "squelched %d whitespace error"
1475 msgid_plural "squelched %d whitespace errors"
1476 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1477 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1478
1477 -#: apply.c:4969 apply.c:4984
1479 +#: apply.c:4951 apply.c:4966
1480 #, c-format
1481 msgid "%d line adds whitespace errors."
1482 msgid_plural "%d lines add whitespace errors."
1483 msgstr[0] "%d 行新增了空白字符误用。"
1484 msgstr[1] "%d 行新增了空白字符误用。"
1485
1484 -#: apply.c:4977
1486 +#: apply.c:4959
1487 #, c-format
1488 msgid "%d line applied after fixing whitespace errors."
1489 msgid_plural "%d lines applied after fixing whitespace errors."
1490 msgstr[0] "修复空白错误后，应用了 %d 行。"
1491 msgstr[1] "修复空白错误后，应用了 %d 行。"
1492
1491 -#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
1493 +#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1494 msgid "Unable to write new index file"
1495 msgstr "无法写入新索引文件"
1496
1495 -#: apply.c:5021
1497 +#: apply.c:5003
1498 msgid "don't apply changes matching the given path"
1499 msgstr "不要应用与给出路径向匹配的变更"
1500
1499 -#: apply.c:5024
1501 +#: apply.c:5006
1502 msgid "apply changes matching the given path"
1503 msgstr "应用与给出路径向匹配的变更"
1504
1503 -#: apply.c:5026 builtin/am.c:2376
1505 +#: apply.c:5008 builtin/am.c:2379
1506 msgid "num"
1507 msgstr "数字"
1508
1507 -#: apply.c:5027
1509 +#: apply.c:5009
1510 msgid "remove <num> leading slashes from traditional diff paths"
1511 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1512
1511 -#: apply.c:5030
1513 +#: apply.c:5012
1514 msgid "ignore additions made by the patch"
1515 msgstr "忽略补丁中的添加的文件"
1516
1515 -#: apply.c:5032
1517 +#: apply.c:5014
1518 msgid "instead of applying the patch, output diffstat for the input"
1519 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1520
1519 -#: apply.c:5036
1521 +#: apply.c:5018
1522 msgid "show number of added and deleted lines in decimal notation"
1523 msgstr "以十进制数显示添加和删除的行数"
1524
1523 -#: apply.c:5038
1525 +#: apply.c:5020
1526 msgid "instead of applying the patch, output a summary for the input"
1527 msgstr "不应用补丁，而是显示输入的概要"
1528
1527 -#: apply.c:5040
1529 +#: apply.c:5022
1530 msgid "instead of applying the patch, see if the patch is applicable"
1531 msgstr "不应用补丁，而是查看补丁是否可应用"
1532
1531 -#: apply.c:5042
1533 +#: apply.c:5024
1534 msgid "make sure the patch is applicable to the current index"
1535 msgstr "确认补丁可以应用到当前索引"
1536
1535 -#: apply.c:5044
1537 +#: apply.c:5026
1538 msgid "mark new files with `git add --intent-to-add`"
1539 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1540
1539 -#: apply.c:5046
1541 +#: apply.c:5028
1542 msgid "apply a patch without touching the working tree"
1543 msgstr "应用补丁而不修改工作区"
1544
1543 -#: apply.c:5048
1545 +#: apply.c:5030
1546 msgid "accept a patch that touches outside the working area"
1547 msgstr "接受修改工作区之外文件的补丁"
1548
1547 -#: apply.c:5051
1549 +#: apply.c:5033
1550 msgid "also apply the patch (use with --stat/--summary/--check)"
1551 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1552
1551 -#: apply.c:5053
1553 +#: apply.c:5035
1554 msgid "attempt three-way merge, fall back on normal patch if that fails"
1555 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
1556
1555 -#: apply.c:5055
1557 +#: apply.c:5037
1558 msgid "build a temporary index based on embedded index information"
1559 msgstr "创建一个临时索引基于嵌入的索引信息"
1560
1559 -#: apply.c:5058 builtin/checkout-index.c:196
1561 +#: apply.c:5040 builtin/checkout-index.c:230
1562 msgid "paths are separated with NUL character"
1563 msgstr "路径以 NUL 字符分隔"
1564
1563 -#: apply.c:5060
1565 +#: apply.c:5042
1566 msgid "ensure at least <n> lines of context match"
1567 msgstr "确保至少匹配 <n> 行上下文"
1568
1567 -#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
1569 +#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1570 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1569 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1570 -#: builtin/rebase.c:1051
1571 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1572 +#: builtin/rebase.c:1079
1573 msgid "action"
1574 msgstr "动作"
1575
1574 -#: apply.c:5062
1576 +#: apply.c:5044
1577 msgid "detect new or modified lines that have whitespace errors"
1578 msgstr "检查新增和修改的行中间的空白字符滥用"
1579
1578 -#: apply.c:5065 apply.c:5068
1580 +#: apply.c:5047 apply.c:5050
1581 msgid "ignore changes in whitespace when finding context"
1582 msgstr "查找上下文时忽略空白字符的变更"
1583
1582 -#: apply.c:5071
1584 +#: apply.c:5053
1585 msgid "apply the patch in reverse"
1586 msgstr "反向应用补丁"
1587
1586 -#: apply.c:5073
1588 +#: apply.c:5055
1589 msgid "don't expect at least one line of context"
1590 msgstr "无需至少一行上下文"
1591
1590 -#: apply.c:5075
1592 +#: apply.c:5057
1593 msgid "leave the rejected hunks in corresponding *.rej files"
1594 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1595
1594 -#: apply.c:5077
1596 +#: apply.c:5059
1597 msgid "allow overlapping hunks"
1598 msgstr "允许重叠的补丁片段"
1599
1598 -#: apply.c:5080
1600 +#: apply.c:5062
1601 msgid "tolerate incorrectly detected missing new-line at the end of file"
1602 msgstr "允许不正确的文件末尾换行符"
1603
1602 -#: apply.c:5083
1604 +#: apply.c:5065
1605 msgid "do not trust the line counts in the hunk headers"
1606 msgstr "不信任补丁片段的头信息中的行号"
1607
1606 -#: apply.c:5085 builtin/am.c:2364
1608 +#: apply.c:5067 builtin/am.c:2367
1609 msgid "root"
1610 msgstr "根目录"
1611
1610 -#: apply.c:5086
1612 +#: apply.c:5068
1613 msgid "prepend <root> to all filenames"
1614 msgstr "为所有文件名前添加 <根目录>"
1615
1614 -#: apply.c:5089
1616 +#: apply.c:5071
1617 msgid "don't return error for empty patches"
1618 msgstr "对空的补丁不返回错误"
1619
1618 -#: archive-tar.c:125 archive-zip.c:345
1620 +#: archive-tar.c:125 archive-zip.c:346
1621 #, c-format
1622 msgid "cannot stream blob %s"
1623 msgstr "不能打开数据对象 %s"
1624
1623 -#: archive-tar.c:265 archive-zip.c:358
1625 +#: archive-tar.c:265 archive-zip.c:359
1626 #, c-format
1627 msgid "unsupported file mode: 0%o (SHA1: %s)"
1628 msgstr "不支持的文件模式：0%o (SHA1: %s)"
@@ -1639,22 +1641,22 @@ msgstr "无法重定向描述符"
1641 msgid "'%s' filter reported error"
1642 msgstr "'%s' 过滤器报告了错误"
1643
1642 -#: archive-zip.c:318
1644 +#: archive-zip.c:319
1645 #, c-format
1646 msgid "path is not valid UTF-8: %s"
1647 msgstr "路径不是有效的 UTF-8：%s"
1648
1647 -#: archive-zip.c:322
1649 +#: archive-zip.c:323
1650 #, c-format
1651 msgid "path too long (%d chars, SHA1: %s): %s"
1652 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
1653
1652 -#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
1654 +#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1655 #, c-format
1656 msgid "deflate error (%d)"
1657 msgstr "压缩错误 (%d)"
1658
1657 -#: archive-zip.c:603
1659 +#: archive-zip.c:604
1660 #, c-format
1661 msgid "timestamp too large for this system: %<PRIuMAX>"
1662 msgstr "对于本系统时间戳太大：%<PRIuMAX>"
@@ -1663,10 +1665,6 @@ msgstr "对于本系统时间戳太大：%<PRIuMAX>"
1665 msgid "git archive [<options>] <tree-ish> [<path>...]"
1666 msgstr "git archive [<选项>] <树对象> [<路径>...]"
1667
1666 -#: archive.c:15
1667 -msgid "git archive --list"
1668 -msgstr "git archive --list"
1669 -
1668 #: archive.c:16
1669 msgid ""
1670 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
@@ -1678,12 +1676,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list"
1676 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1677
1678 #: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1681 -#: builtin/tag.c:578
1679 +#: builtin/tag.c:579
1680 #, c-format
1681 msgid "cannot read '%s'"
1682 msgstr "不能读取 '%s'"
1683
1686 -#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
1684 +#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1685 #, c-format
1686 msgid "pathspec '%s' did not match any files"
1687 msgstr "路径规格 '%s' 未匹配任何文件"
@@ -1725,7 +1723,7 @@ msgstr "格式"
1723 msgid "archive format"
1724 msgstr "归档格式"
1725
1728 -#: archive.c:552 builtin/log.c:1790
1726 +#: archive.c:552 builtin/log.c:1809
1727 msgid "prefix"
1728 msgstr "前缀"
1729
@@ -1733,12 +1731,12 @@ msgstr "前缀"
1731 msgid "prepend prefix to each pathname in the archive"
1732 msgstr "为归档中每个路径名加上前缀"
1733
1736 -#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1737 -#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1734 +#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1735 +#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1736 #: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1739 -#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
1737 +#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1738 #: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1741 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
1739 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1740 msgid "file"
1741 msgstr "文件"
1742
@@ -1766,8 +1764,8 @@ msgstr "设置压缩级别"
1764 msgid "list supported archive formats"
1765 msgstr "列出支持的归档格式"
1766
1769 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1770 -#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
1767 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1768 +#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1769 msgid "repo"
1770 msgstr "仓库"
1771
@@ -1788,11 +1786,12 @@ msgstr "远程 git-upload-archive 命令的路径"
1786 msgid "Unexpected option --remote"
1787 msgstr "未知参数 --remote"
1788
1791 -#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
1792 -#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
1793 -#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
1794 -#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
1795 -#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
1789 +#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1790 +#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1791 +#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1792 +#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1793 +#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1794 +#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1795 #: http-fetch.c:153
1796 #, c-format
1797 msgid "the option '%s' requires '%s'"
@@ -1812,17 +1811,17 @@ msgstr "未知归档格式 '%s'"
1811 msgid "Argument not supported for format '%s': -%d"
1812 msgstr "参数不支持此格式 '%s'：-%d"
1813
1815 -#: attr.c:203
1814 +#: attr.c:202
1815 #, c-format
1816 msgid "%.*s is not a valid attribute name"
1817 msgstr "%.*s 不是一个有效的属性名"
1818
1820 -#: attr.c:364
1819 +#: attr.c:363
1820 #, c-format
1821 msgid "%s not allowed: %s:%d"
1822 msgstr "不允许 %s：%s:%d"
1823
1825 -#: attr.c:404
1824 +#: attr.c:403
1825 msgid ""
1826 "Negative patterns are ignored in git attributes\n"
1827 "Use '\\!' for literal leading exclamation."
@@ -1840,12 +1839,12 @@ msgstr "文件 '%s' 包含错误的引用格式：%s"
1839 msgid "We cannot bisect more!\n"
1840 msgstr "我们无法进行更多的二分查找！\n"
1841
1843 -#: bisect.c:764
1842 +#: bisect.c:765
1843 #, c-format
1844 msgid "Not a valid commit name %s"
1845 msgstr "不是一个有效的提交名 %s"
1846
1848 -#: bisect.c:789
1847 +#: bisect.c:790
1848 #, c-format
1849 msgid ""
1850 "The merge base %s is bad.\n"
@@ -1854,7 +1853,7 @@ msgstr ""
1853 "合并基线 %s 是坏的。\n"
1854 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1855
1857 -#: bisect.c:794
1856 +#: bisect.c:795
1857 #, c-format
1858 msgid ""
1859 "The merge base %s is new.\n"
@@ -1863,7 +1862,7 @@ msgstr ""
1862 "合并基线 %s 是新的。\n"
1863 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
1864
1866 -#: bisect.c:799
1865 +#: bisect.c:800
1866 #, c-format
1867 msgid ""
1868 "The merge base %s is %s.\n"
@@ -1872,7 +1871,7 @@ msgstr ""
1871 "合并基线 %s 是 %s。\n"
1872 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1873
1875 -#: bisect.c:807
1874 +#: bisect.c:808
1875 #, c-format
1876 msgid ""
1877 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1883,7 +1882,7 @@ msgstr ""
1882 "这种情况下 git 二分查找无法正常工作。\n"
1883 "您可能弄错了 %s 和 %s 版本？\n"
1884
1886 -#: bisect.c:820
1885 +#: bisect.c:821
1886 #, c-format
1887 msgid ""
1888 "the merge base between %s and [%s] must be skipped.\n"
@@ -1894,36 +1893,36 @@ msgstr ""
1893 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1894 "我们仍旧继续。"
1895
1897 -#: bisect.c:859
1896 +#: bisect.c:860
1897 #, c-format
1898 msgid "Bisecting: a merge base must be tested\n"
1899 msgstr "二分查找中：合并基线必须是经过测试的\n"
1900
1902 -#: bisect.c:909
1901 +#: bisect.c:910
1902 #, c-format
1903 msgid "a %s revision is needed"
1904 msgstr "需要一个 %s 版本"
1905
1907 -#: bisect.c:939
1906 +#: bisect.c:940
1907 #, c-format
1908 msgid "could not create file '%s'"
1909 msgstr "不能创建文件 '%s'"
1910
1912 -#: bisect.c:985 builtin/merge.c:155
1911 +#: bisect.c:986 builtin/merge.c:155
1912 #, c-format
1913 msgid "could not read file '%s'"
1914 msgstr "不能读取文件 '%s'"
1915
1917 -#: bisect.c:1025
1916 +#: bisect.c:1026
1917 msgid "reading bisect refs failed"
1918 msgstr "读取二分查找引用失败"
1919
1921 -#: bisect.c:1055
1920 +#: bisect.c:1056
1921 #, c-format
1922 msgid "%s was both %s and %s\n"
1923 msgstr "%s 同时为 %s 和 %s\n"
1924
1926 -#: bisect.c:1064
1925 +#: bisect.c:1065
1926 #, c-format
1927 msgid ""
1928 "No testable commit found.\n"
@@ -1932,7 +1931,7 @@ msgstr ""
1931 "没有发现可测试的提交。\n"
1932 "可能您在运行时使用了错误的路径参数？\n"
1933
1935 -#: bisect.c:1093
1934 +#: bisect.c:1094
1935 #, c-format
1936 msgid "(roughly %d step)"
1937 msgid_plural "(roughly %d steps)"
@@ -1942,80 +1941,80 @@ msgstr[1] "（大概 %d 步）"
1941 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1942 #. steps)" translation.
1943 #.
1945 -#: bisect.c:1099
1944 +#: bisect.c:1100
1945 #, c-format
1946 msgid "Bisecting: %d revision left to test after this %s\n"
1947 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1948 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1949 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1950
1952 -#: blame.c:2776
1951 +#: blame.c:2773
1952 msgid "--contents and --reverse do not blend well."
1953 msgstr "--contents 和 --reverse 不能混用。"
1954
1956 -#: blame.c:2790
1955 +#: blame.c:2787
1956 msgid "cannot use --contents with final commit object name"
1957 msgstr "不能将 --contents 和最终的提交对象名共用"
1958
1960 -#: blame.c:2811
1959 +#: blame.c:2808
1960 msgid "--reverse and --first-parent together require specified latest commit"
1961 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1962
1964 -#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
1965 -#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
1966 -#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
1967 -#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
1968 -#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1963 +#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1964 +#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1965 +#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1966 +#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1967 +#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1968 #: builtin/shortlog.c:255
1969 msgid "revision walk setup failed"
1970 msgstr "版本遍历设置失败"
1971
1973 -#: blame.c:2838
1972 +#: blame.c:2835
1973 msgid ""
1974 "--reverse --first-parent together require range along first-parent chain"
1975 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
1976
1978 -#: blame.c:2849
1977 +#: blame.c:2846
1978 #, c-format
1979 msgid "no such path %s in %s"
1980 msgstr "在 %2$s 中无此路径 %1$s"
1981
1983 -#: blame.c:2860
1982 +#: blame.c:2857
1983 #, c-format
1984 msgid "cannot read blob %s for path %s"
1985 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1986
1988 -#: branch.c:77
1987 +#: branch.c:93
1988 msgid ""
1989 "cannot inherit upstream tracking configuration of multiple refs when "
1990 "rebasing is requested"
1991 msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
1992
1994 -#: branch.c:88
1993 +#: branch.c:104
1994 #, c-format
1995 msgid "not setting branch '%s' as its own upstream"
1996 msgstr "没有将分支 '%s' 设置为它自己的上游"
1997
1999 -#: branch.c:144
1998 +#: branch.c:160
1999 #, c-format
2000 msgid "branch '%s' set up to track '%s' by rebasing."
2001 msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
2002
2004 -#: branch.c:145
2003 +#: branch.c:161
2004 #, c-format
2005 msgid "branch '%s' set up to track '%s'."
2006 msgstr "分支 '%s' 设置为跟踪 '%s'。"
2007
2009 -#: branch.c:148
2008 +#: branch.c:164
2009 #, c-format
2010 msgid "branch '%s' set up to track:"
2011 msgstr "分支 '%s' 设置为跟踪："
2012
2014 -#: branch.c:160
2013 +#: branch.c:176
2014 msgid "unable to write upstream branch configuration"
2015 msgstr "无法写入上游分支配置"
2016
2018 -#: branch.c:162
2017 +#: branch.c:178
2018 msgid ""
2019 "\n"
2020 "After fixing the error cause you may try to fix up\n"
@@ -2024,47 +2023,84 @@ msgstr ""
2023 "\n"
2024 "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
2025
2027 -#: branch.c:203
2026 +#: branch.c:219
2027 #, c-format
2028 msgid "asked to inherit tracking from '%s', but no remote is set"
2029 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
2030
2032 -#: branch.c:209
2031 +#: branch.c:225
2032 #, c-format
2033 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
2034 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
2035
2037 -#: branch.c:252
2036 +#: branch.c:277
2037 +#, c-format
2038 +msgid "not tracking: ambiguous information for ref '%s'"
2039 +msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
2040 +
2041 +# 译者：为保证在输出中对齐，注意调整句中空格！
2042 +#. TRANSLATORS: This is a line listing a remote with duplicate
2043 +#. refspecs in the advice message below. For RTL languages you'll
2044 +#. probably want to swap the "%s" and leading " " space around.
2045 +#.
2046 +#. TRANSLATORS: This is line item of ambiguous object output
2047 +#. from describe_ambiguous_object() above. For RTL languages
2048 +#. you'll probably want to swap the "%s" and leading " " space
2049 +#. around.
2050 +#.
2051 +#: branch.c:289 object-name.c:464
2052 +#, c-format
2053 +msgid " %s\n"
2054 +msgstr " %s\n"
2055 +
2056 +#. TRANSLATORS: The second argument is a \n-delimited list of
2057 +#. duplicate refspecs, composed above.
2058 +#.
2059 +#: branch.c:295
2060 #, c-format
2039 -msgid "not tracking: ambiguous information for ref %s"
2040 -msgstr "未跟踪：引用 %s 有歧义"
2061 +msgid ""
2062 +"There are multiple remotes whose fetch refspecs map to the remote\n"
2063 +"tracking ref '%s':\n"
2064 +"%s\n"
2065 +"This is typically a configuration error.\n"
2066 +"\n"
2067 +"To support setting up tracking branches, ensure that\n"
2068 +"different remotes' fetch refspecs map into different\n"
2069 +"tracking namespaces."
2070 +msgstr ""
2071 +"有多个远程的获取引用规格映射到了追踪引用 '%s'：\n"
2072 +"%s\n"
2073 +"这一般是个配置错误。\n"
2074 +"\n"
2075 +"如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"
2076 +"间。"
2077
2042 -#: branch.c:287
2078 +#: branch.c:344
2079 #, c-format
2080 msgid "'%s' is not a valid branch name"
2081 msgstr "'%s' 不是一个有效的分支名称"
2082
2047 -#: branch.c:307
2083 +#: branch.c:364
2084 #, c-format
2085 msgid "a branch named '%s' already exists"
2086 msgstr "一个名为 '%s' 的分支已经存在"
2087
2052 -#: branch.c:313
2088 +#: branch.c:370
2089 #, c-format
2090 msgid "cannot force update the branch '%s' checked out at '%s'"
2091 msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
2092
2057 -#: branch.c:336
2093 +#: branch.c:393
2094 #, c-format
2095 msgid "cannot set up tracking information; starting point '%s' is not a branch"
2096 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
2097
2062 -#: branch.c:338
2098 +#: branch.c:395
2099 #, c-format
2100 msgid "the requested upstream branch '%s' does not exist"
2101 msgstr "请求的上游分支 '%s' 不存在"
2102
2067 -#: branch.c:340
2103 +#: branch.c:397
2104 msgid ""
2105 "\n"
2106 "If you are planning on basing your work on an upstream\n"
@@ -2082,126 +2118,144 @@ msgstr ""
2118 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
2119 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
2120
2085 -#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
2121 +#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
2122 #: builtin/replace.c:423 builtin/replace.c:453
2123 #, c-format
2124 msgid "not a valid object name: '%s'"
2125 msgstr "不是一个有效的对象名：'%s'"
2126
2091 -#: branch.c:404
2127 +#: branch.c:465
2128 #, c-format
2129 msgid "ambiguous object name: '%s'"
2130 msgstr "歧义的对象名：'%s'"
2131
2096 -#: branch.c:409
2132 +#: branch.c:470
2133 #, c-format
2134 msgid "not a valid branch point: '%s'"
2135 msgstr "无效的分支点：'%s'"
2136
2101 -#: branch.c:469
2137 +#: branch.c:658
2138 +#, c-format
2139 +msgid "submodule '%s': unable to find submodule"
2140 +msgstr "子模组 '%s'：无法找到子模组"
2141 +
2142 +#: branch.c:661
2143 +#, c-format
2144 +msgid ""
2145 +"You may try updating the submodules using 'git checkout %s && git submodule "
2146 +"update --init'"
2147 +msgstr ""
2148 +"你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组"
2149 +
2150 +#: branch.c:672 branch.c:698
2151 +#, c-format
2152 +msgid "submodule '%s': cannot create branch '%s'"
2153 +msgstr "子模组 '%s'：不能创建分支 '%s'"
2154 +
2155 +#: branch.c:730
2156 #, c-format
2157 msgid "'%s' is already checked out at '%s'"
2158 msgstr "'%s' 已经检出到 '%s'"
2159
2106 -#: branch.c:494
2160 +#: branch.c:755
2161 #, c-format
2162 msgid "HEAD of working tree %s is not updated"
2163 msgstr "工作区 %s 的 HEAD 指向没有被更新"
2164
2111 -#: bundle.c:44
2165 +#: bundle.c:45
2166 #, c-format
2167 msgid "unrecognized bundle hash algorithm: %s"
2168 msgstr "未能识别的归档包哈希算法：%s"
2169
2116 -#: bundle.c:48
2170 +#: bundle.c:53
2171 #, c-format
2172 msgid "unknown capability '%s'"
2173 msgstr "未知能力 '%s'"
2174
2121 -#: bundle.c:74
2175 +#: bundle.c:79
2176 #, c-format
2177 msgid "'%s' does not look like a v2 or v3 bundle file"
2178 msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
2179
2126 -#: bundle.c:113
2180 +#: bundle.c:118
2181 #, c-format
2182 msgid "unrecognized header: %s%s (%d)"
2183 msgstr "未能识别的包头：%s%s (%d)"
2184
2131 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
2132 -#: builtin/commit.c:862
2185 +#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
2186 +#: builtin/commit.c:865
2187 #, c-format
2188 msgid "could not open '%s'"
2189 msgstr "不能打开 '%s'"
2190
2137 -#: bundle.c:198
2191 +#: bundle.c:203
2192 msgid "Repository lacks these prerequisite commits:"
2193 msgstr "仓库中缺少这些必备的提交："
2194
2141 -#: bundle.c:201
2195 +#: bundle.c:206
2196 msgid "need a repository to verify a bundle"
2197 msgstr "需要一个仓库来校验一个归档包"
2198
2145 -#: bundle.c:257
2199 +#: bundle.c:264
2200 #, c-format
2201 msgid "The bundle contains this ref:"
2148 -msgid_plural "The bundle contains these %d refs:"
2202 +msgid_plural "The bundle contains these %<PRIuMAX> refs:"
2203 msgstr[0] "这个归档包中含有这个引用："
2150 -msgstr[1] "这个归档包中含有 %d 个引用："
2204 +msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
2205
2152 -#: bundle.c:264
2206 +#: bundle.c:272
2207 msgid "The bundle records a complete history."
2208 msgstr "这个归档包记录一个完整历史。"
2209
2156 -#: bundle.c:266
2210 +#: bundle.c:274
2211 #, c-format
2212 msgid "The bundle requires this ref:"
2159 -msgid_plural "The bundle requires these %d refs:"
2213 +msgid_plural "The bundle requires these %<PRIuMAX> refs:"
2214 msgstr[0] "这个归档包需要这个引用："
2161 -msgstr[1] "这个归档包需要 %d 个引用："
2215 +msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
2216
2163 -#: bundle.c:333
2217 +#: bundle.c:350
2218 msgid "unable to dup bundle descriptor"
2219 msgstr "无法复制归档包描述符"
2220
2167 -#: bundle.c:340
2221 +#: bundle.c:357
2222 msgid "Could not spawn pack-objects"
2223 msgstr "不能生成 pack-objects 进程"
2224
2171 -#: bundle.c:351
2225 +#: bundle.c:368
2226 msgid "pack-objects died"
2227 msgstr "pack-objects 终止"
2228
2175 -#: bundle.c:400
2229 +#: bundle.c:417
2230 #, c-format
2231 msgid "ref '%s' is excluded by the rev-list options"
2232 msgstr "引用 '%s' 被 rev-list 选项排除"
2233
2180 -#: bundle.c:504
2234 +#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
2235 +#, c-format
2236 +msgid "unrecognized argument: %s"
2237 +msgstr "未能识别的参数：%s"
2238 +
2239 +#: bundle.c:548
2240 #, c-format
2241 msgid "unsupported bundle version %d"
2242 msgstr "不支持的归档包版本 %d"
2243
2185 -#: bundle.c:506
2244 +#: bundle.c:550
2245 #, c-format
2246 msgid "cannot write bundle version %d with algorithm %s"
2247 msgstr "不能写入，归档包版本 %d 不支持算法 %s"
2248
2190 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
2191 -#, c-format
2192 -msgid "unrecognized argument: %s"
2193 -msgstr "未能识别的参数：%s"
2194 -
2195 -#: bundle.c:553
2249 +#: bundle.c:600
2250 msgid "Refusing to create empty bundle."
2251 msgstr "不能创建空的归档包。"
2252
2199 -#: bundle.c:563
2253 +#: bundle.c:610
2254 #, c-format
2255 msgid "cannot create '%s'"
2256 msgstr "不能创建 '%s'"
2257
2204 -#: bundle.c:588
2258 +#: bundle.c:639
2259 msgid "index-pack died"
2260 msgstr "index-pack 终止"
2261
@@ -2229,7 +2283,7 @@ msgstr "最终块有非零 ID %<PRIx32>"
2283 msgid "invalid color value: %.*s"
2284 msgstr "无效的颜色值：%.*s"
2285
2232 -#: commit-graph.c:204 midx.c:51
2286 +#: commit-graph.c:204 midx.c:52
2287 msgid "invalid hash version"
2288 msgstr "无效的哈希版本"
2289
@@ -2257,234 +2311,235 @@ msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
2311 msgid "commit-graph file is too small to hold %u chunks"
2312 msgstr "提交图形文件太小，容不下 %u 个块"
2313
2260 -#: commit-graph.c:482
2314 +#: commit-graph.c:485
2315 msgid "commit-graph has no base graphs chunk"
2316 msgstr "提交图形没有基础图形块"
2317
2264 -#: commit-graph.c:492
2318 +#: commit-graph.c:495
2319 msgid "commit-graph chain does not match"
2320 msgstr "提交图形链不匹配"
2321
2268 -#: commit-graph.c:540
2322 +#: commit-graph.c:543
2323 #, c-format
2324 msgid "invalid commit-graph chain: line '%s' not a hash"
2325 msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
2326
2273 -#: commit-graph.c:564
2327 +#: commit-graph.c:567
2328 msgid "unable to find all commit-graph files"
2329 msgstr "无法找到所有提交图形文件"
2330
2277 -#: commit-graph.c:749 commit-graph.c:786
2331 +#: commit-graph.c:752 commit-graph.c:789
2332 msgid "invalid commit position. commit-graph is likely corrupt"
2333 msgstr "无效的提交位置。提交图形可能已损坏"
2334
2281 -#: commit-graph.c:770
2335 +#: commit-graph.c:773
2336 #, c-format
2337 msgid "could not find commit %s"
2338 msgstr "无法找到提交 %s"
2339
2286 -#: commit-graph.c:803
2340 +#: commit-graph.c:806
2341 msgid "commit-graph requires overflow generation data but has none"
2342 msgstr "提交图需要溢出世代数据，但是没有"
2343
2290 -#: commit-graph.c:1108 builtin/am.c:1369
2344 +#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2345 +#: builtin/clone.c:705
2346 #, c-format
2347 msgid "unable to parse commit %s"
2348 msgstr "不能解析提交 %s"
2349
2295 -#: commit-graph.c:1370 builtin/pack-objects.c:3070
2350 +#: commit-graph.c:1373 builtin/pack-objects.c:3078
2351 #, c-format
2352 msgid "unable to get type of object %s"
2353 msgstr "无法获得对象 %s 类型"
2354
2300 -#: commit-graph.c:1401
2355 +#: commit-graph.c:1404
2356 msgid "Loading known commits in commit graph"
2357 msgstr "正在加载提交图中的已知提交"
2358
2304 -#: commit-graph.c:1418
2359 +#: commit-graph.c:1421
2360 msgid "Expanding reachable commits in commit graph"
2361 msgstr "正在扩展提交图中的可达提交"
2362
2308 -#: commit-graph.c:1438
2363 +#: commit-graph.c:1441
2364 msgid "Clearing commit marks in commit graph"
2365 msgstr "正在清除提交图中的提交标记"
2366
2312 -#: commit-graph.c:1457
2367 +#: commit-graph.c:1460
2368 msgid "Computing commit graph topological levels"
2369 msgstr "正在计算提交图拓扑级别"
2370
2316 -#: commit-graph.c:1510
2371 +#: commit-graph.c:1513
2372 msgid "Computing commit graph generation numbers"
2373 msgstr "正在计算提交图世代数字"
2374
2320 -#: commit-graph.c:1591
2375 +#: commit-graph.c:1598
2376 msgid "Computing commit changed paths Bloom filters"
2377 msgstr "计算提交变更路径的布隆过滤器"
2378
2324 -#: commit-graph.c:1668
2379 +#: commit-graph.c:1675
2380 msgid "Collecting referenced commits"
2381 msgstr "正在收集引用的提交"
2382
2328 -#: commit-graph.c:1693
2383 +#: commit-graph.c:1701
2384 #, c-format
2330 -msgid "Finding commits for commit graph in %d pack"
2331 -msgid_plural "Finding commits for commit graph in %d packs"
2332 -msgstr[0] "正在 %d 个包中查找提交图的提交"
2333 -msgstr[1] "正在 %d 个包中查找提交图的提交"
2385 +msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2386 +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2387 +msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
2388 +msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
2389
2335 -#: commit-graph.c:1706
2390 +#: commit-graph.c:1714
2391 #, c-format
2392 msgid "error adding pack %s"
2393 msgstr "添加包 %s 出错"
2394
2340 -#: commit-graph.c:1710
2395 +#: commit-graph.c:1718
2396 #, c-format
2397 msgid "error opening index for %s"
2398 msgstr "为 %s 打开索引出错"
2399
2345 -#: commit-graph.c:1747
2400 +#: commit-graph.c:1756
2401 msgid "Finding commits for commit graph among packed objects"
2402 msgstr "正在打包对象中查找提交图的提交"
2403
2349 -#: commit-graph.c:1765
2404 +#: commit-graph.c:1774
2405 msgid "Finding extra edges in commit graph"
2406 msgstr "正在查找提交图中额外的边"
2407
2353 -#: commit-graph.c:1814
2408 +#: commit-graph.c:1823
2409 msgid "failed to write correct number of base graph ids"
2410 msgstr "无法写入正确数量的基础图形 ID"
2411
2357 -#: commit-graph.c:1845 midx.c:1149
2412 +#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2413 #, c-format
2414 msgid "unable to create leading directories of %s"
2415 msgstr "不能为 %s 创建先导目录"
2416
2362 -#: commit-graph.c:1858
2417 +#: commit-graph.c:1868
2418 msgid "unable to create temporary graph layer"
2419 msgstr "无法创建临时图层"
2420
2366 -#: commit-graph.c:1863
2421 +#: commit-graph.c:1873
2422 #, c-format
2423 msgid "unable to adjust shared permissions for '%s'"
2424 msgstr "无法为 '%s' 调整共享权限"
2425
2371 -#: commit-graph.c:1920
2426 +#: commit-graph.c:1930
2427 #, c-format
2428 msgid "Writing out commit graph in %d pass"
2429 msgid_plural "Writing out commit graph in %d passes"
2430 msgstr[0] "正在用 %d 步写出提交图"
2431 msgstr[1] "正在用 %d 步写出提交图"
2432
2378 -#: commit-graph.c:1956
2433 +#: commit-graph.c:1967
2434 msgid "unable to open commit-graph chain file"
2435 msgstr "无法打开提交图形链文件"
2436
2382 -#: commit-graph.c:1972
2437 +#: commit-graph.c:1983
2438 msgid "failed to rename base commit-graph file"
2439 msgstr "无法重命名基础提交图形文件"
2440
2386 -#: commit-graph.c:1992
2441 +#: commit-graph.c:2004
2442 msgid "failed to rename temporary commit-graph file"
2443 msgstr "无法重命名临时提交图形文件"
2444
2390 -#: commit-graph.c:2125
2445 +#: commit-graph.c:2137
2446 msgid "Scanning merged commits"
2447 msgstr "正在扫描合并提交"
2448
2394 -#: commit-graph.c:2169
2449 +#: commit-graph.c:2181
2450 msgid "Merging commit-graph"
2451 msgstr "正在合并提交图形"
2452
2398 -#: commit-graph.c:2277
2453 +#: commit-graph.c:2289
2454 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2455 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
2456
2402 -#: commit-graph.c:2384
2457 +#: commit-graph.c:2396
2458 msgid "too many commits to write graph"
2459 msgstr "提交太多不能画图"
2460
2406 -#: commit-graph.c:2482
2461 +#: commit-graph.c:2494
2462 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2463 msgstr "提交图文件的校验码错误，可能已经损坏"
2464
2410 -#: commit-graph.c:2492
2465 +#: commit-graph.c:2504
2466 #, c-format
2467 msgid "commit-graph has incorrect OID order: %s then %s"
2468 msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
2469
2415 -#: commit-graph.c:2502 commit-graph.c:2517
2470 +#: commit-graph.c:2514 commit-graph.c:2529
2471 #, c-format
2472 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2473 msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
2474
2420 -#: commit-graph.c:2509
2475 +#: commit-graph.c:2521
2476 #, c-format
2477 msgid "failed to parse commit %s from commit-graph"
2478 msgstr "无法从提交图形中解析提交 %s"
2479
2425 -#: commit-graph.c:2527
2480 +#: commit-graph.c:2539
2481 msgid "Verifying commits in commit graph"
2482 msgstr "正在校验提交图中的提交"
2483
2429 -#: commit-graph.c:2542
2484 +#: commit-graph.c:2554
2485 #, c-format
2486 msgid "failed to parse commit %s from object database for commit-graph"
2487 msgstr "无法从提交图形的对象库中解析提交 %s"
2488
2434 -#: commit-graph.c:2549
2489 +#: commit-graph.c:2561
2490 #, c-format
2491 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2492 msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2493
2439 -#: commit-graph.c:2559
2494 +#: commit-graph.c:2571
2495 #, c-format
2496 msgid "commit-graph parent list for commit %s is too long"
2497 msgstr "提交 %s 的提交图形父提交列表太长了"
2498
2444 -#: commit-graph.c:2568
2499 +#: commit-graph.c:2580
2500 #, c-format
2501 msgid "commit-graph parent for %s is %s != %s"
2502 msgstr "%s 的提交图形父提交是 %s != %s"
2503
2449 -#: commit-graph.c:2582
2504 +#: commit-graph.c:2594
2505 #, c-format
2506 msgid "commit-graph parent list for commit %s terminates early"
2507 msgstr "提交 %s 的提交图形父提交列表过早终止"
2508
2454 -#: commit-graph.c:2587
2509 +#: commit-graph.c:2599
2510 #, c-format
2511 msgid ""
2512 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2513 msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
2514
2460 -#: commit-graph.c:2591
2515 +#: commit-graph.c:2603
2516 #, c-format
2517 msgid ""
2518 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2519 msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
2520
2466 -#: commit-graph.c:2608
2521 +#: commit-graph.c:2620
2522 #, c-format
2523 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2524 msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
2525
2471 -#: commit-graph.c:2614
2526 +#: commit-graph.c:2626
2527 #, c-format
2528 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2529 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2530
2476 -#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
2477 -#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
2531 +#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2532 +#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2533 #, c-format
2534 msgid "could not parse %s"
2535 msgstr "不能解析 %s"
2536
2482 -#: commit.c:55
2537 +#: commit.c:56
2538 #, c-format
2539 msgid "%s %s is not a commit!"
2540 msgstr "%s %s 不是一个提交！"
2541
2487 -#: commit.c:196
2542 +#: commit.c:197
2543 msgid ""
2544 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2545 "and will be removed in a future Git version.\n"
@@ -2504,27 +2559,27 @@ msgstr ""
2559 "设置 \"git config advice.graftFileDeprecated false\"\n"
2560 "可关闭本消息"
2561
2507 -#: commit.c:1241
2562 +#: commit.c:1252
2563 #, c-format
2564 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2565 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2566
2512 -#: commit.c:1245
2567 +#: commit.c:1256
2568 #, c-format
2569 msgid "Commit %s has a bad GPG signature allegedly by %s."
2570 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2571
2517 -#: commit.c:1248
2572 +#: commit.c:1259
2573 #, c-format
2574 msgid "Commit %s does not have a GPG signature."
2575 msgstr "提交 %s 没有 GPG 签名。"
2576
2522 -#: commit.c:1251
2577 +#: commit.c:1262
2578 #, c-format
2579 msgid "Commit %s has a good GPG signature by %s\n"
2580 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2581
2527 -#: commit.c:1505
2582 +#: commit.c:1516
2583 msgid ""
2584 "Warning: commit message did not conform to UTF-8.\n"
2585 "You may want to amend it after fixing the message, or set the config\n"
@@ -2538,7 +2593,15 @@ msgstr ""
2593 msgid "memory exhausted"
2594 msgstr "内存耗尽"
2595
2541 -#: config.c:125
2596 +#: compat/terminal.c:167
2597 +msgid "cannot resume in the background, please use 'fg' to resume"
2598 +msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
2599 +
2600 +#: compat/terminal.c:168
2601 +msgid "cannot restore terminal settings"
2602 +msgstr "无法恢复终端设置"
2603 +
2604 +#: config.c:143
2605 #, c-format
2606 msgid ""
2607 "exceeded maximum include depth (%d) while including\n"
@@ -2553,333 +2616,360 @@ msgstr ""
2616 "\t%2$s\n"
2617 "这可能是因为循环包含。"
2618
2556 -#: config.c:141
2619 +#: config.c:159
2620 #, c-format
2621 msgid "could not expand include path '%s'"
2622 msgstr "无法扩展包含路径 '%s'"
2623
2561 -#: config.c:152
2624 +#: config.c:170
2625 msgid "relative config includes must come from files"
2626 msgstr "相对路径的配置文件引用必须来自于文件"
2627
2565 -#: config.c:201
2628 +#: config.c:219
2629 msgid "relative config include conditionals must come from files"
2630 msgstr "相对路径的配置文件条件引用必须来自于文件"
2631
2569 -#: config.c:398
2632 +#: config.c:364
2633 +msgid ""
2634 +"remote URLs cannot be configured in file directly or indirectly included by "
2635 +"includeIf.hasconfig:remote.*.url"
2636 +msgstr ""
2637 +"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*.url 间接"
2638 +"包含地。"
2639 +
2640 +#: config.c:508
2641 #, c-format
2642 msgid "invalid config format: %s"
2643 msgstr "无效的配置格式：%s"
2644
2574 -#: config.c:402
2645 +#: config.c:512
2646 #, c-format
2647 msgid "missing environment variable name for configuration '%.*s'"
2648 msgstr "配置 '%.*s' 缺少环境变量名称"
2649
2579 -#: config.c:407
2650 +#: config.c:517
2651 #, c-format
2652 msgid "missing environment variable '%s' for configuration '%.*s'"
2653 msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
2654
2584 -#: config.c:443
2655 +#: config.c:553
2656 #, c-format
2657 msgid "key does not contain a section: %s"
2658 msgstr "键名没有包含一个小节名称：%s"
2659
2589 -#: config.c:448
2660 +#: config.c:558
2661 #, c-format
2662 msgid "key does not contain variable name: %s"
2663 msgstr "键名没有包含变量名：%s"
2664
2594 -#: config.c:470 sequencer.c:2806
2665 +#: config.c:580 sequencer.c:2802
2666 #, c-format
2667 msgid "invalid key: %s"
2668 msgstr "无效键名：%s"
2669
2599 -#: config.c:475
2670 +#: config.c:585
2671 #, c-format
2672 msgid "invalid key (newline): %s"
2673 msgstr "无效键名（有换行符）：%s"
2674
2604 -#: config.c:495
2675 +#: config.c:605
2676 msgid "empty config key"
2677 msgstr "空的配置键名"
2678
2608 -#: config.c:513 config.c:525
2679 +#: config.c:623 config.c:635
2680 #, c-format
2681 msgid "bogus config parameter: %s"
2682 msgstr "伪配置参数：%s"
2683
2613 -#: config.c:539 config.c:556 config.c:563 config.c:572
2684 +#: config.c:649 config.c:666 config.c:673 config.c:682
2685 #, c-format
2686 msgid "bogus format in %s"
2687 msgstr "%s 中格式错误"
2688
2618 -#: config.c:606
2689 +#: config.c:716
2690 #, c-format
2691 msgid "bogus count in %s"
2692 msgstr "%s 中错误计数"
2693
2623 -#: config.c:610
2694 +#: config.c:720
2695 #, c-format
2696 msgid "too many entries in %s"
2697 msgstr "%s 中太多的条目"
2698
2628 -#: config.c:620
2699 +#: config.c:730
2700 #, c-format
2701 msgid "missing config key %s"
2702 msgstr "缺失配置键名 %s"
2703
2633 -#: config.c:628
2704 +#: config.c:738
2705 #, c-format
2706 msgid "missing config value %s"
2707 msgstr "缺失配置取值 %s"
2708
2638 -#: config.c:979
2709 +#: config.c:1089
2710 #, c-format
2711 msgid "bad config line %d in blob %s"
2712 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
2713
2643 -#: config.c:983
2714 +#: config.c:1093
2715 #, c-format
2716 msgid "bad config line %d in file %s"
2717 msgstr "文件 %2$s 中错误的配置行 %1$d"
2718
2648 -#: config.c:987
2719 +#: config.c:1097
2720 #, c-format
2721 msgid "bad config line %d in standard input"
2722 msgstr "标准输入中错误的配置行 %d"
2723
2653 -#: config.c:991
2724 +#: config.c:1101
2725 #, c-format
2726 msgid "bad config line %d in submodule-blob %s"
2727 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
2728
2658 -#: config.c:995
2729 +#: config.c:1105
2730 #, c-format
2731 msgid "bad config line %d in command line %s"
2732 msgstr "命令行 %2$s 中错误的配置行 %1$d"
2733
2663 -#: config.c:999
2734 +#: config.c:1109
2735 #, c-format
2736 msgid "bad config line %d in %s"
2737 msgstr "在 %2$s 中错误的配置行 %1$d"
2738
2668 -#: config.c:1136
2739 +#: config.c:1246
2740 msgid "out of range"
2741 msgstr "超出范围"
2742
2672 -#: config.c:1136
2743 +#: config.c:1246
2744 msgid "invalid unit"
2745 msgstr "无效的单位"
2746
2676 -#: config.c:1137
2747 +#: config.c:1247
2748 #, c-format
2749 msgid "bad numeric config value '%s' for '%s': %s"
2750 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
2751
2681 -#: config.c:1147
2752 +#: config.c:1257
2753 #, c-format
2754 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2755 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2756
2686 -#: config.c:1150
2757 +#: config.c:1260
2758 #, c-format
2759 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2760 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2761
2691 -#: config.c:1153
2762 +#: config.c:1263
2763 #, c-format
2764 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2765 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
2766
2696 -#: config.c:1156
2767 +#: config.c:1266
2768 #, c-format
2769 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2770 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2771
2701 -#: config.c:1159
2772 +#: config.c:1269
2773 #, c-format
2774 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2775 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2776
2706 -#: config.c:1162
2777 +#: config.c:1272
2778 #, c-format
2779 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2780 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
2781
2711 -#: config.c:1241
2782 +#: config.c:1368
2783 +#, c-format
2784 +msgid "invalid value for variable %s"
2785 +msgstr "变量 %s 的值无效"
2786 +
2787 +#: config.c:1389
2788 +#, c-format
2789 +msgid "ignoring unknown core.fsync component '%s'"
2790 +msgstr "忽略未知的 core.fsync 组件 '%s'"
2791 +
2792 +#: config.c:1425
2793 #, c-format
2794 msgid "bad boolean config value '%s' for '%s'"
2795 msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
2796
2716 -#: config.c:1259
2797 +#: config.c:1443
2798 #, c-format
2799 msgid "failed to expand user dir in: '%s'"
2800 msgstr "无法扩展用户目录：'%s'"
2801
2721 -#: config.c:1268
2802 +#: config.c:1452
2803 #, c-format
2804 msgid "'%s' for '%s' is not a valid timestamp"
2805 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2806
2726 -#: config.c:1361
2807 +#: config.c:1545
2808 #, c-format
2809 msgid "abbrev length out of range: %d"
2810 msgstr "缩写长度超出范围：%d"
2811
2731 -#: config.c:1375 config.c:1386
2812 +#: config.c:1559 config.c:1570
2813 #, c-format
2814 msgid "bad zlib compression level %d"
2815 msgstr "错误的 zlib 压缩级别 %d"
2816
2736 -#: config.c:1476
2817 +#: config.c:1660
2818 msgid "core.commentChar should only be one character"
2819 msgstr "core.commentChar 应该是一个字符"
2820
2740 -#: config.c:1509
2821 +#: config.c:1692
2822 +#, c-format
2823 +msgid "ignoring unknown core.fsyncMethod value '%s'"
2824 +msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
2825 +
2826 +#: config.c:1698
2827 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2828 +msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
2829 +
2830 +#: config.c:1714
2831 #, c-format
2832 msgid "invalid mode for object creation: %s"
2833 msgstr "无效的对象创建模式：%s"
2834
2745 -#: config.c:1584
2835 +#: config.c:1800
2836 #, c-format
2837 msgid "malformed value for %s"
2838 msgstr "%s 的取值格式错误"
2839
2750 -#: config.c:1610
2840 +#: config.c:1826
2841 #, c-format
2842 msgid "malformed value for %s: %s"
2843 msgstr "%s 的取值格式错误：%s"
2844
2755 -#: config.c:1611
2845 +#: config.c:1827
2846 msgid "must be one of nothing, matching, simple, upstream or current"
2847 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
2848
2759 -#: config.c:1672 builtin/pack-objects.c:4053
2849 +#: config.c:1888 builtin/pack-objects.c:4078
2850 #, c-format
2851 msgid "bad pack compression level %d"
2852 msgstr "错误的打包压缩级别 %d"
2853
2764 -#: config.c:1795
2854 +#: config.c:2014
2855 #, c-format
2856 msgid "unable to load config blob object '%s'"
2857 msgstr "无法从数据对象 '%s' 加载配置"
2858
2769 -#: config.c:1798
2859 +#: config.c:2017
2860 #, c-format
2861 msgid "reference '%s' does not point to a blob"
2862 msgstr "引用 '%s' 没有指向一个数据对象"
2863
2774 -#: config.c:1816
2864 +#: config.c:2035
2865 #, c-format
2866 msgid "unable to resolve config blob '%s'"
2867 msgstr "不能解析配置对象 '%s'"
2868
2779 -#: config.c:1861
2869 +#: config.c:2080
2870 #, c-format
2871 msgid "failed to parse %s"
2872 msgstr "无法解析 %s"
2873
2784 -#: config.c:1917
2874 +#: config.c:2136
2875 msgid "unable to parse command-line config"
2876 msgstr "无法解析命令行中的配置"
2877
2788 -#: config.c:2285
2878 +#: config.c:2512
2879 msgid "unknown error occurred while reading the configuration files"
2880 msgstr "在读取配置文件时遇到未知错误"
2881
2792 -#: config.c:2459
2882 +#: config.c:2686
2883 #, c-format
2884 msgid "Invalid %s: '%s'"
2885 msgstr "无效 %s：'%s'"
2886
2797 -#: config.c:2504
2887 +#: config.c:2731
2888 #, c-format
2889 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2890 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2891
2802 -#: config.c:2550
2892 +#: config.c:2763
2893 #, c-format
2894 msgid "unable to parse '%s' from command-line config"
2895 msgstr "无法解析命令行配置中的 '%s'"
2896
2807 -#: config.c:2552
2897 +#: config.c:2765
2898 #, c-format
2899 msgid "bad config variable '%s' in file '%s' at line %d"
2900 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2901
2812 -#: config.c:2637
2902 +#: config.c:2850
2903 #, c-format
2904 msgid "invalid section name '%s'"
2905 msgstr "无效的小节名称 '%s'"
2906
2817 -#: config.c:2669
2907 +#: config.c:2882
2908 #, c-format
2909 msgid "%s has multiple values"
2910 msgstr "%s 有多个取值"
2911
2822 -#: config.c:2698
2912 +#: config.c:2911
2913 #, c-format
2914 msgid "failed to write new configuration file %s"
2915 msgstr "无法写入新的配置文件 %s"
2916
2827 -#: config.c:2950 config.c:3277
2917 +#: config.c:3177 config.c:3518
2918 #, c-format
2919 msgid "could not lock config file %s"
2920 msgstr "不能锁定配置文件 %s"
2921
2832 -#: config.c:2961
2922 +#: config.c:3188
2923 #, c-format
2924 msgid "opening %s"
2925 msgstr "打开 %s"
2926
2837 -#: config.c:2998 builtin/config.c:361
2927 +#: config.c:3225 builtin/config.c:361
2928 #, c-format
2929 msgid "invalid pattern: %s"
2930 msgstr "无效模式：%s"
2931
2842 -#: config.c:3023
2932 +#: config.c:3250
2933 #, c-format
2934 msgid "invalid config file %s"
2935 msgstr "无效的配置文件 %s"
2936
2847 -#: config.c:3036 config.c:3290
2937 +#: config.c:3263 config.c:3531
2938 #, c-format
2939 msgid "fstat on %s failed"
2940 msgstr "对 %s 调用 fstat 失败"
2941
2852 -#: config.c:3047
2942 +#: config.c:3274
2943 #, c-format
2944 msgid "unable to mmap '%s'%s"
2945 msgstr "不能 mmap '%s'%s"
2946
2857 -#: config.c:3057 config.c:3295
2947 +#: config.c:3284 config.c:3536
2948 #, c-format
2949 msgid "chmod on %s failed"
2950 msgstr "对 %s 调用 chmod 失败"
2951
2862 -#: config.c:3142 config.c:3392
2952 +#: config.c:3369 config.c:3633
2953 #, c-format
2954 msgid "could not write config file %s"
2955 msgstr "不能写入配置文件 %s"
2956
2867 -#: config.c:3176
2957 +#: config.c:3403
2958 #, c-format
2959 msgid "could not set '%s' to '%s'"
2960 msgstr "不能设置 '%s' 为 '%s'"
2961
2872 -#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2962 +#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2963 #, c-format
2964 msgid "could not unset '%s'"
2965 msgstr "不能取消设置 '%s'"
2966
2877 -#: config.c:3268
2967 +#: config.c:3509
2968 #, c-format
2969 msgid "invalid section name: %s"
2970 msgstr "无效的小节名称：%s"
2971
2882 -#: config.c:3435
2972 +#: config.c:3676
2973 #, c-format
2974 msgid "missing value for '%s'"
2975 msgstr "%s 的取值缺失"
@@ -3208,68 +3298,68 @@ msgstr "拒绝使用缺少主机字段的凭据"
3298 msgid "refusing to work with credential missing protocol field"
3299 msgstr "拒绝使用缺少协议字段的凭据"
3300
3211 -#: credential.c:395
3301 +#: credential.c:396
3302 #, c-format
3303 msgid "url contains a newline in its %s component: %s"
3304 msgstr "URL 的 %s 组件中包含换行符：%s"
3305
3216 -#: credential.c:439
3306 +#: credential.c:440
3307 #, c-format
3308 msgid "url has no scheme: %s"
3309 msgstr "URL 没有 scheme：%s"
3310
3221 -#: credential.c:512
3311 +#: credential.c:513
3312 #, c-format
3313 msgid "credential url cannot be parsed: %s"
3314 msgstr "不能解析凭据 URL：%s"
3315
3226 -#: date.c:138
3316 +#: date.c:139
3317 msgid "in the future"
3318 msgstr "在将来"
3319
3230 -#: date.c:144
3320 +#: date.c:145
3321 #, c-format
3322 msgid "%<PRIuMAX> second ago"
3323 msgid_plural "%<PRIuMAX> seconds ago"
3324 msgstr[0] "%<PRIuMAX> 秒钟前"
3325 msgstr[1] "%<PRIuMAX> 秒钟前"
3326
3237 -#: date.c:151
3327 +#: date.c:152
3328 #, c-format
3329 msgid "%<PRIuMAX> minute ago"
3330 msgid_plural "%<PRIuMAX> minutes ago"
3331 msgstr[0] "%<PRIuMAX> 分钟前"
3332 msgstr[1] "%<PRIuMAX> 分钟前"
3333
3244 -#: date.c:158
3334 +#: date.c:159
3335 #, c-format
3336 msgid "%<PRIuMAX> hour ago"
3337 msgid_plural "%<PRIuMAX> hours ago"
3338 msgstr[0] "%<PRIuMAX> 小时前"
3339 msgstr[1] "%<PRIuMAX> 小时前"
3340
3251 -#: date.c:165
3341 +#: date.c:166
3342 #, c-format
3343 msgid "%<PRIuMAX> day ago"
3344 msgid_plural "%<PRIuMAX> days ago"
3345 msgstr[0] "%<PRIuMAX> 天前"
3346 msgstr[1] "%<PRIuMAX> 天前"
3347
3258 -#: date.c:171
3348 +#: date.c:172
3349 #, c-format
3350 msgid "%<PRIuMAX> week ago"
3351 msgid_plural "%<PRIuMAX> weeks ago"
3352 msgstr[0] "%<PRIuMAX> 周前"
3353 msgstr[1] "%<PRIuMAX> 周前"
3354
3265 -#: date.c:178
3355 +#: date.c:179
3356 #, c-format
3357 msgid "%<PRIuMAX> month ago"
3358 msgid_plural "%<PRIuMAX> months ago"
3359 msgstr[0] "%<PRIuMAX> 个月前"
3360 msgstr[1] "%<PRIuMAX> 个月前"
3361
3272 -#: date.c:189
3362 +#: date.c:190
3363 #, c-format
3364 msgid "%<PRIuMAX> year"
3365 msgid_plural "%<PRIuMAX> years"
@@ -3277,14 +3367,14 @@ msgstr[0] "%<PRIuMAX> 年"
3367 msgstr[1] "%<PRIuMAX> 年"
3368
3369 #. TRANSLATORS: "%s" is "<n> years"
3280 -#: date.c:192
3370 +#: date.c:193
3371 #, c-format
3372 msgid "%s, %<PRIuMAX> month ago"
3373 msgid_plural "%s, %<PRIuMAX> months ago"
3374 msgstr[0] "%s %<PRIuMAX> 个月前"
3375 msgstr[1] "%s %<PRIuMAX> 个月前"
3376
3287 -#: date.c:197 date.c:202
3377 +#: date.c:198 date.c:203
3378 #, c-format
3379 msgid "%<PRIuMAX> year ago"
3380 msgid_plural "%<PRIuMAX> years ago"
@@ -3315,10 +3405,14 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多
3405 msgid "Marked %d islands, done.\n"
3406 msgstr "已标记 %d 个数据岛，结束。\n"
3407
3318 -#: diff-merges.c:70
3408 +#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3409 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:562 builtin/am.c:203
3410 +#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3411 +#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3412 +#: builtin/pull.c:47 builtin/pull.c:321
3413 #, c-format
3320 -msgid "unknown value for --diff-merges: %s"
3321 -msgstr "未知的 --diff-merges 取值：%s"
3414 +msgid "invalid value for '%s': '%s'"
3415 +msgstr "'%s' 的值无效：'%s'"
3416
3417 #: diff-lib.c:561
3418 msgid "--merge-base does not work with ranges"
@@ -3351,18 +3445,18 @@ msgid ""
3445 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
3446
3447 # 译者：注意保持前导空格
3354 -#: diff.c:158
3448 +#: diff.c:159
3449 #, c-format
3450 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3451 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
3452
3453 # 译者：注意保持前导空格
3360 -#: diff.c:163
3454 +#: diff.c:164
3455 #, c-format
3456 msgid " Unknown dirstat parameter '%s'\n"
3457 msgstr " 未知的 dirstat 参数 '%s'\n"
3458
3365 -#: diff.c:299
3459 +#: diff.c:300
3460 msgid ""
3461 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3462 "'dimmed-zebra', 'plain'"
@@ -3370,7 +3464,7 @@ msgstr ""
3464 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
3465 "'plain'"
3466
3373 -#: diff.c:327
3467 +#: diff.c:328
3468 #, c-format
3469 msgid ""
3470 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3379,18 +3473,18 @@ msgstr ""
3473 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
3474 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3475
3382 -#: diff.c:335
3476 +#: diff.c:336
3477 msgid ""
3478 "color-moved-ws: allow-indentation-change cannot be combined with other "
3479 "whitespace modes"
3480 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
3481
3388 -#: diff.c:412
3482 +#: diff.c:413
3483 #, c-format
3484 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3485 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
3486
3393 -#: diff.c:472
3487 +#: diff.c:473
3488 #, c-format
3489 msgid ""
3490 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3399,48 +3493,48 @@ msgstr ""
3493 "发现配置变量 'diff.dirstat' 中的错误：\n"
3494 "%s"
3495
3402 -#: diff.c:4237
3496 +#: diff.c:4282
3497 #, c-format
3498 msgid "external diff died, stopping at %s"
3499 msgstr "外部 diff 退出，停止在 %s"
3500
3407 -#: diff.c:4589
3501 +#: diff.c:4677 parse-options.c:1114
3502 #, c-format
3503 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3504 msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
3505
3412 -#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3506 +#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3507 #, c-format
3508 msgid "options '%s', '%s', and '%s' cannot be used together"
3509 msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
3510
3417 -#: diff.c:4597
3511 +#: diff.c:4685
3512 #, c-format
3513 msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3514 msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
3515
3422 -#: diff.c:4601
3516 +#: diff.c:4689
3517 #, c-format
3518 msgid ""
3519 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3520 msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
3521
3428 -#: diff.c:4681
3522 +#: diff.c:4769
3523 msgid "--follow requires exactly one pathspec"
3524 msgstr "--follow 明确要求只跟一个路径规格"
3525
3432 -#: diff.c:4729
3526 +#: diff.c:4823
3527 #, c-format
3528 msgid "invalid --stat value: %s"
3529 msgstr "无效的 --stat 值：%s"
3530
3437 -#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
3531 +#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3532 #: parse-options.c:217 parse-options.c:221
3533 #, c-format
3534 msgid "%s expects a numerical value"
3535 msgstr "%s 期望一个数字值"
3536
3443 -#: diff.c:4766
3537 +#: diff.c:4860
3538 #, c-format
3539 msgid ""
3540 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3449,200 +3543,200 @@ msgstr ""
3543 "无法解析 --dirstat/-X 选项的参数：\n"
3544 "%s"
3545
3452 -#: diff.c:4851
3546 +#: diff.c:4893
3547 #, c-format
3548 msgid "unknown change class '%c' in --diff-filter=%s"
3549 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3550
3457 -#: diff.c:4875
3551 +#: diff.c:4917
3552 #, c-format
3553 msgid "unknown value after ws-error-highlight=%.*s"
3554 msgstr "ws-error-highlight=%.*s 之后未知的值"
3555
3462 -#: diff.c:4889
3556 +#: diff.c:4931
3557 #, c-format
3558 msgid "unable to resolve '%s'"
3559 msgstr "不能解析 '%s'"
3560
3467 -#: diff.c:4939 diff.c:4945
3561 +#: diff.c:4981 diff.c:4987
3562 #, c-format
3563 msgid "%s expects <n>/<m> form"
3564 msgstr "%s 期望 <n>/<m> 格式"
3565
3472 -#: diff.c:4957
3566 +#: diff.c:4999
3567 #, c-format
3568 msgid "%s expects a character, got '%s'"
3569 msgstr "%s 期望一个字符，得到 '%s'"
3570
3477 -#: diff.c:4978
3571 +#: diff.c:5020
3572 #, c-format
3573 msgid "bad --color-moved argument: %s"
3574 msgstr "坏的 --color-moved 参数：%s"
3575
3482 -#: diff.c:4997
3576 +#: diff.c:5039
3577 #, c-format
3578 msgid "invalid mode '%s' in --color-moved-ws"
3579 msgstr "--color-moved-ws 中的无效模式 '%s' "
3580
3487 -#: diff.c:5037
3581 +#: diff.c:5079
3582 msgid ""
3583 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3584 "\"histogram\""
3585 msgstr ""
3586 "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3587
3494 -#: diff.c:5073 diff.c:5093
3588 +#: diff.c:5115 diff.c:5135
3589 #, c-format
3590 msgid "invalid argument to %s"
3591 msgstr "%s 的参数无效"
3592
3499 -#: diff.c:5197
3593 +#: diff.c:5239
3594 #, c-format
3595 msgid "invalid regex given to -I: '%s'"
3596 msgstr "选项 -I 的正则表达式无效：'%s'"
3597
3504 -#: diff.c:5246
3598 +#: diff.c:5288
3599 #, c-format
3600 msgid "failed to parse --submodule option parameter: '%s'"
3601 msgstr "无法解析 --submodule 选项的参数：'%s'"
3602
3509 -#: diff.c:5302
3603 +#: diff.c:5344
3604 #, c-format
3605 msgid "bad --word-diff argument: %s"
3606 msgstr "坏的 --word-diff 参数：%s"
3607
3514 -#: diff.c:5338
3608 +#: diff.c:5380
3609 msgid "Diff output format options"
3610 msgstr "差异输出格式化选项"
3611
3518 -#: diff.c:5340 diff.c:5346
3612 +#: diff.c:5382 diff.c:5388
3613 msgid "generate patch"
3614 msgstr "生成补丁"
3615
3522 -#: diff.c:5343 builtin/log.c:179
3616 +#: diff.c:5385 builtin/log.c:180
3617 msgid "suppress diff output"
3618 msgstr "不显示差异输出"
3619
3526 -#: diff.c:5348 diff.c:5462 diff.c:5469
3620 +#: diff.c:5390 diff.c:5504 diff.c:5511
3621 msgid "<n>"
3622 msgstr "<n>"
3623
3530 -#: diff.c:5349 diff.c:5352
3624 +#: diff.c:5391 diff.c:5394
3625 msgid "generate diffs with <n> lines context"
3626 msgstr "生成含 <n> 行上下文的差异"
3627
3534 -#: diff.c:5354
3628 +#: diff.c:5396
3629 msgid "generate the diff in raw format"
3630 msgstr "生成原始格式的差异"
3631
3538 -#: diff.c:5357
3632 +#: diff.c:5399
3633 msgid "synonym for '-p --raw'"
3634 msgstr "和 '-p --raw' 同义"
3635
3542 -#: diff.c:5361
3636 +#: diff.c:5403
3637 msgid "synonym for '-p --stat'"
3638 msgstr "和 '-p --stat' 同义"
3639
3546 -#: diff.c:5365
3640 +#: diff.c:5407
3641 msgid "machine friendly --stat"
3642 msgstr "机器友好的 --stat"
3643
3550 -#: diff.c:5368
3644 +#: diff.c:5410
3645 msgid "output only the last line of --stat"
3646 msgstr "只输出 --stat 的最后一行"
3647
3554 -#: diff.c:5370 diff.c:5378
3648 +#: diff.c:5412 diff.c:5420
3649 msgid "<param1,param2>..."
3650 msgstr "<参数1,参数2>..."
3651
3558 -#: diff.c:5371
3652 +#: diff.c:5413
3653 msgid ""
3654 "output the distribution of relative amount of changes for each sub-directory"
3655 msgstr "输出每个子目录相对变更的分布"
3656
3563 -#: diff.c:5375
3657 +#: diff.c:5417
3658 msgid "synonym for --dirstat=cumulative"
3659 msgstr "和 --dirstat=cumulative 同义"
3660
3567 -#: diff.c:5379
3661 +#: diff.c:5421
3662 msgid "synonym for --dirstat=files,param1,param2..."
3663 msgstr "是 --dirstat=files,param1,param2... 的同义词"
3664
3571 -#: diff.c:5383
3665 +#: diff.c:5425
3666 msgid "warn if changes introduce conflict markers or whitespace errors"
3667 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3668
3575 -#: diff.c:5386
3669 +#: diff.c:5428
3670 msgid "condensed summary such as creations, renames and mode changes"
3671 msgstr "精简摘要，例如创建、重命名和模式变更"
3672
3579 -#: diff.c:5389
3673 +#: diff.c:5431
3674 msgid "show only names of changed files"
3675 msgstr "只显示变更文件的文件名"
3676
3583 -#: diff.c:5392
3677 +#: diff.c:5434
3678 msgid "show only names and status of changed files"
3679 msgstr "只显示变更文件的文件名和状态"
3680
3587 -#: diff.c:5394
3681 +#: diff.c:5436
3682 msgid "<width>[,<name-width>[,<count>]]"
3683 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3684
3591 -#: diff.c:5395
3685 +#: diff.c:5437
3686 msgid "generate diffstat"
3687 msgstr "生成差异统计（diffstat）"
3688
3595 -#: diff.c:5397 diff.c:5400 diff.c:5403
3689 +#: diff.c:5439 diff.c:5442 diff.c:5445
3690 msgid "<width>"
3691 msgstr "<宽度>"
3692
3599 -#: diff.c:5398
3693 +#: diff.c:5440
3694 msgid "generate diffstat with a given width"
3695 msgstr "使用给定的长度生成差异统计"
3696
3603 -#: diff.c:5401
3697 +#: diff.c:5443
3698 msgid "generate diffstat with a given name width"
3699 msgstr "使用给定的文件名长度生成差异统计"
3700
3607 -#: diff.c:5404
3701 +#: diff.c:5446
3702 msgid "generate diffstat with a given graph width"
3703 msgstr "使用给定的图形长度生成差异统计"
3704
3611 -#: diff.c:5406
3705 +#: diff.c:5448
3706 msgid "<count>"
3707 msgstr "<次数>"
3708
3615 -#: diff.c:5407
3709 +#: diff.c:5449
3710 msgid "generate diffstat with limited lines"
3711 msgstr "生成有限行数的差异统计"
3712
3619 -#: diff.c:5410
3713 +#: diff.c:5452
3714 msgid "generate compact summary in diffstat"
3715 msgstr "生成差异统计的简洁摘要"
3716
3623 -#: diff.c:5413
3717 +#: diff.c:5455
3718 msgid "output a binary diff that can be applied"
3719 msgstr "输出一个可以应用的二进制差异"
3720
3627 -#: diff.c:5416
3721 +#: diff.c:5458
3722 msgid "show full pre- and post-image object names on the \"index\" lines"
3723 msgstr "在 \"index\" 行显示完整的前后对象名称"
3724
3631 -#: diff.c:5418
3725 +#: diff.c:5460
3726 msgid "show colored diff"
3727 msgstr "显示带颜色的差异"
3728
3635 -#: diff.c:5419
3729 +#: diff.c:5461
3730 msgid "<kind>"
3731 msgstr "<类型>"
3732
3639 -#: diff.c:5420
3733 +#: diff.c:5462
3734 msgid ""
3735 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3736 "diff"
3737 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3738
3645 -#: diff.c:5423
3739 +#: diff.c:5465
3740 msgid ""
3741 "do not munge pathnames and use NULs as output field terminators in --raw or "
3742 "--numstat"
@@ -3650,311 +3744,311 @@ msgstr ""
3744 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3745 "符"
3746
3653 -#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
3747 +#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3748 msgid "<prefix>"
3749 msgstr "<前缀>"
3750
3657 -#: diff.c:5427
3751 +#: diff.c:5469
3752 msgid "show the given source prefix instead of \"a/\""
3753 msgstr "显示给定的源前缀取代 \"a/\""
3754
3661 -#: diff.c:5430
3755 +#: diff.c:5472
3756 msgid "show the given destination prefix instead of \"b/\""
3757 msgstr "显示给定的目标前缀取代 \"b/\""
3758
3665 -#: diff.c:5433
3759 +#: diff.c:5475
3760 msgid "prepend an additional prefix to every line of output"
3761 msgstr "输出的每一行附加前缀"
3762
3669 -#: diff.c:5436
3763 +#: diff.c:5478
3764 msgid "do not show any source or destination prefix"
3765 msgstr "不显示任何源和目标前缀"
3766
3673 -#: diff.c:5439
3767 +#: diff.c:5481
3768 msgid "show context between diff hunks up to the specified number of lines"
3769 msgstr "显示指定行数的差异块间的上下文"
3770
3677 -#: diff.c:5443 diff.c:5448 diff.c:5453
3771 +#: diff.c:5485 diff.c:5490 diff.c:5495
3772 msgid "<char>"
3773 msgstr "<字符>"
3774
3681 -#: diff.c:5444
3775 +#: diff.c:5486
3776 msgid "specify the character to indicate a new line instead of '+'"
3777 msgstr "指定一个字符取代 '+' 来表示新的一行"
3778
3685 -#: diff.c:5449
3779 +#: diff.c:5491
3780 msgid "specify the character to indicate an old line instead of '-'"
3781 msgstr "指定一个字符取代 '-' 来表示旧的一行"
3782
3689 -#: diff.c:5454
3783 +#: diff.c:5496
3784 msgid "specify the character to indicate a context instead of ' '"
3785 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3786
3693 -#: diff.c:5457
3787 +#: diff.c:5499
3788 msgid "Diff rename options"
3789 msgstr "差异重命名选项"
3790
3697 -#: diff.c:5458
3791 +#: diff.c:5500
3792 msgid "<n>[/<m>]"
3793 msgstr "<n>[/<m>]"
3794
3701 -#: diff.c:5459
3795 +#: diff.c:5501
3796 msgid "break complete rewrite changes into pairs of delete and create"
3797 msgstr "将完全重写的变更打破为成对的删除和创建"
3798
3705 -#: diff.c:5463
3799 +#: diff.c:5505
3800 msgid "detect renames"
3801 msgstr "检测重命名"
3802
3709 -#: diff.c:5467
3803 +#: diff.c:5509
3804 msgid "omit the preimage for deletes"
3805 msgstr "省略删除操作的差异输出"
3806
3713 -#: diff.c:5470
3807 +#: diff.c:5512
3808 msgid "detect copies"
3809 msgstr "检测拷贝"
3810
3717 -#: diff.c:5474
3811 +#: diff.c:5516
3812 msgid "use unmodified files as source to find copies"
3813 msgstr "使用未修改的文件做为发现拷贝的源"
3814
3721 -#: diff.c:5476
3815 +#: diff.c:5518
3816 msgid "disable rename detection"
3817 msgstr "禁用重命名探测"
3818
3725 -#: diff.c:5479
3819 +#: diff.c:5521
3820 msgid "use empty blobs as rename source"
3821 msgstr "使用空的数据对象做为重命名的源"
3822
3729 -#: diff.c:5481
3823 +#: diff.c:5523
3824 msgid "continue listing the history of a file beyond renames"
3825 msgstr "继续列出文件重命名以外的历史记录"
3826
3733 -#: diff.c:5484
3827 +#: diff.c:5526
3828 msgid ""
3829 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3830 "given limit"
3831 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
3832
3739 -#: diff.c:5486
3833 +#: diff.c:5528
3834 msgid "Diff algorithm options"
3835 msgstr "差异算法选项"
3836
3743 -#: diff.c:5488
3837 +#: diff.c:5530
3838 msgid "produce the smallest possible diff"
3839 msgstr "生成尽可能小的差异"
3840
3747 -#: diff.c:5491
3841 +#: diff.c:5533
3842 msgid "ignore whitespace when comparing lines"
3843 msgstr "行比较时忽略空白字符"
3844
3751 -#: diff.c:5494
3845 +#: diff.c:5536
3846 msgid "ignore changes in amount of whitespace"
3847 msgstr "忽略空白字符的变更"
3848
3755 -#: diff.c:5497
3849 +#: diff.c:5539
3850 msgid "ignore changes in whitespace at EOL"
3851 msgstr "忽略行尾的空白字符变更"
3852
3759 -#: diff.c:5500
3853 +#: diff.c:5542
3854 msgid "ignore carrier-return at the end of line"
3855 msgstr "忽略行尾的回车符（CR）"
3856
3763 -#: diff.c:5503
3857 +#: diff.c:5545
3858 msgid "ignore changes whose lines are all blank"
3859 msgstr "忽略整行都是空白的变更"
3860
3767 -#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
3861 +#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
3862 msgid "<regex>"
3863 msgstr "<正则>"
3864
3771 -#: diff.c:5506
3865 +#: diff.c:5548
3866 msgid "ignore changes whose all lines match <regex>"
3867 msgstr "忽略所有行都和正则表达式匹配的变更"
3868
3775 -#: diff.c:5509
3869 +#: diff.c:5551
3870 msgid "heuristic to shift diff hunk boundaries for easy reading"
3871 msgstr "启发式转换差异边界以便阅读"
3872
3779 -#: diff.c:5512
3873 +#: diff.c:5554
3874 msgid "generate diff using the \"patience diff\" algorithm"
3875 msgstr "使用 \"patience diff\" 算法生成差异"
3876
3783 -#: diff.c:5516
3877 +#: diff.c:5558
3878 msgid "generate diff using the \"histogram diff\" algorithm"
3879 msgstr "使用 \"histogram diff\" 算法生成差异"
3880
3787 -#: diff.c:5518
3881 +#: diff.c:5560
3882 msgid "<algorithm>"
3883 msgstr "<算法>"
3884
3791 -#: diff.c:5519
3885 +#: diff.c:5561
3886 msgid "choose a diff algorithm"
3887 msgstr "选择一个差异算法"
3888
3795 -#: diff.c:5521
3889 +#: diff.c:5563
3890 msgid "<text>"
3891 msgstr "<文本>"
3892
3799 -#: diff.c:5522
3893 +#: diff.c:5564
3894 msgid "generate diff using the \"anchored diff\" algorithm"
3895 msgstr "使用 \"anchored diff\" 算法生成差异"
3896
3803 -#: diff.c:5524 diff.c:5533 diff.c:5536
3897 +#: diff.c:5566 diff.c:5575 diff.c:5578
3898 msgid "<mode>"
3899 msgstr "<模式>"
3900
3807 -#: diff.c:5525
3901 +#: diff.c:5567
3902 msgid "show word diff, using <mode> to delimit changed words"
3903 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
3904
3811 -#: diff.c:5528
3905 +#: diff.c:5570
3906 msgid "use <regex> to decide what a word is"
3907 msgstr "使用 <正则表达式> 确定何为一个词"
3908
3815 -#: diff.c:5531
3909 +#: diff.c:5573
3910 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3911 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3912
3819 -#: diff.c:5534
3913 +#: diff.c:5576
3914 msgid "moved lines of code are colored differently"
3915 msgstr "移动的代码行用不同方式着色"
3916
3823 -#: diff.c:5537
3917 +#: diff.c:5579
3918 msgid "how white spaces are ignored in --color-moved"
3919 msgstr "在 --color-moved 下如何忽略空白字符"
3920
3827 -#: diff.c:5540
3921 +#: diff.c:5582
3922 msgid "Other diff options"
3923 msgstr "其它差异选项"
3924
3831 -#: diff.c:5542
3925 +#: diff.c:5584
3926 msgid "when run from subdir, exclude changes outside and show relative paths"
3927 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
3928
3835 -#: diff.c:5546
3929 +#: diff.c:5588
3930 msgid "treat all files as text"
3931 msgstr "把所有文件当做文本处理"
3932
3839 -#: diff.c:5548
3933 +#: diff.c:5590
3934 msgid "swap two inputs, reverse the diff"
3935 msgstr "交换两个输入，反转差异"
3936
3843 -#: diff.c:5550
3937 +#: diff.c:5592
3938 msgid "exit with 1 if there were differences, 0 otherwise"
3939 msgstr "有差异时退出码为 1，否则为 0"
3940
3847 -#: diff.c:5552
3941 +#: diff.c:5594
3942 msgid "disable all output of the program"
3943 msgstr "禁用本程序的所有输出"
3944
3851 -#: diff.c:5554
3945 +#: diff.c:5596
3946 msgid "allow an external diff helper to be executed"
3947 msgstr "允许执行一个外置的差异助手"
3948
3855 -#: diff.c:5556
3949 +#: diff.c:5598
3950 msgid "run external text conversion filters when comparing binary files"
3951 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
3952
3859 -#: diff.c:5558
3953 +#: diff.c:5600
3954 msgid "<when>"
3955 msgstr "<何时>"
3956
3863 -#: diff.c:5559
3957 +#: diff.c:5601
3958 msgid "ignore changes to submodules in the diff generation"
3959 msgstr "在生成差异时，忽略子模组的更改"
3960
3867 -#: diff.c:5562
3961 +#: diff.c:5604
3962 msgid "<format>"
3963 msgstr "<格式>"
3964
3871 -#: diff.c:5563
3965 +#: diff.c:5605
3966 msgid "specify how differences in submodules are shown"
3967 msgstr "指定子模组的差异如何显示"
3968
3875 -#: diff.c:5567
3969 +#: diff.c:5609
3970 msgid "hide 'git add -N' entries from the index"
3971 msgstr "隐藏索引中 'git add -N' 条目"
3972
3879 -#: diff.c:5570
3973 +#: diff.c:5612
3974 msgid "treat 'git add -N' entries as real in the index"
3975 msgstr "将索引中 'git add -N' 条目当做真实的"
3976
3883 -#: diff.c:5572
3977 +#: diff.c:5614
3978 msgid "<string>"
3979 msgstr "<字符串>"
3980
3887 -#: diff.c:5573
3981 +#: diff.c:5615
3982 msgid ""
3983 "look for differences that change the number of occurrences of the specified "
3984 "string"
3985 msgstr "查找改变了指定字符串出现次数的差异"
3986
3893 -#: diff.c:5576
3987 +#: diff.c:5618
3988 msgid ""
3989 "look for differences that change the number of occurrences of the specified "
3990 "regex"
3991 msgstr "查找改变指定正则匹配出现次数的差异"
3992
3899 -#: diff.c:5579
3993 +#: diff.c:5621
3994 msgid "show all changes in the changeset with -S or -G"
3995 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3996
3903 -#: diff.c:5582
3997 +#: diff.c:5624
3998 msgid "treat <string> in -S as extended POSIX regular expression"
3999 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
4000
3907 -#: diff.c:5585
4001 +#: diff.c:5627
4002 msgid "control the order in which files appear in the output"
4003 msgstr "控制输出中的文件显示顺序"
4004
3911 -#: diff.c:5586 diff.c:5589
4005 +#: diff.c:5628 diff.c:5631
4006 msgid "<path>"
4007 msgstr "<路径>"
4008
3915 -#: diff.c:5587
4009 +#: diff.c:5629
4010 msgid "show the change in the specified path first"
4011 msgstr "先显示指定路径的变更"
4012
3919 -#: diff.c:5590
4013 +#: diff.c:5632
4014 msgid "skip the output to the specified path"
4015 msgstr "跳过指定路径的输出"
4016
3923 -#: diff.c:5592
4017 +#: diff.c:5634
4018 msgid "<object-id>"
4019 msgstr "<对象 ID>"
4020
3927 -#: diff.c:5593
4021 +#: diff.c:5635
4022 msgid ""
4023 "look for differences that change the number of occurrences of the specified "
4024 "object"
4025 msgstr "查找改变指定对象出现次数的差异"
4026
3933 -#: diff.c:5595
4027 +#: diff.c:5637
4028 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
4029 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
4030
3937 -#: diff.c:5596
4031 +#: diff.c:5638
4032 msgid "select files by diff type"
4033 msgstr "通过差异类型选择文件"
4034
3941 -#: diff.c:5598
4035 +#: diff.c:5640
4036 msgid "<file>"
4037 msgstr "<文件>"
4038
3945 -#: diff.c:5599
3946 -msgid "Output to a specific file"
3947 -msgstr "输出到一个指定的文件"
4039 +#: diff.c:5641
4040 +msgid "output to a specific file"
4041 +msgstr "输出到指定的文件"
4042
3949 -#: diff.c:6257
4043 +#: diff.c:6321
4044 msgid "exhaustive rename detection was skipped due to too many files."
4045 msgstr "由于文件太多，跳过详尽的重命名检查。"
4046
3953 -#: diff.c:6260
4047 +#: diff.c:6324
4048 msgid "only found copies from modified paths due to too many files."
4049 msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
4050
3957 -#: diff.c:6263
4051 +#: diff.c:6327
4052 #, c-format
4053 msgid ""
4054 "you may want to set your %s variable to at least %d and retry the command."
@@ -4003,20 +4097,20 @@ msgstr "停用锥形模式匹配"
4097 msgid "cannot use %s as an exclude file"
4098 msgstr "不能将 %s 用作排除文件"
4099
4006 -#: dir.c:2418
4100 +#: dir.c:2419
4101 #, c-format
4102 msgid "could not open directory '%s'"
4103 msgstr "不能打开目录 '%s'"
4104
4011 -#: dir.c:2720
4105 +#: dir.c:2721
4106 msgid "failed to get kernel name and information"
4107 msgstr "无法获得内核名称和信息"
4108
4015 -#: dir.c:2844
4109 +#: dir.c:2846
4110 msgid "untracked cache is disabled on this system or location"
4111 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
4112
4019 -#: dir.c:3112
4113 +#: dir.c:3119
4114 msgid ""
4115 "No directory name could be guessed.\n"
4116 "Please specify a directory on the command line"
@@ -4024,17 +4118,17 @@ msgstr ""
4118 "无法猜到目录名。\n"
4119 "请在命令行指定一个目录"
4120
4027 -#: dir.c:3800
4121 +#: dir.c:3807
4122 #, c-format
4123 msgid "index file corrupt in repo %s"
4124 msgstr "仓库 %s 中的索引文件损坏"
4125
4032 -#: dir.c:3847 dir.c:3852
4126 +#: dir.c:3854 dir.c:3859
4127 #, c-format
4128 msgid "could not create directories for %s"
4129 msgstr "不能为 %s 创建目录"
4130
4037 -#: dir.c:3881
4131 +#: dir.c:3888
4132 #, c-format
4133 msgid "could not migrate git directory from '%s' to '%s'"
4134 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
@@ -4053,7 +4147,7 @@ msgstr "过滤内容"
4147 msgid "could not stat file '%s'"
4148 msgstr "不能对文件 '%s' 调用 stat"
4149
4056 -#: environment.c:145
4150 +#: environment.c:147
4151 #, c-format
4152 msgid "bad git namespace path \"%s\""
4153 msgstr "错误的 git 名字空间路径 \"%s\""
@@ -4084,253 +4178,280 @@ msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
4178 msgid "unable to write to remote"
4179 msgstr "无法写到远程"
4180
4087 -#: fetch-pack.c:395 fetch-pack.c:1439
4181 +#: fetch-pack.c:397 fetch-pack.c:1460
4182 #, c-format
4183 msgid "invalid shallow line: %s"
4184 msgstr "无效的 shallow 信息：%s"
4185
4092 -#: fetch-pack.c:401 fetch-pack.c:1445
4186 +#: fetch-pack.c:403 fetch-pack.c:1466
4187 #, c-format
4188 msgid "invalid unshallow line: %s"
4189 msgstr "无效的 unshallow 信息：%s"
4190
4097 -#: fetch-pack.c:403 fetch-pack.c:1447
4191 +#: fetch-pack.c:405 fetch-pack.c:1468
4192 #, c-format
4193 msgid "object not found: %s"
4194 msgstr "对象未找到：%s"
4195
4102 -#: fetch-pack.c:406 fetch-pack.c:1450
4196 +#: fetch-pack.c:408 fetch-pack.c:1471
4197 #, c-format
4198 msgid "error in object: %s"
4199 msgstr "对象中出错：%s"
4200
4107 -#: fetch-pack.c:408 fetch-pack.c:1452
4201 +#: fetch-pack.c:410 fetch-pack.c:1473
4202 #, c-format
4203 msgid "no shallow found: %s"
4204 msgstr "未发现 shallow：%s"
4205
4112 -#: fetch-pack.c:411 fetch-pack.c:1456
4206 +#: fetch-pack.c:413 fetch-pack.c:1477
4207 #, c-format
4208 msgid "expected shallow/unshallow, got %s"
4209 msgstr "应为 shallow/unshallow，却得到 %s"
4210
4117 -#: fetch-pack.c:451
4211 +#: fetch-pack.c:453
4212 #, c-format
4213 msgid "got %s %d %s"
4214 msgstr "得到 %s %d %s"
4215
4122 -#: fetch-pack.c:468
4216 +#: fetch-pack.c:470
4217 #, c-format
4218 msgid "invalid commit %s"
4219 msgstr "无效提交 %s"
4220
4127 -#: fetch-pack.c:499
4221 +#: fetch-pack.c:501
4222 msgid "giving up"
4223 msgstr "放弃"
4224
4131 -#: fetch-pack.c:512 progress.c:339
4225 +#: fetch-pack.c:514 progress.h:25
4226 msgid "done"
4227 msgstr "完成"
4228
4135 -#: fetch-pack.c:524
4229 +#: fetch-pack.c:526
4230 #, c-format
4231 msgid "got %s (%d) %s"
4232 msgstr "得到 %s (%d) %s"
4233
4140 -#: fetch-pack.c:560
4234 +#: fetch-pack.c:562
4235 #, c-format
4236 msgid "Marking %s as complete"
4237 msgstr "标记 %s 为完成"
4238
4145 -#: fetch-pack.c:775
4239 +#: fetch-pack.c:784
4240 #, c-format
4241 msgid "already have %s (%s)"
4242 msgstr "已经有 %s（%s）"
4243
4150 -#: fetch-pack.c:861
4244 +#: fetch-pack.c:870
4245 msgid "fetch-pack: unable to fork off sideband demultiplexer"
4246 msgstr "fetch-pack：无法派生 sideband 多路输出"
4247
4154 -#: fetch-pack.c:869
4248 +#: fetch-pack.c:878
4249 msgid "protocol error: bad pack header"
4250 msgstr "协议错误：坏的包头"
4251
4158 -#: fetch-pack.c:965
4252 +#: fetch-pack.c:974
4253 #, c-format
4254 msgid "fetch-pack: unable to fork off %s"
4255 msgstr "fetch-pack：无法派生进程 %s"
4256
4163 -#: fetch-pack.c:971
4257 +#: fetch-pack.c:980
4258 msgid "fetch-pack: invalid index-pack output"
4259 msgstr "fetch-pack：无效的 index-pack 输出"
4260
4167 -#: fetch-pack.c:988
4261 +#: fetch-pack.c:997
4262 #, c-format
4263 msgid "%s failed"
4264 msgstr "%s 失败"
4265
4172 -#: fetch-pack.c:990
4266 +#: fetch-pack.c:999
4267 msgid "error in sideband demultiplexer"
4268 msgstr "sideband 多路输出出错"
4269
4176 -#: fetch-pack.c:1035
4270 +#: fetch-pack.c:1048
4271 #, c-format
4272 msgid "Server version is %.*s"
4273 msgstr "服务器版本 %.*s"
4274
4181 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
4182 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
4183 -#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
4184 -#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
4275 +#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
4276 +#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
4277 +#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
4278 +#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
4279 #, c-format
4280 msgid "Server supports %s"
4281 msgstr "服务器支持 %s"
4282
4189 -#: fetch-pack.c:1045
4283 +#: fetch-pack.c:1058
4284 msgid "Server does not support shallow clients"
4285 msgstr "服务器不支持浅客户端"
4286
4193 -#: fetch-pack.c:1105
4287 +#: fetch-pack.c:1118
4288 msgid "Server does not support --shallow-since"
4289 msgstr "服务器不支持 --shallow-since"
4290
4197 -#: fetch-pack.c:1110
4291 +#: fetch-pack.c:1123
4292 msgid "Server does not support --shallow-exclude"
4293 msgstr "服务器不支持 --shallow-exclude"
4294
4201 -#: fetch-pack.c:1114
4295 +#: fetch-pack.c:1127
4296 msgid "Server does not support --deepen"
4297 msgstr "服务器不支持 --deepen"
4298
4205 -#: fetch-pack.c:1116
4299 +#: fetch-pack.c:1129
4300 msgid "Server does not support this repository's object format"
4301 msgstr "服务器不支持这个仓库的对象格式"
4302
4209 -#: fetch-pack.c:1129
4303 +#: fetch-pack.c:1142
4304 msgid "no common commits"
4305 msgstr "没有共同的提交"
4306
4213 -#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
4307 +#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
4308 msgid "source repository is shallow, reject to clone."
4309 msgstr "源仓库是浅克隆，拒绝克隆。"
4310
4217 -#: fetch-pack.c:1144 fetch-pack.c:1681
4311 +#: fetch-pack.c:1157 fetch-pack.c:1705
4312 msgid "git fetch-pack: fetch failed."
4313 msgstr "git fetch-pack：获取失败。"
4314
4221 -#: fetch-pack.c:1258
4315 +#: fetch-pack.c:1271
4316 #, c-format
4317 msgid "mismatched algorithms: client %s; server %s"
4318 msgstr "不匹配的算法：客户端 %s，服务端 %s"
4319
4226 -#: fetch-pack.c:1262
4320 +#: fetch-pack.c:1275
4321 #, c-format
4322 msgid "the server does not support algorithm '%s'"
4323 msgstr "服务器不支持算法 '%s'"
4324
4231 -#: fetch-pack.c:1295
4325 +#: fetch-pack.c:1308
4326 msgid "Server does not support shallow requests"
4327 msgstr "服务器不支持浅克隆请求"
4328
4235 -#: fetch-pack.c:1302
4329 +#: fetch-pack.c:1315
4330 msgid "Server supports filter"
4331 msgstr "服务器支持 filter"
4332
4239 -#: fetch-pack.c:1345 fetch-pack.c:2063
4333 +#: fetch-pack.c:1358 fetch-pack.c:2087
4334 msgid "unable to write request to remote"
4335 msgstr "无法将请求写到远程"
4336
4243 -#: fetch-pack.c:1363
4337 +#: fetch-pack.c:1376
4338 #, c-format
4339 msgid "error reading section header '%s'"
4340 msgstr "读取节标题 '%s' 出错"
4341
4248 -#: fetch-pack.c:1369
4342 +#: fetch-pack.c:1382
4343 #, c-format
4344 msgid "expected '%s', received '%s'"
4345 msgstr "预期 '%s'，得到 '%s'"
4346
4253 -#: fetch-pack.c:1403
4347 +#: fetch-pack.c:1416
4348 #, c-format
4349 msgid "unexpected acknowledgment line: '%s'"
4350 msgstr "意外的确认行：'%s'"
4351
4258 -#: fetch-pack.c:1408
4352 +#: fetch-pack.c:1421
4353 #, c-format
4354 msgid "error processing acks: %d"
4355 msgstr "处理 ack 出错：%d"
4356
4263 -#: fetch-pack.c:1418
4264 -msgid "expected packfile to be sent after 'ready'"
4265 -msgstr "预期在 'ready' 之后发送 packfile"
4357 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4358 +#. keyword.
4359 +#.
4360 +#: fetch-pack.c:1435
4361 +#, c-format
4362 +msgid "expected packfile to be sent after '%s'"
4363 +msgstr "预期在 '%s' 之后发送 packfile"
4364
4267 -#: fetch-pack.c:1420
4268 -msgid "expected no other sections to be sent after no 'ready'"
4269 -msgstr "在没有 'ready' 不应该发送其它小节"
4365 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4366 +#. keyword.
4367 +#.
4368 +#: fetch-pack.c:1441
4369 +#, c-format
4370 +msgid "expected no other sections to be sent after no '%s'"
4371 +msgstr "在没有 '%s' 后不应该发送其它小节"
4372
4271 -#: fetch-pack.c:1461
4373 +#: fetch-pack.c:1482
4374 #, c-format
4375 msgid "error processing shallow info: %d"
4376 msgstr "处理浅克隆信息出错：%d"
4377
4276 -#: fetch-pack.c:1510
4378 +#: fetch-pack.c:1531
4379 #, c-format
4380 msgid "expected wanted-ref, got '%s'"
4381 msgstr "预期 wanted-ref，得到 '%s'"
4382
4281 -#: fetch-pack.c:1515
4383 +#: fetch-pack.c:1536
4384 #, c-format
4385 msgid "unexpected wanted-ref: '%s'"
4386 msgstr "意外的 wanted-ref：'%s'"
4387
4286 -#: fetch-pack.c:1520
4388 +#: fetch-pack.c:1541
4389 #, c-format
4390 msgid "error processing wanted refs: %d"
4391 msgstr "处理要获取的引用出错：%d"
4392
4291 -#: fetch-pack.c:1550
4393 +#: fetch-pack.c:1571
4394 msgid "git fetch-pack: expected response end packet"
4395 msgstr "git fetch-pack：预期响应结束包"
4396
4295 -#: fetch-pack.c:1959
4397 +#: fetch-pack.c:1983
4398 msgid "no matching remote head"
4399 msgstr "没有匹配的远程分支"
4400
4299 -#: fetch-pack.c:1982 builtin/clone.c:581
4401 +#: fetch-pack.c:2006 builtin/clone.c:587
4402 msgid "remote did not send all necessary objects"
4403 msgstr "远程没有发送所有必需的对象"
4404
4303 -#: fetch-pack.c:2085
4405 +#: fetch-pack.c:2109
4406 msgid "unexpected 'ready' from remote"
4407 msgstr "来自远程的意外的 'ready'"
4408
4307 -#: fetch-pack.c:2108
4409 +#: fetch-pack.c:2132
4410 #, c-format
4411 msgid "no such remote ref %s"
4412 msgstr "没有这样的远程引用 %s"
4413
4312 -#: fetch-pack.c:2111
4414 +#: fetch-pack.c:2135
4415 #, c-format
4416 msgid "Server does not allow request for unadvertised object %s"
4417 msgstr "服务器不允许请求未公开的对象 %s"
4418
4317 -#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4318 -#: gpg-interface.c:990
4419 +#: fsmonitor-ipc.c:119
4420 +#, c-format
4421 +msgid "fsmonitor_ipc__send_query: invalid path '%s'"
4422 +msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'"
4423 +
4424 +#: fsmonitor-ipc.c:125
4425 +#, c-format
4426 +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
4427 +msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'"
4428 +
4429 +#: fsmonitor-ipc.c:155
4430 +msgid "fsmonitor--daemon is not running"
4431 +msgstr "fsmonitor--daemon 没有运行"
4432 +
4433 +#: fsmonitor-ipc.c:164
4434 +#, c-format
4435 +msgid "could not send '%s' command to fsmonitor--daemon"
4436 +msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
4437 +
4438 +#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
4439 +#: gpg-interface.c:1011
4440 msgid "could not create temporary file"
4441 msgstr "不能创建临时文件"
4442
4322 -#: gpg-interface.c:332 gpg-interface.c:460
4443 +#: gpg-interface.c:332 gpg-interface.c:459
4444 #, c-format
4445 msgid "failed writing detached signature to '%s'"
4446 msgstr "无法将分离式签名写入 '%s'"
4447
4327 -#: gpg-interface.c:451
4448 +#: gpg-interface.c:450
4449 msgid ""
4450 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4451 "signature verification"
4452 msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
4453
4333 -#: gpg-interface.c:480
4454 +#: gpg-interface.c:479
4455 msgid ""
4456 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
4457 "verification (available in openssh version 8.2p1+)"
@@ -4338,61 +4459,61 @@ msgstr ""
4459 "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
4460 "（openssh 8.2p1+ 版本可用）"
4461
4341 -#: gpg-interface.c:536
4462 +#: gpg-interface.c:550
4463 #, c-format
4464 msgid "ssh signing revocation file configured but not found: %s"
4465 msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
4466
4346 -#: gpg-interface.c:624
4467 +#: gpg-interface.c:638
4468 #, c-format
4469 msgid "bad/incompatible signature '%s'"
4470 msgstr "坏的/不兼容的签名 '%s‘"
4471
4351 -#: gpg-interface.c:801 gpg-interface.c:806
4472 +#: gpg-interface.c:815 gpg-interface.c:820
4473 #, c-format
4474 msgid "failed to get the ssh fingerprint for key '%s'"
4475 msgstr "无法得到密钥 '%s' 的 ssh 指纹"
4476
4356 -#: gpg-interface.c:829
4477 +#: gpg-interface.c:843
4478 msgid ""
4479 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4480 msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
4481
4361 -#: gpg-interface.c:851
4482 +#: gpg-interface.c:865
4483 #, c-format
4484 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
4485 msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
4486
4366 -#: gpg-interface.c:857
4487 +#: gpg-interface.c:871
4488 #, c-format
4489 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4490 msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
4491
4371 -#: gpg-interface.c:945
4492 +#: gpg-interface.c:966
4493 msgid "gpg failed to sign the data"
4494 msgstr "gpg 无法为数据签名"
4495
4375 -#: gpg-interface.c:967
4496 +#: gpg-interface.c:988
4497 msgid "user.signingkey needs to be set for ssh signing"
4498 msgstr "ssh 签名需要设置 user.signingkey"
4499
4379 -#: gpg-interface.c:978
4500 +#: gpg-interface.c:999
4501 #, c-format
4502 msgid "failed writing ssh signing key to '%s'"
4503 msgstr "无法将 ssh 签名密钥写入 '%s'"
4504
4384 -#: gpg-interface.c:996
4505 +#: gpg-interface.c:1017
4506 #, c-format
4507 msgid "failed writing ssh signing key buffer to '%s'"
4508 msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
4509
4389 -#: gpg-interface.c:1014
4510 +#: gpg-interface.c:1035
4511 msgid ""
4512 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4513 "8.2p1+)"
4514 msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
4515
4395 -#: gpg-interface.c:1026
4516 +#: gpg-interface.c:1047
4517 #, c-format
4518 msgid "failed reading ssh signing data buffer from '%s'"
4519 msgstr "无法从 '%s' 读入 ssh 签名数据"
@@ -4402,7 +4523,7 @@ msgstr "无法从 '%s' 读入 ssh 签名数据"
4523 msgid "ignored invalid color '%.*s' in log.graphColors"
4524 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4525
4405 -#: grep.c:531
4526 +#: grep.c:446
4527 msgid ""
4528 "given pattern contains NULL byte (via -f <file>). This is only supported "
4529 "with -P under PCRE v2"
@@ -4410,109 +4531,109 @@ msgstr ""
4531 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
4532 "功能"
4533
4413 -#: grep.c:1942
4534 +#: grep.c:1859
4535 #, c-format
4536 msgid "'%s': unable to read %s"
4537 msgstr "'%s'：无法读取 %s"
4538
4418 -#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
4539 +#: grep.c:1876 setup.c:177 builtin/clone.c:308 builtin/diff.c:90
4540 #: builtin/rm.c:136
4541 #, c-format
4542 msgid "failed to stat '%s'"
4543 msgstr "无法对 '%s' 调用 stat"
4544
4424 -#: grep.c:1970
4545 +#: grep.c:1887
4546 #, c-format
4547 msgid "'%s': short read"
4548 msgstr "'%s'：读取不完整"
4549
4429 -#: help.c:24
4550 +#: help.c:25
4551 msgid "start a working area (see also: git help tutorial)"
4552 msgstr "开始一个工作区（参见：git help tutorial）"
4553
4433 -#: help.c:25
4554 +#: help.c:26
4555 msgid "work on the current change (see also: git help everyday)"
4556 msgstr "在当前变更上工作（参见：git help everyday）"
4557
4437 -#: help.c:26
4558 +#: help.c:27
4559 msgid "examine the history and state (see also: git help revisions)"
4560 msgstr "检查历史和状态（参见：git help revisions）"
4561
4441 -#: help.c:27
4562 +#: help.c:28
4563 msgid "grow, mark and tweak your common history"
4564 msgstr "扩展、标记和调校您的历史记录"
4565
4445 -#: help.c:28
4566 +#: help.c:29
4567 msgid "collaborate (see also: git help workflows)"
4568 msgstr "协同（参见：git help workflows）"
4569
4449 -#: help.c:32
4570 +#: help.c:33
4571 msgid "Main Porcelain Commands"
4572 msgstr "主要的上层命令"
4573
4453 -#: help.c:33
4574 +#: help.c:34
4575 msgid "Ancillary Commands / Manipulators"
4576 msgstr "辅助命令/操作者"
4577
4457 -#: help.c:34
4578 +#: help.c:35
4579 msgid "Ancillary Commands / Interrogators"
4580 msgstr "辅助命令/询问者"
4581
4461 -#: help.c:35
4582 +#: help.c:36
4583 msgid "Interacting with Others"
4584 msgstr "与其它系统交互"
4585
4465 -#: help.c:36
4586 +#: help.c:37
4587 msgid "Low-level Commands / Manipulators"
4588 msgstr "低级命令/操作者"
4589
4469 -#: help.c:37
4590 +#: help.c:38
4591 msgid "Low-level Commands / Interrogators"
4592 msgstr "低级命令/询问者"
4593
4473 -#: help.c:38
4594 +#: help.c:39
4595 msgid "Low-level Commands / Syncing Repositories"
4596 msgstr "低级命令/同步仓库"
4597
4477 -#: help.c:39
4598 +#: help.c:40
4599 msgid "Low-level Commands / Internal Helpers"
4600 msgstr "低级命令/内部助手"
4601
4481 -#: help.c:313
4602 +#: help.c:316
4603 #, c-format
4604 msgid "available git commands in '%s'"
4605 msgstr "在 '%s' 下可用的 git 命令"
4606
4486 -#: help.c:320
4607 +#: help.c:323
4608 msgid "git commands available from elsewhere on your $PATH"
4609 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
4610
4490 -#: help.c:329
4611 +#: help.c:332
4612 msgid "These are common Git commands used in various situations:"
4613 msgstr "这些是各种场合常见的 Git 命令："
4614
4494 -#: help.c:378 git.c:100
4615 +#: help.c:382 git.c:100
4616 #, c-format
4617 msgid "unsupported command listing type '%s'"
4618 msgstr "不支持的命令列表类型 '%s'"
4619
4499 -#: help.c:418
4620 +#: help.c:422
4621 msgid "The Git concept guides are:"
4622 msgstr "Git 概念向导有："
4623
4503 -#: help.c:442
4504 -msgid "See 'git help <command>' to read about a specific subcommand"
4505 -msgstr "执行　'git help <command>' 来查看特定子命令"
4506 -
4507 -#: help.c:447
4624 +#: help.c:446
4625 msgid "External commands"
4626 msgstr "外部命令"
4627
4511 -#: help.c:462
4628 +#: help.c:468
4629 msgid "Command aliases"
4630 msgstr "命令别名"
4631
4515 -#: help.c:543
4632 +#: help.c:486
4633 +msgid "See 'git help <command>' to read about a specific subcommand"
4634 +msgstr "执行　'git help <command>' 来了解特定子命令"
4635 +
4636 +#: help.c:563
4637 #, c-format
4638 msgid ""
4639 "'%s' appears to be a git command, but we were not\n"
@@ -4521,36 +4642,36 @@ msgstr ""
4642 "'%s' 像是一个 git 命令，但却无法运行。\n"
4643 "可能是 git-%s 受损？"
4644
4524 -#: help.c:565 help.c:662
4645 +#: help.c:585 help.c:682
4646 #, c-format
4647 msgid "git: '%s' is not a git command. See 'git --help'."
4648 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
4649
4529 -#: help.c:613
4650 +#: help.c:633
4651 msgid "Uh oh. Your system reports no Git commands at all."
4652 msgstr "唉呀，您的系统中未发现 Git 命令。"
4653
4533 -#: help.c:635
4654 +#: help.c:655
4655 #, c-format
4656 msgid "WARNING: You called a Git command named '%s', which does not exist."
4657 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
4658
4538 -#: help.c:640
4659 +#: help.c:660
4660 #, c-format
4661 msgid "Continuing under the assumption that you meant '%s'."
4662 msgstr "假定您想要的是 '%s' 并继续。"
4663
4543 -#: help.c:646
4664 +#: help.c:666
4665 #, c-format
4666 msgid "Run '%s' instead [y/N]? "
4667 msgstr "取而代之运行 '%s' [y/N]？"
4668
4548 -#: help.c:654
4669 +#: help.c:674
4670 #, c-format
4671 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4672 msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
4673
4553 -#: help.c:666
4674 +#: help.c:686
4675 msgid ""
4676 "\n"
4677 "The most similar command is"
@@ -4564,16 +4685,16 @@ msgstr[1] ""
4685 "\n"
4686 "最相似的命令是"
4687
4567 -#: help.c:706
4688 +#: help.c:729
4689 msgid "git version [<options>]"
4690 msgstr "git version [<选项>]"
4691
4571 -#: help.c:761
4692 +#: help.c:784
4693 #, c-format
4694 msgid "%s: %s - %s"
4695 msgstr "%s：%s - %s"
4696
4576 -#: help.c:765
4697 +#: help.c:788
4698 msgid ""
4699 "\n"
4700 "Did you mean this?"
@@ -4587,7 +4708,7 @@ msgstr[1] ""
4708 "\n"
4709 "您指的是这其中的某一个么？"
4710
4590 -#: hook.c:27
4711 +#: hook.c:28
4712 #, c-format
4713 msgid ""
4714 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -4596,15 +4717,20 @@ msgstr ""
4717 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
4718 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
4719
4599 -#: ident.c:353
4720 +#: hook.c:87
4721 +#, c-format
4722 +msgid "Couldn't start hook '%s'\n"
4723 +msgstr "不能启动钩子 '%s'\n"
4724 +
4725 +#: ident.c:354
4726 msgid "Author identity unknown\n"
4727 msgstr "作者身份未知\n"
4728
4603 -#: ident.c:356
4729 +#: ident.c:357
4730 msgid "Committer identity unknown\n"
4731 msgstr "提交者身份未知\n"
4732
4607 -#: ident.c:362
4733 +#: ident.c:363
4734 msgid ""
4735 "\n"
4736 "*** Please tell me who you are.\n"
@@ -4629,71 +4755,71 @@ msgstr ""
4755 "来设置您账号的缺省身份标识。\n"
4756 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
4757
4632 -#: ident.c:397
4758 +#: ident.c:398
4759 msgid "no email was given and auto-detection is disabled"
4760 msgstr "未提供邮件地址且自动探测被禁用"
4761
4636 -#: ident.c:402
4762 +#: ident.c:403
4763 #, c-format
4764 msgid "unable to auto-detect email address (got '%s')"
4765 msgstr "无法自动探测邮件地址（得到 '%s'）"
4766
4641 -#: ident.c:419
4767 +#: ident.c:420
4768 msgid "no name was given and auto-detection is disabled"
4769 msgstr "未提供姓名且自动探测被禁用"
4770
4645 -#: ident.c:425
4771 +#: ident.c:426
4772 #, c-format
4773 msgid "unable to auto-detect name (got '%s')"
4774 msgstr "无法自动探测姓名（得到 '%s'）"
4775
4650 -#: ident.c:433
4776 +#: ident.c:434
4777 #, c-format
4778 msgid "empty ident name (for <%s>) not allowed"
4779 msgstr "不允许空的姓名（对于 <%s>）"
4780
4655 -#: ident.c:439
4781 +#: ident.c:440
4782 #, c-format
4783 msgid "name consists only of disallowed characters: %s"
4784 msgstr "姓名中仅包含禁用字符：%s"
4785
4660 -#: ident.c:454 builtin/commit.c:648
4786 +#: ident.c:455 builtin/commit.c:649
4787 #, c-format
4788 msgid "invalid date format: %s"
4789 msgstr "无效的日期格式：%s"
4790
4665 -#: list-objects-filter-options.c:83
4791 +#: list-objects-filter-options.c:68
4792 msgid "expected 'tree:<depth>'"
4793 msgstr "期望 'tree:<深度>'"
4794
4669 -#: list-objects-filter-options.c:98
4795 +#: list-objects-filter-options.c:83
4796 msgid "sparse:path filters support has been dropped"
4797 msgstr "sparse:path 过滤器支持已被删除"
4798
4673 -#: list-objects-filter-options.c:105
4799 +#: list-objects-filter-options.c:90
4800 #, c-format
4801 msgid "'%s' for 'object:type=<type>' is not a valid object type"
4802 msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
4803
4678 -#: list-objects-filter-options.c:124
4804 +#: list-objects-filter-options.c:109
4805 #, c-format
4806 msgid "invalid filter-spec '%s'"
4807 msgstr "无效的过滤器表达式 '%s'"
4808
4683 -#: list-objects-filter-options.c:140
4809 +#: list-objects-filter-options.c:125
4810 #, c-format
4811 msgid "must escape char in sub-filter-spec: '%c'"
4812 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
4813
4688 -#: list-objects-filter-options.c:182
4814 +#: list-objects-filter-options.c:167
4815 msgid "expected something after combine:"
4816 msgstr "期望在组合后有一些东西："
4817
4692 -#: list-objects-filter-options.c:264
4818 +#: list-objects-filter-options.c:249
4819 msgid "multiple filter-specs cannot be combined"
4820 msgstr "不能混用多种过滤规格"
4821
4696 -#: list-objects-filter-options.c:376
4822 +#: list-objects-filter-options.c:365
4823 msgid "unable to upgrade repository format to support partial clone"
4824 msgstr "无法升级仓库格式以支持部分克隆"
4825
@@ -4707,17 +4833,17 @@ msgstr "不能访问 '%s' 中的稀疏数据对象"
4833 msgid "unable to parse sparse filter data in %s"
4834 msgstr "无法解析 %s 中的稀疏过滤器数据"
4835
4710 -#: list-objects.c:127
4836 +#: list-objects.c:144
4837 #, c-format
4838 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4839 msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
4840
4715 -#: list-objects.c:140
4841 +#: list-objects.c:157
4842 #, c-format
4843 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4844 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
4845
4720 -#: list-objects.c:398
4846 +#: list-objects.c:415
4847 #, c-format
4848 msgid "unable to load root tree for commit %s"
4849 msgstr "无法为提交 %s 加载根树"
@@ -4745,17 +4871,12 @@ msgstr ""
4871 msgid "Unable to create '%s.lock': %s"
4872 msgstr "不能创建 '%s.lock'：%s"
4873
4748 -#: ls-refs.c:37
4749 -#, c-format
4750 -msgid "invalid value '%s' for lsrefs.unborn"
4751 -msgstr "lsrefs.unborn 的取值 '%s' 无效"
4752 -
4753 -#: ls-refs.c:174
4874 +#: ls-refs.c:175
4875 #, c-format
4876 msgid "unexpected line: '%s'"
4877 msgstr "意外的行：'%s'"
4878
4758 -#: ls-refs.c:178
4879 +#: ls-refs.c:179
4880 msgid "expected flush after ls-refs arguments"
4881 msgstr "在 ls-refs 参数后应该有一个 flush 包"
4882
@@ -4763,37 +4884,37 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
4884 msgid "quoted CRLF detected"
4885 msgstr "检测到被引用的 CRLF"
4886
4766 -#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
4887 +#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
4888 #, c-format
4889 msgid "bad action '%s' for '%s'"
4890 msgstr "'%2$s' 的错误动作 '%1$s'"
4891
4771 -#: merge-ort.c:1584 merge-recursive.c:1211
4892 +#: merge-ort.c:1630 merge-recursive.c:1214
4893 #, c-format
4894 msgid "Failed to merge submodule %s (not checked out)"
4895 msgstr "无法合并子模组 %s （没有检出）"
4896
4776 -#: merge-ort.c:1593 merge-recursive.c:1218
4897 +#: merge-ort.c:1639 merge-recursive.c:1221
4898 #, c-format
4899 msgid "Failed to merge submodule %s (commits not present)"
4900 msgstr "无法合并子模组 %s（提交不存在）"
4901
4781 -#: merge-ort.c:1602 merge-recursive.c:1225
4902 +#: merge-ort.c:1648 merge-recursive.c:1228
4903 #, c-format
4904 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4905 msgstr "无法合并子模组 %s （提交未跟随合并基线）"
4906
4786 -#: merge-ort.c:1612 merge-ort.c:1620
4907 +#: merge-ort.c:1658 merge-ort.c:1666
4908 #, c-format
4909 msgid "Note: Fast-forwarding submodule %s to %s"
4910 msgstr "注意：快进子模组 %s 到 %s"
4911
4791 -#: merge-ort.c:1642
4912 +#: merge-ort.c:1688
4913 #, c-format
4914 msgid "Failed to merge submodule %s"
4915 msgstr "无法合并子模组 %s"
4916
4796 -#: merge-ort.c:1649
4917 +#: merge-ort.c:1695
4918 #, c-format
4919 msgid ""
4920 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4802,7 +4923,7 @@ msgstr ""
4923 "无法合并子模组 %s，但是存在一个可能的合并方案：\n"
4924 "%s\n"
4925
4805 -#: merge-ort.c:1653 merge-recursive.c:1281
4926 +#: merge-ort.c:1699 merge-recursive.c:1284
4927 #, c-format
4928 msgid ""
4929 "If this is correct simply add it to the index for example\n"
@@ -4818,7 +4939,7 @@ msgstr ""
4939 "\n"
4940 "以接受此建议。\n"
4941
4821 -#: merge-ort.c:1666
4942 +#: merge-ort.c:1712
4943 #, c-format
4944 msgid ""
4945 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4827,21 +4948,21 @@ msgstr ""
4948 "无法合并子模组 %s，但是存在多个可能的合并：\n"
4949 "%s"
4950
4830 -#: merge-ort.c:1887 merge-recursive.c:1372
4951 +#: merge-ort.c:1937 merge-recursive.c:1375
4952 msgid "Failed to execute internal merge"
4953 msgstr "无法执行内部合并"
4954
4834 -#: merge-ort.c:1892 merge-recursive.c:1377
4955 +#: merge-ort.c:1942 merge-recursive.c:1380
4956 #, c-format
4957 msgid "Unable to add %s to database"
4958 msgstr "不能添加 %s 至对象库"
4959
4839 -#: merge-ort.c:1899 merge-recursive.c:1410
4960 +#: merge-ort.c:1949 merge-recursive.c:1413
4961 #, c-format
4962 msgid "Auto-merging %s"
4963 msgstr "自动合并 %s"
4964
4844 -#: merge-ort.c:2038 merge-recursive.c:2132
4965 +#: merge-ort.c:2088 merge-recursive.c:2135
4966 #, c-format
4967 msgid ""
4968 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4850,7 +4971,7 @@ msgstr ""
4971 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
4972 "在：%s。"
4973
4853 -#: merge-ort.c:2048 merge-recursive.c:2142
4974 +#: merge-ort.c:2098 merge-recursive.c:2145
4975 #, c-format
4976 msgid ""
4977 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4859,7 +4980,7 @@ msgstr ""
4980 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
4981 "径放置于此：%s"
4982
4862 -#: merge-ort.c:2106
4983 +#: merge-ort.c:2156
4984 #, c-format
4985 msgid ""
4986 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4869,14 +4990,14 @@ msgstr ""
4990 "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
4991 "录中，没有一个目标目录中包含多数文件。"
4992
4872 -#: merge-ort.c:2260 merge-recursive.c:2478
4993 +#: merge-ort.c:2310 merge-recursive.c:2481
4994 #, c-format
4995 msgid ""
4996 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4997 "renamed."
4998 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
4999
4879 -#: merge-ort.c:2400 merge-recursive.c:3261
5000 +#: merge-ort.c:2450 merge-recursive.c:3264
5001 #, c-format
5002 msgid ""
5003 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4884,7 +5005,7 @@ msgid ""
5005 msgstr ""
5006 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
5007
4887 -#: merge-ort.c:2407 merge-recursive.c:3268
5008 +#: merge-ort.c:2457 merge-recursive.c:3271
5009 #, c-format
5010 msgid ""
5011 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4893,7 +5014,7 @@ msgstr ""
5014 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
5015 "动到 %5$s。"
5016
4896 -#: merge-ort.c:2420 merge-recursive.c:3264
5017 +#: merge-ort.c:2470 merge-recursive.c:3267
5018 #, c-format
5019 msgid ""
5020 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4902,7 +5023,7 @@ msgstr ""
5023 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
5024 "到 %s。"
5025
4905 -#: merge-ort.c:2428 merge-recursive.c:3271
5026 +#: merge-ort.c:2478 merge-recursive.c:3274
5027 #, c-format
5028 msgid ""
5029 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4911,13 +5032,13 @@ msgstr ""
5032 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
5033 "建议将其移动到 %5$s。"
5034
4914 -#: merge-ort.c:2584
5035 +#: merge-ort.c:2634
5036 #, c-format
5037 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
5038 msgstr ""
5039 "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
5040
4920 -#: merge-ort.c:2679
5041 +#: merge-ort.c:2729
5042 #, c-format
5043 msgid ""
5044 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4927,29 +5048,29 @@ msgstr ""
5048 "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
5049 "可能导致嵌套的冲突标签。"
5050
4930 -#: merge-ort.c:2698 merge-ort.c:2722
5051 +#: merge-ort.c:2748 merge-ort.c:2772
5052 #, c-format
5053 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
5054 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
5055
4935 -#: merge-ort.c:3212 merge-recursive.c:3022
5056 +#: merge-ort.c:3261 merge-recursive.c:3025
5057 #, c-format
5058 msgid "cannot read object %s"
5059 msgstr "不能读取对象 %s"
5060
4940 -#: merge-ort.c:3215 merge-recursive.c:3025
5061 +#: merge-ort.c:3264 merge-recursive.c:3028
5062 #, c-format
5063 msgid "object %s is not a blob"
5064 msgstr "对象 %s 不是一个数据对象"
5065
4945 -#: merge-ort.c:3644
5066 +#: merge-ort.c:3693
5067 #, c-format
5068 msgid ""
5069 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
5070 "%s instead."
5071 msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
5072
4952 -#: merge-ort.c:3721
5073 +#: merge-ort.c:3770
5074 #, c-format
5075 msgid ""
5076 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4958,7 +5079,7 @@ msgstr ""
5079 "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
5080 "置。"
5081
4961 -#: merge-ort.c:3728
5082 +#: merge-ort.c:3777
5083 #, c-format
5084 msgid ""
5085 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4967,24 +5088,24 @@ msgstr ""
5088 "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
5089 "位置。"
5090
4970 -#: merge-ort.c:3819 merge-recursive.c:3101
5091 +#: merge-ort.c:3866 merge-recursive.c:3104
5092 msgid "content"
5093 msgstr "内容"
5094
4974 -#: merge-ort.c:3821 merge-recursive.c:3105
5095 +#: merge-ort.c:3868 merge-recursive.c:3108
5096 msgid "add/add"
5097 msgstr "添加/添加"
5098
4978 -#: merge-ort.c:3823 merge-recursive.c:3150
5099 +#: merge-ort.c:3870 merge-recursive.c:3153
5100 msgid "submodule"
5101 msgstr "子模组"
5102
4982 -#: merge-ort.c:3825 merge-recursive.c:3151
5103 +#: merge-ort.c:3872 merge-recursive.c:3154
5104 #, c-format
5105 msgid "CONFLICT (%s): Merge conflict in %s"
5106 msgstr "冲突（%s）：合并冲突于 %s"
5107
4987 -#: merge-ort.c:3869
5108 +#: merge-ort.c:3916
5109 #, c-format
5110 msgid ""
5111 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4993,7 +5114,7 @@ msgstr ""
5114 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
5115 "在树中被保留。"
5116
4996 -#: merge-ort.c:4165
5117 +#: merge-ort.c:4212
5118 #, c-format
5119 msgid ""
5120 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5003,12 +5124,12 @@ msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副
5124 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5125 #. base, and 2-3) the trees for the two trees we're merging.
5126 #.
5006 -#: merge-ort.c:4534
5127 +#: merge-ort.c:4586
5128 #, c-format
5129 msgid "collecting merge info failed for trees %s, %s, %s"
5130 msgstr "无法收集树 %s、%s、%s 的合并信息"
5131
5011 -#: merge-ort-wrappers.c:13 merge-recursive.c:3716
5132 +#: merge-ort-wrappers.c:13 merge-recursive.c:3723
5133 #, c-format
5134 msgid ""
5135 "Your local changes to the following files would be overwritten by merge:\n"
@@ -5017,7 +5138,7 @@ msgstr ""
5138 "您对下列文件的本地修改将被合并操作覆盖：\n"
5139 " %s"
5140
5020 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
5141 +#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
5142 msgid "Already up to date."
5143 msgstr "已经是最新的。"
5144
@@ -5054,7 +5175,7 @@ msgstr "：可能是一个目录/文件冲突？"
5175 msgid "refusing to lose untracked file at '%s'"
5176 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
5177
5057 -#: merge-recursive.c:956 builtin/cat-file.c:41
5178 +#: merge-recursive.c:956 builtin/cat-file.c:47
5179 #, c-format
5180 msgid "cannot read object %s '%s'"
5181 msgstr "不能读取对象 %s '%s'"
@@ -5079,41 +5200,41 @@ msgstr "无法创建符号链接 '%s'：%s"
5200 msgid "do not know what to do with %06o %s '%s'"
5201 msgstr "不知道如何处理 %06o %s '%s'"
5202
5082 -#: merge-recursive.c:1233 merge-recursive.c:1246
5203 +#: merge-recursive.c:1236 merge-recursive.c:1249
5204 #, c-format
5205 msgid "Fast-forwarding submodule %s to the following commit:"
5206 msgstr "子模组 %s 快进到如下提交："
5207
5087 -#: merge-recursive.c:1236 merge-recursive.c:1249
5208 +#: merge-recursive.c:1239 merge-recursive.c:1252
5209 #, c-format
5210 msgid "Fast-forwarding submodule %s"
5211 msgstr "快进子模组 %s"
5212
5092 -#: merge-recursive.c:1273
5213 +#: merge-recursive.c:1276
5214 #, c-format
5215 msgid "Failed to merge submodule %s (merge following commits not found)"
5216 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
5217
5097 -#: merge-recursive.c:1277
5218 +#: merge-recursive.c:1280
5219 #, c-format
5220 msgid "Failed to merge submodule %s (not fast-forward)"
5221 msgstr "无法合并子模组 %s（非快进）"
5222
5102 -#: merge-recursive.c:1278
5223 +#: merge-recursive.c:1281
5224 msgid "Found a possible merge resolution for the submodule:\n"
5225 msgstr "找到子模组的一个可能的合并方案：\n"
5226
5106 -#: merge-recursive.c:1290
5227 +#: merge-recursive.c:1293
5228 #, c-format
5229 msgid "Failed to merge submodule %s (multiple merges found)"
5230 msgstr "无法合并子模组 %s （发现多个合并）"
5231
5111 -#: merge-recursive.c:1434
5232 +#: merge-recursive.c:1437
5233 #, c-format
5234 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5235 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
5236
5116 -#: merge-recursive.c:1506
5237 +#: merge-recursive.c:1509
5238 #, c-format
5239 msgid ""
5240 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5122,7 +5243,7 @@ msgstr ""
5243 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5244 "本被保留。"
5245
5125 -#: merge-recursive.c:1511
5246 +#: merge-recursive.c:1514
5247 #, c-format
5248 msgid ""
5249 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5131,7 +5252,7 @@ msgstr ""
5252 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5253 "%7$s 版本被保留。"
5254
5134 -#: merge-recursive.c:1518
5255 +#: merge-recursive.c:1521
5256 #, c-format
5257 msgid ""
5258 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5140,7 +5261,7 @@ msgstr ""
5261 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5262 "本保留在 %8$s 中。"
5263
5143 -#: merge-recursive.c:1523
5264 +#: merge-recursive.c:1526
5265 #, c-format
5266 msgid ""
5267 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5149,60 +5270,60 @@ msgstr ""
5270 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5271 "%7$s 版本保留在 %9$s 中。"
5272
5152 -#: merge-recursive.c:1558
5273 +#: merge-recursive.c:1561
5274 msgid "rename"
5275 msgstr "重命名"
5276
5156 -#: merge-recursive.c:1558
5277 +#: merge-recursive.c:1561
5278 msgid "renamed"
5279 msgstr "重命名"
5280
5160 -#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
5281 +#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
5282 #, c-format
5283 msgid "Refusing to lose dirty file at %s"
5284 msgstr "拒绝丢失脏文件 '%s'"
5285
5165 -#: merge-recursive.c:1619
5286 +#: merge-recursive.c:1622
5287 #, c-format
5288 msgid "Refusing to lose untracked file at %s, even though it's in the way."
5289 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
5290
5170 -#: merge-recursive.c:1677
5291 +#: merge-recursive.c:1680
5292 #, c-format
5293 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5294 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5295
5175 -#: merge-recursive.c:1708
5296 +#: merge-recursive.c:1711
5297 #, c-format
5298 msgid "%s is a directory in %s adding as %s instead"
5299 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5300
5180 -#: merge-recursive.c:1713
5301 +#: merge-recursive.c:1716
5302 #, c-format
5303 msgid "Refusing to lose untracked file at %s; adding as %s instead"
5304 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
5305
5185 -#: merge-recursive.c:1740
5306 +#: merge-recursive.c:1743
5307 #, c-format
5308 msgid ""
5188 -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
5189 -"\"->\"%s\" in \"%s\"%s"
5309 +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
5310 +"\"%s\"->\"%s\" in \"%s\"%s"
5311 msgstr ""
5312 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
5313 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5314
5194 -#: merge-recursive.c:1745
5315 +#: merge-recursive.c:1748
5316 msgid " (left unresolved)"
5317 msgstr "（留下未解决）"
5318
5198 -#: merge-recursive.c:1837
5319 +#: merge-recursive.c:1840
5320 #, c-format
5321 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5322 msgstr ""
5202 -"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
5203 -"%5$s"
5323 +"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s-"
5324 +">%5$s"
5325
5205 -#: merge-recursive.c:2100
5326 +#: merge-recursive.c:2103
5327 #, c-format
5328 msgid ""
5329 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5212,7 +5333,7 @@ msgstr ""
5333 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
5334 "其它目录，没有目录包含大部分文件。"
5335
5215 -#: merge-recursive.c:2234
5336 +#: merge-recursive.c:2237
5337 #, c-format
5338 msgid ""
5339 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5221,78 +5342,78 @@ msgstr ""
5342 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
5343 "%4$s->%5$s"
5344
5224 -#: merge-recursive.c:3089
5345 +#: merge-recursive.c:3092
5346 msgid "modify"
5347 msgstr "修改"
5348
5228 -#: merge-recursive.c:3089
5349 +#: merge-recursive.c:3092
5350 msgid "modified"
5351 msgstr "修改"
5352
5232 -#: merge-recursive.c:3128
5353 +#: merge-recursive.c:3131
5354 #, c-format
5355 msgid "Skipped %s (merged same as existing)"
5356 msgstr "略过 %s（已经做过相同合并）"
5357
5237 -#: merge-recursive.c:3181
5358 +#: merge-recursive.c:3184
5359 #, c-format
5360 msgid "Adding as %s instead"
5361 msgstr "而是以 %s 为名添加"
5362
5242 -#: merge-recursive.c:3385
5363 +#: merge-recursive.c:3388
5364 #, c-format
5365 msgid "Removing %s"
5366 msgstr "删除 %s"
5367
5247 -#: merge-recursive.c:3408
5368 +#: merge-recursive.c:3411
5369 msgid "file/directory"
5370 msgstr "文件/目录"
5371
5251 -#: merge-recursive.c:3413
5372 +#: merge-recursive.c:3416
5373 msgid "directory/file"
5374 msgstr "目录/文件"
5375
5255 -#: merge-recursive.c:3420
5376 +#: merge-recursive.c:3423
5377 #, c-format
5378 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5379 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
5380
5260 -#: merge-recursive.c:3429
5381 +#: merge-recursive.c:3432
5382 #, c-format
5383 msgid "Adding %s"
5384 msgstr "添加 %s"
5385
5265 -#: merge-recursive.c:3438
5386 +#: merge-recursive.c:3441
5387 #, c-format
5388 msgid "CONFLICT (add/add): Merge conflict in %s"
5389 msgstr "冲突（add/add）：合并冲突于 %s"
5390
5270 -#: merge-recursive.c:3491
5391 +#: merge-recursive.c:3494
5392 #, c-format
5393 msgid "merging of trees %s and %s failed"
5394 msgstr "无法合并树 %s 和 %s"
5395
5275 -#: merge-recursive.c:3585
5396 +#: merge-recursive.c:3588
5397 msgid "Merging:"
5398 msgstr "合并："
5399
5279 -#: merge-recursive.c:3598
5400 +#: merge-recursive.c:3601
5401 #, c-format
5402 msgid "found %u common ancestor:"
5403 msgid_plural "found %u common ancestors:"
5404 msgstr[0] "发现 %u 个共同祖先："
5405 msgstr[1] "发现 %u 个共同祖先："
5406
5286 -#: merge-recursive.c:3648
5407 +#: merge-recursive.c:3651
5408 msgid "merge returned no commit"
5409 msgstr "合并未返回提交"
5410
5290 -#: merge-recursive.c:3816
5411 +#: merge-recursive.c:3823
5412 #, c-format
5413 msgid "Could not parse object '%s'"
5414 msgstr "不能解析对象 '%s'"
5415
5295 -#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
5416 +#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
5417 #: builtin/stash.c:489
5418 msgid "Unable to write index."
5419 msgstr "不能写入索引。"
@@ -5301,221 +5422,225 @@ msgstr "不能写入索引。"
5422 msgid "failed to read the cache"
5423 msgstr "无法读取缓存"
5424
5304 -#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
5305 -#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
5425 +#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
5426 +#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
5427 #: builtin/stash.c:269
5428 msgid "unable to write new index file"
5429 msgstr "无法写新的索引文件"
5430
5310 -#: midx.c:78
5431 +#: midx.c:79
5432 msgid "multi-pack-index OID fanout is of the wrong size"
5433 msgstr "多包索引的对象ID扇出表大小错误"
5434
5314 -#: midx.c:111
5435 +#: midx.c:112

This file is too large to show in full.