1 # Chinese translations for Git package
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
9 # - Lian Cheng <rhythm.mail AT gmail.com>
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2015-01-21 14:21+0800\n"
16 "PO-Revision-Date: 2015-01-21 14:58+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
32 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33 "as appropriate to mark resolution and make a commit."
35 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
39 msgid "git archive [options] <tree-ish> [<path>...]"
40 msgstr "git archive [选项] <树或提交> [<路径>...]"
43 msgid "git archive --list"
44 msgstr "git archive --list"
48 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
50 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
53 msgid "git archive --remote <repo> [--exec <cmd>] --list"
54 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
56 #: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
58 msgid "pathspec '%s' did not match any files"
59 msgstr "路径规则 '%s' 未匹配任何文件"
66 msgid "archive format"
69 #: archive.c:428 builtin/log.c:1204
74 msgid "prepend prefix to each pathname in the archive"
75 msgstr "为归档中每个路径名加上前缀"
77 #: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
78 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
79 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
80 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
81 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
85 #: archive.c:431 builtin/archive.c:89
86 msgid "write the archive to this file"
90 msgid "read .gitattributes in working directory"
91 msgstr "读取工作区中的 .gitattributes"
94 msgid "report archived files on stderr"
102 msgid "compress faster"
106 msgid "compress better"
110 msgid "list supported archive formats"
113 #: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
117 #: archive.c:450 builtin/archive.c:91
118 msgid "retrieve the archive from remote repository <repo>"
119 msgstr "从远程版本库(<版本库>)提取归档文件"
121 #: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
125 #: archive.c:452 builtin/archive.c:93
126 msgid "path to the remote git-upload-archive command"
127 msgstr "远程 git-upload-archive 命令的路径"
131 "Negative patterns are ignored in git attributes\n"
132 "Use '\\!' for literal leading exclamation."
134 "负值模版在 git attributes 中被忽略\n"
135 "当字符串确实要以感叹号开始时,使用 '\\!'。"
139 msgid "Not setting branch %s as its own upstream."
140 msgstr "未设置分支 %s 作为它自己的上游。"
144 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
145 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
149 msgid "Branch %s set up to track remote branch %s from %s."
150 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
154 msgid "Branch %s set up to track local branch %s by rebasing."
155 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
159 msgid "Branch %s set up to track local branch %s."
160 msgstr "分支 %s 设置为跟踪本地分支 %s。"
164 msgid "Branch %s set up to track remote ref %s by rebasing."
165 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
169 msgid "Branch %s set up to track remote ref %s."
170 msgstr "分支 %s 设置为跟踪远程引用 %s。"
174 msgid "Branch %s set up to track local ref %s by rebasing."
175 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
179 msgid "Branch %s set up to track local ref %s."
180 msgstr "分支 %s 设置为跟踪本地引用 %s。"
184 msgid "Not tracking: ambiguous information for ref %s"
185 msgstr "未跟踪:引用 %s 有歧义"
189 msgid "'%s' is not a valid branch name."
190 msgstr "'%s' 不是一个有效的分支名称。"
194 msgid "A branch named '%s' already exists."
195 msgstr "一个分支名 '%s' 已经存在。"
198 msgid "Cannot force update the current branch."
203 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
204 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
208 msgid "the requested upstream branch '%s' does not exist"
209 msgstr "请求的上游分支 '%s' 不存在"
214 "If you are planning on basing your work on an upstream\n"
215 "branch that already exists at the remote, you may need to\n"
216 "run \"git fetch\" to retrieve it.\n"
218 "If you are planning to push out a new local branch that\n"
219 "will track its remote counterpart, you may want to use\n"
220 "\"git push -u\" to set the upstream config as you push."
223 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
224 "您可能需要执行 \"git fetch\" 来获取分支。\n"
226 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
227 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
231 msgid "Not a valid object name: '%s'."
232 msgstr "不是一个有效的对象名:'%s'。"
236 msgid "Ambiguous object name: '%s'."
237 msgstr "歧义的对象名:'%s'。"
241 msgid "Not a valid branch point: '%s'."
242 msgstr "无效的分支点:'%s'。"
246 msgid "'%s' does not look like a v2 bundle file"
247 msgstr "'%s' 不像是一个 v2 版本的包文件"
251 msgid "unrecognized header: %s%s (%d)"
252 msgstr "未能识别的包头:%s%s (%d)"
254 #: bundle.c:87 builtin/commit.c:770
256 msgid "could not open '%s'"
260 msgid "Repository lacks these prerequisite commits:"
261 msgstr "版本库缺少这些必备的提交:"
263 #: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
264 #: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
265 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
266 #: builtin/shortlog.c:158
267 msgid "revision walk setup failed"
272 msgid "The bundle contains this ref:"
273 msgid_plural "The bundle contains these %d refs:"
274 msgstr[0] "这个包中含有这个引用:"
275 msgstr[1] "这个包中含有 %d 个引用:"
278 msgid "The bundle records a complete history."
279 msgstr "这个包记录一个完整历史。"
283 msgid "The bundle requires this ref:"
284 msgid_plural "The bundle requires these %d refs:"
285 msgstr[0] "这个包需要这个引用:"
286 msgstr[1] "这个包需要 %d 个引用:"
289 msgid "Could not spawn pack-objects"
290 msgstr "不能生成 pack-objects 进程"
293 msgid "pack-objects died"
294 msgstr "pack-objects 终止"
297 msgid "rev-list died"
302 msgid "ref '%s' is excluded by the rev-list options"
303 msgstr "引用 '%s' 被 rev-list 选项排除"
305 #: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
307 msgid "unrecognized argument: %s"
311 msgid "Refusing to create empty bundle."
316 msgid "cannot create '%s'"
320 msgid "index-pack died"
321 msgstr "index-pack 终止"
325 msgid "invalid color value: %.*s"
330 msgid "could not parse %s"
335 msgid "%s %s is not a commit!"
336 msgstr "%s %s 不是一个提交!"
338 #: compat/obstack.c:406 compat/obstack.c:408
339 msgid "memory exhausted"
342 #: config.c:469 config.c:471
344 msgid "bad config file line %d in %s"
345 msgstr "配置文件 %2$s 出错于第 %1$d 行"
349 msgid "bad numeric config value '%s' for '%s' in %s: %s"
350 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
354 msgid "bad numeric config value '%s' for '%s': %s"
355 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
359 msgid "failed to expand user dir in: '%s'"
360 msgstr "无法扩展 '%s' 中的用户目录"
362 #: config.c:752 config.c:763
364 msgid "bad zlib compression level %d"
365 msgstr "错误的 zlib 压缩级别 %d"
369 msgid "invalid mode for object creation: %s"
370 msgstr "无效的对象创建模式:%s"
373 msgid "unable to parse command-line config"
377 msgid "unknown error occured while reading the configuration files"
378 msgstr "在读取配置文件时遇到未知错误"
382 msgid "unable to parse '%s' from command-line config"
383 msgstr "无法解析命令行配置中的 '%s'"
387 msgid "bad config variable '%s' in file '%s' at line %d"
388 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
392 msgid "%s has multiple values"
396 msgid "Could not run 'git rev-list'"
397 msgstr "不能执行 'git rev-list'"
401 msgid "failed write to rev-list: %s"
402 msgstr "无法写入 rev-list:%s"
406 msgid "failed to close rev-list's stdin: %s"
407 msgstr "无法关闭 rev-list 的标准输入:%s"
410 msgid "in the future"
415 msgid "%lu second ago"
416 msgid_plural "%lu seconds ago"
422 msgid "%lu minute ago"
423 msgid_plural "%lu minutes ago"
430 msgid_plural "%lu hours ago"
437 msgid_plural "%lu days ago"
444 msgid_plural "%lu weeks ago"
450 msgid "%lu month ago"
451 msgid_plural "%lu months ago"
458 msgid_plural "%lu years"
462 #. TRANSLATORS: "%s" is "<n> years"
465 msgid "%s, %lu month ago"
466 msgid_plural "%s, %lu months ago"
467 msgstr[0] "%s %lu 个月前"
468 msgstr[1] "%s %lu 个月前"
470 #: date.c:154 date.c:159
473 msgid_plural "%lu years ago"
477 #: diffcore-order.c:24
479 msgid "failed to read orderfile '%s'"
480 msgstr "无法读取排序文件 '%s'"
482 #: diffcore-rename.c:516
483 msgid "Performing inexact rename detection"
484 msgstr "正在进行非精确的重命名检测"
489 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
490 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
495 msgid " Unknown dirstat parameter '%s'\n"
496 msgstr " 未知的 dirstat 参数 '%s'\n"
500 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
501 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
506 "Found errors in 'diff.dirstat' config variable:\n"
509 "发现配置变量 'diff.dirstat' 中的错误:\n"
514 msgid "external diff died, stopping at %s"
515 msgstr "外部 diff 退出,停止在 %s"
518 msgid "--follow requires exactly one pathspec"
519 msgstr "--follow 参数后只跟一个 pathspec"
524 "Failed to parse --dirstat/-X option parameter:\n"
527 "无法解析 --dirstat/-X 选项的参数:\n"
532 msgid "Failed to parse --submodule option parameter: '%s'"
533 msgstr "无法解析 --submodule 选项的参数:'%s'"
535 #: gpg-interface.c:129 gpg-interface.c:200
536 msgid "could not run gpg."
539 #: gpg-interface.c:141
540 msgid "gpg did not accept the data"
543 #: gpg-interface.c:152
544 msgid "gpg failed to sign the data"
547 #: gpg-interface.c:185
549 msgid "could not create temporary file '%s': %s"
550 msgstr "不能创建临时文件 '%s':%s"
552 #: gpg-interface.c:188
554 msgid "failed writing detached signature to '%s': %s"
555 msgstr "无法将分离式签名写入 '%s':%s"
559 msgid "'%s': unable to read %s"
560 msgstr "'%s':无法读取 %s"
569 msgid "'%s': short read %s"
570 msgstr "'%s':读取不完整 %s"
574 msgid "available git commands in '%s'"
575 msgstr "在 '%s' 下可用的 git 命令"
578 msgid "git commands available from elsewhere on your $PATH"
579 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
582 msgid "The most commonly used git commands are:"
583 msgstr "最常用的 git 命令有:"
588 "'%s' appears to be a git command, but we were not\n"
589 "able to execute it. Maybe git-%s is broken?"
591 "'%s' 像是一个 git 命令,但却无法运行。\n"
595 msgid "Uh oh. Your system reports no Git commands at all."
596 msgstr "唉呀,您的系统中未发现 Git 命令。"
601 "WARNING: You called a Git command named '%s', which does not exist.\n"
602 "Continuing under the assumption that you meant '%s'"
604 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
609 msgid "in %0.1f seconds automatically..."
610 msgstr "在 %0.1f 秒钟后自动运行..."
614 msgid "git: '%s' is not a git command. See 'git --help'."
615 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
617 #: help.c:384 help.c:444
623 "Did you mean one of these?"
637 msgid "BUG: reopen a lockfile that is still open"
638 msgstr "BUG: 重新打开一个仍打开着的锁文件"
641 msgid "BUG: reopen a lockfile that has been committed"
642 msgstr "BUG: 重新打开一个已提交的锁文件"
645 msgid "failed to read the cache"
648 #: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
649 #: builtin/clone.c:662
650 msgid "unable to write new index file"
653 #: merge-recursive.c:189
655 msgid "(bad commit)\n"
658 #: merge-recursive.c:209
660 msgid "addinfo_cache failed for path '%s'"
661 msgstr "为路径 '%s' addinfo_cache 失败"
663 #: merge-recursive.c:270
664 msgid "error building trees"
667 #: merge-recursive.c:688
669 msgid "failed to create path '%s'%s"
670 msgstr "无法创建路径 '%s'%s"
672 #: merge-recursive.c:699
674 msgid "Removing %s to make room for subdirectory\n"
675 msgstr "删除 %s 以便为子目录留出空间\n"
677 #: merge-recursive.c:713 merge-recursive.c:734
678 msgid ": perhaps a D/F conflict?"
679 msgstr ":可能是一个目录/文件冲突?"
681 #: merge-recursive.c:724
683 msgid "refusing to lose untracked file at '%s'"
684 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
686 #: merge-recursive.c:764
688 msgid "cannot read object %s '%s'"
689 msgstr "不能读取对象 %s '%s'"
691 #: merge-recursive.c:766
693 msgid "blob expected for %s '%s'"
694 msgstr "%s '%s' 应为数据(blob)对象"
696 #: merge-recursive.c:789 builtin/clone.c:321
698 msgid "failed to open '%s'"
701 #: merge-recursive.c:797
703 msgid "failed to symlink '%s'"
704 msgstr "无法创建符号链接 '%s'"
706 #: merge-recursive.c:800
708 msgid "do not know what to do with %06o %s '%s'"
709 msgstr "不知道如何处理 %06o %s '%s'"
711 #: merge-recursive.c:938
712 msgid "Failed to execute internal merge"
715 #: merge-recursive.c:942
717 msgid "Unable to add %s to database"
718 msgstr "不能添加 %s 至对象库"
720 #: merge-recursive.c:958
721 msgid "unsupported object type in the tree"
722 msgstr "在树中有不支持的对象类型"
724 #: merge-recursive.c:1033 merge-recursive.c:1047
727 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
730 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
733 #: merge-recursive.c:1039 merge-recursive.c:1052
736 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
739 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
742 #: merge-recursive.c:1093
746 #: merge-recursive.c:1093
750 #: merge-recursive.c:1149
752 msgid "%s is a directory in %s adding as %s instead"
753 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
755 #: merge-recursive.c:1171
758 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
759 "\"->\"%s\" in \"%s\"%s"
761 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
762 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
764 #: merge-recursive.c:1176
765 msgid " (left unresolved)"
768 #: merge-recursive.c:1230
770 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
772 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
775 #: merge-recursive.c:1260
777 msgid "Renaming %s to %s and %s to %s instead"
778 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
780 #: merge-recursive.c:1459
782 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
783 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
785 #: merge-recursive.c:1469
787 msgid "Adding merged %s"
790 #: merge-recursive.c:1474 merge-recursive.c:1672
792 msgid "Adding as %s instead"
795 #: merge-recursive.c:1525
797 msgid "cannot read object %s"
800 #: merge-recursive.c:1528
802 msgid "object %s is not a blob"
803 msgstr "对象 %s 不是一个数据(blob)对象"
805 #: merge-recursive.c:1576
809 #: merge-recursive.c:1576
813 #: merge-recursive.c:1586
817 #: merge-recursive.c:1593
821 #: merge-recursive.c:1627
823 msgid "Skipped %s (merged same as existing)"
824 msgstr "略过 %s(已经做过相同合并)"
826 #: merge-recursive.c:1641
828 msgid "Auto-merging %s"
831 #: merge-recursive.c:1645 git-submodule.sh:1150
835 #: merge-recursive.c:1646
837 msgid "CONFLICT (%s): Merge conflict in %s"
838 msgstr "冲突(%s):合并冲突于 %s"
840 #: merge-recursive.c:1732
845 #: merge-recursive.c:1757
846 msgid "file/directory"
849 #: merge-recursive.c:1763
850 msgid "directory/file"
853 #: merge-recursive.c:1768
855 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
856 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
858 #: merge-recursive.c:1778
863 #: merge-recursive.c:1795
864 msgid "Fatal merge failure, shouldn't happen."
865 msgstr "严重的合并错误,不应发生。"
867 #: merge-recursive.c:1814
868 msgid "Already up-to-date!"
871 #: merge-recursive.c:1823
873 msgid "merging of trees %s and %s failed"
874 msgstr "无法合并树 %s 和 %s"
876 #: merge-recursive.c:1853
878 msgid "Unprocessed path??? %s"
879 msgstr "未处理的路径??? %s"
881 #: merge-recursive.c:1898
885 #: merge-recursive.c:1911
887 msgid "found %u common ancestor:"
888 msgid_plural "found %u common ancestors:"
889 msgstr[0] "发现 %u 个共同祖先:"
890 msgstr[1] "发现 %u 个共同祖先:"
892 #: merge-recursive.c:1948
893 msgid "merge returned no commit"
896 #: merge-recursive.c:2005
898 msgid "Could not parse object '%s'"
901 #: merge-recursive.c:2016 builtin/merge.c:667
902 msgid "Unable to write index."
906 msgid "Cannot commit uninitialized/unreferenced notes tree"
907 msgstr "不能提交未初始化/未引用的注解树"
911 msgid "Bad notes.rewriteMode value: '%s'"
912 msgstr "坏的 notes.rewriteMode 值:'%s'"
916 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
917 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
919 #. TRANSLATORS: The first %s is the name of the
920 #. environment variable, the second %s is its value
923 msgid "Bad %s value: '%s'"
924 msgstr "坏的 %s 值:'%s'"
928 msgid "unable to parse object: %s"
931 #: parse-options.c:546
935 #: parse-options.c:564
940 #. TRANSLATORS: the colon here should align with the
941 #. one in "usage: %s" translation
942 #: parse-options.c:568
947 # 译者:为保证在输出中对齐,注意调整句中空格!
948 #: parse-options.c:571
953 #: parse-options.c:605
958 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
959 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
963 "global 'literal' pathspec setting is incompatible with all other global "
965 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
968 msgid "invalid parameter for pathspec magic 'prefix'"
969 msgstr "路径规则包含无效的神奇前缀"
973 msgid "Invalid pathspec magic '%.*s' in '%s'"
974 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
978 msgid "Missing ')' at the end of pathspec magic in '%s'"
979 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
983 msgid "Unimplemented pathspec magic '%c' in '%s'"
984 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
988 msgid "%s: 'literal' and 'glob' are incompatible"
989 msgstr "%s:'literal' 和 'glob' 不兼容"
993 msgid "%s: '%s' is outside repository"
994 msgstr "%s:'%s' 在版本库之外"
998 msgid "Pathspec '%s' is in submodule '%.*s'"
999 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1003 msgid "%s: pathspec magic not supported by this command: %s"
1004 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1008 msgid "pathspec '%s' is beyond a symbolic link"
1009 msgstr "路径规则 '%s' 位于符号链接中"
1013 "There is nothing to exclude from by :(exclude) patterns.\n"
1014 "Perhaps you forgot to add either ':/' or '.' ?"
1016 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1020 msgid "unable to parse --pretty format"
1021 msgstr "不能解析 --pretty 格式"
1027 #: read-cache.c:1267
1030 "index.version set, but the value is invalid.\n"
1033 "设置了 index.version,但是取值无效。\n"
1036 #: read-cache.c:1277
1039 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1042 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1047 msgid "Cannot fetch both %s and %s to %s"
1048 msgstr "不能同时获取 %s 和 %s 至 %s"
1052 msgid "%s usually tracks %s, not %s"
1053 msgstr "%s 通常跟踪 %s,而非 %s"
1057 msgid "%s tracks both %s and %s"
1058 msgstr "%s 同时跟踪 %s 和 %s"
1061 msgid "Internal error"
1066 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1067 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1070 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1071 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1075 msgid "Your branch is up-to-date with '%s'.\n"
1076 msgstr "您的分支与上游分支 '%s' 一致。\n"
1080 msgid "Your branch is ahead of '%s' by %d commit.\n"
1081 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1082 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1083 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1086 msgid " (use \"git push\" to publish your local commits)\n"
1087 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1091 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1093 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1094 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1095 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1099 msgid " (use \"git pull\" to update your local branch)\n"
1100 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1105 "Your branch and '%s' have diverged,\n"
1106 "and have %d and %d different commit each, respectively.\n"
1108 "Your branch and '%s' have diverged,\n"
1109 "and have %d and %d different commits each, respectively.\n"
1111 "您的分支和 '%s' 出现了偏离,\n"
1112 "并且分别有 %d 和 %d 处不同的提交。\n"
1114 "您的分支和 '%s' 出现了偏离,\n"
1115 "并且分别有 %d 和 %d 处不同的提交。\n"
1119 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1120 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1123 msgid "open /dev/null failed"
1124 msgstr "不能打开 /dev/null"
1128 msgid "dup2(%d,%d) failed"
1129 msgstr "不能调用 dup2(%d,%d)"
1132 msgid "failed to sign the push certificate"
1136 msgid "the receiving end does not support --signed push"
1139 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1140 #: builtin/merge.c:1005
1142 msgid "Could not open '%s' for writing"
1143 msgstr "不能为写入打开 '%s'"
1145 #: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1146 #: builtin/merge.c:1010
1148 msgid "Could not write to '%s'"
1153 "after resolving the conflicts, mark the corrected paths\n"
1154 "with 'git add <paths>' or 'git rm <paths>'"
1156 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1161 "after resolving the conflicts, mark the corrected paths\n"
1162 "with 'git add <paths>' or 'git rm <paths>'\n"
1163 "and commit the result with 'git commit'"
1165 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1166 "对修正后的文件做标记,然后用 'git commit' 提交"
1168 #: sequencer.c:211 sequencer.c:856 sequencer.c:939
1170 msgid "Could not write to %s"
1175 msgid "Error wrapping up %s"
1179 msgid "Your local changes would be overwritten by cherry-pick."
1180 msgstr "您的本地修改将被拣选操作覆盖。"
1183 msgid "Your local changes would be overwritten by revert."
1184 msgstr "您的本地修改将被还原操作覆盖。"
1187 msgid "Commit your changes or stash them to proceed."
1188 msgstr "提交您的修改或保存进度后再继续。"
1190 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1193 msgid "%s: Unable to write new index file"
1194 msgstr "%s:无法写入新索引文件"
1197 msgid "Could not resolve HEAD commit\n"
1198 msgstr "不能解析 HEAD 提交\n"
1201 msgid "Unable to update cache tree\n"
1206 msgid "Could not parse commit %s\n"
1207 msgstr "不能解析提交 %s\n"
1211 msgid "Could not parse parent commit %s\n"
1212 msgstr "不能解析父提交 %s\n"
1215 msgid "Your index file is unmerged."
1216 msgstr "您的索引文件未完成合并。"
1220 msgid "Commit %s is a merge but no -m option was given."
1221 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1225 msgid "Commit %s does not have parent %d"
1226 msgstr "提交 %s 没有父提交 %d"
1230 msgid "Mainline was specified but commit %s is not a merge."
1231 msgstr "指定了主线但提交 %s 不是一个合并。"
1233 #. TRANSLATORS: The first %s will be "revert" or
1234 #. "cherry-pick", the second %s a SHA1
1237 msgid "%s: cannot parse parent commit %s"
1238 msgstr "%s:不能解析父提交 %s"
1242 msgid "Cannot get commit message for %s"
1243 msgstr "不能得到 %s 的提交说明"
1247 msgid "could not revert %s... %s"
1248 msgstr "不能还原 %s... %s"
1252 msgid "could not apply %s... %s"
1253 msgstr "不能应用 %s... %s"
1256 msgid "empty commit set passed"
1261 msgid "git %s: failed to read the index"
1262 msgstr "git %s:无法读取索引"
1266 msgid "git %s: failed to refresh the index"
1267 msgstr "git %s:无法刷新索引"
1271 msgid "Cannot %s during a %s"
1272 msgstr "无法 %s 在一个 %s 过程中"
1276 msgid "Could not parse line %d."
1277 msgstr "不能解析第 %d 行。"
1280 msgid "No commits parsed."
1285 msgid "Could not open %s"
1290 msgid "Could not read %s."
1295 msgid "Unusable instruction sheet: %s"
1300 msgid "Invalid key: %s"
1305 msgid "Invalid value for %s: %s"
1310 msgid "Malformed options sheet: %s"
1314 msgid "a cherry-pick or revert is already in progress"
1315 msgstr "一个拣选或还原操作已在进行"
1318 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1319 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1323 msgid "Could not create sequencer directory %s"
1324 msgstr "不能创建序列目录 %s"
1326 #: sequencer.c:858 sequencer.c:943
1328 msgid "Error wrapping up %s."
1331 #: sequencer.c:877 sequencer.c:1013
1332 msgid "no cherry-pick or revert in progress"
1333 msgstr "拣选或还原操作并未进行"
1336 msgid "cannot resolve HEAD"
1340 msgid "cannot abort from a branch yet to be born"
1341 msgstr "不能从尚未建立的分支终止"
1343 #: sequencer.c:903 builtin/apply.c:4128
1345 msgid "cannot open %s: %s"
1350 msgid "cannot read %s: %s"
1354 msgid "unexpected end of file"
1359 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1360 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1364 msgid "Could not format %s."
1369 msgid "%s: can't cherry-pick a %s"
1370 msgstr "%s:不能拣选一个%s"
1374 msgid "%s: bad revision"
1378 msgid "Can't revert as initial commit"
1382 msgid "Can't cherry-pick into empty head"
1387 "Git normally never creates a ref that ends with 40 hex characters\n"
1388 "because it will be ignored when you just specify 40-hex. These refs\n"
1389 "may be created by mistake. For example,\n"
1391 " git checkout -b $br $(git rev-parse ...)\n"
1393 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1394 "examine these refs and maybe delete them. Turn this message off by\n"
1395 "running \"git config advice.objectNameWarning false\""
1397 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1398 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1400 " git checkout -b $br $(git rev-parse ...)\n"
1402 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1403 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1407 msgid "HEAD does not point to a branch"
1408 msgstr "HEAD 没有指向一个分支"
1412 msgid "No such branch: '%s'"
1417 msgid "No upstream configured for branch '%s'"
1418 msgstr "尚未给分支 '%s' 设置上游"
1422 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1423 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1425 #: submodule.c:64 submodule.c:98
1426 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1427 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1429 #: submodule.c:68 submodule.c:102
1431 msgid "Could not find section in .gitmodules where path=%s"
1432 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1436 msgid "Could not update .gitmodules entry %s"
1437 msgstr "不能更新 .gitmodules 条目 %s"
1441 msgid "Could not remove .gitmodules entry for %s"
1442 msgstr "无法移除 %s 的 .gitmodules 条目"
1445 msgid "staging updated .gitmodules failed"
1446 msgstr "将更新后 .gitmodules 添加暂存区失败"
1448 #: submodule.c:1111 builtin/init-db.c:371
1450 msgid "Could not create git link %s"
1451 msgstr "不能创建 git link %s"
1455 msgid "Could not set core.worktree in %s"
1456 msgstr "不能在 %s 中设置 core.worktree"
1458 #: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
1461 msgid "unknown value '%s' for key '%s'"
1462 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1464 #: trailer.c:552 trailer.c:557 builtin/remote.c:290
1466 msgid "more than one %s"
1471 msgid "empty trailer token in trailer '%.*s'"
1472 msgstr "签名 '%.*s' 的键为空"
1476 msgid "could not read input file '%s'"
1477 msgstr "不能读取输入文件 '%s'"
1480 msgid "could not read from stdin"
1483 #: unpack-trees.c:202
1484 msgid "Checking out files"
1488 msgid "invalid URL scheme name or missing '://' suffix"
1489 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1491 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1493 msgid "invalid %XX escape sequence"
1494 msgstr "无效的 %XX 转义序列"
1497 msgid "missing host and scheme is not 'file:'"
1498 msgstr "缺失主机名且URL方案不是 'file:'"
1501 msgid "a 'file:' URL may not have a port number"
1502 msgstr "一个 'file:' URL 不应该包含端口号"
1505 msgid "invalid characters in host name"
1506 msgstr "主机名中包含无效的字符"
1508 #: urlmatch.c:244 urlmatch.c:255
1509 msgid "invalid port number"
1513 msgid "invalid '..' path segment"
1514 msgstr "无效的 '..' 路径片段"
1518 msgid "unable to access '%s': %s"
1519 msgstr "不能访问 '%s':%s"
1523 msgid "unable to access '%s'"
1528 msgid "unable to look up current user in the passwd file: %s"
1529 msgstr "无法在口令文件中查询到当前用户:%s"
1532 msgid "no such user"
1536 msgid "unable to get current working directory"
1540 msgid "Unmerged paths:"
1544 #: wt-status.c:177 wt-status.c:204
1546 msgid " (use \"git reset %s <file>...\" to unstage)"
1547 msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
1550 #: wt-status.c:179 wt-status.c:206
1551 msgid " (use \"git rm --cached <file>...\" to unstage)"
1552 msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
1556 msgid " (use \"git add <file>...\" to mark resolution)"
1557 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1560 #: wt-status.c:185 wt-status.c:189
1561 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1562 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1566 msgid " (use \"git rm <file>...\" to mark resolution)"
1567 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1570 msgid "Changes to be committed:"
1574 msgid "Changes not staged for commit:"
1575 msgstr "尚未暂存以备提交的变更:"
1579 msgid " (use \"git add <file>...\" to update what will be committed)"
1580 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1584 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1585 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1590 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1591 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1595 msgid " (commit or discard the untracked or modified content in submodules)"
1596 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1601 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1602 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1605 msgid "both deleted:"
1609 msgid "added by us:"
1613 msgid "deleted by them:"
1617 msgid "added by them:"
1621 msgid "deleted by us:"
1629 msgid "both modified:"
1634 msgid "bug: unhandled unmerged status %x"
1635 msgstr "bug:无法处理的未合并状态 %x"
1669 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1671 msgid "new commits, "
1674 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1676 msgid "modified content, "
1679 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1681 msgid "untracked content, "
1686 msgid "bug: unhandled diff status %c"
1687 msgstr "bug:无法处理的差异状态 %c"
1690 msgid "Submodules changed but not updated:"
1691 msgstr "子模组已修改但尚未更新:"
1694 msgid "Submodule changes to be committed:"
1699 "Do not touch the line above.\n"
1700 "Everything below will be removed."
1706 msgid "You have unmerged paths."
1711 msgid " (fix conflicts and run \"git commit\")"
1712 msgstr " (解决冲突并运行 \"git commit\")"
1715 msgid "All conflicts fixed but you are still merging."
1716 msgstr "所有冲突已解决但您仍处于合并中。"
1720 msgid " (use \"git commit\" to conclude merge)"
1721 msgstr " (使用 \"git commit\" 结束合并)"
1724 msgid "You are in the middle of an am session."
1725 msgstr "您正处于 am 操作过程中。"
1728 msgid "The current patch is empty."
1733 msgid " (fix conflicts and then run \"git am --continue\")"
1734 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1738 msgid " (use \"git am --skip\" to skip this patch)"
1739 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1743 msgid " (use \"git am --abort\" to restore the original branch)"
1744 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1746 #: wt-status.c:1020 wt-status.c:1037
1748 msgid "You are currently rebasing branch '%s' on '%s'."
1749 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1751 #: wt-status.c:1025 wt-status.c:1042
1752 msgid "You are currently rebasing."
1757 msgid " (fix conflicts and then run \"git rebase --continue\")"
1758 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1762 msgid " (use \"git rebase --skip\" to skip this patch)"
1763 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1767 msgid " (use \"git rebase --abort\" to check out the original branch)"
1768 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1772 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1773 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1778 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1779 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1782 msgid "You are currently splitting a commit during a rebase."
1783 msgstr "您在执行变基操作时拆分提交。"
1787 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1788 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1792 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1793 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1796 msgid "You are currently editing a commit during a rebase."
1797 msgstr "您在执行变基操作时编辑提交。"
1801 msgid " (use \"git commit --amend\" to amend the current commit)"
1802 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1807 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1808 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1812 msgid "You are currently cherry-picking commit %s."
1813 msgstr "您在执行拣选提交 %s 的操作。"
1817 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1818 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1822 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1823 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1827 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1828 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1832 msgid "You are currently reverting commit %s."
1833 msgstr "您在执行反转提交 %s 的操作。"
1837 msgid " (fix conflicts and run \"git revert --continue\")"
1838 msgstr " (解决冲突并运行 \"git revert --continue\")"
1842 msgid " (all conflicts fixed: run \"git revert --continue\")"
1843 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1847 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1848 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1852 msgid "You are currently bisecting, started from branch '%s'."
1853 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1856 msgid "You are currently bisecting."
1857 msgstr "您在执行二分查找操作。"
1861 msgid " (use \"git bisect reset\" to get back to the original branch)"
1862 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1869 msgid "rebase in progress; onto "
1870 msgstr "变基操作正在进行中;至 "
1873 msgid "HEAD detached at "
1877 msgid "HEAD detached from "
1881 msgid "Not currently on any branch."
1885 msgid "Initial commit"
1889 msgid "Untracked files"
1893 msgid "Ignored files"
1899 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1900 "may speed it up, but you have to be careful not to forget to add\n"
1901 "new files yourself (see 'git help status')."
1903 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1904 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1908 msgid "Untracked files not listed%s"
1909 msgstr "未跟踪的文件没有列出%s"
1911 # 译者:中文字符串拼接,可删除前导空格
1913 msgid " (use -u option to show untracked files)"
1914 msgstr "(使用 -u 参数显示未跟踪的文件)"
1922 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1923 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1927 msgid "no changes added to commit\n"
1933 "nothing added to commit but untracked files present (use \"git add\" to "
1935 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1939 msgid "nothing added to commit but untracked files present\n"
1940 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1942 # 译者:中文字符串拼接,可删除前导空格
1945 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1946 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1948 #: wt-status.c:1393 wt-status.c:1398
1950 msgid "nothing to commit\n"
1953 # 译者:中文字符串拼接,可删除前导空格
1956 msgid "nothing to commit (use -u to show untracked files)\n"
1957 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1959 # 译者:中文字符串拼接,可删除前导空格
1962 msgid "nothing to commit, working directory clean\n"
1963 msgstr "无文件要提交,干净的工作区\n"
1966 msgid "HEAD (no branch)"
1971 msgid "Initial commit on "
1979 #: wt-status.c:1549 wt-status.c:1557
1983 #: compat/precompose_utf8.c:55 builtin/clone.c:360
1985 msgid "failed to unlink '%s'"
1989 msgid "git add [options] [--] <pathspec>..."
1990 msgstr "git add [选项] [--] <路径规则>..."
1994 msgid "unexpected diff status %c"
1997 #: builtin/add.c:70 builtin/commit.c:275
1998 msgid "updating files failed"
2003 msgid "remove '%s'\n"
2006 #: builtin/add.c:134
2007 msgid "Unstaged changes after refreshing the index:"
2008 msgstr "刷新索引之后尚未被暂存的变更:"
2010 #: builtin/add.c:194 builtin/rev-parse.c:785
2011 msgid "Could not read the index"
2014 #: builtin/add.c:205
2016 msgid "Could not open '%s' for writing."
2017 msgstr "不能打开 '%s' 以写入。"
2019 #: builtin/add.c:209
2020 msgid "Could not write patch"
2023 #: builtin/add.c:214
2025 msgid "Could not stat '%s'"
2026 msgstr "不能查看文件状态 '%s'"
2028 #: builtin/add.c:216
2029 msgid "Empty patch. Aborted."
2032 #: builtin/add.c:221
2034 msgid "Could not apply '%s'"
2037 #: builtin/add.c:231
2038 msgid "The following paths are ignored by one of your .gitignore files:\n"
2039 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2041 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
2042 #: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
2047 #: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
2048 #: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
2049 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2053 #: builtin/add.c:251
2054 msgid "interactive picking"
2057 #: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
2058 msgid "select hunks interactively"
2061 #: builtin/add.c:253
2062 msgid "edit current diff and apply"
2065 #: builtin/add.c:254
2066 msgid "allow adding otherwise ignored files"
2069 #: builtin/add.c:255
2070 msgid "update tracked files"
2073 #: builtin/add.c:256
2074 msgid "record only the fact that the path will be added later"
2075 msgstr "只记录,该路径稍后再添加"
2077 #: builtin/add.c:257
2078 msgid "add changes from all tracked and untracked files"
2079 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2081 #: builtin/add.c:260
2082 msgid "ignore paths removed in the working tree (same as --no-all)"
2083 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2085 #: builtin/add.c:262
2086 msgid "don't add, only refresh the index"
2089 #: builtin/add.c:263
2090 msgid "just skip files which cannot be added because of errors"
2091 msgstr "跳过因出错不能添加的文件"
2093 #: builtin/add.c:264
2094 msgid "check if - even missing - files are ignored in dry run"
2095 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2097 #: builtin/add.c:286
2099 msgid "Use -f if you really want to add them.\n"
2100 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2102 #: builtin/add.c:293
2103 msgid "adding files failed"
2106 #: builtin/add.c:329
2107 msgid "-A and -u are mutually incompatible"
2108 msgstr "-A 和 -u 选项互斥"
2110 #: builtin/add.c:336
2111 msgid "Option --ignore-missing can only be used together with --dry-run"
2112 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2114 #: builtin/add.c:357
2116 msgid "Nothing specified, nothing added.\n"
2117 msgstr "没有指定文件,也没有文件被添加。\n"
2119 #: builtin/add.c:358
2121 msgid "Maybe you wanted to say 'git add .'?\n"
2122 msgstr "也许您想要执行 'git add .'?\n"
2124 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2125 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2126 msgid "index file corrupt"
2129 #: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
2130 msgid "Unable to write new index file"
2133 #: builtin/apply.c:58
2134 msgid "git apply [options] [<patch>...]"
2135 msgstr "git apply [选项] [<补丁>...]"
2137 #: builtin/apply.c:111
2139 msgid "unrecognized whitespace option '%s'"
2140 msgstr "未能识别的空白字符选项 '%s'"
2142 #: builtin/apply.c:126
2144 msgid "unrecognized whitespace ignore option '%s'"
2145 msgstr "未能识别的空白字符忽略选项 '%s'"
2147 #: builtin/apply.c:826
2149 msgid "Cannot prepare timestamp regexp %s"
2150 msgstr "无法准备时间戳正则表达式 %s"
2152 #: builtin/apply.c:835
2154 msgid "regexec returned %d for input: %s"
2155 msgstr "regexec 返回 %d,输入为:%s"
2157 #: builtin/apply.c:916
2159 msgid "unable to find filename in patch at line %d"
2160 msgstr "不能在补丁的第 %d 行找到文件名"
2162 #: builtin/apply.c:948
2164 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2165 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2167 #: builtin/apply.c:952
2169 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2170 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2172 #: builtin/apply.c:953
2174 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2175 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2177 #: builtin/apply.c:960
2179 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2180 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2182 #: builtin/apply.c:1423
2184 msgid "recount: unexpected line: %.*s"
2185 msgstr "recount:意外的行:%.*s"
2187 #: builtin/apply.c:1480
2189 msgid "patch fragment without header at line %d: %.*s"
2190 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2192 #: builtin/apply.c:1497
2195 "git diff header lacks filename information when removing %d leading pathname "
2196 "component (line %d)"
2198 "git diff header lacks filename information when removing %d leading pathname "
2199 "components (line %d)"
2200 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2201 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2203 #: builtin/apply.c:1657
2204 msgid "new file depends on old contents"
2207 #: builtin/apply.c:1659
2208 msgid "deleted file still has contents"
2211 #: builtin/apply.c:1685
2213 msgid "corrupt patch at line %d"
2214 msgstr "补丁在第 %d 行损坏"
2216 #: builtin/apply.c:1721
2218 msgid "new file %s depends on old contents"
2219 msgstr "新文件 %s 依赖旧内容"
2221 #: builtin/apply.c:1723
2223 msgid "deleted file %s still has contents"
2224 msgstr "删除的文件 %s 仍有内容"
2226 #: builtin/apply.c:1726
2228 msgid "** warning: file %s becomes empty but is not deleted"
2229 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2231 #: builtin/apply.c:1872
2233 msgid "corrupt binary patch at line %d: %.*s"
2234 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2236 #: builtin/apply.c:1901
2238 msgid "unrecognized binary patch at line %d"
2239 msgstr "未能识别的二进制补丁位于第 %d 行"
2241 #: builtin/apply.c:2052
2243 msgid "patch with only garbage at line %d"
2244 msgstr "补丁文件的第 %d 行只有垃圾数据"
2246 #: builtin/apply.c:2142
2248 msgid "unable to read symlink %s"
2249 msgstr "无法读取符号链接 %s"
2251 #: builtin/apply.c:2146
2253 msgid "unable to open or read %s"
2256 #: builtin/apply.c:2754
2258 msgid "invalid start of line: '%c'"
2259 msgstr "无效的行首字符:'%c'"
2261 #: builtin/apply.c:2872
2263 msgid "Hunk #%d succeeded at %d (offset %d line)."
2264 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2265 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2266 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2268 #: builtin/apply.c:2884
2270 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2271 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2273 #: builtin/apply.c:2890
2276 "while searching for:\n"
2282 #: builtin/apply.c:2909
2284 msgid "missing binary patch data for '%s'"
2285 msgstr "缺失 '%s' 的二进制补丁数据"
2287 #: builtin/apply.c:3010
2289 msgid "binary patch does not apply to '%s'"
2290 msgstr "二进制补丁未应用到 '%s'"
2292 #: builtin/apply.c:3016
2294 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2295 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2297 #: builtin/apply.c:3037
2299 msgid "patch failed: %s:%ld"
2300 msgstr "打补丁失败:%s:%ld"
2302 #: builtin/apply.c:3161
2304 msgid "cannot checkout %s"
2307 #: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
2309 msgid "read of %s failed"
2312 #: builtin/apply.c:3240 builtin/apply.c:3462
2314 msgid "path %s has been renamed/deleted"
2315 msgstr "路径 %s 已经被重命名/删除"
2317 #: builtin/apply.c:3321 builtin/apply.c:3476
2319 msgid "%s: does not exist in index"
2322 #: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
2327 #: builtin/apply.c:3330 builtin/apply.c:3484
2329 msgid "%s: does not match index"
2332 #: builtin/apply.c:3432
2333 msgid "removal patch leaves file contents"
2334 msgstr "移除补丁仍留下了文件内容"
2336 #: builtin/apply.c:3501
2338 msgid "%s: wrong type"
2341 #: builtin/apply.c:3503
2343 msgid "%s has type %o, expected %o"
2344 msgstr "%s 的类型是 %o,应为 %o"
2346 #: builtin/apply.c:3604
2348 msgid "%s: already exists in index"
2349 msgstr "%s:已经存在于索引中"
2351 #: builtin/apply.c:3607
2353 msgid "%s: already exists in working directory"
2354 msgstr "%s:已经存在于工作区中"
2356 #: builtin/apply.c:3627
2358 msgid "new mode (%o) of %s does not match old mode (%o)"
2359 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2361 #: builtin/apply.c:3632
2363 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2364 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2366 #: builtin/apply.c:3640
2368 msgid "%s: patch does not apply"
2371 #: builtin/apply.c:3653
2373 msgid "Checking patch %s..."
2376 #: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
2378 msgid "make_cache_entry failed for path '%s'"
2379 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2381 #: builtin/apply.c:3889
2383 msgid "unable to remove %s from index"
2384 msgstr "不能从索引中移除 %s"
2386 #: builtin/apply.c:3918
2388 msgid "corrupt patch for submodule %s"
2389 msgstr "子模组 %s 损坏的补丁"
2391 #: builtin/apply.c:3922
2393 msgid "unable to stat newly created file '%s'"
2394 msgstr "不能枚举新建文件 '%s' 的状态"
2396 #: builtin/apply.c:3927
2398 msgid "unable to create backing store for newly created file %s"
2399 msgstr "不能为新建文件 %s 创建后端存储"
2401 #: builtin/apply.c:3930 builtin/apply.c:4038
2403 msgid "unable to add cache entry for %s"
2404 msgstr "无法为 %s 添加缓存条目"
2406 #: builtin/apply.c:3963
2408 msgid "closing file '%s'"
2411 #: builtin/apply.c:4012
2413 msgid "unable to write file '%s' mode %o"
2414 msgstr "不能写文件 '%s' 权限 %o"
2416 #: builtin/apply.c:4099
2418 msgid "Applied patch %s cleanly."
2421 #: builtin/apply.c:4107
2422 msgid "internal error"
2425 #: builtin/apply.c:4110
2427 msgid "Applying patch %%s with %d reject..."
2428 msgid_plural "Applying patch %%s with %d rejects..."
2429 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2430 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2432 #: builtin/apply.c:4120
2434 msgid "truncating .rej filename to %.*s.rej"
2435 msgstr "截短 .rej 文件名为 %.*s.rej"
2437 #: builtin/apply.c:4141
2439 msgid "Hunk #%d applied cleanly."
2440 msgstr "第 #%d 个片段成功应用。"
2442 #: builtin/apply.c:4144
2444 msgid "Rejected hunk #%d."
2445 msgstr "拒绝第 #%d 个片段。"
2447 #: builtin/apply.c:4234
2448 msgid "unrecognized input"
2451 #: builtin/apply.c:4245
2452 msgid "unable to read index file"
2455 #: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
2456 #: builtin/fetch.c:93
2460 #: builtin/apply.c:4363
2461 msgid "don't apply changes matching the given path"
2462 msgstr "不要应用与给出路径向匹配的变更"
2464 #: builtin/apply.c:4366
2465 msgid "apply changes matching the given path"
2466 msgstr "应用与给出路径向匹配的变更"
2468 #: builtin/apply.c:4368
2472 #: builtin/apply.c:4369
2473 msgid "remove <num> leading slashes from traditional diff paths"
2474 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2476 #: builtin/apply.c:4372
2477 msgid "ignore additions made by the patch"
2478 msgstr "忽略补丁中的添加的文件"
2480 #: builtin/apply.c:4374
2481 msgid "instead of applying the patch, output diffstat for the input"
2482 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2484 #: builtin/apply.c:4378
2485 msgid "show number of added and deleted lines in decimal notation"
2486 msgstr "以十进制数显示添加和删除的行数"
2488 #: builtin/apply.c:4380
2489 msgid "instead of applying the patch, output a summary for the input"
2490 msgstr "不应用补丁,而是显示输入的概要"
2492 #: builtin/apply.c:4382
2493 msgid "instead of applying the patch, see if the patch is applicable"
2494 msgstr "不应用补丁,而是查看补丁是否可应用"
2496 #: builtin/apply.c:4384
2497 msgid "make sure the patch is applicable to the current index"
2498 msgstr "确认补丁可以应用到当前索引"
2500 #: builtin/apply.c:4386
2501 msgid "apply a patch without touching the working tree"
2502 msgstr "应用补丁而不修改工作区"
2504 #: builtin/apply.c:4388
2505 msgid "also apply the patch (use with --stat/--summary/--check)"
2506 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2508 #: builtin/apply.c:4390
2509 msgid "attempt three-way merge if a patch does not apply"
2510 msgstr "如果一个补丁不能应用则尝试三路合并"
2512 #: builtin/apply.c:4392
2513 msgid "build a temporary index based on embedded index information"
2514 msgstr "创建一个临时索引基于嵌入的索引信息"
2516 #: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
2517 msgid "paths are separated with NUL character"
2518 msgstr "路径以 NUL 字符分隔"
2520 #: builtin/apply.c:4397
2521 msgid "ensure at least <n> lines of context match"
2522 msgstr "确保至少匹配 <n> 行上下文"
2524 #: builtin/apply.c:4398
2528 #: builtin/apply.c:4399
2529 msgid "detect new or modified lines that have whitespace errors"
2530 msgstr "检查新增和修改的行中间的空白字符滥用"
2532 #: builtin/apply.c:4402 builtin/apply.c:4405
2533 msgid "ignore changes in whitespace when finding context"
2534 msgstr "查找上下文时忽略空白字符的变更"
2536 #: builtin/apply.c:4408
2537 msgid "apply the patch in reverse"
2540 #: builtin/apply.c:4410
2541 msgid "don't expect at least one line of context"
2544 #: builtin/apply.c:4412
2545 msgid "leave the rejected hunks in corresponding *.rej files"
2546 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2548 #: builtin/apply.c:4414
2549 msgid "allow overlapping hunks"
2552 #: builtin/apply.c:4417
2553 msgid "tolerate incorrectly detected missing new-line at the end of file"
2554 msgstr "允许不正确的文件末尾换行符"
2556 #: builtin/apply.c:4420
2557 msgid "do not trust the line counts in the hunk headers"
2558 msgstr "不信任补丁片段的头信息中的行号"
2560 #: builtin/apply.c:4422
2564 #: builtin/apply.c:4423
2565 msgid "prepend <root> to all filenames"
2566 msgstr "为所有文件名前添加 <根目录>"
2568 #: builtin/apply.c:4445
2569 msgid "--3way outside a repository"
2570 msgstr "--3way 在一个版本库之外"
2572 #: builtin/apply.c:4453
2573 msgid "--index outside a repository"
2574 msgstr "--index 在一个版本库之外"
2576 #: builtin/apply.c:4456
2577 msgid "--cached outside a repository"
2578 msgstr "--cached 在一个版本库之外"
2580 #: builtin/apply.c:4472
2582 msgid "can't open patch '%s'"
2583 msgstr "不能打开补丁 '%s'"
2585 #: builtin/apply.c:4486
2587 msgid "squelched %d whitespace error"
2588 msgid_plural "squelched %d whitespace errors"
2589 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2590 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2592 #: builtin/apply.c:4492 builtin/apply.c:4502
2594 msgid "%d line adds whitespace errors."
2595 msgid_plural "%d lines add whitespace errors."
2596 msgstr[0] "%d 行有空白字符误用。"
2597 msgstr[1] "%d 行有空白字符误用。"
2599 #: builtin/archive.c:17
2601 msgid "could not create archive file '%s'"
2602 msgstr "不能创建归档文件 '%s'"
2604 #: builtin/archive.c:20
2605 msgid "could not redirect output"
2608 #: builtin/archive.c:37
2609 msgid "git archive: Remote with no URL"
2610 msgstr "git archive:未提供远程URL"
2612 #: builtin/archive.c:58
2613 msgid "git archive: expected ACK/NAK, got EOF"
2614 msgstr "git archive:应为ACK/NACK,却得到EOF"
2616 #: builtin/archive.c:61
2618 msgid "git archive: NACK %s"
2619 msgstr "git archive:NACK %s"
2621 #: builtin/archive.c:63
2623 msgid "remote error: %s"
2626 #: builtin/archive.c:64
2627 msgid "git archive: protocol error"
2628 msgstr "git archive:协议错误"
2630 #: builtin/archive.c:68
2631 msgid "git archive: expected a flush"
2632 msgstr "git archive:应为刷新"
2634 #: builtin/bisect--helper.c:7
2635 msgid "git bisect--helper --next-all [--no-checkout]"
2636 msgstr "git bisect--helper --next-all [--no-checkout]"
2638 #: builtin/bisect--helper.c:17
2639 msgid "perform 'git bisect next'"
2640 msgstr "执行 'git bisect next'"
2642 #: builtin/bisect--helper.c:19
2643 msgid "update BISECT_HEAD instead of checking out the current commit"
2644 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2646 #: builtin/blame.c:30
2647 msgid "git blame [options] [rev-opts] [rev] [--] file"
2648 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2650 #: builtin/blame.c:35
2651 msgid "[rev-opts] are documented in git-rev-list(1)"
2652 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2654 #: builtin/blame.c:2501
2655 msgid "Show blame entries as we find them, incrementally"
2656 msgstr "增量式地显示发现的 blame 条目"
2658 #: builtin/blame.c:2502
2659 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2660 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2662 #: builtin/blame.c:2503
2663 msgid "Do not treat root commits as boundaries (Default: off)"
2664 msgstr "不把根提交作为边界(默认:关闭)"
2666 #: builtin/blame.c:2504
2667 msgid "Show work cost statistics"
2670 #: builtin/blame.c:2505
2671 msgid "Show output score for blame entries"
2672 msgstr "显示判断 blame 条目位移的得分诊断信息"
2674 #: builtin/blame.c:2506
2675 msgid "Show original filename (Default: auto)"
2676 msgstr "显示原始文件名(默认:自动)"
2678 #: builtin/blame.c:2507
2679 msgid "Show original linenumber (Default: off)"
2680 msgstr "显示原始的行号(默认:关闭)"
2682 #: builtin/blame.c:2508
2683 msgid "Show in a format designed for machine consumption"
2684 msgstr "显示为一个适合机器读取的格式"
2686 #: builtin/blame.c:2509
2687 msgid "Show porcelain format with per-line commit information"
2688 msgstr "为每一行显示机器适用的提交信息"
2690 #: builtin/blame.c:2510
2691 msgid "Use the same output mode as git-annotate (Default: off)"
2692 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2694 #: builtin/blame.c:2511
2695 msgid "Show raw timestamp (Default: off)"
2696 msgstr "显示原始时间戳(默认:关闭)"
2698 #: builtin/blame.c:2512
2699 msgid "Show long commit SHA1 (Default: off)"
2700 msgstr "显示长的SHA1提交号(默认:关闭)"
2702 #: builtin/blame.c:2513
2703 msgid "Suppress author name and timestamp (Default: off)"
2704 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2706 #: builtin/blame.c:2514
2707 msgid "Show author email instead of name (Default: off)"
2708 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2710 #: builtin/blame.c:2515
2711 msgid "Ignore whitespace differences"
2714 #: builtin/blame.c:2516
2715 msgid "Spend extra cycles to find better match"
2716 msgstr "花费额外的循环来找到更好的匹配"
2718 #: builtin/blame.c:2517
2719 msgid "Use revisions from <file> instead of calling git-rev-list"
2720 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2722 #: builtin/blame.c:2518
2723 msgid "Use <file>'s contents as the final image"
2724 msgstr "使用 <文件> 的内容作为最终的图片"
2726 #: builtin/blame.c:2519 builtin/blame.c:2520
2730 #: builtin/blame.c:2519
2731 msgid "Find line copies within and across files"
2732 msgstr "找到文件内及跨文件的行拷贝"
2734 #: builtin/blame.c:2520
2735 msgid "Find line movements within and across files"
2736 msgstr "找到文件内及跨文件的行移动"
2738 #: builtin/blame.c:2521
2742 #: builtin/blame.c:2521
2743 msgid "Process only line range n,m, counting from 1"
2744 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2746 #. TRANSLATORS: This string is used to tell us the maximum
2747 #. display width for a relative timestamp in "git blame"
2748 #. output. For C locale, "4 years, 11 months ago", which
2749 #. takes 22 places, is the longest among various forms of
2750 #. relative timestamps, but your language may need more or
2751 #. fewer display columns.
2752 #: builtin/blame.c:2602
2753 msgid "4 years, 11 months ago"
2756 #: builtin/branch.c:24
2757 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2758 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2760 #: builtin/branch.c:25
2761 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2762 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2764 #: builtin/branch.c:26
2765 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2766 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2768 #: builtin/branch.c:27
2769 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2770 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2772 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2773 #: builtin/branch.c:152
2776 "deleting branch '%s' that has been merged to\n"
2777 " '%s', but not yet merged to HEAD."
2779 "将要删除的分支 '%s' 已经被合并到\n"
2782 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2783 #: builtin/branch.c:156
2786 "not deleting branch '%s' that is not yet merged to\n"
2787 " '%s', even though it is merged to HEAD."
2789 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2790 " 然而却尚未被合并到分支 '%s' 。"
2792 #: builtin/branch.c:170
2794 msgid "Couldn't look up commit object for '%s'"
2795 msgstr "无法查询 '%s' 指向的提交对象"
2797 #: builtin/branch.c:174
2800 "The branch '%s' is not fully merged.\n"
2801 "If you are sure you want to delete it, run 'git branch -D %s'."
2804 "如果您确认要删除它,执行 'git branch -D %s'。"
2806 #: builtin/branch.c:187
2807 msgid "Update of config-file failed"
2808 msgstr "无法更新 config 文件"
2810 #: builtin/branch.c:215
2811 msgid "cannot use -a with -d"
2812 msgstr "不能将 -a 和 -d 同时使用"
2814 #: builtin/branch.c:221
2815 msgid "Couldn't look up commit object for HEAD"
2816 msgstr "无法查询 HEAD 指向的提交对象"
2818 #: builtin/branch.c:229
2820 msgid "Cannot delete the branch '%s' which you are currently on."
2821 msgstr "无法删除您当前所在的分支 '%s'。"
2823 #: builtin/branch.c:245
2825 msgid "remote branch '%s' not found."
2826 msgstr "远程分支 '%s' 未发现。"
2828 #: builtin/branch.c:246
2830 msgid "branch '%s' not found."
2831 msgstr "分支 '%s' 未发现。"
2833 #: builtin/branch.c:260
2835 msgid "Error deleting remote branch '%s'"
2836 msgstr "删除远程分支 '%s' 时出错"
2838 #: builtin/branch.c:261
2840 msgid "Error deleting branch '%s'"
2841 msgstr "删除分支 '%s' 时出错"
2843 #: builtin/branch.c:268
2845 msgid "Deleted remote branch %s (was %s).\n"
2846 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2848 #: builtin/branch.c:269
2850 msgid "Deleted branch %s (was %s).\n"
2851 msgstr "已删除分支 %s(曾为 %s)。\n"
2853 #: builtin/branch.c:370
2855 msgid "branch '%s' does not point at a commit"
2856 msgstr "分支 '%s' 未指向一个提交"
2858 #: builtin/branch.c:459
2863 #: builtin/branch.c:464
2868 #: builtin/branch.c:469
2870 msgid "[%s: behind %d]"
2873 #: builtin/branch.c:471
2878 #: builtin/branch.c:475
2880 msgid "[%s: ahead %d]"
2883 #: builtin/branch.c:477
2888 #: builtin/branch.c:480
2890 msgid "[%s: ahead %d, behind %d]"
2891 msgstr "[%s:领先 %d,落后 %d]"
2893 #: builtin/branch.c:483
2895 msgid "[ahead %d, behind %d]"
2896 msgstr "[领先 %d,落后 %d]"
2898 #: builtin/branch.c:496
2899 msgid " **** invalid ref ****"
2900 msgstr " **** 无效引用 ****"
2902 #: builtin/branch.c:587
2904 msgid "(no branch, rebasing %s)"
2905 msgstr "(非分支,正变基 %s)"
2907 #: builtin/branch.c:590
2909 msgid "(no branch, bisect started on %s)"
2910 msgstr "(非分支,二分查找开始于 %s)"
2912 #: builtin/branch.c:593
2914 msgid "(detached from %s)"
2917 #: builtin/branch.c:596
2921 #: builtin/branch.c:643
2923 msgid "object '%s' does not point to a commit"
2924 msgstr "对象 '%s' 没有指向一个提交"
2926 #: builtin/branch.c:691
2927 msgid "some refs could not be read"
2930 #: builtin/branch.c:704
2931 msgid "cannot rename the current branch while not on any."
2932 msgstr "无法重命名当前分支因为不处于任何分支上。"
2934 #: builtin/branch.c:714
2936 msgid "Invalid branch name: '%s'"
2937 msgstr "无效的分支名:'%s'"
2939 #: builtin/branch.c:729
2940 msgid "Branch rename failed"
2943 #: builtin/branch.c:733
2945 msgid "Renamed a misnamed branch '%s' away"
2946 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2948 #: builtin/branch.c:737
2950 msgid "Branch renamed to %s, but HEAD is not updated!"
2951 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2953 #: builtin/branch.c:744
2954 msgid "Branch is renamed, but update of config-file failed"
2955 msgstr "分支被重命名,但更新 config 文件失败"
2957 #: builtin/branch.c:759
2959 msgid "malformed object name %s"
2962 #: builtin/branch.c:783
2964 msgid "could not write branch description template: %s"
2965 msgstr "不能写分支描述模版:%s"
2967 #: builtin/branch.c:813
2968 msgid "Generic options"
2971 #: builtin/branch.c:815
2972 msgid "show hash and subject, give twice for upstream branch"
2973 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2975 #: builtin/branch.c:816
2976 msgid "suppress informational messages"
2979 #: builtin/branch.c:817
2980 msgid "set up tracking mode (see git-pull(1))"
2981 msgstr "设置跟踪模式(参见 git-pull(1))"
2983 #: builtin/branch.c:819
2984 msgid "change upstream info"
2987 #: builtin/branch.c:823
2988 msgid "use colored output"
2991 #: builtin/branch.c:824
2992 msgid "act on remote-tracking branches"
2995 #: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
2996 #: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
2997 #: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
2998 #: builtin/tag.c:622
3002 #: builtin/branch.c:828 builtin/branch.c:834
3003 msgid "print only branches that contain the commit"
3004 msgstr "只打印包含该提交的分支"
3006 #: builtin/branch.c:840
3007 msgid "Specific git-branch actions:"
3008 msgstr "具体的 git-branch 动作:"
3010 #: builtin/branch.c:841
3011 msgid "list both remote-tracking and local branches"
3012 msgstr "列出远程跟踪及本地分支"
3014 #: builtin/branch.c:843
3015 msgid "delete fully merged branch"
3018 #: builtin/branch.c:844
3019 msgid "delete branch (even if not merged)"
3020 msgstr "删除分支(即使没有合并)"
3022 #: builtin/branch.c:845
3023 msgid "move/rename a branch and its reflog"
3024 msgstr "移动/重命名一个分支,以及它的引用日志"
3026 #: builtin/branch.c:846
3027 msgid "move/rename a branch, even if target exists"
3028 msgstr "移动/重命名一个分支,即使目标已存在"
3030 #: builtin/branch.c:847
3031 msgid "list branch names"
3034 #: builtin/branch.c:848
3035 msgid "create the branch's reflog"
3038 #: builtin/branch.c:850
3039 msgid "edit the description for the branch"
3042 #: builtin/branch.c:851
3043 msgid "force creation, move/rename, deletion"
3044 msgstr "强制创建、移动/重命名、删除"
3046 #: builtin/branch.c:854
3047 msgid "print only not merged branches"
3050 #: builtin/branch.c:860
3051 msgid "print only merged branches"
3054 #: builtin/branch.c:864
3055 msgid "list branches in columns"
3058 #: builtin/branch.c:877
3059 msgid "Failed to resolve HEAD as a valid ref."
3060 msgstr "无法将 HEAD 解析为有效引用。"
3062 #: builtin/branch.c:881 builtin/clone.c:637
3063 msgid "HEAD not found below refs/heads!"
3064 msgstr "HEAD 没有位于 /refs/heads 之下!"
3066 #: builtin/branch.c:903
3067 msgid "--column and --verbose are incompatible"
3068 msgstr "--column 和 --verbose 不兼容"
3070 #: builtin/branch.c:914 builtin/branch.c:953
3071 msgid "branch name required"
3074 #: builtin/branch.c:929
3075 msgid "Cannot give description to detached HEAD"
3076 msgstr "不能向分离头指针提供描述"
3078 #: builtin/branch.c:934
3079 msgid "cannot edit description of more than one branch"
3080 msgstr "不能为一个以上的分支编辑描述"
3082 #: builtin/branch.c:941
3084 msgid "No commit on branch '%s' yet."
3085 msgstr "分支 '%s' 尚无提交。"
3087 #: builtin/branch.c:944
3089 msgid "No branch named '%s'."
3092 #: builtin/branch.c:959
3093 msgid "too many branches for a rename operation"
3094 msgstr "为重命名操作提供了太多的分支名"
3096 #: builtin/branch.c:964
3097 msgid "too many branches to set new upstream"
3098 msgstr "为设置新上游提供了太多的分支名"
3100 #: builtin/branch.c:968
3103 "could not set upstream of HEAD to %s when it does not point to any branch."
3104 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3106 #: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
3108 msgid "no such branch '%s'"
3111 #: builtin/branch.c:975
3113 msgid "branch '%s' does not exist"
3114 msgstr "分支 '%s' 不存在"
3116 #: builtin/branch.c:987
3117 msgid "too many branches to unset upstream"
3118 msgstr "为取消上游设置操作提供了太多的分支名"
3120 #: builtin/branch.c:991
3121 msgid "could not unset upstream of HEAD when it does not point to any branch."
3122 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3124 #: builtin/branch.c:997
3126 msgid "Branch '%s' has no upstream information"
3127 msgstr "分支 '%s' 没有上游信息"
3129 #: builtin/branch.c:1011
3130 msgid "it does not make sense to create 'HEAD' manually"
3131 msgstr "手工创建 'HEAD' 没有意义"
3133 #: builtin/branch.c:1017
3134 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3135 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3137 #: builtin/branch.c:1020
3140 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3141 "track or --set-upstream-to\n"
3143 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3145 #: builtin/branch.c:1037
3149 "If you wanted to make '%s' track '%s', do this:\n"
3153 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3156 #: builtin/branch.c:1038
3158 msgid " git branch -d %s\n"
3159 msgstr " git branch -d %s\n"
3161 #: builtin/branch.c:1039
3163 msgid " git branch --set-upstream-to %s\n"
3164 msgstr " git branch --set-upstream-to %s\n"
3166 #: builtin/bundle.c:47
3168 msgid "%s is okay\n"
3171 #: builtin/bundle.c:56
3172 msgid "Need a repository to create a bundle."
3173 msgstr "需要一个版本库来创建包。"
3175 #: builtin/bundle.c:60
3176 msgid "Need a repository to unbundle."
3177 msgstr "需要一个版本库来解包。"
3179 #: builtin/cat-file.c:328
3180 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3181 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3183 #: builtin/cat-file.c:329
3184 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3185 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3187 #: builtin/cat-file.c:366
3188 msgid "<type> can be one of: blob, tree, commit, tag"
3189 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3191 #: builtin/cat-file.c:367
3192 msgid "show object type"
3195 #: builtin/cat-file.c:368
3196 msgid "show object size"
3199 #: builtin/cat-file.c:370
3200 msgid "exit with zero when there's no error"
3201 msgstr "当没有错误时退出并返回零"
3203 #: builtin/cat-file.c:371
3204 msgid "pretty-print object's content"
3207 #: builtin/cat-file.c:373
3208 msgid "for blob objects, run textconv on object's content"
3209 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3211 #: builtin/cat-file.c:375
3212 msgid "show info and content of objects fed from the standard input"
3213 msgstr "显示从标准输入提供的对象的信息和内容"
3215 #: builtin/cat-file.c:378
3216 msgid "show info about objects fed from the standard input"
3217 msgstr "显示从标准输入提供的对象的信息"
3219 #: builtin/check-attr.c:11
3220 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3221 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3223 #: builtin/check-attr.c:12
3224 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3225 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3227 #: builtin/check-attr.c:19
3228 msgid "report all attributes set on file"
3229 msgstr "报告设置在文件上的所有属性"
3231 #: builtin/check-attr.c:20
3232 msgid "use .gitattributes only from the index"
3233 msgstr "只使用索引中的 .gitattributes"
3235 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
3236 msgid "read file names from stdin"
3239 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3240 msgid "terminate input and output records by a NUL character"
3241 msgstr "输入和输出的记录使用 NUL 字符终结"
3243 #: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
3244 msgid "suppress progress reporting"
3247 #: builtin/check-ignore.c:26
3248 msgid "show non-matching input paths"
3251 #: builtin/check-ignore.c:28
3252 msgid "ignore index when checking"
3255 #: builtin/check-ignore.c:154
3256 msgid "cannot specify pathnames with --stdin"
3257 msgstr "不能同时提供路径及 --stdin 参数"
3259 #: builtin/check-ignore.c:157
3260 msgid "-z only makes sense with --stdin"
3261 msgstr "-z 需要和 --stdin 参数共用才有意义"
3263 #: builtin/check-ignore.c:159
3264 msgid "no path specified"
3267 #: builtin/check-ignore.c:163
3268 msgid "--quiet is only valid with a single pathname"
3269 msgstr "参数 --quiet 只在提供一个路径名时有效"
3271 #: builtin/check-ignore.c:165
3272 msgid "cannot have both --quiet and --verbose"
3273 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3275 #: builtin/check-ignore.c:168
3276 msgid "--non-matching is only valid with --verbose"
3277 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3279 #: builtin/check-mailmap.c:8
3280 msgid "git check-mailmap [options] <contact>..."
3281 msgstr "git check-mailmap [选项] <联系地址>..."
3283 #: builtin/check-mailmap.c:13
3284 msgid "also read contacts from stdin"
3285 msgstr "还从标准输入读取联系地址"
3287 #: builtin/check-mailmap.c:24
3289 msgid "unable to parse contact: %s"
3290 msgstr "不能解析联系地址:%s"
3292 #: builtin/check-mailmap.c:47
3293 msgid "no contacts specified"
3296 #: builtin/checkout-index.c:126
3297 msgid "git checkout-index [options] [--] [<file>...]"
3298 msgstr "git checkout-index [选项] [--] [<文件>...]"
3300 #: builtin/checkout-index.c:188
3301 msgid "check out all files in the index"
3304 #: builtin/checkout-index.c:189
3305 msgid "force overwrite of existing files"
3308 #: builtin/checkout-index.c:191
3309 msgid "no warning for existing files and files not in index"
3310 msgstr "存在或不在索引中的文件都没有警告"
3312 #: builtin/checkout-index.c:193
3313 msgid "don't checkout new files"
3316 #: builtin/checkout-index.c:195
3317 msgid "update stat information in the index file"
3318 msgstr "更新索引中文件的状态信息"
3320 #: builtin/checkout-index.c:201
3321 msgid "read list of paths from the standard input"
3322 msgstr "从标准输入读取路径列表"
3324 #: builtin/checkout-index.c:203
3325 msgid "write the content to temporary files"
3328 #: builtin/checkout-index.c:204 builtin/column.c:30
3332 #: builtin/checkout-index.c:205
3333 msgid "when creating files, prepend <string>"
3334 msgstr "在创建文件时,在前面加上<字符串>"
3336 #: builtin/checkout-index.c:208
3337 msgid "copy out the files from named stage"
3338 msgstr "从指定暂存区中拷出文件"
3340 #: builtin/checkout.c:25
3341 msgid "git checkout [options] <branch>"
3342 msgstr "git checkout [选项] <分支>"
3344 #: builtin/checkout.c:26
3345 msgid "git checkout [options] [<branch>] -- <file>..."
3346 msgstr "git checkout [选项] [<分支>] -- <文件>..."
3348 #: builtin/checkout.c:132 builtin/checkout.c:165
3350 msgid "path '%s' does not have our version"
3351 msgstr "路径 '%s' 没有我们的版本"
3353 #: builtin/checkout.c:134 builtin/checkout.c:167
3355 msgid "path '%s' does not have their version"
3356 msgstr "路径 '%s' 没有他们的版本"
3358 #: builtin/checkout.c:150
3360 msgid "path '%s' does not have all necessary versions"
3361 msgstr "路径 '%s' 没有全部必须的版本"
3363 #: builtin/checkout.c:194
3365 msgid "path '%s' does not have necessary versions"
3366 msgstr "路径 '%s' 没有必须的版本"
3368 #: builtin/checkout.c:211
3370 msgid "path '%s': cannot merge"
3371 msgstr "path '%s':无法合并"
3373 #: builtin/checkout.c:228
3375 msgid "Unable to add merge result for '%s'"
3376 msgstr "无法为 '%s' 添加合并结果"
3378 #: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3379 #: builtin/checkout.c:258
3381 msgid "'%s' cannot be used with updating paths"
3382 msgstr "'%s' 不能在更新路径时使用"
3384 #: builtin/checkout.c:261 builtin/checkout.c:264
3386 msgid "'%s' cannot be used with %s"
3387 msgstr "'%s' 不能和 %s 同时使用"
3389 #: builtin/checkout.c:267
3391 msgid "Cannot update paths and switch to branch '%s' at the same time."
3392 msgstr "不能同时更新路径并切换到分支'%s'。"
3394 #: builtin/checkout.c:278 builtin/checkout.c:467
3395 msgid "corrupt index file"
3398 #: builtin/checkout.c:338 builtin/checkout.c:345
3400 msgid "path '%s' is unmerged"
3401 msgstr "路径 '%s' 未合并"
3403 #: builtin/checkout.c:489
3404 msgid "you need to resolve your current index first"
3405 msgstr "您需要先解决当前索引的冲突"
3407 #: builtin/checkout.c:615
3409 msgid "Can not do reflog for '%s'\n"
3410 msgstr "不能对 '%s' 执行 reflog 操作\n"
3412 #: builtin/checkout.c:653
3413 msgid "HEAD is now at"
3416 #: builtin/checkout.c:660
3418 msgid "Reset branch '%s'\n"
3419 msgstr "重置分支 '%s'\n"
3421 #: builtin/checkout.c:663
3423 msgid "Already on '%s'\n"
3424 msgstr "已经位于 '%s'\n"
3426 #: builtin/checkout.c:667
3428 msgid "Switched to and reset branch '%s'\n"
3429 msgstr "切换并重置分支 '%s'\n"
3431 #: builtin/checkout.c:669 builtin/checkout.c:1050
3433 msgid "Switched to a new branch '%s'\n"
3434 msgstr "切换到一个新分支 '%s'\n"
3436 #: builtin/checkout.c:671
3438 msgid "Switched to branch '%s'\n"
3439 msgstr "切换到分支 '%s'\n"
3442 #: builtin/checkout.c:723
3444 msgid " ... and %d more.\n"
3445 msgstr " ... 及其它 %d 个。\n"
3447 #: builtin/checkout.c:729
3450 "Warning: you are leaving %d commit behind, not connected to\n"
3451 "any of your branches:\n"
3455 "Warning: you are leaving %d commits behind, not connected to\n"
3456 "any of your branches:\n"
3460 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3464 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3468 #: builtin/checkout.c:747
3471 "If you want to keep them by creating a new branch, this may be a good time\n"
3474 " git branch new_branch_name %s\n"
3477 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3480 " git branch new_branch_name %s\n"
3483 #: builtin/checkout.c:777
3484 msgid "internal error in revision walk"
3485 msgstr "在版本遍历时遇到内部错误"
3487 #: builtin/checkout.c:781
3488 msgid "Previous HEAD position was"
3489 msgstr "之前的 HEAD 位置是"
3491 #: builtin/checkout.c:808 builtin/checkout.c:1045
3492 msgid "You are on a branch yet to be born"
3493 msgstr "您位于一个尚未初始化的分支"
3495 #: builtin/checkout.c:952
3497 msgid "only one reference expected, %d given."
3498 msgstr "只要一个引用,却给出了 %d 个"
3500 #: builtin/checkout.c:991
3502 msgid "invalid reference: %s"
3505 #: builtin/checkout.c:1020
3507 msgid "reference is not a tree: %s"
3510 #: builtin/checkout.c:1059
3511 msgid "paths cannot be used with switching branches"
3512 msgstr "路径不能和切换分支同时使用"
3514 #: builtin/checkout.c:1062 builtin/checkout.c:1066
3516 msgid "'%s' cannot be used with switching branches"
3517 msgstr "'%s' 不能和切换分支同时使用"
3519 #: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3520 #: builtin/checkout.c:1081
3522 msgid "'%s' cannot be used with '%s'"
3523 msgstr "'%s' 不能和 '%s' 同时使用"
3525 #: builtin/checkout.c:1086
3527 msgid "Cannot switch branch to a non-commit '%s'"
3528 msgstr "不能切换分支到一个非提交 '%s'"
3530 #: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
3531 #: builtin/remote.c:159 builtin/remote.c:161
3535 #: builtin/checkout.c:1109
3536 msgid "create and checkout a new branch"
3537 msgstr "创建并检出一个新的分支"
3539 #: builtin/checkout.c:1111
3540 msgid "create/reset and checkout a branch"
3541 msgstr "创建/重置并检出一个分支"
3543 #: builtin/checkout.c:1112
3544 msgid "create reflog for new branch"
3545 msgstr "为新的分支创建引用日志"
3547 #: builtin/checkout.c:1113
3548 msgid "detach the HEAD at named commit"
3549 msgstr "成为指向该提交的分离头指针"
3551 #: builtin/checkout.c:1114
3552 msgid "set upstream info for new branch"
3553 msgstr "为新的分支设置上游信息"
3555 #: builtin/checkout.c:1116
3559 #: builtin/checkout.c:1116
3560 msgid "new unparented branch"
3563 #: builtin/checkout.c:1117
3564 msgid "checkout our version for unmerged files"
3565 msgstr "对尚未合并的文件检出我们的版本"
3567 #: builtin/checkout.c:1119
3568 msgid "checkout their version for unmerged files"
3569 msgstr "对尚未合并的文件检出他们的版本"
3571 #: builtin/checkout.c:1121
3572 msgid "force checkout (throw away local modifications)"
3573 msgstr "强制检出(丢弃本地修改)"
3575 #: builtin/checkout.c:1122
3576 msgid "perform a 3-way merge with the new branch"
3577 msgstr "和新的分支执行三路合并"
3579 #: builtin/checkout.c:1123 builtin/merge.c:227
3580 msgid "update ignored files (default)"
3581 msgstr "更新忽略的文件(默认)"
3583 #: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
3587 #: builtin/checkout.c:1125
3588 msgid "conflict style (merge or diff3)"
3589 msgstr "冲突输出风格(merge 或 diff3)"
3591 #: builtin/checkout.c:1128
3592 msgid "do not limit pathspecs to sparse entries only"
3593 msgstr "对路径不做稀疏检出的限制"
3595 #: builtin/checkout.c:1130
3596 msgid "second guess 'git checkout no-such-branch'"
3597 msgstr "再者猜测'git checkout no-such-branch'"
3599 #: builtin/checkout.c:1153
3600 msgid "-b, -B and --orphan are mutually exclusive"
3601 msgstr "-b、-B 和 --orphan 是互斥的"
3603 #: builtin/checkout.c:1170
3604 msgid "--track needs a branch name"
3605 msgstr "--track 需要一个分支名"
3607 #: builtin/checkout.c:1175
3608 msgid "Missing branch name; try -b"
3609 msgstr "缺少分支名;尝试 -b"
3611 #: builtin/checkout.c:1212
3612 msgid "invalid path specification"
3615 #: builtin/checkout.c:1219
3618 "Cannot update paths and switch to branch '%s' at the same time.\n"
3619 "Did you intend to checkout '%s' which can not be resolved as commit?"
3621 "不能同时更新路径并切换到分支'%s'。\n"
3622 "您是想要检出 '%s' 但其未能解析为提交么?"
3624 #: builtin/checkout.c:1224
3626 msgid "git checkout: --detach does not take a path argument '%s'"
3627 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3629 #: builtin/checkout.c:1228
3631 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3632 "checking out of the index."
3634 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3636 #: builtin/clean.c:26
3638 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3640 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3642 #: builtin/clean.c:30
3644 msgid "Removing %s\n"
3647 #: builtin/clean.c:31
3649 msgid "Would remove %s\n"
3652 #: builtin/clean.c:32
3654 msgid "Skipping repository %s\n"
3657 #: builtin/clean.c:33
3659 msgid "Would skip repository %s\n"
3660 msgstr "将忽略版本库 %s\n"
3662 #: builtin/clean.c:34
3664 msgid "failed to remove %s"
3667 #: builtin/clean.c:295
3670 "1 - select a numbered item\n"
3671 "foo - select item based on unique prefix\n"
3672 " - (empty) select nothing"
3676 "foo - 通过标题选择一个选项\n"
3679 #: builtin/clean.c:299
3682 "1 - select a single item\n"
3683 "3-5 - select a range of items\n"
3684 "2-3,6-9 - select multiple ranges\n"
3685 "foo - select item based on unique prefix\n"
3686 "-... - unselect specified items\n"
3687 "* - choose all items\n"
3688 " - (empty) finish selecting"
3692 "3-5 - 选择一个范围内的所有选项\n"
3693 "2-3,6-9 - 选择多个范围内的所有选项\n"
3694 "foo - 通过标题选择一个选项\n"
3699 #: builtin/clean.c:517
3704 #: builtin/clean.c:659
3706 msgid "Input ignore patterns>> "
3707 msgstr "输入模版以排除条目>> "
3709 #: builtin/clean.c:696
3711 msgid "WARNING: Cannot find items matched by: %s"
3712 msgstr "警告:无法找到和 %s 匹配的条目"
3714 #: builtin/clean.c:717
3715 msgid "Select items to delete"
3718 #: builtin/clean.c:757
3723 #: builtin/clean.c:782
3727 #: builtin/clean.c:790
3729 "clean - start cleaning\n"
3730 "filter by pattern - exclude items from deletion\n"
3731 "select by numbers - select items to be deleted by numbers\n"
3732 "ask each - confirm each deletion (like \"rm -i\")\n"
3733 "quit - stop cleaning\n"
3734 "help - this screen\n"
3735 "? - help for prompt selection"
3738 "filter by pattern - 通过模版排除要删除的条目\n"
3739 "select by numbers - 通过数字选择要删除的条目\n"
3740 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3743 "? - 显示如何在提示符下选择的帮助"
3745 #: builtin/clean.c:817
3746 msgid "*** Commands ***"
3749 #: builtin/clean.c:818
3753 #: builtin/clean.c:826
3754 msgid "Would remove the following item:"
3755 msgid_plural "Would remove the following items:"
3756 msgstr[0] "将删除如下条目:"
3757 msgstr[1] "将删除如下条目:"
3759 #: builtin/clean.c:843
3760 msgid "No more files to clean, exiting."
3761 msgstr "没有要清理的文件,退出。"
3763 #: builtin/clean.c:874
3764 msgid "do not print names of files removed"
3767 #: builtin/clean.c:876
3771 #: builtin/clean.c:877
3772 msgid "interactive cleaning"
3775 #: builtin/clean.c:879
3776 msgid "remove whole directories"
3779 #: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
3780 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3784 #: builtin/clean.c:881
3785 msgid "add <pattern> to ignore rules"
3786 msgstr "添加<模式>到忽略规则"
3788 #: builtin/clean.c:882
3789 msgid "remove ignored files, too"
3792 #: builtin/clean.c:884
3793 msgid "remove only ignored files"
3796 #: builtin/clean.c:902
3797 msgid "-x and -X cannot be used together"
3798 msgstr "-x 和 -X 不能同时使用"
3800 #: builtin/clean.c:906
3802 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3805 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3807 #: builtin/clean.c:909
3809 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3812 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3814 #: builtin/clone.c:37
3815 msgid "git clone [options] [--] <repo> [<dir>]"
3816 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3818 #: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
3819 #: builtin/push.c:514
3820 msgid "force progress reporting"
3823 #: builtin/clone.c:68
3824 msgid "don't create a checkout"
3827 #: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
3828 msgid "create a bare repository"
3831 #: builtin/clone.c:73
3832 msgid "create a mirror repository (implies bare)"
3833 msgstr "创建一个镜像版本库(也是纯版本库)"
3835 #: builtin/clone.c:75
3836 msgid "to clone from a local repository"
3839 #: builtin/clone.c:77
3840 msgid "don't use local hardlinks, always copy"
3841 msgstr "不使用本地硬链接,始终复制"
3843 #: builtin/clone.c:79
3844 msgid "setup as shared repository"
3847 #: builtin/clone.c:81 builtin/clone.c:83
3848 msgid "initialize submodules in the clone"
3851 #: builtin/clone.c:84 builtin/init-db.c:493
3852 msgid "template-directory"
3855 #: builtin/clone.c:85 builtin/init-db.c:494
3856 msgid "directory from which templates will be used"
3859 #: builtin/clone.c:87
3860 msgid "reference repository"
3863 #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3867 #: builtin/clone.c:89
3868 msgid "use <name> instead of 'origin' to track upstream"
3869 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3871 #: builtin/clone.c:91
3872 msgid "checkout <branch> instead of the remote's HEAD"
3873 msgstr "检出<分支>而不是远程HEAD"
3875 #: builtin/clone.c:93
3876 msgid "path to git-upload-pack on the remote"
3877 msgstr "远程 git-upload-pack 路径"
3879 #: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
3883 #: builtin/clone.c:95
3884 msgid "create a shallow clone of that depth"
3885 msgstr "创建一个指定深度的浅克隆"
3887 #: builtin/clone.c:97
3888 msgid "clone only one branch, HEAD or --branch"
3889 msgstr "只克隆一个分支、HEAD 或 --branch"
3891 #: builtin/clone.c:99
3892 msgid "use --reference only while cloning"
3893 msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3895 #: builtin/clone.c:100 builtin/init-db.c:502
3899 #: builtin/clone.c:101 builtin/init-db.c:503
3900 msgid "separate git dir from working tree"
3901 msgstr "git目录和工作区分离"
3903 #: builtin/clone.c:102
3907 #: builtin/clone.c:103
3908 msgid "set config inside the new repository"
3909 msgstr "在新版本库中设置配置信息"
3911 #: builtin/clone.c:256
3913 msgid "reference repository '%s' is not a local repository."
3914 msgstr "参考版本库 '%s' 不是一个本地版本库。"
3916 #: builtin/clone.c:260
3918 msgid "reference repository '%s' is shallow"
3919 msgstr "参考版本库 '%s' 是一个浅克隆"
3921 #: builtin/clone.c:263
3923 msgid "reference repository '%s' is grafted"
3924 msgstr "参考版本库 '%s' 已被嫁接"
3926 #: builtin/clone.c:325
3928 msgid "failed to create directory '%s'"
3929 msgstr "无法创建目录 '%s'"
3931 #: builtin/clone.c:327 builtin/diff.c:84
3933 msgid "failed to stat '%s'"
3934 msgstr "无法枚举 '%s' 状态"
3936 #: builtin/clone.c:329
3938 msgid "%s exists and is not a directory"
3939 msgstr "%s 存在且不是一个目录"
3941 #: builtin/clone.c:343
3943 msgid "failed to stat %s\n"
3944 msgstr "无法枚举 %s 状态\n"
3946 #: builtin/clone.c:365
3948 msgid "failed to create link '%s'"
3949 msgstr "无法创建链接 '%s'"
3951 #: builtin/clone.c:369
3953 msgid "failed to copy file to '%s'"
3954 msgstr "无法拷贝文件至 '%s'"
3956 #: builtin/clone.c:392 builtin/clone.c:566
3961 #: builtin/clone.c:404
3963 "Clone succeeded, but checkout failed.\n"
3964 "You can inspect what was checked out with 'git status'\n"
3965 "and retry the checkout with 'git checkout -f HEAD'\n"
3968 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3969 "'git checkout -f HEAD' 重试\n"
3971 #: builtin/clone.c:481
3973 msgid "Could not find remote branch %s to clone."
3974 msgstr "不能发现要克隆的远程分支 %s。"
3976 #: builtin/clone.c:561
3978 msgid "Checking connectivity... "
3981 #: builtin/clone.c:564
3982 msgid "remote did not send all necessary objects"
3983 msgstr "远程没有发送所有必须的对象"
3985 #: builtin/clone.c:628
3986 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3987 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3989 #: builtin/clone.c:659
3990 msgid "unable to checkout working tree"
3993 #: builtin/clone.c:746
3994 msgid "cannot repack to clean up"
3995 msgstr "无法执行 repack 来清理"
3997 #: builtin/clone.c:748
3998 msgid "cannot unlink temporary alternates file"
3999 msgstr "无法删除临时的 alternates 文件"
4001 #: builtin/clone.c:778
4002 msgid "Too many arguments."
4005 #: builtin/clone.c:782
4006 msgid "You must specify a repository to clone."
4007 msgstr "您必须指定一个版本库来克隆。"
4009 #: builtin/clone.c:793
4011 msgid "--bare and --origin %s options are incompatible."
4012 msgstr "--bare 和 --origin %s 选项不兼容。"
4014 #: builtin/clone.c:796
4015 msgid "--bare and --separate-git-dir are incompatible."
4016 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4018 #: builtin/clone.c:809
4020 msgid "repository '%s' does not exist"
4021 msgstr "版本库 '%s' 不存在"
4023 #: builtin/clone.c:815 builtin/fetch.c:1155
4025 msgid "depth %s is not a positive number"
4026 msgstr "深度 %s 不是一个正数"
4028 #: builtin/clone.c:825
4030 msgid "destination path '%s' already exists and is not an empty directory."
4031 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4033 #: builtin/clone.c:835
4035 msgid "working tree '%s' already exists."
4036 msgstr "工作区 '%s' 已经存在。"
4038 #: builtin/clone.c:848 builtin/clone.c:860
4040 msgid "could not create leading directories of '%s'"
4041 msgstr "不能为 '%s' 创建先导目录"
4043 #: builtin/clone.c:851
4045 msgid "could not create work tree dir '%s'."
4046 msgstr "不能为 '%s' 创建工作区目录。"
4048 #: builtin/clone.c:870
4050 msgid "Cloning into bare repository '%s'...\n"
4051 msgstr "克隆到纯版本库 '%s'...\n"
4053 #: builtin/clone.c:872
4055 msgid "Cloning into '%s'...\n"
4056 msgstr "正克隆到 '%s'...\n"
4058 #: builtin/clone.c:897
4059 msgid "--dissociate given, but there is no --reference"
4060 msgstr "提供了参数 --dissociate,但未提供 --reference"
4062 #: builtin/clone.c:912
4063 msgid "--depth is ignored in local clones; use file:// instead."
4064 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4066 #: builtin/clone.c:915
4067 msgid "source repository is shallow, ignoring --local"
4068 msgstr "源版本库是浅克隆,忽略 --local"
4070 #: builtin/clone.c:920
4071 msgid "--local is ignored"
4072 msgstr "--local 被忽略"
4074 #: builtin/clone.c:924
4076 msgid "Don't know how to clone %s"
4079 #: builtin/clone.c:975 builtin/clone.c:983
4081 msgid "Remote branch %s not found in upstream %s"
4082 msgstr "远程分支 %s 在上游 %s 未发现"
4084 #: builtin/clone.c:986
4085 msgid "You appear to have cloned an empty repository."
4086 msgstr "您似乎克隆了一个空版本库。"
4088 #: builtin/column.c:9
4089 msgid "git column [options]"
4090 msgstr "git column [选项]"
4092 #: builtin/column.c:26
4093 msgid "lookup config vars"
4096 #: builtin/column.c:27 builtin/column.c:28
4097 msgid "layout to use"
4100 #: builtin/column.c:29
4101 msgid "Maximum width"
4104 #: builtin/column.c:30
4105 msgid "Padding space on left border"
4108 #: builtin/column.c:31
4109 msgid "Padding space on right border"
4112 #: builtin/column.c:32
4113 msgid "Padding space between columns"
4116 #: builtin/column.c:51
4117 msgid "--command must be the first argument"
4118 msgstr "--command 必须是第一个参数"
4120 #: builtin/commit.c:37
4121 msgid "git commit [options] [--] <pathspec>..."
4122 msgstr "git commit [选项] [--] <路径规则>..."
4124 #: builtin/commit.c:42
4125 msgid "git status [options] [--] <pathspec>..."
4126 msgstr "git status [选项] [--] <路径规则>..."
4128 #: builtin/commit.c:47
4130 "Your name and email address were configured automatically based\n"
4131 "on your username and hostname. Please check that they are accurate.\n"
4132 "You can suppress this message by setting them explicitly. Run the\n"
4133 "following command and follow the instructions in your editor to edit\n"
4134 "your configuration file:\n"
4136 " git config --global --edit\n"
4138 "After doing this, you may fix the identity used for this commit with:\n"
4140 " git commit --amend --reset-author\n"
4142 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4143 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4146 " git config --global --edit\n"
4148 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4150 " git commit --amend --reset-author\n"
4152 #: builtin/commit.c:60
4154 "Your name and email address were configured automatically based\n"
4155 "on your username and hostname. Please check that they are accurate.\n"
4156 "You can suppress this message by setting them explicitly:\n"
4158 " git config --global user.name \"Your Name\"\n"
4159 " git config --global user.email you@example.com\n"
4161 "After doing this, you may fix the identity used for this commit with:\n"
4163 " git commit --amend --reset-author\n"
4165 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4166 "与否。您可以对其进行设置以免再出现本提示信息:\n"
4168 " git config --global user.name \"Your Name\"\n"
4169 " git config --global user.email you@example.com\n"
4171 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4173 " git commit --amend --reset-author\n"
4175 #: builtin/commit.c:72
4177 "You asked to amend the most recent commit, but doing so would make\n"
4178 "it empty. You can repeat your command with --allow-empty, or you can\n"
4179 "remove the commit entirely with \"git reset HEAD^\".\n"
4181 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4182 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4184 #: builtin/commit.c:77
4186 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4187 "If you wish to commit it anyway, use:\n"
4189 " git commit --allow-empty\n"
4192 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4195 " git commit --allow-empty\n"
4198 #: builtin/commit.c:84
4199 msgid "Otherwise, please use 'git reset'\n"
4200 msgstr "否则,请使用命令 'git reset'\n"
4202 #: builtin/commit.c:87
4204 "If you wish to skip this commit, use:\n"
4208 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4209 "the remaining commits.\n"
4211 "如果您想跳过这个提交,使用命令:\n"
4215 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4218 #: builtin/commit.c:302
4219 msgid "failed to unpack HEAD tree object"
4220 msgstr "无法解包 HEAD 树对象"
4222 #: builtin/commit.c:342
4223 msgid "unable to create temporary index"
4226 #: builtin/commit.c:348
4227 msgid "interactive add failed"
4230 #: builtin/commit.c:359
4231 msgid "unable to write index file"
4234 #: builtin/commit.c:361
4235 msgid "unable to update temporary index"
4238 #: builtin/commit.c:363
4239 msgid "Failed to update main cache tree"
4242 #: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4243 msgid "unable to write new_index file"
4244 msgstr "无法写 new_index 文件"
4246 #: builtin/commit.c:443
4247 msgid "cannot do a partial commit during a merge."
4248 msgstr "在合并过程中不能做部分提交。"
4250 #: builtin/commit.c:445
4251 msgid "cannot do a partial commit during a cherry-pick."
4252 msgstr "在拣选过程中不能做部分提交。"
4254 #: builtin/commit.c:454
4255 msgid "cannot read the index"
4258 #: builtin/commit.c:473
4259 msgid "unable to write temporary index file"
4262 #: builtin/commit.c:584
4264 msgid "commit '%s' lacks author header"
4265 msgstr "提交 '%s' 缺少作者信息"
4267 #: builtin/commit.c:586
4269 msgid "commit '%s' has malformed author line"
4270 msgstr "提交 '%s' 有非法的作者信息"
4272 #: builtin/commit.c:605
4273 msgid "malformed --author parameter"
4274 msgstr "非法的 --author 参数"
4276 #: builtin/commit.c:613
4278 msgid "invalid date format: %s"
4281 #: builtin/commit.c:657
4283 "unable to select a comment character that is not used\n"
4284 "in the current commit message"
4285 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4287 #: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
4289 msgid "could not lookup commit %s"
4292 #: builtin/commit.c:706 builtin/shortlog.c:273
4294 msgid "(reading log message from standard input)\n"
4295 msgstr "(正从标准输入中读取日志信息)\n"
4297 #: builtin/commit.c:708
4298 msgid "could not read log from standard input"
4299 msgstr "不能从标准输入中读取日志信息"
4301 #: builtin/commit.c:712
4303 msgid "could not read log file '%s'"
4304 msgstr "不能读取日志文件 '%s'"
4306 #: builtin/commit.c:734
4307 msgid "could not read MERGE_MSG"
4308 msgstr "不能读取 MERGE_MSG"
4310 #: builtin/commit.c:738
4311 msgid "could not read SQUASH_MSG"
4312 msgstr "不能读取 SQUASH_MSG"
4314 #: builtin/commit.c:742
4316 msgid "could not read '%s'"
4319 #: builtin/commit.c:789
4320 msgid "could not write commit template"
4323 #: builtin/commit.c:807
4327 "It looks like you may be committing a merge.\n"
4328 "If this is not correct, please remove the file\n"
4333 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4337 #: builtin/commit.c:812
4341 "It looks like you may be committing a cherry-pick.\n"
4342 "If this is not correct, please remove the file\n"
4347 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4351 #: builtin/commit.c:825
4354 "Please enter the commit message for your changes. Lines starting\n"
4355 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4357 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4360 #: builtin/commit.c:832
4363 "Please enter the commit message for your changes. Lines starting\n"
4364 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4365 "An empty message aborts the commit.\n"
4367 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4368 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4370 # 译者:为保证在输出中对齐,注意调整句中空格!
4371 #: builtin/commit.c:852
4373 msgid "%sAuthor: %.*s <%.*s>"
4374 msgstr "%s作者: %.*s <%.*s>"
4376 # 译者:为保证在输出中对齐,注意调整句中空格!
4377 #: builtin/commit.c:860
4382 # 译者:为保证在输出中对齐,注意调整句中空格!
4383 #: builtin/commit.c:867
4385 msgid "%sCommitter: %.*s <%.*s>"
4386 msgstr "%s提交者:%.*s <%.*s>"
4388 #: builtin/commit.c:885
4389 msgid "Cannot read index"
4392 #: builtin/commit.c:942
4393 msgid "Error building trees"
4396 #: builtin/commit.c:957 builtin/tag.c:495
4398 msgid "Please supply the message using either -m or -F option.\n"
4399 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4401 #: builtin/commit.c:1059
4403 msgid "No existing author found with '%s'"
4404 msgstr "没有找到匹配 '%s' 的作者"
4406 #: builtin/commit.c:1074 builtin/commit.c:1314
4408 msgid "Invalid untracked files mode '%s'"
4409 msgstr "无效的未追踪文件参数 '%s'"
4411 #: builtin/commit.c:1111
4412 msgid "--long and -z are incompatible"
4413 msgstr "--long 和 -z 选项不兼容"
4415 #: builtin/commit.c:1141
4416 msgid "Using both --reset-author and --author does not make sense"
4417 msgstr "同时使用 --reset-author 和 --author 没有意义"
4419 #: builtin/commit.c:1150
4420 msgid "You have nothing to amend."
4423 #: builtin/commit.c:1153
4424 msgid "You are in the middle of a merge -- cannot amend."
4425 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4427 #: builtin/commit.c:1155
4428 msgid "You are in the middle of a cherry-pick -- cannot amend."
4429 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4431 #: builtin/commit.c:1158
4432 msgid "Options --squash and --fixup cannot be used together"
4433 msgstr "选项 --squash 和 --fixup 不能同时使用"
4435 #: builtin/commit.c:1168
4436 msgid "Only one of -c/-C/-F/--fixup can be used."
4437 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4439 #: builtin/commit.c:1170
4440 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4441 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4443 #: builtin/commit.c:1178
4444 msgid "--reset-author can be used only with -C, -c or --amend."
4445 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4447 #: builtin/commit.c:1195
4448 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4449 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4451 #: builtin/commit.c:1197
4452 msgid "No paths with --include/--only does not make sense."
4453 msgstr "参数 --include/--only 不跟路径没有意义。"
4455 #: builtin/commit.c:1199
4456 msgid "Clever... amending the last one with dirty index."
4457 msgstr "聪明... 在索引不干净下修补最后的提交。"
4459 #: builtin/commit.c:1201
4460 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4461 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4463 #: builtin/commit.c:1213 builtin/tag.c:728
4465 msgid "Invalid cleanup mode %s"
4468 #: builtin/commit.c:1218
4469 msgid "Paths with -a does not make sense."
4470 msgstr "路径和 -a 选项同时使用没有意义。"
4472 #: builtin/commit.c:1328 builtin/commit.c:1608
4473 msgid "show status concisely"
4476 #: builtin/commit.c:1330 builtin/commit.c:1610
4477 msgid "show branch information"
4480 #: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
4481 msgid "machine-readable output"
4484 #: builtin/commit.c:1335 builtin/commit.c:1614
4485 msgid "show status in long format (default)"
4486 msgstr "以长格式显示状态(默认)"
4488 #: builtin/commit.c:1338 builtin/commit.c:1617
4489 msgid "terminate entries with NUL"
4492 #: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
4493 #: builtin/fast-export.c:983 builtin/tag.c:603
4497 #: builtin/commit.c:1341 builtin/commit.c:1620
4498 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4499 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4501 #: builtin/commit.c:1344
4502 msgid "show ignored files"
4505 #: builtin/commit.c:1345 parse-options.h:153
4509 #: builtin/commit.c:1346
4511 "ignore changes to submodules, optional when: all, dirty, untracked. "
4514 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4516 #: builtin/commit.c:1348
4517 msgid "list untracked files in columns"
4518 msgstr "以列的方式显示未跟踪的文件"
4520 #: builtin/commit.c:1435
4521 msgid "couldn't look up newly created commit"
4524 #: builtin/commit.c:1437
4525 msgid "could not parse newly created commit"
4528 #: builtin/commit.c:1482
4529 msgid "detached HEAD"
4532 # 译者:中文字符串拼接,可删除前导空格
4533 #: builtin/commit.c:1485
4534 msgid " (root-commit)"
4537 #: builtin/commit.c:1578
4538 msgid "suppress summary after successful commit"
4539 msgstr "提交成功后不显示概述信息"
4541 #: builtin/commit.c:1579
4542 msgid "show diff in commit message template"
4543 msgstr "在提交说明模板里显示差异"
4545 #: builtin/commit.c:1581
4546 msgid "Commit message options"
4549 #: builtin/commit.c:1582 builtin/tag.c:601
4550 msgid "read message from file"
4553 #: builtin/commit.c:1583
4557 #: builtin/commit.c:1583
4558 msgid "override author for commit"
4561 #: builtin/commit.c:1584 builtin/gc.c:275
4565 #: builtin/commit.c:1584
4566 msgid "override date for commit"
4569 #: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
4570 #: builtin/notes.c:554 builtin/tag.c:599
4574 #: builtin/commit.c:1585
4575 msgid "commit message"
4578 #: builtin/commit.c:1586
4579 msgid "reuse and edit message from specified commit"
4580 msgstr "重用并编辑指定提交的提交说明"
4582 #: builtin/commit.c:1587
4583 msgid "reuse message from specified commit"
4584 msgstr "重用指定提交的提交说明"
4586 #: builtin/commit.c:1588
4587 msgid "use autosquash formatted message to fixup specified commit"
4588 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4590 #: builtin/commit.c:1589
4591 msgid "use autosquash formatted message to squash specified commit"
4592 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4594 #: builtin/commit.c:1590
4595 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4596 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4598 #: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86
4599 msgid "add Signed-off-by:"
4600 msgstr "添加 Signed-off-by: 签名"
4602 #: builtin/commit.c:1592
4603 msgid "use specified template file"
4606 #: builtin/commit.c:1593
4607 msgid "force edit of commit"
4610 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4611 #: builtin/commit.c:1594
4615 #: builtin/commit.c:1594 builtin/tag.c:604
4616 msgid "how to strip spaces and #comments from message"
4617 msgstr "设置如何删除提交说明里的空格和#注释"
4619 #: builtin/commit.c:1595
4620 msgid "include status in commit message template"
4621 msgstr "在提交说明模板里包含状态信息"
4623 #: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
4624 #: builtin/tag.c:605
4628 #: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
4629 msgid "GPG sign commit"
4632 #: builtin/commit.c:1600
4633 msgid "Commit contents options"
4636 #: builtin/commit.c:1601
4637 msgid "commit all changed files"
4640 #: builtin/commit.c:1602
4641 msgid "add specified files to index for commit"
4642 msgstr "添加指定的文件到索引区等待提交"
4644 #: builtin/commit.c:1603
4645 msgid "interactively add files"
4648 #: builtin/commit.c:1604
4649 msgid "interactively add changes"
4652 #: builtin/commit.c:1605
4653 msgid "commit only specified files"
4656 #: builtin/commit.c:1606
4657 msgid "bypass pre-commit hook"
4658 msgstr "绕过 pre-commit 钩子"
4660 #: builtin/commit.c:1607
4661 msgid "show what would be committed"
4664 #: builtin/commit.c:1618
4665 msgid "amend previous commit"
4668 #: builtin/commit.c:1619
4669 msgid "bypass post-rewrite hook"
4670 msgstr "绕过 post-rewrite 钩子"
4672 #: builtin/commit.c:1624
4673 msgid "ok to record an empty change"
4676 #: builtin/commit.c:1626
4677 msgid "ok to record a change with an empty message"
4680 #: builtin/commit.c:1655
4681 msgid "could not parse HEAD commit"
4682 msgstr "不能解析 HEAD 提交"
4684 #: builtin/commit.c:1694 builtin/merge.c:519
4686 msgid "could not open '%s' for reading"
4687 msgstr "不能为读入打开 '%s'"
4689 #: builtin/commit.c:1701
4691 msgid "Corrupt MERGE_HEAD file (%s)"
4692 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4694 #: builtin/commit.c:1708
4695 msgid "could not read MERGE_MODE"
4696 msgstr "不能读取 MERGE_MODE"
4698 #: builtin/commit.c:1727
4700 msgid "could not read commit message: %s"
4701 msgstr "不能读取提交说明:%s"
4703 #: builtin/commit.c:1738
4705 msgid "Aborting commit; you did not edit the message.\n"
4706 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4708 #: builtin/commit.c:1743
4710 msgid "Aborting commit due to empty commit message.\n"
4711 msgstr "终止提交因为提交说明为空。\n"
4713 #: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
4714 msgid "failed to write commit object"
4717 #: builtin/commit.c:1791
4719 "Repository has been updated, but unable to write\n"
4720 "new_index file. Check that disk is not full and quota is\n"
4721 "not exceeded, and then \"git reset HEAD\" to recover."
4723 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4724 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4726 #: builtin/config.c:8
4727 msgid "git config [options]"
4728 msgstr "git config [选项]"
4730 #: builtin/config.c:53
4731 msgid "Config file location"
4734 #: builtin/config.c:54
4735 msgid "use global config file"
4738 #: builtin/config.c:55
4739 msgid "use system config file"
4742 #: builtin/config.c:56
4743 msgid "use repository config file"
4746 #: builtin/config.c:57
4747 msgid "use given config file"
4750 #: builtin/config.c:58
4754 #: builtin/config.c:58
4755 msgid "read config from given blob object"
4756 msgstr "从给定的数据对象读取配置"
4758 #: builtin/config.c:59
4762 #: builtin/config.c:60
4763 msgid "get value: name [value-regex]"
4764 msgstr "获取值:name [value-regex]"
4766 #: builtin/config.c:61
4767 msgid "get all values: key [value-regex]"
4768 msgstr "获得所有的值:key [value-regex]"
4770 #: builtin/config.c:62
4771 msgid "get values for regexp: name-regex [value-regex]"
4772 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4774 #: builtin/config.c:63
4775 msgid "get value specific for the URL: section[.var] URL"
4776 msgstr "获得 URL 取值:section[.var] URL"
4778 #: builtin/config.c:64
4779 msgid "replace all matching variables: name value [value_regex]"
4780 msgstr "替换所有匹配的变量:name value [value_regex]"
4782 #: builtin/config.c:65
4783 msgid "add a new variable: name value"
4784 msgstr "添加一个新的变量:name value"
4786 #: builtin/config.c:66
4787 msgid "remove a variable: name [value-regex]"
4788 msgstr "删除一个变量:name [value-regex]"
4790 #: builtin/config.c:67
4791 msgid "remove all matches: name [value-regex]"
4792 msgstr "删除所有匹配项:name [value-regex]"
4794 #: builtin/config.c:68
4795 msgid "rename section: old-name new-name"
4796 msgstr "重命名小节:old-name new-name"
4798 #: builtin/config.c:69
4799 msgid "remove a section: name"
4800 msgstr "删除一个小节:name"
4802 #: builtin/config.c:70
4806 #: builtin/config.c:71
4807 msgid "open an editor"
4810 #: builtin/config.c:72
4811 msgid "find the color configured: slot [default]"
4812 msgstr "获得配置的颜色:配置 [默认]"
4814 #: builtin/config.c:73
4815 msgid "find the color setting: slot [stdout-is-tty]"
4816 msgstr "获得颜色设置:配置 [stdout-is-tty]"
4818 #: builtin/config.c:74
4822 #: builtin/config.c:75
4823 msgid "value is \"true\" or \"false\""
4824 msgstr "值是 \"true\" 或 \"false\""
4826 #: builtin/config.c:76
4827 msgid "value is decimal number"
4830 #: builtin/config.c:77
4831 msgid "value is --bool or --int"
4832 msgstr "值是 --bool or --int"
4834 #: builtin/config.c:78
4835 msgid "value is a path (file or directory name)"
4836 msgstr "值是一个路径(文件或目录名)"
4838 #: builtin/config.c:79
4842 #: builtin/config.c:80
4843 msgid "terminate values with NUL byte"
4846 #: builtin/config.c:81
4847 msgid "respect include directives on lookup"
4848 msgstr "查询时参照 include 指令递归查找"
4850 #: builtin/config.c:316
4851 msgid "unable to parse default color value"
4854 #: builtin/config.c:457
4857 "# This is Git's per-user configuration file.\n"
4859 "# Please adapt and uncomment the following lines:\n"
4863 "# This is Git's per-user configuration file.\n"
4865 "# Please adapt and uncomment the following lines:\n"
4869 #: builtin/config.c:589
4871 msgid "cannot create configuration file %s"
4872 msgstr "不能创建配置文件 %s"
4874 #: builtin/count-objects.c:55
4875 msgid "git count-objects [-v] [-H | --human-readable]"
4876 msgstr "git count-objects [-v] [-H | --human-readable]"
4878 #: builtin/count-objects.c:65
4879 msgid "print sizes in human readable format"
4880 msgstr "以用户可读的格式显示大小"
4882 #: builtin/describe.c:17
4883 msgid "git describe [options] <commit-ish>*"
4884 msgstr "git describe [选项] <提交号>*"
4886 #: builtin/describe.c:18
4887 msgid "git describe [options] --dirty"
4888 msgstr "git describe [选项] --dirty"
4890 #: builtin/describe.c:217
4892 msgid "annotated tag %s not available"
4893 msgstr "注释 tag %s 无效"
4895 #: builtin/describe.c:221
4897 msgid "annotated tag %s has no embedded name"
4898 msgstr "注释 tag %s 没有嵌入名称"
4900 #: builtin/describe.c:223
4902 msgid "tag '%s' is really '%s' here"
4903 msgstr "tag '%s' 的确是在 '%s'"
4905 #: builtin/describe.c:250 builtin/log.c:452
4907 msgid "Not a valid object name %s"
4908 msgstr "不是一个有效的对象名 %s"
4910 #: builtin/describe.c:253
4912 msgid "%s is not a valid '%s' object"
4913 msgstr "%s 不是一个有效的 '%s' 对象"
4915 #: builtin/describe.c:270
4917 msgid "no tag exactly matches '%s'"
4918 msgstr "没有 tag 准确匹配 '%s'"
4920 #: builtin/describe.c:272
4922 msgid "searching to describe %s\n"
4925 #: builtin/describe.c:319
4927 msgid "finished search at %s\n"
4930 #: builtin/describe.c:346
4933 "No annotated tags can describe '%s'.\n"
4934 "However, there were unannotated tags: try --tags."
4936 "没有注释 tag 能描述 '%s'。\n"
4937 "然而,有非注释 tag:尝试 --tags。"
4939 #: builtin/describe.c:350
4942 "No tags can describe '%s'.\n"
4943 "Try --always, or create some tags."
4945 "没有注释 tag 能描述 '%s'。\n"
4946 "尝试 --always,或者创建一些 tag。"
4948 #: builtin/describe.c:371
4950 msgid "traversed %lu commits\n"
4951 msgstr "已遍历 %lu 个提交\n"
4953 #: builtin/describe.c:374
4956 "more than %i tags found; listed %i most recent\n"
4957 "gave up search at %s\n"
4959 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4962 #: builtin/describe.c:396
4963 msgid "find the tag that comes after the commit"
4964 msgstr "寻找提交之后的 tag(用于描述提交)"
4966 #: builtin/describe.c:397
4967 msgid "debug search strategy on stderr"
4968 msgstr "在标准错误上调试搜索策略"
4970 #: builtin/describe.c:398
4974 #: builtin/describe.c:399
4975 msgid "use any tag, even unannotated"
4976 msgstr "使用任意 tag,即使未带注解"
4978 #: builtin/describe.c:400
4979 msgid "always use long format"
4982 #: builtin/describe.c:401
4983 msgid "only follow first parent"
4986 #: builtin/describe.c:404
4987 msgid "only output exact matches"
4990 #: builtin/describe.c:406
4991 msgid "consider <n> most recent tags (default: 10)"
4992 msgstr "考虑最近 <n> 个 tags(默认:10)"
4994 #: builtin/describe.c:408
4995 msgid "only consider tags matching <pattern>"
4996 msgstr "只考虑匹配 <模式> 的 tags"
4998 #: builtin/describe.c:410 builtin/name-rev.c:318
4999 msgid "show abbreviated commit object as fallback"
5000 msgstr "显示简写的提交号作为后备"
5002 #: builtin/describe.c:411
5006 #: builtin/describe.c:412
5007 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5008 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
5010 #: builtin/describe.c:430
5011 msgid "--long is incompatible with --abbrev=0"
5012 msgstr "--long 与 --abbrev=0 不兼容"
5014 #: builtin/describe.c:456
5015 msgid "No names found, cannot describe anything."
5016 msgstr "没有发现名称,无法描述任何东西。"
5018 #: builtin/describe.c:476
5019 msgid "--dirty is incompatible with commit-ishes"
5020 msgstr "--dirty 不能与提交同时使用"
5022 #: builtin/diff.c:86
5024 msgid "'%s': not a regular file or symlink"
5025 msgstr "'%s':不是一个正规文件或符号链接"
5027 #: builtin/diff.c:237
5029 msgid "invalid option: %s"
5032 #: builtin/diff.c:358
5033 msgid "Not a git repository"
5034 msgstr "不是一个 git 版本库"
5036 #: builtin/diff.c:401
5038 msgid "invalid object '%s' given."
5039 msgstr "提供了无效对象 '%s'。"
5041 #: builtin/diff.c:410
5043 msgid "more than two blobs given: '%s'"
5044 msgstr "提供了超过两个数据(blob)对象:'%s'"
5046 #: builtin/diff.c:417
5048 msgid "unhandled object '%s' given."
5049 msgstr "无法处理的对象 '%s'。"
5051 #: builtin/fast-export.c:24
5052 msgid "git fast-export [rev-list-opts]"
5053 msgstr "git fast-export [rev-list-opts]"
5055 #: builtin/fast-export.c:979
5056 msgid "show progress after <n> objects"
5057 msgstr "在 <n> 个对象之后显示进度"
5059 #: builtin/fast-export.c:981
5060 msgid "select handling of signed tags"
5061 msgstr "选择如何处理签名 tags"
5063 #: builtin/fast-export.c:984
5064 msgid "select handling of tags that tag filtered objects"
5065 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
5067 #: builtin/fast-export.c:987
5068 msgid "Dump marks to this file"
5071 #: builtin/fast-export.c:989
5072 msgid "Import marks from this file"
5075 #: builtin/fast-export.c:991
5076 msgid "Fake a tagger when tags lack one"
5077 msgstr "当 tags 缺少标记者字段时,假装提供一个"
5079 #: builtin/fast-export.c:993
5080 msgid "Output full tree for each commit"
5083 #: builtin/fast-export.c:995
5084 msgid "Use the done feature to terminate the stream"
5085 msgstr "使用 done 功能来终止流"
5087 #: builtin/fast-export.c:996
5088 msgid "Skip output of blob data"
5091 #: builtin/fast-export.c:997
5095 #: builtin/fast-export.c:998
5096 msgid "Apply refspec to exported refs"
5097 msgstr "对导出的引用应用引用表达式"
5099 #: builtin/fast-export.c:999
5100 msgid "anonymize output"
5103 #: builtin/fetch.c:20
5104 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5105 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5107 #: builtin/fetch.c:21
5108 msgid "git fetch [<options>] <group>"
5109 msgstr "git fetch [<选项>] <组>"
5111 #: builtin/fetch.c:22
5112 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5113 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5115 #: builtin/fetch.c:23
5116 msgid "git fetch --all [<options>]"
5117 msgstr "git fetch --all [<选项>]"
5119 #: builtin/fetch.c:90
5120 msgid "fetch from all remotes"
5123 #: builtin/fetch.c:92
5124 msgid "append to .git/FETCH_HEAD instead of overwriting"
5125 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5127 #: builtin/fetch.c:94
5128 msgid "path to upload pack on remote end"
5131 #: builtin/fetch.c:95
5132 msgid "force overwrite of local branch"
5135 #: builtin/fetch.c:97
5136 msgid "fetch from multiple remotes"
5139 #: builtin/fetch.c:99
5140 msgid "fetch all tags and associated objects"
5141 msgstr "抓取所有的 tags 和关联对象"
5143 #: builtin/fetch.c:101
5144 msgid "do not fetch all tags (--no-tags)"
5145 msgstr "不抓取任何 tags (--no-tags)"
5147 #: builtin/fetch.c:103
5148 msgid "prune remote-tracking branches no longer on remote"
5149 msgstr "清除远程已经不存在的分支的跟踪分支"
5152 #: builtin/fetch.c:104
5156 #: builtin/fetch.c:105
5157 msgid "control recursive fetching of submodules"
5160 #: builtin/fetch.c:109
5161 msgid "keep downloaded pack"
5164 #: builtin/fetch.c:111
5165 msgid "allow updating of HEAD ref"
5166 msgstr "允许更新 HEAD 引用"
5168 #: builtin/fetch.c:114
5169 msgid "deepen history of shallow clone"
5172 #: builtin/fetch.c:116
5173 msgid "convert to a complete repository"
5174 msgstr "转换为一个完整的版本库"
5176 #: builtin/fetch.c:118 builtin/log.c:1208
5180 #: builtin/fetch.c:119
5181 msgid "prepend this to submodule path output"
5182 msgstr "在子模组路径输出的前面加上此目录"
5184 #: builtin/fetch.c:122
5185 msgid "default mode for recursion"
5188 #: builtin/fetch.c:124
5189 msgid "accept refs that update .git/shallow"
5190 msgstr "接受更新 .git/shallow 的引用"
5192 #: builtin/fetch.c:125
5196 #: builtin/fetch.c:126
5197 msgid "specify fetch refmap"
5198 msgstr "指定获取操作的引用映射"
5200 #: builtin/fetch.c:376
5201 msgid "Couldn't find remote ref HEAD"
5202 msgstr "无法发现远程 HEAD 引用"
5204 #: builtin/fetch.c:454
5206 msgid "object %s not found"
5209 #: builtin/fetch.c:459
5210 msgid "[up to date]"
5213 #: builtin/fetch.c:473
5215 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5216 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5218 #: builtin/fetch.c:474 builtin/fetch.c:560
5222 #: builtin/fetch.c:485
5223 msgid "[tag update]"
5227 #: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
5228 msgid " (unable to update local ref)"
5229 msgstr " (不能更新本地引用)"
5231 #: builtin/fetch.c:505
5235 #: builtin/fetch.c:508
5236 msgid "[new branch]"
5239 #: builtin/fetch.c:511
5243 #: builtin/fetch.c:556
5244 msgid "unable to update local ref"
5247 #: builtin/fetch.c:556
5248 msgid "forced update"
5251 #: builtin/fetch.c:562
5252 msgid "(non-fast-forward)"
5255 #: builtin/fetch.c:595 builtin/fetch.c:828
5257 msgid "cannot open %s: %s\n"
5258 msgstr "无法打开 %s:%s\n"
5260 #: builtin/fetch.c:604
5262 msgid "%s did not send all necessary objects\n"
5263 msgstr "%s 未发送所有必须的对象\n"
5265 #: builtin/fetch.c:622
5267 msgid "reject %s because shallow roots are not allowed to be updated"
5268 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5270 #: builtin/fetch.c:710 builtin/fetch.c:793
5275 #: builtin/fetch.c:721
5278 "some local refs could not be updated; try running\n"
5279 " 'git remote prune %s' to remove any old, conflicting branches"
5281 "一些本地引用不能被更新;尝试运行\n"
5282 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5285 #: builtin/fetch.c:773
5287 msgid " (%s will become dangling)"
5288 msgstr " (%s 将成为摇摆状态)"
5291 #: builtin/fetch.c:774
5293 msgid " (%s has become dangling)"
5294 msgstr " (%s 已成为摇摆状态)"
5296 #: builtin/fetch.c:798
5300 #: builtin/fetch.c:799 builtin/remote.c:1060
5304 #: builtin/fetch.c:818
5306 msgid "Refusing to fetch into current branch %s of non-bare repository"
5307 msgstr "拒绝获取到非纯版本库的当前分支 %s"
5309 #: builtin/fetch.c:837
5311 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5312 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5314 #: builtin/fetch.c:840
5316 msgid "Option \"%s\" is ignored for %s\n"
5317 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5319 #: builtin/fetch.c:896
5321 msgid "Don't know how to fetch from %s"
5322 msgstr "不知道如何从 %s 获取"
5324 #: builtin/fetch.c:1058
5326 msgid "Fetching %s\n"
5329 #: builtin/fetch.c:1060 builtin/remote.c:90
5331 msgid "Could not fetch %s"
5334 #: builtin/fetch.c:1078
5336 "No remote repository specified. Please, specify either a URL or a\n"
5337 "remote name from which new revisions should be fetched."
5338 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5340 #: builtin/fetch.c:1101
5341 msgid "You need to specify a tag name."
5342 msgstr "您需要指定一个 tag 名称。"
5344 #: builtin/fetch.c:1143
5345 msgid "--depth and --unshallow cannot be used together"
5346 msgstr "--depth 和 --unshallow 不能同时使用"
5348 #: builtin/fetch.c:1145
5349 msgid "--unshallow on a complete repository does not make sense"
5350 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5352 #: builtin/fetch.c:1168
5353 msgid "fetch --all does not take a repository argument"
5354 msgstr "fetch --all 不能带一个版本库参数"
5356 #: builtin/fetch.c:1170
5357 msgid "fetch --all does not make sense with refspecs"
5358 msgstr "fetch --all 带引用规则没有任何意义"
5360 #: builtin/fetch.c:1181
5362 msgid "No such remote or remote group: %s"
5363 msgstr "没有这样的远程或远程组:%s"
5365 #: builtin/fetch.c:1189
5366 msgid "Fetching a group and specifying refspecs does not make sense"
5367 msgstr "获取组并指定引用规则没有意义"
5369 #: builtin/fmt-merge-msg.c:13
5370 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
5373 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5374 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
5375 #: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
5376 #: parse-options.h:132 parse-options.h:239
5380 #: builtin/fmt-merge-msg.c:663
5381 msgid "populate log with at most <n> entries from shortlog"
5382 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5384 #: builtin/fmt-merge-msg.c:666
5385 msgid "alias for --log (deprecated)"
5386 msgstr "参数 --log 的别名(已弃用)"
5388 #: builtin/fmt-merge-msg.c:669
5392 #: builtin/fmt-merge-msg.c:670
5393 msgid "use <text> as start of message"
5394 msgstr "使用 <文本> 作为提交说明的开始"
5396 #: builtin/fmt-merge-msg.c:671
5397 msgid "file to read from"
5400 #: builtin/for-each-ref.c:676
5401 msgid "unable to parse format"
5404 #: builtin/for-each-ref.c:1064
5405 msgid "git for-each-ref [options] [<pattern>]"
5406 msgstr "git for-each-ref [选项] [<模式>]"
5408 #: builtin/for-each-ref.c:1079
5409 msgid "quote placeholders suitably for shells"
5410 msgstr "引用占位符适用于 shells"
5412 #: builtin/for-each-ref.c:1081
5413 msgid "quote placeholders suitably for perl"
5414 msgstr "引用占位符适用于 perl"
5416 #: builtin/for-each-ref.c:1083
5417 msgid "quote placeholders suitably for python"
5418 msgstr "引用占位符适用于 python"
5420 #: builtin/for-each-ref.c:1085
5421 msgid "quote placeholders suitably for Tcl"
5422 msgstr "引用占位符适用于 Tcl"
5424 #: builtin/for-each-ref.c:1088
5425 msgid "show only <n> matched refs"
5426 msgstr "只显示 <n> 个匹配的引用"
5428 #: builtin/for-each-ref.c:1089 builtin/replace.c:438
5432 #: builtin/for-each-ref.c:1089
5433 msgid "format to use for the output"
5436 #: builtin/for-each-ref.c:1090
5440 #: builtin/for-each-ref.c:1091
5441 msgid "field name to sort on"
5444 #: builtin/fsck.c:147 builtin/prune.c:136
5445 msgid "Checking connectivity"
5448 #: builtin/fsck.c:540
5449 msgid "Checking object directories"
5452 #: builtin/fsck.c:603
5453 msgid "git fsck [options] [<object>...]"
5454 msgstr "git fsck [选项] [<对象>...]"
5456 #: builtin/fsck.c:609
5457 msgid "show unreachable objects"
5460 #: builtin/fsck.c:610
5461 msgid "show dangling objects"
5464 #: builtin/fsck.c:611
5468 #: builtin/fsck.c:612
5469 msgid "report root nodes"
5472 #: builtin/fsck.c:613
5473 msgid "make index objects head nodes"
5474 msgstr "将索引亦作为检查的头节点"
5476 #: builtin/fsck.c:614
5477 msgid "make reflogs head nodes (default)"
5478 msgstr "将引用日志作为检查的头节点(默认)"
5480 #: builtin/fsck.c:615
5481 msgid "also consider packs and alternate objects"
5484 #: builtin/fsck.c:616
5485 msgid "enable more strict checking"
5488 #: builtin/fsck.c:618
5489 msgid "write dangling objects in .git/lost-found"
5490 msgstr "将摇摆对象写入 .git/lost-found 中"
5492 #: builtin/fsck.c:619 builtin/prune.c:108
5493 msgid "show progress"
5496 #: builtin/fsck.c:669
5497 msgid "Checking objects"
5501 msgid "git gc [options]"
5502 msgstr "git gc [选项]"
5506 msgid "Invalid gc.pruneexpire: '%s'"
5507 msgstr "无效的 gc.pruneexpire:'%s'"
5511 msgid "insanely long object directory %.*s"
5512 msgstr "不正常的长对象目录 %.*s"
5515 msgid "prune unreferenced objects"
5519 msgid "be more thorough (increased runtime)"
5520 msgstr "更彻底(增加运行时间)"
5523 msgid "enable auto-gc mode"
5527 msgid "force running gc even if there may be another gc running"
5528 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5532 msgid "Auto packing the repository in background for optimum performance.\n"
5533 msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5537 msgid "Auto packing the repository for optimum performance.\n"
5538 msgstr "自动打包版本库以求最佳性能。\n"
5542 msgid "See \"git help gc\" for manual housekeeping.\n"
5543 msgstr "手工维护参见 \"git help gc\"。\n"
5548 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5550 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5554 "There are too many unreachable loose objects; run 'git prune' to remove them."
5555 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5557 #: builtin/grep.c:23
5558 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5559 msgstr "git grep [选项] [-e] <模式> [<版本>...] [[--] <路径>...]"
5561 #: builtin/grep.c:218
5563 msgid "grep: failed to create thread: %s"
5564 msgstr "grep:无法创建线程:%s"
5566 #: builtin/grep.c:441 builtin/grep.c:476
5568 msgid "unable to read tree (%s)"
5571 #: builtin/grep.c:491
5573 msgid "unable to grep from object of type %s"
5574 msgstr "无法抓取来自于 %s 类型的对象"
5576 #: builtin/grep.c:547
5578 msgid "switch `%c' expects a numerical value"
5579 msgstr "开关 `%c' 期望一个数字值"
5581 #: builtin/grep.c:564
5583 msgid "cannot open '%s'"
5586 #: builtin/grep.c:638
5587 msgid "search in index instead of in the work tree"
5588 msgstr "在索引区搜索而不是在工作区"
5590 #: builtin/grep.c:640
5591 msgid "find in contents not managed by git"
5592 msgstr "在未被 git 管理的内容中查找"
5594 # 译者:中文字符串拼接,可删除前导空格
5595 #: builtin/grep.c:642
5596 msgid "search in both tracked and untracked files"
5597 msgstr "在跟踪和未跟踪的文件中搜索"
5599 #: builtin/grep.c:644
5600 msgid "search also in ignored files"
5603 #: builtin/grep.c:647
5604 msgid "show non-matching lines"
5607 #: builtin/grep.c:649
5608 msgid "case insensitive matching"
5611 #: builtin/grep.c:651
5612 msgid "match patterns only at word boundaries"
5615 #: builtin/grep.c:653
5616 msgid "process binary files as text"
5617 msgstr "把二进制文件当做文本处理"
5619 #: builtin/grep.c:655
5620 msgid "don't match patterns in binary files"
5621 msgstr "不在二进制文件中匹配模式"
5623 #: builtin/grep.c:658
5624 msgid "process binary files with textconv filters"
5625 msgstr "用 textconv 过滤器处理二进制文件"
5627 #: builtin/grep.c:660
5628 msgid "descend at most <depth> levels"
5629 msgstr "最多以指定的深度向下寻找"
5631 #: builtin/grep.c:664
5632 msgid "use extended POSIX regular expressions"
5633 msgstr "使用扩展的 POSIX 正则表达式"
5635 #: builtin/grep.c:667
5636 msgid "use basic POSIX regular expressions (default)"
5637 msgstr "使用基本的 POSIX 正则表达式(默认)"
5639 #: builtin/grep.c:670
5640 msgid "interpret patterns as fixed strings"
5641 msgstr "把模式解析为固定的字符串"
5643 #: builtin/grep.c:673
5644 msgid "use Perl-compatible regular expressions"
5645 msgstr "使用 Perl 兼容的正则表达式"
5647 #: builtin/grep.c:676
5648 msgid "show line numbers"
5651 #: builtin/grep.c:677
5652 msgid "don't show filenames"
5655 #: builtin/grep.c:678
5656 msgid "show filenames"
5659 #: builtin/grep.c:680
5660 msgid "show filenames relative to top directory"
5661 msgstr "显示相对于顶级目录的文件名"
5663 #: builtin/grep.c:682
5664 msgid "show only filenames instead of matching lines"
5665 msgstr "只显示文件名而不显示匹配的行"
5667 #: builtin/grep.c:684
5668 msgid "synonym for --files-with-matches"
5669 msgstr "和 --files-with-matches 同义"
5671 #: builtin/grep.c:687
5672 msgid "show only the names of files without match"
5675 #: builtin/grep.c:689
5676 msgid "print NUL after filenames"
5677 msgstr "在文件名后输出 NUL 字符"
5679 #: builtin/grep.c:691
5680 msgid "show the number of matches instead of matching lines"
5681 msgstr "显示总匹配行数,而不显示匹配的行"
5683 #: builtin/grep.c:692
5684 msgid "highlight matches"
5687 #: builtin/grep.c:694
5688 msgid "print empty line between matches from different files"
5689 msgstr "在不同文件的匹配项之间打印空行"
5691 #: builtin/grep.c:696
5692 msgid "show filename only once above matches from same file"
5693 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5695 #: builtin/grep.c:699
5696 msgid "show <n> context lines before and after matches"
5697 msgstr "显示匹配项前后的 <n> 行上下文"
5699 #: builtin/grep.c:702
5700 msgid "show <n> context lines before matches"
5701 msgstr "显示匹配项前 <n> 行上下文"
5703 #: builtin/grep.c:704
5704 msgid "show <n> context lines after matches"
5705 msgstr "显示匹配项后 <n> 行上下文"
5707 #: builtin/grep.c:705
5708 msgid "shortcut for -C NUM"
5711 #: builtin/grep.c:708
5712 msgid "show a line with the function name before matches"
5713 msgstr "在匹配的前面显示一行函数名"
5715 #: builtin/grep.c:710
5716 msgid "show the surrounding function"
5717 msgstr "显示所在函数的前后内容"
5719 #: builtin/grep.c:713
5720 msgid "read patterns from file"
5723 #: builtin/grep.c:715
5724 msgid "match <pattern>"
5727 #: builtin/grep.c:717
5728 msgid "combine patterns specified with -e"
5729 msgstr "组合用 -e 参数设定的模式"
5731 #: builtin/grep.c:729
5732 msgid "indicate hit with exit status without output"
5733 msgstr "不输出,而用退出码标识命中状态"
5735 #: builtin/grep.c:731
5736 msgid "show only matches from files that match all patterns"
5737 msgstr "只显示匹配所有模式的文件中的匹配"
5739 #: builtin/grep.c:733
5740 msgid "show parse tree for grep expression"
5741 msgstr "显示 grep 表达式的解析树"
5743 #: builtin/grep.c:737
5747 #: builtin/grep.c:737
5748 msgid "show matching files in the pager"
5751 #: builtin/grep.c:740
5752 msgid "allow calling of grep(1) (ignored by this build)"
5753 msgstr "允许调用 grep(1)(本次构建忽略)"
5755 #: builtin/grep.c:741 builtin/show-ref.c:187
5759 #: builtin/grep.c:808
5760 msgid "no pattern given."
5763 #: builtin/grep.c:866
5764 msgid "--open-files-in-pager only works on the worktree"
5765 msgstr "--open-files-in-pager 仅用于工作区"
5767 #: builtin/grep.c:892
5768 msgid "--cached or --untracked cannot be used with --no-index."
5769 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5771 #: builtin/grep.c:897
5772 msgid "--no-index or --untracked cannot be used with revs."
5773 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5775 #: builtin/grep.c:900
5776 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5777 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5779 #: builtin/grep.c:908
5780 msgid "both --cached and trees are given."
5781 msgstr "同时给出了 --cached 和树对象。"
5783 #: builtin/hash-object.c:82
5785 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5788 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5791 #: builtin/hash-object.c:83
5792 msgid "git hash-object --stdin-paths < <list-of-paths>"
5793 msgstr "git hash-object --stdin-paths < <路径列表>"
5795 #: builtin/hash-object.c:94 builtin/tag.c:610
5799 #: builtin/hash-object.c:94
5803 #: builtin/hash-object.c:95
5804 msgid "write the object into the object database"
5807 #: builtin/hash-object.c:97
5808 msgid "read the object from stdin"
5811 #: builtin/hash-object.c:99
5812 msgid "store file as is without filters"
5813 msgstr "原样存储文件不使用过滤器"
5815 #: builtin/hash-object.c:100
5817 "just hash any random garbage to create corrupt objects for debugging Git"
5818 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5820 #: builtin/hash-object.c:101
5821 msgid "process file as it were from this path"
5822 msgstr "处理文件并假设其来自于此路径"
5824 #: builtin/help.c:41
5825 msgid "print all available commands"
5828 #: builtin/help.c:42
5829 msgid "print list of useful guides"
5832 #: builtin/help.c:43
5833 msgid "show man page"
5836 #: builtin/help.c:44
5837 msgid "show manual in web browser"
5838 msgstr "在 web 浏览器中显示手册"
5840 #: builtin/help.c:46
5841 msgid "show info page"
5844 #: builtin/help.c:52
5845 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5846 msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5848 #: builtin/help.c:64
5850 msgid "unrecognized help format '%s'"
5851 msgstr "未能识别的帮助格式 '%s'"
5853 #: builtin/help.c:91
5854 msgid "Failed to start emacsclient."
5855 msgstr "无法启动 emacsclient。"
5857 #: builtin/help.c:104
5858 msgid "Failed to parse emacsclient version."
5859 msgstr "无法解析 emacsclient 版本。"
5861 #: builtin/help.c:112
5863 msgid "emacsclient version '%d' too old (< 22)."
5864 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5866 #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
5868 msgid "failed to exec '%s': %s"
5869 msgstr "无法执行 '%s':%s"
5871 #: builtin/help.c:215
5874 "'%s': path for unsupported man viewer.\n"
5875 "Please consider using 'man.<tool>.cmd' instead."
5877 "'%s':不支持的 man 手册查看器的路径。\n"
5878 "请使用 'man.<工具>.cmd'。"
5880 #: builtin/help.c:227
5883 "'%s': cmd for supported man viewer.\n"
5884 "Please consider using 'man.<tool>.path' instead."
5886 "'%s': 支持的 man 手册查看器命令。\n"
5887 "请使用 'man.<工具>.path'。"
5889 #: builtin/help.c:354
5891 msgid "'%s': unknown man viewer."
5892 msgstr "'%s':未知的 man 查看器。"
5894 #: builtin/help.c:371
5895 msgid "no man viewer handled the request"
5896 msgstr "没有 man 查看器处理此请求"
5898 #: builtin/help.c:379
5899 msgid "no info viewer handled the request"
5900 msgstr "没有 info 查看器处理此请求"
5902 #: builtin/help.c:428
5903 msgid "Defining attributes per path"
5906 #: builtin/help.c:429
5907 msgid "Everyday Git With 20 Commands Or So"
5908 msgstr "每一天 Git 常用的约 20 条命令"
5910 #: builtin/help.c:430
5911 msgid "A Git glossary"
5914 #: builtin/help.c:431
5915 msgid "Specifies intentionally untracked files to ignore"
5918 #: builtin/help.c:432
5919 msgid "Defining submodule properties"
5922 #: builtin/help.c:433
5923 msgid "Specifying revisions and ranges for Git"
5924 msgstr "指定 Git 的版本和版本范围"
5926 #: builtin/help.c:434
5927 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5928 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5930 #: builtin/help.c:435
5931 msgid "An overview of recommended workflows with Git"
5932 msgstr "Git 推荐的工作流概览"
5934 #: builtin/help.c:447
5935 msgid "The common Git guides are:\n"
5936 msgstr "最常用的 Git 向导有:\n"
5938 #: builtin/help.c:468 builtin/help.c:485
5943 #: builtin/help.c:501
5945 msgid "`git %s' is aliased to `%s'"
5946 msgstr "`git %s' 是 `%s' 的别名"
5948 #: builtin/index-pack.c:150
5950 msgid "unable to open %s"
5953 #: builtin/index-pack.c:200
5955 msgid "object type mismatch at %s"
5956 msgstr "%s 的对象类型不匹配"
5958 #: builtin/index-pack.c:220
5960 msgid "did not receive expected object %s"
5961 msgstr "未能获取期望的对象 %s"
5963 #: builtin/index-pack.c:223
5965 msgid "object %s: expected type %s, found %s"
5966 msgstr "对象 %s:期待类型 %s,却是 %s"
5968 #: builtin/index-pack.c:265
5970 msgid "cannot fill %d byte"
5971 msgid_plural "cannot fill %d bytes"
5972 msgstr[0] "无法填充 %d 字节"
5973 msgstr[1] "无法填充 %d 字节"
5975 #: builtin/index-pack.c:275
5977 msgstr "过早的文件结束符(EOF)"
5979 #: builtin/index-pack.c:276
5980 msgid "read error on input"
5983 #: builtin/index-pack.c:288
5984 msgid "used more bytes than were available"
5987 #: builtin/index-pack.c:295
5988 msgid "pack too large for current definition of off_t"
5989 msgstr "包太大超过了当前 off_t 的定义"
5991 #: builtin/index-pack.c:311
5993 msgid "unable to create '%s'"
5996 #: builtin/index-pack.c:316
5998 msgid "cannot open packfile '%s'"
5999 msgstr "无法打开包文件 '%s'"
6001 #: builtin/index-pack.c:330
6002 msgid "pack signature mismatch"
6005 #: builtin/index-pack.c:332
6007 msgid "pack version %<PRIu32> unsupported"
6008 msgstr "不支持包版本 %<PRIu32>"
6010 #: builtin/index-pack.c:350
6012 msgid "pack has bad object at offset %lu: %s"
6013 msgstr "包中有错误的对象位于 %lu:%s"
6015 #: builtin/index-pack.c:471
6017 msgid "inflate returned %d"
6020 #: builtin/index-pack.c:520
6021 msgid "offset value overflow for delta base object"
6022 msgstr "偏移值覆盖了 delta 基准对象"
6024 #: builtin/index-pack.c:528
6025 msgid "delta base offset is out of bound"
6026 msgstr "delta 基准偏移越界"
6028 #: builtin/index-pack.c:536
6030 msgid "unknown object type %d"
6033 #: builtin/index-pack.c:567
6034 msgid "cannot pread pack file"
6037 #: builtin/index-pack.c:569
6039 msgid "premature end of pack file, %lu byte missing"
6040 msgid_plural "premature end of pack file, %lu bytes missing"
6041 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6042 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6044 #: builtin/index-pack.c:595
6045 msgid "serious inflate inconsistency"
6048 #: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6049 #: builtin/index-pack.c:749 builtin/index-pack.c:758
6051 msgid "SHA1 COLLISION FOUND WITH %s !"
6052 msgstr "发现 %s 出现 SHA1 冲突!"
6054 #: builtin/index-pack.c:689 builtin/pack-objects.c:164
6055 #: builtin/pack-objects.c:256
6057 msgid "unable to read %s"
6060 #: builtin/index-pack.c:755
6062 msgid "cannot read existing object %s"
6063 msgstr "不能读取现存对象 %s"
6065 #: builtin/index-pack.c:769
6067 msgid "invalid blob object %s"
6068 msgstr "无效的数据(blob)对象 %s"
6070 #: builtin/index-pack.c:783
6075 #: builtin/index-pack.c:787
6076 msgid "Error in object"
6079 #: builtin/index-pack.c:789
6081 msgid "Not all child objects of %s are reachable"
6082 msgstr "%s 的所有子对象并非都可达"
6084 #: builtin/index-pack.c:861 builtin/index-pack.c:890
6085 msgid "failed to apply delta"
6088 #: builtin/index-pack.c:1055
6089 msgid "Receiving objects"
6092 #: builtin/index-pack.c:1055
6093 msgid "Indexing objects"
6096 #: builtin/index-pack.c:1081
6097 msgid "pack is corrupted (SHA1 mismatch)"
6098 msgstr "包冲突(SHA1 不匹配)"
6100 #: builtin/index-pack.c:1086
6101 msgid "cannot fstat packfile"
6104 #: builtin/index-pack.c:1089
6105 msgid "pack has junk at the end"
6108 #: builtin/index-pack.c:1100
6109 msgid "confusion beyond insanity in parse_pack_objects()"
6110 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6112 #: builtin/index-pack.c:1123
6113 msgid "Resolving deltas"
6116 #: builtin/index-pack.c:1133
6118 msgid "unable to create thread: %s"
6121 #: builtin/index-pack.c:1175
6122 msgid "confusion beyond insanity"
6125 #: builtin/index-pack.c:1181
6127 msgid "completed with %d local objects"
6128 msgstr "完成 %d 个本地对象"
6130 #: builtin/index-pack.c:1191
6132 msgid "Unexpected tail checksum for %s (disk corruption?)"
6133 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
6135 #: builtin/index-pack.c:1195
6137 msgid "pack has %d unresolved delta"
6138 msgid_plural "pack has %d unresolved deltas"
6139 msgstr[0] "包有 %d 个未解决的 delta"
6140 msgstr[1] "包有 %d 个未解决的 delta"
6142 #: builtin/index-pack.c:1220
6144 msgid "unable to deflate appended object (%d)"
6145 msgstr "不能压缩附加对象(%d)"
6147 #: builtin/index-pack.c:1299
6149 msgid "local object %s is corrupt"
6150 msgstr "本地对象 %s 已损坏"
6152 #: builtin/index-pack.c:1323
6153 msgid "error while closing pack file"
6156 #: builtin/index-pack.c:1336
6158 msgid "cannot write keep file '%s'"
6159 msgstr "无法写保留文件 '%s'"
6161 #: builtin/index-pack.c:1344
6163 msgid "cannot close written keep file '%s'"
6164 msgstr "无法关闭保留文件 '%s'"
6166 #: builtin/index-pack.c:1357
6167 msgid "cannot store pack file"
6170 #: builtin/index-pack.c:1368
6171 msgid "cannot store index file"
6174 #: builtin/index-pack.c:1401
6176 msgid "bad pack.indexversion=%<PRIu32>"
6177 msgstr "坏的 pack.indexversion=%<PRIu32>"
6179 #: builtin/index-pack.c:1407
6181 msgid "invalid number of threads specified (%d)"
6182 msgstr "指定的线程数无效(%d)"
6184 #: builtin/index-pack.c:1411 builtin/index-pack.c:1590
6186 msgid "no threads support, ignoring %s"
6187 msgstr "没有线程支持,忽略 %s"
6189 #: builtin/index-pack.c:1469
6191 msgid "Cannot open existing pack file '%s'"
6192 msgstr "无法打开现存包文件 '%s'"
6194 #: builtin/index-pack.c:1471
6196 msgid "Cannot open existing pack idx file for '%s'"
6197 msgstr "无法为 %s 打开包索引文件"
6199 #: builtin/index-pack.c:1518
6201 msgid "non delta: %d object"
6202 msgid_plural "non delta: %d objects"
6203 msgstr[0] "非 delta:%d 个对象"
6204 msgstr[1] "非 delta:%d 个对象"
6206 #: builtin/index-pack.c:1525
6208 msgid "chain length = %d: %lu object"
6209 msgid_plural "chain length = %d: %lu objects"
6210 msgstr[0] "链长 = %d: %lu 对象"
6211 msgstr[1] "链长 = %d: %lu 对象"
6213 #: builtin/index-pack.c:1554
6214 msgid "Cannot come back to cwd"
6217 #: builtin/index-pack.c:1602 builtin/index-pack.c:1605
6218 #: builtin/index-pack.c:1617 builtin/index-pack.c:1621
6223 #: builtin/index-pack.c:1635
6224 msgid "--fix-thin cannot be used without --stdin"
6225 msgstr "--fix-thin 不能和 --stdin 同时使用"
6227 #: builtin/index-pack.c:1639 builtin/index-pack.c:1648
6229 msgid "packfile name '%s' does not end with '.pack'"
6230 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6232 #: builtin/index-pack.c:1656
6233 msgid "--verify with no packfile name given"
6234 msgstr "--verify 没有提供包名参数"
6236 #: builtin/init-db.c:35
6238 msgid "Could not make %s writable by group"
6239 msgstr "不能设置 %s 为组可写"
6241 #: builtin/init-db.c:62
6243 msgid "insanely long template name %s"
6246 #: builtin/init-db.c:67
6248 msgid "cannot stat '%s'"
6249 msgstr "不能枚举 '%s' 状态"
6251 #: builtin/init-db.c:73
6253 msgid "cannot stat template '%s'"
6254 msgstr "不能枚举模版 '%s' 状态"
6256 #: builtin/init-db.c:80
6258 msgid "cannot opendir '%s'"
6259 msgstr "不能打开目录 '%s'"
6261 #: builtin/init-db.c:97
6263 msgid "cannot readlink '%s'"
6264 msgstr "不能读取链接 '%s'"
6266 #: builtin/init-db.c:99
6268 msgid "insanely long symlink %s"
6271 #: builtin/init-db.c:102
6273 msgid "cannot symlink '%s' '%s'"
6274 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6276 #: builtin/init-db.c:106
6278 msgid "cannot copy '%s' to '%s'"
6279 msgstr "不能拷贝 '%s' 至 '%s'"
6281 #: builtin/init-db.c:110
6283 msgid "ignoring template %s"
6286 #: builtin/init-db.c:136
6288 msgid "insanely long template path %s"
6291 #: builtin/init-db.c:144
6293 msgid "templates not found %s"
6296 #: builtin/init-db.c:157
6298 msgid "not copying templates of a wrong format version %d from '%s'"
6299 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6301 #: builtin/init-db.c:197
6303 msgid "insane git directory %s"
6304 msgstr "不正常的 git 目录 %s"
6306 #: builtin/init-db.c:331 builtin/init-db.c:334
6308 msgid "%s already exists"
6311 #: builtin/init-db.c:363
6313 msgid "unable to handle file type %d"
6314 msgstr "不能处理 %d 类型的文件"
6316 #: builtin/init-db.c:366
6318 msgid "unable to move %s to %s"
6319 msgstr "不能移动 %s 至 %s"
6321 #. TRANSLATORS: The first '%s' is either "Reinitialized
6322 #. existing" or "Initialized empty", the second " shared" or
6323 #. "", and the last '%s%s' is the verbatim directory name.
6324 #: builtin/init-db.c:426
6326 msgid "%s%s Git repository in %s%s\n"
6327 msgstr "%s%s Git 版本库于 %s%s\n"
6329 #: builtin/init-db.c:427
6330 msgid "Reinitialized existing"
6333 #: builtin/init-db.c:427
6334 msgid "Initialized empty"
6337 # 译者:中文字符串拼接,可删除前导空格
6338 #: builtin/init-db.c:428
6342 #: builtin/init-db.c:475
6344 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6345 "shared[=<permissions>]] [directory]"
6347 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6350 #: builtin/init-db.c:498
6354 #: builtin/init-db.c:499
6355 msgid "specify that the git repository is to be shared amongst several users"
6356 msgstr "指定 git 版本库是多个用户之间共享的"
6358 #: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
6362 #: builtin/init-db.c:533 builtin/init-db.c:538
6364 msgid "cannot mkdir %s"
6367 #: builtin/init-db.c:542
6369 msgid "cannot chdir to %s"
6372 #: builtin/init-db.c:563
6375 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6377 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
6379 #: builtin/init-db.c:591
6381 msgid "Cannot access work tree '%s'"
6382 msgstr "不能访问工作区 '%s'"
6384 #: builtin/interpret-trailers.c:15
6386 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6389 "git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6392 #: builtin/interpret-trailers.c:25
6393 msgid "trim empty trailers"
6396 #: builtin/interpret-trailers.c:26
6400 #: builtin/interpret-trailers.c:27
6401 msgid "trailer(s) to add"
6405 msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6406 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6409 msgid "git show [options] <object>..."
6410 msgstr "git show [选项] <对象>..."
6414 msgid "invalid --decorate option: %s"
6415 msgstr "无效的 --decorate 选项:%s"
6417 #: builtin/log.c:127
6418 msgid "suppress diff output"
6421 #: builtin/log.c:128
6425 #: builtin/log.c:129
6426 msgid "Use mail map file"
6429 #: builtin/log.c:130
6430 msgid "decorate options"
6433 #: builtin/log.c:133
6434 msgid "Process line range n,m in file, counting from 1"
6435 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6437 #: builtin/log.c:229
6439 msgid "Final output: %d %s\n"
6440 msgstr "最终输出:%d %s\n"
6442 #: builtin/log.c:458
6444 msgid "git show %s: bad file"
6445 msgstr "git show %s: 损坏的文件"
6447 #: builtin/log.c:472 builtin/log.c:564
6449 msgid "Could not read object %s"
6452 #: builtin/log.c:588
6454 msgid "Unknown type: %d"
6457 #: builtin/log.c:689
6458 msgid "format.headers without value"
6459 msgstr "format.headers 没有值"
6461 #: builtin/log.c:773
6462 msgid "name of output directory is too long"
6465 #: builtin/log.c:789
6467 msgid "Cannot open patch file %s"
6468 msgstr "无法打开补丁文件 %s"
6470 #: builtin/log.c:803
6471 msgid "Need exactly one range."
6474 #: builtin/log.c:811
6475 msgid "Not a range."
6478 #: builtin/log.c:919
6479 msgid "Cover letter needs email format"
6482 #: builtin/log.c:998
6484 msgid "insane in-reply-to: %s"
6485 msgstr "不正常的 in-reply-to:%s"
6487 #: builtin/log.c:1026
6488 msgid "git format-patch [options] [<since> | <revision range>]"
6489 msgstr "git format-patch [选项] [<从> | <版本范围>]"
6491 #: builtin/log.c:1071
6492 msgid "Two output directories?"
6495 #: builtin/log.c:1186
6496 msgid "use [PATCH n/m] even with a single patch"
6497 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6499 #: builtin/log.c:1189
6500 msgid "use [PATCH] even with multiple patches"
6501 msgstr "使用 [PATCH],即使有多个补丁"
6503 #: builtin/log.c:1193
6504 msgid "print patches to standard out"
6507 #: builtin/log.c:1195
6508 msgid "generate a cover letter"
6511 #: builtin/log.c:1197
6512 msgid "use simple number sequence for output file names"
6513 msgstr "使用简单的数字序列作为输出文件名"
6515 #: builtin/log.c:1198
6519 #: builtin/log.c:1199
6520 msgid "use <sfx> instead of '.patch'"
6521 msgstr "使用 <后缀> 代替 '.patch'"
6523 #: builtin/log.c:1201
6524 msgid "start numbering patches at <n> instead of 1"
6525 msgstr "补丁以 <n> 开始编号,而不是1"
6527 #: builtin/log.c:1203
6528 msgid "mark the series as Nth re-roll"
6529 msgstr "标记补丁系列是第几次重制"
6531 #: builtin/log.c:1205
6532 msgid "Use [<prefix>] instead of [PATCH]"
6533 msgstr "使用 [<前缀>] 代替 [PATCH]"
6535 #: builtin/log.c:1208
6536 msgid "store resulting files in <dir>"
6537 msgstr "把结果文件存储在 <目录>"
6539 #: builtin/log.c:1211
6540 msgid "don't strip/add [PATCH]"
6541 msgstr "不删除/添加 [PATCH]"
6543 #: builtin/log.c:1214
6544 msgid "don't output binary diffs"
6547 #: builtin/log.c:1216
6548 msgid "don't include a patch matching a commit upstream"
6549 msgstr "不包含已在上游提交中的补丁"
6551 #: builtin/log.c:1218
6552 msgid "show patch format instead of default (patch + stat)"
6553 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6555 #: builtin/log.c:1220
6559 #: builtin/log.c:1221
6563 #: builtin/log.c:1222
6564 msgid "add email header"
6567 #: builtin/log.c:1223 builtin/log.c:1225
6571 #: builtin/log.c:1223
6572 msgid "add To: header"
6575 #: builtin/log.c:1225
6576 msgid "add Cc: header"
6579 #: builtin/log.c:1227
6583 #: builtin/log.c:1228
6584 msgid "set From address to <ident> (or committer ident if absent)"
6585 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
6587 #: builtin/log.c:1230
6591 #: builtin/log.c:1231
6592 msgid "make first mail a reply to <message-id>"
6593 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
6595 #: builtin/log.c:1232 builtin/log.c:1235
6599 #: builtin/log.c:1233
6600 msgid "attach the patch"
6603 #: builtin/log.c:1236
6604 msgid "inline the patch"
6607 #: builtin/log.c:1240
6608 msgid "enable message threading, styles: shallow, deep"
6609 msgstr "启用邮件线索,风格:浅,深"
6611 #: builtin/log.c:1242
6615 #: builtin/log.c:1243
6616 msgid "add a signature"
6619 #: builtin/log.c:1245
6620 msgid "add a signature from a file"
6623 #: builtin/log.c:1246
6624 msgid "don't print the patch filenames"
6627 #: builtin/log.c:1320
6629 msgid "invalid ident line: %s"
6630 msgstr "包含无效的身份标识:%s"
6632 #: builtin/log.c:1335
6633 msgid "-n and -k are mutually exclusive."
6634 msgstr "-n 和 -k 互斥。"
6636 #: builtin/log.c:1337
6637 msgid "--subject-prefix and -k are mutually exclusive."
6638 msgstr "--subject-prefix 和 -k 互斥。"
6640 #: builtin/log.c:1345
6641 msgid "--name-only does not make sense"
6642 msgstr "--name-only 无意义"
6644 #: builtin/log.c:1347
6645 msgid "--name-status does not make sense"
6646 msgstr "--name-status 无意义"
6648 #: builtin/log.c:1349
6649 msgid "--check does not make sense"
6650 msgstr "--check 无意义"
6652 #: builtin/log.c:1372
6653 msgid "standard output, or directory, which one?"
6654 msgstr "标准输出或目录,哪一个?"
6656 #: builtin/log.c:1374
6658 msgid "Could not create directory '%s'"
6659 msgstr "不能创建目录 '%s'"
6661 #: builtin/log.c:1472
6663 msgid "unable to read signature file '%s'"
6664 msgstr "无法读取签名文件 '%s'"
6666 #: builtin/log.c:1535
6667 msgid "Failed to create output files"
6670 #: builtin/log.c:1583
6671 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6672 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6674 #: builtin/log.c:1638
6677 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6678 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
6680 #: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
6682 msgid "Unknown commit %s"
6685 #: builtin/ls-files.c:401
6686 msgid "git ls-files [options] [<file>...]"
6687 msgstr "git ls-files [选项] [<文件>...]"
6689 #: builtin/ls-files.c:458
6690 msgid "identify the file status with tags"
6693 #: builtin/ls-files.c:460
6694 msgid "use lowercase letters for 'assume unchanged' files"
6695 msgstr "使用小写字母表示 '假设未改变的' 文件"
6697 #: builtin/ls-files.c:462
6698 msgid "show cached files in the output (default)"
6699 msgstr "显示缓存的文件(默认)"
6701 #: builtin/ls-files.c:464
6702 msgid "show deleted files in the output"
6705 #: builtin/ls-files.c:466
6706 msgid "show modified files in the output"
6709 #: builtin/ls-files.c:468
6710 msgid "show other files in the output"
6713 #: builtin/ls-files.c:470
6714 msgid "show ignored files in the output"
6717 #: builtin/ls-files.c:473
6718 msgid "show staged contents' object name in the output"
6719 msgstr "显示暂存区内容的对象名称"
6721 #: builtin/ls-files.c:475
6722 msgid "show files on the filesystem that need to be removed"
6723 msgstr "显示文件系统需要删除的文件"
6725 #: builtin/ls-files.c:477
6726 msgid "show 'other' directories' names only"
6727 msgstr "只显示“其他”目录的名称"
6729 #: builtin/ls-files.c:480
6730 msgid "don't show empty directories"
6733 #: builtin/ls-files.c:483
6734 msgid "show unmerged files in the output"
6737 #: builtin/ls-files.c:485
6738 msgid "show resolve-undo information"
6739 msgstr "显示 resolve-undo 信息"
6741 #: builtin/ls-files.c:487
6742 msgid "skip files matching pattern"
6745 #: builtin/ls-files.c:490
6746 msgid "exclude patterns are read from <file>"
6747 msgstr "从 <文件> 中读取排除模式"
6749 #: builtin/ls-files.c:493
6750 msgid "read additional per-directory exclude patterns in <file>"
6751 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6753 #: builtin/ls-files.c:495
6754 msgid "add the standard git exclusions"
6755 msgstr "添加标准的 git 排除"
6757 #: builtin/ls-files.c:498
6758 msgid "make the output relative to the project top directory"
6759 msgstr "显示相对于顶级目录的文件名"
6761 #: builtin/ls-files.c:501
6762 msgid "if any <file> is not in the index, treat this as an error"
6763 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6765 #: builtin/ls-files.c:502
6769 #: builtin/ls-files.c:503
6770 msgid "pretend that paths removed since <tree-ish> are still present"
6771 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6773 #: builtin/ls-files.c:505
6774 msgid "show debugging data"
6777 #: builtin/ls-tree.c:28
6778 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6779 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6781 #: builtin/ls-tree.c:127
6782 msgid "only show trees"
6785 #: builtin/ls-tree.c:129
6786 msgid "recurse into subtrees"
6789 #: builtin/ls-tree.c:131
6790 msgid "show trees when recursing"
6793 #: builtin/ls-tree.c:134
6794 msgid "terminate entries with NUL byte"
6797 #: builtin/ls-tree.c:135
6798 msgid "include object size"
6801 #: builtin/ls-tree.c:137 builtin/ls-tree.c:139
6802 msgid "list only filenames"
6805 #: builtin/ls-tree.c:142
6806 msgid "use full path names"
6809 #: builtin/ls-tree.c:144
6810 msgid "list entire tree; not just current directory (implies --full-name)"
6811 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6813 #: builtin/merge.c:45
6814 msgid "git merge [options] [<commit>...]"
6815 msgstr "git merge [选项] [<提交>...]"
6817 #: builtin/merge.c:46
6818 msgid "git merge [options] <msg> HEAD <commit>"
6819 msgstr "git merge [选项] <说明> HEAD <提交>"
6821 #: builtin/merge.c:47
6822 msgid "git merge --abort"
6823 msgstr "git merge --abort"
6825 #: builtin/merge.c:100
6826 msgid "switch `m' requires a value"
6827 msgstr "开关 `m' 需要一个值"
6829 #: builtin/merge.c:137
6831 msgid "Could not find merge strategy '%s'.\n"
6832 msgstr "不能找到合并策略 '%s'。\n"
6834 #: builtin/merge.c:138
6836 msgid "Available strategies are:"
6839 #: builtin/merge.c:143
6841 msgid "Available custom strategies are:"
6844 #: builtin/merge.c:193
6845 msgid "do not show a diffstat at the end of the merge"
6846 msgstr "在合并的最后不显示差异统计"
6848 #: builtin/merge.c:196
6849 msgid "show a diffstat at the end of the merge"
6850 msgstr "在合并的最后显示差异统计"
6852 #: builtin/merge.c:197
6853 msgid "(synonym to --stat)"
6854 msgstr "(和 --stat 同义)"
6856 #: builtin/merge.c:199
6857 msgid "add (at most <n>) entries from shortlog to merge commit message"
6858 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6860 #: builtin/merge.c:202
6861 msgid "create a single commit instead of doing a merge"
6862 msgstr "创建一个单独的提交而不是做一次合并"
6864 #: builtin/merge.c:204
6865 msgid "perform a commit if the merge succeeds (default)"
6866 msgstr "如果合并成功,执行一次提交(默认)"
6868 #: builtin/merge.c:206
6869 msgid "edit message before committing"
6872 #: builtin/merge.c:207
6873 msgid "allow fast-forward (default)"
6876 #: builtin/merge.c:209
6877 msgid "abort if fast-forward is not possible"
6878 msgstr "如果不能快进就放弃合并"
6880 #: builtin/merge.c:213
6881 msgid "Verify that the named commit has a valid GPG signature"
6882 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6884 #: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
6888 #: builtin/merge.c:215
6889 msgid "merge strategy to use"
6892 #: builtin/merge.c:216
6893 msgid "option=value"
6894 msgstr "option=value"
6896 #: builtin/merge.c:217
6897 msgid "option for selected merge strategy"
6900 #: builtin/merge.c:219
6901 msgid "merge commit message (for a non-fast-forward merge)"
6902 msgstr "合并的提交说明(针对非快进式合并)"
6904 #: builtin/merge.c:223
6905 msgid "abort the current in-progress merge"
6906 msgstr "放弃当前正在进行的合并"
6908 #: builtin/merge.c:251
6909 msgid "could not run stash."
6912 #: builtin/merge.c:256
6913 msgid "stash failed"
6916 #: builtin/merge.c:261
6918 msgid "not a valid object: %s"
6919 msgstr "不是一个有效对象:%s"
6921 #: builtin/merge.c:280 builtin/merge.c:297
6922 msgid "read-tree failed"
6926 #: builtin/merge.c:327
6927 msgid " (nothing to squash)"
6930 #: builtin/merge.c:340
6932 msgid "Squash commit -- not updating HEAD\n"
6933 msgstr "压缩提交 -- 未更新 HEAD\n"
6935 #: builtin/merge.c:372
6936 msgid "Writing SQUASH_MSG"
6937 msgstr "写入 SQUASH_MSG"
6939 #: builtin/merge.c:374
6940 msgid "Finishing SQUASH_MSG"
6941 msgstr "完成 SQUASH_MSG"
6943 #: builtin/merge.c:397
6945 msgid "No merge message -- not updating HEAD\n"
6946 msgstr "无合并信息 -- 未更新 HEAD\n"
6948 #: builtin/merge.c:447
6950 msgid "'%s' does not point to a commit"
6951 msgstr "'%s' 没有指向一个提交"
6953 #: builtin/merge.c:559
6955 msgid "Bad branch.%s.mergeoptions string: %s"
6956 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6958 #: builtin/merge.c:654
6959 msgid "git write-tree failed to write a tree"
6960 msgstr "git write-tree 无法写入一树对象"
6962 #: builtin/merge.c:678
6963 msgid "Not handling anything other than two heads merge."
6964 msgstr "不能处理两个头合并之外的任何操作。"
6966 #: builtin/merge.c:692
6968 msgid "Unknown option for merge-recursive: -X%s"
6969 msgstr "merge-recursive 的未知选项:-X%s"
6971 #: builtin/merge.c:705
6973 msgid "unable to write %s"
6976 #: builtin/merge.c:794
6978 msgid "Could not read from '%s'"
6979 msgstr "不能从 '%s' 读取"
6981 #: builtin/merge.c:803
6983 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6984 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6986 #: builtin/merge.c:809
6989 "Please enter a commit message to explain why this merge is necessary,\n"
6990 "especially if it merges an updated upstream into a topic branch.\n"
6992 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6995 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6998 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7000 #: builtin/merge.c:833
7001 msgid "Empty commit message."
7004 #: builtin/merge.c:845
7006 msgid "Wonderful.\n"
7009 #: builtin/merge.c:900
7011 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7012 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7014 #: builtin/merge.c:916
7016 msgid "'%s' is not a commit"
7017 msgstr "'%s' 不是一个提交"
7019 #: builtin/merge.c:957
7020 msgid "No current branch."
7023 #: builtin/merge.c:959
7024 msgid "No remote for the current branch."
7025 msgstr "当前分支没有对应的远程版本库。"
7027 #: builtin/merge.c:961
7028 msgid "No default upstream defined for the current branch."
7029 msgstr "当前分支没有定义默认的上游分支。"
7031 #: builtin/merge.c:966
7033 msgid "No remote-tracking branch for %s from %s"
7034 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7036 #: builtin/merge.c:1122
7037 msgid "There is no merge to abort (MERGE_HEAD missing)."
7038 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7040 #: builtin/merge.c:1138
7042 "You have not concluded your merge (MERGE_HEAD exists).\n"
7043 "Please, commit your changes before you merge."
7045 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7048 #: builtin/merge.c:1141 git-pull.sh:34
7049 msgid "You have not concluded your merge (MERGE_HEAD exists)."
7050 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7052 #: builtin/merge.c:1145
7054 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7055 "Please, commit your changes before you merge."
7057 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7060 #: builtin/merge.c:1148
7061 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7062 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7064 #: builtin/merge.c:1157
7065 msgid "You cannot combine --squash with --no-ff."
7066 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7068 #: builtin/merge.c:1166
7069 msgid "No commit specified and merge.defaultToUpstream not set."
7070 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7072 #: builtin/merge.c:1198
7073 msgid "Can merge only exactly one commit into empty head"
7074 msgstr "只能将一个提交合并到空分支上"
7076 #: builtin/merge.c:1201
7077 msgid "Squash commit into empty head not supported yet"
7078 msgstr "尚不支持到空分支的压缩提交"
7080 #: builtin/merge.c:1203
7081 msgid "Non-fast-forward commit does not make sense into an empty head"
7082 msgstr "到空分支的非快进式提交没有意义"
7084 #: builtin/merge.c:1208
7086 msgid "%s - not something we can merge"
7089 #: builtin/merge.c:1259
7091 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7092 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7094 #: builtin/merge.c:1262
7096 msgid "Commit %s has a bad GPG signature allegedly by %s."
7097 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7099 #: builtin/merge.c:1265
7101 msgid "Commit %s does not have a GPG signature."
7102 msgstr "提交 %s 没有一个 GPG 签名。"
7104 #: builtin/merge.c:1268
7106 msgid "Commit %s has a good GPG signature by %s\n"
7107 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7109 #: builtin/merge.c:1349
7111 msgid "Updating %s..%s\n"
7112 msgstr "更新 %s..%s\n"
7114 #: builtin/merge.c:1388
7116 msgid "Trying really trivial in-index merge...\n"
7117 msgstr "尝试非常小的索引内合并...\n"
7119 #: builtin/merge.c:1395
7124 #: builtin/merge.c:1427
7125 msgid "Not possible to fast-forward, aborting."
7128 #: builtin/merge.c:1450 builtin/merge.c:1529
7130 msgid "Rewinding the tree to pristine...\n"
7131 msgstr "将树回滚至原始状态...\n"
7133 #: builtin/merge.c:1454
7135 msgid "Trying merge strategy %s...\n"
7136 msgstr "尝试合并策略 %s...\n"
7138 #: builtin/merge.c:1520
7140 msgid "No merge strategy handled the merge.\n"
7141 msgstr "没有合并策略处理此合并。\n"
7143 #: builtin/merge.c:1522
7145 msgid "Merge with strategy %s failed.\n"
7146 msgstr "使用策略 %s 合并失败。\n"
7148 #: builtin/merge.c:1531
7150 msgid "Using the %s to prepare resolving by hand.\n"
7151 msgstr "使用 %s 以准备手工解决。\n"
7153 #: builtin/merge.c:1543
7155 msgid "Automatic merge went well; stopped before committing as requested\n"
7156 msgstr "自动合并进展顺利,按要求在提交前停止\n"
7158 #: builtin/merge-base.c:29
7159 msgid "git merge-base [-a|--all] <commit> <commit>..."
7160 msgstr "git merge-base [-a|--all] <提交> <提交>..."
7162 #: builtin/merge-base.c:30
7163 msgid "git merge-base [-a|--all] --octopus <commit>..."
7164 msgstr "git merge-base [-a|--all] --octopus <提交>..."
7166 #: builtin/merge-base.c:31
7167 msgid "git merge-base --independent <commit>..."
7168 msgstr "git merge-base --independent <提交>..."
7170 #: builtin/merge-base.c:32
7171 msgid "git merge-base --is-ancestor <commit> <commit>"
7172 msgstr "git merge-base --is-ancestor <提交> <提交>"
7174 #: builtin/merge-base.c:33
7175 msgid "git merge-base --fork-point <ref> [<commit>]"
7176 msgstr "git merge-base --fork-point <引用> [<提交>]"
7178 #: builtin/merge-base.c:214
7179 msgid "output all common ancestors"
7182 #: builtin/merge-base.c:216
7183 msgid "find ancestors for a single n-way merge"
7184 msgstr "查找一个多路合并的祖先提交"
7186 #: builtin/merge-base.c:218
7187 msgid "list revs not reachable from others"
7188 msgstr "显示不能被其他访问到的版本"
7190 #: builtin/merge-base.c:220
7191 msgid "is the first one ancestor of the other?"
7192 msgstr "第一个是其他的祖先提交么?"
7194 #: builtin/merge-base.c:222
7195 msgid "find where <commit> forked from reflog of <ref>"
7196 msgstr "查找 <提交> 从<引用>日志的何处分支的"
7198 #: builtin/merge-file.c:8
7200 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7203 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7205 #: builtin/merge-file.c:33
7206 msgid "send results to standard output"
7209 #: builtin/merge-file.c:34
7210 msgid "use a diff3 based merge"
7211 msgstr "使用基于 diff3 的合并"
7213 #: builtin/merge-file.c:35
7214 msgid "for conflicts, use our version"
7215 msgstr "如果冲突,使用我们的版本"
7217 #: builtin/merge-file.c:37
7218 msgid "for conflicts, use their version"
7219 msgstr "如果冲突,使用他们的版本"
7221 #: builtin/merge-file.c:39
7222 msgid "for conflicts, use a union version"
7223 msgstr "如果冲突,使用联合版本"
7225 #: builtin/merge-file.c:42
7226 msgid "for conflicts, use this marker size"
7227 msgstr "如果冲突,使用指定长度的标记"
7229 #: builtin/merge-file.c:43
7230 msgid "do not warn about conflicts"
7233 #: builtin/merge-file.c:45
7234 msgid "set labels for file1/orig_file/file2"
7235 msgstr "为 file1/orig_file/file2 设置标签"
7237 #: builtin/mktree.c:64
7238 msgid "git mktree [-z] [--missing] [--batch]"
7239 msgstr "git mktree [-z] [--missing] [--batch]"
7241 #: builtin/mktree.c:150
7242 msgid "input is NUL terminated"
7243 msgstr "输入以 NUL 字符终止"
7245 #: builtin/mktree.c:151 builtin/write-tree.c:24
7246 msgid "allow missing objects"
7249 #: builtin/mktree.c:152
7250 msgid "allow creation of more than one tree"
7254 msgid "git mv [options] <source>... <destination>"
7255 msgstr "git mv [选项] <源>... <目标>"
7259 msgid "Directory %s is in index and no submodule?"
7260 msgstr "目录 %s 在索引中并且不是子模组?"
7263 msgid "Please stage your changes to .gitmodules or stash them to proceed"
7264 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7268 msgid "%.*s is in index"
7272 msgid "force move/rename even if target exists"
7273 msgstr "强制移动/重命令,即使目标存在"
7276 msgid "skip move/rename errors"
7281 msgid "destination '%s' is not a directory"
7282 msgstr "目标 '%s' 不是一个目录"
7286 msgid "Checking rename of '%s' to '%s'\n"
7287 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7294 msgid "can not move directory into itself"
7298 msgid "cannot move directory over file"
7302 msgid "source directory is empty"
7306 msgid "not under version control"
7310 msgid "destination exists"
7315 msgid "overwriting '%s'"
7319 msgid "Cannot overwrite"
7323 msgid "multiple sources for the same target"
7327 msgid "destination directory does not exist"
7332 msgid "%s, source=%s, destination=%s"
7333 msgstr "%s,源=%s,目标=%s"
7337 msgid "Renaming %s to %s\n"
7338 msgstr "重命名 %s 至 %s\n"
7340 #: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
7342 msgid "renaming '%s' failed"
7343 msgstr "重命名 '%s' 失败"
7345 #: builtin/name-rev.c:255
7346 msgid "git name-rev [options] <commit>..."
7347 msgstr "git name-rev [选项] <提交>..."
7349 #: builtin/name-rev.c:256
7350 msgid "git name-rev [options] --all"
7351 msgstr "git name-rev [选项] --all"
7353 #: builtin/name-rev.c:257
7354 msgid "git name-rev [options] --stdin"
7355 msgstr "git name-rev [选项] --stdin"
7357 #: builtin/name-rev.c:309
7358 msgid "print only names (no SHA-1)"
7359 msgstr "只打印名称(无 SHA-1)"
7361 #: builtin/name-rev.c:310
7362 msgid "only use tags to name the commits"
7363 msgstr "只使用 tags 来命名提交"
7365 #: builtin/name-rev.c:312
7366 msgid "only use refs matching <pattern>"
7367 msgstr "只使用和 <模式> 相匹配的引用"
7369 #: builtin/name-rev.c:314
7370 msgid "list all commits reachable from all refs"
7371 msgstr "列出可以从所有引用访问的提交"
7373 #: builtin/name-rev.c:315
7374 msgid "read from stdin"
7377 #: builtin/name-rev.c:316
7378 msgid "allow to print `undefined` names (default)"
7379 msgstr "允许打印 `未定义` 的名称(默认)"
7381 #: builtin/name-rev.c:322
7382 msgid "dereference tags in the input (internal use)"
7383 msgstr "反向解析输入中的 tags(内部使用)"
7385 #: builtin/notes.c:24
7386 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7387 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7389 #: builtin/notes.c:25
7391 "git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7392 "| (-c | -C) <object>] [<object>]"
7394 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7395 "| (-c | -C) <对象>] [<对象>]"
7397 #: builtin/notes.c:26
7398 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7399 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7401 #: builtin/notes.c:27
7403 "git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7404 "(-c | -C) <object>] [<object>]"
7406 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7407 "(-c | -C) <对象>] [<对象>]"
7409 #: builtin/notes.c:28
7410 msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
7411 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7413 #: builtin/notes.c:29
7414 msgid "git notes [--ref <notes_ref>] show [<object>]"
7415 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7417 #: builtin/notes.c:30
7419 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7420 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7422 #: builtin/notes.c:31
7423 msgid "git notes merge --commit [-v | -q]"
7424 msgstr "git notes merge --commit [-v | -q]"
7426 #: builtin/notes.c:32
7427 msgid "git notes merge --abort [-v | -q]"
7428 msgstr "git notes merge --abort [-v | -q]"
7430 #: builtin/notes.c:33
7431 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7432 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7434 #: builtin/notes.c:34
7435 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7436 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7438 #: builtin/notes.c:35
7439 msgid "git notes [--ref <notes_ref>] get-ref"
7440 msgstr "git notes [--ref <注解引用>] get-ref"
7442 #: builtin/notes.c:40
7443 msgid "git notes [list [<object>]]"
7444 msgstr "git notes [list [<对象>]]"
7446 #: builtin/notes.c:45
7447 msgid "git notes add [<options>] [<object>]"
7448 msgstr "git notes add [<选项>] [<对象>]"
7450 #: builtin/notes.c:50
7451 msgid "git notes copy [<options>] <from-object> <to-object>"
7452 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7454 #: builtin/notes.c:51
7455 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7456 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7458 #: builtin/notes.c:56
7459 msgid "git notes append [<options>] [<object>]"
7460 msgstr "git notes append [<选项>] [<对象>]"
7462 #: builtin/notes.c:61
7463 msgid "git notes edit [<object>]"
7464 msgstr "git notes edit [<对象>]"
7466 #: builtin/notes.c:66
7467 msgid "git notes show [<object>]"
7468 msgstr "git notes show [<对象>]"
7470 #: builtin/notes.c:71
7471 msgid "git notes merge [<options>] <notes_ref>"
7472 msgstr "git notes merge [<选项>] <注解引用>"
7474 #: builtin/notes.c:72
7475 msgid "git notes merge --commit [<options>]"
7476 msgstr "git notes merge --commit [<选项>]"
7478 #: builtin/notes.c:73
7479 msgid "git notes merge --abort [<options>]"
7480 msgstr "git notes merge --abort [<选项>]"
7482 #: builtin/notes.c:78
7483 msgid "git notes remove [<object>]"
7484 msgstr "git notes remove [<对象>]"
7486 #: builtin/notes.c:83
7487 msgid "git notes prune [<options>]"
7488 msgstr "git notes prune [<选项>]"
7490 #: builtin/notes.c:88
7491 msgid "git notes get-ref"
7492 msgstr "git notes get-ref"
7494 #: builtin/notes.c:146
7496 msgid "unable to start 'show' for object '%s'"
7497 msgstr "不能为对象 '%s' 开始 'show'"
7499 #: builtin/notes.c:150
7500 msgid "could not read 'show' output"
7501 msgstr "不能读取 'show' 的输出"
7503 #: builtin/notes.c:158
7505 msgid "failed to finish 'show' for object '%s'"
7506 msgstr "无法为对象 '%s' 完成 'show'"
7508 #: builtin/notes.c:173 builtin/tag.c:477
7510 msgid "could not create file '%s'"
7511 msgstr "不能创建文件 '%s'"
7513 #: builtin/notes.c:192
7514 msgid "Please supply the note contents using either -m or -F option"
7515 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7517 #: builtin/notes.c:201
7518 msgid "unable to write note object"
7521 #: builtin/notes.c:203
7523 msgid "The note contents have been left in %s"
7524 msgstr "注解内容被留在 %s 中"
7526 #: builtin/notes.c:231 builtin/tag.c:693
7528 msgid "cannot read '%s'"
7531 #: builtin/notes.c:233 builtin/tag.c:696
7533 msgid "could not open or read '%s'"
7534 msgstr "不能打开或读取 '%s'"
7536 #: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7537 #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7538 #: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7539 #: builtin/notes.c:854 builtin/tag.c:709
7541 msgid "Failed to resolve '%s' as a valid ref."
7542 msgstr "无法解析 '%s' 为一个有效引用。"
7544 #: builtin/notes.c:255
7546 msgid "Failed to read object '%s'."
7547 msgstr "无法读取对象 '%s'。"
7549 #: builtin/notes.c:259
7551 msgid "Cannot read note data from non-blob object '%s'."
7552 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7554 #: builtin/notes.c:299
7556 msgid "Malformed input line: '%s'."
7557 msgstr "非法的输入行:'%s'。"
7559 #: builtin/notes.c:314
7561 msgid "Failed to copy notes from '%s' to '%s'"
7562 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7564 #: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7565 #: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7566 #: builtin/notes.c:919
7567 msgid "too many parameters"
7570 #: builtin/notes.c:371 builtin/notes.c:658
7572 msgid "No note found for object %s."
7573 msgstr "未发现对象 %s 的注解。"
7575 #: builtin/notes.c:392 builtin/notes.c:555
7576 msgid "note contents as a string"
7577 msgstr "注解内容作为一个字符串"
7579 #: builtin/notes.c:395 builtin/notes.c:558
7580 msgid "note contents in a file"
7583 #: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7584 #: builtin/notes.c:563 builtin/tag.c:628
7588 #: builtin/notes.c:398 builtin/notes.c:561
7589 msgid "reuse and edit specified note object"
7590 msgstr "重用和编辑指定的注解对象"
7592 #: builtin/notes.c:401 builtin/notes.c:564
7593 msgid "reuse specified note object"
7596 #: builtin/notes.c:404 builtin/notes.c:567
7597 msgid "allow storing empty note"
7600 #: builtin/notes.c:405 builtin/notes.c:476
7601 msgid "replace existing notes"
7604 #: builtin/notes.c:430
7607 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7609 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7611 #: builtin/notes.c:445 builtin/notes.c:524
7613 msgid "Overwriting existing notes for object %s\n"
7614 msgstr "覆盖对象 %s 现存注解\n"
7616 #: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7618 msgid "Removing note for object %s\n"
7619 msgstr "删除对象 %s 的注解\n"
7621 #: builtin/notes.c:477
7622 msgid "read objects from stdin"
7625 #: builtin/notes.c:479
7626 msgid "load rewriting config for <command> (implies --stdin)"
7627 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7629 #: builtin/notes.c:497
7630 msgid "too few parameters"
7633 #: builtin/notes.c:518
7636 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7638 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7640 #: builtin/notes.c:530
7642 msgid "Missing notes on source object %s. Cannot copy."
7643 msgstr "源对象 %s 缺少注解。不能拷贝。"
7645 #: builtin/notes.c:582
7648 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7649 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7651 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7652 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7654 #: builtin/notes.c:750
7655 msgid "General options"
7658 #: builtin/notes.c:752
7659 msgid "Merge options"
7662 #: builtin/notes.c:754
7664 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7666 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7668 #: builtin/notes.c:756
7669 msgid "Committing unmerged notes"
7672 #: builtin/notes.c:758
7673 msgid "finalize notes merge by committing unmerged notes"
7674 msgstr "通过提交未合并的注解来完成注解合并"
7676 #: builtin/notes.c:760
7677 msgid "Aborting notes merge resolution"
7680 #: builtin/notes.c:762
7681 msgid "abort notes merge"
7684 #: builtin/notes.c:857
7686 msgid "Object %s has no note\n"
7687 msgstr "对象 %s 没有注解\n"
7689 #: builtin/notes.c:869
7690 msgid "attempt to remove non-existent note is not an error"
7691 msgstr "尝试删除不存在的注解不是一个错误"
7693 #: builtin/notes.c:872
7694 msgid "read object names from the standard input"
7695 msgstr "从标准输入读取对象名称"
7697 #: builtin/notes.c:953
7701 #: builtin/notes.c:954
7702 msgid "use notes from <notes_ref>"
7703 msgstr "从 <注解引用> 使用注解"
7705 #: builtin/notes.c:989 builtin/remote.c:1621
7707 msgid "Unknown subcommand: %s"
7710 #: builtin/pack-objects.c:28
7711 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7712 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7714 #: builtin/pack-objects.c:29
7715 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7716 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7718 #: builtin/pack-objects.c:177 builtin/pack-objects.c:180
7720 msgid "deflate error (%d)"
7723 #: builtin/pack-objects.c:773
7724 msgid "Writing objects"
7727 #: builtin/pack-objects.c:1015
7728 msgid "disabling bitmap writing, as some objects are not being packed"
7729 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7731 #: builtin/pack-objects.c:2175
7732 msgid "Compressing objects"
7735 #: builtin/pack-objects.c:2572
7737 msgid "unsupported index version %s"
7738 msgstr "不支持的索引版本 %s"
7740 #: builtin/pack-objects.c:2576
7742 msgid "bad index version '%s'"
7743 msgstr "坏的索引版本 '%s'"
7745 #: builtin/pack-objects.c:2599
7747 msgid "option %s does not accept negative form"
7748 msgstr "选项 %s 不接受否定格式"
7750 #: builtin/pack-objects.c:2603
7752 msgid "unable to parse value '%s' for option %s"
7753 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7755 #: builtin/pack-objects.c:2623
7756 msgid "do not show progress meter"
7759 #: builtin/pack-objects.c:2625
7760 msgid "show progress meter"
7763 #: builtin/pack-objects.c:2627
7764 msgid "show progress meter during object writing phase"
7765 msgstr "在对象写入阶段显示进度表"
7767 #: builtin/pack-objects.c:2630
7768 msgid "similar to --all-progress when progress meter is shown"
7769 msgstr "当进度表显示时类似于 --all-progress"
7771 #: builtin/pack-objects.c:2631
7772 msgid "version[,offset]"
7775 #: builtin/pack-objects.c:2632
7776 msgid "write the pack index file in the specified idx format version"
7777 msgstr "用指定的 idx 格式版本来写包索引文件"
7779 #: builtin/pack-objects.c:2635
7780 msgid "maximum size of each output pack file"
7783 #: builtin/pack-objects.c:2637
7784 msgid "ignore borrowed objects from alternate object store"
7785 msgstr "忽略从替代对象存储里借用对象"
7787 #: builtin/pack-objects.c:2639
7788 msgid "ignore packed objects"
7791 #: builtin/pack-objects.c:2641
7792 msgid "limit pack window by objects"
7795 #: builtin/pack-objects.c:2643
7796 msgid "limit pack window by memory in addition to object limit"
7797 msgstr "除对象数量限制外设置打包窗口的内存限制"
7799 #: builtin/pack-objects.c:2645
7800 msgid "maximum length of delta chain allowed in the resulting pack"
7801 msgstr "打包允许的 delta 链的最大长度"
7803 #: builtin/pack-objects.c:2647
7804 msgid "reuse existing deltas"
7805 msgstr "重用已存在的 deltas"
7807 #: builtin/pack-objects.c:2649
7808 msgid "reuse existing objects"
7811 #: builtin/pack-objects.c:2651
7812 msgid "use OFS_DELTA objects"
7813 msgstr "使用 OFS_DELTA 对象"
7815 #: builtin/pack-objects.c:2653
7816 msgid "use threads when searching for best delta matches"
7817 msgstr "使用线程查询最佳 delta 匹配"
7819 #: builtin/pack-objects.c:2655
7820 msgid "do not create an empty pack output"
7823 #: builtin/pack-objects.c:2657
7824 msgid "read revision arguments from standard input"
7825 msgstr "从标准输入读取版本号参数"
7827 #: builtin/pack-objects.c:2659
7828 msgid "limit the objects to those that are not yet packed"
7829 msgstr "限制那些尚未打包的对象"
7831 #: builtin/pack-objects.c:2662
7832 msgid "include objects reachable from any reference"
7833 msgstr "包括可以从任何引用访问到的对象"
7835 #: builtin/pack-objects.c:2665
7836 msgid "include objects referred by reflog entries"
7837 msgstr "包括被引用日志引用到的对象"
7839 #: builtin/pack-objects.c:2668
7840 msgid "include objects referred to by the index"
7841 msgstr "包括被索引引用到的对象"
7843 #: builtin/pack-objects.c:2671
7844 msgid "output pack to stdout"
7847 #: builtin/pack-objects.c:2673
7848 msgid "include tag objects that refer to objects to be packed"
7849 msgstr "包括引用了打包对象的 tag"
7851 #: builtin/pack-objects.c:2675
7852 msgid "keep unreachable objects"
7855 #: builtin/pack-objects.c:2676 parse-options.h:140
7859 #: builtin/pack-objects.c:2677
7860 msgid "unpack unreachable objects newer than <time>"
7861 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7863 #: builtin/pack-objects.c:2680
7864 msgid "create thin packs"
7867 #: builtin/pack-objects.c:2682
7868 msgid "create packs suitable for shallow fetches"
7869 msgstr "创建适合浅克隆版本库获取的包"
7871 #: builtin/pack-objects.c:2684
7872 msgid "ignore packs that have companion .keep file"
7873 msgstr "忽略配有 .keep 文件的包"
7875 #: builtin/pack-objects.c:2686
7876 msgid "pack compression level"
7879 #: builtin/pack-objects.c:2688
7880 msgid "do not hide commits by grafts"
7883 #: builtin/pack-objects.c:2690
7884 msgid "use a bitmap index if available to speed up counting objects"
7885 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7887 #: builtin/pack-objects.c:2692
7888 msgid "write a bitmap index together with the pack index"
7889 msgstr "在建立包索引的同时创建 bitmap 索引"
7891 #: builtin/pack-objects.c:2783
7892 msgid "Counting objects"
7895 #: builtin/pack-refs.c:6
7896 msgid "git pack-refs [options]"
7897 msgstr "git pack-refs [选项]"
7899 #: builtin/pack-refs.c:14
7900 msgid "pack everything"
7903 #: builtin/pack-refs.c:15
7904 msgid "prune loose refs (default)"
7905 msgstr "清除松散的引用(默认)"
7907 #: builtin/prune-packed.c:7
7908 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7909 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7911 #: builtin/prune-packed.c:40
7912 msgid "Removing duplicate objects"
7915 #: builtin/prune.c:12
7916 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7917 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7919 #: builtin/prune.c:106
7920 msgid "do not remove, show only"
7923 #: builtin/prune.c:107
7924 msgid "report pruned objects"
7927 #: builtin/prune.c:110
7928 msgid "expire objects older than <time>"
7929 msgstr "使早于给定时间的对象过期"
7931 #: builtin/push.c:14
7932 msgid "git push [<options>] [<repository> [<refspec>...]]"
7933 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7935 #: builtin/push.c:85
7936 msgid "tag shorthand without <tag>"
7937 msgstr "tag 后面未提供 <标签> 参数"
7939 #: builtin/push.c:95
7940 msgid "--delete only accepts plain target ref names"
7941 msgstr "--delete 只接受简单的目标引用名"
7943 #: builtin/push.c:139
7946 "To choose either option permanently, see push.default in 'git help config'."
7949 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7951 #: builtin/push.c:142
7954 "The upstream branch of your current branch does not match\n"
7955 "the name of your current branch. To push to the upstream branch\n"
7956 "on the remote, use\n"
7958 " git push %s HEAD:%s\n"
7960 "To push to the branch of the same name on the remote, use\n"
7965 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7968 " git push %s HEAD:%s\n"
7975 #: builtin/push.c:157
7978 "You are not currently on a branch.\n"
7979 "To push the history leading to the current (detached HEAD)\n"
7982 " git push %s HEAD:<name-of-remote-branch>\n"
7985 "现在为推送当前(分离头指针)的历史,使用\n"
7987 " git push %s HEAD:<远程分支名字>\n"
7989 #: builtin/push.c:171
7992 "The current branch %s has no upstream branch.\n"
7993 "To push the current branch and set the remote as upstream, use\n"
7995 " git push --set-upstream %s %s\n"
7997 "当前分支 %s 没有对应的上游分支。\n"
7998 "为推送当前分支并建立与远程上游的跟踪,使用\n"
8000 " git push --set-upstream %s %s\n"
8002 #: builtin/push.c:179
8004 msgid "The current branch %s has multiple upstream branches, refusing to push."
8005 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8007 #: builtin/push.c:182
8010 "You are pushing to remote '%s', which is not the upstream of\n"
8011 "your current branch '%s', without telling me what to push\n"
8012 "to update which remote branch."
8014 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8015 "而没有告诉我要推送什么、更新哪个远程分支。"
8017 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
8018 #: builtin/push.c:205
8020 "push.default is unset; its implicit value has changed in\n"
8021 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
8022 "and maintain the traditional behavior, use:\n"
8024 " git config --global push.default matching\n"
8026 "To squelch this message and adopt the new behavior now, use:\n"
8028 " git config --global push.default simple\n"
8030 "When push.default is set to 'matching', git will push local branches\n"
8031 "to the remote branches that already exist with the same name.\n"
8033 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
8034 "behavior, which only pushes the current branch to the corresponding\n"
8035 "remote branch that 'git pull' uses to update the current branch.\n"
8037 "See 'git help config' and search for 'push.default' for further "
8039 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8040 "'current' instead of 'simple' if you sometimes use older versions of Git)"
8042 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
8043 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
8045 " git config --global push.default matching\n"
8047 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8049 " git config --global push.default simple\n"
8051 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8054 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8055 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8057 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8058 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
8059 "为保持兼容,请用 'current' 代替 'simple')"
8061 #: builtin/push.c:272
8063 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
8064 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
8066 #: builtin/push.c:279
8068 "Updates were rejected because the tip of your current branch is behind\n"
8069 "its remote counterpart. Integrate the remote changes (e.g.\n"
8070 "'git pull ...') before pushing again.\n"
8071 "See the 'Note about fast-forwards' in 'git push --help' for details."
8073 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
8074 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
8075 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8077 #: builtin/push.c:285
8079 "Updates were rejected because a pushed branch tip is behind its remote\n"
8080 "counterpart. Check out this branch and integrate the remote changes\n"
8081 "(e.g. 'git pull ...') before pushing again.\n"
8082 "See the 'Note about fast-forwards' in 'git push --help' for details."
8084 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
8085 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
8086 "'git push --help' 中的 'Note about fast-forwards' 小节。"
8088 #: builtin/push.c:291
8090 "Updates were rejected because the remote contains work that you do\n"
8091 "not have locally. This is usually caused by another repository pushing\n"
8092 "to the same ref. You may want to first integrate the remote changes\n"
8093 "(e.g., 'git pull ...') before pushing again.\n"
8094 "See the 'Note about fast-forwards' in 'git push --help' for details."
8096 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
8097 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8098 "(如 'git pull ...')。\n"
8099 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8101 #: builtin/push.c:298
8102 msgid "Updates were rejected because the tag already exists in the remote."
8103 msgstr "更新被拒绝因为 tag 在远程已经存在。"
8105 #: builtin/push.c:301
8107 "You cannot update a remote ref that points at a non-commit object,\n"
8108 "or update a remote ref to make it point at a non-commit object,\n"
8109 "without using the '--force' option.\n"
8111 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8112 "也不能更新远程引用让其指向一个非提交对象。\n"
8114 #: builtin/push.c:360
8116 msgid "Pushing to %s\n"
8119 #: builtin/push.c:364
8121 msgid "failed to push some refs to '%s'"
8122 msgstr "无法推送一些引用到 '%s'"
8124 #: builtin/push.c:394
8126 msgid "bad repository '%s'"
8129 #: builtin/push.c:395
8131 "No configured push destination.\n"
8132 "Either specify the URL from the command-line or configure a remote "
8133 "repository using\n"
8135 " git remote add <name> <url>\n"
8137 "and then push using the remote name\n"
8139 " git push <name>\n"
8142 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
8144 " git remote add <名称> <地址>\n"
8150 #: builtin/push.c:410
8151 msgid "--all and --tags are incompatible"
8152 msgstr "--all 和 --tags 不兼容"
8154 #: builtin/push.c:411
8155 msgid "--all can't be combined with refspecs"
8156 msgstr "--all 不能和引用规则同时使用"
8158 #: builtin/push.c:416
8159 msgid "--mirror and --tags are incompatible"
8160 msgstr "--mirror 和 --tags 不兼容"
8162 #: builtin/push.c:417
8163 msgid "--mirror can't be combined with refspecs"
8164 msgstr "--mirror 不能和引用规则同时使用"
8166 #: builtin/push.c:422
8167 msgid "--all and --mirror are incompatible"
8168 msgstr "--all 和 --mirror 不兼容"
8170 #: builtin/push.c:493
8174 #: builtin/push.c:494
8175 msgid "push all refs"
8178 #: builtin/push.c:495
8179 msgid "mirror all refs"
8182 #: builtin/push.c:497
8186 #: builtin/push.c:498
8187 msgid "push tags (can't be used with --all or --mirror)"
8188 msgstr "推送 tags(不能使用 --all or --mirror)"
8190 #: builtin/push.c:501
8191 msgid "force updates"
8194 #: builtin/push.c:503
8195 msgid "refname>:<expect"
8198 #: builtin/push.c:504
8199 msgid "require old value of ref to be at this value"
8200 msgstr "要求引用旧的取值为设定值"
8202 #: builtin/push.c:507
8203 msgid "control recursive pushing of submodules"
8206 #: builtin/push.c:509
8207 msgid "use thin pack"
8210 #: builtin/push.c:510 builtin/push.c:511
8211 msgid "receive pack program"
8214 #: builtin/push.c:512
8215 msgid "set upstream for git pull/status"
8216 msgstr "设置 git pull/status 的上游"
8218 #: builtin/push.c:515
8219 msgid "prune locally removed refs"
8222 #: builtin/push.c:517
8223 msgid "bypass pre-push hook"
8224 msgstr "绕过 pre-push 钩子"
8226 #: builtin/push.c:518
8227 msgid "push missing but relevant tags"
8228 msgstr "推送缺失的有关的 tags"
8230 #: builtin/push.c:520
8231 msgid "GPG sign the push"
8232 msgstr "用 GPG 为推送签名"
8234 #: builtin/push.c:529
8235 msgid "--delete is incompatible with --all, --mirror and --tags"
8236 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8238 #: builtin/push.c:531
8239 msgid "--delete doesn't make sense without any refs"
8240 msgstr "--delete 未接任何引用没有意义"
8242 #: builtin/read-tree.c:37
8244 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8245 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8246 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8248 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8249 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8250 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8252 #: builtin/read-tree.c:110
8253 msgid "write resulting index to <file>"
8254 msgstr "将索引结果写入 <文件>"
8256 #: builtin/read-tree.c:113
8257 msgid "only empty the index"
8260 #: builtin/read-tree.c:115
8264 #: builtin/read-tree.c:117
8265 msgid "perform a merge in addition to a read"
8266 msgstr "读取之余再执行一个合并"
8268 #: builtin/read-tree.c:119
8269 msgid "3-way merge if no file level merging required"
8270 msgstr "如果没有文件级合并需要,执行三路合并"
8272 #: builtin/read-tree.c:121
8273 msgid "3-way merge in presence of adds and removes"
8274 msgstr "存在添加和删除时,也执行三路合并"
8276 #: builtin/read-tree.c:123
8277 msgid "same as -m, but discard unmerged entries"
8278 msgstr "类似于 -m,但丢弃未合并的条目"
8280 #: builtin/read-tree.c:124
8281 msgid "<subdirectory>/"
8284 #: builtin/read-tree.c:125
8285 msgid "read the tree into the index under <subdirectory>/"
8286 msgstr "读取树对象到索引的 <子目录>/ 下"
8288 #: builtin/read-tree.c:128
8289 msgid "update working tree with merge result"
8290 msgstr "用合并的结果更新工作区"
8292 #: builtin/read-tree.c:130
8296 #: builtin/read-tree.c:131
8297 msgid "allow explicitly ignored files to be overwritten"
8298 msgstr "允许忽略文件中设定的文件可以被覆盖"
8300 #: builtin/read-tree.c:134
8301 msgid "don't check the working tree after merging"
8304 #: builtin/read-tree.c:135
8305 msgid "don't update the index or the work tree"
8308 #: builtin/read-tree.c:137
8309 msgid "skip applying sparse checkout filter"
8310 msgstr "跳过应用稀疏检出过滤器"
8312 #: builtin/read-tree.c:139
8313 msgid "debug unpack-trees"
8314 msgstr "调试 unpack-trees"
8316 #: builtin/reflog.c:499
8318 msgid "%s' for '%s' is not a valid timestamp"
8319 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8321 #: builtin/reflog.c:615 builtin/reflog.c:620
8323 msgid "'%s' is not a valid timestamp"
8324 msgstr "'%s' 不是一个有效的时间戳"
8326 #: builtin/remote.c:12
8327 msgid "git remote [-v | --verbose]"
8328 msgstr "git remote [-v | --verbose]"
8330 #: builtin/remote.c:13
8332 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8333 "mirror=<fetch|push>] <name> <url>"
8335 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8336 "mirror=<fetch|push>] <名称> <地址>"
8338 #: builtin/remote.c:14 builtin/remote.c:33
8339 msgid "git remote rename <old> <new>"
8340 msgstr "git remote rename <旧名称> <新名称>"
8342 #: builtin/remote.c:15 builtin/remote.c:38
8343 msgid "git remote remove <name>"
8344 msgstr "git remote remove <名称>"
8346 #: builtin/remote.c:16
8347 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8348 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8350 #: builtin/remote.c:17
8351 msgid "git remote [-v | --verbose] show [-n] <name>"
8352 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8354 #: builtin/remote.c:18
8355 msgid "git remote prune [-n | --dry-run] <name>"
8356 msgstr "git remote prune [-n | --dry-run] <名称>"
8358 #: builtin/remote.c:19
8360 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8361 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8363 #: builtin/remote.c:20
8364 msgid "git remote set-branches [--add] <name> <branch>..."
8365 msgstr "git remote set-branches [--add] <名称> <分支>..."
8367 #: builtin/remote.c:21 builtin/remote.c:69
8368 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8369 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8371 #: builtin/remote.c:22 builtin/remote.c:70
8372 msgid "git remote set-url --add <name> <newurl>"
8373 msgstr "git remote set-url --add <名称> <新的地址>"
8375 #: builtin/remote.c:23 builtin/remote.c:71
8376 msgid "git remote set-url --delete <name> <url>"
8377 msgstr "git remote set-url --delete <名称> <地址>"
8379 #: builtin/remote.c:28
8380 msgid "git remote add [<options>] <name> <url>"
8381 msgstr "git remote add [<选项>] <名称> <地址>"
8383 #: builtin/remote.c:43
8384 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8385 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8387 #: builtin/remote.c:48
8388 msgid "git remote set-branches <name> <branch>..."
8389 msgstr "git remote set-branches <名称> <分支>..."
8391 #: builtin/remote.c:49
8392 msgid "git remote set-branches --add <name> <branch>..."
8393 msgstr "git remote set-branches --add <名称> <分支>..."
8395 #: builtin/remote.c:54
8396 msgid "git remote show [<options>] <name>"
8397 msgstr "git remote show [<选项>] <名称>"
8399 #: builtin/remote.c:59
8400 msgid "git remote prune [<options>] <name>"
8401 msgstr "git remote prune [<选项>] <名称>"
8403 #: builtin/remote.c:64
8404 msgid "git remote update [<options>] [<group> | <remote>]..."
8405 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8407 #: builtin/remote.c:88
8412 #: builtin/remote.c:120
8414 "--mirror is dangerous and deprecated; please\n"
8415 "\t use --mirror=fetch or --mirror=push instead"
8417 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8418 "\t 或 --mirror=push"
8420 #: builtin/remote.c:137
8422 msgid "unknown mirror argument: %s"
8425 #: builtin/remote.c:153
8426 msgid "fetch the remote branches"
8429 #: builtin/remote.c:155
8430 msgid "import all tags and associated objects when fetching"
8431 msgstr "抓取时导入所有的 tags 和关联对象"
8433 #: builtin/remote.c:158
8434 msgid "or do not fetch any tag at all (--no-tags)"
8435 msgstr "或不抓取任何 tag(--no-tags)"
8437 #: builtin/remote.c:160
8438 msgid "branch(es) to track"
8441 #: builtin/remote.c:161
8442 msgid "master branch"
8445 #: builtin/remote.c:162
8449 #: builtin/remote.c:163
8450 msgid "set up remote as a mirror to push to or fetch from"
8451 msgstr "把远程设置为用以推送或抓取的镜像"
8453 #: builtin/remote.c:175
8454 msgid "specifying a master branch makes no sense with --mirror"
8455 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8457 #: builtin/remote.c:177
8458 msgid "specifying branches to track makes sense only with fetch mirrors"
8459 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8461 #: builtin/remote.c:187 builtin/remote.c:643
8463 msgid "remote %s already exists."
8464 msgstr "远程 %s 已经存在。"
8466 #: builtin/remote.c:191 builtin/remote.c:647
8468 msgid "'%s' is not a valid remote name"
8469 msgstr "'%s' 不是一个有效的远程名称"
8471 #: builtin/remote.c:235
8473 msgid "Could not setup master '%s'"
8474 msgstr "无法设置 master '%s'"
8476 #: builtin/remote.c:335
8478 msgid "Could not get fetch map for refspec %s"
8479 msgstr "无法得到引用规则 %s 的获取列表"
8481 #: builtin/remote.c:436 builtin/remote.c:444
8485 #: builtin/remote.c:448
8489 #: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
8491 msgid "Could not append '%s' to '%s'"
8492 msgstr "不能添加 '%s' 至 '%s'"
8494 #: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
8496 msgid "No such remote: %s"
8499 #: builtin/remote.c:653
8501 msgid "Could not rename config section '%s' to '%s'"
8502 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8504 #: builtin/remote.c:659 builtin/remote.c:847
8506 msgid "Could not remove config section '%s'"
8507 msgstr "不能移除配置小节 '%s'"
8509 #: builtin/remote.c:674
8512 "Not updating non-default fetch refspec\n"
8514 "\tPlease update the configuration manually if necessary."
8520 #: builtin/remote.c:680
8522 msgid "Could not append '%s'"
8525 #: builtin/remote.c:691
8527 msgid "Could not set '%s'"
8530 #: builtin/remote.c:713
8532 msgid "deleting '%s' failed"
8535 #: builtin/remote.c:747
8537 msgid "creating '%s' failed"
8540 #: builtin/remote.c:766
8542 msgid "Could not remove branch %s"
8545 #: builtin/remote.c:833
8547 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8548 "to delete it, use:"
8550 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8551 "to delete them, use:"
8552 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8553 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8555 #: builtin/remote.c:948
8557 msgid " new (next fetch will store in remotes/%s)"
8558 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8560 #: builtin/remote.c:951
8564 #: builtin/remote.c:953
8565 msgid " stale (use 'git remote prune' to remove)"
8566 msgstr " 过时(使用 'git remote prune' 来移除)"
8568 #: builtin/remote.c:955
8572 #: builtin/remote.c:996
8574 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8575 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8577 #: builtin/remote.c:1003
8579 msgid "rebases onto remote %s"
8582 #: builtin/remote.c:1006
8584 msgid " merges with remote %s"
8587 #: builtin/remote.c:1007
8588 msgid " and with remote"
8591 #: builtin/remote.c:1009
8593 msgid "merges with remote %s"
8596 #: builtin/remote.c:1010
8597 msgid " and with remote"
8600 #: builtin/remote.c:1056
8604 #: builtin/remote.c:1059
8608 #: builtin/remote.c:1063
8612 #: builtin/remote.c:1066
8613 msgid "fast-forwardable"
8616 #: builtin/remote.c:1069
8617 msgid "local out of date"
8620 #: builtin/remote.c:1076
8622 msgid " %-*s forces to %-*s (%s)"
8623 msgstr " %-*s 强制推送至 %-*s (%s)"
8625 #: builtin/remote.c:1079
8627 msgid " %-*s pushes to %-*s (%s)"
8628 msgstr " %-*s 推送至 %-*s (%s)"
8630 #: builtin/remote.c:1083
8632 msgid " %-*s forces to %s"
8633 msgstr " %-*s 强制推送至 %s"
8635 #: builtin/remote.c:1086
8637 msgid " %-*s pushes to %s"
8638 msgstr " %-*s 推送至 %s"
8640 #: builtin/remote.c:1154
8641 msgid "do not query remotes"
8644 #: builtin/remote.c:1181
8649 #: builtin/remote.c:1182
8651 msgid " Fetch URL: %s"
8654 #: builtin/remote.c:1183 builtin/remote.c:1334
8658 #: builtin/remote.c:1192 builtin/remote.c:1194
8660 msgid " Push URL: %s"
8663 #: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
8665 msgid " HEAD branch: %s"
8668 #: builtin/remote.c:1202
8671 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8672 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8674 #: builtin/remote.c:1214
8676 msgid " Remote branch:%s"
8677 msgid_plural " Remote branches:%s"
8678 msgstr[0] " 远程分支:%s"
8679 msgstr[1] " 远程分支:%s"
8681 # 译者:中文字符串拼接,可删除前导空格
8682 #: builtin/remote.c:1217 builtin/remote.c:1244
8683 msgid " (status not queried)"
8686 #: builtin/remote.c:1226
8687 msgid " Local branch configured for 'git pull':"
8688 msgid_plural " Local branches configured for 'git pull':"
8689 msgstr[0] " 为 'git pull' 配置的本地分支:"
8690 msgstr[1] " 为 'git pull' 配置的本地分支:"
8692 #: builtin/remote.c:1234
8693 msgid " Local refs will be mirrored by 'git push'"
8694 msgstr " 本地引用将在 'git push' 时被镜像"
8696 #: builtin/remote.c:1241
8698 msgid " Local ref configured for 'git push'%s:"
8699 msgid_plural " Local refs configured for 'git push'%s:"
8700 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8701 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8703 #: builtin/remote.c:1262
8704 msgid "set refs/remotes/<name>/HEAD according to remote"
8705 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8707 #: builtin/remote.c:1264
8708 msgid "delete refs/remotes/<name>/HEAD"
8709 msgstr "删除 refs/remotes/<名称>/HEAD"
8711 #: builtin/remote.c:1279
8712 msgid "Cannot determine remote HEAD"
8713 msgstr "无法确定远程 HEAD"
8715 #: builtin/remote.c:1281
8716 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8717 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8719 #: builtin/remote.c:1291
8721 msgid "Could not delete %s"
8724 #: builtin/remote.c:1299
8726 msgid "Not a valid ref: %s"
8727 msgstr "不是一个有效引用:%s"
8729 #: builtin/remote.c:1301
8731 msgid "Could not setup %s"
8735 #: builtin/remote.c:1319
8737 msgid " %s will become dangling!"
8738 msgstr " %s 将成为摇摆状态!"
8741 #: builtin/remote.c:1320
8743 msgid " %s has become dangling!"
8744 msgstr " %s 已成为摇摆状态!"
8746 #: builtin/remote.c:1330
8751 #: builtin/remote.c:1331
8756 #: builtin/remote.c:1354
8758 msgid " * [would prune] %s"
8759 msgstr " * [将删除] %s"
8761 #: builtin/remote.c:1357
8763 msgid " * [pruned] %s"
8764 msgstr " * [已删除] %s"
8766 #: builtin/remote.c:1402
8767 msgid "prune remotes after fetching"
8770 #: builtin/remote.c:1468 builtin/remote.c:1542
8772 msgid "No such remote '%s'"
8775 #: builtin/remote.c:1488
8779 #: builtin/remote.c:1495
8780 msgid "no remote specified"
8783 #: builtin/remote.c:1517
8784 msgid "manipulate push URLs"
8787 #: builtin/remote.c:1519
8791 #: builtin/remote.c:1521
8795 #: builtin/remote.c:1528
8796 msgid "--add --delete doesn't make sense"
8797 msgstr "--add --delete 无意义"
8799 #: builtin/remote.c:1568
8801 msgid "Invalid old URL pattern: %s"
8802 msgstr "无效的旧URL匹配模版:%s"
8804 #: builtin/remote.c:1576
8806 msgid "No such URL found: %s"
8809 #: builtin/remote.c:1578
8810 msgid "Will not delete all non-push URLs"
8811 msgstr "将不会删除所有非推送URL地址"
8813 #: builtin/remote.c:1592
8814 msgid "be verbose; must be placed before a subcommand"
8815 msgstr "冗长输出;必须置于子命令之前"
8817 #: builtin/repack.c:17
8818 msgid "git repack [options]"
8819 msgstr "git repack [选项]"
8821 #: builtin/repack.c:159
8822 msgid "pack everything in a single pack"
8823 msgstr "所有内容打包到一个包文件中"
8825 #: builtin/repack.c:161
8826 msgid "same as -a, and turn unreachable objects loose"
8827 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8829 #: builtin/repack.c:164
8830 msgid "remove redundant packs, and run git-prune-packed"
8831 msgstr "删除多余的包,运行 git-prune-packed"
8833 #: builtin/repack.c:166
8834 msgid "pass --no-reuse-delta to git-pack-objects"
8835 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8837 #: builtin/repack.c:168
8838 msgid "pass --no-reuse-object to git-pack-objects"
8839 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8841 #: builtin/repack.c:170
8842 msgid "do not run git-update-server-info"
8843 msgstr "不运行 git-update-server-info"
8845 #: builtin/repack.c:173
8846 msgid "pass --local to git-pack-objects"
8847 msgstr "向 git-pack-objects 传递参数 --local"
8849 #: builtin/repack.c:175
8850 msgid "write bitmap index"
8851 msgstr "写 bitmap 索引"
8853 #: builtin/repack.c:176
8857 #: builtin/repack.c:177
8858 msgid "with -A, do not loosen objects older than this"
8859 msgstr "使用 -A,不要将早于给定时间的对象过期"
8861 #: builtin/repack.c:179
8862 msgid "size of the window used for delta compression"
8865 #: builtin/repack.c:180 builtin/repack.c:184
8869 #: builtin/repack.c:181
8870 msgid "same as the above, but limit memory size instead of entries count"
8871 msgstr "和上面的相似,但限制内存大小而非条目数"
8873 #: builtin/repack.c:183
8874 msgid "limits the maximum delta depth"
8877 #: builtin/repack.c:185
8878 msgid "maximum size of each packfile"
8881 #: builtin/repack.c:187
8882 msgid "repack objects in packs marked with .keep"
8883 msgstr "对标记为 .keep 的包中的对象重新打包"
8885 #: builtin/repack.c:371
8887 msgid "removing '%s' failed"
8890 #: builtin/replace.c:19
8891 msgid "git replace [-f] <object> <replacement>"
8892 msgstr "git replace [-f] <对象> <替换物>"
8894 #: builtin/replace.c:20
8895 msgid "git replace [-f] --edit <object>"
8896 msgstr "git replace [-f] --edit <对象>"
8898 #: builtin/replace.c:21
8899 msgid "git replace [-f] --graft <commit> [<parent>...]"
8900 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8902 #: builtin/replace.c:22
8903 msgid "git replace -d <object>..."
8904 msgstr "git replace -d <对象>..."
8906 #: builtin/replace.c:23
8907 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8908 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8910 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
8912 msgid "Not a valid object name: '%s'"
8913 msgstr "不是一个有效的对象名:'%s'"
8915 #: builtin/replace.c:355
8917 msgid "bad mergetag in commit '%s'"
8918 msgstr "提交 '%s' 中损坏的 mergetag"
8920 #: builtin/replace.c:357
8922 msgid "malformed mergetag in commit '%s'"
8923 msgstr "提交 '%s' 中非法的 mergetag"
8925 #: builtin/replace.c:368
8928 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8929 "instead of --graft"
8930 msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8932 #: builtin/replace.c:401
8934 msgid "the original commit '%s' has a gpg signature."
8935 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8937 #: builtin/replace.c:402
8938 msgid "the signature will be removed in the replacement commit!"
8939 msgstr "在替换的提交中签名将被移除!"
8941 #: builtin/replace.c:408
8943 msgid "could not write replacement commit for: '%s'"
8944 msgstr "不能为 '%s' 写替换提交"
8946 #: builtin/replace.c:432
8947 msgid "list replace refs"
8950 #: builtin/replace.c:433
8951 msgid "delete replace refs"
8954 #: builtin/replace.c:434
8955 msgid "edit existing object"
8958 #: builtin/replace.c:435
8959 msgid "change a commit's parents"
8962 #: builtin/replace.c:436
8963 msgid "replace the ref if it exists"
8966 #: builtin/replace.c:437
8967 msgid "do not pretty-print contents for --edit"
8968 msgstr "不要为 --edit 操作美观显示内容"
8970 #: builtin/replace.c:438
8971 msgid "use this format"
8974 #: builtin/rerere.c:12
8975 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8976 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8978 #: builtin/rerere.c:57
8979 msgid "register clean resolutions in index"
8980 msgstr "在索引中注册干净的解决方案"
8982 #: builtin/reset.c:26
8984 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8985 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8987 #: builtin/reset.c:27
8988 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8989 msgstr "git reset [-q] <树或提交> [--] <路径>..."
8991 #: builtin/reset.c:28
8992 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8993 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8995 #: builtin/reset.c:34
8999 #: builtin/reset.c:34
9003 #: builtin/reset.c:34
9007 #: builtin/reset.c:34
9011 #: builtin/reset.c:34
9015 #: builtin/reset.c:74
9016 msgid "You do not have a valid HEAD."
9017 msgstr "您没有一个有效的 HEAD。"
9019 #: builtin/reset.c:76
9020 msgid "Failed to find tree of HEAD."
9021 msgstr "无法找到 HEAD 指向的树。"
9023 #: builtin/reset.c:82
9025 msgid "Failed to find tree of %s."
9026 msgstr "无法找到 %s 指向的树。"
9028 #: builtin/reset.c:100
9030 msgid "HEAD is now at %s"
9031 msgstr "HEAD 现在位于 %s"
9033 # 译者:汉字之间无空格,故删除%s前后空格
9034 #: builtin/reset.c:183
9036 msgid "Cannot do a %s reset in the middle of a merge."
9037 msgstr "在合并过程中不能做%s重置操作。"
9039 #: builtin/reset.c:276
9040 msgid "be quiet, only report errors"
9043 #: builtin/reset.c:278
9044 msgid "reset HEAD and index"
9045 msgstr "重置 HEAD 和索引"
9047 #: builtin/reset.c:279
9048 msgid "reset only HEAD"
9051 #: builtin/reset.c:281 builtin/reset.c:283
9052 msgid "reset HEAD, index and working tree"
9053 msgstr "重置 HEAD、索引和工作区"
9055 #: builtin/reset.c:285
9056 msgid "reset HEAD but keep local changes"
9057 msgstr "重置 HEAD 但保存本地变更"
9059 #: builtin/reset.c:288
9060 msgid "record only the fact that removed paths will be added later"
9061 msgstr "将删除的路径标记为稍后添加"
9063 #: builtin/reset.c:305
9065 msgid "Failed to resolve '%s' as a valid revision."
9066 msgstr "无法将 '%s' 解析为一个有效的版本。"
9068 #: builtin/reset.c:308 builtin/reset.c:316
9070 msgid "Could not parse object '%s'."
9071 msgstr "不能解析对象 '%s'。"
9073 #: builtin/reset.c:313
9075 msgid "Failed to resolve '%s' as a valid tree."
9076 msgstr "无法将 '%s' 解析为一个有效的树对象。"
9078 #: builtin/reset.c:322
9079 msgid "--patch is incompatible with --{hard,mixed,soft}"
9080 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
9082 #: builtin/reset.c:331
9083 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
9084 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
9086 # 译者:汉字之间无空格,故删除%s前后空格
9087 #: builtin/reset.c:333
9089 msgid "Cannot do %s reset with paths."
9090 msgstr "不能带路径进行%s重置。"
9092 # 译者:汉字之间无空格,故删除%s前后空格
9093 #: builtin/reset.c:343
9095 msgid "%s reset is not allowed in a bare repository"
9096 msgstr "不能对纯版本库进行%s重置"
9098 #: builtin/reset.c:347
9099 msgid "-N can only be used with --mixed"
9100 msgstr "-N 只能和 --mixed 同时使用"
9102 #: builtin/reset.c:364
9103 msgid "Unstaged changes after reset:"
9104 msgstr "重置后撤出暂存区的变更:"
9106 #: builtin/reset.c:370
9108 msgid "Could not reset index file to revision '%s'."
9109 msgstr "不能重置索引文件至版本 '%s'。"
9111 #: builtin/reset.c:374
9112 msgid "Could not write new index file."
9113 msgstr "不能写入新的索引文件。"
9115 #: builtin/rev-parse.c:361
9116 msgid "git rev-parse --parseopt [options] -- [<args>...]"
9117 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
9119 #: builtin/rev-parse.c:366
9120 msgid "keep the `--` passed as an arg"
9121 msgstr "保持 `--` 作为一个参数传递"
9123 #: builtin/rev-parse.c:368
9124 msgid "stop parsing after the first non-option argument"
9125 msgstr "遇到第一个非选项参数后停止解析"
9127 #: builtin/rev-parse.c:371
9128 msgid "output in stuck long form"
9131 #: builtin/rev-parse.c:499
9133 "git rev-parse --parseopt [options] -- [<args>...]\n"
9134 " or: git rev-parse --sq-quote [<arg>...]\n"
9135 " or: git rev-parse [options] [<arg>...]\n"
9137 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9139 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
9140 " 或者:git rev-parse --sq-quote [<参数>...]\n"
9141 " 或者:git rev-parse [选项] [<参数>...]\n"
9143 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9145 #: builtin/revert.c:22
9146 msgid "git revert [options] <commit-ish>..."
9147 msgstr "git revert [选项] <提交号>..."
9149 #: builtin/revert.c:23
9150 msgid "git revert <subcommand>"
9151 msgstr "git revert <子命令>"
9153 #: builtin/revert.c:28
9154 msgid "git cherry-pick [options] <commit-ish>..."
9155 msgstr "git cherry-pick [选项] <提交号>..."
9157 #: builtin/revert.c:29
9158 msgid "git cherry-pick <subcommand>"
9159 msgstr "git cherry-pick <子命令>"
9161 #: builtin/revert.c:71
9163 msgid "%s: %s cannot be used with %s"
9164 msgstr "%s:%s 不能和 %s 同时使用"
9166 #: builtin/revert.c:80
9167 msgid "end revert or cherry-pick sequence"
9170 #: builtin/revert.c:81
9171 msgid "resume revert or cherry-pick sequence"
9174 #: builtin/revert.c:82
9175 msgid "cancel revert or cherry-pick sequence"
9178 #: builtin/revert.c:83
9179 msgid "don't automatically commit"
9182 #: builtin/revert.c:84
9183 msgid "edit the commit message"
9186 #: builtin/revert.c:87
9187 msgid "parent number"
9190 #: builtin/revert.c:89
9191 msgid "merge strategy"
9194 #: builtin/revert.c:90
9198 #: builtin/revert.c:91
9199 msgid "option for merge strategy"
9202 #: builtin/revert.c:104
9203 msgid "append commit name"
9206 #: builtin/revert.c:105
9207 msgid "allow fast-forward"
9210 #: builtin/revert.c:106
9211 msgid "preserve initially empty commits"
9214 #: builtin/revert.c:107
9215 msgid "allow commits with empty messages"
9218 #: builtin/revert.c:108
9219 msgid "keep redundant, empty commits"
9222 #: builtin/revert.c:112
9223 msgid "program error"
9226 #: builtin/revert.c:197
9227 msgid "revert failed"
9230 #: builtin/revert.c:212
9231 msgid "cherry-pick failed"
9235 msgid "git rm [options] [--] <file>..."
9236 msgstr "git rm [选项] [--] <文件>..."
9240 "the following submodule (or one of its nested submodules)\n"
9241 "uses a .git directory:"
9243 "the following submodules (or one of their nested submodules)\n"
9244 "use a .git directory:"
9245 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9246 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9251 "(use 'rm -rf' if you really want to remove it including all of its history)"
9254 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9258 "the following file has staged content different from both the\n"
9259 "file and the HEAD:"
9261 "the following files have staged content different from both the\n"
9262 "file and the HEAD:"
9263 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9264 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9269 "(use -f to force removal)"
9275 msgid "the following file has changes staged in the index:"
9276 msgid_plural "the following files have changes staged in the index:"
9277 msgstr[0] "如下文件相对索引区的内容有修改"
9278 msgstr[1] "如下文件相对索引区的内容有修改"
9280 #: builtin/rm.c:244 builtin/rm.c:255
9283 "(use --cached to keep the file, or -f to force removal)"
9286 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
9289 msgid "the following file has local modifications:"
9290 msgid_plural "the following files have local modifications:"
9291 msgstr[0] "如下文件有本地修改:"
9292 msgstr[1] "如下文件有本地修改:"
9295 msgid "do not list removed files"
9299 msgid "only remove from the index"
9303 msgid "override the up-to-date check"
9307 msgid "allow recursive removal"
9311 msgid "exit with a zero status even if nothing matched"
9312 msgstr "即使没有匹配,也以零状态退出"
9315 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9316 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9320 msgid "not removing '%s' recursively without -r"
9321 msgstr "未提供 -r 选项不会递归删除 '%s'"
9325 msgid "git rm: unable to remove %s"
9326 msgstr "git rm:不能删除 %s"
9328 #: builtin/shortlog.c:13
9329 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9330 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9332 #: builtin/shortlog.c:131
9334 msgid "Missing author: %s"
9337 #: builtin/shortlog.c:230
9338 msgid "sort output according to the number of commits per author"
9339 msgstr "根据每个作者的提交数量排序"
9341 #: builtin/shortlog.c:232
9342 msgid "Suppress commit descriptions, only provides commit count"
9343 msgstr "隐藏提交说明,只提供提交数量"
9345 #: builtin/shortlog.c:234
9346 msgid "Show the email address of each author"
9347 msgstr "显示每个作者的电子邮件地址"
9349 #: builtin/shortlog.c:235
9351 msgstr "w[,i1[,i2]]"
9353 #: builtin/shortlog.c:236
9354 msgid "Linewrap output"
9357 #: builtin/show-branch.c:9
9359 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9360 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9361 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9362 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9364 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9365 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9366 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9367 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9369 #: builtin/show-branch.c:13
9370 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9371 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]"
9373 #: builtin/show-branch.c:652
9374 msgid "show remote-tracking and local branches"
9375 msgstr "显示远程跟踪的和本地的分支"
9377 #: builtin/show-branch.c:654
9378 msgid "show remote-tracking branches"
9381 #: builtin/show-branch.c:656
9382 msgid "color '*!+-' corresponding to the branch"
9383 msgstr "着色 '*!+-' 到相应的分支"
9385 #: builtin/show-branch.c:658
9386 msgid "show <n> more commits after the common ancestor"
9387 msgstr "显示共同祖先后的 <n> 个提交"
9389 #: builtin/show-branch.c:660
9390 msgid "synonym to more=-1"
9391 msgstr "和 more=-1 同义"
9393 #: builtin/show-branch.c:661
9394 msgid "suppress naming strings"
9397 #: builtin/show-branch.c:663
9398 msgid "include the current branch"
9401 #: builtin/show-branch.c:665
9402 msgid "name commits with their object names"
9405 #: builtin/show-branch.c:667
9406 msgid "show possible merge bases"
9409 #: builtin/show-branch.c:669
9410 msgid "show refs unreachable from any other ref"
9411 msgstr "显示没有任何引用的的引用"
9413 #: builtin/show-branch.c:671
9414 msgid "show commits in topological order"
9417 #: builtin/show-branch.c:674
9418 msgid "show only commits not on the first branch"
9419 msgstr "只显示不在第一个分支上的提交"
9421 #: builtin/show-branch.c:676
9422 msgid "show merges reachable from only one tip"
9423 msgstr "显示仅一个分支可访问的合并提交"
9425 #: builtin/show-branch.c:678
9426 msgid "topologically sort, maintaining date order where possible"
9427 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9429 #: builtin/show-branch.c:681
9430 msgid "<n>[,<base>]"
9431 msgstr "<n>[,<base>]"
9433 #: builtin/show-branch.c:682
9434 msgid "show <n> most recent ref-log entries starting at base"
9435 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9437 #: builtin/show-ref.c:10
9439 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9440 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9442 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9443 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9445 #: builtin/show-ref.c:11
9446 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9447 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9449 #: builtin/show-ref.c:168
9450 msgid "only show tags (can be combined with heads)"
9451 msgstr "只显示 tags(可以和头共用)"
9453 #: builtin/show-ref.c:169
9454 msgid "only show heads (can be combined with tags)"
9455 msgstr "只显示头(可以和 tags 共用)"
9457 #: builtin/show-ref.c:170
9458 msgid "stricter reference checking, requires exact ref path"
9459 msgstr "更严格的引用检测,需要精确的引用路径"
9461 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9462 msgid "show the HEAD reference, even if it would be filtered out"
9463 msgstr "显示 HEAD 引用,即使被过滤掉"
9465 #: builtin/show-ref.c:177
9466 msgid "dereference tags into object IDs"
9467 msgstr "转换 tags 到对象ID"
9469 #: builtin/show-ref.c:179
9470 msgid "only show SHA1 hash using <n> digits"
9471 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9473 #: builtin/show-ref.c:183
9474 msgid "do not print results to stdout (useful with --verify)"
9475 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9477 #: builtin/show-ref.c:185
9478 msgid "show refs from stdin that aren't in local repository"
9479 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9481 #: builtin/symbolic-ref.c:7
9482 msgid "git symbolic-ref [options] name [ref]"
9483 msgstr "git symbolic-ref [选项] 名称 [引用]"
9485 #: builtin/symbolic-ref.c:8
9486 msgid "git symbolic-ref -d [-q] name"
9487 msgstr "git symbolic-ref -d [-q] 名称"
9489 #: builtin/symbolic-ref.c:40
9490 msgid "suppress error message for non-symbolic (detached) refs"
9491 msgstr "不显示非符号(分离的)引用的错误信息"
9493 #: builtin/symbolic-ref.c:41
9494 msgid "delete symbolic ref"
9497 #: builtin/symbolic-ref.c:42
9498 msgid "shorten ref output"
9501 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9505 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
9506 msgid "reason of the update"
9511 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9512 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9515 msgid "git tag -d <tagname>..."
9516 msgstr "git tag -d <标签名>..."
9520 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9521 "\t\t[<pattern>...]"
9523 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] \n"
9527 msgid "git tag -v <tagname>..."
9528 msgstr "git tag -v <标签名>..."
9532 msgid "malformed object at '%s'"
9533 msgstr "非法的对象于 '%s'"
9535 #: builtin/tag.c:301
9537 msgid "tag name too long: %.*s..."
9538 msgstr "tag 名字太长:%.*s..."
9540 #: builtin/tag.c:306
9542 msgid "tag '%s' not found."
9543 msgstr "tag '%s' 未发现。"
9545 #: builtin/tag.c:321
9547 msgid "Deleted tag '%s' (was %s)\n"
9548 msgstr "已删除 tag '%s'(曾为 %s)\n"
9550 #: builtin/tag.c:333
9552 msgid "could not verify the tag '%s'"
9553 msgstr "不能校验 tag '%s'"
9555 #: builtin/tag.c:343
9559 "Write a message for tag:\n"
9561 "Lines starting with '%c' will be ignored.\n"
9566 "以 '%c' 开头的行将被忽略。\n"
9568 #: builtin/tag.c:347
9572 "Write a message for tag:\n"
9574 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9580 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9582 #: builtin/tag.c:371
9584 msgid "unsupported sort specification '%s'"
9585 msgstr "不支持的排序规格 '%s'"
9587 #: builtin/tag.c:373
9589 msgid "unsupported sort specification '%s' in variable '%s'"
9590 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9592 #: builtin/tag.c:428
9593 msgid "unable to sign the tag"
9596 #: builtin/tag.c:430
9597 msgid "unable to write tag file"
9600 #: builtin/tag.c:455
9601 msgid "bad object type."
9604 #: builtin/tag.c:468
9605 msgid "tag header too big."
9608 #: builtin/tag.c:504
9609 msgid "no tag message?"
9612 #: builtin/tag.c:510
9614 msgid "The tag message has been left in %s\n"
9615 msgstr "tag 说明被保留在 %s\n"
9617 #: builtin/tag.c:559
9618 msgid "switch 'points-at' requires an object"
9619 msgstr "开关 'points-at' 需要一个对象"
9621 #: builtin/tag.c:561
9623 msgid "malformed object name '%s'"
9624 msgstr "非法的对象名 '%s'"
9626 #: builtin/tag.c:589
9627 msgid "list tag names"
9630 #: builtin/tag.c:591
9631 msgid "print <n> lines of each tag message"
9632 msgstr "每个 tag 信息打印 <n> 行"
9634 #: builtin/tag.c:593
9638 #: builtin/tag.c:594
9642 #: builtin/tag.c:596
9643 msgid "Tag creation options"
9646 #: builtin/tag.c:598
9647 msgid "annotated tag, needs a message"
9648 msgstr "注解 tag,需要一个说明"
9650 #: builtin/tag.c:600
9654 #: builtin/tag.c:602
9655 msgid "annotated and GPG-signed tag"
9656 msgstr "注解并 GPG 签名的 tag"
9658 #: builtin/tag.c:606
9659 msgid "use another key to sign the tag"
9660 msgstr "使用另外的私钥签名 tag"
9662 #: builtin/tag.c:607
9663 msgid "replace the tag if exists"
9664 msgstr "如果存在,替换现有的 tag"
9666 #: builtin/tag.c:608
9667 msgid "show tag list in columns"
9668 msgstr "以列的方式显示 tag"
9670 #: builtin/tag.c:610
9674 #: builtin/tag.c:614
9675 msgid "Tag listing options"
9678 #: builtin/tag.c:617 builtin/tag.c:623
9679 msgid "print only tags that contain the commit"
9680 msgstr "只打印包含提交的tags"
9682 #: builtin/tag.c:629
9683 msgid "print only tags of the object"
9686 #: builtin/tag.c:655
9687 msgid "--column and -n are incompatible"
9688 msgstr "--column 和 -n 不兼容"
9690 #: builtin/tag.c:667
9691 msgid "--sort and -n are incompatible"
9692 msgstr "--sort 和 -n 不兼容"
9694 #: builtin/tag.c:674
9695 msgid "-n option is only allowed with -l."
9696 msgstr "-n 选项只允许和 -l 同时使用。"
9698 #: builtin/tag.c:676
9699 msgid "--contains option is only allowed with -l."
9700 msgstr "--contains 选项只允许和 -l 同时使用。"
9702 #: builtin/tag.c:678
9703 msgid "--points-at option is only allowed with -l."
9704 msgstr "--points-at 选项只允许和 -l 同时使用。"
9706 #: builtin/tag.c:686
9707 msgid "only one -F or -m option is allowed."
9708 msgstr "只允许一个 -F 或 -m 选项。"
9710 #: builtin/tag.c:706
9711 msgid "too many params"
9714 #: builtin/tag.c:712
9716 msgid "'%s' is not a valid tag name."
9717 msgstr "'%s' 不是一个有效的tag名称。"
9719 #: builtin/tag.c:717
9721 msgid "tag '%s' already exists"
9722 msgstr "tag '%s' 已存在"
9724 #: builtin/tag.c:741
9726 msgid "Updated tag '%s' (was %s)\n"
9727 msgstr "已更新tag '%s'(曾为 %s)\n"
9729 #: builtin/unpack-objects.c:489
9730 msgid "Unpacking objects"
9733 #: builtin/update-index.c:403
9734 msgid "git update-index [options] [--] [<file>...]"
9735 msgstr "git update-index [选项] [--] [<文件>...]"
9737 #: builtin/update-index.c:756
9738 msgid "continue refresh even when index needs update"
9739 msgstr "当索引需要更新时继续刷新"
9741 #: builtin/update-index.c:759
9742 msgid "refresh: ignore submodules"
9745 #: builtin/update-index.c:762
9746 msgid "do not ignore new files"
9749 #: builtin/update-index.c:764
9750 msgid "let files replace directories and vice-versa"
9751 msgstr "让文件替换目录(反之亦然)"
9753 #: builtin/update-index.c:766
9754 msgid "notice files missing from worktree"
9757 #: builtin/update-index.c:768
9758 msgid "refresh even if index contains unmerged entries"
9759 msgstr "即使索引区包含未合并的条目也执行刷新"
9761 #: builtin/update-index.c:771
9762 msgid "refresh stat information"
9765 #: builtin/update-index.c:775
9766 msgid "like --refresh, but ignore assume-unchanged setting"
9767 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9769 #: builtin/update-index.c:779
9770 msgid "<mode>,<object>,<path>"
9771 msgstr "<存取模式>,<对象>,<路径>"
9773 #: builtin/update-index.c:780
9774 msgid "add the specified entry to the index"
9775 msgstr "添加指定的条目到索引区"
9777 #: builtin/update-index.c:784
9781 #: builtin/update-index.c:785
9782 msgid "override the executable bit of the listed files"
9783 msgstr "覆盖列表里文件的可执行位"
9785 #: builtin/update-index.c:789
9786 msgid "mark files as \"not changing\""
9787 msgstr "把文件标记为 \"没有变更\""
9789 #: builtin/update-index.c:792
9790 msgid "clear assumed-unchanged bit"
9791 msgstr "清除 assumed-unchanged 位"
9793 #: builtin/update-index.c:795
9794 msgid "mark files as \"index-only\""
9795 msgstr "把文件标记为 \"仅索引\""
9797 #: builtin/update-index.c:798
9798 msgid "clear skip-worktree bit"
9799 msgstr "清除 skip-worktree 位"
9801 #: builtin/update-index.c:801
9802 msgid "add to index only; do not add content to object database"
9803 msgstr "只添加到索引区;不添加对象到对象库"
9805 #: builtin/update-index.c:803
9806 msgid "remove named paths even if present in worktree"
9807 msgstr "即使存在工作区里,也删除路径"
9809 #: builtin/update-index.c:805
9810 msgid "with --stdin: input lines are terminated by null bytes"
9811 msgstr "携带 --stdin:输入的行以 null 字符终止"
9813 #: builtin/update-index.c:807
9814 msgid "read list of paths to be updated from standard input"
9815 msgstr "从标准输入中读取需要更新的路径列表"
9817 #: builtin/update-index.c:811
9818 msgid "add entries from standard input to the index"
9819 msgstr "从标准输入添加条目到索引区"
9821 #: builtin/update-index.c:815
9822 msgid "repopulate stages #2 and #3 for the listed paths"
9823 msgstr "为指定文件重新生成第2和第3暂存区"
9825 #: builtin/update-index.c:819
9826 msgid "only update entries that differ from HEAD"
9827 msgstr "只更新与 HEAD 不同的条目"
9829 #: builtin/update-index.c:823
9830 msgid "ignore files missing from worktree"
9833 #: builtin/update-index.c:826
9834 msgid "report actions to standard output"
9837 #: builtin/update-index.c:828
9838 msgid "(for porcelains) forget saved unresolved conflicts"
9839 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9841 #: builtin/update-index.c:832
9842 msgid "write index in this format"
9845 #: builtin/update-index.c:834
9846 msgid "enable or disable split index"
9849 #: builtin/update-ref.c:9
9850 msgid "git update-ref [options] -d <refname> [<oldval>]"
9851 msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9853 #: builtin/update-ref.c:10
9854 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9855 msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9857 #: builtin/update-ref.c:11
9858 msgid "git update-ref [options] --stdin [-z]"
9859 msgstr "git update-ref [选项] --stdin [-z]"
9861 #: builtin/update-ref.c:359
9862 msgid "delete the reference"
9865 #: builtin/update-ref.c:361
9866 msgid "update <refname> not the one it points to"
9867 msgstr "更新 <引用名> 本身而不是它指向的引用"
9869 #: builtin/update-ref.c:362
9870 msgid "stdin has NUL-terminated arguments"
9871 msgstr "标准输入有以 NUL 字符终止的参数"
9873 #: builtin/update-ref.c:363
9874 msgid "read updates from stdin"
9877 #: builtin/update-server-info.c:6
9878 msgid "git update-server-info [--force]"
9879 msgstr "git update-server-info [--force]"
9881 #: builtin/update-server-info.c:14
9882 msgid "update the info files from scratch"
9885 #: builtin/verify-commit.c:17
9886 msgid "git verify-commit [-v|--verbose] <commit>..."
9887 msgstr "git verify-commit [-v|--verbose] <提交>..."
9889 #: builtin/verify-commit.c:75
9890 msgid "print commit contents"
9893 #: builtin/verify-pack.c:54
9894 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9895 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..."
9897 #: builtin/verify-pack.c:64
9901 #: builtin/verify-pack.c:66
9902 msgid "show statistics only"
9905 #: builtin/verify-tag.c:17
9906 msgid "git verify-tag [-v|--verbose] <tag>..."
9907 msgstr "git verify-tag [-v|--verbose] <标签>..."
9909 #: builtin/verify-tag.c:73
9910 msgid "print tag contents"
9913 #: builtin/write-tree.c:13
9914 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9915 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9917 #: builtin/write-tree.c:26
9921 #: builtin/write-tree.c:27
9922 msgid "write tree object for a subdirectory <prefix>"
9923 msgstr "将 <前缀> 子目录内容写到一个树对象"
9925 #: builtin/write-tree.c:30
9926 msgid "only useful for debugging"
9929 #: credential-cache--daemon.c:267
9930 msgid "print debugging messages to stderr"
9931 msgstr "调试信息输出到标准错误"
9935 "'git help -a' and 'git help -g' list available subcommands and some\n"
9936 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9937 "to read about a specific subcommand or concept."
9939 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9940 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9944 msgid "Add file contents to the index"
9948 msgid "Find by binary search the change that introduced a bug"
9949 msgstr "通过二分查找定位引入 bug 的变更"
9952 msgid "List, create, or delete branches"
9956 msgid "Checkout a branch or paths to the working tree"
9957 msgstr "检出一个分支或路径到工作区"
9960 msgid "Clone a repository into a new directory"
9961 msgstr "克隆一个版本库到一个新目录"
9964 msgid "Record changes to the repository"
9968 msgid "Show changes between commits, commit and working tree, etc"
9969 msgstr "显示提交之间、提交和工作区之间等的差异"
9972 msgid "Download objects and refs from another repository"
9973 msgstr "从另外一个版本库下载对象和引用"
9976 msgid "Print lines matching a pattern"
9980 msgid "Create an empty Git repository or reinitialize an existing one"
9981 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9984 msgid "Show commit logs"
9988 msgid "Join two or more development histories together"
9989 msgstr "合并两个或更多开发历史"
9992 msgid "Move or rename a file, a directory, or a symlink"
9993 msgstr "移动或重命名一个文件、目录或符号链接"
9996 msgid "Fetch from and integrate with another repository or a local branch"
9997 msgstr "获取并整合另外的版本库或一个本地分支"
10000 msgid "Update remote refs along with associated objects"
10001 msgstr "更新远程引用和相关的对象"
10003 #: common-cmds.h:23
10004 msgid "Forward-port local commits to the updated upstream head"
10005 msgstr "本地提交转移至更新后的上游分支中"
10007 #: common-cmds.h:24
10008 msgid "Reset current HEAD to the specified state"
10009 msgstr "重置当前HEAD到指定状态"
10011 #: common-cmds.h:25
10012 msgid "Remove files from the working tree and from the index"
10013 msgstr "从工作区和索引中删除文件"
10015 #: common-cmds.h:26
10016 msgid "Show various types of objects"
10019 #: common-cmds.h:27
10020 msgid "Show the working tree status"
10023 #: common-cmds.h:28
10024 msgid "Create, list, delete or verify a tag object signed with GPG"
10025 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
10027 #: parse-options.h:143
10028 msgid "expiry-date"
10031 #: parse-options.h:158
10032 msgid "no-op (backward compatibility)"
10035 #: parse-options.h:232
10036 msgid "be more verbose"
10039 #: parse-options.h:234
10040 msgid "be more quiet"
10043 #: parse-options.h:240
10044 msgid "use <n> digits to display SHA-1s"
10045 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10048 msgid "update the index with reused conflict resolution if possible"
10049 msgstr "如果可能,重用冲突解决更新索引"
10052 msgid "You need to set your committer info first"
10053 msgstr "您需要先设置你的提交者信息"
10057 "You seem to have moved HEAD since the last 'am' failure.\n"
10058 "Not rewinding to ORIG_HEAD"
10059 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
10064 "When you have resolved this problem, run \"$cmdline --continue\".\n"
10065 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10066 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
10068 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
10069 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10070 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10073 msgid "Cannot fall back to three-way merge."
10074 msgstr "无法求助于三路合并。"
10077 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10078 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
10081 msgid "Using index info to reconstruct a base tree..."
10082 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
10086 "Did you hand edit your patch?\n"
10087 "It does not apply to blobs recorded in its index."
10090 "无法应用补丁到索引中的数据(blob)对象上。"
10093 msgid "Falling back to patching base and 3-way merge..."
10094 msgstr "转而在基础版本上打补丁及进行三路合并..."
10097 msgid "Failed to merge in the changes."
10101 msgid "Only one StGIT patch series can be applied at once"
10102 msgstr "一次只能有一个 StGIT 补丁队列被应用"
10106 msgid "Patch format $patch_format is not supported."
10107 msgstr "不支持 $patch_format 补丁格式。"
10110 msgid "Patch format detection failed."
10115 "The -b/--binary option has been a no-op for long time, and\n"
10116 "it will be removed. Please do not use it anymore."
10118 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10123 msgid "previous rebase directory $dotest still exists but mbox given."
10124 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
10127 msgid "Please make up your mind. --skip or --abort?"
10128 msgstr "请下决心。--skip 或是 --abort ?"
10133 "Stray $dotest directory found.\n"
10134 "Use \"git am --abort\" to remove it."
10136 "发现了错误的 $dotest 目录。\n"
10137 "使用 \"git am --abort\" 删除它。"
10140 msgid "Resolve operation not in progress, we are not resuming."
10141 msgstr "解决操作未进行,我们不会继续。"
10145 msgid "Dirty index: cannot apply patches (dirty: $files)"
10146 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
10151 "Patch is empty. Was it split wrong?\n"
10152 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10153 "To restore the original branch and stop patching run \"$cmdline --abort\"."
10156 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10157 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10160 msgid "Patch does not have a valid e-mail address."
10161 msgstr "补丁中没有一个有效的邮件地址。"
10164 msgid "cannot be interactive without stdin connected to a terminal."
10165 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
10168 msgid "Commit Body is:"
10172 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10173 #. in your translation. The program will only accept English
10174 #. input at this point.
10176 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10177 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10181 msgid "Applying: $FIRSTLINE"
10182 msgstr "正应用:$FIRSTLINE"
10186 "No changes - did you forget to use 'git add'?\n"
10187 "If there is nothing left to stage, chances are that something else\n"
10188 "already introduced the same changes; you might want to skip this patch."
10190 "没有变更 —— 您是不是忘了执行 'git add'?\n"
10191 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10196 "You still have unmerged paths in your index\n"
10197 "did you forget to use 'git add'?"
10198 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
10201 msgid "No changes -- Patch already applied."
10202 msgstr "没有变更 —— 补丁已经应用过。"
10206 msgid "Patch failed at $msgnum $FIRSTLINE"
10207 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10212 "The copy of the patch that failed is found in:\n"
10219 msgid "applying to an empty history"
10220 msgstr "正应用到一个空历史上"
10222 #: git-bisect.sh:48
10223 msgid "You need to start by \"git bisect start\""
10224 msgstr "您需要执行 \"git bisect start\" 来开始"
10227 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10228 #. translation. The program will only accept English input
10230 #: git-bisect.sh:54
10231 msgid "Do you want me to do it for you [Y/n]? "
10232 msgstr "您想让我为您这样做么[Y/n]? "
10234 #: git-bisect.sh:95
10236 msgid "unrecognised option: '$arg'"
10237 msgstr "未能识别的选项:'$arg'"
10239 #: git-bisect.sh:99
10241 msgid "'$arg' does not appear to be a valid revision"
10242 msgstr "'$arg' 看起来不像是一个有效的版本"
10244 #: git-bisect.sh:117
10245 msgid "Bad HEAD - I need a HEAD"
10246 msgstr "坏的 HEAD - 我需要一个 HEAD"
10248 #: git-bisect.sh:130
10251 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10252 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10254 #: git-bisect.sh:140
10255 msgid "won't bisect on cg-seek'ed tree"
10256 msgstr "不会在做了 cg-seek 的树上做二分查找"
10258 #: git-bisect.sh:144
10259 msgid "Bad HEAD - strange symbolic ref"
10260 msgstr "坏的 HEAD - 奇怪的符号引用"
10262 #: git-bisect.sh:189
10264 msgid "Bad bisect_write argument: $state"
10265 msgstr "坏的 bisect_write 参数:$state"
10267 #: git-bisect.sh:218
10269 msgid "Bad rev input: $arg"
10270 msgstr "输入坏的版本:$arg"
10272 #: git-bisect.sh:232
10273 msgid "Please call 'bisect_state' with at least one argument."
10274 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10276 #: git-bisect.sh:244
10278 msgid "Bad rev input: $rev"
10279 msgstr "输入坏的版本:$rev"
10281 #: git-bisect.sh:253
10282 msgid "'git bisect bad' can take only one argument."
10283 msgstr "'git bisect bad' 只能带一个参数。"
10285 #: git-bisect.sh:276
10286 msgid "Warning: bisecting only with a bad commit."
10287 msgstr "警告:在仅有一个坏提交下进行二分查找。"
10290 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10291 #. translation. The program will only accept English input
10293 #: git-bisect.sh:282
10294 msgid "Are you sure [Y/n]? "
10295 msgstr "您确认么[Y/n]? "
10297 #: git-bisect.sh:292
10299 "You need to give me at least one good and one bad revision.\n"
10300 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10302 "您需要给我至少一个好版本和一个坏版本。\n"
10303 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10305 #: git-bisect.sh:295
10307 "You need to start by \"git bisect start\".\n"
10308 "You then need to give me at least one good and one bad revision.\n"
10309 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10311 "您需要执行 \"git bisect start\" 来开始。\n"
10312 "然后需要提供我至少一个好版本和一个坏版本。\n"
10313 "(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
10315 #: git-bisect.sh:366 git-bisect.sh:493
10316 msgid "We are not bisecting."
10317 msgstr "我们没有在二分查找。"
10319 #: git-bisect.sh:373
10321 msgid "'$invalid' is not a valid commit"
10322 msgstr "'$invalid' 不是一个有效的提交"
10324 #: git-bisect.sh:382
10327 "Could not check out original HEAD '$branch'.\n"
10328 "Try 'git bisect reset <commit>'."
10330 "不能检出原始 HEAD '$branch'。\n"
10331 "尝试 'git bisect reset <提交>'。"
10333 #: git-bisect.sh:409
10334 msgid "No logfile given"
10337 #: git-bisect.sh:410
10339 msgid "cannot read $file for replaying"
10340 msgstr "不能读取 $file 来重放"
10342 #: git-bisect.sh:427
10343 msgid "?? what are you talking about?"
10346 #: git-bisect.sh:439
10348 msgid "running $command"
10349 msgstr "运行 $command"
10351 #: git-bisect.sh:446
10354 "bisect run failed:\n"
10355 "exit code $res from '$command' is < 0 or >= 128"
10358 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10360 #: git-bisect.sh:472
10361 msgid "bisect run cannot continue any more"
10362 msgstr "二分查找不能继续运行"
10364 #: git-bisect.sh:478
10367 "bisect run failed:\n"
10368 "'bisect_state $state' exited with error code $res"
10371 "'bisect_state $state' 退出码为 $res"
10373 #: git-bisect.sh:485
10374 msgid "bisect run success"
10379 "Pull is not possible because you have unmerged files.\n"
10380 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10381 "as appropriate to mark resolution and make a commit."
10383 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10384 "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
10387 msgid "Pull is not possible because you have unmerged files."
10388 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10392 "You have not concluded your merge (MERGE_HEAD exists).\n"
10393 "Please, commit your changes before you can merge."
10395 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10399 msgid "updating an unborn branch with changes added to the index"
10400 msgstr "更新尚未诞生的分支,变更添加至索引"
10405 "Warning: fetch updated the current branch head.\n"
10406 "Warning: fast-forwarding your working tree from\n"
10407 "Warning: commit $orig_head."
10409 "警告:fetch 更新了当前的分支。您的工作区\n"
10410 "警告:从原提交 $orig_head 快进。"
10413 msgid "Cannot merge multiple branches into empty head"
10414 msgstr "无法将多个分支合并到空分支"
10417 msgid "Cannot rebase onto multiple branches"
10420 #: git-rebase.sh:57
10422 "When you have resolved this problem, run \"git rebase --continue\".\n"
10423 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10424 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10427 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10428 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10429 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10431 #: git-rebase.sh:165
10432 msgid "Applied autostash."
10433 msgstr "成功应用 autostash。"
10435 #: git-rebase.sh:168
10437 msgid "Cannot store $stash_sha1"
10438 msgstr "无法保存 $stash_sha1"
10440 #: git-rebase.sh:169
10442 "Applying autostash resulted in conflicts.\n"
10443 "Your changes are safe in the stash.\n"
10444 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10446 "应用 autostash 导致冲突。\n"
10447 "您的修改安全地保存在 stash 中。\n"
10448 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10450 #: git-rebase.sh:208
10451 msgid "The pre-rebase hook refused to rebase."
10452 msgstr "钩子 pre-rebase 拒绝变基操作。"
10454 #: git-rebase.sh:213
10455 msgid "It looks like git-am is in progress. Cannot rebase."
10456 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10458 #: git-rebase.sh:351
10459 msgid "The --exec option must be used with the --interactive option"
10460 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10462 #: git-rebase.sh:356
10463 msgid "No rebase in progress?"
10464 msgstr "没有正在进行的变基?"
10466 #: git-rebase.sh:367
10467 msgid "The --edit-todo action can only be used during interactive rebase."
10468 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10470 #: git-rebase.sh:374
10471 msgid "Cannot read HEAD"
10474 #: git-rebase.sh:377
10476 "You must edit all merge conflicts and then\n"
10477 "mark them as resolved using git add"
10479 "您必须编辑所有的合并冲突,然后通过 git add\n"
10482 #: git-rebase.sh:395
10484 msgid "Could not move back to $head_name"
10485 msgstr "无法移回 $head_name"
10487 #: git-rebase.sh:414
10490 "It seems that there is already a $state_dir_base directory, and\n"
10491 "I wonder if you are in the middle of another rebase. If that is the\n"
10492 "case, please try\n"
10493 "\t$cmd_live_rebase\n"
10494 "If that is not the case, please\n"
10495 "\t$cmd_clear_stale_rebase\n"
10496 "and run me again. I am stopping in case you still have something\n"
10499 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10501 "\t$cmd_live_rebase\n"
10503 "\t$cmd_clear_stale_rebase\n"
10504 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10506 #: git-rebase.sh:465
10508 msgid "invalid upstream $upstream_name"
10509 msgstr "无效的上游 $upstream_name"
10511 #: git-rebase.sh:489
10513 msgid "$onto_name: there are more than one merge bases"
10514 msgstr "$onto_name: 有一个以上的合并基准"
10516 #: git-rebase.sh:492 git-rebase.sh:496
10518 msgid "$onto_name: there is no merge base"
10519 msgstr "$onto_name: 没有合并基准"
10521 #: git-rebase.sh:501
10523 msgid "Does not point to a valid commit: $onto_name"
10524 msgstr "没有指向一个有效的提交:$onto_name"
10526 #: git-rebase.sh:524
10528 msgid "fatal: no such branch: $branch_name"
10529 msgstr "严重错误:无此分支:$branch_name"
10531 #: git-rebase.sh:557
10532 msgid "Cannot autostash"
10533 msgstr "无法 autostash"
10535 #: git-rebase.sh:562
10537 msgid "Created autostash: $stash_abbrev"
10538 msgstr "创建了 autostash: $stash_abbrev"
10540 #: git-rebase.sh:566
10541 msgid "Please commit or stash them."
10542 msgstr "请提交或为它们保存进度。"
10544 #: git-rebase.sh:586
10546 msgid "Current branch $branch_name is up to date."
10547 msgstr "当前分支 $branch_name 是最新的。"
10549 #: git-rebase.sh:590
10551 msgid "Current branch $branch_name is up to date, rebase forced."
10552 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10554 #: git-rebase.sh:601
10556 msgid "Changes from $mb to $onto:"
10557 msgstr "变更从 $mb 到 $onto:"
10559 #: git-rebase.sh:610
10560 msgid "First, rewinding head to replay your work on top of it..."
10561 msgstr "首先,重置头指针以便在上面重放您的工作..."
10563 #: git-rebase.sh:620
10565 msgid "Fast-forwarded $branch_name to $onto_name."
10566 msgstr "快进 $branch_name 至 $onto_name。"
10569 msgid "git stash clear with parameters is unimplemented"
10570 msgstr "git stash clear 不支持参数"
10573 msgid "You do not have the initial commit yet"
10577 msgid "Cannot save the current index state"
10578 msgstr "无法保存当前索引状态"
10580 #: git-stash.sh:124 git-stash.sh:137
10581 msgid "Cannot save the current worktree state"
10582 msgstr "无法保存当前工作区状态"
10584 #: git-stash.sh:141
10585 msgid "No changes selected"
10588 #: git-stash.sh:144
10589 msgid "Cannot remove temporary index (can't happen)"
10590 msgstr "无法删除临时索引(不应发生)"
10592 #: git-stash.sh:157
10593 msgid "Cannot record working tree state"
10596 #: git-stash.sh:191
10598 msgid "Cannot update $ref_stash with $w_commit"
10599 msgstr "无法用 $w_commit 更新 $ref_stash"
10601 #. TRANSLATORS: $option is an invalid option, like
10602 #. `--blah-blah'. The 7 spaces at the beginning of the
10603 #. second line correspond to "error: ". So you should line
10604 #. up the second line with however many characters the
10605 #. translation of "error: " takes in your language. E.g. in
10606 #. English this is:
10608 #. $ git stash save --blah-blah 2>&1 | head -n 2
10609 #. error: unknown option for 'stash save': --blah-blah
10610 #. To provide a message, use git stash save -- '--blah-blah'
10611 #: git-stash.sh:238
10614 "error: unknown option for 'stash save': $option\n"
10615 " To provide a message, use git stash save -- '$option'"
10617 "错误:'stash save' 的未知选项:$option\n"
10618 " 要提供一个描述信息,使用 git stash save -- '$option'"
10620 #: git-stash.sh:259
10621 msgid "No local changes to save"
10622 msgstr "没有要保存的本地修改"
10624 #: git-stash.sh:263
10625 msgid "Cannot initialize stash"
10626 msgstr "无法初始化 stash"
10628 #: git-stash.sh:267
10629 msgid "Cannot save the current status"
10632 #: git-stash.sh:285
10633 msgid "Cannot remove worktree changes"
10636 #: git-stash.sh:384
10637 msgid "No stash found."
10638 msgstr "未发现 stash。"
10640 #: git-stash.sh:391
10642 msgid "Too many revisions specified: $REV"
10643 msgstr "指定了太多的版本:$REV"
10645 #: git-stash.sh:397
10647 msgid "$reference is not a valid reference"
10648 msgstr "$reference 不是一个有效的引用"
10650 #: git-stash.sh:425
10652 msgid "'$args' is not a stash-like commit"
10653 msgstr "'$args' 不是 stash 样提交"
10655 #: git-stash.sh:436
10657 msgid "'$args' is not a stash reference"
10658 msgstr "'$args' 不是一个 stash 引用"
10660 #: git-stash.sh:444
10661 msgid "unable to refresh index"
10664 #: git-stash.sh:448
10665 msgid "Cannot apply a stash in the middle of a merge"
10666 msgstr "无法在合并过程中恢复进度"
10668 #: git-stash.sh:456
10669 msgid "Conflicts in index. Try without --index."
10670 msgstr "索引中有冲突。尝试不使用 --index。"
10672 #: git-stash.sh:458
10673 msgid "Could not save index tree"
10676 #: git-stash.sh:492
10677 msgid "Cannot unstage modified files"
10680 #: git-stash.sh:507
10681 msgid "Index was not unstashed."
10682 msgstr "索引的进度没有被恢复。"
10684 #: git-stash.sh:530
10686 msgid "Dropped ${REV} ($s)"
10687 msgstr "丢弃了 ${REV} ($s)"
10689 #: git-stash.sh:531
10691 msgid "${REV}: Could not drop stash entry"
10692 msgstr "${REV}:不能丢弃进度条目"
10694 #: git-stash.sh:539
10695 msgid "No branch name specified"
10698 #: git-stash.sh:611
10699 msgid "(To restore them type \"git stash apply\")"
10700 msgstr "(为恢复数据输入 \"git stash apply\")"
10702 #: git-submodule.sh:95
10704 msgid "cannot strip one component off url '$remoteurl'"
10705 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10707 #: git-submodule.sh:237
10709 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10710 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10712 #: git-submodule.sh:287
10714 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10715 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10717 #: git-submodule.sh:296
10719 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10720 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10722 #: git-submodule.sh:406
10723 msgid "Relative path can only be used from the toplevel of the working tree"
10724 msgstr "只能在工作区的顶级目录中使用相对路径"
10726 #: git-submodule.sh:416
10728 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10729 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10731 #: git-submodule.sh:433
10733 msgid "'$sm_path' already exists in the index"
10734 msgstr "'$sm_path' 已经存在于索引中"
10736 #: git-submodule.sh:437
10739 "The following path is ignored by one of your .gitignore files:\n"
10741 "Use -f if you really want to add it."
10743 "以下路径被您的一个 .gitignore 文件所忽略:\n"
10745 "如果您确实想添加它,使用 -f 参数。"
10747 #: git-submodule.sh:455
10749 msgid "Adding existing repo at '$sm_path' to the index"
10750 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10752 #: git-submodule.sh:457
10754 msgid "'$sm_path' already exists and is not a valid git repo"
10755 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10757 #: git-submodule.sh:465
10759 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10760 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10762 #: git-submodule.sh:467
10765 "If you want to reuse this local git directory instead of cloning again from"
10766 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10768 #: git-submodule.sh:469
10771 "use the '--force' option. If the local git directory is not the correct repo"
10772 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10774 #: git-submodule.sh:470
10777 "or you are unsure what this means choose another name with the '--name' "
10779 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10781 #: git-submodule.sh:472
10783 msgid "Reactivating local git directory for submodule '$sm_name'."
10784 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10786 #: git-submodule.sh:484
10788 msgid "Unable to checkout submodule '$sm_path'"
10789 msgstr "不能检出子模组 '$sm_path'"
10791 #: git-submodule.sh:489
10793 msgid "Failed to add submodule '$sm_path'"
10794 msgstr "无法添加子模组 '$sm_path'"
10796 #: git-submodule.sh:498
10798 msgid "Failed to register submodule '$sm_path'"
10799 msgstr "无法注册子模组 '$sm_path'"
10801 #: git-submodule.sh:542
10803 msgid "Entering '$prefix$displaypath'"
10804 msgstr "正在进入 '$prefix$displaypath'"
10806 #: git-submodule.sh:562
10808 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10809 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10811 #: git-submodule.sh:608
10813 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10814 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10816 #: git-submodule.sh:617
10818 msgid "Failed to register url for submodule path '$displaypath'"
10819 msgstr "无法为子模组路径 '$displaypath' 注册 url"
10821 #: git-submodule.sh:619
10823 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10824 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10826 #: git-submodule.sh:636
10828 msgid "Failed to register update mode for submodule path '$displaypath'"
10829 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10831 #: git-submodule.sh:674
10833 msgid "Use '.' if you really want to deinitialize all submodules"
10834 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10836 #: git-submodule.sh:691
10838 msgid "Submodule work tree '$displaypath' contains a .git directory"
10839 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10841 #: git-submodule.sh:692
10844 "(use 'rm -rf' if you really want to remove it including all of its history)"
10845 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10847 #: git-submodule.sh:698
10850 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10852 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10854 #: git-submodule.sh:701
10856 msgid "Cleared directory '$displaypath'"
10857 msgstr "已清除目录 '$displaypath'"
10859 #: git-submodule.sh:702
10861 msgid "Could not remove submodule work tree '$displaypath'"
10862 msgstr "无法移除子模组工作区 '$displaypath'"
10864 #: git-submodule.sh:705
10866 msgid "Could not create empty submodule directory '$displaypath'"
10867 msgstr "不能创建空的子模组目录 '$displaypath'"
10869 #: git-submodule.sh:714
10871 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10872 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10874 #: git-submodule.sh:830
10877 "Submodule path '$displaypath' not initialized\n"
10878 "Maybe you want to use 'update --init'?"
10880 "子模组路径 '$displaypath' 没有初始化\n"
10881 "也许您想用 'update --init'?"
10883 #: git-submodule.sh:843
10885 msgid "Unable to find current revision in submodule path '$displaypath'"
10886 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10888 #: git-submodule.sh:852
10890 msgid "Unable to fetch in submodule path '$sm_path'"
10891 msgstr "无法在子模组路径 '$sm_path' 中获取"
10893 #: git-submodule.sh:876
10895 msgid "Unable to fetch in submodule path '$displaypath'"
10896 msgstr "无法在子模组路径 '$displaypath' 中获取"
10898 #: git-submodule.sh:890
10900 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10901 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10903 #: git-submodule.sh:891
10905 msgid "Submodule path '$displaypath': checked out '$sha1'"
10906 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10908 #: git-submodule.sh:895
10910 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10911 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10913 #: git-submodule.sh:896
10915 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10916 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10918 #: git-submodule.sh:901
10920 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10921 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10923 #: git-submodule.sh:902
10925 msgid "Submodule path '$displaypath': merged in '$sha1'"
10926 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10928 #: git-submodule.sh:907
10931 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10932 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10934 #: git-submodule.sh:908
10936 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10937 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10939 #: git-submodule.sh:938
10941 msgid "Failed to recurse into submodule path '$displaypath'"
10942 msgstr "无法递归进子模组路径 '$displaypath'"
10944 #: git-submodule.sh:1046
10945 msgid "The --cached option cannot be used with the --files option"
10946 msgstr "选项 --cached 不能和选项 --files 同时使用"
10948 #: git-submodule.sh:1098
10950 msgid "unexpected mode $mod_dst"
10951 msgstr "意外的模式 $mod_dst"
10954 #: git-submodule.sh:1118
10956 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10957 msgstr " 警告:$display_name 未包含提交 $sha1_src"
10960 #: git-submodule.sh:1121
10962 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10963 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10966 #: git-submodule.sh:1124
10968 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10969 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10971 #: git-submodule.sh:1149
10975 #: git-submodule.sh:1267
10977 msgid "Failed to recurse into submodule path '$sm_path'"
10978 msgstr "无法递归进子模组路径 '$sm_path'"
10980 #: git-submodule.sh:1331
10982 msgid "Synchronizing submodule url for '$displaypath'"
10983 msgstr "为 '$displaypath' 同步子模组 url"
10985 #~ msgid "no files added"
10986 #~ msgstr "没有文件被添加"
10988 #~ msgid "force creation (when already exists)"
10989 #~ msgstr "强制创建(当已经存在)"
10991 #~ msgid "Malformed ident string: '%s'"
10992 #~ msgstr "非法的身份字符串:'%s'"
10997 #~ msgid "Failed to lock ref for update"
10998 #~ msgstr "无法为更新锁定引用"
11000 #~ msgid "Failed to write ref"
11003 #~ msgid "Failed to lock HEAD during fast_forward_to"
11004 #~ msgstr "在快进时无法为 HEAD 加锁"
11006 #~ msgid "invalid commit: %s"
11007 #~ msgstr "无效的提交:%s"
11009 #~ msgid "cannot lock HEAD ref"
11010 #~ msgstr "无法锁定 HEAD 引用"
11012 #~ msgid "cannot update HEAD ref"
11013 #~ msgstr "无法更新 HEAD 引用"
11015 #~ msgid "Invalid %s: '%s'"
11016 #~ msgstr "无效的 %s:'%s'"
11018 #~ msgid "cannot tell cwd"
11019 #~ msgstr "无法获知当前路径"
11021 #~ msgid "%s: cannot lock the ref"
11022 #~ msgstr "%s:不能锁定引用"
11024 #~ msgid "%s: cannot update the ref"
11025 #~ msgstr "%s:不能更新引用"
11027 #~ msgid "commit has empty message"
11030 #~ msgid "Failed to chdir: %s"
11031 #~ msgstr "无法切换目录:%s"
11036 #~ msgid "Tracking not set up: name too long: %s"
11037 #~ msgstr "跟踪未设置:名字太长:%s"
11047 #~ msgid ", behind "
11050 #~ msgid "could not find .gitmodules in index"
11051 #~ msgstr "无法在索引中找到 .gitmodules"
11053 #~ msgid "reading updated .gitmodules failed"
11054 #~ msgstr "读取更新后的 .gitmodules 失败"
11056 #~ msgid "unable to stat updated .gitmodules"
11057 #~ msgstr "不能枚举更新后的 .gitmodules"
11059 #~ msgid "unable to remove .gitmodules from index"
11060 #~ msgstr "不能从索引中移除 .gitmodules"
11062 #~ msgid "adding updated .gitmodules failed"
11063 #~ msgstr "添加更新后的 .gitmodules 失败"
11065 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11067 #~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
11068 #~ "subdirectory of the tree will change in Git 2.0 and should not be used "
11070 #~ "To add content for the whole tree, run:\n"
11072 #~ " git add %s :/\n"
11073 #~ " (or git add %s :/)\n"
11075 #~ "To restrict the command to the current directory, run:\n"
11077 #~ " git add %s .\n"
11078 #~ " (or git add %s .)\n"
11080 #~ "With the current Git version, the command is restricted to the current "
11083 #~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
11084 #~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
11085 #~ "如果要添加整个目录树的内容,执行:\n"
11087 #~ " git add %s :/\n"
11088 #~ " (或 git add %s :/)\n"
11090 #~ "如果要限制该命令只作用于当前目录,执行:\n"
11092 #~ " git add %s .\n"
11093 #~ " (或 git add %s .)\n"
11095 #~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
11098 #~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
11099 #~ "whose behaviour will change in Git 2.0 with respect to paths you "
11101 #~ "Paths like '%s' that are\n"
11102 #~ "removed from your working tree are ignored with this version of Git.\n"
11104 #~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
11105 #~ " ignores paths you removed from your working tree.\n"
11107 #~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
11109 #~ "Run 'git status' to check the paths you removed from your working tree.\n"
11111 #~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
11112 #~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
11113 #~ "像本地工作区移除的路径 '%s'\n"
11114 #~ "在此版本的 Git 中被忽略。\n"
11116 #~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
11117 #~ " 忽略您本地工作区中移除的文件。\n"
11119 #~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
11121 #~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
11124 #~ "Auto packing the repository for optimum performance. You may also\n"
11125 #~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
11127 #~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
11128 #~ "参见 \"git help gc\" 以获取更多信息。\n"
11131 #~ "Updates were rejected because a pushed branch tip is behind its remote\n"
11132 #~ "counterpart. If you did not intend to push that branch, you may want to\n"
11133 #~ "specify branches to push or set the 'push.default' configuration "
11135 #~ "to 'simple', 'current' or 'upstream' to push only the current branch."
11137 #~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11138 #~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
11139 #~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
11142 # 译者:为保证在输出中对齐,注意调整句中空格!
11143 #~ msgid "copied: %s -> %s"
11144 #~ msgstr "拷贝: %s -> %s"
11146 # 译者:为保证在输出中对齐,注意调整句中空格!
11147 #~ msgid "deleted: %s"
11150 # 译者:为保证在输出中对齐,注意调整句中空格!
11151 #~ msgid "modified: %s"
11154 # 译者:为保证在输出中对齐,注意调整句中空格!
11155 #~ msgid "renamed: %s -> %s"
11156 #~ msgstr "重命名: %s -> %s"
11158 # 译者:为保证在输出中对齐,注意调整句中空格!
11159 #~ msgid "unmerged: %s"
11160 #~ msgstr "未合并: %s"
11162 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11164 #~ "push.default is unset; its implicit value is changing in\n"
11165 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
11166 #~ "and maintain the current behavior after the default changes, use:\n"
11168 #~ " git config --global push.default matching\n"
11170 #~ "To squelch this message and adopt the new behavior now, use:\n"
11172 #~ " git config --global push.default simple\n"
11174 #~ "See 'git help config' and search for 'push.default' for further "
11175 #~ "information.\n"
11176 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
11177 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
11179 #~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
11180 #~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
11182 #~ " git config --global push.default matching\n"
11184 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
11186 #~ " git config --global push.default simple\n"
11188 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
11189 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
11190 #~ "为保持兼容,请用 'current' 代替 'simple')"
11192 #~ msgid "input paths are terminated by a null character"
11193 #~ msgstr "输入路径以null字符终止"
11196 #~ "The following untracked files would NOT be saved but need to be removed "
11197 #~ "by stash save:"
11198 #~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
11201 #~ "Aborting. Consider using either the --force or --include-untracked option."
11202 #~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
11205 #~ "the following submodule (or one of its nested submodule)\n"
11206 #~ "uses a .git directory:"
11208 #~ "the following submodules (or one of its nested submodule)\n"
11209 #~ "use a .git directory:"
11210 #~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11211 #~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11214 #~ msgid " (fix conflicts and then run \"git am --resolved\")"
11215 #~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
11218 #~ msgid " (all conflicts fixed: run \"git commit\")"
11219 #~ msgstr " (解决所有冲突后,执行 \"git commit\")"
11221 #~ msgid "more than %d trees given: '%s'"
11222 #~ msgstr "提供了超过 %d 个树对象:'%s'"
11224 #~ msgid "You cannot combine --no-ff with --ff-only."
11225 #~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
11228 #~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
11229 #~ "(use 'rm -rf' if you really want to remove it including all of its "
11232 #~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
11233 #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11236 #~ "'%s' has changes staged in the index\n"
11237 #~ "(use --cached to keep the file, or -f to force removal)"
11239 #~ "'%s' 有变更已暂存至索引中\n"
11240 #~ "(使用 --cached 保存文件,或用 -f 强制删除)"
11242 #~ msgid "show commits where no parent comes before its children"
11243 #~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
11245 #~ msgid "show the HEAD reference"
11246 #~ msgstr "显示 HEAD 引用"
11248 #~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
11249 #~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
11251 #~ msgid "Change flags"
11255 #~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
11256 #~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
11258 #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11259 #~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
11261 #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11262 #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11264 #~ msgid "See 'git help <command>' for more information on a specific command."
11265 #~ msgstr "参见 'git help <命令>' 以获得该特定命令的详细信息。"
11267 #~ msgid "BUG: impossible combination of %d and %p"
11268 #~ msgstr "BUG: 无法组合 %d 和 %p"
11271 #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11272 #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11275 #~ msgid "may speed it up, but you have to be careful not to forget to add"
11276 #~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11278 #~ msgid "new files yourself (see 'git help status')."
11279 #~ msgstr "(参见 'git help status')。"
11281 #~ msgid "use any ref in .git/refs"
11282 #~ msgstr "使用 .git/refs 里的任意引用"
11284 #~ msgid "use any tag in .git/refs/tags"
11285 #~ msgstr "使用 .git/refs/tags 里的任意 tag"
11287 #~ msgid "bad object %s"
11290 #~ msgid "bogus committer info %s"
11291 #~ msgstr "虚假的提交者信息 %s"
11293 #~ msgid "can't fdopen 'show' output fd"
11294 #~ msgstr "不能打开 'show' 输出文件句柄"
11296 #~ msgid "failed to close pipe to 'show' for object '%s'"
11297 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11299 #~ msgid " 0 files changed"
11300 #~ msgstr " 0 个文件被修改"
11302 #~ msgid " %d file changed"
11303 #~ msgid_plural " %d files changed"
11304 #~ msgstr[0] " %d 个文件被修改"
11305 #~ msgstr[1] " %d 个文件被修改"
11307 #~ msgid ", %d insertion(+)"
11308 #~ msgid_plural ", %d insertions(+)"
11309 #~ msgstr[0] ",插入 %d 行(+)"
11310 #~ msgstr[1] ",插入 %d 行(+)"
11312 #~ msgid ", %d deletion(-)"
11313 #~ msgid_plural ", %d deletions(-)"
11314 #~ msgstr[0] ",删除 %d 行(-)"
11315 #~ msgstr[1] ",删除 %d 行(-)"
11317 #~ msgid "You do not have a valid HEAD"
11318 #~ msgstr "您没有一个有效的 HEAD"
11323 #~ msgid "Would not remove %s\n"
11324 #~ msgstr "不会删除 %s\n"
11326 #~ msgid "Not removing %s\n"
11327 #~ msgstr "未删除 %s\n"
11329 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11330 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11332 #~ msgid "Could not read index"
11335 # 译者:中文字符串拼接,可删除前导空格
11336 #~ msgid " (use \"git add\" to track)"
11337 #~ msgstr "(使用 \"git add\" 建立跟踪)"
11339 #~ msgid "--detach cannot be used with -b/-B/--orphan"
11340 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11342 #~ msgid "--detach cannot be used with -t"
11343 #~ msgstr "--detach 不能和 -t 同时使用"
11345 #~ msgid "--orphan and -b|-B are mutually exclusive"
11346 #~ msgstr "--orphan 和 -b|-B 互斥"
11348 #~ msgid "--orphan cannot be used with -t"
11349 #~ msgstr "--orphan 不能和 -t 同时使用"
11351 #~ msgid "git checkout: -f and -m are incompatible"
11352 #~ msgstr "git checkout:-f 和 -m 不兼容"
11355 #~ "git checkout: updating paths is incompatible with switching branches."
11356 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
11358 #~ msgid "diff setup failed"
11359 #~ msgstr "diff 设置失败"
11361 #~ msgid "merge-recursive: disk full?"
11362 #~ msgstr "merge-recursive:磁盘已满?"
11364 #~ msgid "diff_setup_done failed"
11365 #~ msgstr "diff_setup_done 失败"