1 # Chinese translations for Git package
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
9 # - Lian Cheng <rhythm.mail AT gmail.com>
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 "POT-Creation-Date: 2014-04-23 12:50+0800\n"
16 "PO-Revision-Date: 2014-04-23 12:53+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,\n"
33 "and then use 'git add/rm <file>' as\n"
34 "appropriate to mark resolution and make a commit,\n"
35 "or use 'git commit -a'."
38 "'git add/rm <file>' 标记解决方案,\n"
39 "或使用 'git commit -a'。"
42 msgid "git archive [options] <tree-ish> [<path>...]"
43 msgstr "git archive [选项] <树或提交> [<路径>...]"
46 msgid "git archive --list"
47 msgstr "git archive --list"
51 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
53 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
56 msgid "git archive --remote <repo> [--exec <cmd>] --list"
57 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
59 #: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328
61 msgid "pathspec '%s' did not match any files"
62 msgstr "路径规则 '%s' 未匹配任何文件"
69 msgid "archive format"
72 #: archive.c:329 builtin/log.c:1193
77 msgid "prepend prefix to each pathname in the archive"
78 msgstr "为归档中每个路径名加上前缀"
80 #: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265
81 #: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680
82 #: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77
83 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
84 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
88 #: archive.c:332 builtin/archive.c:89
89 msgid "write the archive to this file"
93 msgid "read .gitattributes in working directory"
94 msgstr "读取工作区中的 .gitattributes"
97 msgid "report archived files on stderr"
105 msgid "compress faster"
109 msgid "compress better"
113 msgid "list supported archive formats"
116 #: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
120 #: archive.c:351 builtin/archive.c:91
121 msgid "retrieve the archive from remote repository <repo>"
122 msgstr "从远程版本库(<版本库>)提取归档文件"
124 #: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
128 #: archive.c:353 builtin/archive.c:93
129 msgid "path to the remote git-upload-archive command"
130 msgstr "远程 git-upload-archive 命令的路径"
134 "Negative patterns are ignored in git attributes\n"
135 "Use '\\!' for literal leading exclamation."
137 "负值模版在 git attributes 中被忽略\n"
138 "当字符串确实要以感叹号开始时,使用 '\\!'。"
142 msgid "Not setting branch %s as its own upstream."
143 msgstr "未设置分支 %s 作为它自己的上游。"
147 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
148 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
152 msgid "Branch %s set up to track remote branch %s from %s."
153 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
157 msgid "Branch %s set up to track local branch %s by rebasing."
158 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
162 msgid "Branch %s set up to track local branch %s."
163 msgstr "分支 %s 设置为跟踪本地分支 %s。"
167 msgid "Branch %s set up to track remote ref %s by rebasing."
168 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
172 msgid "Branch %s set up to track remote ref %s."
173 msgstr "分支 %s 设置为跟踪远程引用 %s。"
177 msgid "Branch %s set up to track local ref %s by rebasing."
178 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
182 msgid "Branch %s set up to track local ref %s."
183 msgstr "分支 %s 设置为跟踪本地引用 %s。"
187 msgid "Not tracking: ambiguous information for ref %s"
188 msgstr "未跟踪:引用 %s 有歧义"
192 msgid "'%s' is not a valid branch name."
193 msgstr "'%s' 不是一个有效的分支名称。"
197 msgid "A branch named '%s' already exists."
198 msgstr "一个分支名 '%s' 已经存在。"
201 msgid "Cannot force update the current branch."
206 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
207 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
211 msgid "the requested upstream branch '%s' does not exist"
212 msgstr "请求的上游分支 '%s' 不存在"
217 "If you are planning on basing your work on an upstream\n"
218 "branch that already exists at the remote, you may need to\n"
219 "run \"git fetch\" to retrieve it.\n"
221 "If you are planning to push out a new local branch that\n"
222 "will track its remote counterpart, you may want to use\n"
223 "\"git push -u\" to set the upstream config as you push."
226 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
227 "您可能需要执行 \"git fetch\" 来获取分支。\n"
229 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
230 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
234 msgid "Not a valid object name: '%s'."
235 msgstr "不是一个有效的对象名:'%s'。"
239 msgid "Ambiguous object name: '%s'."
240 msgstr "歧义的对象名:'%s'。"
244 msgid "Not a valid branch point: '%s'."
245 msgstr "无效的分支点:'%s'。"
248 msgid "Failed to lock ref for update"
252 msgid "Failed to write ref"
257 msgid "'%s' does not look like a v2 bundle file"
258 msgstr "'%s' 不像是一个 v2 版本的包文件"
262 msgid "unrecognized header: %s%s (%d)"
263 msgstr "未能识别的包头:%s%s (%d)"
265 #: bundle.c:86 builtin/commit.c:706
267 msgid "could not open '%s'"
271 msgid "Repository lacks these prerequisite commits:"
272 msgstr "版本库缺少这些必备的提交:"
274 #: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332
275 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
276 #: builtin/shortlog.c:158
277 msgid "revision walk setup failed"
282 msgid "The bundle contains this ref:"
283 msgid_plural "The bundle contains these %d refs:"
284 msgstr[0] "这个包中含有这个引用:"
285 msgstr[1] "这个包中含有 %d 个引用:"
288 msgid "The bundle records a complete history."
289 msgstr "这个包记录一个完整历史。"
293 msgid "The bundle requires this ref:"
294 msgid_plural "The bundle requires these %d refs:"
295 msgstr[0] "这个包需要这个引用:"
296 msgstr[1] "这个包需要 %d 个引用:"
299 msgid "rev-list died"
302 #: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261
304 msgid "unrecognized argument: %s"
309 msgid "ref '%s' is excluded by the rev-list options"
310 msgstr "引用 '%s' 被 rev-list 选项排除"
313 msgid "Refusing to create empty bundle."
317 msgid "Could not spawn pack-objects"
318 msgstr "不能生成 pack-objects 进程"
321 msgid "pack-objects died"
322 msgstr "pack-objects 终止"
326 msgid "cannot create '%s'"
330 msgid "index-pack died"
331 msgstr "index-pack 终止"
335 msgid "could not parse %s"
340 msgid "%s %s is not a commit!"
341 msgstr "%s %s 不是一个提交!"
343 #: compat/obstack.c:406 compat/obstack.c:408
344 msgid "memory exhausted"
348 msgid "Could not run 'git rev-list'"
349 msgstr "不能执行 'git rev-list'"
353 msgid "failed write to rev-list: %s"
354 msgstr "无法写入 rev-list:%s"
358 msgid "failed to close rev-list's stdin: %s"
359 msgstr "无法关闭 rev-list 的标准输入:%s"
362 msgid "in the future"
367 msgid "%lu second ago"
368 msgid_plural "%lu seconds ago"
374 msgid "%lu minute ago"
375 msgid_plural "%lu minutes ago"
382 msgid_plural "%lu hours ago"
389 msgid_plural "%lu days ago"
396 msgid_plural "%lu weeks ago"
402 msgid "%lu month ago"
403 msgid_plural "%lu months ago"
410 msgid_plural "%lu years"
414 #. TRANSLATORS: "%s" is "<n> years"
417 msgid "%s, %lu month ago"
418 msgid_plural "%s, %lu months ago"
419 msgstr[0] "%s %lu 个月前"
420 msgstr[1] "%s %lu 个月前"
422 #: date.c:154 date.c:159
425 msgid_plural "%lu years ago"
429 #: diffcore-order.c:24
431 msgid "failed to read orderfile '%s'"
432 msgstr "无法读取排序文件 '%s'"
434 #: diffcore-rename.c:517
435 msgid "Performing inexact rename detection"
436 msgstr "正在进行非精确的重命名检测"
441 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
442 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
447 msgid " Unknown dirstat parameter '%s'\n"
448 msgstr " 未知的 dirstat 参数 '%s'\n"
452 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
453 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
458 "Found errors in 'diff.dirstat' config variable:\n"
461 "发现配置变量 'diff.dirstat' 中的错误:\n"
467 "Failed to parse --dirstat/-X option parameter:\n"
470 "无法解析 --dirstat/-X 选项的参数:\n"
475 msgid "Failed to parse --submodule option parameter: '%s'"
476 msgstr "无法解析 --submodule 选项的参数:'%s'"
478 #: gpg-interface.c:59 gpg-interface.c:131
479 msgid "could not run gpg."
482 #: gpg-interface.c:71
483 msgid "gpg did not accept the data"
486 #: gpg-interface.c:82
487 msgid "gpg failed to sign the data"
490 #: gpg-interface.c:115
492 msgid "could not create temporary file '%s': %s"
493 msgstr "不能创建临时文件 '%s':%s"
495 #: gpg-interface.c:118
497 msgid "failed writing detached signature to '%s': %s"
498 msgstr "无法将分离式签名写入 '%s':%s"
502 msgid "'%s': unable to read %s"
503 msgstr "'%s':无法读取 %s"
512 msgid "'%s': short read %s"
513 msgstr "'%s':读取不完整 %s"
517 msgid "available git commands in '%s'"
518 msgstr "在 '%s' 下可用的 git 命令"
521 msgid "git commands available from elsewhere on your $PATH"
522 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
525 msgid "The most commonly used git commands are:"
526 msgstr "最常用的 git 命令有:"
531 "'%s' appears to be a git command, but we were not\n"
532 "able to execute it. Maybe git-%s is broken?"
534 "'%s' 像是一个 git 命令,但却无法运行。\n"
538 msgid "Uh oh. Your system reports no Git commands at all."
539 msgstr "唉呀,您的系统中未发现 Git 命令。"
544 "WARNING: You called a Git command named '%s', which does not exist.\n"
545 "Continuing under the assumption that you meant '%s'"
547 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
552 msgid "in %0.1f seconds automatically..."
553 msgstr "在 %0.1f 秒钟后自动运行..."
557 msgid "git: '%s' is not a git command. See 'git --help'."
558 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
560 #: help.c:384 help.c:443
566 "Did you mean one of these?"
580 msgid "failed to read the cache"
583 #: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558
584 #: builtin/clone.c:661
585 msgid "unable to write new index file"
588 #: merge-recursive.c:190
590 msgid "(bad commit)\n"
593 #: merge-recursive.c:208
595 msgid "addinfo_cache failed for path '%s'"
596 msgstr "为路径 '%s' addinfo_cache 失败"
598 #: merge-recursive.c:271
599 msgid "error building trees"
602 #: merge-recursive.c:675
604 msgid "failed to create path '%s'%s"
605 msgstr "无法创建路径 '%s'%s"
607 #: merge-recursive.c:686
609 msgid "Removing %s to make room for subdirectory\n"
610 msgstr "删除 %s 以便为子目录留出空间\n"
612 #: merge-recursive.c:700 merge-recursive.c:721
613 msgid ": perhaps a D/F conflict?"
614 msgstr ":可能是一个目录/文件冲突?"
616 #: merge-recursive.c:711
618 msgid "refusing to lose untracked file at '%s'"
619 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
621 #: merge-recursive.c:751
623 msgid "cannot read object %s '%s'"
624 msgstr "不能读取对象 %s '%s'"
626 #: merge-recursive.c:753
628 msgid "blob expected for %s '%s'"
629 msgstr "%s '%s' 应为数据(blob)对象"
631 #: merge-recursive.c:776 builtin/clone.c:317
633 msgid "failed to open '%s'"
636 #: merge-recursive.c:784
638 msgid "failed to symlink '%s'"
639 msgstr "无法创建符号链接 '%s'"
641 #: merge-recursive.c:787
643 msgid "do not know what to do with %06o %s '%s'"
644 msgstr "不知道如何处理 %06o %s '%s'"
646 #: merge-recursive.c:925
647 msgid "Failed to execute internal merge"
650 #: merge-recursive.c:929
652 msgid "Unable to add %s to database"
653 msgstr "不能添加 %s 至对象库"
655 #: merge-recursive.c:945
656 msgid "unsupported object type in the tree"
657 msgstr "在树中有不支持的对象类型"
659 #: merge-recursive.c:1024 merge-recursive.c:1038
662 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
665 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
668 #: merge-recursive.c:1030 merge-recursive.c:1043
671 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
674 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
677 #: merge-recursive.c:1084
681 #: merge-recursive.c:1084
685 #: merge-recursive.c:1140
687 msgid "%s is a directory in %s adding as %s instead"
688 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
690 #: merge-recursive.c:1162
693 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
694 "\"->\"%s\" in \"%s\"%s"
696 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
697 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
699 #: merge-recursive.c:1167
700 msgid " (left unresolved)"
703 #: merge-recursive.c:1221
705 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
707 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
710 #: merge-recursive.c:1251
712 msgid "Renaming %s to %s and %s to %s instead"
713 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
715 #: merge-recursive.c:1450
717 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
718 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
720 #: merge-recursive.c:1460
722 msgid "Adding merged %s"
725 #: merge-recursive.c:1465 merge-recursive.c:1663
727 msgid "Adding as %s instead"
730 #: merge-recursive.c:1516
732 msgid "cannot read object %s"
735 #: merge-recursive.c:1519
737 msgid "object %s is not a blob"
738 msgstr "对象 %s 不是一个数据(blob)对象"
740 #: merge-recursive.c:1567
744 #: merge-recursive.c:1567
748 #: merge-recursive.c:1577
752 #: merge-recursive.c:1584
756 #: merge-recursive.c:1618
758 msgid "Skipped %s (merged same as existing)"
759 msgstr "略过 %s(已经做过相同合并)"
761 #: merge-recursive.c:1632
763 msgid "Auto-merging %s"
766 #: merge-recursive.c:1636 git-submodule.sh:1149
770 #: merge-recursive.c:1637
772 msgid "CONFLICT (%s): Merge conflict in %s"
773 msgstr "冲突(%s):合并冲突于 %s"
775 #: merge-recursive.c:1727
780 #: merge-recursive.c:1752
781 msgid "file/directory"
784 #: merge-recursive.c:1758
785 msgid "directory/file"
788 #: merge-recursive.c:1763
790 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
791 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
793 #: merge-recursive.c:1773
798 #: merge-recursive.c:1790
799 msgid "Fatal merge failure, shouldn't happen."
800 msgstr "严重的合并错误,不应发生。"
802 #: merge-recursive.c:1809
803 msgid "Already up-to-date!"
806 #: merge-recursive.c:1818
808 msgid "merging of trees %s and %s failed"
809 msgstr "无法合并树 %s 和 %s"
811 #: merge-recursive.c:1848
813 msgid "Unprocessed path??? %s"
814 msgstr "未处理的路径??? %s"
816 #: merge-recursive.c:1893
820 #: merge-recursive.c:1906
822 msgid "found %u common ancestor:"
823 msgid_plural "found %u common ancestors:"
824 msgstr[0] "发现 %u 个共同祖先:"
825 msgstr[1] "发现 %u 个共同祖先:"
827 #: merge-recursive.c:1943
828 msgid "merge returned no commit"
831 #: merge-recursive.c:2000
833 msgid "Could not parse object '%s'"
836 #: merge-recursive.c:2012 builtin/merge.c:668
837 msgid "Unable to write index."
841 msgid "Cannot commit uninitialized/unreferenced notes tree"
842 msgstr "不能提交未初始化/未引用的注解树"
846 msgid "Bad notes.rewriteMode value: '%s'"
847 msgstr "坏的 notes.rewriteMode 值:'%s'"
851 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
852 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
854 #. TRANSLATORS: The first %s is the name of the
855 #. environment variable, the second %s is its value
858 msgid "Bad %s value: '%s'"
859 msgstr "坏的 %s 值:'%s'"
863 msgid "unable to parse object: %s"
866 #: parse-options.c:532
870 #: parse-options.c:550
875 #. TRANSLATORS: the colon here should align with the
876 #. one in "usage: %s" translation
877 #: parse-options.c:554
882 # 译者:为保证在输出中对齐,注意调整句中空格!
883 #: parse-options.c:557
888 #: parse-options.c:591
893 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
894 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
898 "global 'literal' pathspec setting is incompatible with all other global "
900 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
903 msgid "invalid parameter for pathspec magic 'prefix'"
904 msgstr "路径规则包含无效的神奇前缀"
908 msgid "Invalid pathspec magic '%.*s' in '%s'"
909 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
913 msgid "Missing ')' at the end of pathspec magic in '%s'"
914 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
918 msgid "Unimplemented pathspec magic '%c' in '%s'"
919 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
923 msgid "%s: 'literal' and 'glob' are incompatible"
924 msgstr "%s:'literal' 和 'glob' 不兼容"
928 msgid "%s: '%s' is outside repository"
929 msgstr "%s:'%s' 在版本库之外"
933 msgid "Pathspec '%s' is in submodule '%.*s'"
934 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
938 msgid "%s: pathspec magic not supported by this command: %s"
939 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
943 msgid "pathspec '%s' is beyond a symbolic link"
944 msgstr "路径规则 '%s' 位于符号链接中"
948 "There is nothing to exclude from by :(exclude) patterns.\n"
949 "Perhaps you forgot to add either ':/' or '.' ?"
951 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
961 "index.version set, but the value is invalid.\n"
964 "设置了 index.version,但是取值无效。\n"
970 "GIT_INDEX_VERSION set, but the value is invalid.\n"
973 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
978 msgid "Cannot fetch both %s and %s to %s"
979 msgstr "不能同时获取 %s 和 %s 至 %s"
983 msgid "%s usually tracks %s, not %s"
984 msgstr "%s 通常跟踪 %s,而非 %s"
988 msgid "%s tracks both %s and %s"
989 msgstr "%s 同时跟踪 %s 和 %s"
992 msgid "Internal error"
997 msgid "Your branch is based on '%s', but the upstream is gone.\n"
998 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1001 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1002 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1006 msgid "Your branch is up-to-date with '%s'.\n"
1007 msgstr "您的分支与上游分支 '%s' 一致。\n"
1011 msgid "Your branch is ahead of '%s' by %d commit.\n"
1012 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1013 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1014 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1017 msgid " (use \"git push\" to publish your local commits)\n"
1018 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1022 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1024 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1025 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1026 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1030 msgid " (use \"git pull\" to update your local branch)\n"
1031 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1036 "Your branch and '%s' have diverged,\n"
1037 "and have %d and %d different commit each, respectively.\n"
1039 "Your branch and '%s' have diverged,\n"
1040 "and have %d and %d different commits each, respectively.\n"
1042 "您的分支和 '%s' 出现了偏离,\n"
1043 "并且分别有 %d 和 %d 处不同的提交。\n"
1045 "您的分支和 '%s' 出现了偏离,\n"
1046 "并且分别有 %d 和 %d 处不同的提交。\n"
1050 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1051 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1054 msgid "open /dev/null failed"
1055 msgstr "不能打开 /dev/null"
1059 msgid "dup2(%d,%d) failed"
1060 msgstr "不能调用 dup2(%d,%d)"
1062 #: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899
1063 #: builtin/merge.c:1009 builtin/merge.c:1019
1065 msgid "Could not open '%s' for writing"
1066 msgstr "不能为写入打开 '%s'"
1068 #: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789
1069 #: builtin/merge.c:1011 builtin/merge.c:1024
1071 msgid "Could not write to '%s'"
1076 "after resolving the conflicts, mark the corrected paths\n"
1077 "with 'git add <paths>' or 'git rm <paths>'"
1079 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1084 "after resolving the conflicts, mark the corrected paths\n"
1085 "with 'git add <paths>' or 'git rm <paths>'\n"
1086 "and commit the result with 'git commit'"
1088 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1089 "对修正后的文件做标记,然后用 'git commit' 提交"
1091 #: sequencer.c:245 sequencer.c:879 sequencer.c:962
1093 msgid "Could not write to %s"
1098 msgid "Error wrapping up %s"
1102 msgid "Your local changes would be overwritten by cherry-pick."
1103 msgstr "您的本地修改将被拣选操作覆盖。"
1106 msgid "Your local changes would be overwritten by revert."
1107 msgstr "您的本地修改将被还原操作覆盖。"
1110 msgid "Commit your changes or stash them to proceed."
1111 msgstr "提交您的修改或保存进度后再继续。"
1113 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1116 msgid "%s: Unable to write new index file"
1117 msgstr "%s:无法写入新索引文件"
1120 msgid "Could not resolve HEAD commit\n"
1121 msgstr "不能解析 HEAD 提交\n"
1124 msgid "Unable to update cache tree\n"
1129 msgid "Could not parse commit %s\n"
1130 msgstr "不能解析提交 %s\n"
1134 msgid "Could not parse parent commit %s\n"
1135 msgstr "不能解析父提交 %s\n"
1138 msgid "Your index file is unmerged."
1139 msgstr "您的索引文件未完成合并。"
1143 msgid "Commit %s is a merge but no -m option was given."
1144 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1148 msgid "Commit %s does not have parent %d"
1149 msgstr "提交 %s 没有父提交 %d"
1153 msgid "Mainline was specified but commit %s is not a merge."
1154 msgstr "指定了主线但提交 %s 不是一个合并。"
1156 #. TRANSLATORS: The first %s will be "revert" or
1157 #. "cherry-pick", the second %s a SHA1
1160 msgid "%s: cannot parse parent commit %s"
1161 msgstr "%s:不能解析父提交 %s"
1165 msgid "Cannot get commit message for %s"
1166 msgstr "不能得到 %s 的提交说明"
1170 msgid "could not revert %s... %s"
1171 msgstr "不能还原 %s... %s"
1175 msgid "could not apply %s... %s"
1176 msgstr "不能应用 %s... %s"
1179 msgid "empty commit set passed"
1184 msgid "git %s: failed to read the index"
1185 msgstr "git %s:无法读取索引"
1189 msgid "git %s: failed to refresh the index"
1190 msgstr "git %s:无法刷新索引"
1194 msgid "Cannot %s during a %s"
1195 msgstr "无法 %s 在一个 %s 过程中"
1199 msgid "Could not parse line %d."
1200 msgstr "不能解析第 %d 行。"
1203 msgid "No commits parsed."
1208 msgid "Could not open %s"
1213 msgid "Could not read %s."
1218 msgid "Unusable instruction sheet: %s"
1223 msgid "Invalid key: %s"
1228 msgid "Invalid value for %s: %s"
1233 msgid "Malformed options sheet: %s"
1237 msgid "a cherry-pick or revert is already in progress"
1238 msgstr "一个拣选或还原操作已在进行"
1241 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1242 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1246 msgid "Could not create sequencer directory %s"
1247 msgstr "不能创建序列目录 %s"
1249 #: sequencer.c:881 sequencer.c:966
1251 msgid "Error wrapping up %s."
1254 #: sequencer.c:900 sequencer.c:1036
1255 msgid "no cherry-pick or revert in progress"
1256 msgstr "拣选或还原操作并未进行"
1259 msgid "cannot resolve HEAD"
1263 msgid "cannot abort from a branch yet to be born"
1264 msgstr "不能从尚未建立的分支终止"
1266 #: sequencer.c:926 builtin/apply.c:4061
1268 msgid "cannot open %s: %s"
1273 msgid "cannot read %s: %s"
1277 msgid "unexpected end of file"
1282 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1283 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1287 msgid "Could not format %s."
1292 msgid "%s: can't cherry-pick a %s"
1293 msgstr "%s:不能拣选一个%s"
1297 msgid "%s: bad revision"
1301 msgid "Can't revert as initial commit"
1305 msgid "Can't cherry-pick into empty head"
1310 "Git normally never creates a ref that ends with 40 hex characters\n"
1311 "because it will be ignored when you just specify 40-hex. These refs\n"
1312 "may be created by mistake. For example,\n"
1314 " git checkout -b $br $(git rev-parse ...)\n"
1316 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1317 "examine these refs and maybe delete them. Turn this message off by\n"
1318 "running \"git config advice.objectNameWarning false\""
1320 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1321 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1323 " git checkout -b $br $(git rev-parse ...)\n"
1325 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1326 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1330 msgid "HEAD does not point to a branch"
1331 msgstr "HEAD 没有指向一个分支"
1335 msgid "No such branch: '%s'"
1340 msgid "No upstream configured for branch '%s'"
1341 msgstr "尚未给分支 '%s' 设置上游"
1345 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1346 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1348 #: submodule.c:64 submodule.c:98
1349 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1350 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1352 #: submodule.c:68 submodule.c:102
1354 msgid "Could not find section in .gitmodules where path=%s"
1355 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1359 msgid "Could not update .gitmodules entry %s"
1360 msgstr "不能更新 .gitmodules 条目 %s"
1364 msgid "Could not remove .gitmodules entry for %s"
1365 msgstr "无法移除 %s 的 .gitmodules 条目"
1368 msgid "staging updated .gitmodules failed"
1369 msgstr "将更新后 .gitmodules 添加暂存区失败"
1371 #: submodule.c:1121 builtin/init-db.c:363
1373 msgid "Could not create git link %s"
1374 msgstr "不能创建 git link %s"
1378 msgid "Could not set core.worktree in %s"
1379 msgstr "不能在 %s 中设置 core.worktree"
1381 #: unpack-trees.c:206
1382 msgid "Checking out files"
1386 msgid "invalid URL scheme name or missing '://' suffix"
1387 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1389 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1391 msgid "invalid %XX escape sequence"
1392 msgstr "无效的 %XX 转义序列"
1395 msgid "missing host and scheme is not 'file:'"
1396 msgstr "缺失主机名且URL方案不是 'file:'"
1399 msgid "a 'file:' URL may not have a port number"
1400 msgstr "一个 'file:' URL 不应该包含端口号"
1403 msgid "invalid characters in host name"
1404 msgstr "主机名中包含无效的字符"
1406 #: urlmatch.c:244 urlmatch.c:255
1407 msgid "invalid port number"
1411 msgid "invalid '..' path segment"
1412 msgstr "无效的 '..' 路径片段"
1416 msgid "unable to access '%s': %s"
1417 msgstr "不能访问 '%s':%s"
1421 msgid "unable to access '%s'"
1426 msgid "unable to look up current user in the passwd file: %s"
1427 msgstr "无法在口令文件中查询到当前用户:%s"
1430 msgid "no such user"
1434 msgid "Unmerged paths:"
1438 #: wt-status.c:177 wt-status.c:204
1440 msgid " (use \"git reset %s <file>...\" to unstage)"
1441 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1444 #: wt-status.c:179 wt-status.c:206
1445 msgid " (use \"git rm --cached <file>...\" to unstage)"
1446 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1450 msgid " (use \"git add <file>...\" to mark resolution)"
1451 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1454 #: wt-status.c:185 wt-status.c:189
1455 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1456 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1460 msgid " (use \"git rm <file>...\" to mark resolution)"
1461 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1464 msgid "Changes to be committed:"
1468 msgid "Changes not staged for commit:"
1469 msgstr "尚未暂存以备提交的变更:"
1473 msgid " (use \"git add <file>...\" to update what will be committed)"
1474 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1478 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1479 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1484 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1485 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1489 msgid " (commit or discard the untracked or modified content in submodules)"
1490 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1495 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1496 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1499 msgid "both deleted:"
1503 msgid "added by us:"
1507 msgid "deleted by them:"
1511 msgid "added by them:"
1515 msgid "deleted by us:"
1523 msgid "both modified:"
1528 msgid "bug: unhandled unmerged status %x"
1529 msgstr "bug:无法处理的未合并状态 %x"
1563 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1565 msgid "new commits, "
1568 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1570 msgid "modified content, "
1573 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1575 msgid "untracked content, "
1580 msgid "bug: unhandled diff status %c"
1581 msgstr "bug:无法处理的差异状态 %c"
1584 msgid "Submodules changed but not updated:"
1585 msgstr "子模组已修改但尚未更新:"
1588 msgid "Submodule changes to be committed:"
1593 "Do not touch the line above.\n"
1594 "Everything below will be removed."
1600 msgid "You have unmerged paths."
1605 msgid " (fix conflicts and run \"git commit\")"
1606 msgstr " (解决冲突并运行 \"git commit\")"
1609 msgid "All conflicts fixed but you are still merging."
1610 msgstr "所有冲突已解决但您仍处于合并中。"
1614 msgid " (use \"git commit\" to conclude merge)"
1615 msgstr " (使用 \"git commit\" 结束合并)"
1618 msgid "You are in the middle of an am session."
1619 msgstr "您正处于 am 操作过程中。"
1622 msgid "The current patch is empty."
1627 msgid " (fix conflicts and then run \"git am --continue\")"
1628 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1632 msgid " (use \"git am --skip\" to skip this patch)"
1633 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1637 msgid " (use \"git am --abort\" to restore the original branch)"
1638 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1640 #: wt-status.c:1027 wt-status.c:1044
1642 msgid "You are currently rebasing branch '%s' on '%s'."
1643 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1645 #: wt-status.c:1032 wt-status.c:1049
1646 msgid "You are currently rebasing."
1651 msgid " (fix conflicts and then run \"git rebase --continue\")"
1652 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1656 msgid " (use \"git rebase --skip\" to skip this patch)"
1657 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1661 msgid " (use \"git rebase --abort\" to check out the original branch)"
1662 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1666 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1667 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1672 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1673 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1676 msgid "You are currently splitting a commit during a rebase."
1677 msgstr "您在执行变基操作时拆分提交。"
1681 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1682 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1686 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1687 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1690 msgid "You are currently editing a commit during a rebase."
1691 msgstr "您在执行变基操作时编辑提交。"
1695 msgid " (use \"git commit --amend\" to amend the current commit)"
1696 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1701 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1702 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1706 msgid "You are currently cherry-picking commit %s."
1707 msgstr "您在执行拣选提交 %s 的操作。"
1711 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1712 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1716 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1717 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1721 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1722 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1726 msgid "You are currently reverting commit %s."
1727 msgstr "您在执行反转提交 %s 的操作。"
1731 msgid " (fix conflicts and run \"git revert --continue\")"
1732 msgstr " (解决冲突并运行 \"git revert --continue\")"
1736 msgid " (all conflicts fixed: run \"git revert --continue\")"
1737 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1741 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1742 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1746 msgid "You are currently bisecting, started from branch '%s'."
1747 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1750 msgid "You are currently bisecting."
1751 msgstr "您在执行二分查找操作。"
1755 msgid " (use \"git bisect reset\" to get back to the original branch)"
1756 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1763 msgid "rebase in progress; onto "
1764 msgstr "变基操作正在进行中;至 "
1767 msgid "HEAD detached at "
1771 msgid "HEAD detached from "
1775 msgid "Not currently on any branch."
1779 msgid "Initial commit"
1783 msgid "Untracked files"
1787 msgid "Ignored files"
1793 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1794 "may speed it up, but you have to be careful not to forget to add\n"
1795 "new files yourself (see 'git help status')."
1797 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1798 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1802 msgid "Untracked files not listed%s"
1803 msgstr "未跟踪的文件没有列出%s"
1805 # 译者:中文字符串拼接,可删除前导空格
1807 msgid " (use -u option to show untracked files)"
1808 msgstr "(使用 -u 参数显示未跟踪的文件)"
1816 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1817 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1821 msgid "no changes added to commit\n"
1827 "nothing added to commit but untracked files present (use \"git add\" to "
1829 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1833 msgid "nothing added to commit but untracked files present\n"
1834 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1836 # 译者:中文字符串拼接,可删除前导空格
1839 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1840 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1842 #: wt-status.c:1400 wt-status.c:1405
1844 msgid "nothing to commit\n"
1847 # 译者:中文字符串拼接,可删除前导空格
1850 msgid "nothing to commit (use -u to show untracked files)\n"
1851 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1853 # 译者:中文字符串拼接,可删除前导空格
1856 msgid "nothing to commit, working directory clean\n"
1857 msgstr "无文件要提交,干净的工作区\n"
1860 msgid "HEAD (no branch)"
1865 msgid "Initial commit on "
1873 #: wt-status.c:1556 wt-status.c:1564
1877 #: compat/precompose_utf8.c:55 builtin/clone.c:356
1879 msgid "failed to unlink '%s'"
1883 msgid "git add [options] [--] <pathspec>..."
1884 msgstr "git add [选项] [--] <路径规则>..."
1888 msgid "unexpected diff status %c"
1891 #: builtin/add.c:69 builtin/commit.c:261
1892 msgid "updating files failed"
1897 msgid "remove '%s'\n"
1900 #: builtin/add.c:133
1901 msgid "Unstaged changes after refreshing the index:"
1902 msgstr "刷新索引之后尚未被暂存的变更:"
1904 #: builtin/add.c:193
1905 msgid "Could not read the index"
1908 #: builtin/add.c:204
1910 msgid "Could not open '%s' for writing."
1911 msgstr "不能打开 '%s' 以写入。"
1913 #: builtin/add.c:208
1914 msgid "Could not write patch"
1917 #: builtin/add.c:213
1919 msgid "Could not stat '%s'"
1920 msgstr "不能查看文件状态 '%s'"
1922 #: builtin/add.c:215
1923 msgid "Empty patch. Aborted."
1926 #: builtin/add.c:221
1928 msgid "Could not apply '%s'"
1931 #: builtin/add.c:231
1932 msgid "The following paths are ignored by one of your .gitignore files:\n"
1933 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1935 #: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70
1936 #: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344
1941 #: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19
1942 #: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612
1943 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
1947 #: builtin/add.c:251
1948 msgid "interactive picking"
1951 #: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283
1952 msgid "select hunks interactively"
1955 #: builtin/add.c:253
1956 msgid "edit current diff and apply"
1959 #: builtin/add.c:254
1960 msgid "allow adding otherwise ignored files"
1963 #: builtin/add.c:255
1964 msgid "update tracked files"
1967 #: builtin/add.c:256
1968 msgid "record only the fact that the path will be added later"
1969 msgstr "只记录,该路径稍后再添加"
1971 #: builtin/add.c:257
1972 msgid "add changes from all tracked and untracked files"
1973 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1975 #: builtin/add.c:260
1976 msgid "ignore paths removed in the working tree (same as --no-all)"
1977 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1979 #: builtin/add.c:262
1980 msgid "don't add, only refresh the index"
1983 #: builtin/add.c:263
1984 msgid "just skip files which cannot be added because of errors"
1985 msgstr "跳过因出错不能添加的文件"
1987 #: builtin/add.c:264
1988 msgid "check if - even missing - files are ignored in dry run"
1989 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
1991 #: builtin/add.c:286
1993 msgid "Use -f if you really want to add them.\n"
1994 msgstr "使用 -f 参数如果您确实要添加它们。\n"
1996 #: builtin/add.c:287
1997 msgid "no files added"
2000 #: builtin/add.c:293
2001 msgid "adding files failed"
2004 #: builtin/add.c:330
2005 msgid "-A and -u are mutually incompatible"
2006 msgstr "-A 和 -u 选项互斥"
2008 #: builtin/add.c:337
2009 msgid "Option --ignore-missing can only be used together with --dry-run"
2010 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2012 #: builtin/add.c:358
2014 msgid "Nothing specified, nothing added.\n"
2015 msgstr "没有指定文件,也没有文件被添加。\n"
2017 #: builtin/add.c:359
2019 msgid "Maybe you wanted to say 'git add .'?\n"
2020 msgstr "也许您想要执行 'git add .'?\n"
2022 #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920
2023 #: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
2024 msgid "index file corrupt"
2027 #: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432
2028 msgid "Unable to write new index file"
2031 #: builtin/apply.c:57
2032 msgid "git apply [options] [<patch>...]"
2033 msgstr "git apply [选项] [<补丁>...]"
2035 #: builtin/apply.c:110
2037 msgid "unrecognized whitespace option '%s'"
2038 msgstr "未能识别的空白字符选项 '%s'"
2040 #: builtin/apply.c:125
2042 msgid "unrecognized whitespace ignore option '%s'"
2043 msgstr "未能识别的空白字符忽略选项 '%s'"
2045 #: builtin/apply.c:823
2047 msgid "Cannot prepare timestamp regexp %s"
2048 msgstr "无法准备时间戳正则表达式 %s"
2050 #: builtin/apply.c:832
2052 msgid "regexec returned %d for input: %s"
2053 msgstr "regexec 返回 %d,输入为:%s"
2055 #: builtin/apply.c:913
2057 msgid "unable to find filename in patch at line %d"
2058 msgstr "不能在补丁的第 %d 行找到文件名"
2060 #: builtin/apply.c:945
2062 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2063 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2065 #: builtin/apply.c:949
2067 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2068 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2070 #: builtin/apply.c:950
2072 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2073 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2075 #: builtin/apply.c:957
2077 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2078 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2080 #: builtin/apply.c:1422
2082 msgid "recount: unexpected line: %.*s"
2083 msgstr "recount:意外的行:%.*s"
2085 #: builtin/apply.c:1479
2087 msgid "patch fragment without header at line %d: %.*s"
2088 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2090 #: builtin/apply.c:1496
2093 "git diff header lacks filename information when removing %d leading pathname "
2094 "component (line %d)"
2096 "git diff header lacks filename information when removing %d leading pathname "
2097 "components (line %d)"
2098 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2099 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2101 #: builtin/apply.c:1656
2102 msgid "new file depends on old contents"
2105 #: builtin/apply.c:1658
2106 msgid "deleted file still has contents"
2109 #: builtin/apply.c:1684
2111 msgid "corrupt patch at line %d"
2112 msgstr "补丁在第 %d 行损坏"
2114 #: builtin/apply.c:1720
2116 msgid "new file %s depends on old contents"
2117 msgstr "新文件 %s 依赖旧内容"
2119 #: builtin/apply.c:1722
2121 msgid "deleted file %s still has contents"
2122 msgstr "删除的文件 %s 仍有内容"
2124 #: builtin/apply.c:1725
2126 msgid "** warning: file %s becomes empty but is not deleted"
2127 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2129 #: builtin/apply.c:1871
2131 msgid "corrupt binary patch at line %d: %.*s"
2132 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2134 #: builtin/apply.c:1900
2136 msgid "unrecognized binary patch at line %d"
2137 msgstr "未能识别的二进制补丁位于第 %d 行"
2139 #: builtin/apply.c:1986
2141 msgid "patch with only garbage at line %d"
2142 msgstr "补丁文件的第 %d 行只有垃圾数据"
2144 #: builtin/apply.c:2076
2146 msgid "unable to read symlink %s"
2147 msgstr "无法读取符号链接 %s"
2149 #: builtin/apply.c:2080
2151 msgid "unable to open or read %s"
2154 #: builtin/apply.c:2688
2156 msgid "invalid start of line: '%c'"
2157 msgstr "无效的行首字符:'%c'"
2159 #: builtin/apply.c:2806
2161 msgid "Hunk #%d succeeded at %d (offset %d line)."
2162 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2163 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2164 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2166 #: builtin/apply.c:2818
2168 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2169 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2171 #: builtin/apply.c:2824
2174 "while searching for:\n"
2180 #: builtin/apply.c:2843
2182 msgid "missing binary patch data for '%s'"
2183 msgstr "缺失 '%s' 的二进制补丁数据"
2185 #: builtin/apply.c:2946
2187 msgid "binary patch does not apply to '%s'"
2188 msgstr "二进制补丁未应用到 '%s'"
2190 #: builtin/apply.c:2952
2192 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2193 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2195 #: builtin/apply.c:2973
2197 msgid "patch failed: %s:%ld"
2198 msgstr "打补丁失败:%s:%ld"
2200 #: builtin/apply.c:3095
2202 msgid "cannot checkout %s"
2205 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2207 msgid "read of %s failed"
2210 #: builtin/apply.c:3174 builtin/apply.c:3396
2212 msgid "path %s has been renamed/deleted"
2213 msgstr "路径 %s 已经被重命名/删除"
2215 #: builtin/apply.c:3255 builtin/apply.c:3410
2217 msgid "%s: does not exist in index"
2220 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2225 #: builtin/apply.c:3264 builtin/apply.c:3418
2227 msgid "%s: does not match index"
2230 #: builtin/apply.c:3366
2231 msgid "removal patch leaves file contents"
2232 msgstr "移除补丁仍留下了文件内容"
2234 #: builtin/apply.c:3435
2236 msgid "%s: wrong type"
2239 #: builtin/apply.c:3437
2241 msgid "%s has type %o, expected %o"
2242 msgstr "%s 的类型是 %o,应为 %o"
2244 #: builtin/apply.c:3538
2246 msgid "%s: already exists in index"
2247 msgstr "%s:已经存在于索引中"
2249 #: builtin/apply.c:3541
2251 msgid "%s: already exists in working directory"
2252 msgstr "%s:已经存在于工作区中"
2254 #: builtin/apply.c:3561
2256 msgid "new mode (%o) of %s does not match old mode (%o)"
2257 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2259 #: builtin/apply.c:3566
2261 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2262 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2264 #: builtin/apply.c:3574
2266 msgid "%s: patch does not apply"
2269 #: builtin/apply.c:3587
2271 msgid "Checking patch %s..."
2274 #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2276 msgid "make_cache_entry failed for path '%s'"
2277 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2279 #: builtin/apply.c:3823
2281 msgid "unable to remove %s from index"
2282 msgstr "不能从索引中移除 %s"
2284 #: builtin/apply.c:3851
2286 msgid "corrupt patch for submodule %s"
2287 msgstr "子模组 %s 损坏的补丁"
2289 #: builtin/apply.c:3855
2291 msgid "unable to stat newly created file '%s'"
2292 msgstr "不能枚举新建文件 '%s' 的状态"
2294 #: builtin/apply.c:3860
2296 msgid "unable to create backing store for newly created file %s"
2297 msgstr "不能为新建文件 %s 创建后端存储"
2299 #: builtin/apply.c:3863 builtin/apply.c:3971
2301 msgid "unable to add cache entry for %s"
2302 msgstr "无法为 %s 添加缓存条目"
2304 #: builtin/apply.c:3896
2306 msgid "closing file '%s'"
2309 #: builtin/apply.c:3945
2311 msgid "unable to write file '%s' mode %o"
2312 msgstr "不能写文件 '%s' 权限 %o"
2314 #: builtin/apply.c:4032
2316 msgid "Applied patch %s cleanly."
2319 #: builtin/apply.c:4040
2320 msgid "internal error"
2323 #: builtin/apply.c:4043
2325 msgid "Applying patch %%s with %d reject..."
2326 msgid_plural "Applying patch %%s with %d rejects..."
2327 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2328 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2330 #: builtin/apply.c:4053
2332 msgid "truncating .rej filename to %.*s.rej"
2333 msgstr "截短 .rej 文件名为 %.*s.rej"
2335 #: builtin/apply.c:4074
2337 msgid "Hunk #%d applied cleanly."
2338 msgstr "第 #%d 个片段成功应用。"
2340 #: builtin/apply.c:4077
2342 msgid "Rejected hunk #%d."
2343 msgstr "拒绝第 #%d 个片段。"
2345 #: builtin/apply.c:4227
2346 msgid "unrecognized input"
2349 #: builtin/apply.c:4238
2350 msgid "unable to read index file"
2353 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2354 #: builtin/fetch.c:78
2358 #: builtin/apply.c:4358
2359 msgid "don't apply changes matching the given path"
2360 msgstr "不要应用与给出路径向匹配的变更"
2362 #: builtin/apply.c:4361
2363 msgid "apply changes matching the given path"
2364 msgstr "应用与给出路径向匹配的变更"
2366 #: builtin/apply.c:4363
2370 #: builtin/apply.c:4364
2371 msgid "remove <num> leading slashes from traditional diff paths"
2372 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2374 #: builtin/apply.c:4367
2375 msgid "ignore additions made by the patch"
2376 msgstr "忽略补丁中的添加的文件"
2378 #: builtin/apply.c:4369
2379 msgid "instead of applying the patch, output diffstat for the input"
2380 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2382 #: builtin/apply.c:4373
2383 msgid "show number of added and deleted lines in decimal notation"
2384 msgstr "以十进制数显示添加和删除的行数"
2386 #: builtin/apply.c:4375
2387 msgid "instead of applying the patch, output a summary for the input"
2388 msgstr "不应用补丁,而是显示输入的概要"
2390 #: builtin/apply.c:4377
2391 msgid "instead of applying the patch, see if the patch is applicable"
2392 msgstr "不应用补丁,而是查看补丁是否可应用"
2394 #: builtin/apply.c:4379
2395 msgid "make sure the patch is applicable to the current index"
2396 msgstr "确认补丁可以应用到当前索引"
2398 #: builtin/apply.c:4381
2399 msgid "apply a patch without touching the working tree"
2400 msgstr "应用补丁而不修改工作区"
2402 #: builtin/apply.c:4383
2403 msgid "also apply the patch (use with --stat/--summary/--check)"
2404 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2406 #: builtin/apply.c:4385
2407 msgid "attempt three-way merge if a patch does not apply"
2408 msgstr "如果一个补丁不能应用则尝试三路合并"
2410 #: builtin/apply.c:4387
2411 msgid "build a temporary index based on embedded index information"
2412 msgstr "创建一个临时索引基于嵌入的索引信息"
2414 #: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455
2415 msgid "paths are separated with NUL character"
2416 msgstr "路径以 NUL 字符分隔"
2418 #: builtin/apply.c:4392
2419 msgid "ensure at least <n> lines of context match"
2420 msgstr "确保至少匹配 <n> 行上下文"
2422 #: builtin/apply.c:4393
2426 #: builtin/apply.c:4394
2427 msgid "detect new or modified lines that have whitespace errors"
2428 msgstr "检查新增和修改的行中间的空白字符滥用"
2430 #: builtin/apply.c:4397 builtin/apply.c:4400
2431 msgid "ignore changes in whitespace when finding context"
2432 msgstr "查找上下文时忽略空白字符的变更"
2434 #: builtin/apply.c:4403
2435 msgid "apply the patch in reverse"
2438 #: builtin/apply.c:4405
2439 msgid "don't expect at least one line of context"
2442 #: builtin/apply.c:4407
2443 msgid "leave the rejected hunks in corresponding *.rej files"
2444 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2446 #: builtin/apply.c:4409
2447 msgid "allow overlapping hunks"
2450 #: builtin/apply.c:4412
2451 msgid "tolerate incorrectly detected missing new-line at the end of file"
2452 msgstr "允许不正确的文件末尾换行符"
2454 #: builtin/apply.c:4415
2455 msgid "do not trust the line counts in the hunk headers"
2456 msgstr "不信任补丁片段的头信息中的行号"
2458 #: builtin/apply.c:4417
2462 #: builtin/apply.c:4418
2463 msgid "prepend <root> to all filenames"
2464 msgstr "为所有文件名前添加 <根目录>"
2466 #: builtin/apply.c:4440
2467 msgid "--3way outside a repository"
2468 msgstr "--3way 在一个版本库之外"
2470 #: builtin/apply.c:4448
2471 msgid "--index outside a repository"
2472 msgstr "--index 在一个版本库之外"
2474 #: builtin/apply.c:4451
2475 msgid "--cached outside a repository"
2476 msgstr "--cached 在一个版本库之外"
2478 #: builtin/apply.c:4467
2480 msgid "can't open patch '%s'"
2481 msgstr "不能打开补丁 '%s'"
2483 #: builtin/apply.c:4481
2485 msgid "squelched %d whitespace error"
2486 msgid_plural "squelched %d whitespace errors"
2487 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2488 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2490 #: builtin/apply.c:4487 builtin/apply.c:4497
2492 msgid "%d line adds whitespace errors."
2493 msgid_plural "%d lines add whitespace errors."
2494 msgstr[0] "%d 行有空白字符误用。"
2495 msgstr[1] "%d 行有空白字符误用。"
2497 #: builtin/archive.c:17
2499 msgid "could not create archive file '%s'"
2500 msgstr "不能创建归档文件 '%s'"
2502 #: builtin/archive.c:20
2503 msgid "could not redirect output"
2506 #: builtin/archive.c:37
2507 msgid "git archive: Remote with no URL"
2508 msgstr "git archive:未提供远程URL"
2510 #: builtin/archive.c:58
2511 msgid "git archive: expected ACK/NAK, got EOF"
2512 msgstr "git archive:应为ACK/NACK,却得到EOF"
2514 #: builtin/archive.c:61
2516 msgid "git archive: NACK %s"
2517 msgstr "git archive:NACK %s"
2519 #: builtin/archive.c:63
2521 msgid "remote error: %s"
2524 #: builtin/archive.c:64
2525 msgid "git archive: protocol error"
2526 msgstr "git archive:协议错误"
2528 #: builtin/archive.c:68
2529 msgid "git archive: expected a flush"
2530 msgstr "git archive:应为刷新"
2532 #: builtin/bisect--helper.c:7
2533 msgid "git bisect--helper --next-all [--no-checkout]"
2534 msgstr "git bisect--helper --next-all [--no-checkout]"
2536 #: builtin/bisect--helper.c:17
2537 msgid "perform 'git bisect next'"
2538 msgstr "执行 'git bisect next'"
2540 #: builtin/bisect--helper.c:19
2541 msgid "update BISECT_HEAD instead of checking out the current commit"
2542 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2544 #: builtin/blame.c:27
2545 msgid "git blame [options] [rev-opts] [rev] [--] file"
2546 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2548 #: builtin/blame.c:32
2549 msgid "[rev-opts] are documented in git-rev-list(1)"
2550 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2552 #: builtin/blame.c:2249
2553 msgid "Show blame entries as we find them, incrementally"
2554 msgstr "增量式地显示发现的 blame 条目"
2556 #: builtin/blame.c:2250
2557 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2558 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2560 #: builtin/blame.c:2251
2561 msgid "Do not treat root commits as boundaries (Default: off)"
2562 msgstr "不把根提交作为边界(默认:关闭)"
2564 #: builtin/blame.c:2252
2565 msgid "Show work cost statistics"
2568 #: builtin/blame.c:2253
2569 msgid "Show output score for blame entries"
2570 msgstr "显示判断 blame 条目位移的得分诊断信息"
2572 #: builtin/blame.c:2254
2573 msgid "Show original filename (Default: auto)"
2574 msgstr "显示原始文件名(默认:自动)"
2576 #: builtin/blame.c:2255
2577 msgid "Show original linenumber (Default: off)"
2578 msgstr "显示原始的行号(默认:关闭)"
2580 #: builtin/blame.c:2256
2581 msgid "Show in a format designed for machine consumption"
2582 msgstr "显示为一个适合机器读取的格式"
2584 #: builtin/blame.c:2257
2585 msgid "Show porcelain format with per-line commit information"
2586 msgstr "为每一行显示机器适用的提交信息"
2588 #: builtin/blame.c:2258
2589 msgid "Use the same output mode as git-annotate (Default: off)"
2590 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2592 #: builtin/blame.c:2259
2593 msgid "Show raw timestamp (Default: off)"
2594 msgstr "显示原始时间戳(默认:关闭)"
2596 #: builtin/blame.c:2260
2597 msgid "Show long commit SHA1 (Default: off)"
2598 msgstr "显示长的SHA1提交号(默认:关闭)"
2600 #: builtin/blame.c:2261
2601 msgid "Suppress author name and timestamp (Default: off)"
2602 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2604 #: builtin/blame.c:2262
2605 msgid "Show author email instead of name (Default: off)"
2606 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2608 #: builtin/blame.c:2263
2609 msgid "Ignore whitespace differences"
2612 #: builtin/blame.c:2264
2613 msgid "Spend extra cycles to find better match"
2614 msgstr "花费额外的循环来找到更好的匹配"
2616 #: builtin/blame.c:2265
2617 msgid "Use revisions from <file> instead of calling git-rev-list"
2618 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2620 #: builtin/blame.c:2266
2621 msgid "Use <file>'s contents as the final image"
2622 msgstr "使用 <file> 的内容作为最终的图片"
2624 #: builtin/blame.c:2267 builtin/blame.c:2268
2628 #: builtin/blame.c:2267
2629 msgid "Find line copies within and across files"
2630 msgstr "找到文件内及跨文件的行拷贝"
2632 #: builtin/blame.c:2268
2633 msgid "Find line movements within and across files"
2634 msgstr "找到文件内及跨文件的行移动"
2636 #: builtin/blame.c:2269
2640 #: builtin/blame.c:2269
2641 msgid "Process only line range n,m, counting from 1"
2642 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2644 #. TRANSLATORS: This string is used to tell us the maximum
2645 #. display width for a relative timestamp in "git blame"
2646 #. output. For C locale, "4 years, 11 months ago", which
2647 #. takes 22 places, is the longest among various forms of
2648 #. relative timestamps, but your language may need more or
2649 #. fewer display columns.
2650 #: builtin/blame.c:2347
2651 msgid "4 years, 11 months ago"
2654 #: builtin/branch.c:24
2655 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2656 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2658 #: builtin/branch.c:25
2659 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2660 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2662 #: builtin/branch.c:26
2663 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2664 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2666 #: builtin/branch.c:27
2667 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2668 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2670 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2671 #: builtin/branch.c:150
2674 "deleting branch '%s' that has been merged to\n"
2675 " '%s', but not yet merged to HEAD."
2677 "将要删除的分支 '%s' 已经被合并到\n"
2680 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2681 #: builtin/branch.c:154
2684 "not deleting branch '%s' that is not yet merged to\n"
2685 " '%s', even though it is merged to HEAD."
2687 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2688 " 然而却尚未被合并到分支 '%s' 。"
2690 #: builtin/branch.c:168
2692 msgid "Couldn't look up commit object for '%s'"
2693 msgstr "无法查询 '%s' 指向的提交对象"
2695 #: builtin/branch.c:172
2698 "The branch '%s' is not fully merged.\n"
2699 "If you are sure you want to delete it, run 'git branch -D %s'."
2702 "如果您确认要删除它,执行 'git branch -D %s'。"
2704 #: builtin/branch.c:185
2705 msgid "Update of config-file failed"
2706 msgstr "无法更新 config 文件"
2708 #: builtin/branch.c:213
2709 msgid "cannot use -a with -d"
2710 msgstr "不能将 -a 和 -d 同时使用"
2712 #: builtin/branch.c:219
2713 msgid "Couldn't look up commit object for HEAD"
2714 msgstr "无法查询 HEAD 指向的提交对象"
2716 #: builtin/branch.c:227
2718 msgid "Cannot delete the branch '%s' which you are currently on."
2719 msgstr "无法删除您当前所在的分支 '%s'。"
2721 #: builtin/branch.c:240
2723 msgid "remote branch '%s' not found."
2724 msgstr "远程分支 '%s' 未发现。"
2726 #: builtin/branch.c:241
2728 msgid "branch '%s' not found."
2729 msgstr "分支 '%s' 未发现。"
2731 #: builtin/branch.c:255
2733 msgid "Error deleting remote branch '%s'"
2734 msgstr "删除远程分支 '%s' 时出错"
2736 #: builtin/branch.c:256
2738 msgid "Error deleting branch '%s'"
2739 msgstr "删除分支 '%s' 时出错"
2741 #: builtin/branch.c:263
2743 msgid "Deleted remote branch %s (was %s).\n"
2744 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2746 #: builtin/branch.c:264
2748 msgid "Deleted branch %s (was %s).\n"
2749 msgstr "已删除分支 %s(曾为 %s)。\n"
2751 #: builtin/branch.c:366
2753 msgid "branch '%s' does not point at a commit"
2754 msgstr "分支 '%s' 未指向一个提交"
2756 #: builtin/branch.c:454
2761 #: builtin/branch.c:459
2766 #: builtin/branch.c:464
2768 msgid "[%s: behind %d]"
2771 #: builtin/branch.c:466
2776 #: builtin/branch.c:470
2778 msgid "[%s: ahead %d]"
2781 #: builtin/branch.c:472
2786 #: builtin/branch.c:475
2788 msgid "[%s: ahead %d, behind %d]"
2789 msgstr "[%s:领先 %d,落后 %d]"
2791 #: builtin/branch.c:478
2793 msgid "[ahead %d, behind %d]"
2794 msgstr "[领先 %d,落后 %d]"
2796 #: builtin/branch.c:502
2797 msgid " **** invalid ref ****"
2798 msgstr " **** 无效引用 ****"
2800 #: builtin/branch.c:594
2802 msgid "(no branch, rebasing %s)"
2803 msgstr "(非分支,正变基 %s)"
2805 #: builtin/branch.c:597
2807 msgid "(no branch, bisect started on %s)"
2808 msgstr "(非分支,二分查找开始于 %s)"
2810 #: builtin/branch.c:600
2812 msgid "(detached from %s)"
2815 #: builtin/branch.c:603
2819 #: builtin/branch.c:649
2821 msgid "object '%s' does not point to a commit"
2822 msgstr "对象 '%s' 没有指向一个提交"
2824 #: builtin/branch.c:681
2825 msgid "some refs could not be read"
2828 #: builtin/branch.c:694
2829 msgid "cannot rename the current branch while not on any."
2830 msgstr "无法重命名当前分支因为不处于任何分支上。"
2832 #: builtin/branch.c:704
2834 msgid "Invalid branch name: '%s'"
2835 msgstr "无效的分支名:'%s'"
2837 #: builtin/branch.c:719
2838 msgid "Branch rename failed"
2841 #: builtin/branch.c:723
2843 msgid "Renamed a misnamed branch '%s' away"
2844 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2846 #: builtin/branch.c:727
2848 msgid "Branch renamed to %s, but HEAD is not updated!"
2849 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2851 #: builtin/branch.c:734
2852 msgid "Branch is renamed, but update of config-file failed"
2853 msgstr "分支被重命名,但更新 config 文件失败"
2855 #: builtin/branch.c:749
2857 msgid "malformed object name %s"
2860 #: builtin/branch.c:773
2862 msgid "could not write branch description template: %s"
2863 msgstr "不能写分支描述模版:%s"
2865 #: builtin/branch.c:803
2866 msgid "Generic options"
2869 #: builtin/branch.c:805
2870 msgid "show hash and subject, give twice for upstream branch"
2871 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2873 #: builtin/branch.c:806
2874 msgid "suppress informational messages"
2877 #: builtin/branch.c:807
2878 msgid "set up tracking mode (see git-pull(1))"
2879 msgstr "设置跟踪模式(参见 git-pull(1))"
2881 #: builtin/branch.c:809
2882 msgid "change upstream info"
2885 #: builtin/branch.c:813
2886 msgid "use colored output"
2889 #: builtin/branch.c:814
2890 msgid "act on remote-tracking branches"
2893 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2894 #: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495
2895 #: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527
2896 #: builtin/tag.c:533
2900 #: builtin/branch.c:818 builtin/branch.c:824
2901 msgid "print only branches that contain the commit"
2902 msgstr "只打印包含该提交的分支"
2904 #: builtin/branch.c:830
2905 msgid "Specific git-branch actions:"
2906 msgstr "具体的 git-branch 动作:"
2908 #: builtin/branch.c:831
2909 msgid "list both remote-tracking and local branches"
2910 msgstr "列出远程跟踪及本地分支"
2912 #: builtin/branch.c:833
2913 msgid "delete fully merged branch"
2916 #: builtin/branch.c:834
2917 msgid "delete branch (even if not merged)"
2918 msgstr "删除分支(即使没有合并)"
2920 #: builtin/branch.c:835
2921 msgid "move/rename a branch and its reflog"
2922 msgstr "移动/重命名一个分支,以及它的引用日志"
2924 #: builtin/branch.c:836
2925 msgid "move/rename a branch, even if target exists"
2926 msgstr "移动/重命名一个分支,即使目标已存在"
2928 #: builtin/branch.c:837
2929 msgid "list branch names"
2932 #: builtin/branch.c:838
2933 msgid "create the branch's reflog"
2936 #: builtin/branch.c:840
2937 msgid "edit the description for the branch"
2940 #: builtin/branch.c:841
2941 msgid "force creation (when already exists)"
2942 msgstr "强制创建(当已经存在)"
2944 #: builtin/branch.c:844
2945 msgid "print only not merged branches"
2948 #: builtin/branch.c:850
2949 msgid "print only merged branches"
2952 #: builtin/branch.c:854
2953 msgid "list branches in columns"
2956 #: builtin/branch.c:867
2957 msgid "Failed to resolve HEAD as a valid ref."
2958 msgstr "无法将 HEAD 解析为有效引用。"
2960 #: builtin/branch.c:872 builtin/clone.c:635
2961 msgid "HEAD not found below refs/heads!"
2962 msgstr "HEAD 没有位于 /refs/heads 之下!"
2964 #: builtin/branch.c:896
2965 msgid "--column and --verbose are incompatible"
2966 msgstr "--column 和 --verbose 不兼容"
2968 #: builtin/branch.c:902 builtin/branch.c:941
2969 msgid "branch name required"
2972 #: builtin/branch.c:917
2973 msgid "Cannot give description to detached HEAD"
2974 msgstr "不能向分离头指针提供描述"
2976 #: builtin/branch.c:922
2977 msgid "cannot edit description of more than one branch"
2978 msgstr "不能为一个以上的分支编辑描述"
2980 #: builtin/branch.c:929
2982 msgid "No commit on branch '%s' yet."
2983 msgstr "分支 '%s' 尚无提交。"
2985 #: builtin/branch.c:932
2987 msgid "No branch named '%s'."
2990 #: builtin/branch.c:947
2991 msgid "too many branches for a rename operation"
2992 msgstr "为重命名操作提供了太多的分支名"
2994 #: builtin/branch.c:952
2995 msgid "too many branches to set new upstream"
2996 msgstr "为设置新上游提供了太多的分支名"
2998 #: builtin/branch.c:956
3001 "could not set upstream of HEAD to %s when it does not point to any branch."
3002 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3004 #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
3006 msgid "no such branch '%s'"
3009 #: builtin/branch.c:963
3011 msgid "branch '%s' does not exist"
3012 msgstr "分支 '%s' 不存在"
3014 #: builtin/branch.c:975
3015 msgid "too many branches to unset upstream"
3016 msgstr "为取消上游设置操作提供了太多的分支名"
3018 #: builtin/branch.c:979
3019 msgid "could not unset upstream of HEAD when it does not point to any branch."
3020 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3022 #: builtin/branch.c:985
3024 msgid "Branch '%s' has no upstream information"
3025 msgstr "分支 '%s' 没有上游信息"
3027 #: builtin/branch.c:999
3028 msgid "it does not make sense to create 'HEAD' manually"
3029 msgstr "手工创建 'HEAD' 没有意义"
3031 #: builtin/branch.c:1005
3032 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3033 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3035 #: builtin/branch.c:1008
3038 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3039 "track or --set-upstream-to\n"
3041 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3043 #: builtin/branch.c:1025
3047 "If you wanted to make '%s' track '%s', do this:\n"
3051 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3054 #: builtin/branch.c:1026
3056 msgid " git branch -d %s\n"
3057 msgstr " git branch -d %s\n"
3059 #: builtin/branch.c:1027
3061 msgid " git branch --set-upstream-to %s\n"
3062 msgstr " git branch --set-upstream-to %s\n"
3064 #: builtin/bundle.c:47
3066 msgid "%s is okay\n"
3069 #: builtin/bundle.c:56
3070 msgid "Need a repository to create a bundle."
3071 msgstr "需要一个版本库来创建包。"
3073 #: builtin/bundle.c:60
3074 msgid "Need a repository to unbundle."
3075 msgstr "需要一个版本库来解包。"
3077 #: builtin/cat-file.c:331
3078 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3079 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3081 #: builtin/cat-file.c:332
3082 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3083 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3085 #: builtin/cat-file.c:369
3086 msgid "<type> can be one of: blob, tree, commit, tag"
3087 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3089 #: builtin/cat-file.c:370
3090 msgid "show object type"
3093 #: builtin/cat-file.c:371
3094 msgid "show object size"
3097 #: builtin/cat-file.c:373
3098 msgid "exit with zero when there's no error"
3099 msgstr "当没有错误时退出并返回零"
3101 #: builtin/cat-file.c:374
3102 msgid "pretty-print object's content"
3105 #: builtin/cat-file.c:376
3106 msgid "for blob objects, run textconv on object's content"
3107 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3109 #: builtin/cat-file.c:378
3110 msgid "show info and content of objects fed from the standard input"
3111 msgstr "显示从标准输入提供的对象的信息和内容"
3113 #: builtin/cat-file.c:381
3114 msgid "show info about objects fed from the standard input"
3115 msgstr "显示从标准输入提供的对象的信息"
3117 #: builtin/check-attr.c:11
3118 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3119 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3121 #: builtin/check-attr.c:12
3122 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3123 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3125 #: builtin/check-attr.c:19
3126 msgid "report all attributes set on file"
3127 msgstr "报告设置在文件上的所有属性"
3129 #: builtin/check-attr.c:20
3130 msgid "use .gitattributes only from the index"
3131 msgstr "只使用索引中的 .gitattributes"
3133 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3134 msgid "read file names from stdin"
3137 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3138 msgid "terminate input and output records by a NUL character"
3139 msgstr "输入和输出的记录使用 NUL 字符终结"
3141 #: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271
3142 msgid "suppress progress reporting"
3145 #: builtin/check-ignore.c:26
3146 msgid "show non-matching input paths"
3149 #: builtin/check-ignore.c:28
3150 msgid "ignore index when checking"
3153 #: builtin/check-ignore.c:154
3154 msgid "cannot specify pathnames with --stdin"
3155 msgstr "不能同时提供路径及 --stdin 参数"
3157 #: builtin/check-ignore.c:157
3158 msgid "-z only makes sense with --stdin"
3159 msgstr "-z 需要和 --stdin 参数共用才有意义"
3161 #: builtin/check-ignore.c:159
3162 msgid "no path specified"
3165 #: builtin/check-ignore.c:163
3166 msgid "--quiet is only valid with a single pathname"
3167 msgstr "参数 --quiet 只在提供一个路径名时有效"
3169 #: builtin/check-ignore.c:165
3170 msgid "cannot have both --quiet and --verbose"
3171 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3173 #: builtin/check-ignore.c:168
3174 msgid "--non-matching is only valid with --verbose"
3175 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3177 #: builtin/check-mailmap.c:8
3178 msgid "git check-mailmap [options] <contact>..."
3179 msgstr "git check-mailmap [选项] <联系地址>..."
3181 #: builtin/check-mailmap.c:13
3182 msgid "also read contacts from stdin"
3183 msgstr "还从标准输入读取联系地址"
3185 #: builtin/check-mailmap.c:24
3187 msgid "unable to parse contact: %s"
3188 msgstr "不能解析联系地址:%s"
3190 #: builtin/check-mailmap.c:47
3191 msgid "no contacts specified"
3194 #: builtin/checkout-index.c:126
3195 msgid "git checkout-index [options] [--] [<file>...]"
3196 msgstr "git checkout-index [选项] [--] [<文件>...]"
3198 #: builtin/checkout-index.c:187
3199 msgid "check out all files in the index"
3202 #: builtin/checkout-index.c:188
3203 msgid "force overwrite of existing files"
3206 #: builtin/checkout-index.c:190
3207 msgid "no warning for existing files and files not in index"
3208 msgstr "存在或不在索引中的文件都没有警告"
3210 #: builtin/checkout-index.c:192
3211 msgid "don't checkout new files"
3214 #: builtin/checkout-index.c:194
3215 msgid "update stat information in the index file"
3216 msgstr "更新索引中文件的状态信息"
3218 #: builtin/checkout-index.c:200
3219 msgid "read list of paths from the standard input"
3220 msgstr "从标准输入读取路径列表"
3222 #: builtin/checkout-index.c:202
3223 msgid "write the content to temporary files"
3226 #: builtin/checkout-index.c:203 builtin/column.c:30
3230 #: builtin/checkout-index.c:204
3231 msgid "when creating files, prepend <string>"
3232 msgstr "在创建文件时,在前面加上<字符串>"
3234 #: builtin/checkout-index.c:207
3235 msgid "copy out the files from named stage"
3236 msgstr "从指定暂存区中拷出文件"
3238 #: builtin/checkout.c:25
3239 msgid "git checkout [options] <branch>"
3240 msgstr "git checkout [选项] <分支>"
3242 #: builtin/checkout.c:26
3243 msgid "git checkout [options] [<branch>] -- <file>..."
3244 msgstr "git checkout [选项] [<分支>] -- <文件>..."
3246 #: builtin/checkout.c:114 builtin/checkout.c:147
3248 msgid "path '%s' does not have our version"
3249 msgstr "路径 '%s' 没有我们的版本"
3251 #: builtin/checkout.c:116 builtin/checkout.c:149
3253 msgid "path '%s' does not have their version"
3254 msgstr "路径 '%s' 没有他们的版本"
3256 #: builtin/checkout.c:132
3258 msgid "path '%s' does not have all necessary versions"
3259 msgstr "路径 '%s' 没有全部必须的版本"
3261 #: builtin/checkout.c:176
3263 msgid "path '%s' does not have necessary versions"
3264 msgstr "路径 '%s' 没有必须的版本"
3266 #: builtin/checkout.c:193
3268 msgid "path '%s': cannot merge"
3269 msgstr "path '%s':无法合并"
3271 #: builtin/checkout.c:210
3273 msgid "Unable to add merge result for '%s'"
3274 msgstr "无法为 '%s' 添加合并结果"
3276 #: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3277 #: builtin/checkout.c:241
3279 msgid "'%s' cannot be used with updating paths"
3280 msgstr "'%s' 不能在更新路径时使用"
3282 #: builtin/checkout.c:244 builtin/checkout.c:247
3284 msgid "'%s' cannot be used with %s"
3285 msgstr "'%s' 不能和 %s 同时使用"
3287 #: builtin/checkout.c:250
3289 msgid "Cannot update paths and switch to branch '%s' at the same time."
3290 msgstr "不能同时更新路径并切换到分支'%s'。"
3292 #: builtin/checkout.c:261 builtin/checkout.c:450
3293 msgid "corrupt index file"
3296 #: builtin/checkout.c:321 builtin/checkout.c:328
3298 msgid "path '%s' is unmerged"
3299 msgstr "路径 '%s' 未合并"
3301 #: builtin/checkout.c:472
3302 msgid "you need to resolve your current index first"
3303 msgstr "您需要先解决当前索引的冲突"
3305 #: builtin/checkout.c:593
3307 msgid "Can not do reflog for '%s'\n"
3308 msgstr "不能对 '%s' 执行 reflog 操作\n"
3310 #: builtin/checkout.c:631
3311 msgid "HEAD is now at"
3314 #: builtin/checkout.c:638
3316 msgid "Reset branch '%s'\n"
3317 msgstr "重置分支 '%s'\n"
3319 #: builtin/checkout.c:641
3321 msgid "Already on '%s'\n"
3322 msgstr "已经位于 '%s'\n"
3324 #: builtin/checkout.c:645
3326 msgid "Switched to and reset branch '%s'\n"
3327 msgstr "切换并重置分支 '%s'\n"
3329 #: builtin/checkout.c:647 builtin/checkout.c:1032
3331 msgid "Switched to a new branch '%s'\n"
3332 msgstr "切换到一个新分支 '%s'\n"
3334 #: builtin/checkout.c:649
3336 msgid "Switched to branch '%s'\n"
3337 msgstr "切换到分支 '%s'\n"
3340 #: builtin/checkout.c:705
3342 msgid " ... and %d more.\n"
3343 msgstr " ... 及其它 %d 个。\n"
3345 #: builtin/checkout.c:711
3348 "Warning: you are leaving %d commit behind, not connected to\n"
3349 "any of your branches:\n"
3353 "Warning: you are leaving %d commits behind, not connected to\n"
3354 "any of your branches:\n"
3358 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3362 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3366 #: builtin/checkout.c:729
3369 "If you want to keep them by creating a new branch, this may be a good time\n"
3372 " git branch new_branch_name %s\n"
3375 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3378 " git branch new_branch_name %s\n"
3381 #: builtin/checkout.c:759
3382 msgid "internal error in revision walk"
3383 msgstr "在版本遍历时遇到内部错误"
3385 #: builtin/checkout.c:763
3386 msgid "Previous HEAD position was"
3387 msgstr "之前的 HEAD 位置是"
3389 #: builtin/checkout.c:790 builtin/checkout.c:1027
3390 msgid "You are on a branch yet to be born"
3391 msgstr "您位于一个尚未初始化的分支"
3393 #: builtin/checkout.c:934
3395 msgid "only one reference expected, %d given."
3396 msgstr "只要一个引用,却给出了 %d 个"
3398 #: builtin/checkout.c:973
3400 msgid "invalid reference: %s"
3403 #: builtin/checkout.c:1002
3405 msgid "reference is not a tree: %s"
3408 #: builtin/checkout.c:1041
3409 msgid "paths cannot be used with switching branches"
3410 msgstr "路径不能和切换分支同时使用"
3412 #: builtin/checkout.c:1044 builtin/checkout.c:1048
3414 msgid "'%s' cannot be used with switching branches"
3415 msgstr "'%s' 不能和切换分支同时使用"
3417 #: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060
3418 #: builtin/checkout.c:1063
3420 msgid "'%s' cannot be used with '%s'"
3421 msgstr "'%s' 不能和 '%s' 同时使用"
3423 #: builtin/checkout.c:1068
3425 msgid "Cannot switch branch to a non-commit '%s'"
3426 msgstr "不能切换分支到一个非提交 '%s'"
3428 #: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88
3429 #: builtin/remote.c:159 builtin/remote.c:161
3433 #: builtin/checkout.c:1091
3434 msgid "create and checkout a new branch"
3435 msgstr "创建并检出一个新的分支"
3437 #: builtin/checkout.c:1093
3438 msgid "create/reset and checkout a branch"
3439 msgstr "创建/重置并检出一个分支"
3441 #: builtin/checkout.c:1094
3442 msgid "create reflog for new branch"
3443 msgstr "为新的分支创建引用日志"
3445 #: builtin/checkout.c:1095
3446 msgid "detach the HEAD at named commit"
3447 msgstr "成为指向该提交的分离头指针"
3449 #: builtin/checkout.c:1096
3450 msgid "set upstream info for new branch"
3451 msgstr "为新的分支设置上游信息"
3453 #: builtin/checkout.c:1098
3457 #: builtin/checkout.c:1098
3458 msgid "new unparented branch"
3461 #: builtin/checkout.c:1099
3462 msgid "checkout our version for unmerged files"
3463 msgstr "对尚未合并的文件检出我们的版本"
3465 #: builtin/checkout.c:1101
3466 msgid "checkout their version for unmerged files"
3467 msgstr "对尚未合并的文件检出他们的版本"
3469 #: builtin/checkout.c:1103
3470 msgid "force checkout (throw away local modifications)"
3471 msgstr "强制检出(丢弃本地修改)"
3473 #: builtin/checkout.c:1104
3474 msgid "perform a 3-way merge with the new branch"
3475 msgstr "和新的分支执行三路合并"
3477 #: builtin/checkout.c:1105 builtin/merge.c:225
3478 msgid "update ignored files (default)"
3479 msgstr "更新忽略的文件(默认)"
3481 #: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245
3485 #: builtin/checkout.c:1107
3486 msgid "conflict style (merge or diff3)"
3487 msgstr "冲突输出风格(merge 或 diff3)"
3489 #: builtin/checkout.c:1110
3490 msgid "do not limit pathspecs to sparse entries only"
3491 msgstr "对路径不做稀疏检出的限制"
3493 #: builtin/checkout.c:1112
3494 msgid "second guess 'git checkout no-such-branch'"
3495 msgstr "再者猜测'git checkout no-such-branch'"
3497 #: builtin/checkout.c:1135
3498 msgid "-b, -B and --orphan are mutually exclusive"
3499 msgstr "-b、-B 和 --orphan 是互斥的"
3501 #: builtin/checkout.c:1152
3502 msgid "--track needs a branch name"
3503 msgstr "--track 需要一个分支名"
3505 #: builtin/checkout.c:1159
3506 msgid "Missing branch name; try -b"
3507 msgstr "缺少分支名;尝试 -b"
3509 #: builtin/checkout.c:1196
3510 msgid "invalid path specification"
3513 #: builtin/checkout.c:1203
3516 "Cannot update paths and switch to branch '%s' at the same time.\n"
3517 "Did you intend to checkout '%s' which can not be resolved as commit?"
3519 "不能同时更新路径并切换到分支'%s'。\n"
3520 "您是想要检出 '%s' 但其未能解析为提交么?"
3522 #: builtin/checkout.c:1208
3524 msgid "git checkout: --detach does not take a path argument '%s'"
3525 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3527 #: builtin/checkout.c:1212
3529 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3530 "checking out of the index."
3532 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3534 #: builtin/clean.c:26
3536 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3538 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3540 #: builtin/clean.c:30
3542 msgid "Removing %s\n"
3545 #: builtin/clean.c:31
3547 msgid "Would remove %s\n"
3550 #: builtin/clean.c:32
3552 msgid "Skipping repository %s\n"
3555 #: builtin/clean.c:33
3557 msgid "Would skip repository %s\n"
3558 msgstr "将忽略版本库 %s\n"
3560 #: builtin/clean.c:34
3562 msgid "failed to remove %s"
3565 #: builtin/clean.c:295
3568 "1 - select a numbered item\n"
3569 "foo - select item based on unique prefix\n"
3570 " - (empty) select nothing"
3574 "foo - 通过标题选择一个选项\n"
3577 #: builtin/clean.c:299
3580 "1 - select a single item\n"
3581 "3-5 - select a range of items\n"
3582 "2-3,6-9 - select multiple ranges\n"
3583 "foo - select item based on unique prefix\n"
3584 "-... - unselect specified items\n"
3585 "* - choose all items\n"
3586 " - (empty) finish selecting"
3590 "3-5 - 选择一个范围内的所有选项\n"
3591 "2-3,6-9 - 选择多个范围内的所有选项\n"
3592 "foo - 通过标题选择一个选项\n"
3597 #: builtin/clean.c:517
3602 #: builtin/clean.c:660
3604 msgid "Input ignore patterns>> "
3605 msgstr "输入模版以排除条目>> "
3607 #: builtin/clean.c:697
3609 msgid "WARNING: Cannot find items matched by: %s"
3610 msgstr "警告:无法找到和 %s 匹配的条目"
3612 #: builtin/clean.c:718
3613 msgid "Select items to delete"
3616 #: builtin/clean.c:758
3621 #: builtin/clean.c:783
3625 #: builtin/clean.c:791
3627 "clean - start cleaning\n"
3628 "filter by pattern - exclude items from deletion\n"
3629 "select by numbers - select items to be deleted by numbers\n"
3630 "ask each - confirm each deletion (like \"rm -i\")\n"
3631 "quit - stop cleaning\n"
3632 "help - this screen\n"
3633 "? - help for prompt selection"
3636 "filter by pattern - 通过模版排除要删除的条目\n"
3637 "select by numbers - 通过数字选择要删除的条目\n"
3638 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3641 "? - 显示如何在提示符下选择的帮助"
3643 #: builtin/clean.c:818
3644 msgid "*** Commands ***"
3647 #: builtin/clean.c:819
3651 #: builtin/clean.c:827
3652 msgid "Would remove the following item:"
3653 msgid_plural "Would remove the following items:"
3654 msgstr[0] "将删除如下条目:"
3655 msgstr[1] "将删除如下条目:"
3657 #: builtin/clean.c:844
3658 msgid "No more files to clean, exiting."
3659 msgstr "没有要清理的文件,退出。"
3661 #: builtin/clean.c:875
3662 msgid "do not print names of files removed"
3665 #: builtin/clean.c:877
3669 #: builtin/clean.c:878
3670 msgid "interactive cleaning"
3673 #: builtin/clean.c:880
3674 msgid "remove whole directories"
3677 #: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716
3678 #: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185
3682 #: builtin/clean.c:882
3683 msgid "add <pattern> to ignore rules"
3684 msgstr "添加<模式>到忽略规则"
3686 #: builtin/clean.c:883
3687 msgid "remove ignored files, too"
3690 #: builtin/clean.c:885
3691 msgid "remove only ignored files"
3694 #: builtin/clean.c:903
3695 msgid "-x and -X cannot be used together"
3696 msgstr "-x 和 -X 不能同时使用"
3698 #: builtin/clean.c:907
3700 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3703 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3705 #: builtin/clean.c:910
3707 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3710 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3712 #: builtin/clone.c:36
3713 msgid "git clone [options] [--] <repo> [<dir>]"
3714 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3716 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
3717 #: builtin/push.c:504
3718 msgid "force progress reporting"
3721 #: builtin/clone.c:66
3722 msgid "don't create a checkout"
3725 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3726 msgid "create a bare repository"
3729 #: builtin/clone.c:71
3730 msgid "create a mirror repository (implies bare)"
3731 msgstr "创建一个镜像版本库(也是裸版本库)"
3733 #: builtin/clone.c:73
3734 msgid "to clone from a local repository"
3737 #: builtin/clone.c:75
3738 msgid "don't use local hardlinks, always copy"
3739 msgstr "不使用本地硬链接,始终复制"
3741 #: builtin/clone.c:77
3742 msgid "setup as shared repository"
3745 #: builtin/clone.c:79 builtin/clone.c:81
3746 msgid "initialize submodules in the clone"
3749 #: builtin/clone.c:82 builtin/init-db.c:483
3750 msgid "template-directory"
3753 #: builtin/clone.c:83 builtin/init-db.c:484
3754 msgid "directory from which templates will be used"
3757 #: builtin/clone.c:85
3758 msgid "reference repository"
3761 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3765 #: builtin/clone.c:87
3766 msgid "use <name> instead of 'origin' to track upstream"
3767 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3769 #: builtin/clone.c:89
3770 msgid "checkout <branch> instead of the remote's HEAD"
3771 msgstr "检出<分支>而不是远程HEAD"
3773 #: builtin/clone.c:91
3774 msgid "path to git-upload-pack on the remote"
3775 msgstr "远程 git-upload-pack 路径"
3777 #: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661
3781 #: builtin/clone.c:93
3782 msgid "create a shallow clone of that depth"
3783 msgstr "创建一个指定深度的浅克隆"
3785 #: builtin/clone.c:95
3786 msgid "clone only one branch, HEAD or --branch"
3787 msgstr "只克隆一个分支、HEAD 或 --branch"
3789 #: builtin/clone.c:96 builtin/init-db.c:492
3793 #: builtin/clone.c:97 builtin/init-db.c:493
3794 msgid "separate git dir from working tree"
3795 msgstr "git目录和工作区分离"
3797 #: builtin/clone.c:98
3801 #: builtin/clone.c:99
3802 msgid "set config inside the new repository"
3803 msgstr "在新版本库中设置配置信息"
3805 #: builtin/clone.c:252
3807 msgid "reference repository '%s' is not a local repository."
3808 msgstr "参考版本库 '%s' 不是一个本地版本库。"
3810 #: builtin/clone.c:256
3812 msgid "reference repository '%s' is shallow"
3813 msgstr "参考版本库 '%s' 是一个浅克隆"
3815 #: builtin/clone.c:259
3817 msgid "reference repository '%s' is grafted"
3818 msgstr "参考版本库 '%s' 已被嫁接"
3820 #: builtin/clone.c:321
3822 msgid "failed to create directory '%s'"
3823 msgstr "无法创建目录 '%s'"
3825 #: builtin/clone.c:323 builtin/diff.c:83
3827 msgid "failed to stat '%s'"
3828 msgstr "无法枚举 '%s' 状态"
3830 #: builtin/clone.c:325
3832 msgid "%s exists and is not a directory"
3833 msgstr "%s 存在且不是一个目录"
3835 #: builtin/clone.c:339
3837 msgid "failed to stat %s\n"
3838 msgstr "无法枚举 %s 状态\n"
3840 #: builtin/clone.c:361
3842 msgid "failed to create link '%s'"
3843 msgstr "无法创建链接 '%s'"
3845 #: builtin/clone.c:365
3847 msgid "failed to copy file to '%s'"
3848 msgstr "无法拷贝文件至 '%s'"
3850 #: builtin/clone.c:388 builtin/clone.c:565
3855 #: builtin/clone.c:401
3857 "Clone succeeded, but checkout failed.\n"
3858 "You can inspect what was checked out with 'git status'\n"
3859 "and retry the checkout with 'git checkout -f HEAD'\n"
3862 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3863 "'git checkout -f HEAD' 重试\n"
3865 #: builtin/clone.c:480
3867 msgid "Could not find remote branch %s to clone."
3868 msgstr "不能发现要克隆的远程分支 %s。"
3870 #: builtin/clone.c:560
3872 msgid "Checking connectivity... "
3875 #: builtin/clone.c:563
3876 msgid "remote did not send all necessary objects"
3877 msgstr "远程没有发送所有必须的对象"
3879 #: builtin/clone.c:626
3880 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3881 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3883 #: builtin/clone.c:657
3884 msgid "unable to checkout working tree"
3887 #: builtin/clone.c:765
3888 msgid "Too many arguments."
3891 #: builtin/clone.c:769
3892 msgid "You must specify a repository to clone."
3893 msgstr "您必须指定一个版本库来克隆。"
3895 #: builtin/clone.c:780
3897 msgid "--bare and --origin %s options are incompatible."
3898 msgstr "--bare 和 --origin %s 选项不兼容。"
3900 #: builtin/clone.c:783
3901 msgid "--bare and --separate-git-dir are incompatible."
3902 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3904 #: builtin/clone.c:796
3906 msgid "repository '%s' does not exist"
3907 msgstr "版本库 '%s' 不存在"
3909 #: builtin/clone.c:802
3910 msgid "--depth is ignored in local clones; use file:// instead."
3911 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3913 #: builtin/clone.c:805
3914 msgid "source repository is shallow, ignoring --local"
3915 msgstr "源版本库是浅克隆,忽略 --local"
3917 #: builtin/clone.c:810
3918 msgid "--local is ignored"
3919 msgstr "--local 被忽略"
3921 #: builtin/clone.c:814 builtin/fetch.c:1119
3923 msgid "depth %s is not a positive number"
3924 msgstr "深度 %s 不是一个正数"
3926 #: builtin/clone.c:824
3928 msgid "destination path '%s' already exists and is not an empty directory."
3929 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3931 #: builtin/clone.c:834
3933 msgid "working tree '%s' already exists."
3934 msgstr "工作区 '%s' 已经存在。"
3936 #: builtin/clone.c:847 builtin/clone.c:859
3938 msgid "could not create leading directories of '%s'"
3939 msgstr "不能为 '%s' 创建先导目录"
3941 #: builtin/clone.c:850
3943 msgid "could not create work tree dir '%s'."
3944 msgstr "不能为 '%s' 创建工作区目录。"
3946 #: builtin/clone.c:869
3948 msgid "Cloning into bare repository '%s'...\n"
3949 msgstr "克隆到裸版本库 '%s'...\n"
3951 #: builtin/clone.c:871
3953 msgid "Cloning into '%s'...\n"
3954 msgstr "正克隆到 '%s'...\n"
3956 #: builtin/clone.c:906
3958 msgid "Don't know how to clone %s"
3961 #: builtin/clone.c:957 builtin/clone.c:965
3963 msgid "Remote branch %s not found in upstream %s"
3964 msgstr "远程分支 %s 在上游 %s 未发现"
3966 #: builtin/clone.c:968
3967 msgid "You appear to have cloned an empty repository."
3968 msgstr "您似乎克隆了一个空版本库。"
3970 #: builtin/column.c:9
3971 msgid "git column [options]"
3972 msgstr "git column [选项]"
3974 #: builtin/column.c:26
3975 msgid "lookup config vars"
3978 #: builtin/column.c:27 builtin/column.c:28
3979 msgid "layout to use"
3982 #: builtin/column.c:29
3983 msgid "Maximum width"
3986 #: builtin/column.c:30
3987 msgid "Padding space on left border"
3990 #: builtin/column.c:31
3991 msgid "Padding space on right border"
3994 #: builtin/column.c:32
3995 msgid "Padding space between columns"
3998 #: builtin/column.c:51
3999 msgid "--command must be the first argument"
4000 msgstr "--command 必须是第一个参数"
4002 #: builtin/commit.c:36
4003 msgid "git commit [options] [--] <pathspec>..."
4004 msgstr "git commit [选项] [--] <路径规则>..."
4006 #: builtin/commit.c:41
4007 msgid "git status [options] [--] <pathspec>..."
4008 msgstr "git status [选项] [--] <路径规则>..."
4010 #: builtin/commit.c:46
4012 "Your name and email address were configured automatically based\n"
4013 "on your username and hostname. Please check that they are accurate.\n"
4014 "You can suppress this message by setting them explicitly:\n"
4016 " git config --global user.name \"Your Name\"\n"
4017 " git config --global user.email you@example.com\n"
4019 "After doing this, you may fix the identity used for this commit with:\n"
4021 " git commit --amend --reset-author\n"
4023 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4024 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
4026 " git config --global user.name \"Your Name\"\n"
4027 " git config --global user.email you@example.com\n"
4029 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4031 " git commit --amend --reset-author\n"
4033 #: builtin/commit.c:58
4035 "You asked to amend the most recent commit, but doing so would make\n"
4036 "it empty. You can repeat your command with --allow-empty, or you can\n"
4037 "remove the commit entirely with \"git reset HEAD^\".\n"
4039 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4040 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4042 #: builtin/commit.c:63
4044 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4045 "If you wish to commit it anyway, use:\n"
4047 " git commit --allow-empty\n"
4050 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4053 " git commit --allow-empty\n"
4056 #: builtin/commit.c:70
4057 msgid "Otherwise, please use 'git reset'\n"
4058 msgstr "否则,请使用命令 'git reset'\n"
4060 #: builtin/commit.c:73
4062 "If you wish to skip this commit, use:\n"
4066 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4067 "the remaining commits.\n"
4069 "如果您想跳过这个提交,使用命令:\n"
4073 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4076 #: builtin/commit.c:288
4077 msgid "failed to unpack HEAD tree object"
4078 msgstr "无法解包 HEAD 树对象"
4080 #: builtin/commit.c:330
4081 msgid "unable to create temporary index"
4084 #: builtin/commit.c:336
4085 msgid "interactive add failed"
4088 #: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440
4089 msgid "unable to write new_index file"
4090 msgstr "无法写 new_index 文件"
4092 #: builtin/commit.c:421
4093 msgid "cannot do a partial commit during a merge."
4094 msgstr "在合并过程中不能做部分提交。"
4096 #: builtin/commit.c:423
4097 msgid "cannot do a partial commit during a cherry-pick."
4098 msgstr "在拣选过程中不能做部分提交。"
4100 #: builtin/commit.c:433
4101 msgid "cannot read the index"
4104 #: builtin/commit.c:453
4105 msgid "unable to write temporary index file"
4108 #: builtin/commit.c:544 builtin/commit.c:550
4110 msgid "invalid commit: %s"
4113 #: builtin/commit.c:572
4114 msgid "malformed --author parameter"
4115 msgstr "非法的 --author 参数"
4117 #: builtin/commit.c:592
4119 msgid "Malformed ident string: '%s'"
4120 msgstr "非法的身份字符串:'%s'"
4122 #: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014
4124 msgid "could not lookup commit %s"
4127 #: builtin/commit.c:641 builtin/shortlog.c:273
4129 msgid "(reading log message from standard input)\n"
4130 msgstr "(正从标准输入中读取日志信息)\n"
4132 #: builtin/commit.c:643
4133 msgid "could not read log from standard input"
4134 msgstr "不能从标准输入中读取日志信息"
4136 #: builtin/commit.c:647
4138 msgid "could not read log file '%s'"
4139 msgstr "不能读取日志文件 '%s'"
4141 #: builtin/commit.c:654
4142 msgid "commit has empty message"
4145 #: builtin/commit.c:670
4146 msgid "could not read MERGE_MSG"
4147 msgstr "不能读取 MERGE_MSG"
4149 #: builtin/commit.c:674
4150 msgid "could not read SQUASH_MSG"
4151 msgstr "不能读取 SQUASH_MSG"
4153 #: builtin/commit.c:678
4155 msgid "could not read '%s'"
4158 #: builtin/commit.c:749
4159 msgid "could not write commit template"
4162 #: builtin/commit.c:764
4166 "It looks like you may be committing a merge.\n"
4167 "If this is not correct, please remove the file\n"
4172 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4176 #: builtin/commit.c:769
4180 "It looks like you may be committing a cherry-pick.\n"
4181 "If this is not correct, please remove the file\n"
4186 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4190 #: builtin/commit.c:782
4193 "Please enter the commit message for your changes. Lines starting\n"
4194 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4196 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4199 #: builtin/commit.c:789
4202 "Please enter the commit message for your changes. Lines starting\n"
4203 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4204 "An empty message aborts the commit.\n"
4206 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4207 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4209 # 译者:为保证在输出中对齐,注意调整句中空格!
4210 #: builtin/commit.c:802
4212 msgid "%sAuthor: %s"
4215 # 译者:为保证在输出中对齐,注意调整句中空格!
4216 #: builtin/commit.c:809
4218 msgid "%sCommitter: %s"
4221 #: builtin/commit.c:829
4222 msgid "Cannot read index"
4225 #: builtin/commit.c:872
4226 msgid "Error building trees"
4229 #: builtin/commit.c:887 builtin/tag.c:391
4231 msgid "Please supply the message using either -m or -F option.\n"
4232 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4234 #: builtin/commit.c:989
4236 msgid "No existing author found with '%s'"
4237 msgstr "没有找到匹配 '%s' 的作者"
4239 #: builtin/commit.c:1004 builtin/commit.c:1244
4241 msgid "Invalid untracked files mode '%s'"
4242 msgstr "无效的未追踪文件参数 '%s'"
4244 #: builtin/commit.c:1041
4245 msgid "--long and -z are incompatible"
4246 msgstr "--long 和 -z 选项不兼容"
4248 #: builtin/commit.c:1071
4249 msgid "Using both --reset-author and --author does not make sense"
4250 msgstr "同时使用 --reset-author 和 --author 没有意义"
4252 #: builtin/commit.c:1080
4253 msgid "You have nothing to amend."
4256 #: builtin/commit.c:1083
4257 msgid "You are in the middle of a merge -- cannot amend."
4258 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4260 #: builtin/commit.c:1085
4261 msgid "You are in the middle of a cherry-pick -- cannot amend."
4262 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4264 #: builtin/commit.c:1088
4265 msgid "Options --squash and --fixup cannot be used together"
4266 msgstr "选项 --squash 和 --fixup 不能同时使用"
4268 #: builtin/commit.c:1098
4269 msgid "Only one of -c/-C/-F/--fixup can be used."
4270 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4272 #: builtin/commit.c:1100
4273 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4274 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4276 #: builtin/commit.c:1108
4277 msgid "--reset-author can be used only with -C, -c or --amend."
4278 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4280 #: builtin/commit.c:1125
4281 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4282 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4284 #: builtin/commit.c:1127
4285 msgid "No paths with --include/--only does not make sense."
4286 msgstr "参数 --include/--only 不跟路径没有意义。"
4288 #: builtin/commit.c:1129
4289 msgid "Clever... amending the last one with dirty index."
4290 msgstr "聪明... 在索引不干净下修补最后的提交。"
4292 #: builtin/commit.c:1131
4293 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4294 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4296 #: builtin/commit.c:1143 builtin/tag.c:639
4298 msgid "Invalid cleanup mode %s"
4301 #: builtin/commit.c:1148
4302 msgid "Paths with -a does not make sense."
4303 msgstr "路径和 -a 选项同时使用没有意义。"
4305 #: builtin/commit.c:1258 builtin/commit.c:1516
4306 msgid "show status concisely"
4309 #: builtin/commit.c:1260 builtin/commit.c:1518
4310 msgid "show branch information"
4313 #: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490
4314 msgid "machine-readable output"
4317 #: builtin/commit.c:1265 builtin/commit.c:1522
4318 msgid "show status in long format (default)"
4319 msgstr "以长格式显示状态(默认)"
4321 #: builtin/commit.c:1268 builtin/commit.c:1525
4322 msgid "terminate entries with NUL"
4325 #: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674
4326 #: builtin/fast-export.c:677 builtin/tag.c:514
4330 #: builtin/commit.c:1271 builtin/commit.c:1528
4331 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4332 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4334 #: builtin/commit.c:1274
4335 msgid "show ignored files"
4338 #: builtin/commit.c:1275 parse-options.h:153
4342 #: builtin/commit.c:1276
4344 "ignore changes to submodules, optional when: all, dirty, untracked. "
4347 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4349 #: builtin/commit.c:1278
4350 msgid "list untracked files in columns"
4351 msgstr "以列的方式显示未跟踪的文件"
4353 #: builtin/commit.c:1347
4354 msgid "couldn't look up newly created commit"
4357 #: builtin/commit.c:1349
4358 msgid "could not parse newly created commit"
4361 #: builtin/commit.c:1390
4362 msgid "detached HEAD"
4365 # 译者:中文字符串拼接,可删除前导空格
4366 #: builtin/commit.c:1392
4367 msgid " (root-commit)"
4370 #: builtin/commit.c:1486
4371 msgid "suppress summary after successful commit"
4372 msgstr "提交成功后不显示概述信息"
4374 #: builtin/commit.c:1487
4375 msgid "show diff in commit message template"
4376 msgstr "在提交说明模板里显示差异"
4378 #: builtin/commit.c:1489
4379 msgid "Commit message options"
4382 #: builtin/commit.c:1490 builtin/tag.c:512
4383 msgid "read message from file"
4386 #: builtin/commit.c:1491
4390 #: builtin/commit.c:1491
4391 msgid "override author for commit"
4394 #: builtin/commit.c:1492 builtin/gc.c:272
4398 #: builtin/commit.c:1492
4399 msgid "override date for commit"
4402 #: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409
4403 #: builtin/notes.c:566 builtin/tag.c:510
4407 #: builtin/commit.c:1493
4408 msgid "commit message"
4411 #: builtin/commit.c:1494
4412 msgid "reuse and edit message from specified commit"
4413 msgstr "重用并编辑指定提交的提交说明"
4415 #: builtin/commit.c:1495
4416 msgid "reuse message from specified commit"
4417 msgstr "重用指定提交的提交说明"
4419 #: builtin/commit.c:1496
4420 msgid "use autosquash formatted message to fixup specified commit"
4421 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4423 #: builtin/commit.c:1497
4424 msgid "use autosquash formatted message to squash specified commit"
4425 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4427 #: builtin/commit.c:1498
4428 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4429 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4431 #: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86
4432 msgid "add Signed-off-by:"
4433 msgstr "添加 Signed-off-by: 签名"
4435 #: builtin/commit.c:1500
4436 msgid "use specified template file"
4439 #: builtin/commit.c:1501
4440 msgid "force edit of commit"
4443 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4444 #: builtin/commit.c:1502
4448 #: builtin/commit.c:1502 builtin/tag.c:515
4449 msgid "how to strip spaces and #comments from message"
4450 msgstr "设置如何删除提交说明里的空格和#注释"
4452 #: builtin/commit.c:1503
4453 msgid "include status in commit message template"
4454 msgstr "在提交说明模板里包含状态信息"
4456 #: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
4457 #: builtin/tag.c:516
4461 #: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93
4462 msgid "GPG sign commit"
4465 #: builtin/commit.c:1508
4466 msgid "Commit contents options"
4469 #: builtin/commit.c:1509
4470 msgid "commit all changed files"
4473 #: builtin/commit.c:1510
4474 msgid "add specified files to index for commit"
4475 msgstr "添加指定的文件到索引区等待提交"
4477 #: builtin/commit.c:1511
4478 msgid "interactively add files"
4481 #: builtin/commit.c:1512
4482 msgid "interactively add changes"
4485 #: builtin/commit.c:1513
4486 msgid "commit only specified files"
4489 #: builtin/commit.c:1514
4490 msgid "bypass pre-commit hook"
4491 msgstr "绕过 pre-commit 钩子"
4493 #: builtin/commit.c:1515
4494 msgid "show what would be committed"
4497 #: builtin/commit.c:1526
4498 msgid "amend previous commit"
4501 #: builtin/commit.c:1527
4502 msgid "bypass post-rewrite hook"
4503 msgstr "绕过 post-rewrite 钩子"
4505 #: builtin/commit.c:1532
4506 msgid "ok to record an empty change"
4509 #: builtin/commit.c:1534
4510 msgid "ok to record a change with an empty message"
4513 #: builtin/commit.c:1562
4514 msgid "could not parse HEAD commit"
4515 msgstr "不能解析 HEAD 提交"
4517 #: builtin/commit.c:1601 builtin/merge.c:518
4519 msgid "could not open '%s' for reading"
4520 msgstr "不能为读入打开 '%s'"
4522 #: builtin/commit.c:1608
4524 msgid "Corrupt MERGE_HEAD file (%s)"
4525 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4527 #: builtin/commit.c:1615
4528 msgid "could not read MERGE_MODE"
4529 msgstr "不能读取 MERGE_MODE"
4531 #: builtin/commit.c:1634
4533 msgid "could not read commit message: %s"
4534 msgstr "不能读取提交说明:%s"
4536 #: builtin/commit.c:1645
4538 msgid "Aborting commit; you did not edit the message.\n"
4539 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4541 #: builtin/commit.c:1650
4543 msgid "Aborting commit due to empty commit message.\n"
4544 msgstr "终止提交因为提交说明为空。\n"
4546 #: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882
4547 msgid "failed to write commit object"
4550 #: builtin/commit.c:1686
4551 msgid "cannot lock HEAD ref"
4552 msgstr "无法锁定 HEAD 引用"
4554 #: builtin/commit.c:1690
4555 msgid "cannot update HEAD ref"
4556 msgstr "无法更新 HEAD 引用"
4558 #: builtin/commit.c:1701
4560 "Repository has been updated, but unable to write\n"
4561 "new_index file. Check that disk is not full or quota is\n"
4562 "not exceeded, and then \"git reset HEAD\" to recover."
4564 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4565 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4567 #: builtin/config.c:8
4568 msgid "git config [options]"
4569 msgstr "git config [选项]"
4571 #: builtin/config.c:53
4572 msgid "Config file location"
4575 #: builtin/config.c:54
4576 msgid "use global config file"
4579 #: builtin/config.c:55
4580 msgid "use system config file"
4583 #: builtin/config.c:56
4584 msgid "use repository config file"
4587 #: builtin/config.c:57
4588 msgid "use given config file"
4591 #: builtin/config.c:58
4595 #: builtin/config.c:58
4596 msgid "read config from given blob object"
4597 msgstr "从给定的数据对象读取配置"
4599 #: builtin/config.c:59
4603 #: builtin/config.c:60
4604 msgid "get value: name [value-regex]"
4605 msgstr "获取值:name [value-regex]"
4607 #: builtin/config.c:61
4608 msgid "get all values: key [value-regex]"
4609 msgstr "获得所有的值:key [value-regex]"
4611 #: builtin/config.c:62
4612 msgid "get values for regexp: name-regex [value-regex]"
4613 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4615 #: builtin/config.c:63
4616 msgid "get value specific for the URL: section[.var] URL"
4617 msgstr "获得 URL 取值:section[.var] URL"
4619 #: builtin/config.c:64
4620 msgid "replace all matching variables: name value [value_regex]"
4621 msgstr "替换所有匹配的变量:name value [value_regex]"
4623 #: builtin/config.c:65
4624 msgid "add a new variable: name value"
4625 msgstr "添加一个新的变量:name value"
4627 #: builtin/config.c:66
4628 msgid "remove a variable: name [value-regex]"
4629 msgstr "删除一个变量:name [value-regex]"
4631 #: builtin/config.c:67
4632 msgid "remove all matches: name [value-regex]"
4633 msgstr "删除所有匹配项:name [value-regex]"
4635 #: builtin/config.c:68
4636 msgid "rename section: old-name new-name"
4637 msgstr "重命名小节:old-name new-name"
4639 #: builtin/config.c:69
4640 msgid "remove a section: name"
4641 msgstr "删除一个小节:name"
4643 #: builtin/config.c:70
4647 #: builtin/config.c:71
4648 msgid "open an editor"
4651 #: builtin/config.c:72 builtin/config.c:73
4655 #: builtin/config.c:72
4656 msgid "find the color configured: [default]"
4657 msgstr "找到配置的颜色:[默认]"
4659 #: builtin/config.c:73
4660 msgid "find the color setting: [stdout-is-tty]"
4661 msgstr "找到颜色设置:[stdout-is-tty]"
4663 #: builtin/config.c:74
4667 #: builtin/config.c:75
4668 msgid "value is \"true\" or \"false\""
4669 msgstr "值是 \"true\" 或 \"false\""
4671 #: builtin/config.c:76
4672 msgid "value is decimal number"
4675 #: builtin/config.c:77
4676 msgid "value is --bool or --int"
4677 msgstr "值是 --bool or --int"
4679 #: builtin/config.c:78
4680 msgid "value is a path (file or directory name)"
4681 msgstr "值是一个路径(文件或目录名)"
4683 #: builtin/config.c:79
4687 #: builtin/config.c:80
4688 msgid "terminate values with NUL byte"
4691 #: builtin/config.c:81
4692 msgid "respect include directives on lookup"
4693 msgstr "查询时参照 include 指令递归查找"
4695 #: builtin/count-objects.c:82
4696 msgid "git count-objects [-v] [-H | --human-readable]"
4697 msgstr "git count-objects [-v] [-H | --human-readable]"
4699 #: builtin/count-objects.c:97
4700 msgid "print sizes in human readable format"
4701 msgstr "以用户可读的格式显示大小"
4703 #: builtin/describe.c:16
4704 msgid "git describe [options] <commit-ish>*"
4705 msgstr "git describe [选项] <提交号>*"
4707 #: builtin/describe.c:17
4708 msgid "git describe [options] --dirty"
4709 msgstr "git describe [选项] --dirty"
4711 #: builtin/describe.c:225
4713 msgid "annotated tag %s not available"
4714 msgstr "注释 tag %s 无效"
4716 #: builtin/describe.c:229
4718 msgid "annotated tag %s has no embedded name"
4719 msgstr "注释 tag %s 没有嵌入名称"
4721 #: builtin/describe.c:231
4723 msgid "tag '%s' is really '%s' here"
4724 msgstr "tag '%s' 的确是在 '%s'"
4726 #: builtin/describe.c:258
4728 msgid "Not a valid object name %s"
4729 msgstr "不是一个有效的对象名 %s"
4731 #: builtin/describe.c:261
4733 msgid "%s is not a valid '%s' object"
4734 msgstr "%s 不是一个有效的 '%s' 对象"
4736 #: builtin/describe.c:278
4738 msgid "no tag exactly matches '%s'"
4739 msgstr "没有 tag 准确匹配 '%s'"
4741 #: builtin/describe.c:280
4743 msgid "searching to describe %s\n"
4746 #: builtin/describe.c:327
4748 msgid "finished search at %s\n"
4751 #: builtin/describe.c:354
4754 "No annotated tags can describe '%s'.\n"
4755 "However, there were unannotated tags: try --tags."
4757 "没有注释 tag 能描述 '%s'。\n"
4758 "然而,有非注释 tag:尝试 --tags。"
4760 #: builtin/describe.c:358
4763 "No tags can describe '%s'.\n"
4764 "Try --always, or create some tags."
4766 "没有注释 tag 能描述 '%s'。\n"
4767 "尝试 --always,或者创建一些 tag。"
4769 #: builtin/describe.c:379
4771 msgid "traversed %lu commits\n"
4772 msgstr "已遍历 %lu 个提交\n"
4774 #: builtin/describe.c:382
4777 "more than %i tags found; listed %i most recent\n"
4778 "gave up search at %s\n"
4780 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4783 #: builtin/describe.c:404
4784 msgid "find the tag that comes after the commit"
4785 msgstr "寻找提交之后的 tag(用于描述提交)"
4787 #: builtin/describe.c:405
4788 msgid "debug search strategy on stderr"
4789 msgstr "在标准错误上调试搜索策略"
4791 #: builtin/describe.c:406
4795 #: builtin/describe.c:407
4796 msgid "use any tag, even unannotated"
4797 msgstr "使用任意 tag,即使未带注解"
4799 #: builtin/describe.c:408
4800 msgid "always use long format"
4803 #: builtin/describe.c:409
4804 msgid "only follow first parent"
4807 #: builtin/describe.c:412
4808 msgid "only output exact matches"
4811 #: builtin/describe.c:414
4812 msgid "consider <n> most recent tags (default: 10)"
4813 msgstr "考虑最近 <n> 个 tags(默认:10)"
4815 #: builtin/describe.c:416
4816 msgid "only consider tags matching <pattern>"
4817 msgstr "只考虑匹配 <模式> 的 tags"
4819 #: builtin/describe.c:418 builtin/name-rev.c:321
4820 msgid "show abbreviated commit object as fallback"
4821 msgstr "显示简写的提交号作为后备"
4823 #: builtin/describe.c:419
4827 #: builtin/describe.c:420
4828 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4829 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4831 #: builtin/describe.c:438
4832 msgid "--long is incompatible with --abbrev=0"
4833 msgstr "--long 与 --abbrev=0 不兼容"
4835 #: builtin/describe.c:464
4836 msgid "No names found, cannot describe anything."
4837 msgstr "没有发现名称,无法描述任何东西。"
4839 #: builtin/describe.c:484
4840 msgid "--dirty is incompatible with commit-ishes"
4841 msgstr "--dirty 不能与提交同时使用"
4843 #: builtin/diff.c:85
4845 msgid "'%s': not a regular file or symlink"
4846 msgstr "'%s':不是一个正规文件或符号链接"
4848 #: builtin/diff.c:236
4850 msgid "invalid option: %s"
4853 #: builtin/diff.c:357
4854 msgid "Not a git repository"
4855 msgstr "不是一个 git 版本库"
4857 #: builtin/diff.c:400
4859 msgid "invalid object '%s' given."
4860 msgstr "提供了无效对象 '%s'。"
4862 #: builtin/diff.c:409
4864 msgid "more than two blobs given: '%s'"
4865 msgstr "提供了超过两个数据(blob)对象:'%s'"
4867 #: builtin/diff.c:416
4869 msgid "unhandled object '%s' given."
4870 msgstr "无法处理的对象 '%s'。"
4872 #: builtin/fast-export.c:22
4873 msgid "git fast-export [rev-list-opts]"
4874 msgstr "git fast-export [rev-list-opts]"
4876 #: builtin/fast-export.c:673
4877 msgid "show progress after <n> objects"
4878 msgstr "在 <n> 个对象之后显示进度"
4880 #: builtin/fast-export.c:675
4881 msgid "select handling of signed tags"
4882 msgstr "选择如何处理签名 tags"
4884 #: builtin/fast-export.c:678
4885 msgid "select handling of tags that tag filtered objects"
4886 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4888 #: builtin/fast-export.c:681
4889 msgid "Dump marks to this file"
4892 #: builtin/fast-export.c:683
4893 msgid "Import marks from this file"
4896 #: builtin/fast-export.c:685
4897 msgid "Fake a tagger when tags lack one"
4898 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4900 #: builtin/fast-export.c:687
4901 msgid "Output full tree for each commit"
4904 #: builtin/fast-export.c:689
4905 msgid "Use the done feature to terminate the stream"
4906 msgstr "使用 done 功能来终止流"
4908 #: builtin/fast-export.c:690
4909 msgid "Skip output of blob data"
4912 #: builtin/fetch.c:20
4913 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4914 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
4916 #: builtin/fetch.c:21
4917 msgid "git fetch [<options>] <group>"
4918 msgstr "git fetch [<选项>] <组>"
4920 #: builtin/fetch.c:22
4921 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4922 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4924 #: builtin/fetch.c:23
4925 msgid "git fetch --all [<options>]"
4926 msgstr "git fetch --all [<选项>]"
4928 #: builtin/fetch.c:75
4929 msgid "fetch from all remotes"
4932 #: builtin/fetch.c:77
4933 msgid "append to .git/FETCH_HEAD instead of overwriting"
4934 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4936 #: builtin/fetch.c:79
4937 msgid "path to upload pack on remote end"
4940 #: builtin/fetch.c:80
4941 msgid "force overwrite of local branch"
4944 #: builtin/fetch.c:82
4945 msgid "fetch from multiple remotes"
4948 #: builtin/fetch.c:84
4949 msgid "fetch all tags and associated objects"
4950 msgstr "抓取所有的 tags 和关联对象"
4952 #: builtin/fetch.c:86
4953 msgid "do not fetch all tags (--no-tags)"
4954 msgstr "不抓取任何 tags (--no-tags)"
4956 #: builtin/fetch.c:88
4957 msgid "prune remote-tracking branches no longer on remote"
4958 msgstr "清除远程已经不存在的分支的跟踪分支"
4961 #: builtin/fetch.c:89
4965 #: builtin/fetch.c:90
4966 msgid "control recursive fetching of submodules"
4969 #: builtin/fetch.c:94
4970 msgid "keep downloaded pack"
4973 #: builtin/fetch.c:96
4974 msgid "allow updating of HEAD ref"
4975 msgstr "允许更新 HEAD 引用"
4977 #: builtin/fetch.c:99
4978 msgid "deepen history of shallow clone"
4981 #: builtin/fetch.c:101
4982 msgid "convert to a complete repository"
4983 msgstr "转换为一个完整的版本库"
4985 #: builtin/fetch.c:103 builtin/log.c:1197
4989 #: builtin/fetch.c:104
4990 msgid "prepend this to submodule path output"
4991 msgstr "在子模组路径输出的前面加上此目录"
4993 #: builtin/fetch.c:107
4994 msgid "default mode for recursion"
4997 #: builtin/fetch.c:109
4998 msgid "accept refs that update .git/shallow"
4999 msgstr "接受更新 .git/shallow 的引用"
5001 #: builtin/fetch.c:347
5002 msgid "Couldn't find remote ref HEAD"
5003 msgstr "无法发现远程 HEAD 引用"
5005 #: builtin/fetch.c:411
5007 msgid "object %s not found"
5010 #: builtin/fetch.c:416
5011 msgid "[up to date]"
5014 #: builtin/fetch.c:430
5016 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5017 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5019 #: builtin/fetch.c:431 builtin/fetch.c:517
5023 #: builtin/fetch.c:442
5024 msgid "[tag update]"
5028 #: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
5029 msgid " (unable to update local ref)"
5030 msgstr " (不能更新本地引用)"
5032 #: builtin/fetch.c:462
5036 #: builtin/fetch.c:465
5037 msgid "[new branch]"
5040 #: builtin/fetch.c:468
5044 #: builtin/fetch.c:513
5045 msgid "unable to update local ref"
5048 #: builtin/fetch.c:513
5049 msgid "forced update"
5052 #: builtin/fetch.c:519
5053 msgid "(non-fast-forward)"
5056 #: builtin/fetch.c:552 builtin/fetch.c:785
5058 msgid "cannot open %s: %s\n"
5059 msgstr "无法打开 %s:%s\n"
5061 #: builtin/fetch.c:561
5063 msgid "%s did not send all necessary objects\n"
5064 msgstr "%s 未发送所有必须的对象\n"
5066 #: builtin/fetch.c:579
5068 msgid "reject %s because shallow roots are not allowed to be updated"
5069 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5071 #: builtin/fetch.c:667 builtin/fetch.c:750
5076 #: builtin/fetch.c:678
5079 "some local refs could not be updated; try running\n"
5080 " 'git remote prune %s' to remove any old, conflicting branches"
5082 "一些本地引用不能被更新;尝试运行\n"
5083 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5086 #: builtin/fetch.c:730
5088 msgid " (%s will become dangling)"
5089 msgstr " (%s 将成为摇摆状态)"
5092 #: builtin/fetch.c:731
5094 msgid " (%s has become dangling)"
5095 msgstr " (%s 已成为摇摆状态)"
5097 #: builtin/fetch.c:755
5101 #: builtin/fetch.c:756 builtin/remote.c:1050
5105 #: builtin/fetch.c:775
5107 msgid "Refusing to fetch into current branch %s of non-bare repository"
5108 msgstr "拒绝获取到非裸版本库的当前分支 %s"
5110 #: builtin/fetch.c:794
5112 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5113 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5115 #: builtin/fetch.c:797
5117 msgid "Option \"%s\" is ignored for %s\n"
5118 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5120 #: builtin/fetch.c:853
5122 msgid "Don't know how to fetch from %s"
5123 msgstr "不知道如何从 %s 获取"
5125 #: builtin/fetch.c:1015
5127 msgid "Fetching %s\n"
5130 #: builtin/fetch.c:1017 builtin/remote.c:90
5132 msgid "Could not fetch %s"
5135 #: builtin/fetch.c:1035
5137 "No remote repository specified. Please, specify either a URL or a\n"
5138 "remote name from which new revisions should be fetched."
5139 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5141 #: builtin/fetch.c:1059
5142 msgid "You need to specify a tag name."
5143 msgstr "您需要指定一个 tag 名称。"
5145 #: builtin/fetch.c:1107
5146 msgid "--depth and --unshallow cannot be used together"
5147 msgstr "--depth 和 --unshallow 不能同时使用"
5149 #: builtin/fetch.c:1109
5150 msgid "--unshallow on a complete repository does not make sense"
5151 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5153 #: builtin/fetch.c:1132
5154 msgid "fetch --all does not take a repository argument"
5155 msgstr "fetch --all 不能带一个版本库参数"
5157 #: builtin/fetch.c:1134
5158 msgid "fetch --all does not make sense with refspecs"
5159 msgstr "fetch --all 带引用规则没有任何意义"
5161 #: builtin/fetch.c:1145
5163 msgid "No such remote or remote group: %s"
5164 msgstr "没有这样的远程或远程组:%s"
5166 #: builtin/fetch.c:1153
5167 msgid "Fetching a group and specifying refspecs does not make sense"
5168 msgstr "获取组并指定引用规则没有意义"
5170 #: builtin/fmt-merge-msg.c:13
5171 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5173 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5175 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
5176 #: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179
5177 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501
5178 #: parse-options.h:132 parse-options.h:239
5182 #: builtin/fmt-merge-msg.c:664
5183 msgid "populate log with at most <n> entries from shortlog"
5184 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5186 #: builtin/fmt-merge-msg.c:667
5187 msgid "alias for --log (deprecated)"
5188 msgstr "参数 --log 的别名(已弃用)"
5190 #: builtin/fmt-merge-msg.c:670
5194 #: builtin/fmt-merge-msg.c:671
5195 msgid "use <text> as start of message"
5196 msgstr "使用 <文本> 作为提交说明的开始"
5198 #: builtin/fmt-merge-msg.c:672
5199 msgid "file to read from"
5202 #: builtin/for-each-ref.c:1063
5203 msgid "git for-each-ref [options] [<pattern>]"
5204 msgstr "git for-each-ref [选项] [<模式>]"
5206 #: builtin/for-each-ref.c:1078
5207 msgid "quote placeholders suitably for shells"
5208 msgstr "引用占位符适用于 shells"
5210 #: builtin/for-each-ref.c:1080
5211 msgid "quote placeholders suitably for perl"
5212 msgstr "引用占位符适用于 perl"
5214 #: builtin/for-each-ref.c:1082
5215 msgid "quote placeholders suitably for python"
5216 msgstr "引用占位符适用于 python"
5218 #: builtin/for-each-ref.c:1084
5219 msgid "quote placeholders suitably for tcl"
5220 msgstr "引用占位符适用于 tcl"
5222 #: builtin/for-each-ref.c:1087
5223 msgid "show only <n> matched refs"
5224 msgstr "只显示 <n> 个匹配的引用"
5226 #: builtin/for-each-ref.c:1088 builtin/replace.c:177
5230 #: builtin/for-each-ref.c:1088
5231 msgid "format to use for the output"
5234 #: builtin/for-each-ref.c:1089
5238 #: builtin/for-each-ref.c:1090
5239 msgid "field name to sort on"
5242 #: builtin/fsck.c:147 builtin/prune.c:172
5243 msgid "Checking connectivity"
5246 #: builtin/fsck.c:544
5247 msgid "Checking object directories"
5250 #: builtin/fsck.c:607
5251 msgid "git fsck [options] [<object>...]"
5252 msgstr "git fsck [选项] [<对象>...]"
5254 #: builtin/fsck.c:613
5255 msgid "show unreachable objects"
5258 #: builtin/fsck.c:614
5259 msgid "show dangling objects"
5262 #: builtin/fsck.c:615
5266 #: builtin/fsck.c:616
5267 msgid "report root nodes"
5270 #: builtin/fsck.c:617
5271 msgid "make index objects head nodes"
5272 msgstr "将索引亦作为检查的头节点"
5274 #: builtin/fsck.c:618
5275 msgid "make reflogs head nodes (default)"
5276 msgstr "将引用日志作为检查的头节点(默认)"
5278 #: builtin/fsck.c:619
5279 msgid "also consider packs and alternate objects"
5282 #: builtin/fsck.c:620
5283 msgid "enable more strict checking"
5286 #: builtin/fsck.c:622
5287 msgid "write dangling objects in .git/lost-found"
5288 msgstr "将摇摆对象写入 .git/lost-found 中"
5290 #: builtin/fsck.c:623 builtin/prune.c:144
5291 msgid "show progress"
5294 #: builtin/fsck.c:673
5295 msgid "Checking objects"
5299 msgid "git gc [options]"
5300 msgstr "git gc [选项]"
5304 msgid "Invalid %s: '%s'"
5305 msgstr "无效的 %s:'%s'"
5309 msgid "insanely long object directory %.*s"
5310 msgstr "不正常的长对象目录 %.*s"
5313 msgid "prune unreferenced objects"
5317 msgid "be more thorough (increased runtime)"
5318 msgstr "更彻底(增加运行时间)"
5321 msgid "enable auto-gc mode"
5325 msgid "force running gc even if there may be another gc running"
5326 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5330 msgid "Auto packing the repository in background for optimum performance.\n"
5331 msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5335 msgid "Auto packing the repository for optimum performance.\n"
5336 msgstr "自动打包版本库以求最佳性能。\n"
5340 msgid "See \"git help gc\" for manual housekeeping.\n"
5341 msgstr "手工维护参见 \"git help gc\"。\n"
5346 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5348 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5352 "There are too many unreachable loose objects; run 'git prune' to remove them."
5353 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5355 #: builtin/grep.c:23
5356 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5357 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5359 #: builtin/grep.c:218
5361 msgid "grep: failed to create thread: %s"
5362 msgstr "grep:无法创建线程:%s"
5364 #: builtin/grep.c:365
5366 msgid "Failed to chdir: %s"
5369 #: builtin/grep.c:443 builtin/grep.c:478
5371 msgid "unable to read tree (%s)"
5374 #: builtin/grep.c:493
5376 msgid "unable to grep from object of type %s"
5377 msgstr "无法抓取来自于 %s 类型的对象"
5379 #: builtin/grep.c:549
5381 msgid "switch `%c' expects a numerical value"
5382 msgstr "开关 `%c' 期望一个数字值"
5384 #: builtin/grep.c:566
5386 msgid "cannot open '%s'"
5389 #: builtin/grep.c:640
5390 msgid "search in index instead of in the work tree"
5391 msgstr "在索引区搜索而不是在工作区"
5393 #: builtin/grep.c:642
5394 msgid "find in contents not managed by git"
5395 msgstr "在未被 git 管理的内容中查找"
5397 # 译者:中文字符串拼接,可删除前导空格
5398 #: builtin/grep.c:644
5399 msgid "search in both tracked and untracked files"
5400 msgstr "在跟踪和未跟踪的文件中搜索"
5402 #: builtin/grep.c:646
5403 msgid "search also in ignored files"
5406 #: builtin/grep.c:649
5407 msgid "show non-matching lines"
5410 #: builtin/grep.c:651
5411 msgid "case insensitive matching"
5414 #: builtin/grep.c:653
5415 msgid "match patterns only at word boundaries"
5418 #: builtin/grep.c:655
5419 msgid "process binary files as text"
5420 msgstr "把二进制文件当做文本处理"
5422 #: builtin/grep.c:657
5423 msgid "don't match patterns in binary files"
5424 msgstr "不在二进制文件中匹配模式"
5426 #: builtin/grep.c:660
5427 msgid "process binary files with textconv filters"
5428 msgstr "用 textconv 过滤器处理二进制文件"
5430 #: builtin/grep.c:662
5431 msgid "descend at most <depth> levels"
5432 msgstr "最多以指定的深度向下寻找"
5434 #: builtin/grep.c:666
5435 msgid "use extended POSIX regular expressions"
5436 msgstr "使用扩展的 POSIX 正则表达式"
5438 #: builtin/grep.c:669
5439 msgid "use basic POSIX regular expressions (default)"
5440 msgstr "使用基本的 POSIX 正则表达式(默认)"
5442 #: builtin/grep.c:672
5443 msgid "interpret patterns as fixed strings"
5444 msgstr "把模式解析为固定的字符串"
5446 #: builtin/grep.c:675
5447 msgid "use Perl-compatible regular expressions"
5448 msgstr "使用 Perl 兼容的正则表达式"
5450 #: builtin/grep.c:678
5451 msgid "show line numbers"
5454 #: builtin/grep.c:679
5455 msgid "don't show filenames"
5458 #: builtin/grep.c:680
5459 msgid "show filenames"
5462 #: builtin/grep.c:682
5463 msgid "show filenames relative to top directory"
5464 msgstr "显示相对于顶级目录的文件名"
5466 #: builtin/grep.c:684
5467 msgid "show only filenames instead of matching lines"
5468 msgstr "只显示文件名而不显示匹配的行"
5470 #: builtin/grep.c:686
5471 msgid "synonym for --files-with-matches"
5472 msgstr "和 --files-with-matches 同义"
5474 #: builtin/grep.c:689
5475 msgid "show only the names of files without match"
5478 #: builtin/grep.c:691
5479 msgid "print NUL after filenames"
5480 msgstr "在文件名后输出 NUL 字符"
5482 #: builtin/grep.c:693
5483 msgid "show the number of matches instead of matching lines"
5484 msgstr "显示总匹配行数,而不显示匹配的行"
5486 #: builtin/grep.c:694
5487 msgid "highlight matches"
5490 #: builtin/grep.c:696
5491 msgid "print empty line between matches from different files"
5492 msgstr "在不同文件的匹配项之间打印空行"
5494 #: builtin/grep.c:698
5495 msgid "show filename only once above matches from same file"
5496 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5498 #: builtin/grep.c:701
5499 msgid "show <n> context lines before and after matches"
5500 msgstr "显示匹配项前后的 <n> 行上下文"
5502 #: builtin/grep.c:704
5503 msgid "show <n> context lines before matches"
5504 msgstr "显示匹配项前 <n> 行上下文"
5506 #: builtin/grep.c:706
5507 msgid "show <n> context lines after matches"
5508 msgstr "显示匹配项后 <n> 行上下文"
5510 #: builtin/grep.c:707
5511 msgid "shortcut for -C NUM"
5514 #: builtin/grep.c:710
5515 msgid "show a line with the function name before matches"
5516 msgstr "在匹配的前面显示一行函数名"
5518 #: builtin/grep.c:712
5519 msgid "show the surrounding function"
5520 msgstr "显示所在函数的前后内容"
5522 #: builtin/grep.c:715
5523 msgid "read patterns from file"
5526 #: builtin/grep.c:717
5527 msgid "match <pattern>"
5530 #: builtin/grep.c:719
5531 msgid "combine patterns specified with -e"
5532 msgstr "组合用 -e 参数设定的模式"
5534 #: builtin/grep.c:731
5535 msgid "indicate hit with exit status without output"
5536 msgstr "不输出,而用退出码标识命中状态"
5538 #: builtin/grep.c:733
5539 msgid "show only matches from files that match all patterns"
5540 msgstr "只显示匹配所有模式的文件中的匹配"
5542 #: builtin/grep.c:735
5543 msgid "show parse tree for grep expression"
5544 msgstr "显示 grep 表达式的解析树"
5546 #: builtin/grep.c:739
5550 #: builtin/grep.c:739
5551 msgid "show matching files in the pager"
5554 #: builtin/grep.c:742
5555 msgid "allow calling of grep(1) (ignored by this build)"
5556 msgstr "允许调用 grep(1)(本次构建忽略)"
5558 #: builtin/grep.c:743 builtin/show-ref.c:187
5562 #: builtin/grep.c:810
5563 msgid "no pattern given."
5566 #: builtin/grep.c:868
5567 msgid "--open-files-in-pager only works on the worktree"
5568 msgstr "--open-files-in-pager 仅用于工作区"
5570 #: builtin/grep.c:891
5571 msgid "--cached or --untracked cannot be used with --no-index."
5572 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5574 #: builtin/grep.c:896
5575 msgid "--no-index or --untracked cannot be used with revs."
5576 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5578 #: builtin/grep.c:899
5579 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5580 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5582 #: builtin/grep.c:907
5583 msgid "both --cached and trees are given."
5584 msgstr "同时给出了 --cached 和树对象。"
5586 #: builtin/hash-object.c:60
5588 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5591 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5594 #: builtin/hash-object.c:61
5595 msgid "git hash-object --stdin-paths < <list-of-paths>"
5596 msgstr "git hash-object --stdin-paths < <路径列表>"
5598 #: builtin/hash-object.c:72 builtin/tag.c:521
5602 #: builtin/hash-object.c:72
5606 #: builtin/hash-object.c:73
5607 msgid "write the object into the object database"
5610 #: builtin/hash-object.c:74
5611 msgid "read the object from stdin"
5614 #: builtin/hash-object.c:76
5615 msgid "store file as is without filters"
5616 msgstr "原样存储文件不使用过滤器"
5618 #: builtin/hash-object.c:77
5619 msgid "process file as it were from this path"
5620 msgstr "处理文件并假设其来自于此路径"
5622 #: builtin/help.c:41
5623 msgid "print all available commands"
5626 #: builtin/help.c:42
5627 msgid "print list of useful guides"
5630 #: builtin/help.c:43
5631 msgid "show man page"
5634 #: builtin/help.c:44
5635 msgid "show manual in web browser"
5636 msgstr "在 web 浏览器中显示手册"
5638 #: builtin/help.c:46
5639 msgid "show info page"
5642 #: builtin/help.c:52
5643 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5644 msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5646 #: builtin/help.c:64
5648 msgid "unrecognized help format '%s'"
5649 msgstr "未能识别的帮助格式 '%s'"
5651 #: builtin/help.c:92
5652 msgid "Failed to start emacsclient."
5653 msgstr "无法启动 emacsclient。"
5655 #: builtin/help.c:105
5656 msgid "Failed to parse emacsclient version."
5657 msgstr "无法解析 emacsclient 版本。"
5659 #: builtin/help.c:113
5661 msgid "emacsclient version '%d' too old (< 22)."
5662 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5664 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5666 msgid "failed to exec '%s': %s"
5667 msgstr "无法执行 '%s':%s"
5669 #: builtin/help.c:216
5672 "'%s': path for unsupported man viewer.\n"
5673 "Please consider using 'man.<tool>.cmd' instead."
5675 "'%s':不支持的 man 手册查看器的路径。\n"
5676 "请使用 'man.<tool>.cmd'。"
5678 #: builtin/help.c:228
5681 "'%s': cmd for supported man viewer.\n"
5682 "Please consider using 'man.<tool>.path' instead."
5684 "'%s': 支持的 man 手册查看器命令。\n"
5685 "请使用 'man.<tool>.path'。"
5687 #: builtin/help.c:353
5689 msgid "'%s': unknown man viewer."
5690 msgstr "'%s':未知的 man 查看器。"
5692 #: builtin/help.c:370
5693 msgid "no man viewer handled the request"
5694 msgstr "没有 man 查看器处理此请求"
5696 #: builtin/help.c:378
5697 msgid "no info viewer handled the request"
5698 msgstr "没有 info 查看器处理此请求"
5700 #: builtin/help.c:424
5701 msgid "Defining attributes per path"
5704 #: builtin/help.c:425
5705 msgid "A Git glossary"
5708 #: builtin/help.c:426
5709 msgid "Specifies intentionally untracked files to ignore"
5712 #: builtin/help.c:427
5713 msgid "Defining submodule properties"
5716 #: builtin/help.c:428
5717 msgid "Specifying revisions and ranges for Git"
5718 msgstr "指定 Git 的版本和版本范围"
5720 #: builtin/help.c:429
5721 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5722 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5724 #: builtin/help.c:430
5725 msgid "An overview of recommended workflows with Git"
5726 msgstr "Git 推荐的工作流概览"
5728 #: builtin/help.c:442
5729 msgid "The common Git guides are:\n"
5730 msgstr "最常用的 Git 向导有:\n"
5732 #: builtin/help.c:463 builtin/help.c:480
5737 #: builtin/help.c:496
5739 msgid "`git %s' is aliased to `%s'"
5740 msgstr "`git %s' 是 `%s' 的别名"
5742 #: builtin/index-pack.c:184
5744 msgid "object type mismatch at %s"
5745 msgstr "%s 的对象类型不匹配"
5747 #: builtin/index-pack.c:204
5748 msgid "object of unexpected type"
5751 #: builtin/index-pack.c:244
5753 msgid "cannot fill %d byte"
5754 msgid_plural "cannot fill %d bytes"
5755 msgstr[0] "无法填充 %d 字节"
5756 msgstr[1] "无法填充 %d 字节"
5758 #: builtin/index-pack.c:254
5760 msgstr "过早的文件结束符(EOF)"
5762 #: builtin/index-pack.c:255
5763 msgid "read error on input"
5766 #: builtin/index-pack.c:267
5767 msgid "used more bytes than were available"
5770 #: builtin/index-pack.c:274
5771 msgid "pack too large for current definition of off_t"
5772 msgstr "包太大超过了当前 off_t 的定义"
5774 #: builtin/index-pack.c:290
5776 msgid "unable to create '%s'"
5779 #: builtin/index-pack.c:295
5781 msgid "cannot open packfile '%s'"
5782 msgstr "无法打开包文件 '%s'"
5784 #: builtin/index-pack.c:309
5785 msgid "pack signature mismatch"
5788 #: builtin/index-pack.c:311
5790 msgid "pack version %<PRIu32> unsupported"
5791 msgstr "不支持包版本 %<PRIu32>"
5793 #: builtin/index-pack.c:329
5795 msgid "pack has bad object at offset %lu: %s"
5796 msgstr "包中有错误的对象位于 %lu:%s"
5798 #: builtin/index-pack.c:451
5800 msgid "inflate returned %d"
5803 #: builtin/index-pack.c:500
5804 msgid "offset value overflow for delta base object"
5805 msgstr "偏移值覆盖了 delta 基准对象"
5807 #: builtin/index-pack.c:508
5808 msgid "delta base offset is out of bound"
5809 msgstr "delta 基准偏移越界"
5811 #: builtin/index-pack.c:516
5813 msgid "unknown object type %d"
5816 #: builtin/index-pack.c:547
5817 msgid "cannot pread pack file"
5820 #: builtin/index-pack.c:549
5822 msgid "premature end of pack file, %lu byte missing"
5823 msgid_plural "premature end of pack file, %lu bytes missing"
5824 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5825 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5827 #: builtin/index-pack.c:575
5828 msgid "serious inflate inconsistency"
5831 #: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5832 #: builtin/index-pack.c:729 builtin/index-pack.c:738
5834 msgid "SHA1 COLLISION FOUND WITH %s !"
5835 msgstr "发现 %s 出现 SHA1 冲突!"
5837 #: builtin/index-pack.c:669 builtin/pack-objects.c:162
5838 #: builtin/pack-objects.c:254
5840 msgid "unable to read %s"
5843 #: builtin/index-pack.c:735
5845 msgid "cannot read existing object %s"
5846 msgstr "不能读取现存对象 %s"
5848 #: builtin/index-pack.c:749
5850 msgid "invalid blob object %s"
5851 msgstr "无效的数据(blob)对象 %s"
5853 #: builtin/index-pack.c:763
5858 #: builtin/index-pack.c:766
5859 msgid "Error in object"
5862 #: builtin/index-pack.c:768
5864 msgid "Not all child objects of %s are reachable"
5865 msgstr "%s 的所有子对象并非都可达"
5867 #: builtin/index-pack.c:839 builtin/index-pack.c:869
5868 msgid "failed to apply delta"
5871 #: builtin/index-pack.c:1010
5872 msgid "Receiving objects"
5875 #: builtin/index-pack.c:1010
5876 msgid "Indexing objects"
5879 #: builtin/index-pack.c:1036
5880 msgid "pack is corrupted (SHA1 mismatch)"
5881 msgstr "包冲突(SHA1 不匹配)"
5883 #: builtin/index-pack.c:1041
5884 msgid "cannot fstat packfile"
5887 #: builtin/index-pack.c:1044
5888 msgid "pack has junk at the end"
5891 #: builtin/index-pack.c:1055
5892 msgid "confusion beyond insanity in parse_pack_objects()"
5893 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5895 #: builtin/index-pack.c:1078
5896 msgid "Resolving deltas"
5899 #: builtin/index-pack.c:1088
5901 msgid "unable to create thread: %s"
5904 #: builtin/index-pack.c:1130
5905 msgid "confusion beyond insanity"
5908 #: builtin/index-pack.c:1138
5910 msgid "completed with %d local objects"
5911 msgstr "完成 %d 个本地对象"
5913 #: builtin/index-pack.c:1148
5915 msgid "Unexpected tail checksum for %s (disk corruption?)"
5916 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5918 #: builtin/index-pack.c:1152
5920 msgid "pack has %d unresolved delta"
5921 msgid_plural "pack has %d unresolved deltas"
5922 msgstr[0] "包有 %d 个未解决的 delta"
5923 msgstr[1] "包有 %d 个未解决的 delta"
5925 #: builtin/index-pack.c:1177
5927 msgid "unable to deflate appended object (%d)"
5928 msgstr "不能压缩附加对象(%d)"
5930 #: builtin/index-pack.c:1256
5932 msgid "local object %s is corrupt"
5933 msgstr "本地对象 %s 已损坏"
5935 #: builtin/index-pack.c:1280
5936 msgid "error while closing pack file"
5939 #: builtin/index-pack.c:1293
5941 msgid "cannot write keep file '%s'"
5942 msgstr "无法写保留文件 '%s'"
5944 #: builtin/index-pack.c:1301
5946 msgid "cannot close written keep file '%s'"
5947 msgstr "无法关闭保留文件 '%s'"
5949 #: builtin/index-pack.c:1314
5950 msgid "cannot store pack file"
5953 #: builtin/index-pack.c:1325
5954 msgid "cannot store index file"
5957 #: builtin/index-pack.c:1358
5959 msgid "bad pack.indexversion=%<PRIu32>"
5960 msgstr "坏的 pack.indexversion=%<PRIu32>"
5962 #: builtin/index-pack.c:1364
5964 msgid "invalid number of threads specified (%d)"
5965 msgstr "指定的线程数无效(%d)"
5967 #: builtin/index-pack.c:1368 builtin/index-pack.c:1546
5969 msgid "no threads support, ignoring %s"
5970 msgstr "没有线程支持,忽略 %s"
5972 #: builtin/index-pack.c:1426
5974 msgid "Cannot open existing pack file '%s'"
5975 msgstr "无法打开现存包文件 '%s'"
5977 #: builtin/index-pack.c:1428
5979 msgid "Cannot open existing pack idx file for '%s'"
5980 msgstr "无法为 %s 打开包索引文件"
5982 #: builtin/index-pack.c:1475
5984 msgid "non delta: %d object"
5985 msgid_plural "non delta: %d objects"
5986 msgstr[0] "非 delta:%d 个对象"
5987 msgstr[1] "非 delta:%d 个对象"
5989 #: builtin/index-pack.c:1482
5991 msgid "chain length = %d: %lu object"
5992 msgid_plural "chain length = %d: %lu objects"
5993 msgstr[0] "链长 = %d: %lu 对象"
5994 msgstr[1] "链长 = %d: %lu 对象"
5996 #: builtin/index-pack.c:1510
5997 msgid "Cannot come back to cwd"
6000 #: builtin/index-pack.c:1558 builtin/index-pack.c:1561
6001 #: builtin/index-pack.c:1573 builtin/index-pack.c:1577
6006 #: builtin/index-pack.c:1591
6007 msgid "--fix-thin cannot be used without --stdin"
6008 msgstr "--fix-thin 不能和 --stdin 同时使用"
6010 #: builtin/index-pack.c:1595 builtin/index-pack.c:1605
6012 msgid "packfile name '%s' does not end with '.pack'"
6013 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6015 #: builtin/index-pack.c:1614
6016 msgid "--verify with no packfile name given"
6017 msgstr "--verify 没有提供包名参数"
6019 #: builtin/init-db.c:35
6021 msgid "Could not make %s writable by group"
6022 msgstr "不能设置 %s 为组可写"
6024 #: builtin/init-db.c:62
6026 msgid "insanely long template name %s"
6029 #: builtin/init-db.c:67
6031 msgid "cannot stat '%s'"
6032 msgstr "不能枚举 '%s' 状态"
6034 #: builtin/init-db.c:73
6036 msgid "cannot stat template '%s'"
6037 msgstr "不能枚举模版 '%s' 状态"
6039 #: builtin/init-db.c:80
6041 msgid "cannot opendir '%s'"
6042 msgstr "不能打开目录 '%s'"
6044 #: builtin/init-db.c:97
6046 msgid "cannot readlink '%s'"
6047 msgstr "不能读取链接 '%s'"
6049 #: builtin/init-db.c:99
6051 msgid "insanely long symlink %s"
6054 #: builtin/init-db.c:102
6056 msgid "cannot symlink '%s' '%s'"
6057 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6059 #: builtin/init-db.c:106
6061 msgid "cannot copy '%s' to '%s'"
6062 msgstr "不能拷贝 '%s' 至 '%s'"
6064 #: builtin/init-db.c:110
6066 msgid "ignoring template %s"
6069 #: builtin/init-db.c:133
6071 msgid "insanely long template path %s"
6074 #: builtin/init-db.c:141
6076 msgid "templates not found %s"
6079 #: builtin/init-db.c:154
6081 msgid "not copying templates of a wrong format version %d from '%s'"
6082 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6084 #: builtin/init-db.c:192
6086 msgid "insane git directory %s"
6087 msgstr "不正常的 git 目录 %s"
6089 #: builtin/init-db.c:323 builtin/init-db.c:326
6091 msgid "%s already exists"
6094 #: builtin/init-db.c:355
6096 msgid "unable to handle file type %d"
6097 msgstr "不能处理 %d 类型的文件"
6099 #: builtin/init-db.c:358
6101 msgid "unable to move %s to %s"
6102 msgstr "不能移动 %s 至 %s"
6104 #. TRANSLATORS: The first '%s' is either "Reinitialized
6105 #. existing" or "Initialized empty", the second " shared" or
6106 #. "", and the last '%s%s' is the verbatim directory name.
6107 #: builtin/init-db.c:418
6109 msgid "%s%s Git repository in %s%s\n"
6110 msgstr "%s%s Git 版本库于 %s%s\n"
6112 #: builtin/init-db.c:419
6113 msgid "Reinitialized existing"
6116 #: builtin/init-db.c:419
6117 msgid "Initialized empty"
6120 # 译者:中文字符串拼接,可删除前导空格
6121 #: builtin/init-db.c:420
6125 #: builtin/init-db.c:439
6126 msgid "cannot tell cwd"
6129 #: builtin/init-db.c:465
6131 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6132 "shared[=<permissions>]] [directory]"
6134 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6137 #: builtin/init-db.c:488
6141 #: builtin/init-db.c:489
6142 msgid "specify that the git repository is to be shared amongst several users"
6143 msgstr "指定 git 版本库是多个用户之间共享的"
6145 #: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168
6149 #: builtin/init-db.c:523 builtin/init-db.c:528
6151 msgid "cannot mkdir %s"
6154 #: builtin/init-db.c:532
6156 msgid "cannot chdir to %s"
6159 #: builtin/init-db.c:554
6162 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6165 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6168 #: builtin/init-db.c:578
6169 msgid "Cannot access current working directory"
6172 #: builtin/init-db.c:585
6174 msgid "Cannot access work tree '%s'"
6175 msgstr "不能访问工作区 '%s'"
6178 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6179 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6182 msgid " or: git show [options] <object>..."
6183 msgstr " 或者:git show [选项] <对象>..."
6185 #: builtin/log.c:125
6186 msgid "suppress diff output"
6189 #: builtin/log.c:126
6193 #: builtin/log.c:127
6194 msgid "Use mail map file"
6197 #: builtin/log.c:128
6198 msgid "decorate options"
6201 #: builtin/log.c:231
6203 msgid "Final output: %d %s\n"
6204 msgstr "最终输出:%d %s\n"
6206 #: builtin/log.c:473 builtin/log.c:565
6208 msgid "Could not read object %s"
6211 #: builtin/log.c:589
6213 msgid "Unknown type: %d"
6216 #: builtin/log.c:689
6217 msgid "format.headers without value"
6218 msgstr "format.headers 没有值"
6220 #: builtin/log.c:771
6221 msgid "name of output directory is too long"
6224 #: builtin/log.c:787
6226 msgid "Cannot open patch file %s"
6227 msgstr "无法打开补丁文件 %s"
6229 #: builtin/log.c:801
6230 msgid "Need exactly one range."
6233 #: builtin/log.c:809
6234 msgid "Not a range."
6237 #: builtin/log.c:911
6238 msgid "Cover letter needs email format"
6241 #: builtin/log.c:987
6243 msgid "insane in-reply-to: %s"
6244 msgstr "不正常的 in-reply-to:%s"
6246 #: builtin/log.c:1015
6247 msgid "git format-patch [options] [<since> | <revision range>]"
6248 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6250 #: builtin/log.c:1060
6251 msgid "Two output directories?"
6254 #: builtin/log.c:1175
6255 msgid "use [PATCH n/m] even with a single patch"
6256 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6258 #: builtin/log.c:1178
6259 msgid "use [PATCH] even with multiple patches"
6260 msgstr "使用 [PATCH],即使有多个补丁"
6262 #: builtin/log.c:1182
6263 msgid "print patches to standard out"
6266 #: builtin/log.c:1184
6267 msgid "generate a cover letter"
6270 #: builtin/log.c:1186
6271 msgid "use simple number sequence for output file names"
6272 msgstr "使用简单的数字序列作为输出文件名"
6274 #: builtin/log.c:1187
6278 #: builtin/log.c:1188
6279 msgid "use <sfx> instead of '.patch'"
6280 msgstr "使用 <后缀> 代替 '.patch'"
6282 #: builtin/log.c:1190
6283 msgid "start numbering patches at <n> instead of 1"
6284 msgstr "补丁以 <n> 开始编号,而不是1"
6286 #: builtin/log.c:1192
6287 msgid "mark the series as Nth re-roll"
6288 msgstr "标记补丁系列是第几次重制"
6290 #: builtin/log.c:1194
6291 msgid "Use [<prefix>] instead of [PATCH]"
6292 msgstr "使用 [<前缀>] 代替 [PATCH]"
6294 #: builtin/log.c:1197
6295 msgid "store resulting files in <dir>"
6296 msgstr "把结果文件存储在 <dir>"
6298 #: builtin/log.c:1200
6299 msgid "don't strip/add [PATCH]"
6300 msgstr "不删除/添加 [PATCH]"
6302 #: builtin/log.c:1203
6303 msgid "don't output binary diffs"
6306 #: builtin/log.c:1205
6307 msgid "don't include a patch matching a commit upstream"
6308 msgstr "不包含已在上游提交中的补丁"
6310 #: builtin/log.c:1207
6311 msgid "show patch format instead of default (patch + stat)"
6312 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6314 #: builtin/log.c:1209
6318 #: builtin/log.c:1210
6322 #: builtin/log.c:1211
6323 msgid "add email header"
6326 #: builtin/log.c:1212 builtin/log.c:1214
6330 #: builtin/log.c:1212
6331 msgid "add To: header"
6334 #: builtin/log.c:1214
6335 msgid "add Cc: header"
6338 #: builtin/log.c:1216
6342 #: builtin/log.c:1217
6343 msgid "set From address to <ident> (or committer ident if absent)"
6344 msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6346 #: builtin/log.c:1219
6350 #: builtin/log.c:1220
6351 msgid "make first mail a reply to <message-id>"
6352 msgstr "使第一封邮件作为对 <message-id> 的回复"
6354 #: builtin/log.c:1221 builtin/log.c:1224
6358 #: builtin/log.c:1222
6359 msgid "attach the patch"
6362 #: builtin/log.c:1225
6363 msgid "inline the patch"
6366 #: builtin/log.c:1229
6367 msgid "enable message threading, styles: shallow, deep"
6368 msgstr "启用邮件线索,风格:浅,深"
6370 #: builtin/log.c:1231
6374 #: builtin/log.c:1232
6375 msgid "add a signature"
6378 #: builtin/log.c:1233
6379 msgid "don't print the patch filenames"
6382 #: builtin/log.c:1307
6384 msgid "invalid ident line: %s"
6385 msgstr "包含无效的身份标识:%s"
6387 #: builtin/log.c:1322
6388 msgid "-n and -k are mutually exclusive."
6389 msgstr "-n 和 -k 互斥。"
6391 #: builtin/log.c:1324
6392 msgid "--subject-prefix and -k are mutually exclusive."
6393 msgstr "--subject-prefix 和 -k 互斥。"
6395 #: builtin/log.c:1332
6396 msgid "--name-only does not make sense"
6397 msgstr "--name-only 无意义"
6399 #: builtin/log.c:1334
6400 msgid "--name-status does not make sense"
6401 msgstr "--name-status 无意义"
6403 #: builtin/log.c:1336
6404 msgid "--check does not make sense"
6405 msgstr "--check 无意义"
6407 #: builtin/log.c:1359
6408 msgid "standard output, or directory, which one?"
6409 msgstr "标准输出或目录,哪一个?"
6411 #: builtin/log.c:1361
6413 msgid "Could not create directory '%s'"
6414 msgstr "不能创建目录 '%s'"
6416 #: builtin/log.c:1509
6417 msgid "Failed to create output files"
6420 #: builtin/log.c:1558
6421 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6422 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6424 #: builtin/log.c:1613
6427 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6428 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6430 #: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6432 msgid "Unknown commit %s"
6435 #: builtin/ls-files.c:401
6436 msgid "git ls-files [options] [<file>...]"
6437 msgstr "git ls-files [选项] [<文件>...]"
6439 #: builtin/ls-files.c:458
6440 msgid "identify the file status with tags"
6443 #: builtin/ls-files.c:460
6444 msgid "use lowercase letters for 'assume unchanged' files"
6445 msgstr "使用小写字母表示 '假设未改变的' 文件"
6447 #: builtin/ls-files.c:462
6448 msgid "show cached files in the output (default)"
6449 msgstr "显示缓存的文件(默认)"
6451 #: builtin/ls-files.c:464
6452 msgid "show deleted files in the output"
6455 #: builtin/ls-files.c:466
6456 msgid "show modified files in the output"
6459 #: builtin/ls-files.c:468
6460 msgid "show other files in the output"
6463 #: builtin/ls-files.c:470
6464 msgid "show ignored files in the output"
6467 #: builtin/ls-files.c:473
6468 msgid "show staged contents' object name in the output"
6469 msgstr "显示暂存区内容的对象名称"
6471 #: builtin/ls-files.c:475
6472 msgid "show files on the filesystem that need to be removed"
6473 msgstr "显示文件系统需要删除的文件"
6475 #: builtin/ls-files.c:477
6476 msgid "show 'other' directories' name only"
6477 msgstr "只显示“其他”目录的名称"
6479 #: builtin/ls-files.c:480
6480 msgid "don't show empty directories"
6483 #: builtin/ls-files.c:483
6484 msgid "show unmerged files in the output"
6487 #: builtin/ls-files.c:485
6488 msgid "show resolve-undo information"
6489 msgstr "显示 resolve-undo 信息"
6491 #: builtin/ls-files.c:487
6492 msgid "skip files matching pattern"
6495 #: builtin/ls-files.c:490
6496 msgid "exclude patterns are read from <file>"
6497 msgstr "从 <文件> 中读取排除模式"
6499 #: builtin/ls-files.c:493
6500 msgid "read additional per-directory exclude patterns in <file>"
6501 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6503 #: builtin/ls-files.c:495
6504 msgid "add the standard git exclusions"
6505 msgstr "添加标准的 git 排除"
6507 #: builtin/ls-files.c:498
6508 msgid "make the output relative to the project top directory"
6509 msgstr "显示相对于顶级目录的文件名"
6511 #: builtin/ls-files.c:501
6512 msgid "if any <file> is not in the index, treat this as an error"
6513 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6515 #: builtin/ls-files.c:502
6519 #: builtin/ls-files.c:503
6520 msgid "pretend that paths removed since <tree-ish> are still present"
6521 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6523 #: builtin/ls-files.c:505
6524 msgid "show debugging data"
6527 #: builtin/ls-tree.c:28
6528 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6529 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6531 #: builtin/ls-tree.c:126
6532 msgid "only show trees"
6535 #: builtin/ls-tree.c:128
6536 msgid "recurse into subtrees"
6539 #: builtin/ls-tree.c:130
6540 msgid "show trees when recursing"
6543 #: builtin/ls-tree.c:133
6544 msgid "terminate entries with NUL byte"
6547 #: builtin/ls-tree.c:134
6548 msgid "include object size"
6551 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6552 msgid "list only filenames"
6555 #: builtin/ls-tree.c:141
6556 msgid "use full path names"
6559 #: builtin/ls-tree.c:143
6560 msgid "list entire tree; not just current directory (implies --full-name)"
6561 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6563 #: builtin/merge.c:43
6564 msgid "git merge [options] [<commit>...]"
6565 msgstr "git merge [选项] [<提交>...]"
6567 #: builtin/merge.c:44
6568 msgid "git merge [options] <msg> HEAD <commit>"
6569 msgstr "git merge [选项] <说明> HEAD <提交>"
6571 #: builtin/merge.c:45
6572 msgid "git merge --abort"
6573 msgstr "git merge --abort"
6575 #: builtin/merge.c:98
6576 msgid "switch `m' requires a value"
6577 msgstr "开关 `m' 需要一个值"
6579 #: builtin/merge.c:135
6581 msgid "Could not find merge strategy '%s'.\n"
6582 msgstr "不能找到合并策略 '%s'。\n"
6584 #: builtin/merge.c:136
6586 msgid "Available strategies are:"
6589 #: builtin/merge.c:141
6591 msgid "Available custom strategies are:"
6594 #: builtin/merge.c:191
6595 msgid "do not show a diffstat at the end of the merge"
6596 msgstr "在合并的最后不显示差异统计"
6598 #: builtin/merge.c:194
6599 msgid "show a diffstat at the end of the merge"
6600 msgstr "在合并的最后显示差异统计"
6602 #: builtin/merge.c:195
6603 msgid "(synonym to --stat)"
6604 msgstr "(和 --stat 同义)"
6606 #: builtin/merge.c:197
6607 msgid "add (at most <n>) entries from shortlog to merge commit message"
6608 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6610 #: builtin/merge.c:200
6611 msgid "create a single commit instead of doing a merge"
6612 msgstr "创建一个单独的提交而不是做一次合并"
6614 #: builtin/merge.c:202
6615 msgid "perform a commit if the merge succeeds (default)"
6616 msgstr "如果合并成功,执行一次提交(默认)"
6618 #: builtin/merge.c:204
6619 msgid "edit message before committing"
6622 #: builtin/merge.c:205
6623 msgid "allow fast-forward (default)"
6626 #: builtin/merge.c:207
6627 msgid "abort if fast-forward is not possible"
6628 msgstr "如果不能快进就放弃合并"
6630 #: builtin/merge.c:211
6631 msgid "Verify that the named commit has a valid GPG signature"
6632 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6634 #: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6638 #: builtin/merge.c:213
6639 msgid "merge strategy to use"
6642 #: builtin/merge.c:214
6643 msgid "option=value"
6644 msgstr "option=value"
6646 #: builtin/merge.c:215
6647 msgid "option for selected merge strategy"
6650 #: builtin/merge.c:217
6651 msgid "merge commit message (for a non-fast-forward merge)"
6652 msgstr "合并的提交说明(针对非快进式合并)"
6654 #: builtin/merge.c:221
6655 msgid "abort the current in-progress merge"
6656 msgstr "放弃当前正在进行的合并"
6658 #: builtin/merge.c:250
6659 msgid "could not run stash."
6662 #: builtin/merge.c:255
6663 msgid "stash failed"
6666 #: builtin/merge.c:260
6668 msgid "not a valid object: %s"
6669 msgstr "不是一个有效对象:%s"
6671 #: builtin/merge.c:279 builtin/merge.c:296
6672 msgid "read-tree failed"
6676 #: builtin/merge.c:326
6677 msgid " (nothing to squash)"
6680 #: builtin/merge.c:339
6682 msgid "Squash commit -- not updating HEAD\n"
6683 msgstr "压缩提交 -- 未更新 HEAD\n"
6685 #: builtin/merge.c:371
6686 msgid "Writing SQUASH_MSG"
6687 msgstr "写入 SQUASH_MSG"
6689 #: builtin/merge.c:373
6690 msgid "Finishing SQUASH_MSG"
6691 msgstr "完成 SQUASH_MSG"
6693 #: builtin/merge.c:396
6695 msgid "No merge message -- not updating HEAD\n"
6696 msgstr "无合并信息 -- 未更新 HEAD\n"
6698 #: builtin/merge.c:446
6700 msgid "'%s' does not point to a commit"
6701 msgstr "'%s' 没有指向一个提交"
6703 #: builtin/merge.c:558
6705 msgid "Bad branch.%s.mergeoptions string: %s"
6706 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6708 #: builtin/merge.c:653
6709 msgid "git write-tree failed to write a tree"
6710 msgstr "git write-tree 无法写入一树对象"
6712 #: builtin/merge.c:681
6713 msgid "Not handling anything other than two heads merge."
6714 msgstr "不能处理两个头合并之外的任何操作。"
6716 #: builtin/merge.c:695
6718 msgid "Unknown option for merge-recursive: -X%s"
6719 msgstr "merge-recursive 的未知选项:-X%s"
6721 #: builtin/merge.c:709
6723 msgid "unable to write %s"
6726 #: builtin/merge.c:798
6728 msgid "Could not read from '%s'"
6729 msgstr "不能从 '%s' 读取"
6731 #: builtin/merge.c:807
6733 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6734 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6736 #: builtin/merge.c:813
6739 "Please enter a commit message to explain why this merge is necessary,\n"
6740 "especially if it merges an updated upstream into a topic branch.\n"
6742 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6745 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6748 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6750 #: builtin/merge.c:837
6751 msgid "Empty commit message."
6754 #: builtin/merge.c:849
6756 msgid "Wonderful.\n"
6759 #: builtin/merge.c:914
6761 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6762 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6764 #: builtin/merge.c:930
6766 msgid "'%s' is not a commit"
6767 msgstr "'%s' 不是一个提交"
6769 #: builtin/merge.c:971
6770 msgid "No current branch."
6773 #: builtin/merge.c:973
6774 msgid "No remote for the current branch."
6775 msgstr "当前分支没有对应的远程版本库。"
6777 #: builtin/merge.c:975
6778 msgid "No default upstream defined for the current branch."
6779 msgstr "当前分支没有定义默认的上游分支。"
6781 #: builtin/merge.c:980
6783 msgid "No remote-tracking branch for %s from %s"
6784 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
6786 #: builtin/merge.c:1136
6787 msgid "There is no merge to abort (MERGE_HEAD missing)."
6788 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6790 #: builtin/merge.c:1152 git-pull.sh:31
6792 "You have not concluded your merge (MERGE_HEAD exists).\n"
6793 "Please, commit your changes before you can merge."
6795 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6798 #: builtin/merge.c:1155 git-pull.sh:34
6799 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6800 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6802 #: builtin/merge.c:1159
6804 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6805 "Please, commit your changes before you can merge."
6807 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6810 #: builtin/merge.c:1162
6811 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6812 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6814 #: builtin/merge.c:1171
6815 msgid "You cannot combine --squash with --no-ff."
6816 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6818 #: builtin/merge.c:1180
6819 msgid "No commit specified and merge.defaultToUpstream not set."
6820 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6822 #: builtin/merge.c:1212
6823 msgid "Can merge only exactly one commit into empty head"
6824 msgstr "只能将一个提交合并到空分支上"
6826 #: builtin/merge.c:1215
6827 msgid "Squash commit into empty head not supported yet"
6828 msgstr "尚不支持到空分支的压缩提交"
6830 #: builtin/merge.c:1217
6831 msgid "Non-fast-forward commit does not make sense into an empty head"
6832 msgstr "到空分支的非快进式提交没有意义"
6834 #: builtin/merge.c:1222
6836 msgid "%s - not something we can merge"
6839 #: builtin/merge.c:1273
6841 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6842 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6844 #: builtin/merge.c:1276
6846 msgid "Commit %s has a bad GPG signature allegedly by %s."
6847 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6849 #: builtin/merge.c:1279
6851 msgid "Commit %s does not have a GPG signature."
6852 msgstr "提交 %s 没有一个 GPG 签名。"
6854 #: builtin/merge.c:1282
6856 msgid "Commit %s has a good GPG signature by %s\n"
6857 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6859 #: builtin/merge.c:1366
6861 msgid "Updating %s..%s\n"
6862 msgstr "更新 %s..%s\n"
6864 #: builtin/merge.c:1405
6866 msgid "Trying really trivial in-index merge...\n"
6867 msgstr "尝试非常小的索引内合并...\n"
6869 #: builtin/merge.c:1412
6874 #: builtin/merge.c:1444
6875 msgid "Not possible to fast-forward, aborting."
6878 #: builtin/merge.c:1467 builtin/merge.c:1546
6880 msgid "Rewinding the tree to pristine...\n"
6881 msgstr "将树回滚至原始状态...\n"
6883 #: builtin/merge.c:1471
6885 msgid "Trying merge strategy %s...\n"
6886 msgstr "尝试合并策略 %s...\n"
6888 #: builtin/merge.c:1537
6890 msgid "No merge strategy handled the merge.\n"
6891 msgstr "没有合并策略处理此合并。\n"
6893 #: builtin/merge.c:1539
6895 msgid "Merge with strategy %s failed.\n"
6896 msgstr "使用策略 %s 合并失败。\n"
6898 #: builtin/merge.c:1548
6900 msgid "Using the %s to prepare resolving by hand.\n"
6901 msgstr "使用 %s 以准备手工解决。\n"
6903 #: builtin/merge.c:1560
6905 msgid "Automatic merge went well; stopped before committing as requested\n"
6906 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6908 #: builtin/merge-base.c:29
6909 msgid "git merge-base [-a|--all] <commit> <commit>..."
6910 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6912 #: builtin/merge-base.c:30
6913 msgid "git merge-base [-a|--all] --octopus <commit>..."
6914 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6916 #: builtin/merge-base.c:31
6917 msgid "git merge-base --independent <commit>..."
6918 msgstr "git merge-base --independent <提交>..."
6920 #: builtin/merge-base.c:32
6921 msgid "git merge-base --is-ancestor <commit> <commit>"
6922 msgstr "git merge-base --is-ancestor <提交> <提交>"
6924 #: builtin/merge-base.c:33
6925 msgid "git merge-base --fork-point <ref> [<commit>]"
6926 msgstr "git merge-base --fork-point <提交> [<提交>]"
6928 #: builtin/merge-base.c:214
6929 msgid "output all common ancestors"
6932 #: builtin/merge-base.c:216
6933 msgid "find ancestors for a single n-way merge"
6934 msgstr "查找一个多路合并的祖先提交"
6936 #: builtin/merge-base.c:218
6937 msgid "list revs not reachable from others"
6938 msgstr "显示不能被其他访问到的版本"
6940 #: builtin/merge-base.c:220
6941 msgid "is the first one ancestor of the other?"
6942 msgstr "第一个是其他的祖先提交么?"
6944 #: builtin/merge-base.c:222
6945 msgid "find where <commit> forked from reflog of <ref>"
6946 msgstr "查找 <commit> 从<引用>日志的何处分支的"
6948 #: builtin/merge-file.c:8
6950 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6953 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
6955 #: builtin/merge-file.c:33
6956 msgid "send results to standard output"
6959 #: builtin/merge-file.c:34
6960 msgid "use a diff3 based merge"
6961 msgstr "使用基于 diff3 的合并"
6963 #: builtin/merge-file.c:35
6964 msgid "for conflicts, use our version"
6965 msgstr "如果冲突,使用我们的版本"
6967 #: builtin/merge-file.c:37
6968 msgid "for conflicts, use their version"
6969 msgstr "如果冲突,使用他们的版本"
6971 #: builtin/merge-file.c:39
6972 msgid "for conflicts, use a union version"
6973 msgstr "如果冲突,使用联合版本"
6975 #: builtin/merge-file.c:42
6976 msgid "for conflicts, use this marker size"
6977 msgstr "如果冲突,使用指定长度的标记"
6979 #: builtin/merge-file.c:43
6980 msgid "do not warn about conflicts"
6983 #: builtin/merge-file.c:45
6984 msgid "set labels for file1/orig_file/file2"
6985 msgstr "为 file1/orig_file/file2 设置标签"
6987 #: builtin/mktree.c:64
6988 msgid "git mktree [-z] [--missing] [--batch]"
6989 msgstr "git mktree [-z] [--missing] [--batch]"
6991 #: builtin/mktree.c:150
6992 msgid "input is NUL terminated"
6993 msgstr "输入以 NUL 字符终止"
6995 #: builtin/mktree.c:151 builtin/write-tree.c:24
6996 msgid "allow missing objects"
6999 #: builtin/mktree.c:152
7000 msgid "allow creation of more than one tree"
7004 msgid "git mv [options] <source>... <destination>"
7005 msgstr "git mv [选项] <源>... <目标>"
7008 msgid "force move/rename even if target exists"
7009 msgstr "强制移动/重命令,即使目标存在"
7012 msgid "skip move/rename errors"
7017 msgid "Checking rename of '%s' to '%s'\n"
7018 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7025 msgid "can not move directory into itself"
7029 msgid "cannot move directory over file"
7034 msgid "Huh? Directory %s is in index and no submodule?"
7035 msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7037 #: builtin/mv.c:140 builtin/rm.c:318
7038 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7039 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7043 msgid "Huh? %.*s is in index?"
7044 msgstr "嗯?%.*s 在索引中?"
7047 msgid "source directory is empty"
7051 msgid "not under version control"
7055 msgid "destination exists"
7060 msgid "overwriting '%s'"
7064 msgid "Cannot overwrite"
7068 msgid "multiple sources for the same target"
7072 msgid "destination directory does not exist"
7077 msgid "%s, source=%s, destination=%s"
7078 msgstr "%s,源=%s,目标=%s"
7082 msgid "Renaming %s to %s\n"
7083 msgstr "重命名 %s 至 %s\n"
7085 #: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
7087 msgid "renaming '%s' failed"
7088 msgstr "重命名 '%s' 失败"
7090 #: builtin/name-rev.c:258
7091 msgid "git name-rev [options] <commit>..."
7092 msgstr "git name-rev [选项] <提交>..."
7094 #: builtin/name-rev.c:259
7095 msgid "git name-rev [options] --all"
7096 msgstr "git name-rev [选项] --all"
7098 #: builtin/name-rev.c:260
7099 msgid "git name-rev [options] --stdin"
7100 msgstr "git name-rev [选项] --stdin"
7102 #: builtin/name-rev.c:312
7103 msgid "print only names (no SHA-1)"
7104 msgstr "只打印名称(无 SHA-1)"
7106 #: builtin/name-rev.c:313
7107 msgid "only use tags to name the commits"
7108 msgstr "只使用 tags 来命名提交"
7110 #: builtin/name-rev.c:315
7111 msgid "only use refs matching <pattern>"
7112 msgstr "只使用和 <模式> 相匹配的引用"
7114 #: builtin/name-rev.c:317
7115 msgid "list all commits reachable from all refs"
7116 msgstr "列出可以从所有引用访问的提交"
7118 #: builtin/name-rev.c:318
7119 msgid "read from stdin"
7122 #: builtin/name-rev.c:319
7123 msgid "allow to print `undefined` names (default)"
7124 msgstr "允许打印 `未定义` 的名称(默认)"
7126 #: builtin/name-rev.c:325
7127 msgid "dereference tags in the input (internal use)"
7128 msgstr "反向解析输入中的 tags(内部使用)"
7130 #: builtin/notes.c:24
7131 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7132 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7134 #: builtin/notes.c:25
7136 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7137 "<object>] [<object>]"
7139 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7142 #: builtin/notes.c:26
7143 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7144 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7146 #: builtin/notes.c:27
7148 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7149 "<object>] [<object>]"
7151 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7154 #: builtin/notes.c:28
7155 msgid "git notes [--ref <notes_ref>] edit [<object>]"
7156 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7158 #: builtin/notes.c:29
7159 msgid "git notes [--ref <notes_ref>] show [<object>]"
7160 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7162 #: builtin/notes.c:30
7164 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7165 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7167 #: builtin/notes.c:31
7168 msgid "git notes merge --commit [-v | -q]"
7169 msgstr "git notes merge --commit [-v | -q]"
7171 #: builtin/notes.c:32
7172 msgid "git notes merge --abort [-v | -q]"
7173 msgstr "git notes merge --abort [-v | -q]"
7175 #: builtin/notes.c:33
7176 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7177 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7179 #: builtin/notes.c:34
7180 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7181 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7183 #: builtin/notes.c:35
7184 msgid "git notes [--ref <notes_ref>] get-ref"
7185 msgstr "git notes [--ref <注解引用>] get-ref"
7187 #: builtin/notes.c:40
7188 msgid "git notes [list [<object>]]"
7189 msgstr "git notes [list [<对象>]]"
7191 #: builtin/notes.c:45
7192 msgid "git notes add [<options>] [<object>]"
7193 msgstr "git notes add [<选项>] [<对象>]"
7195 #: builtin/notes.c:50
7196 msgid "git notes copy [<options>] <from-object> <to-object>"
7197 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7199 #: builtin/notes.c:51
7200 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7201 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7203 #: builtin/notes.c:56
7204 msgid "git notes append [<options>] [<object>]"
7205 msgstr "git notes append [<选项>] [<对象>]"
7207 #: builtin/notes.c:61
7208 msgid "git notes edit [<object>]"
7209 msgstr "git notes edit [<对象>]"
7211 #: builtin/notes.c:66
7212 msgid "git notes show [<object>]"
7213 msgstr "git notes show [<对象>]"
7215 #: builtin/notes.c:71
7216 msgid "git notes merge [<options>] <notes_ref>"
7217 msgstr "git notes merge [<选项>] <注解引用>"
7219 #: builtin/notes.c:72
7220 msgid "git notes merge --commit [<options>]"
7221 msgstr "git notes merge --commit [<选项>]"
7223 #: builtin/notes.c:73
7224 msgid "git notes merge --abort [<options>]"
7225 msgstr "git notes merge --abort [<选项>]"
7227 #: builtin/notes.c:78
7228 msgid "git notes remove [<object>]"
7229 msgstr "git notes remove [<对象>]"
7231 #: builtin/notes.c:83
7232 msgid "git notes prune [<options>]"
7233 msgstr "git notes prune [<选项>]"
7235 #: builtin/notes.c:88
7236 msgid "git notes get-ref"
7237 msgstr "git notes get-ref"
7239 #: builtin/notes.c:137
7241 msgid "unable to start 'show' for object '%s'"
7242 msgstr "不能为对象 '%s' 开始 'show'"
7244 #: builtin/notes.c:141
7245 msgid "could not read 'show' output"
7246 msgstr "不能读取 'show' 的输出"
7248 #: builtin/notes.c:149
7250 msgid "failed to finish 'show' for object '%s'"
7251 msgstr "无法为对象 '%s' 完成 'show'"
7253 #: builtin/notes.c:167 builtin/tag.c:373
7255 msgid "could not create file '%s'"
7256 msgstr "不能创建文件 '%s'"
7258 #: builtin/notes.c:186
7259 msgid "Please supply the note contents using either -m or -F option"
7260 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7262 #: builtin/notes.c:207 builtin/notes.c:848
7264 msgid "Removing note for object %s\n"
7265 msgstr "删除对象 %s 的注解\n"
7267 #: builtin/notes.c:212
7268 msgid "unable to write note object"
7271 #: builtin/notes.c:214
7273 msgid "The note contents has been left in %s"
7274 msgstr "注解内容被留在文件 %s 中"
7276 #: builtin/notes.c:248 builtin/tag.c:604
7278 msgid "cannot read '%s'"
7281 #: builtin/notes.c:250 builtin/tag.c:607
7283 msgid "could not open or read '%s'"
7284 msgstr "不能打开或读取 '%s'"
7286 #: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7287 #: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7288 #: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7289 #: builtin/notes.c:843 builtin/tag.c:620
7291 msgid "Failed to resolve '%s' as a valid ref."
7292 msgstr "无法解析 '%s' 为一个有效引用。"
7294 #: builtin/notes.c:272
7296 msgid "Failed to read object '%s'."
7297 msgstr "无法读取对象 '%s'。"
7299 #: builtin/notes.c:276
7301 msgid "Cannot read note data from non-blob object '%s'."
7302 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7304 #: builtin/notes.c:316
7306 msgid "Malformed input line: '%s'."
7307 msgstr "非法的输入行:'%s'。"
7309 #: builtin/notes.c:331
7311 msgid "Failed to copy notes from '%s' to '%s'"
7312 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7314 #: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7315 #: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7316 #: builtin/notes.c:908
7317 msgid "too many parameters"
7320 #: builtin/notes.c:388 builtin/notes.c:647
7322 msgid "No note found for object %s."
7323 msgstr "未发现对象 %s 的注解。"
7325 #: builtin/notes.c:410 builtin/notes.c:567
7326 msgid "note contents as a string"
7327 msgstr "注解内容作为一个字符串"
7329 #: builtin/notes.c:413 builtin/notes.c:570
7330 msgid "note contents in a file"
7333 #: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7334 #: builtin/notes.c:575 builtin/tag.c:539
7338 #: builtin/notes.c:416 builtin/notes.c:573
7339 msgid "reuse and edit specified note object"
7340 msgstr "重用和编辑指定的注解对象"
7342 #: builtin/notes.c:419 builtin/notes.c:576
7343 msgid "reuse specified note object"
7346 #: builtin/notes.c:421 builtin/notes.c:489
7347 msgid "replace existing notes"
7350 #: builtin/notes.c:455
7353 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7355 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7357 #: builtin/notes.c:460 builtin/notes.c:537
7359 msgid "Overwriting existing notes for object %s\n"
7360 msgstr "覆盖对象 %s 现存注解\n"
7362 #: builtin/notes.c:490
7363 msgid "read objects from stdin"
7366 #: builtin/notes.c:492
7367 msgid "load rewriting config for <command> (implies --stdin)"
7368 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7370 #: builtin/notes.c:510
7371 msgid "too few parameters"
7374 #: builtin/notes.c:531
7377 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7379 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7381 #: builtin/notes.c:543
7383 msgid "Missing notes on source object %s. Cannot copy."
7384 msgstr "源对象 %s 缺少注解。不能拷贝。"
7386 #: builtin/notes.c:592
7389 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7390 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7392 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7393 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7395 #: builtin/notes.c:739
7396 msgid "General options"
7399 #: builtin/notes.c:741
7400 msgid "Merge options"
7403 #: builtin/notes.c:743
7405 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7407 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7409 #: builtin/notes.c:745
7410 msgid "Committing unmerged notes"
7413 #: builtin/notes.c:747
7414 msgid "finalize notes merge by committing unmerged notes"
7415 msgstr "通过提交未合并的注解来完成注解合并"
7417 #: builtin/notes.c:749
7418 msgid "Aborting notes merge resolution"
7421 #: builtin/notes.c:751
7422 msgid "abort notes merge"
7425 #: builtin/notes.c:846
7427 msgid "Object %s has no note\n"
7428 msgstr "对象 %s 没有注解\n"
7430 #: builtin/notes.c:858
7431 msgid "attempt to remove non-existent note is not an error"
7432 msgstr "尝试删除不存在的注解不是一个错误"
7434 #: builtin/notes.c:861
7435 msgid "read object names from the standard input"
7436 msgstr "从标准输入读取对象名称"
7438 #: builtin/notes.c:942
7442 #: builtin/notes.c:943
7443 msgid "use notes from <notes_ref>"
7444 msgstr "从 <注解引用> 使用注解"
7446 #: builtin/notes.c:978 builtin/remote.c:1593
7448 msgid "Unknown subcommand: %s"
7451 #: builtin/pack-objects.c:25
7452 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7453 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7455 #: builtin/pack-objects.c:26
7456 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7457 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7459 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7461 msgid "deflate error (%d)"
7464 #: builtin/pack-objects.c:771
7465 msgid "Writing objects"
7468 #: builtin/pack-objects.c:1012
7469 msgid "disabling bitmap writing, as some objects are not being packed"
7470 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7472 #: builtin/pack-objects.c:2174
7473 msgid "Compressing objects"
7476 #: builtin/pack-objects.c:2530
7478 msgid "unsupported index version %s"
7479 msgstr "不支持的索引版本 %s"
7481 #: builtin/pack-objects.c:2534
7483 msgid "bad index version '%s'"
7484 msgstr "坏的索引版本 '%s'"
7486 #: builtin/pack-objects.c:2557
7488 msgid "option %s does not accept negative form"
7489 msgstr "选项 %s 不接受否定格式"
7491 #: builtin/pack-objects.c:2561
7493 msgid "unable to parse value '%s' for option %s"
7494 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7496 #: builtin/pack-objects.c:2580
7497 msgid "do not show progress meter"
7500 #: builtin/pack-objects.c:2582
7501 msgid "show progress meter"
7504 #: builtin/pack-objects.c:2584
7505 msgid "show progress meter during object writing phase"
7506 msgstr "在对象写入阶段显示进度表"
7508 #: builtin/pack-objects.c:2587
7509 msgid "similar to --all-progress when progress meter is shown"
7510 msgstr "当进度表显示时类似于 --all-progress"
7512 #: builtin/pack-objects.c:2588
7513 msgid "version[,offset]"
7516 #: builtin/pack-objects.c:2589
7517 msgid "write the pack index file in the specified idx format version"
7518 msgstr "用指定的 idx 格式版本来写包索引文件"
7520 #: builtin/pack-objects.c:2592
7521 msgid "maximum size of each output pack file"
7524 #: builtin/pack-objects.c:2594
7525 msgid "ignore borrowed objects from alternate object store"
7526 msgstr "忽略从替代对象存储里借用对象"
7528 #: builtin/pack-objects.c:2596
7529 msgid "ignore packed objects"
7532 #: builtin/pack-objects.c:2598
7533 msgid "limit pack window by objects"
7536 #: builtin/pack-objects.c:2600
7537 msgid "limit pack window by memory in addition to object limit"
7538 msgstr "除对象数量限制外设置打包窗口的内存限制"
7540 #: builtin/pack-objects.c:2602
7541 msgid "maximum length of delta chain allowed in the resulting pack"
7542 msgstr "打包允许的 delta 链的最大长度"
7544 #: builtin/pack-objects.c:2604
7545 msgid "reuse existing deltas"
7546 msgstr "重用已存在的 deltas"
7548 #: builtin/pack-objects.c:2606
7549 msgid "reuse existing objects"
7552 #: builtin/pack-objects.c:2608
7553 msgid "use OFS_DELTA objects"
7554 msgstr "使用 OFS_DELTA 对象"
7556 #: builtin/pack-objects.c:2610
7557 msgid "use threads when searching for best delta matches"
7558 msgstr "使用线程查询最佳 delta 匹配"
7560 #: builtin/pack-objects.c:2612
7561 msgid "do not create an empty pack output"
7564 #: builtin/pack-objects.c:2614
7565 msgid "read revision arguments from standard input"
7566 msgstr "从标准输入读取修订号参数"
7568 #: builtin/pack-objects.c:2616
7569 msgid "limit the objects to those that are not yet packed"
7570 msgstr "限制那些尚未打包的对象"
7572 #: builtin/pack-objects.c:2619
7573 msgid "include objects reachable from any reference"
7574 msgstr "包括可以从任何引用访问到的对象"
7576 #: builtin/pack-objects.c:2622
7577 msgid "include objects referred by reflog entries"
7578 msgstr "包括被引用日志引用到的对象"
7580 #: builtin/pack-objects.c:2625
7581 msgid "output pack to stdout"
7584 #: builtin/pack-objects.c:2627
7585 msgid "include tag objects that refer to objects to be packed"
7586 msgstr "包括引用了打包对象的 tag"
7588 #: builtin/pack-objects.c:2629
7589 msgid "keep unreachable objects"
7592 #: builtin/pack-objects.c:2630 parse-options.h:140
7596 #: builtin/pack-objects.c:2631
7597 msgid "unpack unreachable objects newer than <time>"
7598 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7600 #: builtin/pack-objects.c:2634
7601 msgid "create thin packs"
7604 #: builtin/pack-objects.c:2636
7605 msgid "ignore packs that have companion .keep file"
7606 msgstr "忽略配有 .keep 文件的包"
7608 #: builtin/pack-objects.c:2638
7609 msgid "pack compression level"
7612 #: builtin/pack-objects.c:2640
7613 msgid "do not hide commits by grafts"
7616 #: builtin/pack-objects.c:2642
7617 msgid "use a bitmap index if available to speed up counting objects"
7618 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7620 #: builtin/pack-objects.c:2644
7621 msgid "write a bitmap index together with the pack index"
7622 msgstr "在建立包索引的同时创建 bitmap 索引"
7624 #: builtin/pack-objects.c:2723
7625 msgid "Counting objects"
7628 #: builtin/pack-refs.c:6
7629 msgid "git pack-refs [options]"
7630 msgstr "git pack-refs [选项]"
7632 #: builtin/pack-refs.c:14
7633 msgid "pack everything"
7636 #: builtin/pack-refs.c:15
7637 msgid "prune loose refs (default)"
7638 msgstr "清除松散的引用(默认)"
7640 #: builtin/prune-packed.c:7
7641 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7642 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7644 #: builtin/prune-packed.c:49
7645 msgid "Removing duplicate objects"
7648 #: builtin/prune.c:12
7649 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7650 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7652 #: builtin/prune.c:142
7653 msgid "do not remove, show only"
7656 #: builtin/prune.c:143
7657 msgid "report pruned objects"
7660 #: builtin/prune.c:146
7661 msgid "expire objects older than <time>"
7662 msgstr "使早于给定时间的对象过期"
7664 #: builtin/push.c:14
7665 msgid "git push [<options>] [<repository> [<refspec>...]]"
7666 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7668 #: builtin/push.c:85
7669 msgid "tag shorthand without <tag>"
7670 msgstr "tag 简写没有跟 <tag> 参数"
7672 #: builtin/push.c:95
7673 msgid "--delete only accepts plain target ref names"
7674 msgstr "--delete 只接受简单的目标引用名"
7676 #: builtin/push.c:140
7679 "To choose either option permanently, see push.default in 'git help config'."
7682 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7684 #: builtin/push.c:143
7687 "The upstream branch of your current branch does not match\n"
7688 "the name of your current branch. To push to the upstream branch\n"
7689 "on the remote, use\n"
7691 " git push %s HEAD:%s\n"
7693 "To push to the branch of the same name on the remote, use\n"
7698 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7701 " git push %s HEAD:%s\n"
7708 #: builtin/push.c:158
7711 "You are not currently on a branch.\n"
7712 "To push the history leading to the current (detached HEAD)\n"
7715 " git push %s HEAD:<name-of-remote-branch>\n"
7718 "现在为推送当前(分离头指针)的历史,使用\n"
7720 " git push %s HEAD:<name-of-remote-branch>\n"
7722 #: builtin/push.c:172
7725 "The current branch %s has no upstream branch.\n"
7726 "To push the current branch and set the remote as upstream, use\n"
7728 " git push --set-upstream %s %s\n"
7730 "当前分支 %s 没有对应的上游分支。\n"
7731 "为推送当前分支并建立与远程上游的跟踪,使用\n"
7733 " git push --set-upstream %s %s\n"
7735 #: builtin/push.c:180
7737 msgid "The current branch %s has multiple upstream branches, refusing to push."
7738 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7740 #: builtin/push.c:183
7743 "You are pushing to remote '%s', which is not the upstream of\n"
7744 "your current branch '%s', without telling me what to push\n"
7745 "to update which remote branch."
7747 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7748 "而没有告诉我要推送什么、更新哪个远程分支。"
7750 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7751 #: builtin/push.c:206
7753 "push.default is unset; its implicit value has changed in\n"
7754 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7755 "and maintain the traditional behavior, use:\n"
7757 " git config --global push.default matching\n"
7759 "To squelch this message and adopt the new behavior now, use:\n"
7761 " git config --global push.default simple\n"
7763 "When push.default is set to 'matching', git will push local branches\n"
7764 "to the remote branches that already exist with the same name.\n"
7766 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
7767 "behavior, which only pushes the current branch to the corresponding\n"
7768 "remote branch that 'git pull' uses to update the current branch.\n"
7770 "See 'git help config' and search for 'push.default' for further "
7772 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7773 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7775 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
7776 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
7778 " git config --global push.default matching\n"
7780 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7782 " git config --global push.default simple\n"
7784 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7787 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7788 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7790 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7791 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7792 "为保持兼容,请用 'current' 代替 'simple')"
7794 #: builtin/push.c:273
7796 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7797 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
7799 #: builtin/push.c:280
7801 "Updates were rejected because the tip of your current branch is behind\n"
7802 "its remote counterpart. Integrate the remote changes (e.g.\n"
7803 "'git pull ...') before pushing again.\n"
7804 "See the 'Note about fast-forwards' in 'git push --help' for details."
7806 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7807 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
7808 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7810 #: builtin/push.c:286
7812 "Updates were rejected because a pushed branch tip is behind its remote\n"
7813 "counterpart. Check out this branch and integrate the remote changes\n"
7814 "(e.g. 'git pull ...') before pushing again.\n"
7815 "See the 'Note about fast-forwards' in 'git push --help' for details."
7817 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7818 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
7819 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7821 #: builtin/push.c:292
7823 "Updates were rejected because the remote contains work that you do\n"
7824 "not have locally. This is usually caused by another repository pushing\n"
7825 "to the same ref. You may want to first integrate the remote changes\n"
7826 "(e.g., 'git pull ...') before pushing again.\n"
7827 "See the 'Note about fast-forwards' in 'git push --help' for details."
7829 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7830 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7831 "(如 'git pull ...')。\n"
7832 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7834 #: builtin/push.c:299
7835 msgid "Updates were rejected because the tag already exists in the remote."
7836 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7838 #: builtin/push.c:302
7840 "You cannot update a remote ref that points at a non-commit object,\n"
7841 "or update a remote ref to make it point at a non-commit object,\n"
7842 "without using the '--force' option.\n"
7844 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7845 "也不能更新远程引用让其指向一个非提交对象。\n"
7847 #: builtin/push.c:361
7849 msgid "Pushing to %s\n"
7852 #: builtin/push.c:365
7854 msgid "failed to push some refs to '%s'"
7855 msgstr "无法推送一些引用到 '%s'"
7857 #: builtin/push.c:395
7859 msgid "bad repository '%s'"
7862 #: builtin/push.c:396
7864 "No configured push destination.\n"
7865 "Either specify the URL from the command-line or configure a remote "
7866 "repository using\n"
7868 " git remote add <name> <url>\n"
7870 "and then push using the remote name\n"
7872 " git push <name>\n"
7875 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7877 " git remote add <name> <url>\n"
7881 " git push <name>\n"
7883 #: builtin/push.c:411
7884 msgid "--all and --tags are incompatible"
7885 msgstr "--all 和 --tags 不兼容"
7887 #: builtin/push.c:412
7888 msgid "--all can't be combined with refspecs"
7889 msgstr "--all 不能和引用规则同时使用"
7891 #: builtin/push.c:417
7892 msgid "--mirror and --tags are incompatible"
7893 msgstr "--mirror 和 --tags 不兼容"
7895 #: builtin/push.c:418
7896 msgid "--mirror can't be combined with refspecs"
7897 msgstr "--mirror 不能和引用规则同时使用"
7899 #: builtin/push.c:423
7900 msgid "--all and --mirror are incompatible"
7901 msgstr "--all 和 --mirror 不兼容"
7903 #: builtin/push.c:483
7907 #: builtin/push.c:484
7908 msgid "push all refs"
7911 #: builtin/push.c:485
7912 msgid "mirror all refs"
7915 #: builtin/push.c:487
7919 #: builtin/push.c:488
7920 msgid "push tags (can't be used with --all or --mirror)"
7921 msgstr "推送 tags(不能使用 --all or --mirror)"
7923 #: builtin/push.c:491
7924 msgid "force updates"
7927 #: builtin/push.c:493
7928 msgid "refname>:<expect"
7931 #: builtin/push.c:494
7932 msgid "require old value of ref to be at this value"
7933 msgstr "要求引用旧的取值为设定值"
7935 #: builtin/push.c:496
7939 #: builtin/push.c:497
7940 msgid "control recursive pushing of submodules"
7943 #: builtin/push.c:499
7944 msgid "use thin pack"
7947 #: builtin/push.c:500 builtin/push.c:501
7948 msgid "receive pack program"
7951 #: builtin/push.c:502
7952 msgid "set upstream for git pull/status"
7953 msgstr "设置 git pull/status 的上游"
7955 #: builtin/push.c:505
7956 msgid "prune locally removed refs"
7959 #: builtin/push.c:507
7960 msgid "bypass pre-push hook"
7961 msgstr "绕过 pre-push 钩子"
7963 #: builtin/push.c:508
7964 msgid "push missing but relevant tags"
7965 msgstr "推送缺失的有关的 tags"
7967 #: builtin/push.c:518
7968 msgid "--delete is incompatible with --all, --mirror and --tags"
7969 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7971 #: builtin/push.c:520
7972 msgid "--delete doesn't make sense without any refs"
7973 msgstr "--delete 未接任何引用没有意义"
7975 #: builtin/read-tree.c:36
7977 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7978 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7979 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7981 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7982 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7983 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
7985 #: builtin/read-tree.c:109
7986 msgid "write resulting index to <file>"
7987 msgstr "将索引结果写入 <file>"
7989 #: builtin/read-tree.c:112
7990 msgid "only empty the index"
7993 #: builtin/read-tree.c:114
7997 #: builtin/read-tree.c:116
7998 msgid "perform a merge in addition to a read"
7999 msgstr "读取之余再执行一个合并"
8001 #: builtin/read-tree.c:118
8002 msgid "3-way merge if no file level merging required"
8003 msgstr "如果没有文件级合并需要,执行三路合并"
8005 #: builtin/read-tree.c:120
8006 msgid "3-way merge in presence of adds and removes"
8007 msgstr "存在添加和删除时,也执行三路合并"
8009 #: builtin/read-tree.c:122
8010 msgid "same as -m, but discard unmerged entries"
8011 msgstr "类似于 -m,但丢弃未合并的条目"
8013 #: builtin/read-tree.c:123
8014 msgid "<subdirectory>/"
8017 #: builtin/read-tree.c:124
8018 msgid "read the tree into the index under <subdirectory>/"
8019 msgstr "读取树对象到索引的 <子目录>/ 下"
8021 #: builtin/read-tree.c:127
8022 msgid "update working tree with merge result"
8023 msgstr "用合并的结果更新工作区"
8025 #: builtin/read-tree.c:129
8029 #: builtin/read-tree.c:130
8030 msgid "allow explicitly ignored files to be overwritten"
8031 msgstr "允许忽略文件中设定的文件可以被覆盖"
8033 #: builtin/read-tree.c:133
8034 msgid "don't check the working tree after merging"
8037 #: builtin/read-tree.c:134
8038 msgid "don't update the index or the work tree"
8041 #: builtin/read-tree.c:136
8042 msgid "skip applying sparse checkout filter"
8043 msgstr "跳过应用稀疏检出过滤器"
8045 #: builtin/read-tree.c:138
8046 msgid "debug unpack-trees"
8047 msgstr "调试 unpack-trees"
8049 #: builtin/reflog.c:499
8051 msgid "%s' for '%s' is not a valid timestamp"
8052 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8054 #: builtin/reflog.c:615 builtin/reflog.c:620
8056 msgid "'%s' is not a valid timestamp"
8057 msgstr "'%s' 不是一个有效的时间戳"
8059 #: builtin/remote.c:12
8060 msgid "git remote [-v | --verbose]"
8061 msgstr "git remote [-v | --verbose]"
8063 #: builtin/remote.c:13
8065 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8066 "mirror=<fetch|push>] <name> <url>"
8068 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8069 "mirror=<fetch|push>] <名称> <url>"
8071 #: builtin/remote.c:14 builtin/remote.c:33
8072 msgid "git remote rename <old> <new>"
8073 msgstr "git remote rename <旧名称> <新名称>"
8075 #: builtin/remote.c:15 builtin/remote.c:38
8076 msgid "git remote remove <name>"
8077 msgstr "git remote remove <名称>"
8079 #: builtin/remote.c:16
8080 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8081 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8083 #: builtin/remote.c:17
8084 msgid "git remote [-v | --verbose] show [-n] <name>"
8085 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8087 #: builtin/remote.c:18
8088 msgid "git remote prune [-n | --dry-run] <name>"
8089 msgstr "git remote prune [-n | --dry-run] <名称>"
8091 #: builtin/remote.c:19
8093 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8094 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8096 #: builtin/remote.c:20
8097 msgid "git remote set-branches [--add] <name> <branch>..."
8098 msgstr "git remote set-branches [--add] <名称> <分支>..."
8100 #: builtin/remote.c:21 builtin/remote.c:69
8101 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8102 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8104 #: builtin/remote.c:22 builtin/remote.c:70
8105 msgid "git remote set-url --add <name> <newurl>"
8106 msgstr "git remote set-url --add <名称> <新的地址>"
8108 #: builtin/remote.c:23 builtin/remote.c:71
8109 msgid "git remote set-url --delete <name> <url>"
8110 msgstr "git remote set-url --delete <名称> <地址>"
8112 #: builtin/remote.c:28
8113 msgid "git remote add [<options>] <name> <url>"
8114 msgstr "git remote add [<选项>] <名称> <地址>"
8116 #: builtin/remote.c:43
8117 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8118 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8120 #: builtin/remote.c:48
8121 msgid "git remote set-branches <name> <branch>..."
8122 msgstr "git remote set-branches <名称> <分支>..."
8124 #: builtin/remote.c:49
8125 msgid "git remote set-branches --add <name> <branch>..."
8126 msgstr "git remote set-branches --add <名称> <分支>..."
8128 #: builtin/remote.c:54
8129 msgid "git remote show [<options>] <name>"
8130 msgstr "git remote show [<选项>] <名称>"
8132 #: builtin/remote.c:59
8133 msgid "git remote prune [<options>] <name>"
8134 msgstr "git remote prune [<选项>] <名称>"
8136 #: builtin/remote.c:64
8137 msgid "git remote update [<options>] [<group> | <remote>]..."
8138 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8140 #: builtin/remote.c:88
8145 #: builtin/remote.c:120
8147 "--mirror is dangerous and deprecated; please\n"
8148 "\t use --mirror=fetch or --mirror=push instead"
8150 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8151 "\t 或 --mirror=push"
8153 #: builtin/remote.c:137
8155 msgid "unknown mirror argument: %s"
8158 #: builtin/remote.c:153
8159 msgid "fetch the remote branches"
8162 #: builtin/remote.c:155
8163 msgid "import all tags and associated objects when fetching"
8164 msgstr "抓取时导入所有的 tags 和关联对象"
8166 #: builtin/remote.c:158
8167 msgid "or do not fetch any tag at all (--no-tags)"
8168 msgstr "或不抓取任何 tag(--no-tags)"
8170 #: builtin/remote.c:160
8171 msgid "branch(es) to track"
8174 #: builtin/remote.c:161
8175 msgid "master branch"
8178 #: builtin/remote.c:162
8182 #: builtin/remote.c:163
8183 msgid "set up remote as a mirror to push to or fetch from"
8184 msgstr "把远程设置为用以推送或抓取的镜像"
8186 #: builtin/remote.c:175
8187 msgid "specifying a master branch makes no sense with --mirror"
8188 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8190 #: builtin/remote.c:177
8191 msgid "specifying branches to track makes sense only with fetch mirrors"
8192 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8194 #: builtin/remote.c:185 builtin/remote.c:641
8196 msgid "remote %s already exists."
8197 msgstr "远程 %s 已经存在。"
8199 #: builtin/remote.c:189 builtin/remote.c:645
8201 msgid "'%s' is not a valid remote name"
8202 msgstr "'%s' 不是一个有效的远程名称"
8204 #: builtin/remote.c:233
8206 msgid "Could not setup master '%s'"
8207 msgstr "无法设置 master '%s'"
8209 #: builtin/remote.c:289
8211 msgid "more than one %s"
8214 #: builtin/remote.c:334
8216 msgid "Could not get fetch map for refspec %s"
8217 msgstr "无法得到引用规则 %s 的获取列表"
8219 #: builtin/remote.c:435 builtin/remote.c:443
8223 #: builtin/remote.c:447
8227 #: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
8229 msgid "Could not append '%s' to '%s'"
8230 msgstr "不能添加 '%s' 至 '%s'"
8232 #: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
8234 msgid "No such remote: %s"
8237 #: builtin/remote.c:651
8239 msgid "Could not rename config section '%s' to '%s'"
8240 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8242 #: builtin/remote.c:657 builtin/remote.c:794
8244 msgid "Could not remove config section '%s'"
8245 msgstr "不能移除配置小节 '%s'"
8247 #: builtin/remote.c:672
8250 "Not updating non-default fetch refspec\n"
8252 "\tPlease update the configuration manually if necessary."
8258 #: builtin/remote.c:678
8260 msgid "Could not append '%s'"
8263 #: builtin/remote.c:689
8265 msgid "Could not set '%s'"
8268 #: builtin/remote.c:711
8270 msgid "deleting '%s' failed"
8273 #: builtin/remote.c:745
8275 msgid "creating '%s' failed"
8278 #: builtin/remote.c:759
8280 msgid "Could not remove branch %s"
8283 #: builtin/remote.c:829
8285 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8286 "to delete it, use:"
8288 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8289 "to delete them, use:"
8290 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8291 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8293 #: builtin/remote.c:938
8295 msgid " new (next fetch will store in remotes/%s)"
8296 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8298 #: builtin/remote.c:941
8302 #: builtin/remote.c:943
8303 msgid " stale (use 'git remote prune' to remove)"
8304 msgstr " 过时(使用 'git remote prune' 来移除)"
8306 #: builtin/remote.c:945
8310 #: builtin/remote.c:986
8312 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8313 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8315 #: builtin/remote.c:993
8317 msgid "rebases onto remote %s"
8320 #: builtin/remote.c:996
8322 msgid " merges with remote %s"
8325 #: builtin/remote.c:997
8326 msgid " and with remote"
8329 #: builtin/remote.c:999
8331 msgid "merges with remote %s"
8334 #: builtin/remote.c:1000
8335 msgid " and with remote"
8338 #: builtin/remote.c:1046
8342 #: builtin/remote.c:1049
8346 #: builtin/remote.c:1053
8350 #: builtin/remote.c:1056
8351 msgid "fast-forwardable"
8354 #: builtin/remote.c:1059
8355 msgid "local out of date"
8358 #: builtin/remote.c:1066
8360 msgid " %-*s forces to %-*s (%s)"
8361 msgstr " %-*s 强制推送至 %-*s (%s)"
8363 #: builtin/remote.c:1069
8365 msgid " %-*s pushes to %-*s (%s)"
8366 msgstr " %-*s 推送至 %-*s (%s)"
8368 #: builtin/remote.c:1073
8370 msgid " %-*s forces to %s"
8371 msgstr " %-*s 强制推送至 %s"
8373 #: builtin/remote.c:1076
8375 msgid " %-*s pushes to %s"
8376 msgstr " %-*s 推送至 %s"
8378 #: builtin/remote.c:1144
8379 msgid "do not query remotes"
8382 #: builtin/remote.c:1171
8387 #: builtin/remote.c:1172
8389 msgid " Fetch URL: %s"
8392 #: builtin/remote.c:1173 builtin/remote.c:1318
8396 #: builtin/remote.c:1182 builtin/remote.c:1184
8398 msgid " Push URL: %s"
8401 #: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
8403 msgid " HEAD branch: %s"
8406 #: builtin/remote.c:1192
8409 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8410 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8412 #: builtin/remote.c:1204
8414 msgid " Remote branch:%s"
8415 msgid_plural " Remote branches:%s"
8416 msgstr[0] " 远程分支:%s"
8417 msgstr[1] " 远程分支:%s"
8419 # 译者:中文字符串拼接,可删除前导空格
8420 #: builtin/remote.c:1207 builtin/remote.c:1234
8421 msgid " (status not queried)"
8424 #: builtin/remote.c:1216
8425 msgid " Local branch configured for 'git pull':"
8426 msgid_plural " Local branches configured for 'git pull':"
8427 msgstr[0] " 为 'git pull' 配置的本地分支:"
8428 msgstr[1] " 为 'git pull' 配置的本地分支:"
8430 #: builtin/remote.c:1224
8431 msgid " Local refs will be mirrored by 'git push'"
8432 msgstr " 本地引用将在 'git push' 时被镜像"
8434 #: builtin/remote.c:1231
8436 msgid " Local ref configured for 'git push'%s:"
8437 msgid_plural " Local refs configured for 'git push'%s:"
8438 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8439 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8441 #: builtin/remote.c:1252
8442 msgid "set refs/remotes/<name>/HEAD according to remote"
8443 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8445 #: builtin/remote.c:1254
8446 msgid "delete refs/remotes/<name>/HEAD"
8447 msgstr "删除 refs/remotes/<名称>/HEAD"
8449 #: builtin/remote.c:1269
8450 msgid "Cannot determine remote HEAD"
8451 msgstr "无法确定远程 HEAD"
8453 #: builtin/remote.c:1271
8454 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8455 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8457 #: builtin/remote.c:1281
8459 msgid "Could not delete %s"
8462 #: builtin/remote.c:1289
8464 msgid "Not a valid ref: %s"
8465 msgstr "不是一个有效引用:%s"
8467 #: builtin/remote.c:1291
8469 msgid "Could not setup %s"
8473 #: builtin/remote.c:1307
8475 msgid " %s will become dangling!"
8476 msgstr " %s 将成为摇摆状态!"
8479 #: builtin/remote.c:1308
8481 msgid " %s has become dangling!"
8482 msgstr " %s 已成为摇摆状态!"
8484 #: builtin/remote.c:1314
8489 #: builtin/remote.c:1315
8494 #: builtin/remote.c:1328
8496 msgid " * [would prune] %s"
8497 msgstr " * [将删除] %s"
8499 #: builtin/remote.c:1331
8501 msgid " * [pruned] %s"
8502 msgstr " * [已删除] %s"
8504 #: builtin/remote.c:1374
8505 msgid "prune remotes after fetching"
8508 #: builtin/remote.c:1440 builtin/remote.c:1514
8510 msgid "No such remote '%s'"
8513 #: builtin/remote.c:1460
8517 #: builtin/remote.c:1467
8518 msgid "no remote specified"
8521 #: builtin/remote.c:1489
8522 msgid "manipulate push URLs"
8525 #: builtin/remote.c:1491
8529 #: builtin/remote.c:1493
8533 #: builtin/remote.c:1500
8534 msgid "--add --delete doesn't make sense"
8535 msgstr "--add --delete 无意义"
8537 #: builtin/remote.c:1540
8539 msgid "Invalid old URL pattern: %s"
8540 msgstr "无效的旧URL匹配模版:%s"
8542 #: builtin/remote.c:1548
8544 msgid "No such URL found: %s"
8547 #: builtin/remote.c:1550
8548 msgid "Will not delete all non-push URLs"
8549 msgstr "将不会删除所有非推送URL地址"
8551 #: builtin/remote.c:1564
8552 msgid "be verbose; must be placed before a subcommand"
8553 msgstr "冗长输出;必须置于子命令之前"
8555 #: builtin/repack.c:16
8556 msgid "git repack [options]"
8557 msgstr "git repack [选项]"
8559 #: builtin/repack.c:156
8560 msgid "pack everything in a single pack"
8561 msgstr "所有内容打包到一个包文件中"
8563 #: builtin/repack.c:158
8564 msgid "same as -a, and turn unreachable objects loose"
8565 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8567 #: builtin/repack.c:161
8568 msgid "remove redundant packs, and run git-prune-packed"
8569 msgstr "删除多余的包,运行 git-prune-packed"
8571 #: builtin/repack.c:163
8572 msgid "pass --no-reuse-delta to git-pack-objects"
8573 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8575 #: builtin/repack.c:165
8576 msgid "pass --no-reuse-object to git-pack-objects"
8577 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8579 #: builtin/repack.c:167
8580 msgid "do not run git-update-server-info"
8581 msgstr "不运行 git-update-server-info"
8583 #: builtin/repack.c:170
8584 msgid "pass --local to git-pack-objects"
8585 msgstr "向 git-pack-objects 传递参数 --local"
8587 #: builtin/repack.c:172
8588 msgid "write bitmap index"
8589 msgstr "写 bitmap 索引"
8591 #: builtin/repack.c:173
8595 #: builtin/repack.c:174
8596 msgid "with -A, do not loosen objects older than this"
8597 msgstr "使用 -A,不要将早于给定时间的对象过期"
8599 #: builtin/repack.c:176
8600 msgid "size of the window used for delta compression"
8603 #: builtin/repack.c:177 builtin/repack.c:181
8607 #: builtin/repack.c:178
8608 msgid "same as the above, but limit memory size instead of entries count"
8609 msgstr "和上面的相似,但限制内存大小而非条目数"
8611 #: builtin/repack.c:180
8612 msgid "limits the maximum delta depth"
8615 #: builtin/repack.c:182
8616 msgid "maximum size of each packfile"
8619 #: builtin/repack.c:184
8620 msgid "repack objects in packs marked with .keep"
8621 msgstr "对标记为 .keep 的包中的对象重新打包"
8623 #: builtin/repack.c:371
8625 msgid "removing '%s' failed"
8628 #: builtin/replace.c:17
8629 msgid "git replace [-f] <object> <replacement>"
8630 msgstr "git replace [-f] <对象> <替换物>"
8632 #: builtin/replace.c:18
8633 msgid "git replace -d <object>..."
8634 msgstr "git replace -d <对象>..."
8636 #: builtin/replace.c:19
8637 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8638 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8640 #: builtin/replace.c:174
8641 msgid "list replace refs"
8644 #: builtin/replace.c:175
8645 msgid "delete replace refs"
8648 #: builtin/replace.c:176
8649 msgid "replace the ref if it exists"
8652 #: builtin/replace.c:177
8653 msgid "use this format"
8656 #: builtin/rerere.c:12
8657 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8658 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8660 #: builtin/rerere.c:57
8661 msgid "register clean resolutions in index"
8662 msgstr "在索引中注册干净的解决方案"
8664 #: builtin/reset.c:25
8666 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8667 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8669 #: builtin/reset.c:26
8670 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8671 msgstr "git reset [-q] <树或提交> [--] <路径>..."
8673 #: builtin/reset.c:27
8674 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8675 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8677 #: builtin/reset.c:33
8681 #: builtin/reset.c:33
8685 #: builtin/reset.c:33
8689 #: builtin/reset.c:33
8693 #: builtin/reset.c:33
8697 #: builtin/reset.c:73
8698 msgid "You do not have a valid HEAD."
8699 msgstr "您没有一个有效的 HEAD。"
8701 #: builtin/reset.c:75
8702 msgid "Failed to find tree of HEAD."
8703 msgstr "无法找到 HEAD 指向的树。"
8705 #: builtin/reset.c:81
8707 msgid "Failed to find tree of %s."
8708 msgstr "无法找到 %s 指向的树。"
8710 #: builtin/reset.c:99
8712 msgid "HEAD is now at %s"
8713 msgstr "HEAD 现在位于 %s"
8715 # 译者:汉字之间无空格,故删除%s前后空格
8716 #: builtin/reset.c:182
8718 msgid "Cannot do a %s reset in the middle of a merge."
8719 msgstr "在合并过程中不能做%s重置操作。"
8721 #: builtin/reset.c:273
8722 msgid "be quiet, only report errors"
8725 #: builtin/reset.c:275
8726 msgid "reset HEAD and index"
8727 msgstr "重置 HEAD 和索引"
8729 #: builtin/reset.c:276
8730 msgid "reset only HEAD"
8733 #: builtin/reset.c:278 builtin/reset.c:280
8734 msgid "reset HEAD, index and working tree"
8735 msgstr "重置 HEAD、索引和工作区"
8737 #: builtin/reset.c:282
8738 msgid "reset HEAD but keep local changes"
8739 msgstr "重置 HEAD 但保存本地变更"
8741 #: builtin/reset.c:285
8742 msgid "record only the fact that removed paths will be added later"
8743 msgstr "将删除的路径标记为稍后添加"
8745 #: builtin/reset.c:302
8747 msgid "Failed to resolve '%s' as a valid revision."
8748 msgstr "无法将 '%s' 解析为一个有效的版本。"
8750 #: builtin/reset.c:305 builtin/reset.c:313
8752 msgid "Could not parse object '%s'."
8753 msgstr "不能解析对象 '%s'。"
8755 #: builtin/reset.c:310
8757 msgid "Failed to resolve '%s' as a valid tree."
8758 msgstr "无法将 '%s' 解析为一个有效的树对象。"
8760 #: builtin/reset.c:319
8761 msgid "--patch is incompatible with --{hard,mixed,soft}"
8762 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8764 #: builtin/reset.c:328
8765 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8766 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8768 # 译者:汉字之间无空格,故删除%s前后空格
8769 #: builtin/reset.c:330
8771 msgid "Cannot do %s reset with paths."
8772 msgstr "不能带路径进行%s重置。"
8774 # 译者:汉字之间无空格,故删除%s前后空格
8775 #: builtin/reset.c:340
8777 msgid "%s reset is not allowed in a bare repository"
8778 msgstr "不能对裸版本库进行%s重置"
8780 #: builtin/reset.c:344
8781 msgid "-N can only be used with --mixed"
8782 msgstr "-N 只能和 --mixed 同时使用"
8784 #: builtin/reset.c:361
8785 msgid "Unstaged changes after reset:"
8786 msgstr "重置后撤出暂存区的变更:"
8788 #: builtin/reset.c:367
8790 msgid "Could not reset index file to revision '%s'."
8791 msgstr "不能重置索引文件至版本 '%s'。"
8793 #: builtin/reset.c:372
8794 msgid "Could not write new index file."
8795 msgstr "不能写入新的索引文件。"
8797 #: builtin/rev-parse.c:359
8798 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8799 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8801 #: builtin/rev-parse.c:364
8802 msgid "keep the `--` passed as an arg"
8803 msgstr "保持 `--` 作为一个参数传递"
8805 #: builtin/rev-parse.c:366
8806 msgid "stop parsing after the first non-option argument"
8807 msgstr "遇到第一个非选项参数后停止解析"
8809 #: builtin/rev-parse.c:369
8810 msgid "output in stuck long form"
8813 #: builtin/rev-parse.c:497
8815 "git rev-parse --parseopt [options] -- [<args>...]\n"
8816 " or: git rev-parse --sq-quote [<arg>...]\n"
8817 " or: git rev-parse [options] [<arg>...]\n"
8819 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8821 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
8822 " 或者:git rev-parse --sq-quote [<参数>...]\n"
8823 " 或者:git rev-parse [选项] [<参数>...]\n"
8825 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8827 #: builtin/revert.c:22
8828 msgid "git revert [options] <commit-ish>..."
8829 msgstr "git revert [选项] <提交号>..."
8831 #: builtin/revert.c:23
8832 msgid "git revert <subcommand>"
8833 msgstr "git revert <子命令>"
8835 #: builtin/revert.c:28
8836 msgid "git cherry-pick [options] <commit-ish>..."
8837 msgstr "git cherry-pick [选项] <提交号>..."
8839 #: builtin/revert.c:29
8840 msgid "git cherry-pick <subcommand>"
8841 msgstr "git cherry-pick <子命令>"
8843 #: builtin/revert.c:71
8845 msgid "%s: %s cannot be used with %s"
8846 msgstr "%s:%s 不能和 %s 同时使用"
8848 #: builtin/revert.c:80
8849 msgid "end revert or cherry-pick sequence"
8852 #: builtin/revert.c:81
8853 msgid "resume revert or cherry-pick sequence"
8856 #: builtin/revert.c:82
8857 msgid "cancel revert or cherry-pick sequence"
8860 #: builtin/revert.c:83
8861 msgid "don't automatically commit"
8864 #: builtin/revert.c:84
8865 msgid "edit the commit message"
8868 #: builtin/revert.c:87
8869 msgid "parent number"
8872 #: builtin/revert.c:89
8873 msgid "merge strategy"
8876 #: builtin/revert.c:90
8880 #: builtin/revert.c:91
8881 msgid "option for merge strategy"
8884 #: builtin/revert.c:104
8885 msgid "append commit name"
8888 #: builtin/revert.c:105
8889 msgid "allow fast-forward"
8892 #: builtin/revert.c:106
8893 msgid "preserve initially empty commits"
8896 #: builtin/revert.c:107
8897 msgid "allow commits with empty messages"
8900 #: builtin/revert.c:108
8901 msgid "keep redundant, empty commits"
8904 #: builtin/revert.c:112
8905 msgid "program error"
8908 #: builtin/revert.c:197
8909 msgid "revert failed"
8912 #: builtin/revert.c:212
8913 msgid "cherry-pick failed"
8917 msgid "git rm [options] [--] <file>..."
8918 msgstr "git rm [选项] [--] <文件>..."
8922 "the following submodule (or one of its nested submodules)\n"
8923 "uses a .git directory:"
8925 "the following submodules (or one of its nested submodules)\n"
8926 "use a .git directory:"
8927 msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8928 msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8933 "(use 'rm -rf' if you really want to remove it including all of its history)"
8936 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
8940 "the following file has staged content different from both the\n"
8941 "file and the HEAD:"
8943 "the following files have staged content different from both the\n"
8944 "file and the HEAD:"
8945 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8946 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8951 "(use -f to force removal)"
8957 msgid "the following file has changes staged in the index:"
8958 msgid_plural "the following files have changes staged in the index:"
8959 msgstr[0] "如下文件相对索引区的内容有修改"
8960 msgstr[1] "如下文件相对索引区的内容有修改"
8962 #: builtin/rm.c:244 builtin/rm.c:255
8965 "(use --cached to keep the file, or -f to force removal)"
8968 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
8971 msgid "the following file has local modifications:"
8972 msgid_plural "the following files have local modifications:"
8973 msgstr[0] "如下文件有本地修改:"
8974 msgstr[1] "如下文件有本地修改:"
8977 msgid "do not list removed files"
8981 msgid "only remove from the index"
8985 msgid "override the up-to-date check"
8989 msgid "allow recursive removal"
8993 msgid "exit with a zero status even if nothing matched"
8994 msgstr "即使没有匹配,也以零状态退出"
8998 msgid "not removing '%s' recursively without -r"
8999 msgstr "未提供 -r 选项不会递归删除 '%s'"
9003 msgid "git rm: unable to remove %s"
9004 msgstr "git rm:不能删除 %s"
9006 #: builtin/shortlog.c:13
9007 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9008 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9010 #: builtin/shortlog.c:131
9012 msgid "Missing author: %s"
9015 #: builtin/shortlog.c:230
9016 msgid "sort output according to the number of commits per author"
9017 msgstr "根据每个作者的提交数量排序"
9019 #: builtin/shortlog.c:232
9020 msgid "Suppress commit descriptions, only provides commit count"
9021 msgstr "隐藏提交说明,只提供提交数量"
9023 #: builtin/shortlog.c:234
9024 msgid "Show the email address of each author"
9025 msgstr "显示每个作者的电子邮件地址"
9027 #: builtin/shortlog.c:235
9029 msgstr "w[,i1[,i2]]"
9031 #: builtin/shortlog.c:236
9032 msgid "Linewrap output"
9035 #: builtin/show-branch.c:9
9037 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9038 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9039 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9042 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9043 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9044 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9047 #: builtin/show-branch.c:10
9048 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9049 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9051 #: builtin/show-branch.c:649
9052 msgid "show remote-tracking and local branches"
9053 msgstr "显示远程跟踪的和本地的分支"
9055 #: builtin/show-branch.c:651
9056 msgid "show remote-tracking branches"
9059 #: builtin/show-branch.c:653
9060 msgid "color '*!+-' corresponding to the branch"
9061 msgstr "着色 '*!+-' 到相应的分支"
9063 #: builtin/show-branch.c:655
9064 msgid "show <n> more commits after the common ancestor"
9065 msgstr "显示共同祖先后的 <n> 个提交"
9067 #: builtin/show-branch.c:657
9068 msgid "synonym to more=-1"
9069 msgstr "和 more=-1 同义"
9071 #: builtin/show-branch.c:658
9072 msgid "suppress naming strings"
9075 #: builtin/show-branch.c:660
9076 msgid "include the current branch"
9079 #: builtin/show-branch.c:662
9080 msgid "name commits with their object names"
9083 #: builtin/show-branch.c:664
9084 msgid "show possible merge bases"
9087 #: builtin/show-branch.c:666
9088 msgid "show refs unreachable from any other ref"
9089 msgstr "显示没有任何引用的的引用"
9091 #: builtin/show-branch.c:668
9092 msgid "show commits in topological order"
9095 #: builtin/show-branch.c:671
9096 msgid "show only commits not on the first branch"
9097 msgstr "只显示不在第一个分支上的提交"
9099 #: builtin/show-branch.c:673
9100 msgid "show merges reachable from only one tip"
9101 msgstr "显示仅一个分支可访问的合并提交"
9103 #: builtin/show-branch.c:675
9104 msgid "topologically sort, maintaining date order where possible"
9105 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9107 #: builtin/show-branch.c:678
9108 msgid "<n>[,<base>]"
9109 msgstr "<n>[,<base>]"
9111 #: builtin/show-branch.c:679
9112 msgid "show <n> most recent ref-log entries starting at base"
9113 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9115 #: builtin/show-ref.c:10
9117 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9118 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9120 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9121 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9123 #: builtin/show-ref.c:11
9124 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9125 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9127 #: builtin/show-ref.c:168
9128 msgid "only show tags (can be combined with heads)"
9129 msgstr "只显示 tags(可以和头共用)"
9131 #: builtin/show-ref.c:169
9132 msgid "only show heads (can be combined with tags)"
9133 msgstr "只显示头(可以和 tags 共用)"
9135 #: builtin/show-ref.c:170
9136 msgid "stricter reference checking, requires exact ref path"
9137 msgstr "更严格的引用检测,需要精确的引用路径"
9139 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9140 msgid "show the HEAD reference, even if it would be filtered out"
9141 msgstr "显示 HEAD 引用,即使被过滤掉"
9143 #: builtin/show-ref.c:177
9144 msgid "dereference tags into object IDs"
9145 msgstr "转换 tags 到对象ID"
9147 #: builtin/show-ref.c:179
9148 msgid "only show SHA1 hash using <n> digits"
9149 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9151 #: builtin/show-ref.c:183
9152 msgid "do not print results to stdout (useful with --verify)"
9153 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9155 #: builtin/show-ref.c:185
9156 msgid "show refs from stdin that aren't in local repository"
9157 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9159 #: builtin/symbolic-ref.c:7
9160 msgid "git symbolic-ref [options] name [ref]"
9161 msgstr "git symbolic-ref [选项] 名称 [引用]"
9163 #: builtin/symbolic-ref.c:8
9164 msgid "git symbolic-ref -d [-q] name"
9165 msgstr "git symbolic-ref -d [-q] 名称"
9167 #: builtin/symbolic-ref.c:40
9168 msgid "suppress error message for non-symbolic (detached) refs"
9169 msgstr "不显示非符号(分离的)引用的错误信息"
9171 #: builtin/symbolic-ref.c:41
9172 msgid "delete symbolic ref"
9175 #: builtin/symbolic-ref.c:42
9176 msgid "shorten ref output"
9179 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
9183 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:255
9184 msgid "reason of the update"
9189 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9190 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9193 msgid "git tag -d <tagname>..."
9194 msgstr "git tag -d <标签名>..."
9198 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9199 "\t\t[<pattern>...]"
9201 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9205 msgid "git tag -v <tagname>..."
9206 msgstr "git tag -v <标签名>..."
9210 msgid "malformed object at '%s'"
9211 msgstr "非法的对象于 '%s'"
9213 #: builtin/tag.c:239
9215 msgid "tag name too long: %.*s..."
9216 msgstr "tag 名字太长:%.*s..."
9218 #: builtin/tag.c:244
9220 msgid "tag '%s' not found."
9221 msgstr "tag '%s' 未发现。"
9223 #: builtin/tag.c:259
9225 msgid "Deleted tag '%s' (was %s)\n"
9226 msgstr "已删除 tag '%s'(曾为 %s)\n"
9228 #: builtin/tag.c:271
9230 msgid "could not verify the tag '%s'"
9231 msgstr "不能校验 tag '%s'"
9233 #: builtin/tag.c:281
9237 "Write a tag message\n"
9238 "Lines starting with '%c' will be ignored.\n"
9242 "以 '%c' 开头的行将被忽略。\n"
9244 #: builtin/tag.c:285
9248 "Write a tag message\n"
9249 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9254 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9256 #: builtin/tag.c:324
9257 msgid "unable to sign the tag"
9260 #: builtin/tag.c:326
9261 msgid "unable to write tag file"
9264 #: builtin/tag.c:351
9265 msgid "bad object type."
9268 #: builtin/tag.c:364
9269 msgid "tag header too big."
9272 #: builtin/tag.c:400
9273 msgid "no tag message?"
9276 #: builtin/tag.c:406
9278 msgid "The tag message has been left in %s\n"
9279 msgstr "tag 说明被保留在 %s\n"
9281 #: builtin/tag.c:455
9282 msgid "switch 'points-at' requires an object"
9283 msgstr "开关 'points-at' 需要一个对象"
9285 #: builtin/tag.c:457
9287 msgid "malformed object name '%s'"
9288 msgstr "非法的对象名 '%s'"
9290 #: builtin/tag.c:480
9292 msgid "unsupported sort specification %s"
9293 msgstr "不支持的排序规格 %s"
9295 #: builtin/tag.c:500
9296 msgid "list tag names"
9299 #: builtin/tag.c:502
9300 msgid "print <n> lines of each tag message"
9301 msgstr "每个 tag 信息打印 <n> 行"
9303 #: builtin/tag.c:504
9307 #: builtin/tag.c:505
9311 #: builtin/tag.c:507
9312 msgid "Tag creation options"
9315 #: builtin/tag.c:509
9316 msgid "annotated tag, needs a message"
9317 msgstr "注解 tag,需要一个说明"
9319 #: builtin/tag.c:511
9323 #: builtin/tag.c:513
9324 msgid "annotated and GPG-signed tag"
9325 msgstr "注解并 GPG 签名的 tag"
9327 #: builtin/tag.c:517
9328 msgid "use another key to sign the tag"
9329 msgstr "使用另外的私钥签名 tag"
9331 #: builtin/tag.c:518
9332 msgid "replace the tag if exists"
9333 msgstr "如果存在,替换现有的 tag"
9335 #: builtin/tag.c:519
9336 msgid "show tag list in columns"
9337 msgstr "以列的方式显示 tag"
9339 #: builtin/tag.c:521
9343 #: builtin/tag.c:525
9344 msgid "Tag listing options"
9347 #: builtin/tag.c:528 builtin/tag.c:534
9348 msgid "print only tags that contain the commit"
9349 msgstr "只打印包含提交的tags"
9351 #: builtin/tag.c:540
9352 msgid "print only tags of the object"
9355 #: builtin/tag.c:566
9356 msgid "--column and -n are incompatible"
9357 msgstr "--column 和 -n 不兼容"
9359 #: builtin/tag.c:578
9360 msgid "--sort and -n are incompatible"
9361 msgstr "--sort 和 -n 不兼容"
9363 #: builtin/tag.c:585
9364 msgid "-n option is only allowed with -l."
9365 msgstr "-n 选项只允许和 -l 同时使用。"
9367 #: builtin/tag.c:587
9368 msgid "--contains option is only allowed with -l."
9369 msgstr "--contains 选项只允许和 -l 同时使用。"
9371 #: builtin/tag.c:589
9372 msgid "--points-at option is only allowed with -l."
9373 msgstr "--points-at 选项只允许和 -l 同时使用。"
9375 #: builtin/tag.c:597
9376 msgid "only one -F or -m option is allowed."
9377 msgstr "只允许一个 -F 或 -m 选项。"
9379 #: builtin/tag.c:617
9380 msgid "too many params"
9383 #: builtin/tag.c:623
9385 msgid "'%s' is not a valid tag name."
9386 msgstr "'%s' 不是一个有效的tag名称。"
9388 #: builtin/tag.c:628
9390 msgid "tag '%s' already exists"
9391 msgstr "tag '%s' 已存在"
9393 #: builtin/tag.c:646
9395 msgid "%s: cannot lock the ref"
9398 #: builtin/tag.c:648
9400 msgid "%s: cannot update the ref"
9403 #: builtin/tag.c:650
9405 msgid "Updated tag '%s' (was %s)\n"
9406 msgstr "已更新tag '%s'(曾为 %s)\n"
9408 #: builtin/unpack-objects.c:483
9409 msgid "Unpacking objects"
9412 #: builtin/update-index.c:399
9413 msgid "git update-index [options] [--] [<file>...]"
9414 msgstr "git update-index [选项] [--] [<文件>...]"
9416 #: builtin/update-index.c:748
9417 msgid "continue refresh even when index needs update"
9418 msgstr "当索引需要更新时继续刷新"
9420 #: builtin/update-index.c:751
9421 msgid "refresh: ignore submodules"
9424 #: builtin/update-index.c:754
9425 msgid "do not ignore new files"
9428 #: builtin/update-index.c:756
9429 msgid "let files replace directories and vice-versa"
9430 msgstr "让文件替换目录(反之亦然)"
9432 #: builtin/update-index.c:758
9433 msgid "notice files missing from worktree"
9436 #: builtin/update-index.c:760
9437 msgid "refresh even if index contains unmerged entries"
9438 msgstr "即使索引区包含未合并的条目也执行刷新"
9440 #: builtin/update-index.c:763
9441 msgid "refresh stat information"
9444 #: builtin/update-index.c:767
9445 msgid "like --refresh, but ignore assume-unchanged setting"
9446 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9448 #: builtin/update-index.c:771
9449 msgid "<mode>,<object>,<path>"
9450 msgstr "<mode>,<object>,<path>"
9452 #: builtin/update-index.c:772
9453 msgid "add the specified entry to the index"
9454 msgstr "添加指定的条目到索引区"
9456 #: builtin/update-index.c:776
9460 #: builtin/update-index.c:777
9461 msgid "override the executable bit of the listed files"
9462 msgstr "覆盖列表里文件的可执行位"
9464 #: builtin/update-index.c:781
9465 msgid "mark files as \"not changing\""
9466 msgstr "把文件标记为 \"没有变更\""
9468 #: builtin/update-index.c:784
9469 msgid "clear assumed-unchanged bit"
9470 msgstr "清除 assumed-unchanged 位"
9472 #: builtin/update-index.c:787
9473 msgid "mark files as \"index-only\""
9474 msgstr "把文件标记为 \"仅索引\""
9476 #: builtin/update-index.c:790
9477 msgid "clear skip-worktree bit"
9478 msgstr "清除 skip-worktree 位"
9480 #: builtin/update-index.c:793
9481 msgid "add to index only; do not add content to object database"
9482 msgstr "只添加到索引区;不添加对象到对象库"
9484 #: builtin/update-index.c:795
9485 msgid "remove named paths even if present in worktree"
9486 msgstr "即使存在工作区里,也删除路径"
9488 #: builtin/update-index.c:797
9489 msgid "with --stdin: input lines are terminated by null bytes"
9490 msgstr "携带 --stdin:输入的行以 null 字符终止"
9492 #: builtin/update-index.c:799
9493 msgid "read list of paths to be updated from standard input"
9494 msgstr "从标准输入中读取需要更新的路径列表"
9496 #: builtin/update-index.c:803
9497 msgid "add entries from standard input to the index"
9498 msgstr "从标准输入添加条目到索引区"
9500 #: builtin/update-index.c:807
9501 msgid "repopulate stages #2 and #3 for the listed paths"
9502 msgstr "为指定文件重新生成第2和第3暂存区"
9504 #: builtin/update-index.c:811
9505 msgid "only update entries that differ from HEAD"
9506 msgstr "只更新与 HEAD 不同的条目"
9508 #: builtin/update-index.c:815
9509 msgid "ignore files missing from worktree"
9512 #: builtin/update-index.c:818
9513 msgid "report actions to standard output"
9516 #: builtin/update-index.c:820
9517 msgid "(for porcelains) forget saved unresolved conflicts"
9518 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9520 #: builtin/update-index.c:824
9521 msgid "write index in this format"
9524 #: builtin/update-ref.c:9
9525 msgid "git update-ref [options] -d <refname> [<oldval>]"
9526 msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9528 #: builtin/update-ref.c:10
9529 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9530 msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9532 #: builtin/update-ref.c:11
9533 msgid "git update-ref [options] --stdin [-z]"
9534 msgstr "git update-ref [选项] --stdin [-z]"
9536 #: builtin/update-ref.c:256
9537 msgid "delete the reference"
9540 #: builtin/update-ref.c:258
9541 msgid "update <refname> not the one it points to"
9542 msgstr "更新 <引用名> 本身而不是它指向的引用"
9544 #: builtin/update-ref.c:259
9545 msgid "stdin has NUL-terminated arguments"
9546 msgstr "标准输入有以 NUL 字符终止的参数"
9548 #: builtin/update-ref.c:260
9549 msgid "read updates from stdin"
9552 #: builtin/update-server-info.c:6
9553 msgid "git update-server-info [--force]"
9554 msgstr "git update-server-info [--force]"
9556 #: builtin/update-server-info.c:14
9557 msgid "update the info files from scratch"
9560 #: builtin/verify-pack.c:56
9561 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9562 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9564 #: builtin/verify-pack.c:66
9568 #: builtin/verify-pack.c:68
9569 msgid "show statistics only"
9572 #: builtin/verify-tag.c:17
9573 msgid "git verify-tag [-v|--verbose] <tag>..."
9574 msgstr "git verify-tag [-v|--verbose] <tag>..."
9576 #: builtin/verify-tag.c:73
9577 msgid "print tag contents"
9580 #: builtin/write-tree.c:13
9581 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9582 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9584 #: builtin/write-tree.c:26
9588 #: builtin/write-tree.c:27
9589 msgid "write tree object for a subdirectory <prefix>"
9590 msgstr "将 <前缀> 子目录内容写到一个树对象"
9592 #: builtin/write-tree.c:30
9593 msgid "only useful for debugging"
9598 "'git help -a' and 'git help -g' lists available subcommands and some\n"
9599 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9600 "to read about a specific subcommand or concept."
9602 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9603 "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
9605 #: parse-options.h:143
9609 #: parse-options.h:158
9610 msgid "no-op (backward compatibility)"
9613 #: parse-options.h:232
9614 msgid "be more verbose"
9617 #: parse-options.h:234
9618 msgid "be more quiet"
9621 #: parse-options.h:240
9622 msgid "use <n> digits to display SHA-1s"
9623 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9626 msgid "Add file contents to the index"
9630 msgid "Find by binary search the change that introduced a bug"
9631 msgstr "通过二分查找定位引入 bug 的变更"
9634 msgid "List, create, or delete branches"
9638 msgid "Checkout a branch or paths to the working tree"
9639 msgstr "检出一个分支或路径到工作区"
9642 msgid "Clone a repository into a new directory"
9643 msgstr "克隆一个版本库到一个新目录"
9646 msgid "Record changes to the repository"
9650 msgid "Show changes between commits, commit and working tree, etc"
9651 msgstr "显示提交之间、提交和工作区之间等的差异"
9654 msgid "Download objects and refs from another repository"
9655 msgstr "从另外一个版本库下载对象和引用"
9658 msgid "Print lines matching a pattern"
9662 msgid "Create an empty Git repository or reinitialize an existing one"
9663 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9666 msgid "Show commit logs"
9670 msgid "Join two or more development histories together"
9671 msgstr "合并两个或更多开发历史"
9674 msgid "Move or rename a file, a directory, or a symlink"
9675 msgstr "移动或重命名一个文件、目录或符号链接"
9678 msgid "Fetch from and integrate with another repository or a local branch"
9679 msgstr "获取并整合另外的版本库或一个本地分支"
9682 msgid "Update remote refs along with associated objects"
9683 msgstr "更新远程引用和相关的对象"
9686 msgid "Forward-port local commits to the updated upstream head"
9687 msgstr "本地提交转移至更新后的上游分支中"
9690 msgid "Reset current HEAD to the specified state"
9691 msgstr "重置当前HEAD到指定状态"
9694 msgid "Remove files from the working tree and from the index"
9695 msgstr "从工作区和索引中删除文件"
9698 msgid "Show various types of objects"
9702 msgid "Show the working tree status"
9706 msgid "Create, list, delete or verify a tag object signed with GPG"
9707 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9710 msgid "You need to set your committer info first"
9711 msgstr "您需要先设置你的提交者信息"
9715 "You seem to have moved HEAD since the last 'am' failure.\n"
9716 "Not rewinding to ORIG_HEAD"
9717 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9722 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9723 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9724 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9726 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
9727 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9728 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9731 msgid "Cannot fall back to three-way merge."
9735 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9736 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9739 msgid "Using index info to reconstruct a base tree..."
9740 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9744 "Did you hand edit your patch?\n"
9745 "It does not apply to blobs recorded in its index."
9748 "无法应用补丁到索引中的数据(blob)对象上。"
9751 msgid "Falling back to patching base and 3-way merge..."
9752 msgstr "转而在基础版本上打补丁及进行三路合并..."
9755 msgid "Failed to merge in the changes."
9759 msgid "Only one StGIT patch series can be applied at once"
9760 msgstr "一次只能有一个 StGIT 补丁队列被应用"
9764 msgid "Patch format $patch_format is not supported."
9765 msgstr "不支持 $patch_format 补丁格式。"
9768 msgid "Patch format detection failed."
9773 "The -b/--binary option has been a no-op for long time, and\n"
9774 "it will be removed. Please do not use it anymore."
9776 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9781 msgid "previous rebase directory $dotest still exists but mbox given."
9782 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
9785 msgid "Please make up your mind. --skip or --abort?"
9786 msgstr "请下决心。--skip 或是 --abort ?"
9791 "Stray $dotest directory found.\n"
9792 "Use \"git am --abort\" to remove it."
9794 "发现了错误的 $dotest 目录。\n"
9795 "使用 \"git am --abort\" 删除它。"
9798 msgid "Resolve operation not in progress, we are not resuming."
9799 msgstr "解决操作未进行,我们不会继续。"
9803 msgid "Dirty index: cannot apply patches (dirty: $files)"
9804 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9809 "Patch is empty. Was it split wrong?\n"
9810 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9811 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9814 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9815 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9818 msgid "Patch does not have a valid e-mail address."
9819 msgstr "补丁中没有一个有效的邮件地址。"
9822 msgid "cannot be interactive without stdin connected to a terminal."
9823 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9826 msgid "Commit Body is:"
9830 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9831 #. in your translation. The program will only accept English
9832 #. input at this point.
9834 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9835 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9839 msgid "Applying: $FIRSTLINE"
9840 msgstr "正应用:$FIRSTLINE"
9844 "No changes - did you forget to use 'git add'?\n"
9845 "If there is nothing left to stage, chances are that something else\n"
9846 "already introduced the same changes; you might want to skip this patch."
9848 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9849 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9854 "You still have unmerged paths in your index\n"
9855 "did you forget to use 'git add'?"
9856 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9859 msgid "No changes -- Patch already applied."
9860 msgstr "没有变更 —— 补丁已经应用过。"
9864 msgid "Patch failed at $msgnum $FIRSTLINE"
9865 msgstr "补丁失败于 $msgnum $FIRSTLINE"
9870 "The copy of the patch that failed is found in:\n"
9877 msgid "applying to an empty history"
9881 msgid "You need to start by \"git bisect start\""
9882 msgstr "您需要执行 \"git bisect start\" 来开始"
9885 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9886 #. translation. The program will only accept English input
9889 msgid "Do you want me to do it for you [Y/n]? "
9890 msgstr "您想让我为您这样做么[Y/n]? "
9894 msgid "unrecognised option: '$arg'"
9895 msgstr "未能识别的选项:'$arg'"
9899 msgid "'$arg' does not appear to be a valid revision"
9900 msgstr "'$arg' 看起来不像是一个有效的版本"
9902 #: git-bisect.sh:117
9903 msgid "Bad HEAD - I need a HEAD"
9904 msgstr "坏的 HEAD - 我需要一个 HEAD"
9906 #: git-bisect.sh:130
9909 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9910 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9912 #: git-bisect.sh:140
9913 msgid "won't bisect on cg-seek'ed tree"
9914 msgstr "不会在做了 cg-seek 的树上做二分查找"
9916 #: git-bisect.sh:144
9917 msgid "Bad HEAD - strange symbolic ref"
9918 msgstr "坏的 HEAD - 奇怪的符号引用"
9920 #: git-bisect.sh:189
9922 msgid "Bad bisect_write argument: $state"
9923 msgstr "坏的 bisect_write 参数:$state"
9925 #: git-bisect.sh:218
9927 msgid "Bad rev input: $arg"
9928 msgstr "输入坏的版本:$arg"
9930 #: git-bisect.sh:232
9931 msgid "Please call 'bisect_state' with at least one argument."
9932 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9934 #: git-bisect.sh:244
9936 msgid "Bad rev input: $rev"
9937 msgstr "输入坏的版本:$rev"
9939 #: git-bisect.sh:250
9940 msgid "'git bisect bad' can take only one argument."
9941 msgstr "'git bisect bad' 只能带一个参数。"
9943 #: git-bisect.sh:273
9944 msgid "Warning: bisecting only with a bad commit."
9945 msgstr "警告:在仅有一个坏提交下进行二分查找。"
9948 #. TRANSLATORS: Make sure to include [Y] and [n] in your
9949 #. translation. The program will only accept English input
9951 #: git-bisect.sh:279
9952 msgid "Are you sure [Y/n]? "
9953 msgstr "您确认么[Y/n]? "
9955 #: git-bisect.sh:289
9957 "You need to give me at least one good and one bad revisions.\n"
9958 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9960 "您需要给我至少一个好版本和一个坏版本。\n"
9961 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9963 #: git-bisect.sh:292
9965 "You need to start by \"git bisect start\".\n"
9966 "You then need to give me at least one good and one bad revisions.\n"
9967 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9969 "您需要执行 \"git bisect start\" 来开始。\n"
9970 "然后需要提供我至少一个好版本和一个坏版本。\n"
9971 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9973 #: git-bisect.sh:363 git-bisect.sh:490
9974 msgid "We are not bisecting."
9977 #: git-bisect.sh:370
9979 msgid "'$invalid' is not a valid commit"
9980 msgstr "'$invalid' 不是一个有效的提交"
9982 #: git-bisect.sh:379
9985 "Could not check out original HEAD '$branch'.\n"
9986 "Try 'git bisect reset <commit>'."
9988 "不能检出原始 HEAD '$branch'。\n"
9989 "尝试 'git bisect reset <提交>'。"
9991 #: git-bisect.sh:406
9992 msgid "No logfile given"
9995 #: git-bisect.sh:407
9997 msgid "cannot read $file for replaying"
9998 msgstr "不能读取 $file 来重放"
10000 #: git-bisect.sh:424
10001 msgid "?? what are you talking about?"
10004 #: git-bisect.sh:436
10006 msgid "running $command"
10007 msgstr "运行 $command"
10009 #: git-bisect.sh:443
10012 "bisect run failed:\n"
10013 "exit code $res from '$command' is < 0 or >= 128"
10016 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10018 #: git-bisect.sh:469
10019 msgid "bisect run cannot continue any more"
10020 msgstr "二分查找不能继续运行"
10022 #: git-bisect.sh:475
10025 "bisect run failed:\n"
10026 "'bisect_state $state' exited with error code $res"
10029 "'bisect_state $state' 退出码为 $res"
10031 #: git-bisect.sh:482
10032 msgid "bisect run success"
10037 "Pull is not possible because you have unmerged files.\n"
10038 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10039 "as appropriate to mark resolution, or use 'git commit -a'."
10041 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10042 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
10043 "或者使用 'git commit -a'。"
10046 msgid "Pull is not possible because you have unmerged files."
10047 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10050 msgid "updating an unborn branch with changes added to the index"
10051 msgstr "更新尚未诞生的分支,变更添加至索引"
10056 "Warning: fetch updated the current branch head.\n"
10057 "Warning: fast-forwarding your working tree from\n"
10058 "Warning: commit $orig_head."
10060 "警告:fetch 更新了当前的分支。您的工作区\n"
10061 "警告:从原提交 $orig_head 快进。"
10064 msgid "Cannot merge multiple branches into empty head"
10065 msgstr "无法将多个分支合并到空分支"
10068 msgid "Cannot rebase onto multiple branches"
10071 #: git-rebase.sh:57
10073 "When you have resolved this problem, run \"git rebase --continue\".\n"
10074 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10075 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10078 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10079 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10080 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10082 #: git-rebase.sh:164
10083 msgid "Applied autostash."
10084 msgstr "成功应用 autostash。"
10086 #: git-rebase.sh:167
10088 msgid "Cannot store $stash_sha1"
10089 msgstr "无法保存 $stash_sha1"
10091 #: git-rebase.sh:168
10093 "Applying autostash resulted in conflicts.\n"
10094 "Your changes are safe in the stash.\n"
10095 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10097 "应用 autostash 导致冲突。\n"
10098 "您的修改安全地保存在 stash 中。\n"
10099 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10101 #: git-rebase.sh:207
10102 msgid "The pre-rebase hook refused to rebase."
10103 msgstr "钩子 pre-rebase 拒绝变基操作。"
10105 #: git-rebase.sh:212
10106 msgid "It looks like git-am is in progress. Cannot rebase."
10107 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10109 #: git-rebase.sh:350
10110 msgid "The --exec option must be used with the --interactive option"
10111 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10113 #: git-rebase.sh:355
10114 msgid "No rebase in progress?"
10115 msgstr "没有正在进行的变基?"
10117 #: git-rebase.sh:366
10118 msgid "The --edit-todo action can only be used during interactive rebase."
10119 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10121 #: git-rebase.sh:373
10122 msgid "Cannot read HEAD"
10125 #: git-rebase.sh:376
10127 "You must edit all merge conflicts and then\n"
10128 "mark them as resolved using git add"
10130 "您必须编辑所有的合并冲突,然后通过 git add\n"
10133 #: git-rebase.sh:394
10135 msgid "Could not move back to $head_name"
10136 msgstr "无法移回 $head_name"
10138 #: git-rebase.sh:413
10141 "It seems that there is already a $state_dir_base directory, and\n"
10142 "I wonder if you are in the middle of another rebase. If that is the\n"
10143 "case, please try\n"
10144 "\t$cmd_live_rebase\n"
10145 "If that is not the case, please\n"
10146 "\t$cmd_clear_stale_rebase\n"
10147 "and run me again. I am stopping in case you still have something\n"
10150 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10152 "\t$cmd_live_rebase\n"
10154 "\t$cmd_clear_stale_rebase\n"
10155 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10157 #: git-rebase.sh:464
10159 msgid "invalid upstream $upstream_name"
10160 msgstr "无效的上游 $upstream_name"
10162 #: git-rebase.sh:488
10164 msgid "$onto_name: there are more than one merge bases"
10165 msgstr "$onto_name: 有一个以上的合并基准"
10167 #: git-rebase.sh:491 git-rebase.sh:495
10169 msgid "$onto_name: there is no merge base"
10170 msgstr "$onto_name: 没有合并基准"
10172 #: git-rebase.sh:500
10174 msgid "Does not point to a valid commit: $onto_name"
10175 msgstr "没有指向一个有效的提交:$onto_name"
10177 #: git-rebase.sh:523
10179 msgid "fatal: no such branch: $branch_name"
10180 msgstr "严重错误:无此分支:$branch_name"
10182 #: git-rebase.sh:556
10183 msgid "Cannot autostash"
10184 msgstr "无法 autostash"
10186 #: git-rebase.sh:561
10188 msgid "Created autostash: $stash_abbrev"
10189 msgstr "创建了 autostash: $stash_abbrev"
10191 #: git-rebase.sh:565
10192 msgid "Please commit or stash them."
10193 msgstr "请提交或为它们保存进度。"
10195 #: git-rebase.sh:585
10197 msgid "Current branch $branch_name is up to date."
10198 msgstr "当前分支 $branch_name 是最新的。"
10200 #: git-rebase.sh:589
10202 msgid "Current branch $branch_name is up to date, rebase forced."
10203 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10205 #: git-rebase.sh:600
10207 msgid "Changes from $mb to $onto:"
10208 msgstr "变更从 $mb 到 $onto:"
10210 #: git-rebase.sh:609
10211 msgid "First, rewinding head to replay your work on top of it..."
10212 msgstr "首先,重置头指针以便在上面重放您的工作..."
10214 #: git-rebase.sh:619
10216 msgid "Fast-forwarded $branch_name to $onto_name."
10217 msgstr "快进 $branch_name 至 $onto_name。"
10220 msgid "git stash clear with parameters is unimplemented"
10221 msgstr "git stash clear 不支持参数"
10224 msgid "You do not have the initial commit yet"
10228 msgid "Cannot save the current index state"
10229 msgstr "无法保存当前索引状态"
10231 #: git-stash.sh:123 git-stash.sh:136
10232 msgid "Cannot save the current worktree state"
10233 msgstr "无法保存当前工作区状态"
10235 #: git-stash.sh:140
10236 msgid "No changes selected"
10239 #: git-stash.sh:143
10240 msgid "Cannot remove temporary index (can't happen)"
10241 msgstr "无法删除临时索引(不应发生)"
10243 #: git-stash.sh:156
10244 msgid "Cannot record working tree state"
10247 #: git-stash.sh:190
10249 msgid "Cannot update $ref_stash with $w_commit"
10250 msgstr "无法用 $w_commit 更新 $ref_stash"
10252 #. TRANSLATORS: $option is an invalid option, like
10253 #. `--blah-blah'. The 7 spaces at the beginning of the
10254 #. second line correspond to "error: ". So you should line
10255 #. up the second line with however many characters the
10256 #. translation of "error: " takes in your language. E.g. in
10257 #. English this is:
10259 #. $ git stash save --blah-blah 2>&1 | head -n 2
10260 #. error: unknown option for 'stash save': --blah-blah
10261 #. To provide a message, use git stash save -- '--blah-blah'
10262 #: git-stash.sh:237
10265 "error: unknown option for 'stash save': $option\n"
10266 " To provide a message, use git stash save -- '$option'"
10268 "错误:'stash save' 的未知选项:$option\n"
10269 " 要提供一个描述信息,使用 git stash save -- '$option'"
10271 #: git-stash.sh:258
10272 msgid "No local changes to save"
10273 msgstr "没有要保存的本地修改"
10275 #: git-stash.sh:262
10276 msgid "Cannot initialize stash"
10277 msgstr "无法初始化 stash"
10279 #: git-stash.sh:266
10280 msgid "Cannot save the current status"
10283 #: git-stash.sh:284
10284 msgid "Cannot remove worktree changes"
10287 #: git-stash.sh:383
10288 msgid "No stash found."
10289 msgstr "未发现 stash。"
10291 #: git-stash.sh:390
10293 msgid "Too many revisions specified: $REV"
10294 msgstr "指定了太多的版本:$REV"
10296 #: git-stash.sh:396
10298 msgid "$reference is not valid reference"
10299 msgstr "$reference 不是有效的引用"
10301 #: git-stash.sh:424
10303 msgid "'$args' is not a stash-like commit"
10304 msgstr "'$args' 不是 stash 样提交"
10306 #: git-stash.sh:435
10308 msgid "'$args' is not a stash reference"
10309 msgstr "'$args' 不是一个 stash 引用"
10311 #: git-stash.sh:443
10312 msgid "unable to refresh index"
10315 #: git-stash.sh:447
10316 msgid "Cannot apply a stash in the middle of a merge"
10317 msgstr "无法在合并过程中恢复进度"
10319 #: git-stash.sh:455
10320 msgid "Conflicts in index. Try without --index."
10321 msgstr "索引中有冲突。尝试不使用 --index。"
10323 #: git-stash.sh:457
10324 msgid "Could not save index tree"
10327 #: git-stash.sh:491
10328 msgid "Cannot unstage modified files"
10331 #: git-stash.sh:506
10332 msgid "Index was not unstashed."
10333 msgstr "索引的进度没有被恢复。"
10335 #: git-stash.sh:529
10337 msgid "Dropped ${REV} ($s)"
10338 msgstr "丢弃了 ${REV} ($s)"
10340 #: git-stash.sh:530
10342 msgid "${REV}: Could not drop stash entry"
10343 msgstr "${REV}:不能丢弃进度条目"
10345 #: git-stash.sh:537
10346 msgid "No branch name specified"
10349 #: git-stash.sh:609
10350 msgid "(To restore them type \"git stash apply\")"
10351 msgstr "(为恢复数据输入 \"git stash apply\")"
10353 #: git-submodule.sh:95
10355 msgid "cannot strip one component off url '$remoteurl'"
10356 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10358 #: git-submodule.sh:237
10360 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10361 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10363 #: git-submodule.sh:287
10365 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10366 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10368 #: git-submodule.sh:299
10370 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10371 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10373 #: git-submodule.sh:409
10374 msgid "Relative path can only be used from the toplevel of the working tree"
10375 msgstr "只能在工作区的顶级目录中使用相对路径"
10377 #: git-submodule.sh:419
10379 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10380 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10382 #: git-submodule.sh:436
10384 msgid "'$sm_path' already exists in the index"
10385 msgstr "'$sm_path' 已经存在于索引中"
10387 #: git-submodule.sh:440
10390 "The following path is ignored by one of your .gitignore files:\n"
10392 "Use -f if you really want to add it."
10394 "以下路径被您的一个 .gitignore 文件所忽略:\n"
10396 "如果您确实想添加它,使用 -f 参数。"
10398 #: git-submodule.sh:458
10400 msgid "Adding existing repo at '$sm_path' to the index"
10401 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10403 #: git-submodule.sh:460
10405 msgid "'$sm_path' already exists and is not a valid git repo"
10406 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10408 #: git-submodule.sh:468
10410 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10411 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10413 #: git-submodule.sh:470
10416 "If you want to reuse this local git directory instead of cloning again from"
10417 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10419 #: git-submodule.sh:472
10422 "use the '--force' option. If the local git directory is not the correct repo"
10423 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10425 #: git-submodule.sh:473
10428 "or you are unsure what this means choose another name with the '--name' "
10430 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10432 #: git-submodule.sh:475
10434 msgid "Reactivating local git directory for submodule '$sm_name'."
10435 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10437 #: git-submodule.sh:487
10439 msgid "Unable to checkout submodule '$sm_path'"
10440 msgstr "不能检出子模组 '$sm_path'"
10442 #: git-submodule.sh:492
10444 msgid "Failed to add submodule '$sm_path'"
10445 msgstr "无法添加子模组 '$sm_path'"
10447 #: git-submodule.sh:501
10449 msgid "Failed to register submodule '$sm_path'"
10450 msgstr "无法注册子模组 '$sm_path'"
10452 #: git-submodule.sh:545
10454 msgid "Entering '$prefix$displaypath'"
10455 msgstr "正在进入 '$prefix$displaypath'"
10457 #: git-submodule.sh:565
10459 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10460 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10462 #: git-submodule.sh:611
10464 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10465 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10467 #: git-submodule.sh:620
10469 msgid "Failed to register url for submodule path '$displaypath'"
10470 msgstr "无法为子模组路径 '$displaypath' 注册 url"
10472 #: git-submodule.sh:622
10474 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10475 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10477 #: git-submodule.sh:639
10479 msgid "Failed to register update mode for submodule path '$displaypath'"
10480 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10482 #: git-submodule.sh:677
10484 msgid "Use '.' if you really want to deinitialize all submodules"
10485 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10487 #: git-submodule.sh:694
10489 msgid "Submodule work tree '$displaypath' contains a .git directory"
10490 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10492 #: git-submodule.sh:695
10495 "(use 'rm -rf' if you really want to remove it including all of its history)"
10496 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10498 #: git-submodule.sh:701
10501 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10503 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10505 #: git-submodule.sh:704
10507 msgid "Cleared directory '$displaypath'"
10508 msgstr "已清除目录 '$displaypath'"
10510 #: git-submodule.sh:705
10512 msgid "Could not remove submodule work tree '$displaypath'"
10513 msgstr "无法移除子模组工作区 '$displaypath'"
10515 #: git-submodule.sh:708
10517 msgid "Could not create empty submodule directory '$displaypath'"
10518 msgstr "不能创建空的子模组目录 '$displaypath'"
10520 #: git-submodule.sh:717
10522 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10523 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10525 #: git-submodule.sh:833
10528 "Submodule path '$displaypath' not initialized\n"
10529 "Maybe you want to use 'update --init'?"
10531 "子模组路径 '$displaypath' 没有初始化\n"
10532 "也许您想用 'update --init'?"
10534 #: git-submodule.sh:846
10536 msgid "Unable to find current revision in submodule path '$displaypath'"
10537 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10539 #: git-submodule.sh:855
10541 msgid "Unable to fetch in submodule path '$sm_path'"
10542 msgstr "无法在子模组路径 '$sm_path' 中获取"
10544 #: git-submodule.sh:879
10546 msgid "Unable to fetch in submodule path '$displaypath'"
10547 msgstr "无法在子模组路径 '$displaypath' 中获取"
10549 #: git-submodule.sh:893
10551 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10552 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10554 #: git-submodule.sh:894
10556 msgid "Submodule path '$displaypath': checked out '$sha1'"
10557 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10559 #: git-submodule.sh:898
10561 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10562 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10564 #: git-submodule.sh:899
10566 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10567 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10569 #: git-submodule.sh:904
10571 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10572 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10574 #: git-submodule.sh:905
10576 msgid "Submodule path '$displaypath': merged in '$sha1'"
10577 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10579 #: git-submodule.sh:910
10582 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10583 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10585 #: git-submodule.sh:911
10587 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10588 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10590 #: git-submodule.sh:941
10592 msgid "Failed to recurse into submodule path '$displaypath'"
10593 msgstr "无法递归进子模组路径 '$displaypath'"
10595 #: git-submodule.sh:1049
10596 msgid "The --cached option cannot be used with the --files option"
10597 msgstr "选项 --cached 不能和选项 --files 同时使用"
10599 #: git-submodule.sh:1097
10601 msgid "unexpected mode $mod_dst"
10602 msgstr "意外的模式 $mod_dst"
10605 #: git-submodule.sh:1117
10607 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10608 msgstr " 警告:$display_name 未包含提交 $sha1_src"
10611 #: git-submodule.sh:1120
10613 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10614 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10617 #: git-submodule.sh:1123
10619 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10620 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10622 #: git-submodule.sh:1148
10626 #: git-submodule.sh:1262
10628 msgid "Failed to recurse into submodule path '$sm_path'"
10629 msgstr "无法递归进子模组路径 '$sm_path'"
10631 #: git-submodule.sh:1326
10633 msgid "Synchronizing submodule url for '$displaypath'"
10634 msgstr "为 '$displaypath' 同步子模组 url"
10639 #~ msgid "Tracking not set up: name too long: %s"
10640 #~ msgstr "跟踪未设置:名字太长:%s"
10650 #~ msgid ", behind "
10653 #~ msgid "could not find .gitmodules in index"
10654 #~ msgstr "无法在索引中找到 .gitmodules"
10656 #~ msgid "reading updated .gitmodules failed"
10657 #~ msgstr "读取更新后的 .gitmodules 失败"
10659 #~ msgid "unable to stat updated .gitmodules"
10660 #~ msgstr "不能枚举更新后的 .gitmodules"
10662 #~ msgid "unable to remove .gitmodules from index"
10663 #~ msgstr "不能从索引中移除 .gitmodules"
10665 #~ msgid "adding updated .gitmodules failed"
10666 #~ msgstr "添加更新后的 .gitmodules 失败"
10668 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10670 #~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
10671 #~ "subdirectory of the tree will change in Git 2.0 and should not be used "
10673 #~ "To add content for the whole tree, run:\n"
10675 #~ " git add %s :/\n"
10676 #~ " (or git add %s :/)\n"
10678 #~ "To restrict the command to the current directory, run:\n"
10680 #~ " git add %s .\n"
10681 #~ " (or git add %s .)\n"
10683 #~ "With the current Git version, the command is restricted to the current "
10686 #~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
10687 #~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
10688 #~ "如果要添加整个目录树的内容,执行:\n"
10690 #~ " git add %s :/\n"
10691 #~ " (或 git add %s :/)\n"
10693 #~ "如果要限制该命令只作用于当前目录,执行:\n"
10695 #~ " git add %s .\n"
10696 #~ " (或 git add %s .)\n"
10698 #~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
10701 #~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
10702 #~ "whose behaviour will change in Git 2.0 with respect to paths you "
10704 #~ "Paths like '%s' that are\n"
10705 #~ "removed from your working tree are ignored with this version of Git.\n"
10707 #~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
10708 #~ " ignores paths you removed from your working tree.\n"
10710 #~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
10712 #~ "Run 'git status' to check the paths you removed from your working tree.\n"
10714 #~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
10715 #~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
10716 #~ "像本地工作区移除的路径 '%s'\n"
10717 #~ "在此版本的 Git 中被忽略。\n"
10719 #~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
10720 #~ " 忽略您本地工作区中移除的文件。\n"
10722 #~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
10724 #~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
10727 #~ "Auto packing the repository for optimum performance. You may also\n"
10728 #~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
10730 #~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
10731 #~ "参见 \"git help gc\" 以获取更多信息。\n"
10734 #~ "Updates were rejected because a pushed branch tip is behind its remote\n"
10735 #~ "counterpart. If you did not intend to push that branch, you may want to\n"
10736 #~ "specify branches to push or set the 'push.default' configuration "
10738 #~ "to 'simple', 'current' or 'upstream' to push only the current branch."
10740 #~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10741 #~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
10742 #~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
10745 # 译者:为保证在输出中对齐,注意调整句中空格!
10746 #~ msgid "copied: %s -> %s"
10747 #~ msgstr "拷贝: %s -> %s"
10749 # 译者:为保证在输出中对齐,注意调整句中空格!
10750 #~ msgid "deleted: %s"
10753 # 译者:为保证在输出中对齐,注意调整句中空格!
10754 #~ msgid "modified: %s"
10757 # 译者:为保证在输出中对齐,注意调整句中空格!
10758 #~ msgid "renamed: %s -> %s"
10759 #~ msgstr "重命名: %s -> %s"
10761 # 译者:为保证在输出中对齐,注意调整句中空格!
10762 #~ msgid "unmerged: %s"
10763 #~ msgstr "未合并: %s"
10765 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10767 #~ "push.default is unset; its implicit value is changing in\n"
10768 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10769 #~ "and maintain the current behavior after the default changes, use:\n"
10771 #~ " git config --global push.default matching\n"
10773 #~ "To squelch this message and adopt the new behavior now, use:\n"
10775 #~ " git config --global push.default simple\n"
10777 #~ "See 'git help config' and search for 'push.default' for further "
10778 #~ "information.\n"
10779 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10780 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10782 #~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10783 #~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10785 #~ " git config --global push.default matching\n"
10787 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10789 #~ " git config --global push.default simple\n"
10791 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10792 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10793 #~ "为保持兼容,请用 'current' 代替 'simple')"
10795 #~ msgid "input paths are terminated by a null character"
10796 #~ msgstr "输入路径以null字符终止"
10799 #~ "The following untracked files would NOT be saved but need to be removed "
10800 #~ "by stash save:"
10801 #~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10804 #~ "Aborting. Consider using either the --force or --include-untracked option."
10805 #~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10808 #~ "the following submodule (or one of its nested submodule)\n"
10809 #~ "uses a .git directory:"
10811 #~ "the following submodules (or one of its nested submodule)\n"
10812 #~ "use a .git directory:"
10813 #~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10814 #~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10817 #~ msgid " (fix conflicts and then run \"git am --resolved\")"
10818 #~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10821 #~ msgid " (all conflicts fixed: run \"git commit\")"
10822 #~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10824 #~ msgid "more than %d trees given: '%s'"
10825 #~ msgstr "提供了超过 %d 个树对象:'%s'"
10827 #~ msgid "You cannot combine --no-ff with --ff-only."
10828 #~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10831 #~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10832 #~ "(use 'rm -rf' if you really want to remove it including all of its "
10835 #~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10836 #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10839 #~ "'%s' has changes staged in the index\n"
10840 #~ "(use --cached to keep the file, or -f to force removal)"
10842 #~ "'%s' 有变更已暂存至索引中\n"
10843 #~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10845 #~ msgid "show commits where no parent comes before its children"
10846 #~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10848 #~ msgid "show the HEAD reference"
10849 #~ msgstr "显示 HEAD 引用"
10851 #~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10852 #~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10854 #~ msgid "Change flags"
10858 #~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10859 #~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10861 #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10862 #~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
10864 #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10865 #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10867 #~ msgid "See 'git help <command>' for more information on a specific command."
10868 #~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10870 #~ msgid "BUG: impossible combination of %d and %p"
10871 #~ msgstr "BUG: 无法组合 %d 和 %p"
10874 #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
10875 #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10878 #~ msgid "may speed it up, but you have to be careful not to forget to add"
10879 #~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10881 #~ msgid "new files yourself (see 'git help status')."
10882 #~ msgstr "(参见 'git help status')。"
10884 #~ msgid "use any ref in .git/refs"
10885 #~ msgstr "使用 .git/refs 里的任意引用"
10887 #~ msgid "use any tag in .git/refs/tags"
10888 #~ msgstr "使用 .git/refs/tags 里的任意 tag"
10890 #~ msgid "bad object %s"
10893 #~ msgid "bogus committer info %s"
10894 #~ msgstr "虚假的提交者信息 %s"
10896 #~ msgid "can't fdopen 'show' output fd"
10897 #~ msgstr "不能打开 'show' 输出文件句柄"
10899 #~ msgid "failed to close pipe to 'show' for object '%s'"
10900 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10902 #~ msgid " 0 files changed"
10903 #~ msgstr " 0 个文件被修改"
10905 #~ msgid " %d file changed"
10906 #~ msgid_plural " %d files changed"
10907 #~ msgstr[0] " %d 个文件被修改"
10908 #~ msgstr[1] " %d 个文件被修改"
10910 #~ msgid ", %d insertion(+)"
10911 #~ msgid_plural ", %d insertions(+)"
10912 #~ msgstr[0] ",插入 %d 行(+)"
10913 #~ msgstr[1] ",插入 %d 行(+)"
10915 #~ msgid ", %d deletion(-)"
10916 #~ msgid_plural ", %d deletions(-)"
10917 #~ msgstr[0] ",删除 %d 行(-)"
10918 #~ msgstr[1] ",删除 %d 行(-)"
10920 #~ msgid "You do not have a valid HEAD"
10921 #~ msgstr "您没有一个有效的 HEAD"
10926 #~ msgid "Would not remove %s\n"
10927 #~ msgstr "不会删除 %s\n"
10929 #~ msgid "Not removing %s\n"
10930 #~ msgstr "未删除 %s\n"
10932 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10933 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10935 #~ msgid "Could not read index"
10938 # 译者:中文字符串拼接,可删除前导空格
10939 #~ msgid " (use \"git add\" to track)"
10940 #~ msgstr "(使用 \"git add\" 建立跟踪)"
10942 #~ msgid "--detach cannot be used with -b/-B/--orphan"
10943 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10945 #~ msgid "--detach cannot be used with -t"
10946 #~ msgstr "--detach 不能和 -t 同时使用"
10948 #~ msgid "--orphan and -b|-B are mutually exclusive"
10949 #~ msgstr "--orphan 和 -b|-B 互斥"
10951 #~ msgid "--orphan cannot be used with -t"
10952 #~ msgstr "--orphan 不能和 -t 同时使用"
10954 #~ msgid "git checkout: -f and -m are incompatible"
10955 #~ msgstr "git checkout:-f 和 -m 不兼容"
10958 #~ "git checkout: updating paths is incompatible with switching branches."
10959 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
10961 #~ msgid "diff setup failed"
10962 #~ msgstr "diff 设置失败"
10964 #~ msgid "merge-recursive: disk full?"
10965 #~ msgstr "merge-recursive:磁盘已满?"
10967 #~ msgid "diff_setup_done failed"
10968 #~ msgstr "diff_setup_done 失败"