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-03-05 12:36+0800\n"
16 "PO-Revision-Date: 2013-03-05 13:07+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 ignored 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:489
715 #: parse-options.c:507
720 #. TRANSLATORS: the colon here should align with the
721 #. one in "usage: %s" translation
722 #: parse-options.c:511
727 # 译者:为保证在输出中对齐,注意调整句中空格!
728 #: parse-options.c:514
733 #: parse-options.c:548
739 msgid "Path '%s' is in submodule '%.*s'"
740 msgstr "路径 '%s' 属于模组 '%.*s'"
744 msgid "'%s' is beyond a symbolic link"
745 msgstr "'%s' 位于符号链接中"
749 msgid "Your branch is ahead of '%s' by %d commit.\n"
750 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
751 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
752 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
755 msgid " (use \"git push\" to publish your local commits)\n"
756 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
760 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
762 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
763 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
764 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
768 msgid " (use \"git pull\" to update your local branch)\n"
769 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
774 "Your branch and '%s' have diverged,\n"
775 "and have %d and %d different commit each, respectively.\n"
777 "Your branch and '%s' have diverged,\n"
778 "and have %d and %d different commits each, respectively.\n"
780 "您的分支和 '%s' 出现了偏离,\n"
781 "并且分别有 %d 和 %d 处不同的提交。\n"
783 "您的分支和 '%s' 出现了偏离,\n"
784 "并且分别有 %d 和 %d 处不同的提交。\n"
788 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
789 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
791 #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984
792 #: builtin/merge.c:994
794 msgid "Could not open '%s' for writing"
795 msgstr "不能为写入打开 '%s'"
797 #: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986
798 #: builtin/merge.c:999
800 msgid "Could not write to '%s'"
805 "after resolving the conflicts, mark the corrected paths\n"
806 "with 'git add <paths>' or 'git rm <paths>'"
808 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
813 "after resolving the conflicts, mark the corrected paths\n"
814 "with 'git add <paths>' or 'git rm <paths>'\n"
815 "and commit the result with 'git commit'"
817 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
818 "对修正后的文件做标记,然后用 'git commit' 提交"
820 #: sequencer.c:162 sequencer.c:774 sequencer.c:857
822 msgid "Could not write to %s"
827 msgid "Error wrapping up %s"
831 msgid "Your local changes would be overwritten by cherry-pick."
832 msgstr "您的本地修改将被拣选操作覆盖。"
835 msgid "Your local changes would be overwritten by revert."
836 msgstr "您的本地修改将被还原操作覆盖。"
839 msgid "Commit your changes or stash them to proceed."
840 msgstr "提交您的修改或保存进度后再继续。"
842 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
845 msgid "%s: Unable to write new index file"
846 msgstr "%s:无法写入新索引文件"
849 msgid "Could not resolve HEAD commit\n"
850 msgstr "不能解析 HEAD 提交\n"
853 msgid "Unable to update cache tree\n"
858 msgid "Could not parse commit %s\n"
863 msgid "Could not parse parent commit %s\n"
864 msgstr "不能解析父提交 %s\n"
867 msgid "Your index file is unmerged."
868 msgstr "您的索引文件未完成合并。"
872 msgid "Commit %s is a merge but no -m option was given."
873 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
877 msgid "Commit %s does not have parent %d"
878 msgstr "提交 %s 没有父提交 %d"
882 msgid "Mainline was specified but commit %s is not a merge."
883 msgstr "指定了主线但提交 %s 不是一个合并。"
885 #. TRANSLATORS: The first %s will be "revert" or
886 #. "cherry-pick", the second %s a SHA1
889 msgid "%s: cannot parse parent commit %s"
890 msgstr "%s:不能解析父提交 %s"
894 msgid "Cannot get commit message for %s"
895 msgstr "不能得到 %s 的提交说明"
899 msgid "could not revert %s... %s"
900 msgstr "不能还原 %s... %s"
904 msgid "could not apply %s... %s"
905 msgstr "不能应用 %s... %s"
908 msgid "empty commit set passed"
913 msgid "git %s: failed to read the index"
914 msgstr "git %s:无法读取索引"
918 msgid "git %s: failed to refresh the index"
919 msgstr "git %s:无法刷新索引"
923 msgid "Cannot %s during a %s"
924 msgstr "无法 %s 在一个 %s 过程中"
928 msgid "Could not parse line %d."
932 msgid "No commits parsed."
937 msgid "Could not open %s"
942 msgid "Could not read %s."
947 msgid "Unusable instruction sheet: %s"
952 msgid "Invalid key: %s"
957 msgid "Invalid value for %s: %s"
962 msgid "Malformed options sheet: %s"
966 msgid "a cherry-pick or revert is already in progress"
967 msgstr "一个拣选或还原操作已在进行"
970 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
971 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
975 msgid "Could not create sequencer directory %s"
978 #: sequencer.c:776 sequencer.c:861
980 msgid "Error wrapping up %s."
983 #: sequencer.c:795 sequencer.c:929
984 msgid "no cherry-pick or revert in progress"
988 msgid "cannot resolve HEAD"
992 msgid "cannot abort from a branch yet to be born"
993 msgstr "不能从尚未建立的分支终止"
995 #: sequencer.c:821 builtin/apply.c:4056
997 msgid "cannot open %s: %s"
1002 msgid "cannot read %s: %s"
1006 msgid "unexpected end of file"
1011 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1012 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1016 msgid "Could not format %s."
1020 msgid "Can't revert as initial commit"
1024 msgid "Can't cherry-pick into empty head"
1028 msgid "HEAD does not point to a branch"
1029 msgstr "HEAD 没有指向一个分支"
1033 msgid "No such branch: '%s'"
1038 msgid "No upstream configured for branch '%s'"
1039 msgstr "尚未给分支 '%s' 设置上游"
1043 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1044 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1048 msgid "unable to access '%s': %s"
1049 msgstr "不能访问 '%s':%s"
1053 msgid "unable to access '%s'"
1058 msgid "unable to look up current user in the passwd file: %s"
1059 msgstr "无法在口令文件中查询到当前用户:%s"
1062 msgid "no such user"
1066 msgid "Unmerged paths:"
1070 #: wt-status.c:167 wt-status.c:194
1072 msgid " (use \"git reset %s <file>...\" to unstage)"
1073 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1076 #: wt-status.c:169 wt-status.c:196
1077 msgid " (use \"git rm --cached <file>...\" to unstage)"
1078 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1082 msgid " (use \"git add <file>...\" to mark resolution)"
1083 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1086 #: wt-status.c:175 wt-status.c:179
1087 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1088 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1092 msgid " (use \"git rm <file>...\" to mark resolution)"
1093 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1096 msgid "Changes to be committed:"
1100 msgid "Changes not staged for commit:"
1101 msgstr "尚未暂存以备提交的变更:"
1105 msgid " (use \"git add <file>...\" to update what will be committed)"
1106 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1110 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1111 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1116 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1117 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1121 msgid " (commit or discard the untracked or modified content in submodules)"
1122 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1127 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1128 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1135 msgid "both deleted:"
1139 msgid "added by us:"
1143 msgid "deleted by them:"
1147 msgid "added by them:"
1151 msgid "deleted by us:"
1159 msgid "both modified:"
1162 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1164 msgid "new commits, "
1167 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1169 msgid "modified content, "
1172 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1174 msgid "untracked content, "
1177 # 译者:为保证在输出中对齐,注意调整句中空格!
1180 msgid "new file: %s"
1183 # 译者:为保证在输出中对齐,注意调整句中空格!
1186 msgid "copied: %s -> %s"
1187 msgstr "拷贝: %s -> %s"
1189 # 译者:为保证在输出中对齐,注意调整句中空格!
1195 # 译者:为保证在输出中对齐,注意调整句中空格!
1198 msgid "modified: %s"
1201 # 译者:为保证在输出中对齐,注意调整句中空格!
1204 msgid "renamed: %s -> %s"
1205 msgstr "重命名: %s -> %s"
1207 # 译者:为保证在输出中对齐,注意调整句中空格!
1210 msgid "typechange: %s"
1213 # 译者:为保证在输出中对齐,注意调整句中空格!
1219 # 译者:为保证在输出中对齐,注意调整句中空格!
1222 msgid "unmerged: %s"
1227 msgid "bug: unhandled diff status %c"
1228 msgstr "bug:未处理的差异状态 %c"
1231 msgid "You have unmerged paths."
1235 #: wt-status.c:792 wt-status.c:944
1236 msgid " (fix conflicts and run \"git commit\")"
1237 msgstr " (解决冲突并运行 \"git commit\")"
1240 msgid "All conflicts fixed but you are still merging."
1241 msgstr "所有冲突已解决但您仍处于合并中。"
1245 msgid " (use \"git commit\" to conclude merge)"
1246 msgstr " (使用 \"git commit\" 结束合并)"
1249 msgid "You are in the middle of an am session."
1250 msgstr "您正处于一个 am 过程中。"
1253 msgid "The current patch is empty."
1258 msgid " (fix conflicts and then run \"git am --resolved\")"
1259 msgstr " (解决冲突,然后运行 \"git am --resolved\")"
1263 msgid " (use \"git am --skip\" to skip this patch)"
1264 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1268 msgid " (use \"git am --abort\" to restore the original branch)"
1269 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1271 #: wt-status.c:879 wt-status.c:896
1273 msgid "You are currently rebasing branch '%s' on '%s'."
1274 msgstr "您正在将分支 '%s' 变基到 '%s'。"
1276 #: wt-status.c:884 wt-status.c:901
1277 msgid "You are currently rebasing."
1282 msgid " (fix conflicts and then run \"git rebase --continue\")"
1283 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1287 msgid " (use \"git rebase --skip\" to skip this patch)"
1288 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1292 msgid " (use \"git rebase --abort\" to check out the original branch)"
1293 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1297 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1298 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1303 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1304 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1307 msgid "You are currently splitting a commit during a rebase."
1308 msgstr "您正在变基过程中拆分一个提交。"
1312 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1313 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1317 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1318 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1321 msgid "You are currently editing a commit during a rebase."
1322 msgstr "您正在变基过程中编辑一个提交。"
1326 msgid " (use \"git commit --amend\" to amend the current commit)"
1327 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1332 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1333 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1336 msgid "You are currently cherry-picking."
1341 msgid " (all conflicts fixed: run \"git commit\")"
1342 msgstr " (解决所有冲突后,执行 \"git commit\")"
1346 msgid "You are currently bisecting branch '%s'."
1347 msgstr "您正在分支 '%s' 中做二分查找。"
1350 msgid "You are currently bisecting."
1355 msgid " (use \"git bisect reset\" to get back to the original branch)"
1356 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1363 msgid "Not currently on any branch."
1367 msgid "Initial commit"
1371 msgid "Untracked files"
1375 msgid "Ignored files"
1380 msgid "Untracked files not listed%s"
1381 msgstr "未跟踪的文件没有列出%s"
1383 # 译者:中文字符串拼接,可删除前导空格
1385 msgid " (use -u option to show untracked files)"
1386 msgstr "(使用 -u 参数显示未跟踪的文件)"
1392 # 译者:中文字符串拼接,可删除前导空格
1395 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1396 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1400 msgid "no changes added to commit\n"
1406 "nothing added to commit but untracked files present (use \"git add\" to "
1408 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1412 msgid "nothing added to commit but untracked files present\n"
1413 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1415 # 译者:中文字符串拼接,可删除前导空格
1418 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1419 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1421 #: wt-status.c:1129 wt-status.c:1134
1423 msgid "nothing to commit\n"
1426 # 译者:中文字符串拼接,可删除前导空格
1429 msgid "nothing to commit (use -u to show untracked files)\n"
1430 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1432 # 译者:中文字符串拼接,可删除前导空格
1435 msgid "nothing to commit, working directory clean\n"
1436 msgstr "无文件要提交,干净的工作区\n"
1439 msgid "HEAD (no branch)"
1444 msgid "Initial commit on "
1453 #: wt-status.c:1268 wt-status.c:1271
1462 #: compat/precompose_utf8.c:58 builtin/clone.c:341
1464 msgid "failed to unlink '%s'"
1468 msgid "git add [options] [--] <pathspec>..."
1469 msgstr "git add [选项] [--] <路径匹配>..."
1473 msgid "unexpected diff status %c"
1476 #: builtin/add.c:68 builtin/commit.c:231
1477 msgid "updating files failed"
1482 msgid "remove '%s'\n"
1485 #: builtin/add.c:148
1486 msgid "Unstaged changes after refreshing the index:"
1487 msgstr "刷新索引之后尚未被暂存的变更:"
1489 #: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275
1491 msgid "pathspec '%s' did not match any files"
1492 msgstr "路径 '%s' 未匹配任何文件"
1494 #: builtin/add.c:234
1495 msgid "Could not read the index"
1498 #: builtin/add.c:244
1500 msgid "Could not open '%s' for writing."
1501 msgstr "不能打开 '%s' 以写入。"
1503 #: builtin/add.c:248
1504 msgid "Could not write patch"
1507 #: builtin/add.c:253
1509 msgid "Could not stat '%s'"
1510 msgstr "不能查看文件状态 '%s'"
1512 #: builtin/add.c:255
1513 msgid "Empty patch. Aborted."
1516 #: builtin/add.c:261
1518 msgid "Could not apply '%s'"
1521 #: builtin/add.c:271
1522 msgid "The following paths are ignored by one of your .gitignore files:\n"
1523 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1525 #: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1526 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1531 #: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19
1532 #: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613
1533 #: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112
1537 #: builtin/add.c:280
1538 msgid "interactive picking"
1541 #: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258
1542 msgid "select hunks interactively"
1545 #: builtin/add.c:282
1546 msgid "edit current diff and apply"
1549 #: builtin/add.c:283
1550 msgid "allow adding otherwise ignored files"
1553 #: builtin/add.c:284
1554 msgid "update tracked files"
1557 #: builtin/add.c:285
1558 msgid "record only the fact that the path will be added later"
1559 msgstr "只记录,该路径稍后再添加"
1561 #: builtin/add.c:286
1562 msgid "add changes from all tracked and untracked files"
1563 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1565 #: builtin/add.c:287
1566 msgid "don't add, only refresh the index"
1569 #: builtin/add.c:288
1570 msgid "just skip files which cannot be added because of errors"
1571 msgstr "跳过因出错不能添加的文件"
1573 #: builtin/add.c:289
1574 msgid "check if - even missing - files are ignored in dry run"
1575 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1577 #: builtin/add.c:311
1579 msgid "Use -f if you really want to add them.\n"
1580 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1582 #: builtin/add.c:312
1583 msgid "no files added"
1586 #: builtin/add.c:318
1587 msgid "adding files failed"
1590 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1592 #. * To be consistent with "git add -p" and most Git
1593 #. * commands, we should default to being tree-wide, but
1594 #. * this is not the original behavior and can't be
1595 #. * changed until users trained themselves not to type
1596 #. * "git add -u" or "git add -A". For now, we warn and
1597 #. * keep the old behavior. Later, this warning can be
1598 #. * turned into a die(...), and eventually we may
1599 #. * reallow the command with a new behavior.
1601 #: builtin/add.c:335
1604 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1605 "subdirectory of the tree will change in Git 2.0 and should not be used "
1607 "To add content for the whole tree, run:\n"
1610 " (or git add %s :/)\n"
1612 "To restrict the command to the current directory, run:\n"
1615 " (or git add %s .)\n"
1617 "With the current Git version, the command is restricted to the current "
1620 "在 Git 2.0 版本,将不再允许在一个子目录下不带任何路径参数地执行\n"
1621 "命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"
1622 "如果要添加整个目录树的内容,执行:\n"
1625 " (或 git add %s :/)\n"
1627 "如果要限制该命令只作用于当前目录,执行:\n"
1630 " (或 git add %s .)\n"
1632 "对于当前版本的 Git,这条命令只作用于当前目录。"
1634 #: builtin/add.c:381
1635 msgid "-A and -u are mutually incompatible"
1636 msgstr "-A 和 -u 选项互斥"
1638 #: builtin/add.c:383
1639 msgid "Option --ignore-missing can only be used together with --dry-run"
1640 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
1642 #: builtin/add.c:414
1644 msgid "Nothing specified, nothing added.\n"
1645 msgstr "没有指定文件,也没有文件被添加。\n"
1647 #: builtin/add.c:415
1649 msgid "Maybe you wanted to say 'git add .'?\n"
1650 msgstr "也许您想要执行 'git add .'?\n"
1652 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204
1653 #: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235
1654 msgid "index file corrupt"
1657 #: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370
1658 msgid "Unable to write new index file"
1661 #: builtin/apply.c:57
1662 msgid "git apply [options] [<patch>...]"
1663 msgstr "git apply [选项] [<补丁>...]"
1665 #: builtin/apply.c:110
1667 msgid "unrecognized whitespace option '%s'"
1668 msgstr "未能识别的空白字符选项 '%s'"
1670 #: builtin/apply.c:125
1672 msgid "unrecognized whitespace ignore option '%s'"
1673 msgstr "未能识别的空白字符忽略选项 '%s'"
1675 #: builtin/apply.c:823
1677 msgid "Cannot prepare timestamp regexp %s"
1678 msgstr "无法准备时间戳正则表达式 %s"
1680 #: builtin/apply.c:832
1682 msgid "regexec returned %d for input: %s"
1683 msgstr "regexec 返回 %d,输入为:%s"
1685 #: builtin/apply.c:913
1687 msgid "unable to find filename in patch at line %d"
1688 msgstr "不能在补丁的第 %d 行找到文件名"
1690 #: builtin/apply.c:945
1692 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1693 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
1695 #: builtin/apply.c:949
1697 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1698 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
1700 #: builtin/apply.c:950
1702 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1703 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
1705 #: builtin/apply.c:957
1707 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1708 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
1710 #: builtin/apply.c:1422
1712 msgid "recount: unexpected line: %.*s"
1713 msgstr "recount:意外的行:%.*s"
1715 #: builtin/apply.c:1479
1717 msgid "patch fragment without header at line %d: %.*s"
1718 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1720 #: builtin/apply.c:1496
1723 "git diff header lacks filename information when removing %d leading pathname "
1724 "component (line %d)"
1726 "git diff header lacks filename information when removing %d leading pathname "
1727 "components (line %d)"
1728 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1729 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1731 #: builtin/apply.c:1656
1732 msgid "new file depends on old contents"
1735 #: builtin/apply.c:1658
1736 msgid "deleted file still has contents"
1739 #: builtin/apply.c:1684
1741 msgid "corrupt patch at line %d"
1742 msgstr "补丁在第 %d 行损坏"
1744 #: builtin/apply.c:1720
1746 msgid "new file %s depends on old contents"
1747 msgstr "新文件 %s 依赖旧内容"
1749 #: builtin/apply.c:1722
1751 msgid "deleted file %s still has contents"
1752 msgstr "删除的文件 %s 仍有内容"
1754 #: builtin/apply.c:1725
1756 msgid "** warning: file %s becomes empty but is not deleted"
1757 msgstr "** 警告:文件 %s 成为空文件但并未删除"
1759 #: builtin/apply.c:1871
1761 msgid "corrupt binary patch at line %d: %.*s"
1762 msgstr "二进制补丁在第 %d 行损坏:%.*s"
1764 #. there has to be one hunk (forward hunk)
1765 #: builtin/apply.c:1900
1767 msgid "unrecognized binary patch at line %d"
1768 msgstr "未能识别的二进制补丁位于第 %d 行"
1770 #: builtin/apply.c:1986
1772 msgid "patch with only garbage at line %d"
1773 msgstr "补丁文件的第 %d 行只有垃圾数据"
1775 #: builtin/apply.c:2076
1777 msgid "unable to read symlink %s"
1778 msgstr "无法读取符号链接 %s"
1780 #: builtin/apply.c:2080
1782 msgid "unable to open or read %s"
1785 #: builtin/apply.c:2684
1787 msgid "invalid start of line: '%c'"
1788 msgstr "无效的行首字符:'%c'"
1790 #: builtin/apply.c:2802
1792 msgid "Hunk #%d succeeded at %d (offset %d line)."
1793 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1794 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1795 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
1797 #: builtin/apply.c:2814
1799 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1800 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
1802 #: builtin/apply.c:2820
1805 "while searching for:\n"
1811 #: builtin/apply.c:2839
1813 msgid "missing binary patch data for '%s'"
1814 msgstr "缺失 '%s' 的二进制补丁数据"
1816 #: builtin/apply.c:2942
1818 msgid "binary patch does not apply to '%s'"
1819 msgstr "二进制补丁未应用到 '%s'"
1821 #: builtin/apply.c:2948
1823 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1824 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
1826 #: builtin/apply.c:2969
1828 msgid "patch failed: %s:%ld"
1829 msgstr "打补丁失败:%s:%ld"
1831 #: builtin/apply.c:3091
1833 msgid "cannot checkout %s"
1836 #: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189
1838 msgid "read of %s failed"
1841 #: builtin/apply.c:3169 builtin/apply.c:3391
1843 msgid "path %s has been renamed/deleted"
1844 msgstr "路径 %s 已经被重命名/删除"
1846 #: builtin/apply.c:3250 builtin/apply.c:3405
1848 msgid "%s: does not exist in index"
1851 #: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419
1856 #: builtin/apply.c:3259 builtin/apply.c:3413
1858 msgid "%s: does not match index"
1861 #: builtin/apply.c:3361
1862 msgid "removal patch leaves file contents"
1863 msgstr "移除补丁仍留下了文件内容"
1865 #: builtin/apply.c:3430
1867 msgid "%s: wrong type"
1870 #: builtin/apply.c:3432
1872 msgid "%s has type %o, expected %o"
1873 msgstr "%s 的类型是 %o,应为 %o"
1875 #: builtin/apply.c:3533
1877 msgid "%s: already exists in index"
1878 msgstr "%s:已经存在于索引中"
1880 #: builtin/apply.c:3536
1882 msgid "%s: already exists in working directory"
1883 msgstr "%s:已经存在于工作区中"
1885 #: builtin/apply.c:3556
1887 msgid "new mode (%o) of %s does not match old mode (%o)"
1888 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1890 #: builtin/apply.c:3561
1892 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1893 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
1895 #: builtin/apply.c:3569
1897 msgid "%s: patch does not apply"
1900 #: builtin/apply.c:3582
1902 msgid "Checking patch %s..."
1905 #: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124
1907 msgid "make_cache_entry failed for path '%s'"
1908 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1910 #: builtin/apply.c:3818
1912 msgid "unable to remove %s from index"
1913 msgstr "不能从索引中移除 %s"
1915 #: builtin/apply.c:3846
1917 msgid "corrupt patch for subproject %s"
1918 msgstr "子项目 %s 损坏的补丁"
1920 #: builtin/apply.c:3850
1922 msgid "unable to stat newly created file '%s'"
1923 msgstr "不能枚举新建文件 '%s' 的状态"
1925 #: builtin/apply.c:3855
1927 msgid "unable to create backing store for newly created file %s"
1928 msgstr "不能为新建文件 %s 创建后端存储"
1930 #: builtin/apply.c:3858 builtin/apply.c:3966
1932 msgid "unable to add cache entry for %s"
1933 msgstr "无法为 %s 添加缓存条目"
1935 #: builtin/apply.c:3891
1937 msgid "closing file '%s'"
1940 #: builtin/apply.c:3940
1942 msgid "unable to write file '%s' mode %o"
1943 msgstr "不能写文件 '%s' 权限 %o"
1945 #: builtin/apply.c:4027
1947 msgid "Applied patch %s cleanly."
1950 #: builtin/apply.c:4035
1951 msgid "internal error"
1954 #. Say this even without --verbose
1955 #: builtin/apply.c:4038
1957 msgid "Applying patch %%s with %d reject..."
1958 msgid_plural "Applying patch %%s with %d rejects..."
1959 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1960 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1962 #: builtin/apply.c:4048
1964 msgid "truncating .rej filename to %.*s.rej"
1965 msgstr "截短 .rej 文件名为 %.*s.rej"
1967 #: builtin/apply.c:4069
1969 msgid "Hunk #%d applied cleanly."
1970 msgstr "第 #%d 个片段成功应用。"
1972 #: builtin/apply.c:4072
1974 msgid "Rejected hunk #%d."
1975 msgstr "拒绝第 #%d 个片段。"
1977 #: builtin/apply.c:4222
1978 msgid "unrecognized input"
1981 #: builtin/apply.c:4233
1982 msgid "unable to read index file"
1985 #: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91
1986 #: builtin/fetch.c:63
1990 #: builtin/apply.c:4353
1991 msgid "don't apply changes matching the given path"
1992 msgstr "不要应用与给出路径向匹配的变更"
1994 #: builtin/apply.c:4356
1995 msgid "apply changes matching the given path"
1996 msgstr "应用与给出路径向匹配的变更"
1998 #: builtin/apply.c:4358
2002 #: builtin/apply.c:4359
2003 msgid "remove <num> leading slashes from traditional diff paths"
2004 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2006 #: builtin/apply.c:4362
2007 msgid "ignore additions made by the patch"
2008 msgstr "忽略补丁中的添加的文件"
2010 #: builtin/apply.c:4364
2011 msgid "instead of applying the patch, output diffstat for the input"
2012 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2014 #: builtin/apply.c:4368
2015 msgid "show number of added and deleted lines in decimal notation"
2016 msgstr "以十进制数显示添加和删除的行数"
2018 #: builtin/apply.c:4370
2019 msgid "instead of applying the patch, output a summary for the input"
2020 msgstr "不应用补丁,而是显示输入的概要"
2022 #: builtin/apply.c:4372
2023 msgid "instead of applying the patch, see if the patch is applicable"
2024 msgstr "不应用补丁,而是查看补丁是否可应用"
2026 #: builtin/apply.c:4374
2027 msgid "make sure the patch is applicable to the current index"
2028 msgstr "确认补丁可以应用到当前索引"
2030 #: builtin/apply.c:4376
2031 msgid "apply a patch without touching the working tree"
2032 msgstr "应用补丁而不修改工作区"
2034 #: builtin/apply.c:4378
2035 msgid "also apply the patch (use with --stat/--summary/--check)"
2036 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2038 #: builtin/apply.c:4380
2039 msgid "attempt three-way merge if a patch does not apply"
2040 msgstr "如果一个补丁不能应用则尝试三路合并"
2042 #: builtin/apply.c:4382
2043 msgid "build a temporary index based on embedded index information"
2044 msgstr "创建一个临时索引基于嵌入的索引信息"
2046 #: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463
2047 msgid "paths are separated with NUL character"
2048 msgstr "路径以 NUL 字符分隔"
2050 #: builtin/apply.c:4387
2051 msgid "ensure at least <n> lines of context match"
2052 msgstr "确保至少匹配 <n> 行上下文"
2054 #: builtin/apply.c:4388
2058 #: builtin/apply.c:4389
2059 msgid "detect new or modified lines that have whitespace errors"
2060 msgstr "检查新增和修改的行中间的空白字符滥用"
2062 #: builtin/apply.c:4392 builtin/apply.c:4395
2063 msgid "ignore changes in whitespace when finding context"
2064 msgstr "查找上下文时忽略空白字符的变更"
2066 #: builtin/apply.c:4398
2067 msgid "apply the patch in reverse"
2070 #: builtin/apply.c:4400
2071 msgid "don't expect at least one line of context"
2074 #: builtin/apply.c:4402
2075 msgid "leave the rejected hunks in corresponding *.rej files"
2076 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2078 #: builtin/apply.c:4404
2079 msgid "allow overlapping hunks"
2082 #: builtin/apply.c:4407
2083 msgid "tolerate incorrectly detected missing new-line at the end of file"
2084 msgstr "允许不正确的文件末尾换行符"
2086 #: builtin/apply.c:4410
2087 msgid "do not trust the line counts in the hunk headers"
2088 msgstr "不信任补丁片段的头信息中的行号"
2090 #: builtin/apply.c:4412
2094 #: builtin/apply.c:4413
2095 msgid "prepend <root> to all filenames"
2096 msgstr "为所有文件名前添加 <根目录>"
2098 #: builtin/apply.c:4435
2099 msgid "--3way outside a repository"
2100 msgstr "--3way 在一个版本库之外"
2102 #: builtin/apply.c:4443
2103 msgid "--index outside a repository"
2104 msgstr "--index 在一个版本库之外"
2106 #: builtin/apply.c:4446
2107 msgid "--cached outside a repository"
2108 msgstr "--cached 在一个版本库之外"
2110 #: builtin/apply.c:4462
2112 msgid "can't open patch '%s'"
2113 msgstr "不能打开补丁 '%s'"
2115 #: builtin/apply.c:4476
2117 msgid "squelched %d whitespace error"
2118 msgid_plural "squelched %d whitespace errors"
2119 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2120 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2122 #: builtin/apply.c:4482 builtin/apply.c:4492
2124 msgid "%d line adds whitespace errors."
2125 msgid_plural "%d lines add whitespace errors."
2126 msgstr[0] "%d 行有空白字符误用。"
2127 msgstr[1] "%d 行有空白字符误用。"
2129 #: builtin/archive.c:17
2131 msgid "could not create archive file '%s'"
2132 msgstr "不能创建归档文件 '%s'"
2134 #: builtin/archive.c:20
2135 msgid "could not redirect output"
2138 #: builtin/archive.c:37
2139 msgid "git archive: Remote with no URL"
2140 msgstr "git archive:未提供远程URL"
2142 #: builtin/archive.c:58
2143 msgid "git archive: expected ACK/NAK, got EOF"
2144 msgstr "git archive:应为ACK/NACK,却得到EOF"
2146 #: builtin/archive.c:63
2148 msgid "git archive: NACK %s"
2149 msgstr "git archive:NACK %s"
2151 #: builtin/archive.c:65
2153 msgid "remote error: %s"
2156 #: builtin/archive.c:66
2157 msgid "git archive: protocol error"
2158 msgstr "git archive:协议错误"
2160 #: builtin/archive.c:71
2161 msgid "git archive: expected a flush"
2162 msgstr "git archive:应为刷新"
2164 #: builtin/bisect--helper.c:7
2165 msgid "git bisect--helper --next-all [--no-checkout]"
2166 msgstr "git bisect--helper --next-all [--no-checkout]"
2168 #: builtin/bisect--helper.c:17
2169 msgid "perform 'git bisect next'"
2170 msgstr "执行 'git bisect next'"
2172 #: builtin/bisect--helper.c:19
2173 msgid "update BISECT_HEAD instead of checking out the current commit"
2174 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2176 #: builtin/blame.c:25
2177 msgid "git blame [options] [rev-opts] [rev] [--] file"
2178 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2180 #: builtin/blame.c:30 builtin/shortlog.c:15
2181 msgid "[rev-opts] are documented in git-rev-list(1)"
2182 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2184 #: builtin/blame.c:2350
2185 msgid "Show blame entries as we find them, incrementally"
2186 msgstr "增量式地显示发现的 blame 条目"
2188 #: builtin/blame.c:2351
2189 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2190 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2192 #: builtin/blame.c:2352
2193 msgid "Do not treat root commits as boundaries (Default: off)"
2194 msgstr "不把根提交作为边界(默认:关闭)"
2196 #: builtin/blame.c:2353
2197 msgid "Show work cost statistics"
2200 #: builtin/blame.c:2354
2201 msgid "Show output score for blame entries"
2202 msgstr "显示判断 blame 条目位移的得分诊断信息"
2204 #: builtin/blame.c:2355
2205 msgid "Show original filename (Default: auto)"
2206 msgstr "显示原始文件名(默认:自动)"
2208 #: builtin/blame.c:2356
2209 msgid "Show original linenumber (Default: off)"
2210 msgstr "显示原始的行号(默认:关闭)"
2212 #: builtin/blame.c:2357
2213 msgid "Show in a format designed for machine consumption"
2214 msgstr "显示为一个适合机器读取的格式"
2216 #: builtin/blame.c:2358
2217 msgid "Show porcelain format with per-line commit information"
2218 msgstr "为每一行显示机器适用的提交信息"
2220 #: builtin/blame.c:2359
2221 msgid "Use the same output mode as git-annotate (Default: off)"
2222 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2224 #: builtin/blame.c:2360
2225 msgid "Show raw timestamp (Default: off)"
2226 msgstr "显示原始时间戳(默认:关闭)"
2228 #: builtin/blame.c:2361
2229 msgid "Show long commit SHA1 (Default: off)"
2230 msgstr "显示长的SHA1提交号(默认:关闭)"
2232 #: builtin/blame.c:2362
2233 msgid "Suppress author name and timestamp (Default: off)"
2234 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2236 #: builtin/blame.c:2363
2237 msgid "Show author email instead of name (Default: off)"
2238 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2240 #: builtin/blame.c:2364
2241 msgid "Ignore whitespace differences"
2244 #: builtin/blame.c:2365
2245 msgid "Spend extra cycles to find better match"
2246 msgstr "花费额外的循环来找到更好的匹配"
2248 #: builtin/blame.c:2366
2249 msgid "Use revisions from <file> instead of calling git-rev-list"
2250 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2252 #: builtin/blame.c:2367
2253 msgid "Use <file>'s contents as the final image"
2254 msgstr "使用 <file> 的内容作为最终的图片"
2256 #: builtin/blame.c:2368 builtin/blame.c:2369
2260 #: builtin/blame.c:2368
2261 msgid "Find line copies within and across files"
2262 msgstr "找到文件内及跨文件的行拷贝"
2264 #: builtin/blame.c:2369
2265 msgid "Find line movements within and across files"
2266 msgstr "找到文件内及跨文件的行移动"
2268 #: builtin/blame.c:2370
2272 #: builtin/blame.c:2370
2273 msgid "Process only line range n,m, counting from 1"
2274 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2276 #: builtin/branch.c:23
2277 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2278 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2280 #: builtin/branch.c:24
2281 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2282 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2284 #: builtin/branch.c:25
2285 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2286 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2288 #: builtin/branch.c:26
2289 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2290 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2292 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2293 #: builtin/branch.c:145
2296 "deleting branch '%s' that has been merged to\n"
2297 " '%s', but not yet merged to HEAD."
2299 "将要删除的分支 '%s' 已经被合并到\n"
2302 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2303 #: builtin/branch.c:149
2306 "not deleting branch '%s' that is not yet merged to\n"
2307 " '%s', even though it is merged to HEAD."
2309 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2310 " 然而却尚未被合并到分支 '%s' 。"
2312 #: builtin/branch.c:163
2314 msgid "Couldn't look up commit object for '%s'"
2315 msgstr "无法查询 '%s' 指向的提交对象"
2317 #: builtin/branch.c:167
2320 "The branch '%s' is not fully merged.\n"
2321 "If you are sure you want to delete it, run 'git branch -D %s'."
2324 "如果您确认要删除它,执行 'git branch -D %s'。"
2326 #: builtin/branch.c:180
2327 msgid "Update of config-file failed"
2328 msgstr "无法更新 config 文件"
2330 #: builtin/branch.c:208
2331 msgid "cannot use -a with -d"
2332 msgstr "不能将 -a 和 -d 同时使用"
2334 #: builtin/branch.c:214
2335 msgid "Couldn't look up commit object for HEAD"
2336 msgstr "无法查询 HEAD 指向的提交对象"
2338 #: builtin/branch.c:222
2340 msgid "Cannot delete the branch '%s' which you are currently on."
2341 msgstr "无法删除您当前所在的分支 '%s'。"
2343 #: builtin/branch.c:235
2345 msgid "remote branch '%s' not found."
2346 msgstr "远程分支 '%s' 未发现。"
2348 #: builtin/branch.c:236
2350 msgid "branch '%s' not found."
2351 msgstr "分支 '%s' 未发现。"
2353 #: builtin/branch.c:250
2355 msgid "Error deleting remote branch '%s'"
2356 msgstr "删除远程分支 '%s' 时出错"
2358 #: builtin/branch.c:251
2360 msgid "Error deleting branch '%s'"
2361 msgstr "删除分支 '%s' 时出错"
2363 #: builtin/branch.c:258
2365 msgid "Deleted remote branch %s (was %s).\n"
2366 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2368 #: builtin/branch.c:259
2370 msgid "Deleted branch %s (was %s).\n"
2371 msgstr "已删除分支 %s(曾为 %s)。\n"
2373 #: builtin/branch.c:361
2375 msgid "branch '%s' does not point at a commit"
2376 msgstr "分支 '%s' 未指向一个提交"
2378 #: builtin/branch.c:433
2380 msgid "[%s: behind %d]"
2383 #: builtin/branch.c:435
2388 #: builtin/branch.c:439
2390 msgid "[%s: ahead %d]"
2393 #: builtin/branch.c:441
2398 #: builtin/branch.c:444
2400 msgid "[%s: ahead %d, behind %d]"
2401 msgstr "[%s:领先 %d,落后 %d]"
2403 #: builtin/branch.c:447
2405 msgid "[ahead %d, behind %d]"
2406 msgstr "[领先 %d,落后 %d]"
2408 #: builtin/branch.c:469
2409 msgid " **** invalid ref ****"
2410 msgstr " **** 无效引用 ****"
2412 #: builtin/branch.c:560
2416 #: builtin/branch.c:593
2418 msgid "object '%s' does not point to a commit"
2419 msgstr "对象 '%s' 没有指向一个提交"
2421 #: builtin/branch.c:625
2422 msgid "some refs could not be read"
2425 #: builtin/branch.c:638
2426 msgid "cannot rename the current branch while not on any."
2427 msgstr "无法重命名当前分支因为不处于任何分支上。"
2429 #: builtin/branch.c:648
2431 msgid "Invalid branch name: '%s'"
2432 msgstr "无效的分支名:'%s'"
2434 #: builtin/branch.c:663
2435 msgid "Branch rename failed"
2438 #: builtin/branch.c:667
2440 msgid "Renamed a misnamed branch '%s' away"
2441 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2443 #: builtin/branch.c:671
2445 msgid "Branch renamed to %s, but HEAD is not updated!"
2446 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2448 #: builtin/branch.c:678
2449 msgid "Branch is renamed, but update of config-file failed"
2450 msgstr "分支被重命名,但更新 config 文件失败"
2452 #: builtin/branch.c:693
2454 msgid "malformed object name %s"
2457 #: builtin/branch.c:717
2459 msgid "could not write branch description template: %s"
2460 msgstr "不能写分支描述模版:%s"
2462 #: builtin/branch.c:747
2463 msgid "Generic options"
2466 #: builtin/branch.c:749
2467 msgid "show hash and subject, give twice for upstream branch"
2468 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2470 #: builtin/branch.c:750
2471 msgid "suppress informational messages"
2474 #: builtin/branch.c:751
2475 msgid "set up tracking mode (see git-pull(1))"
2476 msgstr "设置跟踪模式(参见 git-pull(1))"
2478 #: builtin/branch.c:753
2479 msgid "change upstream info"
2482 #: builtin/branch.c:757
2483 msgid "use colored output"
2486 #: builtin/branch.c:758
2487 msgid "act on remote-tracking branches"
2490 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788
2491 #: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367
2492 #: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468
2496 #: builtin/branch.c:762 builtin/branch.c:768
2497 msgid "print only branches that contain the commit"
2498 msgstr "只打印包含该提交的分支"
2500 #: builtin/branch.c:774
2501 msgid "Specific git-branch actions:"
2502 msgstr "具体的 git-branch 动作:"
2504 #: builtin/branch.c:775
2505 msgid "list both remote-tracking and local branches"
2506 msgstr "列出远程跟踪及本地分支"
2508 #: builtin/branch.c:777
2509 msgid "delete fully merged branch"
2512 #: builtin/branch.c:778
2513 msgid "delete branch (even if not merged)"
2514 msgstr "删除分支(即使没有合并)"
2516 #: builtin/branch.c:779
2517 msgid "move/rename a branch and its reflog"
2518 msgstr "移动/重命名一个分支,以及它的引用日志"
2520 #: builtin/branch.c:780
2521 msgid "move/rename a branch, even if target exists"
2522 msgstr "移动/重命名一个分支,即使目标已存在"
2524 #: builtin/branch.c:781
2525 msgid "list branch names"
2528 #: builtin/branch.c:782
2529 msgid "create the branch's reflog"
2532 #: builtin/branch.c:784
2533 msgid "edit the description for the branch"
2536 #: builtin/branch.c:785
2537 msgid "force creation (when already exists)"
2538 msgstr "强制创建(当已经存在)"
2540 #: builtin/branch.c:788
2541 msgid "print only not merged branches"
2544 #: builtin/branch.c:794
2545 msgid "print only merged branches"
2548 #: builtin/branch.c:798
2549 msgid "list branches in columns"
2552 #: builtin/branch.c:811
2553 msgid "Failed to resolve HEAD as a valid ref."
2554 msgstr "无法将 HEAD 解析为有效引用。"
2556 #: builtin/branch.c:816 builtin/clone.c:561
2557 msgid "HEAD not found below refs/heads!"
2558 msgstr "HEAD 没有位于 /refs/heads 之下!"
2560 #: builtin/branch.c:839
2561 msgid "--column and --verbose are incompatible"
2562 msgstr "--column 和 --verbose 不兼容"
2564 #: builtin/branch.c:845
2565 msgid "branch name required"
2568 #: builtin/branch.c:860
2569 msgid "Cannot give description to detached HEAD"
2570 msgstr "不能向分离头指针提供描述"
2572 #: builtin/branch.c:865
2573 msgid "cannot edit description of more than one branch"
2574 msgstr "不能为一个以上的分支编辑描述"
2576 #: builtin/branch.c:872
2578 msgid "No commit on branch '%s' yet."
2579 msgstr "分支 '%s' 尚无提交。"
2581 #: builtin/branch.c:875
2583 msgid "No branch named '%s'."
2586 #: builtin/branch.c:888
2587 msgid "too many branches for a rename operation"
2588 msgstr "为重命名操作提供了太多的分支名"
2590 #: builtin/branch.c:893
2592 msgid "branch '%s' does not exist"
2593 msgstr "分支 '%s' 不存在"
2595 #: builtin/branch.c:905
2597 msgid "Branch '%s' has no upstream information"
2598 msgstr "分支 '%s' 没有上游信息"
2600 #: builtin/branch.c:920
2601 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2602 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2604 #: builtin/branch.c:923
2607 "The --set-upstream flag is deprecated and will be removed. Consider using --"
2608 "track or --set-upstream-to\n"
2610 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
2612 #: builtin/branch.c:940
2616 "If you wanted to make '%s' track '%s', do this:\n"
2620 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2623 #: builtin/branch.c:941
2625 msgid " git branch -d %s\n"
2626 msgstr " git branch -d %s\n"
2628 #: builtin/branch.c:942
2630 msgid " git branch --set-upstream-to %s\n"
2631 msgstr " git branch --set-upstream-to %s\n"
2633 #: builtin/bundle.c:47
2635 msgid "%s is okay\n"
2638 #: builtin/bundle.c:56
2639 msgid "Need a repository to create a bundle."
2640 msgstr "需要一个版本库来创建包。"
2642 #: builtin/bundle.c:60
2643 msgid "Need a repository to unbundle."
2644 msgstr "需要一个版本库来解包。"
2646 #: builtin/cat-file.c:247
2647 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2648 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
2650 #: builtin/cat-file.c:248
2651 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2652 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
2654 #: builtin/cat-file.c:266
2655 msgid "<type> can be one of: blob, tree, commit, tag"
2656 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
2658 #: builtin/cat-file.c:267
2659 msgid "show object type"
2662 #: builtin/cat-file.c:268
2663 msgid "show object size"
2666 #: builtin/cat-file.c:270
2667 msgid "exit with zero when there's no error"
2668 msgstr "当没有错误时退出并返回零"
2670 #: builtin/cat-file.c:271
2671 msgid "pretty-print object's content"
2674 #: builtin/cat-file.c:273
2675 msgid "for blob objects, run textconv on object's content"
2676 msgstr "对于数据(blob)对象,对其内容执行 textconv"
2678 #: builtin/cat-file.c:275
2679 msgid "show info and content of objects fed from the standard input"
2680 msgstr "显示从标准输入提供的对象的信息和内容"
2682 #: builtin/cat-file.c:278
2683 msgid "show info about objects fed from the standard input"
2684 msgstr "显示从标准输入提供的对象的信息"
2686 #: builtin/check-attr.c:11
2687 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2688 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
2690 #: builtin/check-attr.c:12
2691 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2692 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
2694 #: builtin/check-attr.c:19
2695 msgid "report all attributes set on file"
2696 msgstr "报告设置在文件上的所有属性"
2698 #: builtin/check-attr.c:20
2699 msgid "use .gitattributes only from the index"
2700 msgstr "只使用索引中的 .gitattributes"
2702 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2703 msgid "read file names from stdin"
2706 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
2707 msgid "input paths are terminated by a null character"
2708 msgstr "输入路径以null字符终止"
2710 #: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177
2711 msgid "suppress progress reporting"
2714 #: builtin/check-ignore.c:151
2715 msgid "cannot specify pathnames with --stdin"
2716 msgstr "不能同时提供路径及 --stdin 参数"
2718 #: builtin/check-ignore.c:154
2719 msgid "-z only makes sense with --stdin"
2720 msgstr "-z 需要和 --stdin 参数共用才有意义"
2722 #: builtin/check-ignore.c:156
2723 msgid "no path specified"
2726 #: builtin/check-ignore.c:160
2727 msgid "--quiet is only valid with a single pathname"
2728 msgstr "参数 --quiet 只在提供一个路径名时有效"
2730 #: builtin/check-ignore.c:162
2731 msgid "cannot have both --quiet and --verbose"
2732 msgstr "不能同时提供 --quiet 和 --verbose 参数"
2734 #: builtin/checkout-index.c:126
2735 msgid "git checkout-index [options] [--] [<file>...]"
2736 msgstr "git checkout-index [选项] [--] [<文件>...]"
2738 #: builtin/checkout-index.c:187
2739 msgid "check out all files in the index"
2742 #: builtin/checkout-index.c:188
2743 msgid "force overwrite of existing files"
2746 #: builtin/checkout-index.c:190
2747 msgid "no warning for existing files and files not in index"
2748 msgstr "存在或不在索引中的文件都没有警告"
2750 #: builtin/checkout-index.c:192
2751 msgid "don't checkout new files"
2754 #: builtin/checkout-index.c:194
2755 msgid "update stat information in the index file"
2756 msgstr "更新索引中文件的状态信息"
2758 #: builtin/checkout-index.c:200
2759 msgid "read list of paths from the standard input"
2760 msgstr "从标准输入读取路径列表"
2762 #: builtin/checkout-index.c:202
2763 msgid "write the content to temporary files"
2766 #: builtin/checkout-index.c:203 builtin/column.c:30
2770 #: builtin/checkout-index.c:204
2771 msgid "when creating files, prepend <string>"
2772 msgstr "在创建文件时,在前面加上<字符串>"
2774 #: builtin/checkout-index.c:207
2775 msgid "copy out the files from named stage"
2776 msgstr "从指定暂存区中拷出文件"
2778 #: builtin/checkout.c:25
2779 msgid "git checkout [options] <branch>"
2780 msgstr "git checkout [选项] <分支>"
2782 #: builtin/checkout.c:26
2783 msgid "git checkout [options] [<branch>] -- <file>..."
2784 msgstr "git checkout [选项] [<分支>] -- <文件>..."
2786 #: builtin/checkout.c:116 builtin/checkout.c:149
2788 msgid "path '%s' does not have our version"
2789 msgstr "路径 '%s' 没有我们的版本"
2791 #: builtin/checkout.c:118 builtin/checkout.c:151
2793 msgid "path '%s' does not have their version"
2794 msgstr "路径 '%s' 没有他们的版本"
2796 #: builtin/checkout.c:134
2798 msgid "path '%s' does not have all necessary versions"
2799 msgstr "路径 '%s' 没有全部必须的版本"
2801 #: builtin/checkout.c:178
2803 msgid "path '%s' does not have necessary versions"
2804 msgstr "路径 '%s' 没有必须的版本"
2806 #: builtin/checkout.c:195
2808 msgid "path '%s': cannot merge"
2809 msgstr "path '%s':无法合并"
2811 #: builtin/checkout.c:212
2813 msgid "Unable to add merge result for '%s'"
2814 msgstr "无法为 '%s' 添加合并结果"
2816 #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242
2817 #: builtin/checkout.c:245
2819 msgid "'%s' cannot be used with updating paths"
2820 msgstr "'%s' 不能在更新路径时使用"
2822 #: builtin/checkout.c:248 builtin/checkout.c:251
2824 msgid "'%s' cannot be used with %s"
2825 msgstr "'%s' 不能和 %s 同时使用"
2827 #: builtin/checkout.c:254
2829 msgid "Cannot update paths and switch to branch '%s' at the same time."
2830 msgstr "不能同时更新路径并切换到分支'%s'。"
2832 #: builtin/checkout.c:265 builtin/checkout.c:426
2833 msgid "corrupt index file"
2836 #: builtin/checkout.c:295 builtin/checkout.c:302
2838 msgid "path '%s' is unmerged"
2839 msgstr "路径 '%s' 未合并"
2841 #: builtin/checkout.c:448
2842 msgid "you need to resolve your current index first"
2843 msgstr "您需要先解决当前索引的冲突"
2845 #: builtin/checkout.c:569
2847 msgid "Can not do reflog for '%s'\n"
2848 msgstr "不能对 '%s' 执行 reflog 操作\n"
2850 #: builtin/checkout.c:602
2851 msgid "HEAD is now at"
2854 #: builtin/checkout.c:609
2856 msgid "Reset branch '%s'\n"
2857 msgstr "重置分支 '%s'\n"
2859 #: builtin/checkout.c:612
2861 msgid "Already on '%s'\n"
2862 msgstr "已经位于 '%s'\n"
2864 #: builtin/checkout.c:616
2866 msgid "Switched to and reset branch '%s'\n"
2867 msgstr "切换并重置分支 '%s'\n"
2869 #: builtin/checkout.c:618 builtin/checkout.c:955
2871 msgid "Switched to a new branch '%s'\n"
2872 msgstr "切换到一个新分支 '%s'\n"
2874 #: builtin/checkout.c:620
2876 msgid "Switched to branch '%s'\n"
2877 msgstr "切换到分支 '%s'\n"
2880 #: builtin/checkout.c:676
2882 msgid " ... and %d more.\n"
2883 msgstr " ... 及其它 %d 个。\n"
2885 #. The singular version
2886 #: builtin/checkout.c:682
2889 "Warning: you are leaving %d commit behind, not connected to\n"
2890 "any of your branches:\n"
2894 "Warning: you are leaving %d commits behind, not connected to\n"
2895 "any of your branches:\n"
2899 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2903 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
2907 #: builtin/checkout.c:700
2910 "If you want to keep them by creating a new branch, this may be a good time\n"
2913 " git branch new_branch_name %s\n"
2916 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
2919 " git branch new_branch_name %s\n"
2922 #: builtin/checkout.c:730
2923 msgid "internal error in revision walk"
2924 msgstr "在版本遍历时遇到内部错误"
2926 #: builtin/checkout.c:734
2927 msgid "Previous HEAD position was"
2928 msgstr "之前的 HEAD 位置是"
2930 #: builtin/checkout.c:761 builtin/checkout.c:950
2931 msgid "You are on a branch yet to be born"
2932 msgstr "您位于一个尚未初始化的分支"
2935 #: builtin/checkout.c:886
2937 msgid "invalid reference: %s"
2940 #. case (1): want a tree
2941 #: builtin/checkout.c:925
2943 msgid "reference is not a tree: %s"
2946 #: builtin/checkout.c:964
2947 msgid "paths cannot be used with switching branches"
2948 msgstr "路径不能和切换分支同时使用"
2950 #: builtin/checkout.c:967 builtin/checkout.c:971
2952 msgid "'%s' cannot be used with switching branches"
2953 msgstr "'%s' 不能和切换分支同时使用"
2955 #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983
2956 #: builtin/checkout.c:986
2958 msgid "'%s' cannot be used with '%s'"
2959 msgstr "'%s' 不能和 '%s' 同时使用"
2961 #: builtin/checkout.c:991
2963 msgid "Cannot switch branch to a non-commit '%s'"
2964 msgstr "不能切换分支到一个非提交 '%s'"
2966 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89
2967 #: builtin/remote.c:169 builtin/remote.c:171
2971 #: builtin/checkout.c:1014
2972 msgid "create and checkout a new branch"
2973 msgstr "创建并检出一个新的分支"
2975 #: builtin/checkout.c:1016
2976 msgid "create/reset and checkout a branch"
2977 msgstr "创建/重置并检出一个分支"
2979 #: builtin/checkout.c:1017
2980 msgid "create reflog for new branch"
2981 msgstr "为新的分支创建引用日志"
2983 #: builtin/checkout.c:1018
2984 msgid "detach the HEAD at named commit"
2985 msgstr "成为指向该提交的分离头指针"
2987 #: builtin/checkout.c:1019
2988 msgid "set upstream info for new branch"
2989 msgstr "为新的分支设置上游信息"
2991 #: builtin/checkout.c:1021
2995 #: builtin/checkout.c:1021
2996 msgid "new unparented branch"
2999 #: builtin/checkout.c:1022
3000 msgid "checkout our version for unmerged files"
3001 msgstr "对尚未合并的文件检出我们的版本"
3003 #: builtin/checkout.c:1024
3004 msgid "checkout their version for unmerged files"
3005 msgstr "对尚未合并的文件检出他们的版本"
3007 #: builtin/checkout.c:1026
3008 msgid "force checkout (throw away local modifications)"
3009 msgstr "强制检出(丢弃本地修改)"
3011 #: builtin/checkout.c:1027
3012 msgid "perform a 3-way merge with the new branch"
3013 msgstr "和新的分支执行三路合并"
3015 #: builtin/checkout.c:1028 builtin/merge.c:215
3016 msgid "update ignored files (default)"
3017 msgstr "更新忽略的文件(默认)"
3019 #: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245
3023 #: builtin/checkout.c:1030
3024 msgid "conflict style (merge or diff3)"
3025 msgstr "冲突输出风格(merge 或 diff3)"
3027 #: builtin/checkout.c:1033
3028 msgid "second guess 'git checkout no-such-branch'"
3029 msgstr "再者猜测'git checkout no-such-branch'"
3031 #: builtin/checkout.c:1057
3032 msgid "-b, -B and --orphan are mutually exclusive"
3033 msgstr "-b、-B 和 --orphan 是互斥的"
3035 #: builtin/checkout.c:1074
3036 msgid "--track needs a branch name"
3037 msgstr "--track 需要一个分支名"
3039 #: builtin/checkout.c:1081
3040 msgid "Missing branch name; try -b"
3041 msgstr "缺少分支名;尝试 -b"
3043 #: builtin/checkout.c:1116
3044 msgid "invalid path specification"
3047 #: builtin/checkout.c:1123
3050 "Cannot update paths and switch to branch '%s' at the same time.\n"
3051 "Did you intend to checkout '%s' which can not be resolved as commit?"
3053 "不能同时更新路径并切换到分支'%s'。\n"
3054 "您是想要检出 '%s' 但其未能解析为提交么?"
3056 #: builtin/checkout.c:1128
3058 msgid "git checkout: --detach does not take a path argument '%s'"
3059 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3061 #: builtin/checkout.c:1132
3063 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3064 "checking out of the index."
3066 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3068 #: builtin/clean.c:20
3069 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3070 msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3072 #: builtin/clean.c:24
3074 msgid "Removing %s\n"
3077 #: builtin/clean.c:25
3079 msgid "Would remove %s\n"
3082 #: builtin/clean.c:26
3084 msgid "Skipping repository %s\n"
3087 #: builtin/clean.c:27
3089 msgid "Would skip repository %s\n"
3090 msgstr "将忽略版本库 %s\n"
3092 #: builtin/clean.c:28
3094 msgid "failed to remove %s"
3097 #: builtin/clean.c:160
3098 msgid "do not print names of files removed"
3101 #: builtin/clean.c:162
3105 #: builtin/clean.c:164
3106 msgid "remove whole directories"
3109 #: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717
3110 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182
3114 #: builtin/clean.c:166
3115 msgid "add <pattern> to ignore rules"
3116 msgstr "添加<模式>到忽略规则"
3118 #: builtin/clean.c:167
3119 msgid "remove ignored files, too"
3122 #: builtin/clean.c:169
3123 msgid "remove only ignored files"
3126 #: builtin/clean.c:187
3127 msgid "-x and -X cannot be used together"
3128 msgstr "-x 和 -X 不能同时使用"
3130 #: builtin/clean.c:191
3132 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3134 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3136 #: builtin/clean.c:194
3138 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3141 "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
3143 #: builtin/clone.c:36
3144 msgid "git clone [options] [--] <repo> [<dir>]"
3145 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3147 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212
3148 #: builtin/push.c:436
3149 msgid "force progress reporting"
3152 #: builtin/clone.c:66
3153 msgid "don't create a checkout"
3156 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3157 msgid "create a bare repository"
3160 #: builtin/clone.c:72
3161 msgid "create a mirror repository (implies bare)"
3162 msgstr "创建一个镜像版本库(也是裸版本库)"
3164 #: builtin/clone.c:74
3165 msgid "to clone from a local repository"
3168 #: builtin/clone.c:76
3169 msgid "don't use local hardlinks, always copy"
3170 msgstr "不使用本地硬链接,始终复制"
3172 #: builtin/clone.c:78
3173 msgid "setup as shared repository"
3176 #: builtin/clone.c:80 builtin/clone.c:82
3177 msgid "initialize submodules in the clone"
3180 #: builtin/clone.c:83 builtin/init-db.c:485
3181 msgid "template-directory"
3184 #: builtin/clone.c:84 builtin/init-db.c:486
3185 msgid "directory from which templates will be used"
3188 #: builtin/clone.c:86
3189 msgid "reference repository"
3192 #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
3196 #: builtin/clone.c:88
3197 msgid "use <name> instead of 'origin' to track upstream"
3198 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3200 #: builtin/clone.c:90
3201 msgid "checkout <branch> instead of the remote's HEAD"
3202 msgstr "检出<分支>而不是远程HEAD"
3204 #: builtin/clone.c:92
3205 msgid "path to git-upload-pack on the remote"
3206 msgstr "远程 git-upload-pack 路径"
3208 #: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662
3212 #: builtin/clone.c:94
3213 msgid "create a shallow clone of that depth"
3214 msgstr "创建一个指定深度的浅克隆"
3216 #: builtin/clone.c:96
3217 msgid "clone only one branch, HEAD or --branch"
3218 msgstr "只克隆一个分支、HEAD 或 --branch"
3220 #: builtin/clone.c:97 builtin/init-db.c:494
3224 #: builtin/clone.c:98 builtin/init-db.c:495
3225 msgid "separate git dir from working tree"
3226 msgstr "git目录和工作区分离"
3228 #: builtin/clone.c:99
3232 #: builtin/clone.c:100
3233 msgid "set config inside the new repository"
3234 msgstr "在新版本库中设置配置信息"
3236 #: builtin/clone.c:243
3238 msgid "reference repository '%s' is not a local directory."
3239 msgstr "引用版本库 '%s' 不是一个本地目录。"
3241 #: builtin/clone.c:306
3243 msgid "failed to create directory '%s'"
3244 msgstr "无法创建目录 '%s'"
3246 #: builtin/clone.c:308 builtin/diff.c:77
3248 msgid "failed to stat '%s'"
3249 msgstr "无法枚举 '%s' 状态"
3251 #: builtin/clone.c:310
3253 msgid "%s exists and is not a directory"
3254 msgstr "%s 存在且不是一个目录"
3256 #: builtin/clone.c:324
3258 msgid "failed to stat %s\n"
3259 msgstr "无法枚举 %s 状态\n"
3261 #: builtin/clone.c:346
3263 msgid "failed to create link '%s'"
3264 msgstr "无法创建链接 '%s'"
3266 #: builtin/clone.c:350
3268 msgid "failed to copy file to '%s'"
3269 msgstr "无法拷贝文件至 '%s'"
3271 #: builtin/clone.c:373
3276 #: builtin/clone.c:443
3278 msgid "Could not find remote branch %s to clone."
3279 msgstr "不能发现要克隆的远程分支 %s。"
3281 #: builtin/clone.c:552
3282 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3283 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3285 #: builtin/clone.c:690
3286 msgid "Too many arguments."
3289 #: builtin/clone.c:694
3290 msgid "You must specify a repository to clone."
3291 msgstr "您必须指定一个版本库来克隆。"
3293 #: builtin/clone.c:705
3295 msgid "--bare and --origin %s options are incompatible."
3296 msgstr "--bare 和 --origin %s 选项不兼容。"
3298 #: builtin/clone.c:708
3299 msgid "--bare and --separate-git-dir are incompatible."
3300 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3302 #: builtin/clone.c:721
3304 msgid "repository '%s' does not exist"
3305 msgstr "版本库 '%s' 不存在"
3307 #: builtin/clone.c:726
3308 msgid "--depth is ignored in local clones; use file:// instead."
3309 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3311 #: builtin/clone.c:736
3313 msgid "destination path '%s' already exists and is not an empty directory."
3314 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3316 #: builtin/clone.c:746
3318 msgid "working tree '%s' already exists."
3319 msgstr "工作区 '%s' 已经存在。"
3321 #: builtin/clone.c:759 builtin/clone.c:771
3323 msgid "could not create leading directories of '%s'"
3324 msgstr "不能为 '%s' 创建先导目录"
3326 #: builtin/clone.c:762
3328 msgid "could not create work tree dir '%s'."
3329 msgstr "不能为 '%s' 创建工作区目录。"
3331 #: builtin/clone.c:781
3333 msgid "Cloning into bare repository '%s'...\n"
3334 msgstr "克隆到裸版本库 '%s'...\n"
3336 #: builtin/clone.c:783
3338 msgid "Cloning into '%s'...\n"
3339 msgstr "正克隆到 '%s'...\n"
3341 #: builtin/clone.c:818
3343 msgid "Don't know how to clone %s"
3346 #: builtin/clone.c:867
3348 msgid "Remote branch %s not found in upstream %s"
3349 msgstr "远程分支 %s 在上游 %s 未发现"
3351 #: builtin/clone.c:874
3352 msgid "You appear to have cloned an empty repository."
3353 msgstr "您似乎克隆了一个空版本库。"
3355 #: builtin/column.c:9
3356 msgid "git column [options]"
3357 msgstr "git column [选项]"
3359 #: builtin/column.c:26
3360 msgid "lookup config vars"
3363 #: builtin/column.c:27 builtin/column.c:28
3364 msgid "layout to use"
3367 #: builtin/column.c:29
3368 msgid "Maximum width"
3371 #: builtin/column.c:30
3372 msgid "Padding space on left border"
3375 #: builtin/column.c:31
3376 msgid "Padding space on right border"
3379 #: builtin/column.c:32
3380 msgid "Padding space between columns"
3383 #: builtin/column.c:51
3384 msgid "--command must be the first argument"
3385 msgstr "--command 必须是第一个参数"
3387 #: builtin/commit.c:34
3388 msgid "git commit [options] [--] <pathspec>..."
3389 msgstr "git commit [选项] [--] <路径匹配>..."
3391 #: builtin/commit.c:39
3392 msgid "git status [options] [--] <pathspec>..."
3393 msgstr "git status [选项] [--] <路径匹配>..."
3395 #: builtin/commit.c:44
3397 "Your name and email address were configured automatically based\n"
3398 "on your username and hostname. Please check that they are accurate.\n"
3399 "You can suppress this message by setting them explicitly:\n"
3401 " git config --global user.name \"Your Name\"\n"
3402 " git config --global user.email you@example.com\n"
3404 "After doing this, you may fix the identity used for this commit with:\n"
3406 " git commit --amend --reset-author\n"
3408 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3409 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
3411 " git config --global user.name \"Your Name\"\n"
3412 " git config --global user.email you@example.com\n"
3414 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3416 " git commit --amend --reset-author\n"
3418 #: builtin/commit.c:56
3420 "You asked to amend the most recent commit, but doing so would make\n"
3421 "it empty. You can repeat your command with --allow-empty, or you can\n"
3422 "remove the commit entirely with \"git reset HEAD^\".\n"
3424 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3425 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
3427 #: builtin/commit.c:61
3429 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3430 "If you wish to commit it anyway, use:\n"
3432 " git commit --allow-empty\n"
3434 "Otherwise, please use 'git reset'\n"
3436 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3439 " git commit --allow-empty\n"
3441 "否则,请使用命令 'git reset'\n"
3443 #: builtin/commit.c:258
3444 msgid "failed to unpack HEAD tree object"
3445 msgstr "无法解包 HEAD 树对象"
3447 #: builtin/commit.c:300
3448 msgid "unable to create temporary index"
3451 #: builtin/commit.c:306
3452 msgid "interactive add failed"
3455 #: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410
3456 msgid "unable to write new_index file"
3457 msgstr "无法写 new_index 文件"
3459 #: builtin/commit.c:391
3460 msgid "cannot do a partial commit during a merge."
3461 msgstr "在合并过程中不能做部分提交。"
3463 #: builtin/commit.c:393
3464 msgid "cannot do a partial commit during a cherry-pick."
3465 msgstr "在拣选过程中不能做部分提交。"
3467 #: builtin/commit.c:403
3468 msgid "cannot read the index"
3471 #: builtin/commit.c:423
3472 msgid "unable to write temporary index file"
3475 #: builtin/commit.c:511 builtin/commit.c:517
3477 msgid "invalid commit: %s"
3480 #: builtin/commit.c:540
3481 msgid "malformed --author parameter"
3482 msgstr "非法的 --author 参数"
3484 #: builtin/commit.c:560
3486 msgid "Malformed ident string: '%s'"
3487 msgstr "非法的身份字符串:'%s'"
3489 #: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954
3491 msgid "could not lookup commit %s"
3494 #: builtin/commit.c:610 builtin/shortlog.c:272
3496 msgid "(reading log message from standard input)\n"
3497 msgstr "(正从标准输入中读取日志信息)\n"
3499 #: builtin/commit.c:612
3500 msgid "could not read log from standard input"
3501 msgstr "不能从标准输入中读取日志信息"
3503 #: builtin/commit.c:616
3505 msgid "could not read log file '%s'"
3506 msgstr "不能读取日志文件 '%s'"
3508 #: builtin/commit.c:622
3509 msgid "commit has empty message"
3512 #: builtin/commit.c:638
3513 msgid "could not read MERGE_MSG"
3514 msgstr "不能读取 MERGE_MSG"
3516 #: builtin/commit.c:642
3517 msgid "could not read SQUASH_MSG"
3518 msgstr "不能读取 SQUASH_MSG"
3520 #: builtin/commit.c:646
3522 msgid "could not read '%s'"
3525 #: builtin/commit.c:707
3526 msgid "could not write commit template"
3529 #: builtin/commit.c:718
3533 "It looks like you may be committing a merge.\n"
3534 "If this is not correct, please remove the file\n"
3539 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
3543 #: builtin/commit.c:723
3547 "It looks like you may be committing a cherry-pick.\n"
3548 "If this is not correct, please remove the file\n"
3553 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
3557 #: builtin/commit.c:735
3560 "Please enter the commit message for your changes. Lines starting\n"
3561 "with '%c' will be ignored, and an empty message aborts the commit.\n"
3563 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
3566 #: builtin/commit.c:740
3569 "Please enter the commit message for your changes. Lines starting\n"
3570 "with '%c' will be kept; you may remove them yourself if you want to.\n"
3571 "An empty message aborts the commit.\n"
3573 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
3574 "也可以删除它们。一个空的提交说明将会终止提交。\n"
3576 # 译者:为保证在输出中对齐,注意调整句中空格!
3577 #: builtin/commit.c:753
3579 msgid "%sAuthor: %s"
3582 # 译者:为保证在输出中对齐,注意调整句中空格!
3583 #: builtin/commit.c:760
3585 msgid "%sCommitter: %s"
3588 #: builtin/commit.c:780
3589 msgid "Cannot read index"
3592 #: builtin/commit.c:817
3593 msgid "Error building trees"
3596 #: builtin/commit.c:832 builtin/tag.c:359
3598 msgid "Please supply the message using either -m or -F option.\n"
3599 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
3601 #: builtin/commit.c:929
3603 msgid "No existing author found with '%s'"
3604 msgstr "没有找到匹配 '%s' 的作者"
3606 #: builtin/commit.c:944 builtin/commit.c:1138
3608 msgid "Invalid untracked files mode '%s'"
3609 msgstr "无效的未追踪文件参数 '%s'"
3611 #: builtin/commit.c:974
3612 msgid "Using both --reset-author and --author does not make sense"
3613 msgstr "同时使用 --reset-author 和 --author 没有意义"
3615 #: builtin/commit.c:985
3616 msgid "You have nothing to amend."
3619 #: builtin/commit.c:988
3620 msgid "You are in the middle of a merge -- cannot amend."
3621 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
3623 #: builtin/commit.c:990
3624 msgid "You are in the middle of a cherry-pick -- cannot amend."
3625 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
3627 #: builtin/commit.c:993
3628 msgid "Options --squash and --fixup cannot be used together"
3629 msgstr "选项 --squash 和 --fixup 不能同时使用"
3631 #: builtin/commit.c:1003
3632 msgid "Only one of -c/-C/-F/--fixup can be used."
3633 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
3635 #: builtin/commit.c:1005
3636 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3637 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
3639 #: builtin/commit.c:1013
3640 msgid "--reset-author can be used only with -C, -c or --amend."
3641 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
3643 #: builtin/commit.c:1030
3644 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3645 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
3647 #: builtin/commit.c:1032
3648 msgid "No paths with --include/--only does not make sense."
3649 msgstr "参数 --include/--only 不跟路径没有意义。"
3651 #: builtin/commit.c:1034
3652 msgid "Clever... amending the last one with dirty index."
3653 msgstr "聪明... 在索引不干净下修补最后的提交。"
3655 #: builtin/commit.c:1036
3656 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3657 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
3659 #: builtin/commit.c:1046 builtin/tag.c:575
3661 msgid "Invalid cleanup mode %s"
3664 #: builtin/commit.c:1051
3665 msgid "Paths with -a does not make sense."
3666 msgstr "路径和 -a 选项同时使用没有意义。"
3668 #: builtin/commit.c:1057 builtin/commit.c:1192
3669 msgid "--long and -z are incompatible"
3670 msgstr "--long 和 -z 选项不兼容"
3672 #: builtin/commit.c:1152 builtin/commit.c:1388
3673 msgid "show status concisely"
3676 #: builtin/commit.c:1154 builtin/commit.c:1390
3677 msgid "show branch information"
3680 #: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426
3681 msgid "machine-readable output"
3684 #: builtin/commit.c:1159 builtin/commit.c:1394
3685 msgid "show status in long format (default)"
3686 msgstr "以长格式显示状态(默认)"
3688 #: builtin/commit.c:1162 builtin/commit.c:1397
3689 msgid "terminate entries with NUL"
3692 #: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647
3693 #: builtin/fast-export.c:650 builtin/tag.c:459
3697 #: builtin/commit.c:1165 builtin/commit.c:1400
3698 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3699 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
3701 #: builtin/commit.c:1168
3702 msgid "show ignored files"
3705 #: builtin/commit.c:1169 parse-options.h:151
3709 #: builtin/commit.c:1170
3711 "ignore changes to submodules, optional when: all, dirty, untracked. "
3714 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
3716 #: builtin/commit.c:1172
3717 msgid "list untracked files in columns"
3718 msgstr "以列的方式显示未跟踪的文件"
3720 #: builtin/commit.c:1246
3721 msgid "couldn't look up newly created commit"
3724 #: builtin/commit.c:1248
3725 msgid "could not parse newly created commit"
3728 #: builtin/commit.c:1289
3729 msgid "detached HEAD"
3732 # 译者:中文字符串拼接,可删除前导空格
3733 #: builtin/commit.c:1291
3734 msgid " (root-commit)"
3737 #: builtin/commit.c:1358
3738 msgid "suppress summary after successful commit"
3739 msgstr "提交成功后不显示概述信息"
3741 #: builtin/commit.c:1359
3742 msgid "show diff in commit message template"
3743 msgstr "在提交说明模板里显示差异"
3745 #: builtin/commit.c:1361
3746 msgid "Commit message options"
3749 #: builtin/commit.c:1362 builtin/tag.c:457
3750 msgid "read message from file"
3753 #: builtin/commit.c:1363
3757 #: builtin/commit.c:1363
3758 msgid "override author for commit"
3761 #: builtin/commit.c:1364 builtin/gc.c:178
3765 #: builtin/commit.c:1364
3766 msgid "override date for commit"
3769 #: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533
3770 #: builtin/notes.c:690 builtin/tag.c:455
3774 #: builtin/commit.c:1365
3775 msgid "commit message"
3778 #: builtin/commit.c:1366
3779 msgid "reuse and edit message from specified commit"
3780 msgstr "重用并编辑指定提交的提交说明"
3782 #: builtin/commit.c:1367
3783 msgid "reuse message from specified commit"
3784 msgstr "重用指定提交的提交说明"
3786 #: builtin/commit.c:1368
3787 msgid "use autosquash formatted message to fixup specified commit"
3788 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
3790 #: builtin/commit.c:1369
3791 msgid "use autosquash formatted message to squash specified commit"
3792 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
3794 #: builtin/commit.c:1370
3795 msgid "the commit is authored by me now (used with -C/-c/--amend)"
3796 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
3798 #: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109
3799 msgid "add Signed-off-by:"
3800 msgstr "添加 Signed-off-by: 签名"
3802 #: builtin/commit.c:1372
3803 msgid "use specified template file"
3806 #: builtin/commit.c:1373
3807 msgid "force edit of commit"
3810 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
3811 #: builtin/commit.c:1374
3815 #: builtin/commit.c:1374 builtin/tag.c:460
3816 msgid "how to strip spaces and #comments from message"
3817 msgstr "设置如何删除提交说明里的空格和#注释"
3819 #: builtin/commit.c:1375
3820 msgid "include status in commit message template"
3821 msgstr "在提交说明模板里包含状态信息"
3823 #: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461
3827 #: builtin/commit.c:1377 builtin/merge.c:214
3828 msgid "GPG sign commit"
3831 #. end commit message options
3832 #: builtin/commit.c:1380
3833 msgid "Commit contents options"
3836 #: builtin/commit.c:1381
3837 msgid "commit all changed files"
3840 #: builtin/commit.c:1382
3841 msgid "add specified files to index for commit"
3842 msgstr "添加指定的文件到索引区等待提交"
3844 #: builtin/commit.c:1383
3845 msgid "interactively add files"
3848 #: builtin/commit.c:1384
3849 msgid "interactively add changes"
3852 #: builtin/commit.c:1385
3853 msgid "commit only specified files"
3856 #: builtin/commit.c:1386
3857 msgid "bypass pre-commit hook"
3858 msgstr "绕过 pre-commit 钩子"
3860 #: builtin/commit.c:1387
3861 msgid "show what would be committed"
3864 #: builtin/commit.c:1398
3865 msgid "amend previous commit"
3868 #: builtin/commit.c:1399
3869 msgid "bypass post-rewrite hook"
3870 msgstr "绕过 post-rewrite 钩子"
3872 #: builtin/commit.c:1404
3873 msgid "ok to record an empty change"
3876 #: builtin/commit.c:1407
3877 msgid "ok to record a change with an empty message"
3880 #: builtin/commit.c:1439
3881 msgid "could not parse HEAD commit"
3882 msgstr "不能解析 HEAD 提交"
3884 #: builtin/commit.c:1477 builtin/merge.c:508
3886 msgid "could not open '%s' for reading"
3887 msgstr "不能为读入打开 '%s'"
3889 #: builtin/commit.c:1484
3891 msgid "Corrupt MERGE_HEAD file (%s)"
3892 msgstr "损坏的 MERGE_HEAD 文件(%s)"
3894 #: builtin/commit.c:1491
3895 msgid "could not read MERGE_MODE"
3896 msgstr "不能读取 MERGE_MODE"
3898 #: builtin/commit.c:1510
3900 msgid "could not read commit message: %s"
3901 msgstr "不能读取提交说明:%s"
3903 #: builtin/commit.c:1524
3905 msgid "Aborting commit; you did not edit the message.\n"
3906 msgstr "终止提交;您未更改来自模版的提交说明。\n"
3908 #: builtin/commit.c:1529
3910 msgid "Aborting commit due to empty commit message.\n"
3911 msgstr "终止提交因为提交说明为空。\n"
3913 #: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857
3914 msgid "failed to write commit object"
3917 #: builtin/commit.c:1565
3918 msgid "cannot lock HEAD ref"
3919 msgstr "无法锁定 HEAD 引用"
3921 #: builtin/commit.c:1569
3922 msgid "cannot update HEAD ref"
3923 msgstr "无法更新 HEAD 引用"
3925 #: builtin/commit.c:1580
3927 "Repository has been updated, but unable to write\n"
3928 "new_index file. Check that disk is not full or quota is\n"
3929 "not exceeded, and then \"git reset HEAD\" to recover."
3931 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
3932 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
3934 #: builtin/config.c:7
3935 msgid "git config [options]"
3936 msgstr "git config [选项]"
3938 #: builtin/config.c:51
3939 msgid "Config file location"
3942 #: builtin/config.c:52
3943 msgid "use global config file"
3946 #: builtin/config.c:53
3947 msgid "use system config file"
3950 #: builtin/config.c:54
3951 msgid "use repository config file"
3954 #: builtin/config.c:55
3955 msgid "use given config file"
3958 #: builtin/config.c:56
3962 #: builtin/config.c:57
3963 msgid "get value: name [value-regex]"
3964 msgstr "获取值:name [value-regex]"
3966 #: builtin/config.c:58
3967 msgid "get all values: key [value-regex]"
3968 msgstr "获得所有的值:key [value-regex]"
3970 #: builtin/config.c:59
3971 msgid "get values for regexp: name-regex [value-regex]"
3972 msgstr "根据正则表达式获得值:name-regex [value-regex]"
3974 #: builtin/config.c:60
3975 msgid "replace all matching variables: name value [value_regex]"
3976 msgstr "替换所有匹配的变量:name value [value_regex]"
3978 #: builtin/config.c:61
3979 msgid "add a new variable: name value"
3980 msgstr "添加一个新的变量:name value"
3982 #: builtin/config.c:62
3983 msgid "remove a variable: name [value-regex]"
3984 msgstr "删除一个变量:name [value-regex]"
3986 #: builtin/config.c:63
3987 msgid "remove all matches: name [value-regex]"
3988 msgstr "删除所有匹配项:name [value-regex]"
3990 #: builtin/config.c:64
3991 msgid "rename section: old-name new-name"
3992 msgstr "重命名小节:old-name new-name"
3994 #: builtin/config.c:65
3995 msgid "remove a section: name"
3996 msgstr "删除一个小节:name"
3998 #: builtin/config.c:66
4002 #: builtin/config.c:67
4003 msgid "open an editor"
4006 #: builtin/config.c:68 builtin/config.c:69
4010 #: builtin/config.c:68
4011 msgid "find the color configured: [default]"
4012 msgstr "找到配置的颜色:[默认]"
4014 #: builtin/config.c:69
4015 msgid "find the color setting: [stdout-is-tty]"
4016 msgstr "找到颜色设置:[stdout-is-tty]"
4018 #: builtin/config.c:70
4022 #: builtin/config.c:71
4023 msgid "value is \"true\" or \"false\""
4024 msgstr "值是 \"true\" 或 \"false\""
4026 #: builtin/config.c:72
4027 msgid "value is decimal number"
4030 #: builtin/config.c:73
4031 msgid "value is --bool or --int"
4032 msgstr "值是 --bool or --int"
4034 #: builtin/config.c:74
4035 msgid "value is a path (file or directory name)"
4036 msgstr "值是一个路径(文件或目录名)"
4038 #: builtin/config.c:75
4042 #: builtin/config.c:76
4043 msgid "terminate values with NUL byte"
4046 #: builtin/config.c:77
4047 msgid "respect include directives on lookup"
4048 msgstr "查询时参照 include 指令递归查找"
4050 #: builtin/count-objects.c:69
4051 msgid "git count-objects [-v]"
4052 msgstr "git count-objects [-v]"
4054 #: builtin/describe.c:15
4055 msgid "git describe [options] <committish>*"
4056 msgstr "git describe [选项] <提交号>*"
4058 #: builtin/describe.c:16
4059 msgid "git describe [options] --dirty"
4060 msgstr "git describe [选项] --dirty"
4062 #: builtin/describe.c:234
4064 msgid "annotated tag %s not available"
4065 msgstr "注释 tag %s 无效"
4067 #: builtin/describe.c:238
4069 msgid "annotated tag %s has no embedded name"
4070 msgstr "注释 tag %s 没有嵌入名称"
4072 #: builtin/describe.c:240
4074 msgid "tag '%s' is really '%s' here"
4075 msgstr "tag '%s' 的确是在 '%s'"
4077 #: builtin/describe.c:267
4079 msgid "Not a valid object name %s"
4080 msgstr "不是一个有效的对象名 %s"
4082 #: builtin/describe.c:270
4084 msgid "%s is not a valid '%s' object"
4085 msgstr "%s 不是一个有效的 '%s' 对象"
4087 #: builtin/describe.c:287
4089 msgid "no tag exactly matches '%s'"
4090 msgstr "没有 tag 准确匹配 '%s'"
4092 #: builtin/describe.c:289
4094 msgid "searching to describe %s\n"
4097 #: builtin/describe.c:329
4099 msgid "finished search at %s\n"
4102 #: builtin/describe.c:353
4105 "No annotated tags can describe '%s'.\n"
4106 "However, there were unannotated tags: try --tags."
4108 "没有注释 tag 能描述 '%s'。\n"
4109 "然而,有非注释 tag:尝试 --tags。"
4111 #: builtin/describe.c:357
4114 "No tags can describe '%s'.\n"
4115 "Try --always, or create some tags."
4117 "没有注释 tag 能描述 '%s'。\n"
4118 "尝试 --always,或者创建一些 tag。"
4120 #: builtin/describe.c:378
4122 msgid "traversed %lu commits\n"
4123 msgstr "已遍历 %lu 个提交\n"
4125 #: builtin/describe.c:381
4128 "more than %i tags found; listed %i most recent\n"
4129 "gave up search at %s\n"
4131 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4134 #: builtin/describe.c:403
4135 msgid "find the tag that comes after the commit"
4136 msgstr "寻找提交之后的 tag(用于描述提交)"
4138 #: builtin/describe.c:404
4139 msgid "debug search strategy on stderr"
4140 msgstr "在标准错误上调试搜索策略"
4142 #: builtin/describe.c:405
4143 msgid "use any ref in .git/refs"
4144 msgstr "使用 .git/refs 里的任意引用"
4146 #: builtin/describe.c:406
4147 msgid "use any tag in .git/refs/tags"
4148 msgstr "使用 .git/refs/tags 里的任意 tag"
4150 #: builtin/describe.c:407
4151 msgid "always use long format"
4154 #: builtin/describe.c:410
4155 msgid "only output exact matches"
4158 #: builtin/describe.c:412
4159 msgid "consider <n> most recent tags (default: 10)"
4160 msgstr "考虑最近 <n> 个 tags(默认:10)"
4162 #: builtin/describe.c:414
4163 msgid "only consider tags matching <pattern>"
4164 msgstr "只考虑匹配 <模式> 的 tags"
4166 #: builtin/describe.c:416 builtin/name-rev.c:238
4167 msgid "show abbreviated commit object as fallback"
4168 msgstr "显示简写的提交号作为后备"
4170 #: builtin/describe.c:417
4174 #: builtin/describe.c:418
4175 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4176 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4178 #: builtin/describe.c:436
4179 msgid "--long is incompatible with --abbrev=0"
4180 msgstr "--long 与 --abbrev=0 不兼容"
4182 #: builtin/describe.c:462
4183 msgid "No names found, cannot describe anything."
4184 msgstr "没有发现名称,无法描述任何东西。"
4186 #: builtin/describe.c:482
4187 msgid "--dirty is incompatible with committishes"
4188 msgstr "--dirty 不能与提交同时使用"
4190 #: builtin/diff.c:79
4192 msgid "'%s': not a regular file or symlink"
4193 msgstr "'%s':不是一个正规文件或符号链接"
4195 #: builtin/diff.c:228
4197 msgid "invalid option: %s"
4200 #: builtin/diff.c:305
4201 msgid "Not a git repository"
4202 msgstr "不是一个 git 版本库"
4204 #: builtin/diff.c:348
4206 msgid "invalid object '%s' given."
4207 msgstr "提供了无效对象 '%s'。"
4209 #: builtin/diff.c:353
4211 msgid "more than %d trees given: '%s'"
4212 msgstr "提供了超过 %d 个树对象:'%s'"
4214 #: builtin/diff.c:363
4216 msgid "more than two blobs given: '%s'"
4217 msgstr "提供了超过两个数据(blob)对象:'%s'"
4219 #: builtin/diff.c:371
4221 msgid "unhandled object '%s' given."
4222 msgstr "提供了无法处理的对象 '%s'。"
4224 #: builtin/fast-export.c:22
4225 msgid "git fast-export [rev-list-opts]"
4226 msgstr "git fast-export [rev-list-opts]"
4228 #: builtin/fast-export.c:646
4229 msgid "show progress after <n> objects"
4230 msgstr "在 <n> 个对象之后显示进度"
4232 #: builtin/fast-export.c:648
4233 msgid "select handling of signed tags"
4234 msgstr "选择如何处理签名 tags"
4236 #: builtin/fast-export.c:651
4237 msgid "select handling of tags that tag filtered objects"
4238 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4240 #: builtin/fast-export.c:654
4241 msgid "Dump marks to this file"
4244 #: builtin/fast-export.c:656
4245 msgid "Import marks from this file"
4248 #: builtin/fast-export.c:658
4249 msgid "Fake a tagger when tags lack one"
4250 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4252 #: builtin/fast-export.c:660
4253 msgid "Output full tree for each commit"
4256 #: builtin/fast-export.c:662
4257 msgid "Use the done feature to terminate the stream"
4258 msgstr "使用 done 功能来终止流"
4260 #: builtin/fast-export.c:663
4261 msgid "Skip output of blob data"
4264 #: builtin/fetch.c:20
4265 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4266 msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
4268 #: builtin/fetch.c:21
4269 msgid "git fetch [<options>] <group>"
4270 msgstr "git fetch [<选项>] <组>"
4272 #: builtin/fetch.c:22
4273 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4274 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4276 #: builtin/fetch.c:23
4277 msgid "git fetch --all [<options>]"
4278 msgstr "git fetch --all [<选项>]"
4280 #: builtin/fetch.c:60
4281 msgid "fetch from all remotes"
4284 #: builtin/fetch.c:62
4285 msgid "append to .git/FETCH_HEAD instead of overwriting"
4286 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4288 #: builtin/fetch.c:64
4289 msgid "path to upload pack on remote end"
4292 #: builtin/fetch.c:65
4293 msgid "force overwrite of local branch"
4296 #: builtin/fetch.c:67
4297 msgid "fetch from multiple remotes"
4300 #: builtin/fetch.c:69
4301 msgid "fetch all tags and associated objects"
4302 msgstr "抓取所有的 tags 和关联对象"
4304 #: builtin/fetch.c:71
4305 msgid "do not fetch all tags (--no-tags)"
4306 msgstr "不抓取任何 tags (--no-tags)"
4308 #: builtin/fetch.c:73
4309 msgid "prune remote-tracking branches no longer on remote"
4310 msgstr "清除远程已经不存在的分支的跟踪分支"
4313 #: builtin/fetch.c:74
4317 #: builtin/fetch.c:75
4318 msgid "control recursive fetching of submodules"
4321 #: builtin/fetch.c:79
4322 msgid "keep downloaded pack"
4325 #: builtin/fetch.c:81
4326 msgid "allow updating of HEAD ref"
4327 msgstr "允许更新 HEAD 引用"
4329 #: builtin/fetch.c:84
4330 msgid "deepen history of shallow clone"
4333 #: builtin/fetch.c:86
4334 msgid "convert to a complete repository"
4335 msgstr "转换为一个完整的版本库"
4337 #: builtin/fetch.c:88 builtin/log.c:1119
4341 #: builtin/fetch.c:89
4342 msgid "prepend this to submodule path output"
4343 msgstr "在子模组路径输出的前面加上此目录"
4345 #: builtin/fetch.c:92
4346 msgid "default mode for recursion"
4349 #: builtin/fetch.c:204
4350 msgid "Couldn't find remote ref HEAD"
4351 msgstr "无法发现远程 HEAD 引用"
4353 #: builtin/fetch.c:257
4355 msgid "object %s not found"
4358 #: builtin/fetch.c:262
4359 msgid "[up to date]"
4362 #: builtin/fetch.c:276
4364 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4365 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4367 #: builtin/fetch.c:277 builtin/fetch.c:363
4371 #: builtin/fetch.c:288
4372 msgid "[tag update]"
4376 #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
4377 msgid " (unable to update local ref)"
4378 msgstr " (不能更新本地引用)"
4380 #: builtin/fetch.c:308
4384 #: builtin/fetch.c:311
4385 msgid "[new branch]"
4388 #: builtin/fetch.c:314
4392 #: builtin/fetch.c:359
4393 msgid "unable to update local ref"
4396 #: builtin/fetch.c:359
4397 msgid "forced update"
4400 #: builtin/fetch.c:365
4401 msgid "(non-fast-forward)"
4404 #: builtin/fetch.c:396 builtin/fetch.c:688
4406 msgid "cannot open %s: %s\n"
4407 msgstr "无法打开 %s:%s\n"
4409 #: builtin/fetch.c:405
4411 msgid "%s did not send all necessary objects\n"
4412 msgstr "%s 未发送所有必须的对象\n"
4414 #: builtin/fetch.c:491
4419 #: builtin/fetch.c:502
4422 "some local refs could not be updated; try running\n"
4423 " 'git remote prune %s' to remove any old, conflicting branches"
4425 "一些本地引用不能被更新;尝试运行\n"
4426 " 'git remote prune %s' 来删除旧的、有冲突的分支"
4429 #: builtin/fetch.c:552
4431 msgid " (%s will become dangling)"
4432 msgstr " (%s 将成为摇摆状态)"
4435 #: builtin/fetch.c:553
4437 msgid " (%s has become dangling)"
4438 msgstr " (%s 已成为摇摆状态)"
4440 #: builtin/fetch.c:560
4444 #: builtin/fetch.c:561 builtin/remote.c:1055
4448 #: builtin/fetch.c:678
4450 msgid "Refusing to fetch into current branch %s of non-bare repository"
4451 msgstr "拒绝获取到非裸版本库的当前分支 %s"
4453 #: builtin/fetch.c:712
4455 msgid "Don't know how to fetch from %s"
4456 msgstr "不知道如何从 %s 获取"
4458 #: builtin/fetch.c:789
4460 msgid "Option \"%s\" value \"%s\" is not valid for %s"
4461 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4463 #: builtin/fetch.c:792
4465 msgid "Option \"%s\" is ignored for %s\n"
4466 msgstr "选项 \"%s\" 为 %s 所忽略\n"
4468 #: builtin/fetch.c:894
4470 msgid "Fetching %s\n"
4473 #: builtin/fetch.c:896 builtin/remote.c:100
4475 msgid "Could not fetch %s"
4478 #: builtin/fetch.c:915
4480 "No remote repository specified. Please, specify either a URL or a\n"
4481 "remote name from which new revisions should be fetched."
4482 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
4484 #: builtin/fetch.c:935
4485 msgid "You need to specify a tag name."
4486 msgstr "您需要指定一个 tag 名称。"
4488 #: builtin/fetch.c:981
4489 msgid "--depth and --unshallow cannot be used together"
4490 msgstr "--depth 和 --unshallow 不能同时使用"
4492 #: builtin/fetch.c:983
4493 msgid "--unshallow on a complete repository does not make sense"
4494 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
4496 #: builtin/fetch.c:1002
4497 msgid "fetch --all does not take a repository argument"
4498 msgstr "fetch --all 不能带一个版本库参数"
4500 #: builtin/fetch.c:1004
4501 msgid "fetch --all does not make sense with refspecs"
4502 msgstr "fetch --all 带引用表达式没有任何意义"
4504 #: builtin/fetch.c:1015
4506 msgid "No such remote or remote group: %s"
4507 msgstr "没有这样的远程或远程组:%s"
4509 #: builtin/fetch.c:1023
4510 msgid "Fetching a group and specifying refspecs does not make sense"
4511 msgstr "获取组并指定引用表达式没有意义"
4513 #: builtin/fmt-merge-msg.c:13
4514 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4516 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4518 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701
4519 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175
4520 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4524 #: builtin/fmt-merge-msg.c:660
4525 msgid "populate log with at most <n> entries from shortlog"
4526 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
4528 #: builtin/fmt-merge-msg.c:663
4529 msgid "alias for --log (deprecated)"
4530 msgstr "参数 --log 的别名(已弃用)"
4532 #: builtin/fmt-merge-msg.c:666
4536 #: builtin/fmt-merge-msg.c:667
4537 msgid "use <text> as start of message"
4538 msgstr "使用 <文本> 作为提交说明的开始"
4540 #: builtin/fmt-merge-msg.c:668
4541 msgid "file to read from"
4544 #: builtin/for-each-ref.c:979
4545 msgid "git for-each-ref [options] [<pattern>]"
4546 msgstr "git for-each-ref [选项] [<模式>]"
4548 #: builtin/for-each-ref.c:994
4549 msgid "quote placeholders suitably for shells"
4550 msgstr "引用占位符适用于 shells"
4552 #: builtin/for-each-ref.c:996
4553 msgid "quote placeholders suitably for perl"
4554 msgstr "引用占位符适用于 perl"
4556 #: builtin/for-each-ref.c:998
4557 msgid "quote placeholders suitably for python"
4558 msgstr "引用占位符适用于 python"
4560 #: builtin/for-each-ref.c:1000
4561 msgid "quote placeholders suitably for tcl"
4562 msgstr "引用占位符适用于 tcl"
4564 #: builtin/for-each-ref.c:1003
4565 msgid "show only <n> matched refs"
4566 msgstr "只显示 <n> 个匹配的引用"
4568 #: builtin/for-each-ref.c:1004
4572 #: builtin/for-each-ref.c:1004
4573 msgid "format to use for the output"
4576 #: builtin/for-each-ref.c:1005
4580 #: builtin/for-each-ref.c:1006
4581 msgid "field name to sort on"
4584 #: builtin/fsck.c:608
4585 msgid "git fsck [options] [<object>...]"
4586 msgstr "git fsck [选项] [<对象>...]"
4588 #: builtin/fsck.c:614
4589 msgid "show unreachable objects"
4592 #: builtin/fsck.c:615
4593 msgid "show dangling objects"
4596 #: builtin/fsck.c:616
4600 #: builtin/fsck.c:617
4601 msgid "report root nodes"
4604 #: builtin/fsck.c:618
4605 msgid "make index objects head nodes"
4606 msgstr "将索引亦作为检查的头节点"
4608 #: builtin/fsck.c:619
4609 msgid "make reflogs head nodes (default)"
4610 msgstr "将引用日志作为检查的头节点(默认)"
4612 #: builtin/fsck.c:620
4613 msgid "also consider packs and alternate objects"
4616 #: builtin/fsck.c:621
4617 msgid "enable more strict checking"
4620 #: builtin/fsck.c:623
4621 msgid "write dangling objects in .git/lost-found"
4622 msgstr "将摇摆对象写入 .git/lost-found 中"
4624 #: builtin/fsck.c:624 builtin/prune.c:134
4625 msgid "show progress"
4629 msgid "git gc [options]"
4630 msgstr "git gc [选项]"
4634 msgid "Invalid %s: '%s'"
4635 msgstr "无效的 %s:'%s'"
4639 msgid "insanely long object directory %.*s"
4640 msgstr "不正常的长对象目录 %.*s"
4643 msgid "prune unreferenced objects"
4647 msgid "be more thorough (increased runtime)"
4648 msgstr "更彻底(增加运行时间)"
4651 msgid "enable auto-gc mode"
4657 "Auto packing the repository for optimum performance. You may also\n"
4658 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
4660 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
4661 "参见 \"git help gc\" 以获取更多信息。\n"
4665 "There are too many unreachable loose objects; run 'git prune' to remove them."
4666 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
4668 #: builtin/grep.c:22
4669 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4670 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
4672 #: builtin/grep.c:217
4674 msgid "grep: failed to create thread: %s"
4675 msgstr "grep:无法创建线程:%s"
4677 #: builtin/grep.c:365
4679 msgid "Failed to chdir: %s"
4682 #: builtin/grep.c:443 builtin/grep.c:478
4684 msgid "unable to read tree (%s)"
4687 #: builtin/grep.c:493
4689 msgid "unable to grep from object of type %s"
4690 msgstr "无法抓取来自于 %s 类型的对象"
4692 #: builtin/grep.c:551
4694 msgid "switch `%c' expects a numerical value"
4695 msgstr "开关 `%c' 期望一个数字值"
4697 #: builtin/grep.c:568
4699 msgid "cannot open '%s'"
4702 #: builtin/grep.c:643
4703 msgid "search in index instead of in the work tree"
4704 msgstr "在索引区搜索而不是在工作区"
4706 #: builtin/grep.c:645
4707 msgid "find in contents not managed by git"
4708 msgstr "在未被 git 管理的内容中查找"
4710 # 译者:中文字符串拼接,可删除前导空格
4711 #: builtin/grep.c:647
4712 msgid "search in both tracked and untracked files"
4713 msgstr "在跟踪和未跟踪的文件中搜索"
4715 #: builtin/grep.c:649
4716 msgid "search also in ignored files"
4719 #: builtin/grep.c:652
4720 msgid "show non-matching lines"
4723 #: builtin/grep.c:654
4724 msgid "case insensitive matching"
4727 #: builtin/grep.c:656
4728 msgid "match patterns only at word boundaries"
4731 #: builtin/grep.c:658
4732 msgid "process binary files as text"
4733 msgstr "把二进制文件当做文本处理"
4735 #: builtin/grep.c:660
4736 msgid "don't match patterns in binary files"
4737 msgstr "不在二进制文件中匹配模式"
4739 #: builtin/grep.c:663
4740 msgid "descend at most <depth> levels"
4741 msgstr "最多以指定的深度向下寻找"
4743 #: builtin/grep.c:667
4744 msgid "use extended POSIX regular expressions"
4745 msgstr "使用扩展的 POSIX 正则表达式"
4747 #: builtin/grep.c:670
4748 msgid "use basic POSIX regular expressions (default)"
4749 msgstr "使用基本的 POSIX 正则表达式(默认)"
4751 #: builtin/grep.c:673
4752 msgid "interpret patterns as fixed strings"
4753 msgstr "把模式解析为固定的字符串"
4755 #: builtin/grep.c:676
4756 msgid "use Perl-compatible regular expressions"
4757 msgstr "使用 Perl 兼容的正则表达式"
4759 #: builtin/grep.c:679
4760 msgid "show line numbers"
4763 #: builtin/grep.c:680
4764 msgid "don't show filenames"
4767 #: builtin/grep.c:681
4768 msgid "show filenames"
4771 #: builtin/grep.c:683
4772 msgid "show filenames relative to top directory"
4773 msgstr "显示相对于顶级目录的文件名"
4775 #: builtin/grep.c:685
4776 msgid "show only filenames instead of matching lines"
4777 msgstr "只显示文件名而不显示匹配的行"
4779 #: builtin/grep.c:687
4780 msgid "synonym for --files-with-matches"
4781 msgstr "和 --files-with-matches 同义"
4783 #: builtin/grep.c:690
4784 msgid "show only the names of files without match"
4787 #: builtin/grep.c:692
4788 msgid "print NUL after filenames"
4789 msgstr "在文件名后输出 NUL 字符"
4791 #: builtin/grep.c:694
4792 msgid "show the number of matches instead of matching lines"
4793 msgstr "显示总匹配行数,而不显示匹配的行"
4795 #: builtin/grep.c:695
4796 msgid "highlight matches"
4799 #: builtin/grep.c:697
4800 msgid "print empty line between matches from different files"
4801 msgstr "在不同文件的匹配项之间打印空行"
4803 #: builtin/grep.c:699
4804 msgid "show filename only once above matches from same file"
4805 msgstr "只在同一文件的匹配项的上面显示一次文件名"
4807 #: builtin/grep.c:702
4808 msgid "show <n> context lines before and after matches"
4809 msgstr "显示匹配项前后的 <n> 行上下文"
4811 #: builtin/grep.c:705
4812 msgid "show <n> context lines before matches"
4813 msgstr "显示匹配项前 <n> 行上下文"
4815 #: builtin/grep.c:707
4816 msgid "show <n> context lines after matches"
4817 msgstr "显示匹配项后 <n> 行上下文"
4819 #: builtin/grep.c:708
4820 msgid "shortcut for -C NUM"
4823 #: builtin/grep.c:711
4824 msgid "show a line with the function name before matches"
4825 msgstr "在匹配的前面显示一行函数名"
4827 #: builtin/grep.c:713
4828 msgid "show the surrounding function"
4829 msgstr "显示所在函数的前后内容"
4831 #: builtin/grep.c:716
4832 msgid "read patterns from file"
4835 #: builtin/grep.c:718
4836 msgid "match <pattern>"
4839 #: builtin/grep.c:720
4840 msgid "combine patterns specified with -e"
4841 msgstr "组合用 -e 参数设定的模式"
4843 #: builtin/grep.c:732
4844 msgid "indicate hit with exit status without output"
4845 msgstr "不输出,而用退出码标识命中状态"
4847 #: builtin/grep.c:734
4848 msgid "show only matches from files that match all patterns"
4849 msgstr "只显示匹配所有模式的文件中的匹配"
4851 #: builtin/grep.c:736
4852 msgid "show parse tree for grep expression"
4853 msgstr "显示 grep 表达式的解析树"
4855 #: builtin/grep.c:740
4859 #: builtin/grep.c:740
4860 msgid "show matching files in the pager"
4863 #: builtin/grep.c:743
4864 msgid "allow calling of grep(1) (ignored by this build)"
4865 msgstr "允许调用 grep(1)(本次构建忽略)"
4867 #: builtin/grep.c:744 builtin/show-ref.c:184
4871 #: builtin/grep.c:811
4872 msgid "no pattern given."
4875 #: builtin/grep.c:825
4877 msgid "bad object %s"
4880 #: builtin/grep.c:868
4881 msgid "--open-files-in-pager only works on the worktree"
4882 msgstr "--open-files-in-pager 仅用于工作区"
4884 #: builtin/grep.c:891
4885 msgid "--cached or --untracked cannot be used with --no-index."
4886 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
4888 #: builtin/grep.c:896
4889 msgid "--no-index or --untracked cannot be used with revs."
4890 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
4892 #: builtin/grep.c:899
4893 msgid "--[no-]exclude-standard cannot be used for tracked contents."
4894 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
4896 #: builtin/grep.c:907
4897 msgid "both --cached and trees are given."
4898 msgstr "同时给出了 --cached 和树对象。"
4900 #: builtin/hash-object.c:60
4902 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4905 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
4908 #: builtin/hash-object.c:61
4909 msgid "git hash-object --stdin-paths < <list-of-paths>"
4910 msgstr "git hash-object --stdin-paths < <路径列表>"
4912 #: builtin/hash-object.c:72
4916 #: builtin/hash-object.c:72
4920 #: builtin/hash-object.c:73
4921 msgid "write the object into the object database"
4924 #: builtin/hash-object.c:74
4925 msgid "read the object from stdin"
4928 #: builtin/hash-object.c:76
4929 msgid "store file as is without filters"
4930 msgstr "原样存储文件不使用过滤器"
4932 #: builtin/hash-object.c:77
4933 msgid "process file as it were from this path"
4934 msgstr "处理文件并假设其来自于此路径"
4936 #: builtin/help.c:42
4937 msgid "print all available commands"
4940 #: builtin/help.c:43
4941 msgid "show man page"
4944 #: builtin/help.c:44
4945 msgid "show manual in web browser"
4946 msgstr "在 web 浏览器中显示手册"
4948 #: builtin/help.c:46
4949 msgid "show info page"
4952 #: builtin/help.c:52
4953 msgid "git help [--all] [--man|--web|--info] [command]"
4954 msgstr "git help [--all] [--man|--web|--info] [命令]"
4956 #: builtin/help.c:64
4958 msgid "unrecognized help format '%s'"
4959 msgstr "未能识别的帮助格式 '%s'"
4961 #: builtin/help.c:92
4962 msgid "Failed to start emacsclient."
4963 msgstr "无法启动 emacsclient。"
4965 #: builtin/help.c:105
4966 msgid "Failed to parse emacsclient version."
4967 msgstr "无法解析 emacsclient 版本。"
4969 #: builtin/help.c:113
4971 msgid "emacsclient version '%d' too old (< 22)."
4972 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
4974 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
4976 msgid "failed to exec '%s': %s"
4977 msgstr "无法执行 '%s':%s"
4979 #: builtin/help.c:216
4982 "'%s': path for unsupported man viewer.\n"
4983 "Please consider using 'man.<tool>.cmd' instead."
4985 "'%s':不支持的 man 手册查看器的路径。\n"
4986 "请使用 'man.<tool>.cmd'。"
4988 #: builtin/help.c:228
4991 "'%s': cmd for supported man viewer.\n"
4992 "Please consider using 'man.<tool>.path' instead."
4994 "'%s': 支持的 man 手册查看器命令。\n"
4995 "请使用 'man.<tool>.path'。"
4997 #: builtin/help.c:349
4999 msgid "'%s': unknown man viewer."
5000 msgstr "'%s':未知的 man 查看器。"
5002 #: builtin/help.c:366
5003 msgid "no man viewer handled the request"
5004 msgstr "没有 man 查看器处理此请求"
5006 #: builtin/help.c:374
5007 msgid "no info viewer handled the request"
5008 msgstr "没有 info 查看器处理此请求"
5010 #: builtin/help.c:429 builtin/help.c:436
5015 #: builtin/help.c:452
5017 msgid "`git %s' is aliased to `%s'"
5018 msgstr "`git %s' 是 `%s' 的别名"
5020 #: builtin/index-pack.c:170
5022 msgid "object type mismatch at %s"
5023 msgstr "%s 的对象类型不匹配"
5025 #: builtin/index-pack.c:190
5026 msgid "object of unexpected type"
5029 #: builtin/index-pack.c:227
5031 msgid "cannot fill %d byte"
5032 msgid_plural "cannot fill %d bytes"
5033 msgstr[0] "无法填充 %d 字节"
5034 msgstr[1] "无法填充 %d 字节"
5036 #: builtin/index-pack.c:237
5038 msgstr "过早的文件结束符(EOF)"
5040 #: builtin/index-pack.c:238
5041 msgid "read error on input"
5044 #: builtin/index-pack.c:250
5045 msgid "used more bytes than were available"
5048 #: builtin/index-pack.c:257
5049 msgid "pack too large for current definition of off_t"
5050 msgstr "包太大超过了当前 off_t 的定义"
5052 #: builtin/index-pack.c:273
5054 msgid "unable to create '%s'"
5057 #: builtin/index-pack.c:278
5059 msgid "cannot open packfile '%s'"
5060 msgstr "无法打开包文件 '%s'"
5062 #: builtin/index-pack.c:292
5063 msgid "pack signature mismatch"
5066 #: builtin/index-pack.c:294
5068 msgid "pack version %<PRIu32> unsupported"
5069 msgstr "不支持包版本 %<PRIu32>"
5071 #: builtin/index-pack.c:312
5073 msgid "pack has bad object at offset %lu: %s"
5074 msgstr "包中有错误的对象位于 %lu:%s"
5076 #: builtin/index-pack.c:434
5078 msgid "inflate returned %d"
5081 #: builtin/index-pack.c:483
5082 msgid "offset value overflow for delta base object"
5083 msgstr "偏移值覆盖了 delta 基准对象"
5085 #: builtin/index-pack.c:491
5086 msgid "delta base offset is out of bound"
5087 msgstr "delta 基准偏移越界"
5089 #: builtin/index-pack.c:499
5091 msgid "unknown object type %d"
5094 #: builtin/index-pack.c:530
5095 msgid "cannot pread pack file"
5098 #: builtin/index-pack.c:532
5100 msgid "premature end of pack file, %lu byte missing"
5101 msgid_plural "premature end of pack file, %lu bytes missing"
5102 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5103 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5105 #: builtin/index-pack.c:558
5106 msgid "serious inflate inconsistency"
5109 #: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
5110 #: builtin/index-pack.c:712 builtin/index-pack.c:721
5112 msgid "SHA1 COLLISION FOUND WITH %s !"
5113 msgstr "发现 %s 出现 SHA1 冲突!"
5115 #: builtin/index-pack.c:652 builtin/pack-objects.c:170
5116 #: builtin/pack-objects.c:262
5118 msgid "unable to read %s"
5121 #: builtin/index-pack.c:718
5123 msgid "cannot read existing object %s"
5124 msgstr "不能读取现存对象 %s"
5126 #: builtin/index-pack.c:732
5128 msgid "invalid blob object %s"
5129 msgstr "无效的数据(blob)对象 %s"
5131 #: builtin/index-pack.c:747
5136 #: builtin/index-pack.c:749
5137 msgid "Error in object"
5140 #: builtin/index-pack.c:751
5142 msgid "Not all child objects of %s are reachable"
5143 msgstr "%s 的所有子对象并非都可达"
5145 #: builtin/index-pack.c:821 builtin/index-pack.c:847
5146 msgid "failed to apply delta"
5149 #: builtin/index-pack.c:986
5150 msgid "Receiving objects"
5153 #: builtin/index-pack.c:986
5154 msgid "Indexing objects"
5157 #: builtin/index-pack.c:1012
5158 msgid "pack is corrupted (SHA1 mismatch)"
5159 msgstr "包冲突(SHA1 不匹配)"
5161 #: builtin/index-pack.c:1017
5162 msgid "cannot fstat packfile"
5165 #: builtin/index-pack.c:1020
5166 msgid "pack has junk at the end"
5169 #: builtin/index-pack.c:1031
5170 msgid "confusion beyond insanity in parse_pack_objects()"
5171 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5173 #: builtin/index-pack.c:1054
5174 msgid "Resolving deltas"
5177 #: builtin/index-pack.c:1064
5179 msgid "unable to create thread: %s"
5182 #: builtin/index-pack.c:1106
5183 msgid "confusion beyond insanity"
5186 #: builtin/index-pack.c:1112
5188 msgid "completed with %d local objects"
5189 msgstr "完成 %d 个本地对象"
5191 #: builtin/index-pack.c:1121
5193 msgid "Unexpected tail checksum for %s (disk corruption?)"
5194 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5196 #: builtin/index-pack.c:1125
5198 msgid "pack has %d unresolved delta"
5199 msgid_plural "pack has %d unresolved deltas"
5200 msgstr[0] "包有 %d 个未解决的 delta"
5201 msgstr[1] "包有 %d 个未解决的 delta"
5203 #: builtin/index-pack.c:1150
5205 msgid "unable to deflate appended object (%d)"
5206 msgstr "不能压缩附加对象(%d)"
5208 #: builtin/index-pack.c:1229
5210 msgid "local object %s is corrupt"
5211 msgstr "本地对象 %s 已损坏"
5213 #: builtin/index-pack.c:1253
5214 msgid "error while closing pack file"
5217 #: builtin/index-pack.c:1266
5219 msgid "cannot write keep file '%s'"
5220 msgstr "无法写保留文件 '%s'"
5222 #: builtin/index-pack.c:1274
5224 msgid "cannot close written keep file '%s'"
5225 msgstr "无法关闭保留文件 '%s'"
5227 #: builtin/index-pack.c:1287
5228 msgid "cannot store pack file"
5231 #: builtin/index-pack.c:1298
5232 msgid "cannot store index file"
5235 #: builtin/index-pack.c:1331
5237 msgid "bad pack.indexversion=%<PRIu32>"
5238 msgstr "坏的 pack.indexversion=%<PRIu32>"
5240 #: builtin/index-pack.c:1337
5242 msgid "invalid number of threads specified (%d)"
5243 msgstr "指定的线程数无效(%d)"
5245 #: builtin/index-pack.c:1341 builtin/index-pack.c:1514
5247 msgid "no threads support, ignoring %s"
5248 msgstr "没有线程支持,忽略 %s"
5250 #: builtin/index-pack.c:1399
5252 msgid "Cannot open existing pack file '%s'"
5253 msgstr "无法打开现存包文件 '%s'"
5255 #: builtin/index-pack.c:1401
5257 msgid "Cannot open existing pack idx file for '%s'"
5258 msgstr "无法为 %s 打开包索引文件"
5260 #: builtin/index-pack.c:1448
5262 msgid "non delta: %d object"
5263 msgid_plural "non delta: %d objects"
5264 msgstr[0] "非 delta:%d 个对象"
5265 msgstr[1] "非 delta:%d 个对象"
5267 #: builtin/index-pack.c:1455
5269 msgid "chain length = %d: %lu object"
5270 msgid_plural "chain length = %d: %lu objects"
5271 msgstr[0] "链长 = %d: %lu 对象"
5272 msgstr[1] "链长 = %d: %lu 对象"
5274 #: builtin/index-pack.c:1482
5275 msgid "Cannot come back to cwd"
5278 #: builtin/index-pack.c:1526 builtin/index-pack.c:1529
5279 #: builtin/index-pack.c:1541 builtin/index-pack.c:1545
5284 #: builtin/index-pack.c:1559
5285 msgid "--fix-thin cannot be used without --stdin"
5286 msgstr "--fix-thin 不能和 --stdin 同时使用"
5288 #: builtin/index-pack.c:1563 builtin/index-pack.c:1573
5290 msgid "packfile name '%s' does not end with '.pack'"
5291 msgstr "包名 '%s' 没有以 '.pack' 结尾"
5293 #: builtin/index-pack.c:1582
5294 msgid "--verify with no packfile name given"
5295 msgstr "--verify 没有提供包名参数"
5297 #: builtin/init-db.c:35
5299 msgid "Could not make %s writable by group"
5300 msgstr "不能设置 %s 为组可写"
5302 #: builtin/init-db.c:62
5304 msgid "insanely long template name %s"
5307 #: builtin/init-db.c:67
5309 msgid "cannot stat '%s'"
5310 msgstr "不能枚举 '%s' 状态"
5312 #: builtin/init-db.c:73
5314 msgid "cannot stat template '%s'"
5315 msgstr "不能枚举模版 '%s' 状态"
5317 #: builtin/init-db.c:80
5319 msgid "cannot opendir '%s'"
5320 msgstr "不能打开目录 '%s'"
5322 #: builtin/init-db.c:97
5324 msgid "cannot readlink '%s'"
5325 msgstr "不能读取链接 '%s'"
5327 #: builtin/init-db.c:99
5329 msgid "insanely long symlink %s"
5332 #: builtin/init-db.c:102
5334 msgid "cannot symlink '%s' '%s'"
5335 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
5337 #: builtin/init-db.c:106
5339 msgid "cannot copy '%s' to '%s'"
5340 msgstr "不能拷贝 '%s' 至 '%s'"
5342 #: builtin/init-db.c:110
5344 msgid "ignoring template %s"
5347 #: builtin/init-db.c:133
5349 msgid "insanely long template path %s"
5352 #: builtin/init-db.c:141
5354 msgid "templates not found %s"
5357 #: builtin/init-db.c:154
5359 msgid "not copying templates of a wrong format version %d from '%s'"
5360 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
5362 #: builtin/init-db.c:192
5364 msgid "insane git directory %s"
5365 msgstr "不正常的 git 目录 %s"
5367 #: builtin/init-db.c:323 builtin/init-db.c:326
5369 msgid "%s already exists"
5372 #: builtin/init-db.c:355
5374 msgid "unable to handle file type %d"
5375 msgstr "不能处理 %d 类型的文件"
5377 #: builtin/init-db.c:358
5379 msgid "unable to move %s to %s"
5380 msgstr "不能移动 %s 至 %s"
5382 #: builtin/init-db.c:363
5384 msgid "Could not create git link %s"
5385 msgstr "不能创建 git link %s"
5388 #. * TRANSLATORS: The first '%s' is either "Reinitialized
5389 #. * existing" or "Initialized empty", the second " shared" or
5390 #. * "", and the last '%s%s' is the verbatim directory name.
5392 #: builtin/init-db.c:420
5394 msgid "%s%s Git repository in %s%s\n"
5395 msgstr "%s%s Git 版本库于 %s%s\n"
5397 #: builtin/init-db.c:421
5398 msgid "Reinitialized existing"
5401 #: builtin/init-db.c:421
5402 msgid "Initialized empty"
5405 # 译者:中文字符串拼接,可删除前导空格
5406 #: builtin/init-db.c:422
5410 #: builtin/init-db.c:441
5411 msgid "cannot tell cwd"
5414 #: builtin/init-db.c:467
5416 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5417 "shared[=<permissions>]] [directory]"
5419 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5422 #: builtin/init-db.c:490
5426 #: builtin/init-db.c:491
5427 msgid "specify that the git repository is to be shared amongst several users"
5428 msgstr "指定 git 版本库是多个用户之间共享的"
5430 #: builtin/init-db.c:493 builtin/prune-packed.c:77
5434 #: builtin/init-db.c:522 builtin/init-db.c:529
5436 msgid "cannot mkdir %s"
5439 #: builtin/init-db.c:533
5441 msgid "cannot chdir to %s"
5444 #: builtin/init-db.c:555
5447 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5450 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5453 #: builtin/init-db.c:579
5454 msgid "Cannot access current working directory"
5457 #: builtin/init-db.c:586
5459 msgid "Cannot access work tree '%s'"
5460 msgstr "不能访问工作区 '%s'"
5463 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
5464 msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"
5467 msgid " or: git show [options] <object>..."
5468 msgstr " 或者:git show [选项] <对象>..."
5470 #: builtin/log.c:102
5471 msgid "suppress diff output"
5474 #: builtin/log.c:103
5478 #: builtin/log.c:104
5479 msgid "Use mail map file"
5482 #: builtin/log.c:105
5483 msgid "decorate options"
5486 #: builtin/log.c:198
5488 msgid "Final output: %d %s\n"
5489 msgstr "最终输出:%d %s\n"
5491 #: builtin/log.c:419 builtin/log.c:511
5493 msgid "Could not read object %s"
5496 #: builtin/log.c:535
5498 msgid "Unknown type: %d"
5501 #: builtin/log.c:627
5502 msgid "format.headers without value"
5503 msgstr "format.headers 没有值"
5505 #: builtin/log.c:701
5506 msgid "name of output directory is too long"
5509 #: builtin/log.c:717
5511 msgid "Cannot open patch file %s"
5512 msgstr "无法打开补丁文件 %s"
5514 #: builtin/log.c:731
5515 msgid "Need exactly one range."
5518 #: builtin/log.c:739
5519 msgid "Not a range."
5522 #: builtin/log.c:812
5523 msgid "Cover letter needs email format"
5526 #: builtin/log.c:885
5528 msgid "insane in-reply-to: %s"
5529 msgstr "不正常的 in-reply-to:%s"
5531 #: builtin/log.c:913
5532 msgid "git format-patch [options] [<since> | <revision range>]"
5533 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
5535 #: builtin/log.c:958
5536 msgid "Two output directories?"
5539 #: builtin/log.c:1097
5540 msgid "use [PATCH n/m] even with a single patch"
5541 msgstr "使用 [PATCH n/m],即使只有一个补丁"
5543 #: builtin/log.c:1100
5544 msgid "use [PATCH] even with multiple patches"
5545 msgstr "使用 [PATCH],即使有多个补丁"
5547 #: builtin/log.c:1104
5548 msgid "print patches to standard out"
5551 #: builtin/log.c:1106
5552 msgid "generate a cover letter"
5555 #: builtin/log.c:1108
5556 msgid "use simple number sequence for output file names"
5557 msgstr "使用简单的数字序列作为输出文件名"
5559 #: builtin/log.c:1109
5563 #: builtin/log.c:1110
5564 msgid "use <sfx> instead of '.patch'"
5565 msgstr "使用 <后缀> 代替 '.patch'"
5567 #: builtin/log.c:1112
5568 msgid "start numbering patches at <n> instead of 1"
5569 msgstr "补丁以 <n> 开始编号,而不是1"
5571 #: builtin/log.c:1114
5572 msgid "mark the series as Nth re-roll"
5573 msgstr "标记补丁系列是第几次重制"
5575 #: builtin/log.c:1116
5576 msgid "Use [<prefix>] instead of [PATCH]"
5577 msgstr "使用 [<前缀>] 代替 [PATCH]"
5579 #: builtin/log.c:1119
5580 msgid "store resulting files in <dir>"
5581 msgstr "把结果文件存储在 <dir>"
5583 #: builtin/log.c:1122
5584 msgid "don't strip/add [PATCH]"
5585 msgstr "不删除/添加 [PATCH]"
5587 #: builtin/log.c:1125
5588 msgid "don't output binary diffs"
5591 #: builtin/log.c:1127
5592 msgid "don't include a patch matching a commit upstream"
5593 msgstr "不包含已在上游提交中的补丁"
5595 #: builtin/log.c:1129
5596 msgid "show patch format instead of default (patch + stat)"
5597 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
5599 #: builtin/log.c:1131
5603 #: builtin/log.c:1132
5607 #: builtin/log.c:1133
5608 msgid "add email header"
5611 #: builtin/log.c:1134 builtin/log.c:1136
5615 #: builtin/log.c:1134
5616 msgid "add To: header"
5619 #: builtin/log.c:1136
5620 msgid "add Cc: header"
5623 #: builtin/log.c:1138
5627 #: builtin/log.c:1139
5628 msgid "make first mail a reply to <message-id>"
5629 msgstr "使第一封邮件作为对 <message-id> 的回复"
5631 #: builtin/log.c:1140 builtin/log.c:1143
5635 #: builtin/log.c:1141
5636 msgid "attach the patch"
5639 #: builtin/log.c:1144
5640 msgid "inline the patch"
5643 #: builtin/log.c:1148
5644 msgid "enable message threading, styles: shallow, deep"
5645 msgstr "启用邮件线索,风格:浅,深"
5647 #: builtin/log.c:1150
5651 #: builtin/log.c:1151
5652 msgid "add a signature"
5655 #: builtin/log.c:1153
5656 msgid "don't print the patch filenames"
5659 #: builtin/log.c:1202
5661 msgid "bogus committer info %s"
5662 msgstr "虚假的提交者信息 %s"
5664 #: builtin/log.c:1247
5665 msgid "-n and -k are mutually exclusive."
5666 msgstr "-n 和 -k 互斥。"
5668 #: builtin/log.c:1249
5669 msgid "--subject-prefix and -k are mutually exclusive."
5670 msgstr "--subject-prefix 和 -k 互斥。"
5672 #: builtin/log.c:1257
5673 msgid "--name-only does not make sense"
5674 msgstr "--name-only 无意义"
5676 #: builtin/log.c:1259
5677 msgid "--name-status does not make sense"
5678 msgstr "--name-status 无意义"
5680 #: builtin/log.c:1261
5681 msgid "--check does not make sense"
5682 msgstr "--check 无意义"
5684 #: builtin/log.c:1284
5685 msgid "standard output, or directory, which one?"
5686 msgstr "标准输出或目录,哪一个?"
5688 #: builtin/log.c:1286
5690 msgid "Could not create directory '%s'"
5691 msgstr "不能创建目录 '%s'"
5693 #: builtin/log.c:1439
5694 msgid "Failed to create output files"
5697 #: builtin/log.c:1488
5698 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5699 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
5701 #: builtin/log.c:1543
5704 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
5705 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
5707 #: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570
5709 msgid "Unknown commit %s"
5712 #: builtin/ls-files.c:409
5713 msgid "git ls-files [options] [<file>...]"
5714 msgstr "git ls-files [选项] [<文件>...]"
5716 #: builtin/ls-files.c:466
5717 msgid "identify the file status with tags"
5720 #: builtin/ls-files.c:468
5721 msgid "use lowercase letters for 'assume unchanged' files"
5722 msgstr "使用小写字母表示 '假设未改变的' 文件"
5724 #: builtin/ls-files.c:470
5725 msgid "show cached files in the output (default)"
5726 msgstr "显示缓存的文件(默认)"
5728 #: builtin/ls-files.c:472
5729 msgid "show deleted files in the output"
5732 #: builtin/ls-files.c:474
5733 msgid "show modified files in the output"
5736 #: builtin/ls-files.c:476
5737 msgid "show other files in the output"
5740 #: builtin/ls-files.c:478
5741 msgid "show ignored files in the output"
5744 #: builtin/ls-files.c:481
5745 msgid "show staged contents' object name in the output"
5746 msgstr "显示暂存区内容的对象名称"
5748 #: builtin/ls-files.c:483
5749 msgid "show files on the filesystem that need to be removed"
5750 msgstr "显示文件系统需要删除的文件"
5752 #: builtin/ls-files.c:485
5753 msgid "show 'other' directories' name only"
5754 msgstr "只显示“其他”目录的名称"
5756 #: builtin/ls-files.c:488
5757 msgid "don't show empty directories"
5760 #: builtin/ls-files.c:491
5761 msgid "show unmerged files in the output"
5764 #: builtin/ls-files.c:493
5765 msgid "show resolve-undo information"
5766 msgstr "显示 resolve-undo 信息"
5768 #: builtin/ls-files.c:495
5769 msgid "skip files matching pattern"
5772 #: builtin/ls-files.c:498
5773 msgid "exclude patterns are read from <file>"
5774 msgstr "从 <文件> 中读取排除模式"
5776 #: builtin/ls-files.c:501
5777 msgid "read additional per-directory exclude patterns in <file>"
5778 msgstr "从 <文件> 读取额外的每个目录的排除模式"
5780 #: builtin/ls-files.c:503
5781 msgid "add the standard git exclusions"
5782 msgstr "添加标准的 git 排除"
5784 #: builtin/ls-files.c:506
5785 msgid "make the output relative to the project top directory"
5786 msgstr "显示相对于顶级目录的文件名"
5788 #: builtin/ls-files.c:509
5789 msgid "if any <file> is not in the index, treat this as an error"
5790 msgstr "如果任何 <文件> 都不在索引区,视为错误"
5792 #: builtin/ls-files.c:510
5796 #: builtin/ls-files.c:511
5797 msgid "pretend that paths removed since <tree-ish> are still present"
5798 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
5800 #: builtin/ls-files.c:513
5801 msgid "show debugging data"
5804 #: builtin/ls-tree.c:27
5805 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5806 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
5808 #: builtin/ls-tree.c:125
5809 msgid "only show trees"
5812 #: builtin/ls-tree.c:127
5813 msgid "recurse into subtrees"
5816 #: builtin/ls-tree.c:129
5817 msgid "show trees when recursing"
5820 #: builtin/ls-tree.c:132
5821 msgid "terminate entries with NUL byte"
5824 #: builtin/ls-tree.c:133
5825 msgid "include object size"
5828 #: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5829 msgid "list only filenames"
5832 #: builtin/ls-tree.c:140
5833 msgid "use full path names"
5836 #: builtin/ls-tree.c:142
5837 msgid "list entire tree; not just current directory (implies --full-name)"
5838 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
5840 #: builtin/merge.c:43
5841 msgid "git merge [options] [<commit>...]"
5842 msgstr "git merge [选项] [<提交>...]"
5844 #: builtin/merge.c:44
5845 msgid "git merge [options] <msg> HEAD <commit>"
5846 msgstr "git merge [选项] <说明> HEAD <提交>"
5848 #: builtin/merge.c:45
5849 msgid "git merge --abort"
5850 msgstr "git merge --abort"
5852 #: builtin/merge.c:90
5853 msgid "switch `m' requires a value"
5854 msgstr "开关 `m' 需要一个值"
5856 #: builtin/merge.c:127
5858 msgid "Could not find merge strategy '%s'.\n"
5859 msgstr "不能找到合并策略 '%s'。\n"
5861 #: builtin/merge.c:128
5863 msgid "Available strategies are:"
5866 #: builtin/merge.c:133
5868 msgid "Available custom strategies are:"
5871 #: builtin/merge.c:183
5872 msgid "do not show a diffstat at the end of the merge"
5873 msgstr "在合并的最后不显示差异统计"
5875 #: builtin/merge.c:186
5876 msgid "show a diffstat at the end of the merge"
5877 msgstr "在合并的最后显示差异统计"
5879 #: builtin/merge.c:187
5880 msgid "(synonym to --stat)"
5881 msgstr "(和 --stat 同义)"
5883 #: builtin/merge.c:189
5884 msgid "add (at most <n>) entries from shortlog to merge commit message"
5885 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
5887 #: builtin/merge.c:192
5888 msgid "create a single commit instead of doing a merge"
5889 msgstr "创建一个单独的提交而不是做一次合并"
5891 #: builtin/merge.c:194
5892 msgid "perform a commit if the merge succeeds (default)"
5893 msgstr "如果合并成功,执行一次提交(默认)"
5895 #: builtin/merge.c:196
5896 msgid "edit message before committing"
5899 #: builtin/merge.c:198
5900 msgid "allow fast-forward (default)"
5903 #: builtin/merge.c:200
5904 msgid "abort if fast-forward is not possible"
5905 msgstr "如果不能快进就放弃合并"
5907 #: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112
5911 #: builtin/merge.c:203
5912 msgid "merge strategy to use"
5915 #: builtin/merge.c:204
5916 msgid "option=value"
5917 msgstr "option=value"
5919 #: builtin/merge.c:205
5920 msgid "option for selected merge strategy"
5923 #: builtin/merge.c:207
5924 msgid "merge commit message (for a non-fast-forward merge)"
5925 msgstr "合并的提交说明(针对非快进式合并)"
5927 #: builtin/merge.c:211
5928 msgid "abort the current in-progress merge"
5929 msgstr "放弃当前正在进行的合并"
5931 #: builtin/merge.c:240
5932 msgid "could not run stash."
5935 #: builtin/merge.c:245
5936 msgid "stash failed"
5939 #: builtin/merge.c:250
5941 msgid "not a valid object: %s"
5942 msgstr "不是一个有效对象:%s"
5944 #: builtin/merge.c:269 builtin/merge.c:286
5945 msgid "read-tree failed"
5949 #: builtin/merge.c:316
5950 msgid " (nothing to squash)"
5953 #: builtin/merge.c:329
5955 msgid "Squash commit -- not updating HEAD\n"
5956 msgstr "压缩提交 -- 未更新 HEAD\n"
5958 #: builtin/merge.c:361
5959 msgid "Writing SQUASH_MSG"
5960 msgstr "写入 SQUASH_MSG"
5962 #: builtin/merge.c:363
5963 msgid "Finishing SQUASH_MSG"
5964 msgstr "完成 SQUASH_MSG"
5966 #: builtin/merge.c:386
5968 msgid "No merge message -- not updating HEAD\n"
5969 msgstr "无合并信息 -- 未更新 HEAD\n"
5971 #: builtin/merge.c:436
5973 msgid "'%s' does not point to a commit"
5974 msgstr "'%s' 没有指向一个提交"
5976 #: builtin/merge.c:535
5978 msgid "Bad branch.%s.mergeoptions string: %s"
5979 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
5981 #: builtin/merge.c:628
5982 msgid "git write-tree failed to write a tree"
5983 msgstr "git write-tree 无法写入一树对象"
5985 #: builtin/merge.c:656
5986 msgid "Not handling anything other than two heads merge."
5987 msgstr "不能处理两个头合并之外的任何操作。"
5989 #: builtin/merge.c:670
5991 msgid "Unknown option for merge-recursive: -X%s"
5992 msgstr "merge-recursive 的未知选项:-X%s"
5994 #: builtin/merge.c:684
5996 msgid "unable to write %s"
5999 #: builtin/merge.c:773
6001 msgid "Could not read from '%s'"
6002 msgstr "不能从 '%s' 读取"
6004 #: builtin/merge.c:782
6006 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6007 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6009 #: builtin/merge.c:788
6012 "Please enter a commit message to explain why this merge is necessary,\n"
6013 "especially if it merges an updated upstream into a topic branch.\n"
6015 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6018 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6021 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6023 #: builtin/merge.c:812
6024 msgid "Empty commit message."
6027 #: builtin/merge.c:824
6029 msgid "Wonderful.\n"
6032 #: builtin/merge.c:889
6034 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6035 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6037 #: builtin/merge.c:905
6039 msgid "'%s' is not a commit"
6040 msgstr "'%s' 不是一个提交"
6042 #: builtin/merge.c:946
6043 msgid "No current branch."
6046 #: builtin/merge.c:948
6047 msgid "No remote for the current branch."
6048 msgstr "当前分支没有对应的远程版本库。"
6050 #: builtin/merge.c:950
6051 msgid "No default upstream defined for the current branch."
6052 msgstr "当前分支没有定义默认的上游分支。"
6054 #: builtin/merge.c:955
6056 msgid "No remote tracking branch for %s from %s"
6057 msgstr "%s 没有来自 %s 的远程跟踪分支"
6059 #: builtin/merge.c:1042 builtin/merge.c:1199
6061 msgid "%s - not something we can merge"
6064 #: builtin/merge.c:1110
6065 msgid "There is no merge to abort (MERGE_HEAD missing)."
6066 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6068 #: builtin/merge.c:1126 git-pull.sh:31
6070 "You have not concluded your merge (MERGE_HEAD exists).\n"
6071 "Please, commit your changes before you can merge."
6073 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6076 #: builtin/merge.c:1129 git-pull.sh:34
6077 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6078 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6080 #: builtin/merge.c:1133
6082 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6083 "Please, commit your changes before you can merge."
6085 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6088 #: builtin/merge.c:1136
6089 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6090 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6092 #: builtin/merge.c:1145
6093 msgid "You cannot combine --squash with --no-ff."
6094 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6096 #: builtin/merge.c:1150
6097 msgid "You cannot combine --no-ff with --ff-only."
6098 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
6100 #: builtin/merge.c:1157
6101 msgid "No commit specified and merge.defaultToUpstream not set."
6102 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6104 #: builtin/merge.c:1189
6105 msgid "Can merge only exactly one commit into empty head"
6106 msgstr "只能将一个提交合并到空分支上"
6108 #: builtin/merge.c:1192
6109 msgid "Squash commit into empty head not supported yet"
6110 msgstr "尚不支持到空分支的压缩提交"
6112 #: builtin/merge.c:1194
6113 msgid "Non-fast-forward commit does not make sense into an empty head"
6114 msgstr "到空分支的非快进式提交没有意义"
6116 #: builtin/merge.c:1310
6118 msgid "Updating %s..%s\n"
6119 msgstr "更新 %s..%s\n"
6121 #: builtin/merge.c:1349
6123 msgid "Trying really trivial in-index merge...\n"
6124 msgstr "尝试非常小的索引内合并...\n"
6126 #: builtin/merge.c:1356
6131 #: builtin/merge.c:1388
6132 msgid "Not possible to fast-forward, aborting."
6135 #: builtin/merge.c:1411 builtin/merge.c:1490
6137 msgid "Rewinding the tree to pristine...\n"
6138 msgstr "将树回滚至原始状态...\n"
6140 #: builtin/merge.c:1415
6142 msgid "Trying merge strategy %s...\n"
6143 msgstr "尝试合并策略 %s...\n"
6145 #: builtin/merge.c:1481
6147 msgid "No merge strategy handled the merge.\n"
6148 msgstr "没有合并策略处理此合并。\n"
6150 #: builtin/merge.c:1483
6152 msgid "Merge with strategy %s failed.\n"
6153 msgstr "使用策略 %s 合并失败。\n"
6155 #: builtin/merge.c:1492
6157 msgid "Using the %s to prepare resolving by hand.\n"
6158 msgstr "使用 %s 以准备手工解决。\n"
6160 #: builtin/merge.c:1504
6162 msgid "Automatic merge went well; stopped before committing as requested\n"
6163 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6165 #: builtin/merge-base.c:26
6166 msgid "git merge-base [-a|--all] <commit> <commit>..."
6167 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6169 #: builtin/merge-base.c:27
6170 msgid "git merge-base [-a|--all] --octopus <commit>..."
6171 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6173 #: builtin/merge-base.c:28
6174 msgid "git merge-base --independent <commit>..."
6175 msgstr "git merge-base --independent <提交>..."
6177 #: builtin/merge-base.c:29
6178 msgid "git merge-base --is-ancestor <commit> <commit>"
6179 msgstr "git merge-base --is-ancestor <提交> <提交>"
6181 #: builtin/merge-base.c:98
6182 msgid "output all common ancestors"
6185 #: builtin/merge-base.c:99
6186 msgid "find ancestors for a single n-way merge"
6187 msgstr "查找一个多路合并的祖先提交"
6189 #: builtin/merge-base.c:100
6190 msgid "list revs not reachable from others"
6191 msgstr "显示不能被其他访问到的版本"
6193 #: builtin/merge-base.c:102
6194 msgid "is the first one ancestor of the other?"
6195 msgstr "第一个是其他的祖先提交么?"
6197 #: builtin/merge-file.c:8
6199 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6202 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6204 #: builtin/merge-file.c:33
6205 msgid "send results to standard output"
6208 #: builtin/merge-file.c:34
6209 msgid "use a diff3 based merge"
6210 msgstr "使用基于 diff3 的合并"
6212 #: builtin/merge-file.c:35
6213 msgid "for conflicts, use our version"
6214 msgstr "如果冲突,使用我们的版本"
6216 #: builtin/merge-file.c:37
6217 msgid "for conflicts, use their version"
6218 msgstr "如果冲突,使用他们的版本"
6220 #: builtin/merge-file.c:39
6221 msgid "for conflicts, use a union version"
6222 msgstr "如果冲突,使用联合版本"
6224 #: builtin/merge-file.c:42
6225 msgid "for conflicts, use this marker size"
6226 msgstr "如果冲突,使用指定长度的标记"
6228 #: builtin/merge-file.c:43
6229 msgid "do not warn about conflicts"
6232 #: builtin/merge-file.c:45
6233 msgid "set labels for file1/orig_file/file2"
6234 msgstr "为 file1/orig_file/file2 设置标签"
6236 #: builtin/mktree.c:67
6237 msgid "git mktree [-z] [--missing] [--batch]"
6238 msgstr "git mktree [-z] [--missing] [--batch]"
6240 #: builtin/mktree.c:153
6241 msgid "input is NUL terminated"
6242 msgstr "输入以 NUL 字符终止"
6244 #: builtin/mktree.c:154 builtin/write-tree.c:24
6245 msgid "allow missing objects"
6248 #: builtin/mktree.c:155
6249 msgid "allow creation of more than one tree"
6253 msgid "git mv [options] <source>... <destination>"
6254 msgstr "git mv [选项] <源>... <目标>"
6257 msgid "force move/rename even if target exists"
6258 msgstr "强制移动/重命令,即使目标存在"
6261 msgid "skip move/rename errors"
6266 msgid "Checking rename of '%s' to '%s'\n"
6267 msgstr "检查 '%s' 到 '%s' 的重命名\n"
6274 msgid "can not move directory into itself"
6278 msgid "cannot move directory over file"
6283 msgid "Huh? %.*s is in index?"
6284 msgstr "嗯?%.*s 在索引中?"
6287 msgid "source directory is empty"
6291 msgid "not under version control"
6295 msgid "destination exists"
6300 msgid "overwriting '%s'"
6304 msgid "Cannot overwrite"
6308 msgid "multiple sources for the same target"
6313 msgid "%s, source=%s, destination=%s"
6314 msgstr "%s,源=%s,目标=%s"
6318 msgid "Renaming %s to %s\n"
6319 msgstr "重命名 %s 至 %s\n"
6321 #: builtin/mv.c:215 builtin/remote.c:731
6323 msgid "renaming '%s' failed"
6324 msgstr "重命名 '%s' 失败"
6326 #: builtin/name-rev.c:175
6327 msgid "git name-rev [options] <commit>..."
6328 msgstr "git name-rev [选项] <提交>..."
6330 #: builtin/name-rev.c:176
6331 msgid "git name-rev [options] --all"
6332 msgstr "git name-rev [选项] --all"
6334 #: builtin/name-rev.c:177
6335 msgid "git name-rev [options] --stdin"
6336 msgstr "git name-rev [选项] --stdin"
6338 #: builtin/name-rev.c:229
6339 msgid "print only names (no SHA-1)"
6340 msgstr "只打印名称(无 SHA-1)"
6342 #: builtin/name-rev.c:230
6343 msgid "only use tags to name the commits"
6344 msgstr "只使用 tags 来命名提交"
6346 #: builtin/name-rev.c:232
6347 msgid "only use refs matching <pattern>"
6348 msgstr "只使用和 <模式> 相匹配的引用"
6350 #: builtin/name-rev.c:234
6351 msgid "list all commits reachable from all refs"
6352 msgstr "列出可以从所有引用访问的提交"
6354 #: builtin/name-rev.c:235
6355 msgid "read from stdin"
6358 #: builtin/name-rev.c:236
6359 msgid "allow to print `undefined` names"
6360 msgstr "允许打印 `未定义` 的名称"
6362 #: builtin/notes.c:26
6363 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6364 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
6366 #: builtin/notes.c:27
6368 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6369 "<object>] [<object>]"
6371 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6374 #: builtin/notes.c:28
6375 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6376 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
6378 #: builtin/notes.c:29
6380 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6381 "<object>] [<object>]"
6383 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6386 #: builtin/notes.c:30
6387 msgid "git notes [--ref <notes_ref>] edit [<object>]"
6388 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
6390 #: builtin/notes.c:31
6391 msgid "git notes [--ref <notes_ref>] show [<object>]"
6392 msgstr "git notes [--ref <注解引用>] show [<对象>]"
6394 #: builtin/notes.c:32
6396 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6397 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
6399 #: builtin/notes.c:33
6400 msgid "git notes merge --commit [-v | -q]"
6401 msgstr "git notes merge --commit [-v | -q]"
6403 #: builtin/notes.c:34
6404 msgid "git notes merge --abort [-v | -q]"
6405 msgstr "git notes merge --abort [-v | -q]"
6407 #: builtin/notes.c:35
6408 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6409 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
6411 #: builtin/notes.c:36
6412 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6413 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
6415 #: builtin/notes.c:37
6416 msgid "git notes [--ref <notes_ref>] get-ref"
6417 msgstr "git notes [--ref <注解引用>] get-ref"
6419 #: builtin/notes.c:42
6420 msgid "git notes [list [<object>]]"
6421 msgstr "git notes [list [<对象>]]"
6423 #: builtin/notes.c:47
6424 msgid "git notes add [<options>] [<object>]"
6425 msgstr "git notes add [<选项>] [<对象>]"
6427 #: builtin/notes.c:52
6428 msgid "git notes copy [<options>] <from-object> <to-object>"
6429 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
6431 #: builtin/notes.c:53
6432 msgid "git notes copy --stdin [<from-object> <to-object>]..."
6433 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
6435 #: builtin/notes.c:58
6436 msgid "git notes append [<options>] [<object>]"
6437 msgstr "git notes append [<选项>] [<对象>]"
6439 #: builtin/notes.c:63
6440 msgid "git notes edit [<object>]"
6441 msgstr "git notes edit [<对象>]"
6443 #: builtin/notes.c:68
6444 msgid "git notes show [<object>]"
6445 msgstr "git notes show [<对象>]"
6447 #: builtin/notes.c:73
6448 msgid "git notes merge [<options>] <notes_ref>"
6449 msgstr "git notes merge [<选项>] <注解引用>"
6451 #: builtin/notes.c:74
6452 msgid "git notes merge --commit [<options>]"
6453 msgstr "git notes merge --commit [<选项>]"
6455 #: builtin/notes.c:75
6456 msgid "git notes merge --abort [<options>]"
6457 msgstr "git notes merge --abort [<选项>]"
6459 #: builtin/notes.c:80
6460 msgid "git notes remove [<object>]"
6461 msgstr "git notes remove [<对象>]"
6463 #: builtin/notes.c:85
6464 msgid "git notes prune [<options>]"
6465 msgstr "git notes prune [<选项>]"
6467 #: builtin/notes.c:90
6468 msgid "git notes get-ref"
6469 msgstr "git notes get-ref"
6471 #: builtin/notes.c:139
6473 msgid "unable to start 'show' for object '%s'"
6474 msgstr "不能为对象 '%s' 开始 'show'"
6476 #: builtin/notes.c:143
6477 msgid "could not read 'show' output"
6478 msgstr "不能读取 'show' 的输出"
6480 #: builtin/notes.c:151
6482 msgid "failed to finish 'show' for object '%s'"
6483 msgstr "无法为对象 '%s' 完成 'show'"
6485 #: builtin/notes.c:169 builtin/tag.c:341
6487 msgid "could not create file '%s'"
6488 msgstr "不能创建文件 '%s'"
6490 #: builtin/notes.c:188
6491 msgid "Please supply the note contents using either -m or -F option"
6492 msgstr "请通过 -m 或 -F 选项为注解提供内容"
6494 #: builtin/notes.c:209 builtin/notes.c:972
6496 msgid "Removing note for object %s\n"
6497 msgstr "删除对象 %s 的注解\n"
6499 #: builtin/notes.c:214
6500 msgid "unable to write note object"
6503 #: builtin/notes.c:216
6505 msgid "The note contents has been left in %s"
6506 msgstr "注解内容被留在文件 %s 中"
6508 #: builtin/notes.c:250 builtin/tag.c:540
6510 msgid "cannot read '%s'"
6513 #: builtin/notes.c:252 builtin/tag.c:543
6515 msgid "could not open or read '%s'"
6516 msgstr "不能打开或读取 '%s'"
6518 #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6519 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6520 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6521 #: builtin/notes.c:967 builtin/tag.c:556
6523 msgid "Failed to resolve '%s' as a valid ref."
6524 msgstr "无法解析 '%s' 为一个有效引用。"
6526 #: builtin/notes.c:274
6528 msgid "Failed to read object '%s'."
6529 msgstr "无法读取对象 '%s'。"
6531 #: builtin/notes.c:298
6532 msgid "Cannot commit uninitialized/unreferenced notes tree"
6533 msgstr "不能提交未初始化/未引用的注解树"
6535 #: builtin/notes.c:339
6537 msgid "Bad notes.rewriteMode value: '%s'"
6538 msgstr "坏的 notes.rewriteMode 值:'%s'"
6540 #: builtin/notes.c:349
6542 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6543 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
6545 #. TRANSLATORS: The first %s is the name of the
6546 #. environment variable, the second %s is its value
6547 #: builtin/notes.c:376
6549 msgid "Bad %s value: '%s'"
6550 msgstr "坏的 %s 值:'%s'"
6552 #: builtin/notes.c:440
6554 msgid "Malformed input line: '%s'."
6555 msgstr "非法的输入行:'%s'。"
6557 #: builtin/notes.c:455
6559 msgid "Failed to copy notes from '%s' to '%s'"
6560 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
6562 #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6563 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6564 #: builtin/notes.c:1032
6565 msgid "too many parameters"
6568 #: builtin/notes.c:512 builtin/notes.c:771
6570 msgid "No note found for object %s."
6571 msgstr "未发现对象 %s 的注解。"
6573 #: builtin/notes.c:534 builtin/notes.c:691
6574 msgid "note contents as a string"
6575 msgstr "注解内容作为一个字符串"
6577 #: builtin/notes.c:537 builtin/notes.c:694
6578 msgid "note contents in a file"
6581 #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6582 #: builtin/notes.c:699 builtin/tag.c:474
6586 #: builtin/notes.c:540 builtin/notes.c:697
6587 msgid "reuse and edit specified note object"
6588 msgstr "重用和编辑指定的注解对象"
6590 #: builtin/notes.c:543 builtin/notes.c:700
6591 msgid "reuse specified note object"
6594 #: builtin/notes.c:545 builtin/notes.c:613
6595 msgid "replace existing notes"
6598 #: builtin/notes.c:579
6601 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6603 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6605 #: builtin/notes.c:584 builtin/notes.c:661
6607 msgid "Overwriting existing notes for object %s\n"
6608 msgstr "覆盖对象 %s 现存注解\n"
6610 #: builtin/notes.c:614
6611 msgid "read objects from stdin"
6614 #: builtin/notes.c:616
6615 msgid "load rewriting config for <command> (implies --stdin)"
6616 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
6618 #: builtin/notes.c:634
6619 msgid "too few parameters"
6622 #: builtin/notes.c:655
6625 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6627 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
6629 #: builtin/notes.c:667
6631 msgid "Missing notes on source object %s. Cannot copy."
6632 msgstr "源对象 %s 缺少注解。不能拷贝。"
6634 #: builtin/notes.c:716
6637 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6638 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6640 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
6641 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
6643 #: builtin/notes.c:863
6644 msgid "General options"
6647 #: builtin/notes.c:865
6648 msgid "Merge options"
6651 #: builtin/notes.c:867
6653 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6655 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
6657 #: builtin/notes.c:869
6658 msgid "Committing unmerged notes"
6661 #: builtin/notes.c:871
6662 msgid "finalize notes merge by committing unmerged notes"
6663 msgstr "通过提交未合并的注解来完成注解合并"
6665 #: builtin/notes.c:873
6666 msgid "Aborting notes merge resolution"
6669 #: builtin/notes.c:875
6670 msgid "abort notes merge"
6673 #: builtin/notes.c:970
6675 msgid "Object %s has no note\n"
6676 msgstr "对象 %s 没有注解\n"
6678 #: builtin/notes.c:982
6679 msgid "attempt to remove non-existent note is not an error"
6680 msgstr "尝试删除不存在的注解不是一个错误"
6682 #: builtin/notes.c:985
6683 msgid "read object names from the standard input"
6684 msgstr "从标准输入读取对象名称"
6686 #: builtin/notes.c:1066
6690 #: builtin/notes.c:1067
6691 msgid "use notes from <notes_ref>"
6692 msgstr "从 <注解引用> 使用注解"
6694 #: builtin/notes.c:1102 builtin/remote.c:1598
6696 msgid "Unknown subcommand: %s"
6699 #: builtin/pack-objects.c:23
6700 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6701 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
6703 #: builtin/pack-objects.c:24
6704 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6705 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
6707 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6709 msgid "deflate error (%d)"
6712 #: builtin/pack-objects.c:2397
6714 msgid "unsupported index version %s"
6715 msgstr "不支持的索引版本 %s"
6717 #: builtin/pack-objects.c:2401
6719 msgid "bad index version '%s'"
6720 msgstr "坏的索引版本 '%s'"
6722 #: builtin/pack-objects.c:2424
6724 msgid "option %s does not accept negative form"
6725 msgstr "选项 %s 不接受否定格式"
6727 #: builtin/pack-objects.c:2428
6729 msgid "unable to parse value '%s' for option %s"
6730 msgstr "不能解析选项 %1$s 的值 '%2$s'"
6732 #: builtin/pack-objects.c:2447
6733 msgid "do not show progress meter"
6736 #: builtin/pack-objects.c:2449
6737 msgid "show progress meter"
6740 #: builtin/pack-objects.c:2451
6741 msgid "show progress meter during object writing phase"
6742 msgstr "在对象写入阶段显示进度表"
6744 #: builtin/pack-objects.c:2454
6745 msgid "similar to --all-progress when progress meter is shown"
6746 msgstr "当进度表显示时类似于 --all-progress"
6748 #: builtin/pack-objects.c:2455
6749 msgid "version[,offset]"
6752 #: builtin/pack-objects.c:2456
6753 msgid "write the pack index file in the specified idx format version"
6754 msgstr "用指定的 idx 格式版本来写包索引文件"
6756 #: builtin/pack-objects.c:2459
6757 msgid "maximum size of each output pack file"
6760 #: builtin/pack-objects.c:2461
6761 msgid "ignore borrowed objects from alternate object store"
6762 msgstr "忽略从替代对象存储里借用对象"
6764 #: builtin/pack-objects.c:2463
6765 msgid "ignore packed objects"
6768 #: builtin/pack-objects.c:2465
6769 msgid "limit pack window by objects"
6772 #: builtin/pack-objects.c:2467
6773 msgid "limit pack window by memory in addition to object limit"
6774 msgstr "除对象数量限制外设置打包窗口的内存限制"
6776 #: builtin/pack-objects.c:2469
6777 msgid "maximum length of delta chain allowed in the resulting pack"
6778 msgstr "打包允许的 delta 链的最大长度"
6780 #: builtin/pack-objects.c:2471
6781 msgid "reuse existing deltas"
6782 msgstr "重用已存在的 deltas"
6784 #: builtin/pack-objects.c:2473
6785 msgid "reuse existing objects"
6788 #: builtin/pack-objects.c:2475
6789 msgid "use OFS_DELTA objects"
6790 msgstr "使用 OFS_DELTA 对象"
6792 #: builtin/pack-objects.c:2477
6793 msgid "use threads when searching for best delta matches"
6794 msgstr "使用线程查询最佳 delta 匹配"
6796 #: builtin/pack-objects.c:2479
6797 msgid "do not create an empty pack output"
6800 #: builtin/pack-objects.c:2481
6801 msgid "read revision arguments from standard input"
6802 msgstr "从标准输入读取修订号参数"
6804 #: builtin/pack-objects.c:2483
6805 msgid "limit the objects to those that are not yet packed"
6806 msgstr "限制那些尚未打包的对象"
6808 #: builtin/pack-objects.c:2486
6809 msgid "include objects reachable from any reference"
6810 msgstr "包括可以从任何引用访问到的对象"
6812 #: builtin/pack-objects.c:2489
6813 msgid "include objects referred by reflog entries"
6814 msgstr "包括被引用日志引用到的对象"
6816 #: builtin/pack-objects.c:2492
6817 msgid "output pack to stdout"
6820 #: builtin/pack-objects.c:2494
6821 msgid "include tag objects that refer to objects to be packed"
6822 msgstr "包括引用了打包对象的 tag"
6824 #: builtin/pack-objects.c:2496
6825 msgid "keep unreachable objects"
6828 #: builtin/pack-objects.c:2497 parse-options.h:141
6832 #: builtin/pack-objects.c:2498
6833 msgid "unpack unreachable objects newer than <time>"
6834 msgstr "将比给定 <时间> 新的无法访问的对象解包"
6836 #: builtin/pack-objects.c:2501
6837 msgid "create thin packs"
6840 #: builtin/pack-objects.c:2503
6841 msgid "ignore packs that have companion .keep file"
6842 msgstr "忽略配有 .keep 文件的包"
6844 #: builtin/pack-objects.c:2505
6845 msgid "pack compression level"
6848 #: builtin/pack-objects.c:2507
6849 msgid "do not hide commits by grafts"
6852 #: builtin/pack-refs.c:6
6853 msgid "git pack-refs [options]"
6854 msgstr "git pack-refs [选项]"
6856 #: builtin/pack-refs.c:14
6857 msgid "pack everything"
6860 #: builtin/pack-refs.c:15
6861 msgid "prune loose refs (default)"
6862 msgstr "清除松散的引用(默认)"
6864 #: builtin/prune-packed.c:7
6865 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6866 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6868 #: builtin/prune.c:12
6869 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6870 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
6872 #: builtin/prune.c:132
6873 msgid "do not remove, show only"
6876 #: builtin/prune.c:133
6877 msgid "report pruned objects"
6880 #: builtin/prune.c:136
6881 msgid "expire objects older than <time>"
6882 msgstr "使早于给定时间的对象过期"
6884 #: builtin/push.c:14
6885 msgid "git push [<options>] [<repository> [<refspec>...]]"
6886 msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
6888 #: builtin/push.c:45
6889 msgid "tag shorthand without <tag>"
6890 msgstr "tag 简写没有跟 <tag> 参数"
6892 #: builtin/push.c:64
6893 msgid "--delete only accepts plain target ref names"
6894 msgstr "--delete 只接受简单的目标引用名"
6896 #: builtin/push.c:99
6899 "To choose either option permanently, see push.default in 'git help config'."
6902 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
6904 #: builtin/push.c:102
6907 "The upstream branch of your current branch does not match\n"
6908 "the name of your current branch. To push to the upstream branch\n"
6909 "on the remote, use\n"
6911 " git push %s HEAD:%s\n"
6913 "To push to the branch of the same name on the remote, use\n"
6918 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
6921 " git push %s HEAD:%s\n"
6928 #: builtin/push.c:121
6931 "You are not currently on a branch.\n"
6932 "To push the history leading to the current (detached HEAD)\n"
6935 " git push %s HEAD:<name-of-remote-branch>\n"
6938 "现在为推送当前(分离头指针)的历史,使用\n"
6940 " git push %s HEAD:<name-of-remote-branch>\n"
6942 #: builtin/push.c:128
6945 "The current branch %s has no upstream branch.\n"
6946 "To push the current branch and set the remote as upstream, use\n"
6948 " git push --set-upstream %s %s\n"
6950 "当前分支 %s 没有对应的上游分支。\n"
6951 "为推送当前分支并建立与远程上游的跟踪,使用\n"
6953 " git push --set-upstream %s %s\n"
6955 #: builtin/push.c:136
6957 msgid "The current branch %s has multiple upstream branches, refusing to push."
6958 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
6960 #: builtin/push.c:139
6963 "You are pushing to remote '%s', which is not the upstream of\n"
6964 "your current branch '%s', without telling me what to push\n"
6965 "to update which remote branch."
6967 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
6968 "而没有告诉我要推送什么、更新哪个远程分支。"
6970 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6971 #: builtin/push.c:151
6973 "push.default is unset; its implicit value is changing in\n"
6974 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6975 "and maintain the current behavior after the default changes, use:\n"
6977 " git config --global push.default matching\n"
6979 "To squelch this message and adopt the new behavior now, use:\n"
6981 " git config --global push.default simple\n"
6983 "See 'git help config' and search for 'push.default' for further "
6985 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
6986 "'current' instead of 'simple' if you sometimes use older versions of Git)"
6988 "push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
6989 "修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
6992 " git config --global push.default matching\n"
6994 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
6996 " git config --global push.default simple\n"
6998 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
6999 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7000 "为保持兼容,请用 'current' 代替 'simple' 模式)"
7002 #: builtin/push.c:199
7004 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7005 msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
7007 #: builtin/push.c:206
7009 "Updates were rejected because the tip of your current branch is behind\n"
7010 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7011 "before pushing again.\n"
7012 "See the 'Note about fast-forwards' in 'git push --help' for details."
7014 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7015 "再次推送前,先与远程变更合并(如 'git pull')。详见\n"
7016 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7018 #: builtin/push.c:212
7020 "Updates were rejected because a pushed branch tip is behind its remote\n"
7021 "counterpart. If you did not intend to push that branch, you may want to\n"
7022 "specify branches to push or set the 'push.default' configuration variable\n"
7023 "to 'simple', 'current' or 'upstream' to push only the current branch."
7025 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7026 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7027 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7030 #: builtin/push.c:218
7032 "Updates were rejected because a pushed branch tip is behind its remote\n"
7033 "counterpart. Check out this branch and merge the remote changes\n"
7034 "(e.g. 'git pull') before pushing again.\n"
7035 "See the 'Note about fast-forwards' in 'git push --help' for details."
7037 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7038 "检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
7039 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7041 #: builtin/push.c:224
7043 "Updates were rejected because the remote contains work that you do\n"
7044 "not have locally. This is usually caused by another repository pushing\n"
7045 "to the same ref. You may want to first merge the remote changes (e.g.,\n"
7046 "'git pull') before pushing again.\n"
7047 "See the 'Note about fast-forwards' in 'git push --help' for details."
7049 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7050 "一个版本库已推送了相同的引用。再次推送前,您可能需要先合并远程变更\n"
7052 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7054 #: builtin/push.c:231
7055 msgid "Updates were rejected because the tag already exists in the remote."
7056 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7058 #: builtin/push.c:234
7060 "You cannot update a remote ref that points at a non-commit object,\n"
7061 "or update a remote ref to make it point at a non-commit object,\n"
7062 "without using the '--force' option.\n"
7064 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7065 "也不能更新远程引用让其指向一个非提交对象。\n"
7067 #: builtin/push.c:294
7069 msgid "Pushing to %s\n"
7072 #: builtin/push.c:298
7074 msgid "failed to push some refs to '%s'"
7075 msgstr "无法推送一些引用到 '%s'"
7077 #: builtin/push.c:331
7079 msgid "bad repository '%s'"
7082 #: builtin/push.c:332
7084 "No configured push destination.\n"
7085 "Either specify the URL from the command-line or configure a remote "
7086 "repository using\n"
7088 " git remote add <name> <url>\n"
7090 "and then push using the remote name\n"
7092 " git push <name>\n"
7095 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7097 " git remote add <name> <url>\n"
7101 " git push <name>\n"
7103 #: builtin/push.c:347
7104 msgid "--all and --tags are incompatible"
7105 msgstr "--all 和 --tags 不兼容"
7107 #: builtin/push.c:348
7108 msgid "--all can't be combined with refspecs"
7109 msgstr "--all 不能和引用表达式同时使用"
7111 #: builtin/push.c:353
7112 msgid "--mirror and --tags are incompatible"
7113 msgstr "--mirror 和 --tags 不兼容"
7115 #: builtin/push.c:354
7116 msgid "--mirror can't be combined with refspecs"
7117 msgstr "--mirror 不能和引用表达式同时使用"
7119 #: builtin/push.c:359
7120 msgid "--all and --mirror are incompatible"
7121 msgstr "--all 和 --mirror 不兼容"
7123 #: builtin/push.c:419
7127 #: builtin/push.c:420
7128 msgid "push all refs"
7131 #: builtin/push.c:421
7132 msgid "mirror all refs"
7135 #: builtin/push.c:423
7139 #: builtin/push.c:424
7140 msgid "push tags (can't be used with --all or --mirror)"
7141 msgstr "推送 tags(不能使用 --all or --mirror)"
7143 #: builtin/push.c:427
7144 msgid "force updates"
7147 #: builtin/push.c:428
7151 #: builtin/push.c:429
7152 msgid "control recursive pushing of submodules"
7155 #: builtin/push.c:431
7156 msgid "use thin pack"
7159 #: builtin/push.c:432 builtin/push.c:433
7160 msgid "receive pack program"
7163 #: builtin/push.c:434
7164 msgid "set upstream for git pull/status"
7165 msgstr "设置 git pull/status 的上游"
7167 #: builtin/push.c:437
7168 msgid "prune locally removed refs"
7171 #: builtin/push.c:439
7172 msgid "bypass pre-push hook"
7173 msgstr "绕过 pre-push 钩子"
7175 #: builtin/push.c:448
7176 msgid "--delete is incompatible with --all, --mirror and --tags"
7177 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7179 #: builtin/push.c:450
7180 msgid "--delete doesn't make sense without any refs"
7181 msgstr "--delete 未接任何引用没有意义"
7183 #: builtin/read-tree.c:36
7185 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7186 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7187 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7189 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7190 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7191 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7193 #: builtin/read-tree.c:108
7194 msgid "write resulting index to <file>"
7195 msgstr "将索引结果写入 <file>"
7197 #: builtin/read-tree.c:111
7198 msgid "only empty the index"
7201 #: builtin/read-tree.c:113
7205 #: builtin/read-tree.c:115
7206 msgid "perform a merge in addition to a read"
7207 msgstr "读取之余再执行一个合并"
7209 #: builtin/read-tree.c:117
7210 msgid "3-way merge if no file level merging required"
7211 msgstr "如果没有文件级合并需要,执行三路合并"
7213 #: builtin/read-tree.c:119
7214 msgid "3-way merge in presence of adds and removes"
7215 msgstr "存在添加和删除时,也执行三路合并"
7217 #: builtin/read-tree.c:121
7218 msgid "same as -m, but discard unmerged entries"
7219 msgstr "类似于 -m,但丢弃未合并的条目"
7221 #: builtin/read-tree.c:122
7222 msgid "<subdirectory>/"
7225 #: builtin/read-tree.c:123
7226 msgid "read the tree into the index under <subdirectory>/"
7227 msgstr "读取树对象到索引的 <子目录>/ 下"
7229 #: builtin/read-tree.c:126
7230 msgid "update working tree with merge result"
7231 msgstr "用合并的结果更新工作区"
7233 #: builtin/read-tree.c:128
7237 #: builtin/read-tree.c:129
7238 msgid "allow explicitly ignored files to be overwritten"
7239 msgstr "允许忽略文件中设定的文件可以被覆盖"
7241 #: builtin/read-tree.c:132
7242 msgid "don't check the working tree after merging"
7245 #: builtin/read-tree.c:133
7246 msgid "don't update the index or the work tree"
7249 #: builtin/read-tree.c:135
7250 msgid "skip applying sparse checkout filter"
7251 msgstr "跳过应用稀疏检出过滤器"
7253 #: builtin/read-tree.c:137
7254 msgid "debug unpack-trees"
7255 msgstr "调试 unpack-trees"
7257 #: builtin/remote.c:11
7258 msgid "git remote [-v | --verbose]"
7259 msgstr "git remote [-v | --verbose]"
7261 #: builtin/remote.c:12
7263 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7264 "mirror=<fetch|push>] <name> <url>"
7266 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7267 "mirror=<fetch|push>] <名称> <url>"
7269 #: builtin/remote.c:13 builtin/remote.c:32
7270 msgid "git remote rename <old> <new>"
7271 msgstr "git remote rename <旧名称> <新名称>"
7273 #: builtin/remote.c:14 builtin/remote.c:37
7274 msgid "git remote remove <name>"
7275 msgstr "git remote remove <名称>"
7277 #: builtin/remote.c:15 builtin/remote.c:42
7278 msgid "git remote set-head <name> (-a | -d | <branch>)"
7279 msgstr "git remote set-head <名称> (-a | -d | <分支>)"
7281 #: builtin/remote.c:16
7282 msgid "git remote [-v | --verbose] show [-n] <name>"
7283 msgstr "git remote [-v | --verbose] show [-n] <名称>"
7285 #: builtin/remote.c:17
7286 msgid "git remote prune [-n | --dry-run] <name>"
7287 msgstr "git remote prune [-n | --dry-run] <名称>"
7289 #: builtin/remote.c:18
7291 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7292 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
7294 #: builtin/remote.c:19
7295 msgid "git remote set-branches [--add] <name> <branch>..."
7296 msgstr "git remote set-branches [--add] <名称> <分支>..."
7298 #: builtin/remote.c:20 builtin/remote.c:68
7299 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7300 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
7302 #: builtin/remote.c:21 builtin/remote.c:69
7303 msgid "git remote set-url --add <name> <newurl>"
7304 msgstr "git remote set-url --add <名称> <新的地址>"
7306 #: builtin/remote.c:22 builtin/remote.c:70
7307 msgid "git remote set-url --delete <name> <url>"
7308 msgstr "git remote set-url --delete <名称> <地址>"
7310 #: builtin/remote.c:27
7311 msgid "git remote add [<options>] <name> <url>"
7312 msgstr "git remote add [<选项>] <名称> <地址>"
7314 #: builtin/remote.c:47
7315 msgid "git remote set-branches <name> <branch>..."
7316 msgstr "git remote set-branches <名称> <分支>..."
7318 #: builtin/remote.c:48
7319 msgid "git remote set-branches --add <name> <branch>..."
7320 msgstr "git remote set-branches --add <名称> <分支>..."
7322 #: builtin/remote.c:53
7323 msgid "git remote show [<options>] <name>"
7324 msgstr "git remote show [<选项>] <名称>"
7326 #: builtin/remote.c:58
7327 msgid "git remote prune [<options>] <name>"
7328 msgstr "git remote prune [<选项>] <名称>"
7330 #: builtin/remote.c:63
7331 msgid "git remote update [<options>] [<group> | <remote>]..."
7332 msgstr "git remote update [<选项>] [<组> | <远程>]..."
7334 #: builtin/remote.c:98
7339 #: builtin/remote.c:130
7341 "--mirror is dangerous and deprecated; please\n"
7342 "\t use --mirror=fetch or --mirror=push instead"
7344 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7345 "\t 或 --mirror=push"
7347 #: builtin/remote.c:147
7349 msgid "unknown mirror argument: %s"
7352 #: builtin/remote.c:163
7353 msgid "fetch the remote branches"
7356 #: builtin/remote.c:165
7357 msgid "import all tags and associated objects when fetching"
7358 msgstr "抓取时导入所有的 tags 和关联对象"
7360 #: builtin/remote.c:168
7361 msgid "or do not fetch any tag at all (--no-tags)"
7362 msgstr "或不抓取任何 tag(--no-tags)"
7364 #: builtin/remote.c:170
7365 msgid "branch(es) to track"
7368 #: builtin/remote.c:171
7369 msgid "master branch"
7372 #: builtin/remote.c:172
7376 #: builtin/remote.c:173
7377 msgid "set up remote as a mirror to push to or fetch from"
7378 msgstr "把远程设置为用以推送或抓取的镜像"
7380 #: builtin/remote.c:185
7381 msgid "specifying a master branch makes no sense with --mirror"
7382 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
7384 #: builtin/remote.c:187
7385 msgid "specifying branches to track makes sense only with fetch mirrors"
7386 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
7388 #: builtin/remote.c:195 builtin/remote.c:646
7390 msgid "remote %s already exists."
7391 msgstr "远程 %s 已经存在。"
7393 #: builtin/remote.c:199 builtin/remote.c:650
7395 msgid "'%s' is not a valid remote name"
7396 msgstr "'%s' 不是一个有效的远程名称"
7398 #: builtin/remote.c:243
7400 msgid "Could not setup master '%s'"
7401 msgstr "无法设置 master '%s'"
7403 #: builtin/remote.c:299
7405 msgid "more than one %s"
7408 #: builtin/remote.c:339
7410 msgid "Could not get fetch map for refspec %s"
7411 msgstr "无法得到引用表达式 %s 的获取列表"
7413 #: builtin/remote.c:440 builtin/remote.c:448
7417 #: builtin/remote.c:452
7421 #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7423 msgid "Could not append '%s' to '%s'"
7424 msgstr "不能添加 '%s' 至 '%s'"
7426 #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7428 msgid "No such remote: %s"
7431 #: builtin/remote.c:656
7433 msgid "Could not rename config section '%s' to '%s'"
7434 msgstr "不能重命名配置小节 '%s' 到 '%s'"
7436 #: builtin/remote.c:662 builtin/remote.c:799
7438 msgid "Could not remove config section '%s'"
7439 msgstr "不能移除配置小节 '%s'"
7441 #: builtin/remote.c:677
7444 "Not updating non-default fetch refspec\n"
7446 "\tPlease update the configuration manually if necessary."
7452 #: builtin/remote.c:683
7454 msgid "Could not append '%s'"
7457 #: builtin/remote.c:694
7459 msgid "Could not set '%s'"
7462 #: builtin/remote.c:716
7464 msgid "deleting '%s' failed"
7467 #: builtin/remote.c:750
7469 msgid "creating '%s' failed"
7472 #: builtin/remote.c:764
7474 msgid "Could not remove branch %s"
7477 #: builtin/remote.c:834
7479 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7480 "to delete it, use:"
7482 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7483 "to delete them, use:"
7484 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
7485 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
7487 #: builtin/remote.c:943
7489 msgid " new (next fetch will store in remotes/%s)"
7490 msgstr " 新的(下一次获取将存储于 remotes/%s)"
7492 #: builtin/remote.c:946
7496 #: builtin/remote.c:948
7497 msgid " stale (use 'git remote prune' to remove)"
7498 msgstr " 过时(使用 'git remote prune' 来移除)"
7500 #: builtin/remote.c:950
7504 #: builtin/remote.c:991
7506 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7507 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
7509 #: builtin/remote.c:998
7511 msgid "rebases onto remote %s"
7514 #: builtin/remote.c:1001
7516 msgid " merges with remote %s"
7519 #: builtin/remote.c:1002
7520 msgid " and with remote"
7523 #: builtin/remote.c:1004
7525 msgid "merges with remote %s"
7528 #: builtin/remote.c:1005
7529 msgid " and with remote"
7532 #: builtin/remote.c:1051
7536 #: builtin/remote.c:1054
7540 #: builtin/remote.c:1058
7544 #: builtin/remote.c:1061
7545 msgid "fast-forwardable"
7548 #: builtin/remote.c:1064
7549 msgid "local out of date"
7552 #: builtin/remote.c:1071
7554 msgid " %-*s forces to %-*s (%s)"
7555 msgstr " %-*s 强制推送至 %-*s (%s)"
7557 #: builtin/remote.c:1074
7559 msgid " %-*s pushes to %-*s (%s)"
7560 msgstr " %-*s 推送至 %-*s (%s)"
7562 #: builtin/remote.c:1078
7564 msgid " %-*s forces to %s"
7565 msgstr " %-*s 强制推送至 %s"
7567 #: builtin/remote.c:1081
7569 msgid " %-*s pushes to %s"
7570 msgstr " %-*s 推送至 %s"
7572 #: builtin/remote.c:1091
7573 msgid "do not query remotes"
7576 #: builtin/remote.c:1118
7581 #: builtin/remote.c:1119
7583 msgid " Fetch URL: %s"
7586 #: builtin/remote.c:1120 builtin/remote.c:1285
7590 #: builtin/remote.c:1129 builtin/remote.c:1131
7592 msgid " Push URL: %s"
7595 #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7597 msgid " HEAD branch: %s"
7600 #: builtin/remote.c:1139
7603 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7604 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
7606 #: builtin/remote.c:1151
7608 msgid " Remote branch:%s"
7609 msgid_plural " Remote branches:%s"
7610 msgstr[0] " 远程分支:%s"
7611 msgstr[1] " 远程分支:%s"
7613 # 译者:中文字符串拼接,可删除前导空格
7614 #: builtin/remote.c:1154 builtin/remote.c:1181
7615 msgid " (status not queried)"
7618 #: builtin/remote.c:1163
7619 msgid " Local branch configured for 'git pull':"
7620 msgid_plural " Local branches configured for 'git pull':"
7621 msgstr[0] " 为 'git pull' 配置的本地分支:"
7622 msgstr[1] " 为 'git pull' 配置的本地分支:"
7624 #: builtin/remote.c:1171
7625 msgid " Local refs will be mirrored by 'git push'"
7626 msgstr " 本地引用将在 'git push' 时被镜像"
7628 #: builtin/remote.c:1178
7630 msgid " Local ref configured for 'git push'%s:"
7631 msgid_plural " Local refs configured for 'git push'%s:"
7632 msgstr[0] " 为 'git push' 配置的本地引用%s:"
7633 msgstr[1] " 为 'git push' 配置的本地引用%s:"
7635 #: builtin/remote.c:1199
7636 msgid "set refs/remotes/<name>/HEAD according to remote"
7637 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
7639 #: builtin/remote.c:1201
7640 msgid "delete refs/remotes/<name>/HEAD"
7641 msgstr "删除 refs/remotes/<名称>/HEAD"
7643 #: builtin/remote.c:1216
7644 msgid "Cannot determine remote HEAD"
7645 msgstr "无法确定远程 HEAD"
7647 #: builtin/remote.c:1218
7648 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7649 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
7651 #: builtin/remote.c:1228
7653 msgid "Could not delete %s"
7656 #: builtin/remote.c:1236
7658 msgid "Not a valid ref: %s"
7659 msgstr "不是一个有效引用:%s"
7661 #: builtin/remote.c:1238
7663 msgid "Could not setup %s"
7667 #: builtin/remote.c:1274
7669 msgid " %s will become dangling!"
7670 msgstr " %s 将成为摇摆状态!"
7673 #: builtin/remote.c:1275
7675 msgid " %s has become dangling!"
7676 msgstr " %s 已成为摇摆状态!"
7678 #: builtin/remote.c:1281
7683 #: builtin/remote.c:1282
7688 #: builtin/remote.c:1295
7690 msgid " * [would prune] %s"
7691 msgstr " * [将删除] %s"
7693 #: builtin/remote.c:1298
7695 msgid " * [pruned] %s"
7696 msgstr " * [已删除] %s"
7698 #: builtin/remote.c:1321
7699 msgid "prune remotes after fetching"
7702 #: builtin/remote.c:1387 builtin/remote.c:1461
7704 msgid "No such remote '%s'"
7707 #: builtin/remote.c:1407
7711 #: builtin/remote.c:1414
7712 msgid "no remote specified"
7715 #: builtin/remote.c:1436
7716 msgid "manipulate push URLs"
7719 #: builtin/remote.c:1438
7723 #: builtin/remote.c:1440
7727 #: builtin/remote.c:1447
7728 msgid "--add --delete doesn't make sense"
7729 msgstr "--add --delete 无意义"
7731 #: builtin/remote.c:1487
7733 msgid "Invalid old URL pattern: %s"
7734 msgstr "无效的旧URL匹配模版:%s"
7736 #: builtin/remote.c:1495
7738 msgid "No such URL found: %s"
7741 #: builtin/remote.c:1497
7742 msgid "Will not delete all non-push URLs"
7743 msgstr "将不会删除所有非推送URL地址"
7745 #: builtin/remote.c:1569
7746 msgid "be verbose; must be placed before a subcommand"
7747 msgstr "冗长输出;必须置于子命令之前"
7749 #: builtin/replace.c:17
7750 msgid "git replace [-f] <object> <replacement>"
7751 msgstr "git replace [-f] <对象> <替换物>"
7753 #: builtin/replace.c:18
7754 msgid "git replace -d <object>..."
7755 msgstr "git replace -d <对象>..."
7757 #: builtin/replace.c:19
7758 msgid "git replace -l [<pattern>]"
7759 msgstr "git replace -l [<模式>]"
7761 #: builtin/replace.c:121
7762 msgid "list replace refs"
7765 #: builtin/replace.c:122
7766 msgid "delete replace refs"
7769 #: builtin/replace.c:123
7770 msgid "replace the ref if it exists"
7773 #: builtin/rerere.c:11
7774 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7775 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
7777 #: builtin/rerere.c:56
7778 msgid "register clean resolutions in index"
7779 msgstr "在索引中注册干净的解决方案"
7781 #: builtin/reset.c:25
7783 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7784 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
7786 #: builtin/reset.c:26
7787 msgid "git reset [-q] <tree-ish> [--] <paths>..."
7788 msgstr "git reset [-q] <树或提交> [--] <路径>..."
7790 #: builtin/reset.c:27
7791 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7792 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
7794 #: builtin/reset.c:33
7798 #: builtin/reset.c:33
7802 #: builtin/reset.c:33
7806 #: builtin/reset.c:33
7810 #: builtin/reset.c:33
7814 #: builtin/reset.c:73
7815 msgid "You do not have a valid HEAD."
7816 msgstr "您没有一个有效的 HEAD。"
7818 #: builtin/reset.c:75
7819 msgid "Failed to find tree of HEAD."
7820 msgstr "无法找到 HEAD 指向的树。"
7822 #: builtin/reset.c:81
7824 msgid "Failed to find tree of %s."
7825 msgstr "无法找到 %s 指向的树。"
7827 #: builtin/reset.c:98
7829 msgid "HEAD is now at %s"
7830 msgstr "HEAD 现在位于 %s"
7832 # 译者:汉字之间无空格,故删除%s前后空格
7833 #: builtin/reset.c:169
7835 msgid "Cannot do a %s reset in the middle of a merge."
7836 msgstr "在合并过程中不能做%s重置操作。"
7838 #: builtin/reset.c:248
7839 msgid "be quiet, only report errors"
7842 #: builtin/reset.c:250
7843 msgid "reset HEAD and index"
7844 msgstr "重置 HEAD 和索引"
7846 #: builtin/reset.c:251
7847 msgid "reset only HEAD"
7850 #: builtin/reset.c:253 builtin/reset.c:255
7851 msgid "reset HEAD, index and working tree"
7852 msgstr "重置 HEAD、索引和工作区"
7854 #: builtin/reset.c:257
7855 msgid "reset HEAD but keep local changes"
7856 msgstr "重置 HEAD 但保存本地变更"
7858 #: builtin/reset.c:275
7860 msgid "Failed to resolve '%s' as a valid revision."
7861 msgstr "无法将 '%s' 解析为一个有效的版本。"
7863 #: builtin/reset.c:278 builtin/reset.c:286
7865 msgid "Could not parse object '%s'."
7866 msgstr "不能解析对象 '%s'。"
7868 #: builtin/reset.c:283
7870 msgid "Failed to resolve '%s' as a valid tree."
7871 msgstr "无法将 '%s' 解析为一个有效的树对象。"
7873 #: builtin/reset.c:292
7874 msgid "--patch is incompatible with --{hard,mixed,soft}"
7875 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
7877 #: builtin/reset.c:301
7878 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7879 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
7881 # 译者:汉字之间无空格,故删除%s前后空格
7882 #: builtin/reset.c:303
7884 msgid "Cannot do %s reset with paths."
7885 msgstr "不能带路径进行%s重置。"
7887 # 译者:汉字之间无空格,故删除%s前后空格
7888 #: builtin/reset.c:313
7890 msgid "%s reset is not allowed in a bare repository"
7891 msgstr "不能对裸版本库进行%s重置"
7893 #: builtin/reset.c:333
7895 msgid "Could not reset index file to revision '%s'."
7896 msgstr "不能重置索引文件至版本 '%s'。"
7898 #: builtin/reset.c:339
7899 msgid "Unstaged changes after reset:"
7900 msgstr "重置后撤出暂存区的变更:"
7902 #: builtin/reset.c:344
7903 msgid "Could not write new index file."
7904 msgstr "不能写入新的索引文件。"
7906 #: builtin/rev-parse.c:339
7907 msgid "git rev-parse --parseopt [options] -- [<args>...]"
7908 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
7910 #: builtin/rev-parse.c:344
7911 msgid "keep the `--` passed as an arg"
7912 msgstr "保持 `--` 作为一个参数传递"
7914 #: builtin/rev-parse.c:346
7915 msgid "stop parsing after the first non-option argument"
7916 msgstr "遇到第一个非选项参数后停止解析"
7918 #: builtin/rev-parse.c:464
7920 "git rev-parse --parseopt [options] -- [<args>...]\n"
7921 " or: git rev-parse --sq-quote [<arg>...]\n"
7922 " or: git rev-parse [options] [<arg>...]\n"
7924 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7926 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
7927 " 或者:git rev-parse --sq-quote [<选项>...]\n"
7928 " 或者:git rev-parse [options] [<选项>...]\n"
7930 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
7932 #: builtin/revert.c:22
7933 msgid "git revert [options] <commit-ish>"
7934 msgstr "git revert [选项] <提交号>"
7936 #: builtin/revert.c:23
7937 msgid "git revert <subcommand>"
7938 msgstr "git revert <子命令>"
7940 #: builtin/revert.c:28
7941 msgid "git cherry-pick [options] <commit-ish>"
7942 msgstr "git cherry-pick [选项] <提交号>"
7944 #: builtin/revert.c:29
7945 msgid "git cherry-pick <subcommand>"
7946 msgstr "git cherry-pick <子命令>"
7948 #: builtin/revert.c:70 builtin/revert.c:92
7950 msgid "%s: %s cannot be used with %s"
7951 msgstr "%s:%s 不能和 %s 同时使用"
7953 #: builtin/revert.c:103
7954 msgid "end revert or cherry-pick sequence"
7957 #: builtin/revert.c:104
7958 msgid "resume revert or cherry-pick sequence"
7961 #: builtin/revert.c:105
7962 msgid "cancel revert or cherry-pick sequence"
7965 #: builtin/revert.c:106
7966 msgid "don't automatically commit"
7969 #: builtin/revert.c:107
7970 msgid "edit the commit message"
7973 #: builtin/revert.c:110
7974 msgid "parent number"
7977 #: builtin/revert.c:112
7978 msgid "merge strategy"
7981 #: builtin/revert.c:113
7985 #: builtin/revert.c:114
7986 msgid "option for merge strategy"
7989 #: builtin/revert.c:125
7990 msgid "append commit name"
7993 #: builtin/revert.c:126
7994 msgid "allow fast-forward"
7997 #: builtin/revert.c:127
7998 msgid "preserve initially empty commits"
8001 #: builtin/revert.c:128
8002 msgid "allow commits with empty messages"
8005 #: builtin/revert.c:129
8006 msgid "keep redundant, empty commits"
8009 #: builtin/revert.c:133
8010 msgid "program error"
8013 #: builtin/revert.c:223
8014 msgid "revert failed"
8017 #: builtin/revert.c:238
8018 msgid "cherry-pick failed"
8022 msgid "git rm [options] [--] <file>..."
8023 msgstr "git rm [选项] [--] <文件>..."
8025 #: builtin/rm.c:64 builtin/rm.c:186
8028 "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8029 "(use 'rm -rf' if you really want to remove it including all of its history)"
8031 "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
8032 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8037 "'%s' has staged content different from both the file and the HEAD\n"
8038 "(use -f to force removal)"
8040 "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
8046 "'%s' has changes staged in the index\n"
8047 "(use --cached to keep the file, or -f to force removal)"
8050 "(使用 --cached 保存文件,或用 -f 强制删除)"
8055 "'%s' has local modifications\n"
8056 "(use --cached to keep the file, or -f to force removal)"
8059 "(使用 --cached 保存文件,或用 -f 强制删除)"
8062 msgid "do not list removed files"
8066 msgid "only remove from the index"
8070 msgid "override the up-to-date check"
8074 msgid "allow recursive removal"
8078 msgid "exit with a zero status even if nothing matched"
8079 msgstr "即使没有匹配,也以零状态退出"
8083 msgid "not removing '%s' recursively without -r"
8084 msgstr "未提供 -r 选项不会递归删除 '%s'"
8088 msgid "git rm: unable to remove %s"
8089 msgstr "git rm:不能删除 %s"
8091 #: builtin/shortlog.c:13
8092 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
8093 msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
8095 #: builtin/shortlog.c:133
8097 msgid "Missing author: %s"
8100 #: builtin/shortlog.c:229
8101 msgid "sort output according to the number of commits per author"
8102 msgstr "根据每个作者的提交数量排序"
8104 #: builtin/shortlog.c:231
8105 msgid "Suppress commit descriptions, only provides commit count"
8106 msgstr "隐藏提交说明,只提供提交数量"
8108 #: builtin/shortlog.c:233
8109 msgid "Show the email address of each author"
8110 msgstr "显示每个作者的电子邮件地址"
8112 #: builtin/shortlog.c:234
8114 msgstr "w[,i1[,i2]]"
8116 #: builtin/shortlog.c:235
8117 msgid "Linewrap output"
8120 #: builtin/show-branch.c:9
8122 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8123 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8124 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8127 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8128 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8129 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8132 #: builtin/show-branch.c:10
8133 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8134 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8136 #: builtin/show-branch.c:651
8137 msgid "show remote-tracking and local branches"
8138 msgstr "显示远程跟踪的和本地的分支"
8140 #: builtin/show-branch.c:653
8141 msgid "show remote-tracking branches"
8144 #: builtin/show-branch.c:655
8145 msgid "color '*!+-' corresponding to the branch"
8146 msgstr "着色 '*!+-' 到相应的分支"
8148 #: builtin/show-branch.c:657
8149 msgid "show <n> more commits after the common ancestor"
8150 msgstr "显示共同祖先后的 <n> 个提交"
8152 #: builtin/show-branch.c:659
8153 msgid "synonym to more=-1"
8154 msgstr "和 more=-1 同义"
8156 #: builtin/show-branch.c:660
8157 msgid "suppress naming strings"
8160 #: builtin/show-branch.c:662
8161 msgid "include the current branch"
8164 #: builtin/show-branch.c:664
8165 msgid "name commits with their object names"
8168 #: builtin/show-branch.c:666
8169 msgid "show possible merge bases"
8172 #: builtin/show-branch.c:668
8173 msgid "show refs unreachable from any other ref"
8174 msgstr "显示没有任何引用的的引用"
8176 #: builtin/show-branch.c:670
8177 msgid "show commits in topological order"
8180 #: builtin/show-branch.c:672
8181 msgid "show only commits not on the first branch"
8182 msgstr "只显示不在第一个分支上的提交"
8184 #: builtin/show-branch.c:674
8185 msgid "show merges reachable from only one tip"
8186 msgstr "显示仅一个分支可访问的合并提交"
8188 #: builtin/show-branch.c:676
8189 msgid "show commits where no parent comes before its children"
8190 msgstr "显示提交时以时间为序且父提交不能领先子提交"
8192 #: builtin/show-branch.c:678
8193 msgid "<n>[,<base>]"
8194 msgstr "<n>[,<base>]"
8196 #: builtin/show-branch.c:679
8197 msgid "show <n> most recent ref-log entries starting at base"
8198 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
8200 #: builtin/show-ref.c:10
8202 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8203 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8205 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8206 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8208 #: builtin/show-ref.c:11
8209 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8210 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
8212 #: builtin/show-ref.c:165
8213 msgid "only show tags (can be combined with heads)"
8214 msgstr "只显示 tags(可以和头共用)"
8216 #: builtin/show-ref.c:166
8217 msgid "only show heads (can be combined with tags)"
8218 msgstr "只显示头(可以和 tags 共用)"
8220 #: builtin/show-ref.c:167
8221 msgid "stricter reference checking, requires exact ref path"
8222 msgstr "更严格的引用检测,需要精确的引用路径"
8224 #: builtin/show-ref.c:170 builtin/show-ref.c:172
8225 msgid "show the HEAD reference"
8228 #: builtin/show-ref.c:174
8229 msgid "dereference tags into object IDs"
8230 msgstr "转换 tags 到对象ID"
8232 #: builtin/show-ref.c:176
8233 msgid "only show SHA1 hash using <n> digits"
8234 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
8236 #: builtin/show-ref.c:180
8237 msgid "do not print results to stdout (useful with --verify)"
8238 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
8240 #: builtin/show-ref.c:182
8241 msgid "show refs from stdin that aren't in local repository"
8242 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
8244 #: builtin/symbolic-ref.c:7
8245 msgid "git symbolic-ref [options] name [ref]"
8246 msgstr "git symbolic-ref [选项] 名称 [引用]"
8248 #: builtin/symbolic-ref.c:8
8249 msgid "git symbolic-ref -d [-q] name"
8250 msgstr "git symbolic-ref -d [-q] 名称"
8252 #: builtin/symbolic-ref.c:40
8253 msgid "suppress error message for non-symbolic (detached) refs"
8254 msgstr "不显示非符号(分离的)引用的错误信息"
8256 #: builtin/symbolic-ref.c:41
8257 msgid "delete symbolic ref"
8260 #: builtin/symbolic-ref.c:42
8261 msgid "shorten ref output"
8264 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8268 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8269 msgid "reason of the update"
8274 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8275 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
8278 msgid "git tag -d <tagname>..."
8279 msgstr "git tag -d <标签名>..."
8283 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8284 "\t\t[<pattern>...]"
8286 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8290 msgid "git tag -v <tagname>..."
8291 msgstr "git tag -v <标签名>..."
8295 msgid "malformed object at '%s'"
8296 msgstr "非法的对象于 '%s'"
8298 #: builtin/tag.c:207
8300 msgid "tag name too long: %.*s..."
8301 msgstr "tag 名字太长:%.*s..."
8303 #: builtin/tag.c:212
8305 msgid "tag '%s' not found."
8306 msgstr "tag '%s' 未发现。"
8308 #: builtin/tag.c:227
8310 msgid "Deleted tag '%s' (was %s)\n"
8311 msgstr "已删除 tag '%s'(曾为 %s)\n"
8313 #: builtin/tag.c:239
8315 msgid "could not verify the tag '%s'"
8316 msgstr "不能校验 tag '%s'"
8318 #: builtin/tag.c:249
8322 "Write a tag message\n"
8323 "Lines starting with '%c' will be ignored.\n"
8327 "以 '%c' 开头的行将被忽略。\n"
8329 #: builtin/tag.c:253
8333 "Write a tag message\n"
8334 "Lines starting with '%c' will be kept; you may remove them yourself if you "
8339 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
8341 #: builtin/tag.c:292
8342 msgid "unable to sign the tag"
8345 #: builtin/tag.c:294
8346 msgid "unable to write tag file"
8349 #: builtin/tag.c:319
8350 msgid "bad object type."
8353 #: builtin/tag.c:332
8354 msgid "tag header too big."
8357 #: builtin/tag.c:368
8358 msgid "no tag message?"
8361 #: builtin/tag.c:374
8363 msgid "The tag message has been left in %s\n"
8364 msgstr "tag 说明被保留在 %s\n"
8366 #: builtin/tag.c:423
8367 msgid "switch 'points-at' requires an object"
8368 msgstr "开关 'points-at' 需要一个对象"
8370 #: builtin/tag.c:425
8372 msgid "malformed object name '%s'"
8373 msgstr "非法的对象名 '%s'"
8375 #: builtin/tag.c:445
8376 msgid "list tag names"
8379 #: builtin/tag.c:447
8380 msgid "print <n> lines of each tag message"
8381 msgstr "每个 tag 信息打印 <n> 行"
8383 #: builtin/tag.c:449
8387 #: builtin/tag.c:450
8391 #: builtin/tag.c:452
8392 msgid "Tag creation options"
8395 #: builtin/tag.c:454
8396 msgid "annotated tag, needs a message"
8397 msgstr "注解 tag,需要一个说明"
8399 #: builtin/tag.c:456
8403 #: builtin/tag.c:458
8404 msgid "annotated and GPG-signed tag"
8405 msgstr "注解并 GPG 签名的 tag"
8407 #: builtin/tag.c:462
8408 msgid "use another key to sign the tag"
8409 msgstr "使用另外的私钥签名 tag"
8411 #: builtin/tag.c:463
8412 msgid "replace the tag if exists"
8413 msgstr "如果存在,替换现有的 tag"
8415 #: builtin/tag.c:464
8416 msgid "show tag list in columns"
8417 msgstr "以列的方式显示 tag"
8419 #: builtin/tag.c:466
8420 msgid "Tag listing options"
8423 #: builtin/tag.c:469
8424 msgid "print only tags that contain the commit"
8425 msgstr "只打印包含提交的tags"
8427 #: builtin/tag.c:475
8428 msgid "print only tags of the object"
8431 #: builtin/tag.c:504
8432 msgid "--column and -n are incompatible"
8433 msgstr "--column 和 -n 不兼容"
8435 #: builtin/tag.c:521
8436 msgid "-n option is only allowed with -l."
8437 msgstr "-n 选项只允许和 -l 同时使用。"
8439 #: builtin/tag.c:523
8440 msgid "--contains option is only allowed with -l."
8441 msgstr "--contains 选项只允许和 -l 同时使用。"
8443 #: builtin/tag.c:525
8444 msgid "--points-at option is only allowed with -l."
8445 msgstr "--points-at 选项只允许和 -l 同时使用。"
8447 #: builtin/tag.c:533
8448 msgid "only one -F or -m option is allowed."
8449 msgstr "只允许一个 -F 或 -m 选项。"
8451 #: builtin/tag.c:553
8452 msgid "too many params"
8455 #: builtin/tag.c:559
8457 msgid "'%s' is not a valid tag name."
8458 msgstr "'%s' 不是一个有效的tag名称。"
8460 #: builtin/tag.c:564
8462 msgid "tag '%s' already exists"
8463 msgstr "tag '%s' 已存在"
8465 #: builtin/tag.c:582
8467 msgid "%s: cannot lock the ref"
8470 #: builtin/tag.c:584
8472 msgid "%s: cannot update the ref"
8475 #: builtin/tag.c:586
8477 msgid "Updated tag '%s' (was %s)\n"
8478 msgstr "已更新tag '%s'(曾为 %s)\n"
8480 #: builtin/update-index.c:401
8481 msgid "git update-index [options] [--] [<file>...]"
8482 msgstr "git update-index [选项] [--] [<文件>...]"
8484 #: builtin/update-index.c:718
8485 msgid "continue refresh even when index needs update"
8486 msgstr "当索引需要更新时继续刷新"
8488 #: builtin/update-index.c:721
8489 msgid "refresh: ignore submodules"
8492 #: builtin/update-index.c:724
8493 msgid "do not ignore new files"
8496 #: builtin/update-index.c:726
8497 msgid "let files replace directories and vice-versa"
8498 msgstr "让文件替换目录(反之亦然)"
8500 #: builtin/update-index.c:728
8501 msgid "notice files missing from worktree"
8504 #: builtin/update-index.c:730
8505 msgid "refresh even if index contains unmerged entries"
8506 msgstr "即使索引区包含未合并的条目也执行刷新"
8508 #: builtin/update-index.c:733
8509 msgid "refresh stat information"
8512 #: builtin/update-index.c:737
8513 msgid "like --refresh, but ignore assume-unchanged setting"
8514 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
8516 #: builtin/update-index.c:741
8517 msgid "<mode> <object> <path>"
8518 msgstr "<mode> <object> <path>"
8520 #: builtin/update-index.c:742
8521 msgid "add the specified entry to the index"
8522 msgstr "添加指定的条目到索引区"
8524 #: builtin/update-index.c:746
8528 #: builtin/update-index.c:747
8529 msgid "override the executable bit of the listed files"
8530 msgstr "覆盖列表里文件的可执行位"
8532 #: builtin/update-index.c:751
8533 msgid "mark files as \"not changing\""
8534 msgstr "把文件标记为 \"没有变更\""
8536 #: builtin/update-index.c:754
8537 msgid "clear assumed-unchanged bit"
8538 msgstr "清除 assumed-unchanged 位"
8540 #: builtin/update-index.c:757
8541 msgid "mark files as \"index-only\""
8542 msgstr "把文件标记为 \"仅索引\""
8544 #: builtin/update-index.c:760
8545 msgid "clear skip-worktree bit"
8546 msgstr "清除 skip-worktree 位"
8548 #: builtin/update-index.c:763
8549 msgid "add to index only; do not add content to object database"
8550 msgstr "只添加到索引区;不添加对象到对象库"
8552 #: builtin/update-index.c:765
8553 msgid "remove named paths even if present in worktree"
8554 msgstr "即使存在工作区里,也删除路径"
8556 #: builtin/update-index.c:767
8557 msgid "with --stdin: input lines are terminated by null bytes"
8558 msgstr "携带 --stdin:输入的行以 null 字符终止"
8560 #: builtin/update-index.c:769
8561 msgid "read list of paths to be updated from standard input"
8562 msgstr "从标准输入中读取需要更新的路径列表"
8564 #: builtin/update-index.c:773
8565 msgid "add entries from standard input to the index"
8566 msgstr "从标准输入添加条目到索引区"
8568 #: builtin/update-index.c:777
8569 msgid "repopulate stages #2 and #3 for the listed paths"
8570 msgstr "为指定文件重新生成第2和第3暂存区"
8572 #: builtin/update-index.c:781
8573 msgid "only update entries that differ from HEAD"
8574 msgstr "只更新与 HEAD 不同的条目"
8576 #: builtin/update-index.c:785
8577 msgid "ignore files missing from worktree"
8580 #: builtin/update-index.c:788
8581 msgid "report actions to standard output"
8584 #: builtin/update-index.c:790
8585 msgid "(for porcelains) forget saved unresolved conflicts"
8586 msgstr "(for porcelains) 忘记保存的未解决的冲突"
8588 #: builtin/update-index.c:794
8589 msgid "write index in this format"
8592 #: builtin/update-ref.c:7
8593 msgid "git update-ref [options] -d <refname> [<oldval>]"
8594 msgstr "git update-ref [options] -d <引用名> [<旧值>]"
8596 #: builtin/update-ref.c:8
8597 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8598 msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
8600 #: builtin/update-ref.c:19
8601 msgid "delete the reference"
8604 #: builtin/update-ref.c:21
8605 msgid "update <refname> not the one it points to"
8606 msgstr "更新 <引用名> 本身而不是它指向的引用"
8608 #: builtin/update-server-info.c:6
8609 msgid "git update-server-info [--force]"
8610 msgstr "git update-server-info [--force]"
8612 #: builtin/update-server-info.c:14
8613 msgid "update the info files from scratch"
8616 #: builtin/verify-pack.c:56
8617 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8618 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8620 #: builtin/verify-pack.c:66
8624 #: builtin/verify-pack.c:68
8625 msgid "show statistics only"
8628 #: builtin/verify-tag.c:17
8629 msgid "git verify-tag [-v|--verbose] <tag>..."
8630 msgstr "git verify-tag [-v|--verbose] <tag>..."
8632 #: builtin/verify-tag.c:73
8633 msgid "print tag contents"
8636 #: builtin/write-tree.c:13
8637 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8638 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
8640 #: builtin/write-tree.c:26
8644 #: builtin/write-tree.c:27
8645 msgid "write tree object for a subdirectory <prefix>"
8646 msgstr "将 <前缀> 子目录内容写到一个树对象"
8648 #: builtin/write-tree.c:30
8649 msgid "only useful for debugging"
8653 msgid "See 'git help <command>' for more information on a specific command."
8654 msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
8656 #: parse-options.h:156
8657 msgid "no-op (backward compatibility)"
8660 #: parse-options.h:232
8661 msgid "be more verbose"
8664 #: parse-options.h:234
8665 msgid "be more quiet"
8668 #: parse-options.h:240
8669 msgid "use <n> digits to display SHA-1s"
8670 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8673 msgid "Add file contents to the index"
8677 msgid "Find by binary search the change that introduced a bug"
8678 msgstr "通过二分查找定位引入 bug 的变更"
8681 msgid "List, create, or delete branches"
8685 msgid "Checkout a branch or paths to the working tree"
8686 msgstr "检出一个分支或路径到工作区"
8689 msgid "Clone a repository into a new directory"
8690 msgstr "克隆一个版本库到一个新目录"
8693 msgid "Record changes to the repository"
8697 msgid "Show changes between commits, commit and working tree, etc"
8698 msgstr "显示提交之间、提交和工作区之间等的差异"
8701 msgid "Download objects and refs from another repository"
8702 msgstr "从另外一个版本库下载对象和引用"
8705 msgid "Print lines matching a pattern"
8709 msgid "Create an empty Git repository or reinitialize an existing one"
8710 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8713 msgid "Show commit logs"
8717 msgid "Join two or more development histories together"
8718 msgstr "合并两个或更多开发历史"
8721 msgid "Move or rename a file, a directory, or a symlink"
8722 msgstr "移动或重命名一个文件、目录或符号链接"
8725 msgid "Fetch from and merge with another repository or a local branch"
8726 msgstr "获取并合并另外的版本库或一个本地分支"
8729 msgid "Update remote refs along with associated objects"
8730 msgstr "更新远程引用和相关的对象"
8733 msgid "Forward-port local commits to the updated upstream head"
8734 msgstr "本地提交转移至更新后的上游分支中"
8737 msgid "Reset current HEAD to the specified state"
8738 msgstr "重置当前HEAD到指定状态"
8741 msgid "Remove files from the working tree and from the index"
8742 msgstr "从工作区和索引中删除文件"
8745 msgid "Show various types of objects"
8749 msgid "Show the working tree status"
8753 msgid "Create, list, delete or verify a tag object signed with GPG"
8754 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8757 msgid "You need to set your committer info first"
8758 msgstr "您需要先设置你的提交者信息"
8762 "You seem to have moved HEAD since the last 'am' failure.\n"
8763 "Not rewinding to ORIG_HEAD"
8764 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8769 "When you have resolved this problem, run \"$cmdline --resolved\".\n"
8770 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8771 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
8773 "当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
8774 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
8775 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8778 msgid "Cannot fall back to three-way merge."
8782 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8783 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
8786 msgid "Using index info to reconstruct a base tree..."
8787 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
8791 "Did you hand edit your patch?\n"
8792 "It does not apply to blobs recorded in its index."
8795 "无法应用补丁到索引中的数据(blob)对象上。"
8798 msgid "Falling back to patching base and 3-way merge..."
8799 msgstr "转而在基础版本上打补丁及进行三路合并..."
8802 msgid "Failed to merge in the changes."
8806 msgid "Only one StGIT patch series can be applied at once"
8807 msgstr "一次只能有一个 StGIT 补丁队列被应用"
8811 msgid "Patch format $patch_format is not supported."
8812 msgstr "不支持 $patch_format 补丁格式。"
8815 msgid "Patch format detection failed."
8820 "The -b/--binary option has been a no-op for long time, and\n"
8821 "it will be removed. Please do not use it anymore."
8823 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
8828 msgid "previous rebase directory $dotest still exists but mbox given."
8829 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
8832 msgid "Please make up your mind. --skip or --abort?"
8833 msgstr "请下决心。--skip 或是 --abort ?"
8836 msgid "Resolve operation not in progress, we are not resuming."
8837 msgstr "解决操作未进行,我们不会继续。"
8841 msgid "Dirty index: cannot apply patches (dirty: $files)"
8842 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
8847 "Patch is empty. Was it split wrong?\n"
8848 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8849 "To restore the original branch and stop patching run \"$cmdline --abort\"."
8852 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
8853 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
8856 msgid "Patch does not have a valid e-mail address."
8857 msgstr "补丁中没有一个有效的邮件地址。"
8860 msgid "cannot be interactive without stdin connected to a terminal."
8861 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8864 msgid "Commit Body is:"
8868 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8869 #. in your translation. The program will only accept English
8870 #. input at this point.
8872 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8873 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8877 msgid "Applying: $FIRSTLINE"
8878 msgstr "正应用:$FIRSTLINE"
8882 "No changes - did you forget to use 'git add'?\n"
8883 "If there is nothing left to stage, chances are that something else\n"
8884 "already introduced the same changes; you might want to skip this patch."
8886 "没有变更 —— 您是不是忘了执行 'git add'?\n"
8887 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8892 "You still have unmerged paths in your index\n"
8893 "did you forget to use 'git add'?"
8894 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
8897 msgid "No changes -- Patch already applied."
8898 msgstr "没有变更 —— 补丁已经应用过。"
8902 msgid "Patch failed at $msgnum $FIRSTLINE"
8903 msgstr "补丁失败于 $msgnum $FIRSTLINE"
8908 "The copy of the patch that failed is found in:\n"
8915 msgid "applying to an empty history"
8919 msgid "You need to start by \"git bisect start\""
8920 msgstr "您需要执行 \"git bisect start\" 来开始"
8923 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8924 #. translation. The program will only accept English input
8927 msgid "Do you want me to do it for you [Y/n]? "
8928 msgstr "您想让我为您这样做么[Y/n]? "
8932 msgid "unrecognised option: '$arg'"
8933 msgstr "未能识别的选项:'$arg'"
8937 msgid "'$arg' does not appear to be a valid revision"
8938 msgstr "'$arg' 看起来不像是一个有效的版本"
8940 #: git-bisect.sh:117
8941 msgid "Bad HEAD - I need a HEAD"
8942 msgstr "坏的 HEAD - 我需要一个 HEAD"
8944 #: git-bisect.sh:130
8947 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8948 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
8950 #: git-bisect.sh:140
8951 msgid "won't bisect on seeked tree"
8952 msgstr "不会在已查找过的树上二分查找"
8954 #: git-bisect.sh:144
8955 msgid "Bad HEAD - strange symbolic ref"
8956 msgstr "坏的 HEAD - 奇怪的符号引用"
8958 #: git-bisect.sh:189
8960 msgid "Bad bisect_write argument: $state"
8961 msgstr "坏的 bisect_write 参数:$state"
8963 #: git-bisect.sh:218
8965 msgid "Bad rev input: $arg"
8966 msgstr "输入坏的版本:$arg"
8968 #: git-bisect.sh:232
8969 msgid "Please call 'bisect_state' with at least one argument."
8970 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
8972 #: git-bisect.sh:244
8974 msgid "Bad rev input: $rev"
8975 msgstr "输入坏的版本:$rev"
8977 #: git-bisect.sh:250
8978 msgid "'git bisect bad' can take only one argument."
8979 msgstr "'git bisect bad' 只能带一个参数。"
8981 #. have bad but not good. we could bisect although
8982 #. this is less optimum.
8983 #: git-bisect.sh:273
8984 msgid "Warning: bisecting only with a bad commit."
8985 msgstr "警告:在仅有一个坏提交下进行二分查找。"
8988 #. TRANSLATORS: Make sure to include [Y] and [n] in your
8989 #. translation. The program will only accept English input
8991 #: git-bisect.sh:279
8992 msgid "Are you sure [Y/n]? "
8993 msgstr "您确认么[Y/n]? "
8995 #: git-bisect.sh:289
8997 "You need to give me at least one good and one bad revisions.\n"
8998 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9000 "您需要给我至少一个好版本和一个坏版本。\n"
9001 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9003 #: git-bisect.sh:292
9005 "You need to start by \"git bisect start\".\n"
9006 "You then need to give me at least one good and one bad revisions.\n"
9007 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9009 "您需要执行 \"git bisect start\" 来开始。\n"
9010 "然后需要提供我至少一个好版本和一个坏版本。\n"
9011 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9013 #: git-bisect.sh:347 git-bisect.sh:474
9014 msgid "We are not bisecting."
9017 #: git-bisect.sh:354
9019 msgid "'$invalid' is not a valid commit"
9020 msgstr "'$invalid' 不是一个有效的提交"
9022 #: git-bisect.sh:363
9025 "Could not check out original HEAD '$branch'.\n"
9026 "Try 'git bisect reset <commit>'."
9028 "不能检出原始 HEAD '$branch'。\n"
9029 "尝试 'git bisect reset <提交>'。"
9031 #: git-bisect.sh:390
9032 msgid "No logfile given"
9035 #: git-bisect.sh:391
9037 msgid "cannot read $file for replaying"
9038 msgstr "不能读取 $file 来重放"
9040 #: git-bisect.sh:408
9041 msgid "?? what are you talking about?"
9044 #: git-bisect.sh:420
9046 msgid "running $command"
9047 msgstr "运行 $command"
9049 #: git-bisect.sh:427
9052 "bisect run failed:\n"
9053 "exit code $res from '$command' is < 0 or >= 128"
9056 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
9058 #: git-bisect.sh:453
9059 msgid "bisect run cannot continue any more"
9062 #: git-bisect.sh:459
9065 "bisect run failed:\n"
9066 "'bisect_state $state' exited with error code $res"
9069 "'bisect_state $state' 退出码为 $res"
9071 #: git-bisect.sh:466
9072 msgid "bisect run success"
9077 "Pull is not possible because you have unmerged files.\n"
9078 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9079 "as appropriate to mark resolution, or use 'git commit -a'."
9081 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
9082 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
9083 "或者使用 'git commit -a'。"
9086 msgid "Pull is not possible because you have unmerged files."
9087 msgstr "Pull 不可用,因为您尚有未合并的文件。"
9090 msgid "updating an unborn branch with changes added to the index"
9091 msgstr "更新尚未诞生的分支,变更添加至索引"
9093 #. The fetch involved updating the current branch.
9094 #. The working tree and the index file is still based on the
9095 #. $orig_head commit, but we are merging into $curr_head.
9096 #. First update the working tree to match $curr_head.
9100 "Warning: fetch updated the current branch head.\n"
9101 "Warning: fast-forwarding your working tree from\n"
9102 "Warning: commit $orig_head."
9104 "警告:fetch 更新了当前的分支。您的工作区\n"
9105 "警告:从原提交 $orig_head 快进。"
9108 msgid "Cannot merge multiple branches into empty head"
9109 msgstr "无法将多个分支合并到空分支"
9112 msgid "Cannot rebase onto multiple branches"
9117 "When you have resolved this problem, run \"git rebase --continue\".\n"
9118 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9119 "To check out the original branch and stop rebasing, run \"git rebase --abort"
9122 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9123 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9124 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9126 #: git-rebase.sh:160
9127 msgid "The pre-rebase hook refused to rebase."
9128 msgstr "钩子 pre-rebase 拒绝变基。"
9130 #: git-rebase.sh:165
9131 msgid "It looks like git-am is in progress. Cannot rebase."
9132 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9134 #: git-rebase.sh:296
9135 msgid "The --exec option must be used with the --interactive option"
9136 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9138 #: git-rebase.sh:301
9139 msgid "No rebase in progress?"
9142 #: git-rebase.sh:312
9143 msgid "The --edit-todo action can only be used during interactive rebase."
9144 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9146 #: git-rebase.sh:319
9147 msgid "Cannot read HEAD"
9150 #: git-rebase.sh:322
9152 "You must edit all merge conflicts and then\n"
9153 "mark them as resolved using git add"
9155 "您必须编辑所有的合并冲突,然后通过 git add\n"
9158 #: git-rebase.sh:340
9160 msgid "Could not move back to $head_name"
9161 msgstr "无法移回 $head_name"
9163 #: git-rebase.sh:359
9166 "It seems that there is already a $state_dir_base directory, and\n"
9167 "I wonder if you are in the middle of another rebase. If that is the\n"
9168 "case, please try\n"
9169 "\t$cmd_live_rebase\n"
9170 "If that is not the case, please\n"
9171 "\t$cmd_clear_stale_rebase\n"
9172 "and run me again. I am stopping in case you still have something\n"
9175 "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9177 "\t$cmd_live_rebase\n"
9179 "\t$cmd_clear_stale_rebase\n"
9180 "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9182 #: git-rebase.sh:404
9184 msgid "invalid upstream $upstream_name"
9185 msgstr "无效的上游 $upstream_name"
9187 #: git-rebase.sh:428
9189 msgid "$onto_name: there are more than one merge bases"
9190 msgstr "$onto_name: 有一个以上的合并基准"
9192 #: git-rebase.sh:431 git-rebase.sh:435
9194 msgid "$onto_name: there is no merge base"
9195 msgstr "$onto_name: 没有合并基准"
9197 #: git-rebase.sh:440
9199 msgid "Does not point to a valid commit: $onto_name"
9200 msgstr "没有指向一个有效的提交:$onto_name"
9202 #: git-rebase.sh:463
9204 msgid "fatal: no such branch: $branch_name"
9205 msgstr "严重错误:无此分支:$branch_name"
9207 #: git-rebase.sh:483
9208 msgid "Please commit or stash them."
9209 msgstr "请提交或为它们保存进度。"
9211 #: git-rebase.sh:501
9213 msgid "Current branch $branch_name is up to date."
9214 msgstr "当前分支 $branch_name 是最新的。"
9216 #: git-rebase.sh:504
9218 msgid "Current branch $branch_name is up to date, rebase forced."
9219 msgstr "当前分支 $branch_name 是最新的,强制变基。"
9221 #: git-rebase.sh:515
9223 msgid "Changes from $mb to $onto:"
9224 msgstr "变更从 $mb 到 $onto:"
9226 #. Detach HEAD and reset the tree
9227 #: git-rebase.sh:524
9228 msgid "First, rewinding head to replay your work on top of it..."
9229 msgstr "首先,重置头指针以便在上面重放您的工作..."
9231 #: git-rebase.sh:532
9233 msgid "Fast-forwarded $branch_name to $onto_name."
9234 msgstr "快进 $branch_name 至 $onto_name。"
9237 msgid "git stash clear with parameters is unimplemented"
9238 msgstr "git stash clear 不支持参数"
9241 msgid "You do not have the initial commit yet"
9245 msgid "Cannot save the current index state"
9248 #: git-stash.sh:123 git-stash.sh:136
9249 msgid "Cannot save the current worktree state"
9250 msgstr "无法保存当前工作区状态"
9253 msgid "No changes selected"
9257 msgid "Cannot remove temporary index (can't happen)"
9258 msgstr "无法删除临时索引(不应发生)"
9261 msgid "Cannot record working tree state"
9264 #. TRANSLATORS: $option is an invalid option, like
9265 #. `--blah-blah'. The 7 spaces at the beginning of the
9266 #. second line correspond to "error: ". So you should line
9267 #. up the second line with however many characters the
9268 #. translation of "error: " takes in your language. E.g. in
9271 #. $ git stash save --blah-blah 2>&1 | head -n 2
9272 #. error: unknown option for 'stash save': --blah-blah
9273 #. To provide a message, use git stash save -- '--blah-blah'
9277 "error: unknown option for 'stash save': $option\n"
9278 " To provide a message, use git stash save -- '$option'"
9280 "错误:'stash save' 的未知选项:$option\n"
9281 " 要提供一个描述信息,使用 git stash save -- '$option'"
9284 msgid "No local changes to save"
9288 msgid "Cannot initialize stash"
9289 msgstr "无法初始化 stash"
9292 msgid "Cannot save the current status"
9296 msgid "Cannot remove worktree changes"
9300 msgid "No stash found."
9305 msgid "Too many revisions specified: $REV"
9306 msgstr "指定了太多的版本:$REV"
9310 msgid "$reference is not valid reference"
9311 msgstr "$reference 不是有效的引用"
9315 msgid "'$args' is not a stash-like commit"
9316 msgstr "'$args' 不是 stash 样提交"
9320 msgid "'$args' is not a stash reference"
9321 msgstr "'$args' 不是一个 stash 引用"
9324 msgid "unable to refresh index"
9328 msgid "Cannot apply a stash in the middle of a merge"
9329 msgstr "无法在合并过程中恢复进度"
9332 msgid "Conflicts in index. Try without --index."
9333 msgstr "索引中有冲突。尝试不使用 --index。"
9336 msgid "Could not save index tree"
9340 msgid "Cannot unstage modified files"
9344 msgid "Index was not unstashed."
9345 msgstr "索引的进度没有被恢复。"
9349 msgid "Dropped ${REV} ($s)"
9350 msgstr "丢弃了 ${REV} ($s)"
9354 msgid "${REV}: Could not drop stash entry"
9355 msgstr "${REV}:不能丢弃进度条目"
9358 msgid "No branch name specified"
9362 msgid "(To restore them type \"git stash apply\")"
9363 msgstr "(为恢复数据输入 \"git stash apply\")"
9365 #: git-submodule.sh:90
9367 msgid "cannot strip one component off url '$remoteurl'"
9368 msgstr "无法从 url '$remoteurl' 剥离一个组件"
9370 #: git-submodule.sh:195
9372 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9373 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
9375 #: git-submodule.sh:238
9377 msgid "Clone of '$url' into submodule path '$sm_path' failed"
9378 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
9380 #: git-submodule.sh:250
9382 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9383 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
9385 #: git-submodule.sh:343
9387 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9388 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
9390 #: git-submodule.sh:360
9392 msgid "'$sm_path' already exists in the index"
9393 msgstr "'$sm_path' 已经存在于索引中"
9395 #: git-submodule.sh:364
9398 "The following path is ignored by one of your .gitignore files:\n"
9400 "Use -f if you really want to add it."
9402 "以下路径被您的一个 .gitignore 文件所忽略:\n"
9404 "如果您确实想添加它,使用 -f 参数。"
9406 #: git-submodule.sh:382
9408 msgid "Adding existing repo at '$sm_path' to the index"
9409 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
9411 #: git-submodule.sh:384
9413 msgid "'$sm_path' already exists and is not a valid git repo"
9414 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
9416 #: git-submodule.sh:392
9418 msgid "A git directory for '$sm_name' is found locally with remote(s):"
9419 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
9421 #: git-submodule.sh:394
9424 "If you want to reuse this local git directory instead of cloning again from"
9425 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
9427 #: git-submodule.sh:396
9430 "use the '--force' option. If the local git directory is not the correct repo"
9431 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
9433 #: git-submodule.sh:397
9436 "or you are unsure what this means choose another name with the '--name' "
9438 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
9440 #: git-submodule.sh:399
9442 msgid "Reactivating local git directory for submodule '$sm_name'."
9443 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
9445 #: git-submodule.sh:411
9447 msgid "Unable to checkout submodule '$sm_path'"
9448 msgstr "不能检出子模组 '$sm_path'"
9450 #: git-submodule.sh:416
9452 msgid "Failed to add submodule '$sm_path'"
9453 msgstr "无法添加子模组 '$sm_path'"
9455 #: git-submodule.sh:425
9457 msgid "Failed to register submodule '$sm_path'"
9458 msgstr "无法注册子模组 '$sm_path'"
9460 #: git-submodule.sh:468
9462 msgid "Entering '$prefix$sm_path'"
9463 msgstr "正在进入 '$prefix$sm_path'"
9465 #: git-submodule.sh:482
9467 msgid "Stopping at '$sm_path'; script returned non-zero status."
9468 msgstr "停止于 '$sm_path',脚本返回非零值。"
9470 #: git-submodule.sh:526
9472 msgid "No url found for submodule path '$sm_path' in .gitmodules"
9473 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
9475 #: git-submodule.sh:535
9477 msgid "Failed to register url for submodule path '$sm_path'"
9478 msgstr "无法为子模组路径 '$sm_path' 注册 url"
9480 #: git-submodule.sh:537
9482 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9483 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
9485 #: git-submodule.sh:545
9487 msgid "Failed to register update mode for submodule path '$sm_path'"
9488 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
9490 #: git-submodule.sh:649
9493 "Submodule path '$sm_path' not initialized\n"
9494 "Maybe you want to use 'update --init'?"
9496 "子模组路径 '$sm_path' 没有初始化\n"
9497 "也许您想用 'update --init'?"
9499 #: git-submodule.sh:662
9501 msgid "Unable to find current revision in submodule path '$sm_path'"
9502 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
9504 #: git-submodule.sh:671 git-submodule.sh:695
9506 msgid "Unable to fetch in submodule path '$sm_path'"
9507 msgstr "无法在子模组路径 '$sm_path' 中获取"
9509 #: git-submodule.sh:709
9511 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
9512 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
9514 #: git-submodule.sh:710
9516 msgid "Submodule path '$sm_path': rebased into '$sha1'"
9517 msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
9519 #: git-submodule.sh:715
9521 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
9522 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
9524 #: git-submodule.sh:716
9526 msgid "Submodule path '$sm_path': merged in '$sha1'"
9527 msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
9529 #: git-submodule.sh:721
9531 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
9532 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
9534 #: git-submodule.sh:722
9536 msgid "Submodule path '$sm_path': checked out '$sha1'"
9537 msgstr "子模组路径 '$sm_path':检出 '$sha1'"
9539 #: git-submodule.sh:744 git-submodule.sh:1066
9541 msgid "Failed to recurse into submodule path '$sm_path'"
9542 msgstr "无法递归进子模组路径 '$sm_path'"
9544 #: git-submodule.sh:852
9545 msgid "The --cached option cannot be used with the --files option"
9546 msgstr "选项 --cached 不能和选项 --files 同时使用"
9549 #: git-submodule.sh:892
9551 msgid "unexpected mode $mod_dst"
9552 msgstr "意外的模式 $mod_dst"
9555 #: git-submodule.sh:910
9557 msgid " Warn: $name doesn't contain commit $sha1_src"
9558 msgstr " 警告:$name 未包含提交 $sha1_src"
9561 #: git-submodule.sh:913
9563 msgid " Warn: $name doesn't contain commit $sha1_dst"
9564 msgstr " 警告:$name 未包含提交 $sha1_dst"
9567 #: git-submodule.sh:916
9569 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9570 msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
9572 #: git-submodule.sh:941
9576 #: git-submodule.sh:979
9577 msgid "Submodules changed but not updated:"
9578 msgstr "子模组已修改但尚未更新:"
9580 #: git-submodule.sh:981
9581 msgid "Submodule changes to be committed:"
9584 #: git-submodule.sh:1129
9586 msgid "Synchronizing submodule url for '$prefix$sm_path'"
9587 msgstr "为 '$prefix$sm_path' 同步子模组 url"
9589 #~ msgid "can't fdopen 'show' output fd"
9590 #~ msgstr "不能打开 'show' 输出文件句柄"
9592 #~ msgid "failed to close pipe to 'show' for object '%s'"
9593 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
9595 #~ msgid " 0 files changed"
9596 #~ msgstr " 0 个文件被修改"
9598 #~ msgid " %d file changed"
9599 #~ msgid_plural " %d files changed"
9600 #~ msgstr[0] " %d 个文件被修改"
9601 #~ msgstr[1] " %d 个文件被修改"
9603 #~ msgid ", %d insertion(+)"
9604 #~ msgid_plural ", %d insertions(+)"
9605 #~ msgstr[0] ",插入 %d 行(+)"
9606 #~ msgstr[1] ",插入 %d 行(+)"
9608 #~ msgid ", %d deletion(-)"
9609 #~ msgid_plural ", %d deletions(-)"
9610 #~ msgstr[0] ",删除 %d 行(-)"
9611 #~ msgstr[1] ",删除 %d 行(-)"
9613 #~ msgid "You do not have a valid HEAD"
9614 #~ msgstr "您没有一个有效的 HEAD"
9619 #~ msgid "Would not remove %s\n"
9620 #~ msgstr "不会删除 %s\n"
9622 #~ msgid "Not removing %s\n"
9623 #~ msgstr "未删除 %s\n"
9625 #~ msgid "Auto packing the repository for optimum performance.\n"
9626 #~ msgstr "自动打包版本库以求最佳性能。\n"
9628 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
9629 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
9631 #~ msgid "Could not read index"
9634 # 译者:中文字符串拼接,可删除前导空格
9635 #~ msgid " (use \"git add\" to track)"
9636 #~ msgstr "(使用 \"git add\" 建立跟踪)"
9638 #~ msgid "-B cannot be used with -b"
9639 #~ msgstr "-B 不能和 -b 同时使用"
9641 #~ msgid "--patch is incompatible with all other options"
9642 #~ msgstr "--patch 选项和其他选项不兼容"
9644 #~ msgid "--detach cannot be used with -b/-B/--orphan"
9645 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
9647 #~ msgid "--detach cannot be used with -t"
9648 #~ msgstr "--detach 不能和 -t 同时使用"
9650 #~ msgid "--orphan and -b|-B are mutually exclusive"
9651 #~ msgstr "--orphan 和 -b|-B 互斥"
9653 #~ msgid "--orphan cannot be used with -t"
9654 #~ msgstr "--orphan 不能和 -t 同时使用"
9656 #~ msgid "git checkout: -f and -m are incompatible"
9657 #~ msgstr "git checkout:-f 和 -m 不兼容"
9660 #~ "git checkout: updating paths is incompatible with switching branches."
9661 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
9663 #~ msgid "diff setup failed"
9664 #~ msgstr "diff 设置失败"
9666 #~ msgid "merge-recursive: disk full?"
9667 #~ msgstr "merge-recursive:磁盘已满?"
9669 #~ msgid "diff_setup_done failed"
9670 #~ msgstr "diff_setup_done 失败"