1 # Chinese translations for Git package
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
9 # - Lian Cheng <rhythm.mail AT gmail.com>
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2013-02-14 14:46+0800\n"
16 "PO-Revision-Date: 2013-02-14 17:43+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
38 "appropriate to mark resolution and make a commit,\n"
39 "or use 'git commit -a'."
42 "'git add/rm <file>' 标记解决方案,\n"
43 "或使用 'git commit -a'。"
46 msgid "git archive [options] <tree-ish> [<path>...]"
47 msgstr "git archive [选项] <树或提交> [<路径>...]"
50 msgid "git archive --list"
51 msgstr "git archive --list"
55 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
57 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
60 msgid "git archive --remote <repo> [--exec <cmd>] --list"
61 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
68 msgid "archive format"
71 #: archive.c:324 builtin/log.c:1115
76 msgid "prepend prefix to each pathname in the archive"
77 msgstr "为归档中每个路径名加上前缀"
79 #: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366
80 #: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653
81 #: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77
82 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536
83 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
87 #: archive.c:327 builtin/archive.c:92
88 msgid "write the archive to this file"
92 msgid "read .gitattributes in working directory"
93 msgstr "读取工作区中的 .gitattributes"
96 msgid "report archived files on stderr"
104 msgid "compress faster"
108 msgid "compress better"
112 msgid "list supported archive formats"
115 #: archive.c:345 builtin/archive.c:93 builtin/clone.c:85
119 #: archive.c:346 builtin/archive.c:94
120 msgid "retrieve the archive from remote repository <repo>"
121 msgstr "从远程版本库(<版本库>)提取归档文件"
123 #: archive.c:347 builtin/archive.c:95 builtin/notes.c:615
127 #: archive.c:348 builtin/archive.c:96
128 msgid "path to the remote git-upload-archive command"
129 msgstr "远程 git-upload-archive 命令的路径"
133 "Negative patterns are forbidden in git attributes\n"
134 "Use '\\!' for literal leading exclamation."
136 "在 git attributes 中不允许使用负值模版\n"
137 "当字符串确实要以感叹号开始时,使用 '\\!'。"
141 msgid "'%s' does not look like a v2 bundle file"
142 msgstr "'%s' 不像是一个 v2 版本的包文件"
146 msgid "unrecognized header: %s%s (%d)"
147 msgstr "未能识别的包头:%s%s (%d)"
149 #: bundle.c:89 builtin/commit.c:674
151 msgid "could not open '%s'"
155 msgid "Repository lacks these prerequisite commits:"
156 msgstr "版本库缺少这些必备的提交:"
158 #: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299
159 #: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347
160 #: builtin/shortlog.c:157
161 msgid "revision walk setup failed"
166 msgid "The bundle contains %d ref"
167 msgid_plural "The bundle contains %d refs"
168 msgstr[0] "这个包中含有 %d 个引用"
169 msgstr[1] "这个包中含有 %d 个引用"
172 msgid "The bundle records a complete history."
173 msgstr "这个包记录一个完整历史。"
177 msgid "The bundle requires this ref"
178 msgid_plural "The bundle requires these %d refs"
179 msgstr[0] "这个包需要这个引用"
180 msgstr[1] "这个包需要 %d 个这些引用"
183 msgid "rev-list died"
186 #: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260
188 msgid "unrecognized argument: %s"
193 msgid "ref '%s' is excluded by the rev-list options"
194 msgstr "引用 '%s' 被 rev-list 选项排除"
197 msgid "Refusing to create empty bundle."
201 msgid "Could not spawn pack-objects"
202 msgstr "不能生成 pack-objects 进程"
205 msgid "pack-objects died"
206 msgstr "pack-objects 终止"
210 msgid "cannot create '%s'"
214 msgid "index-pack died"
215 msgstr "index-pack 终止"
219 msgid "could not parse %s"
224 msgid "%s %s is not a commit!"
225 msgstr "%s %s 不是一个提交!"
227 #: compat/obstack.c:406 compat/obstack.c:408
228 msgid "memory exhausted"
232 msgid "Could not run 'git rev-list'"
233 msgstr "不能执行 'git rev-list'"
237 msgid "failed write to rev-list: %s"
238 msgstr "无法写入 rev-list:%s"
242 msgid "failed to close rev-list's stdin: %s"
243 msgstr "无法关闭 rev-list 的标准输入:%s"
246 msgid "in the future"
251 msgid "%lu second ago"
252 msgid_plural "%lu seconds ago"
258 msgid "%lu minute ago"
259 msgid_plural "%lu minutes ago"
266 msgid_plural "%lu hours ago"
273 msgid_plural "%lu days ago"
280 msgid_plural "%lu weeks ago"
286 msgid "%lu month ago"
287 msgid_plural "%lu months ago"
294 msgid_plural "%lu years"
300 msgid "%s, %lu month ago"
301 msgid_plural "%s, %lu months ago"
302 msgstr[0] "%s,%lu 个月之前"
303 msgstr[1] "%s,%lu 个月之前"
305 #: date.c:154 date.c:159
308 msgid_plural "%lu years ago"
315 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
316 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
321 msgid " Unknown dirstat parameter '%s'\n"
322 msgstr " 未知的 dirstat 参数 '%s'\n"
326 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
327 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
332 "Found errors in 'diff.dirstat' config variable:\n"
335 "发现配置变量 'diff.dirstat' 中的错误:\n"
341 "Failed to parse --dirstat/-X option parameter:\n"
344 "无法解析 --dirstat/-X 选项的参数:\n"
349 msgid "Failed to parse --submodule option parameter: '%s'"
350 msgstr "无法解析 --submodule 选项的参数:'%s'"
352 #: gpg-interface.c:59 gpg-interface.c:127
353 msgid "could not run gpg."
356 #: gpg-interface.c:71
357 msgid "gpg did not accept the data"
360 #: gpg-interface.c:82
361 msgid "gpg failed to sign the data"
364 #: gpg-interface.c:112
366 msgid "could not create temporary file '%s': %s"
367 msgstr "不能创建临时文件 '%s':%s"
369 #: gpg-interface.c:115
371 msgid "failed writing detached signature to '%s': %s"
372 msgstr "无法将分离式签名写入 '%s':%s"
376 msgid "'%s': unable to read %s"
377 msgstr "'%s':无法读取 %s"
386 msgid "'%s': short read %s"
387 msgstr "'%s':读取不完整 %s"
391 msgid "available git commands in '%s'"
392 msgstr "在 '%s' 下可用的 git 命令"
395 msgid "git commands available from elsewhere on your $PATH"
396 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
399 msgid "The most commonly used git commands are:"
400 msgstr "最常用的 git 命令有:"
405 "'%s' appears to be a git command, but we were not\n"
406 "able to execute it. Maybe git-%s is broken?"
408 "'%s' 像是一个 git 命令,但却无法运行。\n"
412 msgid "Uh oh. Your system reports no Git commands at all."
413 msgstr "唉呀,您的系统中未发现 Git 命令。"
418 "WARNING: You called a Git command named '%s', which does not exist.\n"
419 "Continuing under the assumption that you meant '%s'"
421 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
426 msgid "in %0.1f seconds automatically..."
427 msgstr "在 %0.1f 秒钟后自动运行..."
431 msgid "git: '%s' is not a git command. See 'git --help'."
432 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
440 "Did you mean one of these?"
449 msgid "failed to read the cache"
452 #: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534
453 #: builtin/clone.c:586
454 msgid "unable to write new index file"
457 #: merge-recursive.c:190
459 msgid "(bad commit)\n"
462 #: merge-recursive.c:206
464 msgid "addinfo_cache failed for path '%s'"
465 msgstr "为路径 '%s' addinfo_cache 失败"
467 #: merge-recursive.c:268
468 msgid "error building trees"
471 #: merge-recursive.c:672
473 msgid "failed to create path '%s'%s"
474 msgstr "无法创建路径 '%s'%s"
476 #: merge-recursive.c:683
478 msgid "Removing %s to make room for subdirectory\n"
479 msgstr "删除 %s 以便为子目录留出空间\n"
481 #. something else exists
482 #. .. but not some other error (who really cares what?)
483 #: merge-recursive.c:697 merge-recursive.c:718
484 msgid ": perhaps a D/F conflict?"
485 msgstr ":可能是一个目录/文件冲突?"
487 #: merge-recursive.c:708
489 msgid "refusing to lose untracked file at '%s'"
490 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
492 #: merge-recursive.c:748
494 msgid "cannot read object %s '%s'"
495 msgstr "不能读取对象 %s '%s'"
497 #: merge-recursive.c:750
499 msgid "blob expected for %s '%s'"
500 msgstr "%s '%s' 应为数据(blob)对象"
502 #: merge-recursive.c:773 builtin/clone.c:302
504 msgid "failed to open '%s'"
507 #: merge-recursive.c:781
509 msgid "failed to symlink '%s'"
510 msgstr "无法创建符号链接 '%s'"
512 #: merge-recursive.c:784
514 msgid "do not know what to do with %06o %s '%s'"
515 msgstr "不知道如何处理 %06o %s '%s'"
517 #: merge-recursive.c:922
518 msgid "Failed to execute internal merge"
521 #: merge-recursive.c:926
523 msgid "Unable to add %s to database"
524 msgstr "不能添加 %s 至对象库"
526 #: merge-recursive.c:942
527 msgid "unsupported object type in the tree"
528 msgstr "在树中有不支持的对象类型"
530 #: merge-recursive.c:1021 merge-recursive.c:1035
533 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
536 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
539 #: merge-recursive.c:1027 merge-recursive.c:1040
542 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
545 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
548 #: merge-recursive.c:1081
552 #: merge-recursive.c:1081
556 #: merge-recursive.c:1137
558 msgid "%s is a directory in %s adding as %s instead"
559 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
561 #: merge-recursive.c:1159
564 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
565 "\"->\"%s\" in \"%s\"%s"
567 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
568 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
570 #: merge-recursive.c:1164
571 msgid " (left unresolved)"
574 #: merge-recursive.c:1218
576 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
578 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
581 #: merge-recursive.c:1248
583 msgid "Renaming %s to %s and %s to %s instead"
584 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
586 #: merge-recursive.c:1447
588 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
589 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
591 #: merge-recursive.c:1457
593 msgid "Adding merged %s"
596 #: merge-recursive.c:1462 merge-recursive.c:1660
598 msgid "Adding as %s instead"
601 #: merge-recursive.c:1513
603 msgid "cannot read object %s"
606 #: merge-recursive.c:1516
608 msgid "object %s is not a blob"
609 msgstr "对象 %s 不是一个数据(blob)对象"
611 #: merge-recursive.c:1564
615 #: merge-recursive.c:1564
619 #: merge-recursive.c:1574
623 #: merge-recursive.c:1581
627 #: merge-recursive.c:1615
629 msgid "Skipped %s (merged same as existing)"
630 msgstr "略过 %s(已经做过相同合并)"
632 #: merge-recursive.c:1629
634 msgid "Auto-merging %s"
637 #: merge-recursive.c:1633 git-submodule.sh:942
641 #: merge-recursive.c:1634
643 msgid "CONFLICT (%s): Merge conflict in %s"
644 msgstr "冲突(%s):合并冲突于 %s"
646 #: merge-recursive.c:1724
651 #: merge-recursive.c:1749
652 msgid "file/directory"
655 #: merge-recursive.c:1755
656 msgid "directory/file"
659 #: merge-recursive.c:1760
661 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
662 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
664 #: merge-recursive.c:1770
669 #: merge-recursive.c:1787
670 msgid "Fatal merge failure, shouldn't happen."
671 msgstr "严重的合并错误,不应发生。"
673 #: merge-recursive.c:1806
674 msgid "Already up-to-date!"
677 #: merge-recursive.c:1815
679 msgid "merging of trees %s and %s failed"
680 msgstr "无法合并树 %s 和 %s"
682 #: merge-recursive.c:1845
684 msgid "Unprocessed path??? %s"
685 msgstr "未处理的路径??? %s"
687 #: merge-recursive.c:1890
691 #: merge-recursive.c:1903
693 msgid "found %u common ancestor:"
694 msgid_plural "found %u common ancestors:"
695 msgstr[0] "发现 %u 个共同祖先:"
696 msgstr[1] "发现 %u 个共同祖先:"
698 #: merge-recursive.c:1940
699 msgid "merge returned no commit"
702 #: merge-recursive.c:1997
704 msgid "Could not parse object '%s'"
707 #: merge-recursive.c:2009 builtin/merge.c:643
708 msgid "Unable to write index."
711 #: parse-options.c:485
715 #: parse-options.c:503
720 #. TRANSLATORS: the colon here should align with the
721 #. one in "usage: %s" translation
722 #: parse-options.c:507
727 # 译者:为保证在输出中对齐,注意调整句中空格!
728 #: parse-options.c:510
735 msgid "Path '%s' is in submodule '%.*s'"
736 msgstr "路径 '%s' 属于模组 '%.*s'"
740 msgid "'%s' is beyond a symbolic link"
741 msgstr "'%s' 位于符号链接中"
745 msgid "Your branch is ahead of '%s' by %d commit.\n"
746 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
747 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
748 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
751 msgid " (use \"git push\" to publish your local commits)\n"
752 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
756 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
758 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
759 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
760 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
764 msgid " (use \"git pull\" to update your local branch)\n"
765 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
770 "Your branch and '%s' have diverged,\n"
771 "and have %d and %d different commit each, respectively.\n"
773 "Your branch and '%s' have diverged,\n"
774 "and have %d and %d different commits each, respectively.\n"
776 "您的分支和 '%s' 出现了偏离,\n"
777 "并且分别有 %d 和 %d 处不同的提交。\n"
779 "您的分支和 '%s' 出现了偏离,\n"
780 "并且分别有 %d 和 %d 处不同的提交。\n"
784 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
785 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
787 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
788 #: builtin/merge.c:994
790 msgid "Could not open '%s' for writing"
791 msgstr "不能为写入打开 '%s'"
793 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
794 #: builtin/merge.c:999
796 msgid "Could not write to '%s'"
801 "after resolving the conflicts, mark the corrected paths\n"
802 "with 'git add <paths>' or 'git rm <paths>'"
804 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
809 "after resolving the conflicts, mark the corrected paths\n"
810 "with 'git add <paths>' or 'git rm <paths>'\n"
811 "and commit the result with 'git commit'"
813 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
814 "对修正后的文件做标记,然后用 'git commit' 提交"
816 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
818 msgid "Could not write to %s"
823 msgid "Error wrapping up %s"
827 msgid "Your local changes would be overwritten by cherry-pick."
828 msgstr "您的本地修改将被拣选操作覆盖。"
831 msgid "Your local changes would be overwritten by revert."
832 msgstr "您的本地修改将被还原操作覆盖。"
835 msgid "Commit your changes or stash them to proceed."
836 msgstr "提交您的修改或保存进度后再继续。"
838 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
841 msgid "%s: Unable to write new index file"
842 msgstr "%s:无法写入新索引文件"
845 msgid "Could not resolve HEAD commit\n"
846 msgstr "不能解析 HEAD 提交\n"
849 msgid "Unable to update cache tree\n"
854 msgid "Could not parse commit %s\n"
859 msgid "Could not parse parent commit %s\n"
860 msgstr "不能解析父提交 %s\n"
863 msgid "Your index file is unmerged."
864 msgstr "您的索引文件未完成合并。"
868 msgid "Commit %s is a merge but no -m option was given."
869 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
873 msgid "Commit %s does not have parent %d"
874 msgstr "提交 %s 没有父提交 %d"
878 msgid "Mainline was specified but commit %s is not a merge."
879 msgstr "指定了主线但提交 %s 不是一个合并。"
881 #. TRANSLATORS: The first %s will be "revert" or
882 #. "cherry-pick", the second %s a SHA1
885 msgid "%s: cannot parse parent commit %s"
886 msgstr "%s:不能解析父提交 %s"
890 msgid "Cannot get commit message for %s"
891 msgstr "不能得到 %s 的提交说明"
895 msgid "could not revert %s... %s"
896 msgstr "不能还原 %s... %s"
900 msgid "could not apply %s... %s"
901 msgstr "不能应用 %s... %s"
904 msgid "empty commit set passed"
909 msgid "git %s: failed to read the index"
910 msgstr "git %s:无法读取索引"
914 msgid "git %s: failed to refresh the index"
915 msgstr "git %s:无法刷新索引"
919 msgid "Cannot %s during a %s"
920 msgstr "无法 %s 在一个 %s 过程中"
924 msgid "Could not parse line %d."
928 msgid "No commits parsed."
933 msgid "Could not open %s"
938 msgid "Could not read %s."
943 msgid "Unusable instruction sheet: %s"
948 msgid "Invalid key: %s"
953 msgid "Invalid value for %s: %s"
958 msgid "Malformed options sheet: %s"
962 msgid "a cherry-pick or revert is already in progress"
963 msgstr "一个拣选或还原操作已在进行"
966 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
967 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
971 msgid "Could not create sequencer directory %s"
974 #: sequencer.c:776 sequencer.c:861
976 msgid "Error wrapping up %s."
979 #: sequencer.c:795 sequencer.c:929
980 msgid "no cherry-pick or revert in progress"
984 msgid "cannot resolve HEAD"
988 msgid "cannot abort from a branch yet to be born"
989 msgstr "不能从尚未建立的分支终止"
991 #: sequencer.c:821 builtin/apply.c:4020
993 msgid "cannot open %s: %s"
998 msgid "cannot read %s: %s"
1002 msgid "unexpected end of file"
1007 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1008 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1012 msgid "Could not format %s."
1016 msgid "Can't revert as initial commit"
1020 msgid "Can't cherry-pick into empty head"
1024 msgid "HEAD does not point to a branch"
1025 msgstr "HEAD 没有指向一个分支"
1029 msgid "No such branch: '%s'"
1034 msgid "No upstream configured for branch '%s'"
1035 msgstr "尚未给分支 '%s' 设置上游"
1039 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1040 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1044 msgid "unable to access '%s': %s"
1045 msgstr "不能访问 '%s':%s"
1049 msgid "unable to access '%s'"
1054 msgid "unable to look up current user in the passwd file: %s"
1055 msgstr "无法在口令文件中查询到当前用户:%s"
1058 msgid "no such user"
1062 msgid "Unmerged paths:"
1066 #: wt-status.c:167 wt-status.c:194
1068 msgid " (use \"git reset %s <file>...\" to unstage)"
1069 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1072 #: wt-status.c:169 wt-status.c:196
1073 msgid " (use \"git rm --cached <file>...\" to unstage)"
1074 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1078 msgid " (use \"git add <file>...\" to mark resolution)"
1079 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1082 #: wt-status.c:175 wt-status.c:179
1083 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1084 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1088 msgid " (use \"git rm <file>...\" to mark resolution)"
1089 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1092 msgid "Changes to be committed:"
1096 msgid "Changes not staged for commit:"
1097 msgstr "尚未暂存以备提交的变更:"
1101 msgid " (use \"git add <file>...\" to update what will be committed)"
1102 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1106 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1107 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1112 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1113 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1117 msgid " (commit or discard the untracked or modified content in submodules)"
1118 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1123 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1124 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1131 msgid "both deleted:"
1135 msgid "added by us:"
1139 msgid "deleted by them:"
1143 msgid "added by them:"
1147 msgid "deleted by us:"
1155 msgid "both modified:"
1158 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1160 msgid "new commits, "
1163 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1165 msgid "modified content, "
1168 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1170 msgid "untracked content, "
1173 # 译者:为保证在输出中对齐,注意调整句中空格!
1176 msgid "new file: %s"
1179 # 译者:为保证在输出中对齐,注意调整句中空格!
1182 msgid "copied: %s -> %s"
1183 msgstr "拷贝: %s -> %s"
1185 # 译者:为保证在输出中对齐,注意调整句中空格!
1191 # 译者:为保证在输出中对齐,注意调整句中空格!
1194 msgid "modified: %s"
1197 # 译者:为保证在输出中对齐,注意调整句中空格!
1200 msgid "renamed: %s -> %s"
1201 msgstr "重命名: %s -> %s"
1203 # 译者:为保证在输出中对齐,注意调整句中空格!
1206 msgid "typechange: %s"
1209 # 译者:为保证在输出中对齐,注意调整句中空格!
1215 # 译者:为保证在输出中对齐,注意调整句中空格!
1218 msgid "unmerged: %s"
1223 msgid "bug: unhandled diff status %c"
1224 msgstr "bug:未处理的差异状态 %c"
1227 msgid "You have unmerged paths."
1231 #: wt-status.c:792 wt-status.c:916
1232 msgid " (fix conflicts and run \"git commit\")"
1233 msgstr " (解决冲突并运行 \"git commit\")"
1236 msgid "All conflicts fixed but you are still merging."
1237 msgstr "所有冲突已解决但您仍处于合并中。"
1241 msgid " (use \"git commit\" to conclude merge)"
1242 msgstr " (使用 \"git commit\" 结束合并)"
1245 msgid "You are in the middle of an am session."
1246 msgstr "您正处于一个 am 过程中。"
1249 msgid "The current patch is empty."
1254 msgid " (fix conflicts and then run \"git am --resolved\")"
1255 msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1259 msgid " (use \"git am --skip\" to skip this patch)"
1260 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1264 msgid " (use \"git am --abort\" to restore the original branch)"
1265 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1267 #: wt-status.c:877 wt-status.c:887
1268 msgid "You are currently rebasing."
1273 msgid " (fix conflicts and then run \"git rebase --continue\")"
1274 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1278 msgid " (use \"git rebase --skip\" to skip this patch)"
1279 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1283 msgid " (use \"git rebase --abort\" to check out the original branch)"
1284 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1288 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1289 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1292 msgid "You are currently splitting a commit during a rebase."
1293 msgstr "您正在变基过程中拆分一个提交。"
1297 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1298 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1301 msgid "You are currently editing a commit during a rebase."
1302 msgstr "您正在变基过程中编辑一个提交。"
1306 msgid " (use \"git commit --amend\" to amend the current commit)"
1307 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1312 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1313 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1316 msgid "You are currently cherry-picking."
1321 msgid " (all conflicts fixed: run \"git commit\")"
1322 msgstr " (解决所有冲突后,执行 \"git commit\")"
1325 msgid "You are currently bisecting."
1330 msgid " (use \"git bisect reset\" to get back to the original branch)"
1331 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1338 msgid "Not currently on any branch."
1342 msgid "Initial commit"
1346 msgid "Untracked files"
1350 msgid "Ignored files"
1355 msgid "Untracked files not listed%s"
1356 msgstr "未跟踪的文件没有列出%s"
1358 # 译者:中文字符串拼接,可删除前导空格
1360 msgid " (use -u option to show untracked files)"
1361 msgstr "(使用 -u 参数显示未跟踪的文件)"
1367 # 译者:中文字符串拼接,可删除前导空格
1370 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1371 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1375 msgid "no changes added to commit\n"
1381 "nothing added to commit but untracked files present (use \"git add\" to "
1383 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1387 msgid "nothing added to commit but untracked files present\n"
1388 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1390 # 译者:中文字符串拼接,可删除前导空格
1393 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1394 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1396 #: wt-status.c:1047 wt-status.c:1052
1398 msgid "nothing to commit\n"
1401 # 译者:中文字符串拼接,可删除前导空格
1404 msgid "nothing to commit (use -u to show untracked files)\n"
1405 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1407 # 译者:中文字符串拼接,可删除前导空格
1410 msgid "nothing to commit, working directory clean\n"
1411 msgstr "无文件要提交,干净的工作区\n"
1414 msgid "HEAD (no branch)"
1419 msgid "Initial commit on "
1428 #: wt-status.c:1186 wt-status.c:1189
1437 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1439 msgid "failed to unlink '%s'"
1443 msgid "git add [options] [--] <pathspec>..."
1444 msgstr "git add [选项] [--] <路径匹配>..."
1448 msgid "unexpected diff status %c"
1451 #: builtin/add.c:68 builtin/commit.c:231
1452 msgid "updating files failed"
1457 msgid "remove '%s'\n"
1460 #: builtin/add.c:148
1461 msgid "Unstaged changes after refreshing the index:"
1462 msgstr "刷新索引之后尚未被暂存的变更:"
1464 #: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1466 msgid "pathspec '%s' did not match any files"
1467 msgstr "路径 '%s' 未匹配任何文件"
1469 #: builtin/add.c:234
1470 msgid "Could not read the index"
1473 #: builtin/add.c:244
1475 msgid "Could not open '%s' for writing."
1476 msgstr "不能打开 '%s' 以写入。"
1478 #: builtin/add.c:248
1479 msgid "Could not write patch"
1482 #: builtin/add.c:253
1484 msgid "Could not stat '%s'"
1485 msgstr "不能查看文件状态 '%s'"
1487 #: builtin/add.c:255
1488 msgid "Empty patch. Aborted."
1491 #: builtin/add.c:261
1493 msgid "Could not apply '%s'"
1496 #: builtin/add.c:271
1497 msgid "The following paths are ignored by one of your .gitignore files:\n"
1498 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1500 #: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1501 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1506 #: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19
1507 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1508 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
1512 #: builtin/add.c:280
1513 msgid "interactive picking"
1516 #: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
1517 msgid "select hunks interactively"
1520 #: builtin/add.c:282
1521 msgid "edit current diff and apply"
1524 #: builtin/add.c:283
1525 msgid "allow adding otherwise ignored files"
1528 #: builtin/add.c:284
1529 msgid "update tracked files"
1532 #: builtin/add.c:285
1533 msgid "record only the fact that the path will be added later"
1534 msgstr "只记录,该路径稍后再添加"
1536 #: builtin/add.c:286
1537 msgid "add changes from all tracked and untracked files"
1538 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1540 #: builtin/add.c:287
1541 msgid "don't add, only refresh the index"
1544 #: builtin/add.c:288
1545 msgid "just skip files which cannot be added because of errors"
1546 msgstr "跳过因出错不能添加的文件"
1548 #: builtin/add.c:289
1549 msgid "check if - even missing - files are ignored in dry run"
1550 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1552 #: builtin/add.c:311
1554 msgid "Use -f if you really want to add them.\n"
1555 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1557 #: builtin/add.c:312
1558 msgid "no files added"
1561 #: builtin/add.c:318
1562 msgid "adding files failed"
1565 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1567 #. * To be consistent with "git add -p" and most Git
1568 #. * commands, we should default to being tree-wide, but
1569 #. * this is not the original behavior and can't be
1570 #. * changed until users trained themselves not to type
1571 #. * "git add -u" or "git add -A". For now, we warn and
1572 #. * keep the old behavior. Later, this warning can be
1573 #. * turned into a die(...), and eventually we may
1574 #. * reallow the command with a new behavior.
1576 #: builtin/add.c:335
1579 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1580 "subdirectory of the tree will change in Git 2.0 and should not be used "
1582 "To add content for the whole tree, run:\n"
1585 " (or git add %s :/)\n"
1587 "To restrict the command to the current directory, run:\n"
1590 " (or git add %s .)\n"
1592 "With the current Git version, the command is restricted to the current "
1595 "在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1596 "命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1597 "如果要添加整个目录树的内容,执行:\n"
1600 " (或 git add %s :/)\n"
1602 "如果要限制该命令只作用于当前目录,执行:\n"
1605 " (或 git add %s .)\n"
1607 "对于当前版本的 Git,这条命令只作用于当前目录。"
1609 #: builtin/add.c:381
1610 msgid "-A and -u are mutually incompatible"
1611 msgstr "-A 和 -u 选项互斥"
1613 #: builtin/add.c:383
1614 msgid "Option --ignore-missing can only be used together with --dry-run"
1615 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1617 #: builtin/add.c:414
1619 msgid "Nothing specified, nothing added.\n"
1620 msgstr "没有指定文件,也没有文件被添加。\n"
1622 #: builtin/add.c:415
1624 msgid "Maybe you wanted to say 'git add .'?\n"
1625 msgstr "也许您想要执行 'git add .'?\n"
1627 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1628 #: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
1629 msgid "index file corrupt"
1632 #: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370
1633 msgid "Unable to write new index file"
1636 #: builtin/apply.c:57
1637 msgid "git apply [options] [<patch>...]"
1638 msgstr "git apply [选项] [<补丁>...]"
1640 #: builtin/apply.c:110
1642 msgid "unrecognized whitespace option '%s'"
1643 msgstr "未能识别的空白字符选项 '%s'"
1645 #: builtin/apply.c:125
1647 msgid "unrecognized whitespace ignore option '%s'"
1648 msgstr "未能识别的空白字符忽略选项 '%s'"
1650 #: builtin/apply.c:823
1652 msgid "Cannot prepare timestamp regexp %s"
1653 msgstr "无法准备时间戳正则表达式 %s"
1655 #: builtin/apply.c:832
1657 msgid "regexec returned %d for input: %s"
1658 msgstr "regexec 返回 %d,输入为:%s"
1660 #: builtin/apply.c:913
1662 msgid "unable to find filename in patch at line %d"
1663 msgstr "不能在补丁的第 %d 行找到文件名"
1665 #: builtin/apply.c:945
1667 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1668 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1670 #: builtin/apply.c:949
1672 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1673 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1675 #: builtin/apply.c:950
1677 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1678 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1680 #: builtin/apply.c:957
1682 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1683 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1685 #: builtin/apply.c:1422
1687 msgid "recount: unexpected line: %.*s"
1688 msgstr "recount:意外的行:%.*s"
1690 #: builtin/apply.c:1479
1692 msgid "patch fragment without header at line %d: %.*s"
1693 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1695 #: builtin/apply.c:1496
1698 "git diff header lacks filename information when removing %d leading pathname "
1699 "component (line %d)"
1701 "git diff header lacks filename information when removing %d leading pathname "
1702 "components (line %d)"
1703 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1704 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1706 #: builtin/apply.c:1656
1707 msgid "new file depends on old contents"
1710 #: builtin/apply.c:1658
1711 msgid "deleted file still has contents"
1714 #: builtin/apply.c:1684
1716 msgid "corrupt patch at line %d"
1717 msgstr "补丁在第 %d 行损坏"
1719 #: builtin/apply.c:1720
1721 msgid "new file %s depends on old contents"
1722 msgstr "新文件 %s 依赖旧内容"
1724 #: builtin/apply.c:1722
1726 msgid "deleted file %s still has contents"
1727 msgstr "删除的文件 %s 仍有内容"
1729 #: builtin/apply.c:1725
1731 msgid "** warning: file %s becomes empty but is not deleted"
1732 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1734 #: builtin/apply.c:1871
1736 msgid "corrupt binary patch at line %d: %.*s"
1737 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1739 #. there has to be one hunk (forward hunk)
1740 #: builtin/apply.c:1900
1742 msgid "unrecognized binary patch at line %d"
1743 msgstr "未能识别的二进制补丁位于第 %d 行"
1745 #: builtin/apply.c:1986
1747 msgid "patch with only garbage at line %d"
1748 msgstr "补丁文件的第 %d 行只有垃圾数据"
1750 #: builtin/apply.c:2076
1752 msgid "unable to read symlink %s"
1753 msgstr "无法读取符号链接 %s"
1755 #: builtin/apply.c:2080
1757 msgid "unable to open or read %s"
1760 #: builtin/apply.c:2684
1762 msgid "invalid start of line: '%c'"
1763 msgstr "无效的行首字符:'%c'"
1765 #: builtin/apply.c:2802
1767 msgid "Hunk #%d succeeded at %d (offset %d line)."
1768 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1769 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1770 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1772 #: builtin/apply.c:2814
1774 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1775 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1777 #: builtin/apply.c:2820
1780 "while searching for:\n"
1786 #: builtin/apply.c:2839
1788 msgid "missing binary patch data for '%s'"
1789 msgstr "缺失 '%s' 的二进制补丁数据"
1791 #: builtin/apply.c:2942
1793 msgid "binary patch does not apply to '%s'"
1794 msgstr "二进制补丁未应用到 '%s'"
1796 #: builtin/apply.c:2948
1798 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1799 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1801 #: builtin/apply.c:2969
1803 msgid "patch failed: %s:%ld"
1804 msgstr "打补丁失败:%s:%ld"
1806 #: builtin/apply.c:3091
1808 msgid "cannot checkout %s"
1811 #: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
1813 msgid "read of %s failed"
1816 #: builtin/apply.c:3169 builtin/apply.c:3391
1818 msgid "path %s has been renamed/deleted"
1819 msgstr "路径 %s 已经被重命名/删除"
1821 #: builtin/apply.c:3250 builtin/apply.c:3405
1823 msgid "%s: does not exist in index"
1826 #: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
1831 #: builtin/apply.c:3259 builtin/apply.c:3413
1833 msgid "%s: does not match index"
1836 #: builtin/apply.c:3361
1837 msgid "removal patch leaves file contents"
1838 msgstr "移除补丁仍留下了文件内容"
1840 #: builtin/apply.c:3430
1842 msgid "%s: wrong type"
1845 #: builtin/apply.c:3432
1847 msgid "%s has type %o, expected %o"
1848 msgstr "%s 的类型是 %o,应为 %o"
1850 #: builtin/apply.c:3533
1852 msgid "%s: already exists in index"
1853 msgstr "%s:已经存在于索引中"
1855 #: builtin/apply.c:3536
1857 msgid "%s: already exists in working directory"
1858 msgstr "%s:已经存在于工作区中"
1860 #: builtin/apply.c:3556
1862 msgid "new mode (%o) of %s does not match old mode (%o)"
1863 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1865 #: builtin/apply.c:3561
1867 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1868 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1870 #: builtin/apply.c:3569
1872 msgid "%s: patch does not apply"
1875 #: builtin/apply.c:3582
1877 msgid "Checking patch %s..."
1880 #: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124
1882 msgid "make_cache_entry failed for path '%s'"
1883 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1885 #: builtin/apply.c:3782
1887 msgid "unable to remove %s from index"
1888 msgstr "不能从索引中移除 %s"
1890 #: builtin/apply.c:3810
1892 msgid "corrupt patch for subproject %s"
1893 msgstr "子项目 %s 损坏的补丁"
1895 #: builtin/apply.c:3814
1897 msgid "unable to stat newly created file '%s'"
1898 msgstr "不能枚举新建文件 '%s' 的状态"
1900 #: builtin/apply.c:3819
1902 msgid "unable to create backing store for newly created file %s"
1903 msgstr "不能为新建文件 %s 创建后端存储"
1905 #: builtin/apply.c:3822 builtin/apply.c:3930
1907 msgid "unable to add cache entry for %s"
1908 msgstr "无法为 %s 添加缓存条目"
1910 #: builtin/apply.c:3855
1912 msgid "closing file '%s'"
1915 #: builtin/apply.c:3904
1917 msgid "unable to write file '%s' mode %o"
1918 msgstr "不能写文件 '%s' 权限 %o"
1920 #: builtin/apply.c:3991
1922 msgid "Applied patch %s cleanly."
1925 #: builtin/apply.c:3999
1926 msgid "internal error"
1929 #. Say this even without --verbose
1930 #: builtin/apply.c:4002
1932 msgid "Applying patch %%s with %d reject..."
1933 msgid_plural "Applying patch %%s with %d rejects..."
1934 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1935 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1937 #: builtin/apply.c:4012
1939 msgid "truncating .rej filename to %.*s.rej"
1940 msgstr "截短 .rej 文件名为 %.*s.rej"
1942 #: builtin/apply.c:4033
1944 msgid "Hunk #%d applied cleanly."
1945 msgstr "第 #%d 个片段成功应用。"
1947 #: builtin/apply.c:4036
1949 msgid "Rejected hunk #%d."
1950 msgstr "拒绝第 #%d 个片段。"
1952 #: builtin/apply.c:4186
1953 msgid "unrecognized input"
1956 #: builtin/apply.c:4197
1957 msgid "unable to read index file"
1960 #: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91
1961 #: builtin/fetch.c:63
1965 #: builtin/apply.c:4317
1966 msgid "don't apply changes matching the given path"
1967 msgstr "不要应用与给出路径向匹配的变更"
1969 #: builtin/apply.c:4320
1970 msgid "apply changes matching the given path"
1971 msgstr "应用与给出路径向匹配的变更"
1973 #: builtin/apply.c:4322
1977 #: builtin/apply.c:4323
1978 msgid "remove <num> leading slashes from traditional diff paths"
1979 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1981 #: builtin/apply.c:4326
1982 msgid "ignore additions made by the patch"
1983 msgstr "忽略补丁中的添加的文件"
1985 #: builtin/apply.c:4328
1986 msgid "instead of applying the patch, output diffstat for the input"
1987 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
1989 #: builtin/apply.c:4332
1990 msgid "show number of added and deleted lines in decimal notation"
1991 msgstr "以十进制数显示添加和删除的行数"
1993 #: builtin/apply.c:4334
1994 msgid "instead of applying the patch, output a summary for the input"
1995 msgstr "不应用补丁,而是显示输入的概要"
1997 #: builtin/apply.c:4336
1998 msgid "instead of applying the patch, see if the patch is applicable"
1999 msgstr "不应用补丁,而是查看补丁是否可应用"
2001 #: builtin/apply.c:4338
2002 msgid "make sure the patch is applicable to the current index"
2003 msgstr "确认补丁可以应用到当前索引"
2005 #: builtin/apply.c:4340
2006 msgid "apply a patch without touching the working tree"
2007 msgstr "应用补丁而不修改工作区"
2009 #: builtin/apply.c:4342
2010 msgid "also apply the patch (use with --stat/--summary/--check)"
2011 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2013 #: builtin/apply.c:4344
2014 msgid "attempt three-way merge if a patch does not apply"
2015 msgstr "如果一个补丁不能应用则尝试三路合并"
2017 #: builtin/apply.c:4346
2018 msgid "build a temporary index based on embedded index information"
2019 msgstr "创建一个临时索引基于嵌入的索引信息"
2021 #: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463
2022 msgid "paths are separated with NUL character"
2023 msgstr "路径以 NUL 字符分隔"
2025 #: builtin/apply.c:4351
2026 msgid "ensure at least <n> lines of context match"
2027 msgstr "确保至少匹配 <n> 行上下文"
2029 #: builtin/apply.c:4352
2033 #: builtin/apply.c:4353
2034 msgid "detect new or modified lines that have whitespace errors"
2035 msgstr "检查新增和修改的行中间的空白字符滥用"
2037 #: builtin/apply.c:4356 builtin/apply.c:4359
2038 msgid "ignore changes in whitespace when finding context"
2039 msgstr "查找上下文时忽略空白字符的变更"
2041 #: builtin/apply.c:4362
2042 msgid "apply the patch in reverse"
2045 #: builtin/apply.c:4364
2046 msgid "don't expect at least one line of context"
2049 #: builtin/apply.c:4366
2050 msgid "leave the rejected hunks in corresponding *.rej files"
2051 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2053 #: builtin/apply.c:4368
2054 msgid "allow overlapping hunks"
2057 #: builtin/apply.c:4371
2058 msgid "tolerate incorrectly detected missing new-line at the end of file"
2059 msgstr "允许不正确的文件末尾换行符"
2061 #: builtin/apply.c:4374
2062 msgid "do not trust the line counts in the hunk headers"
2063 msgstr "不信任补丁片段的头信息中的行号"
2065 #: builtin/apply.c:4376
2069 #: builtin/apply.c:4377
2070 msgid "prepend <root> to all filenames"
2071 msgstr "为所有文件名前添加 <根目录>"
2073 #: builtin/apply.c:4399
2074 msgid "--3way outside a repository"
2075 msgstr "--3way 在一个版本库之外"
2077 #: builtin/apply.c:4407
2078 msgid "--index outside a repository"
2079 msgstr "--index 在一个版本库之外"
2081 #: builtin/apply.c:4410
2082 msgid "--cached outside a repository"
2083 msgstr "--cached 在一个版本库之外"
2085 #: builtin/apply.c:4426
2087 msgid "can't open patch '%s'"
2088 msgstr "不能打开补丁 '%s'"
2090 #: builtin/apply.c:4440
2092 msgid "squelched %d whitespace error"
2093 msgid_plural "squelched %d whitespace errors"
2094 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2095 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2097 #: builtin/apply.c:4446 builtin/apply.c:4456
2099 msgid "%d line adds whitespace errors."
2100 msgid_plural "%d lines add whitespace errors."
2101 msgstr[0] "%d 行有空白字符误用。"
2102 msgstr[1] "%d 行有空白字符误用。"
2104 #: builtin/archive.c:17
2106 msgid "could not create archive file '%s'"
2107 msgstr "不能创建归档文件 '%s'"
2109 #: builtin/archive.c:20
2110 msgid "could not redirect output"
2113 #: builtin/archive.c:37
2114 msgid "git archive: Remote with no URL"
2115 msgstr "git archive:未提供远程URL"
2117 #: builtin/archive.c:58
2118 msgid "git archive: expected ACK/NAK, got EOF"
2119 msgstr "git archive:应为ACK/NACK,却得到EOF"
2121 #: builtin/archive.c:63
2123 msgid "git archive: NACK %s"
2124 msgstr "git archive:NACK %s"
2126 #: builtin/archive.c:65
2128 msgid "remote error: %s"
2131 #: builtin/archive.c:66
2132 msgid "git archive: protocol error"
2133 msgstr "git archive:协议错误"
2135 #: builtin/archive.c:71
2136 msgid "git archive: expected a flush"
2137 msgstr "git archive:应为刷新"
2139 #: builtin/bisect--helper.c:7
2140 msgid "git bisect--helper --next-all [--no-checkout]"
2141 msgstr "git bisect--helper --next-all [--no-checkout]"
2143 #: builtin/bisect--helper.c:17
2144 msgid "perform 'git bisect next'"
2145 msgstr "执行 'git bisect next'"
2147 #: builtin/bisect--helper.c:19
2148 msgid "update BISECT_HEAD instead of checking out the current commit"
2149 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2151 #: builtin/blame.c:25
2152 msgid "git blame [options] [rev-opts] [rev] [--] file"
2153 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2155 #: builtin/blame.c:30 builtin/shortlog.c:15
2156 msgid "[rev-opts] are documented in git-rev-list(1)"
2157 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2159 #: builtin/blame.c:2350
2160 msgid "Show blame entries as we find them, incrementally"
2161 msgstr "增量式地显示发现的 blame 条目"
2163 #: builtin/blame.c:2351
2164 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2165 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2167 #: builtin/blame.c:2352
2168 msgid "Do not treat root commits as boundaries (Default: off)"
2169 msgstr "不把根提交作为边界(默认:关闭)"
2171 #: builtin/blame.c:2353
2172 msgid "Show work cost statistics"
2175 #: builtin/blame.c:2354
2176 msgid "Show output score for blame entries"
2177 msgstr "显示判断 blame 条目位移的得分诊断信息"
2179 #: builtin/blame.c:2355
2180 msgid "Show original filename (Default: auto)"
2181 msgstr "显示原始文件名(默认:自动)"
2183 #: builtin/blame.c:2356
2184 msgid "Show original linenumber (Default: off)"
2185 msgstr "显示原始的行号(默认:关闭)"
2187 #: builtin/blame.c:2357
2188 msgid "Show in a format designed for machine consumption"
2189 msgstr "显示为一个适合机器读取的格式"
2191 #: builtin/blame.c:2358
2192 msgid "Show porcelain format with per-line commit information"
2193 msgstr "为每一行显示机器适用的提交信息"
2195 #: builtin/blame.c:2359
2196 msgid "Use the same output mode as git-annotate (Default: off)"
2197 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2199 #: builtin/blame.c:2360
2200 msgid "Show raw timestamp (Default: off)"
2201 msgstr "显示原始时间戳(默认:关闭)"
2203 #: builtin/blame.c:2361
2204 msgid "Show long commit SHA1 (Default: off)"
2205 msgstr "显示长的SHA1提交号(默认:关闭)"
2207 #: builtin/blame.c:2362
2208 msgid "Suppress author name and timestamp (Default: off)"
2209 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2211 #: builtin/blame.c:2363
2212 msgid "Show author email instead of name (Default: off)"
2213 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2215 #: builtin/blame.c:2364
2216 msgid "Ignore whitespace differences"
2219 #: builtin/blame.c:2365
2220 msgid "Spend extra cycles to find better match"
2221 msgstr "花费额外的循环来找到更好的匹配"
2223 #: builtin/blame.c:2366
2224 msgid "Use revisions from <file> instead of calling git-rev-list"
2225 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2227 #: builtin/blame.c:2367
2228 msgid "Use <file>'s contents as the final image"
2229 msgstr "使用 <file> 的内容作为最终的图片"
2231 #: builtin/blame.c:2368 builtin/blame.c:2369
2235 #: builtin/blame.c:2368
2236 msgid "Find line copies within and across files"
2237 msgstr "找到文件内及跨文件的行拷贝"
2239 #: builtin/blame.c:2369
2240 msgid "Find line movements within and across files"
2241 msgstr "找到文件内及跨文件的行移动"
2243 #: builtin/blame.c:2370
2247 #: builtin/blame.c:2370
2248 msgid "Process only line range n,m, counting from 1"
2249 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2251 #: builtin/branch.c:23
2252 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2253 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2255 #: builtin/branch.c:24
2256 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2257 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2259 #: builtin/branch.c:25
2260 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2261 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2263 #: builtin/branch.c:26
2264 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2265 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2267 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2268 #: builtin/branch.c:145
2271 "deleting branch '%s' that has been merged to\n"
2272 " '%s', but not yet merged to HEAD."
2274 "将要删除的分支 '%s' 已经被合并到\n"
2277 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2278 #: builtin/branch.c:149
2281 "not deleting branch '%s' that is not yet merged to\n"
2282 " '%s', even though it is merged to HEAD."
2284 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2285 " 然而却尚未被合并到分支 '%s' 。"
2287 #: builtin/branch.c:163
2289 msgid "Couldn't look up commit object for '%s'"
2290 msgstr "无法查询 '%s' 指向的提交对象"
2292 #: builtin/branch.c:167
2295 "The branch '%s' is not fully merged.\n"
2296 "If you are sure you want to delete it, run 'git branch -D %s'."
2299 "如果您确认要删除它,执行 'git branch -D %s'。"
2301 #: builtin/branch.c:180
2302 msgid "Update of config-file failed"
2303 msgstr "无法更新 config 文件"
2305 #: builtin/branch.c:208
2306 msgid "cannot use -a with -d"
2307 msgstr "不能将 -a 和 -d 同时使用"
2309 #: builtin/branch.c:214
2310 msgid "Couldn't look up commit object for HEAD"
2311 msgstr "无法查询 HEAD 指向的提交对象"
2313 #: builtin/branch.c:222
2315 msgid "Cannot delete the branch '%s' which you are currently on."
2316 msgstr "无法删除您当前所在的分支 '%s'。"
2318 #: builtin/branch.c:235
2320 msgid "remote branch '%s' not found."
2321 msgstr "远程分支 '%s' 未发现。"
2323 #: builtin/branch.c:236
2325 msgid "branch '%s' not found."
2326 msgstr "分支 '%s' 未发现。"
2328 #: builtin/branch.c:250
2330 msgid "Error deleting remote branch '%s'"
2331 msgstr "删除远程分支 '%s' 时出错"
2333 #: builtin/branch.c:251
2335 msgid "Error deleting branch '%s'"
2336 msgstr "删除分支 '%s' 时出错"
2338 #: builtin/branch.c:258
2340 msgid "Deleted remote branch %s (was %s).\n"
2341 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2343 #: builtin/branch.c:259
2345 msgid "Deleted branch %s (was %s).\n"
2346 msgstr "已删除分支 %s(曾为 %s)。\n"
2348 #: builtin/branch.c:361
2350 msgid "branch '%s' does not point at a commit"
2351 msgstr "分支 '%s' 未指向一个提交"
2353 #: builtin/branch.c:433
2355 msgid "[%s: behind %d]"
2358 #: builtin/branch.c:435
2363 #: builtin/branch.c:439
2365 msgid "[%s: ahead %d]"
2368 #: builtin/branch.c:441
2373 #: builtin/branch.c:444
2375 msgid "[%s: ahead %d, behind %d]"
2376 msgstr "[%s:领先 %d,落后 %d]"
2378 #: builtin/branch.c:447
2380 msgid "[ahead %d, behind %d]"
2381 msgstr "[领先 %d,落后 %d]"
2383 #: builtin/branch.c:469
2384 msgid " **** invalid ref ****"
2385 msgstr " **** 无效引用 ****"
2387 #: builtin/branch.c:560
2391 #: builtin/branch.c:593
2393 msgid "object '%s' does not point to a commit"
2394 msgstr "对象 '%s' 没有指向一个提交"
2396 #: builtin/branch.c:625
2397 msgid "some refs could not be read"
2400 #: builtin/branch.c:638
2401 msgid "cannot rename the current branch while not on any."
2402 msgstr "无法重命名当前分支因为不处于任何分支上。"
2404 #: builtin/branch.c:648
2406 msgid "Invalid branch name: '%s'"
2407 msgstr "无效的分支名:'%s'"
2409 #: builtin/branch.c:663
2410 msgid "Branch rename failed"
2413 #: builtin/branch.c:667
2415 msgid "Renamed a misnamed branch '%s' away"
2416 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2418 #: builtin/branch.c:671
2420 msgid "Branch renamed to %s, but HEAD is not updated!"
2421 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2423 #: builtin/branch.c:678
2424 msgid "Branch is renamed, but update of config-file failed"
2425 msgstr "分支被重命名,但更新 config 文件失败"
2427 #: builtin/branch.c:693
2429 msgid "malformed object name %s"
2432 #: builtin/branch.c:717
2434 msgid "could not write branch description template: %s"
2435 msgstr "不能写分支描述模版:%s"
2437 #: builtin/branch.c:747
2438 msgid "Generic options"
2441 #: builtin/branch.c:749
2442 msgid "show hash and subject, give twice for upstream branch"
2443 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2445 #: builtin/branch.c:750
2446 msgid "suppress informational messages"
2449 #: builtin/branch.c:751
2450 msgid "set up tracking mode (see git-pull(1))"
2451 msgstr "设置跟踪模式(参见 git-pull(1))"
2453 #: builtin/branch.c:753
2454 msgid "change upstream info"
2457 #: builtin/branch.c:757
2458 msgid "use colored output"
2461 #: builtin/branch.c:758
2462 msgid "act on remote-tracking branches"
2465 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2466 #: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2467 #: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
2471 #: builtin/branch.c:762 builtin/branch.c:768
2472 msgid "print only branches that contain the commit"
2473 msgstr "只打印包含该提交的分支"
2475 #: builtin/branch.c:774
2476 msgid "Specific git-branch actions:"
2477 msgstr "具体的 git-branch 动作:"
2479 #: builtin/branch.c:775
2480 msgid "list both remote-tracking and local branches"
2481 msgstr "列出远程跟踪及本地分支"
2483 #: builtin/branch.c:777
2484 msgid "delete fully merged branch"
2487 #: builtin/branch.c:778
2488 msgid "delete branch (even if not merged)"
2489 msgstr "删除分支(即使没有合并)"
2491 #: builtin/branch.c:779
2492 msgid "move/rename a branch and its reflog"
2493 msgstr "移动/重命名一个分支,以及它的引用日志"
2495 #: builtin/branch.c:780
2496 msgid "move/rename a branch, even if target exists"
2497 msgstr "移动/重命名一个分支,即使目标已存在"
2499 #: builtin/branch.c:781
2500 msgid "list branch names"
2503 #: builtin/branch.c:782
2504 msgid "create the branch's reflog"
2507 #: builtin/branch.c:784
2508 msgid "edit the description for the branch"
2511 #: builtin/branch.c:785
2512 msgid "force creation (when already exists)"
2513 msgstr "强制创建(当已经存在)"
2515 #: builtin/branch.c:788
2516 msgid "print only not merged branches"
2519 #: builtin/branch.c:794
2520 msgid "print only merged branches"
2523 #: builtin/branch.c:798
2524 msgid "list branches in columns"
2527 #: builtin/branch.c:811
2528 msgid "Failed to resolve HEAD as a valid ref."
2529 msgstr "无法将 HEAD 解析为有效引用。"
2531 #: builtin/branch.c:816 builtin/clone.c:561
2532 msgid "HEAD not found below refs/heads!"
2533 msgstr "HEAD 没有位于 /refs/heads 之下!"
2535 #: builtin/branch.c:839
2536 msgid "--column and --verbose are incompatible"
2537 msgstr "--column 和 --verbose 不兼容"
2539 #: builtin/branch.c:845
2540 msgid "branch name required"
2543 #: builtin/branch.c:860
2544 msgid "Cannot give description to detached HEAD"
2545 msgstr "不能向分离头指针提供描述"
2547 #: builtin/branch.c:865
2548 msgid "cannot edit description of more than one branch"
2549 msgstr "不能为一个以上的分支编辑描述"
2551 #: builtin/branch.c:872
2553 msgid "No commit on branch '%s' yet."
2554 msgstr "分支 '%s' 尚无提交。"
2556 #: builtin/branch.c:875
2558 msgid "No branch named '%s'."
2561 #: builtin/branch.c:888
2562 msgid "too many branches for a rename operation"
2563 msgstr "为重命名操作提供了太多的分支名"
2565 #: builtin/branch.c:893
2567 msgid "branch '%s' does not exist"
2568 msgstr "分支 '%s' 不存在"
2570 #: builtin/branch.c:905
2572 msgid "Branch '%s' has no upstream information"
2573 msgstr "分支 '%s' 没有上游信息"
2575 #: builtin/branch.c:920
2576 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2577 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2579 #: builtin/branch.c:923
2582 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2583 "track or --set-upstream-to\n"
2585 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2587 #: builtin/branch.c:940
2591 "If you wanted to make '%s' track '%s', do this:\n"
2595 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2598 #: builtin/branch.c:941
2600 msgid " git branch -d %s\n"
2601 msgstr " git branch -d %s\n"
2603 #: builtin/branch.c:942
2605 msgid " git branch --set-upstream-to %s\n"
2606 msgstr " git branch --set-upstream-to %s\n"
2608 #: builtin/bundle.c:47
2610 msgid "%s is okay\n"
2613 #: builtin/bundle.c:56
2614 msgid "Need a repository to create a bundle."
2615 msgstr "需要一个版本库来创建包。"
2617 #: builtin/bundle.c:60
2618 msgid "Need a repository to unbundle."
2619 msgstr "需要一个版本库来解包。"
2621 #: builtin/cat-file.c:247
2622 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2623 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2625 #: builtin/cat-file.c:248
2626 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2627 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2629 #: builtin/cat-file.c:266
2630 msgid "<type> can be one of: blob, tree, commit, tag"
2631 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2633 #: builtin/cat-file.c:267
2634 msgid "show object type"
2637 #: builtin/cat-file.c:268
2638 msgid "show object size"
2641 #: builtin/cat-file.c:270
2642 msgid "exit with zero when there's no error"
2643 msgstr "当没有错误时退出并返回零"
2645 #: builtin/cat-file.c:271
2646 msgid "pretty-print object's content"
2649 #: builtin/cat-file.c:273
2650 msgid "for blob objects, run textconv on object's content"
2651 msgstr "对于数据(blob)对象,对其内容执行 textconv"
2653 #: builtin/cat-file.c:275
2654 msgid "show info and content of objects fed from the standard input"
2655 msgstr "显示从标准输入提供的对象的信息和内容"
2657 #: builtin/cat-file.c:278
2658 msgid "show info about objects fed from the standard input"
2659 msgstr "显示从标准输入提供的对象的信息"
2661 #: builtin/check-attr.c:11
2662 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2663 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2665 #: builtin/check-attr.c:12
2666 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2667 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2669 #: builtin/check-attr.c:19
2670 msgid "report all attributes set on file"
2671 msgstr "报告设置在文件上的所有属性"
2673 #: builtin/check-attr.c:20
2674 msgid "use .gitattributes only from the index"
2675 msgstr "只使用索引中的 .gitattributes"
2677 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2678 msgid "read file names from stdin"
2681 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2682 msgid "input paths are terminated by a null character"
2683 msgstr "输入路径以null字符终止"
2685 #: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2686 msgid "suppress progress reporting"
2689 #: builtin/check-ignore.c:151
2690 msgid "cannot specify pathnames with --stdin"
2691 msgstr "不能同时提供路径及 --stdin 参数"
2693 #: builtin/check-ignore.c:154
2694 msgid "-z only makes sense with --stdin"
2695 msgstr "-z 需要和 --stdin 参数共用才有意义"
2697 #: builtin/check-ignore.c:156
2698 msgid "no path specified"
2701 #: builtin/check-ignore.c:160
2702 msgid "--quiet is only valid with a single pathname"
2703 msgstr "参数 --quiet 只在提供一个路径名时有效"
2705 #: builtin/check-ignore.c:162
2706 msgid "cannot have both --quiet and --verbose"
2707 msgstr "不能同时提供 --quiet 和 --verbose 参数"
2709 #: builtin/checkout-index.c:126
2710 msgid "git checkout-index [options] [--] [<file>...]"
2711 msgstr "git checkout-index [选项] [--] [<文件>...]"
2713 #: builtin/checkout-index.c:187
2714 msgid "check out all files in the index"
2717 #: builtin/checkout-index.c:188
2718 msgid "force overwrite of existing files"
2721 #: builtin/checkout-index.c:190
2722 msgid "no warning for existing files and files not in index"
2723 msgstr "存在或不在索引中的文件都没有警告"
2725 #: builtin/checkout-index.c:192
2726 msgid "don't checkout new files"
2729 #: builtin/checkout-index.c:194
2730 msgid "update stat information in the index file"
2731 msgstr "更新索引中文件的状态信息"
2733 #: builtin/checkout-index.c:200
2734 msgid "read list of paths from the standard input"
2735 msgstr "从标准输入读取路径列表"
2737 #: builtin/checkout-index.c:202
2738 msgid "write the content to temporary files"
2741 #: builtin/checkout-index.c:203 builtin/column.c:30
2745 #: builtin/checkout-index.c:204
2746 msgid "when creating files, prepend <string>"
2747 msgstr "在创建文件时,在前面加上<字符串>"
2749 #: builtin/checkout-index.c:207
2750 msgid "copy out the files from named stage"
2751 msgstr "从指定暂存区中拷出文件"
2753 #: builtin/checkout.c:25
2754 msgid "git checkout [options] <branch>"
2755 msgstr "git checkout [选项] <分支>"
2757 #: builtin/checkout.c:26
2758 msgid "git checkout [options] [<branch>] -- <file>..."
2759 msgstr "git checkout [选项] [<分支>] -- <文件>..."
2761 #: builtin/checkout.c:116 builtin/checkout.c:149
2763 msgid "path '%s' does not have our version"
2764 msgstr "路径 '%s' 没有我们的版本"
2766 #: builtin/checkout.c:118 builtin/checkout.c:151
2768 msgid "path '%s' does not have their version"
2769 msgstr "路径 '%s' 没有他们的版本"
2771 #: builtin/checkout.c:134
2773 msgid "path '%s' does not have all necessary versions"
2774 msgstr "路径 '%s' 没有全部必须的版本"
2776 #: builtin/checkout.c:178
2778 msgid "path '%s' does not have necessary versions"
2779 msgstr "路径 '%s' 没有必须的版本"
2781 #: builtin/checkout.c:195
2783 msgid "path '%s': cannot merge"
2784 msgstr "path '%s':无法合并"
2786 #: builtin/checkout.c:212
2788 msgid "Unable to add merge result for '%s'"
2789 msgstr "无法为 '%s' 添加合并结果"
2791 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2792 #: builtin/checkout.c:245
2794 msgid "'%s' cannot be used with updating paths"
2795 msgstr "'%s' 不能在更新路径时使用"
2797 #: builtin/checkout.c:248 builtin/checkout.c:251
2799 msgid "'%s' cannot be used with %s"
2800 msgstr "'%s' 不能和 %s 同时使用"
2802 #: builtin/checkout.c:254
2804 msgid "Cannot update paths and switch to branch '%s' at the same time."
2805 msgstr "不能同时更新路径并切换到分支'%s'。"
2807 #: builtin/checkout.c:265 builtin/checkout.c:426
2808 msgid "corrupt index file"
2811 #: builtin/checkout.c:295 builtin/checkout.c:302
2813 msgid "path '%s' is unmerged"
2814 msgstr "路径 '%s' 未合并"
2816 #: builtin/checkout.c:448
2817 msgid "you need to resolve your current index first"
2818 msgstr "您需要先解决当前索引的冲突"
2820 #: builtin/checkout.c:569
2822 msgid "Can not do reflog for '%s'\n"
2823 msgstr "不能对 '%s' 执行 reflog 操作\n"
2825 #: builtin/checkout.c:602
2826 msgid "HEAD is now at"
2829 #: builtin/checkout.c:609
2831 msgid "Reset branch '%s'\n"
2832 msgstr "重置分支 '%s'\n"
2834 #: builtin/checkout.c:612
2836 msgid "Already on '%s'\n"
2837 msgstr "已经位于 '%s'\n"
2839 #: builtin/checkout.c:616
2841 msgid "Switched to and reset branch '%s'\n"
2842 msgstr "切换并重置分支 '%s'\n"
2844 #: builtin/checkout.c:618 builtin/checkout.c:955
2846 msgid "Switched to a new branch '%s'\n"
2847 msgstr "切换到一个新分支 '%s'\n"
2849 #: builtin/checkout.c:620
2851 msgid "Switched to branch '%s'\n"
2852 msgstr "切换到分支 '%s'\n"
2855 #: builtin/checkout.c:676
2857 msgid " ... and %d more.\n"
2858 msgstr " ... 及其它 %d 个。\n"
2860 #. The singular version
2861 #: builtin/checkout.c:682
2864 "Warning: you are leaving %d commit behind, not connected to\n"
2865 "any of your branches:\n"
2869 "Warning: you are leaving %d commits behind, not connected to\n"
2870 "any of your branches:\n"
2874 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2878 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2882 #: builtin/checkout.c:700
2885 "If you want to keep them by creating a new branch, this may be a good time\n"
2888 " git branch new_branch_name %s\n"
2891 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2894 " git branch new_branch_name %s\n"
2897 #: builtin/checkout.c:730
2898 msgid "internal error in revision walk"
2899 msgstr "在版本遍历时遇到内部错误"
2901 #: builtin/checkout.c:734
2902 msgid "Previous HEAD position was"
2903 msgstr "之前的 HEAD 位置是"
2905 #: builtin/checkout.c:761 builtin/checkout.c:950
2906 msgid "You are on a branch yet to be born"
2907 msgstr "您位于一个尚未初始化的分支"
2910 #: builtin/checkout.c:886
2912 msgid "invalid reference: %s"
2915 #. case (1): want a tree
2916 #: builtin/checkout.c:925
2918 msgid "reference is not a tree: %s"
2921 #: builtin/checkout.c:964
2922 msgid "paths cannot be used with switching branches"
2923 msgstr "路径不能和切换分支同时使用"
2925 #: builtin/checkout.c:967 builtin/checkout.c:971
2927 msgid "'%s' cannot be used with switching branches"
2928 msgstr "'%s' 不能和切换分支同时使用"
2930 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2931 #: builtin/checkout.c:986
2933 msgid "'%s' cannot be used with '%s'"
2934 msgstr "'%s' 不能和 '%s' 同时使用"
2936 #: builtin/checkout.c:991
2938 msgid "Cannot switch branch to a non-commit '%s'"
2939 msgstr "不能切换分支到一个非提交 '%s'"
2941 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2942 #: builtin/remote.c:169 builtin/remote.c:171
2946 #: builtin/checkout.c:1014
2947 msgid "create and checkout a new branch"
2948 msgstr "创建并检出一个新的分支"
2950 #: builtin/checkout.c:1016
2951 msgid "create/reset and checkout a branch"
2952 msgstr "创建/重置并检出一个分支"
2954 #: builtin/checkout.c:1017
2955 msgid "create reflog for new branch"
2956 msgstr "为新的分支创建引用日志"
2958 #: builtin/checkout.c:1018
2959 msgid "detach the HEAD at named commit"
2960 msgstr "成为指向该提交的分离头指针"
2962 #: builtin/checkout.c:1019
2963 msgid "set upstream info for new branch"
2964 msgstr "为新的分支设置上游信息"
2966 #: builtin/checkout.c:1021
2970 #: builtin/checkout.c:1021
2971 msgid "new unparented branch"
2974 #: builtin/checkout.c:1022
2975 msgid "checkout our version for unmerged files"
2976 msgstr "对尚未合并的文件检出我们的版本"
2978 #: builtin/checkout.c:1024
2979 msgid "checkout their version for unmerged files"
2980 msgstr "对尚未合并的文件检出他们的版本"
2982 #: builtin/checkout.c:1026
2983 msgid "force checkout (throw away local modifications)"
2984 msgstr "强制检出(丢弃本地修改)"
2986 #: builtin/checkout.c:1027
2987 msgid "perform a 3-way merge with the new branch"
2988 msgstr "和新的分支执行三路合并"
2990 #: builtin/checkout.c:1028 builtin/merge.c:215
2991 msgid "update ignored files (default)"
2992 msgstr "更新忽略的文件(默认)"
2994 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
2998 #: builtin/checkout.c:1030
2999 msgid "conflict style (merge or diff3)"
3000 msgstr "冲突输出风格(merge 或 diff3)"
3002 #: builtin/checkout.c:1033
3003 msgid "second guess 'git checkout no-such-branch'"
3004 msgstr "再者猜测'git checkout no-such-branch'"
3006 #: builtin/checkout.c:1057
3007 msgid "-b, -B and --orphan are mutually exclusive"
3008 msgstr "-b、-B 和 --orphan 是互斥的"
3010 #: builtin/checkout.c:1074
3011 msgid "--track needs a branch name"
3012 msgstr "--track 需要一个分支名"
3014 #: builtin/checkout.c:1081
3015 msgid "Missing branch name; try -b"
3016 msgstr "缺少分支名;尝试 -b"
3018 #: builtin/checkout.c:1116
3019 msgid "invalid path specification"
3022 #: builtin/checkout.c:1123
3025 "Cannot update paths and switch to branch '%s' at the same time.\n"
3026 "Did you intend to checkout '%s' which can not be resolved as commit?"
3028 "不能同时更新路径并切换到分支'%s'。\n"
3029 "您是想要检出 '%s' 但其未能解析为提交么?"
3031 #: builtin/checkout.c:1128
3033 msgid "git checkout: --detach does not take a path argument '%s'"
3034 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3036 #: builtin/checkout.c:1132
3038 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3039 "checking out of the index."
3041 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3043 #: builtin/clean.c:20
3044 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3045 msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3047 #: builtin/clean.c:24
3049 msgid "Removing %s\n"
3052 #: builtin/clean.c:25
3054 msgid "Would remove %s\n"
3057 #: builtin/clean.c:26
3059 msgid "Skipping repository %s\n"
3062 #: builtin/clean.c:27
3064 msgid "Would skip repository %s\n"
3065 msgstr "将忽略版本库 %s\n"
3067 #: builtin/clean.c:28
3069 msgid "failed to remove %s"
3072 #: builtin/clean.c:160
3073 msgid "do not print names of files removed"
3076 #: builtin/clean.c:162
3080 #: builtin/clean.c:164
3081 msgid "remove whole directories"
3084 #: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
3085 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
3089 #: builtin/clean.c:166
3090 msgid "add <pattern> to ignore rules"
3091 msgstr "添加<模式>到忽略规则"
3093 #: builtin/clean.c:167
3094 msgid "remove ignored files, too"
3097 #: builtin/clean.c:169
3098 msgid "remove only ignored files"
3101 #: builtin/clean.c:187
3102 msgid "-x and -X cannot be used together"
3103 msgstr "-x 和 -X 不能同时使用"
3105 #: builtin/clean.c:191
3107 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3109 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3111 #: builtin/clean.c:194
3113 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3116 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3118 #: builtin/clone.c:36
3119 msgid "git clone [options] [--] <repo> [<dir>]"
3120 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3122 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
3123 #: builtin/push.c:436
3124 msgid "force progress reporting"
3127 #: builtin/clone.c:66
3128 msgid "don't create a checkout"
3131 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3132 msgid "create a bare repository"
3135 #: builtin/clone.c:72
3136 msgid "create a mirror repository (implies bare)"
3137 msgstr "创建一个镜像版本库(也是裸版本库)"
3139 #: builtin/clone.c:74
3140 msgid "to clone from a local repository"
3143 #: builtin/clone.c:76
3144 msgid "don't use local hardlinks, always copy"
3145 msgstr "不使用本地硬链接,始终复制"
3147 #: builtin/clone.c:78
3148 msgid "setup as shared repository"
3151 #: builtin/clone.c:80 builtin/clone.c:82
3152 msgid "initialize submodules in the clone"
3155 #: builtin/clone.c:83 builtin/init-db.c:485
3156 msgid "template-directory"
3159 #: builtin/clone.c:84 builtin/init-db.c:486
3160 msgid "directory from which templates will be used"
3163 #: builtin/clone.c:86
3164 msgid "reference repository"
3167 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3171 #: builtin/clone.c:88
3172 msgid "use <name> instead of 'origin' to track upstream"
3173 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3175 #: builtin/clone.c:90
3176 msgid "checkout <branch> instead of the remote's HEAD"
3177 msgstr "检出<分支>而不是远程HEAD"
3179 #: builtin/clone.c:92
3180 msgid "path to git-upload-pack on the remote"
3181 msgstr "远程 git-upload-pack 路径"
3183 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
3187 #: builtin/clone.c:94
3188 msgid "create a shallow clone of that depth"
3189 msgstr "创建一个指定深度的浅克隆"
3191 #: builtin/clone.c:96
3192 msgid "clone only one branch, HEAD or --branch"
3193 msgstr "只克隆一个分支、HEAD 或 --branch"
3195 #: builtin/clone.c:97 builtin/init-db.c:494
3199 #: builtin/clone.c:98 builtin/init-db.c:495
3200 msgid "separate git dir from working tree"
3201 msgstr "git目录和工作区分离"
3203 #: builtin/clone.c:99
3207 #: builtin/clone.c:100
3208 msgid "set config inside the new repository"
3209 msgstr "在新版本库中设置配置信息"
3211 #: builtin/clone.c:243
3213 msgid "reference repository '%s' is not a local directory."
3214 msgstr "引用版本库 '%s' 不是一个本地目录。"
3216 #: builtin/clone.c:306
3218 msgid "failed to create directory '%s'"
3219 msgstr "无法创建目录 '%s'"
3221 #: builtin/clone.c:308 builtin/diff.c:77
3223 msgid "failed to stat '%s'"
3224 msgstr "无法枚举 '%s' 状态"
3226 #: builtin/clone.c:310
3228 msgid "%s exists and is not a directory"
3229 msgstr "%s 存在且不是一个目录"
3231 #: builtin/clone.c:324
3233 msgid "failed to stat %s\n"
3234 msgstr "无法枚举 %s 状态\n"
3236 #: builtin/clone.c:346
3238 msgid "failed to create link '%s'"
3239 msgstr "无法创建链接 '%s'"
3241 #: builtin/clone.c:350
3243 msgid "failed to copy file to '%s'"
3244 msgstr "无法拷贝文件至 '%s'"
3246 #: builtin/clone.c:373
3251 #: builtin/clone.c:443
3253 msgid "Could not find remote branch %s to clone."
3254 msgstr "不能发现要克隆的远程分支 %s。"
3256 #: builtin/clone.c:552
3257 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3258 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3260 #: builtin/clone.c:690
3261 msgid "Too many arguments."
3264 #: builtin/clone.c:694
3265 msgid "You must specify a repository to clone."
3266 msgstr "您必须指定一个版本库来克隆。"
3268 #: builtin/clone.c:705
3270 msgid "--bare and --origin %s options are incompatible."
3271 msgstr "--bare 和 --origin %s 选项不兼容。"
3273 #: builtin/clone.c:708
3274 msgid "--bare and --separate-git-dir are incompatible."
3275 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3277 #: builtin/clone.c:721
3279 msgid "repository '%s' does not exist"
3280 msgstr "版本库 '%s' 不存在"
3282 #: builtin/clone.c:726
3283 msgid "--depth is ignored in local clones; use file:// instead."
3284 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3286 #: builtin/clone.c:736
3288 msgid "destination path '%s' already exists and is not an empty directory."
3289 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3291 #: builtin/clone.c:746
3293 msgid "working tree '%s' already exists."
3294 msgstr "工作区 '%s' 已经存在。"
3296 #: builtin/clone.c:759 builtin/clone.c:771
3298 msgid "could not create leading directories of '%s'"
3299 msgstr "不能为 '%s' 创建先导目录"
3301 #: builtin/clone.c:762
3303 msgid "could not create work tree dir '%s'."
3304 msgstr "不能为 '%s' 创建工作区目录。"
3306 #: builtin/clone.c:781
3308 msgid "Cloning into bare repository '%s'...\n"
3309 msgstr "克隆到裸版本库 '%s'...\n"
3311 #: builtin/clone.c:783
3313 msgid "Cloning into '%s'...\n"
3314 msgstr "正克隆到 '%s'...\n"
3316 #: builtin/clone.c:818
3318 msgid "Don't know how to clone %s"
3321 #: builtin/clone.c:867
3323 msgid "Remote branch %s not found in upstream %s"
3324 msgstr "远程分支 %s 在上游 %s 未发现"
3326 #: builtin/clone.c:874
3327 msgid "You appear to have cloned an empty repository."
3328 msgstr "您似乎克隆了一个空版本库。"
3330 #: builtin/column.c:9
3331 msgid "git column [options]"
3332 msgstr "git column [选项]"
3334 #: builtin/column.c:26
3335 msgid "lookup config vars"
3338 #: builtin/column.c:27 builtin/column.c:28
3339 msgid "layout to use"
3342 #: builtin/column.c:29
3343 msgid "Maximum width"
3346 #: builtin/column.c:30
3347 msgid "Padding space on left border"
3350 #: builtin/column.c:31
3351 msgid "Padding space on right border"
3354 #: builtin/column.c:32
3355 msgid "Padding space between columns"
3358 #: builtin/column.c:51
3359 msgid "--command must be the first argument"
3360 msgstr "--command 必须是第一个参数"
3362 #: builtin/commit.c:34
3363 msgid "git commit [options] [--] <pathspec>..."
3364 msgstr "git commit [选项] [--] <路径匹配>..."
3366 #: builtin/commit.c:39
3367 msgid "git status [options] [--] <pathspec>..."
3368 msgstr "git status [选项] [--] <路径匹配>..."
3370 #: builtin/commit.c:44
3372 "Your name and email address were configured automatically based\n"
3373 "on your username and hostname. Please check that they are accurate.\n"
3374 "You can suppress this message by setting them explicitly:\n"
3376 " git config --global user.name \"Your Name\"\n"
3377 " git config --global user.email you@example.com\n"
3379 "After doing this, you may fix the identity used for this commit with:\n"
3381 " git commit --amend --reset-author\n"
3383 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3384 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3386 " git config --global user.name \"Your Name\"\n"
3387 " git config --global user.email you@example.com\n"
3389 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3391 " git commit --amend --reset-author\n"
3393 #: builtin/commit.c:56
3395 "You asked to amend the most recent commit, but doing so would make\n"
3396 "it empty. You can repeat your command with --allow-empty, or you can\n"
3397 "remove the commit entirely with \"git reset HEAD^\".\n"
3399 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3400 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3402 #: builtin/commit.c:61
3404 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3405 "If you wish to commit it anyway, use:\n"
3407 " git commit --allow-empty\n"
3409 "Otherwise, please use 'git reset'\n"
3411 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3414 " git commit --allow-empty\n"
3416 "否则,请使用命令 'git reset'\n"
3418 #: builtin/commit.c:258
3419 msgid "failed to unpack HEAD tree object"
3420 msgstr "无法解包 HEAD 树对象"
3422 #: builtin/commit.c:300
3423 msgid "unable to create temporary index"
3426 #: builtin/commit.c:306
3427 msgid "interactive add failed"
3430 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3431 msgid "unable to write new_index file"
3432 msgstr "无法写 new_index 文件"
3434 #: builtin/commit.c:391
3435 msgid "cannot do a partial commit during a merge."
3436 msgstr "在合并过程中不能做部分提交。"
3438 #: builtin/commit.c:393
3439 msgid "cannot do a partial commit during a cherry-pick."
3440 msgstr "在拣选过程中不能做部分提交。"
3442 #: builtin/commit.c:403
3443 msgid "cannot read the index"
3446 #: builtin/commit.c:423
3447 msgid "unable to write temporary index file"
3450 #: builtin/commit.c:511 builtin/commit.c:517
3452 msgid "invalid commit: %s"
3455 #: builtin/commit.c:540
3456 msgid "malformed --author parameter"
3457 msgstr "非法的 --author 参数"
3459 #: builtin/commit.c:560
3461 msgid "Malformed ident string: '%s'"
3462 msgstr "非法的身份字符串:'%s'"
3464 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3466 msgid "could not lookup commit %s"
3469 #: builtin/commit.c:610 builtin/shortlog.c:272
3471 msgid "(reading log message from standard input)\n"
3472 msgstr "(正从标准输入中读取日志信息)\n"
3474 #: builtin/commit.c:612
3475 msgid "could not read log from standard input"
3476 msgstr "不能从标准输入中读取日志信息"
3478 #: builtin/commit.c:616
3480 msgid "could not read log file '%s'"
3481 msgstr "不能读取日志文件 '%s'"
3483 #: builtin/commit.c:622
3484 msgid "commit has empty message"
3487 #: builtin/commit.c:638
3488 msgid "could not read MERGE_MSG"
3489 msgstr "不能读取 MERGE_MSG"
3491 #: builtin/commit.c:642
3492 msgid "could not read SQUASH_MSG"
3493 msgstr "不能读取 SQUASH_MSG"
3495 #: builtin/commit.c:646
3497 msgid "could not read '%s'"
3500 #: builtin/commit.c:707
3501 msgid "could not write commit template"
3504 #: builtin/commit.c:718
3508 "It looks like you may be committing a merge.\n"
3509 "If this is not correct, please remove the file\n"
3514 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
3518 #: builtin/commit.c:723
3522 "It looks like you may be committing a cherry-pick.\n"
3523 "If this is not correct, please remove the file\n"
3528 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3532 #: builtin/commit.c:735
3535 "Please enter the commit message for your changes. Lines starting\n"
3536 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3538 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3541 #: builtin/commit.c:740
3544 "Please enter the commit message for your changes. Lines starting\n"
3545 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3546 "An empty message aborts the commit.\n"
3548 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3549 "也可以删除它们。一个空的提交说明将会终止提交。\n"
3551 # 译者:为保证在输出中对齐,注意调整句中空格!
3552 #: builtin/commit.c:753
3554 msgid "%sAuthor: %s"
3557 # 译者:为保证在输出中对齐,注意调整句中空格!
3558 #: builtin/commit.c:760
3560 msgid "%sCommitter: %s"
3563 #: builtin/commit.c:780
3564 msgid "Cannot read index"
3567 #: builtin/commit.c:817
3568 msgid "Error building trees"
3571 #: builtin/commit.c:832 builtin/tag.c:359
3573 msgid "Please supply the message using either -m or -F option.\n"
3574 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3576 #: builtin/commit.c:929
3578 msgid "No existing author found with '%s'"
3579 msgstr "没有找到匹配 '%s' 的作者"
3581 #: builtin/commit.c:944 builtin/commit.c:1138
3583 msgid "Invalid untracked files mode '%s'"
3584 msgstr "无效的未追踪文件参数 '%s'"
3586 #: builtin/commit.c:974
3587 msgid "Using both --reset-author and --author does not make sense"
3588 msgstr "同时使用 --reset-author 和 --author 没有意义"
3590 #: builtin/commit.c:985
3591 msgid "You have nothing to amend."
3594 #: builtin/commit.c:988
3595 msgid "You are in the middle of a merge -- cannot amend."
3596 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3598 #: builtin/commit.c:990
3599 msgid "You are in the middle of a cherry-pick -- cannot amend."
3600 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3602 #: builtin/commit.c:993
3603 msgid "Options --squash and --fixup cannot be used together"
3604 msgstr "选项 --squash 和 --fixup 不能同时使用"
3606 #: builtin/commit.c:1003
3607 msgid "Only one of -c/-C/-F/--fixup can be used."
3608 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3610 #: builtin/commit.c:1005
3611 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3612 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3614 #: builtin/commit.c:1013
3615 msgid "--reset-author can be used only with -C, -c or --amend."
3616 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3618 #: builtin/commit.c:1030
3619 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3620 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3622 #: builtin/commit.c:1032
3623 msgid "No paths with --include/--only does not make sense."
3624 msgstr "参数 --include/--only 不跟路径没有意义。"
3626 #: builtin/commit.c:1034
3627 msgid "Clever... amending the last one with dirty index."
3628 msgstr "聪明... 在索引不干净下修补最后的提交。"
3630 #: builtin/commit.c:1036
3631 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3632 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3634 #: builtin/commit.c:1046 builtin/tag.c:575
3636 msgid "Invalid cleanup mode %s"
3639 #: builtin/commit.c:1051
3640 msgid "Paths with -a does not make sense."
3641 msgstr "路径和 -a 选项同时使用没有意义。"
3643 #: builtin/commit.c:1057 builtin/commit.c:1192
3644 msgid "--long and -z are incompatible"
3645 msgstr "--long 和 -z 选项不兼容"
3647 #: builtin/commit.c:1152 builtin/commit.c:1388
3648 msgid "show status concisely"
3651 #: builtin/commit.c:1154 builtin/commit.c:1390
3652 msgid "show branch information"
3655 #: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
3656 msgid "machine-readable output"
3659 #: builtin/commit.c:1159 builtin/commit.c:1394
3660 msgid "show status in long format (default)"
3661 msgstr "以长格式显示状态(默认)"
3663 #: builtin/commit.c:1162 builtin/commit.c:1397
3664 msgid "terminate entries with NUL"
3667 #: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3668 #: builtin/fast-export.c:650 builtin/tag.c:459
3672 #: builtin/commit.c:1165 builtin/commit.c:1400
3673 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3674 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3676 #: builtin/commit.c:1168
3677 msgid "show ignored files"
3680 #: builtin/commit.c:1169 parse-options.h:151
3684 #: builtin/commit.c:1170
3686 "ignore changes to submodules, optional when: all, dirty, untracked. "
3689 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3691 #: builtin/commit.c:1172
3692 msgid "list untracked files in columns"
3693 msgstr "以列的方式显示未跟踪的文件"
3695 #: builtin/commit.c:1246
3696 msgid "couldn't look up newly created commit"
3699 #: builtin/commit.c:1248
3700 msgid "could not parse newly created commit"
3703 #: builtin/commit.c:1289
3704 msgid "detached HEAD"
3707 # 译者:中文字符串拼接,可删除前导空格
3708 #: builtin/commit.c:1291
3709 msgid " (root-commit)"
3712 #: builtin/commit.c:1358
3713 msgid "suppress summary after successful commit"
3714 msgstr "提交成功后不显示概述信息"
3716 #: builtin/commit.c:1359
3717 msgid "show diff in commit message template"
3718 msgstr "在提交说明模板里显示差异"
3720 #: builtin/commit.c:1361
3721 msgid "Commit message options"
3724 #: builtin/commit.c:1362 builtin/tag.c:457
3725 msgid "read message from file"
3728 #: builtin/commit.c:1363
3732 #: builtin/commit.c:1363
3733 msgid "override author for commit"
3736 #: builtin/commit.c:1364 builtin/gc.c:178
3740 #: builtin/commit.c:1364
3741 msgid "override date for commit"
3744 #: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3745 #: builtin/notes.c:690 builtin/tag.c:455
3749 #: builtin/commit.c:1365
3750 msgid "commit message"
3753 #: builtin/commit.c:1366
3754 msgid "reuse and edit message from specified commit"
3755 msgstr "重用并编辑指定提交的提交说明"
3757 #: builtin/commit.c:1367
3758 msgid "reuse message from specified commit"
3759 msgstr "重用指定提交的提交说明"
3761 #: builtin/commit.c:1368
3762 msgid "use autosquash formatted message to fixup specified commit"
3763 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3765 #: builtin/commit.c:1369
3766 msgid "use autosquash formatted message to squash specified commit"
3767 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3769 #: builtin/commit.c:1370
3770 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3771 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3773 #: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
3774 msgid "add Signed-off-by:"
3775 msgstr "添加 Signed-off-by: 签名"
3777 #: builtin/commit.c:1372
3778 msgid "use specified template file"
3781 #: builtin/commit.c:1373
3782 msgid "force edit of commit"
3785 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3786 #: builtin/commit.c:1374
3790 #: builtin/commit.c:1374 builtin/tag.c:460
3791 msgid "how to strip spaces and #comments from message"
3792 msgstr "设置如何删除提交说明里的空格和#注释"
3794 #: builtin/commit.c:1375
3795 msgid "include status in commit message template"
3796 msgstr "在提交说明模板里包含状态信息"
3798 #: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
3802 #: builtin/commit.c:1377 builtin/merge.c:214
3803 msgid "GPG sign commit"
3806 #. end commit message options
3807 #: builtin/commit.c:1380
3808 msgid "Commit contents options"
3811 #: builtin/commit.c:1381
3812 msgid "commit all changed files"
3815 #: builtin/commit.c:1382
3816 msgid "add specified files to index for commit"
3817 msgstr "添加指定的文件到索引区等待提交"
3819 #: builtin/commit.c:1383
3820 msgid "interactively add files"
3823 #: builtin/commit.c:1384
3824 msgid "interactively add changes"
3827 #: builtin/commit.c:1385
3828 msgid "commit only specified files"
3831 #: builtin/commit.c:1386
3832 msgid "bypass pre-commit hook"
3833 msgstr "绕过 pre-commit 钩子"
3835 #: builtin/commit.c:1387
3836 msgid "show what would be committed"
3839 #: builtin/commit.c:1398
3840 msgid "amend previous commit"
3843 #: builtin/commit.c:1399
3844 msgid "bypass post-rewrite hook"
3845 msgstr "绕过 post-rewrite 钩子"
3847 #: builtin/commit.c:1404
3848 msgid "ok to record an empty change"
3851 #: builtin/commit.c:1407
3852 msgid "ok to record a change with an empty message"
3855 #: builtin/commit.c:1439
3856 msgid "could not parse HEAD commit"
3857 msgstr "不能解析 HEAD 提交"
3859 #: builtin/commit.c:1477 builtin/merge.c:508
3861 msgid "could not open '%s' for reading"
3862 msgstr "不能为读入打开 '%s'"
3864 #: builtin/commit.c:1484
3866 msgid "Corrupt MERGE_HEAD file (%s)"
3867 msgstr "损坏的 MERGE_HEAD 文件(%s)"
3869 #: builtin/commit.c:1491
3870 msgid "could not read MERGE_MODE"
3871 msgstr "不能读取 MERGE_MODE"
3873 #: builtin/commit.c:1510
3875 msgid "could not read commit message: %s"
3876 msgstr "不能读取提交说明:%s"
3878 #: builtin/commit.c:1524
3880 msgid "Aborting commit; you did not edit the message.\n"
3881 msgstr "终止提交;您未更改来自模版的提交说明。\n"
3883 #: builtin/commit.c:1529
3885 msgid "Aborting commit due to empty commit message.\n"
3886 msgstr "终止提交因为提交说明为空。\n"
3888 #: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
3889 msgid "failed to write commit object"
3892 #: builtin/commit.c:1565
3893 msgid "cannot lock HEAD ref"
3894 msgstr "无法锁定 HEAD 引用"
3896 #: builtin/commit.c:1569
3897 msgid "cannot update HEAD ref"
3898 msgstr "无法更新 HEAD 引用"
3900 #: builtin/commit.c:1580
3902 "Repository has been updated, but unable to write\n"
3903 "new_index file. Check that disk is not full or quota is\n"
3904 "not exceeded, and then \"git reset HEAD\" to recover."
3906 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3907 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
3909 #: builtin/config.c:7
3910 msgid "git config [options]"
3911 msgstr "git config [选项]"
3913 #: builtin/config.c:51
3914 msgid "Config file location"
3917 #: builtin/config.c:52
3918 msgid "use global config file"
3921 #: builtin/config.c:53
3922 msgid "use system config file"
3925 #: builtin/config.c:54
3926 msgid "use repository config file"
3929 #: builtin/config.c:55
3930 msgid "use given config file"
3933 #: builtin/config.c:56
3937 #: builtin/config.c:57
3938 msgid "get value: name [value-regex]"
3939 msgstr "获取值:name [value-regex]"
3941 #: builtin/config.c:58
3942 msgid "get all values: key [value-regex]"
3943 msgstr "获得所有的值:key [value-regex]"
3945 #: builtin/config.c:59
3946 msgid "get values for regexp: name-regex [value-regex]"
3947 msgstr "根据正则表达式获得值:name-regex [value-regex]"
3949 #: builtin/config.c:60
3950 msgid "replace all matching variables: name value [value_regex]"
3951 msgstr "替换所有匹配的变量:name value [value_regex]"
3953 #: builtin/config.c:61
3954 msgid "add a new variable: name value"
3955 msgstr "添加一个新的变量:name value"
3957 #: builtin/config.c:62
3958 msgid "remove a variable: name [value-regex]"
3959 msgstr "删除一个变量:name [value-regex]"
3961 #: builtin/config.c:63
3962 msgid "remove all matches: name [value-regex]"
3963 msgstr "删除所有匹配项:name [value-regex]"
3965 #: builtin/config.c:64
3966 msgid "rename section: old-name new-name"
3967 msgstr "重命名小节:old-name new-name"
3969 #: builtin/config.c:65
3970 msgid "remove a section: name"
3971 msgstr "删除一个小节:name"
3973 #: builtin/config.c:66
3977 #: builtin/config.c:67
3978 msgid "open an editor"
3981 #: builtin/config.c:68 builtin/config.c:69
3985 #: builtin/config.c:68
3986 msgid "find the color configured: [default]"
3987 msgstr "找到配置的颜色:[默认]"
3989 #: builtin/config.c:69
3990 msgid "find the color setting: [stdout-is-tty]"
3991 msgstr "找到颜色设置:[stdout-is-tty]"
3993 #: builtin/config.c:70
3997 #: builtin/config.c:71
3998 msgid "value is \"true\" or \"false\""
3999 msgstr "值是 \"true\" 或 \"false\""
4001 #: builtin/config.c:72
4002 msgid "value is decimal number"
4005 #: builtin/config.c:73
4006 msgid "value is --bool or --int"
4007 msgstr "值是 --bool or --int"
4009 #: builtin/config.c:74
4010 msgid "value is a path (file or directory name)"
4011 msgstr "值是一个路径(文件或目录名)"
4013 #: builtin/config.c:75
4017 #: builtin/config.c:76
4018 msgid "terminate values with NUL byte"
4021 #: builtin/config.c:77
4022 msgid "respect include directives on lookup"
4023 msgstr "查询时参照 include 指令递归查找"
4025 #: builtin/count-objects.c:69
4026 msgid "git count-objects [-v]"
4027 msgstr "git count-objects [-v]"
4029 #: builtin/describe.c:15
4030 msgid "git describe [options] <committish>*"
4031 msgstr "git describe [选项] <提交号>*"
4033 #: builtin/describe.c:16
4034 msgid "git describe [options] --dirty"
4035 msgstr "git describe [选项] --dirty"
4037 #: builtin/describe.c:234
4039 msgid "annotated tag %s not available"
4040 msgstr "注释 tag %s 无效"
4042 #: builtin/describe.c:238
4044 msgid "annotated tag %s has no embedded name"
4045 msgstr "注释 tag %s 没有嵌入名称"
4047 #: builtin/describe.c:240
4049 msgid "tag '%s' is really '%s' here"
4050 msgstr "tag '%s' 的确是在 '%s'"
4052 #: builtin/describe.c:267
4054 msgid "Not a valid object name %s"
4055 msgstr "不是一个有效的对象名 %s"
4057 #: builtin/describe.c:270
4059 msgid "%s is not a valid '%s' object"
4060 msgstr "%s 不是一个有效的 '%s' 对象"
4062 #: builtin/describe.c:287
4064 msgid "no tag exactly matches '%s'"
4065 msgstr "没有 tag 准确匹配 '%s'"
4067 #: builtin/describe.c:289
4069 msgid "searching to describe %s\n"
4072 #: builtin/describe.c:329
4074 msgid "finished search at %s\n"
4077 #: builtin/describe.c:353
4080 "No annotated tags can describe '%s'.\n"
4081 "However, there were unannotated tags: try --tags."
4083 "没有注释 tag 能描述 '%s'。\n"
4084 "然而,有非注释 tag:尝试 --tags。"
4086 #: builtin/describe.c:357
4089 "No tags can describe '%s'.\n"
4090 "Try --always, or create some tags."
4092 "没有注释 tag 能描述 '%s'。\n"
4093 "尝试 --always,或者创建一些 tag。"
4095 #: builtin/describe.c:378
4097 msgid "traversed %lu commits\n"
4098 msgstr "已遍历 %lu 个提交\n"
4100 #: builtin/describe.c:381
4103 "more than %i tags found; listed %i most recent\n"
4104 "gave up search at %s\n"
4106 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4109 #: builtin/describe.c:403
4110 msgid "find the tag that comes after the commit"
4111 msgstr "寻找提交之后的 tag(用于描述提交)"
4113 #: builtin/describe.c:404
4114 msgid "debug search strategy on stderr"
4115 msgstr "在标准错误上调试搜索策略"
4117 #: builtin/describe.c:405
4118 msgid "use any ref in .git/refs"
4119 msgstr "使用 .git/refs 里的任意引用"
4121 #: builtin/describe.c:406
4122 msgid "use any tag in .git/refs/tags"
4123 msgstr "使用 .git/refs/tags 里的任意 tag"
4125 #: builtin/describe.c:407
4126 msgid "always use long format"
4129 #: builtin/describe.c:410
4130 msgid "only output exact matches"
4133 #: builtin/describe.c:412
4134 msgid "consider <n> most recent tags (default: 10)"
4135 msgstr "考虑最近 <n> 个 tags(默认:10)"
4137 #: builtin/describe.c:414
4138 msgid "only consider tags matching <pattern>"
4139 msgstr "只考虑匹配 <模式> 的 tags"
4141 #: builtin/describe.c:416 builtin/name-rev.c:238
4142 msgid "show abbreviated commit object as fallback"
4143 msgstr "显示简写的提交号作为后备"
4145 #: builtin/describe.c:417
4149 #: builtin/describe.c:418
4150 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4151 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4153 #: builtin/describe.c:436
4154 msgid "--long is incompatible with --abbrev=0"
4155 msgstr "--long 与 --abbrev=0 不兼容"
4157 #: builtin/describe.c:462
4158 msgid "No names found, cannot describe anything."
4159 msgstr "没有发现名称,无法描述任何东西。"
4161 #: builtin/describe.c:482
4162 msgid "--dirty is incompatible with committishes"
4163 msgstr "--dirty 不能与提交同时使用"
4165 #: builtin/diff.c:79
4167 msgid "'%s': not a regular file or symlink"
4168 msgstr "'%s':不是一个正规文件或符号链接"
4170 #: builtin/diff.c:228
4172 msgid "invalid option: %s"
4175 #: builtin/diff.c:305
4176 msgid "Not a git repository"
4177 msgstr "不是一个 git 版本库"
4179 #: builtin/diff.c:348
4181 msgid "invalid object '%s' given."
4182 msgstr "提供了无效对象 '%s'。"
4184 #: builtin/diff.c:353
4186 msgid "more than %d trees given: '%s'"
4187 msgstr "提供了超过 %d 个树对象:'%s'"
4189 #: builtin/diff.c:363
4191 msgid "more than two blobs given: '%s'"
4192 msgstr "提供了超过两个数据(blob)对象:'%s'"
4194 #: builtin/diff.c:371
4196 msgid "unhandled object '%s' given."
4197 msgstr "提供了无法处理的对象 '%s'。"
4199 #: builtin/fast-export.c:22
4200 msgid "git fast-export [rev-list-opts]"
4201 msgstr "git fast-export [rev-list-opts]"
4203 #: builtin/fast-export.c:646
4204 msgid "show progress after <n> objects"
4205 msgstr "在 <n> 个对象之后显示进度"
4207 #: builtin/fast-export.c:648
4208 msgid "select handling of signed tags"
4209 msgstr "选择如何处理签名 tags"
4211 #: builtin/fast-export.c:651
4212 msgid "select handling of tags that tag filtered objects"
4213 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4215 #: builtin/fast-export.c:654
4216 msgid "Dump marks to this file"
4219 #: builtin/fast-export.c:656
4220 msgid "Import marks from this file"
4223 #: builtin/fast-export.c:658
4224 msgid "Fake a tagger when tags lack one"
4225 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4227 #: builtin/fast-export.c:660
4228 msgid "Output full tree for each commit"
4231 #: builtin/fast-export.c:662
4232 msgid "Use the done feature to terminate the stream"
4233 msgstr "使用 done 功能来终止流"
4235 #: builtin/fast-export.c:663
4236 msgid "Skip output of blob data"
4239 #: builtin/fetch.c:20
4240 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4241 msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4243 #: builtin/fetch.c:21
4244 msgid "git fetch [<options>] <group>"
4245 msgstr "git fetch [<选项>] <组>"
4247 #: builtin/fetch.c:22
4248 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4249 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4251 #: builtin/fetch.c:23
4252 msgid "git fetch --all [<options>]"
4253 msgstr "git fetch --all [<选项>]"
4255 #: builtin/fetch.c:60
4256 msgid "fetch from all remotes"
4259 #: builtin/fetch.c:62
4260 msgid "append to .git/FETCH_HEAD instead of overwriting"
4261 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4263 #: builtin/fetch.c:64
4264 msgid "path to upload pack on remote end"
4267 #: builtin/fetch.c:65
4268 msgid "force overwrite of local branch"
4271 #: builtin/fetch.c:67
4272 msgid "fetch from multiple remotes"
4275 #: builtin/fetch.c:69
4276 msgid "fetch all tags and associated objects"
4277 msgstr "抓取所有的 tags 和关联对象"
4279 #: builtin/fetch.c:71
4280 msgid "do not fetch all tags (--no-tags)"
4281 msgstr "不抓取任何 tags (--no-tags)"
4283 #: builtin/fetch.c:73
4284 msgid "prune remote-tracking branches no longer on remote"
4285 msgstr "清除远程已经不存在的分支的跟踪分支"
4288 #: builtin/fetch.c:74
4292 #: builtin/fetch.c:75
4293 msgid "control recursive fetching of submodules"
4296 #: builtin/fetch.c:79
4297 msgid "keep downloaded pack"
4300 #: builtin/fetch.c:81
4301 msgid "allow updating of HEAD ref"
4302 msgstr "允许更新 HEAD 引用"
4304 #: builtin/fetch.c:84
4305 msgid "deepen history of shallow clone"
4308 #: builtin/fetch.c:86
4309 msgid "convert to a complete repository"
4310 msgstr "转换为一个完整的版本库"
4312 #: builtin/fetch.c:88 builtin/log.c:1119
4316 #: builtin/fetch.c:89
4317 msgid "prepend this to submodule path output"
4318 msgstr "在子模组路径输出的前面加上此目录"
4320 #: builtin/fetch.c:92
4321 msgid "default mode for recursion"
4324 #: builtin/fetch.c:204
4325 msgid "Couldn't find remote ref HEAD"
4326 msgstr "无法发现远程 HEAD 引用"
4328 #: builtin/fetch.c:257
4330 msgid "object %s not found"
4333 #: builtin/fetch.c:262
4334 msgid "[up to date]"
4337 #: builtin/fetch.c:276
4339 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4340 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4342 #: builtin/fetch.c:277 builtin/fetch.c:363
4346 #: builtin/fetch.c:288
4347 msgid "[tag update]"
4351 #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4352 msgid " (unable to update local ref)"
4353 msgstr " (不能更新本地引用)"
4355 #: builtin/fetch.c:308
4359 #: builtin/fetch.c:311
4360 msgid "[new branch]"
4363 #: builtin/fetch.c:314
4367 #: builtin/fetch.c:359
4368 msgid "unable to update local ref"
4371 #: builtin/fetch.c:359
4372 msgid "forced update"
4375 #: builtin/fetch.c:365
4376 msgid "(non-fast-forward)"
4379 #: builtin/fetch.c:396 builtin/fetch.c:688
4381 msgid "cannot open %s: %s\n"
4382 msgstr "无法打开 %s:%s\n"
4384 #: builtin/fetch.c:405
4386 msgid "%s did not send all necessary objects\n"
4387 msgstr "%s 未发送所有必须的对象\n"
4389 #: builtin/fetch.c:491
4394 #: builtin/fetch.c:502
4397 "some local refs could not be updated; try running\n"
4398 " 'git remote prune %s' to remove any old, conflicting branches"
4400 "一些本地引用不能被更新;尝试运行\n"
4401 " 'git remote prune %s' 来删除旧的、有冲突的分支"
4404 #: builtin/fetch.c:552
4406 msgid " (%s will become dangling)"
4407 msgstr " (%s 将成为摇摆状态)"
4410 #: builtin/fetch.c:553
4412 msgid " (%s has become dangling)"
4413 msgstr " (%s 已成为摇摆状态)"
4415 #: builtin/fetch.c:560
4419 #: builtin/fetch.c:561 builtin/remote.c:1055
4423 #: builtin/fetch.c:678
4425 msgid "Refusing to fetch into current branch %s of non-bare repository"
4426 msgstr "拒绝获取到非裸版本库的当前分支 %s"
4428 #: builtin/fetch.c:712
4430 msgid "Don't know how to fetch from %s"
4431 msgstr "不知道如何从 %s 获取"
4433 #: builtin/fetch.c:789
4435 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4436 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4438 #: builtin/fetch.c:792
4440 msgid "Option \"%s\" is ignored for %s\n"
4441 msgstr "选项 \"%s\" 为 %s 所忽略\n"
4443 #: builtin/fetch.c:894
4445 msgid "Fetching %s\n"
4448 #: builtin/fetch.c:896 builtin/remote.c:100
4450 msgid "Could not fetch %s"
4453 #: builtin/fetch.c:915
4455 "No remote repository specified. Please, specify either a URL or a\n"
4456 "remote name from which new revisions should be fetched."
4457 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4459 #: builtin/fetch.c:935
4460 msgid "You need to specify a tag name."
4461 msgstr "您需要指定一个 tag 名称。"
4463 #: builtin/fetch.c:981
4464 msgid "--depth and --unshallow cannot be used together"
4465 msgstr "--depth 和 --unshallow 不能同时使用"
4467 #: builtin/fetch.c:983
4468 msgid "--unshallow on a complete repository does not make sense"
4469 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4471 #: builtin/fetch.c:1002
4472 msgid "fetch --all does not take a repository argument"
4473 msgstr "fetch --all 不能带一个版本库参数"
4475 #: builtin/fetch.c:1004
4476 msgid "fetch --all does not make sense with refspecs"
4477 msgstr "fetch --all 带引用表达式没有任何意义"
4479 #: builtin/fetch.c:1015
4481 msgid "No such remote or remote group: %s"
4482 msgstr "没有这样的远程或远程组:%s"
4484 #: builtin/fetch.c:1023
4485 msgid "Fetching a group and specifying refspecs does not make sense"
4486 msgstr "获取组并指定引用表达式没有意义"
4488 #: builtin/fmt-merge-msg.c:13
4489 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4491 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4493 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4494 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4495 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4499 #: builtin/fmt-merge-msg.c:660
4500 msgid "populate log with at most <n> entries from shortlog"
4501 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4503 #: builtin/fmt-merge-msg.c:663
4504 msgid "alias for --log (deprecated)"
4505 msgstr "参数 --log 的别名(已弃用)"
4507 #: builtin/fmt-merge-msg.c:666
4511 #: builtin/fmt-merge-msg.c:667
4512 msgid "use <text> as start of message"
4513 msgstr "使用 <文本> 作为提交说明的开始"
4515 #: builtin/fmt-merge-msg.c:668
4516 msgid "file to read from"
4519 #: builtin/for-each-ref.c:979
4520 msgid "git for-each-ref [options] [<pattern>]"
4521 msgstr "git for-each-ref [选项] [<模式>]"
4523 #: builtin/for-each-ref.c:994
4524 msgid "quote placeholders suitably for shells"
4525 msgstr "引用占位符适用于 shells"
4527 #: builtin/for-each-ref.c:996
4528 msgid "quote placeholders suitably for perl"
4529 msgstr "引用占位符适用于 perl"
4531 #: builtin/for-each-ref.c:998
4532 msgid "quote placeholders suitably for python"
4533 msgstr "引用占位符适用于 python"
4535 #: builtin/for-each-ref.c:1000
4536 msgid "quote placeholders suitably for tcl"
4537 msgstr "引用占位符适用于 tcl"
4539 #: builtin/for-each-ref.c:1003
4540 msgid "show only <n> matched refs"
4541 msgstr "只显示 <n> 个匹配的引用"
4543 #: builtin/for-each-ref.c:1004
4547 #: builtin/for-each-ref.c:1004
4548 msgid "format to use for the output"
4551 #: builtin/for-each-ref.c:1005
4555 #: builtin/for-each-ref.c:1006
4556 msgid "field name to sort on"
4559 #: builtin/fsck.c:608
4560 msgid "git fsck [options] [<object>...]"
4561 msgstr "git fsck [选项] [<对象>...]"
4563 #: builtin/fsck.c:614
4564 msgid "show unreachable objects"
4567 #: builtin/fsck.c:615
4568 msgid "show dangling objects"
4571 #: builtin/fsck.c:616
4575 #: builtin/fsck.c:617
4576 msgid "report root nodes"
4579 #: builtin/fsck.c:618
4580 msgid "make index objects head nodes"
4581 msgstr "将索引亦作为检查的头节点"
4583 #: builtin/fsck.c:619
4584 msgid "make reflogs head nodes (default)"
4585 msgstr "将引用日志作为检查的头节点(默认)"
4587 #: builtin/fsck.c:620
4588 msgid "also consider packs and alternate objects"
4591 #: builtin/fsck.c:621
4592 msgid "enable more strict checking"
4595 #: builtin/fsck.c:623
4596 msgid "write dangling objects in .git/lost-found"
4597 msgstr "将摇摆对象写入 .git/lost-found 中"
4599 #: builtin/fsck.c:624 builtin/prune.c:134
4600 msgid "show progress"
4604 msgid "git gc [options]"
4605 msgstr "git gc [选项]"
4609 msgid "Invalid %s: '%s'"
4610 msgstr "无效的 %s:'%s'"
4614 msgid "insanely long object directory %.*s"
4615 msgstr "不正常的长对象目录 %.*s"
4618 msgid "prune unreferenced objects"
4622 msgid "be more thorough (increased runtime)"
4623 msgstr "更彻底(增加运行时间)"
4626 msgid "enable auto-gc mode"
4632 "Auto packing the repository for optimum performance. You may also\n"
4633 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4635 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4636 "参见 \"git help gc\" 以获取更多信息。\n"
4640 "There are too many unreachable loose objects; run 'git prune' to remove them."
4641 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4643 #: builtin/grep.c:22
4644 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4645 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4647 #: builtin/grep.c:217
4649 msgid "grep: failed to create thread: %s"
4650 msgstr "grep:无法创建线程:%s"
4652 #: builtin/grep.c:365
4654 msgid "Failed to chdir: %s"
4657 #: builtin/grep.c:443 builtin/grep.c:478
4659 msgid "unable to read tree (%s)"
4662 #: builtin/grep.c:493
4664 msgid "unable to grep from object of type %s"
4665 msgstr "无法抓取来自于 %s 类型的对象"
4667 #: builtin/grep.c:551
4669 msgid "switch `%c' expects a numerical value"
4670 msgstr "开关 `%c' 期望一个数字值"
4672 #: builtin/grep.c:568
4674 msgid "cannot open '%s'"
4677 #: builtin/grep.c:643
4678 msgid "search in index instead of in the work tree"
4679 msgstr "在索引区搜索而不是在工作区"
4681 #: builtin/grep.c:645
4682 msgid "find in contents not managed by git"
4683 msgstr "在未被 git 管理的内容中查找"
4685 # 译者:中文字符串拼接,可删除前导空格
4686 #: builtin/grep.c:647
4687 msgid "search in both tracked and untracked files"
4688 msgstr "在跟踪和未跟踪的文件中搜索"
4690 #: builtin/grep.c:649
4691 msgid "search also in ignored files"
4694 #: builtin/grep.c:652
4695 msgid "show non-matching lines"
4698 #: builtin/grep.c:654
4699 msgid "case insensitive matching"
4702 #: builtin/grep.c:656
4703 msgid "match patterns only at word boundaries"
4706 #: builtin/grep.c:658
4707 msgid "process binary files as text"
4708 msgstr "把二进制文件当做文本处理"
4710 #: builtin/grep.c:660
4711 msgid "don't match patterns in binary files"
4712 msgstr "不在二进制文件中匹配模式"
4714 #: builtin/grep.c:663
4715 msgid "descend at most <depth> levels"
4716 msgstr "最多以指定的深度向下寻找"
4718 #: builtin/grep.c:667
4719 msgid "use extended POSIX regular expressions"
4720 msgstr "使用扩展的 POSIX 正则表达式"
4722 #: builtin/grep.c:670
4723 msgid "use basic POSIX regular expressions (default)"
4724 msgstr "使用基本的 POSIX 正则表达式(默认)"
4726 #: builtin/grep.c:673
4727 msgid "interpret patterns as fixed strings"
4728 msgstr "把模式解析为固定的字符串"
4730 #: builtin/grep.c:676
4731 msgid "use Perl-compatible regular expressions"
4732 msgstr "使用 Perl 兼容的正则表达式"
4734 #: builtin/grep.c:679
4735 msgid "show line numbers"
4738 #: builtin/grep.c:680
4739 msgid "don't show filenames"
4742 #: builtin/grep.c:681
4743 msgid "show filenames"
4746 #: builtin/grep.c:683
4747 msgid "show filenames relative to top directory"
4748 msgstr "显示相对于顶级目录的文件名"
4750 #: builtin/grep.c:685
4751 msgid "show only filenames instead of matching lines"
4752 msgstr "只显示文件名而不显示匹配的行"
4754 #: builtin/grep.c:687
4755 msgid "synonym for --files-with-matches"
4756 msgstr "和 --files-with-matches 同义"
4758 #: builtin/grep.c:690
4759 msgid "show only the names of files without match"
4762 #: builtin/grep.c:692
4763 msgid "print NUL after filenames"
4764 msgstr "在文件名后输出 NUL 字符"
4766 #: builtin/grep.c:694
4767 msgid "show the number of matches instead of matching lines"
4768 msgstr "显示总匹配行数,而不显示匹配的行"
4770 #: builtin/grep.c:695
4771 msgid "highlight matches"
4774 #: builtin/grep.c:697
4775 msgid "print empty line between matches from different files"
4776 msgstr "在不同文件的匹配项之间打印空行"
4778 #: builtin/grep.c:699
4779 msgid "show filename only once above matches from same file"
4780 msgstr "只在同一文件的匹配项的上面显示一次文件名"
4782 #: builtin/grep.c:702
4783 msgid "show <n> context lines before and after matches"
4784 msgstr "显示匹配项前后的 <n> 行上下文"
4786 #: builtin/grep.c:705
4787 msgid "show <n> context lines before matches"
4788 msgstr "显示匹配项前 <n> 行上下文"
4790 #: builtin/grep.c:707
4791 msgid "show <n> context lines after matches"
4792 msgstr "显示匹配项后 <n> 行上下文"
4794 #: builtin/grep.c:708
4795 msgid "shortcut for -C NUM"
4798 #: builtin/grep.c:711
4799 msgid "show a line with the function name before matches"
4800 msgstr "在匹配的前面显示一行函数名"
4802 #: builtin/grep.c:713
4803 msgid "show the surrounding function"
4804 msgstr "显示所在函数的前后内容"
4806 #: builtin/grep.c:716
4807 msgid "read patterns from file"
4810 #: builtin/grep.c:718
4811 msgid "match <pattern>"
4814 #: builtin/grep.c:720
4815 msgid "combine patterns specified with -e"
4816 msgstr "组合用 -e 参数设定的模式"
4818 #: builtin/grep.c:732
4819 msgid "indicate hit with exit status without output"
4820 msgstr "不输出,而用退出码标识命中状态"
4822 #: builtin/grep.c:734
4823 msgid "show only matches from files that match all patterns"
4824 msgstr "只显示匹配所有模式的文件中的匹配"
4826 #: builtin/grep.c:736
4827 msgid "show parse tree for grep expression"
4828 msgstr "显示 grep 表达式的解析树"
4830 #: builtin/grep.c:740
4834 #: builtin/grep.c:740
4835 msgid "show matching files in the pager"
4838 #: builtin/grep.c:743
4839 msgid "allow calling of grep(1) (ignored by this build)"
4840 msgstr "允许调用 grep(1)(本次构建忽略)"
4842 #: builtin/grep.c:744 builtin/show-ref.c:184
4846 #: builtin/grep.c:811
4847 msgid "no pattern given."
4850 #: builtin/grep.c:825
4852 msgid "bad object %s"
4855 #: builtin/grep.c:868
4856 msgid "--open-files-in-pager only works on the worktree"
4857 msgstr "--open-files-in-pager 仅用于工作区"
4859 #: builtin/grep.c:891
4860 msgid "--cached or --untracked cannot be used with --no-index."
4861 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
4863 #: builtin/grep.c:896
4864 msgid "--no-index or --untracked cannot be used with revs."
4865 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
4867 #: builtin/grep.c:899
4868 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4869 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
4871 #: builtin/grep.c:907
4872 msgid "both --cached and trees are given."
4873 msgstr "同时给出了 --cached 和树对象。"
4875 #: builtin/hash-object.c:60
4877 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4880 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4883 #: builtin/hash-object.c:61
4884 msgid "git hash-object --stdin-paths < <list-of-paths>"
4885 msgstr "git hash-object --stdin-paths < <路径列表>"
4887 #: builtin/hash-object.c:72
4891 #: builtin/hash-object.c:72
4895 #: builtin/hash-object.c:73
4896 msgid "write the object into the object database"
4899 #: builtin/hash-object.c:74
4900 msgid "read the object from stdin"
4903 #: builtin/hash-object.c:76
4904 msgid "store file as is without filters"
4905 msgstr "原样存储文件不使用过滤器"
4907 #: builtin/hash-object.c:77
4908 msgid "process file as it were from this path"
4909 msgstr "处理文件并假设其来自于此路径"
4911 #: builtin/help.c:42
4912 msgid "print all available commands"
4915 #: builtin/help.c:43
4916 msgid "show man page"
4919 #: builtin/help.c:44
4920 msgid "show manual in web browser"
4921 msgstr "在 web 浏览器中显示手册"
4923 #: builtin/help.c:46
4924 msgid "show info page"
4927 #: builtin/help.c:52
4928 msgid "git help [--all] [--man|--web|--info] [command]"
4929 msgstr "git help [--all] [--man|--web|--info] [命令]"
4931 #: builtin/help.c:64
4933 msgid "unrecognized help format '%s'"
4934 msgstr "未能识别的帮助格式 '%s'"
4936 #: builtin/help.c:92
4937 msgid "Failed to start emacsclient."
4938 msgstr "无法启动 emacsclient。"
4940 #: builtin/help.c:105
4941 msgid "Failed to parse emacsclient version."
4942 msgstr "无法解析 emacsclient 版本。"
4944 #: builtin/help.c:113
4946 msgid "emacsclient version '%d' too old (< 22)."
4947 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
4949 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
4951 msgid "failed to exec '%s': %s"
4952 msgstr "无法执行 '%s':%s"
4954 #: builtin/help.c:216
4957 "'%s': path for unsupported man viewer.\n"
4958 "Please consider using 'man.<tool>.cmd' instead."
4960 "'%s':不支持的 man 手册查看器的路径。\n"
4961 "请使用 'man.<tool>.cmd'。"
4963 #: builtin/help.c:228
4966 "'%s': cmd for supported man viewer.\n"
4967 "Please consider using 'man.<tool>.path' instead."
4969 "'%s': 支持的 man 手册查看器命令。\n"
4970 "请使用 'man.<tool>.path'。"
4972 #: builtin/help.c:349
4974 msgid "'%s': unknown man viewer."
4975 msgstr "'%s':未知的 man 查看器。"
4977 #: builtin/help.c:366
4978 msgid "no man viewer handled the request"
4979 msgstr "没有 man 查看器处理此请求"
4981 #: builtin/help.c:374
4982 msgid "no info viewer handled the request"
4983 msgstr "没有 info 查看器处理此请求"
4985 #: builtin/help.c:429 builtin/help.c:436
4990 #: builtin/help.c:452
4992 msgid "`git %s' is aliased to `%s'"
4993 msgstr "`git %s' 是 `%s' 的别名"
4995 #: builtin/index-pack.c:170
4997 msgid "object type mismatch at %s"
4998 msgstr "%s 的对象类型不匹配"
5000 #: builtin/index-pack.c:190
5001 msgid "object of unexpected type"
5004 #: builtin/index-pack.c:227
5006 msgid "cannot fill %d byte"
5007 msgid_plural "cannot fill %d bytes"
5008 msgstr[0] "无法填充 %d 字节"
5009 msgstr[1] "无法填充 %d 字节"
5011 #: builtin/index-pack.c:237
5013 msgstr "过早的文件结束符(EOF)"
5015 #: builtin/index-pack.c:238
5016 msgid "read error on input"
5019 #: builtin/index-pack.c:250
5020 msgid "used more bytes than were available"
5023 #: builtin/index-pack.c:257
5024 msgid "pack too large for current definition of off_t"
5025 msgstr "包太大超过了当前 off_t 的定义"
5027 #: builtin/index-pack.c:273
5029 msgid "unable to create '%s'"
5032 #: builtin/index-pack.c:278
5034 msgid "cannot open packfile '%s'"
5035 msgstr "无法打开包文件 '%s'"
5037 #: builtin/index-pack.c:292
5038 msgid "pack signature mismatch"
5041 #: builtin/index-pack.c:294
5043 msgid "pack version %<PRIu32> unsupported"
5044 msgstr "不支持包版本 %<PRIu32>"
5046 #: builtin/index-pack.c:312
5048 msgid "pack has bad object at offset %lu: %s"
5049 msgstr "包中有错误的对象位于 %lu:%s"
5051 #: builtin/index-pack.c:434
5053 msgid "inflate returned %d"
5056 #: builtin/index-pack.c:483
5057 msgid "offset value overflow for delta base object"
5058 msgstr "偏移值覆盖了 delta 基准对象"
5060 #: builtin/index-pack.c:491
5061 msgid "delta base offset is out of bound"
5062 msgstr "delta 基准偏移越界"
5064 #: builtin/index-pack.c:499
5066 msgid "unknown object type %d"
5069 #: builtin/index-pack.c:530
5070 msgid "cannot pread pack file"
5073 #: builtin/index-pack.c:532
5075 msgid "premature end of pack file, %lu byte missing"
5076 msgid_plural "premature end of pack file, %lu bytes missing"
5077 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5078 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5080 #: builtin/index-pack.c:558
5081 msgid "serious inflate inconsistency"
5084 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
5085 #: builtin/index-pack.c:712 builtin/index-pack.c:721
5087 msgid "SHA1 COLLISION FOUND WITH %s !"
5088 msgstr "发现 %s 出现 SHA1 冲突!"
5090 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
5091 #: builtin/pack-objects.c:262
5093 msgid "unable to read %s"
5096 #: builtin/index-pack.c:718
5098 msgid "cannot read existing object %s"
5099 msgstr "不能读取现存对象 %s"
5101 #: builtin/index-pack.c:732
5103 msgid "invalid blob object %s"
5104 msgstr "无效的数据(blob)对象 %s"
5106 #: builtin/index-pack.c:747
5111 #: builtin/index-pack.c:749
5112 msgid "Error in object"
5115 #: builtin/index-pack.c:751
5117 msgid "Not all child objects of %s are reachable"
5118 msgstr "%s 的所有子对象并非都可达"
5120 #: builtin/index-pack.c:821 builtin/index-pack.c:847
5121 msgid "failed to apply delta"
5124 #: builtin/index-pack.c:986
5125 msgid "Receiving objects"
5128 #: builtin/index-pack.c:986
5129 msgid "Indexing objects"
5132 #: builtin/index-pack.c:1012
5133 msgid "pack is corrupted (SHA1 mismatch)"
5134 msgstr "包冲突(SHA1 不匹配)"
5136 #: builtin/index-pack.c:1017
5137 msgid "cannot fstat packfile"
5140 #: builtin/index-pack.c:1020
5141 msgid "pack has junk at the end"
5144 #: builtin/index-pack.c:1031
5145 msgid "confusion beyond insanity in parse_pack_objects()"
5146 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5148 #: builtin/index-pack.c:1054
5149 msgid "Resolving deltas"
5152 #: builtin/index-pack.c:1064
5154 msgid "unable to create thread: %s"
5157 #: builtin/index-pack.c:1106
5158 msgid "confusion beyond insanity"
5161 #: builtin/index-pack.c:1112
5163 msgid "completed with %d local objects"
5164 msgstr "完成 %d 个本地对象"
5166 #: builtin/index-pack.c:1121
5168 msgid "Unexpected tail checksum for %s (disk corruption?)"
5169 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5171 #: builtin/index-pack.c:1125
5173 msgid "pack has %d unresolved delta"
5174 msgid_plural "pack has %d unresolved deltas"
5175 msgstr[0] "包有 %d 个未解决的 delta"
5176 msgstr[1] "包有 %d 个未解决的 delta"
5178 #: builtin/index-pack.c:1150
5180 msgid "unable to deflate appended object (%d)"
5181 msgstr "不能压缩附加对象(%d)"
5183 #: builtin/index-pack.c:1229
5185 msgid "local object %s is corrupt"
5186 msgstr "本地对象 %s 已损坏"
5188 #: builtin/index-pack.c:1253
5189 msgid "error while closing pack file"
5192 #: builtin/index-pack.c:1266
5194 msgid "cannot write keep file '%s'"
5195 msgstr "无法写保留文件 '%s'"
5197 #: builtin/index-pack.c:1274
5199 msgid "cannot close written keep file '%s'"
5200 msgstr "无法关闭保留文件 '%s'"
5202 #: builtin/index-pack.c:1287
5203 msgid "cannot store pack file"
5206 #: builtin/index-pack.c:1298
5207 msgid "cannot store index file"
5210 #: builtin/index-pack.c:1331
5212 msgid "bad pack.indexversion=%<PRIu32>"
5213 msgstr "坏的 pack.indexversion=%<PRIu32>"
5215 #: builtin/index-pack.c:1337
5217 msgid "invalid number of threads specified (%d)"
5218 msgstr "指定的线程数无效(%d)"
5220 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5222 msgid "no threads support, ignoring %s"
5223 msgstr "没有线程支持,忽略 %s"
5225 #: builtin/index-pack.c:1399
5227 msgid "Cannot open existing pack file '%s'"
5228 msgstr "无法打开现存包文件 '%s'"
5230 #: builtin/index-pack.c:1401
5232 msgid "Cannot open existing pack idx file for '%s'"
5233 msgstr "无法为 %s 打开包索引文件"
5235 #: builtin/index-pack.c:1448
5237 msgid "non delta: %d object"
5238 msgid_plural "non delta: %d objects"
5239 msgstr[0] "非 delta:%d 个对象"
5240 msgstr[1] "非 delta:%d 个对象"
5242 #: builtin/index-pack.c:1455
5244 msgid "chain length = %d: %lu object"
5245 msgid_plural "chain length = %d: %lu objects"
5246 msgstr[0] "链长 = %d: %lu 对象"
5247 msgstr[1] "链长 = %d: %lu 对象"
5249 #: builtin/index-pack.c:1482
5250 msgid "Cannot come back to cwd"
5253 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5254 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
5259 #: builtin/index-pack.c:1559
5260 msgid "--fix-thin cannot be used without --stdin"
5261 msgstr "--fix-thin 不能和 --stdin 同时使用"
5263 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
5265 msgid "packfile name '%s' does not end with '.pack'"
5266 msgstr "包名 '%s' 没有以 '.pack' 结尾"
5268 #: builtin/index-pack.c:1582
5269 msgid "--verify with no packfile name given"
5270 msgstr "--verify 没有提供包名参数"
5272 #: builtin/init-db.c:35
5274 msgid "Could not make %s writable by group"
5275 msgstr "不能设置 %s 为组可写"
5277 #: builtin/init-db.c:62
5279 msgid "insanely long template name %s"
5282 #: builtin/init-db.c:67
5284 msgid "cannot stat '%s'"
5285 msgstr "不能枚举 '%s' 状态"
5287 #: builtin/init-db.c:73
5289 msgid "cannot stat template '%s'"
5290 msgstr "不能枚举模版 '%s' 状态"
5292 #: builtin/init-db.c:80
5294 msgid "cannot opendir '%s'"
5295 msgstr "不能打开目录 '%s'"
5297 #: builtin/init-db.c:97
5299 msgid "cannot readlink '%s'"
5300 msgstr "不能读取链接 '%s'"
5302 #: builtin/init-db.c:99
5304 msgid "insanely long symlink %s"
5307 #: builtin/init-db.c:102
5309 msgid "cannot symlink '%s' '%s'"
5310 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5312 #: builtin/init-db.c:106
5314 msgid "cannot copy '%s' to '%s'"
5315 msgstr "不能拷贝 '%s' 至 '%s'"
5317 #: builtin/init-db.c:110
5319 msgid "ignoring template %s"
5322 #: builtin/init-db.c:133
5324 msgid "insanely long template path %s"
5327 #: builtin/init-db.c:141
5329 msgid "templates not found %s"
5332 #: builtin/init-db.c:154
5334 msgid "not copying templates of a wrong format version %d from '%s'"
5335 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5337 #: builtin/init-db.c:192
5339 msgid "insane git directory %s"
5340 msgstr "不正常的 git 目录 %s"
5342 #: builtin/init-db.c:323 builtin/init-db.c:326
5344 msgid "%s already exists"
5347 #: builtin/init-db.c:355
5349 msgid "unable to handle file type %d"
5350 msgstr "不能处理 %d 类型的文件"
5352 #: builtin/init-db.c:358
5354 msgid "unable to move %s to %s"
5355 msgstr "不能移动 %s 至 %s"
5357 #: builtin/init-db.c:363
5359 msgid "Could not create git link %s"
5360 msgstr "不能创建 git link %s"
5363 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5364 #. * existing" or "Initialized empty", the second " shared" or
5365 #. * "", and the last '%s%s' is the verbatim directory name.
5367 #: builtin/init-db.c:420
5369 msgid "%s%s Git repository in %s%s\n"
5370 msgstr "%s%s Git 版本库于 %s%s\n"
5372 #: builtin/init-db.c:421
5373 msgid "Reinitialized existing"
5376 #: builtin/init-db.c:421
5377 msgid "Initialized empty"
5380 # 译者:中文字符串拼接,可删除前导空格
5381 #: builtin/init-db.c:422
5385 #: builtin/init-db.c:441
5386 msgid "cannot tell cwd"
5389 #: builtin/init-db.c:467
5391 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5392 "shared[=<permissions>]] [directory]"
5394 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5397 #: builtin/init-db.c:490
5401 #: builtin/init-db.c:491
5402 msgid "specify that the git repository is to be shared amongst several users"
5403 msgstr "指定 git 版本库是多个用户之间共享的"
5405 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5409 #: builtin/init-db.c:522 builtin/init-db.c:529
5411 msgid "cannot mkdir %s"
5414 #: builtin/init-db.c:533
5416 msgid "cannot chdir to %s"
5419 #: builtin/init-db.c:555
5422 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5425 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5428 #: builtin/init-db.c:579
5429 msgid "Cannot access current working directory"
5432 #: builtin/init-db.c:586
5434 msgid "Cannot access work tree '%s'"
5435 msgstr "不能访问工作区 '%s'"
5438 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5439 msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5442 msgid " or: git show [options] <object>..."
5443 msgstr " 或者:git show [选项] <对象>..."
5445 #: builtin/log.c:102
5446 msgid "suppress diff output"
5449 #: builtin/log.c:103
5453 #: builtin/log.c:104
5454 msgid "Use mail map file"
5457 #: builtin/log.c:105
5458 msgid "decorate options"
5461 #: builtin/log.c:198
5463 msgid "Final output: %d %s\n"
5464 msgstr "最终输出:%d %s\n"
5466 #: builtin/log.c:419 builtin/log.c:511
5468 msgid "Could not read object %s"
5471 #: builtin/log.c:535
5473 msgid "Unknown type: %d"
5476 #: builtin/log.c:627
5477 msgid "format.headers without value"
5478 msgstr "format.headers 没有值"
5480 #: builtin/log.c:701
5481 msgid "name of output directory is too long"
5484 #: builtin/log.c:717
5486 msgid "Cannot open patch file %s"
5487 msgstr "无法打开补丁文件 %s"
5489 #: builtin/log.c:731
5490 msgid "Need exactly one range."
5493 #: builtin/log.c:739
5494 msgid "Not a range."
5497 #: builtin/log.c:812
5498 msgid "Cover letter needs email format"
5501 #: builtin/log.c:885
5503 msgid "insane in-reply-to: %s"
5504 msgstr "不正常的 in-reply-to:%s"
5506 #: builtin/log.c:913
5507 msgid "git format-patch [options] [<since> | <revision range>]"
5508 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5510 #: builtin/log.c:958
5511 msgid "Two output directories?"
5514 #: builtin/log.c:1097
5515 msgid "use [PATCH n/m] even with a single patch"
5516 msgstr "使用 [PATCH n/m],即使只有一个补丁"
5518 #: builtin/log.c:1100
5519 msgid "use [PATCH] even with multiple patches"
5520 msgstr "使用 [PATCH],即使有多个补丁"
5522 #: builtin/log.c:1104
5523 msgid "print patches to standard out"
5526 #: builtin/log.c:1106
5527 msgid "generate a cover letter"
5530 #: builtin/log.c:1108
5531 msgid "use simple number sequence for output file names"
5532 msgstr "使用简单的数字序列作为输出文件名"
5534 #: builtin/log.c:1109
5538 #: builtin/log.c:1110
5539 msgid "use <sfx> instead of '.patch'"
5540 msgstr "使用 <后缀> 代替 '.patch'"
5542 #: builtin/log.c:1112
5543 msgid "start numbering patches at <n> instead of 1"
5544 msgstr "补丁以 <n> 开始编号,而不是1"
5546 #: builtin/log.c:1114
5547 msgid "mark the series as Nth re-roll"
5548 msgstr "标记补丁系列是第几次重制"
5550 #: builtin/log.c:1116
5551 msgid "Use [<prefix>] instead of [PATCH]"
5552 msgstr "使用 [<前缀>] 代替 [PATCH]"
5554 #: builtin/log.c:1119
5555 msgid "store resulting files in <dir>"
5556 msgstr "把结果文件存储在 <dir>"
5558 #: builtin/log.c:1122
5559 msgid "don't strip/add [PATCH]"
5560 msgstr "不删除/添加 [PATCH]"
5562 #: builtin/log.c:1125
5563 msgid "don't output binary diffs"
5566 #: builtin/log.c:1127
5567 msgid "don't include a patch matching a commit upstream"
5568 msgstr "不包含已在上游提交中的补丁"
5570 #: builtin/log.c:1129
5571 msgid "show patch format instead of default (patch + stat)"
5572 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5574 #: builtin/log.c:1131
5578 #: builtin/log.c:1132
5582 #: builtin/log.c:1133
5583 msgid "add email header"
5586 #: builtin/log.c:1134 builtin/log.c:1136
5590 #: builtin/log.c:1134
5591 msgid "add To: header"
5594 #: builtin/log.c:1136
5595 msgid "add Cc: header"
5598 #: builtin/log.c:1138
5602 #: builtin/log.c:1139
5603 msgid "make first mail a reply to <message-id>"
5604 msgstr "使第一封邮件作为对 <message-id> 的回复"
5606 #: builtin/log.c:1140 builtin/log.c:1143
5610 #: builtin/log.c:1141
5611 msgid "attach the patch"
5614 #: builtin/log.c:1144
5615 msgid "inline the patch"
5618 #: builtin/log.c:1148
5619 msgid "enable message threading, styles: shallow, deep"
5620 msgstr "启用邮件线索,风格:浅,深"
5622 #: builtin/log.c:1150
5626 #: builtin/log.c:1151
5627 msgid "add a signature"
5630 #: builtin/log.c:1153
5631 msgid "don't print the patch filenames"
5634 #: builtin/log.c:1202
5636 msgid "bogus committer info %s"
5637 msgstr "虚假的提交者信息 %s"
5639 #: builtin/log.c:1247
5640 msgid "-n and -k are mutually exclusive."
5641 msgstr "-n 和 -k 互斥。"
5643 #: builtin/log.c:1249
5644 msgid "--subject-prefix and -k are mutually exclusive."
5645 msgstr "--subject-prefix 和 -k 互斥。"
5647 #: builtin/log.c:1257
5648 msgid "--name-only does not make sense"
5649 msgstr "--name-only 无意义"
5651 #: builtin/log.c:1259
5652 msgid "--name-status does not make sense"
5653 msgstr "--name-status 无意义"
5655 #: builtin/log.c:1261
5656 msgid "--check does not make sense"
5657 msgstr "--check 无意义"
5659 #: builtin/log.c:1284
5660 msgid "standard output, or directory, which one?"
5661 msgstr "标准输出或目录,哪一个?"
5663 #: builtin/log.c:1286
5665 msgid "Could not create directory '%s'"
5666 msgstr "不能创建目录 '%s'"
5668 #: builtin/log.c:1439
5669 msgid "Failed to create output files"
5672 #: builtin/log.c:1488
5673 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5674 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5676 #: builtin/log.c:1543
5679 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5680 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5682 #: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5684 msgid "Unknown commit %s"
5687 #: builtin/ls-files.c:409
5688 msgid "git ls-files [options] [<file>...]"
5689 msgstr "git ls-files [选项] [<文件>...]"
5691 #: builtin/ls-files.c:466
5692 msgid "identify the file status with tags"
5695 #: builtin/ls-files.c:468
5696 msgid "use lowercase letters for 'assume unchanged' files"
5697 msgstr "使用小写字母表示 '假设未改变的' 文件"
5699 #: builtin/ls-files.c:470
5700 msgid "show cached files in the output (default)"
5701 msgstr "显示缓存的文件(默认)"
5703 #: builtin/ls-files.c:472
5704 msgid "show deleted files in the output"
5707 #: builtin/ls-files.c:474
5708 msgid "show modified files in the output"
5711 #: builtin/ls-files.c:476
5712 msgid "show other files in the output"
5715 #: builtin/ls-files.c:478
5716 msgid "show ignored files in the output"
5719 #: builtin/ls-files.c:481
5720 msgid "show staged contents' object name in the output"
5721 msgstr "显示暂存区内容的对象名称"
5723 #: builtin/ls-files.c:483
5724 msgid "show files on the filesystem that need to be removed"
5725 msgstr "显示文件系统需要删除的文件"
5727 #: builtin/ls-files.c:485
5728 msgid "show 'other' directories' name only"
5729 msgstr "只显示“其他”目录的名称"
5731 #: builtin/ls-files.c:488
5732 msgid "don't show empty directories"
5735 #: builtin/ls-files.c:491
5736 msgid "show unmerged files in the output"
5739 #: builtin/ls-files.c:493
5740 msgid "show resolve-undo information"
5741 msgstr "显示 resolve-undo 信息"
5743 #: builtin/ls-files.c:495
5744 msgid "skip files matching pattern"
5747 #: builtin/ls-files.c:498
5748 msgid "exclude patterns are read from <file>"
5749 msgstr "从 <文件> 中读取排除模式"
5751 #: builtin/ls-files.c:501
5752 msgid "read additional per-directory exclude patterns in <file>"
5753 msgstr "从 <文件> 读取额外的每个目录的排除模式"
5755 #: builtin/ls-files.c:503
5756 msgid "add the standard git exclusions"
5757 msgstr "添加标准的 git 排除"
5759 #: builtin/ls-files.c:506
5760 msgid "make the output relative to the project top directory"
5761 msgstr "显示相对于顶级目录的文件名"
5763 #: builtin/ls-files.c:509
5764 msgid "if any <file> is not in the index, treat this as an error"
5765 msgstr "如果任何 <文件> 都不在索引区,视为错误"
5767 #: builtin/ls-files.c:510
5771 #: builtin/ls-files.c:511
5772 msgid "pretend that paths removed since <tree-ish> are still present"
5773 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5775 #: builtin/ls-files.c:513
5776 msgid "show debugging data"
5779 #: builtin/ls-tree.c:27
5780 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5781 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5783 #: builtin/ls-tree.c:125
5784 msgid "only show trees"
5787 #: builtin/ls-tree.c:127
5788 msgid "recurse into subtrees"
5791 #: builtin/ls-tree.c:129
5792 msgid "show trees when recursing"
5795 #: builtin/ls-tree.c:132
5796 msgid "terminate entries with NUL byte"
5799 #: builtin/ls-tree.c:133
5800 msgid "include object size"
5803 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5804 msgid "list only filenames"
5807 #: builtin/ls-tree.c:140
5808 msgid "use full path names"
5811 #: builtin/ls-tree.c:142
5812 msgid "list entire tree; not just current directory (implies --full-name)"
5813 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5815 #: builtin/merge.c:43
5816 msgid "git merge [options] [<commit>...]"
5817 msgstr "git merge [选项] [<提交>...]"
5819 #: builtin/merge.c:44
5820 msgid "git merge [options] <msg> HEAD <commit>"
5821 msgstr "git merge [选项] <说明> HEAD <提交>"
5823 #: builtin/merge.c:45
5824 msgid "git merge --abort"
5825 msgstr "git merge --abort"
5827 #: builtin/merge.c:90
5828 msgid "switch `m' requires a value"
5829 msgstr "开关 `m' 需要一个值"
5831 #: builtin/merge.c:127
5833 msgid "Could not find merge strategy '%s'.\n"
5834 msgstr "不能找到合并策略 '%s'。\n"
5836 #: builtin/merge.c:128
5838 msgid "Available strategies are:"
5841 #: builtin/merge.c:133
5843 msgid "Available custom strategies are:"
5846 #: builtin/merge.c:183
5847 msgid "do not show a diffstat at the end of the merge"
5848 msgstr "在合并的最后不显示差异统计"
5850 #: builtin/merge.c:186
5851 msgid "show a diffstat at the end of the merge"
5852 msgstr "在合并的最后显示差异统计"
5854 #: builtin/merge.c:187
5855 msgid "(synonym to --stat)"
5856 msgstr "(和 --stat 同义)"
5858 #: builtin/merge.c:189
5859 msgid "add (at most <n>) entries from shortlog to merge commit message"
5860 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
5862 #: builtin/merge.c:192
5863 msgid "create a single commit instead of doing a merge"
5864 msgstr "创建一个单独的提交而不是做一次合并"
5866 #: builtin/merge.c:194
5867 msgid "perform a commit if the merge succeeds (default)"
5868 msgstr "如果合并成功,执行一次提交(默认)"
5870 #: builtin/merge.c:196
5871 msgid "edit message before committing"
5874 #: builtin/merge.c:198
5875 msgid "allow fast-forward (default)"
5878 #: builtin/merge.c:200
5879 msgid "abort if fast-forward is not possible"
5880 msgstr "如果不能快进就放弃合并"
5882 #: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
5886 #: builtin/merge.c:203
5887 msgid "merge strategy to use"
5890 #: builtin/merge.c:204
5891 msgid "option=value"
5892 msgstr "option=value"
5894 #: builtin/merge.c:205
5895 msgid "option for selected merge strategy"
5898 #: builtin/merge.c:207
5899 msgid "merge commit message (for a non-fast-forward merge)"
5900 msgstr "合并的提交说明(针对非快进式合并)"
5902 #: builtin/merge.c:211
5903 msgid "abort the current in-progress merge"
5904 msgstr "放弃当前正在进行的合并"
5906 #: builtin/merge.c:240
5907 msgid "could not run stash."
5910 #: builtin/merge.c:245
5911 msgid "stash failed"
5914 #: builtin/merge.c:250
5916 msgid "not a valid object: %s"
5917 msgstr "不是一个有效对象:%s"
5919 #: builtin/merge.c:269 builtin/merge.c:286
5920 msgid "read-tree failed"
5924 #: builtin/merge.c:316
5925 msgid " (nothing to squash)"
5928 #: builtin/merge.c:329
5930 msgid "Squash commit -- not updating HEAD\n"
5931 msgstr "压缩提交 -- 未更新 HEAD\n"
5933 #: builtin/merge.c:361
5934 msgid "Writing SQUASH_MSG"
5935 msgstr "写入 SQUASH_MSG"
5937 #: builtin/merge.c:363
5938 msgid "Finishing SQUASH_MSG"
5939 msgstr "完成 SQUASH_MSG"
5941 #: builtin/merge.c:386
5943 msgid "No merge message -- not updating HEAD\n"
5944 msgstr "无合并信息 -- 未更新 HEAD\n"
5946 #: builtin/merge.c:436
5948 msgid "'%s' does not point to a commit"
5949 msgstr "'%s' 没有指向一个提交"
5951 #: builtin/merge.c:535
5953 msgid "Bad branch.%s.mergeoptions string: %s"
5954 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
5956 #: builtin/merge.c:628
5957 msgid "git write-tree failed to write a tree"
5958 msgstr "git write-tree 无法写入一树对象"
5960 #: builtin/merge.c:656
5961 msgid "Not handling anything other than two heads merge."
5962 msgstr "不能处理两个头合并之外的任何操作。"
5964 #: builtin/merge.c:670
5966 msgid "Unknown option for merge-recursive: -X%s"
5967 msgstr "merge-recursive 的未知选项:-X%s"
5969 #: builtin/merge.c:684
5971 msgid "unable to write %s"
5974 #: builtin/merge.c:773
5976 msgid "Could not read from '%s'"
5977 msgstr "不能从 '%s' 读取"
5979 #: builtin/merge.c:782
5981 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
5982 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
5984 #: builtin/merge.c:788
5987 "Please enter a commit message to explain why this merge is necessary,\n"
5988 "especially if it merges an updated upstream into a topic branch.\n"
5990 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
5993 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
5996 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
5998 #: builtin/merge.c:812
5999 msgid "Empty commit message."
6002 #: builtin/merge.c:824
6004 msgid "Wonderful.\n"
6007 #: builtin/merge.c:889
6009 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6010 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6012 #: builtin/merge.c:905
6014 msgid "'%s' is not a commit"
6015 msgstr "'%s' 不是一个提交"
6017 #: builtin/merge.c:946
6018 msgid "No current branch."
6021 #: builtin/merge.c:948
6022 msgid "No remote for the current branch."
6023 msgstr "当前分支没有对应的远程版本库。"
6025 #: builtin/merge.c:950
6026 msgid "No default upstream defined for the current branch."
6027 msgstr "当前分支没有定义默认的上游分支。"
6029 #: builtin/merge.c:955
6031 msgid "No remote tracking branch for %s from %s"
6032 msgstr "%s 没有来自 %s 的远程跟踪分支"
6034 #: builtin/merge.c:1042 builtin/merge.c:1199
6036 msgid "%s - not something we can merge"
6039 #: builtin/merge.c:1110
6040 msgid "There is no merge to abort (MERGE_HEAD missing)."
6041 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6043 #: builtin/merge.c:1126 git-pull.sh:31
6045 "You have not concluded your merge (MERGE_HEAD exists).\n"
6046 "Please, commit your changes before you can merge."
6048 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6051 #: builtin/merge.c:1129 git-pull.sh:34
6052 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6053 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6055 #: builtin/merge.c:1133
6057 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6058 "Please, commit your changes before you can merge."
6060 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6063 #: builtin/merge.c:1136
6064 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6065 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6067 #: builtin/merge.c:1145
6068 msgid "You cannot combine --squash with --no-ff."
6069 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6071 #: builtin/merge.c:1150
6072 msgid "You cannot combine --no-ff with --ff-only."
6073 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6075 #: builtin/merge.c:1157
6076 msgid "No commit specified and merge.defaultToUpstream not set."
6077 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6079 #: builtin/merge.c:1189
6080 msgid "Can merge only exactly one commit into empty head"
6081 msgstr "只能将一个提交合并到空分支上"
6083 #: builtin/merge.c:1192
6084 msgid "Squash commit into empty head not supported yet"
6085 msgstr "尚不支持到空分支的压缩提交"
6087 #: builtin/merge.c:1194
6088 msgid "Non-fast-forward commit does not make sense into an empty head"
6089 msgstr "到空分支的非快进式提交没有意义"
6091 #: builtin/merge.c:1310
6093 msgid "Updating %s..%s\n"
6094 msgstr "更新 %s..%s\n"
6096 #: builtin/merge.c:1349
6098 msgid "Trying really trivial in-index merge...\n"
6099 msgstr "尝试非常小的索引内合并...\n"
6101 #: builtin/merge.c:1356
6106 #: builtin/merge.c:1388
6107 msgid "Not possible to fast-forward, aborting."
6110 #: builtin/merge.c:1411 builtin/merge.c:1490
6112 msgid "Rewinding the tree to pristine...\n"
6113 msgstr "将树回滚至原始状态...\n"
6115 #: builtin/merge.c:1415
6117 msgid "Trying merge strategy %s...\n"
6118 msgstr "尝试合并策略 %s...\n"
6120 #: builtin/merge.c:1481
6122 msgid "No merge strategy handled the merge.\n"
6123 msgstr "没有合并策略处理此合并。\n"
6125 #: builtin/merge.c:1483
6127 msgid "Merge with strategy %s failed.\n"
6128 msgstr "使用策略 %s 合并失败。\n"
6130 #: builtin/merge.c:1492
6132 msgid "Using the %s to prepare resolving by hand.\n"
6133 msgstr "使用 %s 以准备手工解决。\n"
6135 #: builtin/merge.c:1504
6137 msgid "Automatic merge went well; stopped before committing as requested\n"
6138 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6140 #: builtin/merge-base.c:26
6141 msgid "git merge-base [-a|--all] <commit> <commit>..."
6142 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6144 #: builtin/merge-base.c:27
6145 msgid "git merge-base [-a|--all] --octopus <commit>..."
6146 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6148 #: builtin/merge-base.c:28
6149 msgid "git merge-base --independent <commit>..."
6150 msgstr "git merge-base --independent <提交>..."
6152 #: builtin/merge-base.c:29
6153 msgid "git merge-base --is-ancestor <commit> <commit>"
6154 msgstr "git merge-base --is-ancestor <提交> <提交>"
6156 #: builtin/merge-base.c:98
6157 msgid "output all common ancestors"
6160 #: builtin/merge-base.c:99
6161 msgid "find ancestors for a single n-way merge"
6162 msgstr "查找一个多路合并的祖先提交"
6164 #: builtin/merge-base.c:100
6165 msgid "list revs not reachable from others"
6166 msgstr "显示不能被其他访问到的版本"
6168 #: builtin/merge-base.c:102
6169 msgid "is the first one ancestor of the other?"
6170 msgstr "第一个是其他的祖先提交么?"
6172 #: builtin/merge-file.c:8
6174 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6177 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6179 #: builtin/merge-file.c:33
6180 msgid "send results to standard output"
6183 #: builtin/merge-file.c:34
6184 msgid "use a diff3 based merge"
6185 msgstr "使用基于 diff3 的合并"
6187 #: builtin/merge-file.c:35
6188 msgid "for conflicts, use our version"
6189 msgstr "如果冲突,使用我们的版本"
6191 #: builtin/merge-file.c:37
6192 msgid "for conflicts, use their version"
6193 msgstr "如果冲突,使用他们的版本"
6195 #: builtin/merge-file.c:39
6196 msgid "for conflicts, use a union version"
6197 msgstr "如果冲突,使用联合版本"
6199 #: builtin/merge-file.c:42
6200 msgid "for conflicts, use this marker size"
6201 msgstr "如果冲突,使用指定长度的标记"
6203 #: builtin/merge-file.c:43
6204 msgid "do not warn about conflicts"
6207 #: builtin/merge-file.c:45
6208 msgid "set labels for file1/orig_file/file2"
6209 msgstr "为 file1/orig_file/file2 设置标签"
6211 #: builtin/mktree.c:67
6212 msgid "git mktree [-z] [--missing] [--batch]"
6213 msgstr "git mktree [-z] [--missing] [--batch]"
6215 #: builtin/mktree.c:153
6216 msgid "input is NUL terminated"
6217 msgstr "输入以 NUL 字符终止"
6219 #: builtin/mktree.c:154 builtin/write-tree.c:24
6220 msgid "allow missing objects"
6223 #: builtin/mktree.c:155
6224 msgid "allow creation of more than one tree"
6228 msgid "git mv [options] <source>... <destination>"
6229 msgstr "git mv [选项] <源>... <目标>"
6232 msgid "force move/rename even if target exists"
6233 msgstr "强制移动/重命令,即使目标存在"
6236 msgid "skip move/rename errors"
6241 msgid "Checking rename of '%s' to '%s'\n"
6242 msgstr "检查 '%s' 到 '%s' 的重命名\n"
6249 msgid "can not move directory into itself"
6253 msgid "cannot move directory over file"
6258 msgid "Huh? %.*s is in index?"
6259 msgstr "嗯?%.*s 在索引中?"
6262 msgid "source directory is empty"
6266 msgid "not under version control"
6270 msgid "destination exists"
6275 msgid "overwriting '%s'"
6279 msgid "Cannot overwrite"
6283 msgid "multiple sources for the same target"
6288 msgid "%s, source=%s, destination=%s"
6289 msgstr "%s,源=%s,目标=%s"
6293 msgid "Renaming %s to %s\n"
6294 msgstr "重命名 %s 至 %s\n"
6296 #: builtin/mv.c:215 builtin/remote.c:731
6298 msgid "renaming '%s' failed"
6299 msgstr "重命名 '%s' 失败"
6301 #: builtin/name-rev.c:175
6302 msgid "git name-rev [options] <commit>..."
6303 msgstr "git name-rev [选项] <提交>..."
6305 #: builtin/name-rev.c:176
6306 msgid "git name-rev [options] --all"
6307 msgstr "git name-rev [选项] --all"
6309 #: builtin/name-rev.c:177
6310 msgid "git name-rev [options] --stdin"
6311 msgstr "git name-rev [选项] --stdin"
6313 #: builtin/name-rev.c:229
6314 msgid "print only names (no SHA-1)"
6315 msgstr "只打印名称(无 SHA-1)"
6317 #: builtin/name-rev.c:230
6318 msgid "only use tags to name the commits"
6319 msgstr "只使用 tags 来命名提交"
6321 #: builtin/name-rev.c:232
6322 msgid "only use refs matching <pattern>"
6323 msgstr "只使用和 <模式> 相匹配的引用"
6325 #: builtin/name-rev.c:234
6326 msgid "list all commits reachable from all refs"
6327 msgstr "列出可以从所有引用访问的提交"
6329 #: builtin/name-rev.c:235
6330 msgid "read from stdin"
6333 #: builtin/name-rev.c:236
6334 msgid "allow to print `undefined` names"
6335 msgstr "允许打印 `未定义` 的名称"
6337 #: builtin/notes.c:26
6338 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6339 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6341 #: builtin/notes.c:27
6343 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6344 "<object>] [<object>]"
6346 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6349 #: builtin/notes.c:28
6350 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6351 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6353 #: builtin/notes.c:29
6355 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6356 "<object>] [<object>]"
6358 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6361 #: builtin/notes.c:30
6362 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6363 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6365 #: builtin/notes.c:31
6366 msgid "git notes [--ref <notes_ref>] show [<object>]"
6367 msgstr "git notes [--ref <注解引用>] show [<对象>]"
6369 #: builtin/notes.c:32
6371 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6372 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6374 #: builtin/notes.c:33
6375 msgid "git notes merge --commit [-v | -q]"
6376 msgstr "git notes merge --commit [-v | -q]"
6378 #: builtin/notes.c:34
6379 msgid "git notes merge --abort [-v | -q]"
6380 msgstr "git notes merge --abort [-v | -q]"
6382 #: builtin/notes.c:35
6383 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6384 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6386 #: builtin/notes.c:36
6387 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6388 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6390 #: builtin/notes.c:37
6391 msgid "git notes [--ref <notes_ref>] get-ref"
6392 msgstr "git notes [--ref <注解引用>] get-ref"
6394 #: builtin/notes.c:42
6395 msgid "git notes [list [<object>]]"
6396 msgstr "git notes [list [<对象>]]"
6398 #: builtin/notes.c:47
6399 msgid "git notes add [<options>] [<object>]"
6400 msgstr "git notes add [<选项>] [<对象>]"
6402 #: builtin/notes.c:52
6403 msgid "git notes copy [<options>] <from-object> <to-object>"
6404 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6406 #: builtin/notes.c:53
6407 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6408 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6410 #: builtin/notes.c:58
6411 msgid "git notes append [<options>] [<object>]"
6412 msgstr "git notes append [<选项>] [<对象>]"
6414 #: builtin/notes.c:63
6415 msgid "git notes edit [<object>]"
6416 msgstr "git notes edit [<对象>]"
6418 #: builtin/notes.c:68
6419 msgid "git notes show [<object>]"
6420 msgstr "git notes show [<对象>]"
6422 #: builtin/notes.c:73
6423 msgid "git notes merge [<options>] <notes_ref>"
6424 msgstr "git notes merge [<选项>] <注解引用>"
6426 #: builtin/notes.c:74
6427 msgid "git notes merge --commit [<options>]"
6428 msgstr "git notes merge --commit [<选项>]"
6430 #: builtin/notes.c:75
6431 msgid "git notes merge --abort [<options>]"
6432 msgstr "git notes merge --abort [<选项>]"
6434 #: builtin/notes.c:80
6435 msgid "git notes remove [<object>]"
6436 msgstr "git notes remove [<对象>]"
6438 #: builtin/notes.c:85
6439 msgid "git notes prune [<options>]"
6440 msgstr "git notes prune [<选项>]"
6442 #: builtin/notes.c:90
6443 msgid "git notes get-ref"
6444 msgstr "git notes get-ref"
6446 #: builtin/notes.c:139
6448 msgid "unable to start 'show' for object '%s'"
6449 msgstr "不能为对象 '%s' 开始 'show'"
6451 #: builtin/notes.c:143
6452 msgid "could not read 'show' output"
6453 msgstr "不能读取 'show' 的输出"
6455 #: builtin/notes.c:151
6457 msgid "failed to finish 'show' for object '%s'"
6458 msgstr "无法为对象 '%s' 完成 'show'"
6460 #: builtin/notes.c:169 builtin/tag.c:341
6462 msgid "could not create file '%s'"
6463 msgstr "不能创建文件 '%s'"
6465 #: builtin/notes.c:188
6466 msgid "Please supply the note contents using either -m or -F option"
6467 msgstr "请通过 -m 或 -F 选项为注解提供内容"
6469 #: builtin/notes.c:209 builtin/notes.c:972
6471 msgid "Removing note for object %s\n"
6472 msgstr "删除对象 %s 的注解\n"
6474 #: builtin/notes.c:214
6475 msgid "unable to write note object"
6478 #: builtin/notes.c:216
6480 msgid "The note contents has been left in %s"
6481 msgstr "注解内容被留在文件 %s 中"
6483 #: builtin/notes.c:250 builtin/tag.c:540
6485 msgid "cannot read '%s'"
6488 #: builtin/notes.c:252 builtin/tag.c:543
6490 msgid "could not open or read '%s'"
6491 msgstr "不能打开或读取 '%s'"
6493 #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6494 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6495 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6496 #: builtin/notes.c:967 builtin/tag.c:556
6498 msgid "Failed to resolve '%s' as a valid ref."
6499 msgstr "无法解析 '%s' 为一个有效引用。"
6501 #: builtin/notes.c:274
6503 msgid "Failed to read object '%s'."
6504 msgstr "无法读取对象 '%s'。"
6506 #: builtin/notes.c:298
6507 msgid "Cannot commit uninitialized/unreferenced notes tree"
6508 msgstr "不能提交未初始化/未引用的注解树"
6510 #: builtin/notes.c:339
6512 msgid "Bad notes.rewriteMode value: '%s'"
6513 msgstr "坏的 notes.rewriteMode 值:'%s'"
6515 #: builtin/notes.c:349
6517 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6518 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6520 #. TRANSLATORS: The first %s is the name of the
6521 #. environment variable, the second %s is its value
6522 #: builtin/notes.c:376
6524 msgid "Bad %s value: '%s'"
6525 msgstr "坏的 %s 值:'%s'"
6527 #: builtin/notes.c:440
6529 msgid "Malformed input line: '%s'."
6530 msgstr "非法的输入行:'%s'。"
6532 #: builtin/notes.c:455
6534 msgid "Failed to copy notes from '%s' to '%s'"
6535 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6537 #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6538 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6539 #: builtin/notes.c:1032
6540 msgid "too many parameters"
6543 #: builtin/notes.c:512 builtin/notes.c:771
6545 msgid "No note found for object %s."
6546 msgstr "未发现对象 %s 的注解。"
6548 #: builtin/notes.c:534 builtin/notes.c:691
6549 msgid "note contents as a string"
6550 msgstr "注解内容作为一个字符串"
6552 #: builtin/notes.c:537 builtin/notes.c:694
6553 msgid "note contents in a file"
6556 #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6557 #: builtin/notes.c:699 builtin/tag.c:474
6561 #: builtin/notes.c:540 builtin/notes.c:697
6562 msgid "reuse and edit specified note object"
6563 msgstr "重用和编辑指定的注解对象"
6565 #: builtin/notes.c:543 builtin/notes.c:700
6566 msgid "reuse specified note object"
6569 #: builtin/notes.c:545 builtin/notes.c:613
6570 msgid "replace existing notes"
6573 #: builtin/notes.c:579
6576 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6578 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6580 #: builtin/notes.c:584 builtin/notes.c:661
6582 msgid "Overwriting existing notes for object %s\n"
6583 msgstr "覆盖对象 %s 现存注解\n"
6585 #: builtin/notes.c:614
6586 msgid "read objects from stdin"
6589 #: builtin/notes.c:616
6590 msgid "load rewriting config for <command> (implies --stdin)"
6591 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6593 #: builtin/notes.c:634
6594 msgid "too few parameters"
6597 #: builtin/notes.c:655
6600 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6602 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6604 #: builtin/notes.c:667
6606 msgid "Missing notes on source object %s. Cannot copy."
6607 msgstr "源对象 %s 缺少注解。不能拷贝。"
6609 #: builtin/notes.c:716
6612 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6613 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6615 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6616 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
6618 #: builtin/notes.c:863
6619 msgid "General options"
6622 #: builtin/notes.c:865
6623 msgid "Merge options"
6626 #: builtin/notes.c:867
6628 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6630 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6632 #: builtin/notes.c:869
6633 msgid "Committing unmerged notes"
6636 #: builtin/notes.c:871
6637 msgid "finalize notes merge by committing unmerged notes"
6638 msgstr "通过提交未合并的注解来完成注解合并"
6640 #: builtin/notes.c:873
6641 msgid "Aborting notes merge resolution"
6644 #: builtin/notes.c:875
6645 msgid "abort notes merge"
6648 #: builtin/notes.c:970
6650 msgid "Object %s has no note\n"
6651 msgstr "对象 %s 没有注解\n"
6653 #: builtin/notes.c:982
6654 msgid "attempt to remove non-existent note is not an error"
6655 msgstr "尝试删除不存在的注解不是一个错误"
6657 #: builtin/notes.c:985
6658 msgid "read object names from the standard input"
6659 msgstr "从标准输入读取对象名称"
6661 #: builtin/notes.c:1066
6665 #: builtin/notes.c:1067
6666 msgid "use notes from <notes_ref>"
6667 msgstr "从 <注解引用> 使用注解"
6669 #: builtin/notes.c:1102 builtin/remote.c:1598
6671 msgid "Unknown subcommand: %s"
6674 #: builtin/pack-objects.c:23
6675 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6676 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6678 #: builtin/pack-objects.c:24
6679 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6680 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6682 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6684 msgid "deflate error (%d)"
6687 #: builtin/pack-objects.c:2397
6689 msgid "unsupported index version %s"
6690 msgstr "不支持的索引版本 %s"
6692 #: builtin/pack-objects.c:2401
6694 msgid "bad index version '%s'"
6695 msgstr "坏的索引版本 '%s'"
6697 #: builtin/pack-objects.c:2424
6699 msgid "option %s does not accept negative form"
6700 msgstr "选项 %s 不接受否定格式"
6702 #: builtin/pack-objects.c:2428
6704 msgid "unable to parse value '%s' for option %s"
6705 msgstr "不能解析选项 %1$s 的值 '%2$s'"
6707 #: builtin/pack-objects.c:2447
6708 msgid "do not show progress meter"
6711 #: builtin/pack-objects.c:2449
6712 msgid "show progress meter"
6715 #: builtin/pack-objects.c:2451
6716 msgid "show progress meter during object writing phase"
6717 msgstr "在对象写入阶段显示进度表"
6719 #: builtin/pack-objects.c:2454
6720 msgid "similar to --all-progress when progress meter is shown"
6721 msgstr "当进度表显示时类似于 --all-progress"
6723 #: builtin/pack-objects.c:2455
6724 msgid "version[,offset]"
6727 #: builtin/pack-objects.c:2456
6728 msgid "write the pack index file in the specified idx format version"
6729 msgstr "用指定的 idx 格式版本来写包索引文件"
6731 #: builtin/pack-objects.c:2459
6732 msgid "maximum size of each output pack file"
6735 #: builtin/pack-objects.c:2461
6736 msgid "ignore borrowed objects from alternate object store"
6737 msgstr "忽略从替代对象存储里借用对象"
6739 #: builtin/pack-objects.c:2463
6740 msgid "ignore packed objects"
6743 #: builtin/pack-objects.c:2465
6744 msgid "limit pack window by objects"
6747 #: builtin/pack-objects.c:2467
6748 msgid "limit pack window by memory in addition to object limit"
6749 msgstr "除对象数量限制外设置打包窗口的内存限制"
6751 #: builtin/pack-objects.c:2469
6752 msgid "maximum length of delta chain allowed in the resulting pack"
6753 msgstr "打包允许的 delta 链的最大长度"
6755 #: builtin/pack-objects.c:2471
6756 msgid "reuse existing deltas"
6757 msgstr "重用已存在的 deltas"
6759 #: builtin/pack-objects.c:2473
6760 msgid "reuse existing objects"
6763 #: builtin/pack-objects.c:2475
6764 msgid "use OFS_DELTA objects"
6765 msgstr "使用 OFS_DELTA 对象"
6767 #: builtin/pack-objects.c:2477
6768 msgid "use threads when searching for best delta matches"
6769 msgstr "使用线程查询最佳 delta 匹配"
6771 #: builtin/pack-objects.c:2479
6772 msgid "do not create an empty pack output"
6775 #: builtin/pack-objects.c:2481
6776 msgid "read revision arguments from standard input"
6777 msgstr "从标准输入读取修订号参数"
6779 #: builtin/pack-objects.c:2483
6780 msgid "limit the objects to those that are not yet packed"
6781 msgstr "限制那些尚未打包的对象"
6783 #: builtin/pack-objects.c:2486
6784 msgid "include objects reachable from any reference"
6785 msgstr "包括可以从任何引用访问到的对象"
6787 #: builtin/pack-objects.c:2489
6788 msgid "include objects referred by reflog entries"
6789 msgstr "包括被引用日志引用到的对象"
6791 #: builtin/pack-objects.c:2492
6792 msgid "output pack to stdout"
6795 #: builtin/pack-objects.c:2494
6796 msgid "include tag objects that refer to objects to be packed"
6797 msgstr "包括引用了打包对象的 tag"
6799 #: builtin/pack-objects.c:2496
6800 msgid "keep unreachable objects"
6803 #: builtin/pack-objects.c:2497 parse-options.h:141
6807 #: builtin/pack-objects.c:2498
6808 msgid "unpack unreachable objects newer than <time>"
6809 msgstr "将比给定 <时间> 新的无法访问的对象解包"
6811 #: builtin/pack-objects.c:2501
6812 msgid "create thin packs"
6815 #: builtin/pack-objects.c:2503
6816 msgid "ignore packs that have companion .keep file"
6817 msgstr "忽略配有 .keep 文件的包"
6819 #: builtin/pack-objects.c:2505
6820 msgid "pack compression level"
6823 #: builtin/pack-objects.c:2507
6824 msgid "do not hide commits by grafts"
6827 #: builtin/pack-refs.c:6
6828 msgid "git pack-refs [options]"
6829 msgstr "git pack-refs [选项]"
6831 #: builtin/pack-refs.c:14
6832 msgid "pack everything"
6835 #: builtin/pack-refs.c:15
6836 msgid "prune loose refs (default)"
6837 msgstr "清除松散的引用(默认)"
6839 #: builtin/prune-packed.c:7
6840 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6841 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6843 #: builtin/prune.c:12
6844 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6845 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
6847 #: builtin/prune.c:132
6848 msgid "do not remove, show only"
6851 #: builtin/prune.c:133
6852 msgid "report pruned objects"
6855 #: builtin/prune.c:136
6856 msgid "expire objects older than <time>"
6857 msgstr "使早于给定时间的对象过期"
6859 #: builtin/push.c:14
6860 msgid "git push [<options>] [<repository> [<refspec>...]]"
6861 msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
6863 #: builtin/push.c:45
6864 msgid "tag shorthand without <tag>"
6865 msgstr "tag 简写没有跟 <tag> 参数"
6867 #: builtin/push.c:64
6868 msgid "--delete only accepts plain target ref names"
6869 msgstr "--delete 只接受简单的目标引用名"
6871 #: builtin/push.c:99
6874 "To choose either option permanently, see push.default in 'git help config'."
6877 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
6879 #: builtin/push.c:102
6882 "The upstream branch of your current branch does not match\n"
6883 "the name of your current branch. To push to the upstream branch\n"
6884 "on the remote, use\n"
6886 " git push %s HEAD:%s\n"
6888 "To push to the branch of the same name on the remote, use\n"
6893 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6896 " git push %s HEAD:%s\n"
6903 #: builtin/push.c:121
6906 "You are not currently on a branch.\n"
6907 "To push the history leading to the current (detached HEAD)\n"
6910 " git push %s HEAD:<name-of-remote-branch>\n"
6913 "现在为推送当前(分离头指针)的历史,使用\n"
6915 " git push %s HEAD:<name-of-remote-branch>\n"
6917 #: builtin/push.c:128
6920 "The current branch %s has no upstream branch.\n"
6921 "To push the current branch and set the remote as upstream, use\n"
6923 " git push --set-upstream %s %s\n"
6925 "当前分支 %s 没有对应的上游分支。\n"
6926 "为推送当前分支并建立与远程上游的跟踪,使用\n"
6928 " git push --set-upstream %s %s\n"
6930 #: builtin/push.c:136
6932 msgid "The current branch %s has multiple upstream branches, refusing to push."
6933 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6935 #: builtin/push.c:139
6938 "You are pushing to remote '%s', which is not the upstream of\n"
6939 "your current branch '%s', without telling me what to push\n"
6940 "to update which remote branch."
6942 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6943 "而没有告诉我要推送什么、更新哪个远程分支。"
6945 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6946 #: builtin/push.c:151
6948 "push.default is unset; its implicit value is changing in\n"
6949 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6950 "and maintain the current behavior after the default changes, use:\n"
6952 " git config --global push.default matching\n"
6954 "To squelch this message and adopt the new behavior now, use:\n"
6956 " git config --global push.default simple\n"
6958 "See 'git help config' and search for 'push.default' for further "
6960 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6961 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6963 "push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6964 "修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6967 " git config --global push.default matching\n"
6969 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6971 " git config --global push.default simple\n"
6973 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6974 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
6975 "为保持兼容,请用 'current' 代替 'simple' 模式)"
6977 #: builtin/push.c:199
6979 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
6980 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
6982 #: builtin/push.c:206
6984 "Updates were rejected because the tip of your current branch is behind\n"
6985 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
6986 "before pushing again.\n"
6987 "See the 'Note about fast-forwards' in 'git push --help' for details."
6989 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
6990 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
6991 "'git push --help' 中的 'Note about fast-forwards' 小节。"
6993 #: builtin/push.c:212
6995 "Updates were rejected because a pushed branch tip is behind its remote\n"
6996 "counterpart. If you did not intend to push that branch, you may want to\n"
6997 "specify branches to push or set the 'push.default' configuration variable\n"
6998 "to 'simple', 'current' or 'upstream' to push only the current branch."
7000 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7001 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7002 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7005 #: builtin/push.c:218
7007 "Updates were rejected because a pushed branch tip is behind its remote\n"
7008 "counterpart. Check out this branch and merge the remote changes\n"
7009 "(e.g. 'git pull') before pushing again.\n"
7010 "See the 'Note about fast-forwards' in 'git push --help' for details."
7012 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7013 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7014 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7016 #: builtin/push.c:224
7018 "Updates were rejected because the remote contains work that you do\n"
7019 "not have locally. This is usually caused by another repository pushing\n"
7020 "to the same ref. You may want to first merge the remote changes (e.g.,\n"
7021 "'git pull') before pushing again.\n"
7022 "See the 'Note about fast-forwards' in 'git push --help' for details."
7024 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7025 "一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7027 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7029 #: builtin/push.c:231
7030 msgid "Updates were rejected because the tag already exists in the remote."
7031 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7033 #: builtin/push.c:234
7035 "You cannot update a remote ref that points at a non-commit object,\n"
7036 "or update a remote ref to make it point at a non-commit object,\n"
7037 "without using the '--force' option.\n"
7039 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7040 "也不能更新远程引用让其指向一个非提交对象。\n"
7042 #: builtin/push.c:294
7044 msgid "Pushing to %s\n"
7047 #: builtin/push.c:298
7049 msgid "failed to push some refs to '%s'"
7050 msgstr "无法推送一些引用到 '%s'"
7052 #: builtin/push.c:331
7054 msgid "bad repository '%s'"
7057 #: builtin/push.c:332
7059 "No configured push destination.\n"
7060 "Either specify the URL from the command-line or configure a remote "
7061 "repository using\n"
7063 " git remote add <name> <url>\n"
7065 "and then push using the remote name\n"
7067 " git push <name>\n"
7070 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7072 " git remote add <name> <url>\n"
7076 " git push <name>\n"
7078 #: builtin/push.c:347
7079 msgid "--all and --tags are incompatible"
7080 msgstr "--all 和 --tags 不兼容"
7082 #: builtin/push.c:348
7083 msgid "--all can't be combined with refspecs"
7084 msgstr "--all 不能和引用表达式同时使用"
7086 #: builtin/push.c:353
7087 msgid "--mirror and --tags are incompatible"
7088 msgstr "--mirror 和 --tags 不兼容"
7090 #: builtin/push.c:354
7091 msgid "--mirror can't be combined with refspecs"
7092 msgstr "--mirror 不能和引用表达式同时使用"
7094 #: builtin/push.c:359
7095 msgid "--all and --mirror are incompatible"
7096 msgstr "--all 和 --mirror 不兼容"
7098 #: builtin/push.c:419
7102 #: builtin/push.c:420
7103 msgid "push all refs"
7106 #: builtin/push.c:421
7107 msgid "mirror all refs"
7110 #: builtin/push.c:423
7114 #: builtin/push.c:424
7115 msgid "push tags (can't be used with --all or --mirror)"
7116 msgstr "推送 tags(不能使用 --all or --mirror)"
7118 #: builtin/push.c:427
7119 msgid "force updates"
7122 #: builtin/push.c:428
7126 #: builtin/push.c:429
7127 msgid "control recursive pushing of submodules"
7130 #: builtin/push.c:431
7131 msgid "use thin pack"
7134 #: builtin/push.c:432 builtin/push.c:433
7135 msgid "receive pack program"
7138 #: builtin/push.c:434
7139 msgid "set upstream for git pull/status"
7140 msgstr "设置 git pull/status 的上游"
7142 #: builtin/push.c:437
7143 msgid "prune locally removed refs"
7146 #: builtin/push.c:439
7147 msgid "bypass pre-push hook"
7148 msgstr "绕过 pre-push 钩子"
7150 #: builtin/push.c:448
7151 msgid "--delete is incompatible with --all, --mirror and --tags"
7152 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7154 #: builtin/push.c:450
7155 msgid "--delete doesn't make sense without any refs"
7156 msgstr "--delete 未接任何引用没有意义"
7158 #: builtin/read-tree.c:36
7160 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7161 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7162 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7164 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7165 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7166 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7168 #: builtin/read-tree.c:108
7169 msgid "write resulting index to <file>"
7170 msgstr "将索引结果写入 <file>"
7172 #: builtin/read-tree.c:111
7173 msgid "only empty the index"
7176 #: builtin/read-tree.c:113
7180 #: builtin/read-tree.c:115
7181 msgid "perform a merge in addition to a read"
7182 msgstr "读取之余再执行一个合并"
7184 #: builtin/read-tree.c:117
7185 msgid "3-way merge if no file level merging required"
7186 msgstr "如果没有文件级合并需要,执行三路合并"
7188 #: builtin/read-tree.c:119
7189 msgid "3-way merge in presence of adds and removes"
7190 msgstr "存在添加和删除时,也执行三路合并"
7192 #: builtin/read-tree.c:121
7193 msgid "same as -m, but discard unmerged entries"
7194 msgstr "类似于 -m,但丢弃未合并的条目"
7196 #: builtin/read-tree.c:122
7197 msgid "<subdirectory>/"
7200 #: builtin/read-tree.c:123
7201 msgid "read the tree into the index under <subdirectory>/"
7202 msgstr "读取树对象到索引的 <子目录>/ 下"
7204 #: builtin/read-tree.c:126
7205 msgid "update working tree with merge result"
7206 msgstr "用合并的结果更新工作区"
7208 #: builtin/read-tree.c:128
7212 #: builtin/read-tree.c:129
7213 msgid "allow explicitly ignored files to be overwritten"
7214 msgstr "允许忽略文件中设定的文件可以被覆盖"
7216 #: builtin/read-tree.c:132
7217 msgid "don't check the working tree after merging"
7220 #: builtin/read-tree.c:133
7221 msgid "don't update the index or the work tree"
7224 #: builtin/read-tree.c:135
7225 msgid "skip applying sparse checkout filter"
7226 msgstr "跳过应用稀疏检出过滤器"
7228 #: builtin/read-tree.c:137
7229 msgid "debug unpack-trees"
7230 msgstr "调试 unpack-trees"
7232 #: builtin/remote.c:11
7233 msgid "git remote [-v | --verbose]"
7234 msgstr "git remote [-v | --verbose]"
7236 #: builtin/remote.c:12
7238 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7239 "mirror=<fetch|push>] <name> <url>"
7241 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7242 "mirror=<fetch|push>] <名称> <url>"
7244 #: builtin/remote.c:13 builtin/remote.c:32
7245 msgid "git remote rename <old> <new>"
7246 msgstr "git remote rename <旧名称> <新名称>"
7248 #: builtin/remote.c:14 builtin/remote.c:37
7249 msgid "git remote remove <name>"
7250 msgstr "git remote remove <名称>"
7252 #: builtin/remote.c:15 builtin/remote.c:42
7253 msgid "git remote set-head <name> (-a | -d | <branch>)"
7254 msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7256 #: builtin/remote.c:16
7257 msgid "git remote [-v | --verbose] show [-n] <name>"
7258 msgstr "git remote [-v | --verbose] show [-n] <名称>"
7260 #: builtin/remote.c:17
7261 msgid "git remote prune [-n | --dry-run] <name>"
7262 msgstr "git remote prune [-n | --dry-run] <名称>"
7264 #: builtin/remote.c:18
7266 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7267 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7269 #: builtin/remote.c:19
7270 msgid "git remote set-branches [--add] <name> <branch>..."
7271 msgstr "git remote set-branches [--add] <名称> <分支>..."
7273 #: builtin/remote.c:20 builtin/remote.c:68
7274 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7275 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7277 #: builtin/remote.c:21 builtin/remote.c:69
7278 msgid "git remote set-url --add <name> <newurl>"
7279 msgstr "git remote set-url --add <名称> <新的地址>"
7281 #: builtin/remote.c:22 builtin/remote.c:70
7282 msgid "git remote set-url --delete <name> <url>"
7283 msgstr "git remote set-url --delete <名称> <地址>"
7285 #: builtin/remote.c:27
7286 msgid "git remote add [<options>] <name> <url>"
7287 msgstr "git remote add [<选项>] <名称> <地址>"
7289 #: builtin/remote.c:47
7290 msgid "git remote set-branches <name> <branch>..."
7291 msgstr "git remote set-branches <名称> <分支>..."
7293 #: builtin/remote.c:48
7294 msgid "git remote set-branches --add <name> <branch>..."
7295 msgstr "git remote set-branches --add <名称> <分支>..."
7297 #: builtin/remote.c:53
7298 msgid "git remote show [<options>] <name>"
7299 msgstr "git remote show [<选项>] <名称>"
7301 #: builtin/remote.c:58
7302 msgid "git remote prune [<options>] <name>"
7303 msgstr "git remote prune [<选项>] <名称>"
7305 #: builtin/remote.c:63
7306 msgid "git remote update [<options>] [<group> | <remote>]..."
7307 msgstr "git remote update [<选项>] [<组> | <远程>]..."
7309 #: builtin/remote.c:98
7314 #: builtin/remote.c:130
7316 "--mirror is dangerous and deprecated; please\n"
7317 "\t use --mirror=fetch or --mirror=push instead"
7319 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7320 "\t 或 --mirror=push"
7322 #: builtin/remote.c:147
7324 msgid "unknown mirror argument: %s"
7327 #: builtin/remote.c:163
7328 msgid "fetch the remote branches"
7331 #: builtin/remote.c:165
7332 msgid "import all tags and associated objects when fetching"
7333 msgstr "抓取时导入所有的 tags 和关联对象"
7335 #: builtin/remote.c:168
7336 msgid "or do not fetch any tag at all (--no-tags)"
7337 msgstr "或不抓取任何 tag(--no-tags)"
7339 #: builtin/remote.c:170
7340 msgid "branch(es) to track"
7343 #: builtin/remote.c:171
7344 msgid "master branch"
7347 #: builtin/remote.c:172
7351 #: builtin/remote.c:173
7352 msgid "set up remote as a mirror to push to or fetch from"
7353 msgstr "把远程设置为用以推送或抓取的镜像"
7355 #: builtin/remote.c:185
7356 msgid "specifying a master branch makes no sense with --mirror"
7357 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7359 #: builtin/remote.c:187
7360 msgid "specifying branches to track makes sense only with fetch mirrors"
7361 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7363 #: builtin/remote.c:195 builtin/remote.c:646
7365 msgid "remote %s already exists."
7366 msgstr "远程 %s 已经存在。"
7368 #: builtin/remote.c:199 builtin/remote.c:650
7370 msgid "'%s' is not a valid remote name"
7371 msgstr "'%s' 不是一个有效的远程名称"
7373 #: builtin/remote.c:243
7375 msgid "Could not setup master '%s'"
7376 msgstr "无法设置 master '%s'"
7378 #: builtin/remote.c:299
7380 msgid "more than one %s"
7383 #: builtin/remote.c:339
7385 msgid "Could not get fetch map for refspec %s"
7386 msgstr "无法得到引用表达式 %s 的获取列表"
7388 #: builtin/remote.c:440 builtin/remote.c:448
7392 #: builtin/remote.c:452
7396 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7398 msgid "Could not append '%s' to '%s'"
7399 msgstr "不能添加 '%s' 至 '%s'"
7401 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7403 msgid "No such remote: %s"
7406 #: builtin/remote.c:656
7408 msgid "Could not rename config section '%s' to '%s'"
7409 msgstr "不能重命名配置小节 '%s' 到 '%s'"
7411 #: builtin/remote.c:662 builtin/remote.c:799
7413 msgid "Could not remove config section '%s'"
7414 msgstr "不能移除配置小节 '%s'"
7416 #: builtin/remote.c:677
7419 "Not updating non-default fetch refspec\n"
7421 "\tPlease update the configuration manually if necessary."
7427 #: builtin/remote.c:683
7429 msgid "Could not append '%s'"
7432 #: builtin/remote.c:694
7434 msgid "Could not set '%s'"
7437 #: builtin/remote.c:716
7439 msgid "deleting '%s' failed"
7442 #: builtin/remote.c:750
7444 msgid "creating '%s' failed"
7447 #: builtin/remote.c:764
7449 msgid "Could not remove branch %s"
7452 #: builtin/remote.c:834
7454 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7455 "to delete it, use:"
7457 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7458 "to delete them, use:"
7459 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7460 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7462 #: builtin/remote.c:943
7464 msgid " new (next fetch will store in remotes/%s)"
7465 msgstr " 新的(下一次获取将存储于 remotes/%s)"
7467 #: builtin/remote.c:946
7471 #: builtin/remote.c:948
7472 msgid " stale (use 'git remote prune' to remove)"
7473 msgstr " 过时(使用 'git remote prune' 来移除)"
7475 #: builtin/remote.c:950
7479 #: builtin/remote.c:991
7481 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7482 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7484 #: builtin/remote.c:998
7486 msgid "rebases onto remote %s"
7489 #: builtin/remote.c:1001
7491 msgid " merges with remote %s"
7494 #: builtin/remote.c:1002
7495 msgid " and with remote"
7498 #: builtin/remote.c:1004
7500 msgid "merges with remote %s"
7503 #: builtin/remote.c:1005
7504 msgid " and with remote"
7507 #: builtin/remote.c:1051
7511 #: builtin/remote.c:1054
7515 #: builtin/remote.c:1058
7519 #: builtin/remote.c:1061
7520 msgid "fast-forwardable"
7523 #: builtin/remote.c:1064
7524 msgid "local out of date"
7527 #: builtin/remote.c:1071
7529 msgid " %-*s forces to %-*s (%s)"
7530 msgstr " %-*s 强制推送至 %-*s (%s)"
7532 #: builtin/remote.c:1074
7534 msgid " %-*s pushes to %-*s (%s)"
7535 msgstr " %-*s 推送至 %-*s (%s)"
7537 #: builtin/remote.c:1078
7539 msgid " %-*s forces to %s"
7540 msgstr " %-*s 强制推送至 %s"
7542 #: builtin/remote.c:1081
7544 msgid " %-*s pushes to %s"
7545 msgstr " %-*s 推送至 %s"
7547 #: builtin/remote.c:1091
7548 msgid "do not query remotes"
7551 #: builtin/remote.c:1118
7556 #: builtin/remote.c:1119
7558 msgid " Fetch URL: %s"
7561 #: builtin/remote.c:1120 builtin/remote.c:1285
7565 #: builtin/remote.c:1129 builtin/remote.c:1131
7567 msgid " Push URL: %s"
7570 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7572 msgid " HEAD branch: %s"
7575 #: builtin/remote.c:1139
7578 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7579 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7581 #: builtin/remote.c:1151
7583 msgid " Remote branch:%s"
7584 msgid_plural " Remote branches:%s"
7585 msgstr[0] " 远程分支:%s"
7586 msgstr[1] " 远程分支:%s"
7588 # 译者:中文字符串拼接,可删除前导空格
7589 #: builtin/remote.c:1154 builtin/remote.c:1181
7590 msgid " (status not queried)"
7593 #: builtin/remote.c:1163
7594 msgid " Local branch configured for 'git pull':"
7595 msgid_plural " Local branches configured for 'git pull':"
7596 msgstr[0] " 为 'git pull' 配置的本地分支:"
7597 msgstr[1] " 为 'git pull' 配置的本地分支:"
7599 #: builtin/remote.c:1171
7600 msgid " Local refs will be mirrored by 'git push'"
7601 msgstr " 本地引用将在 'git push' 时被镜像"
7603 #: builtin/remote.c:1178
7605 msgid " Local ref configured for 'git push'%s:"
7606 msgid_plural " Local refs configured for 'git push'%s:"
7607 msgstr[0] " 为 'git push' 配置的本地引用%s:"
7608 msgstr[1] " 为 'git push' 配置的本地引用%s:"
7610 #: builtin/remote.c:1199
7611 msgid "set refs/remotes/<name>/HEAD according to remote"
7612 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7614 #: builtin/remote.c:1201
7615 msgid "delete refs/remotes/<name>/HEAD"
7616 msgstr "删除 refs/remotes/<名称>/HEAD"
7618 #: builtin/remote.c:1216
7619 msgid "Cannot determine remote HEAD"
7620 msgstr "无法确定远程 HEAD"
7622 #: builtin/remote.c:1218
7623 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7624 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7626 #: builtin/remote.c:1228
7628 msgid "Could not delete %s"
7631 #: builtin/remote.c:1236
7633 msgid "Not a valid ref: %s"
7634 msgstr "不是一个有效引用:%s"
7636 #: builtin/remote.c:1238
7638 msgid "Could not setup %s"
7642 #: builtin/remote.c:1274
7644 msgid " %s will become dangling!"
7645 msgstr " %s 将成为摇摆状态!"
7648 #: builtin/remote.c:1275
7650 msgid " %s has become dangling!"
7651 msgstr " %s 已成为摇摆状态!"
7653 #: builtin/remote.c:1281
7658 #: builtin/remote.c:1282
7663 #: builtin/remote.c:1295
7665 msgid " * [would prune] %s"
7666 msgstr " * [将删除] %s"
7668 #: builtin/remote.c:1298
7670 msgid " * [pruned] %s"
7671 msgstr " * [已删除] %s"
7673 #: builtin/remote.c:1321
7674 msgid "prune remotes after fetching"
7677 #: builtin/remote.c:1387 builtin/remote.c:1461
7679 msgid "No such remote '%s'"
7682 #: builtin/remote.c:1407
7686 #: builtin/remote.c:1414
7687 msgid "no remote specified"
7690 #: builtin/remote.c:1436
7691 msgid "manipulate push URLs"
7694 #: builtin/remote.c:1438
7698 #: builtin/remote.c:1440
7702 #: builtin/remote.c:1447
7703 msgid "--add --delete doesn't make sense"
7704 msgstr "--add --delete 无意义"
7706 #: builtin/remote.c:1487
7708 msgid "Invalid old URL pattern: %s"
7709 msgstr "无效的旧URL匹配模版:%s"
7711 #: builtin/remote.c:1495
7713 msgid "No such URL found: %s"
7716 #: builtin/remote.c:1497
7717 msgid "Will not delete all non-push URLs"
7718 msgstr "将不会删除所有非推送URL地址"
7720 #: builtin/remote.c:1569
7721 msgid "be verbose; must be placed before a subcommand"
7722 msgstr "冗长输出;必须置于子命令之前"
7724 #: builtin/replace.c:17
7725 msgid "git replace [-f] <object> <replacement>"
7726 msgstr "git replace [-f] <对象> <替换物>"
7728 #: builtin/replace.c:18
7729 msgid "git replace -d <object>..."
7730 msgstr "git replace -d <对象>..."
7732 #: builtin/replace.c:19
7733 msgid "git replace -l [<pattern>]"
7734 msgstr "git replace -l [<模式>]"
7736 #: builtin/replace.c:121
7737 msgid "list replace refs"
7740 #: builtin/replace.c:122
7741 msgid "delete replace refs"
7744 #: builtin/replace.c:123
7745 msgid "replace the ref if it exists"
7748 #: builtin/rerere.c:11
7749 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7750 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7752 #: builtin/rerere.c:56
7753 msgid "register clean resolutions in index"
7754 msgstr "在索引中注册干净的解决方案"
7756 #: builtin/reset.c:25
7758 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7759 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7761 #: builtin/reset.c:26
7762 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7763 msgstr "git reset [-q] <树或提交> [--] <路径>..."
7765 #: builtin/reset.c:27
7766 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7767 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7769 #: builtin/reset.c:33
7773 #: builtin/reset.c:33
7777 #: builtin/reset.c:33
7781 #: builtin/reset.c:33
7785 #: builtin/reset.c:33
7789 #: builtin/reset.c:73
7790 msgid "You do not have a valid HEAD."
7791 msgstr "您没有一个有效的 HEAD。"
7793 #: builtin/reset.c:75
7794 msgid "Failed to find tree of HEAD."
7795 msgstr "无法找到 HEAD 指向的树。"
7797 #: builtin/reset.c:81
7799 msgid "Failed to find tree of %s."
7800 msgstr "无法找到 %s 指向的树。"
7802 #: builtin/reset.c:98
7804 msgid "HEAD is now at %s"
7805 msgstr "HEAD 现在位于 %s"
7807 # 译者:汉字之间无空格,故删除%s前后空格
7808 #: builtin/reset.c:169
7810 msgid "Cannot do a %s reset in the middle of a merge."
7811 msgstr "在合并过程中不能做%s重置操作。"
7813 #: builtin/reset.c:248
7814 msgid "be quiet, only report errors"
7817 #: builtin/reset.c:250
7818 msgid "reset HEAD and index"
7819 msgstr "重置 HEAD 和索引"
7821 #: builtin/reset.c:251
7822 msgid "reset only HEAD"
7825 #: builtin/reset.c:253 builtin/reset.c:255
7826 msgid "reset HEAD, index and working tree"
7827 msgstr "重置 HEAD、索引和工作区"
7829 #: builtin/reset.c:257
7830 msgid "reset HEAD but keep local changes"
7831 msgstr "重置 HEAD 但保存本地变更"
7833 #: builtin/reset.c:275
7835 msgid "Failed to resolve '%s' as a valid revision."
7836 msgstr "无法将 '%s' 解析为一个有效的版本。"
7838 #: builtin/reset.c:278 builtin/reset.c:286
7840 msgid "Could not parse object '%s'."
7841 msgstr "不能解析对象 '%s'。"
7843 #: builtin/reset.c:283
7845 msgid "Failed to resolve '%s' as a valid tree."
7846 msgstr "无法将 '%s' 解析为一个有效的树对象。"
7848 #: builtin/reset.c:292
7849 msgid "--patch is incompatible with --{hard,mixed,soft}"
7850 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
7852 #: builtin/reset.c:301
7853 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7854 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
7856 # 译者:汉字之间无空格,故删除%s前后空格
7857 #: builtin/reset.c:303
7859 msgid "Cannot do %s reset with paths."
7860 msgstr "不能带路径进行%s重置。"
7862 # 译者:汉字之间无空格,故删除%s前后空格
7863 #: builtin/reset.c:313
7865 msgid "%s reset is not allowed in a bare repository"
7866 msgstr "不能对裸版本库进行%s重置"
7868 #: builtin/reset.c:333
7870 msgid "Could not reset index file to revision '%s'."
7871 msgstr "不能重置索引文件至版本 '%s'。"
7873 #: builtin/reset.c:339
7874 msgid "Unstaged changes after reset:"
7875 msgstr "重置后撤出暂存区的变更:"
7877 #: builtin/reset.c:344
7878 msgid "Could not write new index file."
7879 msgstr "不能写入新的索引文件。"
7881 #: builtin/rev-parse.c:339
7882 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7883 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
7885 #: builtin/rev-parse.c:344
7886 msgid "keep the `--` passed as an arg"
7887 msgstr "保持 `--` 作为一个参数传递"
7889 #: builtin/rev-parse.c:346
7890 msgid "stop parsing after the first non-option argument"
7891 msgstr "遇到第一个非选项参数后停止解析"
7893 #: builtin/rev-parse.c:464
7895 "git rev-parse --parseopt [options] -- [<args>...]\n"
7896 " or: git rev-parse --sq-quote [<arg>...]\n"
7897 " or: git rev-parse [options] [<arg>...]\n"
7899 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7901 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
7902 " 或者:git rev-parse --sq-quote [<选项>...]\n"
7903 " 或者:git rev-parse [options] [<选项>...]\n"
7905 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
7907 #: builtin/revert.c:22
7908 msgid "git revert [options] <commit-ish>"
7909 msgstr "git revert [选项] <提交号>"
7911 #: builtin/revert.c:23
7912 msgid "git revert <subcommand>"
7913 msgstr "git revert <子命令>"
7915 #: builtin/revert.c:28
7916 msgid "git cherry-pick [options] <commit-ish>"
7917 msgstr "git cherry-pick [选项] <提交号>"
7919 #: builtin/revert.c:29
7920 msgid "git cherry-pick <subcommand>"
7921 msgstr "git cherry-pick <子命令>"
7923 #: builtin/revert.c:70 builtin/revert.c:92
7925 msgid "%s: %s cannot be used with %s"
7926 msgstr "%s:%s 不能和 %s 同时使用"
7928 #: builtin/revert.c:103
7929 msgid "end revert or cherry-pick sequence"
7932 #: builtin/revert.c:104
7933 msgid "resume revert or cherry-pick sequence"
7936 #: builtin/revert.c:105
7937 msgid "cancel revert or cherry-pick sequence"
7940 #: builtin/revert.c:106
7941 msgid "don't automatically commit"
7944 #: builtin/revert.c:107
7945 msgid "edit the commit message"
7948 #: builtin/revert.c:110
7949 msgid "parent number"
7952 #: builtin/revert.c:112
7953 msgid "merge strategy"
7956 #: builtin/revert.c:113
7960 #: builtin/revert.c:114
7961 msgid "option for merge strategy"
7964 #: builtin/revert.c:125
7965 msgid "append commit name"
7968 #: builtin/revert.c:126
7969 msgid "allow fast-forward"
7972 #: builtin/revert.c:127
7973 msgid "preserve initially empty commits"
7976 #: builtin/revert.c:128
7977 msgid "allow commits with empty messages"
7980 #: builtin/revert.c:129
7981 msgid "keep redundant, empty commits"
7984 #: builtin/revert.c:133
7985 msgid "program error"
7988 #: builtin/revert.c:223
7989 msgid "revert failed"
7992 #: builtin/revert.c:238
7993 msgid "cherry-pick failed"
7997 msgid "git rm [options] [--] <file>..."
7998 msgstr "git rm [选项] [--] <文件>..."
8000 #: builtin/rm.c:64 builtin/rm.c:186
8003 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8004 "(use 'rm -rf' if you really want to remove it including all of its history)"
8006 "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8007 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8012 "'%s' has staged content different from both the file and the HEAD\n"
8013 "(use -f to force removal)"
8015 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8021 "'%s' has changes staged in the index\n"
8022 "(use --cached to keep the file, or -f to force removal)"
8025 "(使用 --cached 保存文件,或用 -f 强制删除)"
8030 "'%s' has local modifications\n"
8031 "(use --cached to keep the file, or -f to force removal)"
8034 "(使用 --cached 保存文件,或用 -f 强制删除)"
8037 msgid "do not list removed files"
8041 msgid "only remove from the index"
8045 msgid "override the up-to-date check"
8049 msgid "allow recursive removal"
8053 msgid "exit with a zero status even if nothing matched"
8054 msgstr "即使没有匹配,也以零状态退出"
8058 msgid "not removing '%s' recursively without -r"
8059 msgstr "未提供 -r 选项不会递归删除 '%s'"
8063 msgid "git rm: unable to remove %s"
8064 msgstr "git rm:不能删除 %s"
8066 #: builtin/shortlog.c:13
8067 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
8068 msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
8070 #: builtin/shortlog.c:133
8072 msgid "Missing author: %s"
8075 #: builtin/shortlog.c:229
8076 msgid "sort output according to the number of commits per author"
8077 msgstr "根据每个作者的提交数量排序"
8079 #: builtin/shortlog.c:231
8080 msgid "Suppress commit descriptions, only provides commit count"
8081 msgstr "隐藏提交说明,只提供提交数量"
8083 #: builtin/shortlog.c:233
8084 msgid "Show the email address of each author"
8085 msgstr "显示每个作者的电子邮件地址"
8087 #: builtin/shortlog.c:234
8089 msgstr "w[,i1[,i2]]"
8091 #: builtin/shortlog.c:235
8092 msgid "Linewrap output"
8095 #: builtin/show-branch.c:9
8097 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8098 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8099 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8102 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8103 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8104 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8107 #: builtin/show-branch.c:10
8108 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8109 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8111 #: builtin/show-branch.c:651
8112 msgid "show remote-tracking and local branches"
8113 msgstr "显示远程跟踪的和本地的分支"
8115 #: builtin/show-branch.c:653
8116 msgid "show remote-tracking branches"
8119 #: builtin/show-branch.c:655
8120 msgid "color '*!+-' corresponding to the branch"
8121 msgstr "着色 '*!+-' 到相应的分支"
8123 #: builtin/show-branch.c:657
8124 msgid "show <n> more commits after the common ancestor"
8125 msgstr "显示共同祖先后的 <n> 个提交"
8127 #: builtin/show-branch.c:659
8128 msgid "synonym to more=-1"
8129 msgstr "和 more=-1 同义"
8131 #: builtin/show-branch.c:660
8132 msgid "suppress naming strings"
8135 #: builtin/show-branch.c:662
8136 msgid "include the current branch"
8139 #: builtin/show-branch.c:664
8140 msgid "name commits with their object names"
8143 #: builtin/show-branch.c:666
8144 msgid "show possible merge bases"
8147 #: builtin/show-branch.c:668
8148 msgid "show refs unreachable from any other ref"
8149 msgstr "显示没有任何引用的的引用"
8151 #: builtin/show-branch.c:670
8152 msgid "show commits in topological order"
8155 #: builtin/show-branch.c:672
8156 msgid "show only commits not on the first branch"
8157 msgstr "只显示不在第一个分支上的提交"
8159 #: builtin/show-branch.c:674
8160 msgid "show merges reachable from only one tip"
8161 msgstr "显示仅一个分支可访问的合并提交"
8163 #: builtin/show-branch.c:676
8164 msgid "show commits where no parent comes before its children"
8165 msgstr "显示提交时以时间为序且父提交不能领先子提交"
8167 #: builtin/show-branch.c:678
8168 msgid "<n>[,<base>]"
8169 msgstr "<n>[,<base>]"
8171 #: builtin/show-branch.c:679
8172 msgid "show <n> most recent ref-log entries starting at base"
8173 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8175 #: builtin/show-ref.c:10
8177 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8178 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8180 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8181 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8183 #: builtin/show-ref.c:11
8184 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8185 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8187 #: builtin/show-ref.c:165
8188 msgid "only show tags (can be combined with heads)"
8189 msgstr "只显示 tags(可以和头共用)"
8191 #: builtin/show-ref.c:166
8192 msgid "only show heads (can be combined with tags)"
8193 msgstr "只显示头(可以和 tags 共用)"
8195 #: builtin/show-ref.c:167
8196 msgid "stricter reference checking, requires exact ref path"
8197 msgstr "更严格的引用检测,需要精确的引用路径"
8199 #: builtin/show-ref.c:170 builtin/show-ref.c:172
8200 msgid "show the HEAD reference"
8203 #: builtin/show-ref.c:174
8204 msgid "dereference tags into object IDs"
8205 msgstr "转换 tags 到对象ID"
8207 #: builtin/show-ref.c:176
8208 msgid "only show SHA1 hash using <n> digits"
8209 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8211 #: builtin/show-ref.c:180
8212 msgid "do not print results to stdout (useful with --verify)"
8213 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8215 #: builtin/show-ref.c:182
8216 msgid "show refs from stdin that aren't in local repository"
8217 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8219 #: builtin/symbolic-ref.c:7
8220 msgid "git symbolic-ref [options] name [ref]"
8221 msgstr "git symbolic-ref [选项] 名称 [引用]"
8223 #: builtin/symbolic-ref.c:8
8224 msgid "git symbolic-ref -d [-q] name"
8225 msgstr "git symbolic-ref -d [-q] 名称"
8227 #: builtin/symbolic-ref.c:40
8228 msgid "suppress error message for non-symbolic (detached) refs"
8229 msgstr "不显示非符号(分离的)引用的错误信息"
8231 #: builtin/symbolic-ref.c:41
8232 msgid "delete symbolic ref"
8235 #: builtin/symbolic-ref.c:42
8236 msgid "shorten ref output"
8239 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8243 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8244 msgid "reason of the update"
8249 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8250 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8253 msgid "git tag -d <tagname>..."
8254 msgstr "git tag -d <标签名>..."
8258 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8259 "\t\t[<pattern>...]"
8261 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8265 msgid "git tag -v <tagname>..."
8266 msgstr "git tag -v <标签名>..."
8270 msgid "malformed object at '%s'"
8271 msgstr "非法的对象于 '%s'"
8273 #: builtin/tag.c:207
8275 msgid "tag name too long: %.*s..."
8276 msgstr "tag 名字太长:%.*s..."
8278 #: builtin/tag.c:212
8280 msgid "tag '%s' not found."
8281 msgstr "tag '%s' 未发现。"
8283 #: builtin/tag.c:227
8285 msgid "Deleted tag '%s' (was %s)\n"
8286 msgstr "已删除 tag '%s'(曾为 %s)\n"
8288 #: builtin/tag.c:239
8290 msgid "could not verify the tag '%s'"
8291 msgstr "不能校验 tag '%s'"
8293 #: builtin/tag.c:249
8297 "Write a tag message\n"
8298 "Lines starting with '%c' will be ignored.\n"
8302 "以 '%c' 开头的行将被忽略。\n"
8304 #: builtin/tag.c:253
8308 "Write a tag message\n"
8309 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8314 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8316 #: builtin/tag.c:292
8317 msgid "unable to sign the tag"
8320 #: builtin/tag.c:294
8321 msgid "unable to write tag file"
8324 #: builtin/tag.c:319
8325 msgid "bad object type."
8328 #: builtin/tag.c:332
8329 msgid "tag header too big."
8332 #: builtin/tag.c:368
8333 msgid "no tag message?"
8336 #: builtin/tag.c:374
8338 msgid "The tag message has been left in %s\n"
8339 msgstr "tag 说明被保留在 %s\n"
8341 #: builtin/tag.c:423
8342 msgid "switch 'points-at' requires an object"
8343 msgstr "开关 'points-at' 需要一个对象"
8345 #: builtin/tag.c:425
8347 msgid "malformed object name '%s'"
8348 msgstr "非法的对象名 '%s'"
8350 #: builtin/tag.c:445
8351 msgid "list tag names"
8354 #: builtin/tag.c:447
8355 msgid "print <n> lines of each tag message"
8356 msgstr "每个 tag 信息打印 <n> 行"
8358 #: builtin/tag.c:449
8362 #: builtin/tag.c:450
8366 #: builtin/tag.c:452
8367 msgid "Tag creation options"
8370 #: builtin/tag.c:454
8371 msgid "annotated tag, needs a message"
8372 msgstr "注解 tag,需要一个说明"
8374 #: builtin/tag.c:456
8378 #: builtin/tag.c:458
8379 msgid "annotated and GPG-signed tag"
8380 msgstr "注解并 GPG 签名的 tag"
8382 #: builtin/tag.c:462
8383 msgid "use another key to sign the tag"
8384 msgstr "使用另外的私钥签名 tag"
8386 #: builtin/tag.c:463
8387 msgid "replace the tag if exists"
8388 msgstr "如果存在,替换现有的 tag"
8390 #: builtin/tag.c:464
8391 msgid "show tag list in columns"
8392 msgstr "以列的方式显示 tag"
8394 #: builtin/tag.c:466
8395 msgid "Tag listing options"
8398 #: builtin/tag.c:469
8399 msgid "print only tags that contain the commit"
8400 msgstr "只打印包含提交的tags"
8402 #: builtin/tag.c:475
8403 msgid "print only tags of the object"
8406 #: builtin/tag.c:504
8407 msgid "--column and -n are incompatible"
8408 msgstr "--column 和 -n 不兼容"
8410 #: builtin/tag.c:521
8411 msgid "-n option is only allowed with -l."
8412 msgstr "-n 选项只允许和 -l 同时使用。"
8414 #: builtin/tag.c:523
8415 msgid "--contains option is only allowed with -l."
8416 msgstr "--contains 选项只允许和 -l 同时使用。"
8418 #: builtin/tag.c:525
8419 msgid "--points-at option is only allowed with -l."
8420 msgstr "--points-at 选项只允许和 -l 同时使用。"
8422 #: builtin/tag.c:533
8423 msgid "only one -F or -m option is allowed."
8424 msgstr "只允许一个 -F 或 -m 选项。"
8426 #: builtin/tag.c:553
8427 msgid "too many params"
8430 #: builtin/tag.c:559
8432 msgid "'%s' is not a valid tag name."
8433 msgstr "'%s' 不是一个有效的tag名称。"
8435 #: builtin/tag.c:564
8437 msgid "tag '%s' already exists"
8438 msgstr "tag '%s' 已存在"
8440 #: builtin/tag.c:582
8442 msgid "%s: cannot lock the ref"
8445 #: builtin/tag.c:584
8447 msgid "%s: cannot update the ref"
8450 #: builtin/tag.c:586
8452 msgid "Updated tag '%s' (was %s)\n"
8453 msgstr "已更新tag '%s'(曾为 %s)\n"
8455 #: builtin/update-index.c:401
8456 msgid "git update-index [options] [--] [<file>...]"
8457 msgstr "git update-index [选项] [--] [<文件>...]"
8459 #: builtin/update-index.c:718
8460 msgid "continue refresh even when index needs update"
8461 msgstr "当索引需要更新时继续刷新"
8463 #: builtin/update-index.c:721
8464 msgid "refresh: ignore submodules"
8467 #: builtin/update-index.c:724
8468 msgid "do not ignore new files"
8471 #: builtin/update-index.c:726
8472 msgid "let files replace directories and vice-versa"
8473 msgstr "让文件替换目录(反之亦然)"
8475 #: builtin/update-index.c:728
8476 msgid "notice files missing from worktree"
8479 #: builtin/update-index.c:730
8480 msgid "refresh even if index contains unmerged entries"
8481 msgstr "即使索引区包含未合并的条目也执行刷新"
8483 #: builtin/update-index.c:733
8484 msgid "refresh stat information"
8487 #: builtin/update-index.c:737
8488 msgid "like --refresh, but ignore assume-unchanged setting"
8489 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8491 #: builtin/update-index.c:741
8492 msgid "<mode> <object> <path>"
8493 msgstr "<mode> <object> <path>"
8495 #: builtin/update-index.c:742
8496 msgid "add the specified entry to the index"
8497 msgstr "添加指定的条目到索引区"
8499 #: builtin/update-index.c:746
8503 #: builtin/update-index.c:747
8504 msgid "override the executable bit of the listed files"
8505 msgstr "覆盖列表里文件的可执行位"
8507 #: builtin/update-index.c:751
8508 msgid "mark files as \"not changing\""
8509 msgstr "把文件标记为 \"没有变更\""
8511 #: builtin/update-index.c:754
8512 msgid "clear assumed-unchanged bit"
8513 msgstr "清除 assumed-unchanged 位"
8515 #: builtin/update-index.c:757
8516 msgid "mark files as \"index-only\""
8517 msgstr "把文件标记为 \"仅索引\""
8519 #: builtin/update-index.c:760
8520 msgid "clear skip-worktree bit"
8521 msgstr "清除 skip-worktree 位"
8523 #: builtin/update-index.c:763
8524 msgid "add to index only; do not add content to object database"
8525 msgstr "只添加到索引区;不添加对象到对象库"
8527 #: builtin/update-index.c:765
8528 msgid "remove named paths even if present in worktree"
8529 msgstr "即使存在工作区里,也删除路径"
8531 #: builtin/update-index.c:767
8532 msgid "with --stdin: input lines are terminated by null bytes"
8533 msgstr "携带 --stdin:输入的行以 null 字符终止"
8535 #: builtin/update-index.c:769
8536 msgid "read list of paths to be updated from standard input"
8537 msgstr "从标准输入中读取需要更新的路径列表"
8539 #: builtin/update-index.c:773
8540 msgid "add entries from standard input to the index"
8541 msgstr "从标准输入添加条目到索引区"
8543 #: builtin/update-index.c:777
8544 msgid "repopulate stages #2 and #3 for the listed paths"
8545 msgstr "为指定文件重新生成第2和第3暂存区"
8547 #: builtin/update-index.c:781
8548 msgid "only update entries that differ from HEAD"
8549 msgstr "只更新与 HEAD 不同的条目"
8551 #: builtin/update-index.c:785
8552 msgid "ignore files missing from worktree"
8555 #: builtin/update-index.c:788
8556 msgid "report actions to standard output"
8559 #: builtin/update-index.c:790
8560 msgid "(for porcelains) forget saved unresolved conflicts"
8561 msgstr "(for porcelains) 忘记保存的未解决的冲突"
8563 #: builtin/update-index.c:794
8564 msgid "write index in this format"
8567 #: builtin/update-ref.c:7
8568 msgid "git update-ref [options] -d <refname> [<oldval>]"
8569 msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8571 #: builtin/update-ref.c:8
8572 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8573 msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
8575 #: builtin/update-ref.c:19
8576 msgid "delete the reference"
8579 #: builtin/update-ref.c:21
8580 msgid "update <refname> not the one it points to"
8581 msgstr "更新 <引用名> 本身而不是它指向的引用"
8583 #: builtin/update-server-info.c:6
8584 msgid "git update-server-info [--force]"
8585 msgstr "git update-server-info [--force]"
8587 #: builtin/update-server-info.c:14
8588 msgid "update the info files from scratch"
8591 #: builtin/verify-pack.c:56
8592 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8593 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8595 #: builtin/verify-pack.c:66
8599 #: builtin/verify-pack.c:68
8600 msgid "show statistics only"
8603 #: builtin/verify-tag.c:17
8604 msgid "git verify-tag [-v|--verbose] <tag>..."
8605 msgstr "git verify-tag [-v|--verbose] <tag>..."
8607 #: builtin/verify-tag.c:73
8608 msgid "print tag contents"
8611 #: builtin/write-tree.c:13
8612 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8613 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8615 #: builtin/write-tree.c:26
8619 #: builtin/write-tree.c:27
8620 msgid "write tree object for a subdirectory <prefix>"
8621 msgstr "将 <前缀> 子目录内容写到一个树对象"
8623 #: builtin/write-tree.c:30
8624 msgid "only useful for debugging"
8628 msgid "See 'git help <command>' for more information on a specific command."
8629 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8631 #: parse-options.h:156
8632 msgid "no-op (backward compatibility)"
8635 #: parse-options.h:232
8636 msgid "be more verbose"
8639 #: parse-options.h:234
8640 msgid "be more quiet"
8643 #: parse-options.h:240
8644 msgid "use <n> digits to display SHA-1s"
8645 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8648 msgid "Add file contents to the index"
8652 msgid "Find by binary search the change that introduced a bug"
8653 msgstr "通过二分查找定位引入 bug 的变更"
8656 msgid "List, create, or delete branches"
8660 msgid "Checkout a branch or paths to the working tree"
8661 msgstr "检出一个分支或路径到工作区"
8664 msgid "Clone a repository into a new directory"
8665 msgstr "克隆一个版本库到一个新目录"
8668 msgid "Record changes to the repository"
8672 msgid "Show changes between commits, commit and working tree, etc"
8673 msgstr "显示提交之间、提交和工作区之间等的差异"
8676 msgid "Download objects and refs from another repository"
8677 msgstr "从另外一个版本库下载对象和引用"
8680 msgid "Print lines matching a pattern"
8684 msgid "Create an empty Git repository or reinitialize an existing one"
8685 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8688 msgid "Show commit logs"
8692 msgid "Join two or more development histories together"
8693 msgstr "合并两个或更多开发历史"
8696 msgid "Move or rename a file, a directory, or a symlink"
8697 msgstr "移动或重命名一个文件、目录或符号链接"
8700 msgid "Fetch from and merge with another repository or a local branch"
8701 msgstr "获取并合并另外的版本库或一个本地分支"
8704 msgid "Update remote refs along with associated objects"
8705 msgstr "更新远程引用和相关的对象"
8708 msgid "Forward-port local commits to the updated upstream head"
8709 msgstr "本地提交转移至更新后的上游分支中"
8712 msgid "Reset current HEAD to the specified state"
8713 msgstr "重置当前HEAD到指定状态"
8716 msgid "Remove files from the working tree and from the index"
8717 msgstr "从工作区和索引中删除文件"
8720 msgid "Show various types of objects"
8724 msgid "Show the working tree status"
8728 msgid "Create, list, delete or verify a tag object signed with GPG"
8729 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8732 msgid "You need to set your committer info first"
8733 msgstr "您需要先设置你的提交者信息"
8737 "You seem to have moved HEAD since the last 'am' failure.\n"
8738 "Not rewinding to ORIG_HEAD"
8739 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8744 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8745 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8746 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8748 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8749 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8750 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8753 msgid "Cannot fall back to three-way merge."
8757 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8758 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8761 msgid "Using index info to reconstruct a base tree..."
8762 msgstr "更新索引信息以重建基树..."
8766 "Did you hand edit your patch?\n"
8767 "It does not apply to blobs recorded in its index."
8770 "无法应用补丁到索引中的数据(blob)对象上。"
8773 msgid "Falling back to patching base and 3-way merge..."
8774 msgstr "转而在基础版本上打补丁及进行三路合并..."
8777 msgid "Failed to merge in the changes."
8781 msgid "Only one StGIT patch series can be applied at once"
8782 msgstr "一次只能有一个 StGIT 补丁队列被应用"
8786 msgid "Patch format $patch_format is not supported."
8787 msgstr "不支持 $patch_format 补丁格式。"
8790 msgid "Patch format detection failed."
8795 "The -b/--binary option has been a no-op for long time, and\n"
8796 "it will be removed. Please do not use it anymore."
8798 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8803 msgid "previous rebase directory $dotest still exists but mbox given."
8804 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8807 msgid "Please make up your mind. --skip or --abort?"
8808 msgstr "请下决心。--skip 或是 --abort ?"
8811 msgid "Resolve operation not in progress, we are not resuming."
8812 msgstr "解决操作未进行,我们不会继续。"
8816 msgid "Dirty index: cannot apply patches (dirty: $files)"
8817 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
8822 "Patch is empty. Was it split wrong?\n"
8823 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8824 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8827 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8828 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8831 msgid "Patch does not have a valid e-mail address."
8832 msgstr "补丁中没有一个有效的邮件地址。"
8835 msgid "cannot be interactive without stdin connected to a terminal."
8836 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8839 msgid "Commit Body is:"
8843 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8844 #. in your translation. The program will only accept English
8845 #. input at this point.
8847 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8848 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8852 msgid "Applying: $FIRSTLINE"
8853 msgstr "正应用:$FIRSTLINE"
8857 "No changes - did you forget to use 'git add'?\n"
8858 "If there is nothing left to stage, chances are that something else\n"
8859 "already introduced the same changes; you might want to skip this patch."
8861 "没有变更 —— 您是不是忘了执行 'git add'?\n"
8862 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8867 "You still have unmerged paths in your index\n"
8868 "did you forget to use 'git add'?"
8869 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
8872 msgid "No changes -- Patch already applied."
8873 msgstr "没有变更 -- 补丁已经应用过。"
8877 msgid "Patch failed at $msgnum $FIRSTLINE"
8878 msgstr "补丁失败于 $msgnum $FIRSTLINE"
8883 "The copy of the patch that failed is found in:\n"
8890 msgid "applying to an empty history"
8894 msgid "You need to start by \"git bisect start\""
8895 msgstr "您需要执行 \"git bisect start\" 来开始"
8898 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8899 #. translation. The program will only accept English input
8902 msgid "Do you want me to do it for you [Y/n]? "
8903 msgstr "您想让我为您这样做么[Y/n]? "
8907 msgid "unrecognised option: '$arg'"
8908 msgstr "未能识别的选项:'$arg'"
8912 msgid "'$arg' does not appear to be a valid revision"
8913 msgstr "'$arg' 看起来不像是一个有效的版本"
8915 #: git-bisect.sh:117
8916 msgid "Bad HEAD - I need a HEAD"
8917 msgstr "坏的 HEAD - 我需要一个 HEAD"
8919 #: git-bisect.sh:130
8922 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8923 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8925 #: git-bisect.sh:140
8926 msgid "won't bisect on seeked tree"
8927 msgstr "不会在已查找过的树上二分查找"
8929 #: git-bisect.sh:144
8930 msgid "Bad HEAD - strange symbolic ref"
8931 msgstr "坏的 HEAD - 奇怪的符号引用"
8933 #: git-bisect.sh:189
8935 msgid "Bad bisect_write argument: $state"
8936 msgstr "坏的 bisect_write 参数:$state"
8938 #: git-bisect.sh:218
8940 msgid "Bad rev input: $arg"
8941 msgstr "输入坏的版本:$arg"
8943 #: git-bisect.sh:232
8944 msgid "Please call 'bisect_state' with at least one argument."
8945 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8947 #: git-bisect.sh:244
8949 msgid "Bad rev input: $rev"
8950 msgstr "输入坏的版本:$rev"
8952 #: git-bisect.sh:250
8953 msgid "'git bisect bad' can take only one argument."
8954 msgstr "'git bisect bad' 只能带一个参数。"
8956 #. have bad but not good. we could bisect although
8957 #. this is less optimum.
8958 #: git-bisect.sh:273
8959 msgid "Warning: bisecting only with a bad commit."
8960 msgstr "警告:在仅有一个坏提交下进行二分查找。"
8963 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8964 #. translation. The program will only accept English input
8966 #: git-bisect.sh:279
8967 msgid "Are you sure [Y/n]? "
8968 msgstr "您确认么[Y/n]? "
8970 #: git-bisect.sh:289
8972 "You need to give me at least one good and one bad revisions.\n"
8973 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8975 "您需要给我至少一个好版本和一个坏版本。\n"
8976 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8978 #: git-bisect.sh:292
8980 "You need to start by \"git bisect start\".\n"
8981 "You then need to give me at least one good and one bad revisions.\n"
8982 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8984 "您需要执行 \"git bisect start\" 来开始。\n"
8985 "然后需要提供我至少一个好版本和一个坏版本。\n"
8986 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
8988 #: git-bisect.sh:347 git-bisect.sh:474
8989 msgid "We are not bisecting."
8992 #: git-bisect.sh:354
8994 msgid "'$invalid' is not a valid commit"
8995 msgstr "'$invalid' 不是一个有效的提交"
8997 #: git-bisect.sh:363
9000 "Could not check out original HEAD '$branch'.\n"
9001 "Try 'git bisect reset <commit>'."
9003 "不能检出原始 HEAD '$branch'。\n"
9004 "尝试 'git bisect reset <提交>'。"
9006 #: git-bisect.sh:390
9007 msgid "No logfile given"
9010 #: git-bisect.sh:391
9012 msgid "cannot read $file for replaying"
9013 msgstr "不能读取 $file 来重放"
9015 #: git-bisect.sh:408
9016 msgid "?? what are you talking about?"
9019 #: git-bisect.sh:420
9021 msgid "running $command"
9022 msgstr "运行 $command"
9024 #: git-bisect.sh:427
9027 "bisect run failed:\n"
9028 "exit code $res from '$command' is < 0 or >= 128"
9031 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9033 #: git-bisect.sh:453
9034 msgid "bisect run cannot continue any more"
9037 #: git-bisect.sh:459
9040 "bisect run failed:\n"
9041 "'bisect_state $state' exited with error code $res"
9044 "'bisect_state $state' 退出码为 $res"
9046 #: git-bisect.sh:466
9047 msgid "bisect run success"
9052 "Pull is not possible because you have unmerged files.\n"
9053 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9054 "as appropriate to mark resolution, or use 'git commit -a'."
9056 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9057 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9058 "或者使用 'git commit -a'。"
9061 msgid "Pull is not possible because you have unmerged files."
9062 msgstr "Pull 不可用,因为您尚有未合并的文件。"
9065 msgid "updating an unborn branch with changes added to the index"
9066 msgstr "更新尚未诞生的分支,变更添加至索引"
9068 #. The fetch involved updating the current branch.
9069 #. The working tree and the index file is still based on the
9070 #. $orig_head commit, but we are merging into $curr_head.
9071 #. First update the working tree to match $curr_head.
9075 "Warning: fetch updated the current branch head.\n"
9076 "Warning: fast-forwarding your working tree from\n"
9077 "Warning: commit $orig_head."
9079 "警告:fetch 更新了当前的分支。您的工作区\n"
9080 "警告:从原提交 $orig_head 快进。"
9083 msgid "Cannot merge multiple branches into empty head"
9084 msgstr "无法将多个分支合并到空分支"
9087 msgid "Cannot rebase onto multiple branches"
9092 "When you have resolved this problem, run \"git rebase --continue\".\n"
9093 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9094 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9097 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9098 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9099 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9101 #: git-rebase.sh:160
9102 msgid "The pre-rebase hook refused to rebase."
9103 msgstr "钩子 pre-rebase 拒绝变基。"
9105 #: git-rebase.sh:165
9106 msgid "It looks like git-am is in progress. Cannot rebase."
9107 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9109 #: git-rebase.sh:296
9110 msgid "The --exec option must be used with the --interactive option"
9111 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9113 #: git-rebase.sh:301
9114 msgid "No rebase in progress?"
9117 #: git-rebase.sh:312
9118 msgid "The --edit-todo action can only be used during interactive rebase."
9119 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9121 #: git-rebase.sh:319
9122 msgid "Cannot read HEAD"
9125 #: git-rebase.sh:322
9127 "You must edit all merge conflicts and then\n"
9128 "mark them as resolved using git add"
9130 "您必须编辑所有的合并冲突,然后通过 git add\n"
9133 #: git-rebase.sh:340
9135 msgid "Could not move back to $head_name"
9136 msgstr "无法移回 $head_name"
9138 #: git-rebase.sh:359
9141 "It seems that there is already a $state_dir_base directory, and\n"
9142 "I wonder if you are in the middle of another rebase. If that is the\n"
9143 "case, please try\n"
9144 "\t$cmd_live_rebase\n"
9145 "If that is not the case, please\n"
9146 "\t$cmd_clear_stale_rebase\n"
9147 "and run me again. I am stopping in case you still have something\n"
9150 "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9152 "\t$cmd_live_rebase\n"
9154 "\t$cmd_clear_stale_rebase\n"
9155 "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9157 #: git-rebase.sh:404
9159 msgid "invalid upstream $upstream_name"
9160 msgstr "无效的上游 $upstream_name"
9162 #: git-rebase.sh:428
9164 msgid "$onto_name: there are more than one merge bases"
9165 msgstr "$onto_name: 有一个以上的合并基准"
9167 #: git-rebase.sh:431 git-rebase.sh:435
9169 msgid "$onto_name: there is no merge base"
9170 msgstr "$onto_name: 没有合并基准"
9172 #: git-rebase.sh:440
9174 msgid "Does not point to a valid commit: $onto_name"
9175 msgstr "没有指向一个有效的提交:$onto_name"
9177 #: git-rebase.sh:463
9179 msgid "fatal: no such branch: $branch_name"
9180 msgstr "严重错误:无此分支:$branch_name"
9182 #: git-rebase.sh:483
9183 msgid "Please commit or stash them."
9184 msgstr "请提交或为它们保存进度。"
9186 #: git-rebase.sh:501
9188 msgid "Current branch $branch_name is up to date."
9189 msgstr "当前分支 $branch_name 是最新的。"
9191 #: git-rebase.sh:504
9193 msgid "Current branch $branch_name is up to date, rebase forced."
9194 msgstr "当前分支 $branch_name 是最新的,强制变基。"
9196 #: git-rebase.sh:515
9198 msgid "Changes from $mb to $onto:"
9199 msgstr "变更从 $mb 到 $onto:"
9201 #. Detach HEAD and reset the tree
9202 #: git-rebase.sh:524
9203 msgid "First, rewinding head to replay your work on top of it..."
9204 msgstr "首先,重置头指针以便在上面重放您的工作..."
9206 #: git-rebase.sh:532
9208 msgid "Fast-forwarded $branch_name to $onto_name."
9209 msgstr "快进 $branch_name 至 $onto_name。"
9212 msgid "git stash clear with parameters is unimplemented"
9213 msgstr "git stash clear 不支持参数"
9216 msgid "You do not have the initial commit yet"
9220 msgid "Cannot save the current index state"
9223 #: git-stash.sh:123 git-stash.sh:136
9224 msgid "Cannot save the current worktree state"
9225 msgstr "无法保存当前工作区状态"
9228 msgid "No changes selected"
9232 msgid "Cannot remove temporary index (can't happen)"
9233 msgstr "无法删除临时索引(不应发生)"
9236 msgid "Cannot record working tree state"
9239 #. TRANSLATORS: $option is an invalid option, like
9240 #. `--blah-blah'. The 7 spaces at the beginning of the
9241 #. second line correspond to "error: ". So you should line
9242 #. up the second line with however many characters the
9243 #. translation of "error: " takes in your language. E.g. in
9246 #. $ git stash save --blah-blah 2>&1 | head -n 2
9247 #. error: unknown option for 'stash save': --blah-blah
9248 #. To provide a message, use git stash save -- '--blah-blah'
9252 "error: unknown option for 'stash save': $option\n"
9253 " To provide a message, use git stash save -- '$option'"
9255 "错误:'stash save' 的未知选项:$option\n"
9256 " 要提供一个描述信息,使用 git stash save -- '$option'"
9259 msgid "No local changes to save"
9263 msgid "Cannot initialize stash"
9264 msgstr "无法初始化 stash"
9267 msgid "Cannot save the current status"
9271 msgid "Cannot remove worktree changes"
9275 msgid "No stash found."
9280 msgid "Too many revisions specified: $REV"
9281 msgstr "指定了太多的版本:$REV"
9285 msgid "$reference is not valid reference"
9286 msgstr "$reference 不是有效的引用"
9290 msgid "'$args' is not a stash-like commit"
9291 msgstr "'$args' 不是 stash 样提交"
9295 msgid "'$args' is not a stash reference"
9296 msgstr "'$args' 不是一个 stash 引用"
9299 msgid "unable to refresh index"
9303 msgid "Cannot apply a stash in the middle of a merge"
9304 msgstr "无法在合并过程中恢复进度"
9307 msgid "Conflicts in index. Try without --index."
9308 msgstr "索引中有冲突。尝试不使用 --index。"
9311 msgid "Could not save index tree"
9315 msgid "Cannot unstage modified files"
9319 msgid "Index was not unstashed."
9320 msgstr "索引的进度没有被恢复。"
9324 msgid "Dropped ${REV} ($s)"
9325 msgstr "丢弃了 ${REV} ($s)"
9329 msgid "${REV}: Could not drop stash entry"
9330 msgstr "${REV}:不能丢弃进度条目"
9333 msgid "No branch name specified"
9337 msgid "(To restore them type \"git stash apply\")"
9338 msgstr "(为恢复数据输入 \"git stash apply\")"
9340 #: git-submodule.sh:90
9342 msgid "cannot strip one component off url '$remoteurl'"
9343 msgstr "无法从 url '$remoteurl' 剥离一个组件"
9345 #: git-submodule.sh:195
9347 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9348 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9350 #: git-submodule.sh:238
9352 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9353 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9355 #: git-submodule.sh:250
9357 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9358 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9360 #: git-submodule.sh:343
9362 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9363 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9365 #: git-submodule.sh:360
9367 msgid "'$sm_path' already exists in the index"
9368 msgstr "'$sm_path' 已经存在于索引中"
9370 #: git-submodule.sh:364
9373 "The following path is ignored by one of your .gitignore files:\n"
9375 "Use -f if you really want to add it."
9377 "以下路径被您的一个 .gitignore 文件所忽略:\n"
9379 "如果您确实想添加它,使用 -f 参数。"
9381 #: git-submodule.sh:382
9383 msgid "Adding existing repo at '$sm_path' to the index"
9384 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9386 #: git-submodule.sh:384
9388 msgid "'$sm_path' already exists and is not a valid git repo"
9389 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9391 #: git-submodule.sh:392
9393 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9394 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9396 #: git-submodule.sh:394
9399 "If you want to reuse this local git directory instead of cloning again from"
9400 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9402 #: git-submodule.sh:396
9405 "use the '--force' option. If the local git directory is not the correct repo"
9406 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9408 #: git-submodule.sh:397
9411 "or you are unsure what this means choose another name with the '--name' "
9413 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9415 #: git-submodule.sh:399
9417 msgid "Reactivating local git directory for submodule '$sm_name'."
9418 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9420 #: git-submodule.sh:411
9422 msgid "Unable to checkout submodule '$sm_path'"
9423 msgstr "不能检出子模组 '$sm_path'"
9425 #: git-submodule.sh:416
9427 msgid "Failed to add submodule '$sm_path'"
9428 msgstr "无法添加子模组 '$sm_path'"
9430 #: git-submodule.sh:425
9432 msgid "Failed to register submodule '$sm_path'"
9433 msgstr "无法注册子模组 '$sm_path'"
9435 #: git-submodule.sh:468
9437 msgid "Entering '$prefix$sm_path'"
9438 msgstr "正在进入 '$prefix$sm_path'"
9440 #: git-submodule.sh:482
9442 msgid "Stopping at '$sm_path'; script returned non-zero status."
9443 msgstr "停止于 '$sm_path',脚本返回非零值。"
9445 #: git-submodule.sh:526
9447 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9448 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9450 #: git-submodule.sh:535
9452 msgid "Failed to register url for submodule path '$sm_path'"
9453 msgstr "无法为子模组路径 '$sm_path' 注册 url"
9455 #: git-submodule.sh:537
9457 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9458 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9460 #: git-submodule.sh:545
9462 msgid "Failed to register update mode for submodule path '$sm_path'"
9463 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9465 #: git-submodule.sh:649
9468 "Submodule path '$sm_path' not initialized\n"
9469 "Maybe you want to use 'update --init'?"
9471 "子模组路径 '$sm_path' 没有初始化\n"
9472 "也许您想用 'update --init'?"
9474 #: git-submodule.sh:662
9476 msgid "Unable to find current revision in submodule path '$sm_path'"
9477 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
9479 #: git-submodule.sh:671 git-submodule.sh:695
9481 msgid "Unable to fetch in submodule path '$sm_path'"
9482 msgstr "无法在子模组路径 '$sm_path' 中获取"
9484 #: git-submodule.sh:709
9486 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9487 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
9489 #: git-submodule.sh:710
9491 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9492 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
9494 #: git-submodule.sh:715
9496 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9497 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
9499 #: git-submodule.sh:716
9501 msgid "Submodule path '$sm_path': merged in '$sha1'"
9502 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
9504 #: git-submodule.sh:721
9506 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9507 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
9509 #: git-submodule.sh:722
9511 msgid "Submodule path '$sm_path': checked out '$sha1'"
9512 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
9514 #: git-submodule.sh:744 git-submodule.sh:1066
9516 msgid "Failed to recurse into submodule path '$sm_path'"
9517 msgstr "无法递归进子模组路径 '$sm_path'"
9519 #: git-submodule.sh:852
9520 msgid "The --cached option cannot be used with the --files option"
9521 msgstr "选项 --cached 不能和选项 --files 同时使用"
9524 #: git-submodule.sh:892
9526 msgid "unexpected mode $mod_dst"
9527 msgstr "意外的模式 $mod_dst"
9530 #: git-submodule.sh:910
9532 msgid " Warn: $name doesn't contain commit $sha1_src"
9533 msgstr " 警告:$name 未包含提交 $sha1_src"
9536 #: git-submodule.sh:913
9538 msgid " Warn: $name doesn't contain commit $sha1_dst"
9539 msgstr " 警告:$name 未包含提交 $sha1_dst"
9542 #: git-submodule.sh:916
9544 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9545 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9547 #: git-submodule.sh:941
9551 #: git-submodule.sh:979
9552 msgid "Submodules changed but not updated:"
9553 msgstr "子模组已修改但尚未更新:"
9555 #: git-submodule.sh:981
9556 msgid "Submodule changes to be committed:"
9559 #: git-submodule.sh:1129
9561 msgid "Synchronizing submodule url for '$prefix$sm_path'"
9562 msgstr "为 '$prefix$sm_path' 同步子模组 url"
9564 #~ msgid "can't fdopen 'show' output fd"
9565 #~ msgstr "不能打开 'show' 输出文件句柄"
9567 #~ msgid "failed to close pipe to 'show' for object '%s'"
9568 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9573 #~ msgid " 0 files changed"
9574 #~ msgstr " 0 个文件被修改"
9576 #~ msgid " %d file changed"
9577 #~ msgid_plural " %d files changed"
9578 #~ msgstr[0] " %d 个文件被修改"
9579 #~ msgstr[1] " %d 个文件被修改"
9581 #~ msgid ", %d insertion(+)"
9582 #~ msgid_plural ", %d insertions(+)"
9583 #~ msgstr[0] ",插入 %d 行(+)"
9584 #~ msgstr[1] ",插入 %d 行(+)"
9586 #~ msgid ", %d deletion(-)"
9587 #~ msgid_plural ", %d deletions(-)"
9588 #~ msgstr[0] ",删除 %d 行(-)"
9589 #~ msgstr[1] ",删除 %d 行(-)"
9591 #~ msgid "You do not have a valid HEAD"
9592 #~ msgstr "您没有一个有效的 HEAD"
9597 #~ msgid "Would not remove %s\n"
9598 #~ msgstr "不会删除 %s\n"
9600 #~ msgid "Not removing %s\n"
9601 #~ msgstr "未删除 %s\n"
9603 #~ msgid "Auto packing the repository for optimum performance.\n"
9604 #~ msgstr "自动打包版本库以求最佳性能。\n"
9606 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9607 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9609 #~ msgid "Could not read index"
9612 # 译者:中文字符串拼接,可删除前导空格
9613 #~ msgid " (use \"git add\" to track)"
9614 #~ msgstr "(使用 \"git add\" 建立跟踪)"
9616 #~ msgid "-B cannot be used with -b"
9617 #~ msgstr "-B 不能和 -b 同时使用"
9619 #~ msgid "--patch is incompatible with all other options"
9620 #~ msgstr "--patch 选项和其他选项不兼容"
9622 #~ msgid "--detach cannot be used with -b/-B/--orphan"
9623 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9625 #~ msgid "--detach cannot be used with -t"
9626 #~ msgstr "--detach 不能和 -t 同时使用"
9628 #~ msgid "--orphan and -b|-B are mutually exclusive"
9629 #~ msgstr "--orphan 和 -b|-B 互斥"
9631 #~ msgid "--orphan cannot be used with -t"
9632 #~ msgstr "--orphan 不能和 -t 同时使用"
9634 #~ msgid "git checkout: -f and -m are incompatible"
9635 #~ msgstr "git checkout:-f 和 -m 不兼容"
9638 #~ "git checkout: updating paths is incompatible with switching branches."
9639 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
9641 #~ msgid "diff setup failed"
9642 #~ msgstr "diff 设置失败"
9644 #~ msgid "merge-recursive: disk full?"
9645 #~ msgstr "merge-recursive:磁盘已满?"
9647 #~ msgid "diff_setup_done failed"
9648 #~ msgstr "diff_setup_done 失败"