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: 2014-01-18 07:42+0800\n"
16 "PO-Revision-Date: 2014-01-18 10:54+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
31 #. * Message used both when 'git commit' fails and when
32 #. * other commands doing a merge do.
36 "Fix them up in the work tree,\n"
37 "and then use 'git add/rm <file>' as\n"
38 "appropriate to mark resolution and make a commit,\n"
39 "or use 'git commit -a'."
42 "'git add/rm <file>' 标记解决方案,\n"
43 "或使用 'git commit -a'。"
46 msgid "git archive [options] <tree-ish> [<path>...]"
47 msgstr "git archive [选项] <树或提交> [<路径>...]"
50 msgid "git archive --list"
51 msgstr "git archive --list"
55 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
57 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
60 msgid "git archive --remote <repo> [--exec <cmd>] --list"
61 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
63 #: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328
65 msgid "pathspec '%s' did not match any files"
66 msgstr "路径规则 '%s' 未匹配任何文件"
73 msgid "archive format"
76 #: archive.c:328 builtin/log.c:1193
81 msgid "prepend prefix to each pathname in the archive"
82 msgstr "为归档中每个路径名加上前缀"
84 #: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265
85 #: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680
86 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
87 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
88 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
92 #: archive.c:331 builtin/archive.c:89
93 msgid "write the archive to this file"
97 msgid "read .gitattributes in working directory"
98 msgstr "读取工作区中的 .gitattributes"
101 msgid "report archived files on stderr"
102 msgstr "在标准错误上报告归档文件"
109 msgid "compress faster"
113 msgid "compress better"
117 msgid "list supported archive formats"
120 #: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
124 #: archive.c:350 builtin/archive.c:91
125 msgid "retrieve the archive from remote repository <repo>"
126 msgstr "从远程版本库(<版本库>)提取归档文件"
128 #: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
132 #: archive.c:352 builtin/archive.c:93
133 msgid "path to the remote git-upload-archive command"
134 msgstr "远程 git-upload-archive 命令的路径"
138 "Negative patterns are ignored in git attributes\n"
139 "Use '\\!' for literal leading exclamation."
141 "负值模版在 git attributes 中被忽略\n"
142 "当字符串确实要以感叹号开始时,使用 '\\!'。"
146 msgid "Not setting branch %s as its own upstream."
147 msgstr "未设置分支 %s 作为它自己的上游。"
151 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
152 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
156 msgid "Branch %s set up to track remote branch %s from %s."
157 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
161 msgid "Branch %s set up to track local branch %s by rebasing."
162 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
166 msgid "Branch %s set up to track local branch %s."
167 msgstr "分支 %s 设置为跟踪本地分支 %s。"
171 msgid "Branch %s set up to track remote ref %s by rebasing."
172 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
176 msgid "Branch %s set up to track remote ref %s."
177 msgstr "分支 %s 设置为跟踪远程引用 %s。"
181 msgid "Branch %s set up to track local ref %s by rebasing."
182 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
186 msgid "Branch %s set up to track local ref %s."
187 msgstr "分支 %s 设置为跟踪本地引用 %s。"
191 msgid "Tracking not set up: name too long: %s"
192 msgstr "跟踪未设置:名字太长:%s"
196 msgid "Not tracking: ambiguous information for ref %s"
197 msgstr "未跟踪:引用 %s 有歧义"
201 msgid "'%s' is not a valid branch name."
202 msgstr "'%s' 不是一个有效的分支名称。"
206 msgid "A branch named '%s' already exists."
207 msgstr "一个分支名 '%s' 已经存在。"
210 msgid "Cannot force update the current branch."
215 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
216 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
220 msgid "the requested upstream branch '%s' does not exist"
221 msgstr "请求的上游分支 '%s' 不存在"
226 "If you are planning on basing your work on an upstream\n"
227 "branch that already exists at the remote, you may need to\n"
228 "run \"git fetch\" to retrieve it.\n"
230 "If you are planning to push out a new local branch that\n"
231 "will track its remote counterpart, you may want to use\n"
232 "\"git push -u\" to set the upstream config as you push."
235 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
236 "您可能需要执行 \"git fetch\" 来获取分支。\n"
238 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
239 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
243 msgid "Not a valid object name: '%s'."
244 msgstr "不是一个有效的对象名:'%s'。"
248 msgid "Ambiguous object name: '%s'."
249 msgstr "歧义的对象名:'%s'。"
253 msgid "Not a valid branch point: '%s'."
254 msgstr "无效的分支点:'%s'。"
257 msgid "Failed to lock ref for update"
261 msgid "Failed to write ref"
266 msgid "'%s' does not look like a v2 bundle file"
267 msgstr "'%s' 不像是一个 v2 版本的包文件"
271 msgid "unrecognized header: %s%s (%d)"
272 msgstr "未能识别的包头:%s%s (%d)"
274 #: bundle.c:90 builtin/commit.c:706
276 msgid "could not open '%s'"
280 msgid "Repository lacks these prerequisite commits:"
281 msgstr "版本库缺少这些必备的提交:"
283 #: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
284 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
285 #: builtin/shortlog.c:158
286 msgid "revision walk setup failed"
291 msgid "The bundle contains this ref:"
292 msgid_plural "The bundle contains these %d refs:"
293 msgstr[0] "这个包中含有这个引用:"
294 msgstr[1] "这个包中含有 %d 个引用:"
297 msgid "The bundle records a complete history."
298 msgstr "这个包记录一个完整历史。"
302 msgid "The bundle requires this ref:"
303 msgid_plural "The bundle requires these %d refs:"
304 msgstr[0] "这个包需要这个引用:"
305 msgstr[1] "这个包需要 %d 个引用:"
308 msgid "rev-list died"
311 #: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261
313 msgid "unrecognized argument: %s"
318 msgid "ref '%s' is excluded by the rev-list options"
319 msgstr "引用 '%s' 被 rev-list 选项排除"
322 msgid "Refusing to create empty bundle."
326 msgid "Could not spawn pack-objects"
327 msgstr "不能生成 pack-objects 进程"
330 msgid "pack-objects died"
331 msgstr "pack-objects 终止"
335 msgid "cannot create '%s'"
339 msgid "index-pack died"
340 msgstr "index-pack 终止"
344 msgid "could not parse %s"
349 msgid "%s %s is not a commit!"
350 msgstr "%s %s 不是一个提交!"
352 #: compat/obstack.c:406 compat/obstack.c:408
353 msgid "memory exhausted"
357 msgid "Could not run 'git rev-list'"
358 msgstr "不能执行 'git rev-list'"
362 msgid "failed write to rev-list: %s"
363 msgstr "无法写入 rev-list:%s"
367 msgid "failed to close rev-list's stdin: %s"
368 msgstr "无法关闭 rev-list 的标准输入:%s"
371 msgid "in the future"
376 msgid "%lu second ago"
377 msgid_plural "%lu seconds ago"
383 msgid "%lu minute ago"
384 msgid_plural "%lu minutes ago"
391 msgid_plural "%lu hours ago"
398 msgid_plural "%lu days ago"
405 msgid_plural "%lu weeks ago"
411 msgid "%lu month ago"
412 msgid_plural "%lu months ago"
419 msgid_plural "%lu years"
425 msgid "%s, %lu month ago"
426 msgid_plural "%s, %lu months ago"
427 msgstr[0] "%s,%lu 个月之前"
428 msgstr[1] "%s,%lu 个月之前"
430 #: date.c:154 date.c:159
433 msgid_plural "%lu years ago"
437 #: diffcore-order.c:24
439 msgid "failed to read orderfile '%s'"
440 msgstr "无法读取排序文件 '%s'"
445 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
446 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
451 msgid " Unknown dirstat parameter '%s'\n"
452 msgstr " 未知的 dirstat 参数 '%s'\n"
456 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
457 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
462 "Found errors in 'diff.dirstat' config variable:\n"
465 "发现配置变量 'diff.dirstat' 中的错误:\n"
471 "Failed to parse --dirstat/-X option parameter:\n"
474 "无法解析 --dirstat/-X 选项的参数:\n"
479 msgid "Failed to parse --submodule option parameter: '%s'"
480 msgstr "无法解析 --submodule 选项的参数:'%s'"
482 #: gpg-interface.c:59 gpg-interface.c:131
483 msgid "could not run gpg."
486 #: gpg-interface.c:71
487 msgid "gpg did not accept the data"
490 #: gpg-interface.c:82
491 msgid "gpg failed to sign the data"
494 #: gpg-interface.c:115
496 msgid "could not create temporary file '%s': %s"
497 msgstr "不能创建临时文件 '%s':%s"
499 #: gpg-interface.c:118
501 msgid "failed writing detached signature to '%s': %s"
502 msgstr "无法将分离式签名写入 '%s':%s"
506 msgid "'%s': unable to read %s"
507 msgstr "'%s':无法读取 %s"
516 msgid "'%s': short read %s"
517 msgstr "'%s':读取不完整 %s"
521 msgid "available git commands in '%s'"
522 msgstr "在 '%s' 下可用的 git 命令"
525 msgid "git commands available from elsewhere on your $PATH"
526 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
529 msgid "The most commonly used git commands are:"
530 msgstr "最常用的 git 命令有:"
535 "'%s' appears to be a git command, but we were not\n"
536 "able to execute it. Maybe git-%s is broken?"
538 "'%s' 像是一个 git 命令,但却无法运行。\n"
542 msgid "Uh oh. Your system reports no Git commands at all."
543 msgstr "唉呀,您的系统中未发现 Git 命令。"
548 "WARNING: You called a Git command named '%s', which does not exist.\n"
549 "Continuing under the assumption that you meant '%s'"
551 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
556 msgid "in %0.1f seconds automatically..."
557 msgstr "在 %0.1f 秒钟后自动运行..."
561 msgid "git: '%s' is not a git command. See 'git --help'."
562 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
564 #: help.c:385 help.c:444
570 "Did you mean one of these?"
584 msgid "failed to read the cache"
587 #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
588 #: builtin/clone.c:661
589 msgid "unable to write new index file"
592 #: merge-recursive.c:190
594 msgid "(bad commit)\n"
597 #: merge-recursive.c:206
599 msgid "addinfo_cache failed for path '%s'"
600 msgstr "为路径 '%s' addinfo_cache 失败"
602 #: merge-recursive.c:269
603 msgid "error building trees"
606 #: merge-recursive.c:673
608 msgid "failed to create path '%s'%s"
609 msgstr "无法创建路径 '%s'%s"
611 #: merge-recursive.c:684
613 msgid "Removing %s to make room for subdirectory\n"
614 msgstr "删除 %s 以便为子目录留出空间\n"
616 #. something else exists
617 #. .. but not some other error (who really cares what?)
618 #: merge-recursive.c:698 merge-recursive.c:719
619 msgid ": perhaps a D/F conflict?"
620 msgstr ":可能是一个目录/文件冲突?"
622 #: merge-recursive.c:709
624 msgid "refusing to lose untracked file at '%s'"
625 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
627 #: merge-recursive.c:749
629 msgid "cannot read object %s '%s'"
630 msgstr "不能读取对象 %s '%s'"
632 #: merge-recursive.c:751
634 msgid "blob expected for %s '%s'"
635 msgstr "%s '%s' 应为数据(blob)对象"
637 #: merge-recursive.c:774 builtin/clone.c:317
639 msgid "failed to open '%s'"
642 #: merge-recursive.c:782
644 msgid "failed to symlink '%s'"
645 msgstr "无法创建符号链接 '%s'"
647 #: merge-recursive.c:785
649 msgid "do not know what to do with %06o %s '%s'"
650 msgstr "不知道如何处理 %06o %s '%s'"
652 #: merge-recursive.c:923
653 msgid "Failed to execute internal merge"
656 #: merge-recursive.c:927
658 msgid "Unable to add %s to database"
659 msgstr "不能添加 %s 至对象库"
661 #: merge-recursive.c:943
662 msgid "unsupported object type in the tree"
663 msgstr "在树中有不支持的对象类型"
665 #: merge-recursive.c:1022 merge-recursive.c:1036
668 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
671 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
674 #: merge-recursive.c:1028 merge-recursive.c:1041
677 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
680 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
683 #: merge-recursive.c:1082
687 #: merge-recursive.c:1082 wt-status.c:283
691 #: merge-recursive.c:1138
693 msgid "%s is a directory in %s adding as %s instead"
694 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
696 #: merge-recursive.c:1160
699 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
700 "\"->\"%s\" in \"%s\"%s"
702 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
703 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
705 #: merge-recursive.c:1165
706 msgid " (left unresolved)"
709 #: merge-recursive.c:1219
711 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
713 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
716 #: merge-recursive.c:1249
718 msgid "Renaming %s to %s and %s to %s instead"
719 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
721 #: merge-recursive.c:1448
723 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
724 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
726 #: merge-recursive.c:1458
728 msgid "Adding merged %s"
731 #: merge-recursive.c:1463 merge-recursive.c:1661
733 msgid "Adding as %s instead"
736 #: merge-recursive.c:1514
738 msgid "cannot read object %s"
741 #: merge-recursive.c:1517
743 msgid "object %s is not a blob"
744 msgstr "对象 %s 不是一个数据(blob)对象"
746 #: merge-recursive.c:1565
750 #: merge-recursive.c:1565 wt-status.c:281
754 #: merge-recursive.c:1575
758 #: merge-recursive.c:1582
762 #: merge-recursive.c:1616
764 msgid "Skipped %s (merged same as existing)"
765 msgstr "略过 %s(已经做过相同合并)"
767 #: merge-recursive.c:1630
769 msgid "Auto-merging %s"
772 #: merge-recursive.c:1634 git-submodule.sh:1148
776 #: merge-recursive.c:1635
778 msgid "CONFLICT (%s): Merge conflict in %s"
779 msgstr "冲突(%s):合并冲突于 %s"
781 #: merge-recursive.c:1725
786 #: merge-recursive.c:1750
787 msgid "file/directory"
790 #: merge-recursive.c:1756
791 msgid "directory/file"
794 #: merge-recursive.c:1761
796 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
797 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
799 #: merge-recursive.c:1771
804 #: merge-recursive.c:1788
805 msgid "Fatal merge failure, shouldn't happen."
806 msgstr "严重的合并错误,不应发生。"
808 #: merge-recursive.c:1807
809 msgid "Already up-to-date!"
812 #: merge-recursive.c:1816
814 msgid "merging of trees %s and %s failed"
815 msgstr "无法合并树 %s 和 %s"
817 #: merge-recursive.c:1846
819 msgid "Unprocessed path??? %s"
820 msgstr "未处理的路径??? %s"
822 #: merge-recursive.c:1891
826 #: merge-recursive.c:1904
828 msgid "found %u common ancestor:"
829 msgid_plural "found %u common ancestors:"
830 msgstr[0] "发现 %u 个共同祖先:"
831 msgstr[1] "发现 %u 个共同祖先:"
833 #: merge-recursive.c:1941
834 msgid "merge returned no commit"
837 #: merge-recursive.c:1998
839 msgid "Could not parse object '%s'"
842 #: merge-recursive.c:2010 builtin/merge.c:665
843 msgid "Unable to write index."
847 msgid "Cannot commit uninitialized/unreferenced notes tree"
848 msgstr "不能提交未初始化/未引用的注解树"
852 msgid "Bad notes.rewriteMode value: '%s'"
853 msgstr "坏的 notes.rewriteMode 值:'%s'"
857 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
858 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
860 #. TRANSLATORS: The first %s is the name of the
861 #. environment variable, the second %s is its value
864 msgid "Bad %s value: '%s'"
865 msgstr "坏的 %s 值:'%s'"
869 msgid "unable to parse object: %s"
872 #: parse-options.c:537
876 #: parse-options.c:555
881 #. TRANSLATORS: the colon here should align with the
882 #. one in "usage: %s" translation
883 #: parse-options.c:559
888 # 译者:为保证在输出中对齐,注意调整句中空格!
889 #: parse-options.c:562
894 #: parse-options.c:596
899 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
900 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
904 "global 'literal' pathspec setting is incompatible with all other global "
906 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
909 msgid "invalid parameter for pathspec magic 'prefix'"
910 msgstr "路径规则包含无效的神奇前缀"
914 msgid "Invalid pathspec magic '%.*s' in '%s'"
915 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
919 msgid "Missing ')' at the end of pathspec magic in '%s'"
920 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
924 msgid "Unimplemented pathspec magic '%c' in '%s'"
925 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
929 msgid "%s: 'literal' and 'glob' are incompatible"
930 msgstr "%s:'literal' 和 'glob' 不兼容"
934 msgid "%s: '%s' is outside repository"
935 msgstr "%s:'%s' 在版本库之外"
939 msgid "Pathspec '%s' is in submodule '%.*s'"
940 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
943 #. * We may want to substitute "this command" with a command
944 #. * name. E.g. when add--interactive dies when running
949 msgid "%s: pathspec magic not supported by this command: %s"
950 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
954 msgid "pathspec '%s' is beyond a symbolic link"
955 msgstr "路径规则 '%s' 位于符号链接中"
959 "There is nothing to exclude from by :(exclude) patterns.\n"
960 "Perhaps you forgot to add either ':/' or '.' ?"
962 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
967 msgid "Cannot fetch both %s and %s to %s"
968 msgstr "不能同时获取 %s 和 %s 至 %s"
972 msgid "%s usually tracks %s, not %s"
973 msgstr "%s 通常跟踪 %s,而非 %s"
977 msgid "%s tracks both %s and %s"
978 msgstr "%s 同时跟踪 %s 和 %s"
981 #. * This last possibility doesn't occur because
982 #. * FETCH_HEAD_IGNORE entries always appear at
983 #. * the end of the list.
986 msgid "Internal error"
991 msgid "Your branch is based on '%s', but the upstream is gone.\n"
992 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
995 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
996 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1000 msgid "Your branch is up-to-date with '%s'.\n"
1001 msgstr "您的分支与上游分支 '%s' 一致。\n"
1005 msgid "Your branch is ahead of '%s' by %d commit.\n"
1006 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1007 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1008 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1011 msgid " (use \"git push\" to publish your local commits)\n"
1012 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1016 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1018 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1019 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1020 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1024 msgid " (use \"git pull\" to update your local branch)\n"
1025 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1030 "Your branch and '%s' have diverged,\n"
1031 "and have %d and %d different commit each, respectively.\n"
1033 "Your branch and '%s' have diverged,\n"
1034 "and have %d and %d different commits each, respectively.\n"
1036 "您的分支和 '%s' 出现了偏离,\n"
1037 "并且分别有 %d 和 %d 处不同的提交。\n"
1039 "您的分支和 '%s' 出现了偏离,\n"
1040 "并且分别有 %d 和 %d 处不同的提交。\n"
1044 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1045 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1048 msgid "open /dev/null failed"
1049 msgstr "不能打开 /dev/null"
1053 msgid "dup2(%d,%d) failed"
1054 msgstr "不能调用 dup2(%d,%d)"
1056 #: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896
1057 #: builtin/merge.c:1006 builtin/merge.c:1016
1059 msgid "Could not open '%s' for writing"
1060 msgstr "不能为写入打开 '%s'"
1062 #: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786
1063 #: builtin/merge.c:1008 builtin/merge.c:1021
1065 msgid "Could not write to '%s'"
1070 "after resolving the conflicts, mark the corrected paths\n"
1071 "with 'git add <paths>' or 'git rm <paths>'"
1073 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1078 "after resolving the conflicts, mark the corrected paths\n"
1079 "with 'git add <paths>' or 'git rm <paths>'\n"
1080 "and commit the result with 'git commit'"
1082 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1083 "对修正后的文件做标记,然后用 'git commit' 提交"
1085 #: sequencer.c:245 sequencer.c:870 sequencer.c:953
1087 msgid "Could not write to %s"
1092 msgid "Error wrapping up %s"
1096 msgid "Your local changes would be overwritten by cherry-pick."
1097 msgstr "您的本地修改将被拣选操作覆盖。"
1100 msgid "Your local changes would be overwritten by revert."
1101 msgstr "您的本地修改将被还原操作覆盖。"
1104 msgid "Commit your changes or stash them to proceed."
1105 msgstr "提交您的修改或保存进度后再继续。"
1107 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1110 msgid "%s: Unable to write new index file"
1111 msgstr "%s:无法写入新索引文件"
1114 msgid "Could not resolve HEAD commit\n"
1115 msgstr "不能解析 HEAD 提交\n"
1118 msgid "Unable to update cache tree\n"
1123 msgid "Could not parse commit %s\n"
1124 msgstr "不能解析提交 %s\n"
1128 msgid "Could not parse parent commit %s\n"
1129 msgstr "不能解析父提交 %s\n"
1132 msgid "Your index file is unmerged."
1133 msgstr "您的索引文件未完成合并。"
1137 msgid "Commit %s is a merge but no -m option was given."
1138 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1142 msgid "Commit %s does not have parent %d"
1143 msgstr "提交 %s 没有父提交 %d"
1147 msgid "Mainline was specified but commit %s is not a merge."
1148 msgstr "指定了主线但提交 %s 不是一个合并。"
1150 #. TRANSLATORS: The first %s will be "revert" or
1151 #. "cherry-pick", the second %s a SHA1
1154 msgid "%s: cannot parse parent commit %s"
1155 msgstr "%s:不能解析父提交 %s"
1159 msgid "Cannot get commit message for %s"
1160 msgstr "不能得到 %s 的提交说明"
1164 msgid "could not revert %s... %s"
1165 msgstr "不能还原 %s... %s"
1169 msgid "could not apply %s... %s"
1170 msgstr "不能应用 %s... %s"
1173 msgid "empty commit set passed"
1178 msgid "git %s: failed to read the index"
1179 msgstr "git %s:无法读取索引"
1183 msgid "git %s: failed to refresh the index"
1184 msgstr "git %s:无法刷新索引"
1188 msgid "Cannot %s during a %s"
1189 msgstr "无法 %s 在一个 %s 过程中"
1193 msgid "Could not parse line %d."
1194 msgstr "不能解析第 %d 行。"
1197 msgid "No commits parsed."
1202 msgid "Could not open %s"
1207 msgid "Could not read %s."
1212 msgid "Unusable instruction sheet: %s"
1217 msgid "Invalid key: %s"
1222 msgid "Invalid value for %s: %s"
1227 msgid "Malformed options sheet: %s"
1231 msgid "a cherry-pick or revert is already in progress"
1232 msgstr "一个拣选或还原操作已在进行"
1235 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1236 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1240 msgid "Could not create sequencer directory %s"
1241 msgstr "不能创建序列目录 %s"
1243 #: sequencer.c:872 sequencer.c:957
1245 msgid "Error wrapping up %s."
1248 #: sequencer.c:891 sequencer.c:1025
1249 msgid "no cherry-pick or revert in progress"
1250 msgstr "拣选或还原操作并未进行"
1253 msgid "cannot resolve HEAD"
1257 msgid "cannot abort from a branch yet to be born"
1258 msgstr "不能从尚未建立的分支终止"
1260 #: sequencer.c:917 builtin/apply.c:4061
1262 msgid "cannot open %s: %s"
1267 msgid "cannot read %s: %s"
1271 msgid "unexpected end of file"
1276 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1277 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1281 msgid "Could not format %s."
1286 msgid "%s: can't cherry-pick a %s"
1287 msgstr "%s:不能拣选一个%s"
1291 msgid "%s: bad revision"
1295 msgid "Can't revert as initial commit"
1299 msgid "Can't cherry-pick into empty head"
1304 "Git normally never creates a ref that ends with 40 hex characters\n"
1305 "because it will be ignored when you just specify 40-hex. These refs\n"
1306 "may be created by mistake. For example,\n"
1308 " git checkout -b $br $(git rev-parse ...)\n"
1310 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1311 "examine these refs and maybe delete them. Turn this message off by\n"
1312 "running \"git config advice.objectNameWarning false\""
1314 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1315 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1317 " git checkout -b $br $(git rev-parse ...)\n"
1319 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1320 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1324 msgid "HEAD does not point to a branch"
1325 msgstr "HEAD 没有指向一个分支"
1329 msgid "No such branch: '%s'"
1334 msgid "No upstream configured for branch '%s'"
1335 msgstr "尚未给分支 '%s' 设置上游"
1339 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1340 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1342 #: submodule.c:64 submodule.c:98
1343 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1344 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1346 #: submodule.c:68 submodule.c:102
1348 msgid "Could not find section in .gitmodules where path=%s"
1349 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1351 #. Maybe the user already did that, don't error out here
1354 msgid "Could not update .gitmodules entry %s"
1355 msgstr "不能更新 .gitmodules 条目 %s"
1357 #. Maybe the user already did that, don't error out here
1360 msgid "Could not remove .gitmodules entry for %s"
1361 msgstr "无法移除 %s 的 .gitmodules 条目"
1364 msgid "could not find .gitmodules in index"
1365 msgstr "无法在索引中找到 .gitmodules"
1368 msgid "reading updated .gitmodules failed"
1369 msgstr "读取更新后的 .gitmodules 失败"
1372 msgid "unable to stat updated .gitmodules"
1373 msgstr "不能枚举更新后的 .gitmodules"
1376 msgid "unable to remove .gitmodules from index"
1377 msgstr "不能从索引中移除 .gitmodules"
1380 msgid "adding updated .gitmodules failed"
1381 msgstr "添加更新后的 .gitmodules 失败"
1384 msgid "staging updated .gitmodules failed"
1385 msgstr "将更新后 .gitmodules 添加暂存区失败"
1387 #: submodule.c:1144 builtin/init-db.c:363
1389 msgid "Could not create git link %s"
1390 msgstr "不能创建 git link %s"
1394 msgid "Could not set core.worktree in %s"
1395 msgstr "不能在 %s 中设置 core.worktree"
1398 msgid "invalid URL scheme name or missing '://' suffix"
1399 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1401 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1403 msgid "invalid %XX escape sequence"
1404 msgstr "无效的 %XX 转义序列"
1407 msgid "missing host and scheme is not 'file:'"
1408 msgstr "缺失主机名且URL方案不是 'file:'"
1411 msgid "a 'file:' URL may not have a port number"
1412 msgstr "一个 'file:' URL 不应该包含端口号"
1415 msgid "invalid characters in host name"
1416 msgstr "主机名中包含无效的字符"
1418 #: urlmatch.c:244 urlmatch.c:255
1419 msgid "invalid port number"
1423 msgid "invalid '..' path segment"
1424 msgstr "无效的 '..' 路径片段"
1428 msgid "unable to access '%s': %s"
1429 msgstr "不能访问 '%s':%s"
1433 msgid "unable to access '%s'"
1438 msgid "unable to look up current user in the passwd file: %s"
1439 msgstr "无法在口令文件中查询到当前用户:%s"
1442 msgid "no such user"
1446 msgid "Unmerged paths:"
1450 #: wt-status.c:177 wt-status.c:204
1452 msgid " (use \"git reset %s <file>...\" to unstage)"
1453 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1456 #: wt-status.c:179 wt-status.c:206
1457 msgid " (use \"git rm --cached <file>...\" to unstage)"
1458 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1462 msgid " (use \"git add <file>...\" to mark resolution)"
1463 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1466 #: wt-status.c:185 wt-status.c:189
1467 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1468 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1472 msgid " (use \"git rm <file>...\" to mark resolution)"
1473 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1476 msgid "Changes to be committed:"
1480 msgid "Changes not staged for commit:"
1481 msgstr "尚未暂存以备提交的变更:"
1485 msgid " (use \"git add <file>...\" to update what will be committed)"
1486 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1490 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1491 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1496 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1497 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1501 msgid " (commit or discard the untracked or modified content in submodules)"
1502 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1507 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1508 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1515 msgid "both deleted:"
1519 msgid "added by us:"
1523 msgid "deleted by them:"
1527 msgid "added by them:"
1531 msgid "deleted by us:"
1539 msgid "both modified:"
1542 # 译者:为保证在输出中对齐,注意调整句中空格!
1555 # 译者:为保证在输出中对齐,注意调整句中空格!
1560 # 译者:为保证在输出中对齐,注意调整句中空格!
1569 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1571 msgid "new commits, "
1574 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1576 msgid "modified content, "
1579 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1581 msgid "untracked content, "
1586 msgid "bug: unhandled diff status %c"
1587 msgstr "bug:未处理的差异状态 %c"
1590 msgid "Submodules changed but not updated:"
1591 msgstr "子模组已修改但尚未更新:"
1594 msgid "Submodule changes to be committed:"
1599 "Do not touch the line above.\n"
1600 "Everything below will be removed."
1606 msgid "You have unmerged paths."
1611 msgid " (fix conflicts and run \"git commit\")"
1612 msgstr " (解决冲突并运行 \"git commit\")"
1615 msgid "All conflicts fixed but you are still merging."
1616 msgstr "所有冲突已解决但您仍处于合并中。"
1620 msgid " (use \"git commit\" to conclude merge)"
1621 msgstr " (使用 \"git commit\" 结束合并)"
1624 msgid "You are in the middle of an am session."
1625 msgstr "您正处于一个 am 过程中。"
1628 msgid "The current patch is empty."
1633 msgid " (fix conflicts and then run \"git am --continue\")"
1634 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1638 msgid " (use \"git am --skip\" to skip this patch)"
1639 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1643 msgid " (use \"git am --abort\" to restore the original branch)"
1644 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1646 #: wt-status.c:989 wt-status.c:1006
1648 msgid "You are currently rebasing branch '%s' on '%s'."
1649 msgstr "您正在将分支 '%s' 变基到 '%s'。"
1651 #: wt-status.c:994 wt-status.c:1011
1652 msgid "You are currently rebasing."
1657 msgid " (fix conflicts and then run \"git rebase --continue\")"
1658 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1662 msgid " (use \"git rebase --skip\" to skip this patch)"
1663 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1667 msgid " (use \"git rebase --abort\" to check out the original branch)"
1668 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1672 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1673 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1678 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1679 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1682 msgid "You are currently splitting a commit during a rebase."
1683 msgstr "您正在变基过程中拆分一个提交。"
1687 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1688 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1692 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1693 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1696 msgid "You are currently editing a commit during a rebase."
1697 msgstr "您正在变基过程中编辑一个提交。"
1701 msgid " (use \"git commit --amend\" to amend the current commit)"
1702 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1707 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1708 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1712 msgid "You are currently cherry-picking commit %s."
1713 msgstr "您正在做拣选提交 %s。"
1717 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1718 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1722 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1723 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1727 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1728 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1732 msgid "You are currently reverting commit %s."
1733 msgstr "您正在反转提交 %s 。"
1737 msgid " (fix conflicts and run \"git revert --continue\")"
1738 msgstr " (解决冲突并运行 \"git revert --continue\")"
1742 msgid " (all conflicts fixed: run \"git revert --continue\")"
1743 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1747 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1748 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1752 msgid "You are currently bisecting, started from branch '%s'."
1753 msgstr "您正在从分支 '%s' 开始做二分查找。"
1756 msgid "You are currently bisecting."
1761 msgid " (use \"git bisect reset\" to get back to the original branch)"
1762 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1769 msgid "rebase in progress; onto "
1773 msgid "HEAD detached at "
1777 msgid "HEAD detached from "
1781 msgid "Not currently on any branch."
1785 msgid "Initial commit"
1789 msgid "Untracked files"
1793 msgid "Ignored files"
1799 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1800 "may speed it up, but you have to be careful not to forget to add\n"
1801 "new files yourself (see 'git help status')."
1803 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1804 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1808 msgid "Untracked files not listed%s"
1809 msgstr "未跟踪的文件没有列出%s"
1811 # 译者:中文字符串拼接,可删除前导空格
1813 msgid " (use -u option to show untracked files)"
1814 msgstr "(使用 -u 参数显示未跟踪的文件)"
1822 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1823 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1827 msgid "no changes added to commit\n"
1833 "nothing added to commit but untracked files present (use \"git add\" to "
1835 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1839 msgid "nothing added to commit but untracked files present\n"
1840 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1842 # 译者:中文字符串拼接,可删除前导空格
1845 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1846 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1848 #: wt-status.c:1362 wt-status.c:1367
1850 msgid "nothing to commit\n"
1853 # 译者:中文字符串拼接,可删除前导空格
1856 msgid "nothing to commit (use -u to show untracked files)\n"
1857 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1859 # 译者:中文字符串拼接,可删除前导空格
1862 msgid "nothing to commit, working directory clean\n"
1863 msgstr "无文件要提交,干净的工作区\n"
1866 msgid "HEAD (no branch)"
1871 msgid "Initial commit on "
1884 #: wt-status.c:1519 wt-status.c:1522
1893 #: compat/precompose_utf8.c:55 builtin/clone.c:356
1895 msgid "failed to unlink '%s'"
1899 msgid "git add [options] [--] <pathspec>..."
1900 msgstr "git add [选项] [--] <路径规则>..."
1902 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1904 #. * To be consistent with "git add -p" and most Git
1905 #. * commands, we should default to being tree-wide, but
1906 #. * this is not the original behavior and can't be
1907 #. * changed until users trained themselves not to type
1908 #. * "git add -u" or "git add -A". For now, we warn and
1909 #. * keep the old behavior. Later, the behavior can be changed
1910 #. * to tree-wide, keeping the warning for a while, and
1911 #. * eventually we can drop the warning.
1916 "The behavior of 'git add %s (or %s)' with no path argument from a\n"
1917 "subdirectory of the tree will change in Git 2.0 and should not be used "
1919 "To add content for the whole tree, run:\n"
1922 " (or git add %s :/)\n"
1924 "To restrict the command to the current directory, run:\n"
1927 " (or git add %s .)\n"
1929 "With the current Git version, the command is restricted to the current "
1932 "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
1933 "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
1934 "如果要添加整个目录树的内容,执行:\n"
1937 " (或 git add %s :/)\n"
1939 "如果要限制该命令只作用于当前目录,执行:\n"
1942 " (或 git add %s .)\n"
1944 "对于当前版本的 Git,这条命令只作用于当前目录。\n"
1946 #: builtin/add.c:100
1949 "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1950 "whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1951 "Paths like '%s' that are\n"
1952 "removed from your working tree are ignored with this version of Git.\n"
1954 "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1955 " ignores paths you removed from your working tree.\n"
1957 "* 'git add --all <pathspec>' will let you also record the removals.\n"
1959 "Run 'git status' to check the paths you removed from your working tree.\n"
1961 "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
1962 "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
1963 "像本地工作区移除的路径 '%s'\n"
1966 "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
1967 " 忽略您本地工作区中移除的文件。\n"
1969 "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
1971 "运行 'git status' 来检查您本地工作区中移除的路径。\n"
1973 #: builtin/add.c:144
1975 msgid "unexpected diff status %c"
1978 #: builtin/add.c:149 builtin/commit.c:260
1979 msgid "updating files failed"
1982 #: builtin/add.c:163
1984 msgid "remove '%s'\n"
1987 #: builtin/add.c:237
1988 msgid "Unstaged changes after refreshing the index:"
1989 msgstr "刷新索引之后尚未被暂存的变更:"
1991 #: builtin/add.c:299
1992 msgid "Could not read the index"
1995 #: builtin/add.c:310
1997 msgid "Could not open '%s' for writing."
1998 msgstr "不能打开 '%s' 以写入。"
2000 #: builtin/add.c:314
2001 msgid "Could not write patch"
2004 #: builtin/add.c:319
2006 msgid "Could not stat '%s'"
2007 msgstr "不能查看文件状态 '%s'"
2009 #: builtin/add.c:321
2010 msgid "Empty patch. Aborted."
2013 #: builtin/add.c:327
2015 msgid "Could not apply '%s'"
2018 #: builtin/add.c:337
2019 msgid "The following paths are ignored by one of your .gitignore files:\n"
2020 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2022 #: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70
2023 #: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344
2028 #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
2029 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
2030 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
2034 #: builtin/add.c:357
2035 msgid "interactive picking"
2038 #: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
2039 msgid "select hunks interactively"
2042 #: builtin/add.c:359
2043 msgid "edit current diff and apply"
2046 #: builtin/add.c:360
2047 msgid "allow adding otherwise ignored files"
2050 #: builtin/add.c:361
2051 msgid "update tracked files"
2054 #: builtin/add.c:362
2055 msgid "record only the fact that the path will be added later"
2056 msgstr "只记录,该路径稍后再添加"
2058 #: builtin/add.c:363
2059 msgid "add changes from all tracked and untracked files"
2060 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2062 #. takes no arguments
2063 #: builtin/add.c:366
2064 msgid "ignore paths removed in the working tree (same as --no-all)"
2065 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2067 #: builtin/add.c:368
2068 msgid "don't add, only refresh the index"
2071 #: builtin/add.c:369
2072 msgid "just skip files which cannot be added because of errors"
2073 msgstr "跳过因出错不能添加的文件"
2075 #: builtin/add.c:370
2076 msgid "check if - even missing - files are ignored in dry run"
2077 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2079 #: builtin/add.c:392
2081 msgid "Use -f if you really want to add them.\n"
2082 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2084 #: builtin/add.c:393
2085 msgid "no files added"
2088 #: builtin/add.c:399
2089 msgid "adding files failed"
2092 #: builtin/add.c:438
2093 msgid "-A and -u are mutually incompatible"
2094 msgstr "-A 和 -u 选项互斥"
2096 #: builtin/add.c:456
2097 msgid "Option --ignore-missing can only be used together with --dry-run"
2098 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2100 #: builtin/add.c:486
2102 msgid "Nothing specified, nothing added.\n"
2103 msgstr "没有指定文件,也没有文件被添加。\n"
2105 #: builtin/add.c:487
2107 msgid "Maybe you wanted to say 'git add .'?\n"
2108 msgstr "也许您想要执行 'git add .'?\n"
2110 #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
2111 #: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299
2112 msgid "index file corrupt"
2115 #: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432
2116 msgid "Unable to write new index file"
2119 #: builtin/apply.c:57
2120 msgid "git apply [options] [<patch>...]"
2121 msgstr "git apply [选项] [<补丁>...]"
2123 #: builtin/apply.c:110
2125 msgid "unrecognized whitespace option '%s'"
2126 msgstr "未能识别的空白字符选项 '%s'"
2128 #: builtin/apply.c:125
2130 msgid "unrecognized whitespace ignore option '%s'"
2131 msgstr "未能识别的空白字符忽略选项 '%s'"
2133 #: builtin/apply.c:823
2135 msgid "Cannot prepare timestamp regexp %s"
2136 msgstr "无法准备时间戳正则表达式 %s"
2138 #: builtin/apply.c:832
2140 msgid "regexec returned %d for input: %s"
2141 msgstr "regexec 返回 %d,输入为:%s"
2143 #: builtin/apply.c:913
2145 msgid "unable to find filename in patch at line %d"
2146 msgstr "不能在补丁的第 %d 行找到文件名"
2148 #: builtin/apply.c:945
2150 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2151 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2153 #: builtin/apply.c:949
2155 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2156 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2158 #: builtin/apply.c:950
2160 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2161 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2163 #: builtin/apply.c:957
2165 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2166 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2168 #: builtin/apply.c:1422
2170 msgid "recount: unexpected line: %.*s"
2171 msgstr "recount:意外的行:%.*s"
2173 #: builtin/apply.c:1479
2175 msgid "patch fragment without header at line %d: %.*s"
2176 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2178 #: builtin/apply.c:1496
2181 "git diff header lacks filename information when removing %d leading pathname "
2182 "component (line %d)"
2184 "git diff header lacks filename information when removing %d leading pathname "
2185 "components (line %d)"
2186 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2187 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2189 #: builtin/apply.c:1656
2190 msgid "new file depends on old contents"
2193 #: builtin/apply.c:1658
2194 msgid "deleted file still has contents"
2197 #: builtin/apply.c:1684
2199 msgid "corrupt patch at line %d"
2200 msgstr "补丁在第 %d 行损坏"
2202 #: builtin/apply.c:1720
2204 msgid "new file %s depends on old contents"
2205 msgstr "新文件 %s 依赖旧内容"
2207 #: builtin/apply.c:1722
2209 msgid "deleted file %s still has contents"
2210 msgstr "删除的文件 %s 仍有内容"
2212 #: builtin/apply.c:1725
2214 msgid "** warning: file %s becomes empty but is not deleted"
2215 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2217 #: builtin/apply.c:1871
2219 msgid "corrupt binary patch at line %d: %.*s"
2220 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2222 #. there has to be one hunk (forward hunk)
2223 #: builtin/apply.c:1900
2225 msgid "unrecognized binary patch at line %d"
2226 msgstr "未能识别的二进制补丁位于第 %d 行"
2228 #: builtin/apply.c:1986
2230 msgid "patch with only garbage at line %d"
2231 msgstr "补丁文件的第 %d 行只有垃圾数据"
2233 #: builtin/apply.c:2076
2235 msgid "unable to read symlink %s"
2236 msgstr "无法读取符号链接 %s"
2238 #: builtin/apply.c:2080
2240 msgid "unable to open or read %s"
2243 #: builtin/apply.c:2688
2245 msgid "invalid start of line: '%c'"
2246 msgstr "无效的行首字符:'%c'"
2248 #: builtin/apply.c:2806
2250 msgid "Hunk #%d succeeded at %d (offset %d line)."
2251 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2252 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2253 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2255 #: builtin/apply.c:2818
2257 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2258 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2260 #: builtin/apply.c:2824
2263 "while searching for:\n"
2269 #: builtin/apply.c:2843
2271 msgid "missing binary patch data for '%s'"
2272 msgstr "缺失 '%s' 的二进制补丁数据"
2274 #: builtin/apply.c:2946
2276 msgid "binary patch does not apply to '%s'"
2277 msgstr "二进制补丁未应用到 '%s'"
2279 #: builtin/apply.c:2952
2281 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2282 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2284 #: builtin/apply.c:2973
2286 msgid "patch failed: %s:%ld"
2287 msgstr "打补丁失败:%s:%ld"
2289 #: builtin/apply.c:3095
2291 msgid "cannot checkout %s"
2294 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2296 msgid "read of %s failed"
2299 #: builtin/apply.c:3174 builtin/apply.c:3396
2301 msgid "path %s has been renamed/deleted"
2302 msgstr "路径 %s 已经被重命名/删除"
2304 #: builtin/apply.c:3255 builtin/apply.c:3410
2306 msgid "%s: does not exist in index"
2309 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2314 #: builtin/apply.c:3264 builtin/apply.c:3418
2316 msgid "%s: does not match index"
2319 #: builtin/apply.c:3366
2320 msgid "removal patch leaves file contents"
2321 msgstr "移除补丁仍留下了文件内容"
2323 #: builtin/apply.c:3435
2325 msgid "%s: wrong type"
2328 #: builtin/apply.c:3437
2330 msgid "%s has type %o, expected %o"
2331 msgstr "%s 的类型是 %o,应为 %o"
2333 #: builtin/apply.c:3538
2335 msgid "%s: already exists in index"
2336 msgstr "%s:已经存在于索引中"
2338 #: builtin/apply.c:3541
2340 msgid "%s: already exists in working directory"
2341 msgstr "%s:已经存在于工作区中"
2343 #: builtin/apply.c:3561
2345 msgid "new mode (%o) of %s does not match old mode (%o)"
2346 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2348 #: builtin/apply.c:3566
2350 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2351 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2353 #: builtin/apply.c:3574
2355 msgid "%s: patch does not apply"
2358 #: builtin/apply.c:3587
2360 msgid "Checking patch %s..."
2363 #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
2365 msgid "make_cache_entry failed for path '%s'"
2366 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2368 #: builtin/apply.c:3823
2370 msgid "unable to remove %s from index"
2371 msgstr "不能从索引中移除 %s"
2373 #: builtin/apply.c:3851
2375 msgid "corrupt patch for submodule %s"
2376 msgstr "子模组 %s 损坏的补丁"
2378 #: builtin/apply.c:3855
2380 msgid "unable to stat newly created file '%s'"
2381 msgstr "不能枚举新建文件 '%s' 的状态"
2383 #: builtin/apply.c:3860
2385 msgid "unable to create backing store for newly created file %s"
2386 msgstr "不能为新建文件 %s 创建后端存储"
2388 #: builtin/apply.c:3863 builtin/apply.c:3971
2390 msgid "unable to add cache entry for %s"
2391 msgstr "无法为 %s 添加缓存条目"
2393 #: builtin/apply.c:3896
2395 msgid "closing file '%s'"
2398 #: builtin/apply.c:3945
2400 msgid "unable to write file '%s' mode %o"
2401 msgstr "不能写文件 '%s' 权限 %o"
2403 #: builtin/apply.c:4032
2405 msgid "Applied patch %s cleanly."
2408 #: builtin/apply.c:4040
2409 msgid "internal error"
2412 #. Say this even without --verbose
2413 #: builtin/apply.c:4043
2415 msgid "Applying patch %%s with %d reject..."
2416 msgid_plural "Applying patch %%s with %d rejects..."
2417 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2418 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2420 #: builtin/apply.c:4053
2422 msgid "truncating .rej filename to %.*s.rej"
2423 msgstr "截短 .rej 文件名为 %.*s.rej"
2425 #: builtin/apply.c:4074
2427 msgid "Hunk #%d applied cleanly."
2428 msgstr "第 #%d 个片段成功应用。"
2430 #: builtin/apply.c:4077
2432 msgid "Rejected hunk #%d."
2433 msgstr "拒绝第 #%d 个片段。"
2435 #: builtin/apply.c:4227
2436 msgid "unrecognized input"
2439 #: builtin/apply.c:4238
2440 msgid "unable to read index file"
2443 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2444 #: builtin/fetch.c:78
2448 #: builtin/apply.c:4358
2449 msgid "don't apply changes matching the given path"
2450 msgstr "不要应用与给出路径向匹配的变更"
2452 #: builtin/apply.c:4361
2453 msgid "apply changes matching the given path"
2454 msgstr "应用与给出路径向匹配的变更"
2456 #: builtin/apply.c:4363
2460 #: builtin/apply.c:4364
2461 msgid "remove <num> leading slashes from traditional diff paths"
2462 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2464 #: builtin/apply.c:4367
2465 msgid "ignore additions made by the patch"
2466 msgstr "忽略补丁中的添加的文件"
2468 #: builtin/apply.c:4369
2469 msgid "instead of applying the patch, output diffstat for the input"
2470 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2472 #: builtin/apply.c:4373
2473 msgid "show number of added and deleted lines in decimal notation"
2474 msgstr "以十进制数显示添加和删除的行数"
2476 #: builtin/apply.c:4375
2477 msgid "instead of applying the patch, output a summary for the input"
2478 msgstr "不应用补丁,而是显示输入的概要"
2480 #: builtin/apply.c:4377
2481 msgid "instead of applying the patch, see if the patch is applicable"
2482 msgstr "不应用补丁,而是查看补丁是否可应用"
2484 #: builtin/apply.c:4379
2485 msgid "make sure the patch is applicable to the current index"
2486 msgstr "确认补丁可以应用到当前索引"
2488 #: builtin/apply.c:4381
2489 msgid "apply a patch without touching the working tree"
2490 msgstr "应用补丁而不修改工作区"
2492 #: builtin/apply.c:4383
2493 msgid "also apply the patch (use with --stat/--summary/--check)"
2494 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2496 #: builtin/apply.c:4385
2497 msgid "attempt three-way merge if a patch does not apply"
2498 msgstr "如果一个补丁不能应用则尝试三路合并"
2500 #: builtin/apply.c:4387
2501 msgid "build a temporary index based on embedded index information"
2502 msgstr "创建一个临时索引基于嵌入的索引信息"
2504 #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
2505 msgid "paths are separated with NUL character"
2506 msgstr "路径以 NUL 字符分隔"
2508 #: builtin/apply.c:4392
2509 msgid "ensure at least <n> lines of context match"
2510 msgstr "确保至少匹配 <n> 行上下文"
2512 #: builtin/apply.c:4393
2516 #: builtin/apply.c:4394
2517 msgid "detect new or modified lines that have whitespace errors"
2518 msgstr "检查新增和修改的行中间的空白字符滥用"
2520 #: builtin/apply.c:4397 builtin/apply.c:4400
2521 msgid "ignore changes in whitespace when finding context"
2522 msgstr "查找上下文时忽略空白字符的变更"
2524 #: builtin/apply.c:4403
2525 msgid "apply the patch in reverse"
2528 #: builtin/apply.c:4405
2529 msgid "don't expect at least one line of context"
2532 #: builtin/apply.c:4407
2533 msgid "leave the rejected hunks in corresponding *.rej files"
2534 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2536 #: builtin/apply.c:4409
2537 msgid "allow overlapping hunks"
2540 #: builtin/apply.c:4412
2541 msgid "tolerate incorrectly detected missing new-line at the end of file"
2542 msgstr "允许不正确的文件末尾换行符"
2544 #: builtin/apply.c:4415
2545 msgid "do not trust the line counts in the hunk headers"
2546 msgstr "不信任补丁片段的头信息中的行号"
2548 #: builtin/apply.c:4417
2552 #: builtin/apply.c:4418
2553 msgid "prepend <root> to all filenames"
2554 msgstr "为所有文件名前添加 <根目录>"
2556 #: builtin/apply.c:4440
2557 msgid "--3way outside a repository"
2558 msgstr "--3way 在一个版本库之外"
2560 #: builtin/apply.c:4448
2561 msgid "--index outside a repository"
2562 msgstr "--index 在一个版本库之外"
2564 #: builtin/apply.c:4451
2565 msgid "--cached outside a repository"
2566 msgstr "--cached 在一个版本库之外"
2568 #: builtin/apply.c:4467
2570 msgid "can't open patch '%s'"
2571 msgstr "不能打开补丁 '%s'"
2573 #: builtin/apply.c:4481
2575 msgid "squelched %d whitespace error"
2576 msgid_plural "squelched %d whitespace errors"
2577 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2578 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2580 #: builtin/apply.c:4487 builtin/apply.c:4497
2582 msgid "%d line adds whitespace errors."
2583 msgid_plural "%d lines add whitespace errors."
2584 msgstr[0] "%d 行有空白字符误用。"
2585 msgstr[1] "%d 行有空白字符误用。"
2587 #: builtin/archive.c:17
2589 msgid "could not create archive file '%s'"
2590 msgstr "不能创建归档文件 '%s'"
2592 #: builtin/archive.c:20
2593 msgid "could not redirect output"
2596 #: builtin/archive.c:37
2597 msgid "git archive: Remote with no URL"
2598 msgstr "git archive:未提供远程URL"
2600 #: builtin/archive.c:58
2601 msgid "git archive: expected ACK/NAK, got EOF"
2602 msgstr "git archive:应为ACK/NACK,却得到EOF"
2604 #: builtin/archive.c:61
2606 msgid "git archive: NACK %s"
2607 msgstr "git archive:NACK %s"
2609 #: builtin/archive.c:63
2611 msgid "remote error: %s"
2614 #: builtin/archive.c:64
2615 msgid "git archive: protocol error"
2616 msgstr "git archive:协议错误"
2618 #: builtin/archive.c:68
2619 msgid "git archive: expected a flush"
2620 msgstr "git archive:应为刷新"
2622 #: builtin/bisect--helper.c:7
2623 msgid "git bisect--helper --next-all [--no-checkout]"
2624 msgstr "git bisect--helper --next-all [--no-checkout]"
2626 #: builtin/bisect--helper.c:17
2627 msgid "perform 'git bisect next'"
2628 msgstr "执行 'git bisect next'"
2630 #: builtin/bisect--helper.c:19
2631 msgid "update BISECT_HEAD instead of checking out the current commit"
2632 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2634 #: builtin/blame.c:27
2635 msgid "git blame [options] [rev-opts] [rev] [--] file"
2636 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2638 #: builtin/blame.c:32
2639 msgid "[rev-opts] are documented in git-rev-list(1)"
2640 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2642 #: builtin/blame.c:2249
2643 msgid "Show blame entries as we find them, incrementally"
2644 msgstr "增量式地显示发现的 blame 条目"
2646 #: builtin/blame.c:2250
2647 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2648 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2650 #: builtin/blame.c:2251
2651 msgid "Do not treat root commits as boundaries (Default: off)"
2652 msgstr "不把根提交作为边界(默认:关闭)"
2654 #: builtin/blame.c:2252
2655 msgid "Show work cost statistics"
2658 #: builtin/blame.c:2253
2659 msgid "Show output score for blame entries"
2660 msgstr "显示判断 blame 条目位移的得分诊断信息"
2662 #: builtin/blame.c:2254
2663 msgid "Show original filename (Default: auto)"
2664 msgstr "显示原始文件名(默认:自动)"
2666 #: builtin/blame.c:2255
2667 msgid "Show original linenumber (Default: off)"
2668 msgstr "显示原始的行号(默认:关闭)"
2670 #: builtin/blame.c:2256
2671 msgid "Show in a format designed for machine consumption"
2672 msgstr "显示为一个适合机器读取的格式"
2674 #: builtin/blame.c:2257
2675 msgid "Show porcelain format with per-line commit information"
2676 msgstr "为每一行显示机器适用的提交信息"
2678 #: builtin/blame.c:2258
2679 msgid "Use the same output mode as git-annotate (Default: off)"
2680 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2682 #: builtin/blame.c:2259
2683 msgid "Show raw timestamp (Default: off)"
2684 msgstr "显示原始时间戳(默认:关闭)"
2686 #: builtin/blame.c:2260
2687 msgid "Show long commit SHA1 (Default: off)"
2688 msgstr "显示长的SHA1提交号(默认:关闭)"
2690 #: builtin/blame.c:2261
2691 msgid "Suppress author name and timestamp (Default: off)"
2692 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2694 #: builtin/blame.c:2262
2695 msgid "Show author email instead of name (Default: off)"
2696 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2698 #: builtin/blame.c:2263
2699 msgid "Ignore whitespace differences"
2702 #: builtin/blame.c:2264
2703 msgid "Spend extra cycles to find better match"
2704 msgstr "花费额外的循环来找到更好的匹配"
2706 #: builtin/blame.c:2265
2707 msgid "Use revisions from <file> instead of calling git-rev-list"
2708 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2710 #: builtin/blame.c:2266
2711 msgid "Use <file>'s contents as the final image"
2712 msgstr "使用 <file> 的内容作为最终的图片"
2714 #: builtin/blame.c:2267 builtin/blame.c:2268
2718 #: builtin/blame.c:2267
2719 msgid "Find line copies within and across files"
2720 msgstr "找到文件内及跨文件的行拷贝"
2722 #: builtin/blame.c:2268
2723 msgid "Find line movements within and across files"
2724 msgstr "找到文件内及跨文件的行移动"
2726 #: builtin/blame.c:2269
2730 #: builtin/blame.c:2269
2731 msgid "Process only line range n,m, counting from 1"
2732 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2734 #: builtin/branch.c:24
2735 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2736 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2738 #: builtin/branch.c:25
2739 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2740 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2742 #: builtin/branch.c:26
2743 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2744 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2746 #: builtin/branch.c:27
2747 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2748 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2750 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2751 #: builtin/branch.c:150
2754 "deleting branch '%s' that has been merged to\n"
2755 " '%s', but not yet merged to HEAD."
2757 "将要删除的分支 '%s' 已经被合并到\n"
2760 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2761 #: builtin/branch.c:154
2764 "not deleting branch '%s' that is not yet merged to\n"
2765 " '%s', even though it is merged to HEAD."
2767 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2768 " 然而却尚未被合并到分支 '%s' 。"
2770 #: builtin/branch.c:168
2772 msgid "Couldn't look up commit object for '%s'"
2773 msgstr "无法查询 '%s' 指向的提交对象"
2775 #: builtin/branch.c:172
2778 "The branch '%s' is not fully merged.\n"
2779 "If you are sure you want to delete it, run 'git branch -D %s'."
2782 "如果您确认要删除它,执行 'git branch -D %s'。"
2784 #: builtin/branch.c:185
2785 msgid "Update of config-file failed"
2786 msgstr "无法更新 config 文件"
2788 #: builtin/branch.c:213
2789 msgid "cannot use -a with -d"
2790 msgstr "不能将 -a 和 -d 同时使用"
2792 #: builtin/branch.c:219
2793 msgid "Couldn't look up commit object for HEAD"
2794 msgstr "无法查询 HEAD 指向的提交对象"
2796 #: builtin/branch.c:227
2798 msgid "Cannot delete the branch '%s' which you are currently on."
2799 msgstr "无法删除您当前所在的分支 '%s'。"
2801 #: builtin/branch.c:240
2803 msgid "remote branch '%s' not found."
2804 msgstr "远程分支 '%s' 未发现。"
2806 #: builtin/branch.c:241
2808 msgid "branch '%s' not found."
2809 msgstr "分支 '%s' 未发现。"
2811 #: builtin/branch.c:255
2813 msgid "Error deleting remote branch '%s'"
2814 msgstr "删除远程分支 '%s' 时出错"
2816 #: builtin/branch.c:256
2818 msgid "Error deleting branch '%s'"
2819 msgstr "删除分支 '%s' 时出错"
2821 #: builtin/branch.c:263
2823 msgid "Deleted remote branch %s (was %s).\n"
2824 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2826 #: builtin/branch.c:264
2828 msgid "Deleted branch %s (was %s).\n"
2829 msgstr "已删除分支 %s(曾为 %s)。\n"
2831 #: builtin/branch.c:366
2833 msgid "branch '%s' does not point at a commit"
2834 msgstr "分支 '%s' 未指向一个提交"
2836 #: builtin/branch.c:454
2841 #: builtin/branch.c:459
2846 #: builtin/branch.c:464
2848 msgid "[%s: behind %d]"
2851 #: builtin/branch.c:466
2856 #: builtin/branch.c:470
2858 msgid "[%s: ahead %d]"
2861 #: builtin/branch.c:472
2866 #: builtin/branch.c:475
2868 msgid "[%s: ahead %d, behind %d]"
2869 msgstr "[%s:领先 %d,落后 %d]"
2871 #: builtin/branch.c:478
2873 msgid "[ahead %d, behind %d]"
2874 msgstr "[领先 %d,落后 %d]"
2876 #: builtin/branch.c:502
2877 msgid " **** invalid ref ****"
2878 msgstr " **** 无效引用 ****"
2880 #: builtin/branch.c:594
2882 msgid "(no branch, rebasing %s)"
2883 msgstr "(非分支,正变基 %s)"
2885 #: builtin/branch.c:597
2887 msgid "(no branch, bisect started on %s)"
2888 msgstr "(非分支,二分查找开始于 %s)"
2890 #: builtin/branch.c:600
2892 msgid "(detached from %s)"
2895 #: builtin/branch.c:603
2899 #: builtin/branch.c:649
2901 msgid "object '%s' does not point to a commit"
2902 msgstr "对象 '%s' 没有指向一个提交"
2904 #: builtin/branch.c:681
2905 msgid "some refs could not be read"
2908 #: builtin/branch.c:694
2909 msgid "cannot rename the current branch while not on any."
2910 msgstr "无法重命名当前分支因为不处于任何分支上。"
2912 #: builtin/branch.c:704
2914 msgid "Invalid branch name: '%s'"
2915 msgstr "无效的分支名:'%s'"
2917 #: builtin/branch.c:719
2918 msgid "Branch rename failed"
2921 #: builtin/branch.c:723
2923 msgid "Renamed a misnamed branch '%s' away"
2924 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2926 #: builtin/branch.c:727
2928 msgid "Branch renamed to %s, but HEAD is not updated!"
2929 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2931 #: builtin/branch.c:734
2932 msgid "Branch is renamed, but update of config-file failed"
2933 msgstr "分支被重命名,但更新 config 文件失败"
2935 #: builtin/branch.c:749
2937 msgid "malformed object name %s"
2940 #: builtin/branch.c:773
2942 msgid "could not write branch description template: %s"
2943 msgstr "不能写分支描述模版:%s"
2945 #: builtin/branch.c:803
2946 msgid "Generic options"
2949 #: builtin/branch.c:805
2950 msgid "show hash and subject, give twice for upstream branch"
2951 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2953 #: builtin/branch.c:806
2954 msgid "suppress informational messages"
2957 #: builtin/branch.c:807
2958 msgid "set up tracking mode (see git-pull(1))"
2959 msgstr "设置跟踪模式(参见 git-pull(1))"
2961 #: builtin/branch.c:809
2962 msgid "change upstream info"
2965 #: builtin/branch.c:813
2966 msgid "use colored output"
2969 #: builtin/branch.c:814
2970 msgid "act on remote-tracking branches"
2973 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2974 #: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461
2975 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
2979 #: builtin/branch.c:818 builtin/branch.c:824
2980 msgid "print only branches that contain the commit"
2981 msgstr "只打印包含该提交的分支"
2983 #: builtin/branch.c:830
2984 msgid "Specific git-branch actions:"
2985 msgstr "具体的 git-branch 动作:"
2987 #: builtin/branch.c:831
2988 msgid "list both remote-tracking and local branches"
2989 msgstr "列出远程跟踪及本地分支"
2991 #: builtin/branch.c:833
2992 msgid "delete fully merged branch"
2995 #: builtin/branch.c:834
2996 msgid "delete branch (even if not merged)"
2997 msgstr "删除分支(即使没有合并)"
2999 #: builtin/branch.c:835
3000 msgid "move/rename a branch and its reflog"
3001 msgstr "移动/重命名一个分支,以及它的引用日志"
3003 #: builtin/branch.c:836
3004 msgid "move/rename a branch, even if target exists"
3005 msgstr "移动/重命名一个分支,即使目标已存在"
3007 #: builtin/branch.c:837
3008 msgid "list branch names"
3011 #: builtin/branch.c:838
3012 msgid "create the branch's reflog"
3015 #: builtin/branch.c:840
3016 msgid "edit the description for the branch"
3019 #: builtin/branch.c:841
3020 msgid "force creation (when already exists)"
3021 msgstr "强制创建(当已经存在)"
3023 #: builtin/branch.c:844
3024 msgid "print only not merged branches"
3027 #: builtin/branch.c:850
3028 msgid "print only merged branches"
3031 #: builtin/branch.c:854
3032 msgid "list branches in columns"
3035 #: builtin/branch.c:867
3036 msgid "Failed to resolve HEAD as a valid ref."
3037 msgstr "无法将 HEAD 解析为有效引用。"
3039 #: builtin/branch.c:872 builtin/clone.c:635
3040 msgid "HEAD not found below refs/heads!"
3041 msgstr "HEAD 没有位于 /refs/heads 之下!"
3043 #: builtin/branch.c:896
3044 msgid "--column and --verbose are incompatible"
3045 msgstr "--column 和 --verbose 不兼容"
3047 #: builtin/branch.c:902 builtin/branch.c:941
3048 msgid "branch name required"
3051 #: builtin/branch.c:917
3052 msgid "Cannot give description to detached HEAD"
3053 msgstr "不能向分离头指针提供描述"
3055 #: builtin/branch.c:922
3056 msgid "cannot edit description of more than one branch"
3057 msgstr "不能为一个以上的分支编辑描述"
3059 #: builtin/branch.c:929
3061 msgid "No commit on branch '%s' yet."
3062 msgstr "分支 '%s' 尚无提交。"
3064 #: builtin/branch.c:932
3066 msgid "No branch named '%s'."
3069 #: builtin/branch.c:947
3070 msgid "too many branches for a rename operation"
3071 msgstr "为重命名操作提供了太多的分支名"
3073 #: builtin/branch.c:952
3074 msgid "too many branches to set new upstream"
3075 msgstr "为设置新上游提供了太多的分支名"
3077 #: builtin/branch.c:956
3080 "could not set upstream of HEAD to %s when it does not point to any branch."
3081 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3083 #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
3085 msgid "no such branch '%s'"
3088 #: builtin/branch.c:963
3090 msgid "branch '%s' does not exist"
3091 msgstr "分支 '%s' 不存在"
3093 #: builtin/branch.c:975
3094 msgid "too many branches to unset upstream"
3095 msgstr "为取消上游设置操作提供了太多的分支名"
3097 #: builtin/branch.c:979
3098 msgid "could not unset upstream of HEAD when it does not point to any branch."
3099 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3101 #: builtin/branch.c:985
3103 msgid "Branch '%s' has no upstream information"
3104 msgstr "分支 '%s' 没有上游信息"
3106 #: builtin/branch.c:999
3107 msgid "it does not make sense to create 'HEAD' manually"
3108 msgstr "手工创建 'HEAD' 没有意义"
3110 #: builtin/branch.c:1005
3111 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3112 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3114 #: builtin/branch.c:1008
3117 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3118 "track or --set-upstream-to\n"
3120 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3122 #: builtin/branch.c:1025
3126 "If you wanted to make '%s' track '%s', do this:\n"
3130 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3133 #: builtin/branch.c:1026
3135 msgid " git branch -d %s\n"
3136 msgstr " git branch -d %s\n"
3138 #: builtin/branch.c:1027
3140 msgid " git branch --set-upstream-to %s\n"
3141 msgstr " git branch --set-upstream-to %s\n"
3143 #: builtin/bundle.c:47
3145 msgid "%s is okay\n"
3148 #: builtin/bundle.c:56
3149 msgid "Need a repository to create a bundle."
3150 msgstr "需要一个版本库来创建包。"
3152 #: builtin/bundle.c:60
3153 msgid "Need a repository to unbundle."
3154 msgstr "需要一个版本库来解包。"
3156 #: builtin/cat-file.c:328
3157 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3158 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3160 #: builtin/cat-file.c:329
3161 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3162 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3164 #: builtin/cat-file.c:366
3165 msgid "<type> can be one of: blob, tree, commit, tag"
3166 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3168 #: builtin/cat-file.c:367
3169 msgid "show object type"
3172 #: builtin/cat-file.c:368
3173 msgid "show object size"
3176 #: builtin/cat-file.c:370
3177 msgid "exit with zero when there's no error"
3178 msgstr "当没有错误时退出并返回零"
3180 #: builtin/cat-file.c:371
3181 msgid "pretty-print object's content"
3184 #: builtin/cat-file.c:373
3185 msgid "for blob objects, run textconv on object's content"
3186 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3188 #: builtin/cat-file.c:375
3189 msgid "show info and content of objects fed from the standard input"
3190 msgstr "显示从标准输入提供的对象的信息和内容"
3192 #: builtin/cat-file.c:378
3193 msgid "show info about objects fed from the standard input"
3194 msgstr "显示从标准输入提供的对象的信息"
3196 #: builtin/check-attr.c:11
3197 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3198 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3200 #: builtin/check-attr.c:12
3201 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3202 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3204 #: builtin/check-attr.c:19
3205 msgid "report all attributes set on file"
3206 msgstr "报告设置在文件上的所有属性"
3208 #: builtin/check-attr.c:20
3209 msgid "use .gitattributes only from the index"
3210 msgstr "只使用索引中的 .gitattributes"
3212 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3213 msgid "read file names from stdin"
3216 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3217 msgid "terminate input and output records by a NUL character"
3218 msgstr "输入和输出的记录使用 NUL 字符终结"
3220 #: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260
3221 msgid "suppress progress reporting"
3224 #: builtin/check-ignore.c:26
3225 msgid "show non-matching input paths"
3228 #: builtin/check-ignore.c:28
3229 msgid "ignore index when checking"
3232 #: builtin/check-ignore.c:154
3233 msgid "cannot specify pathnames with --stdin"
3234 msgstr "不能同时提供路径及 --stdin 参数"
3236 #: builtin/check-ignore.c:157
3237 msgid "-z only makes sense with --stdin"
3238 msgstr "-z 需要和 --stdin 参数共用才有意义"
3240 #: builtin/check-ignore.c:159
3241 msgid "no path specified"
3244 #: builtin/check-ignore.c:163
3245 msgid "--quiet is only valid with a single pathname"
3246 msgstr "参数 --quiet 只在提供一个路径名时有效"
3248 #: builtin/check-ignore.c:165
3249 msgid "cannot have both --quiet and --verbose"
3250 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3252 #: builtin/check-ignore.c:168
3253 msgid "--non-matching is only valid with --verbose"
3254 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3256 #: builtin/check-mailmap.c:8
3257 msgid "git check-mailmap [options] <contact>..."
3258 msgstr "git check-mailmap [选项] <联系地址>..."
3260 #: builtin/check-mailmap.c:13
3261 msgid "also read contacts from stdin"
3262 msgstr "还从标准输入读取联系地址"
3264 #: builtin/check-mailmap.c:24
3266 msgid "unable to parse contact: %s"
3267 msgstr "不能解析联系地址:%s"
3269 #: builtin/check-mailmap.c:47
3270 msgid "no contacts specified"
3273 #: builtin/checkout-index.c:126
3274 msgid "git checkout-index [options] [--] [<file>...]"
3275 msgstr "git checkout-index [选项] [--] [<文件>...]"
3277 #: builtin/checkout-index.c:187
3278 msgid "check out all files in the index"
3281 #: builtin/checkout-index.c:188
3282 msgid "force overwrite of existing files"
3285 #: builtin/checkout-index.c:190
3286 msgid "no warning for existing files and files not in index"
3287 msgstr "存在或不在索引中的文件都没有警告"
3289 #: builtin/checkout-index.c:192
3290 msgid "don't checkout new files"
3293 #: builtin/checkout-index.c:194
3294 msgid "update stat information in the index file"
3295 msgstr "更新索引中文件的状态信息"
3297 #: builtin/checkout-index.c:200
3298 msgid "read list of paths from the standard input"
3299 msgstr "从标准输入读取路径列表"
3301 #: builtin/checkout-index.c:202
3302 msgid "write the content to temporary files"
3305 #: builtin/checkout-index.c:203 builtin/column.c:30
3309 #: builtin/checkout-index.c:204
3310 msgid "when creating files, prepend <string>"
3311 msgstr "在创建文件时,在前面加上<字符串>"
3313 #: builtin/checkout-index.c:207
3314 msgid "copy out the files from named stage"
3315 msgstr "从指定暂存区中拷出文件"
3317 #: builtin/checkout.c:25
3318 msgid "git checkout [options] <branch>"
3319 msgstr "git checkout [选项] <分支>"
3321 #: builtin/checkout.c:26
3322 msgid "git checkout [options] [<branch>] -- <file>..."
3323 msgstr "git checkout [选项] [<分支>] -- <文件>..."
3325 #: builtin/checkout.c:114 builtin/checkout.c:147
3327 msgid "path '%s' does not have our version"
3328 msgstr "路径 '%s' 没有我们的版本"
3330 #: builtin/checkout.c:116 builtin/checkout.c:149
3332 msgid "path '%s' does not have their version"
3333 msgstr "路径 '%s' 没有他们的版本"
3335 #: builtin/checkout.c:132
3337 msgid "path '%s' does not have all necessary versions"
3338 msgstr "路径 '%s' 没有全部必须的版本"
3340 #: builtin/checkout.c:176
3342 msgid "path '%s' does not have necessary versions"
3343 msgstr "路径 '%s' 没有必须的版本"
3345 #: builtin/checkout.c:193
3347 msgid "path '%s': cannot merge"
3348 msgstr "path '%s':无法合并"
3350 #: builtin/checkout.c:210
3352 msgid "Unable to add merge result for '%s'"
3353 msgstr "无法为 '%s' 添加合并结果"
3355 #: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3356 #: builtin/checkout.c:241
3358 msgid "'%s' cannot be used with updating paths"
3359 msgstr "'%s' 不能在更新路径时使用"
3361 #: builtin/checkout.c:244 builtin/checkout.c:247
3363 msgid "'%s' cannot be used with %s"
3364 msgstr "'%s' 不能和 %s 同时使用"
3366 #: builtin/checkout.c:250
3368 msgid "Cannot update paths and switch to branch '%s' at the same time."
3369 msgstr "不能同时更新路径并切换到分支'%s'。"
3371 #: builtin/checkout.c:261 builtin/checkout.c:451
3372 msgid "corrupt index file"
3375 #: builtin/checkout.c:322 builtin/checkout.c:329
3377 msgid "path '%s' is unmerged"
3378 msgstr "路径 '%s' 未合并"
3380 #: builtin/checkout.c:473
3381 msgid "you need to resolve your current index first"
3382 msgstr "您需要先解决当前索引的冲突"
3384 #: builtin/checkout.c:594
3386 msgid "Can not do reflog for '%s'\n"
3387 msgstr "不能对 '%s' 执行 reflog 操作\n"
3389 #: builtin/checkout.c:632
3390 msgid "HEAD is now at"
3393 #: builtin/checkout.c:639
3395 msgid "Reset branch '%s'\n"
3396 msgstr "重置分支 '%s'\n"
3398 #: builtin/checkout.c:642
3400 msgid "Already on '%s'\n"
3401 msgstr "已经位于 '%s'\n"
3403 #: builtin/checkout.c:646
3405 msgid "Switched to and reset branch '%s'\n"
3406 msgstr "切换并重置分支 '%s'\n"
3408 #: builtin/checkout.c:648 builtin/checkout.c:1033
3410 msgid "Switched to a new branch '%s'\n"
3411 msgstr "切换到一个新分支 '%s'\n"
3413 #: builtin/checkout.c:650
3415 msgid "Switched to branch '%s'\n"
3416 msgstr "切换到分支 '%s'\n"
3419 #: builtin/checkout.c:706
3421 msgid " ... and %d more.\n"
3422 msgstr " ... 及其它 %d 个。\n"
3424 #. The singular version
3425 #: builtin/checkout.c:712
3428 "Warning: you are leaving %d commit behind, not connected to\n"
3429 "any of your branches:\n"
3433 "Warning: you are leaving %d commits behind, not connected to\n"
3434 "any of your branches:\n"
3438 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3442 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3446 #: builtin/checkout.c:730
3449 "If you want to keep them by creating a new branch, this may be a good time\n"
3452 " git branch new_branch_name %s\n"
3455 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3458 " git branch new_branch_name %s\n"
3461 #: builtin/checkout.c:760
3462 msgid "internal error in revision walk"
3463 msgstr "在版本遍历时遇到内部错误"
3465 #: builtin/checkout.c:764
3466 msgid "Previous HEAD position was"
3467 msgstr "之前的 HEAD 位置是"
3469 #: builtin/checkout.c:791 builtin/checkout.c:1028
3470 msgid "You are on a branch yet to be born"
3471 msgstr "您位于一个尚未初始化的分支"
3473 #: builtin/checkout.c:935
3475 msgid "only one reference expected, %d given."
3476 msgstr "只要一个引用,却给出了 %d 个"
3478 #: builtin/checkout.c:974
3480 msgid "invalid reference: %s"
3483 #. case (1): want a tree
3484 #: builtin/checkout.c:1003
3486 msgid "reference is not a tree: %s"
3489 #: builtin/checkout.c:1042
3490 msgid "paths cannot be used with switching branches"
3491 msgstr "路径不能和切换分支同时使用"
3493 #: builtin/checkout.c:1045 builtin/checkout.c:1049
3495 msgid "'%s' cannot be used with switching branches"
3496 msgstr "'%s' 不能和切换分支同时使用"
3498 #: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
3499 #: builtin/checkout.c:1064
3501 msgid "'%s' cannot be used with '%s'"
3502 msgstr "'%s' 不能和 '%s' 同时使用"
3504 #: builtin/checkout.c:1069
3506 msgid "Cannot switch branch to a non-commit '%s'"
3507 msgstr "不能切换分支到一个非提交 '%s'"
3509 #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
3510 #: builtin/remote.c:159 builtin/remote.c:161
3514 #: builtin/checkout.c:1092
3515 msgid "create and checkout a new branch"
3516 msgstr "创建并检出一个新的分支"
3518 #: builtin/checkout.c:1094
3519 msgid "create/reset and checkout a branch"
3520 msgstr "创建/重置并检出一个分支"
3522 #: builtin/checkout.c:1095
3523 msgid "create reflog for new branch"
3524 msgstr "为新的分支创建引用日志"
3526 #: builtin/checkout.c:1096
3527 msgid "detach the HEAD at named commit"
3528 msgstr "成为指向该提交的分离头指针"
3530 #: builtin/checkout.c:1097
3531 msgid "set upstream info for new branch"
3532 msgstr "为新的分支设置上游信息"
3534 #: builtin/checkout.c:1099
3538 #: builtin/checkout.c:1099
3539 msgid "new unparented branch"
3542 #: builtin/checkout.c:1100
3543 msgid "checkout our version for unmerged files"
3544 msgstr "对尚未合并的文件检出我们的版本"
3546 #: builtin/checkout.c:1102
3547 msgid "checkout their version for unmerged files"
3548 msgstr "对尚未合并的文件检出他们的版本"
3550 #: builtin/checkout.c:1104
3551 msgid "force checkout (throw away local modifications)"
3552 msgstr "强制检出(丢弃本地修改)"
3554 #: builtin/checkout.c:1105
3555 msgid "perform a 3-way merge with the new branch"
3556 msgstr "和新的分支执行三路合并"
3558 #: builtin/checkout.c:1106 builtin/merge.c:225
3559 msgid "update ignored files (default)"
3560 msgstr "更新忽略的文件(默认)"
3562 #: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248
3566 #: builtin/checkout.c:1108
3567 msgid "conflict style (merge or diff3)"
3568 msgstr "冲突输出风格(merge 或 diff3)"
3570 #: builtin/checkout.c:1111
3571 msgid "do not limit pathspecs to sparse entries only"
3572 msgstr "对路径不做稀疏检出的限制"
3574 #: builtin/checkout.c:1113
3575 msgid "second guess 'git checkout no-such-branch'"
3576 msgstr "再者猜测'git checkout no-such-branch'"
3578 #: builtin/checkout.c:1136
3579 msgid "-b, -B and --orphan are mutually exclusive"
3580 msgstr "-b、-B 和 --orphan 是互斥的"
3582 #: builtin/checkout.c:1153
3583 msgid "--track needs a branch name"
3584 msgstr "--track 需要一个分支名"
3586 #: builtin/checkout.c:1160
3587 msgid "Missing branch name; try -b"
3588 msgstr "缺少分支名;尝试 -b"
3590 #: builtin/checkout.c:1197
3591 msgid "invalid path specification"
3594 #: builtin/checkout.c:1204
3597 "Cannot update paths and switch to branch '%s' at the same time.\n"
3598 "Did you intend to checkout '%s' which can not be resolved as commit?"
3600 "不能同时更新路径并切换到分支'%s'。\n"
3601 "您是想要检出 '%s' 但其未能解析为提交么?"
3603 #: builtin/checkout.c:1209
3605 msgid "git checkout: --detach does not take a path argument '%s'"
3606 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3608 #: builtin/checkout.c:1213
3610 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3611 "checking out of the index."
3613 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3615 #: builtin/clean.c:26
3617 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3619 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3621 #: builtin/clean.c:30
3623 msgid "Removing %s\n"
3626 #: builtin/clean.c:31
3628 msgid "Would remove %s\n"
3631 #: builtin/clean.c:32
3633 msgid "Skipping repository %s\n"
3636 #: builtin/clean.c:33
3638 msgid "Would skip repository %s\n"
3639 msgstr "将忽略版本库 %s\n"
3641 #: builtin/clean.c:34
3643 msgid "failed to remove %s"
3646 #: builtin/clean.c:294
3649 "1 - select a numbered item\n"
3650 "foo - select item based on unique prefix\n"
3651 " - (empty) select nothing"
3655 "foo - 通过标题选择一个选项\n"
3658 #: builtin/clean.c:298
3661 "1 - select a single item\n"
3662 "3-5 - select a range of items\n"
3663 "2-3,6-9 - select multiple ranges\n"
3664 "foo - select item based on unique prefix\n"
3665 "-... - unselect specified items\n"
3666 "* - choose all items\n"
3667 " - (empty) finish selecting"
3671 "3-5 - 选择一个范围内的所有选项\n"
3672 "2-3,6-9 - 选择多个范围内的所有选项\n"
3673 "foo - 通过标题选择一个选项\n"
3678 #: builtin/clean.c:516
3683 #: builtin/clean.c:659
3685 msgid "Input ignore patterns>> "
3686 msgstr "输入模版以排除条目>> "
3688 #: builtin/clean.c:696
3690 msgid "WARNING: Cannot find items matched by: %s"
3691 msgstr "警告:无法找到和 %s 匹配的条目"
3693 #: builtin/clean.c:717
3694 msgid "Select items to delete"
3697 #: builtin/clean.c:757
3702 #: builtin/clean.c:782
3706 #: builtin/clean.c:790
3708 "clean - start cleaning\n"
3709 "filter by pattern - exclude items from deletion\n"
3710 "select by numbers - select items to be deleted by numbers\n"
3711 "ask each - confirm each deletion (like \"rm -i\")\n"
3712 "quit - stop cleaning\n"
3713 "help - this screen\n"
3714 "? - help for prompt selection"
3717 "filter by pattern - 通过模版排除要删除的条目\n"
3718 "select by numbers - 通过数字选择要删除的条目\n"
3719 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3722 "? - 显示如何在提示符下选择的帮助"
3724 #: builtin/clean.c:817
3725 msgid "*** Commands ***"
3728 #: builtin/clean.c:818
3732 #: builtin/clean.c:826
3733 msgid "Would remove the following item:"
3734 msgid_plural "Would remove the following items:"
3735 msgstr[0] "将删除如下条目:"
3736 msgstr[1] "将删除如下条目:"
3738 #: builtin/clean.c:843
3739 msgid "No more files to clean, exiting."
3740 msgstr "没有要清理的文件,退出。"
3742 #: builtin/clean.c:874
3743 msgid "do not print names of files removed"
3746 #: builtin/clean.c:876
3750 #: builtin/clean.c:877
3751 msgid "interactive cleaning"
3754 #: builtin/clean.c:879
3755 msgid "remove whole directories"
3758 #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
3759 #: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185
3763 #: builtin/clean.c:881
3764 msgid "add <pattern> to ignore rules"
3765 msgstr "添加<模式>到忽略规则"
3767 #: builtin/clean.c:882
3768 msgid "remove ignored files, too"
3771 #: builtin/clean.c:884
3772 msgid "remove only ignored files"
3775 #: builtin/clean.c:902
3776 msgid "-x and -X cannot be used together"
3777 msgstr "-x 和 -X 不能同时使用"
3779 #: builtin/clean.c:906
3781 "clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3784 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3786 #: builtin/clean.c:909
3788 "clean.requireForce defaults to true and neither -i, -n nor -f given; "
3791 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3793 #: builtin/clone.c:36
3794 msgid "git clone [options] [--] <repo> [<dir>]"
3795 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3797 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
3798 #: builtin/push.c:521
3799 msgid "force progress reporting"
3802 #: builtin/clone.c:66
3803 msgid "don't create a checkout"
3806 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3807 msgid "create a bare repository"
3810 #: builtin/clone.c:71
3811 msgid "create a mirror repository (implies bare)"
3812 msgstr "创建一个镜像版本库(也是裸版本库)"
3814 #: builtin/clone.c:73
3815 msgid "to clone from a local repository"
3818 #: builtin/clone.c:75
3819 msgid "don't use local hardlinks, always copy"
3820 msgstr "不使用本地硬链接,始终复制"
3822 #: builtin/clone.c:77
3823 msgid "setup as shared repository"
3826 #: builtin/clone.c:79 builtin/clone.c:81
3827 msgid "initialize submodules in the clone"
3830 #: builtin/clone.c:82 builtin/init-db.c:485
3831 msgid "template-directory"
3834 #: builtin/clone.c:83 builtin/init-db.c:486
3835 msgid "directory from which templates will be used"
3838 #: builtin/clone.c:85
3839 msgid "reference repository"
3842 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3846 #: builtin/clone.c:87
3847 msgid "use <name> instead of 'origin' to track upstream"
3848 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3850 #: builtin/clone.c:89
3851 msgid "checkout <branch> instead of the remote's HEAD"
3852 msgstr "检出<分支>而不是远程HEAD"
3854 #: builtin/clone.c:91
3855 msgid "path to git-upload-pack on the remote"
3856 msgstr "远程 git-upload-pack 路径"
3858 #: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663
3862 #: builtin/clone.c:93
3863 msgid "create a shallow clone of that depth"
3864 msgstr "创建一个指定深度的浅克隆"
3866 #: builtin/clone.c:95
3867 msgid "clone only one branch, HEAD or --branch"
3868 msgstr "只克隆一个分支、HEAD 或 --branch"
3870 #: builtin/clone.c:96 builtin/init-db.c:494
3874 #: builtin/clone.c:97 builtin/init-db.c:495
3875 msgid "separate git dir from working tree"
3876 msgstr "git目录和工作区分离"
3878 #: builtin/clone.c:98
3882 #: builtin/clone.c:99
3883 msgid "set config inside the new repository"
3884 msgstr "在新版本库中设置配置信息"
3886 #: builtin/clone.c:252
3888 msgid "reference repository '%s' is not a local repository."
3889 msgstr "参考版本库 '%s' 不是一个本地版本库。"
3891 #: builtin/clone.c:256
3893 msgid "reference repository '%s' is shallow"
3894 msgstr "参考版本库 '%s' 是一个浅克隆"
3896 #: builtin/clone.c:259
3898 msgid "reference repository '%s' is grafted"
3899 msgstr "参考版本库 '%s' 已被嫁接"
3901 #: builtin/clone.c:321
3903 msgid "failed to create directory '%s'"
3904 msgstr "无法创建目录 '%s'"
3906 #: builtin/clone.c:323 builtin/diff.c:83
3908 msgid "failed to stat '%s'"
3909 msgstr "无法枚举 '%s' 状态"
3911 #: builtin/clone.c:325
3913 msgid "%s exists and is not a directory"
3914 msgstr "%s 存在且不是一个目录"
3916 #: builtin/clone.c:339
3918 msgid "failed to stat %s\n"
3919 msgstr "无法枚举 %s 状态\n"
3921 #: builtin/clone.c:361
3923 msgid "failed to create link '%s'"
3924 msgstr "无法创建链接 '%s'"
3926 #: builtin/clone.c:365
3928 msgid "failed to copy file to '%s'"
3929 msgstr "无法拷贝文件至 '%s'"
3931 #: builtin/clone.c:388 builtin/clone.c:565
3936 #: builtin/clone.c:401
3938 "Clone succeeded, but checkout failed.\n"
3939 "You can inspect what was checked out with 'git status'\n"
3940 "and retry the checkout with 'git checkout -f HEAD'\n"
3943 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3944 "'git checkout -f HEAD' 重试\n"
3946 #: builtin/clone.c:480
3948 msgid "Could not find remote branch %s to clone."
3949 msgstr "不能发现要克隆的远程分支 %s。"
3951 #: builtin/clone.c:560
3953 msgid "Checking connectivity... "
3956 #: builtin/clone.c:563
3957 msgid "remote did not send all necessary objects"
3958 msgstr "远程没有发送所有必须的对象"
3960 #: builtin/clone.c:626
3961 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3962 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3964 #: builtin/clone.c:657
3965 msgid "unable to checkout working tree"
3968 #: builtin/clone.c:765
3969 msgid "Too many arguments."
3972 #: builtin/clone.c:769
3973 msgid "You must specify a repository to clone."
3974 msgstr "您必须指定一个版本库来克隆。"
3976 #: builtin/clone.c:780
3978 msgid "--bare and --origin %s options are incompatible."
3979 msgstr "--bare 和 --origin %s 选项不兼容。"
3981 #: builtin/clone.c:783
3982 msgid "--bare and --separate-git-dir are incompatible."
3983 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3985 #: builtin/clone.c:796
3987 msgid "repository '%s' does not exist"
3988 msgstr "版本库 '%s' 不存在"
3990 #: builtin/clone.c:802
3991 msgid "--depth is ignored in local clones; use file:// instead."
3992 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3994 #: builtin/clone.c:805
3995 msgid "source repository is shallow, ignoring --local"
3996 msgstr "源版本库是浅克隆,忽略 --local"
3998 #: builtin/clone.c:810
3999 msgid "--local is ignored"
4000 msgstr "--local 被忽略"
4002 #: builtin/clone.c:814 builtin/fetch.c:1119
4004 msgid "depth %s is not a positive number"
4005 msgstr "深度 %s 不是一个正数"
4007 #: builtin/clone.c:824
4009 msgid "destination path '%s' already exists and is not an empty directory."
4010 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4012 #: builtin/clone.c:834
4014 msgid "working tree '%s' already exists."
4015 msgstr "工作区 '%s' 已经存在。"
4017 #: builtin/clone.c:847 builtin/clone.c:859
4019 msgid "could not create leading directories of '%s'"
4020 msgstr "不能为 '%s' 创建先导目录"
4022 #: builtin/clone.c:850
4024 msgid "could not create work tree dir '%s'."
4025 msgstr "不能为 '%s' 创建工作区目录。"
4027 #: builtin/clone.c:869
4029 msgid "Cloning into bare repository '%s'...\n"
4030 msgstr "克隆到裸版本库 '%s'...\n"
4032 #: builtin/clone.c:871
4034 msgid "Cloning into '%s'...\n"
4035 msgstr "正克隆到 '%s'...\n"
4037 #: builtin/clone.c:906
4039 msgid "Don't know how to clone %s"
4042 #: builtin/clone.c:957 builtin/clone.c:965
4044 msgid "Remote branch %s not found in upstream %s"
4045 msgstr "远程分支 %s 在上游 %s 未发现"
4047 #: builtin/clone.c:968
4048 msgid "You appear to have cloned an empty repository."
4049 msgstr "您似乎克隆了一个空版本库。"
4051 #: builtin/column.c:9
4052 msgid "git column [options]"
4053 msgstr "git column [选项]"
4055 #: builtin/column.c:26
4056 msgid "lookup config vars"
4059 #: builtin/column.c:27 builtin/column.c:28
4060 msgid "layout to use"
4063 #: builtin/column.c:29
4064 msgid "Maximum width"
4067 #: builtin/column.c:30
4068 msgid "Padding space on left border"
4071 #: builtin/column.c:31
4072 msgid "Padding space on right border"
4075 #: builtin/column.c:32
4076 msgid "Padding space between columns"
4079 #: builtin/column.c:51
4080 msgid "--command must be the first argument"
4081 msgstr "--command 必须是第一个参数"
4083 #: builtin/commit.c:36
4084 msgid "git commit [options] [--] <pathspec>..."
4085 msgstr "git commit [选项] [--] <路径规则>..."
4087 #: builtin/commit.c:41
4088 msgid "git status [options] [--] <pathspec>..."
4089 msgstr "git status [选项] [--] <路径规则>..."
4091 #: builtin/commit.c:46
4093 "Your name and email address were configured automatically based\n"
4094 "on your username and hostname. Please check that they are accurate.\n"
4095 "You can suppress this message by setting them explicitly:\n"
4097 " git config --global user.name \"Your Name\"\n"
4098 " git config --global user.email you@example.com\n"
4100 "After doing this, you may fix the identity used for this commit with:\n"
4102 " git commit --amend --reset-author\n"
4104 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4105 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
4107 " git config --global user.name \"Your Name\"\n"
4108 " git config --global user.email you@example.com\n"
4110 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4112 " git commit --amend --reset-author\n"
4114 #: builtin/commit.c:58
4116 "You asked to amend the most recent commit, but doing so would make\n"
4117 "it empty. You can repeat your command with --allow-empty, or you can\n"
4118 "remove the commit entirely with \"git reset HEAD^\".\n"
4120 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4121 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4123 #: builtin/commit.c:63
4125 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4126 "If you wish to commit it anyway, use:\n"
4128 " git commit --allow-empty\n"
4131 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4134 " git commit --allow-empty\n"
4137 #: builtin/commit.c:70
4138 msgid "Otherwise, please use 'git reset'\n"
4139 msgstr "否则,请使用命令 'git reset'\n"
4141 #: builtin/commit.c:73
4143 "If you wish to skip this commit, use:\n"
4147 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4148 "the remaining commits.\n"
4150 "如果您想跳过这个提交,使用命令:\n"
4154 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4157 #: builtin/commit.c:287
4158 msgid "failed to unpack HEAD tree object"
4159 msgstr "无法解包 HEAD 树对象"
4161 #: builtin/commit.c:329
4162 msgid "unable to create temporary index"
4165 #: builtin/commit.c:335
4166 msgid "interactive add failed"
4169 #: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
4170 msgid "unable to write new_index file"
4171 msgstr "无法写 new_index 文件"
4173 #: builtin/commit.c:420
4174 msgid "cannot do a partial commit during a merge."
4175 msgstr "在合并过程中不能做部分提交。"
4177 #: builtin/commit.c:422
4178 msgid "cannot do a partial commit during a cherry-pick."
4179 msgstr "在拣选过程中不能做部分提交。"
4181 #: builtin/commit.c:432
4182 msgid "cannot read the index"
4185 #: builtin/commit.c:452
4186 msgid "unable to write temporary index file"
4189 #: builtin/commit.c:543 builtin/commit.c:549
4191 msgid "invalid commit: %s"
4194 #: builtin/commit.c:571
4195 msgid "malformed --author parameter"
4196 msgstr "非法的 --author 参数"
4198 #: builtin/commit.c:591
4200 msgid "Malformed ident string: '%s'"
4201 msgstr "非法的身份字符串:'%s'"
4203 #: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
4205 msgid "could not lookup commit %s"
4208 #: builtin/commit.c:642 builtin/shortlog.c:273
4210 msgid "(reading log message from standard input)\n"
4211 msgstr "(正从标准输入中读取日志信息)\n"
4213 #: builtin/commit.c:644
4214 msgid "could not read log from standard input"
4215 msgstr "不能从标准输入中读取日志信息"
4217 #: builtin/commit.c:648
4219 msgid "could not read log file '%s'"
4220 msgstr "不能读取日志文件 '%s'"
4222 #: builtin/commit.c:654
4223 msgid "commit has empty message"
4226 #: builtin/commit.c:670
4227 msgid "could not read MERGE_MSG"
4228 msgstr "不能读取 MERGE_MSG"
4230 #: builtin/commit.c:674
4231 msgid "could not read SQUASH_MSG"
4232 msgstr "不能读取 SQUASH_MSG"
4234 #: builtin/commit.c:678
4236 msgid "could not read '%s'"
4239 #: builtin/commit.c:749
4240 msgid "could not write commit template"
4243 #: builtin/commit.c:760
4247 "It looks like you may be committing a merge.\n"
4248 "If this is not correct, please remove the file\n"
4253 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4257 #: builtin/commit.c:765
4261 "It looks like you may be committing a cherry-pick.\n"
4262 "If this is not correct, please remove the file\n"
4267 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4271 #: builtin/commit.c:777
4274 "Please enter the commit message for your changes. Lines starting\n"
4275 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4277 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4280 #: builtin/commit.c:782
4283 "Please enter the commit message for your changes. Lines starting\n"
4284 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4285 "An empty message aborts the commit.\n"
4287 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4288 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4290 # 译者:为保证在输出中对齐,注意调整句中空格!
4291 #: builtin/commit.c:795
4293 msgid "%sAuthor: %s"
4296 # 译者:为保证在输出中对齐,注意调整句中空格!
4297 #: builtin/commit.c:802
4299 msgid "%sCommitter: %s"
4302 #: builtin/commit.c:822
4303 msgid "Cannot read index"
4306 #: builtin/commit.c:865
4307 msgid "Error building trees"
4310 #: builtin/commit.c:880 builtin/tag.c:359
4312 msgid "Please supply the message using either -m or -F option.\n"
4313 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4315 #: builtin/commit.c:982
4317 msgid "No existing author found with '%s'"
4318 msgstr "没有找到匹配 '%s' 的作者"
4320 #: builtin/commit.c:997 builtin/commit.c:1237
4322 msgid "Invalid untracked files mode '%s'"
4323 msgstr "无效的未追踪文件参数 '%s'"
4325 #: builtin/commit.c:1034
4326 msgid "--long and -z are incompatible"
4327 msgstr "--long 和 -z 选项不兼容"
4329 #: builtin/commit.c:1064
4330 msgid "Using both --reset-author and --author does not make sense"
4331 msgstr "同时使用 --reset-author 和 --author 没有意义"
4333 #: builtin/commit.c:1075
4334 msgid "You have nothing to amend."
4337 #: builtin/commit.c:1078
4338 msgid "You are in the middle of a merge -- cannot amend."
4339 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4341 #: builtin/commit.c:1080
4342 msgid "You are in the middle of a cherry-pick -- cannot amend."
4343 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4345 #: builtin/commit.c:1083
4346 msgid "Options --squash and --fixup cannot be used together"
4347 msgstr "选项 --squash 和 --fixup 不能同时使用"
4349 #: builtin/commit.c:1093
4350 msgid "Only one of -c/-C/-F/--fixup can be used."
4351 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4353 #: builtin/commit.c:1095
4354 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4355 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4357 #: builtin/commit.c:1103
4358 msgid "--reset-author can be used only with -C, -c or --amend."
4359 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4361 #: builtin/commit.c:1120
4362 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4363 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4365 #: builtin/commit.c:1122
4366 msgid "No paths with --include/--only does not make sense."
4367 msgstr "参数 --include/--only 不跟路径没有意义。"
4369 #: builtin/commit.c:1124
4370 msgid "Clever... amending the last one with dirty index."
4371 msgstr "聪明... 在索引不干净下修补最后的提交。"
4373 #: builtin/commit.c:1126
4374 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
4375 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
4377 #: builtin/commit.c:1136 builtin/tag.c:572
4379 msgid "Invalid cleanup mode %s"
4382 #: builtin/commit.c:1141
4383 msgid "Paths with -a does not make sense."
4384 msgstr "路径和 -a 选项同时使用没有意义。"
4386 #: builtin/commit.c:1251 builtin/commit.c:1482
4387 msgid "show status concisely"
4390 #: builtin/commit.c:1253 builtin/commit.c:1484
4391 msgid "show branch information"
4394 #: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507
4395 msgid "machine-readable output"
4398 #: builtin/commit.c:1258 builtin/commit.c:1488
4399 msgid "show status in long format (default)"
4400 msgstr "以长格式显示状态(默认)"
4402 #: builtin/commit.c:1261 builtin/commit.c:1491
4403 msgid "terminate entries with NUL"
4406 #: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
4407 #: builtin/fast-export.c:677 builtin/tag.c:459
4411 #: builtin/commit.c:1264 builtin/commit.c:1494
4412 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4413 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4415 #: builtin/commit.c:1267
4416 msgid "show ignored files"
4419 #: builtin/commit.c:1268 parse-options.h:156
4423 #: builtin/commit.c:1269
4425 "ignore changes to submodules, optional when: all, dirty, untracked. "
4428 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4430 #: builtin/commit.c:1271
4431 msgid "list untracked files in columns"
4432 msgstr "以列的方式显示未跟踪的文件"
4434 #: builtin/commit.c:1340
4435 msgid "couldn't look up newly created commit"
4438 #: builtin/commit.c:1342
4439 msgid "could not parse newly created commit"
4442 #: builtin/commit.c:1383
4443 msgid "detached HEAD"
4446 # 译者:中文字符串拼接,可删除前导空格
4447 #: builtin/commit.c:1385
4448 msgid " (root-commit)"
4451 #: builtin/commit.c:1452
4452 msgid "suppress summary after successful commit"
4453 msgstr "提交成功后不显示概述信息"
4455 #: builtin/commit.c:1453
4456 msgid "show diff in commit message template"
4457 msgstr "在提交说明模板里显示差异"
4459 #: builtin/commit.c:1455
4460 msgid "Commit message options"
4463 #: builtin/commit.c:1456 builtin/tag.c:457
4464 msgid "read message from file"
4467 #: builtin/commit.c:1457
4471 #: builtin/commit.c:1457
4472 msgid "override author for commit"
4475 #: builtin/commit.c:1458 builtin/gc.c:261
4479 #: builtin/commit.c:1458
4480 msgid "override date for commit"
4483 #: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405
4484 #: builtin/notes.c:562 builtin/tag.c:455
4488 #: builtin/commit.c:1459
4489 msgid "commit message"
4492 #: builtin/commit.c:1460
4493 msgid "reuse and edit message from specified commit"
4494 msgstr "重用并编辑指定提交的提交说明"
4496 #: builtin/commit.c:1461
4497 msgid "reuse message from specified commit"
4498 msgstr "重用指定提交的提交说明"
4500 #: builtin/commit.c:1462
4501 msgid "use autosquash formatted message to fixup specified commit"
4502 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4504 #: builtin/commit.c:1463
4505 msgid "use autosquash formatted message to squash specified commit"
4506 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4508 #: builtin/commit.c:1464
4509 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4510 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4512 #: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
4513 msgid "add Signed-off-by:"
4514 msgstr "添加 Signed-off-by: 签名"
4516 #: builtin/commit.c:1466
4517 msgid "use specified template file"
4520 #: builtin/commit.c:1467
4521 msgid "force edit of commit"
4524 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4525 #: builtin/commit.c:1468
4529 #: builtin/commit.c:1468 builtin/tag.c:460
4530 msgid "how to strip spaces and #comments from message"
4531 msgstr "设置如何删除提交说明里的空格和#注释"
4533 #: builtin/commit.c:1469
4534 msgid "include status in commit message template"
4535 msgstr "在提交说明模板里包含状态信息"
4537 #: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461
4541 #: builtin/commit.c:1471 builtin/merge.c:224
4542 msgid "GPG sign commit"
4545 #. end commit message options
4546 #: builtin/commit.c:1474
4547 msgid "Commit contents options"
4550 #: builtin/commit.c:1475
4551 msgid "commit all changed files"
4554 #: builtin/commit.c:1476
4555 msgid "add specified files to index for commit"
4556 msgstr "添加指定的文件到索引区等待提交"
4558 #: builtin/commit.c:1477
4559 msgid "interactively add files"
4562 #: builtin/commit.c:1478
4563 msgid "interactively add changes"
4566 #: builtin/commit.c:1479
4567 msgid "commit only specified files"
4570 #: builtin/commit.c:1480
4571 msgid "bypass pre-commit hook"
4572 msgstr "绕过 pre-commit 钩子"
4574 #: builtin/commit.c:1481
4575 msgid "show what would be committed"
4578 #: builtin/commit.c:1492
4579 msgid "amend previous commit"
4582 #: builtin/commit.c:1493
4583 msgid "bypass post-rewrite hook"
4584 msgstr "绕过 post-rewrite 钩子"
4586 #: builtin/commit.c:1498
4587 msgid "ok to record an empty change"
4590 #: builtin/commit.c:1500
4591 msgid "ok to record a change with an empty message"
4594 #: builtin/commit.c:1529
4595 msgid "could not parse HEAD commit"
4596 msgstr "不能解析 HEAD 提交"
4598 #: builtin/commit.c:1567 builtin/merge.c:518
4600 msgid "could not open '%s' for reading"
4601 msgstr "不能为读入打开 '%s'"
4603 #: builtin/commit.c:1574
4605 msgid "Corrupt MERGE_HEAD file (%s)"
4606 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4608 #: builtin/commit.c:1581
4609 msgid "could not read MERGE_MODE"
4610 msgstr "不能读取 MERGE_MODE"
4612 #: builtin/commit.c:1600
4614 msgid "could not read commit message: %s"
4615 msgstr "不能读取提交说明:%s"
4617 #: builtin/commit.c:1611
4619 msgid "Aborting commit; you did not edit the message.\n"
4620 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4622 #: builtin/commit.c:1616
4624 msgid "Aborting commit due to empty commit message.\n"
4625 msgstr "终止提交因为提交说明为空。\n"
4627 #: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879
4628 msgid "failed to write commit object"
4631 #: builtin/commit.c:1652
4632 msgid "cannot lock HEAD ref"
4633 msgstr "无法锁定 HEAD 引用"
4635 #: builtin/commit.c:1656
4636 msgid "cannot update HEAD ref"
4637 msgstr "无法更新 HEAD 引用"
4639 #: builtin/commit.c:1667
4641 "Repository has been updated, but unable to write\n"
4642 "new_index file. Check that disk is not full or quota is\n"
4643 "not exceeded, and then \"git reset HEAD\" to recover."
4645 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4646 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4648 #: builtin/config.c:8
4649 msgid "git config [options]"
4650 msgstr "git config [选项]"
4652 #: builtin/config.c:54
4653 msgid "Config file location"
4656 #: builtin/config.c:55
4657 msgid "use global config file"
4660 #: builtin/config.c:56
4661 msgid "use system config file"
4664 #: builtin/config.c:57
4665 msgid "use repository config file"
4668 #: builtin/config.c:58
4669 msgid "use given config file"
4672 #: builtin/config.c:59
4676 #: builtin/config.c:59
4677 msgid "read config from given blob object"
4678 msgstr "从给定的数据对象读取配置"
4680 #: builtin/config.c:60
4684 #: builtin/config.c:61
4685 msgid "get value: name [value-regex]"
4686 msgstr "获取值:name [value-regex]"
4688 #: builtin/config.c:62
4689 msgid "get all values: key [value-regex]"
4690 msgstr "获得所有的值:key [value-regex]"
4692 #: builtin/config.c:63
4693 msgid "get values for regexp: name-regex [value-regex]"
4694 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4696 #: builtin/config.c:64
4697 msgid "get value specific for the URL: section[.var] URL"
4698 msgstr "获得 URL 取值:section[.var] URL"
4700 #: builtin/config.c:65
4701 msgid "replace all matching variables: name value [value_regex]"
4702 msgstr "替换所有匹配的变量:name value [value_regex]"
4704 #: builtin/config.c:66
4705 msgid "add a new variable: name value"
4706 msgstr "添加一个新的变量:name value"
4708 #: builtin/config.c:67
4709 msgid "remove a variable: name [value-regex]"
4710 msgstr "删除一个变量:name [value-regex]"
4712 #: builtin/config.c:68
4713 msgid "remove all matches: name [value-regex]"
4714 msgstr "删除所有匹配项:name [value-regex]"
4716 #: builtin/config.c:69
4717 msgid "rename section: old-name new-name"
4718 msgstr "重命名小节:old-name new-name"
4720 #: builtin/config.c:70
4721 msgid "remove a section: name"
4722 msgstr "删除一个小节:name"
4724 #: builtin/config.c:71
4728 #: builtin/config.c:72
4729 msgid "open an editor"
4732 #: builtin/config.c:73 builtin/config.c:74
4736 #: builtin/config.c:73
4737 msgid "find the color configured: [default]"
4738 msgstr "找到配置的颜色:[默认]"
4740 #: builtin/config.c:74
4741 msgid "find the color setting: [stdout-is-tty]"
4742 msgstr "找到颜色设置:[stdout-is-tty]"
4744 #: builtin/config.c:75
4748 #: builtin/config.c:76
4749 msgid "value is \"true\" or \"false\""
4750 msgstr "值是 \"true\" 或 \"false\""
4752 #: builtin/config.c:77
4753 msgid "value is decimal number"
4756 #: builtin/config.c:78
4757 msgid "value is --bool or --int"
4758 msgstr "值是 --bool or --int"
4760 #: builtin/config.c:79
4761 msgid "value is a path (file or directory name)"
4762 msgstr "值是一个路径(文件或目录名)"
4764 #: builtin/config.c:80
4768 #: builtin/config.c:81
4769 msgid "terminate values with NUL byte"
4772 #: builtin/config.c:82
4773 msgid "respect include directives on lookup"
4774 msgstr "查询时参照 include 指令递归查找"
4776 #: builtin/count-objects.c:82
4777 msgid "git count-objects [-v] [-H | --human-readable]"
4778 msgstr "git count-objects [-v] [-H | --human-readable]"
4780 #: builtin/count-objects.c:97
4781 msgid "print sizes in human readable format"
4782 msgstr "以用户可读的格式显示大小"
4784 #: builtin/describe.c:16
4785 msgid "git describe [options] <commit-ish>*"
4786 msgstr "git describe [选项] <提交号>*"
4788 #: builtin/describe.c:17
4789 msgid "git describe [options] --dirty"
4790 msgstr "git describe [选项] --dirty"
4792 #: builtin/describe.c:237
4794 msgid "annotated tag %s not available"
4795 msgstr "注释 tag %s 无效"
4797 #: builtin/describe.c:241
4799 msgid "annotated tag %s has no embedded name"
4800 msgstr "注释 tag %s 没有嵌入名称"
4802 #: builtin/describe.c:243
4804 msgid "tag '%s' is really '%s' here"
4805 msgstr "tag '%s' 的确是在 '%s'"
4807 #: builtin/describe.c:270
4809 msgid "Not a valid object name %s"
4810 msgstr "不是一个有效的对象名 %s"
4812 #: builtin/describe.c:273
4814 msgid "%s is not a valid '%s' object"
4815 msgstr "%s 不是一个有效的 '%s' 对象"
4817 #: builtin/describe.c:290
4819 msgid "no tag exactly matches '%s'"
4820 msgstr "没有 tag 准确匹配 '%s'"
4822 #: builtin/describe.c:292
4824 msgid "searching to describe %s\n"
4827 #: builtin/describe.c:332
4829 msgid "finished search at %s\n"
4832 #: builtin/describe.c:359
4835 "No annotated tags can describe '%s'.\n"
4836 "However, there were unannotated tags: try --tags."
4838 "没有注释 tag 能描述 '%s'。\n"
4839 "然而,有非注释 tag:尝试 --tags。"
4841 #: builtin/describe.c:363
4844 "No tags can describe '%s'.\n"
4845 "Try --always, or create some tags."
4847 "没有注释 tag 能描述 '%s'。\n"
4848 "尝试 --always,或者创建一些 tag。"
4850 #: builtin/describe.c:384
4852 msgid "traversed %lu commits\n"
4853 msgstr "已遍历 %lu 个提交\n"
4855 #: builtin/describe.c:387
4858 "more than %i tags found; listed %i most recent\n"
4859 "gave up search at %s\n"
4861 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4864 #: builtin/describe.c:409
4865 msgid "find the tag that comes after the commit"
4866 msgstr "寻找提交之后的 tag(用于描述提交)"
4868 #: builtin/describe.c:410
4869 msgid "debug search strategy on stderr"
4870 msgstr "在标准错误上调试搜索策略"
4872 #: builtin/describe.c:411
4876 #: builtin/describe.c:412
4877 msgid "use any tag, even unannotated"
4878 msgstr "使用任意 tag,即使未带注解"
4880 #: builtin/describe.c:413
4881 msgid "always use long format"
4884 #: builtin/describe.c:414
4885 msgid "only follow first parent"
4888 #: builtin/describe.c:417
4889 msgid "only output exact matches"
4892 #: builtin/describe.c:419
4893 msgid "consider <n> most recent tags (default: 10)"
4894 msgstr "考虑最近 <n> 个 tags(默认:10)"
4896 #: builtin/describe.c:421
4897 msgid "only consider tags matching <pattern>"
4898 msgstr "只考虑匹配 <模式> 的 tags"
4900 #: builtin/describe.c:423 builtin/name-rev.c:321
4901 msgid "show abbreviated commit object as fallback"
4902 msgstr "显示简写的提交号作为后备"
4904 #: builtin/describe.c:424
4908 #: builtin/describe.c:425
4909 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4910 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4912 #: builtin/describe.c:443
4913 msgid "--long is incompatible with --abbrev=0"
4914 msgstr "--long 与 --abbrev=0 不兼容"
4916 #: builtin/describe.c:469
4917 msgid "No names found, cannot describe anything."
4918 msgstr "没有发现名称,无法描述任何东西。"
4920 #: builtin/describe.c:489
4921 msgid "--dirty is incompatible with commit-ishes"
4922 msgstr "--dirty 不能与提交同时使用"
4924 #: builtin/diff.c:85
4926 msgid "'%s': not a regular file or symlink"
4927 msgstr "'%s':不是一个正规文件或符号链接"
4929 #: builtin/diff.c:236
4931 msgid "invalid option: %s"
4934 #: builtin/diff.c:357
4935 msgid "Not a git repository"
4936 msgstr "不是一个 git 版本库"
4938 #: builtin/diff.c:400
4940 msgid "invalid object '%s' given."
4941 msgstr "提供了无效对象 '%s'。"
4943 #: builtin/diff.c:409
4945 msgid "more than two blobs given: '%s'"
4946 msgstr "提供了超过两个数据(blob)对象:'%s'"
4948 #: builtin/diff.c:416
4950 msgid "unhandled object '%s' given."
4951 msgstr "提供了无法处理的对象 '%s'。"
4953 #: builtin/fast-export.c:22
4954 msgid "git fast-export [rev-list-opts]"
4955 msgstr "git fast-export [rev-list-opts]"
4957 #: builtin/fast-export.c:673
4958 msgid "show progress after <n> objects"
4959 msgstr "在 <n> 个对象之后显示进度"
4961 #: builtin/fast-export.c:675
4962 msgid "select handling of signed tags"
4963 msgstr "选择如何处理签名 tags"
4965 #: builtin/fast-export.c:678
4966 msgid "select handling of tags that tag filtered objects"
4967 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4969 #: builtin/fast-export.c:681
4970 msgid "Dump marks to this file"
4973 #: builtin/fast-export.c:683
4974 msgid "Import marks from this file"
4977 #: builtin/fast-export.c:685
4978 msgid "Fake a tagger when tags lack one"
4979 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4981 #: builtin/fast-export.c:687
4982 msgid "Output full tree for each commit"
4985 #: builtin/fast-export.c:689
4986 msgid "Use the done feature to terminate the stream"
4987 msgstr "使用 done 功能来终止流"
4989 #: builtin/fast-export.c:690
4990 msgid "Skip output of blob data"
4993 #: builtin/fetch.c:20
4994 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4995 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
4997 #: builtin/fetch.c:21
4998 msgid "git fetch [<options>] <group>"
4999 msgstr "git fetch [<选项>] <组>"
5001 #: builtin/fetch.c:22
5002 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5003 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5005 #: builtin/fetch.c:23
5006 msgid "git fetch --all [<options>]"
5007 msgstr "git fetch --all [<选项>]"
5009 #: builtin/fetch.c:75
5010 msgid "fetch from all remotes"
5013 #: builtin/fetch.c:77
5014 msgid "append to .git/FETCH_HEAD instead of overwriting"
5015 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5017 #: builtin/fetch.c:79
5018 msgid "path to upload pack on remote end"
5021 #: builtin/fetch.c:80
5022 msgid "force overwrite of local branch"
5025 #: builtin/fetch.c:82
5026 msgid "fetch from multiple remotes"
5029 #: builtin/fetch.c:84
5030 msgid "fetch all tags and associated objects"
5031 msgstr "抓取所有的 tags 和关联对象"
5033 #: builtin/fetch.c:86
5034 msgid "do not fetch all tags (--no-tags)"
5035 msgstr "不抓取任何 tags (--no-tags)"
5037 #: builtin/fetch.c:88
5038 msgid "prune remote-tracking branches no longer on remote"
5039 msgstr "清除远程已经不存在的分支的跟踪分支"
5042 #: builtin/fetch.c:89
5046 #: builtin/fetch.c:90
5047 msgid "control recursive fetching of submodules"
5050 #: builtin/fetch.c:94
5051 msgid "keep downloaded pack"
5054 #: builtin/fetch.c:96
5055 msgid "allow updating of HEAD ref"
5056 msgstr "允许更新 HEAD 引用"
5058 #: builtin/fetch.c:99
5059 msgid "deepen history of shallow clone"
5062 #: builtin/fetch.c:101
5063 msgid "convert to a complete repository"
5064 msgstr "转换为一个完整的版本库"
5066 #: builtin/fetch.c:103 builtin/log.c:1197
5070 #: builtin/fetch.c:104
5071 msgid "prepend this to submodule path output"
5072 msgstr "在子模组路径输出的前面加上此目录"
5074 #: builtin/fetch.c:107
5075 msgid "default mode for recursion"
5078 #: builtin/fetch.c:109
5079 msgid "accept refs that update .git/shallow"
5080 msgstr "接受更新 .git/shallow 的引用"
5082 #: builtin/fetch.c:347
5083 msgid "Couldn't find remote ref HEAD"
5084 msgstr "无法发现远程 HEAD 引用"
5086 #: builtin/fetch.c:411
5088 msgid "object %s not found"
5091 #: builtin/fetch.c:416
5092 msgid "[up to date]"
5095 #: builtin/fetch.c:430
5097 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5098 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5100 #: builtin/fetch.c:431 builtin/fetch.c:517
5104 #: builtin/fetch.c:442
5105 msgid "[tag update]"
5109 #: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
5110 msgid " (unable to update local ref)"
5111 msgstr " (不能更新本地引用)"
5113 #: builtin/fetch.c:462
5117 #: builtin/fetch.c:465
5118 msgid "[new branch]"
5121 #: builtin/fetch.c:468
5125 #: builtin/fetch.c:513
5126 msgid "unable to update local ref"
5129 #: builtin/fetch.c:513
5130 msgid "forced update"
5133 #: builtin/fetch.c:519
5134 msgid "(non-fast-forward)"
5137 #: builtin/fetch.c:552 builtin/fetch.c:785
5139 msgid "cannot open %s: %s\n"
5140 msgstr "无法打开 %s:%s\n"
5142 #: builtin/fetch.c:561
5144 msgid "%s did not send all necessary objects\n"
5145 msgstr "%s 未发送所有必须的对象\n"
5147 #: builtin/fetch.c:579
5149 msgid "reject %s because shallow roots are not allowed to be updated"
5150 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5152 #: builtin/fetch.c:667 builtin/fetch.c:750
5157 #: builtin/fetch.c:678
5160 "some local refs could not be updated; try running\n"
5161 " 'git remote prune %s' to remove any old, conflicting branches"
5163 "一些本地引用不能被更新;尝试运行\n"
5164 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5167 #: builtin/fetch.c:730
5169 msgid " (%s will become dangling)"
5170 msgstr " (%s 将成为摇摆状态)"
5173 #: builtin/fetch.c:731
5175 msgid " (%s has become dangling)"
5176 msgstr " (%s 已成为摇摆状态)"
5178 #: builtin/fetch.c:755
5182 #: builtin/fetch.c:756 builtin/remote.c:1050
5186 #: builtin/fetch.c:775
5188 msgid "Refusing to fetch into current branch %s of non-bare repository"
5189 msgstr "拒绝获取到非裸版本库的当前分支 %s"
5191 #: builtin/fetch.c:794
5193 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5194 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5196 #: builtin/fetch.c:797
5198 msgid "Option \"%s\" is ignored for %s\n"
5199 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5201 #: builtin/fetch.c:853
5203 msgid "Don't know how to fetch from %s"
5204 msgstr "不知道如何从 %s 获取"
5206 #: builtin/fetch.c:1015
5208 msgid "Fetching %s\n"
5211 #: builtin/fetch.c:1017 builtin/remote.c:90
5213 msgid "Could not fetch %s"
5216 #: builtin/fetch.c:1036
5218 "No remote repository specified. Please, specify either a URL or a\n"
5219 "remote name from which new revisions should be fetched."
5220 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5222 #: builtin/fetch.c:1059
5223 msgid "You need to specify a tag name."
5224 msgstr "您需要指定一个 tag 名称。"
5226 #: builtin/fetch.c:1107
5227 msgid "--depth and --unshallow cannot be used together"
5228 msgstr "--depth 和 --unshallow 不能同时使用"
5230 #: builtin/fetch.c:1109
5231 msgid "--unshallow on a complete repository does not make sense"
5232 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5234 #: builtin/fetch.c:1132
5235 msgid "fetch --all does not take a repository argument"
5236 msgstr "fetch --all 不能带一个版本库参数"
5238 #: builtin/fetch.c:1134
5239 msgid "fetch --all does not make sense with refspecs"
5240 msgstr "fetch --all 带引用规则没有任何意义"
5242 #: builtin/fetch.c:1145
5244 msgid "No such remote or remote group: %s"
5245 msgstr "没有这样的远程或远程组:%s"
5247 #: builtin/fetch.c:1153
5248 msgid "Fetching a group and specifying refspecs does not make sense"
5249 msgstr "获取组并指定引用规则没有意义"
5251 #: builtin/fmt-merge-msg.c:13
5252 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5254 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5256 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
5257 #: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178
5258 #: builtin/tag.c:446 parse-options.h:135 parse-options.h:242
5262 #: builtin/fmt-merge-msg.c:664
5263 msgid "populate log with at most <n> entries from shortlog"
5264 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5266 #: builtin/fmt-merge-msg.c:667
5267 msgid "alias for --log (deprecated)"
5268 msgstr "参数 --log 的别名(已弃用)"
5270 #: builtin/fmt-merge-msg.c:670
5274 #: builtin/fmt-merge-msg.c:671
5275 msgid "use <text> as start of message"
5276 msgstr "使用 <文本> 作为提交说明的开始"
5278 #: builtin/fmt-merge-msg.c:672
5279 msgid "file to read from"
5282 #: builtin/for-each-ref.c:1063
5283 msgid "git for-each-ref [options] [<pattern>]"
5284 msgstr "git for-each-ref [选项] [<模式>]"
5286 #: builtin/for-each-ref.c:1078
5287 msgid "quote placeholders suitably for shells"
5288 msgstr "引用占位符适用于 shells"
5290 #: builtin/for-each-ref.c:1080
5291 msgid "quote placeholders suitably for perl"
5292 msgstr "引用占位符适用于 perl"
5294 #: builtin/for-each-ref.c:1082
5295 msgid "quote placeholders suitably for python"
5296 msgstr "引用占位符适用于 python"
5298 #: builtin/for-each-ref.c:1084
5299 msgid "quote placeholders suitably for tcl"
5300 msgstr "引用占位符适用于 tcl"
5302 #: builtin/for-each-ref.c:1087
5303 msgid "show only <n> matched refs"
5304 msgstr "只显示 <n> 个匹配的引用"
5306 #: builtin/for-each-ref.c:1088 builtin/replace.c:177
5310 #: builtin/for-each-ref.c:1088
5311 msgid "format to use for the output"
5314 #: builtin/for-each-ref.c:1089
5318 #: builtin/for-each-ref.c:1090
5319 msgid "field name to sort on"
5322 #: builtin/fsck.c:607
5323 msgid "git fsck [options] [<object>...]"
5324 msgstr "git fsck [选项] [<对象>...]"
5326 #: builtin/fsck.c:613
5327 msgid "show unreachable objects"
5330 #: builtin/fsck.c:614
5331 msgid "show dangling objects"
5334 #: builtin/fsck.c:615
5338 #: builtin/fsck.c:616
5339 msgid "report root nodes"
5342 #: builtin/fsck.c:617
5343 msgid "make index objects head nodes"
5344 msgstr "将索引亦作为检查的头节点"
5346 #: builtin/fsck.c:618
5347 msgid "make reflogs head nodes (default)"
5348 msgstr "将引用日志作为检查的头节点(默认)"
5350 #: builtin/fsck.c:619
5351 msgid "also consider packs and alternate objects"
5354 #: builtin/fsck.c:620
5355 msgid "enable more strict checking"
5358 #: builtin/fsck.c:622
5359 msgid "write dangling objects in .git/lost-found"
5360 msgstr "将摇摆对象写入 .git/lost-found 中"
5362 #: builtin/fsck.c:623 builtin/prune.c:144
5363 msgid "show progress"
5367 msgid "git gc [options]"
5368 msgstr "git gc [选项]"
5372 msgid "Invalid %s: '%s'"
5373 msgstr "无效的 %s:'%s'"
5377 msgid "insanely long object directory %.*s"
5378 msgstr "不正常的长对象目录 %.*s"
5381 msgid "prune unreferenced objects"
5385 msgid "be more thorough (increased runtime)"
5386 msgstr "更彻底(增加运行时间)"
5389 msgid "enable auto-gc mode"
5393 msgid "force running gc even if there may be another gc running"
5394 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5399 "Auto packing the repository for optimum performance. You may also\n"
5400 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
5402 "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
5403 "参见 \"git help gc\" 以获取更多信息。\n"
5405 #. be quiet on --auto
5409 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5411 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5415 "There are too many unreachable loose objects; run 'git prune' to remove them."
5416 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5418 #: builtin/grep.c:23
5419 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5420 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5422 #: builtin/grep.c:218
5424 msgid "grep: failed to create thread: %s"
5425 msgstr "grep:无法创建线程:%s"
5427 #: builtin/grep.c:365
5429 msgid "Failed to chdir: %s"
5432 #: builtin/grep.c:443 builtin/grep.c:478
5434 msgid "unable to read tree (%s)"
5437 #: builtin/grep.c:493
5439 msgid "unable to grep from object of type %s"
5440 msgstr "无法抓取来自于 %s 类型的对象"
5442 #: builtin/grep.c:551
5444 msgid "switch `%c' expects a numerical value"
5445 msgstr "开关 `%c' 期望一个数字值"
5447 #: builtin/grep.c:568
5449 msgid "cannot open '%s'"
5452 #: builtin/grep.c:642
5453 msgid "search in index instead of in the work tree"
5454 msgstr "在索引区搜索而不是在工作区"
5456 #: builtin/grep.c:644
5457 msgid "find in contents not managed by git"
5458 msgstr "在未被 git 管理的内容中查找"
5460 # 译者:中文字符串拼接,可删除前导空格
5461 #: builtin/grep.c:646
5462 msgid "search in both tracked and untracked files"
5463 msgstr "在跟踪和未跟踪的文件中搜索"
5465 #: builtin/grep.c:648
5466 msgid "search also in ignored files"
5469 #: builtin/grep.c:651
5470 msgid "show non-matching lines"
5473 #: builtin/grep.c:653
5474 msgid "case insensitive matching"
5477 #: builtin/grep.c:655
5478 msgid "match patterns only at word boundaries"
5481 #: builtin/grep.c:657
5482 msgid "process binary files as text"
5483 msgstr "把二进制文件当做文本处理"
5485 #: builtin/grep.c:659
5486 msgid "don't match patterns in binary files"
5487 msgstr "不在二进制文件中匹配模式"
5489 #: builtin/grep.c:662
5490 msgid "process binary files with textconv filters"
5491 msgstr "用 textconv 过滤器处理二进制文件"
5493 #: builtin/grep.c:664
5494 msgid "descend at most <depth> levels"
5495 msgstr "最多以指定的深度向下寻找"
5497 #: builtin/grep.c:668
5498 msgid "use extended POSIX regular expressions"
5499 msgstr "使用扩展的 POSIX 正则表达式"
5501 #: builtin/grep.c:671
5502 msgid "use basic POSIX regular expressions (default)"
5503 msgstr "使用基本的 POSIX 正则表达式(默认)"
5505 #: builtin/grep.c:674
5506 msgid "interpret patterns as fixed strings"
5507 msgstr "把模式解析为固定的字符串"
5509 #: builtin/grep.c:677
5510 msgid "use Perl-compatible regular expressions"
5511 msgstr "使用 Perl 兼容的正则表达式"
5513 #: builtin/grep.c:680
5514 msgid "show line numbers"
5517 #: builtin/grep.c:681
5518 msgid "don't show filenames"
5521 #: builtin/grep.c:682
5522 msgid "show filenames"
5525 #: builtin/grep.c:684
5526 msgid "show filenames relative to top directory"
5527 msgstr "显示相对于顶级目录的文件名"
5529 #: builtin/grep.c:686
5530 msgid "show only filenames instead of matching lines"
5531 msgstr "只显示文件名而不显示匹配的行"
5533 #: builtin/grep.c:688
5534 msgid "synonym for --files-with-matches"
5535 msgstr "和 --files-with-matches 同义"
5537 #: builtin/grep.c:691
5538 msgid "show only the names of files without match"
5541 #: builtin/grep.c:693
5542 msgid "print NUL after filenames"
5543 msgstr "在文件名后输出 NUL 字符"
5545 #: builtin/grep.c:695
5546 msgid "show the number of matches instead of matching lines"
5547 msgstr "显示总匹配行数,而不显示匹配的行"
5549 #: builtin/grep.c:696
5550 msgid "highlight matches"
5553 #: builtin/grep.c:698
5554 msgid "print empty line between matches from different files"
5555 msgstr "在不同文件的匹配项之间打印空行"
5557 #: builtin/grep.c:700
5558 msgid "show filename only once above matches from same file"
5559 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5561 #: builtin/grep.c:703
5562 msgid "show <n> context lines before and after matches"
5563 msgstr "显示匹配项前后的 <n> 行上下文"
5565 #: builtin/grep.c:706
5566 msgid "show <n> context lines before matches"
5567 msgstr "显示匹配项前 <n> 行上下文"
5569 #: builtin/grep.c:708
5570 msgid "show <n> context lines after matches"
5571 msgstr "显示匹配项后 <n> 行上下文"
5573 #: builtin/grep.c:709
5574 msgid "shortcut for -C NUM"
5577 #: builtin/grep.c:712
5578 msgid "show a line with the function name before matches"
5579 msgstr "在匹配的前面显示一行函数名"
5581 #: builtin/grep.c:714
5582 msgid "show the surrounding function"
5583 msgstr "显示所在函数的前后内容"
5585 #: builtin/grep.c:717
5586 msgid "read patterns from file"
5589 #: builtin/grep.c:719
5590 msgid "match <pattern>"
5593 #: builtin/grep.c:721
5594 msgid "combine patterns specified with -e"
5595 msgstr "组合用 -e 参数设定的模式"
5597 #: builtin/grep.c:733
5598 msgid "indicate hit with exit status without output"
5599 msgstr "不输出,而用退出码标识命中状态"
5601 #: builtin/grep.c:735
5602 msgid "show only matches from files that match all patterns"
5603 msgstr "只显示匹配所有模式的文件中的匹配"
5605 #: builtin/grep.c:737
5606 msgid "show parse tree for grep expression"
5607 msgstr "显示 grep 表达式的解析树"
5609 #: builtin/grep.c:741
5613 #: builtin/grep.c:741
5614 msgid "show matching files in the pager"
5617 #: builtin/grep.c:744
5618 msgid "allow calling of grep(1) (ignored by this build)"
5619 msgstr "允许调用 grep(1)(本次构建忽略)"
5621 #: builtin/grep.c:745 builtin/show-ref.c:187
5625 #: builtin/grep.c:812
5626 msgid "no pattern given."
5629 #: builtin/grep.c:870
5630 msgid "--open-files-in-pager only works on the worktree"
5631 msgstr "--open-files-in-pager 仅用于工作区"
5633 #: builtin/grep.c:893
5634 msgid "--cached or --untracked cannot be used with --no-index."
5635 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5637 #: builtin/grep.c:898
5638 msgid "--no-index or --untracked cannot be used with revs."
5639 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5641 #: builtin/grep.c:901
5642 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5643 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5645 #: builtin/grep.c:909
5646 msgid "both --cached and trees are given."
5647 msgstr "同时给出了 --cached 和树对象。"
5649 #: builtin/hash-object.c:60
5651 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5654 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5657 #: builtin/hash-object.c:61
5658 msgid "git hash-object --stdin-paths < <list-of-paths>"
5659 msgstr "git hash-object --stdin-paths < <路径列表>"
5661 #: builtin/hash-object.c:72
5665 #: builtin/hash-object.c:72
5669 #: builtin/hash-object.c:73
5670 msgid "write the object into the object database"
5673 #: builtin/hash-object.c:74
5674 msgid "read the object from stdin"
5677 #: builtin/hash-object.c:76
5678 msgid "store file as is without filters"
5679 msgstr "原样存储文件不使用过滤器"
5681 #: builtin/hash-object.c:77
5682 msgid "process file as it were from this path"
5683 msgstr "处理文件并假设其来自于此路径"
5685 #: builtin/help.c:41
5686 msgid "print all available commands"
5689 #: builtin/help.c:42
5690 msgid "print list of useful guides"
5693 #: builtin/help.c:43
5694 msgid "show man page"
5697 #: builtin/help.c:44
5698 msgid "show manual in web browser"
5699 msgstr "在 web 浏览器中显示手册"
5701 #: builtin/help.c:46
5702 msgid "show info page"
5705 #: builtin/help.c:52
5706 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5707 msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5709 #: builtin/help.c:64
5711 msgid "unrecognized help format '%s'"
5712 msgstr "未能识别的帮助格式 '%s'"
5714 #: builtin/help.c:92
5715 msgid "Failed to start emacsclient."
5716 msgstr "无法启动 emacsclient。"
5718 #: builtin/help.c:105
5719 msgid "Failed to parse emacsclient version."
5720 msgstr "无法解析 emacsclient 版本。"
5722 #: builtin/help.c:113
5724 msgid "emacsclient version '%d' too old (< 22)."
5725 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5727 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5729 msgid "failed to exec '%s': %s"
5730 msgstr "无法执行 '%s':%s"
5732 #: builtin/help.c:216
5735 "'%s': path for unsupported man viewer.\n"
5736 "Please consider using 'man.<tool>.cmd' instead."
5738 "'%s':不支持的 man 手册查看器的路径。\n"
5739 "请使用 'man.<tool>.cmd'。"
5741 #: builtin/help.c:228
5744 "'%s': cmd for supported man viewer.\n"
5745 "Please consider using 'man.<tool>.path' instead."
5747 "'%s': 支持的 man 手册查看器命令。\n"
5748 "请使用 'man.<tool>.path'。"
5750 #: builtin/help.c:353
5752 msgid "'%s': unknown man viewer."
5753 msgstr "'%s':未知的 man 查看器。"
5755 #: builtin/help.c:370
5756 msgid "no man viewer handled the request"
5757 msgstr "没有 man 查看器处理此请求"
5759 #: builtin/help.c:378
5760 msgid "no info viewer handled the request"
5761 msgstr "没有 info 查看器处理此请求"
5763 #: builtin/help.c:424
5764 msgid "Defining attributes per path"
5767 #: builtin/help.c:425
5768 msgid "A Git glossary"
5771 #: builtin/help.c:426
5772 msgid "Specifies intentionally untracked files to ignore"
5775 #: builtin/help.c:427
5776 msgid "Defining submodule properties"
5779 #: builtin/help.c:428
5780 msgid "Specifying revisions and ranges for Git"
5781 msgstr "指定 Git 的版本和版本范围"
5783 #: builtin/help.c:429
5784 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5785 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5787 #: builtin/help.c:430
5788 msgid "An overview of recommended workflows with Git"
5789 msgstr "Git 推荐的工作流概览"
5791 #: builtin/help.c:442
5792 msgid "The common Git guides are:\n"
5793 msgstr "最常用的 Git 向导有:\n"
5795 #: builtin/help.c:463 builtin/help.c:480
5800 #: builtin/help.c:496
5802 msgid "`git %s' is aliased to `%s'"
5803 msgstr "`git %s' 是 `%s' 的别名"
5805 #: builtin/index-pack.c:184
5807 msgid "object type mismatch at %s"
5808 msgstr "%s 的对象类型不匹配"
5810 #: builtin/index-pack.c:204
5811 msgid "object of unexpected type"
5814 #: builtin/index-pack.c:244
5816 msgid "cannot fill %d byte"
5817 msgid_plural "cannot fill %d bytes"
5818 msgstr[0] "无法填充 %d 字节"
5819 msgstr[1] "无法填充 %d 字节"
5821 #: builtin/index-pack.c:254
5823 msgstr "过早的文件结束符(EOF)"
5825 #: builtin/index-pack.c:255
5826 msgid "read error on input"
5829 #: builtin/index-pack.c:267
5830 msgid "used more bytes than were available"
5833 #: builtin/index-pack.c:274
5834 msgid "pack too large for current definition of off_t"
5835 msgstr "包太大超过了当前 off_t 的定义"
5837 #: builtin/index-pack.c:290
5839 msgid "unable to create '%s'"
5842 #: builtin/index-pack.c:295
5844 msgid "cannot open packfile '%s'"
5845 msgstr "无法打开包文件 '%s'"
5847 #: builtin/index-pack.c:309
5848 msgid "pack signature mismatch"
5851 #: builtin/index-pack.c:311
5853 msgid "pack version %<PRIu32> unsupported"
5854 msgstr "不支持包版本 %<PRIu32>"
5856 #: builtin/index-pack.c:329
5858 msgid "pack has bad object at offset %lu: %s"
5859 msgstr "包中有错误的对象位于 %lu:%s"
5861 #: builtin/index-pack.c:451
5863 msgid "inflate returned %d"
5866 #: builtin/index-pack.c:500
5867 msgid "offset value overflow for delta base object"
5868 msgstr "偏移值覆盖了 delta 基准对象"
5870 #: builtin/index-pack.c:508
5871 msgid "delta base offset is out of bound"
5872 msgstr "delta 基准偏移越界"
5874 #: builtin/index-pack.c:516
5876 msgid "unknown object type %d"
5879 #: builtin/index-pack.c:547
5880 msgid "cannot pread pack file"
5883 #: builtin/index-pack.c:549
5885 msgid "premature end of pack file, %lu byte missing"
5886 msgid_plural "premature end of pack file, %lu bytes missing"
5887 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5888 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5890 #: builtin/index-pack.c:575
5891 msgid "serious inflate inconsistency"
5894 #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5895 #: builtin/index-pack.c:729 builtin/index-pack.c:738
5897 msgid "SHA1 COLLISION FOUND WITH %s !"
5898 msgstr "发现 %s 出现 SHA1 冲突!"
5900 #: builtin/index-pack.c:669 builtin/pack-objects.c:171
5901 #: builtin/pack-objects.c:263
5903 msgid "unable to read %s"
5906 #: builtin/index-pack.c:735
5908 msgid "cannot read existing object %s"
5909 msgstr "不能读取现存对象 %s"
5911 #: builtin/index-pack.c:749
5913 msgid "invalid blob object %s"
5914 msgstr "无效的数据(blob)对象 %s"
5916 #: builtin/index-pack.c:763
5921 #: builtin/index-pack.c:766
5922 msgid "Error in object"
5925 #: builtin/index-pack.c:768
5927 msgid "Not all child objects of %s are reachable"
5928 msgstr "%s 的所有子对象并非都可达"
5930 #: builtin/index-pack.c:839 builtin/index-pack.c:869
5931 msgid "failed to apply delta"
5934 #: builtin/index-pack.c:1010
5935 msgid "Receiving objects"
5938 #: builtin/index-pack.c:1010
5939 msgid "Indexing objects"
5942 #: builtin/index-pack.c:1036
5943 msgid "pack is corrupted (SHA1 mismatch)"
5944 msgstr "包冲突(SHA1 不匹配)"
5946 #: builtin/index-pack.c:1041
5947 msgid "cannot fstat packfile"
5950 #: builtin/index-pack.c:1044
5951 msgid "pack has junk at the end"
5954 #: builtin/index-pack.c:1055
5955 msgid "confusion beyond insanity in parse_pack_objects()"
5956 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5958 #: builtin/index-pack.c:1078
5959 msgid "Resolving deltas"
5962 #: builtin/index-pack.c:1088
5964 msgid "unable to create thread: %s"
5967 #: builtin/index-pack.c:1130
5968 msgid "confusion beyond insanity"
5971 #: builtin/index-pack.c:1138
5973 msgid "completed with %d local objects"
5974 msgstr "完成 %d 个本地对象"
5976 #: builtin/index-pack.c:1148
5978 msgid "Unexpected tail checksum for %s (disk corruption?)"
5979 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5981 #: builtin/index-pack.c:1152
5983 msgid "pack has %d unresolved delta"
5984 msgid_plural "pack has %d unresolved deltas"
5985 msgstr[0] "包有 %d 个未解决的 delta"
5986 msgstr[1] "包有 %d 个未解决的 delta"
5988 #: builtin/index-pack.c:1177
5990 msgid "unable to deflate appended object (%d)"
5991 msgstr "不能压缩附加对象(%d)"
5993 #: builtin/index-pack.c:1256
5995 msgid "local object %s is corrupt"
5996 msgstr "本地对象 %s 已损坏"
5998 #: builtin/index-pack.c:1280
5999 msgid "error while closing pack file"
6002 #: builtin/index-pack.c:1293
6004 msgid "cannot write keep file '%s'"
6005 msgstr "无法写保留文件 '%s'"
6007 #: builtin/index-pack.c:1301
6009 msgid "cannot close written keep file '%s'"
6010 msgstr "无法关闭保留文件 '%s'"
6012 #: builtin/index-pack.c:1314
6013 msgid "cannot store pack file"
6016 #: builtin/index-pack.c:1325
6017 msgid "cannot store index file"
6020 #: builtin/index-pack.c:1358
6022 msgid "bad pack.indexversion=%<PRIu32>"
6023 msgstr "坏的 pack.indexversion=%<PRIu32>"
6025 #: builtin/index-pack.c:1364
6027 msgid "invalid number of threads specified (%d)"
6028 msgstr "指定的线程数无效(%d)"
6030 #: builtin/index-pack.c:1368 builtin/index-pack.c:1546
6032 msgid "no threads support, ignoring %s"
6033 msgstr "没有线程支持,忽略 %s"
6035 #: builtin/index-pack.c:1426
6037 msgid "Cannot open existing pack file '%s'"
6038 msgstr "无法打开现存包文件 '%s'"
6040 #: builtin/index-pack.c:1428
6042 msgid "Cannot open existing pack idx file for '%s'"
6043 msgstr "无法为 %s 打开包索引文件"
6045 #: builtin/index-pack.c:1475
6047 msgid "non delta: %d object"
6048 msgid_plural "non delta: %d objects"
6049 msgstr[0] "非 delta:%d 个对象"
6050 msgstr[1] "非 delta:%d 个对象"
6052 #: builtin/index-pack.c:1482
6054 msgid "chain length = %d: %lu object"
6055 msgid_plural "chain length = %d: %lu objects"
6056 msgstr[0] "链长 = %d: %lu 对象"
6057 msgstr[1] "链长 = %d: %lu 对象"
6059 #: builtin/index-pack.c:1510
6060 msgid "Cannot come back to cwd"
6063 #: builtin/index-pack.c:1558 builtin/index-pack.c:1561
6064 #: builtin/index-pack.c:1573 builtin/index-pack.c:1577
6069 #: builtin/index-pack.c:1591
6070 msgid "--fix-thin cannot be used without --stdin"
6071 msgstr "--fix-thin 不能和 --stdin 同时使用"
6073 #: builtin/index-pack.c:1595 builtin/index-pack.c:1605
6075 msgid "packfile name '%s' does not end with '.pack'"
6076 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6078 #: builtin/index-pack.c:1614
6079 msgid "--verify with no packfile name given"
6080 msgstr "--verify 没有提供包名参数"
6082 #: builtin/init-db.c:35
6084 msgid "Could not make %s writable by group"
6085 msgstr "不能设置 %s 为组可写"
6087 #: builtin/init-db.c:62
6089 msgid "insanely long template name %s"
6092 #: builtin/init-db.c:67
6094 msgid "cannot stat '%s'"
6095 msgstr "不能枚举 '%s' 状态"
6097 #: builtin/init-db.c:73
6099 msgid "cannot stat template '%s'"
6100 msgstr "不能枚举模版 '%s' 状态"
6102 #: builtin/init-db.c:80
6104 msgid "cannot opendir '%s'"
6105 msgstr "不能打开目录 '%s'"
6107 #: builtin/init-db.c:97
6109 msgid "cannot readlink '%s'"
6110 msgstr "不能读取链接 '%s'"
6112 #: builtin/init-db.c:99
6114 msgid "insanely long symlink %s"
6117 #: builtin/init-db.c:102
6119 msgid "cannot symlink '%s' '%s'"
6120 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6122 #: builtin/init-db.c:106
6124 msgid "cannot copy '%s' to '%s'"
6125 msgstr "不能拷贝 '%s' 至 '%s'"
6127 #: builtin/init-db.c:110
6129 msgid "ignoring template %s"
6132 #: builtin/init-db.c:133
6134 msgid "insanely long template path %s"
6137 #: builtin/init-db.c:141
6139 msgid "templates not found %s"
6142 #: builtin/init-db.c:154
6144 msgid "not copying templates of a wrong format version %d from '%s'"
6145 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6147 #: builtin/init-db.c:192
6149 msgid "insane git directory %s"
6150 msgstr "不正常的 git 目录 %s"
6152 #: builtin/init-db.c:323 builtin/init-db.c:326
6154 msgid "%s already exists"
6157 #: builtin/init-db.c:355
6159 msgid "unable to handle file type %d"
6160 msgstr "不能处理 %d 类型的文件"
6162 #: builtin/init-db.c:358
6164 msgid "unable to move %s to %s"
6165 msgstr "不能移动 %s 至 %s"
6168 #. * TRANSLATORS: The first '%s' is either "Reinitialized
6169 #. * existing" or "Initialized empty", the second " shared" or
6170 #. * "", and the last '%s%s' is the verbatim directory name.
6172 #: builtin/init-db.c:420
6174 msgid "%s%s Git repository in %s%s\n"
6175 msgstr "%s%s Git 版本库于 %s%s\n"
6177 #: builtin/init-db.c:421
6178 msgid "Reinitialized existing"
6181 #: builtin/init-db.c:421
6182 msgid "Initialized empty"
6185 # 译者:中文字符串拼接,可删除前导空格
6186 #: builtin/init-db.c:422
6190 #: builtin/init-db.c:441
6191 msgid "cannot tell cwd"
6194 #: builtin/init-db.c:467
6196 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6197 "shared[=<permissions>]] [directory]"
6199 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6202 #: builtin/init-db.c:490
6206 #: builtin/init-db.c:491
6207 msgid "specify that the git repository is to be shared amongst several users"
6208 msgstr "指定 git 版本库是多个用户之间共享的"
6210 #: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155
6214 #: builtin/init-db.c:522 builtin/init-db.c:529
6216 msgid "cannot mkdir %s"
6219 #: builtin/init-db.c:533
6221 msgid "cannot chdir to %s"
6224 #: builtin/init-db.c:555
6227 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6230 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6233 #: builtin/init-db.c:579
6234 msgid "Cannot access current working directory"
6237 #: builtin/init-db.c:586
6239 msgid "Cannot access work tree '%s'"
6240 msgstr "不能访问工作区 '%s'"
6243 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6244 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6247 msgid " or: git show [options] <object>..."
6248 msgstr " 或者:git show [选项] <对象>..."
6250 #: builtin/log.c:125
6251 msgid "suppress diff output"
6254 #: builtin/log.c:126
6258 #: builtin/log.c:127
6259 msgid "Use mail map file"
6262 #: builtin/log.c:128
6263 msgid "decorate options"
6266 #: builtin/log.c:231
6268 msgid "Final output: %d %s\n"
6269 msgstr "最终输出:%d %s\n"
6271 #: builtin/log.c:473 builtin/log.c:565
6273 msgid "Could not read object %s"
6276 #: builtin/log.c:589
6278 msgid "Unknown type: %d"
6281 #: builtin/log.c:689
6282 msgid "format.headers without value"
6283 msgstr "format.headers 没有值"
6285 #: builtin/log.c:771
6286 msgid "name of output directory is too long"
6289 #: builtin/log.c:787
6291 msgid "Cannot open patch file %s"
6292 msgstr "无法打开补丁文件 %s"
6294 #: builtin/log.c:801
6295 msgid "Need exactly one range."
6298 #: builtin/log.c:809
6299 msgid "Not a range."
6302 #: builtin/log.c:911
6303 msgid "Cover letter needs email format"
6306 #: builtin/log.c:987
6308 msgid "insane in-reply-to: %s"
6309 msgstr "不正常的 in-reply-to:%s"
6311 #: builtin/log.c:1015
6312 msgid "git format-patch [options] [<since> | <revision range>]"
6313 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6315 #: builtin/log.c:1060
6316 msgid "Two output directories?"
6319 #: builtin/log.c:1175
6320 msgid "use [PATCH n/m] even with a single patch"
6321 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6323 #: builtin/log.c:1178
6324 msgid "use [PATCH] even with multiple patches"
6325 msgstr "使用 [PATCH],即使有多个补丁"
6327 #: builtin/log.c:1182
6328 msgid "print patches to standard out"
6331 #: builtin/log.c:1184
6332 msgid "generate a cover letter"
6335 #: builtin/log.c:1186
6336 msgid "use simple number sequence for output file names"
6337 msgstr "使用简单的数字序列作为输出文件名"
6339 #: builtin/log.c:1187
6343 #: builtin/log.c:1188
6344 msgid "use <sfx> instead of '.patch'"
6345 msgstr "使用 <后缀> 代替 '.patch'"
6347 #: builtin/log.c:1190
6348 msgid "start numbering patches at <n> instead of 1"
6349 msgstr "补丁以 <n> 开始编号,而不是1"
6351 #: builtin/log.c:1192
6352 msgid "mark the series as Nth re-roll"
6353 msgstr "标记补丁系列是第几次重制"
6355 #: builtin/log.c:1194
6356 msgid "Use [<prefix>] instead of [PATCH]"
6357 msgstr "使用 [<前缀>] 代替 [PATCH]"
6359 #: builtin/log.c:1197
6360 msgid "store resulting files in <dir>"
6361 msgstr "把结果文件存储在 <dir>"
6363 #: builtin/log.c:1200
6364 msgid "don't strip/add [PATCH]"
6365 msgstr "不删除/添加 [PATCH]"
6367 #: builtin/log.c:1203
6368 msgid "don't output binary diffs"
6371 #: builtin/log.c:1205
6372 msgid "don't include a patch matching a commit upstream"
6373 msgstr "不包含已在上游提交中的补丁"
6375 #: builtin/log.c:1207
6376 msgid "show patch format instead of default (patch + stat)"
6377 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6379 #: builtin/log.c:1209
6383 #: builtin/log.c:1210
6387 #: builtin/log.c:1211
6388 msgid "add email header"
6391 #: builtin/log.c:1212 builtin/log.c:1214
6395 #: builtin/log.c:1212
6396 msgid "add To: header"
6399 #: builtin/log.c:1214
6400 msgid "add Cc: header"
6403 #: builtin/log.c:1216
6407 #: builtin/log.c:1217
6408 msgid "set From address to <ident> (or committer ident if absent)"
6409 msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6411 #: builtin/log.c:1219
6415 #: builtin/log.c:1220
6416 msgid "make first mail a reply to <message-id>"
6417 msgstr "使第一封邮件作为对 <message-id> 的回复"
6419 #: builtin/log.c:1221 builtin/log.c:1224
6423 #: builtin/log.c:1222
6424 msgid "attach the patch"
6427 #: builtin/log.c:1225
6428 msgid "inline the patch"
6431 #: builtin/log.c:1229
6432 msgid "enable message threading, styles: shallow, deep"
6433 msgstr "启用邮件线索,风格:浅,深"
6435 #: builtin/log.c:1231
6439 #: builtin/log.c:1232
6440 msgid "add a signature"
6443 #: builtin/log.c:1233
6444 msgid "don't print the patch filenames"
6447 #: builtin/log.c:1307
6449 msgid "invalid ident line: %s"
6450 msgstr "包含无效的身份标识:%s"
6452 #: builtin/log.c:1322
6453 msgid "-n and -k are mutually exclusive."
6454 msgstr "-n 和 -k 互斥。"
6456 #: builtin/log.c:1324
6457 msgid "--subject-prefix and -k are mutually exclusive."
6458 msgstr "--subject-prefix 和 -k 互斥。"
6460 #: builtin/log.c:1332
6461 msgid "--name-only does not make sense"
6462 msgstr "--name-only 无意义"
6464 #: builtin/log.c:1334
6465 msgid "--name-status does not make sense"
6466 msgstr "--name-status 无意义"
6468 #: builtin/log.c:1336
6469 msgid "--check does not make sense"
6470 msgstr "--check 无意义"
6472 #: builtin/log.c:1359
6473 msgid "standard output, or directory, which one?"
6474 msgstr "标准输出或目录,哪一个?"
6476 #: builtin/log.c:1361
6478 msgid "Could not create directory '%s'"
6479 msgstr "不能创建目录 '%s'"
6481 #: builtin/log.c:1509
6482 msgid "Failed to create output files"
6485 #: builtin/log.c:1558
6486 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6487 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6489 #: builtin/log.c:1613
6492 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6493 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6495 #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6497 msgid "Unknown commit %s"
6500 #: builtin/ls-files.c:398
6501 msgid "git ls-files [options] [<file>...]"
6502 msgstr "git ls-files [选项] [<文件>...]"
6504 #: builtin/ls-files.c:455
6505 msgid "identify the file status with tags"
6508 #: builtin/ls-files.c:457
6509 msgid "use lowercase letters for 'assume unchanged' files"
6510 msgstr "使用小写字母表示 '假设未改变的' 文件"
6512 #: builtin/ls-files.c:459
6513 msgid "show cached files in the output (default)"
6514 msgstr "显示缓存的文件(默认)"
6516 #: builtin/ls-files.c:461
6517 msgid "show deleted files in the output"
6520 #: builtin/ls-files.c:463
6521 msgid "show modified files in the output"
6524 #: builtin/ls-files.c:465
6525 msgid "show other files in the output"
6528 #: builtin/ls-files.c:467
6529 msgid "show ignored files in the output"
6532 #: builtin/ls-files.c:470
6533 msgid "show staged contents' object name in the output"
6534 msgstr "显示暂存区内容的对象名称"
6536 #: builtin/ls-files.c:472
6537 msgid "show files on the filesystem that need to be removed"
6538 msgstr "显示文件系统需要删除的文件"
6540 #: builtin/ls-files.c:474
6541 msgid "show 'other' directories' name only"
6542 msgstr "只显示“其他”目录的名称"
6544 #: builtin/ls-files.c:477
6545 msgid "don't show empty directories"
6548 #: builtin/ls-files.c:480
6549 msgid "show unmerged files in the output"
6552 #: builtin/ls-files.c:482
6553 msgid "show resolve-undo information"
6554 msgstr "显示 resolve-undo 信息"
6556 #: builtin/ls-files.c:484
6557 msgid "skip files matching pattern"
6560 #: builtin/ls-files.c:487
6561 msgid "exclude patterns are read from <file>"
6562 msgstr "从 <文件> 中读取排除模式"
6564 #: builtin/ls-files.c:490
6565 msgid "read additional per-directory exclude patterns in <file>"
6566 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6568 #: builtin/ls-files.c:492
6569 msgid "add the standard git exclusions"
6570 msgstr "添加标准的 git 排除"
6572 #: builtin/ls-files.c:495
6573 msgid "make the output relative to the project top directory"
6574 msgstr "显示相对于顶级目录的文件名"
6576 #: builtin/ls-files.c:498
6577 msgid "if any <file> is not in the index, treat this as an error"
6578 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6580 #: builtin/ls-files.c:499
6584 #: builtin/ls-files.c:500
6585 msgid "pretend that paths removed since <tree-ish> are still present"
6586 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6588 #: builtin/ls-files.c:502
6589 msgid "show debugging data"
6592 #: builtin/ls-tree.c:28
6593 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6594 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6596 #: builtin/ls-tree.c:126
6597 msgid "only show trees"
6600 #: builtin/ls-tree.c:128
6601 msgid "recurse into subtrees"
6604 #: builtin/ls-tree.c:130
6605 msgid "show trees when recursing"
6608 #: builtin/ls-tree.c:133
6609 msgid "terminate entries with NUL byte"
6612 #: builtin/ls-tree.c:134
6613 msgid "include object size"
6616 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6617 msgid "list only filenames"
6620 #: builtin/ls-tree.c:141
6621 msgid "use full path names"
6624 #: builtin/ls-tree.c:143
6625 msgid "list entire tree; not just current directory (implies --full-name)"
6626 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6628 #: builtin/merge.c:43
6629 msgid "git merge [options] [<commit>...]"
6630 msgstr "git merge [选项] [<提交>...]"
6632 #: builtin/merge.c:44
6633 msgid "git merge [options] <msg> HEAD <commit>"
6634 msgstr "git merge [选项] <说明> HEAD <提交>"
6636 #: builtin/merge.c:45
6637 msgid "git merge --abort"
6638 msgstr "git merge --abort"
6640 #: builtin/merge.c:98
6641 msgid "switch `m' requires a value"
6642 msgstr "开关 `m' 需要一个值"
6644 #: builtin/merge.c:135
6646 msgid "Could not find merge strategy '%s'.\n"
6647 msgstr "不能找到合并策略 '%s'。\n"
6649 #: builtin/merge.c:136
6651 msgid "Available strategies are:"
6654 #: builtin/merge.c:141
6656 msgid "Available custom strategies are:"
6659 #: builtin/merge.c:191
6660 msgid "do not show a diffstat at the end of the merge"
6661 msgstr "在合并的最后不显示差异统计"
6663 #: builtin/merge.c:194
6664 msgid "show a diffstat at the end of the merge"
6665 msgstr "在合并的最后显示差异统计"
6667 #: builtin/merge.c:195
6668 msgid "(synonym to --stat)"
6669 msgstr "(和 --stat 同义)"
6671 #: builtin/merge.c:197
6672 msgid "add (at most <n>) entries from shortlog to merge commit message"
6673 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6675 #: builtin/merge.c:200
6676 msgid "create a single commit instead of doing a merge"
6677 msgstr "创建一个单独的提交而不是做一次合并"
6679 #: builtin/merge.c:202
6680 msgid "perform a commit if the merge succeeds (default)"
6681 msgstr "如果合并成功,执行一次提交(默认)"
6683 #: builtin/merge.c:204
6684 msgid "edit message before committing"
6687 #: builtin/merge.c:205
6688 msgid "allow fast-forward (default)"
6691 #: builtin/merge.c:207
6692 msgid "abort if fast-forward is not possible"
6693 msgstr "如果不能快进就放弃合并"
6695 #: builtin/merge.c:211
6696 msgid "Verify that the named commit has a valid GPG signature"
6697 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6699 #: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89
6703 #: builtin/merge.c:213
6704 msgid "merge strategy to use"
6707 #: builtin/merge.c:214
6708 msgid "option=value"
6709 msgstr "option=value"
6711 #: builtin/merge.c:215
6712 msgid "option for selected merge strategy"
6715 #: builtin/merge.c:217
6716 msgid "merge commit message (for a non-fast-forward merge)"
6717 msgstr "合并的提交说明(针对非快进式合并)"
6719 #: builtin/merge.c:221
6720 msgid "abort the current in-progress merge"
6721 msgstr "放弃当前正在进行的合并"
6723 #: builtin/merge.c:250
6724 msgid "could not run stash."
6727 #: builtin/merge.c:255
6728 msgid "stash failed"
6731 #: builtin/merge.c:260
6733 msgid "not a valid object: %s"
6734 msgstr "不是一个有效对象:%s"
6736 #: builtin/merge.c:279 builtin/merge.c:296
6737 msgid "read-tree failed"
6741 #: builtin/merge.c:326
6742 msgid " (nothing to squash)"
6745 #: builtin/merge.c:339
6747 msgid "Squash commit -- not updating HEAD\n"
6748 msgstr "压缩提交 -- 未更新 HEAD\n"
6750 #: builtin/merge.c:371
6751 msgid "Writing SQUASH_MSG"
6752 msgstr "写入 SQUASH_MSG"
6754 #: builtin/merge.c:373
6755 msgid "Finishing SQUASH_MSG"
6756 msgstr "完成 SQUASH_MSG"
6758 #: builtin/merge.c:396
6760 msgid "No merge message -- not updating HEAD\n"
6761 msgstr "无合并信息 -- 未更新 HEAD\n"
6763 #: builtin/merge.c:446
6765 msgid "'%s' does not point to a commit"
6766 msgstr "'%s' 没有指向一个提交"
6768 #: builtin/merge.c:558
6770 msgid "Bad branch.%s.mergeoptions string: %s"
6771 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6773 #: builtin/merge.c:650
6774 msgid "git write-tree failed to write a tree"
6775 msgstr "git write-tree 无法写入一树对象"
6777 #: builtin/merge.c:678
6778 msgid "Not handling anything other than two heads merge."
6779 msgstr "不能处理两个头合并之外的任何操作。"
6781 #: builtin/merge.c:692
6783 msgid "Unknown option for merge-recursive: -X%s"
6784 msgstr "merge-recursive 的未知选项:-X%s"
6786 #: builtin/merge.c:706
6788 msgid "unable to write %s"
6791 #: builtin/merge.c:795
6793 msgid "Could not read from '%s'"
6794 msgstr "不能从 '%s' 读取"
6796 #: builtin/merge.c:804
6798 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6799 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6801 #: builtin/merge.c:810
6804 "Please enter a commit message to explain why this merge is necessary,\n"
6805 "especially if it merges an updated upstream into a topic branch.\n"
6807 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6810 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6813 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6815 #: builtin/merge.c:834
6816 msgid "Empty commit message."
6819 #: builtin/merge.c:846
6821 msgid "Wonderful.\n"
6824 #: builtin/merge.c:911
6826 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6827 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6829 #: builtin/merge.c:927
6831 msgid "'%s' is not a commit"
6832 msgstr "'%s' 不是一个提交"
6834 #: builtin/merge.c:968
6835 msgid "No current branch."
6838 #: builtin/merge.c:970
6839 msgid "No remote for the current branch."
6840 msgstr "当前分支没有对应的远程版本库。"
6842 #: builtin/merge.c:972
6843 msgid "No default upstream defined for the current branch."
6844 msgstr "当前分支没有定义默认的上游分支。"
6846 #: builtin/merge.c:977
6848 msgid "No remote-tracking branch for %s from %s"
6849 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
6851 #: builtin/merge.c:1133
6852 msgid "There is no merge to abort (MERGE_HEAD missing)."
6853 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6855 #: builtin/merge.c:1149 git-pull.sh:31
6857 "You have not concluded your merge (MERGE_HEAD exists).\n"
6858 "Please, commit your changes before you can merge."
6860 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6863 #: builtin/merge.c:1152 git-pull.sh:34
6864 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6865 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6867 #: builtin/merge.c:1156
6869 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6870 "Please, commit your changes before you can merge."
6872 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6875 #: builtin/merge.c:1159
6876 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6877 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6879 #: builtin/merge.c:1168
6880 msgid "You cannot combine --squash with --no-ff."
6881 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6883 #: builtin/merge.c:1177
6884 msgid "No commit specified and merge.defaultToUpstream not set."
6885 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6887 #: builtin/merge.c:1209
6888 msgid "Can merge only exactly one commit into empty head"
6889 msgstr "只能将一个提交合并到空分支上"
6891 #: builtin/merge.c:1212
6892 msgid "Squash commit into empty head not supported yet"
6893 msgstr "尚不支持到空分支的压缩提交"
6895 #: builtin/merge.c:1214
6896 msgid "Non-fast-forward commit does not make sense into an empty head"
6897 msgstr "到空分支的非快进式提交没有意义"
6899 #: builtin/merge.c:1219
6901 msgid "%s - not something we can merge"
6904 #: builtin/merge.c:1270
6906 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6907 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6909 #: builtin/merge.c:1273
6911 msgid "Commit %s has a bad GPG signature allegedly by %s."
6912 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6915 #: builtin/merge.c:1276
6917 msgid "Commit %s does not have a GPG signature."
6918 msgstr "提交 %s 没有一个 GPG 签名。"
6920 #: builtin/merge.c:1279
6922 msgid "Commit %s has a good GPG signature by %s\n"
6923 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6925 #: builtin/merge.c:1363
6927 msgid "Updating %s..%s\n"
6928 msgstr "更新 %s..%s\n"
6930 #: builtin/merge.c:1402
6932 msgid "Trying really trivial in-index merge...\n"
6933 msgstr "尝试非常小的索引内合并...\n"
6935 #: builtin/merge.c:1409
6940 #: builtin/merge.c:1441
6941 msgid "Not possible to fast-forward, aborting."
6944 #: builtin/merge.c:1464 builtin/merge.c:1543
6946 msgid "Rewinding the tree to pristine...\n"
6947 msgstr "将树回滚至原始状态...\n"
6949 #: builtin/merge.c:1468
6951 msgid "Trying merge strategy %s...\n"
6952 msgstr "尝试合并策略 %s...\n"
6954 #: builtin/merge.c:1534
6956 msgid "No merge strategy handled the merge.\n"
6957 msgstr "没有合并策略处理此合并。\n"
6959 #: builtin/merge.c:1536
6961 msgid "Merge with strategy %s failed.\n"
6962 msgstr "使用策略 %s 合并失败。\n"
6964 #: builtin/merge.c:1545
6966 msgid "Using the %s to prepare resolving by hand.\n"
6967 msgstr "使用 %s 以准备手工解决。\n"
6969 #: builtin/merge.c:1557
6971 msgid "Automatic merge went well; stopped before committing as requested\n"
6972 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6974 #: builtin/merge-base.c:29
6975 msgid "git merge-base [-a|--all] <commit> <commit>..."
6976 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6978 #: builtin/merge-base.c:30
6979 msgid "git merge-base [-a|--all] --octopus <commit>..."
6980 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6982 #: builtin/merge-base.c:31
6983 msgid "git merge-base --independent <commit>..."
6984 msgstr "git merge-base --independent <提交>..."
6986 #: builtin/merge-base.c:32
6987 msgid "git merge-base --is-ancestor <commit> <commit>"
6988 msgstr "git merge-base --is-ancestor <提交> <提交>"
6990 #: builtin/merge-base.c:33
6991 msgid "git merge-base --fork-point <ref> [<commit>]"
6992 msgstr "git merge-base --fork-point <提交> [<提交>]"
6994 #: builtin/merge-base.c:214
6995 msgid "output all common ancestors"
6998 #: builtin/merge-base.c:216
6999 msgid "find ancestors for a single n-way merge"
7000 msgstr "查找一个多路合并的祖先提交"
7002 #: builtin/merge-base.c:218
7003 msgid "list revs not reachable from others"
7004 msgstr "显示不能被其他访问到的版本"
7006 #: builtin/merge-base.c:220
7007 msgid "is the first one ancestor of the other?"
7008 msgstr "第一个是其他的祖先提交么?"
7010 #: builtin/merge-base.c:222
7011 msgid "find where <commit> forked from reflog of <ref>"
7012 msgstr "查找 <commit> 从<引用>日志的何处分支的"
7014 #: builtin/merge-file.c:8
7016 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7019 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7021 #: builtin/merge-file.c:33
7022 msgid "send results to standard output"
7025 #: builtin/merge-file.c:34
7026 msgid "use a diff3 based merge"
7027 msgstr "使用基于 diff3 的合并"
7029 #: builtin/merge-file.c:35
7030 msgid "for conflicts, use our version"
7031 msgstr "如果冲突,使用我们的版本"
7033 #: builtin/merge-file.c:37
7034 msgid "for conflicts, use their version"
7035 msgstr "如果冲突,使用他们的版本"
7037 #: builtin/merge-file.c:39
7038 msgid "for conflicts, use a union version"
7039 msgstr "如果冲突,使用联合版本"
7041 #: builtin/merge-file.c:42
7042 msgid "for conflicts, use this marker size"
7043 msgstr "如果冲突,使用指定长度的标记"
7045 #: builtin/merge-file.c:43
7046 msgid "do not warn about conflicts"
7049 #: builtin/merge-file.c:45
7050 msgid "set labels for file1/orig_file/file2"
7051 msgstr "为 file1/orig_file/file2 设置标签"
7053 #: builtin/mktree.c:67
7054 msgid "git mktree [-z] [--missing] [--batch]"
7055 msgstr "git mktree [-z] [--missing] [--batch]"
7057 #: builtin/mktree.c:153
7058 msgid "input is NUL terminated"
7059 msgstr "输入以 NUL 字符终止"
7061 #: builtin/mktree.c:154 builtin/write-tree.c:24
7062 msgid "allow missing objects"
7065 #: builtin/mktree.c:155
7066 msgid "allow creation of more than one tree"
7070 msgid "git mv [options] <source>... <destination>"
7071 msgstr "git mv [选项] <源>... <目标>"
7074 msgid "force move/rename even if target exists"
7075 msgstr "强制移动/重命令,即使目标存在"
7078 msgid "skip move/rename errors"
7083 msgid "Checking rename of '%s' to '%s'\n"
7084 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7091 msgid "can not move directory into itself"
7095 msgid "cannot move directory over file"
7100 msgid "Huh? Directory %s is in index and no submodule?"
7101 msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7103 #: builtin/mv.c:140 builtin/rm.c:318
7104 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7105 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7109 msgid "Huh? %.*s is in index?"
7110 msgstr "嗯?%.*s 在索引中?"
7113 msgid "source directory is empty"
7117 msgid "not under version control"
7121 msgid "destination exists"
7126 msgid "overwriting '%s'"
7130 msgid "Cannot overwrite"
7134 msgid "multiple sources for the same target"
7138 msgid "destination directory does not exist"
7143 msgid "%s, source=%s, destination=%s"
7144 msgstr "%s,源=%s,目标=%s"
7148 msgid "Renaming %s to %s\n"
7149 msgstr "重命名 %s 至 %s\n"
7151 #: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328
7153 msgid "renaming '%s' failed"
7154 msgstr "重命名 '%s' 失败"
7156 #: builtin/name-rev.c:258
7157 msgid "git name-rev [options] <commit>..."
7158 msgstr "git name-rev [选项] <提交>..."
7160 #: builtin/name-rev.c:259
7161 msgid "git name-rev [options] --all"
7162 msgstr "git name-rev [选项] --all"
7164 #: builtin/name-rev.c:260
7165 msgid "git name-rev [options] --stdin"
7166 msgstr "git name-rev [选项] --stdin"
7168 #: builtin/name-rev.c:312
7169 msgid "print only names (no SHA-1)"
7170 msgstr "只打印名称(无 SHA-1)"
7172 #: builtin/name-rev.c:313
7173 msgid "only use tags to name the commits"
7174 msgstr "只使用 tags 来命名提交"
7176 #: builtin/name-rev.c:315
7177 msgid "only use refs matching <pattern>"
7178 msgstr "只使用和 <模式> 相匹配的引用"
7180 #: builtin/name-rev.c:317
7181 msgid "list all commits reachable from all refs"
7182 msgstr "列出可以从所有引用访问的提交"
7184 #: builtin/name-rev.c:318
7185 msgid "read from stdin"
7188 #: builtin/name-rev.c:319
7189 msgid "allow to print `undefined` names (default)"
7190 msgstr "允许打印 `未定义` 的名称(默认)"
7192 #: builtin/name-rev.c:325
7193 msgid "dereference tags in the input (internal use)"
7194 msgstr "反向解析输入中的 tags(内部使用)"
7196 #: builtin/notes.c:24
7197 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7198 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7200 #: builtin/notes.c:25
7202 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7203 "<object>] [<object>]"
7205 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7208 #: builtin/notes.c:26
7209 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7210 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7212 #: builtin/notes.c:27
7214 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7215 "<object>] [<object>]"
7217 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7220 #: builtin/notes.c:28
7221 msgid "git notes [--ref <notes_ref>] edit [<object>]"
7222 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7224 #: builtin/notes.c:29
7225 msgid "git notes [--ref <notes_ref>] show [<object>]"
7226 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7228 #: builtin/notes.c:30
7230 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7231 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7233 #: builtin/notes.c:31
7234 msgid "git notes merge --commit [-v | -q]"
7235 msgstr "git notes merge --commit [-v | -q]"
7237 #: builtin/notes.c:32
7238 msgid "git notes merge --abort [-v | -q]"
7239 msgstr "git notes merge --abort [-v | -q]"
7241 #: builtin/notes.c:33
7242 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7243 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7245 #: builtin/notes.c:34
7246 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7247 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7249 #: builtin/notes.c:35
7250 msgid "git notes [--ref <notes_ref>] get-ref"
7251 msgstr "git notes [--ref <注解引用>] get-ref"
7253 #: builtin/notes.c:40
7254 msgid "git notes [list [<object>]]"
7255 msgstr "git notes [list [<对象>]]"
7257 #: builtin/notes.c:45
7258 msgid "git notes add [<options>] [<object>]"
7259 msgstr "git notes add [<选项>] [<对象>]"
7261 #: builtin/notes.c:50
7262 msgid "git notes copy [<options>] <from-object> <to-object>"
7263 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7265 #: builtin/notes.c:51
7266 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7267 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7269 #: builtin/notes.c:56
7270 msgid "git notes append [<options>] [<object>]"
7271 msgstr "git notes append [<选项>] [<对象>]"
7273 #: builtin/notes.c:61
7274 msgid "git notes edit [<object>]"
7275 msgstr "git notes edit [<对象>]"
7277 #: builtin/notes.c:66
7278 msgid "git notes show [<object>]"
7279 msgstr "git notes show [<对象>]"
7281 #: builtin/notes.c:71
7282 msgid "git notes merge [<options>] <notes_ref>"
7283 msgstr "git notes merge [<选项>] <注解引用>"
7285 #: builtin/notes.c:72
7286 msgid "git notes merge --commit [<options>]"
7287 msgstr "git notes merge --commit [<选项>]"
7289 #: builtin/notes.c:73
7290 msgid "git notes merge --abort [<options>]"
7291 msgstr "git notes merge --abort [<选项>]"
7293 #: builtin/notes.c:78
7294 msgid "git notes remove [<object>]"
7295 msgstr "git notes remove [<对象>]"
7297 #: builtin/notes.c:83
7298 msgid "git notes prune [<options>]"
7299 msgstr "git notes prune [<选项>]"
7301 #: builtin/notes.c:88
7302 msgid "git notes get-ref"
7303 msgstr "git notes get-ref"
7305 #: builtin/notes.c:137
7307 msgid "unable to start 'show' for object '%s'"
7308 msgstr "不能为对象 '%s' 开始 'show'"
7310 #: builtin/notes.c:141
7311 msgid "could not read 'show' output"
7312 msgstr "不能读取 'show' 的输出"
7314 #: builtin/notes.c:149
7316 msgid "failed to finish 'show' for object '%s'"
7317 msgstr "无法为对象 '%s' 完成 'show'"
7319 #: builtin/notes.c:167 builtin/tag.c:341
7321 msgid "could not create file '%s'"
7322 msgstr "不能创建文件 '%s'"
7324 #: builtin/notes.c:186
7325 msgid "Please supply the note contents using either -m or -F option"
7326 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7328 #: builtin/notes.c:207 builtin/notes.c:844
7330 msgid "Removing note for object %s\n"
7331 msgstr "删除对象 %s 的注解\n"
7333 #: builtin/notes.c:212
7334 msgid "unable to write note object"
7337 #: builtin/notes.c:214
7339 msgid "The note contents has been left in %s"
7340 msgstr "注解内容被留在文件 %s 中"
7342 #: builtin/notes.c:248 builtin/tag.c:537
7344 msgid "cannot read '%s'"
7347 #: builtin/notes.c:250 builtin/tag.c:540
7349 msgid "could not open or read '%s'"
7350 msgstr "不能打开或读取 '%s'"
7352 #: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7353 #: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7354 #: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
7355 #: builtin/notes.c:839 builtin/tag.c:553
7357 msgid "Failed to resolve '%s' as a valid ref."
7358 msgstr "无法解析 '%s' 为一个有效引用。"
7360 #: builtin/notes.c:272
7362 msgid "Failed to read object '%s'."
7363 msgstr "无法读取对象 '%s'。"
7365 #: builtin/notes.c:312
7367 msgid "Malformed input line: '%s'."
7368 msgstr "非法的输入行:'%s'。"
7370 #: builtin/notes.c:327
7372 msgid "Failed to copy notes from '%s' to '%s'"
7373 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7375 #: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7376 #: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7377 #: builtin/notes.c:904
7378 msgid "too many parameters"
7381 #: builtin/notes.c:384 builtin/notes.c:643
7383 msgid "No note found for object %s."
7384 msgstr "未发现对象 %s 的注解。"
7386 #: builtin/notes.c:406 builtin/notes.c:563
7387 msgid "note contents as a string"
7388 msgstr "注解内容作为一个字符串"
7390 #: builtin/notes.c:409 builtin/notes.c:566
7391 msgid "note contents in a file"
7394 #: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7395 #: builtin/notes.c:571 builtin/tag.c:474
7399 #: builtin/notes.c:412 builtin/notes.c:569
7400 msgid "reuse and edit specified note object"
7401 msgstr "重用和编辑指定的注解对象"
7403 #: builtin/notes.c:415 builtin/notes.c:572
7404 msgid "reuse specified note object"
7407 #: builtin/notes.c:417 builtin/notes.c:485
7408 msgid "replace existing notes"
7411 #: builtin/notes.c:451
7414 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7416 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7418 #: builtin/notes.c:456 builtin/notes.c:533
7420 msgid "Overwriting existing notes for object %s\n"
7421 msgstr "覆盖对象 %s 现存注解\n"
7423 #: builtin/notes.c:486
7424 msgid "read objects from stdin"
7427 #: builtin/notes.c:488
7428 msgid "load rewriting config for <command> (implies --stdin)"
7429 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7431 #: builtin/notes.c:506
7432 msgid "too few parameters"
7435 #: builtin/notes.c:527
7438 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7440 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7442 #: builtin/notes.c:539
7444 msgid "Missing notes on source object %s. Cannot copy."
7445 msgstr "源对象 %s 缺少注解。不能拷贝。"
7447 #: builtin/notes.c:588
7450 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7451 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7453 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7454 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7456 #: builtin/notes.c:735
7457 msgid "General options"
7460 #: builtin/notes.c:737
7461 msgid "Merge options"
7464 #: builtin/notes.c:739
7466 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7468 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7470 #: builtin/notes.c:741
7471 msgid "Committing unmerged notes"
7474 #: builtin/notes.c:743
7475 msgid "finalize notes merge by committing unmerged notes"
7476 msgstr "通过提交未合并的注解来完成注解合并"
7478 #: builtin/notes.c:745
7479 msgid "Aborting notes merge resolution"
7482 #: builtin/notes.c:747
7483 msgid "abort notes merge"
7486 #: builtin/notes.c:842
7488 msgid "Object %s has no note\n"
7489 msgstr "对象 %s 没有注解\n"
7491 #: builtin/notes.c:854
7492 msgid "attempt to remove non-existent note is not an error"
7493 msgstr "尝试删除不存在的注解不是一个错误"
7495 #: builtin/notes.c:857
7496 msgid "read object names from the standard input"
7497 msgstr "从标准输入读取对象名称"
7499 #: builtin/notes.c:938
7503 #: builtin/notes.c:939
7504 msgid "use notes from <notes_ref>"
7505 msgstr "从 <注解引用> 使用注解"
7507 #: builtin/notes.c:974 builtin/remote.c:1593
7509 msgid "Unknown subcommand: %s"
7512 #: builtin/pack-objects.c:23
7513 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7514 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7516 #: builtin/pack-objects.c:24
7517 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7518 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7520 #: builtin/pack-objects.c:184 builtin/pack-objects.c:187
7522 msgid "deflate error (%d)"
7525 #: builtin/pack-objects.c:2396
7527 msgid "unsupported index version %s"
7528 msgstr "不支持的索引版本 %s"
7530 #: builtin/pack-objects.c:2400
7532 msgid "bad index version '%s'"
7533 msgstr "坏的索引版本 '%s'"
7535 #: builtin/pack-objects.c:2423
7537 msgid "option %s does not accept negative form"
7538 msgstr "选项 %s 不接受否定格式"
7540 #: builtin/pack-objects.c:2427
7542 msgid "unable to parse value '%s' for option %s"
7543 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7545 #: builtin/pack-objects.c:2446
7546 msgid "do not show progress meter"
7549 #: builtin/pack-objects.c:2448
7550 msgid "show progress meter"
7553 #: builtin/pack-objects.c:2450
7554 msgid "show progress meter during object writing phase"
7555 msgstr "在对象写入阶段显示进度表"
7557 #: builtin/pack-objects.c:2453
7558 msgid "similar to --all-progress when progress meter is shown"
7559 msgstr "当进度表显示时类似于 --all-progress"
7561 #: builtin/pack-objects.c:2454
7562 msgid "version[,offset]"
7565 #: builtin/pack-objects.c:2455
7566 msgid "write the pack index file in the specified idx format version"
7567 msgstr "用指定的 idx 格式版本来写包索引文件"
7569 #: builtin/pack-objects.c:2458
7570 msgid "maximum size of each output pack file"
7573 #: builtin/pack-objects.c:2460
7574 msgid "ignore borrowed objects from alternate object store"
7575 msgstr "忽略从替代对象存储里借用对象"
7577 #: builtin/pack-objects.c:2462
7578 msgid "ignore packed objects"
7581 #: builtin/pack-objects.c:2464
7582 msgid "limit pack window by objects"
7585 #: builtin/pack-objects.c:2466
7586 msgid "limit pack window by memory in addition to object limit"
7587 msgstr "除对象数量限制外设置打包窗口的内存限制"
7589 #: builtin/pack-objects.c:2468
7590 msgid "maximum length of delta chain allowed in the resulting pack"
7591 msgstr "打包允许的 delta 链的最大长度"
7593 #: builtin/pack-objects.c:2470
7594 msgid "reuse existing deltas"
7595 msgstr "重用已存在的 deltas"
7597 #: builtin/pack-objects.c:2472
7598 msgid "reuse existing objects"
7601 #: builtin/pack-objects.c:2474
7602 msgid "use OFS_DELTA objects"
7603 msgstr "使用 OFS_DELTA 对象"
7605 #: builtin/pack-objects.c:2476
7606 msgid "use threads when searching for best delta matches"
7607 msgstr "使用线程查询最佳 delta 匹配"
7609 #: builtin/pack-objects.c:2478
7610 msgid "do not create an empty pack output"
7613 #: builtin/pack-objects.c:2480
7614 msgid "read revision arguments from standard input"
7615 msgstr "从标准输入读取修订号参数"
7617 #: builtin/pack-objects.c:2482
7618 msgid "limit the objects to those that are not yet packed"
7619 msgstr "限制那些尚未打包的对象"
7621 #: builtin/pack-objects.c:2485
7622 msgid "include objects reachable from any reference"
7623 msgstr "包括可以从任何引用访问到的对象"
7625 #: builtin/pack-objects.c:2488
7626 msgid "include objects referred by reflog entries"
7627 msgstr "包括被引用日志引用到的对象"
7629 #: builtin/pack-objects.c:2491
7630 msgid "output pack to stdout"
7633 #: builtin/pack-objects.c:2493
7634 msgid "include tag objects that refer to objects to be packed"
7635 msgstr "包括引用了打包对象的 tag"
7637 #: builtin/pack-objects.c:2495
7638 msgid "keep unreachable objects"
7641 #: builtin/pack-objects.c:2496 parse-options.h:143
7645 #: builtin/pack-objects.c:2497
7646 msgid "unpack unreachable objects newer than <time>"
7647 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7649 #: builtin/pack-objects.c:2500
7650 msgid "create thin packs"
7653 #: builtin/pack-objects.c:2502
7654 msgid "ignore packs that have companion .keep file"
7655 msgstr "忽略配有 .keep 文件的包"
7657 #: builtin/pack-objects.c:2504
7658 msgid "pack compression level"
7661 #: builtin/pack-objects.c:2506
7662 msgid "do not hide commits by grafts"
7665 #: builtin/pack-refs.c:6
7666 msgid "git pack-refs [options]"
7667 msgstr "git pack-refs [选项]"
7669 #: builtin/pack-refs.c:14
7670 msgid "pack everything"
7673 #: builtin/pack-refs.c:15
7674 msgid "prune loose refs (default)"
7675 msgstr "清除松散的引用(默认)"
7677 #: builtin/prune-packed.c:7
7678 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7679 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7681 #: builtin/prune.c:12
7682 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7683 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7685 #: builtin/prune.c:142
7686 msgid "do not remove, show only"
7689 #: builtin/prune.c:143
7690 msgid "report pruned objects"
7693 #: builtin/prune.c:146
7694 msgid "expire objects older than <time>"
7695 msgstr "使早于给定时间的对象过期"
7697 #: builtin/push.c:14
7698 msgid "git push [<options>] [<repository> [<refspec>...]]"
7699 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7701 #: builtin/push.c:86
7702 msgid "tag shorthand without <tag>"
7703 msgstr "tag 简写没有跟 <tag> 参数"
7705 #: builtin/push.c:96
7706 msgid "--delete only accepts plain target ref names"
7707 msgstr "--delete 只接受简单的目标引用名"
7709 #: builtin/push.c:141
7712 "To choose either option permanently, see push.default in 'git help config'."
7715 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7717 #: builtin/push.c:144
7720 "The upstream branch of your current branch does not match\n"
7721 "the name of your current branch. To push to the upstream branch\n"
7722 "on the remote, use\n"
7724 " git push %s HEAD:%s\n"
7726 "To push to the branch of the same name on the remote, use\n"
7731 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7734 " git push %s HEAD:%s\n"
7741 #: builtin/push.c:159
7744 "You are not currently on a branch.\n"
7745 "To push the history leading to the current (detached HEAD)\n"
7748 " git push %s HEAD:<name-of-remote-branch>\n"
7751 "现在为推送当前(分离头指针)的历史,使用\n"
7753 " git push %s HEAD:<name-of-remote-branch>\n"
7755 #: builtin/push.c:173
7758 "The current branch %s has no upstream branch.\n"
7759 "To push the current branch and set the remote as upstream, use\n"
7761 " git push --set-upstream %s %s\n"
7763 "当前分支 %s 没有对应的上游分支。\n"
7764 "为推送当前分支并建立与远程上游的跟踪,使用\n"
7766 " git push --set-upstream %s %s\n"
7768 #: builtin/push.c:181
7770 msgid "The current branch %s has multiple upstream branches, refusing to push."
7771 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7773 #: builtin/push.c:184
7776 "You are pushing to remote '%s', which is not the upstream of\n"
7777 "your current branch '%s', without telling me what to push\n"
7778 "to update which remote branch."
7780 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7781 "而没有告诉我要推送什么、更新哪个远程分支。"
7783 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7784 #: builtin/push.c:207
7786 "push.default is unset; its implicit value is changing in\n"
7787 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7788 "and maintain the current behavior after the default changes, use:\n"
7790 " git config --global push.default matching\n"
7792 "To squelch this message and adopt the new behavior now, use:\n"
7794 " git config --global push.default simple\n"
7796 "When push.default is set to 'matching', git will push local branches\n"
7797 "to the remote branches that already exist with the same name.\n"
7799 "In Git 2.0, Git will default to the more conservative 'simple'\n"
7800 "behavior, which only pushes the current branch to the corresponding\n"
7801 "remote branch that 'git pull' uses to update the current branch.\n"
7803 "See 'git help config' and search for 'push.default' for further "
7805 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7806 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7808 "push.default 尚未设置,它的默认值在 Git 2.0 从 'matching'\n"
7809 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
7811 " git config --global push.default matching\n"
7813 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7815 " git config --global push.default simple\n"
7817 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7820 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7821 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7823 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7824 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7825 "为保持兼容,请用 'current' 代替 'simple')"
7827 #: builtin/push.c:274
7829 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7830 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
7832 #: builtin/push.c:281
7834 "Updates were rejected because the tip of your current branch is behind\n"
7835 "its remote counterpart. Integrate the remote changes (e.g.\n"
7836 "'git pull ...') before pushing again.\n"
7837 "See the 'Note about fast-forwards' in 'git push --help' for details."
7839 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7840 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
7841 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7843 #: builtin/push.c:287
7845 "Updates were rejected because a pushed branch tip is behind its remote\n"
7846 "counterpart. If you did not intend to push that branch, you may want to\n"
7847 "specify branches to push or set the 'push.default' configuration variable\n"
7848 "to 'simple', 'current' or 'upstream' to push only the current branch."
7850 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7851 "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
7852 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7855 #: builtin/push.c:293
7857 "Updates were rejected because a pushed branch tip is behind its remote\n"
7858 "counterpart. Check out this branch and integrate the remote changes\n"
7859 "(e.g. 'git pull ...') before pushing again.\n"
7860 "See the 'Note about fast-forwards' in 'git push --help' for details."
7862 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7863 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
7864 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7866 #: builtin/push.c:299
7868 "Updates were rejected because the remote contains work that you do\n"
7869 "not have locally. This is usually caused by another repository pushing\n"
7870 "to the same ref. You may want to first integrate the remote changes\n"
7871 "(e.g., 'git pull ...') before pushing again.\n"
7872 "See the 'Note about fast-forwards' in 'git push --help' for details."
7874 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7875 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7876 "(如 'git pull ...')。\n"
7877 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7879 #: builtin/push.c:306
7880 msgid "Updates were rejected because the tag already exists in the remote."
7881 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7883 #: builtin/push.c:309
7885 "You cannot update a remote ref that points at a non-commit object,\n"
7886 "or update a remote ref to make it point at a non-commit object,\n"
7887 "without using the '--force' option.\n"
7889 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7890 "也不能更新远程引用让其指向一个非提交对象。\n"
7892 #: builtin/push.c:375
7894 msgid "Pushing to %s\n"
7897 #: builtin/push.c:379
7899 msgid "failed to push some refs to '%s'"
7900 msgstr "无法推送一些引用到 '%s'"
7902 #: builtin/push.c:412
7904 msgid "bad repository '%s'"
7907 #: builtin/push.c:413
7909 "No configured push destination.\n"
7910 "Either specify the URL from the command-line or configure a remote "
7911 "repository using\n"
7913 " git remote add <name> <url>\n"
7915 "and then push using the remote name\n"
7917 " git push <name>\n"
7920 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7922 " git remote add <name> <url>\n"
7926 " git push <name>\n"
7928 #: builtin/push.c:428
7929 msgid "--all and --tags are incompatible"
7930 msgstr "--all 和 --tags 不兼容"
7932 #: builtin/push.c:429
7933 msgid "--all can't be combined with refspecs"
7934 msgstr "--all 不能和引用规则同时使用"
7936 #: builtin/push.c:434
7937 msgid "--mirror and --tags are incompatible"
7938 msgstr "--mirror 和 --tags 不兼容"
7940 #: builtin/push.c:435
7941 msgid "--mirror can't be combined with refspecs"
7942 msgstr "--mirror 不能和引用规则同时使用"
7944 #: builtin/push.c:440
7945 msgid "--all and --mirror are incompatible"
7946 msgstr "--all 和 --mirror 不兼容"
7948 #: builtin/push.c:500
7952 #: builtin/push.c:501
7953 msgid "push all refs"
7956 #: builtin/push.c:502
7957 msgid "mirror all refs"
7960 #: builtin/push.c:504
7964 #: builtin/push.c:505
7965 msgid "push tags (can't be used with --all or --mirror)"
7966 msgstr "推送 tags(不能使用 --all or --mirror)"
7968 #: builtin/push.c:508
7969 msgid "force updates"
7972 #: builtin/push.c:510
7973 msgid "refname>:<expect"
7976 #: builtin/push.c:511
7977 msgid "require old value of ref to be at this value"
7978 msgstr "要求引用旧的取值为设定值"
7980 #: builtin/push.c:513
7984 #: builtin/push.c:514
7985 msgid "control recursive pushing of submodules"
7988 #: builtin/push.c:516
7989 msgid "use thin pack"
7992 #: builtin/push.c:517 builtin/push.c:518
7993 msgid "receive pack program"
7996 #: builtin/push.c:519
7997 msgid "set upstream for git pull/status"
7998 msgstr "设置 git pull/status 的上游"
8000 #: builtin/push.c:522
8001 msgid "prune locally removed refs"
8004 #: builtin/push.c:524
8005 msgid "bypass pre-push hook"
8006 msgstr "绕过 pre-push 钩子"
8008 #: builtin/push.c:525
8009 msgid "push missing but relevant tags"
8010 msgstr "推送缺失的有关的 tags"
8012 #: builtin/push.c:535
8013 msgid "--delete is incompatible with --all, --mirror and --tags"
8014 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8016 #: builtin/push.c:537
8017 msgid "--delete doesn't make sense without any refs"
8018 msgstr "--delete 未接任何引用没有意义"
8020 #: builtin/read-tree.c:36
8022 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8023 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8024 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8026 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8027 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8028 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8030 #: builtin/read-tree.c:109
8031 msgid "write resulting index to <file>"
8032 msgstr "将索引结果写入 <file>"
8034 #: builtin/read-tree.c:112
8035 msgid "only empty the index"
8038 #: builtin/read-tree.c:114
8042 #: builtin/read-tree.c:116
8043 msgid "perform a merge in addition to a read"
8044 msgstr "读取之余再执行一个合并"
8046 #: builtin/read-tree.c:118
8047 msgid "3-way merge if no file level merging required"
8048 msgstr "如果没有文件级合并需要,执行三路合并"
8050 #: builtin/read-tree.c:120
8051 msgid "3-way merge in presence of adds and removes"
8052 msgstr "存在添加和删除时,也执行三路合并"
8054 #: builtin/read-tree.c:122
8055 msgid "same as -m, but discard unmerged entries"
8056 msgstr "类似于 -m,但丢弃未合并的条目"
8058 #: builtin/read-tree.c:123
8059 msgid "<subdirectory>/"
8062 #: builtin/read-tree.c:124
8063 msgid "read the tree into the index under <subdirectory>/"
8064 msgstr "读取树对象到索引的 <子目录>/ 下"
8066 #: builtin/read-tree.c:127
8067 msgid "update working tree with merge result"
8068 msgstr "用合并的结果更新工作区"
8070 #: builtin/read-tree.c:129
8074 #: builtin/read-tree.c:130
8075 msgid "allow explicitly ignored files to be overwritten"
8076 msgstr "允许忽略文件中设定的文件可以被覆盖"
8078 #: builtin/read-tree.c:133
8079 msgid "don't check the working tree after merging"
8082 #: builtin/read-tree.c:134
8083 msgid "don't update the index or the work tree"
8086 #: builtin/read-tree.c:136
8087 msgid "skip applying sparse checkout filter"
8088 msgstr "跳过应用稀疏检出过滤器"
8090 #: builtin/read-tree.c:138
8091 msgid "debug unpack-trees"
8092 msgstr "调试 unpack-trees"
8094 #: builtin/reflog.c:499
8096 msgid "%s' for '%s' is not a valid timestamp"
8097 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8099 #: builtin/reflog.c:615 builtin/reflog.c:620
8101 msgid "'%s' is not a valid timestamp"
8102 msgstr "'%s' 不是一个有效的时间戳"
8104 #: builtin/remote.c:12
8105 msgid "git remote [-v | --verbose]"
8106 msgstr "git remote [-v | --verbose]"
8108 #: builtin/remote.c:13
8110 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8111 "mirror=<fetch|push>] <name> <url>"
8113 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8114 "mirror=<fetch|push>] <名称> <url>"
8116 #: builtin/remote.c:14 builtin/remote.c:33
8117 msgid "git remote rename <old> <new>"
8118 msgstr "git remote rename <旧名称> <新名称>"
8120 #: builtin/remote.c:15 builtin/remote.c:38
8121 msgid "git remote remove <name>"
8122 msgstr "git remote remove <名称>"
8124 #: builtin/remote.c:16
8125 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8126 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8128 #: builtin/remote.c:17
8129 msgid "git remote [-v | --verbose] show [-n] <name>"
8130 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8132 #: builtin/remote.c:18
8133 msgid "git remote prune [-n | --dry-run] <name>"
8134 msgstr "git remote prune [-n | --dry-run] <名称>"
8136 #: builtin/remote.c:19
8138 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8139 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8141 #: builtin/remote.c:20
8142 msgid "git remote set-branches [--add] <name> <branch>..."
8143 msgstr "git remote set-branches [--add] <名称> <分支>..."
8145 #: builtin/remote.c:21 builtin/remote.c:69
8146 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8147 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8149 #: builtin/remote.c:22 builtin/remote.c:70
8150 msgid "git remote set-url --add <name> <newurl>"
8151 msgstr "git remote set-url --add <名称> <新的地址>"
8153 #: builtin/remote.c:23 builtin/remote.c:71
8154 msgid "git remote set-url --delete <name> <url>"
8155 msgstr "git remote set-url --delete <名称> <地址>"
8157 #: builtin/remote.c:28
8158 msgid "git remote add [<options>] <name> <url>"
8159 msgstr "git remote add [<选项>] <名称> <地址>"
8161 #: builtin/remote.c:43
8162 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8163 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8165 #: builtin/remote.c:48
8166 msgid "git remote set-branches <name> <branch>..."
8167 msgstr "git remote set-branches <名称> <分支>..."
8169 #: builtin/remote.c:49
8170 msgid "git remote set-branches --add <name> <branch>..."
8171 msgstr "git remote set-branches --add <名称> <分支>..."
8173 #: builtin/remote.c:54
8174 msgid "git remote show [<options>] <name>"
8175 msgstr "git remote show [<选项>] <名称>"
8177 #: builtin/remote.c:59
8178 msgid "git remote prune [<options>] <name>"
8179 msgstr "git remote prune [<选项>] <名称>"
8181 #: builtin/remote.c:64
8182 msgid "git remote update [<options>] [<group> | <remote>]..."
8183 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8185 #: builtin/remote.c:88
8190 #: builtin/remote.c:120
8192 "--mirror is dangerous and deprecated; please\n"
8193 "\t use --mirror=fetch or --mirror=push instead"
8195 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8196 "\t 或 --mirror=push"
8198 #: builtin/remote.c:137
8200 msgid "unknown mirror argument: %s"
8203 #: builtin/remote.c:153
8204 msgid "fetch the remote branches"
8207 #: builtin/remote.c:155
8208 msgid "import all tags and associated objects when fetching"
8209 msgstr "抓取时导入所有的 tags 和关联对象"
8211 #: builtin/remote.c:158
8212 msgid "or do not fetch any tag at all (--no-tags)"
8213 msgstr "或不抓取任何 tag(--no-tags)"
8215 #: builtin/remote.c:160
8216 msgid "branch(es) to track"
8219 #: builtin/remote.c:161
8220 msgid "master branch"
8223 #: builtin/remote.c:162
8227 #: builtin/remote.c:163
8228 msgid "set up remote as a mirror to push to or fetch from"
8229 msgstr "把远程设置为用以推送或抓取的镜像"
8231 #: builtin/remote.c:175
8232 msgid "specifying a master branch makes no sense with --mirror"
8233 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8235 #: builtin/remote.c:177
8236 msgid "specifying branches to track makes sense only with fetch mirrors"
8237 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8239 #: builtin/remote.c:185 builtin/remote.c:641
8241 msgid "remote %s already exists."
8242 msgstr "远程 %s 已经存在。"
8244 #: builtin/remote.c:189 builtin/remote.c:645
8246 msgid "'%s' is not a valid remote name"
8247 msgstr "'%s' 不是一个有效的远程名称"
8249 #: builtin/remote.c:233
8251 msgid "Could not setup master '%s'"
8252 msgstr "无法设置 master '%s'"
8254 #: builtin/remote.c:289
8256 msgid "more than one %s"
8259 #: builtin/remote.c:334
8261 msgid "Could not get fetch map for refspec %s"
8262 msgstr "无法得到引用规则 %s 的获取列表"
8264 #: builtin/remote.c:435 builtin/remote.c:443
8268 #: builtin/remote.c:447
8272 #: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
8274 msgid "Could not append '%s' to '%s'"
8275 msgstr "不能添加 '%s' 至 '%s'"
8277 #: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
8279 msgid "No such remote: %s"
8282 #: builtin/remote.c:651
8284 msgid "Could not rename config section '%s' to '%s'"
8285 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8287 #: builtin/remote.c:657 builtin/remote.c:794
8289 msgid "Could not remove config section '%s'"
8290 msgstr "不能移除配置小节 '%s'"
8292 #: builtin/remote.c:672
8295 "Not updating non-default fetch refspec\n"
8297 "\tPlease update the configuration manually if necessary."
8303 #: builtin/remote.c:678
8305 msgid "Could not append '%s'"
8308 #: builtin/remote.c:689
8310 msgid "Could not set '%s'"
8313 #: builtin/remote.c:711
8315 msgid "deleting '%s' failed"
8318 #: builtin/remote.c:745
8320 msgid "creating '%s' failed"
8323 #: builtin/remote.c:759
8325 msgid "Could not remove branch %s"
8328 #: builtin/remote.c:829
8330 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8331 "to delete it, use:"
8333 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8334 "to delete them, use:"
8335 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8336 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8338 #: builtin/remote.c:938
8340 msgid " new (next fetch will store in remotes/%s)"
8341 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8343 #: builtin/remote.c:941
8347 #: builtin/remote.c:943
8348 msgid " stale (use 'git remote prune' to remove)"
8349 msgstr " 过时(使用 'git remote prune' 来移除)"
8351 #: builtin/remote.c:945
8355 #: builtin/remote.c:986
8357 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8358 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8360 #: builtin/remote.c:993
8362 msgid "rebases onto remote %s"
8365 #: builtin/remote.c:996
8367 msgid " merges with remote %s"
8370 #: builtin/remote.c:997
8371 msgid " and with remote"
8374 #: builtin/remote.c:999
8376 msgid "merges with remote %s"
8379 #: builtin/remote.c:1000
8380 msgid " and with remote"
8383 #: builtin/remote.c:1046
8387 #: builtin/remote.c:1049
8391 #: builtin/remote.c:1053
8395 #: builtin/remote.c:1056
8396 msgid "fast-forwardable"
8399 #: builtin/remote.c:1059
8400 msgid "local out of date"
8403 #: builtin/remote.c:1066
8405 msgid " %-*s forces to %-*s (%s)"
8406 msgstr " %-*s 强制推送至 %-*s (%s)"
8408 #: builtin/remote.c:1069
8410 msgid " %-*s pushes to %-*s (%s)"
8411 msgstr " %-*s 推送至 %-*s (%s)"
8413 #: builtin/remote.c:1073
8415 msgid " %-*s forces to %s"
8416 msgstr " %-*s 强制推送至 %s"
8418 #: builtin/remote.c:1076
8420 msgid " %-*s pushes to %s"
8421 msgstr " %-*s 推送至 %s"
8423 #: builtin/remote.c:1144
8424 msgid "do not query remotes"
8427 #: builtin/remote.c:1171
8432 #: builtin/remote.c:1172
8434 msgid " Fetch URL: %s"
8437 #: builtin/remote.c:1173 builtin/remote.c:1318
8441 #: builtin/remote.c:1182 builtin/remote.c:1184
8443 msgid " Push URL: %s"
8446 #: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
8448 msgid " HEAD branch: %s"
8451 #: builtin/remote.c:1192
8454 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8455 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8457 #: builtin/remote.c:1204
8459 msgid " Remote branch:%s"
8460 msgid_plural " Remote branches:%s"
8461 msgstr[0] " 远程分支:%s"
8462 msgstr[1] " 远程分支:%s"
8464 # 译者:中文字符串拼接,可删除前导空格
8465 #: builtin/remote.c:1207 builtin/remote.c:1234
8466 msgid " (status not queried)"
8469 #: builtin/remote.c:1216
8470 msgid " Local branch configured for 'git pull':"
8471 msgid_plural " Local branches configured for 'git pull':"
8472 msgstr[0] " 为 'git pull' 配置的本地分支:"
8473 msgstr[1] " 为 'git pull' 配置的本地分支:"
8475 #: builtin/remote.c:1224
8476 msgid " Local refs will be mirrored by 'git push'"
8477 msgstr " 本地引用将在 'git push' 时被镜像"
8479 #: builtin/remote.c:1231
8481 msgid " Local ref configured for 'git push'%s:"
8482 msgid_plural " Local refs configured for 'git push'%s:"
8483 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8484 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8486 #: builtin/remote.c:1252
8487 msgid "set refs/remotes/<name>/HEAD according to remote"
8488 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8490 #: builtin/remote.c:1254
8491 msgid "delete refs/remotes/<name>/HEAD"
8492 msgstr "删除 refs/remotes/<名称>/HEAD"
8494 #: builtin/remote.c:1269
8495 msgid "Cannot determine remote HEAD"
8496 msgstr "无法确定远程 HEAD"
8498 #: builtin/remote.c:1271
8499 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8500 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8502 #: builtin/remote.c:1281
8504 msgid "Could not delete %s"
8507 #: builtin/remote.c:1289
8509 msgid "Not a valid ref: %s"
8510 msgstr "不是一个有效引用:%s"
8512 #: builtin/remote.c:1291
8514 msgid "Could not setup %s"
8518 #: builtin/remote.c:1307
8520 msgid " %s will become dangling!"
8521 msgstr " %s 将成为摇摆状态!"
8524 #: builtin/remote.c:1308
8526 msgid " %s has become dangling!"
8527 msgstr " %s 已成为摇摆状态!"
8529 #: builtin/remote.c:1314
8534 #: builtin/remote.c:1315
8539 #: builtin/remote.c:1328
8541 msgid " * [would prune] %s"
8542 msgstr " * [将删除] %s"
8544 #: builtin/remote.c:1331
8546 msgid " * [pruned] %s"
8547 msgstr " * [已删除] %s"
8549 #: builtin/remote.c:1374
8550 msgid "prune remotes after fetching"
8553 #: builtin/remote.c:1440 builtin/remote.c:1514
8555 msgid "No such remote '%s'"
8558 #: builtin/remote.c:1460
8562 #: builtin/remote.c:1467
8563 msgid "no remote specified"
8566 #: builtin/remote.c:1489
8567 msgid "manipulate push URLs"
8570 #: builtin/remote.c:1491
8574 #: builtin/remote.c:1493
8578 #: builtin/remote.c:1500
8579 msgid "--add --delete doesn't make sense"
8580 msgstr "--add --delete 无意义"
8582 #: builtin/remote.c:1540
8584 msgid "Invalid old URL pattern: %s"
8585 msgstr "无效的旧URL匹配模版:%s"
8587 #: builtin/remote.c:1548
8589 msgid "No such URL found: %s"
8592 #: builtin/remote.c:1550
8593 msgid "Will not delete all non-push URLs"
8594 msgstr "将不会删除所有非推送URL地址"
8596 #: builtin/remote.c:1564
8597 msgid "be verbose; must be placed before a subcommand"
8598 msgstr "冗长输出;必须置于子命令之前"
8600 #: builtin/repack.c:15
8601 msgid "git repack [options]"
8602 msgstr "git repack [选项]"
8604 #: builtin/repack.c:143
8605 msgid "pack everything in a single pack"
8606 msgstr "所有内容打包到一个包文件中"
8608 #: builtin/repack.c:145
8609 msgid "same as -a, and turn unreachable objects loose"
8610 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8612 #: builtin/repack.c:148
8613 msgid "remove redundant packs, and run git-prune-packed"
8614 msgstr "删除多余的包,运行 git-prune-packed"
8616 #: builtin/repack.c:150
8617 msgid "pass --no-reuse-delta to git-pack-objects"
8618 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8620 #: builtin/repack.c:152
8621 msgid "pass --no-reuse-object to git-pack-objects"
8622 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8624 #: builtin/repack.c:154
8625 msgid "do not run git-update-server-info"
8626 msgstr "不运行 git-update-server-info"
8628 #: builtin/repack.c:157
8629 msgid "pass --local to git-pack-objects"
8630 msgstr "向 git-pack-objects 传递参数 --local"
8632 #: builtin/repack.c:158
8636 #: builtin/repack.c:159
8637 msgid "with -A, do not loosen objects older than this"
8638 msgstr "使用 -A,不要将早于给定时间的对象过期"
8640 #: builtin/repack.c:161
8641 msgid "size of the window used for delta compression"
8644 #: builtin/repack.c:163
8645 msgid "same as the above, but limit memory size instead of entries count"
8646 msgstr "和上面的相似,但限制内存大小而非条目数"
8648 #: builtin/repack.c:165
8649 msgid "limits the maximum delta depth"
8652 #: builtin/repack.c:167
8653 msgid "maximum size of each packfile"
8656 #: builtin/repack.c:343
8658 msgid "removing '%s' failed"
8661 #: builtin/replace.c:17
8662 msgid "git replace [-f] <object> <replacement>"
8663 msgstr "git replace [-f] <对象> <替换物>"
8665 #: builtin/replace.c:18
8666 msgid "git replace -d <object>..."
8667 msgstr "git replace -d <对象>..."
8669 #: builtin/replace.c:19
8670 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8671 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8673 #: builtin/replace.c:174
8674 msgid "list replace refs"
8677 #: builtin/replace.c:175
8678 msgid "delete replace refs"
8681 #: builtin/replace.c:176
8682 msgid "replace the ref if it exists"
8685 #: builtin/replace.c:177
8686 msgid "use this format"
8689 #: builtin/rerere.c:12
8690 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8691 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8693 #: builtin/rerere.c:57
8694 msgid "register clean resolutions in index"
8695 msgstr "在索引中注册干净的解决方案"
8697 #: builtin/reset.c:25
8699 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8700 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8702 #: builtin/reset.c:26
8703 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8704 msgstr "git reset [-q] <树或提交> [--] <路径>..."
8706 #: builtin/reset.c:27
8707 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8708 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8710 #: builtin/reset.c:33
8714 #: builtin/reset.c:33
8718 #: builtin/reset.c:33
8722 #: builtin/reset.c:33
8726 #: builtin/reset.c:33
8730 #: builtin/reset.c:73
8731 msgid "You do not have a valid HEAD."
8732 msgstr "您没有一个有效的 HEAD。"
8734 #: builtin/reset.c:75
8735 msgid "Failed to find tree of HEAD."
8736 msgstr "无法找到 HEAD 指向的树。"
8738 #: builtin/reset.c:81
8740 msgid "Failed to find tree of %s."
8741 msgstr "无法找到 %s 指向的树。"
8743 #: builtin/reset.c:99
8745 msgid "HEAD is now at %s"
8746 msgstr "HEAD 现在位于 %s"
8748 # 译者:汉字之间无空格,故删除%s前后空格
8749 #: builtin/reset.c:172
8751 msgid "Cannot do a %s reset in the middle of a merge."
8752 msgstr "在合并过程中不能做%s重置操作。"
8754 #: builtin/reset.c:262
8755 msgid "be quiet, only report errors"
8758 #: builtin/reset.c:264
8759 msgid "reset HEAD and index"
8760 msgstr "重置 HEAD 和索引"
8762 #: builtin/reset.c:265
8763 msgid "reset only HEAD"
8766 #: builtin/reset.c:267 builtin/reset.c:269
8767 msgid "reset HEAD, index and working tree"
8768 msgstr "重置 HEAD、索引和工作区"
8770 #: builtin/reset.c:271
8771 msgid "reset HEAD but keep local changes"
8772 msgstr "重置 HEAD 但保存本地变更"
8774 #: builtin/reset.c:289
8776 msgid "Failed to resolve '%s' as a valid revision."
8777 msgstr "无法将 '%s' 解析为一个有效的版本。"
8779 #: builtin/reset.c:292 builtin/reset.c:300
8781 msgid "Could not parse object '%s'."
8782 msgstr "不能解析对象 '%s'。"
8784 #: builtin/reset.c:297
8786 msgid "Failed to resolve '%s' as a valid tree."
8787 msgstr "无法将 '%s' 解析为一个有效的树对象。"
8789 #: builtin/reset.c:306
8790 msgid "--patch is incompatible with --{hard,mixed,soft}"
8791 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8793 #: builtin/reset.c:315
8794 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8795 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8797 # 译者:汉字之间无空格,故删除%s前后空格
8798 #: builtin/reset.c:317
8800 msgid "Cannot do %s reset with paths."
8801 msgstr "不能带路径进行%s重置。"
8803 # 译者:汉字之间无空格,故删除%s前后空格
8804 #: builtin/reset.c:327
8806 msgid "%s reset is not allowed in a bare repository"
8807 msgstr "不能对裸版本库进行%s重置"
8809 #: builtin/reset.c:344
8810 msgid "Unstaged changes after reset:"
8811 msgstr "重置后撤出暂存区的变更:"
8813 #: builtin/reset.c:350
8815 msgid "Could not reset index file to revision '%s'."
8816 msgstr "不能重置索引文件至版本 '%s'。"
8818 #: builtin/reset.c:355
8819 msgid "Could not write new index file."
8820 msgstr "不能写入新的索引文件。"
8822 #: builtin/rev-parse.c:359
8823 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8824 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8826 #: builtin/rev-parse.c:364
8827 msgid "keep the `--` passed as an arg"
8828 msgstr "保持 `--` 作为一个参数传递"
8830 #: builtin/rev-parse.c:366
8831 msgid "stop parsing after the first non-option argument"
8832 msgstr "遇到第一个非选项参数后停止解析"
8834 #: builtin/rev-parse.c:369
8835 msgid "output in stuck long form"
8838 #: builtin/rev-parse.c:486
8840 "git rev-parse --parseopt [options] -- [<args>...]\n"
8841 " or: git rev-parse --sq-quote [<arg>...]\n"
8842 " or: git rev-parse [options] [<arg>...]\n"
8844 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8846 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
8847 " 或者:git rev-parse --sq-quote [<参数>...]\n"
8848 " 或者:git rev-parse [选项] [<参数>...]\n"
8850 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8852 #: builtin/revert.c:22
8853 msgid "git revert [options] <commit-ish>..."
8854 msgstr "git revert [选项] <提交号>..."
8856 #: builtin/revert.c:23
8857 msgid "git revert <subcommand>"
8858 msgstr "git revert <子命令>"
8860 #: builtin/revert.c:28
8861 msgid "git cherry-pick [options] <commit-ish>..."
8862 msgstr "git cherry-pick [选项] <提交号>..."
8864 #: builtin/revert.c:29
8865 msgid "git cherry-pick <subcommand>"
8866 msgstr "git cherry-pick <子命令>"
8868 #: builtin/revert.c:71
8870 msgid "%s: %s cannot be used with %s"
8871 msgstr "%s:%s 不能和 %s 同时使用"
8873 #: builtin/revert.c:80
8874 msgid "end revert or cherry-pick sequence"
8877 #: builtin/revert.c:81
8878 msgid "resume revert or cherry-pick sequence"
8881 #: builtin/revert.c:82
8882 msgid "cancel revert or cherry-pick sequence"
8885 #: builtin/revert.c:83
8886 msgid "don't automatically commit"
8889 #: builtin/revert.c:84
8890 msgid "edit the commit message"
8893 #: builtin/revert.c:87
8894 msgid "parent number"
8897 #: builtin/revert.c:89
8898 msgid "merge strategy"
8901 #: builtin/revert.c:90
8905 #: builtin/revert.c:91
8906 msgid "option for merge strategy"
8909 #: builtin/revert.c:102
8910 msgid "append commit name"
8913 #: builtin/revert.c:103
8914 msgid "allow fast-forward"
8917 #: builtin/revert.c:104
8918 msgid "preserve initially empty commits"
8921 #: builtin/revert.c:105
8922 msgid "allow commits with empty messages"
8925 #: builtin/revert.c:106
8926 msgid "keep redundant, empty commits"
8929 #: builtin/revert.c:110
8930 msgid "program error"
8933 #: builtin/revert.c:195
8934 msgid "revert failed"
8937 #: builtin/revert.c:210
8938 msgid "cherry-pick failed"
8942 msgid "git rm [options] [--] <file>..."
8943 msgstr "git rm [选项] [--] <文件>..."
8947 "the following submodule (or one of its nested submodules)\n"
8948 "uses a .git directory:"
8950 "the following submodules (or one of its nested submodules)\n"
8951 "use a .git directory:"
8952 msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8953 msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8958 "(use 'rm -rf' if you really want to remove it including all of its history)"
8961 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8965 "the following file has staged content different from both the\n"
8966 "file and the HEAD:"
8968 "the following files have staged content different from both the\n"
8969 "file and the HEAD:"
8970 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8971 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8976 "(use -f to force removal)"
8982 msgid "the following file has changes staged in the index:"
8983 msgid_plural "the following files have changes staged in the index:"
8984 msgstr[0] "如下文件相对索引区的内容有修改"
8985 msgstr[1] "如下文件相对索引区的内容有修改"
8987 #: builtin/rm.c:244 builtin/rm.c:255
8990 "(use --cached to keep the file, or -f to force removal)"
8993 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
8996 msgid "the following file has local modifications:"
8997 msgid_plural "the following files have local modifications:"
8998 msgstr[0] "如下文件有本地修改:"
8999 msgstr[1] "如下文件有本地修改:"
9002 msgid "do not list removed files"
9006 msgid "only remove from the index"
9010 msgid "override the up-to-date check"
9014 msgid "allow recursive removal"
9018 msgid "exit with a zero status even if nothing matched"
9019 msgstr "即使没有匹配,也以零状态退出"
9023 msgid "not removing '%s' recursively without -r"
9024 msgstr "未提供 -r 选项不会递归删除 '%s'"
9028 msgid "git rm: unable to remove %s"
9029 msgstr "git rm:不能删除 %s"
9031 #: builtin/shortlog.c:13
9032 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9033 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9035 #: builtin/shortlog.c:131
9037 msgid "Missing author: %s"
9040 #: builtin/shortlog.c:230
9041 msgid "sort output according to the number of commits per author"
9042 msgstr "根据每个作者的提交数量排序"
9044 #: builtin/shortlog.c:232
9045 msgid "Suppress commit descriptions, only provides commit count"
9046 msgstr "隐藏提交说明,只提供提交数量"
9048 #: builtin/shortlog.c:234
9049 msgid "Show the email address of each author"
9050 msgstr "显示每个作者的电子邮件地址"
9052 #: builtin/shortlog.c:235
9054 msgstr "w[,i1[,i2]]"
9056 #: builtin/shortlog.c:236
9057 msgid "Linewrap output"
9060 #: builtin/show-branch.c:9
9062 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9063 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9064 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9067 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9068 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9069 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9072 #: builtin/show-branch.c:10
9073 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9074 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9076 #: builtin/show-branch.c:649
9077 msgid "show remote-tracking and local branches"
9078 msgstr "显示远程跟踪的和本地的分支"
9080 #: builtin/show-branch.c:651
9081 msgid "show remote-tracking branches"
9084 #: builtin/show-branch.c:653
9085 msgid "color '*!+-' corresponding to the branch"
9086 msgstr "着色 '*!+-' 到相应的分支"
9088 #: builtin/show-branch.c:655
9089 msgid "show <n> more commits after the common ancestor"
9090 msgstr "显示共同祖先后的 <n> 个提交"
9092 #: builtin/show-branch.c:657
9093 msgid "synonym to more=-1"
9094 msgstr "和 more=-1 同义"
9096 #: builtin/show-branch.c:658
9097 msgid "suppress naming strings"
9100 #: builtin/show-branch.c:660
9101 msgid "include the current branch"
9104 #: builtin/show-branch.c:662
9105 msgid "name commits with their object names"
9108 #: builtin/show-branch.c:664
9109 msgid "show possible merge bases"
9112 #: builtin/show-branch.c:666
9113 msgid "show refs unreachable from any other ref"
9114 msgstr "显示没有任何引用的的引用"
9116 #: builtin/show-branch.c:668
9117 msgid "show commits in topological order"
9120 #: builtin/show-branch.c:671
9121 msgid "show only commits not on the first branch"
9122 msgstr "只显示不在第一个分支上的提交"
9124 #: builtin/show-branch.c:673
9125 msgid "show merges reachable from only one tip"
9126 msgstr "显示仅一个分支可访问的合并提交"
9128 #: builtin/show-branch.c:675
9129 msgid "topologically sort, maintaining date order where possible"
9130 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9132 #: builtin/show-branch.c:678
9133 msgid "<n>[,<base>]"
9134 msgstr "<n>[,<base>]"
9136 #: builtin/show-branch.c:679
9137 msgid "show <n> most recent ref-log entries starting at base"
9138 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9140 #: builtin/show-ref.c:10
9142 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9143 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9145 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9146 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9148 #: builtin/show-ref.c:11
9149 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9150 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9152 #: builtin/show-ref.c:168
9153 msgid "only show tags (can be combined with heads)"
9154 msgstr "只显示 tags(可以和头共用)"
9156 #: builtin/show-ref.c:169
9157 msgid "only show heads (can be combined with tags)"
9158 msgstr "只显示头(可以和 tags 共用)"
9160 #: builtin/show-ref.c:170
9161 msgid "stricter reference checking, requires exact ref path"
9162 msgstr "更严格的引用检测,需要精确的引用路径"
9164 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9165 msgid "show the HEAD reference, even if it would be filtered out"
9166 msgstr "显示 HEAD 引用,即使被过滤掉"
9168 #: builtin/show-ref.c:177
9169 msgid "dereference tags into object IDs"
9170 msgstr "转换 tags 到对象ID"
9172 #: builtin/show-ref.c:179
9173 msgid "only show SHA1 hash using <n> digits"
9174 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9176 #: builtin/show-ref.c:183
9177 msgid "do not print results to stdout (useful with --verify)"
9178 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9180 #: builtin/show-ref.c:185
9181 msgid "show refs from stdin that aren't in local repository"
9182 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9184 #: builtin/symbolic-ref.c:7
9185 msgid "git symbolic-ref [options] name [ref]"
9186 msgstr "git symbolic-ref [选项] 名称 [引用]"
9188 #: builtin/symbolic-ref.c:8
9189 msgid "git symbolic-ref -d [-q] name"
9190 msgstr "git symbolic-ref -d [-q] 名称"
9192 #: builtin/symbolic-ref.c:40
9193 msgid "suppress error message for non-symbolic (detached) refs"
9194 msgstr "不显示非符号(分离的)引用的错误信息"
9196 #: builtin/symbolic-ref.c:41
9197 msgid "delete symbolic ref"
9200 #: builtin/symbolic-ref.c:42
9201 msgid "shorten ref output"
9204 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
9208 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
9209 msgid "reason of the update"
9214 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9215 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9218 msgid "git tag -d <tagname>..."
9219 msgstr "git tag -d <标签名>..."
9223 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9224 "\t\t[<pattern>...]"
9226 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9230 msgid "git tag -v <tagname>..."
9231 msgstr "git tag -v <标签名>..."
9235 msgid "malformed object at '%s'"
9236 msgstr "非法的对象于 '%s'"
9238 #: builtin/tag.c:207
9240 msgid "tag name too long: %.*s..."
9241 msgstr "tag 名字太长:%.*s..."
9243 #: builtin/tag.c:212
9245 msgid "tag '%s' not found."
9246 msgstr "tag '%s' 未发现。"
9248 #: builtin/tag.c:227
9250 msgid "Deleted tag '%s' (was %s)\n"
9251 msgstr "已删除 tag '%s'(曾为 %s)\n"
9253 #: builtin/tag.c:239
9255 msgid "could not verify the tag '%s'"
9256 msgstr "不能校验 tag '%s'"
9258 #: builtin/tag.c:249
9262 "Write a tag message\n"
9263 "Lines starting with '%c' will be ignored.\n"
9267 "以 '%c' 开头的行将被忽略。\n"
9269 #: builtin/tag.c:253
9273 "Write a tag message\n"
9274 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9279 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9281 #: builtin/tag.c:292
9282 msgid "unable to sign the tag"
9285 #: builtin/tag.c:294
9286 msgid "unable to write tag file"
9289 #: builtin/tag.c:319
9290 msgid "bad object type."
9293 #: builtin/tag.c:332
9294 msgid "tag header too big."
9297 #: builtin/tag.c:368
9298 msgid "no tag message?"
9301 #: builtin/tag.c:374
9303 msgid "The tag message has been left in %s\n"
9304 msgstr "tag 说明被保留在 %s\n"
9306 #: builtin/tag.c:423
9307 msgid "switch 'points-at' requires an object"
9308 msgstr "开关 'points-at' 需要一个对象"
9310 #: builtin/tag.c:425
9312 msgid "malformed object name '%s'"
9313 msgstr "非法的对象名 '%s'"
9315 #: builtin/tag.c:445
9316 msgid "list tag names"
9319 #: builtin/tag.c:447
9320 msgid "print <n> lines of each tag message"
9321 msgstr "每个 tag 信息打印 <n> 行"
9323 #: builtin/tag.c:449
9327 #: builtin/tag.c:450
9331 #: builtin/tag.c:452
9332 msgid "Tag creation options"
9335 #: builtin/tag.c:454
9336 msgid "annotated tag, needs a message"
9337 msgstr "注解 tag,需要一个说明"
9339 #: builtin/tag.c:456
9343 #: builtin/tag.c:458
9344 msgid "annotated and GPG-signed tag"
9345 msgstr "注解并 GPG 签名的 tag"
9347 #: builtin/tag.c:462
9348 msgid "use another key to sign the tag"
9349 msgstr "使用另外的私钥签名 tag"
9351 #: builtin/tag.c:463
9352 msgid "replace the tag if exists"
9353 msgstr "如果存在,替换现有的 tag"
9355 #: builtin/tag.c:464
9356 msgid "show tag list in columns"
9357 msgstr "以列的方式显示 tag"
9359 #: builtin/tag.c:466
9360 msgid "Tag listing options"
9363 #: builtin/tag.c:469
9364 msgid "print only tags that contain the commit"
9365 msgstr "只打印包含提交的tags"
9367 #: builtin/tag.c:475
9368 msgid "print only tags of the object"
9371 #: builtin/tag.c:501
9372 msgid "--column and -n are incompatible"
9373 msgstr "--column 和 -n 不兼容"
9375 #: builtin/tag.c:518
9376 msgid "-n option is only allowed with -l."
9377 msgstr "-n 选项只允许和 -l 同时使用。"
9379 #: builtin/tag.c:520
9380 msgid "--contains option is only allowed with -l."
9381 msgstr "--contains 选项只允许和 -l 同时使用。"
9383 #: builtin/tag.c:522
9384 msgid "--points-at option is only allowed with -l."
9385 msgstr "--points-at 选项只允许和 -l 同时使用。"
9387 #: builtin/tag.c:530
9388 msgid "only one -F or -m option is allowed."
9389 msgstr "只允许一个 -F 或 -m 选项。"
9391 #: builtin/tag.c:550
9392 msgid "too many params"
9395 #: builtin/tag.c:556
9397 msgid "'%s' is not a valid tag name."
9398 msgstr "'%s' 不是一个有效的tag名称。"
9400 #: builtin/tag.c:561
9402 msgid "tag '%s' already exists"
9403 msgstr "tag '%s' 已存在"
9405 #: builtin/tag.c:579
9407 msgid "%s: cannot lock the ref"
9410 #: builtin/tag.c:581
9412 msgid "%s: cannot update the ref"
9415 #: builtin/tag.c:583
9417 msgid "Updated tag '%s' (was %s)\n"
9418 msgstr "已更新tag '%s'(曾为 %s)\n"
9420 #: builtin/update-index.c:402
9421 msgid "git update-index [options] [--] [<file>...]"
9422 msgstr "git update-index [选项] [--] [<文件>...]"
9424 #: builtin/update-index.c:720
9425 msgid "continue refresh even when index needs update"
9426 msgstr "当索引需要更新时继续刷新"
9428 #: builtin/update-index.c:723
9429 msgid "refresh: ignore submodules"
9432 #: builtin/update-index.c:726
9433 msgid "do not ignore new files"
9436 #: builtin/update-index.c:728
9437 msgid "let files replace directories and vice-versa"
9438 msgstr "让文件替换目录(反之亦然)"
9440 #: builtin/update-index.c:730
9441 msgid "notice files missing from worktree"
9444 #: builtin/update-index.c:732
9445 msgid "refresh even if index contains unmerged entries"
9446 msgstr "即使索引区包含未合并的条目也执行刷新"
9448 #: builtin/update-index.c:735
9449 msgid "refresh stat information"
9452 #: builtin/update-index.c:739
9453 msgid "like --refresh, but ignore assume-unchanged setting"
9454 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9456 #: builtin/update-index.c:743
9457 msgid "<mode> <object> <path>"
9458 msgstr "<mode> <object> <path>"
9460 #: builtin/update-index.c:744
9461 msgid "add the specified entry to the index"
9462 msgstr "添加指定的条目到索引区"
9464 #: builtin/update-index.c:748
9468 #: builtin/update-index.c:749
9469 msgid "override the executable bit of the listed files"
9470 msgstr "覆盖列表里文件的可执行位"
9472 #: builtin/update-index.c:753
9473 msgid "mark files as \"not changing\""
9474 msgstr "把文件标记为 \"没有变更\""
9476 #: builtin/update-index.c:756
9477 msgid "clear assumed-unchanged bit"
9478 msgstr "清除 assumed-unchanged 位"
9480 #: builtin/update-index.c:759
9481 msgid "mark files as \"index-only\""
9482 msgstr "把文件标记为 \"仅索引\""
9484 #: builtin/update-index.c:762
9485 msgid "clear skip-worktree bit"
9486 msgstr "清除 skip-worktree 位"
9488 #: builtin/update-index.c:765
9489 msgid "add to index only; do not add content to object database"
9490 msgstr "只添加到索引区;不添加对象到对象库"
9492 #: builtin/update-index.c:767
9493 msgid "remove named paths even if present in worktree"
9494 msgstr "即使存在工作区里,也删除路径"
9496 #: builtin/update-index.c:769
9497 msgid "with --stdin: input lines are terminated by null bytes"
9498 msgstr "携带 --stdin:输入的行以 null 字符终止"
9500 #: builtin/update-index.c:771
9501 msgid "read list of paths to be updated from standard input"
9502 msgstr "从标准输入中读取需要更新的路径列表"
9504 #: builtin/update-index.c:775
9505 msgid "add entries from standard input to the index"
9506 msgstr "从标准输入添加条目到索引区"
9508 #: builtin/update-index.c:779
9509 msgid "repopulate stages #2 and #3 for the listed paths"
9510 msgstr "为指定文件重新生成第2和第3暂存区"
9512 #: builtin/update-index.c:783
9513 msgid "only update entries that differ from HEAD"
9514 msgstr "只更新与 HEAD 不同的条目"
9516 #: builtin/update-index.c:787
9517 msgid "ignore files missing from worktree"
9520 #: builtin/update-index.c:790
9521 msgid "report actions to standard output"
9524 #: builtin/update-index.c:792
9525 msgid "(for porcelains) forget saved unresolved conflicts"
9526 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9528 #: builtin/update-index.c:796
9529 msgid "write index in this format"
9532 #: builtin/update-ref.c:9
9533 msgid "git update-ref [options] -d <refname> [<oldval>]"
9534 msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9536 #: builtin/update-ref.c:10
9537 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9538 msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9540 #: builtin/update-ref.c:11
9541 msgid "git update-ref [options] --stdin [-z]"
9542 msgstr "git update-ref [选项] --stdin [-z]"
9544 #: builtin/update-ref.c:255
9545 msgid "delete the reference"
9548 #: builtin/update-ref.c:257
9549 msgid "update <refname> not the one it points to"
9550 msgstr "更新 <引用名> 本身而不是它指向的引用"
9552 #: builtin/update-ref.c:258
9553 msgid "stdin has NUL-terminated arguments"
9554 msgstr "标准输入有以 NUL 字符终止的参数"
9556 #: builtin/update-ref.c:259
9557 msgid "read updates from stdin"
9560 #: builtin/update-server-info.c:6
9561 msgid "git update-server-info [--force]"
9562 msgstr "git update-server-info [--force]"
9564 #: builtin/update-server-info.c:14
9565 msgid "update the info files from scratch"
9568 #: builtin/verify-pack.c:56
9569 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9570 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9572 #: builtin/verify-pack.c:66
9576 #: builtin/verify-pack.c:68
9577 msgid "show statistics only"
9580 #: builtin/verify-tag.c:17
9581 msgid "git verify-tag [-v|--verbose] <tag>..."
9582 msgstr "git verify-tag [-v|--verbose] <tag>..."
9584 #: builtin/verify-tag.c:73
9585 msgid "print tag contents"
9588 #: builtin/write-tree.c:13
9589 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9590 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9592 #: builtin/write-tree.c:26
9596 #: builtin/write-tree.c:27
9597 msgid "write tree object for a subdirectory <prefix>"
9598 msgstr "将 <前缀> 子目录内容写到一个树对象"
9600 #: builtin/write-tree.c:30
9601 msgid "only useful for debugging"
9606 "'git help -a' and 'git help -g' lists available subcommands and some\n"
9607 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9608 "to read about a specific subcommand or concept."
9610 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9611 "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
9613 #: parse-options.h:146
9617 #: parse-options.h:161
9618 msgid "no-op (backward compatibility)"
9621 #: parse-options.h:235
9622 msgid "be more verbose"
9625 #: parse-options.h:237
9626 msgid "be more quiet"
9629 #: parse-options.h:243
9630 msgid "use <n> digits to display SHA-1s"
9631 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9634 msgid "Add file contents to the index"
9638 msgid "Find by binary search the change that introduced a bug"
9639 msgstr "通过二分查找定位引入 bug 的变更"
9642 msgid "List, create, or delete branches"
9646 msgid "Checkout a branch or paths to the working tree"
9647 msgstr "检出一个分支或路径到工作区"
9650 msgid "Clone a repository into a new directory"
9651 msgstr "克隆一个版本库到一个新目录"
9654 msgid "Record changes to the repository"
9658 msgid "Show changes between commits, commit and working tree, etc"
9659 msgstr "显示提交之间、提交和工作区之间等的差异"
9662 msgid "Download objects and refs from another repository"
9663 msgstr "从另外一个版本库下载对象和引用"
9666 msgid "Print lines matching a pattern"
9670 msgid "Create an empty Git repository or reinitialize an existing one"
9671 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9674 msgid "Show commit logs"
9678 msgid "Join two or more development histories together"
9679 msgstr "合并两个或更多开发历史"
9682 msgid "Move or rename a file, a directory, or a symlink"
9683 msgstr "移动或重命名一个文件、目录或符号链接"
9686 msgid "Fetch from and integrate with another repository or a local branch"
9687 msgstr "获取并整合另外的版本库或一个本地分支"
9690 msgid "Update remote refs along with associated objects"
9691 msgstr "更新远程引用和相关的对象"
9694 msgid "Forward-port local commits to the updated upstream head"
9695 msgstr "本地提交转移至更新后的上游分支中"
9698 msgid "Reset current HEAD to the specified state"
9699 msgstr "重置当前HEAD到指定状态"
9702 msgid "Remove files from the working tree and from the index"
9703 msgstr "从工作区和索引中删除文件"
9706 msgid "Show various types of objects"
9710 msgid "Show the working tree status"
9714 msgid "Create, list, delete or verify a tag object signed with GPG"
9715 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9718 msgid "You need to set your committer info first"
9719 msgstr "您需要先设置你的提交者信息"
9723 "You seem to have moved HEAD since the last 'am' failure.\n"
9724 "Not rewinding to ORIG_HEAD"
9725 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9730 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9731 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9732 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9734 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
9735 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9736 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9739 msgid "Cannot fall back to three-way merge."
9743 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9744 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9747 msgid "Using index info to reconstruct a base tree..."
9748 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9752 "Did you hand edit your patch?\n"
9753 "It does not apply to blobs recorded in its index."
9756 "无法应用补丁到索引中的数据(blob)对象上。"
9759 msgid "Falling back to patching base and 3-way merge..."
9760 msgstr "转而在基础版本上打补丁及进行三路合并..."
9763 msgid "Failed to merge in the changes."
9767 msgid "Only one StGIT patch series can be applied at once"
9768 msgstr "一次只能有一个 StGIT 补丁队列被应用"
9772 msgid "Patch format $patch_format is not supported."
9773 msgstr "不支持 $patch_format 补丁格式。"
9776 msgid "Patch format detection failed."
9781 "The -b/--binary option has been a no-op for long time, and\n"
9782 "it will be removed. Please do not use it anymore."
9784 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9789 msgid "previous rebase directory $dotest still exists but mbox given."
9790 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
9793 msgid "Please make up your mind. --skip or --abort?"
9794 msgstr "请下决心。--skip 或是 --abort ?"
9799 "Stray $dotest directory found.\n"
9800 "Use \"git am --abort\" to remove it."
9802 "发现了错误的 $dotest 目录。\n"
9803 "使用 \"git am --abort\" 删除它。"
9806 msgid "Resolve operation not in progress, we are not resuming."
9807 msgstr "解决操作未进行,我们不会继续。"
9811 msgid "Dirty index: cannot apply patches (dirty: $files)"
9812 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9817 "Patch is empty. Was it split wrong?\n"
9818 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9819 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9822 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9823 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9826 msgid "Patch does not have a valid e-mail address."
9827 msgstr "补丁中没有一个有效的邮件地址。"
9830 msgid "cannot be interactive without stdin connected to a terminal."
9831 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9834 msgid "Commit Body is:"
9838 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9839 #. in your translation. The program will only accept English
9840 #. input at this point.
9842 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9843 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9847 msgid "Applying: $FIRSTLINE"
9848 msgstr "正应用:$FIRSTLINE"
9852 "No changes - did you forget to use 'git add'?\n"
9853 "If there is nothing left to stage, chances are that something else\n"
9854 "already introduced the same changes; you might want to skip this patch."
9856 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9857 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9862 "You still have unmerged paths in your index\n"
9863 "did you forget to use 'git add'?"
9864 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9867 msgid "No changes -- Patch already applied."
9868 msgstr "没有变更 —— 补丁已经应用过。"
9872 msgid "Patch failed at $msgnum $FIRSTLINE"
9873 msgstr "补丁失败于 $msgnum $FIRSTLINE"
9878 "The copy of the patch that failed is found in:\n"
9885 msgid "applying to an empty history"
9889 msgid "You need to start by \"git bisect start\""
9890 msgstr "您需要执行 \"git bisect start\" 来开始"
9893 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9894 #. translation. The program will only accept English input
9897 msgid "Do you want me to do it for you [Y/n]? "
9898 msgstr "您想让我为您这样做么[Y/n]? "
9902 msgid "unrecognised option: '$arg'"
9903 msgstr "未能识别的选项:'$arg'"
9907 msgid "'$arg' does not appear to be a valid revision"
9908 msgstr "'$arg' 看起来不像是一个有效的版本"
9910 #: git-bisect.sh:117
9911 msgid "Bad HEAD - I need a HEAD"
9912 msgstr "坏的 HEAD - 我需要一个 HEAD"
9914 #: git-bisect.sh:130
9917 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9918 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9920 #: git-bisect.sh:140
9921 msgid "won't bisect on cg-seek'ed tree"
9922 msgstr "不会在做了 cg-seek 的树上做二分查找"
9924 #: git-bisect.sh:144
9925 msgid "Bad HEAD - strange symbolic ref"
9926 msgstr "坏的 HEAD - 奇怪的符号引用"
9928 #: git-bisect.sh:189
9930 msgid "Bad bisect_write argument: $state"
9931 msgstr "坏的 bisect_write 参数:$state"
9933 #: git-bisect.sh:218
9935 msgid "Bad rev input: $arg"
9936 msgstr "输入坏的版本:$arg"
9938 #: git-bisect.sh:232
9939 msgid "Please call 'bisect_state' with at least one argument."
9940 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9942 #: git-bisect.sh:244
9944 msgid "Bad rev input: $rev"
9945 msgstr "输入坏的版本:$rev"
9947 #: git-bisect.sh:250
9948 msgid "'git bisect bad' can take only one argument."
9949 msgstr "'git bisect bad' 只能带一个参数。"
9951 #. have bad but not good. we could bisect although
9952 #. this is less optimum.
9953 #: git-bisect.sh:273
9954 msgid "Warning: bisecting only with a bad commit."
9955 msgstr "警告:在仅有一个坏提交下进行二分查找。"
9958 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9959 #. translation. The program will only accept English input
9961 #: git-bisect.sh:279
9962 msgid "Are you sure [Y/n]? "
9963 msgstr "您确认么[Y/n]? "
9965 #: git-bisect.sh:289
9967 "You need to give me at least one good and one bad revisions.\n"
9968 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9970 "您需要给我至少一个好版本和一个坏版本。\n"
9971 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9973 #: git-bisect.sh:292
9975 "You need to start by \"git bisect start\".\n"
9976 "You then need to give me at least one good and one bad revisions.\n"
9977 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9979 "您需要执行 \"git bisect start\" 来开始。\n"
9980 "然后需要提供我至少一个好版本和一个坏版本。\n"
9981 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9983 #: git-bisect.sh:363 git-bisect.sh:490
9984 msgid "We are not bisecting."
9987 #: git-bisect.sh:370
9989 msgid "'$invalid' is not a valid commit"
9990 msgstr "'$invalid' 不是一个有效的提交"
9992 #: git-bisect.sh:379
9995 "Could not check out original HEAD '$branch'.\n"
9996 "Try 'git bisect reset <commit>'."
9998 "不能检出原始 HEAD '$branch'。\n"
9999 "尝试 'git bisect reset <提交>'。"
10001 #: git-bisect.sh:406
10002 msgid "No logfile given"
10005 #: git-bisect.sh:407
10007 msgid "cannot read $file for replaying"
10008 msgstr "不能读取 $file 来重放"
10010 #: git-bisect.sh:424
10011 msgid "?? what are you talking about?"
10014 #: git-bisect.sh:436
10016 msgid "running $command"
10017 msgstr "运行 $command"
10019 #: git-bisect.sh:443
10022 "bisect run failed:\n"
10023 "exit code $res from '$command' is < 0 or >= 128"
10026 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10028 #: git-bisect.sh:469
10029 msgid "bisect run cannot continue any more"
10030 msgstr "二分查找不能继续运行"
10032 #: git-bisect.sh:475
10035 "bisect run failed:\n"
10036 "'bisect_state $state' exited with error code $res"
10039 "'bisect_state $state' 退出码为 $res"
10041 #: git-bisect.sh:482
10042 msgid "bisect run success"
10047 "Pull is not possible because you have unmerged files.\n"
10048 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10049 "as appropriate to mark resolution, or use 'git commit -a'."
10051 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10052 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
10053 "或者使用 'git commit -a'。"
10056 msgid "Pull is not possible because you have unmerged files."
10057 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10060 msgid "updating an unborn branch with changes added to the index"
10061 msgstr "更新尚未诞生的分支,变更添加至索引"
10063 #. The fetch involved updating the current branch.
10064 #. The working tree and the index file is still based on the
10065 #. $orig_head commit, but we are merging into $curr_head.
10066 #. First update the working tree to match $curr_head.
10070 "Warning: fetch updated the current branch head.\n"
10071 "Warning: fast-forwarding your working tree from\n"
10072 "Warning: commit $orig_head."
10074 "警告:fetch 更新了当前的分支。您的工作区\n"
10075 "警告:从原提交 $orig_head 快进。"
10078 msgid "Cannot merge multiple branches into empty head"
10079 msgstr "无法将多个分支合并到空分支"
10082 msgid "Cannot rebase onto multiple branches"
10085 #: git-rebase.sh:55
10087 "When you have resolved this problem, run \"git rebase --continue\".\n"
10088 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10089 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10092 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10093 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10094 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10096 #: git-rebase.sh:158
10097 msgid "Applied autostash."
10098 msgstr "成功应用 autostash。"
10100 #: git-rebase.sh:161
10102 msgid "Cannot store $stash_sha1"
10103 msgstr "无法保存 $stash_sha1"
10105 #: git-rebase.sh:162
10107 "Applying autostash resulted in conflicts.\n"
10108 "Your changes are safe in the stash.\n"
10109 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10111 "应用 autostash 导致冲突。\n"
10112 "您的修改安全地保存在 stash 中。\n"
10113 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10115 #: git-rebase.sh:201
10116 msgid "The pre-rebase hook refused to rebase."
10117 msgstr "钩子 pre-rebase 拒绝变基。"
10119 #: git-rebase.sh:206
10120 msgid "It looks like git-am is in progress. Cannot rebase."
10121 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10123 #: git-rebase.sh:346
10124 msgid "The --exec option must be used with the --interactive option"
10125 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10127 #: git-rebase.sh:351
10128 msgid "No rebase in progress?"
10129 msgstr "没有正在进行的变基?"
10131 #: git-rebase.sh:362
10132 msgid "The --edit-todo action can only be used during interactive rebase."
10133 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10135 #: git-rebase.sh:369
10136 msgid "Cannot read HEAD"
10139 #: git-rebase.sh:372
10141 "You must edit all merge conflicts and then\n"
10142 "mark them as resolved using git add"
10144 "您必须编辑所有的合并冲突,然后通过 git add\n"
10147 #: git-rebase.sh:390
10149 msgid "Could not move back to $head_name"
10150 msgstr "无法移回 $head_name"
10152 #: git-rebase.sh:409
10155 "It seems that there is already a $state_dir_base directory, and\n"
10156 "I wonder if you are in the middle of another rebase. If that is the\n"
10157 "case, please try\n"
10158 "\t$cmd_live_rebase\n"
10159 "If that is not the case, please\n"
10160 "\t$cmd_clear_stale_rebase\n"
10161 "and run me again. I am stopping in case you still have something\n"
10164 "好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
10166 "\t$cmd_live_rebase\n"
10168 "\t$cmd_clear_stale_rebase\n"
10169 "然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
10171 #: git-rebase.sh:456
10173 msgid "invalid upstream $upstream_name"
10174 msgstr "无效的上游 $upstream_name"
10176 #: git-rebase.sh:480
10178 msgid "$onto_name: there are more than one merge bases"
10179 msgstr "$onto_name: 有一个以上的合并基准"
10181 #: git-rebase.sh:483 git-rebase.sh:487
10183 msgid "$onto_name: there is no merge base"
10184 msgstr "$onto_name: 没有合并基准"
10186 #: git-rebase.sh:492
10188 msgid "Does not point to a valid commit: $onto_name"
10189 msgstr "没有指向一个有效的提交:$onto_name"
10191 #: git-rebase.sh:515
10193 msgid "fatal: no such branch: $branch_name"
10194 msgstr "严重错误:无此分支:$branch_name"
10196 #: git-rebase.sh:548
10197 msgid "Cannot autostash"
10198 msgstr "无法 autostash"
10200 #: git-rebase.sh:553
10202 msgid "Created autostash: $stash_abbrev"
10203 msgstr "创建了 autostash: $stash_abbrev"
10205 #: git-rebase.sh:557
10206 msgid "Please commit or stash them."
10207 msgstr "请提交或为它们保存进度。"
10209 #: git-rebase.sh:577
10211 msgid "Current branch $branch_name is up to date."
10212 msgstr "当前分支 $branch_name 是最新的。"
10214 #: git-rebase.sh:581
10216 msgid "Current branch $branch_name is up to date, rebase forced."
10217 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10219 #: git-rebase.sh:592
10221 msgid "Changes from $mb to $onto:"
10222 msgstr "变更从 $mb 到 $onto:"
10224 #. Detach HEAD and reset the tree
10225 #: git-rebase.sh:601
10226 msgid "First, rewinding head to replay your work on top of it..."
10227 msgstr "首先,重置头指针以便在上面重放您的工作..."
10229 #: git-rebase.sh:611
10231 msgid "Fast-forwarded $branch_name to $onto_name."
10232 msgstr "快进 $branch_name 至 $onto_name。"
10235 msgid "git stash clear with parameters is unimplemented"
10236 msgstr "git stash clear 不支持参数"
10239 msgid "You do not have the initial commit yet"
10243 msgid "Cannot save the current index state"
10244 msgstr "无法保存当前索引状态"
10246 #: git-stash.sh:123 git-stash.sh:136
10247 msgid "Cannot save the current worktree state"
10248 msgstr "无法保存当前工作区状态"
10250 #: git-stash.sh:140
10251 msgid "No changes selected"
10254 #: git-stash.sh:143
10255 msgid "Cannot remove temporary index (can't happen)"
10256 msgstr "无法删除临时索引(不应发生)"
10258 #: git-stash.sh:156
10259 msgid "Cannot record working tree state"
10262 #: git-stash.sh:190
10264 msgid "Cannot update $ref_stash with $w_commit"
10265 msgstr "无法用 $w_commit 更新 $ref_stash"
10267 #. TRANSLATORS: $option is an invalid option, like
10268 #. `--blah-blah'. The 7 spaces at the beginning of the
10269 #. second line correspond to "error: ". So you should line
10270 #. up the second line with however many characters the
10271 #. translation of "error: " takes in your language. E.g. in
10272 #. English this is:
10274 #. $ git stash save --blah-blah 2>&1 | head -n 2
10275 #. error: unknown option for 'stash save': --blah-blah
10276 #. To provide a message, use git stash save -- '--blah-blah'
10277 #: git-stash.sh:237
10280 "error: unknown option for 'stash save': $option\n"
10281 " To provide a message, use git stash save -- '$option'"
10283 "错误:'stash save' 的未知选项:$option\n"
10284 " 要提供一个描述信息,使用 git stash save -- '$option'"
10286 #: git-stash.sh:258
10287 msgid "No local changes to save"
10288 msgstr "没有要保存的本地修改"
10290 #: git-stash.sh:262
10291 msgid "Cannot initialize stash"
10292 msgstr "无法初始化 stash"
10294 #: git-stash.sh:266
10295 msgid "Cannot save the current status"
10298 #: git-stash.sh:284
10299 msgid "Cannot remove worktree changes"
10302 #: git-stash.sh:383
10303 msgid "No stash found."
10304 msgstr "未发现 stash。"
10306 #: git-stash.sh:390
10308 msgid "Too many revisions specified: $REV"
10309 msgstr "指定了太多的版本:$REV"
10311 #: git-stash.sh:396
10313 msgid "$reference is not valid reference"
10314 msgstr "$reference 不是有效的引用"
10316 #: git-stash.sh:424
10318 msgid "'$args' is not a stash-like commit"
10319 msgstr "'$args' 不是 stash 样提交"
10321 #: git-stash.sh:435
10323 msgid "'$args' is not a stash reference"
10324 msgstr "'$args' 不是一个 stash 引用"
10326 #: git-stash.sh:443
10327 msgid "unable to refresh index"
10330 #: git-stash.sh:447
10331 msgid "Cannot apply a stash in the middle of a merge"
10332 msgstr "无法在合并过程中恢复进度"
10334 #: git-stash.sh:455
10335 msgid "Conflicts in index. Try without --index."
10336 msgstr "索引中有冲突。尝试不使用 --index。"
10338 #: git-stash.sh:457
10339 msgid "Could not save index tree"
10342 #: git-stash.sh:491
10343 msgid "Cannot unstage modified files"
10346 #: git-stash.sh:506
10347 msgid "Index was not unstashed."
10348 msgstr "索引的进度没有被恢复。"
10350 #: git-stash.sh:523
10352 msgid "Dropped ${REV} ($s)"
10353 msgstr "丢弃了 ${REV} ($s)"
10355 #: git-stash.sh:524
10357 msgid "${REV}: Could not drop stash entry"
10358 msgstr "${REV}:不能丢弃进度条目"
10360 #: git-stash.sh:531
10361 msgid "No branch name specified"
10364 #: git-stash.sh:603
10365 msgid "(To restore them type \"git stash apply\")"
10366 msgstr "(为恢复数据输入 \"git stash apply\")"
10368 #: git-submodule.sh:95
10370 msgid "cannot strip one component off url '$remoteurl'"
10371 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10373 #: git-submodule.sh:237
10375 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10376 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10378 #: git-submodule.sh:281
10380 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10381 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10383 #: git-submodule.sh:293
10385 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10386 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10388 #: git-submodule.sh:403
10389 msgid "Relative path can only be used from the toplevel of the working tree"
10390 msgstr "只能在工作区的顶级目录中使用相对路径"
10392 #: git-submodule.sh:413
10394 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10395 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10397 #: git-submodule.sh:430
10399 msgid "'$sm_path' already exists in the index"
10400 msgstr "'$sm_path' 已经存在于索引中"
10402 #: git-submodule.sh:434
10405 "The following path is ignored by one of your .gitignore files:\n"
10407 "Use -f if you really want to add it."
10409 "以下路径被您的一个 .gitignore 文件所忽略:\n"
10411 "如果您确实想添加它,使用 -f 参数。"
10413 #: git-submodule.sh:452
10415 msgid "Adding existing repo at '$sm_path' to the index"
10416 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10418 #: git-submodule.sh:454
10420 msgid "'$sm_path' already exists and is not a valid git repo"
10421 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10423 #: git-submodule.sh:462
10425 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10426 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10428 #: git-submodule.sh:464
10431 "If you want to reuse this local git directory instead of cloning again from"
10432 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10434 #: git-submodule.sh:466
10437 "use the '--force' option. If the local git directory is not the correct repo"
10438 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10440 #: git-submodule.sh:467
10443 "or you are unsure what this means choose another name with the '--name' "
10445 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10447 #: git-submodule.sh:469
10449 msgid "Reactivating local git directory for submodule '$sm_name'."
10450 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10452 #: git-submodule.sh:481
10454 msgid "Unable to checkout submodule '$sm_path'"
10455 msgstr "不能检出子模组 '$sm_path'"
10457 #: git-submodule.sh:486
10459 msgid "Failed to add submodule '$sm_path'"
10460 msgstr "无法添加子模组 '$sm_path'"
10462 #: git-submodule.sh:495
10464 msgid "Failed to register submodule '$sm_path'"
10465 msgstr "无法注册子模组 '$sm_path'"
10467 #: git-submodule.sh:539
10469 msgid "Entering '$prefix$displaypath'"
10470 msgstr "正在进入 '$prefix$displaypath'"
10472 #: git-submodule.sh:559
10474 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10475 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10477 #: git-submodule.sh:605
10479 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10480 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10482 #: git-submodule.sh:614
10484 msgid "Failed to register url for submodule path '$displaypath'"
10485 msgstr "无法为子模组路径 '$displaypath' 注册 url"
10487 #: git-submodule.sh:616
10489 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10490 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10492 #: git-submodule.sh:633
10494 msgid "Failed to register update mode for submodule path '$displaypath'"
10495 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10497 #: git-submodule.sh:671
10499 msgid "Use '.' if you really want to deinitialize all submodules"
10500 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10502 #: git-submodule.sh:688
10504 msgid "Submodule work tree '$displaypath' contains a .git directory"
10505 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10507 #: git-submodule.sh:689
10510 "(use 'rm -rf' if you really want to remove it including all of its history)"
10511 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10513 #: git-submodule.sh:695
10516 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10518 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10520 #: git-submodule.sh:698
10522 msgid "Cleared directory '$displaypath'"
10523 msgstr "已清除目录 '$displaypath'"
10525 #: git-submodule.sh:699
10527 msgid "Could not remove submodule work tree '$displaypath'"
10528 msgstr "无法移除子模组工作区 '$displaypath'"
10530 #: git-submodule.sh:702
10532 msgid "Could not create empty submodule directory '$displaypath'"
10533 msgstr "不能创建空的子模组目录 '$displaypath'"
10535 #: git-submodule.sh:711
10537 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10538 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10540 #: git-submodule.sh:834
10543 "Submodule path '$displaypath' not initialized\n"
10544 "Maybe you want to use 'update --init'?"
10546 "子模组路径 '$displaypath' 没有初始化\n"
10547 "也许您想用 'update --init'?"
10549 #: git-submodule.sh:847
10551 msgid "Unable to find current revision in submodule path '$displaypath'"
10552 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10554 #: git-submodule.sh:856
10556 msgid "Unable to fetch in submodule path '$sm_path'"
10557 msgstr "无法在子模组路径 '$sm_path' 中获取"
10559 #: git-submodule.sh:880
10561 msgid "Unable to fetch in submodule path '$displaypath'"
10562 msgstr "无法在子模组路径 '$displaypath' 中获取"
10564 #: git-submodule.sh:894
10566 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10567 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10569 #: git-submodule.sh:895
10571 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10572 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10574 #: git-submodule.sh:900
10576 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10577 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10579 #: git-submodule.sh:901
10581 msgid "Submodule path '$displaypath': merged in '$sha1'"
10582 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10584 #: git-submodule.sh:906
10587 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10588 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10590 #: git-submodule.sh:907
10592 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10593 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10595 #: git-submodule.sh:912
10597 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10598 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10600 #: git-submodule.sh:913
10602 msgid "Submodule path '$displaypath': checked out '$sha1'"
10603 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10605 #: git-submodule.sh:940
10607 msgid "Failed to recurse into submodule path '$displaypath'"
10608 msgstr "无法递归进子模组路径 '$displaypath'"
10610 #: git-submodule.sh:1048
10611 msgid "The --cached option cannot be used with the --files option"
10612 msgstr "选项 --cached 不能和选项 --files 同时使用"
10615 #: git-submodule.sh:1096
10617 msgid "unexpected mode $mod_dst"
10618 msgstr "意外的模式 $mod_dst"
10621 #: git-submodule.sh:1116
10623 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10624 msgstr " 警告:$display_name 未包含提交 $sha1_src"
10627 #: git-submodule.sh:1119
10629 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10630 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10633 #: git-submodule.sh:1122
10635 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10636 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10638 #: git-submodule.sh:1147
10642 #: git-submodule.sh:1261
10644 msgid "Failed to recurse into submodule path '$sm_path'"
10645 msgstr "无法递归进子模组路径 '$sm_path'"
10647 #: git-submodule.sh:1325
10649 msgid "Synchronizing submodule url for '$displaypath'"
10650 msgstr "为 '$displaypath' 同步子模组 url"
10652 # 译者:为保证在输出中对齐,注意调整句中空格!
10653 #~ msgid "copied: %s -> %s"
10654 #~ msgstr "拷贝: %s -> %s"
10656 # 译者:为保证在输出中对齐,注意调整句中空格!
10657 #~ msgid "deleted: %s"
10660 # 译者:为保证在输出中对齐,注意调整句中空格!
10661 #~ msgid "modified: %s"
10664 # 译者:为保证在输出中对齐,注意调整句中空格!
10665 #~ msgid "renamed: %s -> %s"
10666 #~ msgstr "重命名: %s -> %s"
10668 # 译者:为保证在输出中对齐,注意调整句中空格!
10669 #~ msgid "unmerged: %s"
10670 #~ msgstr "未合并: %s"
10672 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10674 #~ "push.default is unset; its implicit value is changing in\n"
10675 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10676 #~ "and maintain the current behavior after the default changes, use:\n"
10678 #~ " git config --global push.default matching\n"
10680 #~ "To squelch this message and adopt the new behavior now, use:\n"
10682 #~ " git config --global push.default simple\n"
10684 #~ "See 'git help config' and search for 'push.default' for further "
10685 #~ "information.\n"
10686 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10687 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10689 #~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10690 #~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10692 #~ " git config --global push.default matching\n"
10694 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10696 #~ " git config --global push.default simple\n"
10698 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10699 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10700 #~ "为保持兼容,请用 'current' 代替 'simple')"
10705 #~ msgid "input paths are terminated by a null character"
10706 #~ msgstr "输入路径以null字符终止"
10709 #~ "The following untracked files would NOT be saved but need to be removed "
10710 #~ "by stash save:"
10711 #~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10714 #~ "Aborting. Consider using either the --force or --include-untracked option."
10715 #~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10718 #~ "the following submodule (or one of its nested submodule)\n"
10719 #~ "uses a .git directory:"
10721 #~ "the following submodules (or one of its nested submodule)\n"
10722 #~ "use a .git directory:"
10723 #~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10724 #~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10727 #~ msgid " (fix conflicts and then run \"git am --resolved\")"
10728 #~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10731 #~ msgid " (all conflicts fixed: run \"git commit\")"
10732 #~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10734 #~ msgid "more than %d trees given: '%s'"
10735 #~ msgstr "提供了超过 %d 个树对象:'%s'"
10737 #~ msgid "You cannot combine --no-ff with --ff-only."
10738 #~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10741 #~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10742 #~ "(use 'rm -rf' if you really want to remove it including all of its "
10745 #~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10746 #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10749 #~ "'%s' has changes staged in the index\n"
10750 #~ "(use --cached to keep the file, or -f to force removal)"
10752 #~ "'%s' 有变更已暂存至索引中\n"
10753 #~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10755 #~ msgid "show commits where no parent comes before its children"
10756 #~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10758 #~ msgid "show the HEAD reference"
10759 #~ msgstr "显示 HEAD 引用"
10761 #~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10762 #~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10764 #~ msgid "Change flags"
10768 #~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10769 #~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10771 #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10772 #~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
10774 #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10775 #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10777 #~ msgid "See 'git help <command>' for more information on a specific command."
10778 #~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10780 #~ msgid "BUG: impossible combination of %d and %p"
10781 #~ msgstr "BUG: 无法组合 %d 和 %p"
10784 #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
10785 #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10788 #~ msgid "may speed it up, but you have to be careful not to forget to add"
10789 #~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10791 #~ msgid "new files yourself (see 'git help status')."
10792 #~ msgstr "(参见 'git help status')。"
10794 #~ msgid "use any ref in .git/refs"
10795 #~ msgstr "使用 .git/refs 里的任意引用"
10797 #~ msgid "use any tag in .git/refs/tags"
10798 #~ msgstr "使用 .git/refs/tags 里的任意 tag"
10800 #~ msgid "bad object %s"
10803 #~ msgid "bogus committer info %s"
10804 #~ msgstr "虚假的提交者信息 %s"
10806 #~ msgid "can't fdopen 'show' output fd"
10807 #~ msgstr "不能打开 'show' 输出文件句柄"
10809 #~ msgid "failed to close pipe to 'show' for object '%s'"
10810 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10812 #~ msgid " 0 files changed"
10813 #~ msgstr " 0 个文件被修改"
10815 #~ msgid " %d file changed"
10816 #~ msgid_plural " %d files changed"
10817 #~ msgstr[0] " %d 个文件被修改"
10818 #~ msgstr[1] " %d 个文件被修改"
10820 #~ msgid ", %d insertion(+)"
10821 #~ msgid_plural ", %d insertions(+)"
10822 #~ msgstr[0] ",插入 %d 行(+)"
10823 #~ msgstr[1] ",插入 %d 行(+)"
10825 #~ msgid ", %d deletion(-)"
10826 #~ msgid_plural ", %d deletions(-)"
10827 #~ msgstr[0] ",删除 %d 行(-)"
10828 #~ msgstr[1] ",删除 %d 行(-)"
10830 #~ msgid "You do not have a valid HEAD"
10831 #~ msgstr "您没有一个有效的 HEAD"
10836 #~ msgid "Would not remove %s\n"
10837 #~ msgstr "不会删除 %s\n"
10839 #~ msgid "Not removing %s\n"
10840 #~ msgstr "未删除 %s\n"
10842 #~ msgid "Auto packing the repository for optimum performance.\n"
10843 #~ msgstr "自动打包版本库以求最佳性能。\n"
10845 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10846 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10848 #~ msgid "Could not read index"
10851 # 译者:中文字符串拼接,可删除前导空格
10852 #~ msgid " (use \"git add\" to track)"
10853 #~ msgstr "(使用 \"git add\" 建立跟踪)"
10855 #~ msgid "-B cannot be used with -b"
10856 #~ msgstr "-B 不能和 -b 同时使用"
10858 #~ msgid "--detach cannot be used with -b/-B/--orphan"
10859 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10861 #~ msgid "--detach cannot be used with -t"
10862 #~ msgstr "--detach 不能和 -t 同时使用"
10864 #~ msgid "--orphan and -b|-B are mutually exclusive"
10865 #~ msgstr "--orphan 和 -b|-B 互斥"
10867 #~ msgid "--orphan cannot be used with -t"
10868 #~ msgstr "--orphan 不能和 -t 同时使用"
10870 #~ msgid "git checkout: -f and -m are incompatible"
10871 #~ msgstr "git checkout:-f 和 -m 不兼容"
10874 #~ "git checkout: updating paths is incompatible with switching branches."
10875 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
10877 #~ msgid "diff setup failed"
10878 #~ msgstr "diff 设置失败"
10880 #~ msgid "merge-recursive: disk full?"
10881 #~ msgstr "merge-recursive:磁盘已满?"
10883 #~ msgid "diff_setup_done failed"
10884 #~ msgstr "diff_setup_done 失败"