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: 2015-06-27 19:17+0800\n"
16 "PO-Revision-Date: 2015-07-05 23:12+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/jiangxin/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"
32 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33 "as appropriate to mark resolution and make a commit."
35 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
39 msgid "git archive [<options>] <tree-ish> [<path>...]"
40 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
43 msgid "git archive --list"
44 msgstr "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
50 "git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
53 msgid "git archive --remote <repo> [--exec <cmd>] --list"
54 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
56 #: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
58 msgid "pathspec '%s' did not match any files"
59 msgstr "路径规则 '%s' 未匹配任何文件"
66 msgid "archive format"
69 #: archive.c:428 builtin/log.c:1204
74 msgid "prepend prefix to each pathname in the archive"
75 msgstr "为归档中每个路径名加上前缀"
77 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
78 #: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
79 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
80 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
81 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
85 #: archive.c:431 builtin/archive.c:89
86 msgid "write the archive to this file"
90 msgid "read .gitattributes in working directory"
91 msgstr "读取工作区中的 .gitattributes"
94 msgid "report archived files on stderr"
102 msgid "compress faster"
106 msgid "compress better"
110 msgid "list supported archive formats"
113 #: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
117 #: archive.c:450 builtin/archive.c:91
118 msgid "retrieve the archive from remote repository <repo>"
119 msgstr "从远程版本库(<版本库>)提取归档文件"
121 #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
125 #: archive.c:452 builtin/archive.c:93
126 msgid "path to the remote git-upload-archive command"
127 msgstr "远程 git-upload-archive 命令的路径"
131 "Negative patterns are ignored in git attributes\n"
132 "Use '\\!' for literal leading exclamation."
134 "负值模版在 git attributes 中被忽略\n"
135 "当字符串确实要以感叹号开始时,使用 '\\!'。"
139 msgid "Not setting branch %s as its own upstream."
140 msgstr "未设置分支 %s 作为它自己的上游。"
144 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
145 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
149 msgid "Branch %s set up to track remote branch %s from %s."
150 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
154 msgid "Branch %s set up to track local branch %s by rebasing."
155 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
159 msgid "Branch %s set up to track local branch %s."
160 msgstr "分支 %s 设置为跟踪本地分支 %s。"
164 msgid "Branch %s set up to track remote ref %s by rebasing."
165 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
169 msgid "Branch %s set up to track remote ref %s."
170 msgstr "分支 %s 设置为跟踪远程引用 %s。"
174 msgid "Branch %s set up to track local ref %s by rebasing."
175 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
179 msgid "Branch %s set up to track local ref %s."
180 msgstr "分支 %s 设置为跟踪本地引用 %s。"
184 msgid "Not tracking: ambiguous information for ref %s"
185 msgstr "未跟踪:引用 %s 有歧义"
189 msgid "'%s' is not a valid branch name."
190 msgstr "'%s' 不是一个有效的分支名称。"
194 msgid "A branch named '%s' already exists."
195 msgstr "一个分支名 '%s' 已经存在。"
198 msgid "Cannot force update the current branch."
203 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
204 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
208 msgid "the requested upstream branch '%s' does not exist"
209 msgstr "请求的上游分支 '%s' 不存在"
214 "If you are planning on basing your work on an upstream\n"
215 "branch that already exists at the remote, you may need to\n"
216 "run \"git fetch\" to retrieve it.\n"
218 "If you are planning to push out a new local branch that\n"
219 "will track its remote counterpart, you may want to use\n"
220 "\"git push -u\" to set the upstream config as you push."
223 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
224 "您可能需要执行 \"git fetch\" 来获取分支。\n"
226 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
227 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
231 msgid "Not a valid object name: '%s'."
232 msgstr "不是一个有效的对象名:'%s'。"
236 msgid "Ambiguous object name: '%s'."
237 msgstr "歧义的对象名:'%s'。"
241 msgid "Not a valid branch point: '%s'."
242 msgstr "无效的分支点:'%s'。"
246 msgid "'%s' does not look like a v2 bundle file"
247 msgstr "'%s' 不像是一个 v2 版本的包文件"
251 msgid "unrecognized header: %s%s (%d)"
252 msgstr "未能识别的包头:%s%s (%d)"
254 #: bundle.c:87 builtin/commit.c:766
256 msgid "could not open '%s'"
260 msgid "Repository lacks these prerequisite commits:"
261 msgstr "版本库缺少这些必备的提交:"
263 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
264 #: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
265 #: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
266 #: builtin/shortlog.c:158
267 msgid "revision walk setup failed"
272 msgid "The bundle contains this ref:"
273 msgid_plural "The bundle contains these %d refs:"
274 msgstr[0] "这个包中含有这个引用:"
275 msgstr[1] "这个包中含有 %d 个引用:"
278 msgid "The bundle records a complete history."
279 msgstr "这个包记录一个完整历史。"
283 msgid "The bundle requires this ref:"
284 msgid_plural "The bundle requires these %d refs:"
285 msgstr[0] "这个包需要这个引用:"
286 msgstr[1] "这个包需要 %d 个引用:"
289 msgid "Could not spawn pack-objects"
290 msgstr "不能生成 pack-objects 进程"
293 msgid "pack-objects died"
294 msgstr "pack-objects 终止"
297 msgid "rev-list died"
302 msgid "ref '%s' is excluded by the rev-list options"
303 msgstr "引用 '%s' 被 rev-list 选项排除"
305 #: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
307 msgid "unrecognized argument: %s"
311 msgid "Refusing to create empty bundle."
316 msgid "cannot create '%s'"
320 msgid "index-pack died"
321 msgstr "index-pack 终止"
325 msgid "invalid color value: %.*s"
330 msgid "could not parse %s"
335 msgid "%s %s is not a commit!"
336 msgstr "%s %s 不是一个提交!"
338 #: compat/obstack.c:406 compat/obstack.c:408
339 msgid "memory exhausted"
342 #: config.c:474 config.c:476
344 msgid "bad config file line %d in %s"
345 msgstr "配置文件 %2$s 出错于第 %1$d 行"
349 msgid "bad numeric config value '%s' for '%s' in %s: %s"
350 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
354 msgid "bad numeric config value '%s' for '%s': %s"
355 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
359 msgid "failed to expand user dir in: '%s'"
360 msgstr "无法扩展 '%s' 中的用户目录"
362 #: config.c:757 config.c:768
364 msgid "bad zlib compression level %d"
365 msgstr "错误的 zlib 压缩级别 %d"
369 msgid "invalid mode for object creation: %s"
370 msgstr "无效的对象创建模式:%s"
373 msgid "unable to parse command-line config"
377 msgid "unknown error occured while reading the configuration files"
378 msgstr "在读取配置文件时遇到未知错误"
382 msgid "unable to parse '%s' from command-line config"
383 msgstr "无法解析命令行配置中的 '%s'"
387 msgid "bad config variable '%s' in file '%s' at line %d"
388 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
392 msgid "%s has multiple values"
396 msgid "Could not run 'git rev-list'"
397 msgstr "不能执行 'git rev-list'"
401 msgid "failed write to rev-list: %s"
402 msgstr "无法写入 rev-list:%s"
406 msgid "failed to close rev-list's stdin: %s"
407 msgstr "无法关闭 rev-list 的标准输入:%s"
410 msgid "in the future"
415 msgid "%lu second ago"
416 msgid_plural "%lu seconds ago"
422 msgid "%lu minute ago"
423 msgid_plural "%lu minutes ago"
430 msgid_plural "%lu hours ago"
437 msgid_plural "%lu days ago"
444 msgid_plural "%lu weeks ago"
450 msgid "%lu month ago"
451 msgid_plural "%lu months ago"
458 msgid_plural "%lu years"
462 #. TRANSLATORS: "%s" is "<n> years"
465 msgid "%s, %lu month ago"
466 msgid_plural "%s, %lu months ago"
467 msgstr[0] "%s %lu 个月前"
468 msgstr[1] "%s %lu 个月前"
470 #: date.c:154 date.c:159
473 msgid_plural "%lu years ago"
477 #: diffcore-order.c:24
479 msgid "failed to read orderfile '%s'"
480 msgstr "无法读取排序文件 '%s'"
482 #: diffcore-rename.c:536
483 msgid "Performing inexact rename detection"
484 msgstr "正在进行非精确的重命名检测"
489 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
490 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
495 msgid " Unknown dirstat parameter '%s'\n"
496 msgstr " 未知的 dirstat 参数 '%s'\n"
500 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
501 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
506 "Found errors in 'diff.dirstat' config variable:\n"
509 "发现配置变量 'diff.dirstat' 中的错误:\n"
514 msgid "external diff died, stopping at %s"
515 msgstr "外部 diff 退出,停止在 %s"
518 msgid "--follow requires exactly one pathspec"
519 msgstr "--follow 参数后只跟一个 pathspec"
524 "Failed to parse --dirstat/-X option parameter:\n"
527 "无法解析 --dirstat/-X 选项的参数:\n"
532 msgid "Failed to parse --submodule option parameter: '%s'"
533 msgstr "无法解析 --submodule 选项的参数:'%s'"
536 msgid "failed to get kernel name and information"
540 msgid "Untracked cache is disabled on this system."
541 msgstr "缓存未跟踪文件在本系统被禁用"
543 #: gpg-interface.c:129 gpg-interface.c:200
544 msgid "could not run gpg."
547 #: gpg-interface.c:141
548 msgid "gpg did not accept the data"
551 #: gpg-interface.c:152
552 msgid "gpg failed to sign the data"
555 #: gpg-interface.c:185
557 msgid "could not create temporary file '%s': %s"
558 msgstr "不能创建临时文件 '%s':%s"
560 #: gpg-interface.c:188
562 msgid "failed writing detached signature to '%s': %s"
563 msgstr "无法将分离式签名写入 '%s':%s"
567 msgid "'%s': unable to read %s"
568 msgstr "'%s':无法读取 %s"
577 msgid "'%s': short read %s"
578 msgstr "'%s':读取不完整 %s"
582 msgid "available git commands in '%s'"
583 msgstr "在 '%s' 下可用的 git 命令"
586 msgid "git commands available from elsewhere on your $PATH"
587 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
590 msgid "These are common Git commands used in various situations:"
591 msgstr "这些是各种场合常见的 Git 命令:"
596 "'%s' appears to be a git command, but we were not\n"
597 "able to execute it. Maybe git-%s is broken?"
599 "'%s' 像是一个 git 命令,但却无法运行。\n"
603 msgid "Uh oh. Your system reports no Git commands at all."
604 msgstr "唉呀,您的系统中未发现 Git 命令。"
609 "WARNING: You called a Git command named '%s', which does not exist.\n"
610 "Continuing under the assumption that you meant '%s'"
612 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
617 msgid "in %0.1f seconds automatically..."
618 msgstr "在 %0.1f 秒钟后自动运行..."
622 msgid "git: '%s' is not a git command. See 'git --help'."
623 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
625 #: help.c:406 help.c:466
631 "Did you mean one of these?"
645 msgid "BUG: reopen a lockfile that is still open"
646 msgstr "BUG: 重新打开一个仍打开着的锁文件"
649 msgid "BUG: reopen a lockfile that has been committed"
650 msgstr "BUG: 重新打开一个已提交的锁文件"
653 msgid "failed to read the cache"
656 #: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
657 #: builtin/clone.c:654
658 msgid "unable to write new index file"
661 #: merge-recursive.c:189
663 msgid "(bad commit)\n"
666 #: merge-recursive.c:209
668 msgid "addinfo_cache failed for path '%s'"
669 msgstr "为路径 '%s' addinfo_cache 失败"
671 #: merge-recursive.c:270
672 msgid "error building trees"
675 #: merge-recursive.c:687
677 msgid "failed to create path '%s'%s"
678 msgstr "无法创建路径 '%s'%s"
680 #: merge-recursive.c:698
682 msgid "Removing %s to make room for subdirectory\n"
683 msgstr "删除 %s 以便为子目录留出空间\n"
685 #: merge-recursive.c:712 merge-recursive.c:733
686 msgid ": perhaps a D/F conflict?"
687 msgstr ":可能是一个目录/文件冲突?"
689 #: merge-recursive.c:723
691 msgid "refusing to lose untracked file at '%s'"
692 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
694 #: merge-recursive.c:763
696 msgid "cannot read object %s '%s'"
697 msgstr "不能读取对象 %s '%s'"
699 #: merge-recursive.c:765
701 msgid "blob expected for %s '%s'"
702 msgstr "%s '%s' 应为数据(blob)对象"
704 #: merge-recursive.c:788 builtin/clone.c:313
706 msgid "failed to open '%s'"
709 #: merge-recursive.c:796
711 msgid "failed to symlink '%s'"
712 msgstr "无法创建符号链接 '%s'"
714 #: merge-recursive.c:799
716 msgid "do not know what to do with %06o %s '%s'"
717 msgstr "不知道如何处理 %06o %s '%s'"
719 #: merge-recursive.c:937
720 msgid "Failed to execute internal merge"
723 #: merge-recursive.c:941
725 msgid "Unable to add %s to database"
726 msgstr "不能添加 %s 至对象库"
728 #: merge-recursive.c:957
729 msgid "unsupported object type in the tree"
730 msgstr "在树中有不支持的对象类型"
732 #: merge-recursive.c:1032 merge-recursive.c:1046
735 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
738 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
741 #: merge-recursive.c:1038 merge-recursive.c:1051
744 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
747 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
750 #: merge-recursive.c:1092
754 #: merge-recursive.c:1092
758 #: merge-recursive.c:1148
760 msgid "%s is a directory in %s adding as %s instead"
761 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
763 #: merge-recursive.c:1170
766 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
767 "\"->\"%s\" in \"%s\"%s"
769 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
770 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
772 #: merge-recursive.c:1175
773 msgid " (left unresolved)"
776 #: merge-recursive.c:1229
778 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
780 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
783 #: merge-recursive.c:1259
785 msgid "Renaming %s to %s and %s to %s instead"
786 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
788 #: merge-recursive.c:1458
790 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
791 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
793 #: merge-recursive.c:1468
795 msgid "Adding merged %s"
798 #: merge-recursive.c:1473 merge-recursive.c:1671
800 msgid "Adding as %s instead"
803 #: merge-recursive.c:1524
805 msgid "cannot read object %s"
808 #: merge-recursive.c:1527
810 msgid "object %s is not a blob"
811 msgstr "对象 %s 不是一个数据(blob)对象"
813 #: merge-recursive.c:1575
817 #: merge-recursive.c:1575
821 #: merge-recursive.c:1585
825 #: merge-recursive.c:1592
829 #: merge-recursive.c:1626
831 msgid "Skipped %s (merged same as existing)"
832 msgstr "略过 %s(已经做过相同合并)"
834 #: merge-recursive.c:1640
836 msgid "Auto-merging %s"
839 #: merge-recursive.c:1644 git-submodule.sh:1150
843 #: merge-recursive.c:1645
845 msgid "CONFLICT (%s): Merge conflict in %s"
846 msgstr "冲突(%s):合并冲突于 %s"
848 #: merge-recursive.c:1731
853 #: merge-recursive.c:1756
854 msgid "file/directory"
857 #: merge-recursive.c:1762
858 msgid "directory/file"
861 #: merge-recursive.c:1767
863 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
864 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
866 #: merge-recursive.c:1777
871 #: merge-recursive.c:1794
872 msgid "Fatal merge failure, shouldn't happen."
873 msgstr "严重的合并错误,不应发生。"
875 #: merge-recursive.c:1813
876 msgid "Already up-to-date!"
879 #: merge-recursive.c:1822
881 msgid "merging of trees %s and %s failed"
882 msgstr "无法合并树 %s 和 %s"
884 #: merge-recursive.c:1852
886 msgid "Unprocessed path??? %s"
887 msgstr "未处理的路径??? %s"
889 #: merge-recursive.c:1900
893 #: merge-recursive.c:1913
895 msgid "found %u common ancestor:"
896 msgid_plural "found %u common ancestors:"
897 msgstr[0] "发现 %u 个共同祖先:"
898 msgstr[1] "发现 %u 个共同祖先:"
900 #: merge-recursive.c:1950
901 msgid "merge returned no commit"
904 #: merge-recursive.c:2007
906 msgid "Could not parse object '%s'"
909 #: merge-recursive.c:2018 builtin/merge.c:645
910 msgid "Unable to write index."
914 msgid "Cannot commit uninitialized/unreferenced notes tree"
915 msgstr "不能提交未初始化/未引用的注解树"
919 msgid "Bad notes.rewriteMode value: '%s'"
920 msgstr "坏的 notes.rewriteMode 值:'%s'"
924 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
925 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
927 #. TRANSLATORS: The first %s is the name of the
928 #. environment variable, the second %s is its value
931 msgid "Bad %s value: '%s'"
932 msgstr "坏的 %s 值:'%s'"
936 msgid "unable to parse object: %s"
939 #: parse-options.c:546
943 #: parse-options.c:564
948 #. TRANSLATORS: the colon here should align with the
949 #. one in "usage: %s" translation
950 #: parse-options.c:568
955 # 译者:为保证在输出中对齐,注意调整句中空格!
956 #: parse-options.c:571
961 #: parse-options.c:605
966 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
967 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
971 "global 'literal' pathspec setting is incompatible with all other global "
973 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
976 msgid "invalid parameter for pathspec magic 'prefix'"
977 msgstr "路径规则包含无效的神奇前缀"
981 msgid "Invalid pathspec magic '%.*s' in '%s'"
982 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
986 msgid "Missing ')' at the end of pathspec magic in '%s'"
987 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
991 msgid "Unimplemented pathspec magic '%c' in '%s'"
992 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
996 msgid "%s: 'literal' and 'glob' are incompatible"
997 msgstr "%s:'literal' 和 'glob' 不兼容"
1001 msgid "%s: '%s' is outside repository"
1002 msgstr "%s:'%s' 在版本库之外"
1006 msgid "Pathspec '%s' is in submodule '%.*s'"
1007 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1011 msgid "%s: pathspec magic not supported by this command: %s"
1012 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1016 msgid "pathspec '%s' is beyond a symbolic link"
1017 msgstr "路径规则 '%s' 位于符号链接中"
1021 "There is nothing to exclude from by :(exclude) patterns.\n"
1022 "Perhaps you forgot to add either ':/' or '.' ?"
1024 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1028 msgid "unable to parse --pretty format"
1029 msgstr "不能解析 --pretty 格式"
1035 #: read-cache.c:1295
1038 "index.version set, but the value is invalid.\n"
1041 "设置了 index.version,但是取值无效。\n"
1044 #: read-cache.c:1305
1047 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1050 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1055 msgid "Cannot fetch both %s and %s to %s"
1056 msgstr "不能同时获取 %s 和 %s 至 %s"
1060 msgid "%s usually tracks %s, not %s"
1061 msgstr "%s 通常跟踪 %s,而非 %s"
1065 msgid "%s tracks both %s and %s"
1066 msgstr "%s 同时跟踪 %s 和 %s"
1069 msgid "Internal error"
1072 #: remote.c:1723 remote.c:1766
1073 msgid "HEAD does not point to a branch"
1074 msgstr "HEAD 没有指向一个分支"
1078 msgid "no such branch: '%s'"
1083 msgid "no upstream configured for branch '%s'"
1084 msgstr "尚未给分支 '%s' 设置上游"
1088 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1089 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1093 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1094 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1098 msgid "branch '%s' has no remote for pushing"
1099 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1103 msgid "push refspecs for '%s' do not include '%s'"
1104 msgstr "向 '%s' 推送引用表达式未包含 '%s'"
1107 msgid "push has no destination (push.default is 'nothing')"
1108 msgstr "推送无目标(push.default 是 'nothing')"
1111 msgid "cannot resolve 'simple' push to a single destination"
1112 msgstr "无法解析 'simple' 推送至一个单独的目标"
1116 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1117 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1120 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1121 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1125 msgid "Your branch is up-to-date with '%s'.\n"
1126 msgstr "您的分支与上游分支 '%s' 一致。\n"
1130 msgid "Your branch is ahead of '%s' by %d commit.\n"
1131 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1132 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1133 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1136 msgid " (use \"git push\" to publish your local commits)\n"
1137 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1141 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1143 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1144 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1145 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1149 msgid " (use \"git pull\" to update your local branch)\n"
1150 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1155 "Your branch and '%s' have diverged,\n"
1156 "and have %d and %d different commit each, respectively.\n"
1158 "Your branch and '%s' have diverged,\n"
1159 "and have %d and %d different commits each, respectively.\n"
1161 "您的分支和 '%s' 出现了偏离,\n"
1162 "并且分别有 %d 和 %d 处不同的提交。\n"
1164 "您的分支和 '%s' 出现了偏离,\n"
1165 "并且分别有 %d 和 %d 处不同的提交。\n"
1169 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1170 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1173 msgid "--first-parent is incompatible with --bisect"
1174 msgstr "--first-parent 与 --bisect 不兼容"
1177 msgid "open /dev/null failed"
1178 msgstr "不能打开 /dev/null"
1182 msgid "dup2(%d,%d) failed"
1183 msgstr "不能调用 dup2(%d,%d)"
1186 msgid "failed to sign the push certificate"
1190 msgid "the receiving end does not support --signed push"
1194 msgid "the receiving end does not support --atomic push"
1197 #: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1198 #: builtin/merge.c:983
1200 msgid "Could not open '%s' for writing"
1201 msgstr "不能为写入打开 '%s'"
1203 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1204 #: builtin/merge.c:988
1206 msgid "Could not write to '%s'"
1211 "after resolving the conflicts, mark the corrected paths\n"
1212 "with 'git add <paths>' or 'git rm <paths>'"
1214 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1219 "after resolving the conflicts, mark the corrected paths\n"
1220 "with 'git add <paths>' or 'git rm <paths>'\n"
1221 "and commit the result with 'git commit'"
1223 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1224 "对修正后的文件做标记,然后用 'git commit' 提交"
1226 #: sequencer.c:211 sequencer.c:861 sequencer.c:944
1228 msgid "Could not write to %s"
1233 msgid "Error wrapping up %s"
1237 msgid "Your local changes would be overwritten by cherry-pick."
1238 msgstr "您的本地修改将被拣选操作覆盖。"
1241 msgid "Your local changes would be overwritten by revert."
1242 msgstr "您的本地修改将被还原操作覆盖。"
1245 msgid "Commit your changes or stash them to proceed."
1246 msgstr "提交您的修改或保存进度后再继续。"
1248 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1251 msgid "%s: Unable to write new index file"
1252 msgstr "%s:无法写入新索引文件"
1255 msgid "Could not resolve HEAD commit\n"
1256 msgstr "不能解析 HEAD 提交\n"
1259 msgid "Unable to update cache tree\n"
1264 msgid "Could not parse commit %s\n"
1265 msgstr "不能解析提交 %s\n"
1269 msgid "Could not parse parent commit %s\n"
1270 msgstr "不能解析父提交 %s\n"
1273 msgid "Your index file is unmerged."
1274 msgstr "您的索引文件未完成合并。"
1278 msgid "Commit %s is a merge but no -m option was given."
1279 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1283 msgid "Commit %s does not have parent %d"
1284 msgstr "提交 %s 没有父提交 %d"
1288 msgid "Mainline was specified but commit %s is not a merge."
1289 msgstr "指定了主线但提交 %s 不是一个合并。"
1291 #. TRANSLATORS: The first %s will be "revert" or
1292 #. "cherry-pick", the second %s a SHA1
1295 msgid "%s: cannot parse parent commit %s"
1296 msgstr "%s:不能解析父提交 %s"
1300 msgid "Cannot get commit message for %s"
1301 msgstr "不能得到 %s 的提交说明"
1305 msgid "could not revert %s... %s"
1306 msgstr "不能还原 %s... %s"
1310 msgid "could not apply %s... %s"
1311 msgstr "不能应用 %s... %s"
1314 msgid "empty commit set passed"
1319 msgid "git %s: failed to read the index"
1320 msgstr "git %s:无法读取索引"
1324 msgid "git %s: failed to refresh the index"
1325 msgstr "git %s:无法刷新索引"
1329 msgid "Cannot %s during a %s"
1330 msgstr "无法 %s 在一个 %s 过程中"
1334 msgid "Could not parse line %d."
1335 msgstr "不能解析第 %d 行。"
1338 msgid "No commits parsed."
1343 msgid "Could not open %s"
1348 msgid "Could not read %s."
1353 msgid "Unusable instruction sheet: %s"
1358 msgid "Invalid key: %s"
1363 msgid "Invalid value for %s: %s"
1368 msgid "Malformed options sheet: %s"
1372 msgid "a cherry-pick or revert is already in progress"
1373 msgstr "一个拣选或还原操作已在进行"
1376 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1377 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1381 msgid "Could not create sequencer directory %s"
1382 msgstr "不能创建序列目录 %s"
1384 #: sequencer.c:863 sequencer.c:948
1386 msgid "Error wrapping up %s."
1389 #: sequencer.c:882 sequencer.c:1018
1390 msgid "no cherry-pick or revert in progress"
1391 msgstr "拣选或还原操作并未进行"
1394 msgid "cannot resolve HEAD"
1398 msgid "cannot abort from a branch yet to be born"
1399 msgstr "不能从尚未建立的分支终止"
1401 #: sequencer.c:908 builtin/apply.c:4291
1403 msgid "cannot open %s: %s"
1408 msgid "cannot read %s: %s"
1412 msgid "unexpected end of file"
1417 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1418 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1422 msgid "Could not format %s."
1427 msgid "%s: can't cherry-pick a %s"
1428 msgstr "%s:不能拣选一个%s"
1432 msgid "%s: bad revision"
1436 msgid "Can't revert as initial commit"
1440 msgid "Can't cherry-pick into empty head"
1445 msgid "failed to read %s"
1450 "Git normally never creates a ref that ends with 40 hex characters\n"
1451 "because it will be ignored when you just specify 40-hex. These refs\n"
1452 "may be created by mistake. For example,\n"
1454 " git checkout -b $br $(git rev-parse ...)\n"
1456 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1457 "examine these refs and maybe delete them. Turn this message off by\n"
1458 "running \"git config advice.objectNameWarning false\""
1460 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1461 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1463 " git checkout -b $br $(git rev-parse ...)\n"
1465 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1466 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1469 #: submodule.c:64 submodule.c:98
1470 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1471 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1473 #: submodule.c:68 submodule.c:102
1475 msgid "Could not find section in .gitmodules where path=%s"
1476 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1480 msgid "Could not update .gitmodules entry %s"
1481 msgstr "不能更新 .gitmodules 条目 %s"
1485 msgid "Could not remove .gitmodules entry for %s"
1486 msgstr "无法移除 %s 的 .gitmodules 条目"
1489 msgid "staging updated .gitmodules failed"
1490 msgstr "将更新后 .gitmodules 添加暂存区失败"
1494 msgid "Could not set core.worktree in %s"
1495 msgstr "不能在 %s 中设置 core.worktree"
1497 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1500 msgid "unknown value '%s' for key '%s'"
1501 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1503 #: trailer.c:543 trailer.c:548 builtin/remote.c:290
1505 msgid "more than one %s"
1510 msgid "empty trailer token in trailer '%.*s'"
1511 msgstr "签名 '%.*s' 的键为空"
1515 msgid "could not read input file '%s'"
1516 msgstr "不能读取输入文件 '%s'"
1519 msgid "could not read from stdin"
1522 #: unpack-trees.c:203
1523 msgid "Checking out files"
1527 msgid "invalid URL scheme name or missing '://' suffix"
1528 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1530 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1532 msgid "invalid %XX escape sequence"
1533 msgstr "无效的 %XX 转义序列"
1536 msgid "missing host and scheme is not 'file:'"
1537 msgstr "缺失主机名且URL方案不是 'file:'"
1540 msgid "a 'file:' URL may not have a port number"
1541 msgstr "一个 'file:' URL 不应该包含端口号"
1544 msgid "invalid characters in host name"
1545 msgstr "主机名中包含无效的字符"
1547 #: urlmatch.c:244 urlmatch.c:255
1548 msgid "invalid port number"
1552 msgid "invalid '..' path segment"
1553 msgstr "无效的 '..' 路径片段"
1557 msgid "unable to access '%s': %s"
1558 msgstr "不能访问 '%s':%s"
1562 msgid "unable to access '%s'"
1567 msgid "unable to look up current user in the passwd file: %s"
1568 msgstr "无法在口令文件中查询到当前用户:%s"
1571 msgid "no such user"
1575 msgid "unable to get current working directory"
1580 msgid "could not open %s for writing"
1585 msgid "could not write to %s"
1590 msgid "could not close %s"
1594 msgid "Unmerged paths:"
1598 #: wt-status.c:177 wt-status.c:204
1600 msgid " (use \"git reset %s <file>...\" to unstage)"
1601 msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1604 #: wt-status.c:179 wt-status.c:206
1605 msgid " (use \"git rm --cached <file>...\" to unstage)"
1606 msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1610 msgid " (use \"git add <file>...\" to mark resolution)"
1611 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1614 #: wt-status.c:185 wt-status.c:189
1615 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1616 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1620 msgid " (use \"git rm <file>...\" to mark resolution)"
1621 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1623 #: wt-status.c:198 wt-status.c:881
1624 msgid "Changes to be committed:"
1627 #: wt-status.c:216 wt-status.c:890
1628 msgid "Changes not staged for commit:"
1629 msgstr "尚未暂存以备提交的变更:"
1633 msgid " (use \"git add <file>...\" to update what will be committed)"
1634 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1638 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1639 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1644 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1645 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1649 msgid " (commit or discard the untracked or modified content in submodules)"
1650 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1655 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1656 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1659 msgid "both deleted:"
1663 msgid "added by us:"
1667 msgid "deleted by them:"
1671 msgid "added by them:"
1675 msgid "deleted by us:"
1683 msgid "both modified:"
1688 msgid "bug: unhandled unmerged status %x"
1689 msgstr "bug:无法处理的未合并状态 %x"
1723 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1725 msgid "new commits, "
1728 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1730 msgid "modified content, "
1733 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1735 msgid "untracked content, "
1740 msgid "bug: unhandled diff status %c"
1741 msgstr "bug:无法处理的差异状态 %c"
1744 msgid "Submodules changed but not updated:"
1745 msgstr "子模组已修改但尚未更新:"
1748 msgid "Submodule changes to be committed:"
1753 "Do not touch the line above.\n"
1754 "Everything below will be removed."
1760 msgid "You have unmerged paths."
1765 msgid " (fix conflicts and run \"git commit\")"
1766 msgstr " (解决冲突并运行 \"git commit\")"
1769 msgid "All conflicts fixed but you are still merging."
1770 msgstr "所有冲突已解决但您仍处于合并中。"
1774 msgid " (use \"git commit\" to conclude merge)"
1775 msgstr " (使用 \"git commit\" 结束合并)"
1778 msgid "You are in the middle of an am session."
1779 msgstr "您正处于 am 操作过程中。"
1782 msgid "The current patch is empty."
1787 msgid " (fix conflicts and then run \"git am --continue\")"
1788 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1792 msgid " (use \"git am --skip\" to skip this patch)"
1793 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1797 msgid " (use \"git am --abort\" to restore the original branch)"
1798 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1800 #: wt-status.c:1039 wt-status.c:1056
1802 msgid "You are currently rebasing branch '%s' on '%s'."
1803 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1805 #: wt-status.c:1044 wt-status.c:1061
1806 msgid "You are currently rebasing."
1811 msgid " (fix conflicts and then run \"git rebase --continue\")"
1812 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1816 msgid " (use \"git rebase --skip\" to skip this patch)"
1817 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1821 msgid " (use \"git rebase --abort\" to check out the original branch)"
1822 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1826 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1827 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1832 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1833 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1836 msgid "You are currently splitting a commit during a rebase."
1837 msgstr "您在执行变基操作时拆分提交。"
1841 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1842 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1846 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1847 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1850 msgid "You are currently editing a commit during a rebase."
1851 msgstr "您在执行变基操作时编辑提交。"
1855 msgid " (use \"git commit --amend\" to amend the current commit)"
1856 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1861 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1862 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1866 msgid "You are currently cherry-picking commit %s."
1867 msgstr "您在执行拣选提交 %s 的操作。"
1871 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1872 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1876 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1877 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1881 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1882 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1886 msgid "You are currently reverting commit %s."
1887 msgstr "您在执行反转提交 %s 的操作。"
1891 msgid " (fix conflicts and run \"git revert --continue\")"
1892 msgstr " (解决冲突并运行 \"git revert --continue\")"
1896 msgid " (all conflicts fixed: run \"git revert --continue\")"
1897 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1901 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1902 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1906 msgid "You are currently bisecting, started from branch '%s'."
1907 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1910 msgid "You are currently bisecting."
1911 msgstr "您在执行二分查找操作。"
1915 msgid " (use \"git bisect reset\" to get back to the original branch)"
1916 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1923 msgid "rebase in progress; onto "
1924 msgstr "变基操作正在进行中;至 "
1927 msgid "HEAD detached at "
1931 msgid "HEAD detached from "
1935 msgid "Not currently on any branch."
1939 msgid "Initial commit"
1943 msgid "Untracked files"
1947 msgid "Ignored files"
1953 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1954 "may speed it up, but you have to be careful not to forget to add\n"
1955 "new files yourself (see 'git help status')."
1957 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1958 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1962 msgid "Untracked files not listed%s"
1963 msgstr "未跟踪的文件没有列出%s"
1965 # 译者:中文字符串拼接,可删除前导空格
1967 msgid " (use -u option to show untracked files)"
1968 msgstr "(使用 -u 参数显示未跟踪的文件)"
1976 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1977 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1981 msgid "no changes added to commit\n"
1987 "nothing added to commit but untracked files present (use \"git add\" to "
1989 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1993 msgid "nothing added to commit but untracked files present\n"
1994 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1996 # 译者:中文字符串拼接,可删除前导空格
1999 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2000 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2002 #: wt-status.c:1412 wt-status.c:1417
2004 msgid "nothing to commit\n"
2007 # 译者:中文字符串拼接,可删除前导空格
2010 msgid "nothing to commit (use -u to show untracked files)\n"
2011 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2013 # 译者:中文字符串拼接,可删除前导空格
2016 msgid "nothing to commit, working directory clean\n"
2017 msgstr "无文件要提交,干净的工作区\n"
2020 msgid "HEAD (no branch)"
2025 msgid "Initial commit on "
2033 #: wt-status.c:1563 wt-status.c:1571
2037 #: compat/precompose_utf8.c:55 builtin/clone.c:352
2039 msgid "failed to unlink '%s'"
2043 msgid "git add [<options>] [--] <pathspec>..."
2044 msgstr "git add [<选项>] [--] <路径规则>..."
2048 msgid "unexpected diff status %c"
2051 #: builtin/add.c:70 builtin/commit.c:277
2052 msgid "updating files failed"
2057 msgid "remove '%s'\n"
2060 #: builtin/add.c:134
2061 msgid "Unstaged changes after refreshing the index:"
2062 msgstr "刷新索引之后尚未被暂存的变更:"
2064 #: builtin/add.c:194 builtin/rev-parse.c:796
2065 msgid "Could not read the index"
2068 #: builtin/add.c:205
2070 msgid "Could not open '%s' for writing."
2071 msgstr "不能打开 '%s' 以写入。"
2073 #: builtin/add.c:209
2074 msgid "Could not write patch"
2077 #: builtin/add.c:212
2078 msgid "editing patch failed"
2081 #: builtin/add.c:215
2083 msgid "Could not stat '%s'"
2084 msgstr "不能查看文件状态 '%s'"
2086 #: builtin/add.c:217
2087 msgid "Empty patch. Aborted."
2090 #: builtin/add.c:222
2092 msgid "Could not apply '%s'"
2095 #: builtin/add.c:232
2096 msgid "The following paths are ignored by one of your .gitignore files:\n"
2097 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2099 #: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2100 #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2105 #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2106 #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
2107 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2111 #: builtin/add.c:252
2112 msgid "interactive picking"
2115 #: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
2116 msgid "select hunks interactively"
2119 #: builtin/add.c:254
2120 msgid "edit current diff and apply"
2123 #: builtin/add.c:255
2124 msgid "allow adding otherwise ignored files"
2127 #: builtin/add.c:256
2128 msgid "update tracked files"
2131 #: builtin/add.c:257
2132 msgid "record only the fact that the path will be added later"
2133 msgstr "只记录,该路径稍后再添加"
2135 #: builtin/add.c:258
2136 msgid "add changes from all tracked and untracked files"
2137 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2139 #: builtin/add.c:261
2140 msgid "ignore paths removed in the working tree (same as --no-all)"
2141 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2143 #: builtin/add.c:263
2144 msgid "don't add, only refresh the index"
2147 #: builtin/add.c:264
2148 msgid "just skip files which cannot be added because of errors"
2149 msgstr "跳过因出错不能添加的文件"
2151 #: builtin/add.c:265
2152 msgid "check if - even missing - files are ignored in dry run"
2153 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2155 #: builtin/add.c:287
2157 msgid "Use -f if you really want to add them.\n"
2158 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2160 #: builtin/add.c:294
2161 msgid "adding files failed"
2164 #: builtin/add.c:330
2165 msgid "-A and -u are mutually incompatible"
2166 msgstr "-A 和 -u 选项互斥"
2168 #: builtin/add.c:337
2169 msgid "Option --ignore-missing can only be used together with --dry-run"
2170 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2172 #: builtin/add.c:358
2174 msgid "Nothing specified, nothing added.\n"
2175 msgstr "没有指定文件,也没有文件被添加。\n"
2177 #: builtin/add.c:359
2179 msgid "Maybe you wanted to say 'git add .'?\n"
2180 msgstr "也许您想要执行 'git add .'?\n"
2182 #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2183 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
2184 msgid "index file corrupt"
2187 #: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
2188 msgid "Unable to write new index file"
2191 #: builtin/apply.c:59
2192 msgid "git apply [<options>] [<patch>...]"
2193 msgstr "git apply [<选项>] [<补丁>...]"
2195 #: builtin/apply.c:112
2197 msgid "unrecognized whitespace option '%s'"
2198 msgstr "未能识别的空白字符选项 '%s'"
2200 #: builtin/apply.c:127
2202 msgid "unrecognized whitespace ignore option '%s'"
2203 msgstr "未能识别的空白字符忽略选项 '%s'"
2205 #: builtin/apply.c:822
2207 msgid "Cannot prepare timestamp regexp %s"
2208 msgstr "无法准备时间戳正则表达式 %s"
2210 #: builtin/apply.c:831
2212 msgid "regexec returned %d for input: %s"
2213 msgstr "regexec 返回 %d,输入为:%s"
2215 #: builtin/apply.c:912
2217 msgid "unable to find filename in patch at line %d"
2218 msgstr "不能在补丁的第 %d 行找到文件名"
2220 #: builtin/apply.c:944
2222 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2223 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2225 #: builtin/apply.c:948
2227 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2228 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2230 #: builtin/apply.c:949
2232 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2233 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2235 #: builtin/apply.c:956
2237 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2238 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2240 #: builtin/apply.c:1419
2242 msgid "recount: unexpected line: %.*s"
2243 msgstr "recount:意外的行:%.*s"
2245 #: builtin/apply.c:1476
2247 msgid "patch fragment without header at line %d: %.*s"
2248 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2250 #: builtin/apply.c:1493
2253 "git diff header lacks filename information when removing %d leading pathname "
2254 "component (line %d)"
2256 "git diff header lacks filename information when removing %d leading pathname "
2257 "components (line %d)"
2258 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2259 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2261 #: builtin/apply.c:1659
2262 msgid "new file depends on old contents"
2265 #: builtin/apply.c:1661
2266 msgid "deleted file still has contents"
2269 #: builtin/apply.c:1687
2271 msgid "corrupt patch at line %d"
2272 msgstr "补丁在第 %d 行损坏"
2274 #: builtin/apply.c:1723
2276 msgid "new file %s depends on old contents"
2277 msgstr "新文件 %s 依赖旧内容"
2279 #: builtin/apply.c:1725
2281 msgid "deleted file %s still has contents"
2282 msgstr "删除的文件 %s 仍有内容"
2284 #: builtin/apply.c:1728
2286 msgid "** warning: file %s becomes empty but is not deleted"
2287 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2289 #: builtin/apply.c:1874
2291 msgid "corrupt binary patch at line %d: %.*s"
2292 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2294 #: builtin/apply.c:1903
2296 msgid "unrecognized binary patch at line %d"
2297 msgstr "未能识别的二进制补丁位于第 %d 行"
2299 #: builtin/apply.c:2054
2301 msgid "patch with only garbage at line %d"
2302 msgstr "补丁文件的第 %d 行只有垃圾数据"
2304 #: builtin/apply.c:2144
2306 msgid "unable to read symlink %s"
2307 msgstr "无法读取符号链接 %s"
2309 #: builtin/apply.c:2148
2311 msgid "unable to open or read %s"
2314 #: builtin/apply.c:2781
2316 msgid "invalid start of line: '%c'"
2317 msgstr "无效的行首字符:'%c'"
2319 #: builtin/apply.c:2900
2321 msgid "Hunk #%d succeeded at %d (offset %d line)."
2322 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2323 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2324 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2326 #: builtin/apply.c:2912
2328 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2329 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2331 #: builtin/apply.c:2918
2334 "while searching for:\n"
2340 #: builtin/apply.c:2938
2342 msgid "missing binary patch data for '%s'"
2343 msgstr "缺失 '%s' 的二进制补丁数据"
2345 #: builtin/apply.c:3039
2347 msgid "binary patch does not apply to '%s'"
2348 msgstr "二进制补丁未应用到 '%s'"
2350 #: builtin/apply.c:3045
2352 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2353 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2355 #: builtin/apply.c:3066
2357 msgid "patch failed: %s:%ld"
2358 msgstr "打补丁失败:%s:%ld"
2360 #: builtin/apply.c:3190
2362 msgid "cannot checkout %s"
2365 #: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
2367 msgid "read of %s failed"
2370 #: builtin/apply.c:3243
2372 msgid "reading from '%s' beyond a symbolic link"
2373 msgstr "读取位于符号链接中的 '%s'"
2375 #: builtin/apply.c:3271 builtin/apply.c:3493
2377 msgid "path %s has been renamed/deleted"
2378 msgstr "路径 %s 已经被重命名/删除"
2380 #: builtin/apply.c:3352 builtin/apply.c:3507
2382 msgid "%s: does not exist in index"
2385 #: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
2390 #: builtin/apply.c:3361 builtin/apply.c:3515
2392 msgid "%s: does not match index"
2395 #: builtin/apply.c:3463
2396 msgid "removal patch leaves file contents"
2397 msgstr "移除补丁仍留下了文件内容"
2399 #: builtin/apply.c:3532
2401 msgid "%s: wrong type"
2404 #: builtin/apply.c:3534
2406 msgid "%s has type %o, expected %o"
2407 msgstr "%s 的类型是 %o,应为 %o"
2409 #: builtin/apply.c:3693 builtin/apply.c:3695
2411 msgid "invalid path '%s'"
2414 #: builtin/apply.c:3750
2416 msgid "%s: already exists in index"
2417 msgstr "%s:已经存在于索引中"
2419 #: builtin/apply.c:3753
2421 msgid "%s: already exists in working directory"
2422 msgstr "%s:已经存在于工作区中"
2424 #: builtin/apply.c:3773
2426 msgid "new mode (%o) of %s does not match old mode (%o)"
2427 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2429 #: builtin/apply.c:3778
2431 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2432 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2434 #: builtin/apply.c:3798
2436 msgid "affected file '%s' is beyond a symbolic link"
2437 msgstr "受影响的文件 '%s' 位于符号链接中"
2439 #: builtin/apply.c:3802
2441 msgid "%s: patch does not apply"
2444 #: builtin/apply.c:3816
2446 msgid "Checking patch %s..."
2449 #: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
2451 msgid "make_cache_entry failed for path '%s'"
2452 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2454 #: builtin/apply.c:4052
2456 msgid "unable to remove %s from index"
2457 msgstr "不能从索引中移除 %s"
2459 #: builtin/apply.c:4081
2461 msgid "corrupt patch for submodule %s"
2462 msgstr "子模组 %s 损坏的补丁"
2464 #: builtin/apply.c:4085
2466 msgid "unable to stat newly created file '%s'"
2467 msgstr "不能枚举新建文件 '%s' 的状态"
2469 #: builtin/apply.c:4090
2471 msgid "unable to create backing store for newly created file %s"
2472 msgstr "不能为新建文件 %s 创建后端存储"
2474 #: builtin/apply.c:4093 builtin/apply.c:4201
2476 msgid "unable to add cache entry for %s"
2477 msgstr "无法为 %s 添加缓存条目"
2479 #: builtin/apply.c:4126
2481 msgid "closing file '%s'"
2484 #: builtin/apply.c:4175
2486 msgid "unable to write file '%s' mode %o"
2487 msgstr "不能写文件 '%s' 权限 %o"
2489 #: builtin/apply.c:4262
2491 msgid "Applied patch %s cleanly."
2494 #: builtin/apply.c:4270
2495 msgid "internal error"
2498 #: builtin/apply.c:4273
2500 msgid "Applying patch %%s with %d reject..."
2501 msgid_plural "Applying patch %%s with %d rejects..."
2502 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2503 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2505 #: builtin/apply.c:4283
2507 msgid "truncating .rej filename to %.*s.rej"
2508 msgstr "截短 .rej 文件名为 %.*s.rej"
2510 #: builtin/apply.c:4304
2512 msgid "Hunk #%d applied cleanly."
2513 msgstr "第 #%d 个片段成功应用。"
2515 #: builtin/apply.c:4307
2517 msgid "Rejected hunk #%d."
2518 msgstr "拒绝第 #%d 个片段。"
2520 #: builtin/apply.c:4397
2521 msgid "unrecognized input"
2524 #: builtin/apply.c:4408
2525 msgid "unable to read index file"
2528 #: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
2529 #: builtin/fetch.c:92
2533 #: builtin/apply.c:4526
2534 msgid "don't apply changes matching the given path"
2535 msgstr "不要应用与给出路径向匹配的变更"
2537 #: builtin/apply.c:4529
2538 msgid "apply changes matching the given path"
2539 msgstr "应用与给出路径向匹配的变更"
2541 #: builtin/apply.c:4531
2545 #: builtin/apply.c:4532
2546 msgid "remove <num> leading slashes from traditional diff paths"
2547 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2549 #: builtin/apply.c:4535
2550 msgid "ignore additions made by the patch"
2551 msgstr "忽略补丁中的添加的文件"
2553 #: builtin/apply.c:4537
2554 msgid "instead of applying the patch, output diffstat for the input"
2555 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2557 #: builtin/apply.c:4541
2558 msgid "show number of added and deleted lines in decimal notation"
2559 msgstr "以十进制数显示添加和删除的行数"
2561 #: builtin/apply.c:4543
2562 msgid "instead of applying the patch, output a summary for the input"
2563 msgstr "不应用补丁,而是显示输入的概要"
2565 #: builtin/apply.c:4545
2566 msgid "instead of applying the patch, see if the patch is applicable"
2567 msgstr "不应用补丁,而是查看补丁是否可应用"
2569 #: builtin/apply.c:4547
2570 msgid "make sure the patch is applicable to the current index"
2571 msgstr "确认补丁可以应用到当前索引"
2573 #: builtin/apply.c:4549
2574 msgid "apply a patch without touching the working tree"
2575 msgstr "应用补丁而不修改工作区"
2577 #: builtin/apply.c:4551
2578 msgid "accept a patch that touches outside the working area"
2579 msgstr "接受修改工作区之外文件的补丁"
2581 #: builtin/apply.c:4553
2582 msgid "also apply the patch (use with --stat/--summary/--check)"
2583 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2585 #: builtin/apply.c:4555
2586 msgid "attempt three-way merge if a patch does not apply"
2587 msgstr "如果一个补丁不能应用则尝试三路合并"
2589 #: builtin/apply.c:4557
2590 msgid "build a temporary index based on embedded index information"
2591 msgstr "创建一个临时索引基于嵌入的索引信息"
2593 #: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
2594 msgid "paths are separated with NUL character"
2595 msgstr "路径以 NUL 字符分隔"
2597 #: builtin/apply.c:4562
2598 msgid "ensure at least <n> lines of context match"
2599 msgstr "确保至少匹配 <n> 行上下文"
2601 #: builtin/apply.c:4563
2605 #: builtin/apply.c:4564
2606 msgid "detect new or modified lines that have whitespace errors"
2607 msgstr "检查新增和修改的行中间的空白字符滥用"
2609 #: builtin/apply.c:4567 builtin/apply.c:4570
2610 msgid "ignore changes in whitespace when finding context"
2611 msgstr "查找上下文时忽略空白字符的变更"
2613 #: builtin/apply.c:4573
2614 msgid "apply the patch in reverse"
2617 #: builtin/apply.c:4575
2618 msgid "don't expect at least one line of context"
2621 #: builtin/apply.c:4577
2622 msgid "leave the rejected hunks in corresponding *.rej files"
2623 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2625 #: builtin/apply.c:4579
2626 msgid "allow overlapping hunks"
2629 #: builtin/apply.c:4582
2630 msgid "tolerate incorrectly detected missing new-line at the end of file"
2631 msgstr "允许不正确的文件末尾换行符"
2633 #: builtin/apply.c:4585
2634 msgid "do not trust the line counts in the hunk headers"
2635 msgstr "不信任补丁片段的头信息中的行号"
2637 #: builtin/apply.c:4587
2641 #: builtin/apply.c:4588
2642 msgid "prepend <root> to all filenames"
2643 msgstr "为所有文件名前添加 <根目录>"
2645 #: builtin/apply.c:4610
2646 msgid "--3way outside a repository"
2647 msgstr "--3way 在一个版本库之外"
2649 #: builtin/apply.c:4618
2650 msgid "--index outside a repository"
2651 msgstr "--index 在一个版本库之外"
2653 #: builtin/apply.c:4621
2654 msgid "--cached outside a repository"
2655 msgstr "--cached 在一个版本库之外"
2657 #: builtin/apply.c:4640
2659 msgid "can't open patch '%s'"
2660 msgstr "不能打开补丁 '%s'"
2662 #: builtin/apply.c:4654
2664 msgid "squelched %d whitespace error"
2665 msgid_plural "squelched %d whitespace errors"
2666 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2667 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2669 #: builtin/apply.c:4660 builtin/apply.c:4670
2671 msgid "%d line adds whitespace errors."
2672 msgid_plural "%d lines add whitespace errors."
2673 msgstr[0] "%d 行有空白字符误用。"
2674 msgstr[1] "%d 行有空白字符误用。"
2676 #: builtin/archive.c:17
2678 msgid "could not create archive file '%s'"
2679 msgstr "不能创建归档文件 '%s'"
2681 #: builtin/archive.c:20
2682 msgid "could not redirect output"
2685 #: builtin/archive.c:37
2686 msgid "git archive: Remote with no URL"
2687 msgstr "git archive:未提供远程URL"
2689 #: builtin/archive.c:58
2690 msgid "git archive: expected ACK/NAK, got EOF"
2691 msgstr "git archive:应为ACK/NACK,却得到EOF"
2693 #: builtin/archive.c:61
2695 msgid "git archive: NACK %s"
2696 msgstr "git archive:NACK %s"
2698 #: builtin/archive.c:63
2700 msgid "remote error: %s"
2703 #: builtin/archive.c:64
2704 msgid "git archive: protocol error"
2705 msgstr "git archive:协议错误"
2707 #: builtin/archive.c:68
2708 msgid "git archive: expected a flush"
2709 msgstr "git archive:应为刷新"
2711 #: builtin/bisect--helper.c:7
2712 msgid "git bisect--helper --next-all [--no-checkout]"
2713 msgstr "git bisect--helper --next-all [--no-checkout]"
2715 #: builtin/bisect--helper.c:17
2716 msgid "perform 'git bisect next'"
2717 msgstr "执行 'git bisect next'"
2719 #: builtin/bisect--helper.c:19
2720 msgid "update BISECT_HEAD instead of checking out the current commit"
2721 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2723 #: builtin/blame.c:31
2724 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2725 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
2727 #: builtin/blame.c:36
2728 msgid "<rev-opts> are documented in git-rev-list(1)"
2729 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2731 #: builtin/blame.c:2500
2732 msgid "Show blame entries as we find them, incrementally"
2733 msgstr "增量式地显示发现的 blame 条目"
2735 #: builtin/blame.c:2501
2736 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2737 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2739 #: builtin/blame.c:2502
2740 msgid "Do not treat root commits as boundaries (Default: off)"
2741 msgstr "不把根提交作为边界(默认:关闭)"
2743 #: builtin/blame.c:2503
2744 msgid "Show work cost statistics"
2747 #: builtin/blame.c:2504
2748 msgid "Show output score for blame entries"
2749 msgstr "显示判断 blame 条目位移的得分诊断信息"
2751 #: builtin/blame.c:2505
2752 msgid "Show original filename (Default: auto)"
2753 msgstr "显示原始文件名(默认:自动)"
2755 #: builtin/blame.c:2506
2756 msgid "Show original linenumber (Default: off)"
2757 msgstr "显示原始的行号(默认:关闭)"
2759 #: builtin/blame.c:2507
2760 msgid "Show in a format designed for machine consumption"
2761 msgstr "显示为一个适合机器读取的格式"
2763 #: builtin/blame.c:2508
2764 msgid "Show porcelain format with per-line commit information"
2765 msgstr "为每一行显示机器适用的提交信息"
2767 #: builtin/blame.c:2509
2768 msgid "Use the same output mode as git-annotate (Default: off)"
2769 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2771 #: builtin/blame.c:2510
2772 msgid "Show raw timestamp (Default: off)"
2773 msgstr "显示原始时间戳(默认:关闭)"
2775 #: builtin/blame.c:2511
2776 msgid "Show long commit SHA1 (Default: off)"
2777 msgstr "显示长的SHA1提交号(默认:关闭)"
2779 #: builtin/blame.c:2512
2780 msgid "Suppress author name and timestamp (Default: off)"
2781 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2783 #: builtin/blame.c:2513
2784 msgid "Show author email instead of name (Default: off)"
2785 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2787 #: builtin/blame.c:2514
2788 msgid "Ignore whitespace differences"
2791 #: builtin/blame.c:2515
2792 msgid "Spend extra cycles to find better match"
2793 msgstr "花费额外的循环来找到更好的匹配"
2795 #: builtin/blame.c:2516
2796 msgid "Use revisions from <file> instead of calling git-rev-list"
2797 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2799 #: builtin/blame.c:2517
2800 msgid "Use <file>'s contents as the final image"
2801 msgstr "使用 <文件> 的内容作为最终的图片"
2803 #: builtin/blame.c:2518 builtin/blame.c:2519
2807 #: builtin/blame.c:2518
2808 msgid "Find line copies within and across files"
2809 msgstr "找到文件内及跨文件的行拷贝"
2811 #: builtin/blame.c:2519
2812 msgid "Find line movements within and across files"
2813 msgstr "找到文件内及跨文件的行移动"
2815 #: builtin/blame.c:2520
2819 #: builtin/blame.c:2520
2820 msgid "Process only line range n,m, counting from 1"
2821 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2823 #. TRANSLATORS: This string is used to tell us the maximum
2824 #. display width for a relative timestamp in "git blame"
2825 #. output. For C locale, "4 years, 11 months ago", which
2826 #. takes 22 places, is the longest among various forms of
2827 #. relative timestamps, but your language may need more or
2828 #. fewer display columns.
2829 #: builtin/blame.c:2601
2830 msgid "4 years, 11 months ago"
2833 #: builtin/branch.c:24
2834 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2835 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2837 #: builtin/branch.c:25
2838 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2839 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2841 #: builtin/branch.c:26
2842 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2843 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2845 #: builtin/branch.c:27
2846 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2847 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2849 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2850 #: builtin/branch.c:150
2853 "deleting branch '%s' that has been merged to\n"
2854 " '%s', but not yet merged to HEAD."
2856 "将要删除的分支 '%s' 已经被合并到\n"
2859 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2860 #: builtin/branch.c:154
2863 "not deleting branch '%s' that is not yet merged to\n"
2864 " '%s', even though it is merged to HEAD."
2866 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2867 " 然而却尚未被合并到分支 '%s' 。"
2869 #: builtin/branch.c:168
2871 msgid "Couldn't look up commit object for '%s'"
2872 msgstr "无法查询 '%s' 指向的提交对象"
2874 #: builtin/branch.c:172
2877 "The branch '%s' is not fully merged.\n"
2878 "If you are sure you want to delete it, run 'git branch -D %s'."
2881 "如果您确认要删除它,执行 'git branch -D %s'。"
2883 #: builtin/branch.c:185
2884 msgid "Update of config-file failed"
2885 msgstr "无法更新 config 文件"
2887 #: builtin/branch.c:213
2888 msgid "cannot use -a with -d"
2889 msgstr "不能将 -a 和 -d 同时使用"
2891 #: builtin/branch.c:219
2892 msgid "Couldn't look up commit object for HEAD"
2893 msgstr "无法查询 HEAD 指向的提交对象"
2895 #: builtin/branch.c:227
2897 msgid "Cannot delete the branch '%s' which you are currently on."
2898 msgstr "无法删除您当前所在的分支 '%s'。"
2900 #: builtin/branch.c:243
2902 msgid "remote-tracking branch '%s' not found."
2903 msgstr "未能找到远程跟踪分支 '%s'。"
2905 #: builtin/branch.c:244
2907 msgid "branch '%s' not found."
2908 msgstr "分支 '%s' 未发现。"
2910 #: builtin/branch.c:258
2912 msgid "Error deleting remote-tracking branch '%s'"
2913 msgstr "无法删除远程跟踪分支 '%s'"
2915 #: builtin/branch.c:259
2917 msgid "Error deleting branch '%s'"
2918 msgstr "无法删除分支 '%s'"
2920 #: builtin/branch.c:266
2922 msgid "Deleted remote-tracking branch %s (was %s).\n"
2923 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
2925 #: builtin/branch.c:267
2927 msgid "Deleted branch %s (was %s).\n"
2928 msgstr "已删除分支 %s(曾为 %s)。\n"
2930 #: builtin/branch.c:368
2932 msgid "branch '%s' does not point at a commit"
2933 msgstr "分支 '%s' 未指向一个提交"
2935 #: builtin/branch.c:451
2940 #: builtin/branch.c:456
2945 #: builtin/branch.c:461
2947 msgid "[%s: behind %d]"
2950 #: builtin/branch.c:463
2955 #: builtin/branch.c:467
2957 msgid "[%s: ahead %d]"
2960 #: builtin/branch.c:469
2965 #: builtin/branch.c:472
2967 msgid "[%s: ahead %d, behind %d]"
2968 msgstr "[%s:领先 %d,落后 %d]"
2970 #: builtin/branch.c:475
2972 msgid "[ahead %d, behind %d]"
2973 msgstr "[领先 %d,落后 %d]"
2975 #: builtin/branch.c:488
2976 msgid " **** invalid ref ****"
2977 msgstr " **** 无效引用 ****"
2979 #: builtin/branch.c:579
2981 msgid "(no branch, rebasing %s)"
2982 msgstr "(非分支,正变基 %s)"
2984 #: builtin/branch.c:582
2986 msgid "(no branch, bisect started on %s)"
2987 msgstr "(非分支,二分查找开始于 %s)"
2989 #: builtin/branch.c:588
2991 msgid "(HEAD detached at %s)"
2992 msgstr "(头指针分离于 %s)"
2994 #: builtin/branch.c:591
2996 msgid "(HEAD detached from %s)"
2997 msgstr "(头指针分离自 %s)"
2999 #: builtin/branch.c:595
3003 #: builtin/branch.c:642
3005 msgid "object '%s' does not point to a commit"
3006 msgstr "对象 '%s' 没有指向一个提交"
3008 #: builtin/branch.c:690
3009 msgid "some refs could not be read"
3012 #: builtin/branch.c:703
3013 msgid "cannot rename the current branch while not on any."
3014 msgstr "无法重命名当前分支因为不处于任何分支上。"
3016 #: builtin/branch.c:713
3018 msgid "Invalid branch name: '%s'"
3019 msgstr "无效的分支名:'%s'"
3021 #: builtin/branch.c:728
3022 msgid "Branch rename failed"
3025 #: builtin/branch.c:732
3027 msgid "Renamed a misnamed branch '%s' away"
3028 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3030 #: builtin/branch.c:736
3032 msgid "Branch renamed to %s, but HEAD is not updated!"
3033 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3035 #: builtin/branch.c:743
3036 msgid "Branch is renamed, but update of config-file failed"
3037 msgstr "分支被重命名,但更新 config 文件失败"
3039 #: builtin/branch.c:758
3041 msgid "malformed object name %s"
3044 #: builtin/branch.c:780
3046 msgid "could not write branch description template: %s"
3047 msgstr "不能写分支描述模版:%s"
3049 #: builtin/branch.c:810
3050 msgid "Generic options"
3053 #: builtin/branch.c:812
3054 msgid "show hash and subject, give twice for upstream branch"
3055 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3057 #: builtin/branch.c:813
3058 msgid "suppress informational messages"
3061 #: builtin/branch.c:814
3062 msgid "set up tracking mode (see git-pull(1))"
3063 msgstr "设置跟踪模式(参见 git-pull(1))"
3065 #: builtin/branch.c:816
3066 msgid "change upstream info"
3069 #: builtin/branch.c:820
3070 msgid "use colored output"
3073 #: builtin/branch.c:821
3074 msgid "act on remote-tracking branches"
3077 #: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3078 #: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3079 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
3080 #: builtin/tag.c:622
3084 #: builtin/branch.c:825 builtin/branch.c:831
3085 msgid "print only branches that contain the commit"
3086 msgstr "只打印包含该提交的分支"
3088 #: builtin/branch.c:837
3089 msgid "Specific git-branch actions:"
3090 msgstr "具体的 git-branch 动作:"
3092 #: builtin/branch.c:838
3093 msgid "list both remote-tracking and local branches"
3094 msgstr "列出远程跟踪及本地分支"
3096 #: builtin/branch.c:840
3097 msgid "delete fully merged branch"
3100 #: builtin/branch.c:841
3101 msgid "delete branch (even if not merged)"
3102 msgstr "删除分支(即使没有合并)"
3104 #: builtin/branch.c:842
3105 msgid "move/rename a branch and its reflog"
3106 msgstr "移动/重命名一个分支,以及它的引用日志"
3108 #: builtin/branch.c:843
3109 msgid "move/rename a branch, even if target exists"
3110 msgstr "移动/重命名一个分支,即使目标已存在"
3112 #: builtin/branch.c:844
3113 msgid "list branch names"
3116 #: builtin/branch.c:845
3117 msgid "create the branch's reflog"
3120 #: builtin/branch.c:847
3121 msgid "edit the description for the branch"
3124 #: builtin/branch.c:848
3125 msgid "force creation, move/rename, deletion"
3126 msgstr "强制创建、移动/重命名、删除"
3128 #: builtin/branch.c:851
3129 msgid "print only not merged branches"
3132 #: builtin/branch.c:857
3133 msgid "print only merged branches"
3136 #: builtin/branch.c:861
3137 msgid "list branches in columns"
3140 #: builtin/branch.c:874
3141 msgid "Failed to resolve HEAD as a valid ref."
3142 msgstr "无法将 HEAD 解析为有效引用。"
3144 #: builtin/branch.c:878 builtin/clone.c:629
3145 msgid "HEAD not found below refs/heads!"
3146 msgstr "HEAD 没有位于 /refs/heads 之下!"
3148 #: builtin/branch.c:900
3149 msgid "--column and --verbose are incompatible"
3150 msgstr "--column 和 --verbose 不兼容"
3152 #: builtin/branch.c:911 builtin/branch.c:950
3153 msgid "branch name required"
3156 #: builtin/branch.c:926
3157 msgid "Cannot give description to detached HEAD"
3158 msgstr "不能向分离头指针提供描述"
3160 #: builtin/branch.c:931
3161 msgid "cannot edit description of more than one branch"
3162 msgstr "不能为一个以上的分支编辑描述"
3164 #: builtin/branch.c:938
3166 msgid "No commit on branch '%s' yet."
3167 msgstr "分支 '%s' 尚无提交。"
3169 #: builtin/branch.c:941
3171 msgid "No branch named '%s'."
3174 #: builtin/branch.c:956
3175 msgid "too many branches for a rename operation"
3176 msgstr "为重命名操作提供了太多的分支名"
3178 #: builtin/branch.c:961
3179 msgid "too many branches to set new upstream"
3180 msgstr "为设置新上游提供了太多的分支名"
3182 #: builtin/branch.c:965
3185 "could not set upstream of HEAD to %s when it does not point to any branch."
3186 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3188 #: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
3190 msgid "no such branch '%s'"
3193 #: builtin/branch.c:972
3195 msgid "branch '%s' does not exist"
3196 msgstr "分支 '%s' 不存在"
3198 #: builtin/branch.c:984
3199 msgid "too many branches to unset upstream"
3200 msgstr "为取消上游设置操作提供了太多的分支名"
3202 #: builtin/branch.c:988
3203 msgid "could not unset upstream of HEAD when it does not point to any branch."
3204 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3206 #: builtin/branch.c:994
3208 msgid "Branch '%s' has no upstream information"
3209 msgstr "分支 '%s' 没有上游信息"
3211 #: builtin/branch.c:1008
3212 msgid "it does not make sense to create 'HEAD' manually"
3213 msgstr "手工创建 'HEAD' 没有意义"
3215 #: builtin/branch.c:1014
3216 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3217 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3219 #: builtin/branch.c:1017
3222 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3223 "track or --set-upstream-to\n"
3225 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3227 #: builtin/branch.c:1034
3231 "If you wanted to make '%s' track '%s', do this:\n"
3235 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3238 #: builtin/branch.c:1035
3240 msgid " git branch -d %s\n"
3241 msgstr " git branch -d %s\n"
3243 #: builtin/branch.c:1036
3245 msgid " git branch --set-upstream-to %s\n"
3246 msgstr " git branch --set-upstream-to %s\n"
3248 #: builtin/bundle.c:51
3250 msgid "%s is okay\n"
3253 #: builtin/bundle.c:64
3254 msgid "Need a repository to create a bundle."
3255 msgstr "需要一个版本库来创建包。"
3257 #: builtin/bundle.c:68
3258 msgid "Need a repository to unbundle."
3259 msgstr "需要一个版本库来解包。"
3261 #: builtin/cat-file.c:369
3263 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3264 "<type>|--textconv) <object>"
3266 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3267 ">|--textconv) <对象>"
3269 #: builtin/cat-file.c:370
3271 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3274 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
3276 #: builtin/cat-file.c:407
3277 msgid "<type> can be one of: blob, tree, commit, tag"
3278 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3280 #: builtin/cat-file.c:408
3281 msgid "show object type"
3284 #: builtin/cat-file.c:409
3285 msgid "show object size"
3288 #: builtin/cat-file.c:411
3289 msgid "exit with zero when there's no error"
3290 msgstr "当没有错误时退出并返回零"
3292 #: builtin/cat-file.c:412
3293 msgid "pretty-print object's content"
3296 #: builtin/cat-file.c:414
3297 msgid "for blob objects, run textconv on object's content"
3298 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3300 #: builtin/cat-file.c:416
3301 msgid "allow -s and -t to work with broken/corrupt objects"
3302 msgstr "允许 -s 和 -t 对损坏的对象生效"
3304 #: builtin/cat-file.c:418
3305 msgid "show info and content of objects fed from the standard input"
3306 msgstr "显示从标准输入提供的对象的信息和内容"
3308 #: builtin/cat-file.c:421
3309 msgid "show info about objects fed from the standard input"
3310 msgstr "显示从标准输入提供的对象的信息"
3312 #: builtin/cat-file.c:424
3313 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3314 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3316 #: builtin/check-attr.c:11
3317 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3318 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3320 #: builtin/check-attr.c:12
3321 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3322 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3324 #: builtin/check-attr.c:19
3325 msgid "report all attributes set on file"
3326 msgstr "报告设置在文件上的所有属性"
3328 #: builtin/check-attr.c:20
3329 msgid "use .gitattributes only from the index"
3330 msgstr "只使用索引中的 .gitattributes"
3332 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
3333 msgid "read file names from stdin"
3336 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3337 msgid "terminate input and output records by a NUL character"
3338 msgstr "输入和输出的记录使用 NUL 字符终结"
3340 #: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
3341 msgid "suppress progress reporting"
3344 #: builtin/check-ignore.c:26
3345 msgid "show non-matching input paths"
3348 #: builtin/check-ignore.c:28
3349 msgid "ignore index when checking"
3352 #: builtin/check-ignore.c:154
3353 msgid "cannot specify pathnames with --stdin"
3354 msgstr "不能同时提供路径及 --stdin 参数"
3356 #: builtin/check-ignore.c:157
3357 msgid "-z only makes sense with --stdin"
3358 msgstr "-z 需要和 --stdin 参数共用才有意义"
3360 #: builtin/check-ignore.c:159
3361 msgid "no path specified"
3364 #: builtin/check-ignore.c:163
3365 msgid "--quiet is only valid with a single pathname"
3366 msgstr "参数 --quiet 只在提供一个路径名时有效"
3368 #: builtin/check-ignore.c:165
3369 msgid "cannot have both --quiet and --verbose"
3370 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3372 #: builtin/check-ignore.c:168
3373 msgid "--non-matching is only valid with --verbose"
3374 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3376 #: builtin/check-mailmap.c:8
3377 msgid "git check-mailmap [<options>] <contact>..."
3378 msgstr "git check-mailmap [<选项>] <联系地址>..."
3380 #: builtin/check-mailmap.c:13
3381 msgid "also read contacts from stdin"
3382 msgstr "还从标准输入读取联系地址"
3384 #: builtin/check-mailmap.c:24
3386 msgid "unable to parse contact: %s"
3387 msgstr "不能解析联系地址:%s"
3389 #: builtin/check-mailmap.c:47
3390 msgid "no contacts specified"
3393 #: builtin/checkout-index.c:126
3394 msgid "git checkout-index [<options>] [--] [<file>...]"
3395 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3397 #: builtin/checkout-index.c:188
3398 msgid "check out all files in the index"
3401 #: builtin/checkout-index.c:189
3402 msgid "force overwrite of existing files"
3405 #: builtin/checkout-index.c:191
3406 msgid "no warning for existing files and files not in index"
3407 msgstr "存在或不在索引中的文件都没有警告"
3409 #: builtin/checkout-index.c:193
3410 msgid "don't checkout new files"
3413 #: builtin/checkout-index.c:195
3414 msgid "update stat information in the index file"
3415 msgstr "更新索引中文件的状态信息"
3417 #: builtin/checkout-index.c:201
3418 msgid "read list of paths from the standard input"
3419 msgstr "从标准输入读取路径列表"
3421 #: builtin/checkout-index.c:203
3422 msgid "write the content to temporary files"
3425 #: builtin/checkout-index.c:204 builtin/column.c:30
3429 #: builtin/checkout-index.c:205
3430 msgid "when creating files, prepend <string>"
3431 msgstr "在创建文件时,在前面加上<字符串>"
3433 #: builtin/checkout-index.c:208
3434 msgid "copy out the files from named stage"
3435 msgstr "从指定暂存区中拷出文件"
3437 #: builtin/checkout.c:26
3438 msgid "git checkout [<options>] <branch>"
3439 msgstr "git checkout [<选项>] <分支>"
3441 #: builtin/checkout.c:27
3442 msgid "git checkout [<options>] [<branch>] -- <file>..."
3443 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3445 #: builtin/checkout.c:138 builtin/checkout.c:171
3447 msgid "path '%s' does not have our version"
3448 msgstr "路径 '%s' 没有我们的版本"
3450 #: builtin/checkout.c:140 builtin/checkout.c:173
3452 msgid "path '%s' does not have their version"
3453 msgstr "路径 '%s' 没有他们的版本"
3455 #: builtin/checkout.c:156
3457 msgid "path '%s' does not have all necessary versions"
3458 msgstr "路径 '%s' 没有全部必须的版本"
3460 #: builtin/checkout.c:200
3462 msgid "path '%s' does not have necessary versions"
3463 msgstr "路径 '%s' 没有必须的版本"
3465 #: builtin/checkout.c:217
3467 msgid "path '%s': cannot merge"
3468 msgstr "path '%s':无法合并"
3470 #: builtin/checkout.c:234
3472 msgid "Unable to add merge result for '%s'"
3473 msgstr "无法为 '%s' 添加合并结果"
3475 #: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
3476 #: builtin/checkout.c:264 builtin/checkout.c:277
3478 msgid "'%s' cannot be used with updating paths"
3479 msgstr "'%s' 不能在更新路径时使用"
3481 #: builtin/checkout.c:267 builtin/checkout.c:270
3483 msgid "'%s' cannot be used with %s"
3484 msgstr "'%s' 不能和 %s 同时使用"
3486 #: builtin/checkout.c:273
3488 msgid "Cannot update paths and switch to branch '%s' at the same time."
3489 msgstr "不能同时更新路径并切换到分支'%s'。"
3491 #: builtin/checkout.c:287 builtin/checkout.c:481
3492 msgid "corrupt index file"
3495 #: builtin/checkout.c:347 builtin/checkout.c:354
3497 msgid "path '%s' is unmerged"
3498 msgstr "路径 '%s' 未合并"
3500 #: builtin/checkout.c:503
3501 msgid "you need to resolve your current index first"
3502 msgstr "您需要先解决当前索引的冲突"
3504 #: builtin/checkout.c:634
3506 msgid "Can not do reflog for '%s'\n"
3507 msgstr "不能对 '%s' 执行 reflog 操作\n"
3509 #: builtin/checkout.c:670
3510 msgid "HEAD is now at"
3513 #: builtin/checkout.c:677
3515 msgid "Reset branch '%s'\n"
3516 msgstr "重置分支 '%s'\n"
3518 #: builtin/checkout.c:680
3520 msgid "Already on '%s'\n"
3521 msgstr "已经位于 '%s'\n"
3523 #: builtin/checkout.c:684
3525 msgid "Switched to and reset branch '%s'\n"
3526 msgstr "切换并重置分支 '%s'\n"
3528 #: builtin/checkout.c:686 builtin/checkout.c:1285
3530 msgid "Switched to a new branch '%s'\n"
3531 msgstr "切换到一个新分支 '%s'\n"
3533 #: builtin/checkout.c:688
3535 msgid "Switched to branch '%s'\n"
3536 msgstr "切换到分支 '%s'\n"
3539 #: builtin/checkout.c:740
3541 msgid " ... and %d more.\n"
3542 msgstr " ... 及其它 %d 个。\n"
3544 #: builtin/checkout.c:746
3547 "Warning: you are leaving %d commit behind, not connected to\n"
3548 "any of your branches:\n"
3552 "Warning: you are leaving %d commits behind, not connected to\n"
3553 "any of your branches:\n"
3557 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3561 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3565 #: builtin/checkout.c:765
3568 "If you want to keep it by creating a new branch, this may be a good time\n"
3571 " git branch <new-branch-name> %s\n"
3574 "If you want to keep them by creating a new branch, this may be a good time\n"
3577 " git branch <new-branch-name> %s\n"
3580 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3583 " git branch <新分支名> %s\n"
3586 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
3589 " git branch <新分支名> %s\n"
3592 #: builtin/checkout.c:801
3593 msgid "internal error in revision walk"
3594 msgstr "在版本遍历时遇到内部错误"
3596 #: builtin/checkout.c:805
3597 msgid "Previous HEAD position was"
3598 msgstr "之前的 HEAD 位置是"
3600 #: builtin/checkout.c:832 builtin/checkout.c:1280
3601 msgid "You are on a branch yet to be born"
3602 msgstr "您位于一个尚未初始化的分支"
3604 #: builtin/checkout.c:893
3605 msgid "no branch specified"
3608 #: builtin/checkout.c:895
3610 msgid "'%s' already exists"
3613 #: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
3614 #: builtin/clone.c:853
3616 msgid "could not create leading directories of '%s'"
3617 msgstr "不能为 '%s' 创建先导目录"
3619 #: builtin/checkout.c:924
3621 msgid "could not create directory of '%s'"
3622 msgstr "不能创建目录 '%s'"
3624 #: builtin/checkout.c:960
3626 msgid "Enter %s (identifier %s)"
3627 msgstr "输入 %s (标识符 %s)"
3629 #: builtin/checkout.c:1070
3631 msgid "'%s' is already checked out at '%s'"
3632 msgstr "'%s' 已经检出到 '%s'"
3634 #: builtin/checkout.c:1176
3636 msgid "only one reference expected, %d given."
3637 msgstr "只要一个引用,却给出了 %d 个"
3639 #: builtin/checkout.c:1215
3641 msgid "invalid reference: %s"
3644 #: builtin/checkout.c:1255
3646 msgid "reference is not a tree: %s"
3649 #: builtin/checkout.c:1294
3650 msgid "paths cannot be used with switching branches"
3651 msgstr "路径不能和切换分支同时使用"
3653 #: builtin/checkout.c:1297 builtin/checkout.c:1301
3655 msgid "'%s' cannot be used with switching branches"
3656 msgstr "'%s' 不能和切换分支同时使用"
3658 #: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
3659 #: builtin/checkout.c:1316
3661 msgid "'%s' cannot be used with '%s'"
3662 msgstr "'%s' 不能和 '%s' 同时使用"
3664 #: builtin/checkout.c:1321
3666 msgid "Cannot switch branch to a non-commit '%s'"
3667 msgstr "不能切换分支到一个非提交 '%s'"
3669 #: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
3670 #: builtin/remote.c:159 builtin/remote.c:161
3674 #: builtin/checkout.c:1347
3675 msgid "create and checkout a new branch"
3676 msgstr "创建并检出一个新的分支"
3678 #: builtin/checkout.c:1349
3679 msgid "create/reset and checkout a branch"
3680 msgstr "创建/重置并检出一个分支"
3682 #: builtin/checkout.c:1350
3683 msgid "create reflog for new branch"
3684 msgstr "为新的分支创建引用日志"
3686 #: builtin/checkout.c:1351
3687 msgid "detach the HEAD at named commit"
3688 msgstr "成为指向该提交的分离头指针"
3690 #: builtin/checkout.c:1352
3691 msgid "set upstream info for new branch"
3692 msgstr "为新的分支设置上游信息"
3694 #: builtin/checkout.c:1354
3698 #: builtin/checkout.c:1354
3699 msgid "new unparented branch"
3702 #: builtin/checkout.c:1355
3703 msgid "checkout our version for unmerged files"
3704 msgstr "对尚未合并的文件检出我们的版本"
3706 #: builtin/checkout.c:1357
3707 msgid "checkout their version for unmerged files"
3708 msgstr "对尚未合并的文件检出他们的版本"
3710 #: builtin/checkout.c:1359
3711 msgid "force checkout (throw away local modifications)"
3712 msgstr "强制检出(丢弃本地修改)"
3714 #: builtin/checkout.c:1360
3715 msgid "perform a 3-way merge with the new branch"
3716 msgstr "和新的分支执行三路合并"
3718 #: builtin/checkout.c:1361 builtin/merge.c:227
3719 msgid "update ignored files (default)"
3720 msgstr "更新忽略的文件(默认)"
3722 #: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
3726 #: builtin/checkout.c:1363
3727 msgid "conflict style (merge or diff3)"
3728 msgstr "冲突输出风格(merge 或 diff3)"
3730 #: builtin/checkout.c:1366
3731 msgid "do not limit pathspecs to sparse entries only"
3732 msgstr "对路径不做稀疏检出的限制"
3734 #: builtin/checkout.c:1368
3735 msgid "second guess 'git checkout <no-such-branch>'"
3736 msgstr "二次猜测'git checkout <无此分支>'"
3738 #: builtin/checkout.c:1370
3739 msgid "check a branch out in a separate working directory"
3740 msgstr "检出一个分支到单独的工作目录"
3742 #: builtin/checkout.c:1372
3743 msgid "do not check if another worktree is holding the given ref"
3744 msgstr "不检查指定的引用是否被其他工作区所占用"
3746 #: builtin/checkout.c:1406
3747 msgid "-b, -B and --orphan are mutually exclusive"
3748 msgstr "-b、-B 和 --orphan 是互斥的"
3750 #: builtin/checkout.c:1423
3751 msgid "--track needs a branch name"
3752 msgstr "--track 需要一个分支名"
3754 #: builtin/checkout.c:1428
3755 msgid "Missing branch name; try -b"
3756 msgstr "缺少分支名;尝试 -b"
3758 #: builtin/checkout.c:1464
3759 msgid "invalid path specification"
3762 #: builtin/checkout.c:1471
3765 "Cannot update paths and switch to branch '%s' at the same time.\n"
3766 "Did you intend to checkout '%s' which can not be resolved as commit?"
3768 "不能同时更新路径并切换到分支'%s'。\n"
3769 "您是想要检出 '%s' 但其未能解析为提交么?"
3771 #: builtin/checkout.c:1476
3773 msgid "git checkout: --detach does not take a path argument '%s'"
3774 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3776 #: builtin/checkout.c:1480
3778 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3779 "checking out of the index."
3781 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3783 #: builtin/clean.c:26
3785 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3787 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3789 #: builtin/clean.c:30
3791 msgid "Removing %s\n"
3794 #: builtin/clean.c:31
3796 msgid "Would remove %s\n"
3799 #: builtin/clean.c:32
3801 msgid "Skipping repository %s\n"
3804 #: builtin/clean.c:33
3806 msgid "Would skip repository %s\n"
3807 msgstr "将忽略版本库 %s\n"
3809 #: builtin/clean.c:34
3811 msgid "failed to remove %s"
3814 #: builtin/clean.c:295
3817 "1 - select a numbered item\n"
3818 "foo - select item based on unique prefix\n"
3819 " - (empty) select nothing"
3823 "foo - 通过标题选择一个选项\n"
3826 #: builtin/clean.c:299
3829 "1 - select a single item\n"
3830 "3-5 - select a range of items\n"
3831 "2-3,6-9 - select multiple ranges\n"
3832 "foo - select item based on unique prefix\n"
3833 "-... - unselect specified items\n"
3834 "* - choose all items\n"
3835 " - (empty) finish selecting"
3839 "3-5 - 选择一个范围内的所有选项\n"
3840 "2-3,6-9 - 选择多个范围内的所有选项\n"
3841 "foo - 通过标题选择一个选项\n"
3846 #: builtin/clean.c:515
3851 #: builtin/clean.c:657
3853 msgid "Input ignore patterns>> "
3854 msgstr "输入模版以排除条目>> "
3856 #: builtin/clean.c:694
3858 msgid "WARNING: Cannot find items matched by: %s"
3859 msgstr "警告:无法找到和 %s 匹配的条目"
3861 #: builtin/clean.c:715
3862 msgid "Select items to delete"
3865 #. TRANSLATORS: Make sure to keep [y/N] as is
3866 #: builtin/clean.c:756
3868 msgid "Remove %s [y/N]? "
3869 msgstr "删除 %s [y/N]?"
3871 #: builtin/clean.c:781
3875 #: builtin/clean.c:789
3877 "clean - start cleaning\n"
3878 "filter by pattern - exclude items from deletion\n"
3879 "select by numbers - select items to be deleted by numbers\n"
3880 "ask each - confirm each deletion (like \"rm -i\")\n"
3881 "quit - stop cleaning\n"
3882 "help - this screen\n"
3883 "? - help for prompt selection"
3886 "filter by pattern - 通过模版排除要删除的条目\n"
3887 "select by numbers - 通过数字选择要删除的条目\n"
3888 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3891 "? - 显示如何在提示符下选择的帮助"
3893 #: builtin/clean.c:816
3894 msgid "*** Commands ***"
3897 #: builtin/clean.c:817
3901 #: builtin/clean.c:825
3902 msgid "Would remove the following item:"
3903 msgid_plural "Would remove the following items:"
3904 msgstr[0] "将删除如下条目:"
3905 msgstr[1] "将删除如下条目:"
3907 #: builtin/clean.c:842
3908 msgid "No more files to clean, exiting."
3909 msgstr "没有要清理的文件,退出。"
3911 #: builtin/clean.c:873
3912 msgid "do not print names of files removed"
3915 #: builtin/clean.c:875
3919 #: builtin/clean.c:876
3920 msgid "interactive cleaning"
3923 #: builtin/clean.c:878
3924 msgid "remove whole directories"
3927 #: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
3928 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
3932 #: builtin/clean.c:880
3933 msgid "add <pattern> to ignore rules"
3934 msgstr "添加<模式>到忽略规则"
3936 #: builtin/clean.c:881
3937 msgid "remove ignored files, too"
3940 #: builtin/clean.c:883
3941 msgid "remove only ignored files"
3944 #: builtin/clean.c:901
3945 msgid "-x and -X cannot be used together"
3946 msgstr "-x 和 -X 不能同时使用"
3948 #: builtin/clean.c:905
3950 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3953 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3955 #: builtin/clean.c:908
3957 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3960 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3962 #: builtin/clone.c:37
3963 msgid "git clone [<options>] [--] <repo> [<dir>]"
3964 msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
3966 #: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
3967 #: builtin/push.c:523
3968 msgid "force progress reporting"
3971 #: builtin/clone.c:59
3972 msgid "don't create a checkout"
3975 #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
3976 msgid "create a bare repository"
3979 #: builtin/clone.c:64
3980 msgid "create a mirror repository (implies bare)"
3981 msgstr "创建一个镜像版本库(也是纯版本库)"
3983 #: builtin/clone.c:66
3984 msgid "to clone from a local repository"
3987 #: builtin/clone.c:68
3988 msgid "don't use local hardlinks, always copy"
3989 msgstr "不使用本地硬链接,始终复制"
3991 #: builtin/clone.c:70
3992 msgid "setup as shared repository"
3995 #: builtin/clone.c:72 builtin/clone.c:74
3996 msgid "initialize submodules in the clone"
3999 #: builtin/clone.c:75 builtin/init-db.c:500
4000 msgid "template-directory"
4003 #: builtin/clone.c:76 builtin/init-db.c:501
4004 msgid "directory from which templates will be used"
4007 #: builtin/clone.c:78
4008 msgid "reference repository"
4011 #: builtin/clone.c:80
4012 msgid "use --reference only while cloning"
4013 msgstr "仅在克隆时参考 --reference 指向的本地版本库"
4015 #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
4019 #: builtin/clone.c:82
4020 msgid "use <name> instead of 'origin' to track upstream"
4021 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
4023 #: builtin/clone.c:84
4024 msgid "checkout <branch> instead of the remote's HEAD"
4025 msgstr "检出<分支>而不是远程HEAD"
4027 #: builtin/clone.c:86
4028 msgid "path to git-upload-pack on the remote"
4029 msgstr "远程 git-upload-pack 路径"
4031 #: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
4035 #: builtin/clone.c:88
4036 msgid "create a shallow clone of that depth"
4037 msgstr "创建一个指定深度的浅克隆"
4039 #: builtin/clone.c:90
4040 msgid "clone only one branch, HEAD or --branch"
4041 msgstr "只克隆一个分支、HEAD 或 --branch"
4043 #: builtin/clone.c:91 builtin/init-db.c:509
4047 #: builtin/clone.c:92 builtin/init-db.c:510
4048 msgid "separate git dir from working tree"
4049 msgstr "git目录和工作区分离"
4051 #: builtin/clone.c:93
4055 #: builtin/clone.c:94
4056 msgid "set config inside the new repository"
4057 msgstr "在新版本库中设置配置信息"
4059 #: builtin/clone.c:247
4061 msgid "reference repository '%s' is not a local repository."
4062 msgstr "参考版本库 '%s' 不是一个本地版本库。"
4064 #: builtin/clone.c:251
4066 msgid "reference repository '%s' is shallow"
4067 msgstr "参考版本库 '%s' 是一个浅克隆"
4069 #: builtin/clone.c:254
4071 msgid "reference repository '%s' is grafted"
4072 msgstr "参考版本库 '%s' 已被嫁接"
4074 #: builtin/clone.c:317
4076 msgid "failed to create directory '%s'"
4077 msgstr "无法创建目录 '%s'"
4079 #: builtin/clone.c:319 builtin/diff.c:84
4081 msgid "failed to stat '%s'"
4082 msgstr "无法枚举 '%s' 状态"
4084 #: builtin/clone.c:321
4086 msgid "%s exists and is not a directory"
4087 msgstr "%s 存在且不是一个目录"
4089 #: builtin/clone.c:335
4091 msgid "failed to stat %s\n"
4092 msgstr "无法枚举 %s 状态\n"
4094 #: builtin/clone.c:357
4096 msgid "failed to create link '%s'"
4097 msgstr "无法创建链接 '%s'"
4099 #: builtin/clone.c:361
4101 msgid "failed to copy file to '%s'"
4102 msgstr "无法拷贝文件至 '%s'"
4104 #: builtin/clone.c:384 builtin/clone.c:558
4109 #: builtin/clone.c:396
4111 "Clone succeeded, but checkout failed.\n"
4112 "You can inspect what was checked out with 'git status'\n"
4113 "and retry the checkout with 'git checkout -f HEAD'\n"
4116 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4117 "'git checkout -f HEAD' 重试\n"
4119 #: builtin/clone.c:473
4121 msgid "Could not find remote branch %s to clone."
4122 msgstr "不能发现要克隆的远程分支 %s。"
4124 #: builtin/clone.c:553
4126 msgid "Checking connectivity... "
4129 #: builtin/clone.c:556
4130 msgid "remote did not send all necessary objects"
4131 msgstr "远程没有发送所有必须的对象"
4133 #: builtin/clone.c:620
4134 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4135 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4137 #: builtin/clone.c:651
4138 msgid "unable to checkout working tree"
4141 #: builtin/clone.c:738
4142 msgid "cannot repack to clean up"
4143 msgstr "无法执行 repack 来清理"
4145 #: builtin/clone.c:740
4146 msgid "cannot unlink temporary alternates file"
4147 msgstr "无法删除临时的 alternates 文件"
4149 #: builtin/clone.c:770
4150 msgid "Too many arguments."
4153 #: builtin/clone.c:774
4154 msgid "You must specify a repository to clone."
4155 msgstr "您必须指定一个版本库来克隆。"
4157 #: builtin/clone.c:785
4159 msgid "--bare and --origin %s options are incompatible."
4160 msgstr "--bare 和 --origin %s 选项不兼容。"
4162 #: builtin/clone.c:788
4163 msgid "--bare and --separate-git-dir are incompatible."
4164 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4166 #: builtin/clone.c:801
4168 msgid "repository '%s' does not exist"
4169 msgstr "版本库 '%s' 不存在"
4171 #: builtin/clone.c:807 builtin/fetch.c:1160
4173 msgid "depth %s is not a positive number"
4174 msgstr "深度 %s 不是一个正数"
4176 #: builtin/clone.c:817
4178 msgid "destination path '%s' already exists and is not an empty directory."
4179 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4181 #: builtin/clone.c:827
4183 msgid "working tree '%s' already exists."
4184 msgstr "工作区 '%s' 已经存在。"
4186 #: builtin/clone.c:845
4188 msgid "could not create work tree dir '%s'"
4189 msgstr "不能创建工作区目录 '%s'"
4191 #: builtin/clone.c:863
4193 msgid "Cloning into bare repository '%s'...\n"
4194 msgstr "克隆到纯版本库 '%s'...\n"
4196 #: builtin/clone.c:865
4198 msgid "Cloning into '%s'...\n"
4199 msgstr "正克隆到 '%s'...\n"
4201 #: builtin/clone.c:890
4202 msgid "--dissociate given, but there is no --reference"
4203 msgstr "提供了参数 --dissociate,但未提供 --reference"
4205 #: builtin/clone.c:907
4206 msgid "--depth is ignored in local clones; use file:// instead."
4207 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4209 #: builtin/clone.c:910
4210 msgid "source repository is shallow, ignoring --local"
4211 msgstr "源版本库是浅克隆,忽略 --local"
4213 #: builtin/clone.c:915
4214 msgid "--local is ignored"
4215 msgstr "--local 被忽略"
4217 #: builtin/clone.c:919
4219 msgid "Don't know how to clone %s"
4222 #: builtin/clone.c:968 builtin/clone.c:976
4224 msgid "Remote branch %s not found in upstream %s"
4225 msgstr "远程分支 %s 在上游 %s 未发现"
4227 #: builtin/clone.c:979
4228 msgid "You appear to have cloned an empty repository."
4229 msgstr "您似乎克隆了一个空版本库。"
4231 #: builtin/column.c:9
4232 msgid "git column [<options>]"
4233 msgstr "git column [<选项>]"
4235 #: builtin/column.c:26
4236 msgid "lookup config vars"
4239 #: builtin/column.c:27 builtin/column.c:28
4240 msgid "layout to use"
4243 #: builtin/column.c:29
4244 msgid "Maximum width"
4247 #: builtin/column.c:30
4248 msgid "Padding space on left border"
4251 #: builtin/column.c:31
4252 msgid "Padding space on right border"
4255 #: builtin/column.c:32
4256 msgid "Padding space between columns"
4259 #: builtin/column.c:51
4260 msgid "--command must be the first argument"
4261 msgstr "--command 必须是第一个参数"
4263 #: builtin/commit.c:37
4264 msgid "git commit [<options>] [--] <pathspec>..."
4265 msgstr "git commit [<选项>] [--] <路径规则>..."
4267 #: builtin/commit.c:42
4268 msgid "git status [<options>] [--] <pathspec>..."
4269 msgstr "git status [<选项>] [--] <路径规则>..."
4271 #: builtin/commit.c:47
4273 "Your name and email address were configured automatically based\n"
4274 "on your username and hostname. Please check that they are accurate.\n"
4275 "You can suppress this message by setting them explicitly. Run the\n"
4276 "following command and follow the instructions in your editor to edit\n"
4277 "your configuration file:\n"
4279 " git config --global --edit\n"
4281 "After doing this, you may fix the identity used for this commit with:\n"
4283 " git commit --amend --reset-author\n"
4285 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4286 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4289 " git config --global --edit\n"
4291 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4293 " git commit --amend --reset-author\n"
4295 #: builtin/commit.c:60
4297 "Your name and email address were configured automatically based\n"
4298 "on your username and hostname. Please check that they are accurate.\n"
4299 "You can suppress this message by setting them explicitly:\n"
4301 " git config --global user.name \"Your Name\"\n"
4302 " git config --global user.email you@example.com\n"
4304 "After doing this, you may fix the identity used for this commit with:\n"
4306 " git commit --amend --reset-author\n"
4308 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4309 "与否。您可以对其进行设置以免再出现本提示信息:\n"
4311 " git config --global user.name \"Your Name\"\n"
4312 " git config --global user.email you@example.com\n"
4314 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4316 " git commit --amend --reset-author\n"
4318 #: builtin/commit.c:72
4320 "You asked to amend the most recent commit, but doing so would make\n"
4321 "it empty. You can repeat your command with --allow-empty, or you can\n"
4322 "remove the commit entirely with \"git reset HEAD^\".\n"
4324 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4325 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4327 #: builtin/commit.c:77
4329 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4330 "If you wish to commit it anyway, use:\n"
4332 " git commit --allow-empty\n"
4335 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4338 " git commit --allow-empty\n"
4341 #: builtin/commit.c:84
4342 msgid "Otherwise, please use 'git reset'\n"
4343 msgstr "否则,请使用命令 'git reset'\n"
4345 #: builtin/commit.c:87
4347 "If you wish to skip this commit, use:\n"
4351 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4352 "the remaining commits.\n"
4354 "如果您想跳过这个提交,使用命令:\n"
4358 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4361 #: builtin/commit.c:304
4362 msgid "failed to unpack HEAD tree object"
4363 msgstr "无法解包 HEAD 树对象"
4365 #: builtin/commit.c:344
4366 msgid "unable to create temporary index"
4369 #: builtin/commit.c:350
4370 msgid "interactive add failed"
4373 #: builtin/commit.c:361
4374 msgid "unable to write index file"
4377 #: builtin/commit.c:363
4378 msgid "unable to update temporary index"
4381 #: builtin/commit.c:365
4382 msgid "Failed to update main cache tree"
4385 #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4386 msgid "unable to write new_index file"
4387 msgstr "无法写 new_index 文件"
4389 #: builtin/commit.c:445
4390 msgid "cannot do a partial commit during a merge."
4391 msgstr "在合并过程中不能做部分提交。"
4393 #: builtin/commit.c:447
4394 msgid "cannot do a partial commit during a cherry-pick."
4395 msgstr "在拣选过程中不能做部分提交。"
4397 #: builtin/commit.c:456
4398 msgid "cannot read the index"
4401 #: builtin/commit.c:475
4402 msgid "unable to write temporary index file"
4405 #: builtin/commit.c:580
4407 msgid "commit '%s' lacks author header"
4408 msgstr "提交 '%s' 缺少作者信息"
4410 #: builtin/commit.c:582
4412 msgid "commit '%s' has malformed author line"
4413 msgstr "提交 '%s' 有非法的作者信息"
4415 #: builtin/commit.c:601
4416 msgid "malformed --author parameter"
4417 msgstr "非法的 --author 参数"
4419 #: builtin/commit.c:609
4421 msgid "invalid date format: %s"
4424 #: builtin/commit.c:653
4426 "unable to select a comment character that is not used\n"
4427 "in the current commit message"
4428 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4430 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4432 msgid "could not lookup commit %s"
4435 #: builtin/commit.c:702 builtin/shortlog.c:273
4437 msgid "(reading log message from standard input)\n"
4438 msgstr "(正从标准输入中读取日志信息)\n"
4440 #: builtin/commit.c:704
4441 msgid "could not read log from standard input"
4442 msgstr "不能从标准输入中读取日志信息"
4444 #: builtin/commit.c:708
4446 msgid "could not read log file '%s'"
4447 msgstr "不能读取日志文件 '%s'"
4449 #: builtin/commit.c:730
4450 msgid "could not read MERGE_MSG"
4451 msgstr "不能读取 MERGE_MSG"
4453 #: builtin/commit.c:734
4454 msgid "could not read SQUASH_MSG"
4455 msgstr "不能读取 SQUASH_MSG"
4457 #: builtin/commit.c:738 builtin/merge.c:1079
4459 msgid "could not read '%s'"
4462 #: builtin/commit.c:785
4463 msgid "could not write commit template"
4466 #: builtin/commit.c:803
4470 "It looks like you may be committing a merge.\n"
4471 "If this is not correct, please remove the file\n"
4476 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4480 #: builtin/commit.c:808
4484 "It looks like you may be committing a cherry-pick.\n"
4485 "If this is not correct, please remove the file\n"
4490 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4494 #: builtin/commit.c:821
4497 "Please enter the commit message for your changes. Lines starting\n"
4498 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4500 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4503 #: builtin/commit.c:828
4506 "Please enter the commit message for your changes. Lines starting\n"
4507 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4508 "An empty message aborts the commit.\n"
4510 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4511 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4513 # 译者:为保证在输出中对齐,注意调整句中空格!
4514 #: builtin/commit.c:848
4516 msgid "%sAuthor: %.*s <%.*s>"
4517 msgstr "%s作者: %.*s <%.*s>"
4519 # 译者:为保证在输出中对齐,注意调整句中空格!
4520 #: builtin/commit.c:856
4525 # 译者:为保证在输出中对齐,注意调整句中空格!
4526 #: builtin/commit.c:863
4528 msgid "%sCommitter: %.*s <%.*s>"
4529 msgstr "%s提交者:%.*s <%.*s>"
4531 #: builtin/commit.c:881
4532 msgid "Cannot read index"
4535 #: builtin/commit.c:938
4536 msgid "Error building trees"
4539 #: builtin/commit.c:953 builtin/tag.c:495
4541 msgid "Please supply the message using either -m or -F option.\n"
4542 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4544 #: builtin/commit.c:1055
4546 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4547 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4549 #: builtin/commit.c:1070 builtin/commit.c:1310
4551 msgid "Invalid untracked files mode '%s'"
4552 msgstr "无效的未追踪文件参数 '%s'"
4554 #: builtin/commit.c:1107
4555 msgid "--long and -z are incompatible"
4556 msgstr "--long 和 -z 选项不兼容"
4558 #: builtin/commit.c:1137
4559 msgid "Using both --reset-author and --author does not make sense"
4560 msgstr "同时使用 --reset-author 和 --author 没有意义"
4562 #: builtin/commit.c:1146
4563 msgid "You have nothing to amend."
4566 #: builtin/commit.c:1149
4567 msgid "You are in the middle of a merge -- cannot amend."
4568 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4570 #: builtin/commit.c:1151
4571 msgid "You are in the middle of a cherry-pick -- cannot amend."
4572 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4574 #: builtin/commit.c:1154
4575 msgid "Options --squash and --fixup cannot be used together"
4576 msgstr "选项 --squash 和 --fixup 不能同时使用"
4578 #: builtin/commit.c:1164
4579 msgid "Only one of -c/-C/-F/--fixup can be used."
4580 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4582 #: builtin/commit.c:1166
4583 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4584 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4586 #: builtin/commit.c:1174
4587 msgid "--reset-author can be used only with -C, -c or --amend."
4588 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4590 #: builtin/commit.c:1191
4591 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4592 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4594 #: builtin/commit.c:1193
4595 msgid "No paths with --include/--only does not make sense."
4596 msgstr "参数 --include/--only 不跟路径没有意义。"
4598 #: builtin/commit.c:1195
4599 msgid "Clever... amending the last one with dirty index."
4600 msgstr "聪明... 在索引不干净下修补最后的提交。"
4602 #: builtin/commit.c:1197
4603 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4604 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4606 #: builtin/commit.c:1209 builtin/tag.c:728
4608 msgid "Invalid cleanup mode %s"
4611 #: builtin/commit.c:1214
4612 msgid "Paths with -a does not make sense."
4613 msgstr "路径和 -a 选项同时使用没有意义。"
4615 #: builtin/commit.c:1324 builtin/commit.c:1603
4616 msgid "show status concisely"
4619 #: builtin/commit.c:1326 builtin/commit.c:1605
4620 msgid "show branch information"
4623 #: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
4624 msgid "machine-readable output"
4627 #: builtin/commit.c:1331 builtin/commit.c:1609
4628 msgid "show status in long format (default)"
4629 msgstr "以长格式显示状态(默认)"
4631 #: builtin/commit.c:1334 builtin/commit.c:1612
4632 msgid "terminate entries with NUL"
4635 #: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
4636 #: builtin/fast-export.c:983 builtin/tag.c:603
4640 #: builtin/commit.c:1337 builtin/commit.c:1615
4641 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4642 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4644 #: builtin/commit.c:1340
4645 msgid "show ignored files"
4648 #: builtin/commit.c:1341 parse-options.h:152
4652 #: builtin/commit.c:1342
4654 "ignore changes to submodules, optional when: all, dirty, untracked. "
4657 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4659 #: builtin/commit.c:1344
4660 msgid "list untracked files in columns"
4661 msgstr "以列的方式显示未跟踪的文件"
4663 #: builtin/commit.c:1430
4664 msgid "couldn't look up newly created commit"
4667 #: builtin/commit.c:1432
4668 msgid "could not parse newly created commit"
4671 #: builtin/commit.c:1477
4672 msgid "detached HEAD"
4675 # 译者:中文字符串拼接,可删除前导空格
4676 #: builtin/commit.c:1480
4677 msgid " (root-commit)"
4680 #: builtin/commit.c:1573
4681 msgid "suppress summary after successful commit"
4682 msgstr "提交成功后不显示概述信息"
4684 #: builtin/commit.c:1574
4685 msgid "show diff in commit message template"
4686 msgstr "在提交说明模板里显示差异"
4688 #: builtin/commit.c:1576
4689 msgid "Commit message options"
4692 #: builtin/commit.c:1577 builtin/tag.c:601
4693 msgid "read message from file"
4696 #: builtin/commit.c:1578
4700 #: builtin/commit.c:1578
4701 msgid "override author for commit"
4704 #: builtin/commit.c:1579 builtin/gc.c:280
4708 #: builtin/commit.c:1579
4709 msgid "override date for commit"
4712 #: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
4713 #: builtin/notes.c:554 builtin/tag.c:599
4717 #: builtin/commit.c:1580
4718 msgid "commit message"
4721 #: builtin/commit.c:1581
4722 msgid "reuse and edit message from specified commit"
4723 msgstr "重用并编辑指定提交的提交说明"
4725 #: builtin/commit.c:1582
4726 msgid "reuse message from specified commit"
4727 msgstr "重用指定提交的提交说明"
4729 #: builtin/commit.c:1583
4730 msgid "use autosquash formatted message to fixup specified commit"
4731 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4733 #: builtin/commit.c:1584
4734 msgid "use autosquash formatted message to squash specified commit"
4735 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4737 #: builtin/commit.c:1585
4738 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4739 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4741 #: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
4742 msgid "add Signed-off-by:"
4743 msgstr "添加 Signed-off-by: 签名"
4745 #: builtin/commit.c:1587
4746 msgid "use specified template file"
4749 #: builtin/commit.c:1588
4750 msgid "force edit of commit"
4753 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4754 #: builtin/commit.c:1589
4758 #: builtin/commit.c:1589 builtin/tag.c:604
4759 msgid "how to strip spaces and #comments from message"
4760 msgstr "设置如何删除提交说明里的空格和#注释"
4762 #: builtin/commit.c:1590
4763 msgid "include status in commit message template"
4764 msgstr "在提交说明模板里包含状态信息"
4766 #: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
4767 #: builtin/tag.c:605
4771 #: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
4772 msgid "GPG sign commit"
4775 #: builtin/commit.c:1595
4776 msgid "Commit contents options"
4779 #: builtin/commit.c:1596
4780 msgid "commit all changed files"
4783 #: builtin/commit.c:1597
4784 msgid "add specified files to index for commit"
4785 msgstr "添加指定的文件到索引区等待提交"
4787 #: builtin/commit.c:1598
4788 msgid "interactively add files"
4791 #: builtin/commit.c:1599
4792 msgid "interactively add changes"
4795 #: builtin/commit.c:1600
4796 msgid "commit only specified files"
4799 #: builtin/commit.c:1601
4800 msgid "bypass pre-commit hook"
4801 msgstr "绕过 pre-commit 钩子"
4803 #: builtin/commit.c:1602
4804 msgid "show what would be committed"
4807 #: builtin/commit.c:1613
4808 msgid "amend previous commit"
4811 #: builtin/commit.c:1614
4812 msgid "bypass post-rewrite hook"
4813 msgstr "绕过 post-rewrite 钩子"
4815 #: builtin/commit.c:1619
4816 msgid "ok to record an empty change"
4819 #: builtin/commit.c:1621
4820 msgid "ok to record a change with an empty message"
4823 #: builtin/commit.c:1650
4824 msgid "could not parse HEAD commit"
4825 msgstr "不能解析 HEAD 提交"
4827 #: builtin/commit.c:1689 builtin/merge.c:1076
4829 msgid "could not open '%s' for reading"
4830 msgstr "不能为读入打开 '%s'"
4832 #: builtin/commit.c:1696
4834 msgid "Corrupt MERGE_HEAD file (%s)"
4835 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4837 #: builtin/commit.c:1703
4838 msgid "could not read MERGE_MODE"
4839 msgstr "不能读取 MERGE_MODE"
4841 #: builtin/commit.c:1722
4843 msgid "could not read commit message: %s"
4844 msgstr "不能读取提交说明:%s"
4846 #: builtin/commit.c:1733
4848 msgid "Aborting commit; you did not edit the message.\n"
4849 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4851 #: builtin/commit.c:1738
4853 msgid "Aborting commit due to empty commit message.\n"
4854 msgstr "终止提交因为提交说明为空。\n"
4856 #: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
4857 msgid "failed to write commit object"
4860 #: builtin/commit.c:1786
4862 "Repository has been updated, but unable to write\n"
4863 "new_index file. Check that disk is not full and quota is\n"
4864 "not exceeded, and then \"git reset HEAD\" to recover."
4866 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4867 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4869 #: builtin/config.c:8
4870 msgid "git config [<options>]"
4871 msgstr "git config [<选项>]"
4873 #: builtin/config.c:53
4874 msgid "Config file location"
4877 #: builtin/config.c:54
4878 msgid "use global config file"
4881 #: builtin/config.c:55
4882 msgid "use system config file"
4885 #: builtin/config.c:56
4886 msgid "use repository config file"
4889 #: builtin/config.c:57
4890 msgid "use given config file"
4893 #: builtin/config.c:58
4897 #: builtin/config.c:58
4898 msgid "read config from given blob object"
4899 msgstr "从给定的数据对象读取配置"
4901 #: builtin/config.c:59
4905 #: builtin/config.c:60
4906 msgid "get value: name [value-regex]"
4907 msgstr "获取值:name [value-regex]"
4909 #: builtin/config.c:61
4910 msgid "get all values: key [value-regex]"
4911 msgstr "获得所有的值:key [value-regex]"
4913 #: builtin/config.c:62
4914 msgid "get values for regexp: name-regex [value-regex]"
4915 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4917 #: builtin/config.c:63
4918 msgid "get value specific for the URL: section[.var] URL"
4919 msgstr "获得 URL 取值:section[.var] URL"
4921 #: builtin/config.c:64
4922 msgid "replace all matching variables: name value [value_regex]"
4923 msgstr "替换所有匹配的变量:name value [value_regex]"
4925 #: builtin/config.c:65
4926 msgid "add a new variable: name value"
4927 msgstr "添加一个新的变量:name value"
4929 #: builtin/config.c:66
4930 msgid "remove a variable: name [value-regex]"
4931 msgstr "删除一个变量:name [value-regex]"
4933 #: builtin/config.c:67
4934 msgid "remove all matches: name [value-regex]"
4935 msgstr "删除所有匹配项:name [value-regex]"
4937 #: builtin/config.c:68
4938 msgid "rename section: old-name new-name"
4939 msgstr "重命名小节:old-name new-name"
4941 #: builtin/config.c:69
4942 msgid "remove a section: name"
4943 msgstr "删除一个小节:name"
4945 #: builtin/config.c:70
4949 #: builtin/config.c:71
4950 msgid "open an editor"
4953 #: builtin/config.c:72
4954 msgid "find the color configured: slot [default]"
4955 msgstr "获得配置的颜色:配置 [默认]"
4957 #: builtin/config.c:73
4958 msgid "find the color setting: slot [stdout-is-tty]"
4959 msgstr "获得颜色设置:配置 [stdout-is-tty]"
4961 #: builtin/config.c:74
4965 #: builtin/config.c:75
4966 msgid "value is \"true\" or \"false\""
4967 msgstr "值是 \"true\" 或 \"false\""
4969 #: builtin/config.c:76
4970 msgid "value is decimal number"
4973 #: builtin/config.c:77
4974 msgid "value is --bool or --int"
4975 msgstr "值是 --bool or --int"
4977 #: builtin/config.c:78
4978 msgid "value is a path (file or directory name)"
4979 msgstr "值是一个路径(文件或目录名)"
4981 #: builtin/config.c:79
4985 #: builtin/config.c:80
4986 msgid "terminate values with NUL byte"
4989 #: builtin/config.c:81
4990 msgid "respect include directives on lookup"
4991 msgstr "查询时参照 include 指令递归查找"
4993 #: builtin/config.c:316
4994 msgid "unable to parse default color value"
4997 #: builtin/config.c:457
5000 "# This is Git's per-user configuration file.\n"
5002 "# Please adapt and uncomment the following lines:\n"
5006 "# This is Git's per-user configuration file.\n"
5008 "# Please adapt and uncomment the following lines:\n"
5012 #: builtin/config.c:587
5014 msgid "cannot create configuration file %s"
5015 msgstr "不能创建配置文件 %s"
5017 #: builtin/count-objects.c:55
5018 msgid "git count-objects [-v] [-H | --human-readable]"
5019 msgstr "git count-objects [-v] [-H | --human-readable]"
5021 #: builtin/count-objects.c:65
5022 msgid "print sizes in human readable format"
5023 msgstr "以用户可读的格式显示大小"
5025 #: builtin/describe.c:17
5026 msgid "git describe [<options>] [<commit-ish>...]"
5027 msgstr "git describe [<选项>] [<提交号>...]"
5029 #: builtin/describe.c:18
5030 msgid "git describe [<options>] --dirty"
5031 msgstr "git describe [<选项>] --dirty"
5033 #: builtin/describe.c:217
5035 msgid "annotated tag %s not available"
5036 msgstr "注释 tag %s 无效"
5038 #: builtin/describe.c:221
5040 msgid "annotated tag %s has no embedded name"
5041 msgstr "注释 tag %s 没有嵌入名称"
5043 #: builtin/describe.c:223
5045 msgid "tag '%s' is really '%s' here"
5046 msgstr "tag '%s' 的确是在 '%s'"
5048 #: builtin/describe.c:250 builtin/log.c:452
5050 msgid "Not a valid object name %s"
5051 msgstr "不是一个有效的对象名 %s"
5053 #: builtin/describe.c:253
5055 msgid "%s is not a valid '%s' object"
5056 msgstr "%s 不是一个有效的 '%s' 对象"
5058 #: builtin/describe.c:270
5060 msgid "no tag exactly matches '%s'"
5061 msgstr "没有 tag 准确匹配 '%s'"
5063 #: builtin/describe.c:272
5065 msgid "searching to describe %s\n"
5068 #: builtin/describe.c:319
5070 msgid "finished search at %s\n"
5073 #: builtin/describe.c:346
5076 "No annotated tags can describe '%s'.\n"
5077 "However, there were unannotated tags: try --tags."
5079 "没有注释 tag 能描述 '%s'。\n"
5080 "然而,有非注释 tag:尝试 --tags。"
5082 #: builtin/describe.c:350
5085 "No tags can describe '%s'.\n"
5086 "Try --always, or create some tags."
5088 "没有注释 tag 能描述 '%s'。\n"
5089 "尝试 --always,或者创建一些 tag。"
5091 #: builtin/describe.c:371
5093 msgid "traversed %lu commits\n"
5094 msgstr "已遍历 %lu 个提交\n"
5096 #: builtin/describe.c:374
5099 "more than %i tags found; listed %i most recent\n"
5100 "gave up search at %s\n"
5102 "发现多于 %i 个 tag,列出最近的 %i 个\n"
5105 #: builtin/describe.c:396
5106 msgid "find the tag that comes after the commit"
5107 msgstr "寻找提交之后的 tag(用于描述提交)"
5109 #: builtin/describe.c:397
5110 msgid "debug search strategy on stderr"
5111 msgstr "在标准错误上调试搜索策略"
5113 #: builtin/describe.c:398
5117 #: builtin/describe.c:399
5118 msgid "use any tag, even unannotated"
5119 msgstr "使用任意 tag,即使未带注解"
5121 #: builtin/describe.c:400
5122 msgid "always use long format"
5125 #: builtin/describe.c:401
5126 msgid "only follow first parent"
5129 #: builtin/describe.c:404
5130 msgid "only output exact matches"
5133 #: builtin/describe.c:406
5134 msgid "consider <n> most recent tags (default: 10)"
5135 msgstr "考虑最近 <n> 个 tags(默认:10)"
5137 #: builtin/describe.c:408
5138 msgid "only consider tags matching <pattern>"
5139 msgstr "只考虑匹配 <模式> 的 tags"
5141 #: builtin/describe.c:410 builtin/name-rev.c:318
5142 msgid "show abbreviated commit object as fallback"
5143 msgstr "显示简写的提交号作为后备"
5145 #: builtin/describe.c:411
5149 #: builtin/describe.c:412
5150 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5151 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5153 #: builtin/describe.c:430
5154 msgid "--long is incompatible with --abbrev=0"
5155 msgstr "--long 与 --abbrev=0 不兼容"
5157 #: builtin/describe.c:456
5158 msgid "No names found, cannot describe anything."
5159 msgstr "没有发现名称,无法描述任何东西。"
5161 #: builtin/describe.c:476
5162 msgid "--dirty is incompatible with commit-ishes"
5163 msgstr "--dirty 不能与提交同时使用"
5165 #: builtin/diff.c:86
5167 msgid "'%s': not a regular file or symlink"
5168 msgstr "'%s':不是一个正规文件或符号链接"
5170 #: builtin/diff.c:237
5172 msgid "invalid option: %s"
5175 #: builtin/diff.c:358
5176 msgid "Not a git repository"
5177 msgstr "不是一个 git 版本库"
5179 #: builtin/diff.c:401
5181 msgid "invalid object '%s' given."
5182 msgstr "提供了无效对象 '%s'。"
5184 #: builtin/diff.c:410
5186 msgid "more than two blobs given: '%s'"
5187 msgstr "提供了超过两个数据(blob)对象:'%s'"
5189 #: builtin/diff.c:417
5191 msgid "unhandled object '%s' given."
5192 msgstr "无法处理的对象 '%s'。"
5194 #: builtin/fast-export.c:24
5195 msgid "git fast-export [rev-list-opts]"
5196 msgstr "git fast-export [rev-list-opts]"
5198 #: builtin/fast-export.c:979
5199 msgid "show progress after <n> objects"
5200 msgstr "在 <n> 个对象之后显示进度"
5202 #: builtin/fast-export.c:981
5203 msgid "select handling of signed tags"
5204 msgstr "选择如何处理签名 tags"
5206 #: builtin/fast-export.c:984
5207 msgid "select handling of tags that tag filtered objects"
5208 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5210 #: builtin/fast-export.c:987
5211 msgid "Dump marks to this file"
5214 #: builtin/fast-export.c:989
5215 msgid "Import marks from this file"
5218 #: builtin/fast-export.c:991
5219 msgid "Fake a tagger when tags lack one"
5220 msgstr "当 tags 缺少标记者字段时,假装提供一个"
5222 #: builtin/fast-export.c:993
5223 msgid "Output full tree for each commit"
5226 #: builtin/fast-export.c:995
5227 msgid "Use the done feature to terminate the stream"
5228 msgstr "使用 done 功能来终止流"
5230 #: builtin/fast-export.c:996
5231 msgid "Skip output of blob data"
5234 #: builtin/fast-export.c:997
5238 #: builtin/fast-export.c:998
5239 msgid "Apply refspec to exported refs"
5240 msgstr "对导出的引用应用引用表达式"
5242 #: builtin/fast-export.c:999
5243 msgid "anonymize output"
5246 #: builtin/fetch.c:19
5247 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5248 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5250 #: builtin/fetch.c:20
5251 msgid "git fetch [<options>] <group>"
5252 msgstr "git fetch [<选项>] <组>"
5254 #: builtin/fetch.c:21
5255 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5256 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5258 #: builtin/fetch.c:22
5259 msgid "git fetch --all [<options>]"
5260 msgstr "git fetch --all [<选项>]"
5262 #: builtin/fetch.c:89
5263 msgid "fetch from all remotes"
5266 #: builtin/fetch.c:91
5267 msgid "append to .git/FETCH_HEAD instead of overwriting"
5268 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5270 #: builtin/fetch.c:93
5271 msgid "path to upload pack on remote end"
5274 #: builtin/fetch.c:94
5275 msgid "force overwrite of local branch"
5278 #: builtin/fetch.c:96
5279 msgid "fetch from multiple remotes"
5282 #: builtin/fetch.c:98
5283 msgid "fetch all tags and associated objects"
5284 msgstr "抓取所有的 tags 和关联对象"
5286 #: builtin/fetch.c:100
5287 msgid "do not fetch all tags (--no-tags)"
5288 msgstr "不抓取任何 tags (--no-tags)"
5290 #: builtin/fetch.c:102
5291 msgid "prune remote-tracking branches no longer on remote"
5292 msgstr "清除远程已经不存在的分支的跟踪分支"
5295 #: builtin/fetch.c:103
5299 #: builtin/fetch.c:104
5300 msgid "control recursive fetching of submodules"
5303 #: builtin/fetch.c:108
5304 msgid "keep downloaded pack"
5307 #: builtin/fetch.c:110
5308 msgid "allow updating of HEAD ref"
5309 msgstr "允许更新 HEAD 引用"
5311 #: builtin/fetch.c:113
5312 msgid "deepen history of shallow clone"
5315 #: builtin/fetch.c:115
5316 msgid "convert to a complete repository"
5317 msgstr "转换为一个完整的版本库"
5319 #: builtin/fetch.c:117 builtin/log.c:1208
5323 #: builtin/fetch.c:118
5324 msgid "prepend this to submodule path output"
5325 msgstr "在子模组路径输出的前面加上此目录"
5327 #: builtin/fetch.c:121
5328 msgid "default mode for recursion"
5331 #: builtin/fetch.c:123
5332 msgid "accept refs that update .git/shallow"
5333 msgstr "接受更新 .git/shallow 的引用"
5335 #: builtin/fetch.c:124
5339 #: builtin/fetch.c:125
5340 msgid "specify fetch refmap"
5341 msgstr "指定获取操作的引用映射"
5343 #: builtin/fetch.c:377
5344 msgid "Couldn't find remote ref HEAD"
5345 msgstr "无法发现远程 HEAD 引用"
5347 #: builtin/fetch.c:457
5349 msgid "object %s not found"
5352 #: builtin/fetch.c:462
5353 msgid "[up to date]"
5356 #: builtin/fetch.c:476
5358 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5359 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5361 #: builtin/fetch.c:477 builtin/fetch.c:563
5365 #: builtin/fetch.c:488
5366 msgid "[tag update]"
5370 #: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
5371 msgid " (unable to update local ref)"
5372 msgstr " (不能更新本地引用)"
5374 #: builtin/fetch.c:508
5378 #: builtin/fetch.c:511
5379 msgid "[new branch]"
5382 #: builtin/fetch.c:514
5386 #: builtin/fetch.c:559
5387 msgid "unable to update local ref"
5390 #: builtin/fetch.c:559
5391 msgid "forced update"
5394 #: builtin/fetch.c:565
5395 msgid "(non-fast-forward)"
5398 #: builtin/fetch.c:599 builtin/fetch.c:832
5400 msgid "cannot open %s: %s\n"
5401 msgstr "无法打开 %s:%s\n"
5403 #: builtin/fetch.c:608
5405 msgid "%s did not send all necessary objects\n"
5406 msgstr "%s 未发送所有必须的对象\n"
5408 #: builtin/fetch.c:626
5410 msgid "reject %s because shallow roots are not allowed to be updated"
5411 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5413 #: builtin/fetch.c:714 builtin/fetch.c:797
5418 #: builtin/fetch.c:725
5421 "some local refs could not be updated; try running\n"
5422 " 'git remote prune %s' to remove any old, conflicting branches"
5424 "一些本地引用不能被更新;尝试运行\n"
5425 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5428 #: builtin/fetch.c:777
5430 msgid " (%s will become dangling)"
5431 msgstr " (%s 将成为摇摆状态)"
5434 #: builtin/fetch.c:778
5436 msgid " (%s has become dangling)"
5437 msgstr " (%s 已成为摇摆状态)"
5439 #: builtin/fetch.c:802
5443 #: builtin/fetch.c:803 builtin/remote.c:1057
5447 #: builtin/fetch.c:822
5449 msgid "Refusing to fetch into current branch %s of non-bare repository"
5450 msgstr "拒绝获取到非纯版本库的当前分支 %s"
5452 #: builtin/fetch.c:841
5454 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5455 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5457 #: builtin/fetch.c:844
5459 msgid "Option \"%s\" is ignored for %s\n"
5460 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5462 #: builtin/fetch.c:900
5464 msgid "Don't know how to fetch from %s"
5465 msgstr "不知道如何从 %s 获取"
5467 #: builtin/fetch.c:1063
5469 msgid "Fetching %s\n"
5472 #: builtin/fetch.c:1065 builtin/remote.c:90
5474 msgid "Could not fetch %s"
5477 #: builtin/fetch.c:1083
5479 "No remote repository specified. Please, specify either a URL or a\n"
5480 "remote name from which new revisions should be fetched."
5481 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5483 #: builtin/fetch.c:1106
5484 msgid "You need to specify a tag name."
5485 msgstr "您需要指定一个 tag 名称。"
5487 #: builtin/fetch.c:1148
5488 msgid "--depth and --unshallow cannot be used together"
5489 msgstr "--depth 和 --unshallow 不能同时使用"
5491 #: builtin/fetch.c:1150
5492 msgid "--unshallow on a complete repository does not make sense"
5493 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5495 #: builtin/fetch.c:1173
5496 msgid "fetch --all does not take a repository argument"
5497 msgstr "fetch --all 不能带一个版本库参数"
5499 #: builtin/fetch.c:1175
5500 msgid "fetch --all does not make sense with refspecs"
5501 msgstr "fetch --all 带引用规则没有任何意义"
5503 #: builtin/fetch.c:1186
5505 msgid "No such remote or remote group: %s"
5506 msgstr "没有这样的远程或远程组:%s"
5508 #: builtin/fetch.c:1194
5509 msgid "Fetching a group and specifying refspecs does not make sense"
5510 msgstr "获取组并指定引用规则没有意义"
5512 #: builtin/fmt-merge-msg.c:13
5514 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5515 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5517 #: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
5518 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5519 #: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5520 #: parse-options.h:131 parse-options.h:238
5524 #: builtin/fmt-merge-msg.c:669
5525 msgid "populate log with at most <n> entries from shortlog"
5526 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5528 #: builtin/fmt-merge-msg.c:672
5529 msgid "alias for --log (deprecated)"
5530 msgstr "参数 --log 的别名(已弃用)"
5532 #: builtin/fmt-merge-msg.c:675
5536 #: builtin/fmt-merge-msg.c:676
5537 msgid "use <text> as start of message"
5538 msgstr "使用 <文本> 作为提交说明的开始"
5540 #: builtin/fmt-merge-msg.c:677
5541 msgid "file to read from"
5544 #: builtin/for-each-ref.c:687
5545 msgid "unable to parse format"
5548 #: builtin/for-each-ref.c:1083
5549 msgid "git for-each-ref [<options>] [<pattern>]"
5550 msgstr "git for-each-ref [<选项>] [<模式>]"
5552 #: builtin/for-each-ref.c:1098
5553 msgid "quote placeholders suitably for shells"
5554 msgstr "引用占位符适用于 shells"
5556 #: builtin/for-each-ref.c:1100
5557 msgid "quote placeholders suitably for perl"
5558 msgstr "引用占位符适用于 perl"
5560 #: builtin/for-each-ref.c:1102
5561 msgid "quote placeholders suitably for python"
5562 msgstr "引用占位符适用于 python"
5564 #: builtin/for-each-ref.c:1104
5565 msgid "quote placeholders suitably for Tcl"
5566 msgstr "引用占位符适用于 Tcl"
5568 #: builtin/for-each-ref.c:1107
5569 msgid "show only <n> matched refs"
5570 msgstr "只显示 <n> 个匹配的引用"
5572 #: builtin/for-each-ref.c:1108 builtin/replace.c:438
5576 #: builtin/for-each-ref.c:1108
5577 msgid "format to use for the output"
5580 #: builtin/for-each-ref.c:1109
5584 #: builtin/for-each-ref.c:1110
5585 msgid "field name to sort on"
5588 #: builtin/fsck.c:147 builtin/prune.c:236
5589 msgid "Checking connectivity"
5592 #: builtin/fsck.c:548
5593 msgid "Checking object directories"
5596 #: builtin/fsck.c:611
5597 msgid "git fsck [<options>] [<object>...]"
5598 msgstr "git fsck [<选项>] [<对象>...]"
5600 #: builtin/fsck.c:617
5601 msgid "show unreachable objects"
5604 #: builtin/fsck.c:618
5605 msgid "show dangling objects"
5608 #: builtin/fsck.c:619
5612 #: builtin/fsck.c:620
5613 msgid "report root nodes"
5616 #: builtin/fsck.c:621
5617 msgid "make index objects head nodes"
5618 msgstr "将索引亦作为检查的头节点"
5620 #: builtin/fsck.c:622
5621 msgid "make reflogs head nodes (default)"
5622 msgstr "将引用日志作为检查的头节点(默认)"
5624 #: builtin/fsck.c:623
5625 msgid "also consider packs and alternate objects"
5628 #: builtin/fsck.c:624
5629 msgid "enable more strict checking"
5632 #: builtin/fsck.c:626
5633 msgid "write dangling objects in .git/lost-found"
5634 msgstr "将摇摆对象写入 .git/lost-found 中"
5636 #: builtin/fsck.c:627 builtin/prune.c:198
5637 msgid "show progress"
5640 #: builtin/fsck.c:677
5641 msgid "Checking objects"
5645 msgid "git gc [<options>]"
5646 msgstr "git gc [<选项>]"
5650 msgid "Invalid %s: '%s'"
5655 msgid "insanely long object directory %.*s"
5656 msgstr "不正常的长对象目录 %.*s"
5659 msgid "prune unreferenced objects"
5663 msgid "be more thorough (increased runtime)"
5664 msgstr "更彻底(增加运行时间)"
5667 msgid "enable auto-gc mode"
5671 msgid "force running gc even if there may be another gc running"
5672 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5676 msgid "Auto packing the repository in background for optimum performance.\n"
5677 msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5681 msgid "Auto packing the repository for optimum performance.\n"
5682 msgstr "自动打包版本库以求最佳性能。\n"
5686 msgid "See \"git help gc\" for manual housekeeping.\n"
5687 msgstr "手工维护参见 \"git help gc\"。\n"
5692 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5694 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5698 "There are too many unreachable loose objects; run 'git prune' to remove them."
5699 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5701 #: builtin/grep.c:23
5702 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5703 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5705 #: builtin/grep.c:218
5707 msgid "grep: failed to create thread: %s"
5708 msgstr "grep:无法创建线程:%s"
5710 #: builtin/grep.c:441 builtin/grep.c:476
5712 msgid "unable to read tree (%s)"
5715 #: builtin/grep.c:491
5717 msgid "unable to grep from object of type %s"
5718 msgstr "无法抓取来自于 %s 类型的对象"
5720 #: builtin/grep.c:547
5722 msgid "switch `%c' expects a numerical value"
5723 msgstr "开关 `%c' 期望一个数字值"
5725 #: builtin/grep.c:564
5727 msgid "cannot open '%s'"
5730 #: builtin/grep.c:638
5731 msgid "search in index instead of in the work tree"
5732 msgstr "在索引区搜索而不是在工作区"
5734 #: builtin/grep.c:640
5735 msgid "find in contents not managed by git"
5736 msgstr "在未被 git 管理的内容中查找"
5738 # 译者:中文字符串拼接,可删除前导空格
5739 #: builtin/grep.c:642
5740 msgid "search in both tracked and untracked files"
5741 msgstr "在跟踪和未跟踪的文件中搜索"
5743 #: builtin/grep.c:644
5744 msgid "ignore files specified via '.gitignore'"
5745 msgstr "忽略 '.gitignore' 包含的文件"
5747 #: builtin/grep.c:647
5748 msgid "show non-matching lines"
5751 #: builtin/grep.c:649
5752 msgid "case insensitive matching"
5755 #: builtin/grep.c:651
5756 msgid "match patterns only at word boundaries"
5759 #: builtin/grep.c:653
5760 msgid "process binary files as text"
5761 msgstr "把二进制文件当做文本处理"
5763 #: builtin/grep.c:655
5764 msgid "don't match patterns in binary files"
5765 msgstr "不在二进制文件中匹配模式"
5767 #: builtin/grep.c:658
5768 msgid "process binary files with textconv filters"
5769 msgstr "用 textconv 过滤器处理二进制文件"
5771 #: builtin/grep.c:660
5772 msgid "descend at most <depth> levels"
5773 msgstr "最多以指定的深度向下寻找"
5775 #: builtin/grep.c:664
5776 msgid "use extended POSIX regular expressions"
5777 msgstr "使用扩展的 POSIX 正则表达式"
5779 #: builtin/grep.c:667
5780 msgid "use basic POSIX regular expressions (default)"
5781 msgstr "使用基本的 POSIX 正则表达式(默认)"
5783 #: builtin/grep.c:670
5784 msgid "interpret patterns as fixed strings"
5785 msgstr "把模式解析为固定的字符串"
5787 #: builtin/grep.c:673
5788 msgid "use Perl-compatible regular expressions"
5789 msgstr "使用 Perl 兼容的正则表达式"
5791 #: builtin/grep.c:676
5792 msgid "show line numbers"
5795 #: builtin/grep.c:677
5796 msgid "don't show filenames"
5799 #: builtin/grep.c:678
5800 msgid "show filenames"
5803 #: builtin/grep.c:680
5804 msgid "show filenames relative to top directory"
5805 msgstr "显示相对于顶级目录的文件名"
5807 #: builtin/grep.c:682
5808 msgid "show only filenames instead of matching lines"
5809 msgstr "只显示文件名而不显示匹配的行"
5811 #: builtin/grep.c:684
5812 msgid "synonym for --files-with-matches"
5813 msgstr "和 --files-with-matches 同义"
5815 #: builtin/grep.c:687
5816 msgid "show only the names of files without match"
5819 #: builtin/grep.c:689
5820 msgid "print NUL after filenames"
5821 msgstr "在文件名后输出 NUL 字符"
5823 #: builtin/grep.c:691
5824 msgid "show the number of matches instead of matching lines"
5825 msgstr "显示总匹配行数,而不显示匹配的行"
5827 #: builtin/grep.c:692
5828 msgid "highlight matches"
5831 #: builtin/grep.c:694
5832 msgid "print empty line between matches from different files"
5833 msgstr "在不同文件的匹配项之间打印空行"
5835 #: builtin/grep.c:696
5836 msgid "show filename only once above matches from same file"
5837 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5839 #: builtin/grep.c:699
5840 msgid "show <n> context lines before and after matches"
5841 msgstr "显示匹配项前后的 <n> 行上下文"
5843 #: builtin/grep.c:702
5844 msgid "show <n> context lines before matches"
5845 msgstr "显示匹配项前 <n> 行上下文"
5847 #: builtin/grep.c:704
5848 msgid "show <n> context lines after matches"
5849 msgstr "显示匹配项后 <n> 行上下文"
5851 #: builtin/grep.c:705
5852 msgid "shortcut for -C NUM"
5855 #: builtin/grep.c:708
5856 msgid "show a line with the function name before matches"
5857 msgstr "在匹配的前面显示一行函数名"
5859 #: builtin/grep.c:710
5860 msgid "show the surrounding function"
5861 msgstr "显示所在函数的前后内容"
5863 #: builtin/grep.c:713
5864 msgid "read patterns from file"
5867 #: builtin/grep.c:715
5868 msgid "match <pattern>"
5871 #: builtin/grep.c:717
5872 msgid "combine patterns specified with -e"
5873 msgstr "组合用 -e 参数设定的模式"
5875 #: builtin/grep.c:729
5876 msgid "indicate hit with exit status without output"
5877 msgstr "不输出,而用退出码标识命中状态"
5879 #: builtin/grep.c:731
5880 msgid "show only matches from files that match all patterns"
5881 msgstr "只显示匹配所有模式的文件中的匹配"
5883 #: builtin/grep.c:733
5884 msgid "show parse tree for grep expression"
5885 msgstr "显示 grep 表达式的解析树"
5887 #: builtin/grep.c:737
5891 #: builtin/grep.c:737
5892 msgid "show matching files in the pager"
5895 #: builtin/grep.c:740
5896 msgid "allow calling of grep(1) (ignored by this build)"
5897 msgstr "允许调用 grep(1)(本次构建忽略)"
5899 #: builtin/grep.c:741 builtin/show-ref.c:189
5903 #: builtin/grep.c:808
5904 msgid "no pattern given."
5907 #: builtin/grep.c:866
5908 msgid "--open-files-in-pager only works on the worktree"
5909 msgstr "--open-files-in-pager 仅用于工作区"
5911 #: builtin/grep.c:892
5912 msgid "--cached or --untracked cannot be used with --no-index."
5913 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5915 #: builtin/grep.c:897
5916 msgid "--no-index or --untracked cannot be used with revs."
5917 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5919 #: builtin/grep.c:900
5920 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5921 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5923 #: builtin/grep.c:908
5924 msgid "both --cached and trees are given."
5925 msgstr "同时给出了 --cached 和树对象。"
5927 #: builtin/hash-object.c:80
5929 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5932 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5935 #: builtin/hash-object.c:81
5936 msgid "git hash-object --stdin-paths < <list-of-paths>"
5937 msgstr "git hash-object --stdin-paths < <路径列表>"
5939 #: builtin/hash-object.c:92 builtin/tag.c:612
5943 #: builtin/hash-object.c:92
5947 #: builtin/hash-object.c:93
5948 msgid "write the object into the object database"
5951 #: builtin/hash-object.c:95
5952 msgid "read the object from stdin"
5955 #: builtin/hash-object.c:97
5956 msgid "store file as is without filters"
5957 msgstr "原样存储文件不使用过滤器"
5959 #: builtin/hash-object.c:98
5961 "just hash any random garbage to create corrupt objects for debugging Git"
5962 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5964 #: builtin/hash-object.c:99
5965 msgid "process file as it were from this path"
5966 msgstr "处理文件并假设其来自于此路径"
5968 #: builtin/help.c:41
5969 msgid "print all available commands"
5972 #: builtin/help.c:42
5973 msgid "print list of useful guides"
5976 #: builtin/help.c:43
5977 msgid "show man page"
5980 #: builtin/help.c:44
5981 msgid "show manual in web browser"
5982 msgstr "在 web 浏览器中显示手册"
5984 #: builtin/help.c:46
5985 msgid "show info page"
5988 #: builtin/help.c:52
5989 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5990 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
5992 #: builtin/help.c:64
5994 msgid "unrecognized help format '%s'"
5995 msgstr "未能识别的帮助格式 '%s'"
5997 #: builtin/help.c:91
5998 msgid "Failed to start emacsclient."
5999 msgstr "无法启动 emacsclient。"
6001 #: builtin/help.c:104
6002 msgid "Failed to parse emacsclient version."
6003 msgstr "无法解析 emacsclient 版本。"
6005 #: builtin/help.c:112
6007 msgid "emacsclient version '%d' too old (< 22)."
6008 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6010 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
6012 msgid "failed to exec '%s': %s"
6013 msgstr "无法执行 '%s':%s"
6015 #: builtin/help.c:215
6018 "'%s': path for unsupported man viewer.\n"
6019 "Please consider using 'man.<tool>.cmd' instead."
6021 "'%s':不支持的 man 手册查看器的路径。\n"
6022 "请使用 'man.<工具>.cmd'。"
6024 #: builtin/help.c:227
6027 "'%s': cmd for supported man viewer.\n"
6028 "Please consider using 'man.<tool>.path' instead."
6030 "'%s': 支持的 man 手册查看器命令。\n"
6031 "请使用 'man.<工具>.path'。"
6033 #: builtin/help.c:354
6035 msgid "'%s': unknown man viewer."
6036 msgstr "'%s':未知的 man 查看器。"
6038 #: builtin/help.c:371
6039 msgid "no man viewer handled the request"
6040 msgstr "没有 man 查看器处理此请求"
6042 #: builtin/help.c:379
6043 msgid "no info viewer handled the request"
6044 msgstr "没有 info 查看器处理此请求"
6046 #: builtin/help.c:428
6047 msgid "Defining attributes per path"
6050 #: builtin/help.c:429
6051 msgid "Everyday Git With 20 Commands Or So"
6052 msgstr "每一天 Git 常用的约 20 条命令"
6054 #: builtin/help.c:430
6055 msgid "A Git glossary"
6058 #: builtin/help.c:431
6059 msgid "Specifies intentionally untracked files to ignore"
6062 #: builtin/help.c:432
6063 msgid "Defining submodule properties"
6066 #: builtin/help.c:433
6067 msgid "Specifying revisions and ranges for Git"
6068 msgstr "指定 Git 的版本和版本范围"
6070 #: builtin/help.c:434
6071 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6072 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6074 #: builtin/help.c:435
6075 msgid "An overview of recommended workflows with Git"
6076 msgstr "Git 推荐的工作流概览"
6078 #: builtin/help.c:447
6079 msgid "The common Git guides are:\n"
6080 msgstr "最常用的 Git 向导有:\n"
6082 #: builtin/help.c:468 builtin/help.c:485
6087 #: builtin/help.c:501
6089 msgid "`git %s' is aliased to `%s'"
6090 msgstr "`git %s' 是 `%s' 的别名"
6092 #: builtin/index-pack.c:151
6094 msgid "unable to open %s"
6097 #: builtin/index-pack.c:201
6099 msgid "object type mismatch at %s"
6100 msgstr "%s 的对象类型不匹配"
6102 #: builtin/index-pack.c:221
6104 msgid "did not receive expected object %s"
6105 msgstr "未能获取期望的对象 %s"
6107 #: builtin/index-pack.c:224
6109 msgid "object %s: expected type %s, found %s"
6110 msgstr "对象 %s:期待类型 %s,却是 %s"
6112 #: builtin/index-pack.c:266
6114 msgid "cannot fill %d byte"
6115 msgid_plural "cannot fill %d bytes"
6116 msgstr[0] "无法填充 %d 字节"
6117 msgstr[1] "无法填充 %d 字节"
6119 #: builtin/index-pack.c:276
6121 msgstr "过早的文件结束符(EOF)"
6123 #: builtin/index-pack.c:277
6124 msgid "read error on input"
6127 #: builtin/index-pack.c:289
6128 msgid "used more bytes than were available"
6131 #: builtin/index-pack.c:296
6132 msgid "pack too large for current definition of off_t"
6133 msgstr "包太大超过了当前 off_t 的定义"
6135 #: builtin/index-pack.c:312
6137 msgid "unable to create '%s'"
6140 #: builtin/index-pack.c:317
6142 msgid "cannot open packfile '%s'"
6143 msgstr "无法打开包文件 '%s'"
6145 #: builtin/index-pack.c:331
6146 msgid "pack signature mismatch"
6149 #: builtin/index-pack.c:333
6151 msgid "pack version %<PRIu32> unsupported"
6152 msgstr "不支持包版本 %<PRIu32>"
6154 #: builtin/index-pack.c:351
6156 msgid "pack has bad object at offset %lu: %s"
6157 msgstr "包中有错误的对象位于 %lu:%s"
6159 #: builtin/index-pack.c:472
6161 msgid "inflate returned %d"
6164 #: builtin/index-pack.c:521
6165 msgid "offset value overflow for delta base object"
6166 msgstr "偏移值覆盖了 delta 基准对象"
6168 #: builtin/index-pack.c:529
6169 msgid "delta base offset is out of bound"
6170 msgstr "delta 基准偏移越界"
6172 #: builtin/index-pack.c:537
6174 msgid "unknown object type %d"
6177 #: builtin/index-pack.c:568
6178 msgid "cannot pread pack file"
6181 #: builtin/index-pack.c:570
6183 msgid "premature end of pack file, %lu byte missing"
6184 msgid_plural "premature end of pack file, %lu bytes missing"
6185 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6186 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6188 #: builtin/index-pack.c:596
6189 msgid "serious inflate inconsistency"
6192 #: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6193 #: builtin/index-pack.c:805 builtin/index-pack.c:814
6195 msgid "SHA1 COLLISION FOUND WITH %s !"
6196 msgstr "发现 %s 出现 SHA1 冲突!"
6198 #: builtin/index-pack.c:745 builtin/pack-objects.c:162
6199 #: builtin/pack-objects.c:254
6201 msgid "unable to read %s"
6204 #: builtin/index-pack.c:811
6206 msgid "cannot read existing object %s"
6207 msgstr "不能读取现存对象 %s"
6209 #: builtin/index-pack.c:825
6211 msgid "invalid blob object %s"
6212 msgstr "无效的数据(blob)对象 %s"
6214 #: builtin/index-pack.c:839
6219 #: builtin/index-pack.c:843
6220 msgid "Error in object"
6223 #: builtin/index-pack.c:845
6225 msgid "Not all child objects of %s are reachable"
6226 msgstr "%s 的所有子对象并非都可达"
6228 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6229 msgid "failed to apply delta"
6232 #: builtin/index-pack.c:1118
6233 msgid "Receiving objects"
6236 #: builtin/index-pack.c:1118
6237 msgid "Indexing objects"
6240 #: builtin/index-pack.c:1150
6241 msgid "pack is corrupted (SHA1 mismatch)"
6242 msgstr "包冲突(SHA1 不匹配)"
6244 #: builtin/index-pack.c:1155
6245 msgid "cannot fstat packfile"
6248 #: builtin/index-pack.c:1158
6249 msgid "pack has junk at the end"
6252 #: builtin/index-pack.c:1169
6253 msgid "confusion beyond insanity in parse_pack_objects()"
6254 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6256 #: builtin/index-pack.c:1194
6257 msgid "Resolving deltas"
6260 #: builtin/index-pack.c:1205
6262 msgid "unable to create thread: %s"
6265 #: builtin/index-pack.c:1247
6266 msgid "confusion beyond insanity"
6269 #: builtin/index-pack.c:1253
6271 msgid "completed with %d local objects"
6272 msgstr "完成 %d 个本地对象"
6274 #: builtin/index-pack.c:1263
6276 msgid "Unexpected tail checksum for %s (disk corruption?)"
6277 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6279 #: builtin/index-pack.c:1267
6281 msgid "pack has %d unresolved delta"
6282 msgid_plural "pack has %d unresolved deltas"
6283 msgstr[0] "包有 %d 个未解决的 delta"
6284 msgstr[1] "包有 %d 个未解决的 delta"
6286 #: builtin/index-pack.c:1291
6288 msgid "unable to deflate appended object (%d)"
6289 msgstr "不能压缩附加对象(%d)"
6291 #: builtin/index-pack.c:1367
6293 msgid "local object %s is corrupt"
6294 msgstr "本地对象 %s 已损坏"
6296 #: builtin/index-pack.c:1391
6297 msgid "error while closing pack file"
6300 #: builtin/index-pack.c:1404
6302 msgid "cannot write keep file '%s'"
6303 msgstr "无法写保留文件 '%s'"
6305 #: builtin/index-pack.c:1412
6307 msgid "cannot close written keep file '%s'"
6308 msgstr "无法关闭保留文件 '%s'"
6310 #: builtin/index-pack.c:1425
6311 msgid "cannot store pack file"
6314 #: builtin/index-pack.c:1436
6315 msgid "cannot store index file"
6318 #: builtin/index-pack.c:1469
6320 msgid "bad pack.indexversion=%<PRIu32>"
6321 msgstr "坏的 pack.indexversion=%<PRIu32>"
6323 #: builtin/index-pack.c:1475
6325 msgid "invalid number of threads specified (%d)"
6326 msgstr "指定的线程数无效(%d)"
6328 #: builtin/index-pack.c:1479 builtin/index-pack.c:1658
6330 msgid "no threads support, ignoring %s"
6331 msgstr "没有线程支持,忽略 %s"
6333 #: builtin/index-pack.c:1537
6335 msgid "Cannot open existing pack file '%s'"
6336 msgstr "无法打开现存包文件 '%s'"
6338 #: builtin/index-pack.c:1539
6340 msgid "Cannot open existing pack idx file for '%s'"
6341 msgstr "无法为 %s 打开包索引文件"
6343 #: builtin/index-pack.c:1586
6345 msgid "non delta: %d object"
6346 msgid_plural "non delta: %d objects"
6347 msgstr[0] "非 delta:%d 个对象"
6348 msgstr[1] "非 delta:%d 个对象"
6350 #: builtin/index-pack.c:1593
6352 msgid "chain length = %d: %lu object"
6353 msgid_plural "chain length = %d: %lu objects"
6354 msgstr[0] "链长 = %d: %lu 对象"
6355 msgstr[1] "链长 = %d: %lu 对象"
6357 #: builtin/index-pack.c:1622
6358 msgid "Cannot come back to cwd"
6361 #: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6362 #: builtin/index-pack.c:1685 builtin/index-pack.c:1689
6367 #: builtin/index-pack.c:1703
6368 msgid "--fix-thin cannot be used without --stdin"
6369 msgstr "--fix-thin 不能和 --stdin 同时使用"
6371 #: builtin/index-pack.c:1707 builtin/index-pack.c:1716
6373 msgid "packfile name '%s' does not end with '.pack'"
6374 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6376 #: builtin/index-pack.c:1724
6377 msgid "--verify with no packfile name given"
6378 msgstr "--verify 没有提供包名参数"
6380 #: builtin/init-db.c:35
6382 msgid "Could not make %s writable by group"
6383 msgstr "不能设置 %s 为组可写"
6385 #: builtin/init-db.c:62
6387 msgid "insanely long template name %s"
6390 #: builtin/init-db.c:67
6392 msgid "cannot stat '%s'"
6393 msgstr "不能枚举 '%s' 状态"
6395 #: builtin/init-db.c:73
6397 msgid "cannot stat template '%s'"
6398 msgstr "不能枚举模版 '%s' 状态"
6400 #: builtin/init-db.c:80
6402 msgid "cannot opendir '%s'"
6403 msgstr "不能打开目录 '%s'"
6405 #: builtin/init-db.c:97
6407 msgid "cannot readlink '%s'"
6408 msgstr "不能读取链接 '%s'"
6410 #: builtin/init-db.c:99
6412 msgid "insanely long symlink %s"
6415 #: builtin/init-db.c:102
6417 msgid "cannot symlink '%s' '%s'"
6418 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6420 #: builtin/init-db.c:106
6422 msgid "cannot copy '%s' to '%s'"
6423 msgstr "不能拷贝 '%s' 至 '%s'"
6425 #: builtin/init-db.c:110
6427 msgid "ignoring template %s"
6430 #: builtin/init-db.c:136
6432 msgid "insanely long template path %s"
6435 #: builtin/init-db.c:144
6437 msgid "templates not found %s"
6440 #: builtin/init-db.c:157
6442 msgid "not copying templates of a wrong format version %d from '%s'"
6443 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6445 #: builtin/init-db.c:211
6447 msgid "insane git directory %s"
6448 msgstr "不正常的 git 目录 %s"
6450 #: builtin/init-db.c:343 builtin/init-db.c:346
6452 msgid "%s already exists"
6455 #: builtin/init-db.c:374
6457 msgid "unable to handle file type %d"
6458 msgstr "不能处理 %d 类型的文件"
6460 #: builtin/init-db.c:377
6462 msgid "unable to move %s to %s"
6463 msgstr "不能移动 %s 至 %s"
6465 #. TRANSLATORS: The first '%s' is either "Reinitialized
6466 #. existing" or "Initialized empty", the second " shared" or
6467 #. "", and the last '%s%s' is the verbatim directory name.
6468 #: builtin/init-db.c:433
6470 msgid "%s%s Git repository in %s%s\n"
6471 msgstr "%s%s Git 版本库于 %s%s\n"
6473 #: builtin/init-db.c:434
6474 msgid "Reinitialized existing"
6477 #: builtin/init-db.c:434
6478 msgid "Initialized empty"
6481 # 译者:中文字符串拼接,可删除前导空格
6482 #: builtin/init-db.c:435
6486 #: builtin/init-db.c:482
6488 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6489 "shared[=<permissions>]] [<directory>]"
6491 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6494 #: builtin/init-db.c:505
6498 #: builtin/init-db.c:506
6499 msgid "specify that the git repository is to be shared amongst several users"
6500 msgstr "指定 git 版本库是多个用户之间共享的"
6502 #: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
6506 #: builtin/init-db.c:540 builtin/init-db.c:545
6508 msgid "cannot mkdir %s"
6511 #: builtin/init-db.c:549
6513 msgid "cannot chdir to %s"
6516 #: builtin/init-db.c:570
6519 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6521 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6523 #: builtin/init-db.c:598
6525 msgid "Cannot access work tree '%s'"
6526 msgstr "不能访问工作区 '%s'"
6528 #: builtin/interpret-trailers.c:15
6530 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6533 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6536 #: builtin/interpret-trailers.c:25
6537 msgid "trim empty trailers"
6540 #: builtin/interpret-trailers.c:26
6544 #: builtin/interpret-trailers.c:27
6545 msgid "trailer(s) to add"
6549 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
6550 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6553 msgid "git show [<options>] <object>..."
6554 msgstr "git show [<选项>] <对象>..."
6558 msgid "invalid --decorate option: %s"
6559 msgstr "无效的 --decorate 选项:%s"
6561 #: builtin/log.c:127
6562 msgid "suppress diff output"
6565 #: builtin/log.c:128
6569 #: builtin/log.c:129
6570 msgid "Use mail map file"
6573 #: builtin/log.c:130
6574 msgid "decorate options"
6577 #: builtin/log.c:133
6578 msgid "Process line range n,m in file, counting from 1"
6579 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6581 #: builtin/log.c:229
6583 msgid "Final output: %d %s\n"
6584 msgstr "最终输出:%d %s\n"
6586 #: builtin/log.c:458
6588 msgid "git show %s: bad file"
6589 msgstr "git show %s: 损坏的文件"
6591 #: builtin/log.c:472 builtin/log.c:564
6593 msgid "Could not read object %s"
6596 #: builtin/log.c:588
6598 msgid "Unknown type: %d"
6601 #: builtin/log.c:689
6602 msgid "format.headers without value"
6603 msgstr "format.headers 没有值"
6605 #: builtin/log.c:773
6606 msgid "name of output directory is too long"
6609 #: builtin/log.c:789
6611 msgid "Cannot open patch file %s"
6612 msgstr "无法打开补丁文件 %s"
6614 #: builtin/log.c:803
6615 msgid "Need exactly one range."
6618 #: builtin/log.c:813
6619 msgid "Not a range."
6622 #: builtin/log.c:919
6623 msgid "Cover letter needs email format"
6626 #: builtin/log.c:998
6628 msgid "insane in-reply-to: %s"
6629 msgstr "不正常的 in-reply-to:%s"
6631 #: builtin/log.c:1026
6632 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6633 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6635 #: builtin/log.c:1071
6636 msgid "Two output directories?"
6639 #: builtin/log.c:1186
6640 msgid "use [PATCH n/m] even with a single patch"
6641 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6643 #: builtin/log.c:1189
6644 msgid "use [PATCH] even with multiple patches"
6645 msgstr "使用 [PATCH],即使有多个补丁"
6647 #: builtin/log.c:1193
6648 msgid "print patches to standard out"
6651 #: builtin/log.c:1195
6652 msgid "generate a cover letter"
6655 #: builtin/log.c:1197
6656 msgid "use simple number sequence for output file names"
6657 msgstr "使用简单的数字序列作为输出文件名"
6659 #: builtin/log.c:1198
6663 #: builtin/log.c:1199
6664 msgid "use <sfx> instead of '.patch'"
6665 msgstr "使用 <后缀> 代替 '.patch'"
6667 #: builtin/log.c:1201
6668 msgid "start numbering patches at <n> instead of 1"
6669 msgstr "补丁以 <n> 开始编号,而不是1"
6671 #: builtin/log.c:1203
6672 msgid "mark the series as Nth re-roll"
6673 msgstr "标记补丁系列是第几次重制"
6675 #: builtin/log.c:1205
6676 msgid "Use [<prefix>] instead of [PATCH]"
6677 msgstr "使用 [<前缀>] 代替 [PATCH]"
6679 #: builtin/log.c:1208
6680 msgid "store resulting files in <dir>"
6681 msgstr "把结果文件存储在 <目录>"
6683 #: builtin/log.c:1211
6684 msgid "don't strip/add [PATCH]"
6685 msgstr "不删除/添加 [PATCH]"
6687 #: builtin/log.c:1214
6688 msgid "don't output binary diffs"
6691 #: builtin/log.c:1216
6692 msgid "don't include a patch matching a commit upstream"
6693 msgstr "不包含已在上游提交中的补丁"
6695 #: builtin/log.c:1218
6696 msgid "show patch format instead of default (patch + stat)"
6697 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6699 #: builtin/log.c:1220
6703 #: builtin/log.c:1221
6707 #: builtin/log.c:1222
6708 msgid "add email header"
6711 #: builtin/log.c:1223 builtin/log.c:1225
6715 #: builtin/log.c:1223
6716 msgid "add To: header"
6719 #: builtin/log.c:1225
6720 msgid "add Cc: header"
6723 #: builtin/log.c:1227
6727 #: builtin/log.c:1228
6728 msgid "set From address to <ident> (or committer ident if absent)"
6729 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6731 #: builtin/log.c:1230
6735 #: builtin/log.c:1231
6736 msgid "make first mail a reply to <message-id>"
6737 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6739 #: builtin/log.c:1232 builtin/log.c:1235
6743 #: builtin/log.c:1233
6744 msgid "attach the patch"
6747 #: builtin/log.c:1236
6748 msgid "inline the patch"
6751 #: builtin/log.c:1240
6752 msgid "enable message threading, styles: shallow, deep"
6753 msgstr "启用邮件线索,风格:浅,深"
6755 #: builtin/log.c:1242
6759 #: builtin/log.c:1243
6760 msgid "add a signature"
6763 #: builtin/log.c:1245
6764 msgid "add a signature from a file"
6767 #: builtin/log.c:1246
6768 msgid "don't print the patch filenames"
6771 #: builtin/log.c:1320
6773 msgid "invalid ident line: %s"
6774 msgstr "包含无效的身份标识:%s"
6776 #: builtin/log.c:1335
6777 msgid "-n and -k are mutually exclusive."
6778 msgstr "-n 和 -k 互斥。"
6780 #: builtin/log.c:1337
6781 msgid "--subject-prefix and -k are mutually exclusive."
6782 msgstr "--subject-prefix 和 -k 互斥。"
6784 #: builtin/log.c:1345
6785 msgid "--name-only does not make sense"
6786 msgstr "--name-only 无意义"
6788 #: builtin/log.c:1347
6789 msgid "--name-status does not make sense"
6790 msgstr "--name-status 无意义"
6792 #: builtin/log.c:1349
6793 msgid "--check does not make sense"
6794 msgstr "--check 无意义"
6796 #: builtin/log.c:1372
6797 msgid "standard output, or directory, which one?"
6798 msgstr "标准输出或目录,哪一个?"
6800 #: builtin/log.c:1374
6802 msgid "Could not create directory '%s'"
6803 msgstr "不能创建目录 '%s'"
6805 #: builtin/log.c:1472
6807 msgid "unable to read signature file '%s'"
6808 msgstr "无法读取签名文件 '%s'"
6810 #: builtin/log.c:1535
6811 msgid "Failed to create output files"
6814 #: builtin/log.c:1583
6815 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6816 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6818 #: builtin/log.c:1637
6821 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6822 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6824 #: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
6826 msgid "Unknown commit %s"
6829 #: builtin/ls-files.c:358
6830 msgid "git ls-files [<options>] [<file>...]"
6831 msgstr "git ls-files [<选项>] [<文件>...]"
6833 #: builtin/ls-files.c:415
6834 msgid "identify the file status with tags"
6837 #: builtin/ls-files.c:417
6838 msgid "use lowercase letters for 'assume unchanged' files"
6839 msgstr "使用小写字母表示 '假设未改变的' 文件"
6841 #: builtin/ls-files.c:419
6842 msgid "show cached files in the output (default)"
6843 msgstr "显示缓存的文件(默认)"
6845 #: builtin/ls-files.c:421
6846 msgid "show deleted files in the output"
6849 #: builtin/ls-files.c:423
6850 msgid "show modified files in the output"
6853 #: builtin/ls-files.c:425
6854 msgid "show other files in the output"
6857 #: builtin/ls-files.c:427
6858 msgid "show ignored files in the output"
6861 #: builtin/ls-files.c:430
6862 msgid "show staged contents' object name in the output"
6863 msgstr "显示暂存区内容的对象名称"
6865 #: builtin/ls-files.c:432
6866 msgid "show files on the filesystem that need to be removed"
6867 msgstr "显示文件系统需要删除的文件"
6869 #: builtin/ls-files.c:434
6870 msgid "show 'other' directories' names only"
6871 msgstr "只显示“其他”目录的名称"
6873 #: builtin/ls-files.c:437
6874 msgid "don't show empty directories"
6877 #: builtin/ls-files.c:440
6878 msgid "show unmerged files in the output"
6881 #: builtin/ls-files.c:442
6882 msgid "show resolve-undo information"
6883 msgstr "显示 resolve-undo 信息"
6885 #: builtin/ls-files.c:444
6886 msgid "skip files matching pattern"
6889 #: builtin/ls-files.c:447
6890 msgid "exclude patterns are read from <file>"
6891 msgstr "从 <文件> 中读取排除模式"
6893 #: builtin/ls-files.c:450
6894 msgid "read additional per-directory exclude patterns in <file>"
6895 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6897 #: builtin/ls-files.c:452
6898 msgid "add the standard git exclusions"
6899 msgstr "添加标准的 git 排除"
6901 #: builtin/ls-files.c:455
6902 msgid "make the output relative to the project top directory"
6903 msgstr "显示相对于顶级目录的文件名"
6905 #: builtin/ls-files.c:458
6906 msgid "if any <file> is not in the index, treat this as an error"
6907 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6909 #: builtin/ls-files.c:459
6913 #: builtin/ls-files.c:460
6914 msgid "pretend that paths removed since <tree-ish> are still present"
6915 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6917 #: builtin/ls-files.c:462
6918 msgid "show debugging data"
6921 #: builtin/ls-tree.c:28
6922 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6923 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6925 #: builtin/ls-tree.c:127
6926 msgid "only show trees"
6929 #: builtin/ls-tree.c:129
6930 msgid "recurse into subtrees"
6933 #: builtin/ls-tree.c:131
6934 msgid "show trees when recursing"
6937 #: builtin/ls-tree.c:134
6938 msgid "terminate entries with NUL byte"
6941 #: builtin/ls-tree.c:135
6942 msgid "include object size"
6945 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6946 msgid "list only filenames"
6949 #: builtin/ls-tree.c:142
6950 msgid "use full path names"
6953 #: builtin/ls-tree.c:144
6954 msgid "list entire tree; not just current directory (implies --full-name)"
6955 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6957 #: builtin/merge.c:45
6958 msgid "git merge [<options>] [<commit>...]"
6959 msgstr "git merge [<选项>] [<提交>...]"
6961 #: builtin/merge.c:46
6962 msgid "git merge [<options>] <msg> HEAD <commit>"
6963 msgstr "git merge [<选项>] <说明> HEAD <提交>"
6965 #: builtin/merge.c:47
6966 msgid "git merge --abort"
6967 msgstr "git merge --abort"
6969 #: builtin/merge.c:100
6970 msgid "switch `m' requires a value"
6971 msgstr "开关 `m' 需要一个值"
6973 #: builtin/merge.c:137
6975 msgid "Could not find merge strategy '%s'.\n"
6976 msgstr "不能找到合并策略 '%s'。\n"
6978 #: builtin/merge.c:138
6980 msgid "Available strategies are:"
6983 #: builtin/merge.c:143
6985 msgid "Available custom strategies are:"
6988 #: builtin/merge.c:193
6989 msgid "do not show a diffstat at the end of the merge"
6990 msgstr "在合并的最后不显示差异统计"
6992 #: builtin/merge.c:196
6993 msgid "show a diffstat at the end of the merge"
6994 msgstr "在合并的最后显示差异统计"
6996 #: builtin/merge.c:197
6997 msgid "(synonym to --stat)"
6998 msgstr "(和 --stat 同义)"
7000 #: builtin/merge.c:199
7001 msgid "add (at most <n>) entries from shortlog to merge commit message"
7002 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7004 #: builtin/merge.c:202
7005 msgid "create a single commit instead of doing a merge"
7006 msgstr "创建一个单独的提交而不是做一次合并"
7008 #: builtin/merge.c:204
7009 msgid "perform a commit if the merge succeeds (default)"
7010 msgstr "如果合并成功,执行一次提交(默认)"
7012 #: builtin/merge.c:206
7013 msgid "edit message before committing"
7016 #: builtin/merge.c:207
7017 msgid "allow fast-forward (default)"
7020 #: builtin/merge.c:209
7021 msgid "abort if fast-forward is not possible"
7022 msgstr "如果不能快进就放弃合并"
7024 #: builtin/merge.c:213
7025 msgid "Verify that the named commit has a valid GPG signature"
7026 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7028 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
7032 #: builtin/merge.c:215
7033 msgid "merge strategy to use"
7036 #: builtin/merge.c:216
7037 msgid "option=value"
7038 msgstr "option=value"
7040 #: builtin/merge.c:217
7041 msgid "option for selected merge strategy"
7044 #: builtin/merge.c:219
7045 msgid "merge commit message (for a non-fast-forward merge)"
7046 msgstr "合并的提交说明(针对非快进式合并)"
7048 #: builtin/merge.c:223
7049 msgid "abort the current in-progress merge"
7050 msgstr "放弃当前正在进行的合并"
7052 #: builtin/merge.c:251
7053 msgid "could not run stash."
7056 #: builtin/merge.c:256
7057 msgid "stash failed"
7060 #: builtin/merge.c:261
7062 msgid "not a valid object: %s"
7063 msgstr "不是一个有效对象:%s"
7065 #: builtin/merge.c:280 builtin/merge.c:297
7066 msgid "read-tree failed"
7070 #: builtin/merge.c:327
7071 msgid " (nothing to squash)"
7074 #: builtin/merge.c:340
7076 msgid "Squash commit -- not updating HEAD\n"
7077 msgstr "压缩提交 -- 未更新 HEAD\n"
7079 #: builtin/merge.c:372
7080 msgid "Writing SQUASH_MSG"
7081 msgstr "写入 SQUASH_MSG"
7083 #: builtin/merge.c:374
7084 msgid "Finishing SQUASH_MSG"
7085 msgstr "完成 SQUASH_MSG"
7087 #: builtin/merge.c:397
7089 msgid "No merge message -- not updating HEAD\n"
7090 msgstr "无合并信息 -- 未更新 HEAD\n"
7092 #: builtin/merge.c:447
7094 msgid "'%s' does not point to a commit"
7095 msgstr "'%s' 没有指向一个提交"
7097 #: builtin/merge.c:537
7099 msgid "Bad branch.%s.mergeoptions string: %s"
7100 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7102 #: builtin/merge.c:632
7103 msgid "git write-tree failed to write a tree"
7104 msgstr "git write-tree 无法写入一树对象"
7106 #: builtin/merge.c:656
7107 msgid "Not handling anything other than two heads merge."
7108 msgstr "不能处理两个头合并之外的任何操作。"
7110 #: builtin/merge.c:670
7112 msgid "Unknown option for merge-recursive: -X%s"
7113 msgstr "merge-recursive 的未知选项:-X%s"
7115 #: builtin/merge.c:683
7117 msgid "unable to write %s"
7120 #: builtin/merge.c:772
7122 msgid "Could not read from '%s'"
7123 msgstr "不能从 '%s' 读取"
7125 #: builtin/merge.c:781
7127 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7128 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7130 #: builtin/merge.c:787
7133 "Please enter a commit message to explain why this merge is necessary,\n"
7134 "especially if it merges an updated upstream into a topic branch.\n"
7136 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7139 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7142 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7144 #: builtin/merge.c:811
7145 msgid "Empty commit message."
7148 #: builtin/merge.c:823
7150 msgid "Wonderful.\n"
7153 #: builtin/merge.c:878
7155 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7156 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7158 #: builtin/merge.c:894
7160 msgid "'%s' is not a commit"
7161 msgstr "'%s' 不是一个提交"
7163 #: builtin/merge.c:935
7164 msgid "No current branch."
7167 #: builtin/merge.c:937
7168 msgid "No remote for the current branch."
7169 msgstr "当前分支没有对应的远程版本库。"
7171 #: builtin/merge.c:939
7172 msgid "No default upstream defined for the current branch."
7173 msgstr "当前分支没有定义默认的上游分支。"
7175 #: builtin/merge.c:944
7177 msgid "No remote-tracking branch for %s from %s"
7178 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7180 #: builtin/merge.c:1081
7182 msgid "could not close '%s'"
7185 #: builtin/merge.c:1208
7186 msgid "There is no merge to abort (MERGE_HEAD missing)."
7187 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7189 #: builtin/merge.c:1224
7191 "You have not concluded your merge (MERGE_HEAD exists).\n"
7192 "Please, commit your changes before you merge."
7194 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7197 #: builtin/merge.c:1227 git-pull.sh:74
7198 msgid "You have not concluded your merge (MERGE_HEAD exists)."
7199 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7201 #: builtin/merge.c:1231
7203 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7204 "Please, commit your changes before you merge."
7206 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7209 #: builtin/merge.c:1234
7210 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7211 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7213 #: builtin/merge.c:1243
7214 msgid "You cannot combine --squash with --no-ff."
7215 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7217 #: builtin/merge.c:1251
7218 msgid "No commit specified and merge.defaultToUpstream not set."
7219 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7221 #: builtin/merge.c:1268
7222 msgid "Squash commit into empty head not supported yet"
7223 msgstr "尚不支持到空分支的压缩提交"
7225 #: builtin/merge.c:1270
7226 msgid "Non-fast-forward commit does not make sense into an empty head"
7227 msgstr "到空分支的非快进式提交没有意义"
7229 #: builtin/merge.c:1276
7231 msgid "%s - not something we can merge"
7234 #: builtin/merge.c:1278
7235 msgid "Can merge only exactly one commit into empty head"
7236 msgstr "只能将一个提交合并到空分支上"
7238 #: builtin/merge.c:1333
7240 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7241 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7243 #: builtin/merge.c:1336
7245 msgid "Commit %s has a bad GPG signature allegedly by %s."
7246 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7248 #: builtin/merge.c:1339
7250 msgid "Commit %s does not have a GPG signature."
7251 msgstr "提交 %s 没有一个 GPG 签名。"
7253 #: builtin/merge.c:1342
7255 msgid "Commit %s has a good GPG signature by %s\n"
7256 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7258 #: builtin/merge.c:1423
7260 msgid "Updating %s..%s\n"
7261 msgstr "更新 %s..%s\n"
7263 #: builtin/merge.c:1462
7265 msgid "Trying really trivial in-index merge...\n"
7266 msgstr "尝试非常小的索引内合并...\n"
7268 #: builtin/merge.c:1469
7273 #: builtin/merge.c:1501
7274 msgid "Not possible to fast-forward, aborting."
7277 #: builtin/merge.c:1524 builtin/merge.c:1603
7279 msgid "Rewinding the tree to pristine...\n"
7280 msgstr "将树回滚至原始状态...\n"
7282 #: builtin/merge.c:1528
7284 msgid "Trying merge strategy %s...\n"
7285 msgstr "尝试合并策略 %s...\n"
7287 #: builtin/merge.c:1594
7289 msgid "No merge strategy handled the merge.\n"
7290 msgstr "没有合并策略处理此合并。\n"
7292 #: builtin/merge.c:1596
7294 msgid "Merge with strategy %s failed.\n"
7295 msgstr "使用策略 %s 合并失败。\n"
7297 #: builtin/merge.c:1605
7299 msgid "Using the %s to prepare resolving by hand.\n"
7300 msgstr "使用 %s 以准备手工解决。\n"
7302 #: builtin/merge.c:1617
7304 msgid "Automatic merge went well; stopped before committing as requested\n"
7305 msgstr "自动合并进展顺利,按要求在提交前停止\n"
7307 #: builtin/merge-base.c:29
7308 msgid "git merge-base [-a | --all] <commit> <commit>..."
7309 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7311 #: builtin/merge-base.c:30
7312 msgid "git merge-base [-a | --all] --octopus <commit>..."
7313 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7315 #: builtin/merge-base.c:31
7316 msgid "git merge-base --independent <commit>..."
7317 msgstr "git merge-base --independent <提交>..."
7319 #: builtin/merge-base.c:32
7320 msgid "git merge-base --is-ancestor <commit> <commit>"
7321 msgstr "git merge-base --is-ancestor <提交> <提交>"
7323 #: builtin/merge-base.c:33
7324 msgid "git merge-base --fork-point <ref> [<commit>]"
7325 msgstr "git merge-base --fork-point <引用> [<提交>]"
7327 #: builtin/merge-base.c:214
7328 msgid "output all common ancestors"
7331 #: builtin/merge-base.c:216
7332 msgid "find ancestors for a single n-way merge"
7333 msgstr "查找一个多路合并的祖先提交"
7335 #: builtin/merge-base.c:218
7336 msgid "list revs not reachable from others"
7337 msgstr "显示不能被其他访问到的版本"
7339 #: builtin/merge-base.c:220
7340 msgid "is the first one ancestor of the other?"
7341 msgstr "第一个是其他的祖先提交么?"
7343 #: builtin/merge-base.c:222
7344 msgid "find where <commit> forked from reflog of <ref>"
7345 msgstr "查找 <提交> 从<引用>日志的何处分支的"
7347 #: builtin/merge-file.c:8
7349 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7350 "<orig-file> <file2>"
7352 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7355 #: builtin/merge-file.c:33
7356 msgid "send results to standard output"
7359 #: builtin/merge-file.c:34
7360 msgid "use a diff3 based merge"
7361 msgstr "使用基于 diff3 的合并"
7363 #: builtin/merge-file.c:35
7364 msgid "for conflicts, use our version"
7365 msgstr "如果冲突,使用我们的版本"
7367 #: builtin/merge-file.c:37
7368 msgid "for conflicts, use their version"
7369 msgstr "如果冲突,使用他们的版本"
7371 #: builtin/merge-file.c:39
7372 msgid "for conflicts, use a union version"
7373 msgstr "如果冲突,使用联合版本"
7375 #: builtin/merge-file.c:42
7376 msgid "for conflicts, use this marker size"
7377 msgstr "如果冲突,使用指定长度的标记"
7379 #: builtin/merge-file.c:43
7380 msgid "do not warn about conflicts"
7383 #: builtin/merge-file.c:45
7384 msgid "set labels for file1/orig-file/file2"
7385 msgstr "为 文件1/初始文件/文件2 设置标签"
7387 #: builtin/mktree.c:64
7388 msgid "git mktree [-z] [--missing] [--batch]"
7389 msgstr "git mktree [-z] [--missing] [--batch]"
7391 #: builtin/mktree.c:150
7392 msgid "input is NUL terminated"
7393 msgstr "输入以 NUL 字符终止"
7395 #: builtin/mktree.c:151 builtin/write-tree.c:24
7396 msgid "allow missing objects"
7399 #: builtin/mktree.c:152
7400 msgid "allow creation of more than one tree"
7404 msgid "git mv [<options>] <source>... <destination>"
7405 msgstr "git mv [<选项>] <源>... <目标>"
7409 msgid "Directory %s is in index and no submodule?"
7410 msgstr "目录 %s 在索引中并且不是子模组?"
7413 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7414 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7418 msgid "%.*s is in index"
7422 msgid "force move/rename even if target exists"
7423 msgstr "强制移动/重命令,即使目标存在"
7426 msgid "skip move/rename errors"
7431 msgid "destination '%s' is not a directory"
7432 msgstr "目标 '%s' 不是一个目录"
7436 msgid "Checking rename of '%s' to '%s'\n"
7437 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7444 msgid "can not move directory into itself"
7448 msgid "cannot move directory over file"
7452 msgid "source directory is empty"
7456 msgid "not under version control"
7460 msgid "destination exists"
7465 msgid "overwriting '%s'"
7469 msgid "Cannot overwrite"
7473 msgid "multiple sources for the same target"
7477 msgid "destination directory does not exist"
7482 msgid "%s, source=%s, destination=%s"
7483 msgstr "%s,源=%s,目标=%s"
7487 msgid "Renaming %s to %s\n"
7488 msgstr "重命名 %s 至 %s\n"
7490 #: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
7492 msgid "renaming '%s' failed"
7493 msgstr "重命名 '%s' 失败"
7495 #: builtin/name-rev.c:255
7496 msgid "git name-rev [<options>] <commit>..."
7497 msgstr "git name-rev [<选项>] <提交>..."
7499 #: builtin/name-rev.c:256
7500 msgid "git name-rev [<options>] --all"
7501 msgstr "git name-rev [<选项>] --all"
7503 #: builtin/name-rev.c:257
7504 msgid "git name-rev [<options>] --stdin"
7505 msgstr "git name-rev [<选项>] --stdin"
7507 #: builtin/name-rev.c:309
7508 msgid "print only names (no SHA-1)"
7509 msgstr "只打印名称(无 SHA-1)"
7511 #: builtin/name-rev.c:310
7512 msgid "only use tags to name the commits"
7513 msgstr "只使用 tags 来命名提交"
7515 #: builtin/name-rev.c:312
7516 msgid "only use refs matching <pattern>"
7517 msgstr "只使用和 <模式> 相匹配的引用"
7519 #: builtin/name-rev.c:314
7520 msgid "list all commits reachable from all refs"
7521 msgstr "列出可以从所有引用访问的提交"
7523 #: builtin/name-rev.c:315
7524 msgid "read from stdin"
7527 #: builtin/name-rev.c:316
7528 msgid "allow to print `undefined` names (default)"
7529 msgstr "允许打印 `未定义` 的名称(默认)"
7531 #: builtin/name-rev.c:322
7532 msgid "dereference tags in the input (internal use)"
7533 msgstr "反向解析输入中的 tags(内部使用)"
7535 #: builtin/notes.c:24
7536 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7537 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7539 #: builtin/notes.c:25
7541 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7542 "| (-c | -C) <object>] [<object>]"
7544 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7545 "| (-c | -C) <对象>] [<对象>]"
7547 #: builtin/notes.c:26
7548 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7549 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7551 #: builtin/notes.c:27
7553 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7554 "(-c | -C) <object>] [<object>]"
7556 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7557 "(-c | -C) <对象>] [<对象>]"
7559 #: builtin/notes.c:28
7560 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7561 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7563 #: builtin/notes.c:29
7564 msgid "git notes [--ref <notes-ref>] show [<object>]"
7565 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7567 #: builtin/notes.c:30
7569 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7570 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7572 #: builtin/notes.c:31
7573 msgid "git notes merge --commit [-v | -q]"
7574 msgstr "git notes merge --commit [-v | -q]"
7576 #: builtin/notes.c:32
7577 msgid "git notes merge --abort [-v | -q]"
7578 msgstr "git notes merge --abort [-v | -q]"
7580 #: builtin/notes.c:33
7581 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7582 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7584 #: builtin/notes.c:34
7585 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7586 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7588 #: builtin/notes.c:35
7589 msgid "git notes [--ref <notes-ref>] get-ref"
7590 msgstr "git notes [--ref <注解引用>] get-ref"
7592 #: builtin/notes.c:40
7593 msgid "git notes [list [<object>]]"
7594 msgstr "git notes [list [<对象>]]"
7596 #: builtin/notes.c:45
7597 msgid "git notes add [<options>] [<object>]"
7598 msgstr "git notes add [<选项>] [<对象>]"
7600 #: builtin/notes.c:50
7601 msgid "git notes copy [<options>] <from-object> <to-object>"
7602 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7604 #: builtin/notes.c:51
7605 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7606 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7608 #: builtin/notes.c:56
7609 msgid "git notes append [<options>] [<object>]"
7610 msgstr "git notes append [<选项>] [<对象>]"
7612 #: builtin/notes.c:61
7613 msgid "git notes edit [<object>]"
7614 msgstr "git notes edit [<对象>]"
7616 #: builtin/notes.c:66
7617 msgid "git notes show [<object>]"
7618 msgstr "git notes show [<对象>]"
7620 #: builtin/notes.c:71
7621 msgid "git notes merge [<options>] <notes-ref>"
7622 msgstr "git notes merge [<选项>] <注解引用>"
7624 #: builtin/notes.c:72
7625 msgid "git notes merge --commit [<options>]"
7626 msgstr "git notes merge --commit [<选项>]"
7628 #: builtin/notes.c:73
7629 msgid "git notes merge --abort [<options>]"
7630 msgstr "git notes merge --abort [<选项>]"
7632 #: builtin/notes.c:78
7633 msgid "git notes remove [<object>]"
7634 msgstr "git notes remove [<对象>]"
7636 #: builtin/notes.c:83
7637 msgid "git notes prune [<options>]"
7638 msgstr "git notes prune [<选项>]"
7640 #: builtin/notes.c:88
7641 msgid "git notes get-ref"
7642 msgstr "git notes get-ref"
7644 #: builtin/notes.c:146
7646 msgid "unable to start 'show' for object '%s'"
7647 msgstr "不能为对象 '%s' 开始 'show'"
7649 #: builtin/notes.c:150
7650 msgid "could not read 'show' output"
7651 msgstr "不能读取 'show' 的输出"
7653 #: builtin/notes.c:158
7655 msgid "failed to finish 'show' for object '%s'"
7656 msgstr "无法为对象 '%s' 完成 'show'"
7658 #: builtin/notes.c:173 builtin/tag.c:477
7660 msgid "could not create file '%s'"
7661 msgstr "不能创建文件 '%s'"
7663 #: builtin/notes.c:192
7664 msgid "Please supply the note contents using either -m or -F option"
7665 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7667 #: builtin/notes.c:201
7668 msgid "unable to write note object"
7671 #: builtin/notes.c:203
7673 msgid "The note contents have been left in %s"
7674 msgstr "注解内容被留在 %s 中"
7676 #: builtin/notes.c:231 builtin/tag.c:693
7678 msgid "cannot read '%s'"
7681 #: builtin/notes.c:233 builtin/tag.c:696
7683 msgid "could not open or read '%s'"
7684 msgstr "不能打开或读取 '%s'"
7686 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7687 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7688 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7689 #: builtin/notes.c:854 builtin/tag.c:709
7691 msgid "Failed to resolve '%s' as a valid ref."
7692 msgstr "无法解析 '%s' 为一个有效引用。"
7694 #: builtin/notes.c:255
7696 msgid "Failed to read object '%s'."
7697 msgstr "无法读取对象 '%s'。"
7699 #: builtin/notes.c:259
7701 msgid "Cannot read note data from non-blob object '%s'."
7702 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7704 #: builtin/notes.c:299
7706 msgid "Malformed input line: '%s'."
7707 msgstr "非法的输入行:'%s'。"
7709 #: builtin/notes.c:314
7711 msgid "Failed to copy notes from '%s' to '%s'"
7712 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7714 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7715 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7716 #: builtin/notes.c:919
7717 msgid "too many parameters"
7720 #: builtin/notes.c:371 builtin/notes.c:658
7722 msgid "No note found for object %s."
7723 msgstr "未发现对象 %s 的注解。"
7725 #: builtin/notes.c:392 builtin/notes.c:555
7726 msgid "note contents as a string"
7727 msgstr "注解内容作为一个字符串"
7729 #: builtin/notes.c:395 builtin/notes.c:558
7730 msgid "note contents in a file"
7733 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7734 #: builtin/notes.c:563 builtin/tag.c:628
7738 #: builtin/notes.c:398 builtin/notes.c:561
7739 msgid "reuse and edit specified note object"
7740 msgstr "重用和编辑指定的注解对象"
7742 #: builtin/notes.c:401 builtin/notes.c:564
7743 msgid "reuse specified note object"
7746 #: builtin/notes.c:404 builtin/notes.c:567
7747 msgid "allow storing empty note"
7750 #: builtin/notes.c:405 builtin/notes.c:476
7751 msgid "replace existing notes"
7754 #: builtin/notes.c:430
7757 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7759 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7761 #: builtin/notes.c:445 builtin/notes.c:524
7763 msgid "Overwriting existing notes for object %s\n"
7764 msgstr "覆盖对象 %s 现存注解\n"
7766 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7768 msgid "Removing note for object %s\n"
7769 msgstr "删除对象 %s 的注解\n"
7771 #: builtin/notes.c:477
7772 msgid "read objects from stdin"
7775 #: builtin/notes.c:479
7776 msgid "load rewriting config for <command> (implies --stdin)"
7777 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7779 #: builtin/notes.c:497
7780 msgid "too few parameters"
7783 #: builtin/notes.c:518
7786 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7788 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7790 #: builtin/notes.c:530
7792 msgid "Missing notes on source object %s. Cannot copy."
7793 msgstr "源对象 %s 缺少注解。不能拷贝。"
7795 #: builtin/notes.c:582
7798 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7799 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7801 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7802 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7804 #: builtin/notes.c:750
7805 msgid "General options"
7808 #: builtin/notes.c:752
7809 msgid "Merge options"
7812 #: builtin/notes.c:754
7814 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7816 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7818 #: builtin/notes.c:756
7819 msgid "Committing unmerged notes"
7822 #: builtin/notes.c:758
7823 msgid "finalize notes merge by committing unmerged notes"
7824 msgstr "通过提交未合并的注解来完成注解合并"
7826 #: builtin/notes.c:760
7827 msgid "Aborting notes merge resolution"
7830 #: builtin/notes.c:762
7831 msgid "abort notes merge"
7834 #: builtin/notes.c:857
7836 msgid "Object %s has no note\n"
7837 msgstr "对象 %s 没有注解\n"
7839 #: builtin/notes.c:869
7840 msgid "attempt to remove non-existent note is not an error"
7841 msgstr "尝试删除不存在的注解不是一个错误"
7843 #: builtin/notes.c:872
7844 msgid "read object names from the standard input"
7845 msgstr "从标准输入读取对象名称"
7847 #: builtin/notes.c:953
7851 #: builtin/notes.c:954
7852 msgid "use notes from <notes-ref>"
7853 msgstr "从 <注解引用> 使用注解"
7855 #: builtin/notes.c:989 builtin/remote.c:1618
7857 msgid "Unknown subcommand: %s"
7860 #: builtin/pack-objects.c:28
7861 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7862 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7864 #: builtin/pack-objects.c:29
7865 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7866 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7868 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7870 msgid "deflate error (%d)"
7873 #: builtin/pack-objects.c:771
7874 msgid "Writing objects"
7877 #: builtin/pack-objects.c:1011
7878 msgid "disabling bitmap writing, as some objects are not being packed"
7879 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7881 #: builtin/pack-objects.c:2171
7882 msgid "Compressing objects"
7885 #: builtin/pack-objects.c:2568
7887 msgid "unsupported index version %s"
7888 msgstr "不支持的索引版本 %s"
7890 #: builtin/pack-objects.c:2572
7892 msgid "bad index version '%s'"
7893 msgstr "坏的索引版本 '%s'"
7895 #: builtin/pack-objects.c:2595
7897 msgid "option %s does not accept negative form"
7898 msgstr "选项 %s 不接受否定格式"
7900 #: builtin/pack-objects.c:2599
7902 msgid "unable to parse value '%s' for option %s"
7903 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7905 #: builtin/pack-objects.c:2619
7906 msgid "do not show progress meter"
7909 #: builtin/pack-objects.c:2621
7910 msgid "show progress meter"
7913 #: builtin/pack-objects.c:2623
7914 msgid "show progress meter during object writing phase"
7915 msgstr "在对象写入阶段显示进度表"
7917 #: builtin/pack-objects.c:2626
7918 msgid "similar to --all-progress when progress meter is shown"
7919 msgstr "当进度表显示时类似于 --all-progress"
7921 #: builtin/pack-objects.c:2627
7922 msgid "version[,offset]"
7925 #: builtin/pack-objects.c:2628
7926 msgid "write the pack index file in the specified idx format version"
7927 msgstr "用指定的 idx 格式版本来写包索引文件"
7929 #: builtin/pack-objects.c:2631
7930 msgid "maximum size of each output pack file"
7933 #: builtin/pack-objects.c:2633
7934 msgid "ignore borrowed objects from alternate object store"
7935 msgstr "忽略从替代对象存储里借用对象"
7937 #: builtin/pack-objects.c:2635
7938 msgid "ignore packed objects"
7941 #: builtin/pack-objects.c:2637
7942 msgid "limit pack window by objects"
7945 #: builtin/pack-objects.c:2639
7946 msgid "limit pack window by memory in addition to object limit"
7947 msgstr "除对象数量限制外设置打包窗口的内存限制"
7949 #: builtin/pack-objects.c:2641
7950 msgid "maximum length of delta chain allowed in the resulting pack"
7951 msgstr "打包允许的 delta 链的最大长度"
7953 #: builtin/pack-objects.c:2643
7954 msgid "reuse existing deltas"
7955 msgstr "重用已存在的 deltas"
7957 #: builtin/pack-objects.c:2645
7958 msgid "reuse existing objects"
7961 #: builtin/pack-objects.c:2647
7962 msgid "use OFS_DELTA objects"
7963 msgstr "使用 OFS_DELTA 对象"
7965 #: builtin/pack-objects.c:2649
7966 msgid "use threads when searching for best delta matches"
7967 msgstr "使用线程查询最佳 delta 匹配"
7969 #: builtin/pack-objects.c:2651
7970 msgid "do not create an empty pack output"
7973 #: builtin/pack-objects.c:2653
7974 msgid "read revision arguments from standard input"
7975 msgstr "从标准输入读取版本号参数"
7977 #: builtin/pack-objects.c:2655
7978 msgid "limit the objects to those that are not yet packed"
7979 msgstr "限制那些尚未打包的对象"
7981 #: builtin/pack-objects.c:2658
7982 msgid "include objects reachable from any reference"
7983 msgstr "包括可以从任何引用访问到的对象"
7985 #: builtin/pack-objects.c:2661
7986 msgid "include objects referred by reflog entries"
7987 msgstr "包括被引用日志引用到的对象"
7989 #: builtin/pack-objects.c:2664
7990 msgid "include objects referred to by the index"
7991 msgstr "包括被索引引用到的对象"
7993 #: builtin/pack-objects.c:2667
7994 msgid "output pack to stdout"
7997 #: builtin/pack-objects.c:2669
7998 msgid "include tag objects that refer to objects to be packed"
7999 msgstr "包括引用了打包对象的 tag"
8001 #: builtin/pack-objects.c:2671
8002 msgid "keep unreachable objects"
8005 #: builtin/pack-objects.c:2672 parse-options.h:139
8009 #: builtin/pack-objects.c:2673
8010 msgid "unpack unreachable objects newer than <time>"
8011 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8013 #: builtin/pack-objects.c:2676
8014 msgid "create thin packs"
8017 #: builtin/pack-objects.c:2678
8018 msgid "create packs suitable for shallow fetches"
8019 msgstr "创建适合浅克隆版本库获取的包"
8021 #: builtin/pack-objects.c:2680
8022 msgid "ignore packs that have companion .keep file"
8023 msgstr "忽略配有 .keep 文件的包"
8025 #: builtin/pack-objects.c:2682
8026 msgid "pack compression level"
8029 #: builtin/pack-objects.c:2684
8030 msgid "do not hide commits by grafts"
8033 #: builtin/pack-objects.c:2686
8034 msgid "use a bitmap index if available to speed up counting objects"
8035 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8037 #: builtin/pack-objects.c:2688
8038 msgid "write a bitmap index together with the pack index"
8039 msgstr "在建立包索引的同时创建 bitmap 索引"
8041 #: builtin/pack-objects.c:2779
8042 msgid "Counting objects"
8045 #: builtin/pack-refs.c:6
8046 msgid "git pack-refs [<options>]"
8047 msgstr "git pack-refs [<选项>]"
8049 #: builtin/pack-refs.c:14
8050 msgid "pack everything"
8053 #: builtin/pack-refs.c:15
8054 msgid "prune loose refs (default)"
8055 msgstr "清除松散的引用(默认)"
8057 #: builtin/prune-packed.c:7
8058 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8059 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8061 #: builtin/prune-packed.c:40
8062 msgid "Removing duplicate objects"
8065 #: builtin/prune.c:12
8066 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8067 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8069 #: builtin/prune.c:86
8071 msgid "Removing worktrees/%s: not a valid directory"
8072 msgstr "删除工作区/%s:不是一个有效的目录"
8074 #: builtin/prune.c:92
8076 msgid "Removing worktrees/%s: gitdir file does not exist"
8077 msgstr "删除 worktrees/%s:gitdir 文件不存在"
8079 #: builtin/prune.c:97
8081 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
8082 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
8084 #: builtin/prune.c:108
8086 msgid "Removing worktrees/%s: invalid gitdir file"
8087 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
8089 #: builtin/prune.c:124
8091 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
8092 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
8094 #: builtin/prune.c:159
8096 msgid "failed to remove: %s"
8099 #: builtin/prune.c:196
8100 msgid "do not remove, show only"
8103 #: builtin/prune.c:197
8104 msgid "report pruned objects"
8107 #: builtin/prune.c:199
8108 msgid "prune .git/worktrees"
8109 msgstr "清理 .git/worktrees"
8111 #: builtin/prune.c:201
8112 msgid "expire objects older than <time>"
8113 msgstr "使早于给定时间的对象过期"
8115 #: builtin/prune.c:216
8116 msgid "--worktrees does not take extra arguments"
8117 msgstr "--worktrees 没有附加参数"
8119 #: builtin/push.c:14
8120 msgid "git push [<options>] [<repository> [<refspec>...]]"
8121 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
8123 #: builtin/push.c:85
8124 msgid "tag shorthand without <tag>"
8125 msgstr "tag 后面未提供 <标签> 参数"
8127 #: builtin/push.c:95
8128 msgid "--delete only accepts plain target ref names"
8129 msgstr "--delete 只接受简单的目标引用名"
8131 #: builtin/push.c:139
8134 "To choose either option permanently, see push.default in 'git help config'."
8137 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8139 #: builtin/push.c:142
8142 "The upstream branch of your current branch does not match\n"
8143 "the name of your current branch. To push to the upstream branch\n"
8144 "on the remote, use\n"
8146 " git push %s HEAD:%s\n"
8148 "To push to the branch of the same name on the remote, use\n"
8153 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8156 " git push %s HEAD:%s\n"
8163 #: builtin/push.c:157
8166 "You are not currently on a branch.\n"
8167 "To push the history leading to the current (detached HEAD)\n"
8170 " git push %s HEAD:<name-of-remote-branch>\n"
8173 "现在为推送当前(分离头指针)的历史,使用\n"
8175 " git push %s HEAD:<远程分支名字>\n"
8177 #: builtin/push.c:171
8180 "The current branch %s has no upstream branch.\n"
8181 "To push the current branch and set the remote as upstream, use\n"
8183 " git push --set-upstream %s %s\n"
8185 "当前分支 %s 没有对应的上游分支。\n"
8186 "为推送当前分支并建立与远程上游的跟踪,使用\n"
8188 " git push --set-upstream %s %s\n"
8190 #: builtin/push.c:179
8192 msgid "The current branch %s has multiple upstream branches, refusing to push."
8193 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8195 #: builtin/push.c:182
8198 "You are pushing to remote '%s', which is not the upstream of\n"
8199 "your current branch '%s', without telling me what to push\n"
8200 "to update which remote branch."
8202 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8203 "而没有告诉我要推送什么、更新哪个远程分支。"
8205 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8206 #: builtin/push.c:205
8208 "push.default is unset; its implicit value has changed in\n"
8209 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8210 "and maintain the traditional behavior, use:\n"
8212 " git config --global push.default matching\n"
8214 "To squelch this message and adopt the new behavior now, use:\n"
8216 " git config --global push.default simple\n"
8218 "When push.default is set to 'matching', git will push local branches\n"
8219 "to the remote branches that already exist with the same name.\n"
8221 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8222 "behavior, which only pushes the current branch to the corresponding\n"
8223 "remote branch that 'git pull' uses to update the current branch.\n"
8225 "See 'git help config' and search for 'push.default' for further "
8227 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8228 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8230 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8231 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8233 " git config --global push.default matching\n"
8235 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8237 " git config --global push.default simple\n"
8239 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8242 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8243 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8245 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8246 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8247 "为保持兼容,请用 'current' 代替 'simple')"
8249 #: builtin/push.c:272
8251 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8252 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8254 #: builtin/push.c:279
8256 "Updates were rejected because the tip of your current branch is behind\n"
8257 "its remote counterpart. Integrate the remote changes (e.g.\n"
8258 "'git pull ...') before pushing again.\n"
8259 "See the 'Note about fast-forwards' in 'git push --help' for details."
8261 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8262 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8263 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8265 #: builtin/push.c:285
8267 "Updates were rejected because a pushed branch tip is behind its remote\n"
8268 "counterpart. Check out this branch and integrate the remote changes\n"
8269 "(e.g. 'git pull ...') before pushing again.\n"
8270 "See the 'Note about fast-forwards' in 'git push --help' for details."
8272 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8273 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8274 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8276 #: builtin/push.c:291
8278 "Updates were rejected because the remote contains work that you do\n"
8279 "not have locally. This is usually caused by another repository pushing\n"
8280 "to the same ref. You may want to first integrate the remote changes\n"
8281 "(e.g., 'git pull ...') before pushing again.\n"
8282 "See the 'Note about fast-forwards' in 'git push --help' for details."
8284 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8285 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8286 "(如 'git pull ...')。\n"
8287 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8289 #: builtin/push.c:298
8290 msgid "Updates were rejected because the tag already exists in the remote."
8291 msgstr "更新被拒绝因为 tag 在远程已经存在。"
8293 #: builtin/push.c:301
8295 "You cannot update a remote ref that points at a non-commit object,\n"
8296 "or update a remote ref to make it point at a non-commit object,\n"
8297 "without using the '--force' option.\n"
8299 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8300 "也不能更新远程引用让其指向一个非提交对象。\n"
8302 #: builtin/push.c:360
8304 msgid "Pushing to %s\n"
8307 #: builtin/push.c:364
8309 msgid "failed to push some refs to '%s'"
8310 msgstr "无法推送一些引用到 '%s'"
8312 #: builtin/push.c:394
8314 msgid "bad repository '%s'"
8317 #: builtin/push.c:395
8319 "No configured push destination.\n"
8320 "Either specify the URL from the command-line or configure a remote "
8321 "repository using\n"
8323 " git remote add <name> <url>\n"
8325 "and then push using the remote name\n"
8327 " git push <name>\n"
8330 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8332 " git remote add <名称> <地址>\n"
8338 #: builtin/push.c:410
8339 msgid "--all and --tags are incompatible"
8340 msgstr "--all 和 --tags 不兼容"
8342 #: builtin/push.c:411
8343 msgid "--all can't be combined with refspecs"
8344 msgstr "--all 不能和引用规则同时使用"
8346 #: builtin/push.c:416
8347 msgid "--mirror and --tags are incompatible"
8348 msgstr "--mirror 和 --tags 不兼容"
8350 #: builtin/push.c:417
8351 msgid "--mirror can't be combined with refspecs"
8352 msgstr "--mirror 不能和引用规则同时使用"
8354 #: builtin/push.c:422
8355 msgid "--all and --mirror are incompatible"
8356 msgstr "--all 和 --mirror 不兼容"
8358 #: builtin/push.c:502
8362 #: builtin/push.c:503
8363 msgid "push all refs"
8366 #: builtin/push.c:504
8367 msgid "mirror all refs"
8370 #: builtin/push.c:506
8374 #: builtin/push.c:507
8375 msgid "push tags (can't be used with --all or --mirror)"
8376 msgstr "推送 tags(不能使用 --all or --mirror)"
8378 #: builtin/push.c:510
8379 msgid "force updates"
8382 #: builtin/push.c:512
8383 msgid "refname>:<expect"
8386 #: builtin/push.c:513
8387 msgid "require old value of ref to be at this value"
8388 msgstr "要求引用旧的取值为设定值"
8390 #: builtin/push.c:516
8391 msgid "control recursive pushing of submodules"
8394 #: builtin/push.c:518
8395 msgid "use thin pack"
8398 #: builtin/push.c:519 builtin/push.c:520
8399 msgid "receive pack program"
8402 #: builtin/push.c:521
8403 msgid "set upstream for git pull/status"
8404 msgstr "设置 git pull/status 的上游"
8406 #: builtin/push.c:524
8407 msgid "prune locally removed refs"
8410 #: builtin/push.c:526
8411 msgid "bypass pre-push hook"
8412 msgstr "绕过 pre-push 钩子"
8414 #: builtin/push.c:527
8415 msgid "push missing but relevant tags"
8416 msgstr "推送缺失的有关的 tags"
8418 #: builtin/push.c:529
8419 msgid "GPG sign the push"
8420 msgstr "用 GPG 为推送签名"
8422 #: builtin/push.c:530
8423 msgid "request atomic transaction on remote side"
8426 #: builtin/push.c:539
8427 msgid "--delete is incompatible with --all, --mirror and --tags"
8428 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8430 #: builtin/push.c:541
8431 msgid "--delete doesn't make sense without any refs"
8432 msgstr "--delete 未接任何引用没有意义"
8434 #: builtin/read-tree.c:37
8436 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8437 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8438 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8440 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8441 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8442 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8444 #: builtin/read-tree.c:110
8445 msgid "write resulting index to <file>"
8446 msgstr "将索引结果写入 <文件>"
8448 #: builtin/read-tree.c:113
8449 msgid "only empty the index"
8452 #: builtin/read-tree.c:115
8456 #: builtin/read-tree.c:117
8457 msgid "perform a merge in addition to a read"
8458 msgstr "读取之余再执行一个合并"
8460 #: builtin/read-tree.c:119
8461 msgid "3-way merge if no file level merging required"
8462 msgstr "如果没有文件级合并需要,执行三路合并"
8464 #: builtin/read-tree.c:121
8465 msgid "3-way merge in presence of adds and removes"
8466 msgstr "存在添加和删除时,也执行三路合并"
8468 #: builtin/read-tree.c:123
8469 msgid "same as -m, but discard unmerged entries"
8470 msgstr "类似于 -m,但丢弃未合并的条目"
8472 #: builtin/read-tree.c:124
8473 msgid "<subdirectory>/"
8476 #: builtin/read-tree.c:125
8477 msgid "read the tree into the index under <subdirectory>/"
8478 msgstr "读取树对象到索引的 <子目录>/ 下"
8480 #: builtin/read-tree.c:128
8481 msgid "update working tree with merge result"
8482 msgstr "用合并的结果更新工作区"
8484 #: builtin/read-tree.c:130
8488 #: builtin/read-tree.c:131
8489 msgid "allow explicitly ignored files to be overwritten"
8490 msgstr "允许忽略文件中设定的文件可以被覆盖"
8492 #: builtin/read-tree.c:134
8493 msgid "don't check the working tree after merging"
8496 #: builtin/read-tree.c:135
8497 msgid "don't update the index or the work tree"
8500 #: builtin/read-tree.c:137
8501 msgid "skip applying sparse checkout filter"
8502 msgstr "跳过应用稀疏检出过滤器"
8504 #: builtin/read-tree.c:139
8505 msgid "debug unpack-trees"
8506 msgstr "调试 unpack-trees"
8508 #: builtin/reflog.c:430
8510 msgid "%s' for '%s' is not a valid timestamp"
8511 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8513 #: builtin/reflog.c:547 builtin/reflog.c:552
8515 msgid "'%s' is not a valid timestamp"
8516 msgstr "'%s' 不是一个有效的时间戳"
8518 #: builtin/remote.c:12
8519 msgid "git remote [-v | --verbose]"
8520 msgstr "git remote [-v | --verbose]"
8522 #: builtin/remote.c:13
8524 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8525 "mirror=<fetch|push>] <name> <url>"
8527 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8528 "mirror=<fetch|push>] <名称> <地址>"
8530 #: builtin/remote.c:14 builtin/remote.c:33
8531 msgid "git remote rename <old> <new>"
8532 msgstr "git remote rename <旧名称> <新名称>"
8534 #: builtin/remote.c:15 builtin/remote.c:38
8535 msgid "git remote remove <name>"
8536 msgstr "git remote remove <名称>"
8538 #: builtin/remote.c:16 builtin/remote.c:43
8539 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8540 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8542 #: builtin/remote.c:17
8543 msgid "git remote [-v | --verbose] show [-n] <name>"
8544 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8546 #: builtin/remote.c:18
8547 msgid "git remote prune [-n | --dry-run] <name>"
8548 msgstr "git remote prune [-n | --dry-run] <名称>"
8550 #: builtin/remote.c:19
8552 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8553 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8555 #: builtin/remote.c:20
8556 msgid "git remote set-branches [--add] <name> <branch>..."
8557 msgstr "git remote set-branches [--add] <名称> <分支>..."
8559 #: builtin/remote.c:21 builtin/remote.c:69
8560 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8561 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8563 #: builtin/remote.c:22 builtin/remote.c:70
8564 msgid "git remote set-url --add <name> <newurl>"
8565 msgstr "git remote set-url --add <名称> <新的地址>"
8567 #: builtin/remote.c:23 builtin/remote.c:71
8568 msgid "git remote set-url --delete <name> <url>"
8569 msgstr "git remote set-url --delete <名称> <地址>"
8571 #: builtin/remote.c:28
8572 msgid "git remote add [<options>] <name> <url>"
8573 msgstr "git remote add [<选项>] <名称> <地址>"
8575 #: builtin/remote.c:48
8576 msgid "git remote set-branches <name> <branch>..."
8577 msgstr "git remote set-branches <名称> <分支>..."
8579 #: builtin/remote.c:49
8580 msgid "git remote set-branches --add <name> <branch>..."
8581 msgstr "git remote set-branches --add <名称> <分支>..."
8583 #: builtin/remote.c:54
8584 msgid "git remote show [<options>] <name>"
8585 msgstr "git remote show [<选项>] <名称>"
8587 #: builtin/remote.c:59
8588 msgid "git remote prune [<options>] <name>"
8589 msgstr "git remote prune [<选项>] <名称>"
8591 #: builtin/remote.c:64
8592 msgid "git remote update [<options>] [<group> | <remote>]..."
8593 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8595 #: builtin/remote.c:88
8600 #: builtin/remote.c:120
8602 "--mirror is dangerous and deprecated; please\n"
8603 "\t use --mirror=fetch or --mirror=push instead"
8605 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8606 "\t 或 --mirror=push"
8608 #: builtin/remote.c:137
8610 msgid "unknown mirror argument: %s"
8613 #: builtin/remote.c:153
8614 msgid "fetch the remote branches"
8617 #: builtin/remote.c:155
8618 msgid "import all tags and associated objects when fetching"
8619 msgstr "抓取时导入所有的 tags 和关联对象"
8621 #: builtin/remote.c:158
8622 msgid "or do not fetch any tag at all (--no-tags)"
8623 msgstr "或不抓取任何 tag(--no-tags)"
8625 #: builtin/remote.c:160
8626 msgid "branch(es) to track"
8629 #: builtin/remote.c:161
8630 msgid "master branch"
8633 #: builtin/remote.c:162
8637 #: builtin/remote.c:163
8638 msgid "set up remote as a mirror to push to or fetch from"
8639 msgstr "把远程设置为用以推送或抓取的镜像"
8641 #: builtin/remote.c:175
8642 msgid "specifying a master branch makes no sense with --mirror"
8643 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8645 #: builtin/remote.c:177
8646 msgid "specifying branches to track makes sense only with fetch mirrors"
8647 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8649 #: builtin/remote.c:187 builtin/remote.c:640
8651 msgid "remote %s already exists."
8652 msgstr "远程 %s 已经存在。"
8654 #: builtin/remote.c:191 builtin/remote.c:644
8656 msgid "'%s' is not a valid remote name"
8657 msgstr "'%s' 不是一个有效的远程名称"
8659 #: builtin/remote.c:235
8661 msgid "Could not setup master '%s'"
8662 msgstr "无法设置 master '%s'"
8664 #: builtin/remote.c:335
8666 msgid "Could not get fetch map for refspec %s"
8667 msgstr "无法得到引用规则 %s 的获取列表"
8669 #: builtin/remote.c:436 builtin/remote.c:444
8673 #: builtin/remote.c:448
8677 #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8679 msgid "Could not append '%s' to '%s'"
8680 msgstr "不能添加 '%s' 至 '%s'"
8682 #: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
8684 msgid "No such remote: %s"
8687 #: builtin/remote.c:650
8689 msgid "Could not rename config section '%s' to '%s'"
8690 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8692 #: builtin/remote.c:656 builtin/remote.c:844
8694 msgid "Could not remove config section '%s'"
8695 msgstr "不能移除配置小节 '%s'"
8697 #: builtin/remote.c:671
8700 "Not updating non-default fetch refspec\n"
8702 "\tPlease update the configuration manually if necessary."
8708 #: builtin/remote.c:677
8710 msgid "Could not append '%s'"
8713 #: builtin/remote.c:688
8715 msgid "Could not set '%s'"
8718 #: builtin/remote.c:710
8720 msgid "deleting '%s' failed"
8723 #: builtin/remote.c:744
8725 msgid "creating '%s' failed"
8728 #: builtin/remote.c:763
8730 msgid "Could not remove branch %s"
8733 #: builtin/remote.c:830
8735 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8736 "to delete it, use:"
8738 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8739 "to delete them, use:"
8740 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8741 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8743 #: builtin/remote.c:945
8745 msgid " new (next fetch will store in remotes/%s)"
8746 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8748 #: builtin/remote.c:948
8752 #: builtin/remote.c:950
8753 msgid " stale (use 'git remote prune' to remove)"
8754 msgstr " 过时(使用 'git remote prune' 来移除)"
8756 #: builtin/remote.c:952
8760 #: builtin/remote.c:993
8762 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8763 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8765 #: builtin/remote.c:1000
8767 msgid "rebases onto remote %s"
8770 #: builtin/remote.c:1003
8772 msgid " merges with remote %s"
8775 #: builtin/remote.c:1004
8776 msgid " and with remote"
8779 #: builtin/remote.c:1006
8781 msgid "merges with remote %s"
8784 #: builtin/remote.c:1007
8785 msgid " and with remote"
8788 #: builtin/remote.c:1053
8792 #: builtin/remote.c:1056
8796 #: builtin/remote.c:1060
8800 #: builtin/remote.c:1063
8801 msgid "fast-forwardable"
8804 #: builtin/remote.c:1066
8805 msgid "local out of date"
8808 #: builtin/remote.c:1073
8810 msgid " %-*s forces to %-*s (%s)"
8811 msgstr " %-*s 强制推送至 %-*s (%s)"
8813 #: builtin/remote.c:1076
8815 msgid " %-*s pushes to %-*s (%s)"
8816 msgstr " %-*s 推送至 %-*s (%s)"
8818 #: builtin/remote.c:1080
8820 msgid " %-*s forces to %s"
8821 msgstr " %-*s 强制推送至 %s"
8823 #: builtin/remote.c:1083
8825 msgid " %-*s pushes to %s"
8826 msgstr " %-*s 推送至 %s"
8828 #: builtin/remote.c:1151
8829 msgid "do not query remotes"
8832 #: builtin/remote.c:1178
8837 #: builtin/remote.c:1179
8839 msgid " Fetch URL: %s"
8842 #: builtin/remote.c:1180 builtin/remote.c:1331
8846 #: builtin/remote.c:1189 builtin/remote.c:1191
8848 msgid " Push URL: %s"
8851 #: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
8853 msgid " HEAD branch: %s"
8856 #: builtin/remote.c:1199
8859 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8860 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8862 #: builtin/remote.c:1211
8864 msgid " Remote branch:%s"
8865 msgid_plural " Remote branches:%s"
8866 msgstr[0] " 远程分支:%s"
8867 msgstr[1] " 远程分支:%s"
8869 # 译者:中文字符串拼接,可删除前导空格
8870 #: builtin/remote.c:1214 builtin/remote.c:1241
8871 msgid " (status not queried)"
8874 #: builtin/remote.c:1223
8875 msgid " Local branch configured for 'git pull':"
8876 msgid_plural " Local branches configured for 'git pull':"
8877 msgstr[0] " 为 'git pull' 配置的本地分支:"
8878 msgstr[1] " 为 'git pull' 配置的本地分支:"
8880 #: builtin/remote.c:1231
8881 msgid " Local refs will be mirrored by 'git push'"
8882 msgstr " 本地引用将在 'git push' 时被镜像"
8884 #: builtin/remote.c:1238
8886 msgid " Local ref configured for 'git push'%s:"
8887 msgid_plural " Local refs configured for 'git push'%s:"
8888 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8889 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8891 #: builtin/remote.c:1259
8892 msgid "set refs/remotes/<name>/HEAD according to remote"
8893 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8895 #: builtin/remote.c:1261
8896 msgid "delete refs/remotes/<name>/HEAD"
8897 msgstr "删除 refs/remotes/<名称>/HEAD"
8899 #: builtin/remote.c:1276
8900 msgid "Cannot determine remote HEAD"
8901 msgstr "无法确定远程 HEAD"
8903 #: builtin/remote.c:1278
8904 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8905 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8907 #: builtin/remote.c:1288
8909 msgid "Could not delete %s"
8912 #: builtin/remote.c:1296
8914 msgid "Not a valid ref: %s"
8915 msgstr "不是一个有效引用:%s"
8917 #: builtin/remote.c:1298
8919 msgid "Could not setup %s"
8923 #: builtin/remote.c:1316
8925 msgid " %s will become dangling!"
8926 msgstr " %s 将成为摇摆状态!"
8929 #: builtin/remote.c:1317
8931 msgid " %s has become dangling!"
8932 msgstr " %s 已成为摇摆状态!"
8934 #: builtin/remote.c:1327
8939 #: builtin/remote.c:1328
8944 #: builtin/remote.c:1351
8946 msgid " * [would prune] %s"
8947 msgstr " * [将删除] %s"
8949 #: builtin/remote.c:1354
8951 msgid " * [pruned] %s"
8952 msgstr " * [已删除] %s"
8954 #: builtin/remote.c:1399
8955 msgid "prune remotes after fetching"
8958 #: builtin/remote.c:1465 builtin/remote.c:1539
8960 msgid "No such remote '%s'"
8963 #: builtin/remote.c:1485
8967 #: builtin/remote.c:1492
8968 msgid "no remote specified"
8971 #: builtin/remote.c:1514
8972 msgid "manipulate push URLs"
8975 #: builtin/remote.c:1516
8979 #: builtin/remote.c:1518
8983 #: builtin/remote.c:1525
8984 msgid "--add --delete doesn't make sense"
8985 msgstr "--add --delete 无意义"
8987 #: builtin/remote.c:1565
8989 msgid "Invalid old URL pattern: %s"
8990 msgstr "无效的旧URL匹配模版:%s"
8992 #: builtin/remote.c:1573
8994 msgid "No such URL found: %s"
8997 #: builtin/remote.c:1575
8998 msgid "Will not delete all non-push URLs"
8999 msgstr "将不会删除所有非推送URL地址"
9001 #: builtin/remote.c:1589
9002 msgid "be verbose; must be placed before a subcommand"
9003 msgstr "冗长输出;必须置于子命令之前"
9005 #: builtin/repack.c:17
9006 msgid "git repack [<options>]"
9007 msgstr "git repack [<选项>]"
9009 #: builtin/repack.c:159
9010 msgid "pack everything in a single pack"
9011 msgstr "所有内容打包到一个包文件中"
9013 #: builtin/repack.c:161
9014 msgid "same as -a, and turn unreachable objects loose"
9015 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9017 #: builtin/repack.c:164
9018 msgid "remove redundant packs, and run git-prune-packed"
9019 msgstr "删除多余的包,运行 git-prune-packed"
9021 #: builtin/repack.c:166
9022 msgid "pass --no-reuse-delta to git-pack-objects"
9023 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9025 #: builtin/repack.c:168
9026 msgid "pass --no-reuse-object to git-pack-objects"
9027 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9029 #: builtin/repack.c:170
9030 msgid "do not run git-update-server-info"
9031 msgstr "不运行 git-update-server-info"
9033 #: builtin/repack.c:173
9034 msgid "pass --local to git-pack-objects"
9035 msgstr "向 git-pack-objects 传递参数 --local"
9037 #: builtin/repack.c:175
9038 msgid "write bitmap index"
9039 msgstr "写 bitmap 索引"
9041 #: builtin/repack.c:176
9045 #: builtin/repack.c:177
9046 msgid "with -A, do not loosen objects older than this"
9047 msgstr "使用 -A,不要将早于给定时间的对象过期"
9049 #: builtin/repack.c:179
9050 msgid "size of the window used for delta compression"
9053 #: builtin/repack.c:180 builtin/repack.c:184
9057 #: builtin/repack.c:181
9058 msgid "same as the above, but limit memory size instead of entries count"
9059 msgstr "和上面的相似,但限制内存大小而非条目数"
9061 #: builtin/repack.c:183
9062 msgid "limits the maximum delta depth"
9065 #: builtin/repack.c:185
9066 msgid "maximum size of each packfile"
9069 #: builtin/repack.c:187
9070 msgid "repack objects in packs marked with .keep"
9071 msgstr "对标记为 .keep 的包中的对象重新打包"
9073 #: builtin/repack.c:377
9075 msgid "removing '%s' failed"
9078 #: builtin/replace.c:19
9079 msgid "git replace [-f] <object> <replacement>"
9080 msgstr "git replace [-f] <对象> <替换物>"
9082 #: builtin/replace.c:20
9083 msgid "git replace [-f] --edit <object>"
9084 msgstr "git replace [-f] --edit <对象>"
9086 #: builtin/replace.c:21
9087 msgid "git replace [-f] --graft <commit> [<parent>...]"
9088 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9090 #: builtin/replace.c:22
9091 msgid "git replace -d <object>..."
9092 msgstr "git replace -d <对象>..."
9094 #: builtin/replace.c:23
9095 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9096 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9098 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9100 msgid "Not a valid object name: '%s'"
9101 msgstr "不是一个有效的对象名:'%s'"
9103 #: builtin/replace.c:355
9105 msgid "bad mergetag in commit '%s'"
9106 msgstr "提交 '%s' 中损坏的 mergetag"
9108 #: builtin/replace.c:357
9110 msgid "malformed mergetag in commit '%s'"
9111 msgstr "提交 '%s' 中非法的 mergetag"
9113 #: builtin/replace.c:368
9116 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9117 "instead of --graft"
9118 msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
9120 #: builtin/replace.c:401
9122 msgid "the original commit '%s' has a gpg signature."
9123 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9125 #: builtin/replace.c:402
9126 msgid "the signature will be removed in the replacement commit!"
9127 msgstr "在替换的提交中签名将被移除!"
9129 #: builtin/replace.c:408
9131 msgid "could not write replacement commit for: '%s'"
9132 msgstr "不能为 '%s' 写替换提交"
9134 #: builtin/replace.c:432
9135 msgid "list replace refs"
9138 #: builtin/replace.c:433
9139 msgid "delete replace refs"
9142 #: builtin/replace.c:434
9143 msgid "edit existing object"
9146 #: builtin/replace.c:435
9147 msgid "change a commit's parents"
9150 #: builtin/replace.c:436
9151 msgid "replace the ref if it exists"
9154 #: builtin/replace.c:437
9155 msgid "do not pretty-print contents for --edit"
9156 msgstr "不要为 --edit 操作美观显示内容"
9158 #: builtin/replace.c:438
9159 msgid "use this format"
9162 #: builtin/rerere.c:12
9163 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9164 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9166 #: builtin/rerere.c:57
9167 msgid "register clean resolutions in index"
9168 msgstr "在索引中注册干净的解决方案"
9170 #: builtin/reset.c:26
9172 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9173 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9175 #: builtin/reset.c:27
9176 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9177 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9179 #: builtin/reset.c:28
9180 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9181 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9183 #: builtin/reset.c:34
9187 #: builtin/reset.c:34
9191 #: builtin/reset.c:34
9195 #: builtin/reset.c:34
9199 #: builtin/reset.c:34
9203 #: builtin/reset.c:74
9204 msgid "You do not have a valid HEAD."
9205 msgstr "您没有一个有效的 HEAD。"
9207 #: builtin/reset.c:76
9208 msgid "Failed to find tree of HEAD."
9209 msgstr "无法找到 HEAD 指向的树。"
9211 #: builtin/reset.c:82
9213 msgid "Failed to find tree of %s."
9214 msgstr "无法找到 %s 指向的树。"
9216 #: builtin/reset.c:100
9218 msgid "HEAD is now at %s"
9219 msgstr "HEAD 现在位于 %s"
9221 # 译者:汉字之间无空格,故删除%s前后空格
9222 #: builtin/reset.c:183
9224 msgid "Cannot do a %s reset in the middle of a merge."
9225 msgstr "在合并过程中不能做%s重置操作。"
9227 #: builtin/reset.c:276
9228 msgid "be quiet, only report errors"
9231 #: builtin/reset.c:278
9232 msgid "reset HEAD and index"
9233 msgstr "重置 HEAD 和索引"
9235 #: builtin/reset.c:279
9236 msgid "reset only HEAD"
9239 #: builtin/reset.c:281 builtin/reset.c:283
9240 msgid "reset HEAD, index and working tree"
9241 msgstr "重置 HEAD、索引和工作区"
9243 #: builtin/reset.c:285
9244 msgid "reset HEAD but keep local changes"
9245 msgstr "重置 HEAD 但保存本地变更"
9247 #: builtin/reset.c:288
9248 msgid "record only the fact that removed paths will be added later"
9249 msgstr "将删除的路径标记为稍后添加"
9251 #: builtin/reset.c:305
9253 msgid "Failed to resolve '%s' as a valid revision."
9254 msgstr "无法将 '%s' 解析为一个有效的版本。"
9256 #: builtin/reset.c:308 builtin/reset.c:316
9258 msgid "Could not parse object '%s'."
9259 msgstr "不能解析对象 '%s'。"
9261 #: builtin/reset.c:313
9263 msgid "Failed to resolve '%s' as a valid tree."
9264 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9266 #: builtin/reset.c:322
9267 msgid "--patch is incompatible with --{hard,mixed,soft}"
9268 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9270 #: builtin/reset.c:331
9271 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9272 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9274 # 译者:汉字之间无空格,故删除%s前后空格
9275 #: builtin/reset.c:333
9277 msgid "Cannot do %s reset with paths."
9278 msgstr "不能带路径进行%s重置。"
9280 # 译者:汉字之间无空格,故删除%s前后空格
9281 #: builtin/reset.c:343
9283 msgid "%s reset is not allowed in a bare repository"
9284 msgstr "不能对纯版本库进行%s重置"
9286 #: builtin/reset.c:347
9287 msgid "-N can only be used with --mixed"
9288 msgstr "-N 只能和 --mixed 同时使用"
9290 #: builtin/reset.c:364
9291 msgid "Unstaged changes after reset:"
9292 msgstr "重置后撤出暂存区的变更:"
9294 #: builtin/reset.c:370
9296 msgid "Could not reset index file to revision '%s'."
9297 msgstr "不能重置索引文件至版本 '%s'。"
9299 #: builtin/reset.c:374
9300 msgid "Could not write new index file."
9301 msgstr "不能写入新的索引文件。"
9303 #: builtin/rev-parse.c:361
9304 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9305 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9307 #: builtin/rev-parse.c:366
9308 msgid "keep the `--` passed as an arg"
9309 msgstr "保持 `--` 作为一个参数传递"
9311 #: builtin/rev-parse.c:368
9312 msgid "stop parsing after the first non-option argument"
9313 msgstr "遇到第一个非选项参数后停止解析"
9315 #: builtin/rev-parse.c:371
9316 msgid "output in stuck long form"
9319 #: builtin/rev-parse.c:499
9321 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9322 " or: git rev-parse --sq-quote [<arg>...]\n"
9323 " or: git rev-parse [<options>] [<arg>...]\n"
9325 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9327 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9328 " 或者:git rev-parse --sq-quote [<参数>...]\n"
9329 " 或者:git rev-parse [<选项>] [<参数>...]\n"
9331 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9333 #: builtin/revert.c:22
9334 msgid "git revert [<options>] <commit-ish>..."
9335 msgstr "git revert [<选项>] <提交号>..."
9337 #: builtin/revert.c:23
9338 msgid "git revert <subcommand>"
9339 msgstr "git revert <子命令>"
9341 #: builtin/revert.c:28
9342 msgid "git cherry-pick [<options>] <commit-ish>..."
9343 msgstr "git cherry-pick [<选项>] <提交号>..."
9345 #: builtin/revert.c:29
9346 msgid "git cherry-pick <subcommand>"
9347 msgstr "git cherry-pick <子命令>"
9349 #: builtin/revert.c:71
9351 msgid "%s: %s cannot be used with %s"
9352 msgstr "%s:%s 不能和 %s 同时使用"
9354 #: builtin/revert.c:80
9355 msgid "end revert or cherry-pick sequence"
9358 #: builtin/revert.c:81
9359 msgid "resume revert or cherry-pick sequence"
9362 #: builtin/revert.c:82
9363 msgid "cancel revert or cherry-pick sequence"
9366 #: builtin/revert.c:83
9367 msgid "don't automatically commit"
9370 #: builtin/revert.c:84
9371 msgid "edit the commit message"
9374 #: builtin/revert.c:87
9375 msgid "parent number"
9378 #: builtin/revert.c:89
9379 msgid "merge strategy"
9382 #: builtin/revert.c:90
9386 #: builtin/revert.c:91
9387 msgid "option for merge strategy"
9390 #: builtin/revert.c:104
9391 msgid "append commit name"
9394 #: builtin/revert.c:105
9395 msgid "allow fast-forward"
9398 #: builtin/revert.c:106
9399 msgid "preserve initially empty commits"
9402 #: builtin/revert.c:107
9403 msgid "allow commits with empty messages"
9406 #: builtin/revert.c:108
9407 msgid "keep redundant, empty commits"
9410 #: builtin/revert.c:112
9411 msgid "program error"
9414 #: builtin/revert.c:197
9415 msgid "revert failed"
9418 #: builtin/revert.c:212
9419 msgid "cherry-pick failed"
9423 msgid "git rm [<options>] [--] <file>..."
9424 msgstr "git rm [<选项>] [--] <文件>..."
9428 "the following submodule (or one of its nested submodules)\n"
9429 "uses a .git directory:"
9431 "the following submodules (or one of their nested submodules)\n"
9432 "use a .git directory:"
9433 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9434 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9439 "(use 'rm -rf' if you really want to remove it including all of its history)"
9442 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9446 "the following file has staged content different from both the\n"
9447 "file and the HEAD:"
9449 "the following files have staged content different from both the\n"
9450 "file and the HEAD:"
9451 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9452 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9457 "(use -f to force removal)"
9463 msgid "the following file has changes staged in the index:"
9464 msgid_plural "the following files have changes staged in the index:"
9465 msgstr[0] "如下文件相对索引区的内容有修改"
9466 msgstr[1] "如下文件相对索引区的内容有修改"
9468 #: builtin/rm.c:243 builtin/rm.c:254
9471 "(use --cached to keep the file, or -f to force removal)"
9474 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
9477 msgid "the following file has local modifications:"
9478 msgid_plural "the following files have local modifications:"
9479 msgstr[0] "如下文件有本地修改:"
9480 msgstr[1] "如下文件有本地修改:"
9483 msgid "do not list removed files"
9487 msgid "only remove from the index"
9491 msgid "override the up-to-date check"
9495 msgid "allow recursive removal"
9499 msgid "exit with a zero status even if nothing matched"
9500 msgstr "即使没有匹配,也以零状态退出"
9503 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9504 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9508 msgid "not removing '%s' recursively without -r"
9509 msgstr "未提供 -r 选项不会递归删除 '%s'"
9513 msgid "git rm: unable to remove %s"
9514 msgstr "git rm:不能删除 %s"
9516 #: builtin/shortlog.c:13
9517 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9518 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9520 #: builtin/shortlog.c:131
9522 msgid "Missing author: %s"
9525 #: builtin/shortlog.c:230
9526 msgid "sort output according to the number of commits per author"
9527 msgstr "根据每个作者的提交数量排序"
9529 #: builtin/shortlog.c:232
9530 msgid "Suppress commit descriptions, only provides commit count"
9531 msgstr "隐藏提交说明,只提供提交数量"
9533 #: builtin/shortlog.c:234
9534 msgid "Show the email address of each author"
9535 msgstr "显示每个作者的电子邮件地址"
9537 #: builtin/shortlog.c:235
9539 msgstr "w[,i1[,i2]]"
9541 #: builtin/shortlog.c:236
9542 msgid "Linewrap output"
9545 #: builtin/show-branch.c:9
9547 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9548 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9549 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9550 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9552 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9553 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9554 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9555 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9557 #: builtin/show-branch.c:13
9558 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9559 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9561 #: builtin/show-branch.c:659
9562 msgid "show remote-tracking and local branches"
9563 msgstr "显示远程跟踪的和本地的分支"
9565 #: builtin/show-branch.c:661
9566 msgid "show remote-tracking branches"
9569 #: builtin/show-branch.c:663
9570 msgid "color '*!+-' corresponding to the branch"
9571 msgstr "着色 '*!+-' 到相应的分支"
9573 #: builtin/show-branch.c:665
9574 msgid "show <n> more commits after the common ancestor"
9575 msgstr "显示共同祖先后的 <n> 个提交"
9577 #: builtin/show-branch.c:667
9578 msgid "synonym to more=-1"
9579 msgstr "和 more=-1 同义"
9581 #: builtin/show-branch.c:668
9582 msgid "suppress naming strings"
9585 #: builtin/show-branch.c:670
9586 msgid "include the current branch"
9589 #: builtin/show-branch.c:672
9590 msgid "name commits with their object names"
9593 #: builtin/show-branch.c:674
9594 msgid "show possible merge bases"
9597 #: builtin/show-branch.c:676
9598 msgid "show refs unreachable from any other ref"
9599 msgstr "显示没有任何引用的的引用"
9601 #: builtin/show-branch.c:678
9602 msgid "show commits in topological order"
9605 #: builtin/show-branch.c:681
9606 msgid "show only commits not on the first branch"
9607 msgstr "只显示不在第一个分支上的提交"
9609 #: builtin/show-branch.c:683
9610 msgid "show merges reachable from only one tip"
9611 msgstr "显示仅一个分支可访问的合并提交"
9613 #: builtin/show-branch.c:685
9614 msgid "topologically sort, maintaining date order where possible"
9615 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9617 #: builtin/show-branch.c:688
9618 msgid "<n>[,<base>]"
9619 msgstr "<n>[,<base>]"
9621 #: builtin/show-branch.c:689
9622 msgid "show <n> most recent ref-log entries starting at base"
9623 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9625 #: builtin/show-ref.c:10
9627 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9628 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9630 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9631 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9633 #: builtin/show-ref.c:11
9634 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9635 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9637 #: builtin/show-ref.c:170
9638 msgid "only show tags (can be combined with heads)"
9639 msgstr "只显示 tags(可以和头共用)"
9641 #: builtin/show-ref.c:171
9642 msgid "only show heads (can be combined with tags)"
9643 msgstr "只显示头(可以和 tags 共用)"
9645 #: builtin/show-ref.c:172
9646 msgid "stricter reference checking, requires exact ref path"
9647 msgstr "更严格的引用检测,需要精确的引用路径"
9649 #: builtin/show-ref.c:175 builtin/show-ref.c:177
9650 msgid "show the HEAD reference, even if it would be filtered out"
9651 msgstr "显示 HEAD 引用,即使被过滤掉"
9653 #: builtin/show-ref.c:179
9654 msgid "dereference tags into object IDs"
9655 msgstr "转换 tags 到对象ID"
9657 #: builtin/show-ref.c:181
9658 msgid "only show SHA1 hash using <n> digits"
9659 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9661 #: builtin/show-ref.c:185
9662 msgid "do not print results to stdout (useful with --verify)"
9663 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9665 #: builtin/show-ref.c:187
9666 msgid "show refs from stdin that aren't in local repository"
9667 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9669 #: builtin/symbolic-ref.c:7
9670 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9671 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9673 #: builtin/symbolic-ref.c:8
9674 msgid "git symbolic-ref -d [-q] <name>"
9675 msgstr "git symbolic-ref -d [-q] <名称>"
9677 #: builtin/symbolic-ref.c:40
9678 msgid "suppress error message for non-symbolic (detached) refs"
9679 msgstr "不显示非符号(分离的)引用的错误信息"
9681 #: builtin/symbolic-ref.c:41
9682 msgid "delete symbolic ref"
9685 #: builtin/symbolic-ref.c:42
9686 msgid "shorten ref output"
9689 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9693 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9694 msgid "reason of the update"
9699 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9702 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9705 msgid "git tag -d <tagname>..."
9706 msgstr "git tag -d <标签名>..."
9710 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9711 "\t\t[<pattern>...]"
9713 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9716 msgid "git tag -v <tagname>..."
9717 msgstr "git tag -v <标签名>..."
9721 msgid "malformed object at '%s'"
9722 msgstr "非法的对象于 '%s'"
9724 #: builtin/tag.c:301
9726 msgid "tag name too long: %.*s..."
9727 msgstr "tag 名字太长:%.*s..."
9729 #: builtin/tag.c:306
9731 msgid "tag '%s' not found."
9732 msgstr "tag '%s' 未发现。"
9734 #: builtin/tag.c:321
9736 msgid "Deleted tag '%s' (was %s)\n"
9737 msgstr "已删除 tag '%s'(曾为 %s)\n"
9739 #: builtin/tag.c:333
9741 msgid "could not verify the tag '%s'"
9742 msgstr "不能校验 tag '%s'"
9744 #: builtin/tag.c:343
9748 "Write a message for tag:\n"
9750 "Lines starting with '%c' will be ignored.\n"
9755 "以 '%c' 开头的行将被忽略。\n"
9757 #: builtin/tag.c:347
9761 "Write a message for tag:\n"
9763 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9769 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9771 #: builtin/tag.c:371
9773 msgid "unsupported sort specification '%s'"
9774 msgstr "不支持的排序规格 '%s'"
9776 #: builtin/tag.c:373
9778 msgid "unsupported sort specification '%s' in variable '%s'"
9779 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9781 #: builtin/tag.c:428
9782 msgid "unable to sign the tag"
9785 #: builtin/tag.c:430
9786 msgid "unable to write tag file"
9789 #: builtin/tag.c:455
9790 msgid "bad object type."
9793 #: builtin/tag.c:468
9794 msgid "tag header too big."
9797 #: builtin/tag.c:504
9798 msgid "no tag message?"
9801 #: builtin/tag.c:510
9803 msgid "The tag message has been left in %s\n"
9804 msgstr "tag 说明被保留在 %s\n"
9806 #: builtin/tag.c:559
9807 msgid "switch 'points-at' requires an object"
9808 msgstr "开关 'points-at' 需要一个对象"
9810 #: builtin/tag.c:561
9812 msgid "malformed object name '%s'"
9813 msgstr "非法的对象名 '%s'"
9815 #: builtin/tag.c:589
9816 msgid "list tag names"
9819 #: builtin/tag.c:591
9820 msgid "print <n> lines of each tag message"
9821 msgstr "每个 tag 信息打印 <n> 行"
9823 #: builtin/tag.c:593
9827 #: builtin/tag.c:594
9831 #: builtin/tag.c:596
9832 msgid "Tag creation options"
9835 #: builtin/tag.c:598
9836 msgid "annotated tag, needs a message"
9837 msgstr "注解 tag,需要一个说明"
9839 #: builtin/tag.c:600
9843 #: builtin/tag.c:602
9844 msgid "annotated and GPG-signed tag"
9845 msgstr "注解并 GPG 签名的 tag"
9847 #: builtin/tag.c:606
9848 msgid "use another key to sign the tag"
9849 msgstr "使用另外的私钥签名 tag"
9851 #: builtin/tag.c:607
9852 msgid "replace the tag if exists"
9853 msgstr "如果存在,替换现有的 tag"
9855 #: builtin/tag.c:609
9856 msgid "Tag listing options"
9859 #: builtin/tag.c:610
9860 msgid "show tag list in columns"
9861 msgstr "以列的方式显示 tag"
9863 #: builtin/tag.c:612
9867 #: builtin/tag.c:617 builtin/tag.c:623
9868 msgid "print only tags that contain the commit"
9869 msgstr "只打印包含提交的tags"
9871 #: builtin/tag.c:629
9872 msgid "print only tags of the object"
9875 #: builtin/tag.c:655
9876 msgid "--column and -n are incompatible"
9877 msgstr "--column 和 -n 不兼容"
9879 #: builtin/tag.c:667
9880 msgid "--sort and -n are incompatible"
9881 msgstr "--sort 和 -n 不兼容"
9883 #: builtin/tag.c:674
9884 msgid "-n option is only allowed with -l."
9885 msgstr "-n 选项只允许和 -l 同时使用。"
9887 #: builtin/tag.c:676
9888 msgid "--contains option is only allowed with -l."
9889 msgstr "--contains 选项只允许和 -l 同时使用。"
9891 #: builtin/tag.c:678
9892 msgid "--points-at option is only allowed with -l."
9893 msgstr "--points-at 选项只允许和 -l 同时使用。"
9895 #: builtin/tag.c:686
9896 msgid "only one -F or -m option is allowed."
9897 msgstr "只允许一个 -F 或 -m 选项。"
9899 #: builtin/tag.c:706
9900 msgid "too many params"
9903 #: builtin/tag.c:712
9905 msgid "'%s' is not a valid tag name."
9906 msgstr "'%s' 不是一个有效的tag名称。"
9908 #: builtin/tag.c:717
9910 msgid "tag '%s' already exists"
9911 msgstr "tag '%s' 已存在"
9913 #: builtin/tag.c:741
9915 msgid "Updated tag '%s' (was %s)\n"
9916 msgstr "已更新tag '%s'(曾为 %s)\n"
9918 #: builtin/unpack-objects.c:489
9919 msgid "Unpacking objects"
9922 #: builtin/update-index.c:70
9924 msgid "failed to create directory %s"
9927 #: builtin/update-index.c:76
9929 msgid "failed to stat %s"
9932 #: builtin/update-index.c:86
9934 msgid "failed to create file %s"
9937 #: builtin/update-index.c:94
9939 msgid "failed to delete file %s"
9942 #: builtin/update-index.c:101 builtin/update-index.c:203
9944 msgid "failed to delete directory %s"
9947 #: builtin/update-index.c:124
9952 #: builtin/update-index.c:136
9953 msgid "directory stat info does not change after adding a new file"
9954 msgstr "添加一个新文件后,目录的状态信息未改变"
9956 #: builtin/update-index.c:149
9957 msgid "directory stat info does not change after adding a new directory"
9958 msgstr "添加一个新目录后,目录的状态信息未改变"
9960 #: builtin/update-index.c:162
9961 msgid "directory stat info changes after updating a file"
9962 msgstr "更新一个文件后,目录的状态信息被修改"
9964 #: builtin/update-index.c:173
9965 msgid "directory stat info changes after adding a file inside subdirectory"
9966 msgstr "在子目录中添加文件后,目录的状态信息被修改"
9968 #: builtin/update-index.c:184
9969 msgid "directory stat info does not change after deleting a file"
9970 msgstr "删除一个文件后,目录的状态信息未改变"
9972 #: builtin/update-index.c:197
9973 msgid "directory stat info does not change after deleting a directory"
9974 msgstr "删除一个目录后,目录的状态信息未改变"
9976 #: builtin/update-index.c:204
9980 #: builtin/update-index.c:564
9981 msgid "git update-index [<options>] [--] [<file>...]"
9982 msgstr "git update-index [<选项>] [--] [<文件>...]"
9984 #: builtin/update-index.c:918
9985 msgid "continue refresh even when index needs update"
9986 msgstr "当索引需要更新时继续刷新"
9988 #: builtin/update-index.c:921
9989 msgid "refresh: ignore submodules"
9992 #: builtin/update-index.c:924
9993 msgid "do not ignore new files"
9996 #: builtin/update-index.c:926
9997 msgid "let files replace directories and vice-versa"
9998 msgstr "让文件替换目录(反之亦然)"
10000 #: builtin/update-index.c:928
10001 msgid "notice files missing from worktree"
10002 msgstr "通知文件从工作区丢失"
10004 #: builtin/update-index.c:930
10005 msgid "refresh even if index contains unmerged entries"
10006 msgstr "即使索引区包含未合并的条目也执行刷新"
10008 #: builtin/update-index.c:933
10009 msgid "refresh stat information"
10012 #: builtin/update-index.c:937
10013 msgid "like --refresh, but ignore assume-unchanged setting"
10014 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10016 #: builtin/update-index.c:941
10017 msgid "<mode>,<object>,<path>"
10018 msgstr "<存取模式>,<对象>,<路径>"
10020 #: builtin/update-index.c:942
10021 msgid "add the specified entry to the index"
10022 msgstr "添加指定的条目到索引区"
10024 #: builtin/update-index.c:946
10028 #: builtin/update-index.c:947
10029 msgid "override the executable bit of the listed files"
10030 msgstr "覆盖列表里文件的可执行位"
10032 #: builtin/update-index.c:951
10033 msgid "mark files as \"not changing\""
10034 msgstr "把文件标记为 \"没有变更\""
10036 #: builtin/update-index.c:954
10037 msgid "clear assumed-unchanged bit"
10038 msgstr "清除 assumed-unchanged 位"
10040 #: builtin/update-index.c:957
10041 msgid "mark files as \"index-only\""
10042 msgstr "把文件标记为 \"仅索引\""
10044 #: builtin/update-index.c:960
10045 msgid "clear skip-worktree bit"
10046 msgstr "清除 skip-worktree 位"
10048 #: builtin/update-index.c:963
10049 msgid "add to index only; do not add content to object database"
10050 msgstr "只添加到索引区;不添加对象到对象库"
10052 #: builtin/update-index.c:965
10053 msgid "remove named paths even if present in worktree"
10054 msgstr "即使存在工作区里,也删除路径"
10056 #: builtin/update-index.c:967
10057 msgid "with --stdin: input lines are terminated by null bytes"
10058 msgstr "携带 --stdin:输入的行以 null 字符终止"
10060 #: builtin/update-index.c:969
10061 msgid "read list of paths to be updated from standard input"
10062 msgstr "从标准输入中读取需要更新的路径列表"
10064 #: builtin/update-index.c:973
10065 msgid "add entries from standard input to the index"
10066 msgstr "从标准输入添加条目到索引区"
10068 #: builtin/update-index.c:977
10069 msgid "repopulate stages #2 and #3 for the listed paths"
10070 msgstr "为指定文件重新生成第2和第3暂存区"
10072 #: builtin/update-index.c:981
10073 msgid "only update entries that differ from HEAD"
10074 msgstr "只更新与 HEAD 不同的条目"
10076 #: builtin/update-index.c:985
10077 msgid "ignore files missing from worktree"
10078 msgstr "忽略工作区丢失的文件"
10080 #: builtin/update-index.c:988
10081 msgid "report actions to standard output"
10084 #: builtin/update-index.c:990
10085 msgid "(for porcelains) forget saved unresolved conflicts"
10086 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10088 #: builtin/update-index.c:994
10089 msgid "write index in this format"
10090 msgstr "以这种格式写入索引区"
10092 #: builtin/update-index.c:996
10093 msgid "enable or disable split index"
10096 #: builtin/update-index.c:998
10097 msgid "enable/disable untracked cache"
10098 msgstr "启用/禁用对未跟踪文件的缓存"
10100 #: builtin/update-index.c:1000
10101 msgid "enable untracked cache without testing the filesystem"
10102 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10104 #: builtin/update-ref.c:9
10105 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10106 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
10108 #: builtin/update-ref.c:10
10109 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10110 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
10112 #: builtin/update-ref.c:11
10113 msgid "git update-ref [<options>] --stdin [-z]"
10114 msgstr "git update-ref [<选项>] --stdin [-z]"
10116 #: builtin/update-ref.c:359
10117 msgid "delete the reference"
10120 #: builtin/update-ref.c:361
10121 msgid "update <refname> not the one it points to"
10122 msgstr "更新 <引用名> 本身而不是它指向的引用"
10124 #: builtin/update-ref.c:362
10125 msgid "stdin has NUL-terminated arguments"
10126 msgstr "标准输入有以 NUL 字符终止的参数"
10128 #: builtin/update-ref.c:363
10129 msgid "read updates from stdin"
10132 #: builtin/update-server-info.c:6
10133 msgid "git update-server-info [--force]"
10134 msgstr "git update-server-info [--force]"
10136 #: builtin/update-server-info.c:14
10137 msgid "update the info files from scratch"
10138 msgstr "从头开始更新文件信息"
10140 #: builtin/verify-commit.c:17
10141 msgid "git verify-commit [-v | --verbose] <commit>..."
10142 msgstr "git verify-commit [-v | --verbose] <提交>..."
10144 #: builtin/verify-commit.c:75
10145 msgid "print commit contents"
10148 #: builtin/verify-pack.c:54
10149 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10150 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
10152 #: builtin/verify-pack.c:64
10156 #: builtin/verify-pack.c:66
10157 msgid "show statistics only"
10160 #: builtin/verify-tag.c:17
10161 msgid "git verify-tag [-v | --verbose] <tag>..."
10162 msgstr "git verify-tag [-v | --verbose] <标签>..."
10164 #: builtin/verify-tag.c:73
10165 msgid "print tag contents"
10168 #: builtin/write-tree.c:13
10169 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
10170 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
10172 #: builtin/write-tree.c:26
10176 #: builtin/write-tree.c:27
10177 msgid "write tree object for a subdirectory <prefix>"
10178 msgstr "将 <前缀> 子目录内容写到一个树对象"
10180 #: builtin/write-tree.c:30
10181 msgid "only useful for debugging"
10184 #: credential-cache--daemon.c:267
10185 msgid "print debugging messages to stderr"
10186 msgstr "调试信息输出到标准错误"
10190 "'git help -a' and 'git help -g' list available subcommands and some\n"
10191 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
10192 "to read about a specific subcommand or concept."
10194 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10195 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10198 #: common-cmds.h:10
10199 msgid "start a working area (see also: git help tutorial)"
10200 msgstr "开始一个工作区(参见:git help tutorial)"
10202 #: common-cmds.h:11
10203 msgid "work on the current change (see also: git help everyday)"
10204 msgstr "在当前变更上工作(参见:git help everyday)"
10206 #: common-cmds.h:12
10207 msgid "examine the history and state (see also: git help revisions)"
10208 msgstr "检查历史和状态(参见:git help revisions)"
10210 #: common-cmds.h:13
10211 msgid "grow, mark and tweak your common history"
10212 msgstr "扩展、标记和调校您的历史记录"
10214 #: common-cmds.h:14
10215 msgid "collaborate (see also: git help workflows)"
10216 msgstr "协同(参见:git help workflows)"
10218 #: common-cmds.h:18
10219 msgid "Add file contents to the index"
10222 #: common-cmds.h:19
10223 msgid "Find by binary search the change that introduced a bug"
10224 msgstr "通过二分查找定位引入 bug 的变更"
10226 #: common-cmds.h:20
10227 msgid "List, create, or delete branches"
10228 msgstr "列出、创建或删除分支"
10230 #: common-cmds.h:21
10231 msgid "Checkout a branch or paths to the working tree"
10232 msgstr "检出一个分支或路径到工作区"
10234 #: common-cmds.h:22
10235 msgid "Clone a repository into a new directory"
10236 msgstr "克隆一个版本库到一个新目录"
10238 #: common-cmds.h:23
10239 msgid "Record changes to the repository"
10242 #: common-cmds.h:24
10243 msgid "Show changes between commits, commit and working tree, etc"
10244 msgstr "显示提交之间、提交和工作区之间等的差异"
10246 #: common-cmds.h:25
10247 msgid "Download objects and refs from another repository"
10248 msgstr "从另外一个版本库下载对象和引用"
10250 #: common-cmds.h:26
10251 msgid "Print lines matching a pattern"
10254 #: common-cmds.h:27
10255 msgid "Create an empty Git repository or reinitialize an existing one"
10256 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
10258 #: common-cmds.h:28
10259 msgid "Show commit logs"
10262 #: common-cmds.h:29
10263 msgid "Join two or more development histories together"
10264 msgstr "合并两个或更多开发历史"
10266 #: common-cmds.h:30
10267 msgid "Move or rename a file, a directory, or a symlink"
10268 msgstr "移动或重命名一个文件、目录或符号链接"
10270 #: common-cmds.h:31
10271 msgid "Fetch from and integrate with another repository or a local branch"
10272 msgstr "获取并整合另外的版本库或一个本地分支"
10274 #: common-cmds.h:32
10275 msgid "Update remote refs along with associated objects"
10276 msgstr "更新远程引用和相关的对象"
10278 #: common-cmds.h:33
10279 msgid "Forward-port local commits to the updated upstream head"
10280 msgstr "本地提交转移至更新后的上游分支中"
10282 #: common-cmds.h:34
10283 msgid "Reset current HEAD to the specified state"
10284 msgstr "重置当前HEAD到指定状态"
10286 #: common-cmds.h:35
10287 msgid "Remove files from the working tree and from the index"
10288 msgstr "从工作区和索引中删除文件"
10290 #: common-cmds.h:36
10291 msgid "Show various types of objects"
10294 #: common-cmds.h:37
10295 msgid "Show the working tree status"
10298 #: common-cmds.h:38
10299 msgid "Create, list, delete or verify a tag object signed with GPG"
10300 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10302 #: parse-options.h:142
10303 msgid "expiry-date"
10306 #: parse-options.h:157
10307 msgid "no-op (backward compatibility)"
10310 #: parse-options.h:231
10311 msgid "be more verbose"
10314 #: parse-options.h:233
10315 msgid "be more quiet"
10318 #: parse-options.h:239
10319 msgid "use <n> digits to display SHA-1s"
10320 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10323 msgid "update the index with reused conflict resolution if possible"
10324 msgstr "如果可能,重用冲突解决更新索引"
10327 msgid "You need to set your committer info first"
10328 msgstr "您需要先设置你的提交者信息"
10332 "You seem to have moved HEAD since the last 'am' failure.\n"
10333 "Not rewinding to ORIG_HEAD"
10334 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10339 "When you have resolved this problem, run \"$cmdline --continue\".\n"
10340 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10341 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
10343 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10344 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10345 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10348 msgid "Cannot fall back to three-way merge."
10349 msgstr "无法求助于三路合并。"
10352 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10353 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10356 msgid "Using index info to reconstruct a base tree..."
10357 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10361 "Did you hand edit your patch?\n"
10362 "It does not apply to blobs recorded in its index."
10365 "无法应用补丁到索引中的数据(blob)对象上。"
10368 msgid "Falling back to patching base and 3-way merge..."
10369 msgstr "转而在基础版本上打补丁及进行三路合并..."
10372 msgid "Failed to merge in the changes."
10376 msgid "Only one StGIT patch series can be applied at once"
10377 msgstr "一次只能有一个 StGIT 补丁队列被应用"
10381 msgid "Patch format $patch_format is not supported."
10382 msgstr "不支持 $patch_format 补丁格式。"
10385 msgid "Patch format detection failed."
10390 "The -b/--binary option has been a no-op for long time, and\n"
10391 "it will be removed. Please do not use it anymore."
10393 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10398 msgid "previous rebase directory $dotest still exists but mbox given."
10399 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10402 msgid "Please make up your mind. --skip or --abort?"
10403 msgstr "请下决心。--skip 或是 --abort ?"
10408 "Stray $dotest directory found.\n"
10409 "Use \"git am --abort\" to remove it."
10411 "发现了错误的 $dotest 目录。\n"
10412 "使用 \"git am --abort\" 删除它。"
10415 msgid "Resolve operation not in progress, we are not resuming."
10416 msgstr "解决操作未进行,我们不会继续。"
10420 msgid "Dirty index: cannot apply patches (dirty: $files)"
10421 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10426 "Patch is empty. Was it split wrong?\n"
10427 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10428 "To restore the original branch and stop patching run \"$cmdline --abort\"."
10431 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10432 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10435 msgid "Patch does not have a valid e-mail address."
10436 msgstr "补丁中没有一个有效的邮件地址。"
10439 msgid "cannot be interactive without stdin connected to a terminal."
10440 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10443 msgid "Commit Body is:"
10447 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10448 #. in your translation. The program will only accept English
10449 #. input at this point.
10451 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10452 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10456 msgid "Applying: $FIRSTLINE"
10457 msgstr "正应用:$FIRSTLINE"
10461 "No changes - did you forget to use 'git add'?\n"
10462 "If there is nothing left to stage, chances are that something else\n"
10463 "already introduced the same changes; you might want to skip this patch."
10465 "没有变更 —— 您是不是忘了执行 'git add'?\n"
10466 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10471 "You still have unmerged paths in your index\n"
10472 "did you forget to use 'git add'?"
10473 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10476 msgid "No changes -- Patch already applied."
10477 msgstr "没有变更 —— 补丁已经应用过。"
10481 msgid "Patch failed at $msgnum $FIRSTLINE"
10482 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10487 "The copy of the patch that failed is found in:\n"
10494 msgid "applying to an empty history"
10495 msgstr "正应用到一个空历史上"
10497 #: git-bisect.sh:48
10498 msgid "You need to start by \"git bisect start\""
10499 msgstr "您需要执行 \"git bisect start\" 来开始"
10502 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10503 #. translation. The program will only accept English input
10505 #: git-bisect.sh:54
10506 msgid "Do you want me to do it for you [Y/n]? "
10507 msgstr "您想让我为您这样做么[Y/n]? "
10509 #: git-bisect.sh:95
10511 msgid "unrecognised option: '$arg'"
10512 msgstr "未能识别的选项:'$arg'"
10514 #: git-bisect.sh:99
10516 msgid "'$arg' does not appear to be a valid revision"
10517 msgstr "'$arg' 看起来不像是一个有效的版本"
10519 #: git-bisect.sh:117
10520 msgid "Bad HEAD - I need a HEAD"
10521 msgstr "坏的 HEAD - 我需要一个 HEAD"
10523 #: git-bisect.sh:130
10526 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10527 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10529 #: git-bisect.sh:140
10530 msgid "won't bisect on cg-seek'ed tree"
10531 msgstr "不会在做了 cg-seek 的树上做二分查找"
10533 #: git-bisect.sh:144
10534 msgid "Bad HEAD - strange symbolic ref"
10535 msgstr "坏的 HEAD - 奇怪的符号引用"
10537 #: git-bisect.sh:189
10539 msgid "Bad bisect_write argument: $state"
10540 msgstr "坏的 bisect_write 参数:$state"
10542 #: git-bisect.sh:218
10544 msgid "Bad rev input: $arg"
10545 msgstr "输入坏的版本:$arg"
10547 #: git-bisect.sh:232
10548 msgid "Please call 'bisect_state' with at least one argument."
10549 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10551 #: git-bisect.sh:244
10553 msgid "Bad rev input: $rev"
10554 msgstr "输入坏的版本:$rev"
10556 #: git-bisect.sh:253
10557 msgid "'git bisect bad' can take only one argument."
10558 msgstr "'git bisect bad' 只能带一个参数。"
10560 #: git-bisect.sh:276
10561 msgid "Warning: bisecting only with a bad commit."
10562 msgstr "警告:在仅有一个坏提交下进行二分查找。"
10565 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10566 #. translation. The program will only accept English input
10568 #: git-bisect.sh:282
10569 msgid "Are you sure [Y/n]? "
10570 msgstr "您确认么[Y/n]? "
10572 #: git-bisect.sh:292
10574 "You need to give me at least one good and one bad revision.\n"
10575 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10577 "您需要给我至少一个好版本和一个坏版本。\n"
10578 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10580 #: git-bisect.sh:295
10582 "You need to start by \"git bisect start\".\n"
10583 "You then need to give me at least one good and one bad revision.\n"
10584 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10586 "您需要执行 \"git bisect start\" 来开始。\n"
10587 "然后需要提供我至少一个好版本和一个坏版本。\n"
10588 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10590 #: git-bisect.sh:366 git-bisect.sh:493
10591 msgid "We are not bisecting."
10592 msgstr "我们没有在二分查找。"
10594 #: git-bisect.sh:373
10596 msgid "'$invalid' is not a valid commit"
10597 msgstr "'$invalid' 不是一个有效的提交"
10599 #: git-bisect.sh:382
10602 "Could not check out original HEAD '$branch'.\n"
10603 "Try 'git bisect reset <commit>'."
10605 "不能检出原始 HEAD '$branch'。\n"
10606 "尝试 'git bisect reset <提交>'。"
10608 #: git-bisect.sh:409
10609 msgid "No logfile given"
10612 #: git-bisect.sh:410
10614 msgid "cannot read $file for replaying"
10615 msgstr "不能读取 $file 来重放"
10617 #: git-bisect.sh:427
10618 msgid "?? what are you talking about?"
10621 #: git-bisect.sh:439
10623 msgid "running $command"
10624 msgstr "运行 $command"
10626 #: git-bisect.sh:446
10629 "bisect run failed:\n"
10630 "exit code $res from '$command' is < 0 or >= 128"
10633 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10635 #: git-bisect.sh:472
10636 msgid "bisect run cannot continue any more"
10637 msgstr "二分查找不能继续运行"
10639 #: git-bisect.sh:478
10642 "bisect run failed:\n"
10643 "'bisect_state $state' exited with error code $res"
10646 "'bisect_state $state' 退出码为 $res"
10648 #: git-bisect.sh:485
10649 msgid "bisect run success"
10654 "Pull is not possible because you have unmerged files.\n"
10655 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10656 "as appropriate to mark resolution and make a commit."
10658 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10659 "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10662 msgid "Pull is not possible because you have unmerged files."
10663 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10667 "You have not concluded your merge (MERGE_HEAD exists).\n"
10668 "Please, commit your changes before you can merge."
10670 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10674 msgid "updating an unborn branch with changes added to the index"
10675 msgstr "更新尚未诞生的分支,变更添加至索引"
10680 "Warning: fetch updated the current branch head.\n"
10681 "Warning: fast-forwarding your working tree from\n"
10682 "Warning: commit $orig_head."
10684 "警告:fetch 更新了当前的分支。您的工作区\n"
10685 "警告:从原提交 $orig_head 快进。"
10688 msgid "Cannot merge multiple branches into empty head"
10689 msgstr "无法将多个分支合并到空分支"
10692 msgid "Cannot rebase onto multiple branches"
10695 #: git-rebase.sh:57
10697 "When you have resolved this problem, run \"git rebase --continue\".\n"
10698 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10699 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10702 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10703 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10704 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10706 #: git-rebase.sh:165
10707 msgid "Applied autostash."
10708 msgstr "成功应用 autostash。"
10710 #: git-rebase.sh:168
10712 msgid "Cannot store $stash_sha1"
10713 msgstr "无法保存 $stash_sha1"
10715 #: git-rebase.sh:169
10717 "Applying autostash resulted in conflicts.\n"
10718 "Your changes are safe in the stash.\n"
10719 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10721 "应用 autostash 导致冲突。\n"
10722 "您的修改安全地保存在 stash 中。\n"
10723 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10725 #: git-rebase.sh:208
10726 msgid "The pre-rebase hook refused to rebase."
10727 msgstr "钩子 pre-rebase 拒绝变基操作。"
10729 #: git-rebase.sh:213
10730 msgid "It looks like git-am is in progress. Cannot rebase."
10731 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10733 #: git-rebase.sh:351
10734 msgid "The --exec option must be used with the --interactive option"
10735 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10737 #: git-rebase.sh:356
10738 msgid "No rebase in progress?"
10739 msgstr "没有正在进行的变基?"
10741 #: git-rebase.sh:367
10742 msgid "The --edit-todo action can only be used during interactive rebase."
10743 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10745 #: git-rebase.sh:374
10746 msgid "Cannot read HEAD"
10749 #: git-rebase.sh:377
10751 "You must edit all merge conflicts and then\n"
10752 "mark them as resolved using git add"
10754 "您必须编辑所有的合并冲突,然后通过 git add\n"
10757 #: git-rebase.sh:395
10759 msgid "Could not move back to $head_name"
10760 msgstr "无法移回 $head_name"
10762 #: git-rebase.sh:414
10765 "It seems that there is already a $state_dir_base directory, and\n"
10766 "I wonder if you are in the middle of another rebase. If that is the\n"
10767 "case, please try\n"
10768 "\t$cmd_live_rebase\n"
10769 "If that is not the case, please\n"
10770 "\t$cmd_clear_stale_rebase\n"
10771 "and run me again. I am stopping in case you still have something\n"
10774 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10776 "\t$cmd_live_rebase\n"
10778 "\t$cmd_clear_stale_rebase\n"
10779 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10781 #: git-rebase.sh:465
10783 msgid "invalid upstream $upstream_name"
10784 msgstr "无效的上游 $upstream_name"
10786 #: git-rebase.sh:489
10788 msgid "$onto_name: there are more than one merge bases"
10789 msgstr "$onto_name: 有一个以上的合并基准"
10791 #: git-rebase.sh:492 git-rebase.sh:496
10793 msgid "$onto_name: there is no merge base"
10794 msgstr "$onto_name: 没有合并基准"
10796 #: git-rebase.sh:501
10798 msgid "Does not point to a valid commit: $onto_name"
10799 msgstr "没有指向一个有效的提交:$onto_name"
10801 #: git-rebase.sh:524
10803 msgid "fatal: no such branch: $branch_name"
10804 msgstr "严重错误:无此分支:$branch_name"
10806 #: git-rebase.sh:557
10807 msgid "Cannot autostash"
10808 msgstr "无法 autostash"
10810 #: git-rebase.sh:562
10812 msgid "Created autostash: $stash_abbrev"
10813 msgstr "创建了 autostash: $stash_abbrev"
10815 #: git-rebase.sh:566
10816 msgid "Please commit or stash them."
10817 msgstr "请提交或为它们保存进度。"
10819 #: git-rebase.sh:586
10821 msgid "Current branch $branch_name is up to date."
10822 msgstr "当前分支 $branch_name 是最新的。"
10824 #: git-rebase.sh:590
10826 msgid "Current branch $branch_name is up to date, rebase forced."
10827 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10829 #: git-rebase.sh:601
10831 msgid "Changes from $mb to $onto:"
10832 msgstr "变更从 $mb 到 $onto:"
10834 #: git-rebase.sh:610
10835 msgid "First, rewinding head to replay your work on top of it..."
10836 msgstr "首先,重置头指针以便在上面重放您的工作..."
10838 #: git-rebase.sh:620
10840 msgid "Fast-forwarded $branch_name to $onto_name."
10841 msgstr "快进 $branch_name 至 $onto_name。"
10844 msgid "git stash clear with parameters is unimplemented"
10845 msgstr "git stash clear 不支持参数"
10848 msgid "You do not have the initial commit yet"
10852 msgid "Cannot save the current index state"
10853 msgstr "无法保存当前索引状态"
10855 #: git-stash.sh:124 git-stash.sh:137
10856 msgid "Cannot save the current worktree state"
10857 msgstr "无法保存当前工作区状态"
10859 #: git-stash.sh:141
10860 msgid "No changes selected"
10863 #: git-stash.sh:144
10864 msgid "Cannot remove temporary index (can't happen)"
10865 msgstr "无法删除临时索引(不应发生)"
10867 #: git-stash.sh:157
10868 msgid "Cannot record working tree state"
10871 #: git-stash.sh:191
10873 msgid "Cannot update $ref_stash with $w_commit"
10874 msgstr "无法用 $w_commit 更新 $ref_stash"
10876 #. TRANSLATORS: $option is an invalid option, like
10877 #. `--blah-blah'. The 7 spaces at the beginning of the
10878 #. second line correspond to "error: ". So you should line
10879 #. up the second line with however many characters the
10880 #. translation of "error: " takes in your language. E.g. in
10881 #. English this is:
10883 #. $ git stash save --blah-blah 2>&1 | head -n 2
10884 #. error: unknown option for 'stash save': --blah-blah
10885 #. To provide a message, use git stash save -- '--blah-blah'
10886 #: git-stash.sh:241
10889 "error: unknown option for 'stash save': $option\n"
10890 " To provide a message, use git stash save -- '$option'"
10892 "错误:'stash save' 的未知选项:$option\n"
10893 " 要提供一个描述信息,使用 git stash save -- '$option'"
10895 #: git-stash.sh:262
10896 msgid "No local changes to save"
10897 msgstr "没有要保存的本地修改"
10899 #: git-stash.sh:266
10900 msgid "Cannot initialize stash"
10901 msgstr "无法初始化 stash"
10903 #: git-stash.sh:270
10904 msgid "Cannot save the current status"
10907 #: git-stash.sh:288
10908 msgid "Cannot remove worktree changes"
10911 #: git-stash.sh:389
10913 msgid "unknown option: $opt"
10914 msgstr "未知选项: $opt"
10916 #: git-stash.sh:399
10917 msgid "No stash found."
10918 msgstr "未发现 stash。"
10920 #: git-stash.sh:406
10922 msgid "Too many revisions specified: $REV"
10923 msgstr "指定了太多的版本:$REV"
10925 #: git-stash.sh:412
10927 msgid "$reference is not a valid reference"
10928 msgstr "$reference 不是一个有效的引用"
10930 #: git-stash.sh:440
10932 msgid "'$args' is not a stash-like commit"
10933 msgstr "'$args' 不是 stash 样提交"
10935 #: git-stash.sh:451
10937 msgid "'$args' is not a stash reference"
10938 msgstr "'$args' 不是一个 stash 引用"
10940 #: git-stash.sh:459
10941 msgid "unable to refresh index"
10944 #: git-stash.sh:463
10945 msgid "Cannot apply a stash in the middle of a merge"
10946 msgstr "无法在合并过程中恢复进度"
10948 #: git-stash.sh:471
10949 msgid "Conflicts in index. Try without --index."
10950 msgstr "索引中有冲突。尝试不使用 --index。"
10952 #: git-stash.sh:473
10953 msgid "Could not save index tree"
10956 #: git-stash.sh:507
10957 msgid "Cannot unstage modified files"
10960 #: git-stash.sh:522
10961 msgid "Index was not unstashed."
10962 msgstr "索引的进度没有被恢复。"
10964 #: git-stash.sh:545
10966 msgid "Dropped ${REV} ($s)"
10967 msgstr "丢弃了 ${REV} ($s)"
10969 #: git-stash.sh:546
10971 msgid "${REV}: Could not drop stash entry"
10972 msgstr "${REV}:不能丢弃进度条目"
10974 #: git-stash.sh:554
10975 msgid "No branch name specified"
10978 #: git-stash.sh:626
10979 msgid "(To restore them type \"git stash apply\")"
10980 msgstr "(为恢复数据输入 \"git stash apply\")"
10982 #: git-submodule.sh:95
10984 msgid "cannot strip one component off url '$remoteurl'"
10985 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10987 #: git-submodule.sh:237
10989 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10990 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10992 #: git-submodule.sh:287
10994 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10995 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10997 #: git-submodule.sh:296
10999 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
11000 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
11002 #: git-submodule.sh:406
11003 msgid "Relative path can only be used from the toplevel of the working tree"
11004 msgstr "只能在工作区的顶级目录中使用相对路径"
11006 #: git-submodule.sh:416
11008 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11009 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11011 #: git-submodule.sh:433
11013 msgid "'$sm_path' already exists in the index"
11014 msgstr "'$sm_path' 已经存在于索引中"
11016 #: git-submodule.sh:437
11019 "The following path is ignored by one of your .gitignore files:\n"
11021 "Use -f if you really want to add it."
11023 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11025 "如果您确实想添加它,使用 -f 参数。"
11027 #: git-submodule.sh:455
11029 msgid "Adding existing repo at '$sm_path' to the index"
11030 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
11032 #: git-submodule.sh:457
11034 msgid "'$sm_path' already exists and is not a valid git repo"
11035 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
11037 #: git-submodule.sh:465
11039 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11040 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
11042 #: git-submodule.sh:467
11045 "If you want to reuse this local git directory instead of cloning again from"
11046 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11048 #: git-submodule.sh:469
11051 "use the '--force' option. If the local git directory is not the correct repo"
11052 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
11054 #: git-submodule.sh:470
11057 "or you are unsure what this means choose another name with the '--name' "
11059 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11061 #: git-submodule.sh:472
11063 msgid "Reactivating local git directory for submodule '$sm_name'."
11064 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11066 #: git-submodule.sh:484
11068 msgid "Unable to checkout submodule '$sm_path'"
11069 msgstr "不能检出子模组 '$sm_path'"
11071 #: git-submodule.sh:489
11073 msgid "Failed to add submodule '$sm_path'"
11074 msgstr "无法添加子模组 '$sm_path'"
11076 #: git-submodule.sh:498
11078 msgid "Failed to register submodule '$sm_path'"
11079 msgstr "无法注册子模组 '$sm_path'"
11081 #: git-submodule.sh:542
11083 msgid "Entering '$prefix$displaypath'"
11084 msgstr "正在进入 '$prefix$displaypath'"
11086 #: git-submodule.sh:562
11088 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11089 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11091 #: git-submodule.sh:608
11093 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11094 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11096 #: git-submodule.sh:617
11098 msgid "Failed to register url for submodule path '$displaypath'"
11099 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11101 #: git-submodule.sh:619
11103 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11104 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11106 #: git-submodule.sh:636
11108 msgid "Failed to register update mode for submodule path '$displaypath'"
11109 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11111 #: git-submodule.sh:674
11113 msgid "Use '.' if you really want to deinitialize all submodules"
11114 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11116 #: git-submodule.sh:691
11118 msgid "Submodule work tree '$displaypath' contains a .git directory"
11119 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11121 #: git-submodule.sh:692
11124 "(use 'rm -rf' if you really want to remove it including all of its history)"
11125 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11127 #: git-submodule.sh:698
11130 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11132 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11134 #: git-submodule.sh:701
11136 msgid "Cleared directory '$displaypath'"
11137 msgstr "已清除目录 '$displaypath'"
11139 #: git-submodule.sh:702
11141 msgid "Could not remove submodule work tree '$displaypath'"
11142 msgstr "无法移除子模组工作区 '$displaypath'"
11144 #: git-submodule.sh:705
11146 msgid "Could not create empty submodule directory '$displaypath'"
11147 msgstr "不能创建空的子模组目录 '$displaypath'"
11149 #: git-submodule.sh:714
11151 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11152 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11154 #: git-submodule.sh:830
11157 "Submodule path '$displaypath' not initialized\n"
11158 "Maybe you want to use 'update --init'?"
11160 "子模组路径 '$displaypath' 没有初始化\n"
11161 "也许您想用 'update --init'?"
11163 #: git-submodule.sh:843
11165 msgid "Unable to find current revision in submodule path '$displaypath'"
11166 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11168 #: git-submodule.sh:852
11170 msgid "Unable to fetch in submodule path '$sm_path'"
11171 msgstr "无法在子模组路径 '$sm_path' 中获取"
11173 #: git-submodule.sh:876
11175 msgid "Unable to fetch in submodule path '$displaypath'"
11176 msgstr "无法在子模组路径 '$displaypath' 中获取"
11178 #: git-submodule.sh:890
11180 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11181 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11183 #: git-submodule.sh:891
11185 msgid "Submodule path '$displaypath': checked out '$sha1'"
11186 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11188 #: git-submodule.sh:895
11190 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11191 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
11193 #: git-submodule.sh:896
11195 msgid "Submodule path '$displaypath': rebased into '$sha1'"
11196 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
11198 #: git-submodule.sh:901
11200 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11201 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
11203 #: git-submodule.sh:902
11205 msgid "Submodule path '$displaypath': merged in '$sha1'"
11206 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
11208 #: git-submodule.sh:907
11211 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11212 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
11214 #: git-submodule.sh:908
11216 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11217 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
11219 #: git-submodule.sh:938
11221 msgid "Failed to recurse into submodule path '$displaypath'"
11222 msgstr "无法递归进子模组路径 '$displaypath'"
11224 #: git-submodule.sh:1046
11225 msgid "The --cached option cannot be used with the --files option"
11226 msgstr "选项 --cached 不能和选项 --files 同时使用"
11228 #: git-submodule.sh:1098
11230 msgid "unexpected mode $mod_dst"
11231 msgstr "意外的模式 $mod_dst"
11234 #: git-submodule.sh:1118
11236 msgid " Warn: $display_name doesn't contain commit $sha1_src"
11237 msgstr " 警告:$display_name 未包含提交 $sha1_src"
11240 #: git-submodule.sh:1121
11242 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11243 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11246 #: git-submodule.sh:1124
11248 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11249 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11251 #: git-submodule.sh:1149
11255 #: git-submodule.sh:1267
11257 msgid "Failed to recurse into submodule path '$sm_path'"
11258 msgstr "无法递归进子模组路径 '$sm_path'"
11260 #: git-submodule.sh:1331
11262 msgid "Synchronizing submodule url for '$displaypath'"
11263 msgstr "为 '$displaypath' 同步子模组 url"
11265 #~ msgid "Cannot apply stash: Your index contains uncommitted changes."
11266 #~ msgstr "无法应用 stash:您的索引中包含未提交的变更。"
11268 #~ msgid "The most commonly used git commands are:"
11269 #~ msgstr "最常用的 git 命令有:"
11271 #~ msgid "No such branch: '%s'"
11272 #~ msgstr "没有此分支:'%s'"
11274 #~ msgid "Could not create git link %s"
11275 #~ msgstr "不能创建 git link %s"
11277 #~ msgid "Invalid gc.pruneexpire: '%s'"
11278 #~ msgstr "无效的 gc.pruneexpire:'%s'"