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-04-03 08:13+0800\n"
16 "PO-Revision-Date: 2015-04-03 08:35+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
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:427 builtin/rm.c:328
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:101
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:151
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:86
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:659 builtin/commit.c:1045 builtin/log.c:330
265 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 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'"
535 #: gpg-interface.c:129 gpg-interface.c:200
536 msgid "could not run gpg."
539 #: gpg-interface.c:141
540 msgid "gpg did not accept the data"
543 #: gpg-interface.c:152
544 msgid "gpg failed to sign the data"
547 #: gpg-interface.c:185
549 msgid "could not create temporary file '%s': %s"
550 msgstr "不能创建临时文件 '%s':%s"
552 #: gpg-interface.c:188
554 msgid "failed writing detached signature to '%s': %s"
555 msgstr "无法将分离式签名写入 '%s':%s"
559 msgid "'%s': unable to read %s"
560 msgstr "'%s':无法读取 %s"
569 msgid "'%s': short read %s"
570 msgstr "'%s':读取不完整 %s"
574 msgid "available git commands in '%s'"
575 msgstr "在 '%s' 下可用的 git 命令"
578 msgid "git commands available from elsewhere on your $PATH"
579 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
582 msgid "The most commonly used git commands are:"
583 msgstr "最常用的 git 命令有:"
588 "'%s' appears to be a git command, but we were not\n"
589 "able to execute it. Maybe git-%s is broken?"
591 "'%s' 像是一个 git 命令,但却无法运行。\n"
595 msgid "Uh oh. Your system reports no Git commands at all."
596 msgstr "唉呀,您的系统中未发现 Git 命令。"
601 "WARNING: You called a Git command named '%s', which does not exist.\n"
602 "Continuing under the assumption that you meant '%s'"
604 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
609 msgid "in %0.1f seconds automatically..."
610 msgstr "在 %0.1f 秒钟后自动运行..."
614 msgid "git: '%s' is not a git command. See 'git --help'."
615 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
617 #: help.c:384 help.c:444
623 "Did you mean one of these?"
637 msgid "BUG: reopen a lockfile that is still open"
638 msgstr "BUG: 重新打开一个仍打开着的锁文件"
641 msgid "BUG: reopen a lockfile that has been committed"
642 msgstr "BUG: 重新打开一个已提交的锁文件"
645 msgid "failed to read the cache"
648 #: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
649 #: builtin/clone.c:662
650 msgid "unable to write new index file"
653 #: merge-recursive.c:189
655 msgid "(bad commit)\n"
658 #: merge-recursive.c:209
660 msgid "addinfo_cache failed for path '%s'"
661 msgstr "为路径 '%s' addinfo_cache 失败"
663 #: merge-recursive.c:270
664 msgid "error building trees"
667 #: merge-recursive.c:688
669 msgid "failed to create path '%s'%s"
670 msgstr "无法创建路径 '%s'%s"
672 #: merge-recursive.c:699
674 msgid "Removing %s to make room for subdirectory\n"
675 msgstr "删除 %s 以便为子目录留出空间\n"
677 #: merge-recursive.c:713 merge-recursive.c:734
678 msgid ": perhaps a D/F conflict?"
679 msgstr ":可能是一个目录/文件冲突?"
681 #: merge-recursive.c:724
683 msgid "refusing to lose untracked file at '%s'"
684 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
686 #: merge-recursive.c:764
688 msgid "cannot read object %s '%s'"
689 msgstr "不能读取对象 %s '%s'"
691 #: merge-recursive.c:766
693 msgid "blob expected for %s '%s'"
694 msgstr "%s '%s' 应为数据(blob)对象"
696 #: merge-recursive.c:789 builtin/clone.c:321
698 msgid "failed to open '%s'"
701 #: merge-recursive.c:797
703 msgid "failed to symlink '%s'"
704 msgstr "无法创建符号链接 '%s'"
706 #: merge-recursive.c:800
708 msgid "do not know what to do with %06o %s '%s'"
709 msgstr "不知道如何处理 %06o %s '%s'"
711 #: merge-recursive.c:938
712 msgid "Failed to execute internal merge"
715 #: merge-recursive.c:942
717 msgid "Unable to add %s to database"
718 msgstr "不能添加 %s 至对象库"
720 #: merge-recursive.c:958
721 msgid "unsupported object type in the tree"
722 msgstr "在树中有不支持的对象类型"
724 #: merge-recursive.c:1033 merge-recursive.c:1047
727 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
730 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
733 #: merge-recursive.c:1039 merge-recursive.c:1052
736 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
739 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
742 #: merge-recursive.c:1093
746 #: merge-recursive.c:1093
750 #: merge-recursive.c:1149
752 msgid "%s is a directory in %s adding as %s instead"
753 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
755 #: merge-recursive.c:1171
758 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
759 "\"->\"%s\" in \"%s\"%s"
761 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
762 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
764 #: merge-recursive.c:1176
765 msgid " (left unresolved)"
768 #: merge-recursive.c:1230
770 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
772 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
775 #: merge-recursive.c:1260
777 msgid "Renaming %s to %s and %s to %s instead"
778 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
780 #: merge-recursive.c:1459
782 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
783 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
785 #: merge-recursive.c:1469
787 msgid "Adding merged %s"
790 #: merge-recursive.c:1474 merge-recursive.c:1672
792 msgid "Adding as %s instead"
795 #: merge-recursive.c:1525
797 msgid "cannot read object %s"
800 #: merge-recursive.c:1528
802 msgid "object %s is not a blob"
803 msgstr "对象 %s 不是一个数据(blob)对象"
805 #: merge-recursive.c:1576
809 #: merge-recursive.c:1576
813 #: merge-recursive.c:1586
817 #: merge-recursive.c:1593
821 #: merge-recursive.c:1627
823 msgid "Skipped %s (merged same as existing)"
824 msgstr "略过 %s(已经做过相同合并)"
826 #: merge-recursive.c:1641
828 msgid "Auto-merging %s"
831 #: merge-recursive.c:1645 git-submodule.sh:1150
835 #: merge-recursive.c:1646
837 msgid "CONFLICT (%s): Merge conflict in %s"
838 msgstr "冲突(%s):合并冲突于 %s"
840 #: merge-recursive.c:1732
845 #: merge-recursive.c:1757
846 msgid "file/directory"
849 #: merge-recursive.c:1763
850 msgid "directory/file"
853 #: merge-recursive.c:1768
855 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
856 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
858 #: merge-recursive.c:1778
863 #: merge-recursive.c:1795
864 msgid "Fatal merge failure, shouldn't happen."
865 msgstr "严重的合并错误,不应发生。"
867 #: merge-recursive.c:1814
868 msgid "Already up-to-date!"
871 #: merge-recursive.c:1823
873 msgid "merging of trees %s and %s failed"
874 msgstr "无法合并树 %s 和 %s"
876 #: merge-recursive.c:1853
878 msgid "Unprocessed path??? %s"
879 msgstr "未处理的路径??? %s"
881 #: merge-recursive.c:1901
885 #: merge-recursive.c:1914
887 msgid "found %u common ancestor:"
888 msgid_plural "found %u common ancestors:"
889 msgstr[0] "发现 %u 个共同祖先:"
890 msgstr[1] "发现 %u 个共同祖先:"
892 #: merge-recursive.c:1951
893 msgid "merge returned no commit"
896 #: merge-recursive.c:2008
898 msgid "Could not parse object '%s'"
901 #: merge-recursive.c:2019 builtin/merge.c:667
902 msgid "Unable to write index."
906 msgid "Cannot commit uninitialized/unreferenced notes tree"
907 msgstr "不能提交未初始化/未引用的注解树"
911 msgid "Bad notes.rewriteMode value: '%s'"
912 msgstr "坏的 notes.rewriteMode 值:'%s'"
916 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
917 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
919 #. TRANSLATORS: The first %s is the name of the
920 #. environment variable, the second %s is its value
923 msgid "Bad %s value: '%s'"
924 msgstr "坏的 %s 值:'%s'"
928 msgid "unable to parse object: %s"
931 #: parse-options.c:546
935 #: parse-options.c:564
940 #. TRANSLATORS: the colon here should align with the
941 #. one in "usage: %s" translation
942 #: parse-options.c:568
947 # 译者:为保证在输出中对齐,注意调整句中空格!
948 #: parse-options.c:571
953 #: parse-options.c:605
958 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
959 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
963 "global 'literal' pathspec setting is incompatible with all other global "
965 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
968 msgid "invalid parameter for pathspec magic 'prefix'"
969 msgstr "路径规则包含无效的神奇前缀"
973 msgid "Invalid pathspec magic '%.*s' in '%s'"
974 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
978 msgid "Missing ')' at the end of pathspec magic in '%s'"
979 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
983 msgid "Unimplemented pathspec magic '%c' in '%s'"
984 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
988 msgid "%s: 'literal' and 'glob' are incompatible"
989 msgstr "%s:'literal' 和 'glob' 不兼容"
993 msgid "%s: '%s' is outside repository"
994 msgstr "%s:'%s' 在版本库之外"
998 msgid "Pathspec '%s' is in submodule '%.*s'"
999 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1003 msgid "%s: pathspec magic not supported by this command: %s"
1004 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1008 msgid "pathspec '%s' is beyond a symbolic link"
1009 msgstr "路径规则 '%s' 位于符号链接中"
1013 "There is nothing to exclude from by :(exclude) patterns.\n"
1014 "Perhaps you forgot to add either ':/' or '.' ?"
1016 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1020 msgid "unable to parse --pretty format"
1021 msgstr "不能解析 --pretty 格式"
1027 #: read-cache.c:1275
1030 "index.version set, but the value is invalid.\n"
1033 "设置了 index.version,但是取值无效。\n"
1036 #: read-cache.c:1285
1039 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1042 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1047 msgid "Cannot fetch both %s and %s to %s"
1048 msgstr "不能同时获取 %s 和 %s 至 %s"
1052 msgid "%s usually tracks %s, not %s"
1053 msgstr "%s 通常跟踪 %s,而非 %s"
1057 msgid "%s tracks both %s and %s"
1058 msgstr "%s 同时跟踪 %s 和 %s"
1061 msgid "Internal error"
1066 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1067 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1070 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1071 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1075 msgid "Your branch is up-to-date with '%s'.\n"
1076 msgstr "您的分支与上游分支 '%s' 一致。\n"
1080 msgid "Your branch is ahead of '%s' by %d commit.\n"
1081 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1082 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1083 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1086 msgid " (use \"git push\" to publish your local commits)\n"
1087 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1091 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1093 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1094 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1095 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1099 msgid " (use \"git pull\" to update your local branch)\n"
1100 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1105 "Your branch and '%s' have diverged,\n"
1106 "and have %d and %d different commit each, respectively.\n"
1108 "Your branch and '%s' have diverged,\n"
1109 "and have %d and %d different commits each, respectively.\n"
1111 "您的分支和 '%s' 出现了偏离,\n"
1112 "并且分别有 %d 和 %d 处不同的提交。\n"
1114 "您的分支和 '%s' 出现了偏离,\n"
1115 "并且分别有 %d 和 %d 处不同的提交。\n"
1119 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1120 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1123 msgid "--first-parent is incompatible with --bisect"
1124 msgstr "--first-parent 与 --bisect 不兼容"
1127 msgid "open /dev/null failed"
1128 msgstr "不能打开 /dev/null"
1132 msgid "dup2(%d,%d) failed"
1133 msgstr "不能调用 dup2(%d,%d)"
1136 msgid "failed to sign the push certificate"
1140 msgid "the receiving end does not support --signed push"
1144 msgid "the receiving end does not support --atomic push"
1147 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1148 #: builtin/merge.c:1005
1150 msgid "Could not open '%s' for writing"
1151 msgstr "不能为写入打开 '%s'"
1153 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1154 #: builtin/merge.c:1010
1156 msgid "Could not write to '%s'"
1161 "after resolving the conflicts, mark the corrected paths\n"
1162 "with 'git add <paths>' or 'git rm <paths>'"
1164 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1169 "after resolving the conflicts, mark the corrected paths\n"
1170 "with 'git add <paths>' or 'git rm <paths>'\n"
1171 "and commit the result with 'git commit'"
1173 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1174 "对修正后的文件做标记,然后用 'git commit' 提交"
1176 #: sequencer.c:211 sequencer.c:861 sequencer.c:944
1178 msgid "Could not write to %s"
1183 msgid "Error wrapping up %s"
1187 msgid "Your local changes would be overwritten by cherry-pick."
1188 msgstr "您的本地修改将被拣选操作覆盖。"
1191 msgid "Your local changes would be overwritten by revert."
1192 msgstr "您的本地修改将被还原操作覆盖。"
1195 msgid "Commit your changes or stash them to proceed."
1196 msgstr "提交您的修改或保存进度后再继续。"
1198 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1201 msgid "%s: Unable to write new index file"
1202 msgstr "%s:无法写入新索引文件"
1205 msgid "Could not resolve HEAD commit\n"
1206 msgstr "不能解析 HEAD 提交\n"
1209 msgid "Unable to update cache tree\n"
1214 msgid "Could not parse commit %s\n"
1215 msgstr "不能解析提交 %s\n"
1219 msgid "Could not parse parent commit %s\n"
1220 msgstr "不能解析父提交 %s\n"
1223 msgid "Your index file is unmerged."
1224 msgstr "您的索引文件未完成合并。"
1228 msgid "Commit %s is a merge but no -m option was given."
1229 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1233 msgid "Commit %s does not have parent %d"
1234 msgstr "提交 %s 没有父提交 %d"
1238 msgid "Mainline was specified but commit %s is not a merge."
1239 msgstr "指定了主线但提交 %s 不是一个合并。"
1241 #. TRANSLATORS: The first %s will be "revert" or
1242 #. "cherry-pick", the second %s a SHA1
1245 msgid "%s: cannot parse parent commit %s"
1246 msgstr "%s:不能解析父提交 %s"
1250 msgid "Cannot get commit message for %s"
1251 msgstr "不能得到 %s 的提交说明"
1255 msgid "could not revert %s... %s"
1256 msgstr "不能还原 %s... %s"
1260 msgid "could not apply %s... %s"
1261 msgstr "不能应用 %s... %s"
1264 msgid "empty commit set passed"
1269 msgid "git %s: failed to read the index"
1270 msgstr "git %s:无法读取索引"
1274 msgid "git %s: failed to refresh the index"
1275 msgstr "git %s:无法刷新索引"
1279 msgid "Cannot %s during a %s"
1280 msgstr "无法 %s 在一个 %s 过程中"
1284 msgid "Could not parse line %d."
1285 msgstr "不能解析第 %d 行。"
1288 msgid "No commits parsed."
1293 msgid "Could not open %s"
1298 msgid "Could not read %s."
1303 msgid "Unusable instruction sheet: %s"
1308 msgid "Invalid key: %s"
1313 msgid "Invalid value for %s: %s"
1318 msgid "Malformed options sheet: %s"
1322 msgid "a cherry-pick or revert is already in progress"
1323 msgstr "一个拣选或还原操作已在进行"
1326 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1327 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1331 msgid "Could not create sequencer directory %s"
1332 msgstr "不能创建序列目录 %s"
1334 #: sequencer.c:863 sequencer.c:948
1336 msgid "Error wrapping up %s."
1339 #: sequencer.c:882 sequencer.c:1018
1340 msgid "no cherry-pick or revert in progress"
1341 msgstr "拣选或还原操作并未进行"
1344 msgid "cannot resolve HEAD"
1348 msgid "cannot abort from a branch yet to be born"
1349 msgstr "不能从尚未建立的分支终止"
1351 #: sequencer.c:908 builtin/apply.c:4288
1353 msgid "cannot open %s: %s"
1358 msgid "cannot read %s: %s"
1362 msgid "unexpected end of file"
1367 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1368 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1372 msgid "Could not format %s."
1377 msgid "%s: can't cherry-pick a %s"
1378 msgstr "%s:不能拣选一个%s"
1382 msgid "%s: bad revision"
1386 msgid "Can't revert as initial commit"
1390 msgid "Can't cherry-pick into empty head"
1395 "Git normally never creates a ref that ends with 40 hex characters\n"
1396 "because it will be ignored when you just specify 40-hex. These refs\n"
1397 "may be created by mistake. For example,\n"
1399 " git checkout -b $br $(git rev-parse ...)\n"
1401 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1402 "examine these refs and maybe delete them. Turn this message off by\n"
1403 "running \"git config advice.objectNameWarning false\""
1405 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1406 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1408 " git checkout -b $br $(git rev-parse ...)\n"
1410 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1411 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1415 msgid "HEAD does not point to a branch"
1416 msgstr "HEAD 没有指向一个分支"
1420 msgid "No such branch: '%s'"
1425 msgid "No upstream configured for branch '%s'"
1426 msgstr "尚未给分支 '%s' 设置上游"
1430 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1431 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1433 #: submodule.c:64 submodule.c:98
1434 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1435 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1437 #: submodule.c:68 submodule.c:102
1439 msgid "Could not find section in .gitmodules where path=%s"
1440 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1444 msgid "Could not update .gitmodules entry %s"
1445 msgstr "不能更新 .gitmodules 条目 %s"
1449 msgid "Could not remove .gitmodules entry for %s"
1450 msgstr "无法移除 %s 的 .gitmodules 条目"
1453 msgid "staging updated .gitmodules failed"
1454 msgstr "将更新后 .gitmodules 添加暂存区失败"
1456 #: submodule.c:1109 builtin/init-db.c:371
1458 msgid "Could not create git link %s"
1459 msgstr "不能创建 git link %s"
1463 msgid "Could not set core.worktree in %s"
1464 msgstr "不能在 %s 中设置 core.worktree"
1466 #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1469 msgid "unknown value '%s' for key '%s'"
1470 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1472 #: trailer.c:543 trailer.c:548 builtin/remote.c:290
1474 msgid "more than one %s"
1479 msgid "empty trailer token in trailer '%.*s'"
1480 msgstr "签名 '%.*s' 的键为空"
1484 msgid "could not read input file '%s'"
1485 msgstr "不能读取输入文件 '%s'"
1488 msgid "could not read from stdin"
1491 #: unpack-trees.c:202
1492 msgid "Checking out files"
1496 msgid "invalid URL scheme name or missing '://' suffix"
1497 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1499 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1501 msgid "invalid %XX escape sequence"
1502 msgstr "无效的 %XX 转义序列"
1505 msgid "missing host and scheme is not 'file:'"
1506 msgstr "缺失主机名且URL方案不是 'file:'"
1509 msgid "a 'file:' URL may not have a port number"
1510 msgstr "一个 'file:' URL 不应该包含端口号"
1513 msgid "invalid characters in host name"
1514 msgstr "主机名中包含无效的字符"
1516 #: urlmatch.c:244 urlmatch.c:255
1517 msgid "invalid port number"
1521 msgid "invalid '..' path segment"
1522 msgstr "无效的 '..' 路径片段"
1526 msgid "unable to access '%s': %s"
1527 msgstr "不能访问 '%s':%s"
1531 msgid "unable to access '%s'"
1536 msgid "unable to look up current user in the passwd file: %s"
1537 msgstr "无法在口令文件中查询到当前用户:%s"
1540 msgid "no such user"
1544 msgid "unable to get current working directory"
1548 msgid "Unmerged paths:"
1552 #: wt-status.c:177 wt-status.c:204
1554 msgid " (use \"git reset %s <file>...\" to unstage)"
1555 msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1558 #: wt-status.c:179 wt-status.c:206
1559 msgid " (use \"git rm --cached <file>...\" to unstage)"
1560 msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1564 msgid " (use \"git add <file>...\" to mark resolution)"
1565 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1568 #: wt-status.c:185 wt-status.c:189
1569 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1570 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1574 msgid " (use \"git rm <file>...\" to mark resolution)"
1575 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1577 #: wt-status.c:198 wt-status.c:878
1578 msgid "Changes to be committed:"
1581 #: wt-status.c:216 wt-status.c:887
1582 msgid "Changes not staged for commit:"
1583 msgstr "尚未暂存以备提交的变更:"
1587 msgid " (use \"git add <file>...\" to update what will be committed)"
1588 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1592 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1593 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1598 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1599 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1603 msgid " (commit or discard the untracked or modified content in submodules)"
1604 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1609 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1610 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1613 msgid "both deleted:"
1617 msgid "added by us:"
1621 msgid "deleted by them:"
1625 msgid "added by them:"
1629 msgid "deleted by us:"
1637 msgid "both modified:"
1642 msgid "bug: unhandled unmerged status %x"
1643 msgstr "bug:无法处理的未合并状态 %x"
1677 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1679 msgid "new commits, "
1682 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1684 msgid "modified content, "
1687 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1689 msgid "untracked content, "
1694 msgid "bug: unhandled diff status %c"
1695 msgstr "bug:无法处理的差异状态 %c"
1698 msgid "Submodules changed but not updated:"
1699 msgstr "子模组已修改但尚未更新:"
1702 msgid "Submodule changes to be committed:"
1707 "Do not touch the line above.\n"
1708 "Everything below will be removed."
1714 msgid "You have unmerged paths."
1719 msgid " (fix conflicts and run \"git commit\")"
1720 msgstr " (解决冲突并运行 \"git commit\")"
1723 msgid "All conflicts fixed but you are still merging."
1724 msgstr "所有冲突已解决但您仍处于合并中。"
1728 msgid " (use \"git commit\" to conclude merge)"
1729 msgstr " (使用 \"git commit\" 结束合并)"
1732 msgid "You are in the middle of an am session."
1733 msgstr "您正处于 am 操作过程中。"
1736 msgid "The current patch is empty."
1741 msgid " (fix conflicts and then run \"git am --continue\")"
1742 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1746 msgid " (use \"git am --skip\" to skip this patch)"
1747 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1751 msgid " (use \"git am --abort\" to restore the original branch)"
1752 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1754 #: wt-status.c:1036 wt-status.c:1053
1756 msgid "You are currently rebasing branch '%s' on '%s'."
1757 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1759 #: wt-status.c:1041 wt-status.c:1058
1760 msgid "You are currently rebasing."
1765 msgid " (fix conflicts and then run \"git rebase --continue\")"
1766 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1770 msgid " (use \"git rebase --skip\" to skip this patch)"
1771 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1775 msgid " (use \"git rebase --abort\" to check out the original branch)"
1776 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1780 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1781 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1786 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1787 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1790 msgid "You are currently splitting a commit during a rebase."
1791 msgstr "您在执行变基操作时拆分提交。"
1795 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1796 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1800 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1801 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1804 msgid "You are currently editing a commit during a rebase."
1805 msgstr "您在执行变基操作时编辑提交。"
1809 msgid " (use \"git commit --amend\" to amend the current commit)"
1810 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1815 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1816 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1820 msgid "You are currently cherry-picking commit %s."
1821 msgstr "您在执行拣选提交 %s 的操作。"
1825 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1826 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1830 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1831 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1835 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1836 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1840 msgid "You are currently reverting commit %s."
1841 msgstr "您在执行反转提交 %s 的操作。"
1845 msgid " (fix conflicts and run \"git revert --continue\")"
1846 msgstr " (解决冲突并运行 \"git revert --continue\")"
1850 msgid " (all conflicts fixed: run \"git revert --continue\")"
1851 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1855 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1856 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1860 msgid "You are currently bisecting, started from branch '%s'."
1861 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1864 msgid "You are currently bisecting."
1865 msgstr "您在执行二分查找操作。"
1869 msgid " (use \"git bisect reset\" to get back to the original branch)"
1870 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1877 msgid "rebase in progress; onto "
1878 msgstr "变基操作正在进行中;至 "
1881 msgid "HEAD detached at "
1885 msgid "HEAD detached from "
1889 msgid "Not currently on any branch."
1893 msgid "Initial commit"
1897 msgid "Untracked files"
1901 msgid "Ignored files"
1907 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1908 "may speed it up, but you have to be careful not to forget to add\n"
1909 "new files yourself (see 'git help status')."
1911 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1912 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1916 msgid "Untracked files not listed%s"
1917 msgstr "未跟踪的文件没有列出%s"
1919 # 译者:中文字符串拼接,可删除前导空格
1921 msgid " (use -u option to show untracked files)"
1922 msgstr "(使用 -u 参数显示未跟踪的文件)"
1930 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1931 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1935 msgid "no changes added to commit\n"
1941 "nothing added to commit but untracked files present (use \"git add\" to "
1943 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1947 msgid "nothing added to commit but untracked files present\n"
1948 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1950 # 译者:中文字符串拼接,可删除前导空格
1953 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1954 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1956 #: wt-status.c:1409 wt-status.c:1414
1958 msgid "nothing to commit\n"
1961 # 译者:中文字符串拼接,可删除前导空格
1964 msgid "nothing to commit (use -u to show untracked files)\n"
1965 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1967 # 译者:中文字符串拼接,可删除前导空格
1970 msgid "nothing to commit, working directory clean\n"
1971 msgstr "无文件要提交,干净的工作区\n"
1974 msgid "HEAD (no branch)"
1979 msgid "Initial commit on "
1987 #: wt-status.c:1565 wt-status.c:1573
1991 #: compat/precompose_utf8.c:55 builtin/clone.c:360
1993 msgid "failed to unlink '%s'"
1997 msgid "git add [<options>] [--] <pathspec>..."
1998 msgstr "git add [<选项>] [--] <路径规则>..."
2002 msgid "unexpected diff status %c"
2005 #: builtin/add.c:70 builtin/commit.c:277
2006 msgid "updating files failed"
2011 msgid "remove '%s'\n"
2014 #: builtin/add.c:134
2015 msgid "Unstaged changes after refreshing the index:"
2016 msgstr "刷新索引之后尚未被暂存的变更:"
2018 #: builtin/add.c:194 builtin/rev-parse.c:785
2019 msgid "Could not read the index"
2022 #: builtin/add.c:205
2024 msgid "Could not open '%s' for writing."
2025 msgstr "不能打开 '%s' 以写入。"
2027 #: builtin/add.c:209
2028 msgid "Could not write patch"
2031 #: builtin/add.c:214
2033 msgid "Could not stat '%s'"
2034 msgstr "不能查看文件状态 '%s'"
2036 #: builtin/add.c:216
2037 msgid "Empty patch. Aborted."
2040 #: builtin/add.c:221
2042 msgid "Could not apply '%s'"
2045 #: builtin/add.c:231
2046 msgid "The following paths are ignored by one of your .gitignore files:\n"
2047 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2049 #: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110
2050 #: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372
2055 #: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
2056 #: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
2057 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2061 #: builtin/add.c:251
2062 msgid "interactive picking"
2065 #: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
2066 msgid "select hunks interactively"
2069 #: builtin/add.c:253
2070 msgid "edit current diff and apply"
2073 #: builtin/add.c:254
2074 msgid "allow adding otherwise ignored files"
2077 #: builtin/add.c:255
2078 msgid "update tracked files"
2081 #: builtin/add.c:256
2082 msgid "record only the fact that the path will be added later"
2083 msgstr "只记录,该路径稍后再添加"
2085 #: builtin/add.c:257
2086 msgid "add changes from all tracked and untracked files"
2087 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2089 #: builtin/add.c:260
2090 msgid "ignore paths removed in the working tree (same as --no-all)"
2091 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2093 #: builtin/add.c:262
2094 msgid "don't add, only refresh the index"
2097 #: builtin/add.c:263
2098 msgid "just skip files which cannot be added because of errors"
2099 msgstr "跳过因出错不能添加的文件"
2101 #: builtin/add.c:264
2102 msgid "check if - even missing - files are ignored in dry run"
2103 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2105 #: builtin/add.c:286
2107 msgid "Use -f if you really want to add them.\n"
2108 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2110 #: builtin/add.c:293
2111 msgid "adding files failed"
2114 #: builtin/add.c:329
2115 msgid "-A and -u are mutually incompatible"
2116 msgstr "-A 和 -u 选项互斥"
2118 #: builtin/add.c:336
2119 msgid "Option --ignore-missing can only be used together with --dry-run"
2120 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2122 #: builtin/add.c:357
2124 msgid "Nothing specified, nothing added.\n"
2125 msgstr "没有指定文件,也没有文件被添加。\n"
2127 #: builtin/add.c:358
2129 msgid "Maybe you wanted to say 'git add .'?\n"
2130 msgstr "也许您想要执行 'git add .'?\n"
2132 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2133 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2134 msgid "index file corrupt"
2137 #: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2138 msgid "Unable to write new index file"
2141 #: builtin/apply.c:59
2142 msgid "git apply [<options>] [<patch>...]"
2143 msgstr "git apply [<选项>] [<补丁>...]"
2145 #: builtin/apply.c:112
2147 msgid "unrecognized whitespace option '%s'"
2148 msgstr "未能识别的空白字符选项 '%s'"
2150 #: builtin/apply.c:127
2152 msgid "unrecognized whitespace ignore option '%s'"
2153 msgstr "未能识别的空白字符忽略选项 '%s'"
2155 #: builtin/apply.c:822
2157 msgid "Cannot prepare timestamp regexp %s"
2158 msgstr "无法准备时间戳正则表达式 %s"
2160 #: builtin/apply.c:831
2162 msgid "regexec returned %d for input: %s"
2163 msgstr "regexec 返回 %d,输入为:%s"
2165 #: builtin/apply.c:912
2167 msgid "unable to find filename in patch at line %d"
2168 msgstr "不能在补丁的第 %d 行找到文件名"
2170 #: builtin/apply.c:944
2172 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2173 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2175 #: builtin/apply.c:948
2177 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2178 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2180 #: builtin/apply.c:949
2182 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2183 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2185 #: builtin/apply.c:956
2187 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2188 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2190 #: builtin/apply.c:1419
2192 msgid "recount: unexpected line: %.*s"
2193 msgstr "recount:意外的行:%.*s"
2195 #: builtin/apply.c:1476
2197 msgid "patch fragment without header at line %d: %.*s"
2198 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2200 #: builtin/apply.c:1493
2203 "git diff header lacks filename information when removing %d leading pathname "
2204 "component (line %d)"
2206 "git diff header lacks filename information when removing %d leading pathname "
2207 "components (line %d)"
2208 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2209 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2211 #: builtin/apply.c:1656
2212 msgid "new file depends on old contents"
2215 #: builtin/apply.c:1658
2216 msgid "deleted file still has contents"
2219 #: builtin/apply.c:1684
2221 msgid "corrupt patch at line %d"
2222 msgstr "补丁在第 %d 行损坏"
2224 #: builtin/apply.c:1720
2226 msgid "new file %s depends on old contents"
2227 msgstr "新文件 %s 依赖旧内容"
2229 #: builtin/apply.c:1722
2231 msgid "deleted file %s still has contents"
2232 msgstr "删除的文件 %s 仍有内容"
2234 #: builtin/apply.c:1725
2236 msgid "** warning: file %s becomes empty but is not deleted"
2237 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2239 #: builtin/apply.c:1871
2241 msgid "corrupt binary patch at line %d: %.*s"
2242 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2244 #: builtin/apply.c:1900
2246 msgid "unrecognized binary patch at line %d"
2247 msgstr "未能识别的二进制补丁位于第 %d 行"
2249 #: builtin/apply.c:2051
2251 msgid "patch with only garbage at line %d"
2252 msgstr "补丁文件的第 %d 行只有垃圾数据"
2254 #: builtin/apply.c:2141
2256 msgid "unable to read symlink %s"
2257 msgstr "无法读取符号链接 %s"
2259 #: builtin/apply.c:2145
2261 msgid "unable to open or read %s"
2264 #: builtin/apply.c:2778
2266 msgid "invalid start of line: '%c'"
2267 msgstr "无效的行首字符:'%c'"
2269 #: builtin/apply.c:2897
2271 msgid "Hunk #%d succeeded at %d (offset %d line)."
2272 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2273 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2274 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2276 #: builtin/apply.c:2909
2278 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2279 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2281 #: builtin/apply.c:2915
2284 "while searching for:\n"
2290 #: builtin/apply.c:2935
2292 msgid "missing binary patch data for '%s'"
2293 msgstr "缺失 '%s' 的二进制补丁数据"
2295 #: builtin/apply.c:3036
2297 msgid "binary patch does not apply to '%s'"
2298 msgstr "二进制补丁未应用到 '%s'"
2300 #: builtin/apply.c:3042
2302 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2303 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2305 #: builtin/apply.c:3063
2307 msgid "patch failed: %s:%ld"
2308 msgstr "打补丁失败:%s:%ld"
2310 #: builtin/apply.c:3187
2312 msgid "cannot checkout %s"
2315 #: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2317 msgid "read of %s failed"
2320 #: builtin/apply.c:3240
2322 msgid "reading from '%s' beyond a symbolic link"
2323 msgstr "读取位于符号链接中的 '%s'"
2325 #: builtin/apply.c:3268 builtin/apply.c:3490
2327 msgid "path %s has been renamed/deleted"
2328 msgstr "路径 %s 已经被重命名/删除"
2330 #: builtin/apply.c:3349 builtin/apply.c:3504
2332 msgid "%s: does not exist in index"
2335 #: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2340 #: builtin/apply.c:3358 builtin/apply.c:3512
2342 msgid "%s: does not match index"
2345 #: builtin/apply.c:3460
2346 msgid "removal patch leaves file contents"
2347 msgstr "移除补丁仍留下了文件内容"
2349 #: builtin/apply.c:3529
2351 msgid "%s: wrong type"
2354 #: builtin/apply.c:3531
2356 msgid "%s has type %o, expected %o"
2357 msgstr "%s 的类型是 %o,应为 %o"
2359 #: builtin/apply.c:3690 builtin/apply.c:3692
2361 msgid "invalid path '%s'"
2364 #: builtin/apply.c:3747
2366 msgid "%s: already exists in index"
2367 msgstr "%s:已经存在于索引中"
2369 #: builtin/apply.c:3750
2371 msgid "%s: already exists in working directory"
2372 msgstr "%s:已经存在于工作区中"
2374 #: builtin/apply.c:3770
2376 msgid "new mode (%o) of %s does not match old mode (%o)"
2377 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2379 #: builtin/apply.c:3775
2381 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2382 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2384 #: builtin/apply.c:3795
2386 msgid "affected file '%s' is beyond a symbolic link"
2387 msgstr "受影响的文件 '%s' 位于符号链接中"
2389 #: builtin/apply.c:3799
2391 msgid "%s: patch does not apply"
2394 #: builtin/apply.c:3813
2396 msgid "Checking patch %s..."
2399 #: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2401 msgid "make_cache_entry failed for path '%s'"
2402 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2404 #: builtin/apply.c:4049
2406 msgid "unable to remove %s from index"
2407 msgstr "不能从索引中移除 %s"
2409 #: builtin/apply.c:4078
2411 msgid "corrupt patch for submodule %s"
2412 msgstr "子模组 %s 损坏的补丁"
2414 #: builtin/apply.c:4082
2416 msgid "unable to stat newly created file '%s'"
2417 msgstr "不能枚举新建文件 '%s' 的状态"
2419 #: builtin/apply.c:4087
2421 msgid "unable to create backing store for newly created file %s"
2422 msgstr "不能为新建文件 %s 创建后端存储"
2424 #: builtin/apply.c:4090 builtin/apply.c:4198
2426 msgid "unable to add cache entry for %s"
2427 msgstr "无法为 %s 添加缓存条目"
2429 #: builtin/apply.c:4123
2431 msgid "closing file '%s'"
2434 #: builtin/apply.c:4172
2436 msgid "unable to write file '%s' mode %o"
2437 msgstr "不能写文件 '%s' 权限 %o"
2439 #: builtin/apply.c:4259
2441 msgid "Applied patch %s cleanly."
2444 #: builtin/apply.c:4267
2445 msgid "internal error"
2448 #: builtin/apply.c:4270
2450 msgid "Applying patch %%s with %d reject..."
2451 msgid_plural "Applying patch %%s with %d rejects..."
2452 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2453 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2455 #: builtin/apply.c:4280
2457 msgid "truncating .rej filename to %.*s.rej"
2458 msgstr "截短 .rej 文件名为 %.*s.rej"
2460 #: builtin/apply.c:4301
2462 msgid "Hunk #%d applied cleanly."
2463 msgstr "第 #%d 个片段成功应用。"
2465 #: builtin/apply.c:4304
2467 msgid "Rejected hunk #%d."
2468 msgstr "拒绝第 #%d 个片段。"
2470 #: builtin/apply.c:4394
2471 msgid "unrecognized input"
2474 #: builtin/apply.c:4405
2475 msgid "unable to read index file"
2478 #: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2479 #: builtin/fetch.c:92
2483 #: builtin/apply.c:4523
2484 msgid "don't apply changes matching the given path"
2485 msgstr "不要应用与给出路径向匹配的变更"
2487 #: builtin/apply.c:4526
2488 msgid "apply changes matching the given path"
2489 msgstr "应用与给出路径向匹配的变更"
2491 #: builtin/apply.c:4528
2495 #: builtin/apply.c:4529
2496 msgid "remove <num> leading slashes from traditional diff paths"
2497 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2499 #: builtin/apply.c:4532
2500 msgid "ignore additions made by the patch"
2501 msgstr "忽略补丁中的添加的文件"
2503 #: builtin/apply.c:4534
2504 msgid "instead of applying the patch, output diffstat for the input"
2505 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2507 #: builtin/apply.c:4538
2508 msgid "show number of added and deleted lines in decimal notation"
2509 msgstr "以十进制数显示添加和删除的行数"
2511 #: builtin/apply.c:4540
2512 msgid "instead of applying the patch, output a summary for the input"
2513 msgstr "不应用补丁,而是显示输入的概要"
2515 #: builtin/apply.c:4542
2516 msgid "instead of applying the patch, see if the patch is applicable"
2517 msgstr "不应用补丁,而是查看补丁是否可应用"
2519 #: builtin/apply.c:4544
2520 msgid "make sure the patch is applicable to the current index"
2521 msgstr "确认补丁可以应用到当前索引"
2523 #: builtin/apply.c:4546
2524 msgid "apply a patch without touching the working tree"
2525 msgstr "应用补丁而不修改工作区"
2527 #: builtin/apply.c:4548
2528 msgid "accept a patch that touches outside the working area"
2529 msgstr "接受修改工作区之外文件的补丁"
2531 #: builtin/apply.c:4550
2532 msgid "also apply the patch (use with --stat/--summary/--check)"
2533 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2535 #: builtin/apply.c:4552
2536 msgid "attempt three-way merge if a patch does not apply"
2537 msgstr "如果一个补丁不能应用则尝试三路合并"
2539 #: builtin/apply.c:4554
2540 msgid "build a temporary index based on embedded index information"
2541 msgstr "创建一个临时索引基于嵌入的索引信息"
2543 #: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2544 msgid "paths are separated with NUL character"
2545 msgstr "路径以 NUL 字符分隔"
2547 #: builtin/apply.c:4559
2548 msgid "ensure at least <n> lines of context match"
2549 msgstr "确保至少匹配 <n> 行上下文"
2551 #: builtin/apply.c:4560
2555 #: builtin/apply.c:4561
2556 msgid "detect new or modified lines that have whitespace errors"
2557 msgstr "检查新增和修改的行中间的空白字符滥用"
2559 #: builtin/apply.c:4564 builtin/apply.c:4567
2560 msgid "ignore changes in whitespace when finding context"
2561 msgstr "查找上下文时忽略空白字符的变更"
2563 #: builtin/apply.c:4570
2564 msgid "apply the patch in reverse"
2567 #: builtin/apply.c:4572
2568 msgid "don't expect at least one line of context"
2571 #: builtin/apply.c:4574
2572 msgid "leave the rejected hunks in corresponding *.rej files"
2573 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2575 #: builtin/apply.c:4576
2576 msgid "allow overlapping hunks"
2579 #: builtin/apply.c:4579
2580 msgid "tolerate incorrectly detected missing new-line at the end of file"
2581 msgstr "允许不正确的文件末尾换行符"
2583 #: builtin/apply.c:4582
2584 msgid "do not trust the line counts in the hunk headers"
2585 msgstr "不信任补丁片段的头信息中的行号"
2587 #: builtin/apply.c:4584
2591 #: builtin/apply.c:4585
2592 msgid "prepend <root> to all filenames"
2593 msgstr "为所有文件名前添加 <根目录>"
2595 #: builtin/apply.c:4607
2596 msgid "--3way outside a repository"
2597 msgstr "--3way 在一个版本库之外"
2599 #: builtin/apply.c:4615
2600 msgid "--index outside a repository"
2601 msgstr "--index 在一个版本库之外"
2603 #: builtin/apply.c:4618
2604 msgid "--cached outside a repository"
2605 msgstr "--cached 在一个版本库之外"
2607 #: builtin/apply.c:4637
2609 msgid "can't open patch '%s'"
2610 msgstr "不能打开补丁 '%s'"
2612 #: builtin/apply.c:4651
2614 msgid "squelched %d whitespace error"
2615 msgid_plural "squelched %d whitespace errors"
2616 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2617 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2619 #: builtin/apply.c:4657 builtin/apply.c:4667
2621 msgid "%d line adds whitespace errors."
2622 msgid_plural "%d lines add whitespace errors."
2623 msgstr[0] "%d 行有空白字符误用。"
2624 msgstr[1] "%d 行有空白字符误用。"
2626 #: builtin/archive.c:17
2628 msgid "could not create archive file '%s'"
2629 msgstr "不能创建归档文件 '%s'"
2631 #: builtin/archive.c:20
2632 msgid "could not redirect output"
2635 #: builtin/archive.c:37
2636 msgid "git archive: Remote with no URL"
2637 msgstr "git archive:未提供远程URL"
2639 #: builtin/archive.c:58
2640 msgid "git archive: expected ACK/NAK, got EOF"
2641 msgstr "git archive:应为ACK/NACK,却得到EOF"
2643 #: builtin/archive.c:61
2645 msgid "git archive: NACK %s"
2646 msgstr "git archive:NACK %s"
2648 #: builtin/archive.c:63
2650 msgid "remote error: %s"
2653 #: builtin/archive.c:64
2654 msgid "git archive: protocol error"
2655 msgstr "git archive:协议错误"
2657 #: builtin/archive.c:68
2658 msgid "git archive: expected a flush"
2659 msgstr "git archive:应为刷新"
2661 #: builtin/bisect--helper.c:7
2662 msgid "git bisect--helper --next-all [--no-checkout]"
2663 msgstr "git bisect--helper --next-all [--no-checkout]"
2665 #: builtin/bisect--helper.c:17
2666 msgid "perform 'git bisect next'"
2667 msgstr "执行 'git bisect next'"
2669 #: builtin/bisect--helper.c:19
2670 msgid "update BISECT_HEAD instead of checking out the current commit"
2671 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2673 #: builtin/blame.c:30
2674 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"
2675 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件"
2677 #: builtin/blame.c:35
2678 msgid "<rev-opts> are documented in git-rev-list(1)"
2679 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2681 #: builtin/blame.c:2500
2682 msgid "Show blame entries as we find them, incrementally"
2683 msgstr "增量式地显示发现的 blame 条目"
2685 #: builtin/blame.c:2501
2686 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2687 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2689 #: builtin/blame.c:2502
2690 msgid "Do not treat root commits as boundaries (Default: off)"
2691 msgstr "不把根提交作为边界(默认:关闭)"
2693 #: builtin/blame.c:2503
2694 msgid "Show work cost statistics"
2697 #: builtin/blame.c:2504
2698 msgid "Show output score for blame entries"
2699 msgstr "显示判断 blame 条目位移的得分诊断信息"
2701 #: builtin/blame.c:2505
2702 msgid "Show original filename (Default: auto)"
2703 msgstr "显示原始文件名(默认:自动)"
2705 #: builtin/blame.c:2506
2706 msgid "Show original linenumber (Default: off)"
2707 msgstr "显示原始的行号(默认:关闭)"
2709 #: builtin/blame.c:2507
2710 msgid "Show in a format designed for machine consumption"
2711 msgstr "显示为一个适合机器读取的格式"
2713 #: builtin/blame.c:2508
2714 msgid "Show porcelain format with per-line commit information"
2715 msgstr "为每一行显示机器适用的提交信息"
2717 #: builtin/blame.c:2509
2718 msgid "Use the same output mode as git-annotate (Default: off)"
2719 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2721 #: builtin/blame.c:2510
2722 msgid "Show raw timestamp (Default: off)"
2723 msgstr "显示原始时间戳(默认:关闭)"
2725 #: builtin/blame.c:2511
2726 msgid "Show long commit SHA1 (Default: off)"
2727 msgstr "显示长的SHA1提交号(默认:关闭)"
2729 #: builtin/blame.c:2512
2730 msgid "Suppress author name and timestamp (Default: off)"
2731 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2733 #: builtin/blame.c:2513
2734 msgid "Show author email instead of name (Default: off)"
2735 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2737 #: builtin/blame.c:2514
2738 msgid "Ignore whitespace differences"
2741 #: builtin/blame.c:2515
2742 msgid "Spend extra cycles to find better match"
2743 msgstr "花费额外的循环来找到更好的匹配"
2745 #: builtin/blame.c:2516
2746 msgid "Use revisions from <file> instead of calling git-rev-list"
2747 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2749 #: builtin/blame.c:2517
2750 msgid "Use <file>'s contents as the final image"
2751 msgstr "使用 <文件> 的内容作为最终的图片"
2753 #: builtin/blame.c:2518 builtin/blame.c:2519
2757 #: builtin/blame.c:2518
2758 msgid "Find line copies within and across files"
2759 msgstr "找到文件内及跨文件的行拷贝"
2761 #: builtin/blame.c:2519
2762 msgid "Find line movements within and across files"
2763 msgstr "找到文件内及跨文件的行移动"
2765 #: builtin/blame.c:2520
2769 #: builtin/blame.c:2520
2770 msgid "Process only line range n,m, counting from 1"
2771 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2773 #. TRANSLATORS: This string is used to tell us the maximum
2774 #. display width for a relative timestamp in "git blame"
2775 #. output. For C locale, "4 years, 11 months ago", which
2776 #. takes 22 places, is the longest among various forms of
2777 #. relative timestamps, but your language may need more or
2778 #. fewer display columns.
2779 #: builtin/blame.c:2601
2780 msgid "4 years, 11 months ago"
2783 #: builtin/branch.c:24
2784 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2785 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2787 #: builtin/branch.c:25
2788 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2789 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2791 #: builtin/branch.c:26
2792 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2793 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2795 #: builtin/branch.c:27
2796 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2797 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2799 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2800 #: builtin/branch.c:152
2803 "deleting branch '%s' that has been merged to\n"
2804 " '%s', but not yet merged to HEAD."
2806 "将要删除的分支 '%s' 已经被合并到\n"
2809 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2810 #: builtin/branch.c:156
2813 "not deleting branch '%s' that is not yet merged to\n"
2814 " '%s', even though it is merged to HEAD."
2816 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2817 " 然而却尚未被合并到分支 '%s' 。"
2819 #: builtin/branch.c:170
2821 msgid "Couldn't look up commit object for '%s'"
2822 msgstr "无法查询 '%s' 指向的提交对象"
2824 #: builtin/branch.c:174
2827 "The branch '%s' is not fully merged.\n"
2828 "If you are sure you want to delete it, run 'git branch -D %s'."
2831 "如果您确认要删除它,执行 'git branch -D %s'。"
2833 #: builtin/branch.c:187
2834 msgid "Update of config-file failed"
2835 msgstr "无法更新 config 文件"
2837 #: builtin/branch.c:215
2838 msgid "cannot use -a with -d"
2839 msgstr "不能将 -a 和 -d 同时使用"
2841 #: builtin/branch.c:221
2842 msgid "Couldn't look up commit object for HEAD"
2843 msgstr "无法查询 HEAD 指向的提交对象"
2845 #: builtin/branch.c:229
2847 msgid "Cannot delete the branch '%s' which you are currently on."
2848 msgstr "无法删除您当前所在的分支 '%s'。"
2850 #: builtin/branch.c:245
2852 msgid "remote branch '%s' not found."
2853 msgstr "远程分支 '%s' 未发现。"
2855 #: builtin/branch.c:246
2857 msgid "branch '%s' not found."
2858 msgstr "分支 '%s' 未发现。"
2860 #: builtin/branch.c:260
2862 msgid "Error deleting remote branch '%s'"
2863 msgstr "删除远程分支 '%s' 时出错"
2865 #: builtin/branch.c:261
2867 msgid "Error deleting branch '%s'"
2868 msgstr "删除分支 '%s' 时出错"
2870 #: builtin/branch.c:268
2872 msgid "Deleted remote branch %s (was %s).\n"
2873 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2875 #: builtin/branch.c:269
2877 msgid "Deleted branch %s (was %s).\n"
2878 msgstr "已删除分支 %s(曾为 %s)。\n"
2880 #: builtin/branch.c:370
2882 msgid "branch '%s' does not point at a commit"
2883 msgstr "分支 '%s' 未指向一个提交"
2885 #: builtin/branch.c:459
2890 #: builtin/branch.c:464
2895 #: builtin/branch.c:469
2897 msgid "[%s: behind %d]"
2900 #: builtin/branch.c:471
2905 #: builtin/branch.c:475
2907 msgid "[%s: ahead %d]"
2910 #: builtin/branch.c:477
2915 #: builtin/branch.c:480
2917 msgid "[%s: ahead %d, behind %d]"
2918 msgstr "[%s:领先 %d,落后 %d]"
2920 #: builtin/branch.c:483
2922 msgid "[ahead %d, behind %d]"
2923 msgstr "[领先 %d,落后 %d]"
2925 #: builtin/branch.c:496
2926 msgid " **** invalid ref ****"
2927 msgstr " **** 无效引用 ****"
2929 #: builtin/branch.c:587
2931 msgid "(no branch, rebasing %s)"
2932 msgstr "(非分支,正变基 %s)"
2934 #: builtin/branch.c:590
2936 msgid "(no branch, bisect started on %s)"
2937 msgstr "(非分支,二分查找开始于 %s)"
2939 #: builtin/branch.c:596
2941 msgid "(HEAD detached at %s)"
2942 msgstr "(头指针分离于 %s)"
2944 #: builtin/branch.c:599
2946 msgid "(HEAD detached from %s)"
2947 msgstr "(头指针分离自 %s)"
2949 #: builtin/branch.c:603
2953 #: builtin/branch.c:650
2955 msgid "object '%s' does not point to a commit"
2956 msgstr "对象 '%s' 没有指向一个提交"
2958 #: builtin/branch.c:698
2959 msgid "some refs could not be read"
2962 #: builtin/branch.c:711
2963 msgid "cannot rename the current branch while not on any."
2964 msgstr "无法重命名当前分支因为不处于任何分支上。"
2966 #: builtin/branch.c:721
2968 msgid "Invalid branch name: '%s'"
2969 msgstr "无效的分支名:'%s'"
2971 #: builtin/branch.c:736
2972 msgid "Branch rename failed"
2975 #: builtin/branch.c:740
2977 msgid "Renamed a misnamed branch '%s' away"
2978 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2980 #: builtin/branch.c:744
2982 msgid "Branch renamed to %s, but HEAD is not updated!"
2983 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2985 #: builtin/branch.c:751
2986 msgid "Branch is renamed, but update of config-file failed"
2987 msgstr "分支被重命名,但更新 config 文件失败"
2989 #: builtin/branch.c:766
2991 msgid "malformed object name %s"
2994 #: builtin/branch.c:790
2996 msgid "could not write branch description template: %s"
2997 msgstr "不能写分支描述模版:%s"
2999 #: builtin/branch.c:820
3000 msgid "Generic options"
3003 #: builtin/branch.c:822
3004 msgid "show hash and subject, give twice for upstream branch"
3005 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3007 #: builtin/branch.c:823
3008 msgid "suppress informational messages"
3011 #: builtin/branch.c:824
3012 msgid "set up tracking mode (see git-pull(1))"
3013 msgstr "设置跟踪模式(参见 git-pull(1))"
3015 #: builtin/branch.c:826
3016 msgid "change upstream info"
3019 #: builtin/branch.c:830
3020 msgid "use colored output"
3023 #: builtin/branch.c:831
3024 msgid "act on remote-tracking branches"
3027 #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
3028 #: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
3029 #: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
3030 #: builtin/tag.c:622
3034 #: builtin/branch.c:835 builtin/branch.c:841
3035 msgid "print only branches that contain the commit"
3036 msgstr "只打印包含该提交的分支"
3038 #: builtin/branch.c:847
3039 msgid "Specific git-branch actions:"
3040 msgstr "具体的 git-branch 动作:"
3042 #: builtin/branch.c:848
3043 msgid "list both remote-tracking and local branches"
3044 msgstr "列出远程跟踪及本地分支"
3046 #: builtin/branch.c:850
3047 msgid "delete fully merged branch"
3050 #: builtin/branch.c:851
3051 msgid "delete branch (even if not merged)"
3052 msgstr "删除分支(即使没有合并)"
3054 #: builtin/branch.c:852
3055 msgid "move/rename a branch and its reflog"
3056 msgstr "移动/重命名一个分支,以及它的引用日志"
3058 #: builtin/branch.c:853
3059 msgid "move/rename a branch, even if target exists"
3060 msgstr "移动/重命名一个分支,即使目标已存在"
3062 #: builtin/branch.c:854
3063 msgid "list branch names"
3066 #: builtin/branch.c:855
3067 msgid "create the branch's reflog"
3070 #: builtin/branch.c:857
3071 msgid "edit the description for the branch"
3074 #: builtin/branch.c:858
3075 msgid "force creation, move/rename, deletion"
3076 msgstr "强制创建、移动/重命名、删除"
3078 #: builtin/branch.c:861
3079 msgid "print only not merged branches"
3082 #: builtin/branch.c:867
3083 msgid "print only merged branches"
3086 #: builtin/branch.c:871
3087 msgid "list branches in columns"
3090 #: builtin/branch.c:884
3091 msgid "Failed to resolve HEAD as a valid ref."
3092 msgstr "无法将 HEAD 解析为有效引用。"
3094 #: builtin/branch.c:888 builtin/clone.c:637
3095 msgid "HEAD not found below refs/heads!"
3096 msgstr "HEAD 没有位于 /refs/heads 之下!"
3098 #: builtin/branch.c:910
3099 msgid "--column and --verbose are incompatible"
3100 msgstr "--column 和 --verbose 不兼容"
3102 #: builtin/branch.c:921 builtin/branch.c:960
3103 msgid "branch name required"
3106 #: builtin/branch.c:936
3107 msgid "Cannot give description to detached HEAD"
3108 msgstr "不能向分离头指针提供描述"
3110 #: builtin/branch.c:941
3111 msgid "cannot edit description of more than one branch"
3112 msgstr "不能为一个以上的分支编辑描述"
3114 #: builtin/branch.c:948
3116 msgid "No commit on branch '%s' yet."
3117 msgstr "分支 '%s' 尚无提交。"
3119 #: builtin/branch.c:951
3121 msgid "No branch named '%s'."
3124 #: builtin/branch.c:966
3125 msgid "too many branches for a rename operation"
3126 msgstr "为重命名操作提供了太多的分支名"
3128 #: builtin/branch.c:971
3129 msgid "too many branches to set new upstream"
3130 msgstr "为设置新上游提供了太多的分支名"
3132 #: builtin/branch.c:975
3135 "could not set upstream of HEAD to %s when it does not point to any branch."
3136 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3138 #: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021
3140 msgid "no such branch '%s'"
3143 #: builtin/branch.c:982
3145 msgid "branch '%s' does not exist"
3146 msgstr "分支 '%s' 不存在"
3148 #: builtin/branch.c:994
3149 msgid "too many branches to unset upstream"
3150 msgstr "为取消上游设置操作提供了太多的分支名"
3152 #: builtin/branch.c:998
3153 msgid "could not unset upstream of HEAD when it does not point to any branch."
3154 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3156 #: builtin/branch.c:1004
3158 msgid "Branch '%s' has no upstream information"
3159 msgstr "分支 '%s' 没有上游信息"
3161 #: builtin/branch.c:1018
3162 msgid "it does not make sense to create 'HEAD' manually"
3163 msgstr "手工创建 'HEAD' 没有意义"
3165 #: builtin/branch.c:1024
3166 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3167 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3169 #: builtin/branch.c:1027
3172 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3173 "track or --set-upstream-to\n"
3175 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3177 #: builtin/branch.c:1044
3181 "If you wanted to make '%s' track '%s', do this:\n"
3185 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3188 #: builtin/branch.c:1045
3190 msgid " git branch -d %s\n"
3191 msgstr " git branch -d %s\n"
3193 #: builtin/branch.c:1046
3195 msgid " git branch --set-upstream-to %s\n"
3196 msgstr " git branch --set-upstream-to %s\n"
3198 #: builtin/bundle.c:47
3200 msgid "%s is okay\n"
3203 #: builtin/bundle.c:56
3204 msgid "Need a repository to create a bundle."
3205 msgstr "需要一个版本库来创建包。"
3207 #: builtin/bundle.c:60
3208 msgid "Need a repository to unbundle."
3209 msgstr "需要一个版本库来解包。"
3211 #: builtin/cat-file.c:326
3212 msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"
3213 msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>"
3215 #: builtin/cat-file.c:327
3216 msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"
3217 msgstr "git cat-file (--batch | --batch-check) < <对象列表>"
3219 #: builtin/cat-file.c:364
3220 msgid "<type> can be one of: blob, tree, commit, tag"
3221 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3223 #: builtin/cat-file.c:365
3224 msgid "show object type"
3227 #: builtin/cat-file.c:366
3228 msgid "show object size"
3231 #: builtin/cat-file.c:368
3232 msgid "exit with zero when there's no error"
3233 msgstr "当没有错误时退出并返回零"
3235 #: builtin/cat-file.c:369
3236 msgid "pretty-print object's content"
3239 #: builtin/cat-file.c:371
3240 msgid "for blob objects, run textconv on object's content"
3241 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3243 #: builtin/cat-file.c:373
3244 msgid "show info and content of objects fed from the standard input"
3245 msgstr "显示从标准输入提供的对象的信息和内容"
3247 #: builtin/cat-file.c:376
3248 msgid "show info about objects fed from the standard input"
3249 msgstr "显示从标准输入提供的对象的信息"
3251 #: builtin/check-attr.c:11
3252 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3253 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3255 #: builtin/check-attr.c:12
3256 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3257 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3259 #: builtin/check-attr.c:19
3260 msgid "report all attributes set on file"
3261 msgstr "报告设置在文件上的所有属性"
3263 #: builtin/check-attr.c:20
3264 msgid "use .gitattributes only from the index"
3265 msgstr "只使用索引中的 .gitattributes"
3267 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3268 msgid "read file names from stdin"
3271 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3272 msgid "terminate input and output records by a NUL character"
3273 msgstr "输入和输出的记录使用 NUL 字符终结"
3275 #: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
3276 msgid "suppress progress reporting"
3279 #: builtin/check-ignore.c:26
3280 msgid "show non-matching input paths"
3283 #: builtin/check-ignore.c:28
3284 msgid "ignore index when checking"
3287 #: builtin/check-ignore.c:154
3288 msgid "cannot specify pathnames with --stdin"
3289 msgstr "不能同时提供路径及 --stdin 参数"
3291 #: builtin/check-ignore.c:157
3292 msgid "-z only makes sense with --stdin"
3293 msgstr "-z 需要和 --stdin 参数共用才有意义"
3295 #: builtin/check-ignore.c:159
3296 msgid "no path specified"
3299 #: builtin/check-ignore.c:163
3300 msgid "--quiet is only valid with a single pathname"
3301 msgstr "参数 --quiet 只在提供一个路径名时有效"
3303 #: builtin/check-ignore.c:165
3304 msgid "cannot have both --quiet and --verbose"
3305 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3307 #: builtin/check-ignore.c:168
3308 msgid "--non-matching is only valid with --verbose"
3309 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3311 #: builtin/check-mailmap.c:8
3312 msgid "git check-mailmap [<options>] <contact>..."
3313 msgstr "git check-mailmap [<选项>] <联系地址>..."
3315 #: builtin/check-mailmap.c:13
3316 msgid "also read contacts from stdin"
3317 msgstr "还从标准输入读取联系地址"
3319 #: builtin/check-mailmap.c:24
3321 msgid "unable to parse contact: %s"
3322 msgstr "不能解析联系地址:%s"
3324 #: builtin/check-mailmap.c:47
3325 msgid "no contacts specified"
3328 #: builtin/checkout-index.c:126
3329 msgid "git checkout-index [<options>] [--] [<file>...]"
3330 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3332 #: builtin/checkout-index.c:188
3333 msgid "check out all files in the index"
3336 #: builtin/checkout-index.c:189
3337 msgid "force overwrite of existing files"
3340 #: builtin/checkout-index.c:191
3341 msgid "no warning for existing files and files not in index"
3342 msgstr "存在或不在索引中的文件都没有警告"
3344 #: builtin/checkout-index.c:193
3345 msgid "don't checkout new files"
3348 #: builtin/checkout-index.c:195
3349 msgid "update stat information in the index file"
3350 msgstr "更新索引中文件的状态信息"
3352 #: builtin/checkout-index.c:201
3353 msgid "read list of paths from the standard input"
3354 msgstr "从标准输入读取路径列表"
3356 #: builtin/checkout-index.c:203
3357 msgid "write the content to temporary files"
3360 #: builtin/checkout-index.c:204 builtin/column.c:30
3364 #: builtin/checkout-index.c:205
3365 msgid "when creating files, prepend <string>"
3366 msgstr "在创建文件时,在前面加上<字符串>"
3368 #: builtin/checkout-index.c:208
3369 msgid "copy out the files from named stage"
3370 msgstr "从指定暂存区中拷出文件"
3372 #: builtin/checkout.c:25
3373 msgid "git checkout [<options>] <branch>"
3374 msgstr "git checkout [<选项>] <分支>"
3376 #: builtin/checkout.c:26
3377 msgid "git checkout [<options>] [<branch>] -- <file>..."
3378 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3380 #: builtin/checkout.c:132 builtin/checkout.c:165
3382 msgid "path '%s' does not have our version"
3383 msgstr "路径 '%s' 没有我们的版本"
3385 #: builtin/checkout.c:134 builtin/checkout.c:167
3387 msgid "path '%s' does not have their version"
3388 msgstr "路径 '%s' 没有他们的版本"
3390 #: builtin/checkout.c:150
3392 msgid "path '%s' does not have all necessary versions"
3393 msgstr "路径 '%s' 没有全部必须的版本"
3395 #: builtin/checkout.c:194
3397 msgid "path '%s' does not have necessary versions"
3398 msgstr "路径 '%s' 没有必须的版本"
3400 #: builtin/checkout.c:211
3402 msgid "path '%s': cannot merge"
3403 msgstr "path '%s':无法合并"
3405 #: builtin/checkout.c:228
3407 msgid "Unable to add merge result for '%s'"
3408 msgstr "无法为 '%s' 添加合并结果"
3410 #: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3411 #: builtin/checkout.c:258
3413 msgid "'%s' cannot be used with updating paths"
3414 msgstr "'%s' 不能在更新路径时使用"
3416 #: builtin/checkout.c:261 builtin/checkout.c:264
3418 msgid "'%s' cannot be used with %s"
3419 msgstr "'%s' 不能和 %s 同时使用"
3421 #: builtin/checkout.c:267
3423 msgid "Cannot update paths and switch to branch '%s' at the same time."
3424 msgstr "不能同时更新路径并切换到分支'%s'。"
3426 #: builtin/checkout.c:278 builtin/checkout.c:467
3427 msgid "corrupt index file"
3430 #: builtin/checkout.c:338 builtin/checkout.c:345
3432 msgid "path '%s' is unmerged"
3433 msgstr "路径 '%s' 未合并"
3435 #: builtin/checkout.c:489
3436 msgid "you need to resolve your current index first"
3437 msgstr "您需要先解决当前索引的冲突"
3439 #: builtin/checkout.c:615
3441 msgid "Can not do reflog for '%s'\n"
3442 msgstr "不能对 '%s' 执行 reflog 操作\n"
3444 #: builtin/checkout.c:653
3445 msgid "HEAD is now at"
3448 #: builtin/checkout.c:660
3450 msgid "Reset branch '%s'\n"
3451 msgstr "重置分支 '%s'\n"
3453 #: builtin/checkout.c:663
3455 msgid "Already on '%s'\n"
3456 msgstr "已经位于 '%s'\n"
3458 #: builtin/checkout.c:667
3460 msgid "Switched to and reset branch '%s'\n"
3461 msgstr "切换并重置分支 '%s'\n"
3463 #: builtin/checkout.c:669 builtin/checkout.c:1050
3465 msgid "Switched to a new branch '%s'\n"
3466 msgstr "切换到一个新分支 '%s'\n"
3468 #: builtin/checkout.c:671
3470 msgid "Switched to branch '%s'\n"
3471 msgstr "切换到分支 '%s'\n"
3474 #: builtin/checkout.c:723
3476 msgid " ... and %d more.\n"
3477 msgstr " ... 及其它 %d 个。\n"
3479 #: builtin/checkout.c:729
3482 "Warning: you are leaving %d commit behind, not connected to\n"
3483 "any of your branches:\n"
3487 "Warning: you are leaving %d commits behind, not connected to\n"
3488 "any of your branches:\n"
3492 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3496 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3500 #: builtin/checkout.c:747
3503 "If you want to keep them by creating a new branch, this may be a good time\n"
3506 " git branch <new-branch-name> %s\n"
3509 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3512 " git branch <新分支名> %s\n"
3515 #: builtin/checkout.c:777
3516 msgid "internal error in revision walk"
3517 msgstr "在版本遍历时遇到内部错误"
3519 #: builtin/checkout.c:781
3520 msgid "Previous HEAD position was"
3521 msgstr "之前的 HEAD 位置是"
3523 #: builtin/checkout.c:808 builtin/checkout.c:1045
3524 msgid "You are on a branch yet to be born"
3525 msgstr "您位于一个尚未初始化的分支"
3527 #: builtin/checkout.c:952
3529 msgid "only one reference expected, %d given."
3530 msgstr "只要一个引用,却给出了 %d 个"
3532 #: builtin/checkout.c:991
3534 msgid "invalid reference: %s"
3537 #: builtin/checkout.c:1020
3539 msgid "reference is not a tree: %s"
3542 #: builtin/checkout.c:1059
3543 msgid "paths cannot be used with switching branches"
3544 msgstr "路径不能和切换分支同时使用"
3546 #: builtin/checkout.c:1062 builtin/checkout.c:1066
3548 msgid "'%s' cannot be used with switching branches"
3549 msgstr "'%s' 不能和切换分支同时使用"
3551 #: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3552 #: builtin/checkout.c:1081
3554 msgid "'%s' cannot be used with '%s'"
3555 msgstr "'%s' 不能和 '%s' 同时使用"
3557 #: builtin/checkout.c:1086
3559 msgid "Cannot switch branch to a non-commit '%s'"
3560 msgstr "不能切换分支到一个非提交 '%s'"
3562 #: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
3563 #: builtin/remote.c:159 builtin/remote.c:161
3567 #: builtin/checkout.c:1109
3568 msgid "create and checkout a new branch"
3569 msgstr "创建并检出一个新的分支"
3571 #: builtin/checkout.c:1111
3572 msgid "create/reset and checkout a branch"
3573 msgstr "创建/重置并检出一个分支"
3575 #: builtin/checkout.c:1112
3576 msgid "create reflog for new branch"
3577 msgstr "为新的分支创建引用日志"
3579 #: builtin/checkout.c:1113
3580 msgid "detach the HEAD at named commit"
3581 msgstr "成为指向该提交的分离头指针"
3583 #: builtin/checkout.c:1114
3584 msgid "set upstream info for new branch"
3585 msgstr "为新的分支设置上游信息"
3587 #: builtin/checkout.c:1116
3591 #: builtin/checkout.c:1116
3592 msgid "new unparented branch"
3595 #: builtin/checkout.c:1117
3596 msgid "checkout our version for unmerged files"
3597 msgstr "对尚未合并的文件检出我们的版本"
3599 #: builtin/checkout.c:1119
3600 msgid "checkout their version for unmerged files"
3601 msgstr "对尚未合并的文件检出他们的版本"
3603 #: builtin/checkout.c:1121
3604 msgid "force checkout (throw away local modifications)"
3605 msgstr "强制检出(丢弃本地修改)"
3607 #: builtin/checkout.c:1122
3608 msgid "perform a 3-way merge with the new branch"
3609 msgstr "和新的分支执行三路合并"
3611 #: builtin/checkout.c:1123 builtin/merge.c:227
3612 msgid "update ignored files (default)"
3613 msgstr "更新忽略的文件(默认)"
3615 #: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
3619 #: builtin/checkout.c:1125
3620 msgid "conflict style (merge or diff3)"
3621 msgstr "冲突输出风格(merge 或 diff3)"
3623 #: builtin/checkout.c:1128
3624 msgid "do not limit pathspecs to sparse entries only"
3625 msgstr "对路径不做稀疏检出的限制"
3627 #: builtin/checkout.c:1130
3628 msgid "second guess 'git checkout <no-such-branch>'"
3629 msgstr "二次猜测'git checkout <无此分支>'"
3631 #: builtin/checkout.c:1153
3632 msgid "-b, -B and --orphan are mutually exclusive"
3633 msgstr "-b、-B 和 --orphan 是互斥的"
3635 #: builtin/checkout.c:1170
3636 msgid "--track needs a branch name"
3637 msgstr "--track 需要一个分支名"
3639 #: builtin/checkout.c:1175
3640 msgid "Missing branch name; try -b"
3641 msgstr "缺少分支名;尝试 -b"
3643 #: builtin/checkout.c:1212
3644 msgid "invalid path specification"
3647 #: builtin/checkout.c:1219
3650 "Cannot update paths and switch to branch '%s' at the same time.\n"
3651 "Did you intend to checkout '%s' which can not be resolved as commit?"
3653 "不能同时更新路径并切换到分支'%s'。\n"
3654 "您是想要检出 '%s' 但其未能解析为提交么?"
3656 #: builtin/checkout.c:1224
3658 msgid "git checkout: --detach does not take a path argument '%s'"
3659 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3661 #: builtin/checkout.c:1228
3663 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3664 "checking out of the index."
3666 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3668 #: builtin/clean.c:26
3670 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3672 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3674 #: builtin/clean.c:30
3676 msgid "Removing %s\n"
3679 #: builtin/clean.c:31
3681 msgid "Would remove %s\n"
3684 #: builtin/clean.c:32
3686 msgid "Skipping repository %s\n"
3689 #: builtin/clean.c:33
3691 msgid "Would skip repository %s\n"
3692 msgstr "将忽略版本库 %s\n"
3694 #: builtin/clean.c:34
3696 msgid "failed to remove %s"
3699 #: builtin/clean.c:295
3702 "1 - select a numbered item\n"
3703 "foo - select item based on unique prefix\n"
3704 " - (empty) select nothing"
3708 "foo - 通过标题选择一个选项\n"
3711 #: builtin/clean.c:299
3714 "1 - select a single item\n"
3715 "3-5 - select a range of items\n"
3716 "2-3,6-9 - select multiple ranges\n"
3717 "foo - select item based on unique prefix\n"
3718 "-... - unselect specified items\n"
3719 "* - choose all items\n"
3720 " - (empty) finish selecting"
3724 "3-5 - 选择一个范围内的所有选项\n"
3725 "2-3,6-9 - 选择多个范围内的所有选项\n"
3726 "foo - 通过标题选择一个选项\n"
3731 #: builtin/clean.c:517
3736 #: builtin/clean.c:659
3738 msgid "Input ignore patterns>> "
3739 msgstr "输入模版以排除条目>> "
3741 #: builtin/clean.c:696
3743 msgid "WARNING: Cannot find items matched by: %s"
3744 msgstr "警告:无法找到和 %s 匹配的条目"
3746 #: builtin/clean.c:717
3747 msgid "Select items to delete"
3750 #. TRANSLATORS: Make sure to keep [y/N] as is
3751 #: builtin/clean.c:758
3753 msgid "Remove %s [y/N]? "
3754 msgstr "删除 %s [y/N]?"
3756 #: builtin/clean.c:783
3760 #: builtin/clean.c:791
3762 "clean - start cleaning\n"
3763 "filter by pattern - exclude items from deletion\n"
3764 "select by numbers - select items to be deleted by numbers\n"
3765 "ask each - confirm each deletion (like \"rm -i\")\n"
3766 "quit - stop cleaning\n"
3767 "help - this screen\n"
3768 "? - help for prompt selection"
3771 "filter by pattern - 通过模版排除要删除的条目\n"
3772 "select by numbers - 通过数字选择要删除的条目\n"
3773 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3776 "? - 显示如何在提示符下选择的帮助"
3778 #: builtin/clean.c:818
3779 msgid "*** Commands ***"
3782 #: builtin/clean.c:819
3786 #: builtin/clean.c:827
3787 msgid "Would remove the following item:"
3788 msgid_plural "Would remove the following items:"
3789 msgstr[0] "将删除如下条目:"
3790 msgstr[1] "将删除如下条目:"
3792 #: builtin/clean.c:844
3793 msgid "No more files to clean, exiting."
3794 msgstr "没有要清理的文件,退出。"
3796 #: builtin/clean.c:875
3797 msgid "do not print names of files removed"
3800 #: builtin/clean.c:877
3804 #: builtin/clean.c:878
3805 msgid "interactive cleaning"
3808 #: builtin/clean.c:880
3809 msgid "remove whole directories"
3812 #: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714
3813 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185
3817 #: builtin/clean.c:882
3818 msgid "add <pattern> to ignore rules"
3819 msgstr "添加<模式>到忽略规则"
3821 #: builtin/clean.c:883
3822 msgid "remove ignored files, too"
3825 #: builtin/clean.c:885
3826 msgid "remove only ignored files"
3829 #: builtin/clean.c:903
3830 msgid "-x and -X cannot be used together"
3831 msgstr "-x 和 -X 不能同时使用"
3833 #: builtin/clean.c:907
3835 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3838 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3840 #: builtin/clean.c:910
3842 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3845 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3847 #: builtin/clone.c:37
3848 msgid "git clone [<options>] [--] <repo> [<dir>]"
3849 msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
3851 #: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224
3852 #: builtin/push.c:523
3853 msgid "force progress reporting"
3856 #: builtin/clone.c:68
3857 msgid "don't create a checkout"
3860 #: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
3861 msgid "create a bare repository"
3864 #: builtin/clone.c:73
3865 msgid "create a mirror repository (implies bare)"
3866 msgstr "创建一个镜像版本库(也是纯版本库)"
3868 #: builtin/clone.c:75
3869 msgid "to clone from a local repository"
3872 #: builtin/clone.c:77
3873 msgid "don't use local hardlinks, always copy"
3874 msgstr "不使用本地硬链接,始终复制"
3876 #: builtin/clone.c:79
3877 msgid "setup as shared repository"
3880 #: builtin/clone.c:81 builtin/clone.c:83
3881 msgid "initialize submodules in the clone"
3884 #: builtin/clone.c:84 builtin/init-db.c:493
3885 msgid "template-directory"
3888 #: builtin/clone.c:85 builtin/init-db.c:494
3889 msgid "directory from which templates will be used"
3892 #: builtin/clone.c:87
3893 msgid "reference repository"
3896 #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3900 #: builtin/clone.c:89
3901 msgid "use <name> instead of 'origin' to track upstream"
3902 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3904 #: builtin/clone.c:91
3905 msgid "checkout <branch> instead of the remote's HEAD"
3906 msgstr "检出<分支>而不是远程HEAD"
3908 #: builtin/clone.c:93
3909 msgid "path to git-upload-pack on the remote"
3910 msgstr "远程 git-upload-pack 路径"
3912 #: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659
3916 #: builtin/clone.c:95
3917 msgid "create a shallow clone of that depth"
3918 msgstr "创建一个指定深度的浅克隆"
3920 #: builtin/clone.c:97
3921 msgid "clone only one branch, HEAD or --branch"
3922 msgstr "只克隆一个分支、HEAD 或 --branch"
3924 #: builtin/clone.c:99
3925 msgid "use --reference only while cloning"
3926 msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3928 #: builtin/clone.c:100 builtin/init-db.c:502
3932 #: builtin/clone.c:101 builtin/init-db.c:503
3933 msgid "separate git dir from working tree"
3934 msgstr "git目录和工作区分离"
3936 #: builtin/clone.c:102
3940 #: builtin/clone.c:103
3941 msgid "set config inside the new repository"
3942 msgstr "在新版本库中设置配置信息"
3944 #: builtin/clone.c:256
3946 msgid "reference repository '%s' is not a local repository."
3947 msgstr "参考版本库 '%s' 不是一个本地版本库。"
3949 #: builtin/clone.c:260
3951 msgid "reference repository '%s' is shallow"
3952 msgstr "参考版本库 '%s' 是一个浅克隆"
3954 #: builtin/clone.c:263
3956 msgid "reference repository '%s' is grafted"
3957 msgstr "参考版本库 '%s' 已被嫁接"
3959 #: builtin/clone.c:325
3961 msgid "failed to create directory '%s'"
3962 msgstr "无法创建目录 '%s'"
3964 #: builtin/clone.c:327 builtin/diff.c:84
3966 msgid "failed to stat '%s'"
3967 msgstr "无法枚举 '%s' 状态"
3969 #: builtin/clone.c:329
3971 msgid "%s exists and is not a directory"
3972 msgstr "%s 存在且不是一个目录"
3974 #: builtin/clone.c:343
3976 msgid "failed to stat %s\n"
3977 msgstr "无法枚举 %s 状态\n"
3979 #: builtin/clone.c:365
3981 msgid "failed to create link '%s'"
3982 msgstr "无法创建链接 '%s'"
3984 #: builtin/clone.c:369
3986 msgid "failed to copy file to '%s'"
3987 msgstr "无法拷贝文件至 '%s'"
3989 #: builtin/clone.c:392 builtin/clone.c:566
3994 #: builtin/clone.c:404
3996 "Clone succeeded, but checkout failed.\n"
3997 "You can inspect what was checked out with 'git status'\n"
3998 "and retry the checkout with 'git checkout -f HEAD'\n"
4001 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4002 "'git checkout -f HEAD' 重试\n"
4004 #: builtin/clone.c:481
4006 msgid "Could not find remote branch %s to clone."
4007 msgstr "不能发现要克隆的远程分支 %s。"
4009 #: builtin/clone.c:561
4011 msgid "Checking connectivity... "
4014 #: builtin/clone.c:564
4015 msgid "remote did not send all necessary objects"
4016 msgstr "远程没有发送所有必须的对象"
4018 #: builtin/clone.c:628
4019 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4020 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4022 #: builtin/clone.c:659
4023 msgid "unable to checkout working tree"
4026 #: builtin/clone.c:746
4027 msgid "cannot repack to clean up"
4028 msgstr "无法执行 repack 来清理"
4030 #: builtin/clone.c:748
4031 msgid "cannot unlink temporary alternates file"
4032 msgstr "无法删除临时的 alternates 文件"
4034 #: builtin/clone.c:778
4035 msgid "Too many arguments."
4038 #: builtin/clone.c:782
4039 msgid "You must specify a repository to clone."
4040 msgstr "您必须指定一个版本库来克隆。"
4042 #: builtin/clone.c:793
4044 msgid "--bare and --origin %s options are incompatible."
4045 msgstr "--bare 和 --origin %s 选项不兼容。"
4047 #: builtin/clone.c:796
4048 msgid "--bare and --separate-git-dir are incompatible."
4049 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4051 #: builtin/clone.c:809
4053 msgid "repository '%s' does not exist"
4054 msgstr "版本库 '%s' 不存在"
4056 #: builtin/clone.c:815 builtin/fetch.c:1156
4058 msgid "depth %s is not a positive number"
4059 msgstr "深度 %s 不是一个正数"
4061 #: builtin/clone.c:825
4063 msgid "destination path '%s' already exists and is not an empty directory."
4064 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4066 #: builtin/clone.c:835
4068 msgid "working tree '%s' already exists."
4069 msgstr "工作区 '%s' 已经存在。"
4071 #: builtin/clone.c:850 builtin/clone.c:861
4073 msgid "could not create leading directories of '%s'"
4074 msgstr "不能为 '%s' 创建先导目录"
4076 #: builtin/clone.c:853
4078 msgid "could not create work tree dir '%s'"
4079 msgstr "不能创建工作区目录 '%s'"
4081 #: builtin/clone.c:871
4083 msgid "Cloning into bare repository '%s'...\n"
4084 msgstr "克隆到纯版本库 '%s'...\n"
4086 #: builtin/clone.c:873
4088 msgid "Cloning into '%s'...\n"
4089 msgstr "正克隆到 '%s'...\n"
4091 #: builtin/clone.c:898
4092 msgid "--dissociate given, but there is no --reference"
4093 msgstr "提供了参数 --dissociate,但未提供 --reference"
4095 #: builtin/clone.c:913
4096 msgid "--depth is ignored in local clones; use file:// instead."
4097 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4099 #: builtin/clone.c:916
4100 msgid "source repository is shallow, ignoring --local"
4101 msgstr "源版本库是浅克隆,忽略 --local"
4103 #: builtin/clone.c:921
4104 msgid "--local is ignored"
4105 msgstr "--local 被忽略"
4107 #: builtin/clone.c:925
4109 msgid "Don't know how to clone %s"
4112 #: builtin/clone.c:976 builtin/clone.c:984
4114 msgid "Remote branch %s not found in upstream %s"
4115 msgstr "远程分支 %s 在上游 %s 未发现"
4117 #: builtin/clone.c:987
4118 msgid "You appear to have cloned an empty repository."
4119 msgstr "您似乎克隆了一个空版本库。"
4121 #: builtin/column.c:9
4122 msgid "git column [<options>]"
4123 msgstr "git column [<选项>]"
4125 #: builtin/column.c:26
4126 msgid "lookup config vars"
4129 #: builtin/column.c:27 builtin/column.c:28
4130 msgid "layout to use"
4133 #: builtin/column.c:29
4134 msgid "Maximum width"
4137 #: builtin/column.c:30
4138 msgid "Padding space on left border"
4141 #: builtin/column.c:31
4142 msgid "Padding space on right border"
4145 #: builtin/column.c:32
4146 msgid "Padding space between columns"
4149 #: builtin/column.c:51
4150 msgid "--command must be the first argument"
4151 msgstr "--command 必须是第一个参数"
4153 #: builtin/commit.c:37
4154 msgid "git commit [<options>] [--] <pathspec>..."
4155 msgstr "git commit [<选项>] [--] <路径规则>..."
4157 #: builtin/commit.c:42
4158 msgid "git status [<options>] [--] <pathspec>..."
4159 msgstr "git status [<选项>] [--] <路径规则>..."
4161 #: builtin/commit.c:47
4163 "Your name and email address were configured automatically based\n"
4164 "on your username and hostname. Please check that they are accurate.\n"
4165 "You can suppress this message by setting them explicitly. Run the\n"
4166 "following command and follow the instructions in your editor to edit\n"
4167 "your configuration file:\n"
4169 " git config --global --edit\n"
4171 "After doing this, you may fix the identity used for this commit with:\n"
4173 " git commit --amend --reset-author\n"
4175 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4176 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4179 " git config --global --edit\n"
4181 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4183 " git commit --amend --reset-author\n"
4185 #: builtin/commit.c:60
4187 "Your name and email address were configured automatically based\n"
4188 "on your username and hostname. Please check that they are accurate.\n"
4189 "You can suppress this message by setting them explicitly:\n"
4191 " git config --global user.name \"Your Name\"\n"
4192 " git config --global user.email you@example.com\n"
4194 "After doing this, you may fix the identity used for this commit with:\n"
4196 " git commit --amend --reset-author\n"
4198 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4199 "与否。您可以对其进行设置以免再出现本提示信息:\n"
4201 " git config --global user.name \"Your Name\"\n"
4202 " git config --global user.email you@example.com\n"
4204 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4206 " git commit --amend --reset-author\n"
4208 #: builtin/commit.c:72
4210 "You asked to amend the most recent commit, but doing so would make\n"
4211 "it empty. You can repeat your command with --allow-empty, or you can\n"
4212 "remove the commit entirely with \"git reset HEAD^\".\n"
4214 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4215 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4217 #: builtin/commit.c:77
4219 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4220 "If you wish to commit it anyway, use:\n"
4222 " git commit --allow-empty\n"
4225 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4228 " git commit --allow-empty\n"
4231 #: builtin/commit.c:84
4232 msgid "Otherwise, please use 'git reset'\n"
4233 msgstr "否则,请使用命令 'git reset'\n"
4235 #: builtin/commit.c:87
4237 "If you wish to skip this commit, use:\n"
4241 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4242 "the remaining commits.\n"
4244 "如果您想跳过这个提交,使用命令:\n"
4248 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4251 #: builtin/commit.c:304
4252 msgid "failed to unpack HEAD tree object"
4253 msgstr "无法解包 HEAD 树对象"
4255 #: builtin/commit.c:344
4256 msgid "unable to create temporary index"
4259 #: builtin/commit.c:350
4260 msgid "interactive add failed"
4263 #: builtin/commit.c:361
4264 msgid "unable to write index file"
4267 #: builtin/commit.c:363
4268 msgid "unable to update temporary index"
4271 #: builtin/commit.c:365
4272 msgid "Failed to update main cache tree"
4275 #: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4276 msgid "unable to write new_index file"
4277 msgstr "无法写 new_index 文件"
4279 #: builtin/commit.c:445
4280 msgid "cannot do a partial commit during a merge."
4281 msgstr "在合并过程中不能做部分提交。"
4283 #: builtin/commit.c:447
4284 msgid "cannot do a partial commit during a cherry-pick."
4285 msgstr "在拣选过程中不能做部分提交。"
4287 #: builtin/commit.c:456
4288 msgid "cannot read the index"
4291 #: builtin/commit.c:475
4292 msgid "unable to write temporary index file"
4295 #: builtin/commit.c:580
4297 msgid "commit '%s' lacks author header"
4298 msgstr "提交 '%s' 缺少作者信息"
4300 #: builtin/commit.c:582
4302 msgid "commit '%s' has malformed author line"
4303 msgstr "提交 '%s' 有非法的作者信息"
4305 #: builtin/commit.c:601
4306 msgid "malformed --author parameter"
4307 msgstr "非法的 --author 参数"
4309 #: builtin/commit.c:609
4311 msgid "invalid date format: %s"
4314 #: builtin/commit.c:653
4316 "unable to select a comment character that is not used\n"
4317 "in the current commit message"
4318 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4320 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4322 msgid "could not lookup commit %s"
4325 #: builtin/commit.c:702 builtin/shortlog.c:273
4327 msgid "(reading log message from standard input)\n"
4328 msgstr "(正从标准输入中读取日志信息)\n"
4330 #: builtin/commit.c:704
4331 msgid "could not read log from standard input"
4332 msgstr "不能从标准输入中读取日志信息"
4334 #: builtin/commit.c:708
4336 msgid "could not read log file '%s'"
4337 msgstr "不能读取日志文件 '%s'"
4339 #: builtin/commit.c:730
4340 msgid "could not read MERGE_MSG"
4341 msgstr "不能读取 MERGE_MSG"
4343 #: builtin/commit.c:734
4344 msgid "could not read SQUASH_MSG"
4345 msgstr "不能读取 SQUASH_MSG"
4347 #: builtin/commit.c:738
4349 msgid "could not read '%s'"
4352 #: builtin/commit.c:785
4353 msgid "could not write commit template"
4356 #: builtin/commit.c:803
4360 "It looks like you may be committing a merge.\n"
4361 "If this is not correct, please remove the file\n"
4366 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4370 #: builtin/commit.c:808
4374 "It looks like you may be committing a cherry-pick.\n"
4375 "If this is not correct, please remove the file\n"
4380 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4384 #: builtin/commit.c:821
4387 "Please enter the commit message for your changes. Lines starting\n"
4388 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4390 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4393 #: builtin/commit.c:828
4396 "Please enter the commit message for your changes. Lines starting\n"
4397 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4398 "An empty message aborts the commit.\n"
4400 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4401 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4403 # 译者:为保证在输出中对齐,注意调整句中空格!
4404 #: builtin/commit.c:848
4406 msgid "%sAuthor: %.*s <%.*s>"
4407 msgstr "%s作者: %.*s <%.*s>"
4409 # 译者:为保证在输出中对齐,注意调整句中空格!
4410 #: builtin/commit.c:856
4415 # 译者:为保证在输出中对齐,注意调整句中空格!
4416 #: builtin/commit.c:863
4418 msgid "%sCommitter: %.*s <%.*s>"
4419 msgstr "%s提交者:%.*s <%.*s>"
4421 #: builtin/commit.c:881
4422 msgid "Cannot read index"
4425 #: builtin/commit.c:938
4426 msgid "Error building trees"
4429 #: builtin/commit.c:953 builtin/tag.c:495
4431 msgid "Please supply the message using either -m or -F option.\n"
4432 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4434 #: builtin/commit.c:1055
4436 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4437 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
4439 #: builtin/commit.c:1070 builtin/commit.c:1310
4441 msgid "Invalid untracked files mode '%s'"
4442 msgstr "无效的未追踪文件参数 '%s'"
4444 #: builtin/commit.c:1107
4445 msgid "--long and -z are incompatible"
4446 msgstr "--long 和 -z 选项不兼容"
4448 #: builtin/commit.c:1137
4449 msgid "Using both --reset-author and --author does not make sense"
4450 msgstr "同时使用 --reset-author 和 --author 没有意义"
4452 #: builtin/commit.c:1146
4453 msgid "You have nothing to amend."
4456 #: builtin/commit.c:1149
4457 msgid "You are in the middle of a merge -- cannot amend."
4458 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4460 #: builtin/commit.c:1151
4461 msgid "You are in the middle of a cherry-pick -- cannot amend."
4462 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4464 #: builtin/commit.c:1154
4465 msgid "Options --squash and --fixup cannot be used together"
4466 msgstr "选项 --squash 和 --fixup 不能同时使用"
4468 #: builtin/commit.c:1164
4469 msgid "Only one of -c/-C/-F/--fixup can be used."
4470 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4472 #: builtin/commit.c:1166
4473 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4474 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4476 #: builtin/commit.c:1174
4477 msgid "--reset-author can be used only with -C, -c or --amend."
4478 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4480 #: builtin/commit.c:1191
4481 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4482 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4484 #: builtin/commit.c:1193
4485 msgid "No paths with --include/--only does not make sense."
4486 msgstr "参数 --include/--only 不跟路径没有意义。"
4488 #: builtin/commit.c:1195
4489 msgid "Clever... amending the last one with dirty index."
4490 msgstr "聪明... 在索引不干净下修补最后的提交。"
4492 #: builtin/commit.c:1197
4493 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4494 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4496 #: builtin/commit.c:1209 builtin/tag.c:728
4498 msgid "Invalid cleanup mode %s"
4501 #: builtin/commit.c:1214
4502 msgid "Paths with -a does not make sense."
4503 msgstr "路径和 -a 选项同时使用没有意义。"
4505 #: builtin/commit.c:1324 builtin/commit.c:1604
4506 msgid "show status concisely"
4509 #: builtin/commit.c:1326 builtin/commit.c:1606
4510 msgid "show branch information"
4513 #: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4514 msgid "machine-readable output"
4517 #: builtin/commit.c:1331 builtin/commit.c:1610
4518 msgid "show status in long format (default)"
4519 msgstr "以长格式显示状态(默认)"
4521 #: builtin/commit.c:1334 builtin/commit.c:1613
4522 msgid "terminate entries with NUL"
4525 #: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4526 #: builtin/fast-export.c:983 builtin/tag.c:603
4530 #: builtin/commit.c:1337 builtin/commit.c:1616
4531 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4532 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4534 #: builtin/commit.c:1340
4535 msgid "show ignored files"
4538 #: builtin/commit.c:1341 parse-options.h:153
4542 #: builtin/commit.c:1342
4544 "ignore changes to submodules, optional when: all, dirty, untracked. "
4547 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4549 #: builtin/commit.c:1344
4550 msgid "list untracked files in columns"
4551 msgstr "以列的方式显示未跟踪的文件"
4553 #: builtin/commit.c:1431
4554 msgid "couldn't look up newly created commit"
4557 #: builtin/commit.c:1433
4558 msgid "could not parse newly created commit"
4561 #: builtin/commit.c:1478
4562 msgid "detached HEAD"
4565 # 译者:中文字符串拼接,可删除前导空格
4566 #: builtin/commit.c:1481
4567 msgid " (root-commit)"
4570 #: builtin/commit.c:1574
4571 msgid "suppress summary after successful commit"
4572 msgstr "提交成功后不显示概述信息"
4574 #: builtin/commit.c:1575
4575 msgid "show diff in commit message template"
4576 msgstr "在提交说明模板里显示差异"
4578 #: builtin/commit.c:1577
4579 msgid "Commit message options"
4582 #: builtin/commit.c:1578 builtin/tag.c:601
4583 msgid "read message from file"
4586 #: builtin/commit.c:1579
4590 #: builtin/commit.c:1579
4591 msgid "override author for commit"
4594 #: builtin/commit.c:1580 builtin/gc.c:275
4598 #: builtin/commit.c:1580
4599 msgid "override date for commit"
4602 #: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4603 #: builtin/notes.c:554 builtin/tag.c:599
4607 #: builtin/commit.c:1581
4608 msgid "commit message"
4611 #: builtin/commit.c:1582
4612 msgid "reuse and edit message from specified commit"
4613 msgstr "重用并编辑指定提交的提交说明"
4615 #: builtin/commit.c:1583
4616 msgid "reuse message from specified commit"
4617 msgstr "重用指定提交的提交说明"
4619 #: builtin/commit.c:1584
4620 msgid "use autosquash formatted message to fixup specified commit"
4621 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4623 #: builtin/commit.c:1585
4624 msgid "use autosquash formatted message to squash specified commit"
4625 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4627 #: builtin/commit.c:1586
4628 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4629 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4631 #: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4632 msgid "add Signed-off-by:"
4633 msgstr "添加 Signed-off-by: 签名"
4635 #: builtin/commit.c:1588
4636 msgid "use specified template file"
4639 #: builtin/commit.c:1589
4640 msgid "force edit of commit"
4643 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4644 #: builtin/commit.c:1590
4648 #: builtin/commit.c:1590 builtin/tag.c:604
4649 msgid "how to strip spaces and #comments from message"
4650 msgstr "设置如何删除提交说明里的空格和#注释"
4652 #: builtin/commit.c:1591
4653 msgid "include status in commit message template"
4654 msgstr "在提交说明模板里包含状态信息"
4656 #: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4657 #: builtin/tag.c:605
4661 #: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4662 msgid "GPG sign commit"
4665 #: builtin/commit.c:1596
4666 msgid "Commit contents options"
4669 #: builtin/commit.c:1597
4670 msgid "commit all changed files"
4673 #: builtin/commit.c:1598
4674 msgid "add specified files to index for commit"
4675 msgstr "添加指定的文件到索引区等待提交"
4677 #: builtin/commit.c:1599
4678 msgid "interactively add files"
4681 #: builtin/commit.c:1600
4682 msgid "interactively add changes"
4685 #: builtin/commit.c:1601
4686 msgid "commit only specified files"
4689 #: builtin/commit.c:1602
4690 msgid "bypass pre-commit hook"
4691 msgstr "绕过 pre-commit 钩子"
4693 #: builtin/commit.c:1603
4694 msgid "show what would be committed"
4697 #: builtin/commit.c:1614
4698 msgid "amend previous commit"
4701 #: builtin/commit.c:1615
4702 msgid "bypass post-rewrite hook"
4703 msgstr "绕过 post-rewrite 钩子"
4705 #: builtin/commit.c:1620
4706 msgid "ok to record an empty change"
4709 #: builtin/commit.c:1622
4710 msgid "ok to record a change with an empty message"
4713 #: builtin/commit.c:1651
4714 msgid "could not parse HEAD commit"
4715 msgstr "不能解析 HEAD 提交"
4717 #: builtin/commit.c:1690 builtin/merge.c:519
4719 msgid "could not open '%s' for reading"
4720 msgstr "不能为读入打开 '%s'"
4722 #: builtin/commit.c:1697
4724 msgid "Corrupt MERGE_HEAD file (%s)"
4725 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4727 #: builtin/commit.c:1704
4728 msgid "could not read MERGE_MODE"
4729 msgstr "不能读取 MERGE_MODE"
4731 #: builtin/commit.c:1723
4733 msgid "could not read commit message: %s"
4734 msgstr "不能读取提交说明:%s"
4736 #: builtin/commit.c:1734
4738 msgid "Aborting commit; you did not edit the message.\n"
4739 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4741 #: builtin/commit.c:1739
4743 msgid "Aborting commit due to empty commit message.\n"
4744 msgstr "终止提交因为提交说明为空。\n"
4746 #: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4747 msgid "failed to write commit object"
4750 #: builtin/commit.c:1787
4752 "Repository has been updated, but unable to write\n"
4753 "new_index file. Check that disk is not full and quota is\n"
4754 "not exceeded, and then \"git reset HEAD\" to recover."
4756 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4757 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4759 #: builtin/config.c:8
4760 msgid "git config [<options>]"
4761 msgstr "git config [<选项>]"
4763 #: builtin/config.c:53
4764 msgid "Config file location"
4767 #: builtin/config.c:54
4768 msgid "use global config file"
4771 #: builtin/config.c:55
4772 msgid "use system config file"
4775 #: builtin/config.c:56
4776 msgid "use repository config file"
4779 #: builtin/config.c:57
4780 msgid "use given config file"
4783 #: builtin/config.c:58
4787 #: builtin/config.c:58
4788 msgid "read config from given blob object"
4789 msgstr "从给定的数据对象读取配置"
4791 #: builtin/config.c:59
4795 #: builtin/config.c:60
4796 msgid "get value: name [value-regex]"
4797 msgstr "获取值:name [value-regex]"
4799 #: builtin/config.c:61
4800 msgid "get all values: key [value-regex]"
4801 msgstr "获得所有的值:key [value-regex]"
4803 #: builtin/config.c:62
4804 msgid "get values for regexp: name-regex [value-regex]"
4805 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4807 #: builtin/config.c:63
4808 msgid "get value specific for the URL: section[.var] URL"
4809 msgstr "获得 URL 取值:section[.var] URL"
4811 #: builtin/config.c:64
4812 msgid "replace all matching variables: name value [value_regex]"
4813 msgstr "替换所有匹配的变量:name value [value_regex]"
4815 #: builtin/config.c:65
4816 msgid "add a new variable: name value"
4817 msgstr "添加一个新的变量:name value"
4819 #: builtin/config.c:66
4820 msgid "remove a variable: name [value-regex]"
4821 msgstr "删除一个变量:name [value-regex]"
4823 #: builtin/config.c:67
4824 msgid "remove all matches: name [value-regex]"
4825 msgstr "删除所有匹配项:name [value-regex]"
4827 #: builtin/config.c:68
4828 msgid "rename section: old-name new-name"
4829 msgstr "重命名小节:old-name new-name"
4831 #: builtin/config.c:69
4832 msgid "remove a section: name"
4833 msgstr "删除一个小节:name"
4835 #: builtin/config.c:70
4839 #: builtin/config.c:71
4840 msgid "open an editor"
4843 #: builtin/config.c:72
4844 msgid "find the color configured: slot [default]"
4845 msgstr "获得配置的颜色:配置 [默认]"
4847 #: builtin/config.c:73
4848 msgid "find the color setting: slot [stdout-is-tty]"
4849 msgstr "获得颜色设置:配置 [stdout-is-tty]"
4851 #: builtin/config.c:74
4855 #: builtin/config.c:75
4856 msgid "value is \"true\" or \"false\""
4857 msgstr "值是 \"true\" 或 \"false\""
4859 #: builtin/config.c:76
4860 msgid "value is decimal number"
4863 #: builtin/config.c:77
4864 msgid "value is --bool or --int"
4865 msgstr "值是 --bool or --int"
4867 #: builtin/config.c:78
4868 msgid "value is a path (file or directory name)"
4869 msgstr "值是一个路径(文件或目录名)"
4871 #: builtin/config.c:79
4875 #: builtin/config.c:80
4876 msgid "terminate values with NUL byte"
4879 #: builtin/config.c:81
4880 msgid "respect include directives on lookup"
4881 msgstr "查询时参照 include 指令递归查找"
4883 #: builtin/config.c:316
4884 msgid "unable to parse default color value"
4887 #: builtin/config.c:457
4890 "# This is Git's per-user configuration file.\n"
4892 "# Please adapt and uncomment the following lines:\n"
4896 "# This is Git's per-user configuration file.\n"
4898 "# Please adapt and uncomment the following lines:\n"
4902 #: builtin/config.c:589
4904 msgid "cannot create configuration file %s"
4905 msgstr "不能创建配置文件 %s"
4907 #: builtin/count-objects.c:55
4908 msgid "git count-objects [-v] [-H | --human-readable]"
4909 msgstr "git count-objects [-v] [-H | --human-readable]"
4911 #: builtin/count-objects.c:65
4912 msgid "print sizes in human readable format"
4913 msgstr "以用户可读的格式显示大小"
4915 #: builtin/describe.c:17
4916 msgid "git describe [<options>] [<commit-ish>...]"
4917 msgstr "git describe [<选项>] [<提交号>...]"
4919 #: builtin/describe.c:18
4920 msgid "git describe [<options>] --dirty"
4921 msgstr "git describe [<选项>] --dirty"
4923 #: builtin/describe.c:217
4925 msgid "annotated tag %s not available"
4926 msgstr "注释 tag %s 无效"
4928 #: builtin/describe.c:221
4930 msgid "annotated tag %s has no embedded name"
4931 msgstr "注释 tag %s 没有嵌入名称"
4933 #: builtin/describe.c:223
4935 msgid "tag '%s' is really '%s' here"
4936 msgstr "tag '%s' 的确是在 '%s'"
4938 #: builtin/describe.c:250 builtin/log.c:452
4940 msgid "Not a valid object name %s"
4941 msgstr "不是一个有效的对象名 %s"
4943 #: builtin/describe.c:253
4945 msgid "%s is not a valid '%s' object"
4946 msgstr "%s 不是一个有效的 '%s' 对象"
4948 #: builtin/describe.c:270
4950 msgid "no tag exactly matches '%s'"
4951 msgstr "没有 tag 准确匹配 '%s'"
4953 #: builtin/describe.c:272
4955 msgid "searching to describe %s\n"
4958 #: builtin/describe.c:319
4960 msgid "finished search at %s\n"
4963 #: builtin/describe.c:346
4966 "No annotated tags can describe '%s'.\n"
4967 "However, there were unannotated tags: try --tags."
4969 "没有注释 tag 能描述 '%s'。\n"
4970 "然而,有非注释 tag:尝试 --tags。"
4972 #: builtin/describe.c:350
4975 "No tags can describe '%s'.\n"
4976 "Try --always, or create some tags."
4978 "没有注释 tag 能描述 '%s'。\n"
4979 "尝试 --always,或者创建一些 tag。"
4981 #: builtin/describe.c:371
4983 msgid "traversed %lu commits\n"
4984 msgstr "已遍历 %lu 个提交\n"
4986 #: builtin/describe.c:374
4989 "more than %i tags found; listed %i most recent\n"
4990 "gave up search at %s\n"
4992 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4995 #: builtin/describe.c:396
4996 msgid "find the tag that comes after the commit"
4997 msgstr "寻找提交之后的 tag(用于描述提交)"
4999 #: builtin/describe.c:397
5000 msgid "debug search strategy on stderr"
5001 msgstr "在标准错误上调试搜索策略"
5003 #: builtin/describe.c:398
5007 #: builtin/describe.c:399
5008 msgid "use any tag, even unannotated"
5009 msgstr "使用任意 tag,即使未带注解"
5011 #: builtin/describe.c:400
5012 msgid "always use long format"
5015 #: builtin/describe.c:401
5016 msgid "only follow first parent"
5019 #: builtin/describe.c:404
5020 msgid "only output exact matches"
5023 #: builtin/describe.c:406
5024 msgid "consider <n> most recent tags (default: 10)"
5025 msgstr "考虑最近 <n> 个 tags(默认:10)"
5027 #: builtin/describe.c:408
5028 msgid "only consider tags matching <pattern>"
5029 msgstr "只考虑匹配 <模式> 的 tags"
5031 #: builtin/describe.c:410 builtin/name-rev.c:318
5032 msgid "show abbreviated commit object as fallback"
5033 msgstr "显示简写的提交号作为后备"
5035 #: builtin/describe.c:411
5039 #: builtin/describe.c:412
5040 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5041 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5043 #: builtin/describe.c:430
5044 msgid "--long is incompatible with --abbrev=0"
5045 msgstr "--long 与 --abbrev=0 不兼容"
5047 #: builtin/describe.c:456
5048 msgid "No names found, cannot describe anything."
5049 msgstr "没有发现名称,无法描述任何东西。"
5051 #: builtin/describe.c:476
5052 msgid "--dirty is incompatible with commit-ishes"
5053 msgstr "--dirty 不能与提交同时使用"
5055 #: builtin/diff.c:86
5057 msgid "'%s': not a regular file or symlink"
5058 msgstr "'%s':不是一个正规文件或符号链接"
5060 #: builtin/diff.c:237
5062 msgid "invalid option: %s"
5065 #: builtin/diff.c:358
5066 msgid "Not a git repository"
5067 msgstr "不是一个 git 版本库"
5069 #: builtin/diff.c:401
5071 msgid "invalid object '%s' given."
5072 msgstr "提供了无效对象 '%s'。"
5074 #: builtin/diff.c:410
5076 msgid "more than two blobs given: '%s'"
5077 msgstr "提供了超过两个数据(blob)对象:'%s'"
5079 #: builtin/diff.c:417
5081 msgid "unhandled object '%s' given."
5082 msgstr "无法处理的对象 '%s'。"
5084 #: builtin/fast-export.c:24
5085 msgid "git fast-export [rev-list-opts]"
5086 msgstr "git fast-export [rev-list-opts]"
5088 #: builtin/fast-export.c:979
5089 msgid "show progress after <n> objects"
5090 msgstr "在 <n> 个对象之后显示进度"
5092 #: builtin/fast-export.c:981
5093 msgid "select handling of signed tags"
5094 msgstr "选择如何处理签名 tags"
5096 #: builtin/fast-export.c:984
5097 msgid "select handling of tags that tag filtered objects"
5098 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5100 #: builtin/fast-export.c:987
5101 msgid "Dump marks to this file"
5104 #: builtin/fast-export.c:989
5105 msgid "Import marks from this file"
5108 #: builtin/fast-export.c:991
5109 msgid "Fake a tagger when tags lack one"
5110 msgstr "当 tags 缺少标记者字段时,假装提供一个"
5112 #: builtin/fast-export.c:993
5113 msgid "Output full tree for each commit"
5116 #: builtin/fast-export.c:995
5117 msgid "Use the done feature to terminate the stream"
5118 msgstr "使用 done 功能来终止流"
5120 #: builtin/fast-export.c:996
5121 msgid "Skip output of blob data"
5124 #: builtin/fast-export.c:997
5128 #: builtin/fast-export.c:998
5129 msgid "Apply refspec to exported refs"
5130 msgstr "对导出的引用应用引用表达式"
5132 #: builtin/fast-export.c:999
5133 msgid "anonymize output"
5136 #: builtin/fetch.c:19
5137 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5138 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5140 #: builtin/fetch.c:20
5141 msgid "git fetch [<options>] <group>"
5142 msgstr "git fetch [<选项>] <组>"
5144 #: builtin/fetch.c:21
5145 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5146 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5148 #: builtin/fetch.c:22
5149 msgid "git fetch --all [<options>]"
5150 msgstr "git fetch --all [<选项>]"
5152 #: builtin/fetch.c:89
5153 msgid "fetch from all remotes"
5156 #: builtin/fetch.c:91
5157 msgid "append to .git/FETCH_HEAD instead of overwriting"
5158 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5160 #: builtin/fetch.c:93
5161 msgid "path to upload pack on remote end"
5164 #: builtin/fetch.c:94
5165 msgid "force overwrite of local branch"
5168 #: builtin/fetch.c:96
5169 msgid "fetch from multiple remotes"
5172 #: builtin/fetch.c:98
5173 msgid "fetch all tags and associated objects"
5174 msgstr "抓取所有的 tags 和关联对象"
5176 #: builtin/fetch.c:100
5177 msgid "do not fetch all tags (--no-tags)"
5178 msgstr "不抓取任何 tags (--no-tags)"
5180 #: builtin/fetch.c:102
5181 msgid "prune remote-tracking branches no longer on remote"
5182 msgstr "清除远程已经不存在的分支的跟踪分支"
5185 #: builtin/fetch.c:103
5189 #: builtin/fetch.c:104
5190 msgid "control recursive fetching of submodules"
5193 #: builtin/fetch.c:108
5194 msgid "keep downloaded pack"
5197 #: builtin/fetch.c:110
5198 msgid "allow updating of HEAD ref"
5199 msgstr "允许更新 HEAD 引用"
5201 #: builtin/fetch.c:113
5202 msgid "deepen history of shallow clone"
5205 #: builtin/fetch.c:115
5206 msgid "convert to a complete repository"
5207 msgstr "转换为一个完整的版本库"
5209 #: builtin/fetch.c:117 builtin/log.c:1208
5213 #: builtin/fetch.c:118
5214 msgid "prepend this to submodule path output"
5215 msgstr "在子模组路径输出的前面加上此目录"
5217 #: builtin/fetch.c:121
5218 msgid "default mode for recursion"
5221 #: builtin/fetch.c:123
5222 msgid "accept refs that update .git/shallow"
5223 msgstr "接受更新 .git/shallow 的引用"
5225 #: builtin/fetch.c:124
5229 #: builtin/fetch.c:125
5230 msgid "specify fetch refmap"
5231 msgstr "指定获取操作的引用映射"
5233 #: builtin/fetch.c:375
5234 msgid "Couldn't find remote ref HEAD"
5235 msgstr "无法发现远程 HEAD 引用"
5237 #: builtin/fetch.c:455
5239 msgid "object %s not found"
5242 #: builtin/fetch.c:460
5243 msgid "[up to date]"
5246 #: builtin/fetch.c:474
5248 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5249 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5251 #: builtin/fetch.c:475 builtin/fetch.c:561
5255 #: builtin/fetch.c:486
5256 msgid "[tag update]"
5260 #: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541
5261 msgid " (unable to update local ref)"
5262 msgstr " (不能更新本地引用)"
5264 #: builtin/fetch.c:506
5268 #: builtin/fetch.c:509
5269 msgid "[new branch]"
5272 #: builtin/fetch.c:512
5276 #: builtin/fetch.c:557
5277 msgid "unable to update local ref"
5280 #: builtin/fetch.c:557
5281 msgid "forced update"
5284 #: builtin/fetch.c:563
5285 msgid "(non-fast-forward)"
5288 #: builtin/fetch.c:596 builtin/fetch.c:829
5290 msgid "cannot open %s: %s\n"
5291 msgstr "无法打开 %s:%s\n"
5293 #: builtin/fetch.c:605
5295 msgid "%s did not send all necessary objects\n"
5296 msgstr "%s 未发送所有必须的对象\n"
5298 #: builtin/fetch.c:623
5300 msgid "reject %s because shallow roots are not allowed to be updated"
5301 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5303 #: builtin/fetch.c:711 builtin/fetch.c:794
5308 #: builtin/fetch.c:722
5311 "some local refs could not be updated; try running\n"
5312 " 'git remote prune %s' to remove any old, conflicting branches"
5314 "一些本地引用不能被更新;尝试运行\n"
5315 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5318 #: builtin/fetch.c:774
5320 msgid " (%s will become dangling)"
5321 msgstr " (%s 将成为摇摆状态)"
5324 #: builtin/fetch.c:775
5326 msgid " (%s has become dangling)"
5327 msgstr " (%s 已成为摇摆状态)"
5329 #: builtin/fetch.c:799
5333 #: builtin/fetch.c:800 builtin/remote.c:1060
5337 #: builtin/fetch.c:819
5339 msgid "Refusing to fetch into current branch %s of non-bare repository"
5340 msgstr "拒绝获取到非纯版本库的当前分支 %s"
5342 #: builtin/fetch.c:838
5344 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5345 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5347 #: builtin/fetch.c:841
5349 msgid "Option \"%s\" is ignored for %s\n"
5350 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5352 #: builtin/fetch.c:897
5354 msgid "Don't know how to fetch from %s"
5355 msgstr "不知道如何从 %s 获取"
5357 #: builtin/fetch.c:1059
5359 msgid "Fetching %s\n"
5362 #: builtin/fetch.c:1061 builtin/remote.c:90
5364 msgid "Could not fetch %s"
5367 #: builtin/fetch.c:1079
5369 "No remote repository specified. Please, specify either a URL or a\n"
5370 "remote name from which new revisions should be fetched."
5371 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5373 #: builtin/fetch.c:1102
5374 msgid "You need to specify a tag name."
5375 msgstr "您需要指定一个 tag 名称。"
5377 #: builtin/fetch.c:1144
5378 msgid "--depth and --unshallow cannot be used together"
5379 msgstr "--depth 和 --unshallow 不能同时使用"
5381 #: builtin/fetch.c:1146
5382 msgid "--unshallow on a complete repository does not make sense"
5383 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5385 #: builtin/fetch.c:1169
5386 msgid "fetch --all does not take a repository argument"
5387 msgstr "fetch --all 不能带一个版本库参数"
5389 #: builtin/fetch.c:1171
5390 msgid "fetch --all does not make sense with refspecs"
5391 msgstr "fetch --all 带引用规则没有任何意义"
5393 #: builtin/fetch.c:1182
5395 msgid "No such remote or remote group: %s"
5396 msgstr "没有这样的远程或远程组:%s"
5398 #: builtin/fetch.c:1190
5399 msgid "Fetching a group and specifying refspecs does not make sense"
5400 msgstr "获取组并指定引用规则没有意义"
5402 #: builtin/fmt-merge-msg.c:13
5404 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5405 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5407 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5408 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5409 #: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5410 #: parse-options.h:132 parse-options.h:239
5414 #: builtin/fmt-merge-msg.c:663
5415 msgid "populate log with at most <n> entries from shortlog"
5416 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5418 #: builtin/fmt-merge-msg.c:666
5419 msgid "alias for --log (deprecated)"
5420 msgstr "参数 --log 的别名(已弃用)"
5422 #: builtin/fmt-merge-msg.c:669
5426 #: builtin/fmt-merge-msg.c:670
5427 msgid "use <text> as start of message"
5428 msgstr "使用 <文本> 作为提交说明的开始"
5430 #: builtin/fmt-merge-msg.c:671
5431 msgid "file to read from"
5434 #: builtin/for-each-ref.c:675
5435 msgid "unable to parse format"
5438 #: builtin/for-each-ref.c:1063
5439 msgid "git for-each-ref [<options>] [<pattern>]"
5440 msgstr "git for-each-ref [<选项>] [<模式>]"
5442 #: builtin/for-each-ref.c:1078
5443 msgid "quote placeholders suitably for shells"
5444 msgstr "引用占位符适用于 shells"
5446 #: builtin/for-each-ref.c:1080
5447 msgid "quote placeholders suitably for perl"
5448 msgstr "引用占位符适用于 perl"
5450 #: builtin/for-each-ref.c:1082
5451 msgid "quote placeholders suitably for python"
5452 msgstr "引用占位符适用于 python"
5454 #: builtin/for-each-ref.c:1084
5455 msgid "quote placeholders suitably for Tcl"
5456 msgstr "引用占位符适用于 Tcl"
5458 #: builtin/for-each-ref.c:1087
5459 msgid "show only <n> matched refs"
5460 msgstr "只显示 <n> 个匹配的引用"
5462 #: builtin/for-each-ref.c:1088 builtin/replace.c:438
5466 #: builtin/for-each-ref.c:1088
5467 msgid "format to use for the output"
5470 #: builtin/for-each-ref.c:1089
5474 #: builtin/for-each-ref.c:1090
5475 msgid "field name to sort on"
5478 #: builtin/fsck.c:147 builtin/prune.c:137
5479 msgid "Checking connectivity"
5482 #: builtin/fsck.c:540
5483 msgid "Checking object directories"
5486 #: builtin/fsck.c:603
5487 msgid "git fsck [<options>] [<object>...]"
5488 msgstr "git fsck [<选项>] [<对象>...]"
5490 #: builtin/fsck.c:609
5491 msgid "show unreachable objects"
5494 #: builtin/fsck.c:610
5495 msgid "show dangling objects"
5498 #: builtin/fsck.c:611
5502 #: builtin/fsck.c:612
5503 msgid "report root nodes"
5506 #: builtin/fsck.c:613
5507 msgid "make index objects head nodes"
5508 msgstr "将索引亦作为检查的头节点"
5510 #: builtin/fsck.c:614
5511 msgid "make reflogs head nodes (default)"
5512 msgstr "将引用日志作为检查的头节点(默认)"
5514 #: builtin/fsck.c:615
5515 msgid "also consider packs and alternate objects"
5518 #: builtin/fsck.c:616
5519 msgid "enable more strict checking"
5522 #: builtin/fsck.c:618
5523 msgid "write dangling objects in .git/lost-found"
5524 msgstr "将摇摆对象写入 .git/lost-found 中"
5526 #: builtin/fsck.c:619 builtin/prune.c:108
5527 msgid "show progress"
5530 #: builtin/fsck.c:669
5531 msgid "Checking objects"
5535 msgid "git gc [<options>]"
5536 msgstr "git gc [<选项>]"
5540 msgid "Invalid gc.pruneexpire: '%s'"
5541 msgstr "无效的 gc.pruneexpire:'%s'"
5545 msgid "insanely long object directory %.*s"
5546 msgstr "不正常的长对象目录 %.*s"
5549 msgid "prune unreferenced objects"
5553 msgid "be more thorough (increased runtime)"
5554 msgstr "更彻底(增加运行时间)"
5557 msgid "enable auto-gc mode"
5561 msgid "force running gc even if there may be another gc running"
5562 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5566 msgid "Auto packing the repository in background for optimum performance.\n"
5567 msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5571 msgid "Auto packing the repository for optimum performance.\n"
5572 msgstr "自动打包版本库以求最佳性能。\n"
5576 msgid "See \"git help gc\" for manual housekeeping.\n"
5577 msgstr "手工维护参见 \"git help gc\"。\n"
5582 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5584 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5588 "There are too many unreachable loose objects; run 'git prune' to remove them."
5589 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5591 #: builtin/grep.c:23
5592 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5593 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5595 #: builtin/grep.c:218
5597 msgid "grep: failed to create thread: %s"
5598 msgstr "grep:无法创建线程:%s"
5600 #: builtin/grep.c:441 builtin/grep.c:476
5602 msgid "unable to read tree (%s)"
5605 #: builtin/grep.c:491
5607 msgid "unable to grep from object of type %s"
5608 msgstr "无法抓取来自于 %s 类型的对象"
5610 #: builtin/grep.c:547
5612 msgid "switch `%c' expects a numerical value"
5613 msgstr "开关 `%c' 期望一个数字值"
5615 #: builtin/grep.c:564
5617 msgid "cannot open '%s'"
5620 #: builtin/grep.c:638
5621 msgid "search in index instead of in the work tree"
5622 msgstr "在索引区搜索而不是在工作区"
5624 #: builtin/grep.c:640
5625 msgid "find in contents not managed by git"
5626 msgstr "在未被 git 管理的内容中查找"
5628 # 译者:中文字符串拼接,可删除前导空格
5629 #: builtin/grep.c:642
5630 msgid "search in both tracked and untracked files"
5631 msgstr "在跟踪和未跟踪的文件中搜索"
5633 #: builtin/grep.c:644
5634 msgid "ignore files specified via '.gitignore'"
5635 msgstr "忽略 '.gitignore' 包含的文件"
5637 #: builtin/grep.c:647
5638 msgid "show non-matching lines"
5641 #: builtin/grep.c:649
5642 msgid "case insensitive matching"
5645 #: builtin/grep.c:651
5646 msgid "match patterns only at word boundaries"
5649 #: builtin/grep.c:653
5650 msgid "process binary files as text"
5651 msgstr "把二进制文件当做文本处理"
5653 #: builtin/grep.c:655
5654 msgid "don't match patterns in binary files"
5655 msgstr "不在二进制文件中匹配模式"
5657 #: builtin/grep.c:658
5658 msgid "process binary files with textconv filters"
5659 msgstr "用 textconv 过滤器处理二进制文件"
5661 #: builtin/grep.c:660
5662 msgid "descend at most <depth> levels"
5663 msgstr "最多以指定的深度向下寻找"
5665 #: builtin/grep.c:664
5666 msgid "use extended POSIX regular expressions"
5667 msgstr "使用扩展的 POSIX 正则表达式"
5669 #: builtin/grep.c:667
5670 msgid "use basic POSIX regular expressions (default)"
5671 msgstr "使用基本的 POSIX 正则表达式(默认)"
5673 #: builtin/grep.c:670
5674 msgid "interpret patterns as fixed strings"
5675 msgstr "把模式解析为固定的字符串"
5677 #: builtin/grep.c:673
5678 msgid "use Perl-compatible regular expressions"
5679 msgstr "使用 Perl 兼容的正则表达式"
5681 #: builtin/grep.c:676
5682 msgid "show line numbers"
5685 #: builtin/grep.c:677
5686 msgid "don't show filenames"
5689 #: builtin/grep.c:678
5690 msgid "show filenames"
5693 #: builtin/grep.c:680
5694 msgid "show filenames relative to top directory"
5695 msgstr "显示相对于顶级目录的文件名"
5697 #: builtin/grep.c:682
5698 msgid "show only filenames instead of matching lines"
5699 msgstr "只显示文件名而不显示匹配的行"
5701 #: builtin/grep.c:684
5702 msgid "synonym for --files-with-matches"
5703 msgstr "和 --files-with-matches 同义"
5705 #: builtin/grep.c:687
5706 msgid "show only the names of files without match"
5709 #: builtin/grep.c:689
5710 msgid "print NUL after filenames"
5711 msgstr "在文件名后输出 NUL 字符"
5713 #: builtin/grep.c:691
5714 msgid "show the number of matches instead of matching lines"
5715 msgstr "显示总匹配行数,而不显示匹配的行"
5717 #: builtin/grep.c:692
5718 msgid "highlight matches"
5721 #: builtin/grep.c:694
5722 msgid "print empty line between matches from different files"
5723 msgstr "在不同文件的匹配项之间打印空行"
5725 #: builtin/grep.c:696
5726 msgid "show filename only once above matches from same file"
5727 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5729 #: builtin/grep.c:699
5730 msgid "show <n> context lines before and after matches"
5731 msgstr "显示匹配项前后的 <n> 行上下文"
5733 #: builtin/grep.c:702
5734 msgid "show <n> context lines before matches"
5735 msgstr "显示匹配项前 <n> 行上下文"
5737 #: builtin/grep.c:704
5738 msgid "show <n> context lines after matches"
5739 msgstr "显示匹配项后 <n> 行上下文"
5741 #: builtin/grep.c:705
5742 msgid "shortcut for -C NUM"
5745 #: builtin/grep.c:708
5746 msgid "show a line with the function name before matches"
5747 msgstr "在匹配的前面显示一行函数名"
5749 #: builtin/grep.c:710
5750 msgid "show the surrounding function"
5751 msgstr "显示所在函数的前后内容"
5753 #: builtin/grep.c:713
5754 msgid "read patterns from file"
5757 #: builtin/grep.c:715
5758 msgid "match <pattern>"
5761 #: builtin/grep.c:717
5762 msgid "combine patterns specified with -e"
5763 msgstr "组合用 -e 参数设定的模式"
5765 #: builtin/grep.c:729
5766 msgid "indicate hit with exit status without output"
5767 msgstr "不输出,而用退出码标识命中状态"
5769 #: builtin/grep.c:731
5770 msgid "show only matches from files that match all patterns"
5771 msgstr "只显示匹配所有模式的文件中的匹配"
5773 #: builtin/grep.c:733
5774 msgid "show parse tree for grep expression"
5775 msgstr "显示 grep 表达式的解析树"
5777 #: builtin/grep.c:737
5781 #: builtin/grep.c:737
5782 msgid "show matching files in the pager"
5785 #: builtin/grep.c:740
5786 msgid "allow calling of grep(1) (ignored by this build)"
5787 msgstr "允许调用 grep(1)(本次构建忽略)"
5789 #: builtin/grep.c:741 builtin/show-ref.c:187
5793 #: builtin/grep.c:808
5794 msgid "no pattern given."
5797 #: builtin/grep.c:866
5798 msgid "--open-files-in-pager only works on the worktree"
5799 msgstr "--open-files-in-pager 仅用于工作区"
5801 #: builtin/grep.c:892
5802 msgid "--cached or --untracked cannot be used with --no-index."
5803 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5805 #: builtin/grep.c:897
5806 msgid "--no-index or --untracked cannot be used with revs."
5807 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5809 #: builtin/grep.c:900
5810 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5811 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5813 #: builtin/grep.c:908
5814 msgid "both --cached and trees are given."
5815 msgstr "同时给出了 --cached 和树对象。"
5817 #: builtin/hash-object.c:82
5819 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5822 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5825 #: builtin/hash-object.c:83
5826 msgid "git hash-object --stdin-paths < <list-of-paths>"
5827 msgstr "git hash-object --stdin-paths < <路径列表>"
5829 #: builtin/hash-object.c:94 builtin/tag.c:612
5833 #: builtin/hash-object.c:94
5837 #: builtin/hash-object.c:95
5838 msgid "write the object into the object database"
5841 #: builtin/hash-object.c:97
5842 msgid "read the object from stdin"
5845 #: builtin/hash-object.c:99
5846 msgid "store file as is without filters"
5847 msgstr "原样存储文件不使用过滤器"
5849 #: builtin/hash-object.c:100
5851 "just hash any random garbage to create corrupt objects for debugging Git"
5852 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5854 #: builtin/hash-object.c:101
5855 msgid "process file as it were from this path"
5856 msgstr "处理文件并假设其来自于此路径"
5858 #: builtin/help.c:41
5859 msgid "print all available commands"
5862 #: builtin/help.c:42
5863 msgid "print list of useful guides"
5866 #: builtin/help.c:43
5867 msgid "show man page"
5870 #: builtin/help.c:44
5871 msgid "show manual in web browser"
5872 msgstr "在 web 浏览器中显示手册"
5874 #: builtin/help.c:46
5875 msgid "show info page"
5878 #: builtin/help.c:52
5879 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5880 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
5882 #: builtin/help.c:64
5884 msgid "unrecognized help format '%s'"
5885 msgstr "未能识别的帮助格式 '%s'"
5887 #: builtin/help.c:91
5888 msgid "Failed to start emacsclient."
5889 msgstr "无法启动 emacsclient。"
5891 #: builtin/help.c:104
5892 msgid "Failed to parse emacsclient version."
5893 msgstr "无法解析 emacsclient 版本。"
5895 #: builtin/help.c:112
5897 msgid "emacsclient version '%d' too old (< 22)."
5898 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5900 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5902 msgid "failed to exec '%s': %s"
5903 msgstr "无法执行 '%s':%s"
5905 #: builtin/help.c:215
5908 "'%s': path for unsupported man viewer.\n"
5909 "Please consider using 'man.<tool>.cmd' instead."
5911 "'%s':不支持的 man 手册查看器的路径。\n"
5912 "请使用 'man.<工具>.cmd'。"
5914 #: builtin/help.c:227
5917 "'%s': cmd for supported man viewer.\n"
5918 "Please consider using 'man.<tool>.path' instead."
5920 "'%s': 支持的 man 手册查看器命令。\n"
5921 "请使用 'man.<工具>.path'。"
5923 #: builtin/help.c:354
5925 msgid "'%s': unknown man viewer."
5926 msgstr "'%s':未知的 man 查看器。"
5928 #: builtin/help.c:371
5929 msgid "no man viewer handled the request"
5930 msgstr "没有 man 查看器处理此请求"
5932 #: builtin/help.c:379
5933 msgid "no info viewer handled the request"
5934 msgstr "没有 info 查看器处理此请求"
5936 #: builtin/help.c:428
5937 msgid "Defining attributes per path"
5940 #: builtin/help.c:429
5941 msgid "Everyday Git With 20 Commands Or So"
5942 msgstr "每一天 Git 常用的约 20 条命令"
5944 #: builtin/help.c:430
5945 msgid "A Git glossary"
5948 #: builtin/help.c:431
5949 msgid "Specifies intentionally untracked files to ignore"
5952 #: builtin/help.c:432
5953 msgid "Defining submodule properties"
5956 #: builtin/help.c:433
5957 msgid "Specifying revisions and ranges for Git"
5958 msgstr "指定 Git 的版本和版本范围"
5960 #: builtin/help.c:434
5961 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5962 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5964 #: builtin/help.c:435
5965 msgid "An overview of recommended workflows with Git"
5966 msgstr "Git 推荐的工作流概览"
5968 #: builtin/help.c:447
5969 msgid "The common Git guides are:\n"
5970 msgstr "最常用的 Git 向导有:\n"
5972 #: builtin/help.c:468 builtin/help.c:485
5977 #: builtin/help.c:501
5979 msgid "`git %s' is aliased to `%s'"
5980 msgstr "`git %s' 是 `%s' 的别名"
5982 #: builtin/index-pack.c:150
5984 msgid "unable to open %s"
5987 #: builtin/index-pack.c:200
5989 msgid "object type mismatch at %s"
5990 msgstr "%s 的对象类型不匹配"
5992 #: builtin/index-pack.c:220
5994 msgid "did not receive expected object %s"
5995 msgstr "未能获取期望的对象 %s"
5997 #: builtin/index-pack.c:223
5999 msgid "object %s: expected type %s, found %s"
6000 msgstr "对象 %s:期待类型 %s,却是 %s"
6002 #: builtin/index-pack.c:265
6004 msgid "cannot fill %d byte"
6005 msgid_plural "cannot fill %d bytes"
6006 msgstr[0] "无法填充 %d 字节"
6007 msgstr[1] "无法填充 %d 字节"
6009 #: builtin/index-pack.c:275
6011 msgstr "过早的文件结束符(EOF)"
6013 #: builtin/index-pack.c:276
6014 msgid "read error on input"
6017 #: builtin/index-pack.c:288
6018 msgid "used more bytes than were available"
6021 #: builtin/index-pack.c:295
6022 msgid "pack too large for current definition of off_t"
6023 msgstr "包太大超过了当前 off_t 的定义"
6025 #: builtin/index-pack.c:311
6027 msgid "unable to create '%s'"
6030 #: builtin/index-pack.c:316
6032 msgid "cannot open packfile '%s'"
6033 msgstr "无法打开包文件 '%s'"
6035 #: builtin/index-pack.c:330
6036 msgid "pack signature mismatch"
6039 #: builtin/index-pack.c:332
6041 msgid "pack version %<PRIu32> unsupported"
6042 msgstr "不支持包版本 %<PRIu32>"
6044 #: builtin/index-pack.c:350
6046 msgid "pack has bad object at offset %lu: %s"
6047 msgstr "包中有错误的对象位于 %lu:%s"
6049 #: builtin/index-pack.c:471
6051 msgid "inflate returned %d"
6054 #: builtin/index-pack.c:520
6055 msgid "offset value overflow for delta base object"
6056 msgstr "偏移值覆盖了 delta 基准对象"
6058 #: builtin/index-pack.c:528
6059 msgid "delta base offset is out of bound"
6060 msgstr "delta 基准偏移越界"
6062 #: builtin/index-pack.c:536
6064 msgid "unknown object type %d"
6067 #: builtin/index-pack.c:567
6068 msgid "cannot pread pack file"
6071 #: builtin/index-pack.c:569
6073 msgid "premature end of pack file, %lu byte missing"
6074 msgid_plural "premature end of pack file, %lu bytes missing"
6075 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6076 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6078 #: builtin/index-pack.c:595
6079 msgid "serious inflate inconsistency"
6082 #: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6083 #: builtin/index-pack.c:749 builtin/index-pack.c:758
6085 msgid "SHA1 COLLISION FOUND WITH %s !"
6086 msgstr "发现 %s 出现 SHA1 冲突!"
6088 #: builtin/index-pack.c:689 builtin/pack-objects.c:162
6089 #: builtin/pack-objects.c:254
6091 msgid "unable to read %s"
6094 #: builtin/index-pack.c:755
6096 msgid "cannot read existing object %s"
6097 msgstr "不能读取现存对象 %s"
6099 #: builtin/index-pack.c:769
6101 msgid "invalid blob object %s"
6102 msgstr "无效的数据(blob)对象 %s"
6104 #: builtin/index-pack.c:783
6109 #: builtin/index-pack.c:787
6110 msgid "Error in object"
6113 #: builtin/index-pack.c:789
6115 msgid "Not all child objects of %s are reachable"
6116 msgstr "%s 的所有子对象并非都可达"
6118 #: builtin/index-pack.c:861 builtin/index-pack.c:890
6119 msgid "failed to apply delta"
6122 #: builtin/index-pack.c:1055
6123 msgid "Receiving objects"
6126 #: builtin/index-pack.c:1055
6127 msgid "Indexing objects"
6130 #: builtin/index-pack.c:1081
6131 msgid "pack is corrupted (SHA1 mismatch)"
6132 msgstr "包冲突(SHA1 不匹配)"
6134 #: builtin/index-pack.c:1086
6135 msgid "cannot fstat packfile"
6138 #: builtin/index-pack.c:1089
6139 msgid "pack has junk at the end"
6142 #: builtin/index-pack.c:1100
6143 msgid "confusion beyond insanity in parse_pack_objects()"
6144 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6146 #: builtin/index-pack.c:1123
6147 msgid "Resolving deltas"
6150 #: builtin/index-pack.c:1133
6152 msgid "unable to create thread: %s"
6155 #: builtin/index-pack.c:1175
6156 msgid "confusion beyond insanity"
6159 #: builtin/index-pack.c:1181
6161 msgid "completed with %d local objects"
6162 msgstr "完成 %d 个本地对象"
6164 #: builtin/index-pack.c:1191
6166 msgid "Unexpected tail checksum for %s (disk corruption?)"
6167 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6169 #: builtin/index-pack.c:1195
6171 msgid "pack has %d unresolved delta"
6172 msgid_plural "pack has %d unresolved deltas"
6173 msgstr[0] "包有 %d 个未解决的 delta"
6174 msgstr[1] "包有 %d 个未解决的 delta"
6176 #: builtin/index-pack.c:1219
6178 msgid "unable to deflate appended object (%d)"
6179 msgstr "不能压缩附加对象(%d)"
6181 #: builtin/index-pack.c:1298
6183 msgid "local object %s is corrupt"
6184 msgstr "本地对象 %s 已损坏"
6186 #: builtin/index-pack.c:1322
6187 msgid "error while closing pack file"
6190 #: builtin/index-pack.c:1335
6192 msgid "cannot write keep file '%s'"
6193 msgstr "无法写保留文件 '%s'"
6195 #: builtin/index-pack.c:1343
6197 msgid "cannot close written keep file '%s'"
6198 msgstr "无法关闭保留文件 '%s'"
6200 #: builtin/index-pack.c:1356
6201 msgid "cannot store pack file"
6204 #: builtin/index-pack.c:1367
6205 msgid "cannot store index file"
6208 #: builtin/index-pack.c:1400
6210 msgid "bad pack.indexversion=%<PRIu32>"
6211 msgstr "坏的 pack.indexversion=%<PRIu32>"
6213 #: builtin/index-pack.c:1406
6215 msgid "invalid number of threads specified (%d)"
6216 msgstr "指定的线程数无效(%d)"
6218 #: builtin/index-pack.c:1410 builtin/index-pack.c:1589
6220 msgid "no threads support, ignoring %s"
6221 msgstr "没有线程支持,忽略 %s"
6223 #: builtin/index-pack.c:1468
6225 msgid "Cannot open existing pack file '%s'"
6226 msgstr "无法打开现存包文件 '%s'"
6228 #: builtin/index-pack.c:1470
6230 msgid "Cannot open existing pack idx file for '%s'"
6231 msgstr "无法为 %s 打开包索引文件"
6233 #: builtin/index-pack.c:1517
6235 msgid "non delta: %d object"
6236 msgid_plural "non delta: %d objects"
6237 msgstr[0] "非 delta:%d 个对象"
6238 msgstr[1] "非 delta:%d 个对象"
6240 #: builtin/index-pack.c:1524
6242 msgid "chain length = %d: %lu object"
6243 msgid_plural "chain length = %d: %lu objects"
6244 msgstr[0] "链长 = %d: %lu 对象"
6245 msgstr[1] "链长 = %d: %lu 对象"
6247 #: builtin/index-pack.c:1553
6248 msgid "Cannot come back to cwd"
6251 #: builtin/index-pack.c:1601 builtin/index-pack.c:1604
6252 #: builtin/index-pack.c:1616 builtin/index-pack.c:1620
6257 #: builtin/index-pack.c:1634
6258 msgid "--fix-thin cannot be used without --stdin"
6259 msgstr "--fix-thin 不能和 --stdin 同时使用"
6261 #: builtin/index-pack.c:1638 builtin/index-pack.c:1647
6263 msgid "packfile name '%s' does not end with '.pack'"
6264 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6266 #: builtin/index-pack.c:1655
6267 msgid "--verify with no packfile name given"
6268 msgstr "--verify 没有提供包名参数"
6270 #: builtin/init-db.c:35
6272 msgid "Could not make %s writable by group"
6273 msgstr "不能设置 %s 为组可写"
6275 #: builtin/init-db.c:62
6277 msgid "insanely long template name %s"
6280 #: builtin/init-db.c:67
6282 msgid "cannot stat '%s'"
6283 msgstr "不能枚举 '%s' 状态"
6285 #: builtin/init-db.c:73
6287 msgid "cannot stat template '%s'"
6288 msgstr "不能枚举模版 '%s' 状态"
6290 #: builtin/init-db.c:80
6292 msgid "cannot opendir '%s'"
6293 msgstr "不能打开目录 '%s'"
6295 #: builtin/init-db.c:97
6297 msgid "cannot readlink '%s'"
6298 msgstr "不能读取链接 '%s'"
6300 #: builtin/init-db.c:99
6302 msgid "insanely long symlink %s"
6305 #: builtin/init-db.c:102
6307 msgid "cannot symlink '%s' '%s'"
6308 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6310 #: builtin/init-db.c:106
6312 msgid "cannot copy '%s' to '%s'"
6313 msgstr "不能拷贝 '%s' 至 '%s'"
6315 #: builtin/init-db.c:110
6317 msgid "ignoring template %s"
6320 #: builtin/init-db.c:136
6322 msgid "insanely long template path %s"
6325 #: builtin/init-db.c:144
6327 msgid "templates not found %s"
6330 #: builtin/init-db.c:157
6332 msgid "not copying templates of a wrong format version %d from '%s'"
6333 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6335 #: builtin/init-db.c:197
6337 msgid "insane git directory %s"
6338 msgstr "不正常的 git 目录 %s"
6340 #: builtin/init-db.c:331 builtin/init-db.c:334
6342 msgid "%s already exists"
6345 #: builtin/init-db.c:363
6347 msgid "unable to handle file type %d"
6348 msgstr "不能处理 %d 类型的文件"
6350 #: builtin/init-db.c:366
6352 msgid "unable to move %s to %s"
6353 msgstr "不能移动 %s 至 %s"
6355 #. TRANSLATORS: The first '%s' is either "Reinitialized
6356 #. existing" or "Initialized empty", the second " shared" or
6357 #. "", and the last '%s%s' is the verbatim directory name.
6358 #: builtin/init-db.c:426
6360 msgid "%s%s Git repository in %s%s\n"
6361 msgstr "%s%s Git 版本库于 %s%s\n"
6363 #: builtin/init-db.c:427
6364 msgid "Reinitialized existing"
6367 #: builtin/init-db.c:427
6368 msgid "Initialized empty"
6371 # 译者:中文字符串拼接,可删除前导空格
6372 #: builtin/init-db.c:428
6376 #: builtin/init-db.c:475
6378 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6379 "shared[=<permissions>]] [<directory>]"
6381 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6384 #: builtin/init-db.c:498
6388 #: builtin/init-db.c:499
6389 msgid "specify that the git repository is to be shared amongst several users"
6390 msgstr "指定 git 版本库是多个用户之间共享的"
6392 #: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
6396 #: builtin/init-db.c:533 builtin/init-db.c:538
6398 msgid "cannot mkdir %s"
6401 #: builtin/init-db.c:542
6403 msgid "cannot chdir to %s"
6406 #: builtin/init-db.c:563
6409 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6411 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6413 #: builtin/init-db.c:591
6415 msgid "Cannot access work tree '%s'"
6416 msgstr "不能访问工作区 '%s'"
6418 #: builtin/interpret-trailers.c:15
6420 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6423 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6426 #: builtin/interpret-trailers.c:25
6427 msgid "trim empty trailers"
6430 #: builtin/interpret-trailers.c:26
6434 #: builtin/interpret-trailers.c:27
6435 msgid "trailer(s) to add"
6439 msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6440 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6443 msgid "git show [<options>] <object>..."
6444 msgstr "git show [<选项>] <对象>..."
6448 msgid "invalid --decorate option: %s"
6449 msgstr "无效的 --decorate 选项:%s"
6451 #: builtin/log.c:127
6452 msgid "suppress diff output"
6455 #: builtin/log.c:128
6459 #: builtin/log.c:129
6460 msgid "Use mail map file"
6463 #: builtin/log.c:130
6464 msgid "decorate options"
6467 #: builtin/log.c:133
6468 msgid "Process line range n,m in file, counting from 1"
6469 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6471 #: builtin/log.c:229
6473 msgid "Final output: %d %s\n"
6474 msgstr "最终输出:%d %s\n"
6476 #: builtin/log.c:458
6478 msgid "git show %s: bad file"
6479 msgstr "git show %s: 损坏的文件"
6481 #: builtin/log.c:472 builtin/log.c:564
6483 msgid "Could not read object %s"
6486 #: builtin/log.c:588
6488 msgid "Unknown type: %d"
6491 #: builtin/log.c:689
6492 msgid "format.headers without value"
6493 msgstr "format.headers 没有值"
6495 #: builtin/log.c:773
6496 msgid "name of output directory is too long"
6499 #: builtin/log.c:789
6501 msgid "Cannot open patch file %s"
6502 msgstr "无法打开补丁文件 %s"
6504 #: builtin/log.c:803
6505 msgid "Need exactly one range."
6508 #: builtin/log.c:811
6509 msgid "Not a range."
6512 #: builtin/log.c:919
6513 msgid "Cover letter needs email format"
6516 #: builtin/log.c:998
6518 msgid "insane in-reply-to: %s"
6519 msgstr "不正常的 in-reply-to:%s"
6521 #: builtin/log.c:1026
6522 msgid "git format-patch [<options>] [<since> | <revision-range>]"
6523 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6525 #: builtin/log.c:1071
6526 msgid "Two output directories?"
6529 #: builtin/log.c:1186
6530 msgid "use [PATCH n/m] even with a single patch"
6531 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6533 #: builtin/log.c:1189
6534 msgid "use [PATCH] even with multiple patches"
6535 msgstr "使用 [PATCH],即使有多个补丁"
6537 #: builtin/log.c:1193
6538 msgid "print patches to standard out"
6541 #: builtin/log.c:1195
6542 msgid "generate a cover letter"
6545 #: builtin/log.c:1197
6546 msgid "use simple number sequence for output file names"
6547 msgstr "使用简单的数字序列作为输出文件名"
6549 #: builtin/log.c:1198
6553 #: builtin/log.c:1199
6554 msgid "use <sfx> instead of '.patch'"
6555 msgstr "使用 <后缀> 代替 '.patch'"
6557 #: builtin/log.c:1201
6558 msgid "start numbering patches at <n> instead of 1"
6559 msgstr "补丁以 <n> 开始编号,而不是1"
6561 #: builtin/log.c:1203
6562 msgid "mark the series as Nth re-roll"
6563 msgstr "标记补丁系列是第几次重制"
6565 #: builtin/log.c:1205
6566 msgid "Use [<prefix>] instead of [PATCH]"
6567 msgstr "使用 [<前缀>] 代替 [PATCH]"
6569 #: builtin/log.c:1208
6570 msgid "store resulting files in <dir>"
6571 msgstr "把结果文件存储在 <目录>"
6573 #: builtin/log.c:1211
6574 msgid "don't strip/add [PATCH]"
6575 msgstr "不删除/添加 [PATCH]"
6577 #: builtin/log.c:1214
6578 msgid "don't output binary diffs"
6581 #: builtin/log.c:1216
6582 msgid "don't include a patch matching a commit upstream"
6583 msgstr "不包含已在上游提交中的补丁"
6585 #: builtin/log.c:1218
6586 msgid "show patch format instead of default (patch + stat)"
6587 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6589 #: builtin/log.c:1220
6593 #: builtin/log.c:1221
6597 #: builtin/log.c:1222
6598 msgid "add email header"
6601 #: builtin/log.c:1223 builtin/log.c:1225
6605 #: builtin/log.c:1223
6606 msgid "add To: header"
6609 #: builtin/log.c:1225
6610 msgid "add Cc: header"
6613 #: builtin/log.c:1227
6617 #: builtin/log.c:1228
6618 msgid "set From address to <ident> (or committer ident if absent)"
6619 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6621 #: builtin/log.c:1230
6625 #: builtin/log.c:1231
6626 msgid "make first mail a reply to <message-id>"
6627 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6629 #: builtin/log.c:1232 builtin/log.c:1235
6633 #: builtin/log.c:1233
6634 msgid "attach the patch"
6637 #: builtin/log.c:1236
6638 msgid "inline the patch"
6641 #: builtin/log.c:1240
6642 msgid "enable message threading, styles: shallow, deep"
6643 msgstr "启用邮件线索,风格:浅,深"
6645 #: builtin/log.c:1242
6649 #: builtin/log.c:1243
6650 msgid "add a signature"
6653 #: builtin/log.c:1245
6654 msgid "add a signature from a file"
6657 #: builtin/log.c:1246
6658 msgid "don't print the patch filenames"
6661 #: builtin/log.c:1320
6663 msgid "invalid ident line: %s"
6664 msgstr "包含无效的身份标识:%s"
6666 #: builtin/log.c:1335
6667 msgid "-n and -k are mutually exclusive."
6668 msgstr "-n 和 -k 互斥。"
6670 #: builtin/log.c:1337
6671 msgid "--subject-prefix and -k are mutually exclusive."
6672 msgstr "--subject-prefix 和 -k 互斥。"
6674 #: builtin/log.c:1345
6675 msgid "--name-only does not make sense"
6676 msgstr "--name-only 无意义"
6678 #: builtin/log.c:1347
6679 msgid "--name-status does not make sense"
6680 msgstr "--name-status 无意义"
6682 #: builtin/log.c:1349
6683 msgid "--check does not make sense"
6684 msgstr "--check 无意义"
6686 #: builtin/log.c:1372
6687 msgid "standard output, or directory, which one?"
6688 msgstr "标准输出或目录,哪一个?"
6690 #: builtin/log.c:1374
6692 msgid "Could not create directory '%s'"
6693 msgstr "不能创建目录 '%s'"
6695 #: builtin/log.c:1472
6697 msgid "unable to read signature file '%s'"
6698 msgstr "无法读取签名文件 '%s'"
6700 #: builtin/log.c:1535
6701 msgid "Failed to create output files"
6704 #: builtin/log.c:1583
6705 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6706 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6708 #: builtin/log.c:1638
6711 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6712 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6714 #: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6716 msgid "Unknown commit %s"
6719 #: builtin/ls-files.c:358
6720 msgid "git ls-files [<options>] [<file>...]"
6721 msgstr "git ls-files [<选项>] [<文件>...]"
6723 #: builtin/ls-files.c:415
6724 msgid "identify the file status with tags"
6727 #: builtin/ls-files.c:417
6728 msgid "use lowercase letters for 'assume unchanged' files"
6729 msgstr "使用小写字母表示 '假设未改变的' 文件"
6731 #: builtin/ls-files.c:419
6732 msgid "show cached files in the output (default)"
6733 msgstr "显示缓存的文件(默认)"
6735 #: builtin/ls-files.c:421
6736 msgid "show deleted files in the output"
6739 #: builtin/ls-files.c:423
6740 msgid "show modified files in the output"
6743 #: builtin/ls-files.c:425
6744 msgid "show other files in the output"
6747 #: builtin/ls-files.c:427
6748 msgid "show ignored files in the output"
6751 #: builtin/ls-files.c:430
6752 msgid "show staged contents' object name in the output"
6753 msgstr "显示暂存区内容的对象名称"
6755 #: builtin/ls-files.c:432
6756 msgid "show files on the filesystem that need to be removed"
6757 msgstr "显示文件系统需要删除的文件"
6759 #: builtin/ls-files.c:434
6760 msgid "show 'other' directories' names only"
6761 msgstr "只显示“其他”目录的名称"
6763 #: builtin/ls-files.c:437
6764 msgid "don't show empty directories"
6767 #: builtin/ls-files.c:440
6768 msgid "show unmerged files in the output"
6771 #: builtin/ls-files.c:442
6772 msgid "show resolve-undo information"
6773 msgstr "显示 resolve-undo 信息"
6775 #: builtin/ls-files.c:444
6776 msgid "skip files matching pattern"
6779 #: builtin/ls-files.c:447
6780 msgid "exclude patterns are read from <file>"
6781 msgstr "从 <文件> 中读取排除模式"
6783 #: builtin/ls-files.c:450
6784 msgid "read additional per-directory exclude patterns in <file>"
6785 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6787 #: builtin/ls-files.c:452
6788 msgid "add the standard git exclusions"
6789 msgstr "添加标准的 git 排除"
6791 #: builtin/ls-files.c:455
6792 msgid "make the output relative to the project top directory"
6793 msgstr "显示相对于顶级目录的文件名"
6795 #: builtin/ls-files.c:458
6796 msgid "if any <file> is not in the index, treat this as an error"
6797 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6799 #: builtin/ls-files.c:459
6803 #: builtin/ls-files.c:460
6804 msgid "pretend that paths removed since <tree-ish> are still present"
6805 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6807 #: builtin/ls-files.c:462
6808 msgid "show debugging data"
6811 #: builtin/ls-tree.c:28
6812 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6813 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6815 #: builtin/ls-tree.c:127
6816 msgid "only show trees"
6819 #: builtin/ls-tree.c:129
6820 msgid "recurse into subtrees"
6823 #: builtin/ls-tree.c:131
6824 msgid "show trees when recursing"
6827 #: builtin/ls-tree.c:134
6828 msgid "terminate entries with NUL byte"
6831 #: builtin/ls-tree.c:135
6832 msgid "include object size"
6835 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6836 msgid "list only filenames"
6839 #: builtin/ls-tree.c:142
6840 msgid "use full path names"
6843 #: builtin/ls-tree.c:144
6844 msgid "list entire tree; not just current directory (implies --full-name)"
6845 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6847 #: builtin/merge.c:45
6848 msgid "git merge [<options>] [<commit>...]"
6849 msgstr "git merge [<选项>] [<提交>...]"
6851 #: builtin/merge.c:46
6852 msgid "git merge [<options>] <msg> HEAD <commit>"
6853 msgstr "git merge [<选项>] <说明> HEAD <提交>"
6855 #: builtin/merge.c:47
6856 msgid "git merge --abort"
6857 msgstr "git merge --abort"
6859 #: builtin/merge.c:100
6860 msgid "switch `m' requires a value"
6861 msgstr "开关 `m' 需要一个值"
6863 #: builtin/merge.c:137
6865 msgid "Could not find merge strategy '%s'.\n"
6866 msgstr "不能找到合并策略 '%s'。\n"
6868 #: builtin/merge.c:138
6870 msgid "Available strategies are:"
6873 #: builtin/merge.c:143
6875 msgid "Available custom strategies are:"
6878 #: builtin/merge.c:193
6879 msgid "do not show a diffstat at the end of the merge"
6880 msgstr "在合并的最后不显示差异统计"
6882 #: builtin/merge.c:196
6883 msgid "show a diffstat at the end of the merge"
6884 msgstr "在合并的最后显示差异统计"
6886 #: builtin/merge.c:197
6887 msgid "(synonym to --stat)"
6888 msgstr "(和 --stat 同义)"
6890 #: builtin/merge.c:199
6891 msgid "add (at most <n>) entries from shortlog to merge commit message"
6892 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6894 #: builtin/merge.c:202
6895 msgid "create a single commit instead of doing a merge"
6896 msgstr "创建一个单独的提交而不是做一次合并"
6898 #: builtin/merge.c:204
6899 msgid "perform a commit if the merge succeeds (default)"
6900 msgstr "如果合并成功,执行一次提交(默认)"
6902 #: builtin/merge.c:206
6903 msgid "edit message before committing"
6906 #: builtin/merge.c:207
6907 msgid "allow fast-forward (default)"
6910 #: builtin/merge.c:209
6911 msgid "abort if fast-forward is not possible"
6912 msgstr "如果不能快进就放弃合并"
6914 #: builtin/merge.c:213
6915 msgid "Verify that the named commit has a valid GPG signature"
6916 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6918 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6922 #: builtin/merge.c:215
6923 msgid "merge strategy to use"
6926 #: builtin/merge.c:216
6927 msgid "option=value"
6928 msgstr "option=value"
6930 #: builtin/merge.c:217
6931 msgid "option for selected merge strategy"
6934 #: builtin/merge.c:219
6935 msgid "merge commit message (for a non-fast-forward merge)"
6936 msgstr "合并的提交说明(针对非快进式合并)"
6938 #: builtin/merge.c:223
6939 msgid "abort the current in-progress merge"
6940 msgstr "放弃当前正在进行的合并"
6942 #: builtin/merge.c:251
6943 msgid "could not run stash."
6946 #: builtin/merge.c:256
6947 msgid "stash failed"
6950 #: builtin/merge.c:261
6952 msgid "not a valid object: %s"
6953 msgstr "不是一个有效对象:%s"
6955 #: builtin/merge.c:280 builtin/merge.c:297
6956 msgid "read-tree failed"
6960 #: builtin/merge.c:327
6961 msgid " (nothing to squash)"
6964 #: builtin/merge.c:340
6966 msgid "Squash commit -- not updating HEAD\n"
6967 msgstr "压缩提交 -- 未更新 HEAD\n"
6969 #: builtin/merge.c:372
6970 msgid "Writing SQUASH_MSG"
6971 msgstr "写入 SQUASH_MSG"
6973 #: builtin/merge.c:374
6974 msgid "Finishing SQUASH_MSG"
6975 msgstr "完成 SQUASH_MSG"
6977 #: builtin/merge.c:397
6979 msgid "No merge message -- not updating HEAD\n"
6980 msgstr "无合并信息 -- 未更新 HEAD\n"
6982 #: builtin/merge.c:447
6984 msgid "'%s' does not point to a commit"
6985 msgstr "'%s' 没有指向一个提交"
6987 #: builtin/merge.c:559
6989 msgid "Bad branch.%s.mergeoptions string: %s"
6990 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6992 #: builtin/merge.c:654
6993 msgid "git write-tree failed to write a tree"
6994 msgstr "git write-tree 无法写入一树对象"
6996 #: builtin/merge.c:678
6997 msgid "Not handling anything other than two heads merge."
6998 msgstr "不能处理两个头合并之外的任何操作。"
7000 #: builtin/merge.c:692
7002 msgid "Unknown option for merge-recursive: -X%s"
7003 msgstr "merge-recursive 的未知选项:-X%s"
7005 #: builtin/merge.c:705
7007 msgid "unable to write %s"
7010 #: builtin/merge.c:794
7012 msgid "Could not read from '%s'"
7013 msgstr "不能从 '%s' 读取"
7015 #: builtin/merge.c:803
7017 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7018 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7020 #: builtin/merge.c:809
7023 "Please enter a commit message to explain why this merge is necessary,\n"
7024 "especially if it merges an updated upstream into a topic branch.\n"
7026 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7029 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7032 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7034 #: builtin/merge.c:833
7035 msgid "Empty commit message."
7038 #: builtin/merge.c:845
7040 msgid "Wonderful.\n"
7043 #: builtin/merge.c:900
7045 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7046 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7048 #: builtin/merge.c:916
7050 msgid "'%s' is not a commit"
7051 msgstr "'%s' 不是一个提交"
7053 #: builtin/merge.c:957
7054 msgid "No current branch."
7057 #: builtin/merge.c:959
7058 msgid "No remote for the current branch."
7059 msgstr "当前分支没有对应的远程版本库。"
7061 #: builtin/merge.c:961
7062 msgid "No default upstream defined for the current branch."
7063 msgstr "当前分支没有定义默认的上游分支。"
7065 #: builtin/merge.c:966
7067 msgid "No remote-tracking branch for %s from %s"
7068 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7070 #: builtin/merge.c:1122
7071 msgid "There is no merge to abort (MERGE_HEAD missing)."
7072 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7074 #: builtin/merge.c:1138
7076 "You have not concluded your merge (MERGE_HEAD exists).\n"
7077 "Please, commit your changes before you merge."
7079 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7082 #: builtin/merge.c:1141 git-pull.sh:34
7083 msgid "You have not concluded your merge (MERGE_HEAD exists)."
7084 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7086 #: builtin/merge.c:1145
7088 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7089 "Please, commit your changes before you merge."
7091 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7094 #: builtin/merge.c:1148
7095 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7096 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7098 #: builtin/merge.c:1157
7099 msgid "You cannot combine --squash with --no-ff."
7100 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7102 #: builtin/merge.c:1166
7103 msgid "No commit specified and merge.defaultToUpstream not set."
7104 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7106 #: builtin/merge.c:1198
7107 msgid "Can merge only exactly one commit into empty head"
7108 msgstr "只能将一个提交合并到空分支上"
7110 #: builtin/merge.c:1201
7111 msgid "Squash commit into empty head not supported yet"
7112 msgstr "尚不支持到空分支的压缩提交"
7114 #: builtin/merge.c:1203
7115 msgid "Non-fast-forward commit does not make sense into an empty head"
7116 msgstr "到空分支的非快进式提交没有意义"
7118 #: builtin/merge.c:1208
7120 msgid "%s - not something we can merge"
7123 #: builtin/merge.c:1259
7125 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7126 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7128 #: builtin/merge.c:1262
7130 msgid "Commit %s has a bad GPG signature allegedly by %s."
7131 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7133 #: builtin/merge.c:1265
7135 msgid "Commit %s does not have a GPG signature."
7136 msgstr "提交 %s 没有一个 GPG 签名。"
7138 #: builtin/merge.c:1268
7140 msgid "Commit %s has a good GPG signature by %s\n"
7141 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7143 #: builtin/merge.c:1349
7145 msgid "Updating %s..%s\n"
7146 msgstr "更新 %s..%s\n"
7148 #: builtin/merge.c:1388
7150 msgid "Trying really trivial in-index merge...\n"
7151 msgstr "尝试非常小的索引内合并...\n"
7153 #: builtin/merge.c:1395
7158 #: builtin/merge.c:1427
7159 msgid "Not possible to fast-forward, aborting."
7162 #: builtin/merge.c:1450 builtin/merge.c:1529
7164 msgid "Rewinding the tree to pristine...\n"
7165 msgstr "将树回滚至原始状态...\n"
7167 #: builtin/merge.c:1454
7169 msgid "Trying merge strategy %s...\n"
7170 msgstr "尝试合并策略 %s...\n"
7172 #: builtin/merge.c:1520
7174 msgid "No merge strategy handled the merge.\n"
7175 msgstr "没有合并策略处理此合并。\n"
7177 #: builtin/merge.c:1522
7179 msgid "Merge with strategy %s failed.\n"
7180 msgstr "使用策略 %s 合并失败。\n"
7182 #: builtin/merge.c:1531
7184 msgid "Using the %s to prepare resolving by hand.\n"
7185 msgstr "使用 %s 以准备手工解决。\n"
7187 #: builtin/merge.c:1543
7189 msgid "Automatic merge went well; stopped before committing as requested\n"
7190 msgstr "自动合并进展顺利,按要求在提交前停止\n"
7192 #: builtin/merge-base.c:29
7193 msgid "git merge-base [-a | --all] <commit> <commit>..."
7194 msgstr "git merge-base [-a | --all] <提交> <提交>..."
7196 #: builtin/merge-base.c:30
7197 msgid "git merge-base [-a | --all] --octopus <commit>..."
7198 msgstr "git merge-base [-a | --all] --octopus <提交>..."
7200 #: builtin/merge-base.c:31
7201 msgid "git merge-base --independent <commit>..."
7202 msgstr "git merge-base --independent <提交>..."
7204 #: builtin/merge-base.c:32
7205 msgid "git merge-base --is-ancestor <commit> <commit>"
7206 msgstr "git merge-base --is-ancestor <提交> <提交>"
7208 #: builtin/merge-base.c:33
7209 msgid "git merge-base --fork-point <ref> [<commit>]"
7210 msgstr "git merge-base --fork-point <引用> [<提交>]"
7212 #: builtin/merge-base.c:214
7213 msgid "output all common ancestors"
7216 #: builtin/merge-base.c:216
7217 msgid "find ancestors for a single n-way merge"
7218 msgstr "查找一个多路合并的祖先提交"
7220 #: builtin/merge-base.c:218
7221 msgid "list revs not reachable from others"
7222 msgstr "显示不能被其他访问到的版本"
7224 #: builtin/merge-base.c:220
7225 msgid "is the first one ancestor of the other?"
7226 msgstr "第一个是其他的祖先提交么?"
7228 #: builtin/merge-base.c:222
7229 msgid "find where <commit> forked from reflog of <ref>"
7230 msgstr "查找 <提交> 从<引用>日志的何处分支的"
7232 #: builtin/merge-file.c:8
7234 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7235 "<orig-file> <file2>"
7237 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7240 #: builtin/merge-file.c:33
7241 msgid "send results to standard output"
7244 #: builtin/merge-file.c:34
7245 msgid "use a diff3 based merge"
7246 msgstr "使用基于 diff3 的合并"
7248 #: builtin/merge-file.c:35
7249 msgid "for conflicts, use our version"
7250 msgstr "如果冲突,使用我们的版本"
7252 #: builtin/merge-file.c:37
7253 msgid "for conflicts, use their version"
7254 msgstr "如果冲突,使用他们的版本"
7256 #: builtin/merge-file.c:39
7257 msgid "for conflicts, use a union version"
7258 msgstr "如果冲突,使用联合版本"
7260 #: builtin/merge-file.c:42
7261 msgid "for conflicts, use this marker size"
7262 msgstr "如果冲突,使用指定长度的标记"
7264 #: builtin/merge-file.c:43
7265 msgid "do not warn about conflicts"
7268 #: builtin/merge-file.c:45
7269 msgid "set labels for file1/orig-file/file2"
7270 msgstr "为 文件1/初始文件/文件2 设置标签"
7272 #: builtin/mktree.c:64
7273 msgid "git mktree [-z] [--missing] [--batch]"
7274 msgstr "git mktree [-z] [--missing] [--batch]"
7276 #: builtin/mktree.c:150
7277 msgid "input is NUL terminated"
7278 msgstr "输入以 NUL 字符终止"
7280 #: builtin/mktree.c:151 builtin/write-tree.c:24
7281 msgid "allow missing objects"
7284 #: builtin/mktree.c:152
7285 msgid "allow creation of more than one tree"
7289 msgid "git mv [<options>] <source>... <destination>"
7290 msgstr "git mv [<选项>] <源>... <目标>"
7294 msgid "Directory %s is in index and no submodule?"
7295 msgstr "目录 %s 在索引中并且不是子模组?"
7298 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7299 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7303 msgid "%.*s is in index"
7307 msgid "force move/rename even if target exists"
7308 msgstr "强制移动/重命令,即使目标存在"
7311 msgid "skip move/rename errors"
7316 msgid "destination '%s' is not a directory"
7317 msgstr "目标 '%s' 不是一个目录"
7321 msgid "Checking rename of '%s' to '%s'\n"
7322 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7329 msgid "can not move directory into itself"
7333 msgid "cannot move directory over file"
7337 msgid "source directory is empty"
7341 msgid "not under version control"
7345 msgid "destination exists"
7350 msgid "overwriting '%s'"
7354 msgid "Cannot overwrite"
7358 msgid "multiple sources for the same target"
7362 msgid "destination directory does not exist"
7367 msgid "%s, source=%s, destination=%s"
7368 msgstr "%s,源=%s,目标=%s"
7372 msgid "Renaming %s to %s\n"
7373 msgstr "重命名 %s 至 %s\n"
7375 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359
7377 msgid "renaming '%s' failed"
7378 msgstr "重命名 '%s' 失败"
7380 #: builtin/name-rev.c:255
7381 msgid "git name-rev [<options>] <commit>..."
7382 msgstr "git name-rev [<选项>] <提交>..."
7384 #: builtin/name-rev.c:256
7385 msgid "git name-rev [<options>] --all"
7386 msgstr "git name-rev [<选项>] --all"
7388 #: builtin/name-rev.c:257
7389 msgid "git name-rev [<options>] --stdin"
7390 msgstr "git name-rev [<选项>] --stdin"
7392 #: builtin/name-rev.c:309
7393 msgid "print only names (no SHA-1)"
7394 msgstr "只打印名称(无 SHA-1)"
7396 #: builtin/name-rev.c:310
7397 msgid "only use tags to name the commits"
7398 msgstr "只使用 tags 来命名提交"
7400 #: builtin/name-rev.c:312
7401 msgid "only use refs matching <pattern>"
7402 msgstr "只使用和 <模式> 相匹配的引用"
7404 #: builtin/name-rev.c:314
7405 msgid "list all commits reachable from all refs"
7406 msgstr "列出可以从所有引用访问的提交"
7408 #: builtin/name-rev.c:315
7409 msgid "read from stdin"
7412 #: builtin/name-rev.c:316
7413 msgid "allow to print `undefined` names (default)"
7414 msgstr "允许打印 `未定义` 的名称(默认)"
7416 #: builtin/name-rev.c:322
7417 msgid "dereference tags in the input (internal use)"
7418 msgstr "反向解析输入中的 tags(内部使用)"
7420 #: builtin/notes.c:24
7421 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7422 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7424 #: builtin/notes.c:25
7426 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7427 "| (-c | -C) <object>] [<object>]"
7429 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7430 "| (-c | -C) <对象>] [<对象>]"
7432 #: builtin/notes.c:26
7433 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7434 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7436 #: builtin/notes.c:27
7438 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7439 "(-c | -C) <object>] [<object>]"
7441 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7442 "(-c | -C) <对象>] [<对象>]"
7444 #: builtin/notes.c:28
7445 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7446 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7448 #: builtin/notes.c:29
7449 msgid "git notes [--ref <notes-ref>] show [<object>]"
7450 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7452 #: builtin/notes.c:30
7454 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7455 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7457 #: builtin/notes.c:31
7458 msgid "git notes merge --commit [-v | -q]"
7459 msgstr "git notes merge --commit [-v | -q]"
7461 #: builtin/notes.c:32
7462 msgid "git notes merge --abort [-v | -q]"
7463 msgstr "git notes merge --abort [-v | -q]"
7465 #: builtin/notes.c:33
7466 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7467 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7469 #: builtin/notes.c:34
7470 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7471 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7473 #: builtin/notes.c:35
7474 msgid "git notes [--ref <notes-ref>] get-ref"
7475 msgstr "git notes [--ref <注解引用>] get-ref"
7477 #: builtin/notes.c:40
7478 msgid "git notes [list [<object>]]"
7479 msgstr "git notes [list [<对象>]]"
7481 #: builtin/notes.c:45
7482 msgid "git notes add [<options>] [<object>]"
7483 msgstr "git notes add [<选项>] [<对象>]"
7485 #: builtin/notes.c:50
7486 msgid "git notes copy [<options>] <from-object> <to-object>"
7487 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7489 #: builtin/notes.c:51
7490 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7491 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7493 #: builtin/notes.c:56
7494 msgid "git notes append [<options>] [<object>]"
7495 msgstr "git notes append [<选项>] [<对象>]"
7497 #: builtin/notes.c:61
7498 msgid "git notes edit [<object>]"
7499 msgstr "git notes edit [<对象>]"
7501 #: builtin/notes.c:66
7502 msgid "git notes show [<object>]"
7503 msgstr "git notes show [<对象>]"
7505 #: builtin/notes.c:71
7506 msgid "git notes merge [<options>] <notes-ref>"
7507 msgstr "git notes merge [<选项>] <注解引用>"
7509 #: builtin/notes.c:72
7510 msgid "git notes merge --commit [<options>]"
7511 msgstr "git notes merge --commit [<选项>]"
7513 #: builtin/notes.c:73
7514 msgid "git notes merge --abort [<options>]"
7515 msgstr "git notes merge --abort [<选项>]"
7517 #: builtin/notes.c:78
7518 msgid "git notes remove [<object>]"
7519 msgstr "git notes remove [<对象>]"
7521 #: builtin/notes.c:83
7522 msgid "git notes prune [<options>]"
7523 msgstr "git notes prune [<选项>]"
7525 #: builtin/notes.c:88
7526 msgid "git notes get-ref"
7527 msgstr "git notes get-ref"
7529 #: builtin/notes.c:146
7531 msgid "unable to start 'show' for object '%s'"
7532 msgstr "不能为对象 '%s' 开始 'show'"
7534 #: builtin/notes.c:150
7535 msgid "could not read 'show' output"
7536 msgstr "不能读取 'show' 的输出"
7538 #: builtin/notes.c:158
7540 msgid "failed to finish 'show' for object '%s'"
7541 msgstr "无法为对象 '%s' 完成 'show'"
7543 #: builtin/notes.c:173 builtin/tag.c:477
7545 msgid "could not create file '%s'"
7546 msgstr "不能创建文件 '%s'"
7548 #: builtin/notes.c:192
7549 msgid "Please supply the note contents using either -m or -F option"
7550 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7552 #: builtin/notes.c:201
7553 msgid "unable to write note object"
7556 #: builtin/notes.c:203
7558 msgid "The note contents have been left in %s"
7559 msgstr "注解内容被留在 %s 中"
7561 #: builtin/notes.c:231 builtin/tag.c:693
7563 msgid "cannot read '%s'"
7566 #: builtin/notes.c:233 builtin/tag.c:696
7568 msgid "could not open or read '%s'"
7569 msgstr "不能打开或读取 '%s'"
7571 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7572 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7573 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7574 #: builtin/notes.c:854 builtin/tag.c:709
7576 msgid "Failed to resolve '%s' as a valid ref."
7577 msgstr "无法解析 '%s' 为一个有效引用。"
7579 #: builtin/notes.c:255
7581 msgid "Failed to read object '%s'."
7582 msgstr "无法读取对象 '%s'。"
7584 #: builtin/notes.c:259
7586 msgid "Cannot read note data from non-blob object '%s'."
7587 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7589 #: builtin/notes.c:299
7591 msgid "Malformed input line: '%s'."
7592 msgstr "非法的输入行:'%s'。"
7594 #: builtin/notes.c:314
7596 msgid "Failed to copy notes from '%s' to '%s'"
7597 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7599 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7600 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7601 #: builtin/notes.c:919
7602 msgid "too many parameters"
7605 #: builtin/notes.c:371 builtin/notes.c:658
7607 msgid "No note found for object %s."
7608 msgstr "未发现对象 %s 的注解。"
7610 #: builtin/notes.c:392 builtin/notes.c:555
7611 msgid "note contents as a string"
7612 msgstr "注解内容作为一个字符串"
7614 #: builtin/notes.c:395 builtin/notes.c:558
7615 msgid "note contents in a file"
7618 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7619 #: builtin/notes.c:563 builtin/tag.c:628
7623 #: builtin/notes.c:398 builtin/notes.c:561
7624 msgid "reuse and edit specified note object"
7625 msgstr "重用和编辑指定的注解对象"
7627 #: builtin/notes.c:401 builtin/notes.c:564
7628 msgid "reuse specified note object"
7631 #: builtin/notes.c:404 builtin/notes.c:567
7632 msgid "allow storing empty note"
7635 #: builtin/notes.c:405 builtin/notes.c:476
7636 msgid "replace existing notes"
7639 #: builtin/notes.c:430
7642 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7644 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7646 #: builtin/notes.c:445 builtin/notes.c:524
7648 msgid "Overwriting existing notes for object %s\n"
7649 msgstr "覆盖对象 %s 现存注解\n"
7651 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7653 msgid "Removing note for object %s\n"
7654 msgstr "删除对象 %s 的注解\n"
7656 #: builtin/notes.c:477
7657 msgid "read objects from stdin"
7660 #: builtin/notes.c:479
7661 msgid "load rewriting config for <command> (implies --stdin)"
7662 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7664 #: builtin/notes.c:497
7665 msgid "too few parameters"
7668 #: builtin/notes.c:518
7671 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7673 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7675 #: builtin/notes.c:530
7677 msgid "Missing notes on source object %s. Cannot copy."
7678 msgstr "源对象 %s 缺少注解。不能拷贝。"
7680 #: builtin/notes.c:582
7683 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7684 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7686 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7687 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7689 #: builtin/notes.c:750
7690 msgid "General options"
7693 #: builtin/notes.c:752
7694 msgid "Merge options"
7697 #: builtin/notes.c:754
7699 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7701 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7703 #: builtin/notes.c:756
7704 msgid "Committing unmerged notes"
7707 #: builtin/notes.c:758
7708 msgid "finalize notes merge by committing unmerged notes"
7709 msgstr "通过提交未合并的注解来完成注解合并"
7711 #: builtin/notes.c:760
7712 msgid "Aborting notes merge resolution"
7715 #: builtin/notes.c:762
7716 msgid "abort notes merge"
7719 #: builtin/notes.c:857
7721 msgid "Object %s has no note\n"
7722 msgstr "对象 %s 没有注解\n"
7724 #: builtin/notes.c:869
7725 msgid "attempt to remove non-existent note is not an error"
7726 msgstr "尝试删除不存在的注解不是一个错误"
7728 #: builtin/notes.c:872
7729 msgid "read object names from the standard input"
7730 msgstr "从标准输入读取对象名称"
7732 #: builtin/notes.c:953
7736 #: builtin/notes.c:954
7737 msgid "use notes from <notes-ref>"
7738 msgstr "从 <注解引用> 使用注解"
7740 #: builtin/notes.c:989 builtin/remote.c:1621
7742 msgid "Unknown subcommand: %s"
7745 #: builtin/pack-objects.c:28
7746 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7747 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7749 #: builtin/pack-objects.c:29
7750 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7751 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7753 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7755 msgid "deflate error (%d)"
7758 #: builtin/pack-objects.c:771
7759 msgid "Writing objects"
7762 #: builtin/pack-objects.c:1013
7763 msgid "disabling bitmap writing, as some objects are not being packed"
7764 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7766 #: builtin/pack-objects.c:2173
7767 msgid "Compressing objects"
7770 #: builtin/pack-objects.c:2570
7772 msgid "unsupported index version %s"
7773 msgstr "不支持的索引版本 %s"
7775 #: builtin/pack-objects.c:2574
7777 msgid "bad index version '%s'"
7778 msgstr "坏的索引版本 '%s'"
7780 #: builtin/pack-objects.c:2597
7782 msgid "option %s does not accept negative form"
7783 msgstr "选项 %s 不接受否定格式"
7785 #: builtin/pack-objects.c:2601
7787 msgid "unable to parse value '%s' for option %s"
7788 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7790 #: builtin/pack-objects.c:2621
7791 msgid "do not show progress meter"
7794 #: builtin/pack-objects.c:2623
7795 msgid "show progress meter"
7798 #: builtin/pack-objects.c:2625
7799 msgid "show progress meter during object writing phase"
7800 msgstr "在对象写入阶段显示进度表"
7802 #: builtin/pack-objects.c:2628
7803 msgid "similar to --all-progress when progress meter is shown"
7804 msgstr "当进度表显示时类似于 --all-progress"
7806 #: builtin/pack-objects.c:2629
7807 msgid "version[,offset]"
7810 #: builtin/pack-objects.c:2630
7811 msgid "write the pack index file in the specified idx format version"
7812 msgstr "用指定的 idx 格式版本来写包索引文件"
7814 #: builtin/pack-objects.c:2633
7815 msgid "maximum size of each output pack file"
7818 #: builtin/pack-objects.c:2635
7819 msgid "ignore borrowed objects from alternate object store"
7820 msgstr "忽略从替代对象存储里借用对象"
7822 #: builtin/pack-objects.c:2637
7823 msgid "ignore packed objects"
7826 #: builtin/pack-objects.c:2639
7827 msgid "limit pack window by objects"
7830 #: builtin/pack-objects.c:2641
7831 msgid "limit pack window by memory in addition to object limit"
7832 msgstr "除对象数量限制外设置打包窗口的内存限制"
7834 #: builtin/pack-objects.c:2643
7835 msgid "maximum length of delta chain allowed in the resulting pack"
7836 msgstr "打包允许的 delta 链的最大长度"
7838 #: builtin/pack-objects.c:2645
7839 msgid "reuse existing deltas"
7840 msgstr "重用已存在的 deltas"
7842 #: builtin/pack-objects.c:2647
7843 msgid "reuse existing objects"
7846 #: builtin/pack-objects.c:2649
7847 msgid "use OFS_DELTA objects"
7848 msgstr "使用 OFS_DELTA 对象"
7850 #: builtin/pack-objects.c:2651
7851 msgid "use threads when searching for best delta matches"
7852 msgstr "使用线程查询最佳 delta 匹配"
7854 #: builtin/pack-objects.c:2653
7855 msgid "do not create an empty pack output"
7858 #: builtin/pack-objects.c:2655
7859 msgid "read revision arguments from standard input"
7860 msgstr "从标准输入读取版本号参数"
7862 #: builtin/pack-objects.c:2657
7863 msgid "limit the objects to those that are not yet packed"
7864 msgstr "限制那些尚未打包的对象"
7866 #: builtin/pack-objects.c:2660
7867 msgid "include objects reachable from any reference"
7868 msgstr "包括可以从任何引用访问到的对象"
7870 #: builtin/pack-objects.c:2663
7871 msgid "include objects referred by reflog entries"
7872 msgstr "包括被引用日志引用到的对象"
7874 #: builtin/pack-objects.c:2666
7875 msgid "include objects referred to by the index"
7876 msgstr "包括被索引引用到的对象"
7878 #: builtin/pack-objects.c:2669
7879 msgid "output pack to stdout"
7882 #: builtin/pack-objects.c:2671
7883 msgid "include tag objects that refer to objects to be packed"
7884 msgstr "包括引用了打包对象的 tag"
7886 #: builtin/pack-objects.c:2673
7887 msgid "keep unreachable objects"
7890 #: builtin/pack-objects.c:2674 parse-options.h:140
7894 #: builtin/pack-objects.c:2675
7895 msgid "unpack unreachable objects newer than <time>"
7896 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7898 #: builtin/pack-objects.c:2678
7899 msgid "create thin packs"
7902 #: builtin/pack-objects.c:2680
7903 msgid "create packs suitable for shallow fetches"
7904 msgstr "创建适合浅克隆版本库获取的包"
7906 #: builtin/pack-objects.c:2682
7907 msgid "ignore packs that have companion .keep file"
7908 msgstr "忽略配有 .keep 文件的包"
7910 #: builtin/pack-objects.c:2684
7911 msgid "pack compression level"
7914 #: builtin/pack-objects.c:2686
7915 msgid "do not hide commits by grafts"
7918 #: builtin/pack-objects.c:2688
7919 msgid "use a bitmap index if available to speed up counting objects"
7920 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7922 #: builtin/pack-objects.c:2690
7923 msgid "write a bitmap index together with the pack index"
7924 msgstr "在建立包索引的同时创建 bitmap 索引"
7926 #: builtin/pack-objects.c:2781
7927 msgid "Counting objects"
7930 #: builtin/pack-refs.c:6
7931 msgid "git pack-refs [<options>]"
7932 msgstr "git pack-refs [<选项>]"
7934 #: builtin/pack-refs.c:14
7935 msgid "pack everything"
7938 #: builtin/pack-refs.c:15
7939 msgid "prune loose refs (default)"
7940 msgstr "清除松散的引用(默认)"
7942 #: builtin/prune-packed.c:7
7943 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
7944 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
7946 #: builtin/prune-packed.c:40
7947 msgid "Removing duplicate objects"
7950 #: builtin/prune.c:12
7951 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7952 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7954 #: builtin/prune.c:106
7955 msgid "do not remove, show only"
7958 #: builtin/prune.c:107
7959 msgid "report pruned objects"
7962 #: builtin/prune.c:110
7963 msgid "expire objects older than <time>"
7964 msgstr "使早于给定时间的对象过期"
7966 #: builtin/push.c:14
7967 msgid "git push [<options>] [<repository> [<refspec>...]]"
7968 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7970 #: builtin/push.c:85
7971 msgid "tag shorthand without <tag>"
7972 msgstr "tag 后面未提供 <标签> 参数"
7974 #: builtin/push.c:95
7975 msgid "--delete only accepts plain target ref names"
7976 msgstr "--delete 只接受简单的目标引用名"
7978 #: builtin/push.c:139
7981 "To choose either option permanently, see push.default in 'git help config'."
7984 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7986 #: builtin/push.c:142
7989 "The upstream branch of your current branch does not match\n"
7990 "the name of your current branch. To push to the upstream branch\n"
7991 "on the remote, use\n"
7993 " git push %s HEAD:%s\n"
7995 "To push to the branch of the same name on the remote, use\n"
8000 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8003 " git push %s HEAD:%s\n"
8010 #: builtin/push.c:157
8013 "You are not currently on a branch.\n"
8014 "To push the history leading to the current (detached HEAD)\n"
8017 " git push %s HEAD:<name-of-remote-branch>\n"
8020 "现在为推送当前(分离头指针)的历史,使用\n"
8022 " git push %s HEAD:<远程分支名字>\n"
8024 #: builtin/push.c:171
8027 "The current branch %s has no upstream branch.\n"
8028 "To push the current branch and set the remote as upstream, use\n"
8030 " git push --set-upstream %s %s\n"
8032 "当前分支 %s 没有对应的上游分支。\n"
8033 "为推送当前分支并建立与远程上游的跟踪,使用\n"
8035 " git push --set-upstream %s %s\n"
8037 #: builtin/push.c:179
8039 msgid "The current branch %s has multiple upstream branches, refusing to push."
8040 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8042 #: builtin/push.c:182
8045 "You are pushing to remote '%s', which is not the upstream of\n"
8046 "your current branch '%s', without telling me what to push\n"
8047 "to update which remote branch."
8049 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8050 "而没有告诉我要推送什么、更新哪个远程分支。"
8052 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8053 #: builtin/push.c:205
8055 "push.default is unset; its implicit value has changed in\n"
8056 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8057 "and maintain the traditional behavior, use:\n"
8059 " git config --global push.default matching\n"
8061 "To squelch this message and adopt the new behavior now, use:\n"
8063 " git config --global push.default simple\n"
8065 "When push.default is set to 'matching', git will push local branches\n"
8066 "to the remote branches that already exist with the same name.\n"
8068 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8069 "behavior, which only pushes the current branch to the corresponding\n"
8070 "remote branch that 'git pull' uses to update the current branch.\n"
8072 "See 'git help config' and search for 'push.default' for further "
8074 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8075 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8077 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8078 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8080 " git config --global push.default matching\n"
8082 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8084 " git config --global push.default simple\n"
8086 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8089 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8090 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8092 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8093 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8094 "为保持兼容,请用 'current' 代替 'simple')"
8096 #: builtin/push.c:272
8098 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8099 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8101 #: builtin/push.c:279
8103 "Updates were rejected because the tip of your current branch is behind\n"
8104 "its remote counterpart. Integrate the remote changes (e.g.\n"
8105 "'git pull ...') before pushing again.\n"
8106 "See the 'Note about fast-forwards' in 'git push --help' for details."
8108 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8109 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8110 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8112 #: builtin/push.c:285
8114 "Updates were rejected because a pushed branch tip is behind its remote\n"
8115 "counterpart. Check out this branch and integrate the remote changes\n"
8116 "(e.g. 'git pull ...') before pushing again.\n"
8117 "See the 'Note about fast-forwards' in 'git push --help' for details."
8119 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8120 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8121 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8123 #: builtin/push.c:291
8125 "Updates were rejected because the remote contains work that you do\n"
8126 "not have locally. This is usually caused by another repository pushing\n"
8127 "to the same ref. You may want to first integrate the remote changes\n"
8128 "(e.g., 'git pull ...') before pushing again.\n"
8129 "See the 'Note about fast-forwards' in 'git push --help' for details."
8131 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8132 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8133 "(如 'git pull ...')。\n"
8134 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8136 #: builtin/push.c:298
8137 msgid "Updates were rejected because the tag already exists in the remote."
8138 msgstr "更新被拒绝因为 tag 在远程已经存在。"
8140 #: builtin/push.c:301
8142 "You cannot update a remote ref that points at a non-commit object,\n"
8143 "or update a remote ref to make it point at a non-commit object,\n"
8144 "without using the '--force' option.\n"
8146 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8147 "也不能更新远程引用让其指向一个非提交对象。\n"
8149 #: builtin/push.c:360
8151 msgid "Pushing to %s\n"
8154 #: builtin/push.c:364
8156 msgid "failed to push some refs to '%s'"
8157 msgstr "无法推送一些引用到 '%s'"
8159 #: builtin/push.c:394
8161 msgid "bad repository '%s'"
8164 #: builtin/push.c:395
8166 "No configured push destination.\n"
8167 "Either specify the URL from the command-line or configure a remote "
8168 "repository using\n"
8170 " git remote add <name> <url>\n"
8172 "and then push using the remote name\n"
8174 " git push <name>\n"
8177 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8179 " git remote add <名称> <地址>\n"
8185 #: builtin/push.c:410
8186 msgid "--all and --tags are incompatible"
8187 msgstr "--all 和 --tags 不兼容"
8189 #: builtin/push.c:411
8190 msgid "--all can't be combined with refspecs"
8191 msgstr "--all 不能和引用规则同时使用"
8193 #: builtin/push.c:416
8194 msgid "--mirror and --tags are incompatible"
8195 msgstr "--mirror 和 --tags 不兼容"
8197 #: builtin/push.c:417
8198 msgid "--mirror can't be combined with refspecs"
8199 msgstr "--mirror 不能和引用规则同时使用"
8201 #: builtin/push.c:422
8202 msgid "--all and --mirror are incompatible"
8203 msgstr "--all 和 --mirror 不兼容"
8205 #: builtin/push.c:502
8209 #: builtin/push.c:503
8210 msgid "push all refs"
8213 #: builtin/push.c:504
8214 msgid "mirror all refs"
8217 #: builtin/push.c:506
8221 #: builtin/push.c:507
8222 msgid "push tags (can't be used with --all or --mirror)"
8223 msgstr "推送 tags(不能使用 --all or --mirror)"
8225 #: builtin/push.c:510
8226 msgid "force updates"
8229 #: builtin/push.c:512
8230 msgid "refname>:<expect"
8233 #: builtin/push.c:513
8234 msgid "require old value of ref to be at this value"
8235 msgstr "要求引用旧的取值为设定值"
8237 #: builtin/push.c:516
8238 msgid "control recursive pushing of submodules"
8241 #: builtin/push.c:518
8242 msgid "use thin pack"
8245 #: builtin/push.c:519 builtin/push.c:520
8246 msgid "receive pack program"
8249 #: builtin/push.c:521
8250 msgid "set upstream for git pull/status"
8251 msgstr "设置 git pull/status 的上游"
8253 #: builtin/push.c:524
8254 msgid "prune locally removed refs"
8257 #: builtin/push.c:526
8258 msgid "bypass pre-push hook"
8259 msgstr "绕过 pre-push 钩子"
8261 #: builtin/push.c:527
8262 msgid "push missing but relevant tags"
8263 msgstr "推送缺失的有关的 tags"
8265 #: builtin/push.c:529
8266 msgid "GPG sign the push"
8267 msgstr "用 GPG 为推送签名"
8269 #: builtin/push.c:530
8270 msgid "request atomic transaction on remote side"
8273 #: builtin/push.c:539
8274 msgid "--delete is incompatible with --all, --mirror and --tags"
8275 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8277 #: builtin/push.c:541
8278 msgid "--delete doesn't make sense without any refs"
8279 msgstr "--delete 未接任何引用没有意义"
8281 #: builtin/read-tree.c:37
8283 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8284 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8285 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8287 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8288 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8289 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8291 #: builtin/read-tree.c:110
8292 msgid "write resulting index to <file>"
8293 msgstr "将索引结果写入 <文件>"
8295 #: builtin/read-tree.c:113
8296 msgid "only empty the index"
8299 #: builtin/read-tree.c:115
8303 #: builtin/read-tree.c:117
8304 msgid "perform a merge in addition to a read"
8305 msgstr "读取之余再执行一个合并"
8307 #: builtin/read-tree.c:119
8308 msgid "3-way merge if no file level merging required"
8309 msgstr "如果没有文件级合并需要,执行三路合并"
8311 #: builtin/read-tree.c:121
8312 msgid "3-way merge in presence of adds and removes"
8313 msgstr "存在添加和删除时,也执行三路合并"
8315 #: builtin/read-tree.c:123
8316 msgid "same as -m, but discard unmerged entries"
8317 msgstr "类似于 -m,但丢弃未合并的条目"
8319 #: builtin/read-tree.c:124
8320 msgid "<subdirectory>/"
8323 #: builtin/read-tree.c:125
8324 msgid "read the tree into the index under <subdirectory>/"
8325 msgstr "读取树对象到索引的 <子目录>/ 下"
8327 #: builtin/read-tree.c:128
8328 msgid "update working tree with merge result"
8329 msgstr "用合并的结果更新工作区"
8331 #: builtin/read-tree.c:130
8335 #: builtin/read-tree.c:131
8336 msgid "allow explicitly ignored files to be overwritten"
8337 msgstr "允许忽略文件中设定的文件可以被覆盖"
8339 #: builtin/read-tree.c:134
8340 msgid "don't check the working tree after merging"
8343 #: builtin/read-tree.c:135
8344 msgid "don't update the index or the work tree"
8347 #: builtin/read-tree.c:137
8348 msgid "skip applying sparse checkout filter"
8349 msgstr "跳过应用稀疏检出过滤器"
8351 #: builtin/read-tree.c:139
8352 msgid "debug unpack-trees"
8353 msgstr "调试 unpack-trees"
8355 #: builtin/reflog.c:429
8357 msgid "%s' for '%s' is not a valid timestamp"
8358 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8360 #: builtin/reflog.c:546 builtin/reflog.c:551
8362 msgid "'%s' is not a valid timestamp"
8363 msgstr "'%s' 不是一个有效的时间戳"
8365 #: builtin/remote.c:12
8366 msgid "git remote [-v | --verbose]"
8367 msgstr "git remote [-v | --verbose]"
8369 #: builtin/remote.c:13
8371 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8372 "mirror=<fetch|push>] <name> <url>"
8374 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8375 "mirror=<fetch|push>] <名称> <地址>"
8377 #: builtin/remote.c:14 builtin/remote.c:33
8378 msgid "git remote rename <old> <new>"
8379 msgstr "git remote rename <旧名称> <新名称>"
8381 #: builtin/remote.c:15 builtin/remote.c:38
8382 msgid "git remote remove <name>"
8383 msgstr "git remote remove <名称>"
8385 #: builtin/remote.c:16 builtin/remote.c:43
8386 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8387 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8389 #: builtin/remote.c:17
8390 msgid "git remote [-v | --verbose] show [-n] <name>"
8391 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8393 #: builtin/remote.c:18
8394 msgid "git remote prune [-n | --dry-run] <name>"
8395 msgstr "git remote prune [-n | --dry-run] <名称>"
8397 #: builtin/remote.c:19
8399 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8400 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8402 #: builtin/remote.c:20
8403 msgid "git remote set-branches [--add] <name> <branch>..."
8404 msgstr "git remote set-branches [--add] <名称> <分支>..."
8406 #: builtin/remote.c:21 builtin/remote.c:69
8407 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8408 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8410 #: builtin/remote.c:22 builtin/remote.c:70
8411 msgid "git remote set-url --add <name> <newurl>"
8412 msgstr "git remote set-url --add <名称> <新的地址>"
8414 #: builtin/remote.c:23 builtin/remote.c:71
8415 msgid "git remote set-url --delete <name> <url>"
8416 msgstr "git remote set-url --delete <名称> <地址>"
8418 #: builtin/remote.c:28
8419 msgid "git remote add [<options>] <name> <url>"
8420 msgstr "git remote add [<选项>] <名称> <地址>"
8422 #: builtin/remote.c:48
8423 msgid "git remote set-branches <name> <branch>..."
8424 msgstr "git remote set-branches <名称> <分支>..."
8426 #: builtin/remote.c:49
8427 msgid "git remote set-branches --add <name> <branch>..."
8428 msgstr "git remote set-branches --add <名称> <分支>..."
8430 #: builtin/remote.c:54
8431 msgid "git remote show [<options>] <name>"
8432 msgstr "git remote show [<选项>] <名称>"
8434 #: builtin/remote.c:59
8435 msgid "git remote prune [<options>] <name>"
8436 msgstr "git remote prune [<选项>] <名称>"
8438 #: builtin/remote.c:64
8439 msgid "git remote update [<options>] [<group> | <remote>]..."
8440 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8442 #: builtin/remote.c:88
8447 #: builtin/remote.c:120
8449 "--mirror is dangerous and deprecated; please\n"
8450 "\t use --mirror=fetch or --mirror=push instead"
8452 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8453 "\t 或 --mirror=push"
8455 #: builtin/remote.c:137
8457 msgid "unknown mirror argument: %s"
8460 #: builtin/remote.c:153
8461 msgid "fetch the remote branches"
8464 #: builtin/remote.c:155
8465 msgid "import all tags and associated objects when fetching"
8466 msgstr "抓取时导入所有的 tags 和关联对象"
8468 #: builtin/remote.c:158
8469 msgid "or do not fetch any tag at all (--no-tags)"
8470 msgstr "或不抓取任何 tag(--no-tags)"
8472 #: builtin/remote.c:160
8473 msgid "branch(es) to track"
8476 #: builtin/remote.c:161
8477 msgid "master branch"
8480 #: builtin/remote.c:162
8484 #: builtin/remote.c:163
8485 msgid "set up remote as a mirror to push to or fetch from"
8486 msgstr "把远程设置为用以推送或抓取的镜像"
8488 #: builtin/remote.c:175
8489 msgid "specifying a master branch makes no sense with --mirror"
8490 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8492 #: builtin/remote.c:177
8493 msgid "specifying branches to track makes sense only with fetch mirrors"
8494 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8496 #: builtin/remote.c:187 builtin/remote.c:643
8498 msgid "remote %s already exists."
8499 msgstr "远程 %s 已经存在。"
8501 #: builtin/remote.c:191 builtin/remote.c:647
8503 msgid "'%s' is not a valid remote name"
8504 msgstr "'%s' 不是一个有效的远程名称"
8506 #: builtin/remote.c:235
8508 msgid "Could not setup master '%s'"
8509 msgstr "无法设置 master '%s'"
8511 #: builtin/remote.c:335
8513 msgid "Could not get fetch map for refspec %s"
8514 msgstr "无法得到引用规则 %s 的获取列表"
8516 #: builtin/remote.c:436 builtin/remote.c:444
8520 #: builtin/remote.c:448
8524 #: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8526 msgid "Could not append '%s' to '%s'"
8527 msgstr "不能添加 '%s' 至 '%s'"
8529 #: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8531 msgid "No such remote: %s"
8534 #: builtin/remote.c:653
8536 msgid "Could not rename config section '%s' to '%s'"
8537 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8539 #: builtin/remote.c:659 builtin/remote.c:847
8541 msgid "Could not remove config section '%s'"
8542 msgstr "不能移除配置小节 '%s'"
8544 #: builtin/remote.c:674
8547 "Not updating non-default fetch refspec\n"
8549 "\tPlease update the configuration manually if necessary."
8555 #: builtin/remote.c:680
8557 msgid "Could not append '%s'"
8560 #: builtin/remote.c:691
8562 msgid "Could not set '%s'"
8565 #: builtin/remote.c:713
8567 msgid "deleting '%s' failed"
8570 #: builtin/remote.c:747
8572 msgid "creating '%s' failed"
8575 #: builtin/remote.c:766
8577 msgid "Could not remove branch %s"
8580 #: builtin/remote.c:833
8582 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8583 "to delete it, use:"
8585 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8586 "to delete them, use:"
8587 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8588 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8590 #: builtin/remote.c:948
8592 msgid " new (next fetch will store in remotes/%s)"
8593 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8595 #: builtin/remote.c:951
8599 #: builtin/remote.c:953
8600 msgid " stale (use 'git remote prune' to remove)"
8601 msgstr " 过时(使用 'git remote prune' 来移除)"
8603 #: builtin/remote.c:955
8607 #: builtin/remote.c:996
8609 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8610 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8612 #: builtin/remote.c:1003
8614 msgid "rebases onto remote %s"
8617 #: builtin/remote.c:1006
8619 msgid " merges with remote %s"
8622 #: builtin/remote.c:1007
8623 msgid " and with remote"
8626 #: builtin/remote.c:1009
8628 msgid "merges with remote %s"
8631 #: builtin/remote.c:1010
8632 msgid " and with remote"
8635 #: builtin/remote.c:1056
8639 #: builtin/remote.c:1059
8643 #: builtin/remote.c:1063
8647 #: builtin/remote.c:1066
8648 msgid "fast-forwardable"
8651 #: builtin/remote.c:1069
8652 msgid "local out of date"
8655 #: builtin/remote.c:1076
8657 msgid " %-*s forces to %-*s (%s)"
8658 msgstr " %-*s 强制推送至 %-*s (%s)"
8660 #: builtin/remote.c:1079
8662 msgid " %-*s pushes to %-*s (%s)"
8663 msgstr " %-*s 推送至 %-*s (%s)"
8665 #: builtin/remote.c:1083
8667 msgid " %-*s forces to %s"
8668 msgstr " %-*s 强制推送至 %s"
8670 #: builtin/remote.c:1086
8672 msgid " %-*s pushes to %s"
8673 msgstr " %-*s 推送至 %s"
8675 #: builtin/remote.c:1154
8676 msgid "do not query remotes"
8679 #: builtin/remote.c:1181
8684 #: builtin/remote.c:1182
8686 msgid " Fetch URL: %s"
8689 #: builtin/remote.c:1183 builtin/remote.c:1334
8693 #: builtin/remote.c:1192 builtin/remote.c:1194
8695 msgid " Push URL: %s"
8698 #: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8700 msgid " HEAD branch: %s"
8703 #: builtin/remote.c:1202
8706 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8707 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8709 #: builtin/remote.c:1214
8711 msgid " Remote branch:%s"
8712 msgid_plural " Remote branches:%s"
8713 msgstr[0] " 远程分支:%s"
8714 msgstr[1] " 远程分支:%s"
8716 # 译者:中文字符串拼接,可删除前导空格
8717 #: builtin/remote.c:1217 builtin/remote.c:1244
8718 msgid " (status not queried)"
8721 #: builtin/remote.c:1226
8722 msgid " Local branch configured for 'git pull':"
8723 msgid_plural " Local branches configured for 'git pull':"
8724 msgstr[0] " 为 'git pull' 配置的本地分支:"
8725 msgstr[1] " 为 'git pull' 配置的本地分支:"
8727 #: builtin/remote.c:1234
8728 msgid " Local refs will be mirrored by 'git push'"
8729 msgstr " 本地引用将在 'git push' 时被镜像"
8731 #: builtin/remote.c:1241
8733 msgid " Local ref configured for 'git push'%s:"
8734 msgid_plural " Local refs configured for 'git push'%s:"
8735 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8736 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8738 #: builtin/remote.c:1262
8739 msgid "set refs/remotes/<name>/HEAD according to remote"
8740 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8742 #: builtin/remote.c:1264
8743 msgid "delete refs/remotes/<name>/HEAD"
8744 msgstr "删除 refs/remotes/<名称>/HEAD"
8746 #: builtin/remote.c:1279
8747 msgid "Cannot determine remote HEAD"
8748 msgstr "无法确定远程 HEAD"
8750 #: builtin/remote.c:1281
8751 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8752 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8754 #: builtin/remote.c:1291
8756 msgid "Could not delete %s"
8759 #: builtin/remote.c:1299
8761 msgid "Not a valid ref: %s"
8762 msgstr "不是一个有效引用:%s"
8764 #: builtin/remote.c:1301
8766 msgid "Could not setup %s"
8770 #: builtin/remote.c:1319
8772 msgid " %s will become dangling!"
8773 msgstr " %s 将成为摇摆状态!"
8776 #: builtin/remote.c:1320
8778 msgid " %s has become dangling!"
8779 msgstr " %s 已成为摇摆状态!"
8781 #: builtin/remote.c:1330
8786 #: builtin/remote.c:1331
8791 #: builtin/remote.c:1354
8793 msgid " * [would prune] %s"
8794 msgstr " * [将删除] %s"
8796 #: builtin/remote.c:1357
8798 msgid " * [pruned] %s"
8799 msgstr " * [已删除] %s"
8801 #: builtin/remote.c:1402
8802 msgid "prune remotes after fetching"
8805 #: builtin/remote.c:1468 builtin/remote.c:1542
8807 msgid "No such remote '%s'"
8810 #: builtin/remote.c:1488
8814 #: builtin/remote.c:1495
8815 msgid "no remote specified"
8818 #: builtin/remote.c:1517
8819 msgid "manipulate push URLs"
8822 #: builtin/remote.c:1519
8826 #: builtin/remote.c:1521
8830 #: builtin/remote.c:1528
8831 msgid "--add --delete doesn't make sense"
8832 msgstr "--add --delete 无意义"
8834 #: builtin/remote.c:1568
8836 msgid "Invalid old URL pattern: %s"
8837 msgstr "无效的旧URL匹配模版:%s"
8839 #: builtin/remote.c:1576
8841 msgid "No such URL found: %s"
8844 #: builtin/remote.c:1578
8845 msgid "Will not delete all non-push URLs"
8846 msgstr "将不会删除所有非推送URL地址"
8848 #: builtin/remote.c:1592
8849 msgid "be verbose; must be placed before a subcommand"
8850 msgstr "冗长输出;必须置于子命令之前"
8852 #: builtin/repack.c:17
8853 msgid "git repack [<options>]"
8854 msgstr "git repack [<选项>]"
8856 #: builtin/repack.c:159
8857 msgid "pack everything in a single pack"
8858 msgstr "所有内容打包到一个包文件中"
8860 #: builtin/repack.c:161
8861 msgid "same as -a, and turn unreachable objects loose"
8862 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8864 #: builtin/repack.c:164
8865 msgid "remove redundant packs, and run git-prune-packed"
8866 msgstr "删除多余的包,运行 git-prune-packed"
8868 #: builtin/repack.c:166
8869 msgid "pass --no-reuse-delta to git-pack-objects"
8870 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8872 #: builtin/repack.c:168
8873 msgid "pass --no-reuse-object to git-pack-objects"
8874 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8876 #: builtin/repack.c:170
8877 msgid "do not run git-update-server-info"
8878 msgstr "不运行 git-update-server-info"
8880 #: builtin/repack.c:173
8881 msgid "pass --local to git-pack-objects"
8882 msgstr "向 git-pack-objects 传递参数 --local"
8884 #: builtin/repack.c:175
8885 msgid "write bitmap index"
8886 msgstr "写 bitmap 索引"
8888 #: builtin/repack.c:176
8892 #: builtin/repack.c:177
8893 msgid "with -A, do not loosen objects older than this"
8894 msgstr "使用 -A,不要将早于给定时间的对象过期"
8896 #: builtin/repack.c:179
8897 msgid "size of the window used for delta compression"
8900 #: builtin/repack.c:180 builtin/repack.c:184
8904 #: builtin/repack.c:181
8905 msgid "same as the above, but limit memory size instead of entries count"
8906 msgstr "和上面的相似,但限制内存大小而非条目数"
8908 #: builtin/repack.c:183
8909 msgid "limits the maximum delta depth"
8912 #: builtin/repack.c:185
8913 msgid "maximum size of each packfile"
8916 #: builtin/repack.c:187
8917 msgid "repack objects in packs marked with .keep"
8918 msgstr "对标记为 .keep 的包中的对象重新打包"
8920 #: builtin/repack.c:375
8922 msgid "removing '%s' failed"
8925 #: builtin/replace.c:19
8926 msgid "git replace [-f] <object> <replacement>"
8927 msgstr "git replace [-f] <对象> <替换物>"
8929 #: builtin/replace.c:20
8930 msgid "git replace [-f] --edit <object>"
8931 msgstr "git replace [-f] --edit <对象>"
8933 #: builtin/replace.c:21
8934 msgid "git replace [-f] --graft <commit> [<parent>...]"
8935 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8937 #: builtin/replace.c:22
8938 msgid "git replace -d <object>..."
8939 msgstr "git replace -d <对象>..."
8941 #: builtin/replace.c:23
8942 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8943 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8945 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8947 msgid "Not a valid object name: '%s'"
8948 msgstr "不是一个有效的对象名:'%s'"
8950 #: builtin/replace.c:355
8952 msgid "bad mergetag in commit '%s'"
8953 msgstr "提交 '%s' 中损坏的 mergetag"
8955 #: builtin/replace.c:357
8957 msgid "malformed mergetag in commit '%s'"
8958 msgstr "提交 '%s' 中非法的 mergetag"
8960 #: builtin/replace.c:368
8963 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8964 "instead of --graft"
8965 msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8967 #: builtin/replace.c:401
8969 msgid "the original commit '%s' has a gpg signature."
8970 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8972 #: builtin/replace.c:402
8973 msgid "the signature will be removed in the replacement commit!"
8974 msgstr "在替换的提交中签名将被移除!"
8976 #: builtin/replace.c:408
8978 msgid "could not write replacement commit for: '%s'"
8979 msgstr "不能为 '%s' 写替换提交"
8981 #: builtin/replace.c:432
8982 msgid "list replace refs"
8985 #: builtin/replace.c:433
8986 msgid "delete replace refs"
8989 #: builtin/replace.c:434
8990 msgid "edit existing object"
8993 #: builtin/replace.c:435
8994 msgid "change a commit's parents"
8997 #: builtin/replace.c:436
8998 msgid "replace the ref if it exists"
9001 #: builtin/replace.c:437
9002 msgid "do not pretty-print contents for --edit"
9003 msgstr "不要为 --edit 操作美观显示内容"
9005 #: builtin/replace.c:438
9006 msgid "use this format"
9009 #: builtin/rerere.c:12
9010 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9011 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9013 #: builtin/rerere.c:57
9014 msgid "register clean resolutions in index"
9015 msgstr "在索引中注册干净的解决方案"
9017 #: builtin/reset.c:26
9019 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9020 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9022 #: builtin/reset.c:27
9023 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9024 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9026 #: builtin/reset.c:28
9027 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9028 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9030 #: builtin/reset.c:34
9034 #: builtin/reset.c:34
9038 #: builtin/reset.c:34
9042 #: builtin/reset.c:34
9046 #: builtin/reset.c:34
9050 #: builtin/reset.c:74
9051 msgid "You do not have a valid HEAD."
9052 msgstr "您没有一个有效的 HEAD。"
9054 #: builtin/reset.c:76
9055 msgid "Failed to find tree of HEAD."
9056 msgstr "无法找到 HEAD 指向的树。"
9058 #: builtin/reset.c:82
9060 msgid "Failed to find tree of %s."
9061 msgstr "无法找到 %s 指向的树。"
9063 #: builtin/reset.c:100
9065 msgid "HEAD is now at %s"
9066 msgstr "HEAD 现在位于 %s"
9068 # 译者:汉字之间无空格,故删除%s前后空格
9069 #: builtin/reset.c:183
9071 msgid "Cannot do a %s reset in the middle of a merge."
9072 msgstr "在合并过程中不能做%s重置操作。"
9074 #: builtin/reset.c:276
9075 msgid "be quiet, only report errors"
9078 #: builtin/reset.c:278
9079 msgid "reset HEAD and index"
9080 msgstr "重置 HEAD 和索引"
9082 #: builtin/reset.c:279
9083 msgid "reset only HEAD"
9086 #: builtin/reset.c:281 builtin/reset.c:283
9087 msgid "reset HEAD, index and working tree"
9088 msgstr "重置 HEAD、索引和工作区"
9090 #: builtin/reset.c:285
9091 msgid "reset HEAD but keep local changes"
9092 msgstr "重置 HEAD 但保存本地变更"
9094 #: builtin/reset.c:288
9095 msgid "record only the fact that removed paths will be added later"
9096 msgstr "将删除的路径标记为稍后添加"
9098 #: builtin/reset.c:305
9100 msgid "Failed to resolve '%s' as a valid revision."
9101 msgstr "无法将 '%s' 解析为一个有效的版本。"
9103 #: builtin/reset.c:308 builtin/reset.c:316
9105 msgid "Could not parse object '%s'."
9106 msgstr "不能解析对象 '%s'。"
9108 #: builtin/reset.c:313
9110 msgid "Failed to resolve '%s' as a valid tree."
9111 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9113 #: builtin/reset.c:322
9114 msgid "--patch is incompatible with --{hard,mixed,soft}"
9115 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9117 #: builtin/reset.c:331
9118 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9119 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9121 # 译者:汉字之间无空格,故删除%s前后空格
9122 #: builtin/reset.c:333
9124 msgid "Cannot do %s reset with paths."
9125 msgstr "不能带路径进行%s重置。"
9127 # 译者:汉字之间无空格,故删除%s前后空格
9128 #: builtin/reset.c:343
9130 msgid "%s reset is not allowed in a bare repository"
9131 msgstr "不能对纯版本库进行%s重置"
9133 #: builtin/reset.c:347
9134 msgid "-N can only be used with --mixed"
9135 msgstr "-N 只能和 --mixed 同时使用"
9137 #: builtin/reset.c:364
9138 msgid "Unstaged changes after reset:"
9139 msgstr "重置后撤出暂存区的变更:"
9141 #: builtin/reset.c:370
9143 msgid "Could not reset index file to revision '%s'."
9144 msgstr "不能重置索引文件至版本 '%s'。"
9146 #: builtin/reset.c:374
9147 msgid "Could not write new index file."
9148 msgstr "不能写入新的索引文件。"
9150 #: builtin/rev-parse.c:361
9151 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9152 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9154 #: builtin/rev-parse.c:366
9155 msgid "keep the `--` passed as an arg"
9156 msgstr "保持 `--` 作为一个参数传递"
9158 #: builtin/rev-parse.c:368
9159 msgid "stop parsing after the first non-option argument"
9160 msgstr "遇到第一个非选项参数后停止解析"
9162 #: builtin/rev-parse.c:371
9163 msgid "output in stuck long form"
9166 #: builtin/rev-parse.c:499
9168 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
9169 " or: git rev-parse --sq-quote [<arg>...]\n"
9170 " or: git rev-parse [<options>] [<arg>...]\n"
9172 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9174 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9175 " 或者:git rev-parse --sq-quote [<参数>...]\n"
9176 " 或者:git rev-parse [<选项>] [<参数>...]\n"
9178 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9180 #: builtin/revert.c:22
9181 msgid "git revert [<options>] <commit-ish>..."
9182 msgstr "git revert [<选项>] <提交号>..."
9184 #: builtin/revert.c:23
9185 msgid "git revert <subcommand>"
9186 msgstr "git revert <子命令>"
9188 #: builtin/revert.c:28
9189 msgid "git cherry-pick [<options>] <commit-ish>..."
9190 msgstr "git cherry-pick [<选项>] <提交号>..."
9192 #: builtin/revert.c:29
9193 msgid "git cherry-pick <subcommand>"
9194 msgstr "git cherry-pick <子命令>"
9196 #: builtin/revert.c:71
9198 msgid "%s: %s cannot be used with %s"
9199 msgstr "%s:%s 不能和 %s 同时使用"
9201 #: builtin/revert.c:80
9202 msgid "end revert or cherry-pick sequence"
9205 #: builtin/revert.c:81
9206 msgid "resume revert or cherry-pick sequence"
9209 #: builtin/revert.c:82
9210 msgid "cancel revert or cherry-pick sequence"
9213 #: builtin/revert.c:83
9214 msgid "don't automatically commit"
9217 #: builtin/revert.c:84
9218 msgid "edit the commit message"
9221 #: builtin/revert.c:87
9222 msgid "parent number"
9225 #: builtin/revert.c:89
9226 msgid "merge strategy"
9229 #: builtin/revert.c:90
9233 #: builtin/revert.c:91
9234 msgid "option for merge strategy"
9237 #: builtin/revert.c:104
9238 msgid "append commit name"
9241 #: builtin/revert.c:105
9242 msgid "allow fast-forward"
9245 #: builtin/revert.c:106
9246 msgid "preserve initially empty commits"
9249 #: builtin/revert.c:107
9250 msgid "allow commits with empty messages"
9253 #: builtin/revert.c:108
9254 msgid "keep redundant, empty commits"
9257 #: builtin/revert.c:112
9258 msgid "program error"
9261 #: builtin/revert.c:197
9262 msgid "revert failed"
9265 #: builtin/revert.c:212
9266 msgid "cherry-pick failed"
9270 msgid "git rm [<options>] [--] <file>..."
9271 msgstr "git rm [<选项>] [--] <文件>..."
9275 "the following submodule (or one of its nested submodules)\n"
9276 "uses a .git directory:"
9278 "the following submodules (or one of their nested submodules)\n"
9279 "use a .git directory:"
9280 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9281 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9286 "(use 'rm -rf' if you really want to remove it including all of its history)"
9289 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9293 "the following file has staged content different from both the\n"
9294 "file and the HEAD:"
9296 "the following files have staged content different from both the\n"
9297 "file and the HEAD:"
9298 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9299 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9304 "(use -f to force removal)"
9310 msgid "the following file has changes staged in the index:"
9311 msgid_plural "the following files have changes staged in the index:"
9312 msgstr[0] "如下文件相对索引区的内容有修改"
9313 msgstr[1] "如下文件相对索引区的内容有修改"
9315 #: builtin/rm.c:244 builtin/rm.c:255
9318 "(use --cached to keep the file, or -f to force removal)"
9321 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
9324 msgid "the following file has local modifications:"
9325 msgid_plural "the following files have local modifications:"
9326 msgstr[0] "如下文件有本地修改:"
9327 msgstr[1] "如下文件有本地修改:"
9330 msgid "do not list removed files"
9334 msgid "only remove from the index"
9338 msgid "override the up-to-date check"
9342 msgid "allow recursive removal"
9346 msgid "exit with a zero status even if nothing matched"
9347 msgstr "即使没有匹配,也以零状态退出"
9350 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9351 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9355 msgid "not removing '%s' recursively without -r"
9356 msgstr "未提供 -r 选项不会递归删除 '%s'"
9360 msgid "git rm: unable to remove %s"
9361 msgstr "git rm:不能删除 %s"
9363 #: builtin/shortlog.c:13
9364 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9365 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9367 #: builtin/shortlog.c:131
9369 msgid "Missing author: %s"
9372 #: builtin/shortlog.c:230
9373 msgid "sort output according to the number of commits per author"
9374 msgstr "根据每个作者的提交数量排序"
9376 #: builtin/shortlog.c:232
9377 msgid "Suppress commit descriptions, only provides commit count"
9378 msgstr "隐藏提交说明,只提供提交数量"
9380 #: builtin/shortlog.c:234
9381 msgid "Show the email address of each author"
9382 msgstr "显示每个作者的电子邮件地址"
9384 #: builtin/shortlog.c:235
9386 msgstr "w[,i1[,i2]]"
9388 #: builtin/shortlog.c:236
9389 msgid "Linewrap output"
9392 #: builtin/show-branch.c:9
9394 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9395 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9396 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9397 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9399 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9400 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9401 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9402 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9404 #: builtin/show-branch.c:13
9405 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9406 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9408 #: builtin/show-branch.c:652
9409 msgid "show remote-tracking and local branches"
9410 msgstr "显示远程跟踪的和本地的分支"
9412 #: builtin/show-branch.c:654
9413 msgid "show remote-tracking branches"
9416 #: builtin/show-branch.c:656
9417 msgid "color '*!+-' corresponding to the branch"
9418 msgstr "着色 '*!+-' 到相应的分支"
9420 #: builtin/show-branch.c:658
9421 msgid "show <n> more commits after the common ancestor"
9422 msgstr "显示共同祖先后的 <n> 个提交"
9424 #: builtin/show-branch.c:660
9425 msgid "synonym to more=-1"
9426 msgstr "和 more=-1 同义"
9428 #: builtin/show-branch.c:661
9429 msgid "suppress naming strings"
9432 #: builtin/show-branch.c:663
9433 msgid "include the current branch"
9436 #: builtin/show-branch.c:665
9437 msgid "name commits with their object names"
9440 #: builtin/show-branch.c:667
9441 msgid "show possible merge bases"
9444 #: builtin/show-branch.c:669
9445 msgid "show refs unreachable from any other ref"
9446 msgstr "显示没有任何引用的的引用"
9448 #: builtin/show-branch.c:671
9449 msgid "show commits in topological order"
9452 #: builtin/show-branch.c:674
9453 msgid "show only commits not on the first branch"
9454 msgstr "只显示不在第一个分支上的提交"
9456 #: builtin/show-branch.c:676
9457 msgid "show merges reachable from only one tip"
9458 msgstr "显示仅一个分支可访问的合并提交"
9460 #: builtin/show-branch.c:678
9461 msgid "topologically sort, maintaining date order where possible"
9462 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9464 #: builtin/show-branch.c:681
9465 msgid "<n>[,<base>]"
9466 msgstr "<n>[,<base>]"
9468 #: builtin/show-branch.c:682
9469 msgid "show <n> most recent ref-log entries starting at base"
9470 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9472 #: builtin/show-ref.c:10
9474 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9475 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9477 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9478 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9480 #: builtin/show-ref.c:11
9481 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9482 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9484 #: builtin/show-ref.c:168
9485 msgid "only show tags (can be combined with heads)"
9486 msgstr "只显示 tags(可以和头共用)"
9488 #: builtin/show-ref.c:169
9489 msgid "only show heads (can be combined with tags)"
9490 msgstr "只显示头(可以和 tags 共用)"
9492 #: builtin/show-ref.c:170
9493 msgid "stricter reference checking, requires exact ref path"
9494 msgstr "更严格的引用检测,需要精确的引用路径"
9496 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9497 msgid "show the HEAD reference, even if it would be filtered out"
9498 msgstr "显示 HEAD 引用,即使被过滤掉"
9500 #: builtin/show-ref.c:177
9501 msgid "dereference tags into object IDs"
9502 msgstr "转换 tags 到对象ID"
9504 #: builtin/show-ref.c:179
9505 msgid "only show SHA1 hash using <n> digits"
9506 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9508 #: builtin/show-ref.c:183
9509 msgid "do not print results to stdout (useful with --verify)"
9510 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9512 #: builtin/show-ref.c:185
9513 msgid "show refs from stdin that aren't in local repository"
9514 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9516 #: builtin/symbolic-ref.c:7
9517 msgid "git symbolic-ref [<options>] <name> [<ref>]"
9518 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9520 #: builtin/symbolic-ref.c:8
9521 msgid "git symbolic-ref -d [-q] <name>"
9522 msgstr "git symbolic-ref -d [-q] <名称>"
9524 #: builtin/symbolic-ref.c:40
9525 msgid "suppress error message for non-symbolic (detached) refs"
9526 msgstr "不显示非符号(分离的)引用的错误信息"
9528 #: builtin/symbolic-ref.c:41
9529 msgid "delete symbolic ref"
9532 #: builtin/symbolic-ref.c:42
9533 msgid "shorten ref output"
9536 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9540 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9541 msgid "reason of the update"
9546 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9549 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9552 msgid "git tag -d <tagname>..."
9553 msgstr "git tag -d <标签名>..."
9557 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9558 "\t\t[<pattern>...]"
9560 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9563 msgid "git tag -v <tagname>..."
9564 msgstr "git tag -v <标签名>..."
9568 msgid "malformed object at '%s'"
9569 msgstr "非法的对象于 '%s'"
9571 #: builtin/tag.c:301
9573 msgid "tag name too long: %.*s..."
9574 msgstr "tag 名字太长:%.*s..."
9576 #: builtin/tag.c:306
9578 msgid "tag '%s' not found."
9579 msgstr "tag '%s' 未发现。"
9581 #: builtin/tag.c:321
9583 msgid "Deleted tag '%s' (was %s)\n"
9584 msgstr "已删除 tag '%s'(曾为 %s)\n"
9586 #: builtin/tag.c:333
9588 msgid "could not verify the tag '%s'"
9589 msgstr "不能校验 tag '%s'"
9591 #: builtin/tag.c:343
9595 "Write a message for tag:\n"
9597 "Lines starting with '%c' will be ignored.\n"
9602 "以 '%c' 开头的行将被忽略。\n"
9604 #: builtin/tag.c:347
9608 "Write a message for tag:\n"
9610 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9616 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9618 #: builtin/tag.c:371
9620 msgid "unsupported sort specification '%s'"
9621 msgstr "不支持的排序规格 '%s'"
9623 #: builtin/tag.c:373
9625 msgid "unsupported sort specification '%s' in variable '%s'"
9626 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9628 #: builtin/tag.c:428
9629 msgid "unable to sign the tag"
9632 #: builtin/tag.c:430
9633 msgid "unable to write tag file"
9636 #: builtin/tag.c:455
9637 msgid "bad object type."
9640 #: builtin/tag.c:468
9641 msgid "tag header too big."
9644 #: builtin/tag.c:504
9645 msgid "no tag message?"
9648 #: builtin/tag.c:510
9650 msgid "The tag message has been left in %s\n"
9651 msgstr "tag 说明被保留在 %s\n"
9653 #: builtin/tag.c:559
9654 msgid "switch 'points-at' requires an object"
9655 msgstr "开关 'points-at' 需要一个对象"
9657 #: builtin/tag.c:561
9659 msgid "malformed object name '%s'"
9660 msgstr "非法的对象名 '%s'"
9662 #: builtin/tag.c:589
9663 msgid "list tag names"
9666 #: builtin/tag.c:591
9667 msgid "print <n> lines of each tag message"
9668 msgstr "每个 tag 信息打印 <n> 行"
9670 #: builtin/tag.c:593
9674 #: builtin/tag.c:594
9678 #: builtin/tag.c:596
9679 msgid "Tag creation options"
9682 #: builtin/tag.c:598
9683 msgid "annotated tag, needs a message"
9684 msgstr "注解 tag,需要一个说明"
9686 #: builtin/tag.c:600
9690 #: builtin/tag.c:602
9691 msgid "annotated and GPG-signed tag"
9692 msgstr "注解并 GPG 签名的 tag"
9694 #: builtin/tag.c:606
9695 msgid "use another key to sign the tag"
9696 msgstr "使用另外的私钥签名 tag"
9698 #: builtin/tag.c:607
9699 msgid "replace the tag if exists"
9700 msgstr "如果存在,替换现有的 tag"
9702 #: builtin/tag.c:609
9703 msgid "Tag listing options"
9706 #: builtin/tag.c:610
9707 msgid "show tag list in columns"
9708 msgstr "以列的方式显示 tag"
9710 #: builtin/tag.c:612
9714 #: builtin/tag.c:617 builtin/tag.c:623
9715 msgid "print only tags that contain the commit"
9716 msgstr "只打印包含提交的tags"
9718 #: builtin/tag.c:629
9719 msgid "print only tags of the object"
9722 #: builtin/tag.c:655
9723 msgid "--column and -n are incompatible"
9724 msgstr "--column 和 -n 不兼容"
9726 #: builtin/tag.c:667
9727 msgid "--sort and -n are incompatible"
9728 msgstr "--sort 和 -n 不兼容"
9730 #: builtin/tag.c:674
9731 msgid "-n option is only allowed with -l."
9732 msgstr "-n 选项只允许和 -l 同时使用。"
9734 #: builtin/tag.c:676
9735 msgid "--contains option is only allowed with -l."
9736 msgstr "--contains 选项只允许和 -l 同时使用。"
9738 #: builtin/tag.c:678
9739 msgid "--points-at option is only allowed with -l."
9740 msgstr "--points-at 选项只允许和 -l 同时使用。"
9742 #: builtin/tag.c:686
9743 msgid "only one -F or -m option is allowed."
9744 msgstr "只允许一个 -F 或 -m 选项。"
9746 #: builtin/tag.c:706
9747 msgid "too many params"
9750 #: builtin/tag.c:712
9752 msgid "'%s' is not a valid tag name."
9753 msgstr "'%s' 不是一个有效的tag名称。"
9755 #: builtin/tag.c:717
9757 msgid "tag '%s' already exists"
9758 msgstr "tag '%s' 已存在"
9760 #: builtin/tag.c:741
9762 msgid "Updated tag '%s' (was %s)\n"
9763 msgstr "已更新tag '%s'(曾为 %s)\n"
9765 #: builtin/unpack-objects.c:489
9766 msgid "Unpacking objects"
9769 #: builtin/update-index.c:403
9770 msgid "git update-index [<options>] [--] [<file>...]"
9771 msgstr "git update-index [<选项>] [--] [<文件>...]"
9773 #: builtin/update-index.c:757
9774 msgid "continue refresh even when index needs update"
9775 msgstr "当索引需要更新时继续刷新"
9777 #: builtin/update-index.c:760
9778 msgid "refresh: ignore submodules"
9781 #: builtin/update-index.c:763
9782 msgid "do not ignore new files"
9785 #: builtin/update-index.c:765
9786 msgid "let files replace directories and vice-versa"
9787 msgstr "让文件替换目录(反之亦然)"
9789 #: builtin/update-index.c:767
9790 msgid "notice files missing from worktree"
9793 #: builtin/update-index.c:769
9794 msgid "refresh even if index contains unmerged entries"
9795 msgstr "即使索引区包含未合并的条目也执行刷新"
9797 #: builtin/update-index.c:772
9798 msgid "refresh stat information"
9801 #: builtin/update-index.c:776
9802 msgid "like --refresh, but ignore assume-unchanged setting"
9803 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9805 #: builtin/update-index.c:780
9806 msgid "<mode>,<object>,<path>"
9807 msgstr "<存取模式>,<对象>,<路径>"
9809 #: builtin/update-index.c:781
9810 msgid "add the specified entry to the index"
9811 msgstr "添加指定的条目到索引区"
9813 #: builtin/update-index.c:785
9817 #: builtin/update-index.c:786
9818 msgid "override the executable bit of the listed files"
9819 msgstr "覆盖列表里文件的可执行位"
9821 #: builtin/update-index.c:790
9822 msgid "mark files as \"not changing\""
9823 msgstr "把文件标记为 \"没有变更\""
9825 #: builtin/update-index.c:793
9826 msgid "clear assumed-unchanged bit"
9827 msgstr "清除 assumed-unchanged 位"
9829 #: builtin/update-index.c:796
9830 msgid "mark files as \"index-only\""
9831 msgstr "把文件标记为 \"仅索引\""
9833 #: builtin/update-index.c:799
9834 msgid "clear skip-worktree bit"
9835 msgstr "清除 skip-worktree 位"
9837 #: builtin/update-index.c:802
9838 msgid "add to index only; do not add content to object database"
9839 msgstr "只添加到索引区;不添加对象到对象库"
9841 #: builtin/update-index.c:804
9842 msgid "remove named paths even if present in worktree"
9843 msgstr "即使存在工作区里,也删除路径"
9845 #: builtin/update-index.c:806
9846 msgid "with --stdin: input lines are terminated by null bytes"
9847 msgstr "携带 --stdin:输入的行以 null 字符终止"
9849 #: builtin/update-index.c:808
9850 msgid "read list of paths to be updated from standard input"
9851 msgstr "从标准输入中读取需要更新的路径列表"
9853 #: builtin/update-index.c:812
9854 msgid "add entries from standard input to the index"
9855 msgstr "从标准输入添加条目到索引区"
9857 #: builtin/update-index.c:816
9858 msgid "repopulate stages #2 and #3 for the listed paths"
9859 msgstr "为指定文件重新生成第2和第3暂存区"
9861 #: builtin/update-index.c:820
9862 msgid "only update entries that differ from HEAD"
9863 msgstr "只更新与 HEAD 不同的条目"
9865 #: builtin/update-index.c:824
9866 msgid "ignore files missing from worktree"
9869 #: builtin/update-index.c:827
9870 msgid "report actions to standard output"
9873 #: builtin/update-index.c:829
9874 msgid "(for porcelains) forget saved unresolved conflicts"
9875 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9877 #: builtin/update-index.c:833
9878 msgid "write index in this format"
9881 #: builtin/update-index.c:835
9882 msgid "enable or disable split index"
9885 #: builtin/update-ref.c:9
9886 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
9887 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
9889 #: builtin/update-ref.c:10
9890 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
9891 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
9893 #: builtin/update-ref.c:11
9894 msgid "git update-ref [<options>] --stdin [-z]"
9895 msgstr "git update-ref [<选项>] --stdin [-z]"
9897 #: builtin/update-ref.c:359
9898 msgid "delete the reference"
9901 #: builtin/update-ref.c:361
9902 msgid "update <refname> not the one it points to"
9903 msgstr "更新 <引用名> 本身而不是它指向的引用"
9905 #: builtin/update-ref.c:362
9906 msgid "stdin has NUL-terminated arguments"
9907 msgstr "标准输入有以 NUL 字符终止的参数"
9909 #: builtin/update-ref.c:363
9910 msgid "read updates from stdin"
9913 #: builtin/update-server-info.c:6
9914 msgid "git update-server-info [--force]"
9915 msgstr "git update-server-info [--force]"
9917 #: builtin/update-server-info.c:14
9918 msgid "update the info files from scratch"
9921 #: builtin/verify-commit.c:17
9922 msgid "git verify-commit [-v | --verbose] <commit>..."
9923 msgstr "git verify-commit [-v | --verbose] <提交>..."
9925 #: builtin/verify-commit.c:75
9926 msgid "print commit contents"
9929 #: builtin/verify-pack.c:54
9930 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
9931 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
9933 #: builtin/verify-pack.c:64
9937 #: builtin/verify-pack.c:66
9938 msgid "show statistics only"
9941 #: builtin/verify-tag.c:17
9942 msgid "git verify-tag [-v | --verbose] <tag>..."
9943 msgstr "git verify-tag [-v | --verbose] <标签>..."
9945 #: builtin/verify-tag.c:73
9946 msgid "print tag contents"
9949 #: builtin/write-tree.c:13
9950 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9951 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9953 #: builtin/write-tree.c:26
9957 #: builtin/write-tree.c:27
9958 msgid "write tree object for a subdirectory <prefix>"
9959 msgstr "将 <前缀> 子目录内容写到一个树对象"
9961 #: builtin/write-tree.c:30
9962 msgid "only useful for debugging"
9965 #: credential-cache--daemon.c:267
9966 msgid "print debugging messages to stderr"
9967 msgstr "调试信息输出到标准错误"
9971 "'git help -a' and 'git help -g' list available subcommands and some\n"
9972 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9973 "to read about a specific subcommand or concept."
9975 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9976 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9980 msgid "Add file contents to the index"
9984 msgid "Find by binary search the change that introduced a bug"
9985 msgstr "通过二分查找定位引入 bug 的变更"
9988 msgid "List, create, or delete branches"
9992 msgid "Checkout a branch or paths to the working tree"
9993 msgstr "检出一个分支或路径到工作区"
9996 msgid "Clone a repository into a new directory"
9997 msgstr "克隆一个版本库到一个新目录"
10000 msgid "Record changes to the repository"
10003 #: common-cmds.h:14
10004 msgid "Show changes between commits, commit and working tree, etc"
10005 msgstr "显示提交之间、提交和工作区之间等的差异"
10007 #: common-cmds.h:15
10008 msgid "Download objects and refs from another repository"
10009 msgstr "从另外一个版本库下载对象和引用"
10011 #: common-cmds.h:16
10012 msgid "Print lines matching a pattern"
10015 #: common-cmds.h:17
10016 msgid "Create an empty Git repository or reinitialize an existing one"
10017 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
10019 #: common-cmds.h:18
10020 msgid "Show commit logs"
10023 #: common-cmds.h:19
10024 msgid "Join two or more development histories together"
10025 msgstr "合并两个或更多开发历史"
10027 #: common-cmds.h:20
10028 msgid "Move or rename a file, a directory, or a symlink"
10029 msgstr "移动或重命名一个文件、目录或符号链接"
10031 #: common-cmds.h:21
10032 msgid "Fetch from and integrate with another repository or a local branch"
10033 msgstr "获取并整合另外的版本库或一个本地分支"
10035 #: common-cmds.h:22
10036 msgid "Update remote refs along with associated objects"
10037 msgstr "更新远程引用和相关的对象"
10039 #: common-cmds.h:23
10040 msgid "Forward-port local commits to the updated upstream head"
10041 msgstr "本地提交转移至更新后的上游分支中"
10043 #: common-cmds.h:24
10044 msgid "Reset current HEAD to the specified state"
10045 msgstr "重置当前HEAD到指定状态"
10047 #: common-cmds.h:25
10048 msgid "Remove files from the working tree and from the index"
10049 msgstr "从工作区和索引中删除文件"
10051 #: common-cmds.h:26
10052 msgid "Show various types of objects"
10055 #: common-cmds.h:27
10056 msgid "Show the working tree status"
10059 #: common-cmds.h:28
10060 msgid "Create, list, delete or verify a tag object signed with GPG"
10061 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10063 #: parse-options.h:143
10064 msgid "expiry-date"
10067 #: parse-options.h:158
10068 msgid "no-op (backward compatibility)"
10071 #: parse-options.h:232
10072 msgid "be more verbose"
10075 #: parse-options.h:234
10076 msgid "be more quiet"
10079 #: parse-options.h:240
10080 msgid "use <n> digits to display SHA-1s"
10081 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10084 msgid "update the index with reused conflict resolution if possible"
10085 msgstr "如果可能,重用冲突解决更新索引"
10088 msgid "You need to set your committer info first"
10089 msgstr "您需要先设置你的提交者信息"
10093 "You seem to have moved HEAD since the last 'am' failure.\n"
10094 "Not rewinding to ORIG_HEAD"
10095 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10100 "When you have resolved this problem, run \"$cmdline --continue\".\n"
10101 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10102 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
10104 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10105 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10106 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10109 msgid "Cannot fall back to three-way merge."
10110 msgstr "无法求助于三路合并。"
10113 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10114 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10117 msgid "Using index info to reconstruct a base tree..."
10118 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10122 "Did you hand edit your patch?\n"
10123 "It does not apply to blobs recorded in its index."
10126 "无法应用补丁到索引中的数据(blob)对象上。"
10129 msgid "Falling back to patching base and 3-way merge..."
10130 msgstr "转而在基础版本上打补丁及进行三路合并..."
10133 msgid "Failed to merge in the changes."
10137 msgid "Only one StGIT patch series can be applied at once"
10138 msgstr "一次只能有一个 StGIT 补丁队列被应用"
10142 msgid "Patch format $patch_format is not supported."
10143 msgstr "不支持 $patch_format 补丁格式。"
10146 msgid "Patch format detection failed."
10151 "The -b/--binary option has been a no-op for long time, and\n"
10152 "it will be removed. Please do not use it anymore."
10154 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10159 msgid "previous rebase directory $dotest still exists but mbox given."
10160 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10163 msgid "Please make up your mind. --skip or --abort?"
10164 msgstr "请下决心。--skip 或是 --abort ?"
10169 "Stray $dotest directory found.\n"
10170 "Use \"git am --abort\" to remove it."
10172 "发现了错误的 $dotest 目录。\n"
10173 "使用 \"git am --abort\" 删除它。"
10176 msgid "Resolve operation not in progress, we are not resuming."
10177 msgstr "解决操作未进行,我们不会继续。"
10181 msgid "Dirty index: cannot apply patches (dirty: $files)"
10182 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10187 "Patch is empty. Was it split wrong?\n"
10188 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10189 "To restore the original branch and stop patching run \"$cmdline --abort\"."
10192 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10193 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10196 msgid "Patch does not have a valid e-mail address."
10197 msgstr "补丁中没有一个有效的邮件地址。"
10200 msgid "cannot be interactive without stdin connected to a terminal."
10201 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10204 msgid "Commit Body is:"
10208 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10209 #. in your translation. The program will only accept English
10210 #. input at this point.
10212 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10213 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10217 msgid "Applying: $FIRSTLINE"
10218 msgstr "正应用:$FIRSTLINE"
10222 "No changes - did you forget to use 'git add'?\n"
10223 "If there is nothing left to stage, chances are that something else\n"
10224 "already introduced the same changes; you might want to skip this patch."
10226 "没有变更 —— 您是不是忘了执行 'git add'?\n"
10227 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10232 "You still have unmerged paths in your index\n"
10233 "did you forget to use 'git add'?"
10234 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10237 msgid "No changes -- Patch already applied."
10238 msgstr "没有变更 —— 补丁已经应用过。"
10242 msgid "Patch failed at $msgnum $FIRSTLINE"
10243 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10248 "The copy of the patch that failed is found in:\n"
10255 msgid "applying to an empty history"
10256 msgstr "正应用到一个空历史上"
10258 #: git-bisect.sh:48
10259 msgid "You need to start by \"git bisect start\""
10260 msgstr "您需要执行 \"git bisect start\" 来开始"
10263 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10264 #. translation. The program will only accept English input
10266 #: git-bisect.sh:54
10267 msgid "Do you want me to do it for you [Y/n]? "
10268 msgstr "您想让我为您这样做么[Y/n]? "
10270 #: git-bisect.sh:95
10272 msgid "unrecognised option: '$arg'"
10273 msgstr "未能识别的选项:'$arg'"
10275 #: git-bisect.sh:99
10277 msgid "'$arg' does not appear to be a valid revision"
10278 msgstr "'$arg' 看起来不像是一个有效的版本"
10280 #: git-bisect.sh:117
10281 msgid "Bad HEAD - I need a HEAD"
10282 msgstr "坏的 HEAD - 我需要一个 HEAD"
10284 #: git-bisect.sh:130
10287 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10288 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10290 #: git-bisect.sh:140
10291 msgid "won't bisect on cg-seek'ed tree"
10292 msgstr "不会在做了 cg-seek 的树上做二分查找"
10294 #: git-bisect.sh:144
10295 msgid "Bad HEAD - strange symbolic ref"
10296 msgstr "坏的 HEAD - 奇怪的符号引用"
10298 #: git-bisect.sh:189
10300 msgid "Bad bisect_write argument: $state"
10301 msgstr "坏的 bisect_write 参数:$state"
10303 #: git-bisect.sh:218
10305 msgid "Bad rev input: $arg"
10306 msgstr "输入坏的版本:$arg"
10308 #: git-bisect.sh:232
10309 msgid "Please call 'bisect_state' with at least one argument."
10310 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10312 #: git-bisect.sh:244
10314 msgid "Bad rev input: $rev"
10315 msgstr "输入坏的版本:$rev"
10317 #: git-bisect.sh:253
10318 msgid "'git bisect bad' can take only one argument."
10319 msgstr "'git bisect bad' 只能带一个参数。"
10321 #: git-bisect.sh:276
10322 msgid "Warning: bisecting only with a bad commit."
10323 msgstr "警告:在仅有一个坏提交下进行二分查找。"
10326 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10327 #. translation. The program will only accept English input
10329 #: git-bisect.sh:282
10330 msgid "Are you sure [Y/n]? "
10331 msgstr "您确认么[Y/n]? "
10333 #: git-bisect.sh:292
10335 "You need to give me at least one good and one bad revision.\n"
10336 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10338 "您需要给我至少一个好版本和一个坏版本。\n"
10339 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10341 #: git-bisect.sh:295
10343 "You need to start by \"git bisect start\".\n"
10344 "You then need to give me at least one good and one bad revision.\n"
10345 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10347 "您需要执行 \"git bisect start\" 来开始。\n"
10348 "然后需要提供我至少一个好版本和一个坏版本。\n"
10349 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10351 #: git-bisect.sh:366 git-bisect.sh:493
10352 msgid "We are not bisecting."
10353 msgstr "我们没有在二分查找。"
10355 #: git-bisect.sh:373
10357 msgid "'$invalid' is not a valid commit"
10358 msgstr "'$invalid' 不是一个有效的提交"
10360 #: git-bisect.sh:382
10363 "Could not check out original HEAD '$branch'.\n"
10364 "Try 'git bisect reset <commit>'."
10366 "不能检出原始 HEAD '$branch'。\n"
10367 "尝试 'git bisect reset <提交>'。"
10369 #: git-bisect.sh:409
10370 msgid "No logfile given"
10373 #: git-bisect.sh:410
10375 msgid "cannot read $file for replaying"
10376 msgstr "不能读取 $file 来重放"
10378 #: git-bisect.sh:427
10379 msgid "?? what are you talking about?"
10382 #: git-bisect.sh:439
10384 msgid "running $command"
10385 msgstr "运行 $command"
10387 #: git-bisect.sh:446
10390 "bisect run failed:\n"
10391 "exit code $res from '$command' is < 0 or >= 128"
10394 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10396 #: git-bisect.sh:472
10397 msgid "bisect run cannot continue any more"
10398 msgstr "二分查找不能继续运行"
10400 #: git-bisect.sh:478
10403 "bisect run failed:\n"
10404 "'bisect_state $state' exited with error code $res"
10407 "'bisect_state $state' 退出码为 $res"
10409 #: git-bisect.sh:485
10410 msgid "bisect run success"
10415 "Pull is not possible because you have unmerged files.\n"
10416 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10417 "as appropriate to mark resolution and make a commit."
10419 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10420 "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10423 msgid "Pull is not possible because you have unmerged files."
10424 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10428 "You have not concluded your merge (MERGE_HEAD exists).\n"
10429 "Please, commit your changes before you can merge."
10431 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10435 msgid "updating an unborn branch with changes added to the index"
10436 msgstr "更新尚未诞生的分支,变更添加至索引"
10441 "Warning: fetch updated the current branch head.\n"
10442 "Warning: fast-forwarding your working tree from\n"
10443 "Warning: commit $orig_head."
10445 "警告:fetch 更新了当前的分支。您的工作区\n"
10446 "警告:从原提交 $orig_head 快进。"
10449 msgid "Cannot merge multiple branches into empty head"
10450 msgstr "无法将多个分支合并到空分支"
10453 msgid "Cannot rebase onto multiple branches"
10456 #: git-rebase.sh:57
10458 "When you have resolved this problem, run \"git rebase --continue\".\n"
10459 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10460 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10463 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10464 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10465 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10467 #: git-rebase.sh:165
10468 msgid "Applied autostash."
10469 msgstr "成功应用 autostash。"
10471 #: git-rebase.sh:168
10473 msgid "Cannot store $stash_sha1"
10474 msgstr "无法保存 $stash_sha1"
10476 #: git-rebase.sh:169
10478 "Applying autostash resulted in conflicts.\n"
10479 "Your changes are safe in the stash.\n"
10480 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10482 "应用 autostash 导致冲突。\n"
10483 "您的修改安全地保存在 stash 中。\n"
10484 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10486 #: git-rebase.sh:208
10487 msgid "The pre-rebase hook refused to rebase."
10488 msgstr "钩子 pre-rebase 拒绝变基操作。"
10490 #: git-rebase.sh:213
10491 msgid "It looks like git-am is in progress. Cannot rebase."
10492 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10494 #: git-rebase.sh:351
10495 msgid "The --exec option must be used with the --interactive option"
10496 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10498 #: git-rebase.sh:356
10499 msgid "No rebase in progress?"
10500 msgstr "没有正在进行的变基?"
10502 #: git-rebase.sh:367
10503 msgid "The --edit-todo action can only be used during interactive rebase."
10504 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10506 #: git-rebase.sh:374
10507 msgid "Cannot read HEAD"
10510 #: git-rebase.sh:377
10512 "You must edit all merge conflicts and then\n"
10513 "mark them as resolved using git add"
10515 "您必须编辑所有的合并冲突,然后通过 git add\n"
10518 #: git-rebase.sh:395
10520 msgid "Could not move back to $head_name"
10521 msgstr "无法移回 $head_name"
10523 #: git-rebase.sh:414
10526 "It seems that there is already a $state_dir_base directory, and\n"
10527 "I wonder if you are in the middle of another rebase. If that is the\n"
10528 "case, please try\n"
10529 "\t$cmd_live_rebase\n"
10530 "If that is not the case, please\n"
10531 "\t$cmd_clear_stale_rebase\n"
10532 "and run me again. I am stopping in case you still have something\n"
10535 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10537 "\t$cmd_live_rebase\n"
10539 "\t$cmd_clear_stale_rebase\n"
10540 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10542 #: git-rebase.sh:465
10544 msgid "invalid upstream $upstream_name"
10545 msgstr "无效的上游 $upstream_name"
10547 #: git-rebase.sh:489
10549 msgid "$onto_name: there are more than one merge bases"
10550 msgstr "$onto_name: 有一个以上的合并基准"
10552 #: git-rebase.sh:492 git-rebase.sh:496
10554 msgid "$onto_name: there is no merge base"
10555 msgstr "$onto_name: 没有合并基准"
10557 #: git-rebase.sh:501
10559 msgid "Does not point to a valid commit: $onto_name"
10560 msgstr "没有指向一个有效的提交:$onto_name"
10562 #: git-rebase.sh:524
10564 msgid "fatal: no such branch: $branch_name"
10565 msgstr "严重错误:无此分支:$branch_name"
10567 #: git-rebase.sh:557
10568 msgid "Cannot autostash"
10569 msgstr "无法 autostash"
10571 #: git-rebase.sh:562
10573 msgid "Created autostash: $stash_abbrev"
10574 msgstr "创建了 autostash: $stash_abbrev"
10576 #: git-rebase.sh:566
10577 msgid "Please commit or stash them."
10578 msgstr "请提交或为它们保存进度。"
10580 #: git-rebase.sh:586
10582 msgid "Current branch $branch_name is up to date."
10583 msgstr "当前分支 $branch_name 是最新的。"
10585 #: git-rebase.sh:590
10587 msgid "Current branch $branch_name is up to date, rebase forced."
10588 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10590 #: git-rebase.sh:601
10592 msgid "Changes from $mb to $onto:"
10593 msgstr "变更从 $mb 到 $onto:"
10595 #: git-rebase.sh:610
10596 msgid "First, rewinding head to replay your work on top of it..."
10597 msgstr "首先,重置头指针以便在上面重放您的工作..."
10599 #: git-rebase.sh:620
10601 msgid "Fast-forwarded $branch_name to $onto_name."
10602 msgstr "快进 $branch_name 至 $onto_name。"
10605 msgid "git stash clear with parameters is unimplemented"
10606 msgstr "git stash clear 不支持参数"
10609 msgid "You do not have the initial commit yet"
10613 msgid "Cannot save the current index state"
10614 msgstr "无法保存当前索引状态"
10616 #: git-stash.sh:124 git-stash.sh:137
10617 msgid "Cannot save the current worktree state"
10618 msgstr "无法保存当前工作区状态"
10620 #: git-stash.sh:141
10621 msgid "No changes selected"
10624 #: git-stash.sh:144
10625 msgid "Cannot remove temporary index (can't happen)"
10626 msgstr "无法删除临时索引(不应发生)"
10628 #: git-stash.sh:157
10629 msgid "Cannot record working tree state"
10632 #: git-stash.sh:191
10634 msgid "Cannot update $ref_stash with $w_commit"
10635 msgstr "无法用 $w_commit 更新 $ref_stash"
10637 #. TRANSLATORS: $option is an invalid option, like
10638 #. `--blah-blah'. The 7 spaces at the beginning of the
10639 #. second line correspond to "error: ". So you should line
10640 #. up the second line with however many characters the
10641 #. translation of "error: " takes in your language. E.g. in
10642 #. English this is:
10644 #. $ git stash save --blah-blah 2>&1 | head -n 2
10645 #. error: unknown option for 'stash save': --blah-blah
10646 #. To provide a message, use git stash save -- '--blah-blah'
10647 #: git-stash.sh:238
10650 "error: unknown option for 'stash save': $option\n"
10651 " To provide a message, use git stash save -- '$option'"
10653 "错误:'stash save' 的未知选项:$option\n"
10654 " 要提供一个描述信息,使用 git stash save -- '$option'"
10656 #: git-stash.sh:259
10657 msgid "No local changes to save"
10658 msgstr "没有要保存的本地修改"
10660 #: git-stash.sh:263
10661 msgid "Cannot initialize stash"
10662 msgstr "无法初始化 stash"
10664 #: git-stash.sh:267
10665 msgid "Cannot save the current status"
10668 #: git-stash.sh:285
10669 msgid "Cannot remove worktree changes"
10672 #: git-stash.sh:384
10673 msgid "No stash found."
10674 msgstr "未发现 stash。"
10676 #: git-stash.sh:391
10678 msgid "Too many revisions specified: $REV"
10679 msgstr "指定了太多的版本:$REV"
10681 #: git-stash.sh:397
10683 msgid "$reference is not a valid reference"
10684 msgstr "$reference 不是一个有效的引用"
10686 #: git-stash.sh:425
10688 msgid "'$args' is not a stash-like commit"
10689 msgstr "'$args' 不是 stash 样提交"
10691 #: git-stash.sh:436
10693 msgid "'$args' is not a stash reference"
10694 msgstr "'$args' 不是一个 stash 引用"
10696 #: git-stash.sh:444
10697 msgid "unable to refresh index"
10700 #: git-stash.sh:448
10701 msgid "Cannot apply a stash in the middle of a merge"
10702 msgstr "无法在合并过程中恢复进度"
10704 #: git-stash.sh:456
10705 msgid "Conflicts in index. Try without --index."
10706 msgstr "索引中有冲突。尝试不使用 --index。"
10708 #: git-stash.sh:458
10709 msgid "Could not save index tree"
10712 #: git-stash.sh:492
10713 msgid "Cannot unstage modified files"
10716 #: git-stash.sh:507
10717 msgid "Index was not unstashed."
10718 msgstr "索引的进度没有被恢复。"
10720 #: git-stash.sh:530
10722 msgid "Dropped ${REV} ($s)"
10723 msgstr "丢弃了 ${REV} ($s)"
10725 #: git-stash.sh:531
10727 msgid "${REV}: Could not drop stash entry"
10728 msgstr "${REV}:不能丢弃进度条目"
10730 #: git-stash.sh:539
10731 msgid "No branch name specified"
10734 #: git-stash.sh:611
10735 msgid "(To restore them type \"git stash apply\")"
10736 msgstr "(为恢复数据输入 \"git stash apply\")"
10738 #: git-submodule.sh:95
10740 msgid "cannot strip one component off url '$remoteurl'"
10741 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10743 #: git-submodule.sh:237
10745 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10746 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10748 #: git-submodule.sh:287
10750 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10751 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10753 #: git-submodule.sh:296
10755 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10756 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10758 #: git-submodule.sh:406
10759 msgid "Relative path can only be used from the toplevel of the working tree"
10760 msgstr "只能在工作区的顶级目录中使用相对路径"
10762 #: git-submodule.sh:416
10764 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10765 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10767 #: git-submodule.sh:433
10769 msgid "'$sm_path' already exists in the index"
10770 msgstr "'$sm_path' 已经存在于索引中"
10772 #: git-submodule.sh:437
10775 "The following path is ignored by one of your .gitignore files:\n"
10777 "Use -f if you really want to add it."
10779 "以下路径被您的一个 .gitignore 文件所忽略:\n"
10781 "如果您确实想添加它,使用 -f 参数。"
10783 #: git-submodule.sh:455
10785 msgid "Adding existing repo at '$sm_path' to the index"
10786 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10788 #: git-submodule.sh:457
10790 msgid "'$sm_path' already exists and is not a valid git repo"
10791 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10793 #: git-submodule.sh:465
10795 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10796 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10798 #: git-submodule.sh:467
10801 "If you want to reuse this local git directory instead of cloning again from"
10802 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10804 #: git-submodule.sh:469
10807 "use the '--force' option. If the local git directory is not the correct repo"
10808 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10810 #: git-submodule.sh:470
10813 "or you are unsure what this means choose another name with the '--name' "
10815 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10817 #: git-submodule.sh:472
10819 msgid "Reactivating local git directory for submodule '$sm_name'."
10820 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10822 #: git-submodule.sh:484
10824 msgid "Unable to checkout submodule '$sm_path'"
10825 msgstr "不能检出子模组 '$sm_path'"
10827 #: git-submodule.sh:489
10829 msgid "Failed to add submodule '$sm_path'"
10830 msgstr "无法添加子模组 '$sm_path'"
10832 #: git-submodule.sh:498
10834 msgid "Failed to register submodule '$sm_path'"
10835 msgstr "无法注册子模组 '$sm_path'"
10837 #: git-submodule.sh:542
10839 msgid "Entering '$prefix$displaypath'"
10840 msgstr "正在进入 '$prefix$displaypath'"
10842 #: git-submodule.sh:562
10844 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10845 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10847 #: git-submodule.sh:608
10849 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10850 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10852 #: git-submodule.sh:617
10854 msgid "Failed to register url for submodule path '$displaypath'"
10855 msgstr "无法为子模组路径 '$displaypath' 注册 url"
10857 #: git-submodule.sh:619
10859 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10860 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10862 #: git-submodule.sh:636
10864 msgid "Failed to register update mode for submodule path '$displaypath'"
10865 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10867 #: git-submodule.sh:674
10869 msgid "Use '.' if you really want to deinitialize all submodules"
10870 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10872 #: git-submodule.sh:691
10874 msgid "Submodule work tree '$displaypath' contains a .git directory"
10875 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10877 #: git-submodule.sh:692
10880 "(use 'rm -rf' if you really want to remove it including all of its history)"
10881 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10883 #: git-submodule.sh:698
10886 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10888 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10890 #: git-submodule.sh:701
10892 msgid "Cleared directory '$displaypath'"
10893 msgstr "已清除目录 '$displaypath'"
10895 #: git-submodule.sh:702
10897 msgid "Could not remove submodule work tree '$displaypath'"
10898 msgstr "无法移除子模组工作区 '$displaypath'"
10900 #: git-submodule.sh:705
10902 msgid "Could not create empty submodule directory '$displaypath'"
10903 msgstr "不能创建空的子模组目录 '$displaypath'"
10905 #: git-submodule.sh:714
10907 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10908 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10910 #: git-submodule.sh:830
10913 "Submodule path '$displaypath' not initialized\n"
10914 "Maybe you want to use 'update --init'?"
10916 "子模组路径 '$displaypath' 没有初始化\n"
10917 "也许您想用 'update --init'?"
10919 #: git-submodule.sh:843
10921 msgid "Unable to find current revision in submodule path '$displaypath'"
10922 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10924 #: git-submodule.sh:852
10926 msgid "Unable to fetch in submodule path '$sm_path'"
10927 msgstr "无法在子模组路径 '$sm_path' 中获取"
10929 #: git-submodule.sh:876
10931 msgid "Unable to fetch in submodule path '$displaypath'"
10932 msgstr "无法在子模组路径 '$displaypath' 中获取"
10934 #: git-submodule.sh:890
10936 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10937 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10939 #: git-submodule.sh:891
10941 msgid "Submodule path '$displaypath': checked out '$sha1'"
10942 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10944 #: git-submodule.sh:895
10946 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10947 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10949 #: git-submodule.sh:896
10951 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10952 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10954 #: git-submodule.sh:901
10956 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10957 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10959 #: git-submodule.sh:902
10961 msgid "Submodule path '$displaypath': merged in '$sha1'"
10962 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10964 #: git-submodule.sh:907
10967 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10968 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10970 #: git-submodule.sh:908
10972 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10973 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10975 #: git-submodule.sh:938
10977 msgid "Failed to recurse into submodule path '$displaypath'"
10978 msgstr "无法递归进子模组路径 '$displaypath'"
10980 #: git-submodule.sh:1046
10981 msgid "The --cached option cannot be used with the --files option"
10982 msgstr "选项 --cached 不能和选项 --files 同时使用"
10984 #: git-submodule.sh:1098
10986 msgid "unexpected mode $mod_dst"
10987 msgstr "意外的模式 $mod_dst"
10990 #: git-submodule.sh:1118
10992 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10993 msgstr " 警告:$display_name 未包含提交 $sha1_src"
10996 #: git-submodule.sh:1121
10998 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10999 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
11002 #: git-submodule.sh:1124
11004 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11005 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
11007 #: git-submodule.sh:1149
11011 #: git-submodule.sh:1267
11013 msgid "Failed to recurse into submodule path '$sm_path'"
11014 msgstr "无法递归进子模组路径 '$sm_path'"
11016 #: git-submodule.sh:1331
11018 msgid "Synchronizing submodule url for '$displaypath'"
11019 msgstr "为 '$displaypath' 同步子模组 url"