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-08-04 14:48+0800\n"
16 "PO-Revision-Date: 2014-08-04 16:16+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22 "Content-Transfer-Encoding: 8bit\n"
23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
32 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
33 "as appropriate to mark resolution and make a commit, or use\n"
36 "请在工作区改正文件,然后酌情使用 'git add/rm <file>' 命令标记\n"
37 "解决方案并提交,或者使用 'git commit -a'。"
40 msgid "git archive [options] <tree-ish> [<path>...]"
41 msgstr "git archive [选项] <树或提交> [<路径>...]"
44 msgid "git archive --list"
45 msgstr "git archive --list"
49 "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
51 "git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
54 msgid "git archive --remote <repo> [--exec <cmd>] --list"
55 msgstr "git archive --remote <版本库> [--exec <命令>] --list"
57 #: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
59 msgid "pathspec '%s' did not match any files"
60 msgstr "路径规则 '%s' 未匹配任何文件"
67 msgid "archive format"
70 #: archive.c:329 builtin/log.c:1201
75 msgid "prepend prefix to each pathname in the archive"
76 msgstr "为归档中每个路径名加上前缀"
78 #: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
79 #: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
80 #: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
81 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
82 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
86 #: archive.c:332 builtin/archive.c:89
87 msgid "write the archive to this file"
91 msgid "read .gitattributes in working directory"
92 msgstr "读取工作区中的 .gitattributes"
95 msgid "report archived files on stderr"
103 msgid "compress faster"
107 msgid "compress better"
111 msgid "list supported archive formats"
114 #: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
118 #: archive.c:351 builtin/archive.c:91
119 msgid "retrieve the archive from remote repository <repo>"
120 msgstr "从远程版本库(<版本库>)提取归档文件"
122 #: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
126 #: archive.c:353 builtin/archive.c:93
127 msgid "path to the remote git-upload-archive command"
128 msgstr "远程 git-upload-archive 命令的路径"
132 "Negative patterns are ignored in git attributes\n"
133 "Use '\\!' for literal leading exclamation."
135 "负值模版在 git attributes 中被忽略\n"
136 "当字符串确实要以感叹号开始时,使用 '\\!'。"
140 msgid "Not setting branch %s as its own upstream."
141 msgstr "未设置分支 %s 作为它自己的上游。"
145 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
146 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
150 msgid "Branch %s set up to track remote branch %s from %s."
151 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
155 msgid "Branch %s set up to track local branch %s by rebasing."
156 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
160 msgid "Branch %s set up to track local branch %s."
161 msgstr "分支 %s 设置为跟踪本地分支 %s。"
165 msgid "Branch %s set up to track remote ref %s by rebasing."
166 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
170 msgid "Branch %s set up to track remote ref %s."
171 msgstr "分支 %s 设置为跟踪远程引用 %s。"
175 msgid "Branch %s set up to track local ref %s by rebasing."
176 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
180 msgid "Branch %s set up to track local ref %s."
181 msgstr "分支 %s 设置为跟踪本地引用 %s。"
185 msgid "Not tracking: ambiguous information for ref %s"
186 msgstr "未跟踪:引用 %s 有歧义"
190 msgid "'%s' is not a valid branch name."
191 msgstr "'%s' 不是一个有效的分支名称。"
195 msgid "A branch named '%s' already exists."
196 msgstr "一个分支名 '%s' 已经存在。"
199 msgid "Cannot force update the current branch."
204 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
205 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
209 msgid "the requested upstream branch '%s' does not exist"
210 msgstr "请求的上游分支 '%s' 不存在"
215 "If you are planning on basing your work on an upstream\n"
216 "branch that already exists at the remote, you may need to\n"
217 "run \"git fetch\" to retrieve it.\n"
219 "If you are planning to push out a new local branch that\n"
220 "will track its remote counterpart, you may want to use\n"
221 "\"git push -u\" to set the upstream config as you push."
224 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
225 "您可能需要执行 \"git fetch\" 来获取分支。\n"
227 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
228 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
232 msgid "Not a valid object name: '%s'."
233 msgstr "不是一个有效的对象名:'%s'。"
237 msgid "Ambiguous object name: '%s'."
238 msgstr "歧义的对象名:'%s'。"
242 msgid "Not a valid branch point: '%s'."
243 msgstr "无效的分支点:'%s'。"
246 msgid "Failed to lock ref for update"
250 msgid "Failed to write ref"
255 msgid "'%s' does not look like a v2 bundle file"
256 msgstr "'%s' 不像是一个 v2 版本的包文件"
260 msgid "unrecognized header: %s%s (%d)"
261 msgstr "未能识别的包头:%s%s (%d)"
263 #: bundle.c:86 builtin/commit.c:755
265 msgid "could not open '%s'"
269 msgid "Repository lacks these prerequisite commits:"
270 msgstr "版本库缺少这些必备的提交:"
272 #: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
273 #: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
274 #: builtin/shortlog.c:158
275 msgid "revision walk setup failed"
280 msgid "The bundle contains this ref:"
281 msgid_plural "The bundle contains these %d refs:"
282 msgstr[0] "这个包中含有这个引用:"
283 msgstr[1] "这个包中含有 %d 个引用:"
286 msgid "The bundle records a complete history."
287 msgstr "这个包记录一个完整历史。"
291 msgid "The bundle requires this ref:"
292 msgid_plural "The bundle requires these %d refs:"
293 msgstr[0] "这个包需要这个引用:"
294 msgstr[1] "这个包需要 %d 个引用:"
297 msgid "rev-list died"
300 #: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
302 msgid "unrecognized argument: %s"
307 msgid "ref '%s' is excluded by the rev-list options"
308 msgstr "引用 '%s' 被 rev-list 选项排除"
311 msgid "Refusing to create empty bundle."
315 msgid "Could not spawn pack-objects"
316 msgstr "不能生成 pack-objects 进程"
319 msgid "pack-objects died"
320 msgstr "pack-objects 终止"
324 msgid "cannot create '%s'"
328 msgid "index-pack died"
329 msgstr "index-pack 终止"
333 msgid "could not parse %s"
338 msgid "%s %s is not a commit!"
339 msgstr "%s %s 不是一个提交!"
341 #: compat/obstack.c:406 compat/obstack.c:408
342 msgid "memory exhausted"
346 msgid "Could not run 'git rev-list'"
347 msgstr "不能执行 'git rev-list'"
351 msgid "failed write to rev-list: %s"
352 msgstr "无法写入 rev-list:%s"
356 msgid "failed to close rev-list's stdin: %s"
357 msgstr "无法关闭 rev-list 的标准输入:%s"
360 msgid "in the future"
365 msgid "%lu second ago"
366 msgid_plural "%lu seconds ago"
372 msgid "%lu minute ago"
373 msgid_plural "%lu minutes ago"
380 msgid_plural "%lu hours ago"
387 msgid_plural "%lu days ago"
394 msgid_plural "%lu weeks ago"
400 msgid "%lu month ago"
401 msgid_plural "%lu months ago"
408 msgid_plural "%lu years"
412 #. TRANSLATORS: "%s" is "<n> years"
415 msgid "%s, %lu month ago"
416 msgid_plural "%s, %lu months ago"
417 msgstr[0] "%s %lu 个月前"
418 msgstr[1] "%s %lu 个月前"
420 #: date.c:154 date.c:159
423 msgid_plural "%lu years ago"
427 #: diffcore-order.c:24
429 msgid "failed to read orderfile '%s'"
430 msgstr "无法读取排序文件 '%s'"
432 #: diffcore-rename.c:514
433 msgid "Performing inexact rename detection"
434 msgstr "正在进行非精确的重命名检测"
439 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
440 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
445 msgid " Unknown dirstat parameter '%s'\n"
446 msgstr " 未知的 dirstat 参数 '%s'\n"
450 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
451 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
456 "Found errors in 'diff.dirstat' config variable:\n"
459 "发现配置变量 'diff.dirstat' 中的错误:\n"
464 msgid "external diff died, stopping at %s"
465 msgstr "外部 diff 退出,停止在 %s"
468 msgid "--follow requires exactly one pathspec"
469 msgstr "--follow 参数后只跟一个 pathspec"
474 "Failed to parse --dirstat/-X option parameter:\n"
477 "无法解析 --dirstat/-X 选项的参数:\n"
482 msgid "Failed to parse --submodule option parameter: '%s'"
483 msgstr "无法解析 --submodule 选项的参数:'%s'"
485 #: gpg-interface.c:73 gpg-interface.c:145
486 msgid "could not run gpg."
489 #: gpg-interface.c:85
490 msgid "gpg did not accept the data"
493 #: gpg-interface.c:96
494 msgid "gpg failed to sign the data"
497 #: gpg-interface.c:129
499 msgid "could not create temporary file '%s': %s"
500 msgstr "不能创建临时文件 '%s':%s"
502 #: gpg-interface.c:132
504 msgid "failed writing detached signature to '%s': %s"
505 msgstr "无法将分离式签名写入 '%s':%s"
509 msgid "'%s': unable to read %s"
510 msgstr "'%s':无法读取 %s"
519 msgid "'%s': short read %s"
520 msgstr "'%s':读取不完整 %s"
524 msgid "available git commands in '%s'"
525 msgstr "在 '%s' 下可用的 git 命令"
528 msgid "git commands available from elsewhere on your $PATH"
529 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
532 msgid "The most commonly used git commands are:"
533 msgstr "最常用的 git 命令有:"
538 "'%s' appears to be a git command, but we were not\n"
539 "able to execute it. Maybe git-%s is broken?"
541 "'%s' 像是一个 git 命令,但却无法运行。\n"
545 msgid "Uh oh. Your system reports no Git commands at all."
546 msgstr "唉呀,您的系统中未发现 Git 命令。"
551 "WARNING: You called a Git command named '%s', which does not exist.\n"
552 "Continuing under the assumption that you meant '%s'"
554 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
559 msgid "in %0.1f seconds automatically..."
560 msgstr "在 %0.1f 秒钟后自动运行..."
564 msgid "git: '%s' is not a git command. See 'git --help'."
565 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
567 #: help.c:384 help.c:444
573 "Did you mean one of these?"
587 msgid "failed to read the cache"
590 #: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
591 #: builtin/clone.c:661
592 msgid "unable to write new index file"
595 #: merge-recursive.c:190
597 msgid "(bad commit)\n"
600 #: merge-recursive.c:210
602 msgid "addinfo_cache failed for path '%s'"
603 msgstr "为路径 '%s' addinfo_cache 失败"
605 #: merge-recursive.c:271
606 msgid "error building trees"
609 #: merge-recursive.c:692
611 msgid "failed to create path '%s'%s"
612 msgstr "无法创建路径 '%s'%s"
614 #: merge-recursive.c:703
616 msgid "Removing %s to make room for subdirectory\n"
617 msgstr "删除 %s 以便为子目录留出空间\n"
619 #: merge-recursive.c:717 merge-recursive.c:738
620 msgid ": perhaps a D/F conflict?"
621 msgstr ":可能是一个目录/文件冲突?"
623 #: merge-recursive.c:728
625 msgid "refusing to lose untracked file at '%s'"
626 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
628 #: merge-recursive.c:768
630 msgid "cannot read object %s '%s'"
631 msgstr "不能读取对象 %s '%s'"
633 #: merge-recursive.c:770
635 msgid "blob expected for %s '%s'"
636 msgstr "%s '%s' 应为数据(blob)对象"
638 #: merge-recursive.c:793 builtin/clone.c:317
640 msgid "failed to open '%s'"
643 #: merge-recursive.c:801
645 msgid "failed to symlink '%s'"
646 msgstr "无法创建符号链接 '%s'"
648 #: merge-recursive.c:804
650 msgid "do not know what to do with %06o %s '%s'"
651 msgstr "不知道如何处理 %06o %s '%s'"
653 #: merge-recursive.c:942
654 msgid "Failed to execute internal merge"
657 #: merge-recursive.c:946
659 msgid "Unable to add %s to database"
660 msgstr "不能添加 %s 至对象库"
662 #: merge-recursive.c:962
663 msgid "unsupported object type in the tree"
664 msgstr "在树中有不支持的对象类型"
666 #: merge-recursive.c:1037 merge-recursive.c:1051
669 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
672 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
675 #: merge-recursive.c:1043 merge-recursive.c:1056
678 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
681 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
684 #: merge-recursive.c:1097
688 #: merge-recursive.c:1097
692 #: merge-recursive.c:1153
694 msgid "%s is a directory in %s adding as %s instead"
695 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
697 #: merge-recursive.c:1175
700 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
701 "\"->\"%s\" in \"%s\"%s"
703 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
704 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
706 #: merge-recursive.c:1180
707 msgid " (left unresolved)"
710 #: merge-recursive.c:1234
712 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
714 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
717 #: merge-recursive.c:1264
719 msgid "Renaming %s to %s and %s to %s instead"
720 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
722 #: merge-recursive.c:1463
724 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
725 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
727 #: merge-recursive.c:1473
729 msgid "Adding merged %s"
732 #: merge-recursive.c:1478 merge-recursive.c:1676
734 msgid "Adding as %s instead"
737 #: merge-recursive.c:1529
739 msgid "cannot read object %s"
742 #: merge-recursive.c:1532
744 msgid "object %s is not a blob"
745 msgstr "对象 %s 不是一个数据(blob)对象"
747 #: merge-recursive.c:1580
751 #: merge-recursive.c:1580
755 #: merge-recursive.c:1590
759 #: merge-recursive.c:1597
763 #: merge-recursive.c:1631
765 msgid "Skipped %s (merged same as existing)"
766 msgstr "略过 %s(已经做过相同合并)"
768 #: merge-recursive.c:1645
770 msgid "Auto-merging %s"
773 #: merge-recursive.c:1649 git-submodule.sh:1150
777 #: merge-recursive.c:1650
779 msgid "CONFLICT (%s): Merge conflict in %s"
780 msgstr "冲突(%s):合并冲突于 %s"
782 #: merge-recursive.c:1740
787 #: merge-recursive.c:1765
788 msgid "file/directory"
791 #: merge-recursive.c:1771
792 msgid "directory/file"
795 #: merge-recursive.c:1776
797 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
798 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
800 #: merge-recursive.c:1786
805 #: merge-recursive.c:1803
806 msgid "Fatal merge failure, shouldn't happen."
807 msgstr "严重的合并错误,不应发生。"
809 #: merge-recursive.c:1822
810 msgid "Already up-to-date!"
813 #: merge-recursive.c:1831
815 msgid "merging of trees %s and %s failed"
816 msgstr "无法合并树 %s 和 %s"
818 #: merge-recursive.c:1861
820 msgid "Unprocessed path??? %s"
821 msgstr "未处理的路径??? %s"
823 #: merge-recursive.c:1906
827 #: merge-recursive.c:1919
829 msgid "found %u common ancestor:"
830 msgid_plural "found %u common ancestors:"
831 msgstr[0] "发现 %u 个共同祖先:"
832 msgstr[1] "发现 %u 个共同祖先:"
834 #: merge-recursive.c:1956
835 msgid "merge returned no commit"
838 #: merge-recursive.c:2013
840 msgid "Could not parse object '%s'"
843 #: merge-recursive.c:2024 builtin/merge.c:666
844 msgid "Unable to write index."
848 msgid "Cannot commit uninitialized/unreferenced notes tree"
849 msgstr "不能提交未初始化/未引用的注解树"
853 msgid "Bad notes.rewriteMode value: '%s'"
854 msgstr "坏的 notes.rewriteMode 值:'%s'"
858 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
859 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
861 #. TRANSLATORS: The first %s is the name of the
862 #. environment variable, the second %s is its value
865 msgid "Bad %s value: '%s'"
866 msgstr "坏的 %s 值:'%s'"
870 msgid "unable to parse object: %s"
873 #: parse-options.c:534
877 #: parse-options.c:552
882 #. TRANSLATORS: the colon here should align with the
883 #. one in "usage: %s" translation
884 #: parse-options.c:556
889 # 译者:为保证在输出中对齐,注意调整句中空格!
890 #: parse-options.c:559
895 #: parse-options.c:593
900 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
901 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
905 "global 'literal' pathspec setting is incompatible with all other global "
907 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
910 msgid "invalid parameter for pathspec magic 'prefix'"
911 msgstr "路径规则包含无效的神奇前缀"
915 msgid "Invalid pathspec magic '%.*s' in '%s'"
916 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
920 msgid "Missing ')' at the end of pathspec magic in '%s'"
921 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
925 msgid "Unimplemented pathspec magic '%c' in '%s'"
926 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
930 msgid "%s: 'literal' and 'glob' are incompatible"
931 msgstr "%s:'literal' 和 'glob' 不兼容"
935 msgid "%s: '%s' is outside repository"
936 msgstr "%s:'%s' 在版本库之外"
940 msgid "Pathspec '%s' is in submodule '%.*s'"
941 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
945 msgid "%s: pathspec magic not supported by this command: %s"
946 msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
950 msgid "pathspec '%s' is beyond a symbolic link"
951 msgstr "路径规则 '%s' 位于符号链接中"
955 "There is nothing to exclude from by :(exclude) patterns.\n"
956 "Perhaps you forgot to add either ':/' or '.' ?"
958 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
968 "index.version set, but the value is invalid.\n"
971 "设置了 index.version,但是取值无效。\n"
977 "GIT_INDEX_VERSION set, but the value is invalid.\n"
980 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
985 msgid "Cannot fetch both %s and %s to %s"
986 msgstr "不能同时获取 %s 和 %s 至 %s"
990 msgid "%s usually tracks %s, not %s"
991 msgstr "%s 通常跟踪 %s,而非 %s"
995 msgid "%s tracks both %s and %s"
996 msgstr "%s 同时跟踪 %s 和 %s"
999 msgid "Internal error"
1004 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1005 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1008 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1009 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1013 msgid "Your branch is up-to-date with '%s'.\n"
1014 msgstr "您的分支与上游分支 '%s' 一致。\n"
1018 msgid "Your branch is ahead of '%s' by %d commit.\n"
1019 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1020 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1021 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1024 msgid " (use \"git push\" to publish your local commits)\n"
1025 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1029 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1031 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1032 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1033 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1037 msgid " (use \"git pull\" to update your local branch)\n"
1038 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1043 "Your branch and '%s' have diverged,\n"
1044 "and have %d and %d different commit each, respectively.\n"
1046 "Your branch and '%s' have diverged,\n"
1047 "and have %d and %d different commits each, respectively.\n"
1049 "您的分支和 '%s' 出现了偏离,\n"
1050 "并且分别有 %d 和 %d 处不同的提交。\n"
1052 "您的分支和 '%s' 出现了偏离,\n"
1053 "并且分别有 %d 和 %d 处不同的提交。\n"
1057 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1058 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1061 msgid "open /dev/null failed"
1062 msgstr "不能打开 /dev/null"
1066 msgid "dup2(%d,%d) failed"
1067 msgstr "不能调用 dup2(%d,%d)"
1069 #: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
1070 #: builtin/merge.c:1003 builtin/merge.c:1013
1072 msgid "Could not open '%s' for writing"
1073 msgstr "不能为写入打开 '%s'"
1075 #: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
1076 #: builtin/merge.c:1005 builtin/merge.c:1018
1078 msgid "Could not write to '%s'"
1083 "after resolving the conflicts, mark the corrected paths\n"
1084 "with 'git add <paths>' or 'git rm <paths>'"
1086 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1091 "after resolving the conflicts, mark the corrected paths\n"
1092 "with 'git add <paths>' or 'git rm <paths>'\n"
1093 "and commit the result with 'git commit'"
1095 "冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1096 "对修正后的文件做标记,然后用 'git commit' 提交"
1098 #: sequencer.c:210 sequencer.c:841 sequencer.c:924
1100 msgid "Could not write to %s"
1105 msgid "Error wrapping up %s"
1109 msgid "Your local changes would be overwritten by cherry-pick."
1110 msgstr "您的本地修改将被拣选操作覆盖。"
1113 msgid "Your local changes would be overwritten by revert."
1114 msgstr "您的本地修改将被还原操作覆盖。"
1117 msgid "Commit your changes or stash them to proceed."
1118 msgstr "提交您的修改或保存进度后再继续。"
1121 msgid "Failed to lock HEAD during fast_forward_to"
1122 msgstr "在快进时无法为 HEAD 加锁"
1124 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1127 msgid "%s: Unable to write new index file"
1128 msgstr "%s:无法写入新索引文件"
1131 msgid "Could not resolve HEAD commit\n"
1132 msgstr "不能解析 HEAD 提交\n"
1135 msgid "Unable to update cache tree\n"
1140 msgid "Could not parse commit %s\n"
1141 msgstr "不能解析提交 %s\n"
1145 msgid "Could not parse parent commit %s\n"
1146 msgstr "不能解析父提交 %s\n"
1149 msgid "Your index file is unmerged."
1150 msgstr "您的索引文件未完成合并。"
1154 msgid "Commit %s is a merge but no -m option was given."
1155 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1159 msgid "Commit %s does not have parent %d"
1160 msgstr "提交 %s 没有父提交 %d"
1164 msgid "Mainline was specified but commit %s is not a merge."
1165 msgstr "指定了主线但提交 %s 不是一个合并。"
1167 #. TRANSLATORS: The first %s will be "revert" or
1168 #. "cherry-pick", the second %s a SHA1
1171 msgid "%s: cannot parse parent commit %s"
1172 msgstr "%s:不能解析父提交 %s"
1176 msgid "Cannot get commit message for %s"
1177 msgstr "不能得到 %s 的提交说明"
1181 msgid "could not revert %s... %s"
1182 msgstr "不能还原 %s... %s"
1186 msgid "could not apply %s... %s"
1187 msgstr "不能应用 %s... %s"
1190 msgid "empty commit set passed"
1195 msgid "git %s: failed to read the index"
1196 msgstr "git %s:无法读取索引"
1200 msgid "git %s: failed to refresh the index"
1201 msgstr "git %s:无法刷新索引"
1205 msgid "Cannot %s during a %s"
1206 msgstr "无法 %s 在一个 %s 过程中"
1210 msgid "Could not parse line %d."
1211 msgstr "不能解析第 %d 行。"
1214 msgid "No commits parsed."
1219 msgid "Could not open %s"
1224 msgid "Could not read %s."
1229 msgid "Unusable instruction sheet: %s"
1234 msgid "Invalid key: %s"
1239 msgid "Invalid value for %s: %s"
1244 msgid "Malformed options sheet: %s"
1248 msgid "a cherry-pick or revert is already in progress"
1249 msgstr "一个拣选或还原操作已在进行"
1252 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1253 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1257 msgid "Could not create sequencer directory %s"
1258 msgstr "不能创建序列目录 %s"
1260 #: sequencer.c:843 sequencer.c:928
1262 msgid "Error wrapping up %s."
1265 #: sequencer.c:862 sequencer.c:998
1266 msgid "no cherry-pick or revert in progress"
1267 msgstr "拣选或还原操作并未进行"
1270 msgid "cannot resolve HEAD"
1274 msgid "cannot abort from a branch yet to be born"
1275 msgstr "不能从尚未建立的分支终止"
1277 #: sequencer.c:888 builtin/apply.c:4062
1279 msgid "cannot open %s: %s"
1284 msgid "cannot read %s: %s"
1288 msgid "unexpected end of file"
1293 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1294 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1298 msgid "Could not format %s."
1303 msgid "%s: can't cherry-pick a %s"
1304 msgstr "%s:不能拣选一个%s"
1308 msgid "%s: bad revision"
1312 msgid "Can't revert as initial commit"
1316 msgid "Can't cherry-pick into empty head"
1321 "Git normally never creates a ref that ends with 40 hex characters\n"
1322 "because it will be ignored when you just specify 40-hex. These refs\n"
1323 "may be created by mistake. For example,\n"
1325 " git checkout -b $br $(git rev-parse ...)\n"
1327 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1328 "examine these refs and maybe delete them. Turn this message off by\n"
1329 "running \"git config advice.objectNameWarning false\""
1331 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1332 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1334 " git checkout -b $br $(git rev-parse ...)\n"
1336 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1337 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1341 msgid "HEAD does not point to a branch"
1342 msgstr "HEAD 没有指向一个分支"
1346 msgid "No such branch: '%s'"
1351 msgid "No upstream configured for branch '%s'"
1352 msgstr "尚未给分支 '%s' 设置上游"
1356 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1357 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1359 #: submodule.c:64 submodule.c:98
1360 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1361 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1363 #: submodule.c:68 submodule.c:102
1365 msgid "Could not find section in .gitmodules where path=%s"
1366 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1370 msgid "Could not update .gitmodules entry %s"
1371 msgstr "不能更新 .gitmodules 条目 %s"
1375 msgid "Could not remove .gitmodules entry for %s"
1376 msgstr "无法移除 %s 的 .gitmodules 条目"
1379 msgid "staging updated .gitmodules failed"
1380 msgstr "将更新后 .gitmodules 添加暂存区失败"
1382 #: submodule.c:1118 builtin/init-db.c:363
1384 msgid "Could not create git link %s"
1385 msgstr "不能创建 git link %s"
1389 msgid "Could not set core.worktree in %s"
1390 msgstr "不能在 %s 中设置 core.worktree"
1392 #: unpack-trees.c:202
1393 msgid "Checking out files"
1397 msgid "invalid URL scheme name or missing '://' suffix"
1398 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1400 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1402 msgid "invalid %XX escape sequence"
1403 msgstr "无效的 %XX 转义序列"
1406 msgid "missing host and scheme is not 'file:'"
1407 msgstr "缺失主机名且URL方案不是 'file:'"
1410 msgid "a 'file:' URL may not have a port number"
1411 msgstr "一个 'file:' URL 不应该包含端口号"
1414 msgid "invalid characters in host name"
1415 msgstr "主机名中包含无效的字符"
1417 #: urlmatch.c:244 urlmatch.c:255
1418 msgid "invalid port number"
1422 msgid "invalid '..' path segment"
1423 msgstr "无效的 '..' 路径片段"
1427 msgid "unable to access '%s': %s"
1428 msgstr "不能访问 '%s':%s"
1432 msgid "unable to access '%s'"
1437 msgid "unable to look up current user in the passwd file: %s"
1438 msgstr "无法在口令文件中查询到当前用户:%s"
1441 msgid "no such user"
1445 msgid "Unmerged paths:"
1449 #: wt-status.c:177 wt-status.c:204
1451 msgid " (use \"git reset %s <file>...\" to unstage)"
1452 msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1455 #: wt-status.c:179 wt-status.c:206
1456 msgid " (use \"git rm --cached <file>...\" to unstage)"
1457 msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1461 msgid " (use \"git add <file>...\" to mark resolution)"
1462 msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1465 #: wt-status.c:185 wt-status.c:189
1466 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1467 msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1471 msgid " (use \"git rm <file>...\" to mark resolution)"
1472 msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1475 msgid "Changes to be committed:"
1479 msgid "Changes not staged for commit:"
1480 msgstr "尚未暂存以备提交的变更:"
1484 msgid " (use \"git add <file>...\" to update what will be committed)"
1485 msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1489 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1490 msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1495 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1496 msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1500 msgid " (commit or discard the untracked or modified content in submodules)"
1501 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1506 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1507 msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
1510 msgid "both deleted:"
1514 msgid "added by us:"
1518 msgid "deleted by them:"
1522 msgid "added by them:"
1526 msgid "deleted by us:"
1534 msgid "both modified:"
1539 msgid "bug: unhandled unmerged status %x"
1540 msgstr "bug:无法处理的未合并状态 %x"
1574 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1576 msgid "new commits, "
1579 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1581 msgid "modified content, "
1584 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
1586 msgid "untracked content, "
1591 msgid "bug: unhandled diff status %c"
1592 msgstr "bug:无法处理的差异状态 %c"
1595 msgid "Submodules changed but not updated:"
1596 msgstr "子模组已修改但尚未更新:"
1599 msgid "Submodule changes to be committed:"
1604 "Do not touch the line above.\n"
1605 "Everything below will be removed."
1611 msgid "You have unmerged paths."
1616 msgid " (fix conflicts and run \"git commit\")"
1617 msgstr " (解决冲突并运行 \"git commit\")"
1620 msgid "All conflicts fixed but you are still merging."
1621 msgstr "所有冲突已解决但您仍处于合并中。"
1625 msgid " (use \"git commit\" to conclude merge)"
1626 msgstr " (使用 \"git commit\" 结束合并)"
1629 msgid "You are in the middle of an am session."
1630 msgstr "您正处于 am 操作过程中。"
1633 msgid "The current patch is empty."
1638 msgid " (fix conflicts and then run \"git am --continue\")"
1639 msgstr " (解决冲突,然后运行 \"git am --continue\")"
1643 msgid " (use \"git am --skip\" to skip this patch)"
1644 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1648 msgid " (use \"git am --abort\" to restore the original branch)"
1649 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1651 #: wt-status.c:1026 wt-status.c:1043
1653 msgid "You are currently rebasing branch '%s' on '%s'."
1654 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1656 #: wt-status.c:1031 wt-status.c:1048
1657 msgid "You are currently rebasing."
1662 msgid " (fix conflicts and then run \"git rebase --continue\")"
1663 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1667 msgid " (use \"git rebase --skip\" to skip this patch)"
1668 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1672 msgid " (use \"git rebase --abort\" to check out the original branch)"
1673 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1677 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1678 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1683 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1684 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1687 msgid "You are currently splitting a commit during a rebase."
1688 msgstr "您在执行变基操作时拆分提交。"
1692 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1693 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1697 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1698 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1701 msgid "You are currently editing a commit during a rebase."
1702 msgstr "您在执行变基操作时编辑提交。"
1706 msgid " (use \"git commit --amend\" to amend the current commit)"
1707 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1712 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1713 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1717 msgid "You are currently cherry-picking commit %s."
1718 msgstr "您在执行拣选提交 %s 的操作。"
1722 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1723 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1727 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1728 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1732 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1733 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1737 msgid "You are currently reverting commit %s."
1738 msgstr "您在执行反转提交 %s 的操作。"
1742 msgid " (fix conflicts and run \"git revert --continue\")"
1743 msgstr " (解决冲突并运行 \"git revert --continue\")"
1747 msgid " (all conflicts fixed: run \"git revert --continue\")"
1748 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1752 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1753 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1757 msgid "You are currently bisecting, started from branch '%s'."
1758 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1761 msgid "You are currently bisecting."
1762 msgstr "您在执行二分查找操作。"
1766 msgid " (use \"git bisect reset\" to get back to the original branch)"
1767 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1774 msgid "rebase in progress; onto "
1775 msgstr "变基操作正在进行中;至 "
1778 msgid "HEAD detached at "
1782 msgid "HEAD detached from "
1786 msgid "Not currently on any branch."
1790 msgid "Initial commit"
1794 msgid "Untracked files"
1798 msgid "Ignored files"
1804 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1805 "may speed it up, but you have to be careful not to forget to add\n"
1806 "new files yourself (see 'git help status')."
1808 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1809 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
1813 msgid "Untracked files not listed%s"
1814 msgstr "未跟踪的文件没有列出%s"
1816 # 译者:中文字符串拼接,可删除前导空格
1818 msgid " (use -u option to show untracked files)"
1819 msgstr "(使用 -u 参数显示未跟踪的文件)"
1827 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1828 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1832 msgid "no changes added to commit\n"
1838 "nothing added to commit but untracked files present (use \"git add\" to "
1840 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1844 msgid "nothing added to commit but untracked files present\n"
1845 msgstr "提交为空,但是存在尚未跟踪的文件\n"
1847 # 译者:中文字符串拼接,可删除前导空格
1850 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1851 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1853 #: wt-status.c:1399 wt-status.c:1404
1855 msgid "nothing to commit\n"
1858 # 译者:中文字符串拼接,可删除前导空格
1861 msgid "nothing to commit (use -u to show untracked files)\n"
1862 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1864 # 译者:中文字符串拼接,可删除前导空格
1867 msgid "nothing to commit, working directory clean\n"
1868 msgstr "无文件要提交,干净的工作区\n"
1871 msgid "HEAD (no branch)"
1876 msgid "Initial commit on "
1884 #: wt-status.c:1555 wt-status.c:1563
1888 #: compat/precompose_utf8.c:55 builtin/clone.c:356
1890 msgid "failed to unlink '%s'"
1894 msgid "git add [options] [--] <pathspec>..."
1895 msgstr "git add [选项] [--] <路径规则>..."
1899 msgid "unexpected diff status %c"
1902 #: builtin/add.c:69 builtin/commit.c:261
1903 msgid "updating files failed"
1908 msgid "remove '%s'\n"
1911 #: builtin/add.c:133
1912 msgid "Unstaged changes after refreshing the index:"
1913 msgstr "刷新索引之后尚未被暂存的变更:"
1915 #: builtin/add.c:193 builtin/rev-parse.c:781
1916 msgid "Could not read the index"
1919 #: builtin/add.c:204
1921 msgid "Could not open '%s' for writing."
1922 msgstr "不能打开 '%s' 以写入。"
1924 #: builtin/add.c:208
1925 msgid "Could not write patch"
1928 #: builtin/add.c:213
1930 msgid "Could not stat '%s'"
1931 msgstr "不能查看文件状态 '%s'"
1933 #: builtin/add.c:215
1934 msgid "Empty patch. Aborted."
1937 #: builtin/add.c:221
1939 msgid "Could not apply '%s'"
1942 #: builtin/add.c:231
1943 msgid "The following paths are ignored by one of your .gitignore files:\n"
1944 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
1946 #: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
1947 #: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
1952 #: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
1953 #: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
1954 #: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
1958 #: builtin/add.c:251
1959 msgid "interactive picking"
1962 #: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
1963 msgid "select hunks interactively"
1966 #: builtin/add.c:253
1967 msgid "edit current diff and apply"
1970 #: builtin/add.c:254
1971 msgid "allow adding otherwise ignored files"
1974 #: builtin/add.c:255
1975 msgid "update tracked files"
1978 #: builtin/add.c:256
1979 msgid "record only the fact that the path will be added later"
1980 msgstr "只记录,该路径稍后再添加"
1982 #: builtin/add.c:257
1983 msgid "add changes from all tracked and untracked files"
1984 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
1986 #: builtin/add.c:260
1987 msgid "ignore paths removed in the working tree (same as --no-all)"
1988 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1990 #: builtin/add.c:262
1991 msgid "don't add, only refresh the index"
1994 #: builtin/add.c:263
1995 msgid "just skip files which cannot be added because of errors"
1996 msgstr "跳过因出错不能添加的文件"
1998 #: builtin/add.c:264
1999 msgid "check if - even missing - files are ignored in dry run"
2000 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2002 #: builtin/add.c:286
2004 msgid "Use -f if you really want to add them.\n"
2005 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2007 #: builtin/add.c:287
2008 msgid "no files added"
2011 #: builtin/add.c:293
2012 msgid "adding files failed"
2015 #: builtin/add.c:329
2016 msgid "-A and -u are mutually incompatible"
2017 msgstr "-A 和 -u 选项互斥"
2019 #: builtin/add.c:336
2020 msgid "Option --ignore-missing can only be used together with --dry-run"
2021 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2023 #: builtin/add.c:357
2025 msgid "Nothing specified, nothing added.\n"
2026 msgstr "没有指定文件,也没有文件被添加。\n"
2028 #: builtin/add.c:358
2030 msgid "Maybe you wanted to say 'git add .'?\n"
2031 msgstr "也许您想要执行 'git add .'?\n"
2033 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2034 #: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
2035 msgid "index file corrupt"
2038 #: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
2039 msgid "Unable to write new index file"
2042 #: builtin/apply.c:57
2043 msgid "git apply [options] [<patch>...]"
2044 msgstr "git apply [选项] [<补丁>...]"
2046 #: builtin/apply.c:110
2048 msgid "unrecognized whitespace option '%s'"
2049 msgstr "未能识别的空白字符选项 '%s'"
2051 #: builtin/apply.c:125
2053 msgid "unrecognized whitespace ignore option '%s'"
2054 msgstr "未能识别的空白字符忽略选项 '%s'"
2056 #: builtin/apply.c:825
2058 msgid "Cannot prepare timestamp regexp %s"
2059 msgstr "无法准备时间戳正则表达式 %s"
2061 #: builtin/apply.c:834
2063 msgid "regexec returned %d for input: %s"
2064 msgstr "regexec 返回 %d,输入为:%s"
2066 #: builtin/apply.c:915
2068 msgid "unable to find filename in patch at line %d"
2069 msgstr "不能在补丁的第 %d 行找到文件名"
2071 #: builtin/apply.c:947
2073 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2074 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2076 #: builtin/apply.c:951
2078 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2079 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2081 #: builtin/apply.c:952
2083 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2084 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2086 #: builtin/apply.c:959
2088 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2089 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2091 #: builtin/apply.c:1422
2093 msgid "recount: unexpected line: %.*s"
2094 msgstr "recount:意外的行:%.*s"
2096 #: builtin/apply.c:1479
2098 msgid "patch fragment without header at line %d: %.*s"
2099 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2101 #: builtin/apply.c:1496
2104 "git diff header lacks filename information when removing %d leading pathname "
2105 "component (line %d)"
2107 "git diff header lacks filename information when removing %d leading pathname "
2108 "components (line %d)"
2109 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2110 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2112 #: builtin/apply.c:1656
2113 msgid "new file depends on old contents"
2116 #: builtin/apply.c:1658
2117 msgid "deleted file still has contents"
2120 #: builtin/apply.c:1684
2122 msgid "corrupt patch at line %d"
2123 msgstr "补丁在第 %d 行损坏"
2125 #: builtin/apply.c:1720
2127 msgid "new file %s depends on old contents"
2128 msgstr "新文件 %s 依赖旧内容"
2130 #: builtin/apply.c:1722
2132 msgid "deleted file %s still has contents"
2133 msgstr "删除的文件 %s 仍有内容"
2135 #: builtin/apply.c:1725
2137 msgid "** warning: file %s becomes empty but is not deleted"
2138 msgstr "** 警告:文件 %s 成为空文件但并未删除"
2140 #: builtin/apply.c:1871
2142 msgid "corrupt binary patch at line %d: %.*s"
2143 msgstr "二进制补丁在第 %d 行损坏:%.*s"
2145 #: builtin/apply.c:1900
2147 msgid "unrecognized binary patch at line %d"
2148 msgstr "未能识别的二进制补丁位于第 %d 行"
2150 #: builtin/apply.c:1986
2152 msgid "patch with only garbage at line %d"
2153 msgstr "补丁文件的第 %d 行只有垃圾数据"
2155 #: builtin/apply.c:2076
2157 msgid "unable to read symlink %s"
2158 msgstr "无法读取符号链接 %s"
2160 #: builtin/apply.c:2080
2162 msgid "unable to open or read %s"
2165 #: builtin/apply.c:2688
2167 msgid "invalid start of line: '%c'"
2168 msgstr "无效的行首字符:'%c'"
2170 #: builtin/apply.c:2806
2172 msgid "Hunk #%d succeeded at %d (offset %d line)."
2173 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2174 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2175 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
2177 #: builtin/apply.c:2818
2179 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2180 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
2182 #: builtin/apply.c:2824
2185 "while searching for:\n"
2191 #: builtin/apply.c:2843
2193 msgid "missing binary patch data for '%s'"
2194 msgstr "缺失 '%s' 的二进制补丁数据"
2196 #: builtin/apply.c:2944
2198 msgid "binary patch does not apply to '%s'"
2199 msgstr "二进制补丁未应用到 '%s'"
2201 #: builtin/apply.c:2950
2203 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2204 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
2206 #: builtin/apply.c:2971
2208 msgid "patch failed: %s:%ld"
2209 msgstr "打补丁失败:%s:%ld"
2211 #: builtin/apply.c:3095
2213 msgid "cannot checkout %s"
2216 #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
2218 msgid "read of %s failed"
2221 #: builtin/apply.c:3174 builtin/apply.c:3396
2223 msgid "path %s has been renamed/deleted"
2224 msgstr "路径 %s 已经被重命名/删除"
2226 #: builtin/apply.c:3255 builtin/apply.c:3410
2228 msgid "%s: does not exist in index"
2231 #: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
2236 #: builtin/apply.c:3264 builtin/apply.c:3418
2238 msgid "%s: does not match index"
2241 #: builtin/apply.c:3366
2242 msgid "removal patch leaves file contents"
2243 msgstr "移除补丁仍留下了文件内容"
2245 #: builtin/apply.c:3435
2247 msgid "%s: wrong type"
2250 #: builtin/apply.c:3437
2252 msgid "%s has type %o, expected %o"
2253 msgstr "%s 的类型是 %o,应为 %o"
2255 #: builtin/apply.c:3538
2257 msgid "%s: already exists in index"
2258 msgstr "%s:已经存在于索引中"
2260 #: builtin/apply.c:3541
2262 msgid "%s: already exists in working directory"
2263 msgstr "%s:已经存在于工作区中"
2265 #: builtin/apply.c:3561
2267 msgid "new mode (%o) of %s does not match old mode (%o)"
2268 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
2270 #: builtin/apply.c:3566
2272 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2273 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2275 #: builtin/apply.c:3574
2277 msgid "%s: patch does not apply"
2280 #: builtin/apply.c:3587
2282 msgid "Checking patch %s..."
2285 #: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2287 msgid "make_cache_entry failed for path '%s'"
2288 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2290 #: builtin/apply.c:3823
2292 msgid "unable to remove %s from index"
2293 msgstr "不能从索引中移除 %s"
2295 #: builtin/apply.c:3852
2297 msgid "corrupt patch for submodule %s"
2298 msgstr "子模组 %s 损坏的补丁"
2300 #: builtin/apply.c:3856
2302 msgid "unable to stat newly created file '%s'"
2303 msgstr "不能枚举新建文件 '%s' 的状态"
2305 #: builtin/apply.c:3861
2307 msgid "unable to create backing store for newly created file %s"
2308 msgstr "不能为新建文件 %s 创建后端存储"
2310 #: builtin/apply.c:3864 builtin/apply.c:3972
2312 msgid "unable to add cache entry for %s"
2313 msgstr "无法为 %s 添加缓存条目"
2315 #: builtin/apply.c:3897
2317 msgid "closing file '%s'"
2320 #: builtin/apply.c:3946
2322 msgid "unable to write file '%s' mode %o"
2323 msgstr "不能写文件 '%s' 权限 %o"
2325 #: builtin/apply.c:4033
2327 msgid "Applied patch %s cleanly."
2330 #: builtin/apply.c:4041
2331 msgid "internal error"
2334 #: builtin/apply.c:4044
2336 msgid "Applying patch %%s with %d reject..."
2337 msgid_plural "Applying patch %%s with %d rejects..."
2338 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2339 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2341 #: builtin/apply.c:4054
2343 msgid "truncating .rej filename to %.*s.rej"
2344 msgstr "截短 .rej 文件名为 %.*s.rej"
2346 #: builtin/apply.c:4075
2348 msgid "Hunk #%d applied cleanly."
2349 msgstr "第 #%d 个片段成功应用。"
2351 #: builtin/apply.c:4078
2353 msgid "Rejected hunk #%d."
2354 msgstr "拒绝第 #%d 个片段。"
2356 #: builtin/apply.c:4228
2357 msgid "unrecognized input"
2360 #: builtin/apply.c:4239
2361 msgid "unable to read index file"
2364 #: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
2365 #: builtin/fetch.c:93
2369 #: builtin/apply.c:4359
2370 msgid "don't apply changes matching the given path"
2371 msgstr "不要应用与给出路径向匹配的变更"
2373 #: builtin/apply.c:4362
2374 msgid "apply changes matching the given path"
2375 msgstr "应用与给出路径向匹配的变更"
2377 #: builtin/apply.c:4364
2381 #: builtin/apply.c:4365
2382 msgid "remove <num> leading slashes from traditional diff paths"
2383 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2385 #: builtin/apply.c:4368
2386 msgid "ignore additions made by the patch"
2387 msgstr "忽略补丁中的添加的文件"
2389 #: builtin/apply.c:4370
2390 msgid "instead of applying the patch, output diffstat for the input"
2391 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
2393 #: builtin/apply.c:4374
2394 msgid "show number of added and deleted lines in decimal notation"
2395 msgstr "以十进制数显示添加和删除的行数"
2397 #: builtin/apply.c:4376
2398 msgid "instead of applying the patch, output a summary for the input"
2399 msgstr "不应用补丁,而是显示输入的概要"
2401 #: builtin/apply.c:4378
2402 msgid "instead of applying the patch, see if the patch is applicable"
2403 msgstr "不应用补丁,而是查看补丁是否可应用"
2405 #: builtin/apply.c:4380
2406 msgid "make sure the patch is applicable to the current index"
2407 msgstr "确认补丁可以应用到当前索引"
2409 #: builtin/apply.c:4382
2410 msgid "apply a patch without touching the working tree"
2411 msgstr "应用补丁而不修改工作区"
2413 #: builtin/apply.c:4384
2414 msgid "also apply the patch (use with --stat/--summary/--check)"
2415 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
2417 #: builtin/apply.c:4386
2418 msgid "attempt three-way merge if a patch does not apply"
2419 msgstr "如果一个补丁不能应用则尝试三路合并"
2421 #: builtin/apply.c:4388
2422 msgid "build a temporary index based on embedded index information"
2423 msgstr "创建一个临时索引基于嵌入的索引信息"
2425 #: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
2426 msgid "paths are separated with NUL character"
2427 msgstr "路径以 NUL 字符分隔"
2429 #: builtin/apply.c:4393
2430 msgid "ensure at least <n> lines of context match"
2431 msgstr "确保至少匹配 <n> 行上下文"
2433 #: builtin/apply.c:4394
2437 #: builtin/apply.c:4395
2438 msgid "detect new or modified lines that have whitespace errors"
2439 msgstr "检查新增和修改的行中间的空白字符滥用"
2441 #: builtin/apply.c:4398 builtin/apply.c:4401
2442 msgid "ignore changes in whitespace when finding context"
2443 msgstr "查找上下文时忽略空白字符的变更"
2445 #: builtin/apply.c:4404
2446 msgid "apply the patch in reverse"
2449 #: builtin/apply.c:4406
2450 msgid "don't expect at least one line of context"
2453 #: builtin/apply.c:4408
2454 msgid "leave the rejected hunks in corresponding *.rej files"
2455 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2457 #: builtin/apply.c:4410
2458 msgid "allow overlapping hunks"
2461 #: builtin/apply.c:4413
2462 msgid "tolerate incorrectly detected missing new-line at the end of file"
2463 msgstr "允许不正确的文件末尾换行符"
2465 #: builtin/apply.c:4416
2466 msgid "do not trust the line counts in the hunk headers"
2467 msgstr "不信任补丁片段的头信息中的行号"
2469 #: builtin/apply.c:4418
2473 #: builtin/apply.c:4419
2474 msgid "prepend <root> to all filenames"
2475 msgstr "为所有文件名前添加 <根目录>"
2477 #: builtin/apply.c:4441
2478 msgid "--3way outside a repository"
2479 msgstr "--3way 在一个版本库之外"
2481 #: builtin/apply.c:4449
2482 msgid "--index outside a repository"
2483 msgstr "--index 在一个版本库之外"
2485 #: builtin/apply.c:4452
2486 msgid "--cached outside a repository"
2487 msgstr "--cached 在一个版本库之外"
2489 #: builtin/apply.c:4468
2491 msgid "can't open patch '%s'"
2492 msgstr "不能打开补丁 '%s'"
2494 #: builtin/apply.c:4482
2496 msgid "squelched %d whitespace error"
2497 msgid_plural "squelched %d whitespace errors"
2498 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2499 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2501 #: builtin/apply.c:4488 builtin/apply.c:4498
2503 msgid "%d line adds whitespace errors."
2504 msgid_plural "%d lines add whitespace errors."
2505 msgstr[0] "%d 行有空白字符误用。"
2506 msgstr[1] "%d 行有空白字符误用。"
2508 #: builtin/archive.c:17
2510 msgid "could not create archive file '%s'"
2511 msgstr "不能创建归档文件 '%s'"
2513 #: builtin/archive.c:20
2514 msgid "could not redirect output"
2517 #: builtin/archive.c:37
2518 msgid "git archive: Remote with no URL"
2519 msgstr "git archive:未提供远程URL"
2521 #: builtin/archive.c:58
2522 msgid "git archive: expected ACK/NAK, got EOF"
2523 msgstr "git archive:应为ACK/NACK,却得到EOF"
2525 #: builtin/archive.c:61
2527 msgid "git archive: NACK %s"
2528 msgstr "git archive:NACK %s"
2530 #: builtin/archive.c:63
2532 msgid "remote error: %s"
2535 #: builtin/archive.c:64
2536 msgid "git archive: protocol error"
2537 msgstr "git archive:协议错误"
2539 #: builtin/archive.c:68
2540 msgid "git archive: expected a flush"
2541 msgstr "git archive:应为刷新"
2543 #: builtin/bisect--helper.c:7
2544 msgid "git bisect--helper --next-all [--no-checkout]"
2545 msgstr "git bisect--helper --next-all [--no-checkout]"
2547 #: builtin/bisect--helper.c:17
2548 msgid "perform 'git bisect next'"
2549 msgstr "执行 'git bisect next'"
2551 #: builtin/bisect--helper.c:19
2552 msgid "update BISECT_HEAD instead of checking out the current commit"
2553 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2555 #: builtin/blame.c:30
2556 msgid "git blame [options] [rev-opts] [rev] [--] file"
2557 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2559 #: builtin/blame.c:35
2560 msgid "[rev-opts] are documented in git-rev-list(1)"
2561 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2563 #: builtin/blame.c:2501
2564 msgid "Show blame entries as we find them, incrementally"
2565 msgstr "增量式地显示发现的 blame 条目"
2567 #: builtin/blame.c:2502
2568 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2569 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
2571 #: builtin/blame.c:2503
2572 msgid "Do not treat root commits as boundaries (Default: off)"
2573 msgstr "不把根提交作为边界(默认:关闭)"
2575 #: builtin/blame.c:2504
2576 msgid "Show work cost statistics"
2579 #: builtin/blame.c:2505
2580 msgid "Show output score for blame entries"
2581 msgstr "显示判断 blame 条目位移的得分诊断信息"
2583 #: builtin/blame.c:2506
2584 msgid "Show original filename (Default: auto)"
2585 msgstr "显示原始文件名(默认:自动)"
2587 #: builtin/blame.c:2507
2588 msgid "Show original linenumber (Default: off)"
2589 msgstr "显示原始的行号(默认:关闭)"
2591 #: builtin/blame.c:2508
2592 msgid "Show in a format designed for machine consumption"
2593 msgstr "显示为一个适合机器读取的格式"
2595 #: builtin/blame.c:2509
2596 msgid "Show porcelain format with per-line commit information"
2597 msgstr "为每一行显示机器适用的提交信息"
2599 #: builtin/blame.c:2510
2600 msgid "Use the same output mode as git-annotate (Default: off)"
2601 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
2603 #: builtin/blame.c:2511
2604 msgid "Show raw timestamp (Default: off)"
2605 msgstr "显示原始时间戳(默认:关闭)"
2607 #: builtin/blame.c:2512
2608 msgid "Show long commit SHA1 (Default: off)"
2609 msgstr "显示长的SHA1提交号(默认:关闭)"
2611 #: builtin/blame.c:2513
2612 msgid "Suppress author name and timestamp (Default: off)"
2613 msgstr "隐藏作者名字和时间戳(默认:关闭)"
2615 #: builtin/blame.c:2514
2616 msgid "Show author email instead of name (Default: off)"
2617 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
2619 #: builtin/blame.c:2515
2620 msgid "Ignore whitespace differences"
2623 #: builtin/blame.c:2516
2624 msgid "Spend extra cycles to find better match"
2625 msgstr "花费额外的循环来找到更好的匹配"
2627 #: builtin/blame.c:2517
2628 msgid "Use revisions from <file> instead of calling git-rev-list"
2629 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
2631 #: builtin/blame.c:2518
2632 msgid "Use <file>'s contents as the final image"
2633 msgstr "使用 <file> 的内容作为最终的图片"
2635 #: builtin/blame.c:2519 builtin/blame.c:2520
2639 #: builtin/blame.c:2519
2640 msgid "Find line copies within and across files"
2641 msgstr "找到文件内及跨文件的行拷贝"
2643 #: builtin/blame.c:2520
2644 msgid "Find line movements within and across files"
2645 msgstr "找到文件内及跨文件的行移动"
2647 #: builtin/blame.c:2521
2651 #: builtin/blame.c:2521
2652 msgid "Process only line range n,m, counting from 1"
2653 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
2655 #. TRANSLATORS: This string is used to tell us the maximum
2656 #. display width for a relative timestamp in "git blame"
2657 #. output. For C locale, "4 years, 11 months ago", which
2658 #. takes 22 places, is the longest among various forms of
2659 #. relative timestamps, but your language may need more or
2660 #. fewer display columns.
2661 #: builtin/blame.c:2599
2662 msgid "4 years, 11 months ago"
2665 #: builtin/branch.c:24
2666 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2667 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2669 #: builtin/branch.c:25
2670 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2671 msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2673 #: builtin/branch.c:26
2674 msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2675 msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2677 #: builtin/branch.c:27
2678 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2679 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2681 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2682 #: builtin/branch.c:150
2685 "deleting branch '%s' that has been merged to\n"
2686 " '%s', but not yet merged to HEAD."
2688 "将要删除的分支 '%s' 已经被合并到\n"
2691 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
2692 #: builtin/branch.c:154
2695 "not deleting branch '%s' that is not yet merged to\n"
2696 " '%s', even though it is merged to HEAD."
2698 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2699 " 然而却尚未被合并到分支 '%s' 。"
2701 #: builtin/branch.c:168
2703 msgid "Couldn't look up commit object for '%s'"
2704 msgstr "无法查询 '%s' 指向的提交对象"
2706 #: builtin/branch.c:172
2709 "The branch '%s' is not fully merged.\n"
2710 "If you are sure you want to delete it, run 'git branch -D %s'."
2713 "如果您确认要删除它,执行 'git branch -D %s'。"
2715 #: builtin/branch.c:185
2716 msgid "Update of config-file failed"
2717 msgstr "无法更新 config 文件"
2719 #: builtin/branch.c:213
2720 msgid "cannot use -a with -d"
2721 msgstr "不能将 -a 和 -d 同时使用"
2723 #: builtin/branch.c:219
2724 msgid "Couldn't look up commit object for HEAD"
2725 msgstr "无法查询 HEAD 指向的提交对象"
2727 #: builtin/branch.c:227
2729 msgid "Cannot delete the branch '%s' which you are currently on."
2730 msgstr "无法删除您当前所在的分支 '%s'。"
2732 #: builtin/branch.c:240
2734 msgid "remote branch '%s' not found."
2735 msgstr "远程分支 '%s' 未发现。"
2737 #: builtin/branch.c:241
2739 msgid "branch '%s' not found."
2740 msgstr "分支 '%s' 未发现。"
2742 #: builtin/branch.c:255
2744 msgid "Error deleting remote branch '%s'"
2745 msgstr "删除远程分支 '%s' 时出错"
2747 #: builtin/branch.c:256
2749 msgid "Error deleting branch '%s'"
2750 msgstr "删除分支 '%s' 时出错"
2752 #: builtin/branch.c:263
2754 msgid "Deleted remote branch %s (was %s).\n"
2755 msgstr "已删除远程分支 %s(曾为 %s)。\n"
2757 #: builtin/branch.c:264
2759 msgid "Deleted branch %s (was %s).\n"
2760 msgstr "已删除分支 %s(曾为 %s)。\n"
2762 #: builtin/branch.c:366
2764 msgid "branch '%s' does not point at a commit"
2765 msgstr "分支 '%s' 未指向一个提交"
2767 #: builtin/branch.c:454
2772 #: builtin/branch.c:459
2777 #: builtin/branch.c:464
2779 msgid "[%s: behind %d]"
2782 #: builtin/branch.c:466
2787 #: builtin/branch.c:470
2789 msgid "[%s: ahead %d]"
2792 #: builtin/branch.c:472
2797 #: builtin/branch.c:475
2799 msgid "[%s: ahead %d, behind %d]"
2800 msgstr "[%s:领先 %d,落后 %d]"
2802 #: builtin/branch.c:478
2804 msgid "[ahead %d, behind %d]"
2805 msgstr "[领先 %d,落后 %d]"
2807 #: builtin/branch.c:502
2808 msgid " **** invalid ref ****"
2809 msgstr " **** 无效引用 ****"
2811 #: builtin/branch.c:594
2813 msgid "(no branch, rebasing %s)"
2814 msgstr "(非分支,正变基 %s)"
2816 #: builtin/branch.c:597
2818 msgid "(no branch, bisect started on %s)"
2819 msgstr "(非分支,二分查找开始于 %s)"
2821 #: builtin/branch.c:600
2823 msgid "(detached from %s)"
2826 #: builtin/branch.c:603
2830 #: builtin/branch.c:649
2832 msgid "object '%s' does not point to a commit"
2833 msgstr "对象 '%s' 没有指向一个提交"
2835 #: builtin/branch.c:681
2836 msgid "some refs could not be read"
2839 #: builtin/branch.c:694
2840 msgid "cannot rename the current branch while not on any."
2841 msgstr "无法重命名当前分支因为不处于任何分支上。"
2843 #: builtin/branch.c:704
2845 msgid "Invalid branch name: '%s'"
2846 msgstr "无效的分支名:'%s'"
2848 #: builtin/branch.c:719
2849 msgid "Branch rename failed"
2852 #: builtin/branch.c:723
2854 msgid "Renamed a misnamed branch '%s' away"
2855 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2857 #: builtin/branch.c:727
2859 msgid "Branch renamed to %s, but HEAD is not updated!"
2860 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2862 #: builtin/branch.c:734
2863 msgid "Branch is renamed, but update of config-file failed"
2864 msgstr "分支被重命名,但更新 config 文件失败"
2866 #: builtin/branch.c:749
2868 msgid "malformed object name %s"
2871 #: builtin/branch.c:773
2873 msgid "could not write branch description template: %s"
2874 msgstr "不能写分支描述模版:%s"
2876 #: builtin/branch.c:803
2877 msgid "Generic options"
2880 #: builtin/branch.c:805
2881 msgid "show hash and subject, give twice for upstream branch"
2882 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
2884 #: builtin/branch.c:806
2885 msgid "suppress informational messages"
2888 #: builtin/branch.c:807
2889 msgid "set up tracking mode (see git-pull(1))"
2890 msgstr "设置跟踪模式(参见 git-pull(1))"
2892 #: builtin/branch.c:809
2893 msgid "change upstream info"
2896 #: builtin/branch.c:813
2897 msgid "use colored output"
2900 #: builtin/branch.c:814
2901 msgid "act on remote-tracking branches"
2904 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2905 #: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
2906 #: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
2907 #: builtin/tag.c:621
2911 #: builtin/branch.c:818 builtin/branch.c:824
2912 msgid "print only branches that contain the commit"
2913 msgstr "只打印包含该提交的分支"
2915 #: builtin/branch.c:830
2916 msgid "Specific git-branch actions:"
2917 msgstr "具体的 git-branch 动作:"
2919 #: builtin/branch.c:831
2920 msgid "list both remote-tracking and local branches"
2921 msgstr "列出远程跟踪及本地分支"
2923 #: builtin/branch.c:833
2924 msgid "delete fully merged branch"
2927 #: builtin/branch.c:834
2928 msgid "delete branch (even if not merged)"
2929 msgstr "删除分支(即使没有合并)"
2931 #: builtin/branch.c:835
2932 msgid "move/rename a branch and its reflog"
2933 msgstr "移动/重命名一个分支,以及它的引用日志"
2935 #: builtin/branch.c:836
2936 msgid "move/rename a branch, even if target exists"
2937 msgstr "移动/重命名一个分支,即使目标已存在"
2939 #: builtin/branch.c:837
2940 msgid "list branch names"
2943 #: builtin/branch.c:838
2944 msgid "create the branch's reflog"
2947 #: builtin/branch.c:840
2948 msgid "edit the description for the branch"
2951 #: builtin/branch.c:841
2952 msgid "force creation (when already exists)"
2953 msgstr "强制创建(当已经存在)"
2955 #: builtin/branch.c:844
2956 msgid "print only not merged branches"
2959 #: builtin/branch.c:850
2960 msgid "print only merged branches"
2963 #: builtin/branch.c:854
2964 msgid "list branches in columns"
2967 #: builtin/branch.c:867
2968 msgid "Failed to resolve HEAD as a valid ref."
2969 msgstr "无法将 HEAD 解析为有效引用。"
2971 #: builtin/branch.c:872 builtin/clone.c:636
2972 msgid "HEAD not found below refs/heads!"
2973 msgstr "HEAD 没有位于 /refs/heads 之下!"
2975 #: builtin/branch.c:896
2976 msgid "--column and --verbose are incompatible"
2977 msgstr "--column 和 --verbose 不兼容"
2979 #: builtin/branch.c:902 builtin/branch.c:941
2980 msgid "branch name required"
2983 #: builtin/branch.c:917
2984 msgid "Cannot give description to detached HEAD"
2985 msgstr "不能向分离头指针提供描述"
2987 #: builtin/branch.c:922
2988 msgid "cannot edit description of more than one branch"
2989 msgstr "不能为一个以上的分支编辑描述"
2991 #: builtin/branch.c:929
2993 msgid "No commit on branch '%s' yet."
2994 msgstr "分支 '%s' 尚无提交。"
2996 #: builtin/branch.c:932
2998 msgid "No branch named '%s'."
3001 #: builtin/branch.c:947
3002 msgid "too many branches for a rename operation"
3003 msgstr "为重命名操作提供了太多的分支名"
3005 #: builtin/branch.c:952
3006 msgid "too many branches to set new upstream"
3007 msgstr "为设置新上游提供了太多的分支名"
3009 #: builtin/branch.c:956
3012 "could not set upstream of HEAD to %s when it does not point to any branch."
3013 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3015 #: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002
3017 msgid "no such branch '%s'"
3020 #: builtin/branch.c:963
3022 msgid "branch '%s' does not exist"
3023 msgstr "分支 '%s' 不存在"
3025 #: builtin/branch.c:975
3026 msgid "too many branches to unset upstream"
3027 msgstr "为取消上游设置操作提供了太多的分支名"
3029 #: builtin/branch.c:979
3030 msgid "could not unset upstream of HEAD when it does not point to any branch."
3031 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3033 #: builtin/branch.c:985
3035 msgid "Branch '%s' has no upstream information"
3036 msgstr "分支 '%s' 没有上游信息"
3038 #: builtin/branch.c:999
3039 msgid "it does not make sense to create 'HEAD' manually"
3040 msgstr "手工创建 'HEAD' 没有意义"
3042 #: builtin/branch.c:1005
3043 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3044 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3046 #: builtin/branch.c:1008
3049 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3050 "track or --set-upstream-to\n"
3052 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3054 #: builtin/branch.c:1025
3058 "If you wanted to make '%s' track '%s', do this:\n"
3062 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3065 #: builtin/branch.c:1026
3067 msgid " git branch -d %s\n"
3068 msgstr " git branch -d %s\n"
3070 #: builtin/branch.c:1027
3072 msgid " git branch --set-upstream-to %s\n"
3073 msgstr " git branch --set-upstream-to %s\n"
3075 #: builtin/bundle.c:47
3077 msgid "%s is okay\n"
3080 #: builtin/bundle.c:56
3081 msgid "Need a repository to create a bundle."
3082 msgstr "需要一个版本库来创建包。"
3084 #: builtin/bundle.c:60
3085 msgid "Need a repository to unbundle."
3086 msgstr "需要一个版本库来解包。"
3088 #: builtin/cat-file.c:331
3089 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3090 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3092 #: builtin/cat-file.c:332
3093 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3094 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3096 #: builtin/cat-file.c:369
3097 msgid "<type> can be one of: blob, tree, commit, tag"
3098 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3100 #: builtin/cat-file.c:370
3101 msgid "show object type"
3104 #: builtin/cat-file.c:371
3105 msgid "show object size"
3108 #: builtin/cat-file.c:373
3109 msgid "exit with zero when there's no error"
3110 msgstr "当没有错误时退出并返回零"
3112 #: builtin/cat-file.c:374
3113 msgid "pretty-print object's content"
3116 #: builtin/cat-file.c:376
3117 msgid "for blob objects, run textconv on object's content"
3118 msgstr "对于数据(blob)对象,对其内容执行 textconv"
3120 #: builtin/cat-file.c:378
3121 msgid "show info and content of objects fed from the standard input"
3122 msgstr "显示从标准输入提供的对象的信息和内容"
3124 #: builtin/cat-file.c:381
3125 msgid "show info about objects fed from the standard input"
3126 msgstr "显示从标准输入提供的对象的信息"
3128 #: builtin/check-attr.c:11
3129 msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3130 msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3132 #: builtin/check-attr.c:12
3133 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3134 msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3136 #: builtin/check-attr.c:19
3137 msgid "report all attributes set on file"
3138 msgstr "报告设置在文件上的所有属性"
3140 #: builtin/check-attr.c:20
3141 msgid "use .gitattributes only from the index"
3142 msgstr "只使用索引中的 .gitattributes"
3144 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
3145 msgid "read file names from stdin"
3148 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
3149 msgid "terminate input and output records by a NUL character"
3150 msgstr "输入和输出的记录使用 NUL 字符终结"
3152 #: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
3153 msgid "suppress progress reporting"
3156 #: builtin/check-ignore.c:26
3157 msgid "show non-matching input paths"
3160 #: builtin/check-ignore.c:28
3161 msgid "ignore index when checking"
3164 #: builtin/check-ignore.c:154
3165 msgid "cannot specify pathnames with --stdin"
3166 msgstr "不能同时提供路径及 --stdin 参数"
3168 #: builtin/check-ignore.c:157
3169 msgid "-z only makes sense with --stdin"
3170 msgstr "-z 需要和 --stdin 参数共用才有意义"
3172 #: builtin/check-ignore.c:159
3173 msgid "no path specified"
3176 #: builtin/check-ignore.c:163
3177 msgid "--quiet is only valid with a single pathname"
3178 msgstr "参数 --quiet 只在提供一个路径名时有效"
3180 #: builtin/check-ignore.c:165
3181 msgid "cannot have both --quiet and --verbose"
3182 msgstr "不能同时提供 --quiet 和 --verbose 参数"
3184 #: builtin/check-ignore.c:168
3185 msgid "--non-matching is only valid with --verbose"
3186 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3188 #: builtin/check-mailmap.c:8
3189 msgid "git check-mailmap [options] <contact>..."
3190 msgstr "git check-mailmap [选项] <联系地址>..."
3192 #: builtin/check-mailmap.c:13
3193 msgid "also read contacts from stdin"
3194 msgstr "还从标准输入读取联系地址"
3196 #: builtin/check-mailmap.c:24
3198 msgid "unable to parse contact: %s"
3199 msgstr "不能解析联系地址:%s"
3201 #: builtin/check-mailmap.c:47
3202 msgid "no contacts specified"
3205 #: builtin/checkout-index.c:126
3206 msgid "git checkout-index [options] [--] [<file>...]"
3207 msgstr "git checkout-index [选项] [--] [<文件>...]"
3209 #: builtin/checkout-index.c:188
3210 msgid "check out all files in the index"
3213 #: builtin/checkout-index.c:189
3214 msgid "force overwrite of existing files"
3217 #: builtin/checkout-index.c:191
3218 msgid "no warning for existing files and files not in index"
3219 msgstr "存在或不在索引中的文件都没有警告"
3221 #: builtin/checkout-index.c:193
3222 msgid "don't checkout new files"
3225 #: builtin/checkout-index.c:195
3226 msgid "update stat information in the index file"
3227 msgstr "更新索引中文件的状态信息"
3229 #: builtin/checkout-index.c:201
3230 msgid "read list of paths from the standard input"
3231 msgstr "从标准输入读取路径列表"
3233 #: builtin/checkout-index.c:203
3234 msgid "write the content to temporary files"
3237 #: builtin/checkout-index.c:204 builtin/column.c:30
3241 #: builtin/checkout-index.c:205
3242 msgid "when creating files, prepend <string>"
3243 msgstr "在创建文件时,在前面加上<字符串>"
3245 #: builtin/checkout-index.c:208
3246 msgid "copy out the files from named stage"
3247 msgstr "从指定暂存区中拷出文件"
3249 #: builtin/checkout.c:25
3250 msgid "git checkout [options] <branch>"
3251 msgstr "git checkout [选项] <分支>"
3253 #: builtin/checkout.c:26
3254 msgid "git checkout [options] [<branch>] -- <file>..."
3255 msgstr "git checkout [选项] [<分支>] -- <文件>..."
3257 #: builtin/checkout.c:114 builtin/checkout.c:147
3259 msgid "path '%s' does not have our version"
3260 msgstr "路径 '%s' 没有我们的版本"
3262 #: builtin/checkout.c:116 builtin/checkout.c:149
3264 msgid "path '%s' does not have their version"
3265 msgstr "路径 '%s' 没有他们的版本"
3267 #: builtin/checkout.c:132
3269 msgid "path '%s' does not have all necessary versions"
3270 msgstr "路径 '%s' 没有全部必须的版本"
3272 #: builtin/checkout.c:176
3274 msgid "path '%s' does not have necessary versions"
3275 msgstr "路径 '%s' 没有必须的版本"
3277 #: builtin/checkout.c:193
3279 msgid "path '%s': cannot merge"
3280 msgstr "path '%s':无法合并"
3282 #: builtin/checkout.c:210
3284 msgid "Unable to add merge result for '%s'"
3285 msgstr "无法为 '%s' 添加合并结果"
3287 #: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3288 #: builtin/checkout.c:240
3290 msgid "'%s' cannot be used with updating paths"
3291 msgstr "'%s' 不能在更新路径时使用"
3293 #: builtin/checkout.c:243 builtin/checkout.c:246
3295 msgid "'%s' cannot be used with %s"
3296 msgstr "'%s' 不能和 %s 同时使用"
3298 #: builtin/checkout.c:249
3300 msgid "Cannot update paths and switch to branch '%s' at the same time."
3301 msgstr "不能同时更新路径并切换到分支'%s'。"
3303 #: builtin/checkout.c:260 builtin/checkout.c:449
3304 msgid "corrupt index file"
3307 #: builtin/checkout.c:320 builtin/checkout.c:327
3309 msgid "path '%s' is unmerged"
3310 msgstr "路径 '%s' 未合并"
3312 #: builtin/checkout.c:471
3313 msgid "you need to resolve your current index first"
3314 msgstr "您需要先解决当前索引的冲突"
3316 #: builtin/checkout.c:591
3318 msgid "Can not do reflog for '%s'\n"
3319 msgstr "不能对 '%s' 执行 reflog 操作\n"
3321 #: builtin/checkout.c:629
3322 msgid "HEAD is now at"
3325 #: builtin/checkout.c:636
3327 msgid "Reset branch '%s'\n"
3328 msgstr "重置分支 '%s'\n"
3330 #: builtin/checkout.c:639
3332 msgid "Already on '%s'\n"
3333 msgstr "已经位于 '%s'\n"
3335 #: builtin/checkout.c:643
3337 msgid "Switched to and reset branch '%s'\n"
3338 msgstr "切换并重置分支 '%s'\n"
3340 #: builtin/checkout.c:645 builtin/checkout.c:1026
3342 msgid "Switched to a new branch '%s'\n"
3343 msgstr "切换到一个新分支 '%s'\n"
3345 #: builtin/checkout.c:647
3347 msgid "Switched to branch '%s'\n"
3348 msgstr "切换到分支 '%s'\n"
3351 #: builtin/checkout.c:699
3353 msgid " ... and %d more.\n"
3354 msgstr " ... 及其它 %d 个。\n"
3356 #: builtin/checkout.c:705
3359 "Warning: you are leaving %d commit behind, not connected to\n"
3360 "any of your branches:\n"
3364 "Warning: you are leaving %d commits behind, not connected to\n"
3365 "any of your branches:\n"
3369 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3373 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3377 #: builtin/checkout.c:723
3380 "If you want to keep them by creating a new branch, this may be a good time\n"
3383 " git branch new_branch_name %s\n"
3386 "如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3389 " git branch new_branch_name %s\n"
3392 #: builtin/checkout.c:753
3393 msgid "internal error in revision walk"
3394 msgstr "在版本遍历时遇到内部错误"
3396 #: builtin/checkout.c:757
3397 msgid "Previous HEAD position was"
3398 msgstr "之前的 HEAD 位置是"
3400 #: builtin/checkout.c:784 builtin/checkout.c:1021
3401 msgid "You are on a branch yet to be born"
3402 msgstr "您位于一个尚未初始化的分支"
3404 #: builtin/checkout.c:928
3406 msgid "only one reference expected, %d given."
3407 msgstr "只要一个引用,却给出了 %d 个"
3409 #: builtin/checkout.c:967
3411 msgid "invalid reference: %s"
3414 #: builtin/checkout.c:996
3416 msgid "reference is not a tree: %s"
3419 #: builtin/checkout.c:1035
3420 msgid "paths cannot be used with switching branches"
3421 msgstr "路径不能和切换分支同时使用"
3423 #: builtin/checkout.c:1038 builtin/checkout.c:1042
3425 msgid "'%s' cannot be used with switching branches"
3426 msgstr "'%s' 不能和切换分支同时使用"
3428 #: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
3429 #: builtin/checkout.c:1057
3431 msgid "'%s' cannot be used with '%s'"
3432 msgstr "'%s' 不能和 '%s' 同时使用"
3434 #: builtin/checkout.c:1062
3436 msgid "Cannot switch branch to a non-commit '%s'"
3437 msgstr "不能切换分支到一个非提交 '%s'"
3439 #: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
3440 #: builtin/remote.c:159 builtin/remote.c:161
3444 #: builtin/checkout.c:1085
3445 msgid "create and checkout a new branch"
3446 msgstr "创建并检出一个新的分支"
3448 #: builtin/checkout.c:1087
3449 msgid "create/reset and checkout a branch"
3450 msgstr "创建/重置并检出一个分支"
3452 #: builtin/checkout.c:1088
3453 msgid "create reflog for new branch"
3454 msgstr "为新的分支创建引用日志"
3456 #: builtin/checkout.c:1089
3457 msgid "detach the HEAD at named commit"
3458 msgstr "成为指向该提交的分离头指针"
3460 #: builtin/checkout.c:1090
3461 msgid "set upstream info for new branch"
3462 msgstr "为新的分支设置上游信息"
3464 #: builtin/checkout.c:1092
3468 #: builtin/checkout.c:1092
3469 msgid "new unparented branch"
3472 #: builtin/checkout.c:1093
3473 msgid "checkout our version for unmerged files"
3474 msgstr "对尚未合并的文件检出我们的版本"
3476 #: builtin/checkout.c:1095
3477 msgid "checkout their version for unmerged files"
3478 msgstr "对尚未合并的文件检出他们的版本"
3480 #: builtin/checkout.c:1097
3481 msgid "force checkout (throw away local modifications)"
3482 msgstr "强制检出(丢弃本地修改)"
3484 #: builtin/checkout.c:1098
3485 msgid "perform a 3-way merge with the new branch"
3486 msgstr "和新的分支执行三路合并"
3488 #: builtin/checkout.c:1099 builtin/merge.c:225
3489 msgid "update ignored files (default)"
3490 msgstr "更新忽略的文件(默认)"
3492 #: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
3496 #: builtin/checkout.c:1101
3497 msgid "conflict style (merge or diff3)"
3498 msgstr "冲突输出风格(merge 或 diff3)"
3500 #: builtin/checkout.c:1104
3501 msgid "do not limit pathspecs to sparse entries only"
3502 msgstr "对路径不做稀疏检出的限制"
3504 #: builtin/checkout.c:1106
3505 msgid "second guess 'git checkout no-such-branch'"
3506 msgstr "再者猜测'git checkout no-such-branch'"
3508 #: builtin/checkout.c:1129
3509 msgid "-b, -B and --orphan are mutually exclusive"
3510 msgstr "-b、-B 和 --orphan 是互斥的"
3512 #: builtin/checkout.c:1146
3513 msgid "--track needs a branch name"
3514 msgstr "--track 需要一个分支名"
3516 #: builtin/checkout.c:1153
3517 msgid "Missing branch name; try -b"
3518 msgstr "缺少分支名;尝试 -b"
3520 #: builtin/checkout.c:1190
3521 msgid "invalid path specification"
3524 #: builtin/checkout.c:1197
3527 "Cannot update paths and switch to branch '%s' at the same time.\n"
3528 "Did you intend to checkout '%s' which can not be resolved as commit?"
3530 "不能同时更新路径并切换到分支'%s'。\n"
3531 "您是想要检出 '%s' 但其未能解析为提交么?"
3533 #: builtin/checkout.c:1202
3535 msgid "git checkout: --detach does not take a path argument '%s'"
3536 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
3538 #: builtin/checkout.c:1206
3540 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3541 "checking out of the index."
3543 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
3545 #: builtin/clean.c:26
3547 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3549 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
3551 #: builtin/clean.c:30
3553 msgid "Removing %s\n"
3556 #: builtin/clean.c:31
3558 msgid "Would remove %s\n"
3561 #: builtin/clean.c:32
3563 msgid "Skipping repository %s\n"
3566 #: builtin/clean.c:33
3568 msgid "Would skip repository %s\n"
3569 msgstr "将忽略版本库 %s\n"
3571 #: builtin/clean.c:34
3573 msgid "failed to remove %s"
3576 #: builtin/clean.c:295
3579 "1 - select a numbered item\n"
3580 "foo - select item based on unique prefix\n"
3581 " - (empty) select nothing"
3585 "foo - 通过标题选择一个选项\n"
3588 #: builtin/clean.c:299
3591 "1 - select a single item\n"
3592 "3-5 - select a range of items\n"
3593 "2-3,6-9 - select multiple ranges\n"
3594 "foo - select item based on unique prefix\n"
3595 "-... - unselect specified items\n"
3596 "* - choose all items\n"
3597 " - (empty) finish selecting"
3601 "3-5 - 选择一个范围内的所有选项\n"
3602 "2-3,6-9 - 选择多个范围内的所有选项\n"
3603 "foo - 通过标题选择一个选项\n"
3608 #: builtin/clean.c:517
3613 #: builtin/clean.c:659
3615 msgid "Input ignore patterns>> "
3616 msgstr "输入模版以排除条目>> "
3618 #: builtin/clean.c:696
3620 msgid "WARNING: Cannot find items matched by: %s"
3621 msgstr "警告:无法找到和 %s 匹配的条目"
3623 #: builtin/clean.c:717
3624 msgid "Select items to delete"
3627 #: builtin/clean.c:757
3632 #: builtin/clean.c:782
3636 #: builtin/clean.c:790
3638 "clean - start cleaning\n"
3639 "filter by pattern - exclude items from deletion\n"
3640 "select by numbers - select items to be deleted by numbers\n"
3641 "ask each - confirm each deletion (like \"rm -i\")\n"
3642 "quit - stop cleaning\n"
3643 "help - this screen\n"
3644 "? - help for prompt selection"
3647 "filter by pattern - 通过模版排除要删除的条目\n"
3648 "select by numbers - 通过数字选择要删除的条目\n"
3649 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3652 "? - 显示如何在提示符下选择的帮助"
3654 #: builtin/clean.c:817
3655 msgid "*** Commands ***"
3658 #: builtin/clean.c:818
3662 #: builtin/clean.c:826
3663 msgid "Would remove the following item:"
3664 msgid_plural "Would remove the following items:"
3665 msgstr[0] "将删除如下条目:"
3666 msgstr[1] "将删除如下条目:"
3668 #: builtin/clean.c:843
3669 msgid "No more files to clean, exiting."
3670 msgstr "没有要清理的文件,退出。"
3672 #: builtin/clean.c:874
3673 msgid "do not print names of files removed"
3676 #: builtin/clean.c:876
3680 #: builtin/clean.c:877
3681 msgid "interactive cleaning"
3684 #: builtin/clean.c:879
3685 msgid "remove whole directories"
3688 #: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
3689 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3693 #: builtin/clean.c:881
3694 msgid "add <pattern> to ignore rules"
3695 msgstr "添加<模式>到忽略规则"
3697 #: builtin/clean.c:882
3698 msgid "remove ignored files, too"
3701 #: builtin/clean.c:884
3702 msgid "remove only ignored files"
3705 #: builtin/clean.c:902
3706 msgid "-x and -X cannot be used together"
3707 msgstr "-x 和 -X 不能同时使用"
3709 #: builtin/clean.c:906
3711 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3714 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3716 #: builtin/clean.c:909
3718 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3721 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
3723 #: builtin/clone.c:36
3724 msgid "git clone [options] [--] <repo> [<dir>]"
3725 msgstr "git clone [选项] [--] <版本库> [<路径>]"
3727 #: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
3728 #: builtin/push.c:503
3729 msgid "force progress reporting"
3732 #: builtin/clone.c:66
3733 msgid "don't create a checkout"
3736 #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3737 msgid "create a bare repository"
3740 #: builtin/clone.c:71
3741 msgid "create a mirror repository (implies bare)"
3742 msgstr "创建一个镜像版本库(也是裸版本库)"
3744 #: builtin/clone.c:73
3745 msgid "to clone from a local repository"
3748 #: builtin/clone.c:75
3749 msgid "don't use local hardlinks, always copy"
3750 msgstr "不使用本地硬链接,始终复制"
3752 #: builtin/clone.c:77
3753 msgid "setup as shared repository"
3756 #: builtin/clone.c:79 builtin/clone.c:81
3757 msgid "initialize submodules in the clone"
3760 #: builtin/clone.c:82 builtin/init-db.c:483
3761 msgid "template-directory"
3764 #: builtin/clone.c:83 builtin/init-db.c:484
3765 msgid "directory from which templates will be used"
3768 #: builtin/clone.c:85
3769 msgid "reference repository"
3772 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
3776 #: builtin/clone.c:87
3777 msgid "use <name> instead of 'origin' to track upstream"
3778 msgstr "使用<名称>而不是 'origin' 去跟踪上游"
3780 #: builtin/clone.c:89
3781 msgid "checkout <branch> instead of the remote's HEAD"
3782 msgstr "检出<分支>而不是远程HEAD"
3784 #: builtin/clone.c:91
3785 msgid "path to git-upload-pack on the remote"
3786 msgstr "远程 git-upload-pack 路径"
3788 #: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
3792 #: builtin/clone.c:93
3793 msgid "create a shallow clone of that depth"
3794 msgstr "创建一个指定深度的浅克隆"
3796 #: builtin/clone.c:95
3797 msgid "clone only one branch, HEAD or --branch"
3798 msgstr "只克隆一个分支、HEAD 或 --branch"
3800 #: builtin/clone.c:96 builtin/init-db.c:492
3804 #: builtin/clone.c:97 builtin/init-db.c:493
3805 msgid "separate git dir from working tree"
3806 msgstr "git目录和工作区分离"
3808 #: builtin/clone.c:98
3812 #: builtin/clone.c:99
3813 msgid "set config inside the new repository"
3814 msgstr "在新版本库中设置配置信息"
3816 #: builtin/clone.c:252
3818 msgid "reference repository '%s' is not a local repository."
3819 msgstr "参考版本库 '%s' 不是一个本地版本库。"
3821 #: builtin/clone.c:256
3823 msgid "reference repository '%s' is shallow"
3824 msgstr "参考版本库 '%s' 是一个浅克隆"
3826 #: builtin/clone.c:259
3828 msgid "reference repository '%s' is grafted"
3829 msgstr "参考版本库 '%s' 已被嫁接"
3831 #: builtin/clone.c:321
3833 msgid "failed to create directory '%s'"
3834 msgstr "无法创建目录 '%s'"
3836 #: builtin/clone.c:323 builtin/diff.c:83
3838 msgid "failed to stat '%s'"
3839 msgstr "无法枚举 '%s' 状态"
3841 #: builtin/clone.c:325
3843 msgid "%s exists and is not a directory"
3844 msgstr "%s 存在且不是一个目录"
3846 #: builtin/clone.c:339
3848 msgid "failed to stat %s\n"
3849 msgstr "无法枚举 %s 状态\n"
3851 #: builtin/clone.c:361
3853 msgid "failed to create link '%s'"
3854 msgstr "无法创建链接 '%s'"
3856 #: builtin/clone.c:365
3858 msgid "failed to copy file to '%s'"
3859 msgstr "无法拷贝文件至 '%s'"
3861 #: builtin/clone.c:388 builtin/clone.c:565
3866 #: builtin/clone.c:401
3868 "Clone succeeded, but checkout failed.\n"
3869 "You can inspect what was checked out with 'git status'\n"
3870 "and retry the checkout with 'git checkout -f HEAD'\n"
3873 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3874 "'git checkout -f HEAD' 重试\n"
3876 #: builtin/clone.c:480
3878 msgid "Could not find remote branch %s to clone."
3879 msgstr "不能发现要克隆的远程分支 %s。"
3881 #: builtin/clone.c:560
3883 msgid "Checking connectivity... "
3886 #: builtin/clone.c:563
3887 msgid "remote did not send all necessary objects"
3888 msgstr "远程没有发送所有必须的对象"
3890 #: builtin/clone.c:627
3891 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3892 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3894 #: builtin/clone.c:658
3895 msgid "unable to checkout working tree"
3898 #: builtin/clone.c:768
3899 msgid "Too many arguments."
3902 #: builtin/clone.c:772
3903 msgid "You must specify a repository to clone."
3904 msgstr "您必须指定一个版本库来克隆。"
3906 #: builtin/clone.c:783
3908 msgid "--bare and --origin %s options are incompatible."
3909 msgstr "--bare 和 --origin %s 选项不兼容。"
3911 #: builtin/clone.c:786
3912 msgid "--bare and --separate-git-dir are incompatible."
3913 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3915 #: builtin/clone.c:799
3917 msgid "repository '%s' does not exist"
3918 msgstr "版本库 '%s' 不存在"
3920 #: builtin/clone.c:805 builtin/fetch.c:1143
3922 msgid "depth %s is not a positive number"
3923 msgstr "深度 %s 不是一个正数"
3925 #: builtin/clone.c:815
3927 msgid "destination path '%s' already exists and is not an empty directory."
3928 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
3930 #: builtin/clone.c:825
3932 msgid "working tree '%s' already exists."
3933 msgstr "工作区 '%s' 已经存在。"
3935 #: builtin/clone.c:838 builtin/clone.c:850
3937 msgid "could not create leading directories of '%s'"
3938 msgstr "不能为 '%s' 创建先导目录"
3940 #: builtin/clone.c:841
3942 msgid "could not create work tree dir '%s'."
3943 msgstr "不能为 '%s' 创建工作区目录。"
3945 #: builtin/clone.c:860
3947 msgid "Cloning into bare repository '%s'...\n"
3948 msgstr "克隆到裸版本库 '%s'...\n"
3950 #: builtin/clone.c:862
3952 msgid "Cloning into '%s'...\n"
3953 msgstr "正克隆到 '%s'...\n"
3955 #: builtin/clone.c:898
3956 msgid "--depth is ignored in local clones; use file:// instead."
3957 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3959 #: builtin/clone.c:901
3960 msgid "source repository is shallow, ignoring --local"
3961 msgstr "源版本库是浅克隆,忽略 --local"
3963 #: builtin/clone.c:906
3964 msgid "--local is ignored"
3965 msgstr "--local 被忽略"
3967 #: builtin/clone.c:910
3969 msgid "Don't know how to clone %s"
3972 #: builtin/clone.c:961 builtin/clone.c:969
3974 msgid "Remote branch %s not found in upstream %s"
3975 msgstr "远程分支 %s 在上游 %s 未发现"
3977 #: builtin/clone.c:972
3978 msgid "You appear to have cloned an empty repository."
3979 msgstr "您似乎克隆了一个空版本库。"
3981 #: builtin/column.c:9
3982 msgid "git column [options]"
3983 msgstr "git column [选项]"
3985 #: builtin/column.c:26
3986 msgid "lookup config vars"
3989 #: builtin/column.c:27 builtin/column.c:28
3990 msgid "layout to use"
3993 #: builtin/column.c:29
3994 msgid "Maximum width"
3997 #: builtin/column.c:30
3998 msgid "Padding space on left border"
4001 #: builtin/column.c:31
4002 msgid "Padding space on right border"
4005 #: builtin/column.c:32
4006 msgid "Padding space between columns"
4009 #: builtin/column.c:51
4010 msgid "--command must be the first argument"
4011 msgstr "--command 必须是第一个参数"
4013 #: builtin/commit.c:36
4014 msgid "git commit [options] [--] <pathspec>..."
4015 msgstr "git commit [选项] [--] <路径规则>..."
4017 #: builtin/commit.c:41
4018 msgid "git status [options] [--] <pathspec>..."
4019 msgstr "git status [选项] [--] <路径规则>..."
4021 #: builtin/commit.c:46
4023 "Your name and email address were configured automatically based\n"
4024 "on your username and hostname. Please check that they are accurate.\n"
4025 "You can suppress this message by setting them explicitly:\n"
4027 " git config --global user.name \"Your Name\"\n"
4028 " git config --global user.email you@example.com\n"
4030 "After doing this, you may fix the identity used for this commit with:\n"
4032 " git commit --amend --reset-author\n"
4034 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4035 "与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
4037 " git config --global user.name \"Your Name\"\n"
4038 " git config --global user.email you@example.com\n"
4040 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4042 " git commit --amend --reset-author\n"
4044 #: builtin/commit.c:58
4046 "You asked to amend the most recent commit, but doing so would make\n"
4047 "it empty. You can repeat your command with --allow-empty, or you can\n"
4048 "remove the commit entirely with \"git reset HEAD^\".\n"
4050 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4051 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
4053 #: builtin/commit.c:63
4055 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4056 "If you wish to commit it anyway, use:\n"
4058 " git commit --allow-empty\n"
4061 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4064 " git commit --allow-empty\n"
4067 #: builtin/commit.c:70
4068 msgid "Otherwise, please use 'git reset'\n"
4069 msgstr "否则,请使用命令 'git reset'\n"
4071 #: builtin/commit.c:73
4073 "If you wish to skip this commit, use:\n"
4077 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4078 "the remaining commits.\n"
4080 "如果您想跳过这个提交,使用命令:\n"
4084 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4087 #: builtin/commit.c:288
4088 msgid "failed to unpack HEAD tree object"
4089 msgstr "无法解包 HEAD 树对象"
4091 #: builtin/commit.c:328
4092 msgid "unable to create temporary index"
4095 #: builtin/commit.c:334
4096 msgid "interactive add failed"
4099 #: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
4100 msgid "unable to write new_index file"
4101 msgstr "无法写 new_index 文件"
4103 #: builtin/commit.c:418
4104 msgid "cannot do a partial commit during a merge."
4105 msgstr "在合并过程中不能做部分提交。"
4107 #: builtin/commit.c:420
4108 msgid "cannot do a partial commit during a cherry-pick."
4109 msgstr "在拣选过程中不能做部分提交。"
4111 #: builtin/commit.c:429
4112 msgid "cannot read the index"
4115 #: builtin/commit.c:447
4116 msgid "unable to write temporary index file"
4119 #: builtin/commit.c:557 builtin/commit.c:563
4121 msgid "invalid commit: %s"
4124 #: builtin/commit.c:585
4125 msgid "malformed --author parameter"
4126 msgstr "非法的 --author 参数"
4128 #: builtin/commit.c:592
4130 msgid "invalid date format: %s"
4133 #: builtin/commit.c:609
4135 msgid "Malformed ident string: '%s'"
4136 msgstr "非法的身份字符串:'%s'"
4138 #: builtin/commit.c:642
4140 "unable to select a comment character that is not used\n"
4141 "in the current commit message"
4142 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4144 #: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
4146 msgid "could not lookup commit %s"
4149 #: builtin/commit.c:691 builtin/shortlog.c:273
4151 msgid "(reading log message from standard input)\n"
4152 msgstr "(正从标准输入中读取日志信息)\n"
4154 #: builtin/commit.c:693
4155 msgid "could not read log from standard input"
4156 msgstr "不能从标准输入中读取日志信息"
4158 #: builtin/commit.c:697
4160 msgid "could not read log file '%s'"
4161 msgstr "不能读取日志文件 '%s'"
4163 #: builtin/commit.c:719
4164 msgid "could not read MERGE_MSG"
4165 msgstr "不能读取 MERGE_MSG"
4167 #: builtin/commit.c:723
4168 msgid "could not read SQUASH_MSG"
4169 msgstr "不能读取 SQUASH_MSG"
4171 #: builtin/commit.c:727
4173 msgid "could not read '%s'"
4176 #: builtin/commit.c:798
4177 msgid "could not write commit template"
4180 #: builtin/commit.c:816
4184 "It looks like you may be committing a merge.\n"
4185 "If this is not correct, please remove the file\n"
4190 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
4194 #: builtin/commit.c:821
4198 "It looks like you may be committing a cherry-pick.\n"
4199 "If this is not correct, please remove the file\n"
4204 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
4208 #: builtin/commit.c:834
4211 "Please enter the commit message for your changes. Lines starting\n"
4212 "with '%c' will be ignored, and an empty message aborts the commit.\n"
4214 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
4217 #: builtin/commit.c:841
4220 "Please enter the commit message for your changes. Lines starting\n"
4221 "with '%c' will be kept; you may remove them yourself if you want to.\n"
4222 "An empty message aborts the commit.\n"
4224 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4225 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4227 # 译者:为保证在输出中对齐,注意调整句中空格!
4228 #: builtin/commit.c:855
4230 msgid "%sAuthor: %.*s <%.*s>"
4231 msgstr "%s作者: %.*s <%.*s>"
4233 # 译者:为保证在输出中对齐,注意调整句中空格!
4234 #: builtin/commit.c:863
4239 # 译者:为保证在输出中对齐,注意调整句中空格!
4240 #: builtin/commit.c:870
4242 msgid "%sCommitter: %.*s <%.*s>"
4243 msgstr "%s提交者:%.*s <%.*s>"
4245 #: builtin/commit.c:888
4246 msgid "Cannot read index"
4249 #: builtin/commit.c:945
4250 msgid "Error building trees"
4253 #: builtin/commit.c:960 builtin/tag.c:495
4255 msgid "Please supply the message using either -m or -F option.\n"
4256 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4258 #: builtin/commit.c:1061
4260 msgid "No existing author found with '%s'"
4261 msgstr "没有找到匹配 '%s' 的作者"
4263 #: builtin/commit.c:1076 builtin/commit.c:1316
4265 msgid "Invalid untracked files mode '%s'"
4266 msgstr "无效的未追踪文件参数 '%s'"
4268 #: builtin/commit.c:1113
4269 msgid "--long and -z are incompatible"
4270 msgstr "--long 和 -z 选项不兼容"
4272 #: builtin/commit.c:1143
4273 msgid "Using both --reset-author and --author does not make sense"
4274 msgstr "同时使用 --reset-author 和 --author 没有意义"
4276 #: builtin/commit.c:1152
4277 msgid "You have nothing to amend."
4280 #: builtin/commit.c:1155
4281 msgid "You are in the middle of a merge -- cannot amend."
4282 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4284 #: builtin/commit.c:1157
4285 msgid "You are in the middle of a cherry-pick -- cannot amend."
4286 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4288 #: builtin/commit.c:1160
4289 msgid "Options --squash and --fixup cannot be used together"
4290 msgstr "选项 --squash 和 --fixup 不能同时使用"
4292 #: builtin/commit.c:1170
4293 msgid "Only one of -c/-C/-F/--fixup can be used."
4294 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4296 #: builtin/commit.c:1172
4297 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4298 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4300 #: builtin/commit.c:1180
4301 msgid "--reset-author can be used only with -C, -c or --amend."
4302 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4304 #: builtin/commit.c:1197
4305 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4306 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4308 #: builtin/commit.c:1199
4309 msgid "No paths with --include/--only does not make sense."
4310 msgstr "参数 --include/--only 不跟路径没有意义。"
4312 #: builtin/commit.c:1201
4313 msgid "Clever... amending the last one with dirty index."
4314 msgstr "聪明... 在索引不干净下修补最后的提交。"
4316 #: builtin/commit.c:1203
4317 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4318 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
4320 #: builtin/commit.c:1215 builtin/tag.c:727
4322 msgid "Invalid cleanup mode %s"
4325 #: builtin/commit.c:1220
4326 msgid "Paths with -a does not make sense."
4327 msgstr "路径和 -a 选项同时使用没有意义。"
4329 #: builtin/commit.c:1330 builtin/commit.c:1595
4330 msgid "show status concisely"
4333 #: builtin/commit.c:1332 builtin/commit.c:1597
4334 msgid "show branch information"
4337 #: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
4338 msgid "machine-readable output"
4341 #: builtin/commit.c:1337 builtin/commit.c:1601
4342 msgid "show status in long format (default)"
4343 msgstr "以长格式显示状态(默认)"
4345 #: builtin/commit.c:1340 builtin/commit.c:1604
4346 msgid "terminate entries with NUL"
4349 #: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
4350 #: builtin/fast-export.c:706 builtin/tag.c:602
4354 #: builtin/commit.c:1343 builtin/commit.c:1607
4355 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4356 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
4358 #: builtin/commit.c:1346
4359 msgid "show ignored files"
4362 #: builtin/commit.c:1347 parse-options.h:153
4366 #: builtin/commit.c:1348
4368 "ignore changes to submodules, optional when: all, dirty, untracked. "
4371 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
4373 #: builtin/commit.c:1350
4374 msgid "list untracked files in columns"
4375 msgstr "以列的方式显示未跟踪的文件"
4377 #: builtin/commit.c:1419
4378 msgid "couldn't look up newly created commit"
4381 #: builtin/commit.c:1421
4382 msgid "could not parse newly created commit"
4385 #: builtin/commit.c:1469
4386 msgid "detached HEAD"
4389 # 译者:中文字符串拼接,可删除前导空格
4390 #: builtin/commit.c:1471
4391 msgid " (root-commit)"
4394 #: builtin/commit.c:1565
4395 msgid "suppress summary after successful commit"
4396 msgstr "提交成功后不显示概述信息"
4398 #: builtin/commit.c:1566
4399 msgid "show diff in commit message template"
4400 msgstr "在提交说明模板里显示差异"
4402 #: builtin/commit.c:1568
4403 msgid "Commit message options"
4406 #: builtin/commit.c:1569 builtin/tag.c:600
4407 msgid "read message from file"
4410 #: builtin/commit.c:1570
4414 #: builtin/commit.c:1570
4415 msgid "override author for commit"
4418 #: builtin/commit.c:1571 builtin/gc.c:286
4422 #: builtin/commit.c:1571
4423 msgid "override date for commit"
4426 #: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
4427 #: builtin/notes.c:566 builtin/tag.c:598
4431 #: builtin/commit.c:1572
4432 msgid "commit message"
4435 #: builtin/commit.c:1573
4436 msgid "reuse and edit message from specified commit"
4437 msgstr "重用并编辑指定提交的提交说明"
4439 #: builtin/commit.c:1574
4440 msgid "reuse message from specified commit"
4441 msgstr "重用指定提交的提交说明"
4443 #: builtin/commit.c:1575
4444 msgid "use autosquash formatted message to fixup specified commit"
4445 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4447 #: builtin/commit.c:1576
4448 msgid "use autosquash formatted message to squash specified commit"
4449 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4451 #: builtin/commit.c:1577
4452 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4453 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
4455 #: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
4456 msgid "add Signed-off-by:"
4457 msgstr "添加 Signed-off-by: 签名"
4459 #: builtin/commit.c:1579
4460 msgid "use specified template file"
4463 #: builtin/commit.c:1580
4464 msgid "force edit of commit"
4467 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
4468 #: builtin/commit.c:1581
4472 #: builtin/commit.c:1581 builtin/tag.c:603
4473 msgid "how to strip spaces and #comments from message"
4474 msgstr "设置如何删除提交说明里的空格和#注释"
4476 #: builtin/commit.c:1582
4477 msgid "include status in commit message template"
4478 msgstr "在提交说明模板里包含状态信息"
4480 #: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
4481 #: builtin/tag.c:604
4485 #: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
4486 msgid "GPG sign commit"
4489 #: builtin/commit.c:1587
4490 msgid "Commit contents options"
4493 #: builtin/commit.c:1588
4494 msgid "commit all changed files"
4497 #: builtin/commit.c:1589
4498 msgid "add specified files to index for commit"
4499 msgstr "添加指定的文件到索引区等待提交"
4501 #: builtin/commit.c:1590
4502 msgid "interactively add files"
4505 #: builtin/commit.c:1591
4506 msgid "interactively add changes"
4509 #: builtin/commit.c:1592
4510 msgid "commit only specified files"
4513 #: builtin/commit.c:1593
4514 msgid "bypass pre-commit hook"
4515 msgstr "绕过 pre-commit 钩子"
4517 #: builtin/commit.c:1594
4518 msgid "show what would be committed"
4521 #: builtin/commit.c:1605
4522 msgid "amend previous commit"
4525 #: builtin/commit.c:1606
4526 msgid "bypass post-rewrite hook"
4527 msgstr "绕过 post-rewrite 钩子"
4529 #: builtin/commit.c:1611
4530 msgid "ok to record an empty change"
4533 #: builtin/commit.c:1613
4534 msgid "ok to record a change with an empty message"
4537 #: builtin/commit.c:1641
4538 msgid "could not parse HEAD commit"
4539 msgstr "不能解析 HEAD 提交"
4541 #: builtin/commit.c:1680 builtin/merge.c:518
4543 msgid "could not open '%s' for reading"
4544 msgstr "不能为读入打开 '%s'"
4546 #: builtin/commit.c:1687
4548 msgid "Corrupt MERGE_HEAD file (%s)"
4549 msgstr "损坏的 MERGE_HEAD 文件(%s)"
4551 #: builtin/commit.c:1694
4552 msgid "could not read MERGE_MODE"
4553 msgstr "不能读取 MERGE_MODE"
4555 #: builtin/commit.c:1713
4557 msgid "could not read commit message: %s"
4558 msgstr "不能读取提交说明:%s"
4560 #: builtin/commit.c:1724
4562 msgid "Aborting commit; you did not edit the message.\n"
4563 msgstr "终止提交;您未更改来自模版的提交说明。\n"
4565 #: builtin/commit.c:1729
4567 msgid "Aborting commit due to empty commit message.\n"
4568 msgstr "终止提交因为提交说明为空。\n"
4570 #: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
4571 msgid "failed to write commit object"
4574 #: builtin/commit.c:1756
4575 msgid "cannot lock HEAD ref"
4576 msgstr "无法锁定 HEAD 引用"
4578 #: builtin/commit.c:1769
4579 msgid "cannot update HEAD ref"
4580 msgstr "无法更新 HEAD 引用"
4582 #: builtin/commit.c:1780
4584 "Repository has been updated, but unable to write\n"
4585 "new_index file. Check that disk is not full or quota is\n"
4586 "not exceeded, and then \"git reset HEAD\" to recover."
4588 "版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4589 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
4591 #: builtin/config.c:8
4592 msgid "git config [options]"
4593 msgstr "git config [选项]"
4595 #: builtin/config.c:53
4596 msgid "Config file location"
4599 #: builtin/config.c:54
4600 msgid "use global config file"
4603 #: builtin/config.c:55
4604 msgid "use system config file"
4607 #: builtin/config.c:56
4608 msgid "use repository config file"
4611 #: builtin/config.c:57
4612 msgid "use given config file"
4615 #: builtin/config.c:58
4619 #: builtin/config.c:58
4620 msgid "read config from given blob object"
4621 msgstr "从给定的数据对象读取配置"
4623 #: builtin/config.c:59
4627 #: builtin/config.c:60
4628 msgid "get value: name [value-regex]"
4629 msgstr "获取值:name [value-regex]"
4631 #: builtin/config.c:61
4632 msgid "get all values: key [value-regex]"
4633 msgstr "获得所有的值:key [value-regex]"
4635 #: builtin/config.c:62
4636 msgid "get values for regexp: name-regex [value-regex]"
4637 msgstr "根据正则表达式获得值:name-regex [value-regex]"
4639 #: builtin/config.c:63
4640 msgid "get value specific for the URL: section[.var] URL"
4641 msgstr "获得 URL 取值:section[.var] URL"
4643 #: builtin/config.c:64
4644 msgid "replace all matching variables: name value [value_regex]"
4645 msgstr "替换所有匹配的变量:name value [value_regex]"
4647 #: builtin/config.c:65
4648 msgid "add a new variable: name value"
4649 msgstr "添加一个新的变量:name value"
4651 #: builtin/config.c:66
4652 msgid "remove a variable: name [value-regex]"
4653 msgstr "删除一个变量:name [value-regex]"
4655 #: builtin/config.c:67
4656 msgid "remove all matches: name [value-regex]"
4657 msgstr "删除所有匹配项:name [value-regex]"
4659 #: builtin/config.c:68
4660 msgid "rename section: old-name new-name"
4661 msgstr "重命名小节:old-name new-name"
4663 #: builtin/config.c:69
4664 msgid "remove a section: name"
4665 msgstr "删除一个小节:name"
4667 #: builtin/config.c:70
4671 #: builtin/config.c:71
4672 msgid "open an editor"
4675 #: builtin/config.c:72 builtin/config.c:73
4679 #: builtin/config.c:72
4680 msgid "find the color configured: [default]"
4681 msgstr "找到配置的颜色:[默认]"
4683 #: builtin/config.c:73
4684 msgid "find the color setting: [stdout-is-tty]"
4685 msgstr "找到颜色设置:[stdout-is-tty]"
4687 #: builtin/config.c:74
4691 #: builtin/config.c:75
4692 msgid "value is \"true\" or \"false\""
4693 msgstr "值是 \"true\" 或 \"false\""
4695 #: builtin/config.c:76
4696 msgid "value is decimal number"
4699 #: builtin/config.c:77
4700 msgid "value is --bool or --int"
4701 msgstr "值是 --bool or --int"
4703 #: builtin/config.c:78
4704 msgid "value is a path (file or directory name)"
4705 msgstr "值是一个路径(文件或目录名)"
4707 #: builtin/config.c:79
4711 #: builtin/config.c:80
4712 msgid "terminate values with NUL byte"
4715 #: builtin/config.c:81
4716 msgid "respect include directives on lookup"
4717 msgstr "查询时参照 include 指令递归查找"
4719 #: builtin/count-objects.c:82
4720 msgid "git count-objects [-v] [-H | --human-readable]"
4721 msgstr "git count-objects [-v] [-H | --human-readable]"
4723 #: builtin/count-objects.c:97
4724 msgid "print sizes in human readable format"
4725 msgstr "以用户可读的格式显示大小"
4727 #: builtin/describe.c:16
4728 msgid "git describe [options] <commit-ish>*"
4729 msgstr "git describe [选项] <提交号>*"
4731 #: builtin/describe.c:17
4732 msgid "git describe [options] --dirty"
4733 msgstr "git describe [选项] --dirty"
4735 #: builtin/describe.c:216
4737 msgid "annotated tag %s not available"
4738 msgstr "注释 tag %s 无效"
4740 #: builtin/describe.c:220
4742 msgid "annotated tag %s has no embedded name"
4743 msgstr "注释 tag %s 没有嵌入名称"
4745 #: builtin/describe.c:222
4747 msgid "tag '%s' is really '%s' here"
4748 msgstr "tag '%s' 的确是在 '%s'"
4750 #: builtin/describe.c:249
4752 msgid "Not a valid object name %s"
4753 msgstr "不是一个有效的对象名 %s"
4755 #: builtin/describe.c:252
4757 msgid "%s is not a valid '%s' object"
4758 msgstr "%s 不是一个有效的 '%s' 对象"
4760 #: builtin/describe.c:269
4762 msgid "no tag exactly matches '%s'"
4763 msgstr "没有 tag 准确匹配 '%s'"
4765 #: builtin/describe.c:271
4767 msgid "searching to describe %s\n"
4770 #: builtin/describe.c:318
4772 msgid "finished search at %s\n"
4775 #: builtin/describe.c:345
4778 "No annotated tags can describe '%s'.\n"
4779 "However, there were unannotated tags: try --tags."
4781 "没有注释 tag 能描述 '%s'。\n"
4782 "然而,有非注释 tag:尝试 --tags。"
4784 #: builtin/describe.c:349
4787 "No tags can describe '%s'.\n"
4788 "Try --always, or create some tags."
4790 "没有注释 tag 能描述 '%s'。\n"
4791 "尝试 --always,或者创建一些 tag。"
4793 #: builtin/describe.c:370
4795 msgid "traversed %lu commits\n"
4796 msgstr "已遍历 %lu 个提交\n"
4798 #: builtin/describe.c:373
4801 "more than %i tags found; listed %i most recent\n"
4802 "gave up search at %s\n"
4804 "发现多于 %i 个 tag,列出最近的 %i 个\n"
4807 #: builtin/describe.c:395
4808 msgid "find the tag that comes after the commit"
4809 msgstr "寻找提交之后的 tag(用于描述提交)"
4811 #: builtin/describe.c:396
4812 msgid "debug search strategy on stderr"
4813 msgstr "在标准错误上调试搜索策略"
4815 #: builtin/describe.c:397
4819 #: builtin/describe.c:398
4820 msgid "use any tag, even unannotated"
4821 msgstr "使用任意 tag,即使未带注解"
4823 #: builtin/describe.c:399
4824 msgid "always use long format"
4827 #: builtin/describe.c:400
4828 msgid "only follow first parent"
4831 #: builtin/describe.c:403
4832 msgid "only output exact matches"
4835 #: builtin/describe.c:405
4836 msgid "consider <n> most recent tags (default: 10)"
4837 msgstr "考虑最近 <n> 个 tags(默认:10)"
4839 #: builtin/describe.c:407
4840 msgid "only consider tags matching <pattern>"
4841 msgstr "只考虑匹配 <模式> 的 tags"
4843 #: builtin/describe.c:409 builtin/name-rev.c:318
4844 msgid "show abbreviated commit object as fallback"
4845 msgstr "显示简写的提交号作为后备"
4847 #: builtin/describe.c:410
4851 #: builtin/describe.c:411
4852 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4853 msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
4855 #: builtin/describe.c:429
4856 msgid "--long is incompatible with --abbrev=0"
4857 msgstr "--long 与 --abbrev=0 不兼容"
4859 #: builtin/describe.c:455
4860 msgid "No names found, cannot describe anything."
4861 msgstr "没有发现名称,无法描述任何东西。"
4863 #: builtin/describe.c:475
4864 msgid "--dirty is incompatible with commit-ishes"
4865 msgstr "--dirty 不能与提交同时使用"
4867 #: builtin/diff.c:85
4869 msgid "'%s': not a regular file or symlink"
4870 msgstr "'%s':不是一个正规文件或符号链接"
4872 #: builtin/diff.c:236
4874 msgid "invalid option: %s"
4877 #: builtin/diff.c:357
4878 msgid "Not a git repository"
4879 msgstr "不是一个 git 版本库"
4881 #: builtin/diff.c:400
4883 msgid "invalid object '%s' given."
4884 msgstr "提供了无效对象 '%s'。"
4886 #: builtin/diff.c:409
4888 msgid "more than two blobs given: '%s'"
4889 msgstr "提供了超过两个数据(blob)对象:'%s'"
4891 #: builtin/diff.c:416
4893 msgid "unhandled object '%s' given."
4894 msgstr "无法处理的对象 '%s'。"
4896 #: builtin/fast-export.c:23
4897 msgid "git fast-export [rev-list-opts]"
4898 msgstr "git fast-export [rev-list-opts]"
4900 #: builtin/fast-export.c:702
4901 msgid "show progress after <n> objects"
4902 msgstr "在 <n> 个对象之后显示进度"
4904 #: builtin/fast-export.c:704
4905 msgid "select handling of signed tags"
4906 msgstr "选择如何处理签名 tags"
4908 #: builtin/fast-export.c:707
4909 msgid "select handling of tags that tag filtered objects"
4910 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
4912 #: builtin/fast-export.c:710
4913 msgid "Dump marks to this file"
4916 #: builtin/fast-export.c:712
4917 msgid "Import marks from this file"
4920 #: builtin/fast-export.c:714
4921 msgid "Fake a tagger when tags lack one"
4922 msgstr "当 tags 缺少标记者字段时,假装提供一个"
4924 #: builtin/fast-export.c:716
4925 msgid "Output full tree for each commit"
4928 #: builtin/fast-export.c:718
4929 msgid "Use the done feature to terminate the stream"
4930 msgstr "使用 done 功能来终止流"
4932 #: builtin/fast-export.c:719
4933 msgid "Skip output of blob data"
4936 #: builtin/fast-export.c:720
4940 #: builtin/fast-export.c:721
4941 msgid "Apply refspec to exported refs"
4942 msgstr "对导出的引用应用引用表达式"
4944 #: builtin/fetch.c:20
4945 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4946 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
4948 #: builtin/fetch.c:21
4949 msgid "git fetch [<options>] <group>"
4950 msgstr "git fetch [<选项>] <组>"
4952 #: builtin/fetch.c:22
4953 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4954 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
4956 #: builtin/fetch.c:23
4957 msgid "git fetch --all [<options>]"
4958 msgstr "git fetch --all [<选项>]"
4960 #: builtin/fetch.c:90
4961 msgid "fetch from all remotes"
4964 #: builtin/fetch.c:92
4965 msgid "append to .git/FETCH_HEAD instead of overwriting"
4966 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
4968 #: builtin/fetch.c:94
4969 msgid "path to upload pack on remote end"
4972 #: builtin/fetch.c:95
4973 msgid "force overwrite of local branch"
4976 #: builtin/fetch.c:97
4977 msgid "fetch from multiple remotes"
4980 #: builtin/fetch.c:99
4981 msgid "fetch all tags and associated objects"
4982 msgstr "抓取所有的 tags 和关联对象"
4984 #: builtin/fetch.c:101
4985 msgid "do not fetch all tags (--no-tags)"
4986 msgstr "不抓取任何 tags (--no-tags)"
4988 #: builtin/fetch.c:103
4989 msgid "prune remote-tracking branches no longer on remote"
4990 msgstr "清除远程已经不存在的分支的跟踪分支"
4993 #: builtin/fetch.c:104
4997 #: builtin/fetch.c:105
4998 msgid "control recursive fetching of submodules"
5001 #: builtin/fetch.c:109
5002 msgid "keep downloaded pack"
5005 #: builtin/fetch.c:111
5006 msgid "allow updating of HEAD ref"
5007 msgstr "允许更新 HEAD 引用"
5009 #: builtin/fetch.c:114
5010 msgid "deepen history of shallow clone"
5013 #: builtin/fetch.c:116
5014 msgid "convert to a complete repository"
5015 msgstr "转换为一个完整的版本库"
5017 #: builtin/fetch.c:118 builtin/log.c:1205
5021 #: builtin/fetch.c:119
5022 msgid "prepend this to submodule path output"
5023 msgstr "在子模组路径输出的前面加上此目录"
5025 #: builtin/fetch.c:122
5026 msgid "default mode for recursion"
5029 #: builtin/fetch.c:124
5030 msgid "accept refs that update .git/shallow"
5031 msgstr "接受更新 .git/shallow 的引用"
5033 #: builtin/fetch.c:125
5037 #: builtin/fetch.c:126
5038 msgid "specify fetch refmap"
5039 msgstr "指定获取操作的引用映射"
5041 #: builtin/fetch.c:376
5042 msgid "Couldn't find remote ref HEAD"
5043 msgstr "无法发现远程 HEAD 引用"
5045 #: builtin/fetch.c:440
5047 msgid "object %s not found"
5050 #: builtin/fetch.c:445
5051 msgid "[up to date]"
5054 #: builtin/fetch.c:459
5056 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5057 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5059 #: builtin/fetch.c:460 builtin/fetch.c:546
5063 #: builtin/fetch.c:471
5064 msgid "[tag update]"
5068 #: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
5069 msgid " (unable to update local ref)"
5070 msgstr " (不能更新本地引用)"
5072 #: builtin/fetch.c:491
5076 #: builtin/fetch.c:494
5077 msgid "[new branch]"
5080 #: builtin/fetch.c:497
5084 #: builtin/fetch.c:542
5085 msgid "unable to update local ref"
5088 #: builtin/fetch.c:542
5089 msgid "forced update"
5092 #: builtin/fetch.c:548
5093 msgid "(non-fast-forward)"
5096 #: builtin/fetch.c:581 builtin/fetch.c:814
5098 msgid "cannot open %s: %s\n"
5099 msgstr "无法打开 %s:%s\n"
5101 #: builtin/fetch.c:590
5103 msgid "%s did not send all necessary objects\n"
5104 msgstr "%s 未发送所有必须的对象\n"
5106 #: builtin/fetch.c:608
5108 msgid "reject %s because shallow roots are not allowed to be updated"
5109 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5111 #: builtin/fetch.c:696 builtin/fetch.c:779
5116 #: builtin/fetch.c:707
5119 "some local refs could not be updated; try running\n"
5120 " 'git remote prune %s' to remove any old, conflicting branches"
5122 "一些本地引用不能被更新;尝试运行\n"
5123 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5126 #: builtin/fetch.c:759
5128 msgid " (%s will become dangling)"
5129 msgstr " (%s 将成为摇摆状态)"
5132 #: builtin/fetch.c:760
5134 msgid " (%s has become dangling)"
5135 msgstr " (%s 已成为摇摆状态)"
5137 #: builtin/fetch.c:784
5141 #: builtin/fetch.c:785 builtin/remote.c:1059
5145 #: builtin/fetch.c:804
5147 msgid "Refusing to fetch into current branch %s of non-bare repository"
5148 msgstr "拒绝获取到非裸版本库的当前分支 %s"
5150 #: builtin/fetch.c:823
5152 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5153 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5155 #: builtin/fetch.c:826
5157 msgid "Option \"%s\" is ignored for %s\n"
5158 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5160 #: builtin/fetch.c:882
5162 msgid "Don't know how to fetch from %s"
5163 msgstr "不知道如何从 %s 获取"
5165 #: builtin/fetch.c:1044
5167 msgid "Fetching %s\n"
5170 #: builtin/fetch.c:1046 builtin/remote.c:90
5172 msgid "Could not fetch %s"
5175 #: builtin/fetch.c:1064
5177 "No remote repository specified. Please, specify either a URL or a\n"
5178 "remote name from which new revisions should be fetched."
5179 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
5181 #: builtin/fetch.c:1087
5182 msgid "You need to specify a tag name."
5183 msgstr "您需要指定一个 tag 名称。"
5185 #: builtin/fetch.c:1131
5186 msgid "--depth and --unshallow cannot be used together"
5187 msgstr "--depth 和 --unshallow 不能同时使用"
5189 #: builtin/fetch.c:1133
5190 msgid "--unshallow on a complete repository does not make sense"
5191 msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5193 #: builtin/fetch.c:1156
5194 msgid "fetch --all does not take a repository argument"
5195 msgstr "fetch --all 不能带一个版本库参数"
5197 #: builtin/fetch.c:1158
5198 msgid "fetch --all does not make sense with refspecs"
5199 msgstr "fetch --all 带引用规则没有任何意义"
5201 #: builtin/fetch.c:1169
5203 msgid "No such remote or remote group: %s"
5204 msgstr "没有这样的远程或远程组:%s"
5206 #: builtin/fetch.c:1177
5207 msgid "Fetching a group and specifying refspecs does not make sense"
5208 msgstr "获取组并指定引用规则没有意义"
5210 #: builtin/fmt-merge-msg.c:13
5211 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5213 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5215 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
5216 #: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
5217 #: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
5218 #: parse-options.h:132 parse-options.h:239
5222 #: builtin/fmt-merge-msg.c:664
5223 msgid "populate log with at most <n> entries from shortlog"
5224 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
5226 #: builtin/fmt-merge-msg.c:667
5227 msgid "alias for --log (deprecated)"
5228 msgstr "参数 --log 的别名(已弃用)"
5230 #: builtin/fmt-merge-msg.c:670
5234 #: builtin/fmt-merge-msg.c:671
5235 msgid "use <text> as start of message"
5236 msgstr "使用 <文本> 作为提交说明的开始"
5238 #: builtin/fmt-merge-msg.c:672
5239 msgid "file to read from"
5242 #: builtin/for-each-ref.c:1051
5243 msgid "git for-each-ref [options] [<pattern>]"
5244 msgstr "git for-each-ref [选项] [<模式>]"
5246 #: builtin/for-each-ref.c:1066
5247 msgid "quote placeholders suitably for shells"
5248 msgstr "引用占位符适用于 shells"
5250 #: builtin/for-each-ref.c:1068
5251 msgid "quote placeholders suitably for perl"
5252 msgstr "引用占位符适用于 perl"
5254 #: builtin/for-each-ref.c:1070
5255 msgid "quote placeholders suitably for python"
5256 msgstr "引用占位符适用于 python"
5258 #: builtin/for-each-ref.c:1072
5259 msgid "quote placeholders suitably for tcl"
5260 msgstr "引用占位符适用于 tcl"
5262 #: builtin/for-each-ref.c:1075
5263 msgid "show only <n> matched refs"
5264 msgstr "只显示 <n> 个匹配的引用"
5266 #: builtin/for-each-ref.c:1076 builtin/replace.c:435
5270 #: builtin/for-each-ref.c:1076
5271 msgid "format to use for the output"
5274 #: builtin/for-each-ref.c:1077
5278 #: builtin/for-each-ref.c:1078
5279 msgid "field name to sort on"
5282 #: builtin/fsck.c:147 builtin/prune.c:172
5283 msgid "Checking connectivity"
5286 #: builtin/fsck.c:538
5287 msgid "Checking object directories"
5290 #: builtin/fsck.c:601
5291 msgid "git fsck [options] [<object>...]"
5292 msgstr "git fsck [选项] [<对象>...]"
5294 #: builtin/fsck.c:607
5295 msgid "show unreachable objects"
5298 #: builtin/fsck.c:608
5299 msgid "show dangling objects"
5302 #: builtin/fsck.c:609
5306 #: builtin/fsck.c:610
5307 msgid "report root nodes"
5310 #: builtin/fsck.c:611
5311 msgid "make index objects head nodes"
5312 msgstr "将索引亦作为检查的头节点"
5314 #: builtin/fsck.c:612
5315 msgid "make reflogs head nodes (default)"
5316 msgstr "将引用日志作为检查的头节点(默认)"
5318 #: builtin/fsck.c:613
5319 msgid "also consider packs and alternate objects"
5322 #: builtin/fsck.c:614
5323 msgid "enable more strict checking"
5326 #: builtin/fsck.c:616
5327 msgid "write dangling objects in .git/lost-found"
5328 msgstr "将摇摆对象写入 .git/lost-found 中"
5330 #: builtin/fsck.c:617 builtin/prune.c:144
5331 msgid "show progress"
5334 #: builtin/fsck.c:667
5335 msgid "Checking objects"
5339 msgid "git gc [options]"
5340 msgstr "git gc [选项]"
5344 msgid "Invalid %s: '%s'"
5345 msgstr "无效的 %s:'%s'"
5349 msgid "insanely long object directory %.*s"
5350 msgstr "不正常的长对象目录 %.*s"
5353 msgid "prune unreferenced objects"
5357 msgid "be more thorough (increased runtime)"
5358 msgstr "更彻底(增加运行时间)"
5361 msgid "enable auto-gc mode"
5365 msgid "force running gc even if there may be another gc running"
5366 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5370 msgid "Auto packing the repository in background for optimum performance.\n"
5371 msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5375 msgid "Auto packing the repository for optimum performance.\n"
5376 msgstr "自动打包版本库以求最佳性能。\n"
5380 msgid "See \"git help gc\" for manual housekeeping.\n"
5381 msgstr "手工维护参见 \"git help gc\"。\n"
5386 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5388 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5392 "There are too many unreachable loose objects; run 'git prune' to remove them."
5393 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
5395 #: builtin/grep.c:23
5396 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5397 msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
5399 #: builtin/grep.c:218
5401 msgid "grep: failed to create thread: %s"
5402 msgstr "grep:无法创建线程:%s"
5404 #: builtin/grep.c:441 builtin/grep.c:476
5406 msgid "unable to read tree (%s)"
5409 #: builtin/grep.c:491
5411 msgid "unable to grep from object of type %s"
5412 msgstr "无法抓取来自于 %s 类型的对象"
5414 #: builtin/grep.c:547
5416 msgid "switch `%c' expects a numerical value"
5417 msgstr "开关 `%c' 期望一个数字值"
5419 #: builtin/grep.c:564
5421 msgid "cannot open '%s'"
5424 #: builtin/grep.c:638
5425 msgid "search in index instead of in the work tree"
5426 msgstr "在索引区搜索而不是在工作区"
5428 #: builtin/grep.c:640
5429 msgid "find in contents not managed by git"
5430 msgstr "在未被 git 管理的内容中查找"
5432 # 译者:中文字符串拼接,可删除前导空格
5433 #: builtin/grep.c:642
5434 msgid "search in both tracked and untracked files"
5435 msgstr "在跟踪和未跟踪的文件中搜索"
5437 #: builtin/grep.c:644
5438 msgid "search also in ignored files"
5441 #: builtin/grep.c:647
5442 msgid "show non-matching lines"
5445 #: builtin/grep.c:649
5446 msgid "case insensitive matching"
5449 #: builtin/grep.c:651
5450 msgid "match patterns only at word boundaries"
5453 #: builtin/grep.c:653
5454 msgid "process binary files as text"
5455 msgstr "把二进制文件当做文本处理"
5457 #: builtin/grep.c:655
5458 msgid "don't match patterns in binary files"
5459 msgstr "不在二进制文件中匹配模式"
5461 #: builtin/grep.c:658
5462 msgid "process binary files with textconv filters"
5463 msgstr "用 textconv 过滤器处理二进制文件"
5465 #: builtin/grep.c:660
5466 msgid "descend at most <depth> levels"
5467 msgstr "最多以指定的深度向下寻找"
5469 #: builtin/grep.c:664
5470 msgid "use extended POSIX regular expressions"
5471 msgstr "使用扩展的 POSIX 正则表达式"
5473 #: builtin/grep.c:667
5474 msgid "use basic POSIX regular expressions (default)"
5475 msgstr "使用基本的 POSIX 正则表达式(默认)"
5477 #: builtin/grep.c:670
5478 msgid "interpret patterns as fixed strings"
5479 msgstr "把模式解析为固定的字符串"
5481 #: builtin/grep.c:673
5482 msgid "use Perl-compatible regular expressions"
5483 msgstr "使用 Perl 兼容的正则表达式"
5485 #: builtin/grep.c:676
5486 msgid "show line numbers"
5489 #: builtin/grep.c:677
5490 msgid "don't show filenames"
5493 #: builtin/grep.c:678
5494 msgid "show filenames"
5497 #: builtin/grep.c:680
5498 msgid "show filenames relative to top directory"
5499 msgstr "显示相对于顶级目录的文件名"
5501 #: builtin/grep.c:682
5502 msgid "show only filenames instead of matching lines"
5503 msgstr "只显示文件名而不显示匹配的行"
5505 #: builtin/grep.c:684
5506 msgid "synonym for --files-with-matches"
5507 msgstr "和 --files-with-matches 同义"
5509 #: builtin/grep.c:687
5510 msgid "show only the names of files without match"
5513 #: builtin/grep.c:689
5514 msgid "print NUL after filenames"
5515 msgstr "在文件名后输出 NUL 字符"
5517 #: builtin/grep.c:691
5518 msgid "show the number of matches instead of matching lines"
5519 msgstr "显示总匹配行数,而不显示匹配的行"
5521 #: builtin/grep.c:692
5522 msgid "highlight matches"
5525 #: builtin/grep.c:694
5526 msgid "print empty line between matches from different files"
5527 msgstr "在不同文件的匹配项之间打印空行"
5529 #: builtin/grep.c:696
5530 msgid "show filename only once above matches from same file"
5531 msgstr "只在同一文件的匹配项的上面显示一次文件名"
5533 #: builtin/grep.c:699
5534 msgid "show <n> context lines before and after matches"
5535 msgstr "显示匹配项前后的 <n> 行上下文"
5537 #: builtin/grep.c:702
5538 msgid "show <n> context lines before matches"
5539 msgstr "显示匹配项前 <n> 行上下文"
5541 #: builtin/grep.c:704
5542 msgid "show <n> context lines after matches"
5543 msgstr "显示匹配项后 <n> 行上下文"
5545 #: builtin/grep.c:705
5546 msgid "shortcut for -C NUM"
5549 #: builtin/grep.c:708
5550 msgid "show a line with the function name before matches"
5551 msgstr "在匹配的前面显示一行函数名"
5553 #: builtin/grep.c:710
5554 msgid "show the surrounding function"
5555 msgstr "显示所在函数的前后内容"
5557 #: builtin/grep.c:713
5558 msgid "read patterns from file"
5561 #: builtin/grep.c:715
5562 msgid "match <pattern>"
5565 #: builtin/grep.c:717
5566 msgid "combine patterns specified with -e"
5567 msgstr "组合用 -e 参数设定的模式"
5569 #: builtin/grep.c:729
5570 msgid "indicate hit with exit status without output"
5571 msgstr "不输出,而用退出码标识命中状态"
5573 #: builtin/grep.c:731
5574 msgid "show only matches from files that match all patterns"
5575 msgstr "只显示匹配所有模式的文件中的匹配"
5577 #: builtin/grep.c:733
5578 msgid "show parse tree for grep expression"
5579 msgstr "显示 grep 表达式的解析树"
5581 #: builtin/grep.c:737
5585 #: builtin/grep.c:737
5586 msgid "show matching files in the pager"
5589 #: builtin/grep.c:740
5590 msgid "allow calling of grep(1) (ignored by this build)"
5591 msgstr "允许调用 grep(1)(本次构建忽略)"
5593 #: builtin/grep.c:741 builtin/show-ref.c:187
5597 #: builtin/grep.c:808
5598 msgid "no pattern given."
5601 #: builtin/grep.c:866
5602 msgid "--open-files-in-pager only works on the worktree"
5603 msgstr "--open-files-in-pager 仅用于工作区"
5605 #: builtin/grep.c:892
5606 msgid "--cached or --untracked cannot be used with --no-index."
5607 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
5609 #: builtin/grep.c:897
5610 msgid "--no-index or --untracked cannot be used with revs."
5611 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
5613 #: builtin/grep.c:900
5614 msgid "--[no-]exclude-standard cannot be used for tracked contents."
5615 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
5617 #: builtin/grep.c:908
5618 msgid "both --cached and trees are given."
5619 msgstr "同时给出了 --cached 和树对象。"
5621 #: builtin/hash-object.c:60
5623 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5626 "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5629 #: builtin/hash-object.c:61
5630 msgid "git hash-object --stdin-paths < <list-of-paths>"
5631 msgstr "git hash-object --stdin-paths < <路径列表>"
5633 #: builtin/hash-object.c:72 builtin/tag.c:609
5637 #: builtin/hash-object.c:72
5641 #: builtin/hash-object.c:73
5642 msgid "write the object into the object database"
5645 #: builtin/hash-object.c:74
5646 msgid "read the object from stdin"
5649 #: builtin/hash-object.c:76
5650 msgid "store file as is without filters"
5651 msgstr "原样存储文件不使用过滤器"
5653 #: builtin/hash-object.c:77
5654 msgid "process file as it were from this path"
5655 msgstr "处理文件并假设其来自于此路径"
5657 #: builtin/help.c:41
5658 msgid "print all available commands"
5661 #: builtin/help.c:42
5662 msgid "print list of useful guides"
5665 #: builtin/help.c:43
5666 msgid "show man page"
5669 #: builtin/help.c:44
5670 msgid "show manual in web browser"
5671 msgstr "在 web 浏览器中显示手册"
5673 #: builtin/help.c:46
5674 msgid "show info page"
5677 #: builtin/help.c:52
5678 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5679 msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5681 #: builtin/help.c:64
5683 msgid "unrecognized help format '%s'"
5684 msgstr "未能识别的帮助格式 '%s'"
5686 #: builtin/help.c:92
5687 msgid "Failed to start emacsclient."
5688 msgstr "无法启动 emacsclient。"
5690 #: builtin/help.c:105
5691 msgid "Failed to parse emacsclient version."
5692 msgstr "无法解析 emacsclient 版本。"
5694 #: builtin/help.c:113
5696 msgid "emacsclient version '%d' too old (< 22)."
5697 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
5699 #: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
5701 msgid "failed to exec '%s': %s"
5702 msgstr "无法执行 '%s':%s"
5704 #: builtin/help.c:216
5707 "'%s': path for unsupported man viewer.\n"
5708 "Please consider using 'man.<tool>.cmd' instead."
5710 "'%s':不支持的 man 手册查看器的路径。\n"
5711 "请使用 'man.<tool>.cmd'。"
5713 #: builtin/help.c:228
5716 "'%s': cmd for supported man viewer.\n"
5717 "Please consider using 'man.<tool>.path' instead."
5719 "'%s': 支持的 man 手册查看器命令。\n"
5720 "请使用 'man.<tool>.path'。"
5722 #: builtin/help.c:353
5724 msgid "'%s': unknown man viewer."
5725 msgstr "'%s':未知的 man 查看器。"
5727 #: builtin/help.c:370
5728 msgid "no man viewer handled the request"
5729 msgstr "没有 man 查看器处理此请求"
5731 #: builtin/help.c:378
5732 msgid "no info viewer handled the request"
5733 msgstr "没有 info 查看器处理此请求"
5735 #: builtin/help.c:424
5736 msgid "Defining attributes per path"
5739 #: builtin/help.c:425
5740 msgid "A Git glossary"
5743 #: builtin/help.c:426
5744 msgid "Specifies intentionally untracked files to ignore"
5747 #: builtin/help.c:427
5748 msgid "Defining submodule properties"
5751 #: builtin/help.c:428
5752 msgid "Specifying revisions and ranges for Git"
5753 msgstr "指定 Git 的版本和版本范围"
5755 #: builtin/help.c:429
5756 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5757 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5759 #: builtin/help.c:430
5760 msgid "An overview of recommended workflows with Git"
5761 msgstr "Git 推荐的工作流概览"
5763 #: builtin/help.c:442
5764 msgid "The common Git guides are:\n"
5765 msgstr "最常用的 Git 向导有:\n"
5767 #: builtin/help.c:463 builtin/help.c:480
5772 #: builtin/help.c:496
5774 msgid "`git %s' is aliased to `%s'"
5775 msgstr "`git %s' 是 `%s' 的别名"
5777 #: builtin/index-pack.c:145
5779 msgid "unable to open %s"
5782 #: builtin/index-pack.c:191
5784 msgid "object type mismatch at %s"
5785 msgstr "%s 的对象类型不匹配"
5787 #: builtin/index-pack.c:211
5789 msgid "did not receive expected object %s"
5790 msgstr "未能获取期望的对象 %s"
5792 #: builtin/index-pack.c:214
5794 msgid "object %s: expected type %s, found %s"
5795 msgstr "对象 %s:期待类型 %s,却是 %s"
5797 #: builtin/index-pack.c:256
5799 msgid "cannot fill %d byte"
5800 msgid_plural "cannot fill %d bytes"
5801 msgstr[0] "无法填充 %d 字节"
5802 msgstr[1] "无法填充 %d 字节"
5804 #: builtin/index-pack.c:266
5806 msgstr "过早的文件结束符(EOF)"
5808 #: builtin/index-pack.c:267
5809 msgid "read error on input"
5812 #: builtin/index-pack.c:279
5813 msgid "used more bytes than were available"
5816 #: builtin/index-pack.c:286
5817 msgid "pack too large for current definition of off_t"
5818 msgstr "包太大超过了当前 off_t 的定义"
5820 #: builtin/index-pack.c:302
5822 msgid "unable to create '%s'"
5825 #: builtin/index-pack.c:307
5827 msgid "cannot open packfile '%s'"
5828 msgstr "无法打开包文件 '%s'"
5830 #: builtin/index-pack.c:321
5831 msgid "pack signature mismatch"
5834 #: builtin/index-pack.c:323
5836 msgid "pack version %<PRIu32> unsupported"
5837 msgstr "不支持包版本 %<PRIu32>"
5839 #: builtin/index-pack.c:341
5841 msgid "pack has bad object at offset %lu: %s"
5842 msgstr "包中有错误的对象位于 %lu:%s"
5844 #: builtin/index-pack.c:462
5846 msgid "inflate returned %d"
5849 #: builtin/index-pack.c:511
5850 msgid "offset value overflow for delta base object"
5851 msgstr "偏移值覆盖了 delta 基准对象"
5853 #: builtin/index-pack.c:519
5854 msgid "delta base offset is out of bound"
5855 msgstr "delta 基准偏移越界"
5857 #: builtin/index-pack.c:527
5859 msgid "unknown object type %d"
5862 #: builtin/index-pack.c:558
5863 msgid "cannot pread pack file"
5866 #: builtin/index-pack.c:560
5868 msgid "premature end of pack file, %lu byte missing"
5869 msgid_plural "premature end of pack file, %lu bytes missing"
5870 msgstr[0] "包文件过早结束,缺少 %lu 字节"
5871 msgstr[1] "包文件过早结束,缺少 %lu 字节"
5873 #: builtin/index-pack.c:586
5874 msgid "serious inflate inconsistency"
5877 #: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
5878 #: builtin/index-pack.c:740 builtin/index-pack.c:749
5880 msgid "SHA1 COLLISION FOUND WITH %s !"
5881 msgstr "发现 %s 出现 SHA1 冲突!"
5883 #: builtin/index-pack.c:680 builtin/pack-objects.c:162
5884 #: builtin/pack-objects.c:254
5886 msgid "unable to read %s"
5889 #: builtin/index-pack.c:746
5891 msgid "cannot read existing object %s"
5892 msgstr "不能读取现存对象 %s"
5894 #: builtin/index-pack.c:760
5896 msgid "invalid blob object %s"
5897 msgstr "无效的数据(blob)对象 %s"
5899 #: builtin/index-pack.c:774
5904 #: builtin/index-pack.c:777
5905 msgid "Error in object"
5908 #: builtin/index-pack.c:779
5910 msgid "Not all child objects of %s are reachable"
5911 msgstr "%s 的所有子对象并非都可达"
5913 #: builtin/index-pack.c:851 builtin/index-pack.c:881
5914 msgid "failed to apply delta"
5917 #: builtin/index-pack.c:1022
5918 msgid "Receiving objects"
5921 #: builtin/index-pack.c:1022
5922 msgid "Indexing objects"
5925 #: builtin/index-pack.c:1048
5926 msgid "pack is corrupted (SHA1 mismatch)"
5927 msgstr "包冲突(SHA1 不匹配)"
5929 #: builtin/index-pack.c:1053
5930 msgid "cannot fstat packfile"
5933 #: builtin/index-pack.c:1056
5934 msgid "pack has junk at the end"
5937 #: builtin/index-pack.c:1067
5938 msgid "confusion beyond insanity in parse_pack_objects()"
5939 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5941 #: builtin/index-pack.c:1090
5942 msgid "Resolving deltas"
5945 #: builtin/index-pack.c:1100
5947 msgid "unable to create thread: %s"
5950 #: builtin/index-pack.c:1142
5951 msgid "confusion beyond insanity"
5954 #: builtin/index-pack.c:1150
5956 msgid "completed with %d local objects"
5957 msgstr "完成 %d 个本地对象"
5959 #: builtin/index-pack.c:1160
5961 msgid "Unexpected tail checksum for %s (disk corruption?)"
5962 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
5964 #: builtin/index-pack.c:1164
5966 msgid "pack has %d unresolved delta"
5967 msgid_plural "pack has %d unresolved deltas"
5968 msgstr[0] "包有 %d 个未解决的 delta"
5969 msgstr[1] "包有 %d 个未解决的 delta"
5971 #: builtin/index-pack.c:1189
5973 msgid "unable to deflate appended object (%d)"
5974 msgstr "不能压缩附加对象(%d)"
5976 #: builtin/index-pack.c:1268
5978 msgid "local object %s is corrupt"
5979 msgstr "本地对象 %s 已损坏"
5981 #: builtin/index-pack.c:1292
5982 msgid "error while closing pack file"
5985 #: builtin/index-pack.c:1305
5987 msgid "cannot write keep file '%s'"
5988 msgstr "无法写保留文件 '%s'"
5990 #: builtin/index-pack.c:1313
5992 msgid "cannot close written keep file '%s'"
5993 msgstr "无法关闭保留文件 '%s'"
5995 #: builtin/index-pack.c:1326
5996 msgid "cannot store pack file"
5999 #: builtin/index-pack.c:1337
6000 msgid "cannot store index file"
6003 #: builtin/index-pack.c:1370
6005 msgid "bad pack.indexversion=%<PRIu32>"
6006 msgstr "坏的 pack.indexversion=%<PRIu32>"
6008 #: builtin/index-pack.c:1376
6010 msgid "invalid number of threads specified (%d)"
6011 msgstr "指定的线程数无效(%d)"
6013 #: builtin/index-pack.c:1380 builtin/index-pack.c:1559
6015 msgid "no threads support, ignoring %s"
6016 msgstr "没有线程支持,忽略 %s"
6018 #: builtin/index-pack.c:1438
6020 msgid "Cannot open existing pack file '%s'"
6021 msgstr "无法打开现存包文件 '%s'"
6023 #: builtin/index-pack.c:1440
6025 msgid "Cannot open existing pack idx file for '%s'"
6026 msgstr "无法为 %s 打开包索引文件"
6028 #: builtin/index-pack.c:1487
6030 msgid "non delta: %d object"
6031 msgid_plural "non delta: %d objects"
6032 msgstr[0] "非 delta:%d 个对象"
6033 msgstr[1] "非 delta:%d 个对象"
6035 #: builtin/index-pack.c:1494
6037 msgid "chain length = %d: %lu object"
6038 msgid_plural "chain length = %d: %lu objects"
6039 msgstr[0] "链长 = %d: %lu 对象"
6040 msgstr[1] "链长 = %d: %lu 对象"
6042 #: builtin/index-pack.c:1523
6043 msgid "Cannot come back to cwd"
6046 #: builtin/index-pack.c:1571 builtin/index-pack.c:1574
6047 #: builtin/index-pack.c:1586 builtin/index-pack.c:1590
6052 #: builtin/index-pack.c:1604
6053 msgid "--fix-thin cannot be used without --stdin"
6054 msgstr "--fix-thin 不能和 --stdin 同时使用"
6056 #: builtin/index-pack.c:1608 builtin/index-pack.c:1617
6058 msgid "packfile name '%s' does not end with '.pack'"
6059 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6061 #: builtin/index-pack.c:1625
6062 msgid "--verify with no packfile name given"
6063 msgstr "--verify 没有提供包名参数"
6065 #: builtin/init-db.c:35
6067 msgid "Could not make %s writable by group"
6068 msgstr "不能设置 %s 为组可写"
6070 #: builtin/init-db.c:62
6072 msgid "insanely long template name %s"
6075 #: builtin/init-db.c:67
6077 msgid "cannot stat '%s'"
6078 msgstr "不能枚举 '%s' 状态"
6080 #: builtin/init-db.c:73
6082 msgid "cannot stat template '%s'"
6083 msgstr "不能枚举模版 '%s' 状态"
6085 #: builtin/init-db.c:80
6087 msgid "cannot opendir '%s'"
6088 msgstr "不能打开目录 '%s'"
6090 #: builtin/init-db.c:97
6092 msgid "cannot readlink '%s'"
6093 msgstr "不能读取链接 '%s'"
6095 #: builtin/init-db.c:99
6097 msgid "insanely long symlink %s"
6100 #: builtin/init-db.c:102
6102 msgid "cannot symlink '%s' '%s'"
6103 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
6105 #: builtin/init-db.c:106
6107 msgid "cannot copy '%s' to '%s'"
6108 msgstr "不能拷贝 '%s' 至 '%s'"
6110 #: builtin/init-db.c:110
6112 msgid "ignoring template %s"
6115 #: builtin/init-db.c:133
6117 msgid "insanely long template path %s"
6120 #: builtin/init-db.c:141
6122 msgid "templates not found %s"
6125 #: builtin/init-db.c:154
6127 msgid "not copying templates of a wrong format version %d from '%s'"
6128 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
6130 #: builtin/init-db.c:192
6132 msgid "insane git directory %s"
6133 msgstr "不正常的 git 目录 %s"
6135 #: builtin/init-db.c:323 builtin/init-db.c:326
6137 msgid "%s already exists"
6140 #: builtin/init-db.c:355
6142 msgid "unable to handle file type %d"
6143 msgstr "不能处理 %d 类型的文件"
6145 #: builtin/init-db.c:358
6147 msgid "unable to move %s to %s"
6148 msgstr "不能移动 %s 至 %s"
6150 #. TRANSLATORS: The first '%s' is either "Reinitialized
6151 #. existing" or "Initialized empty", the second " shared" or
6152 #. "", and the last '%s%s' is the verbatim directory name.
6153 #: builtin/init-db.c:418
6155 msgid "%s%s Git repository in %s%s\n"
6156 msgstr "%s%s Git 版本库于 %s%s\n"
6158 #: builtin/init-db.c:419
6159 msgid "Reinitialized existing"
6162 #: builtin/init-db.c:419
6163 msgid "Initialized empty"
6166 # 译者:中文字符串拼接,可删除前导空格
6167 #: builtin/init-db.c:420
6171 #: builtin/init-db.c:439
6172 msgid "cannot tell cwd"
6175 #: builtin/init-db.c:465
6177 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6178 "shared[=<permissions>]] [directory]"
6180 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6183 #: builtin/init-db.c:488
6187 #: builtin/init-db.c:489
6188 msgid "specify that the git repository is to be shared amongst several users"
6189 msgstr "指定 git 版本库是多个用户之间共享的"
6191 #: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
6195 #: builtin/init-db.c:523 builtin/init-db.c:528
6197 msgid "cannot mkdir %s"
6200 #: builtin/init-db.c:532
6202 msgid "cannot chdir to %s"
6205 #: builtin/init-db.c:554
6208 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6211 "不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6214 #: builtin/init-db.c:578
6215 msgid "Cannot access current working directory"
6218 #: builtin/init-db.c:585
6220 msgid "Cannot access work tree '%s'"
6221 msgstr "不能访问工作区 '%s'"
6224 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6225 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
6228 msgid " or: git show [options] <object>..."
6229 msgstr " 或者:git show [选项] <对象>..."
6231 #: builtin/log.c:127
6232 msgid "suppress diff output"
6235 #: builtin/log.c:128
6239 #: builtin/log.c:129
6240 msgid "Use mail map file"
6243 #: builtin/log.c:130
6244 msgid "decorate options"
6247 #: builtin/log.c:229
6249 msgid "Final output: %d %s\n"
6250 msgstr "最终输出:%d %s\n"
6252 #: builtin/log.c:470 builtin/log.c:562
6254 msgid "Could not read object %s"
6257 #: builtin/log.c:586
6259 msgid "Unknown type: %d"
6262 #: builtin/log.c:687
6263 msgid "format.headers without value"
6264 msgstr "format.headers 没有值"
6266 #: builtin/log.c:771
6267 msgid "name of output directory is too long"
6270 #: builtin/log.c:787
6272 msgid "Cannot open patch file %s"
6273 msgstr "无法打开补丁文件 %s"
6275 #: builtin/log.c:801
6276 msgid "Need exactly one range."
6279 #: builtin/log.c:809
6280 msgid "Not a range."
6283 #: builtin/log.c:916
6284 msgid "Cover letter needs email format"
6287 #: builtin/log.c:995
6289 msgid "insane in-reply-to: %s"
6290 msgstr "不正常的 in-reply-to:%s"
6292 #: builtin/log.c:1023
6293 msgid "git format-patch [options] [<since> | <revision range>]"
6294 msgstr "git format-patch [选项] [<从> | <修订集范围>]"
6296 #: builtin/log.c:1068
6297 msgid "Two output directories?"
6300 #: builtin/log.c:1183
6301 msgid "use [PATCH n/m] even with a single patch"
6302 msgstr "使用 [PATCH n/m],即使只有一个补丁"
6304 #: builtin/log.c:1186
6305 msgid "use [PATCH] even with multiple patches"
6306 msgstr "使用 [PATCH],即使有多个补丁"
6308 #: builtin/log.c:1190
6309 msgid "print patches to standard out"
6312 #: builtin/log.c:1192
6313 msgid "generate a cover letter"
6316 #: builtin/log.c:1194
6317 msgid "use simple number sequence for output file names"
6318 msgstr "使用简单的数字序列作为输出文件名"
6320 #: builtin/log.c:1195
6324 #: builtin/log.c:1196
6325 msgid "use <sfx> instead of '.patch'"
6326 msgstr "使用 <后缀> 代替 '.patch'"
6328 #: builtin/log.c:1198
6329 msgid "start numbering patches at <n> instead of 1"
6330 msgstr "补丁以 <n> 开始编号,而不是1"
6332 #: builtin/log.c:1200
6333 msgid "mark the series as Nth re-roll"
6334 msgstr "标记补丁系列是第几次重制"
6336 #: builtin/log.c:1202
6337 msgid "Use [<prefix>] instead of [PATCH]"
6338 msgstr "使用 [<前缀>] 代替 [PATCH]"
6340 #: builtin/log.c:1205
6341 msgid "store resulting files in <dir>"
6342 msgstr "把结果文件存储在 <dir>"
6344 #: builtin/log.c:1208
6345 msgid "don't strip/add [PATCH]"
6346 msgstr "不删除/添加 [PATCH]"
6348 #: builtin/log.c:1211
6349 msgid "don't output binary diffs"
6352 #: builtin/log.c:1213
6353 msgid "don't include a patch matching a commit upstream"
6354 msgstr "不包含已在上游提交中的补丁"
6356 #: builtin/log.c:1215
6357 msgid "show patch format instead of default (patch + stat)"
6358 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
6360 #: builtin/log.c:1217
6364 #: builtin/log.c:1218
6368 #: builtin/log.c:1219
6369 msgid "add email header"
6372 #: builtin/log.c:1220 builtin/log.c:1222
6376 #: builtin/log.c:1220
6377 msgid "add To: header"
6380 #: builtin/log.c:1222
6381 msgid "add Cc: header"
6384 #: builtin/log.c:1224
6388 #: builtin/log.c:1225
6389 msgid "set From address to <ident> (or committer ident if absent)"
6390 msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6392 #: builtin/log.c:1227
6396 #: builtin/log.c:1228
6397 msgid "make first mail a reply to <message-id>"
6398 msgstr "使第一封邮件作为对 <message-id> 的回复"
6400 #: builtin/log.c:1229 builtin/log.c:1232
6404 #: builtin/log.c:1230
6405 msgid "attach the patch"
6408 #: builtin/log.c:1233
6409 msgid "inline the patch"
6412 #: builtin/log.c:1237
6413 msgid "enable message threading, styles: shallow, deep"
6414 msgstr "启用邮件线索,风格:浅,深"
6416 #: builtin/log.c:1239
6420 #: builtin/log.c:1240
6421 msgid "add a signature"
6424 #: builtin/log.c:1242
6425 msgid "add a signature from a file"
6428 #: builtin/log.c:1243
6429 msgid "don't print the patch filenames"
6432 #: builtin/log.c:1317
6434 msgid "invalid ident line: %s"
6435 msgstr "包含无效的身份标识:%s"
6437 #: builtin/log.c:1332
6438 msgid "-n and -k are mutually exclusive."
6439 msgstr "-n 和 -k 互斥。"
6441 #: builtin/log.c:1334
6442 msgid "--subject-prefix and -k are mutually exclusive."
6443 msgstr "--subject-prefix 和 -k 互斥。"
6445 #: builtin/log.c:1342
6446 msgid "--name-only does not make sense"
6447 msgstr "--name-only 无意义"
6449 #: builtin/log.c:1344
6450 msgid "--name-status does not make sense"
6451 msgstr "--name-status 无意义"
6453 #: builtin/log.c:1346
6454 msgid "--check does not make sense"
6455 msgstr "--check 无意义"
6457 #: builtin/log.c:1369
6458 msgid "standard output, or directory, which one?"
6459 msgstr "标准输出或目录,哪一个?"
6461 #: builtin/log.c:1371
6463 msgid "Could not create directory '%s'"
6464 msgstr "不能创建目录 '%s'"
6466 #: builtin/log.c:1468
6468 msgid "unable to read signature file '%s'"
6469 msgstr "无法读取签名文件 '%s'"
6471 #: builtin/log.c:1531
6472 msgid "Failed to create output files"
6475 #: builtin/log.c:1579
6476 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6477 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
6479 #: builtin/log.c:1634
6482 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
6483 msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
6485 #: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
6487 msgid "Unknown commit %s"
6490 #: builtin/ls-files.c:401
6491 msgid "git ls-files [options] [<file>...]"
6492 msgstr "git ls-files [选项] [<文件>...]"
6494 #: builtin/ls-files.c:458
6495 msgid "identify the file status with tags"
6498 #: builtin/ls-files.c:460
6499 msgid "use lowercase letters for 'assume unchanged' files"
6500 msgstr "使用小写字母表示 '假设未改变的' 文件"
6502 #: builtin/ls-files.c:462
6503 msgid "show cached files in the output (default)"
6504 msgstr "显示缓存的文件(默认)"
6506 #: builtin/ls-files.c:464
6507 msgid "show deleted files in the output"
6510 #: builtin/ls-files.c:466
6511 msgid "show modified files in the output"
6514 #: builtin/ls-files.c:468
6515 msgid "show other files in the output"
6518 #: builtin/ls-files.c:470
6519 msgid "show ignored files in the output"
6522 #: builtin/ls-files.c:473
6523 msgid "show staged contents' object name in the output"
6524 msgstr "显示暂存区内容的对象名称"
6526 #: builtin/ls-files.c:475
6527 msgid "show files on the filesystem that need to be removed"
6528 msgstr "显示文件系统需要删除的文件"
6530 #: builtin/ls-files.c:477
6531 msgid "show 'other' directories' name only"
6532 msgstr "只显示“其他”目录的名称"
6534 #: builtin/ls-files.c:480
6535 msgid "don't show empty directories"
6538 #: builtin/ls-files.c:483
6539 msgid "show unmerged files in the output"
6542 #: builtin/ls-files.c:485
6543 msgid "show resolve-undo information"
6544 msgstr "显示 resolve-undo 信息"
6546 #: builtin/ls-files.c:487
6547 msgid "skip files matching pattern"
6550 #: builtin/ls-files.c:490
6551 msgid "exclude patterns are read from <file>"
6552 msgstr "从 <文件> 中读取排除模式"
6554 #: builtin/ls-files.c:493
6555 msgid "read additional per-directory exclude patterns in <file>"
6556 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6558 #: builtin/ls-files.c:495
6559 msgid "add the standard git exclusions"
6560 msgstr "添加标准的 git 排除"
6562 #: builtin/ls-files.c:498
6563 msgid "make the output relative to the project top directory"
6564 msgstr "显示相对于顶级目录的文件名"
6566 #: builtin/ls-files.c:501
6567 msgid "if any <file> is not in the index, treat this as an error"
6568 msgstr "如果任何 <文件> 都不在索引区,视为错误"
6570 #: builtin/ls-files.c:502
6574 #: builtin/ls-files.c:503
6575 msgid "pretend that paths removed since <tree-ish> are still present"
6576 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6578 #: builtin/ls-files.c:505
6579 msgid "show debugging data"
6582 #: builtin/ls-tree.c:28
6583 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6584 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
6586 #: builtin/ls-tree.c:126
6587 msgid "only show trees"
6590 #: builtin/ls-tree.c:128
6591 msgid "recurse into subtrees"
6594 #: builtin/ls-tree.c:130
6595 msgid "show trees when recursing"
6598 #: builtin/ls-tree.c:133
6599 msgid "terminate entries with NUL byte"
6602 #: builtin/ls-tree.c:134
6603 msgid "include object size"
6606 #: builtin/ls-tree.c:136 builtin/ls-tree.c:138
6607 msgid "list only filenames"
6610 #: builtin/ls-tree.c:141
6611 msgid "use full path names"
6614 #: builtin/ls-tree.c:143
6615 msgid "list entire tree; not just current directory (implies --full-name)"
6616 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
6618 #: builtin/merge.c:43
6619 msgid "git merge [options] [<commit>...]"
6620 msgstr "git merge [选项] [<提交>...]"
6622 #: builtin/merge.c:44
6623 msgid "git merge [options] <msg> HEAD <commit>"
6624 msgstr "git merge [选项] <说明> HEAD <提交>"
6626 #: builtin/merge.c:45
6627 msgid "git merge --abort"
6628 msgstr "git merge --abort"
6630 #: builtin/merge.c:98
6631 msgid "switch `m' requires a value"
6632 msgstr "开关 `m' 需要一个值"
6634 #: builtin/merge.c:135
6636 msgid "Could not find merge strategy '%s'.\n"
6637 msgstr "不能找到合并策略 '%s'。\n"
6639 #: builtin/merge.c:136
6641 msgid "Available strategies are:"
6644 #: builtin/merge.c:141
6646 msgid "Available custom strategies are:"
6649 #: builtin/merge.c:191
6650 msgid "do not show a diffstat at the end of the merge"
6651 msgstr "在合并的最后不显示差异统计"
6653 #: builtin/merge.c:194
6654 msgid "show a diffstat at the end of the merge"
6655 msgstr "在合并的最后显示差异统计"
6657 #: builtin/merge.c:195
6658 msgid "(synonym to --stat)"
6659 msgstr "(和 --stat 同义)"
6661 #: builtin/merge.c:197
6662 msgid "add (at most <n>) entries from shortlog to merge commit message"
6663 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
6665 #: builtin/merge.c:200
6666 msgid "create a single commit instead of doing a merge"
6667 msgstr "创建一个单独的提交而不是做一次合并"
6669 #: builtin/merge.c:202
6670 msgid "perform a commit if the merge succeeds (default)"
6671 msgstr "如果合并成功,执行一次提交(默认)"
6673 #: builtin/merge.c:204
6674 msgid "edit message before committing"
6677 #: builtin/merge.c:205
6678 msgid "allow fast-forward (default)"
6681 #: builtin/merge.c:207
6682 msgid "abort if fast-forward is not possible"
6683 msgstr "如果不能快进就放弃合并"
6685 #: builtin/merge.c:211
6686 msgid "Verify that the named commit has a valid GPG signature"
6687 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6689 #: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6693 #: builtin/merge.c:213
6694 msgid "merge strategy to use"
6697 #: builtin/merge.c:214
6698 msgid "option=value"
6699 msgstr "option=value"
6701 #: builtin/merge.c:215
6702 msgid "option for selected merge strategy"
6705 #: builtin/merge.c:217
6706 msgid "merge commit message (for a non-fast-forward merge)"
6707 msgstr "合并的提交说明(针对非快进式合并)"
6709 #: builtin/merge.c:221
6710 msgid "abort the current in-progress merge"
6711 msgstr "放弃当前正在进行的合并"
6713 #: builtin/merge.c:250
6714 msgid "could not run stash."
6717 #: builtin/merge.c:255
6718 msgid "stash failed"
6721 #: builtin/merge.c:260
6723 msgid "not a valid object: %s"
6724 msgstr "不是一个有效对象:%s"
6726 #: builtin/merge.c:279 builtin/merge.c:296
6727 msgid "read-tree failed"
6731 #: builtin/merge.c:326
6732 msgid " (nothing to squash)"
6735 #: builtin/merge.c:339
6737 msgid "Squash commit -- not updating HEAD\n"
6738 msgstr "压缩提交 -- 未更新 HEAD\n"
6740 #: builtin/merge.c:371
6741 msgid "Writing SQUASH_MSG"
6742 msgstr "写入 SQUASH_MSG"
6744 #: builtin/merge.c:373
6745 msgid "Finishing SQUASH_MSG"
6746 msgstr "完成 SQUASH_MSG"
6748 #: builtin/merge.c:396
6750 msgid "No merge message -- not updating HEAD\n"
6751 msgstr "无合并信息 -- 未更新 HEAD\n"
6753 #: builtin/merge.c:446
6755 msgid "'%s' does not point to a commit"
6756 msgstr "'%s' 没有指向一个提交"
6758 #: builtin/merge.c:558
6760 msgid "Bad branch.%s.mergeoptions string: %s"
6761 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
6763 #: builtin/merge.c:653
6764 msgid "git write-tree failed to write a tree"
6765 msgstr "git write-tree 无法写入一树对象"
6767 #: builtin/merge.c:678
6768 msgid "Not handling anything other than two heads merge."
6769 msgstr "不能处理两个头合并之外的任何操作。"
6771 #: builtin/merge.c:692
6773 msgid "Unknown option for merge-recursive: -X%s"
6774 msgstr "merge-recursive 的未知选项:-X%s"
6776 #: builtin/merge.c:705
6778 msgid "unable to write %s"
6781 #: builtin/merge.c:794
6783 msgid "Could not read from '%s'"
6784 msgstr "不能从 '%s' 读取"
6786 #: builtin/merge.c:803
6788 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6789 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6791 #: builtin/merge.c:809
6794 "Please enter a commit message to explain why this merge is necessary,\n"
6795 "especially if it merges an updated upstream into a topic branch.\n"
6797 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
6800 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6803 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
6805 #: builtin/merge.c:833
6806 msgid "Empty commit message."
6809 #: builtin/merge.c:845
6811 msgid "Wonderful.\n"
6814 #: builtin/merge.c:908
6816 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6817 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6819 #: builtin/merge.c:924
6821 msgid "'%s' is not a commit"
6822 msgstr "'%s' 不是一个提交"
6824 #: builtin/merge.c:965
6825 msgid "No current branch."
6828 #: builtin/merge.c:967
6829 msgid "No remote for the current branch."
6830 msgstr "当前分支没有对应的远程版本库。"
6832 #: builtin/merge.c:969
6833 msgid "No default upstream defined for the current branch."
6834 msgstr "当前分支没有定义默认的上游分支。"
6836 #: builtin/merge.c:974
6838 msgid "No remote-tracking branch for %s from %s"
6839 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
6841 #: builtin/merge.c:1130
6842 msgid "There is no merge to abort (MERGE_HEAD missing)."
6843 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
6845 #: builtin/merge.c:1146 git-pull.sh:31
6847 "You have not concluded your merge (MERGE_HEAD exists).\n"
6848 "Please, commit your changes before you can merge."
6850 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
6853 #: builtin/merge.c:1149 git-pull.sh:34
6854 msgid "You have not concluded your merge (MERGE_HEAD exists)."
6855 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6857 #: builtin/merge.c:1153
6859 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6860 "Please, commit your changes before you can merge."
6862 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
6865 #: builtin/merge.c:1156
6866 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6867 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6869 #: builtin/merge.c:1165
6870 msgid "You cannot combine --squash with --no-ff."
6871 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
6873 #: builtin/merge.c:1174
6874 msgid "No commit specified and merge.defaultToUpstream not set."
6875 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
6877 #: builtin/merge.c:1206
6878 msgid "Can merge only exactly one commit into empty head"
6879 msgstr "只能将一个提交合并到空分支上"
6881 #: builtin/merge.c:1209
6882 msgid "Squash commit into empty head not supported yet"
6883 msgstr "尚不支持到空分支的压缩提交"
6885 #: builtin/merge.c:1211
6886 msgid "Non-fast-forward commit does not make sense into an empty head"
6887 msgstr "到空分支的非快进式提交没有意义"
6889 #: builtin/merge.c:1216
6891 msgid "%s - not something we can merge"
6894 #: builtin/merge.c:1267
6896 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6897 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6899 #: builtin/merge.c:1270
6901 msgid "Commit %s has a bad GPG signature allegedly by %s."
6902 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6904 #: builtin/merge.c:1273
6906 msgid "Commit %s does not have a GPG signature."
6907 msgstr "提交 %s 没有一个 GPG 签名。"
6909 #: builtin/merge.c:1276
6911 msgid "Commit %s has a good GPG signature by %s\n"
6912 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6914 #: builtin/merge.c:1357
6916 msgid "Updating %s..%s\n"
6917 msgstr "更新 %s..%s\n"
6919 #: builtin/merge.c:1396
6921 msgid "Trying really trivial in-index merge...\n"
6922 msgstr "尝试非常小的索引内合并...\n"
6924 #: builtin/merge.c:1403
6929 #: builtin/merge.c:1435
6930 msgid "Not possible to fast-forward, aborting."
6933 #: builtin/merge.c:1458 builtin/merge.c:1537
6935 msgid "Rewinding the tree to pristine...\n"
6936 msgstr "将树回滚至原始状态...\n"
6938 #: builtin/merge.c:1462
6940 msgid "Trying merge strategy %s...\n"
6941 msgstr "尝试合并策略 %s...\n"
6943 #: builtin/merge.c:1528
6945 msgid "No merge strategy handled the merge.\n"
6946 msgstr "没有合并策略处理此合并。\n"
6948 #: builtin/merge.c:1530
6950 msgid "Merge with strategy %s failed.\n"
6951 msgstr "使用策略 %s 合并失败。\n"
6953 #: builtin/merge.c:1539
6955 msgid "Using the %s to prepare resolving by hand.\n"
6956 msgstr "使用 %s 以准备手工解决。\n"
6958 #: builtin/merge.c:1551
6960 msgid "Automatic merge went well; stopped before committing as requested\n"
6961 msgstr "自动合并进展顺利,按要求在提交前停止\n"
6963 #: builtin/merge-base.c:29
6964 msgid "git merge-base [-a|--all] <commit> <commit>..."
6965 msgstr "git merge-base [-a|--all] <提交> <提交>..."
6967 #: builtin/merge-base.c:30
6968 msgid "git merge-base [-a|--all] --octopus <commit>..."
6969 msgstr "git merge-base [-a|--all] --octopus <提交>..."
6971 #: builtin/merge-base.c:31
6972 msgid "git merge-base --independent <commit>..."
6973 msgstr "git merge-base --independent <提交>..."
6975 #: builtin/merge-base.c:32
6976 msgid "git merge-base --is-ancestor <commit> <commit>"
6977 msgstr "git merge-base --is-ancestor <提交> <提交>"
6979 #: builtin/merge-base.c:33
6980 msgid "git merge-base --fork-point <ref> [<commit>]"
6981 msgstr "git merge-base --fork-point <提交> [<提交>]"
6983 #: builtin/merge-base.c:214
6984 msgid "output all common ancestors"
6987 #: builtin/merge-base.c:216
6988 msgid "find ancestors for a single n-way merge"
6989 msgstr "查找一个多路合并的祖先提交"
6991 #: builtin/merge-base.c:218
6992 msgid "list revs not reachable from others"
6993 msgstr "显示不能被其他访问到的版本"
6995 #: builtin/merge-base.c:220
6996 msgid "is the first one ancestor of the other?"
6997 msgstr "第一个是其他的祖先提交么?"
6999 #: builtin/merge-base.c:222
7000 msgid "find where <commit> forked from reflog of <ref>"
7001 msgstr "查找 <commit> 从<引用>日志的何处分支的"
7003 #: builtin/merge-file.c:8
7005 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7008 "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7010 #: builtin/merge-file.c:33
7011 msgid "send results to standard output"
7014 #: builtin/merge-file.c:34
7015 msgid "use a diff3 based merge"
7016 msgstr "使用基于 diff3 的合并"
7018 #: builtin/merge-file.c:35
7019 msgid "for conflicts, use our version"
7020 msgstr "如果冲突,使用我们的版本"
7022 #: builtin/merge-file.c:37
7023 msgid "for conflicts, use their version"
7024 msgstr "如果冲突,使用他们的版本"
7026 #: builtin/merge-file.c:39
7027 msgid "for conflicts, use a union version"
7028 msgstr "如果冲突,使用联合版本"
7030 #: builtin/merge-file.c:42
7031 msgid "for conflicts, use this marker size"
7032 msgstr "如果冲突,使用指定长度的标记"
7034 #: builtin/merge-file.c:43
7035 msgid "do not warn about conflicts"
7038 #: builtin/merge-file.c:45
7039 msgid "set labels for file1/orig_file/file2"
7040 msgstr "为 file1/orig_file/file2 设置标签"
7042 #: builtin/mktree.c:64
7043 msgid "git mktree [-z] [--missing] [--batch]"
7044 msgstr "git mktree [-z] [--missing] [--batch]"
7046 #: builtin/mktree.c:150
7047 msgid "input is NUL terminated"
7048 msgstr "输入以 NUL 字符终止"
7050 #: builtin/mktree.c:151 builtin/write-tree.c:24
7051 msgid "allow missing objects"
7054 #: builtin/mktree.c:152
7055 msgid "allow creation of more than one tree"
7059 msgid "git mv [options] <source>... <destination>"
7060 msgstr "git mv [选项] <源>... <目标>"
7063 msgid "force move/rename even if target exists"
7064 msgstr "强制移动/重命令,即使目标存在"
7067 msgid "skip move/rename errors"
7072 msgid "Checking rename of '%s' to '%s'\n"
7073 msgstr "检查 '%s' 到 '%s' 的重命名\n"
7080 msgid "can not move directory into itself"
7084 msgid "cannot move directory over file"
7089 msgid "Huh? Directory %s is in index and no submodule?"
7090 msgstr "嗯?目录 %s 在索引中并且不是子模组?"
7092 #: builtin/mv.c:140 builtin/rm.c:318
7093 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
7094 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7098 msgid "Huh? %.*s is in index?"
7099 msgstr "嗯?%.*s 在索引中?"
7102 msgid "source directory is empty"
7106 msgid "not under version control"
7110 msgid "destination exists"
7115 msgid "overwriting '%s'"
7119 msgid "Cannot overwrite"
7123 msgid "multiple sources for the same target"
7127 msgid "destination directory does not exist"
7132 msgid "%s, source=%s, destination=%s"
7133 msgstr "%s,源=%s,目标=%s"
7137 msgid "Renaming %s to %s\n"
7138 msgstr "重命名 %s 至 %s\n"
7140 #: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
7142 msgid "renaming '%s' failed"
7143 msgstr "重命名 '%s' 失败"
7145 #: builtin/name-rev.c:255
7146 msgid "git name-rev [options] <commit>..."
7147 msgstr "git name-rev [选项] <提交>..."
7149 #: builtin/name-rev.c:256
7150 msgid "git name-rev [options] --all"
7151 msgstr "git name-rev [选项] --all"
7153 #: builtin/name-rev.c:257
7154 msgid "git name-rev [options] --stdin"
7155 msgstr "git name-rev [选项] --stdin"
7157 #: builtin/name-rev.c:309
7158 msgid "print only names (no SHA-1)"
7159 msgstr "只打印名称(无 SHA-1)"
7161 #: builtin/name-rev.c:310
7162 msgid "only use tags to name the commits"
7163 msgstr "只使用 tags 来命名提交"
7165 #: builtin/name-rev.c:312
7166 msgid "only use refs matching <pattern>"
7167 msgstr "只使用和 <模式> 相匹配的引用"
7169 #: builtin/name-rev.c:314
7170 msgid "list all commits reachable from all refs"
7171 msgstr "列出可以从所有引用访问的提交"
7173 #: builtin/name-rev.c:315
7174 msgid "read from stdin"
7177 #: builtin/name-rev.c:316
7178 msgid "allow to print `undefined` names (default)"
7179 msgstr "允许打印 `未定义` 的名称(默认)"
7181 #: builtin/name-rev.c:322
7182 msgid "dereference tags in the input (internal use)"
7183 msgstr "反向解析输入中的 tags(内部使用)"
7185 #: builtin/notes.c:24
7186 msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7187 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7189 #: builtin/notes.c:25
7191 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
7192 "<object>] [<object>]"
7194 "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
7197 #: builtin/notes.c:26
7198 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7199 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7201 #: builtin/notes.c:27
7203 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
7204 "<object>] [<object>]"
7206 "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
7209 #: builtin/notes.c:28
7210 msgid "git notes [--ref <notes_ref>] edit [<object>]"
7211 msgstr "git notes [--ref <注解引用>] edit [<对象>]"
7213 #: builtin/notes.c:29
7214 msgid "git notes [--ref <notes_ref>] show [<object>]"
7215 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7217 #: builtin/notes.c:30
7219 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7220 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7222 #: builtin/notes.c:31
7223 msgid "git notes merge --commit [-v | -q]"
7224 msgstr "git notes merge --commit [-v | -q]"
7226 #: builtin/notes.c:32
7227 msgid "git notes merge --abort [-v | -q]"
7228 msgstr "git notes merge --abort [-v | -q]"
7230 #: builtin/notes.c:33
7231 msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7232 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7234 #: builtin/notes.c:34
7235 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7236 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7238 #: builtin/notes.c:35
7239 msgid "git notes [--ref <notes_ref>] get-ref"
7240 msgstr "git notes [--ref <注解引用>] get-ref"
7242 #: builtin/notes.c:40
7243 msgid "git notes [list [<object>]]"
7244 msgstr "git notes [list [<对象>]]"
7246 #: builtin/notes.c:45
7247 msgid "git notes add [<options>] [<object>]"
7248 msgstr "git notes add [<选项>] [<对象>]"
7250 #: builtin/notes.c:50
7251 msgid "git notes copy [<options>] <from-object> <to-object>"
7252 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
7254 #: builtin/notes.c:51
7255 msgid "git notes copy --stdin [<from-object> <to-object>]..."
7256 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
7258 #: builtin/notes.c:56
7259 msgid "git notes append [<options>] [<object>]"
7260 msgstr "git notes append [<选项>] [<对象>]"
7262 #: builtin/notes.c:61
7263 msgid "git notes edit [<object>]"
7264 msgstr "git notes edit [<对象>]"
7266 #: builtin/notes.c:66
7267 msgid "git notes show [<object>]"
7268 msgstr "git notes show [<对象>]"
7270 #: builtin/notes.c:71
7271 msgid "git notes merge [<options>] <notes_ref>"
7272 msgstr "git notes merge [<选项>] <注解引用>"
7274 #: builtin/notes.c:72
7275 msgid "git notes merge --commit [<options>]"
7276 msgstr "git notes merge --commit [<选项>]"
7278 #: builtin/notes.c:73
7279 msgid "git notes merge --abort [<options>]"
7280 msgstr "git notes merge --abort [<选项>]"
7282 #: builtin/notes.c:78
7283 msgid "git notes remove [<object>]"
7284 msgstr "git notes remove [<对象>]"
7286 #: builtin/notes.c:83
7287 msgid "git notes prune [<options>]"
7288 msgstr "git notes prune [<选项>]"
7290 #: builtin/notes.c:88
7291 msgid "git notes get-ref"
7292 msgstr "git notes get-ref"
7294 #: builtin/notes.c:137
7296 msgid "unable to start 'show' for object '%s'"
7297 msgstr "不能为对象 '%s' 开始 'show'"
7299 #: builtin/notes.c:141
7300 msgid "could not read 'show' output"
7301 msgstr "不能读取 'show' 的输出"
7303 #: builtin/notes.c:149
7305 msgid "failed to finish 'show' for object '%s'"
7306 msgstr "无法为对象 '%s' 完成 'show'"
7308 #: builtin/notes.c:167 builtin/tag.c:477
7310 msgid "could not create file '%s'"
7311 msgstr "不能创建文件 '%s'"
7313 #: builtin/notes.c:186
7314 msgid "Please supply the note contents using either -m or -F option"
7315 msgstr "请通过 -m 或 -F 选项为注解提供内容"
7317 #: builtin/notes.c:207 builtin/notes.c:848
7319 msgid "Removing note for object %s\n"
7320 msgstr "删除对象 %s 的注解\n"
7322 #: builtin/notes.c:212
7323 msgid "unable to write note object"
7326 #: builtin/notes.c:214
7328 msgid "The note contents has been left in %s"
7329 msgstr "注解内容被留在文件 %s 中"
7331 #: builtin/notes.c:248 builtin/tag.c:692
7333 msgid "cannot read '%s'"
7336 #: builtin/notes.c:250 builtin/tag.c:695
7338 msgid "could not open or read '%s'"
7339 msgstr "不能打开或读取 '%s'"
7341 #: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7342 #: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7343 #: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7344 #: builtin/notes.c:843 builtin/tag.c:708
7346 msgid "Failed to resolve '%s' as a valid ref."
7347 msgstr "无法解析 '%s' 为一个有效引用。"
7349 #: builtin/notes.c:272
7351 msgid "Failed to read object '%s'."
7352 msgstr "无法读取对象 '%s'。"
7354 #: builtin/notes.c:276
7356 msgid "Cannot read note data from non-blob object '%s'."
7357 msgstr "不能从非数据对象 '%s' 中读取注解数据"
7359 #: builtin/notes.c:316
7361 msgid "Malformed input line: '%s'."
7362 msgstr "非法的输入行:'%s'。"
7364 #: builtin/notes.c:331
7366 msgid "Failed to copy notes from '%s' to '%s'"
7367 msgstr "无法从 '%s' 到 '%s' 拷贝注解"
7369 #: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7370 #: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7371 #: builtin/notes.c:908
7372 msgid "too many parameters"
7375 #: builtin/notes.c:388 builtin/notes.c:647
7377 msgid "No note found for object %s."
7378 msgstr "未发现对象 %s 的注解。"
7380 #: builtin/notes.c:410 builtin/notes.c:567
7381 msgid "note contents as a string"
7382 msgstr "注解内容作为一个字符串"
7384 #: builtin/notes.c:413 builtin/notes.c:570
7385 msgid "note contents in a file"
7388 #: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7389 #: builtin/notes.c:575 builtin/tag.c:627
7393 #: builtin/notes.c:416 builtin/notes.c:573
7394 msgid "reuse and edit specified note object"
7395 msgstr "重用和编辑指定的注解对象"
7397 #: builtin/notes.c:419 builtin/notes.c:576
7398 msgid "reuse specified note object"
7401 #: builtin/notes.c:421 builtin/notes.c:489
7402 msgid "replace existing notes"
7405 #: builtin/notes.c:455
7408 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7410 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7412 #: builtin/notes.c:460 builtin/notes.c:537
7414 msgid "Overwriting existing notes for object %s\n"
7415 msgstr "覆盖对象 %s 现存注解\n"
7417 #: builtin/notes.c:490
7418 msgid "read objects from stdin"
7421 #: builtin/notes.c:492
7422 msgid "load rewriting config for <command> (implies --stdin)"
7423 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
7425 #: builtin/notes.c:510
7426 msgid "too few parameters"
7429 #: builtin/notes.c:531
7432 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7434 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7436 #: builtin/notes.c:543
7438 msgid "Missing notes on source object %s. Cannot copy."
7439 msgstr "源对象 %s 缺少注解。不能拷贝。"
7441 #: builtin/notes.c:592
7444 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7445 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7447 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7448 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
7450 #: builtin/notes.c:739
7451 msgid "General options"
7454 #: builtin/notes.c:741
7455 msgid "Merge options"
7458 #: builtin/notes.c:743
7460 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7462 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
7464 #: builtin/notes.c:745
7465 msgid "Committing unmerged notes"
7468 #: builtin/notes.c:747
7469 msgid "finalize notes merge by committing unmerged notes"
7470 msgstr "通过提交未合并的注解来完成注解合并"
7472 #: builtin/notes.c:749
7473 msgid "Aborting notes merge resolution"
7476 #: builtin/notes.c:751
7477 msgid "abort notes merge"
7480 #: builtin/notes.c:846
7482 msgid "Object %s has no note\n"
7483 msgstr "对象 %s 没有注解\n"
7485 #: builtin/notes.c:858
7486 msgid "attempt to remove non-existent note is not an error"
7487 msgstr "尝试删除不存在的注解不是一个错误"
7489 #: builtin/notes.c:861
7490 msgid "read object names from the standard input"
7491 msgstr "从标准输入读取对象名称"
7493 #: builtin/notes.c:942
7497 #: builtin/notes.c:943
7498 msgid "use notes from <notes_ref>"
7499 msgstr "从 <注解引用> 使用注解"
7501 #: builtin/notes.c:978 builtin/remote.c:1616
7503 msgid "Unknown subcommand: %s"
7506 #: builtin/pack-objects.c:25
7507 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7508 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7510 #: builtin/pack-objects.c:26
7511 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7512 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7514 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7516 msgid "deflate error (%d)"
7519 #: builtin/pack-objects.c:771
7520 msgid "Writing objects"
7523 #: builtin/pack-objects.c:1012
7524 msgid "disabling bitmap writing, as some objects are not being packed"
7525 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7527 #: builtin/pack-objects.c:2174
7528 msgid "Compressing objects"
7531 #: builtin/pack-objects.c:2526
7533 msgid "unsupported index version %s"
7534 msgstr "不支持的索引版本 %s"
7536 #: builtin/pack-objects.c:2530
7538 msgid "bad index version '%s'"
7539 msgstr "坏的索引版本 '%s'"
7541 #: builtin/pack-objects.c:2553
7543 msgid "option %s does not accept negative form"
7544 msgstr "选项 %s 不接受否定格式"
7546 #: builtin/pack-objects.c:2557
7548 msgid "unable to parse value '%s' for option %s"
7549 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7551 #: builtin/pack-objects.c:2576
7552 msgid "do not show progress meter"
7555 #: builtin/pack-objects.c:2578
7556 msgid "show progress meter"
7559 #: builtin/pack-objects.c:2580
7560 msgid "show progress meter during object writing phase"
7561 msgstr "在对象写入阶段显示进度表"
7563 #: builtin/pack-objects.c:2583
7564 msgid "similar to --all-progress when progress meter is shown"
7565 msgstr "当进度表显示时类似于 --all-progress"
7567 #: builtin/pack-objects.c:2584
7568 msgid "version[,offset]"
7571 #: builtin/pack-objects.c:2585
7572 msgid "write the pack index file in the specified idx format version"
7573 msgstr "用指定的 idx 格式版本来写包索引文件"
7575 #: builtin/pack-objects.c:2588
7576 msgid "maximum size of each output pack file"
7579 #: builtin/pack-objects.c:2590
7580 msgid "ignore borrowed objects from alternate object store"
7581 msgstr "忽略从替代对象存储里借用对象"
7583 #: builtin/pack-objects.c:2592
7584 msgid "ignore packed objects"
7587 #: builtin/pack-objects.c:2594
7588 msgid "limit pack window by objects"
7591 #: builtin/pack-objects.c:2596
7592 msgid "limit pack window by memory in addition to object limit"
7593 msgstr "除对象数量限制外设置打包窗口的内存限制"
7595 #: builtin/pack-objects.c:2598
7596 msgid "maximum length of delta chain allowed in the resulting pack"
7597 msgstr "打包允许的 delta 链的最大长度"
7599 #: builtin/pack-objects.c:2600
7600 msgid "reuse existing deltas"
7601 msgstr "重用已存在的 deltas"
7603 #: builtin/pack-objects.c:2602
7604 msgid "reuse existing objects"
7607 #: builtin/pack-objects.c:2604
7608 msgid "use OFS_DELTA objects"
7609 msgstr "使用 OFS_DELTA 对象"
7611 #: builtin/pack-objects.c:2606
7612 msgid "use threads when searching for best delta matches"
7613 msgstr "使用线程查询最佳 delta 匹配"
7615 #: builtin/pack-objects.c:2608
7616 msgid "do not create an empty pack output"
7619 #: builtin/pack-objects.c:2610
7620 msgid "read revision arguments from standard input"
7621 msgstr "从标准输入读取修订号参数"
7623 #: builtin/pack-objects.c:2612
7624 msgid "limit the objects to those that are not yet packed"
7625 msgstr "限制那些尚未打包的对象"
7627 #: builtin/pack-objects.c:2615
7628 msgid "include objects reachable from any reference"
7629 msgstr "包括可以从任何引用访问到的对象"
7631 #: builtin/pack-objects.c:2618
7632 msgid "include objects referred by reflog entries"
7633 msgstr "包括被引用日志引用到的对象"
7635 #: builtin/pack-objects.c:2621
7636 msgid "output pack to stdout"
7639 #: builtin/pack-objects.c:2623
7640 msgid "include tag objects that refer to objects to be packed"
7641 msgstr "包括引用了打包对象的 tag"
7643 #: builtin/pack-objects.c:2625
7644 msgid "keep unreachable objects"
7647 #: builtin/pack-objects.c:2626 parse-options.h:140
7651 #: builtin/pack-objects.c:2627
7652 msgid "unpack unreachable objects newer than <time>"
7653 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7655 #: builtin/pack-objects.c:2630
7656 msgid "create thin packs"
7659 #: builtin/pack-objects.c:2632
7660 msgid "ignore packs that have companion .keep file"
7661 msgstr "忽略配有 .keep 文件的包"
7663 #: builtin/pack-objects.c:2634
7664 msgid "pack compression level"
7667 #: builtin/pack-objects.c:2636
7668 msgid "do not hide commits by grafts"
7671 #: builtin/pack-objects.c:2638
7672 msgid "use a bitmap index if available to speed up counting objects"
7673 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7675 #: builtin/pack-objects.c:2640
7676 msgid "write a bitmap index together with the pack index"
7677 msgstr "在建立包索引的同时创建 bitmap 索引"
7679 #: builtin/pack-objects.c:2719
7680 msgid "Counting objects"
7683 #: builtin/pack-refs.c:6
7684 msgid "git pack-refs [options]"
7685 msgstr "git pack-refs [选项]"
7687 #: builtin/pack-refs.c:14
7688 msgid "pack everything"
7691 #: builtin/pack-refs.c:15
7692 msgid "prune loose refs (default)"
7693 msgstr "清除松散的引用(默认)"
7695 #: builtin/prune-packed.c:7
7696 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7697 msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7699 #: builtin/prune-packed.c:49
7700 msgid "Removing duplicate objects"
7703 #: builtin/prune.c:12
7704 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7705 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7707 #: builtin/prune.c:142
7708 msgid "do not remove, show only"
7711 #: builtin/prune.c:143
7712 msgid "report pruned objects"
7715 #: builtin/prune.c:146
7716 msgid "expire objects older than <time>"
7717 msgstr "使早于给定时间的对象过期"
7719 #: builtin/push.c:14
7720 msgid "git push [<options>] [<repository> [<refspec>...]]"
7721 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7723 #: builtin/push.c:85
7724 msgid "tag shorthand without <tag>"
7725 msgstr "tag 简写没有跟 <tag> 参数"
7727 #: builtin/push.c:95
7728 msgid "--delete only accepts plain target ref names"
7729 msgstr "--delete 只接受简单的目标引用名"
7731 #: builtin/push.c:139
7734 "To choose either option permanently, see push.default in 'git help config'."
7737 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
7739 #: builtin/push.c:142
7742 "The upstream branch of your current branch does not match\n"
7743 "the name of your current branch. To push to the upstream branch\n"
7744 "on the remote, use\n"
7746 " git push %s HEAD:%s\n"
7748 "To push to the branch of the same name on the remote, use\n"
7753 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7756 " git push %s HEAD:%s\n"
7763 #: builtin/push.c:157
7766 "You are not currently on a branch.\n"
7767 "To push the history leading to the current (detached HEAD)\n"
7770 " git push %s HEAD:<name-of-remote-branch>\n"
7773 "现在为推送当前(分离头指针)的历史,使用\n"
7775 " git push %s HEAD:<name-of-remote-branch>\n"
7777 #: builtin/push.c:171
7780 "The current branch %s has no upstream branch.\n"
7781 "To push the current branch and set the remote as upstream, use\n"
7783 " git push --set-upstream %s %s\n"
7785 "当前分支 %s 没有对应的上游分支。\n"
7786 "为推送当前分支并建立与远程上游的跟踪,使用\n"
7788 " git push --set-upstream %s %s\n"
7790 #: builtin/push.c:179
7792 msgid "The current branch %s has multiple upstream branches, refusing to push."
7793 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7795 #: builtin/push.c:182
7798 "You are pushing to remote '%s', which is not the upstream of\n"
7799 "your current branch '%s', without telling me what to push\n"
7800 "to update which remote branch."
7802 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7803 "而没有告诉我要推送什么、更新哪个远程分支。"
7805 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
7806 #: builtin/push.c:205
7808 "push.default is unset; its implicit value has changed in\n"
7809 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7810 "and maintain the traditional behavior, use:\n"
7812 " git config --global push.default matching\n"
7814 "To squelch this message and adopt the new behavior now, use:\n"
7816 " git config --global push.default simple\n"
7818 "When push.default is set to 'matching', git will push local branches\n"
7819 "to the remote branches that already exist with the same name.\n"
7821 "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
7822 "behavior, which only pushes the current branch to the corresponding\n"
7823 "remote branch that 'git pull' uses to update the current branch.\n"
7825 "See 'git help config' and search for 'push.default' for further "
7827 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7828 "'current' instead of 'simple' if you sometimes use older versions of Git)"
7830 "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
7831 "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
7833 " git config --global push.default matching\n"
7835 "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7837 " git config --global push.default simple\n"
7839 "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
7842 "从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
7843 "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
7845 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7846 "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7847 "为保持兼容,请用 'current' 代替 'simple')"
7849 #: builtin/push.c:272
7851 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
7852 msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
7854 #: builtin/push.c:279
7856 "Updates were rejected because the tip of your current branch is behind\n"
7857 "its remote counterpart. Integrate the remote changes (e.g.\n"
7858 "'git pull ...') before pushing again.\n"
7859 "See the 'Note about fast-forwards' in 'git push --help' for details."
7861 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
7862 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
7863 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7865 #: builtin/push.c:285
7867 "Updates were rejected because a pushed branch tip is behind its remote\n"
7868 "counterpart. Check out this branch and integrate the remote changes\n"
7869 "(e.g. 'git pull ...') before pushing again.\n"
7870 "See the 'Note about fast-forwards' in 'git push --help' for details."
7872 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7873 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
7874 "'git push --help' 中的 'Note about fast-forwards' 小节。"
7876 #: builtin/push.c:291
7878 "Updates were rejected because the remote contains work that you do\n"
7879 "not have locally. This is usually caused by another repository pushing\n"
7880 "to the same ref. You may want to first integrate the remote changes\n"
7881 "(e.g., 'git pull ...') before pushing again.\n"
7882 "See the 'Note about fast-forwards' in 'git push --help' for details."
7884 "更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
7885 "一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7886 "(如 'git pull ...')。\n"
7887 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7889 #: builtin/push.c:298
7890 msgid "Updates were rejected because the tag already exists in the remote."
7891 msgstr "更新被拒绝因为 tag 在远程已经存在。"
7893 #: builtin/push.c:301
7895 "You cannot update a remote ref that points at a non-commit object,\n"
7896 "or update a remote ref to make it point at a non-commit object,\n"
7897 "without using the '--force' option.\n"
7899 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7900 "也不能更新远程引用让其指向一个非提交对象。\n"
7902 #: builtin/push.c:360
7904 msgid "Pushing to %s\n"
7907 #: builtin/push.c:364
7909 msgid "failed to push some refs to '%s'"
7910 msgstr "无法推送一些引用到 '%s'"
7912 #: builtin/push.c:394
7914 msgid "bad repository '%s'"
7917 #: builtin/push.c:395
7919 "No configured push destination.\n"
7920 "Either specify the URL from the command-line or configure a remote "
7921 "repository using\n"
7923 " git remote add <name> <url>\n"
7925 "and then push using the remote name\n"
7927 " git push <name>\n"
7930 "或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
7932 " git remote add <name> <url>\n"
7936 " git push <name>\n"
7938 #: builtin/push.c:410
7939 msgid "--all and --tags are incompatible"
7940 msgstr "--all 和 --tags 不兼容"
7942 #: builtin/push.c:411
7943 msgid "--all can't be combined with refspecs"
7944 msgstr "--all 不能和引用规则同时使用"
7946 #: builtin/push.c:416
7947 msgid "--mirror and --tags are incompatible"
7948 msgstr "--mirror 和 --tags 不兼容"
7950 #: builtin/push.c:417
7951 msgid "--mirror can't be combined with refspecs"
7952 msgstr "--mirror 不能和引用规则同时使用"
7954 #: builtin/push.c:422
7955 msgid "--all and --mirror are incompatible"
7956 msgstr "--all 和 --mirror 不兼容"
7958 #: builtin/push.c:482
7962 #: builtin/push.c:483
7963 msgid "push all refs"
7966 #: builtin/push.c:484
7967 msgid "mirror all refs"
7970 #: builtin/push.c:486
7974 #: builtin/push.c:487
7975 msgid "push tags (can't be used with --all or --mirror)"
7976 msgstr "推送 tags(不能使用 --all or --mirror)"
7978 #: builtin/push.c:490
7979 msgid "force updates"
7982 #: builtin/push.c:492
7983 msgid "refname>:<expect"
7986 #: builtin/push.c:493
7987 msgid "require old value of ref to be at this value"
7988 msgstr "要求引用旧的取值为设定值"
7990 #: builtin/push.c:495
7994 #: builtin/push.c:496
7995 msgid "control recursive pushing of submodules"
7998 #: builtin/push.c:498
7999 msgid "use thin pack"
8002 #: builtin/push.c:499 builtin/push.c:500
8003 msgid "receive pack program"
8006 #: builtin/push.c:501
8007 msgid "set upstream for git pull/status"
8008 msgstr "设置 git pull/status 的上游"
8010 #: builtin/push.c:504
8011 msgid "prune locally removed refs"
8014 #: builtin/push.c:506
8015 msgid "bypass pre-push hook"
8016 msgstr "绕过 pre-push 钩子"
8018 #: builtin/push.c:507
8019 msgid "push missing but relevant tags"
8020 msgstr "推送缺失的有关的 tags"
8022 #: builtin/push.c:517
8023 msgid "--delete is incompatible with --all, --mirror and --tags"
8024 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8026 #: builtin/push.c:519
8027 msgid "--delete doesn't make sense without any refs"
8028 msgstr "--delete 未接任何引用没有意义"
8030 #: builtin/read-tree.c:36
8032 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8033 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8034 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8036 "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8037 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8038 "index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
8040 #: builtin/read-tree.c:109
8041 msgid "write resulting index to <file>"
8042 msgstr "将索引结果写入 <file>"
8044 #: builtin/read-tree.c:112
8045 msgid "only empty the index"
8048 #: builtin/read-tree.c:114
8052 #: builtin/read-tree.c:116
8053 msgid "perform a merge in addition to a read"
8054 msgstr "读取之余再执行一个合并"
8056 #: builtin/read-tree.c:118
8057 msgid "3-way merge if no file level merging required"
8058 msgstr "如果没有文件级合并需要,执行三路合并"
8060 #: builtin/read-tree.c:120
8061 msgid "3-way merge in presence of adds and removes"
8062 msgstr "存在添加和删除时,也执行三路合并"
8064 #: builtin/read-tree.c:122
8065 msgid "same as -m, but discard unmerged entries"
8066 msgstr "类似于 -m,但丢弃未合并的条目"
8068 #: builtin/read-tree.c:123
8069 msgid "<subdirectory>/"
8072 #: builtin/read-tree.c:124
8073 msgid "read the tree into the index under <subdirectory>/"
8074 msgstr "读取树对象到索引的 <子目录>/ 下"
8076 #: builtin/read-tree.c:127
8077 msgid "update working tree with merge result"
8078 msgstr "用合并的结果更新工作区"
8080 #: builtin/read-tree.c:129
8084 #: builtin/read-tree.c:130
8085 msgid "allow explicitly ignored files to be overwritten"
8086 msgstr "允许忽略文件中设定的文件可以被覆盖"
8088 #: builtin/read-tree.c:133
8089 msgid "don't check the working tree after merging"
8092 #: builtin/read-tree.c:134
8093 msgid "don't update the index or the work tree"
8096 #: builtin/read-tree.c:136
8097 msgid "skip applying sparse checkout filter"
8098 msgstr "跳过应用稀疏检出过滤器"
8100 #: builtin/read-tree.c:138
8101 msgid "debug unpack-trees"
8102 msgstr "调试 unpack-trees"
8104 #: builtin/reflog.c:499
8106 msgid "%s' for '%s' is not a valid timestamp"
8107 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8109 #: builtin/reflog.c:615 builtin/reflog.c:620
8111 msgid "'%s' is not a valid timestamp"
8112 msgstr "'%s' 不是一个有效的时间戳"
8114 #: builtin/remote.c:12
8115 msgid "git remote [-v | --verbose]"
8116 msgstr "git remote [-v | --verbose]"
8118 #: builtin/remote.c:13
8120 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8121 "mirror=<fetch|push>] <name> <url>"
8123 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8124 "mirror=<fetch|push>] <名称> <url>"
8126 #: builtin/remote.c:14 builtin/remote.c:33
8127 msgid "git remote rename <old> <new>"
8128 msgstr "git remote rename <旧名称> <新名称>"
8130 #: builtin/remote.c:15 builtin/remote.c:38
8131 msgid "git remote remove <name>"
8132 msgstr "git remote remove <名称>"
8134 #: builtin/remote.c:16
8135 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8136 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8138 #: builtin/remote.c:17
8139 msgid "git remote [-v | --verbose] show [-n] <name>"
8140 msgstr "git remote [-v | --verbose] show [-n] <名称>"
8142 #: builtin/remote.c:18
8143 msgid "git remote prune [-n | --dry-run] <name>"
8144 msgstr "git remote prune [-n | --dry-run] <名称>"
8146 #: builtin/remote.c:19
8148 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
8149 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
8151 #: builtin/remote.c:20
8152 msgid "git remote set-branches [--add] <name> <branch>..."
8153 msgstr "git remote set-branches [--add] <名称> <分支>..."
8155 #: builtin/remote.c:21 builtin/remote.c:69
8156 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
8157 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
8159 #: builtin/remote.c:22 builtin/remote.c:70
8160 msgid "git remote set-url --add <name> <newurl>"
8161 msgstr "git remote set-url --add <名称> <新的地址>"
8163 #: builtin/remote.c:23 builtin/remote.c:71
8164 msgid "git remote set-url --delete <name> <url>"
8165 msgstr "git remote set-url --delete <名称> <地址>"
8167 #: builtin/remote.c:28
8168 msgid "git remote add [<options>] <name> <url>"
8169 msgstr "git remote add [<选项>] <名称> <地址>"
8171 #: builtin/remote.c:43
8172 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8173 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8175 #: builtin/remote.c:48
8176 msgid "git remote set-branches <name> <branch>..."
8177 msgstr "git remote set-branches <名称> <分支>..."
8179 #: builtin/remote.c:49
8180 msgid "git remote set-branches --add <name> <branch>..."
8181 msgstr "git remote set-branches --add <名称> <分支>..."
8183 #: builtin/remote.c:54
8184 msgid "git remote show [<options>] <name>"
8185 msgstr "git remote show [<选项>] <名称>"
8187 #: builtin/remote.c:59
8188 msgid "git remote prune [<options>] <name>"
8189 msgstr "git remote prune [<选项>] <名称>"
8191 #: builtin/remote.c:64
8192 msgid "git remote update [<options>] [<group> | <remote>]..."
8193 msgstr "git remote update [<选项>] [<组> | <远程>]..."
8195 #: builtin/remote.c:88
8200 #: builtin/remote.c:120
8202 "--mirror is dangerous and deprecated; please\n"
8203 "\t use --mirror=fetch or --mirror=push instead"
8205 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8206 "\t 或 --mirror=push"
8208 #: builtin/remote.c:137
8210 msgid "unknown mirror argument: %s"
8213 #: builtin/remote.c:153
8214 msgid "fetch the remote branches"
8217 #: builtin/remote.c:155
8218 msgid "import all tags and associated objects when fetching"
8219 msgstr "抓取时导入所有的 tags 和关联对象"
8221 #: builtin/remote.c:158
8222 msgid "or do not fetch any tag at all (--no-tags)"
8223 msgstr "或不抓取任何 tag(--no-tags)"
8225 #: builtin/remote.c:160
8226 msgid "branch(es) to track"
8229 #: builtin/remote.c:161
8230 msgid "master branch"
8233 #: builtin/remote.c:162
8237 #: builtin/remote.c:163
8238 msgid "set up remote as a mirror to push to or fetch from"
8239 msgstr "把远程设置为用以推送或抓取的镜像"
8241 #: builtin/remote.c:175
8242 msgid "specifying a master branch makes no sense with --mirror"
8243 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8245 #: builtin/remote.c:177
8246 msgid "specifying branches to track makes sense only with fetch mirrors"
8247 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8249 #: builtin/remote.c:185 builtin/remote.c:640
8251 msgid "remote %s already exists."
8252 msgstr "远程 %s 已经存在。"
8254 #: builtin/remote.c:189 builtin/remote.c:644
8256 msgid "'%s' is not a valid remote name"
8257 msgstr "'%s' 不是一个有效的远程名称"
8259 #: builtin/remote.c:233
8261 msgid "Could not setup master '%s'"
8262 msgstr "无法设置 master '%s'"
8264 #: builtin/remote.c:288
8266 msgid "more than one %s"
8269 #: builtin/remote.c:333
8271 msgid "Could not get fetch map for refspec %s"
8272 msgstr "无法得到引用规则 %s 的获取列表"
8274 #: builtin/remote.c:434 builtin/remote.c:442
8278 #: builtin/remote.c:446
8282 #: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
8284 msgid "Could not append '%s' to '%s'"
8285 msgstr "不能添加 '%s' 至 '%s'"
8287 #: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
8289 msgid "No such remote: %s"
8292 #: builtin/remote.c:650
8294 msgid "Could not rename config section '%s' to '%s'"
8295 msgstr "不能重命名配置小节 '%s' 到 '%s'"
8297 #: builtin/remote.c:656 builtin/remote.c:846
8299 msgid "Could not remove config section '%s'"
8300 msgstr "不能移除配置小节 '%s'"
8302 #: builtin/remote.c:671
8305 "Not updating non-default fetch refspec\n"
8307 "\tPlease update the configuration manually if necessary."
8313 #: builtin/remote.c:677
8315 msgid "Could not append '%s'"
8318 #: builtin/remote.c:688
8320 msgid "Could not set '%s'"
8323 #: builtin/remote.c:710
8325 msgid "deleting '%s' failed"
8328 #: builtin/remote.c:744
8330 msgid "creating '%s' failed"
8333 #: builtin/remote.c:765
8335 msgid "Could not remove branch %s"
8338 #: builtin/remote.c:832
8340 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8341 "to delete it, use:"
8343 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8344 "to delete them, use:"
8345 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8346 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8348 #: builtin/remote.c:947
8350 msgid " new (next fetch will store in remotes/%s)"
8351 msgstr " 新的(下一次获取将存储于 remotes/%s)"
8353 #: builtin/remote.c:950
8357 #: builtin/remote.c:952
8358 msgid " stale (use 'git remote prune' to remove)"
8359 msgstr " 过时(使用 'git remote prune' 来移除)"
8361 #: builtin/remote.c:954
8365 #: builtin/remote.c:995
8367 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8368 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8370 #: builtin/remote.c:1002
8372 msgid "rebases onto remote %s"
8375 #: builtin/remote.c:1005
8377 msgid " merges with remote %s"
8380 #: builtin/remote.c:1006
8381 msgid " and with remote"
8384 #: builtin/remote.c:1008
8386 msgid "merges with remote %s"
8389 #: builtin/remote.c:1009
8390 msgid " and with remote"
8393 #: builtin/remote.c:1055
8397 #: builtin/remote.c:1058
8401 #: builtin/remote.c:1062
8405 #: builtin/remote.c:1065
8406 msgid "fast-forwardable"
8409 #: builtin/remote.c:1068
8410 msgid "local out of date"
8413 #: builtin/remote.c:1075
8415 msgid " %-*s forces to %-*s (%s)"
8416 msgstr " %-*s 强制推送至 %-*s (%s)"
8418 #: builtin/remote.c:1078
8420 msgid " %-*s pushes to %-*s (%s)"
8421 msgstr " %-*s 推送至 %-*s (%s)"
8423 #: builtin/remote.c:1082
8425 msgid " %-*s forces to %s"
8426 msgstr " %-*s 强制推送至 %s"
8428 #: builtin/remote.c:1085
8430 msgid " %-*s pushes to %s"
8431 msgstr " %-*s 推送至 %s"
8433 #: builtin/remote.c:1153
8434 msgid "do not query remotes"
8437 #: builtin/remote.c:1180
8442 #: builtin/remote.c:1181
8444 msgid " Fetch URL: %s"
8447 #: builtin/remote.c:1182 builtin/remote.c:1329
8451 #: builtin/remote.c:1191 builtin/remote.c:1193
8453 msgid " Push URL: %s"
8456 #: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
8458 msgid " HEAD branch: %s"
8461 #: builtin/remote.c:1201
8464 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8465 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8467 #: builtin/remote.c:1213
8469 msgid " Remote branch:%s"
8470 msgid_plural " Remote branches:%s"
8471 msgstr[0] " 远程分支:%s"
8472 msgstr[1] " 远程分支:%s"
8474 # 译者:中文字符串拼接,可删除前导空格
8475 #: builtin/remote.c:1216 builtin/remote.c:1243
8476 msgid " (status not queried)"
8479 #: builtin/remote.c:1225
8480 msgid " Local branch configured for 'git pull':"
8481 msgid_plural " Local branches configured for 'git pull':"
8482 msgstr[0] " 为 'git pull' 配置的本地分支:"
8483 msgstr[1] " 为 'git pull' 配置的本地分支:"
8485 #: builtin/remote.c:1233
8486 msgid " Local refs will be mirrored by 'git push'"
8487 msgstr " 本地引用将在 'git push' 时被镜像"
8489 #: builtin/remote.c:1240
8491 msgid " Local ref configured for 'git push'%s:"
8492 msgid_plural " Local refs configured for 'git push'%s:"
8493 msgstr[0] " 为 'git push' 配置的本地引用%s:"
8494 msgstr[1] " 为 'git push' 配置的本地引用%s:"
8496 #: builtin/remote.c:1261
8497 msgid "set refs/remotes/<name>/HEAD according to remote"
8498 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
8500 #: builtin/remote.c:1263
8501 msgid "delete refs/remotes/<name>/HEAD"
8502 msgstr "删除 refs/remotes/<名称>/HEAD"
8504 #: builtin/remote.c:1278
8505 msgid "Cannot determine remote HEAD"
8506 msgstr "无法确定远程 HEAD"
8508 #: builtin/remote.c:1280
8509 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8510 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8512 #: builtin/remote.c:1290
8514 msgid "Could not delete %s"
8517 #: builtin/remote.c:1298
8519 msgid "Not a valid ref: %s"
8520 msgstr "不是一个有效引用:%s"
8522 #: builtin/remote.c:1300
8524 msgid "Could not setup %s"
8528 #: builtin/remote.c:1318
8530 msgid " %s will become dangling!"
8531 msgstr " %s 将成为摇摆状态!"
8534 #: builtin/remote.c:1319
8536 msgid " %s has become dangling!"
8537 msgstr " %s 已成为摇摆状态!"
8539 #: builtin/remote.c:1325
8544 #: builtin/remote.c:1326
8549 #: builtin/remote.c:1349
8551 msgid " * [would prune] %s"
8552 msgstr " * [将删除] %s"
8554 #: builtin/remote.c:1352
8556 msgid " * [pruned] %s"
8557 msgstr " * [已删除] %s"
8559 #: builtin/remote.c:1397
8560 msgid "prune remotes after fetching"
8563 #: builtin/remote.c:1463 builtin/remote.c:1537
8565 msgid "No such remote '%s'"
8568 #: builtin/remote.c:1483
8572 #: builtin/remote.c:1490
8573 msgid "no remote specified"
8576 #: builtin/remote.c:1512
8577 msgid "manipulate push URLs"
8580 #: builtin/remote.c:1514
8584 #: builtin/remote.c:1516
8588 #: builtin/remote.c:1523
8589 msgid "--add --delete doesn't make sense"
8590 msgstr "--add --delete 无意义"
8592 #: builtin/remote.c:1563
8594 msgid "Invalid old URL pattern: %s"
8595 msgstr "无效的旧URL匹配模版:%s"
8597 #: builtin/remote.c:1571
8599 msgid "No such URL found: %s"
8602 #: builtin/remote.c:1573
8603 msgid "Will not delete all non-push URLs"
8604 msgstr "将不会删除所有非推送URL地址"
8606 #: builtin/remote.c:1587
8607 msgid "be verbose; must be placed before a subcommand"
8608 msgstr "冗长输出;必须置于子命令之前"
8610 #: builtin/repack.c:17
8611 msgid "git repack [options]"
8612 msgstr "git repack [选项]"
8614 #: builtin/repack.c:160
8615 msgid "pack everything in a single pack"
8616 msgstr "所有内容打包到一个包文件中"
8618 #: builtin/repack.c:162
8619 msgid "same as -a, and turn unreachable objects loose"
8620 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8622 #: builtin/repack.c:165
8623 msgid "remove redundant packs, and run git-prune-packed"
8624 msgstr "删除多余的包,运行 git-prune-packed"
8626 #: builtin/repack.c:167
8627 msgid "pass --no-reuse-delta to git-pack-objects"
8628 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8630 #: builtin/repack.c:169
8631 msgid "pass --no-reuse-object to git-pack-objects"
8632 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8634 #: builtin/repack.c:171
8635 msgid "do not run git-update-server-info"
8636 msgstr "不运行 git-update-server-info"
8638 #: builtin/repack.c:174
8639 msgid "pass --local to git-pack-objects"
8640 msgstr "向 git-pack-objects 传递参数 --local"
8642 #: builtin/repack.c:176
8643 msgid "write bitmap index"
8644 msgstr "写 bitmap 索引"
8646 #: builtin/repack.c:177
8650 #: builtin/repack.c:178
8651 msgid "with -A, do not loosen objects older than this"
8652 msgstr "使用 -A,不要将早于给定时间的对象过期"
8654 #: builtin/repack.c:180
8655 msgid "size of the window used for delta compression"
8658 #: builtin/repack.c:181 builtin/repack.c:185
8662 #: builtin/repack.c:182
8663 msgid "same as the above, but limit memory size instead of entries count"
8664 msgstr "和上面的相似,但限制内存大小而非条目数"
8666 #: builtin/repack.c:184
8667 msgid "limits the maximum delta depth"
8670 #: builtin/repack.c:186
8671 msgid "maximum size of each packfile"
8674 #: builtin/repack.c:188
8675 msgid "repack objects in packs marked with .keep"
8676 msgstr "对标记为 .keep 的包中的对象重新打包"
8678 #: builtin/repack.c:374
8680 msgid "removing '%s' failed"
8683 #: builtin/replace.c:19
8684 msgid "git replace [-f] <object> <replacement>"
8685 msgstr "git replace [-f] <对象> <替换物>"
8687 #: builtin/replace.c:20
8688 msgid "git replace [-f] --edit <object>"
8689 msgstr "git replace [-f] --edit <对象>"
8691 #: builtin/replace.c:21
8692 msgid "git replace [-f] --graft <commit> [<parent>...]"
8693 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8695 #: builtin/replace.c:22
8696 msgid "git replace -d <object>..."
8697 msgstr "git replace -d <对象>..."
8699 #: builtin/replace.c:23
8700 msgid "git replace [--format=<format>] [-l [<pattern>]]"
8701 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
8703 #: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388
8705 msgid "Not a valid object name: '%s'"
8706 msgstr "不是一个有效的对象名:'%s'"
8708 #: builtin/replace.c:352
8710 msgid "bad mergetag in commit '%s'"
8711 msgstr "提交 '%s' 中损坏的 mergetag"
8713 #: builtin/replace.c:354
8715 msgid "malformed mergetag in commit '%s'"
8716 msgstr "提交 '%s' 中非法的 mergetag"
8718 #: builtin/replace.c:365
8721 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8722 "instead of --graft"
8723 msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8725 #: builtin/replace.c:398
8727 msgid "the original commit '%s' has a gpg signature."
8728 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8730 #: builtin/replace.c:399
8731 msgid "the signature will be removed in the replacement commit!"
8732 msgstr "在替换的提交中签名将被移除!"
8734 #: builtin/replace.c:405
8736 msgid "could not write replacement commit for: '%s'"
8737 msgstr "不能为 '%s' 写替换提交"
8739 #: builtin/replace.c:429
8740 msgid "list replace refs"
8743 #: builtin/replace.c:430
8744 msgid "delete replace refs"
8747 #: builtin/replace.c:431
8748 msgid "edit existing object"
8751 #: builtin/replace.c:432
8752 msgid "change a commit's parents"
8755 #: builtin/replace.c:433
8756 msgid "replace the ref if it exists"
8759 #: builtin/replace.c:434
8760 msgid "do not pretty-print contents for --edit"
8761 msgstr "不要为 --edit 操作美观显示内容"
8763 #: builtin/replace.c:435
8764 msgid "use this format"
8767 #: builtin/rerere.c:12
8768 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8769 msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
8771 #: builtin/rerere.c:57
8772 msgid "register clean resolutions in index"
8773 msgstr "在索引中注册干净的解决方案"
8775 #: builtin/reset.c:25
8777 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8778 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
8780 #: builtin/reset.c:26
8781 msgid "git reset [-q] <tree-ish> [--] <paths>..."
8782 msgstr "git reset [-q] <树或提交> [--] <路径>..."
8784 #: builtin/reset.c:27
8785 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8786 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
8788 #: builtin/reset.c:33
8792 #: builtin/reset.c:33
8796 #: builtin/reset.c:33
8800 #: builtin/reset.c:33
8804 #: builtin/reset.c:33
8808 #: builtin/reset.c:73
8809 msgid "You do not have a valid HEAD."
8810 msgstr "您没有一个有效的 HEAD。"
8812 #: builtin/reset.c:75
8813 msgid "Failed to find tree of HEAD."
8814 msgstr "无法找到 HEAD 指向的树。"
8816 #: builtin/reset.c:81
8818 msgid "Failed to find tree of %s."
8819 msgstr "无法找到 %s 指向的树。"
8821 #: builtin/reset.c:99
8823 msgid "HEAD is now at %s"
8824 msgstr "HEAD 现在位于 %s"
8826 # 译者:汉字之间无空格,故删除%s前后空格
8827 #: builtin/reset.c:182
8829 msgid "Cannot do a %s reset in the middle of a merge."
8830 msgstr "在合并过程中不能做%s重置操作。"
8832 #: builtin/reset.c:275
8833 msgid "be quiet, only report errors"
8836 #: builtin/reset.c:277
8837 msgid "reset HEAD and index"
8838 msgstr "重置 HEAD 和索引"
8840 #: builtin/reset.c:278
8841 msgid "reset only HEAD"
8844 #: builtin/reset.c:280 builtin/reset.c:282
8845 msgid "reset HEAD, index and working tree"
8846 msgstr "重置 HEAD、索引和工作区"
8848 #: builtin/reset.c:284
8849 msgid "reset HEAD but keep local changes"
8850 msgstr "重置 HEAD 但保存本地变更"
8852 #: builtin/reset.c:287
8853 msgid "record only the fact that removed paths will be added later"
8854 msgstr "将删除的路径标记为稍后添加"
8856 #: builtin/reset.c:304
8858 msgid "Failed to resolve '%s' as a valid revision."
8859 msgstr "无法将 '%s' 解析为一个有效的版本。"
8861 #: builtin/reset.c:307 builtin/reset.c:315
8863 msgid "Could not parse object '%s'."
8864 msgstr "不能解析对象 '%s'。"
8866 #: builtin/reset.c:312
8868 msgid "Failed to resolve '%s' as a valid tree."
8869 msgstr "无法将 '%s' 解析为一个有效的树对象。"
8871 #: builtin/reset.c:321
8872 msgid "--patch is incompatible with --{hard,mixed,soft}"
8873 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
8875 #: builtin/reset.c:330
8876 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8877 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
8879 # 译者:汉字之间无空格,故删除%s前后空格
8880 #: builtin/reset.c:332
8882 msgid "Cannot do %s reset with paths."
8883 msgstr "不能带路径进行%s重置。"
8885 # 译者:汉字之间无空格,故删除%s前后空格
8886 #: builtin/reset.c:342
8888 msgid "%s reset is not allowed in a bare repository"
8889 msgstr "不能对裸版本库进行%s重置"
8891 #: builtin/reset.c:346
8892 msgid "-N can only be used with --mixed"
8893 msgstr "-N 只能和 --mixed 同时使用"
8895 #: builtin/reset.c:363
8896 msgid "Unstaged changes after reset:"
8897 msgstr "重置后撤出暂存区的变更:"
8899 #: builtin/reset.c:369
8901 msgid "Could not reset index file to revision '%s'."
8902 msgstr "不能重置索引文件至版本 '%s'。"
8904 #: builtin/reset.c:373
8905 msgid "Could not write new index file."
8906 msgstr "不能写入新的索引文件。"
8908 #: builtin/rev-parse.c:360
8909 msgid "git rev-parse --parseopt [options] -- [<args>...]"
8910 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
8912 #: builtin/rev-parse.c:365
8913 msgid "keep the `--` passed as an arg"
8914 msgstr "保持 `--` 作为一个参数传递"
8916 #: builtin/rev-parse.c:367
8917 msgid "stop parsing after the first non-option argument"
8918 msgstr "遇到第一个非选项参数后停止解析"
8920 #: builtin/rev-parse.c:370
8921 msgid "output in stuck long form"
8924 #: builtin/rev-parse.c:498
8926 "git rev-parse --parseopt [options] -- [<args>...]\n"
8927 " or: git rev-parse --sq-quote [<arg>...]\n"
8928 " or: git rev-parse [options] [<arg>...]\n"
8930 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8932 "git rev-parse --parseopt [选项] -- [<参数>...]\n"
8933 " 或者:git rev-parse --sq-quote [<参数>...]\n"
8934 " 或者:git rev-parse [选项] [<参数>...]\n"
8936 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
8938 #: builtin/revert.c:22
8939 msgid "git revert [options] <commit-ish>..."
8940 msgstr "git revert [选项] <提交号>..."
8942 #: builtin/revert.c:23
8943 msgid "git revert <subcommand>"
8944 msgstr "git revert <子命令>"
8946 #: builtin/revert.c:28
8947 msgid "git cherry-pick [options] <commit-ish>..."
8948 msgstr "git cherry-pick [选项] <提交号>..."
8950 #: builtin/revert.c:29
8951 msgid "git cherry-pick <subcommand>"
8952 msgstr "git cherry-pick <子命令>"
8954 #: builtin/revert.c:71
8956 msgid "%s: %s cannot be used with %s"
8957 msgstr "%s:%s 不能和 %s 同时使用"
8959 #: builtin/revert.c:80
8960 msgid "end revert or cherry-pick sequence"
8963 #: builtin/revert.c:81
8964 msgid "resume revert or cherry-pick sequence"
8967 #: builtin/revert.c:82
8968 msgid "cancel revert or cherry-pick sequence"
8971 #: builtin/revert.c:83
8972 msgid "don't automatically commit"
8975 #: builtin/revert.c:84
8976 msgid "edit the commit message"
8979 #: builtin/revert.c:87
8980 msgid "parent number"
8983 #: builtin/revert.c:89
8984 msgid "merge strategy"
8987 #: builtin/revert.c:90
8991 #: builtin/revert.c:91
8992 msgid "option for merge strategy"
8995 #: builtin/revert.c:104
8996 msgid "append commit name"
8999 #: builtin/revert.c:105
9000 msgid "allow fast-forward"
9003 #: builtin/revert.c:106
9004 msgid "preserve initially empty commits"
9007 #: builtin/revert.c:107
9008 msgid "allow commits with empty messages"
9011 #: builtin/revert.c:108
9012 msgid "keep redundant, empty commits"
9015 #: builtin/revert.c:112
9016 msgid "program error"
9019 #: builtin/revert.c:197
9020 msgid "revert failed"
9023 #: builtin/revert.c:212
9024 msgid "cherry-pick failed"
9028 msgid "git rm [options] [--] <file>..."
9029 msgstr "git rm [选项] [--] <文件>..."
9033 "the following submodule (or one of its nested submodules)\n"
9034 "uses a .git directory:"
9036 "the following submodules (or one of its nested submodules)\n"
9037 "use a .git directory:"
9038 msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9039 msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9044 "(use 'rm -rf' if you really want to remove it including all of its history)"
9047 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
9051 "the following file has staged content different from both the\n"
9052 "file and the HEAD:"
9054 "the following files have staged content different from both the\n"
9055 "file and the HEAD:"
9056 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9057 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9062 "(use -f to force removal)"
9068 msgid "the following file has changes staged in the index:"
9069 msgid_plural "the following files have changes staged in the index:"
9070 msgstr[0] "如下文件相对索引区的内容有修改"
9071 msgstr[1] "如下文件相对索引区的内容有修改"
9073 #: builtin/rm.c:244 builtin/rm.c:255
9076 "(use --cached to keep the file, or -f to force removal)"
9079 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
9082 msgid "the following file has local modifications:"
9083 msgid_plural "the following files have local modifications:"
9084 msgstr[0] "如下文件有本地修改:"
9085 msgstr[1] "如下文件有本地修改:"
9088 msgid "do not list removed files"
9092 msgid "only remove from the index"
9096 msgid "override the up-to-date check"
9100 msgid "allow recursive removal"
9104 msgid "exit with a zero status even if nothing matched"
9105 msgstr "即使没有匹配,也以零状态退出"
9109 msgid "not removing '%s' recursively without -r"
9110 msgstr "未提供 -r 选项不会递归删除 '%s'"
9114 msgid "git rm: unable to remove %s"
9115 msgstr "git rm:不能删除 %s"
9117 #: builtin/shortlog.c:13
9118 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9119 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9121 #: builtin/shortlog.c:131
9123 msgid "Missing author: %s"
9126 #: builtin/shortlog.c:230
9127 msgid "sort output according to the number of commits per author"
9128 msgstr "根据每个作者的提交数量排序"
9130 #: builtin/shortlog.c:232
9131 msgid "Suppress commit descriptions, only provides commit count"
9132 msgstr "隐藏提交说明,只提供提交数量"
9134 #: builtin/shortlog.c:234
9135 msgid "Show the email address of each author"
9136 msgstr "显示每个作者的电子邮件地址"
9138 #: builtin/shortlog.c:235
9140 msgstr "w[,i1[,i2]]"
9142 #: builtin/shortlog.c:236
9143 msgid "Linewrap output"
9146 #: builtin/show-branch.c:9
9148 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9149 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9150 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9153 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9154 "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9155 "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9158 #: builtin/show-branch.c:10
9159 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9160 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9162 #: builtin/show-branch.c:649
9163 msgid "show remote-tracking and local branches"
9164 msgstr "显示远程跟踪的和本地的分支"
9166 #: builtin/show-branch.c:651
9167 msgid "show remote-tracking branches"
9170 #: builtin/show-branch.c:653
9171 msgid "color '*!+-' corresponding to the branch"
9172 msgstr "着色 '*!+-' 到相应的分支"
9174 #: builtin/show-branch.c:655
9175 msgid "show <n> more commits after the common ancestor"
9176 msgstr "显示共同祖先后的 <n> 个提交"
9178 #: builtin/show-branch.c:657
9179 msgid "synonym to more=-1"
9180 msgstr "和 more=-1 同义"
9182 #: builtin/show-branch.c:658
9183 msgid "suppress naming strings"
9186 #: builtin/show-branch.c:660
9187 msgid "include the current branch"
9190 #: builtin/show-branch.c:662
9191 msgid "name commits with their object names"
9194 #: builtin/show-branch.c:664
9195 msgid "show possible merge bases"
9198 #: builtin/show-branch.c:666
9199 msgid "show refs unreachable from any other ref"
9200 msgstr "显示没有任何引用的的引用"
9202 #: builtin/show-branch.c:668
9203 msgid "show commits in topological order"
9206 #: builtin/show-branch.c:671
9207 msgid "show only commits not on the first branch"
9208 msgstr "只显示不在第一个分支上的提交"
9210 #: builtin/show-branch.c:673
9211 msgid "show merges reachable from only one tip"
9212 msgstr "显示仅一个分支可访问的合并提交"
9214 #: builtin/show-branch.c:675
9215 msgid "topologically sort, maintaining date order where possible"
9216 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
9218 #: builtin/show-branch.c:678
9219 msgid "<n>[,<base>]"
9220 msgstr "<n>[,<base>]"
9222 #: builtin/show-branch.c:679
9223 msgid "show <n> most recent ref-log entries starting at base"
9224 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9226 #: builtin/show-ref.c:10
9228 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9229 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9231 "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9232 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9234 #: builtin/show-ref.c:11
9235 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
9236 msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
9238 #: builtin/show-ref.c:168
9239 msgid "only show tags (can be combined with heads)"
9240 msgstr "只显示 tags(可以和头共用)"
9242 #: builtin/show-ref.c:169
9243 msgid "only show heads (can be combined with tags)"
9244 msgstr "只显示头(可以和 tags 共用)"
9246 #: builtin/show-ref.c:170
9247 msgid "stricter reference checking, requires exact ref path"
9248 msgstr "更严格的引用检测,需要精确的引用路径"
9250 #: builtin/show-ref.c:173 builtin/show-ref.c:175
9251 msgid "show the HEAD reference, even if it would be filtered out"
9252 msgstr "显示 HEAD 引用,即使被过滤掉"
9254 #: builtin/show-ref.c:177
9255 msgid "dereference tags into object IDs"
9256 msgstr "转换 tags 到对象ID"
9258 #: builtin/show-ref.c:179
9259 msgid "only show SHA1 hash using <n> digits"
9260 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
9262 #: builtin/show-ref.c:183
9263 msgid "do not print results to stdout (useful with --verify)"
9264 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
9266 #: builtin/show-ref.c:185
9267 msgid "show refs from stdin that aren't in local repository"
9268 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9270 #: builtin/symbolic-ref.c:7
9271 msgid "git symbolic-ref [options] name [ref]"
9272 msgstr "git symbolic-ref [选项] 名称 [引用]"
9274 #: builtin/symbolic-ref.c:8
9275 msgid "git symbolic-ref -d [-q] name"
9276 msgstr "git symbolic-ref -d [-q] 名称"
9278 #: builtin/symbolic-ref.c:40
9279 msgid "suppress error message for non-symbolic (detached) refs"
9280 msgstr "不显示非符号(分离的)引用的错误信息"
9282 #: builtin/symbolic-ref.c:41
9283 msgid "delete symbolic ref"
9286 #: builtin/symbolic-ref.c:42
9287 msgid "shorten ref output"
9290 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
9294 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
9295 msgid "reason of the update"
9300 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9301 msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9304 msgid "git tag -d <tagname>..."
9305 msgstr "git tag -d <标签名>..."
9309 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9310 "\t\t[<pattern>...]"
9312 "git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9316 msgid "git tag -v <tagname>..."
9317 msgstr "git tag -v <标签名>..."
9321 msgid "malformed object at '%s'"
9322 msgstr "非法的对象于 '%s'"
9324 #: builtin/tag.c:301
9326 msgid "tag name too long: %.*s..."
9327 msgstr "tag 名字太长:%.*s..."
9329 #: builtin/tag.c:306
9331 msgid "tag '%s' not found."
9332 msgstr "tag '%s' 未发现。"
9334 #: builtin/tag.c:321
9336 msgid "Deleted tag '%s' (was %s)\n"
9337 msgstr "已删除 tag '%s'(曾为 %s)\n"
9339 #: builtin/tag.c:333
9341 msgid "could not verify the tag '%s'"
9342 msgstr "不能校验 tag '%s'"
9344 #: builtin/tag.c:343
9348 "Write a message for tag:\n"
9350 "Lines starting with '%c' will be ignored.\n"
9355 "以 '%c' 开头的行将被忽略。\n"
9357 #: builtin/tag.c:347
9361 "Write a message for tag:\n"
9363 "Lines starting with '%c' will be kept; you may remove them yourself if you "
9369 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
9371 #: builtin/tag.c:371
9373 msgid "unsupported sort specification '%s'"
9374 msgstr "不支持的排序规格 '%s'"
9376 #: builtin/tag.c:373
9378 msgid "unsupported sort specification '%s' in variable '%s'"
9379 msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9381 #: builtin/tag.c:428
9382 msgid "unable to sign the tag"
9385 #: builtin/tag.c:430
9386 msgid "unable to write tag file"
9389 #: builtin/tag.c:455
9390 msgid "bad object type."
9393 #: builtin/tag.c:468
9394 msgid "tag header too big."
9397 #: builtin/tag.c:504
9398 msgid "no tag message?"
9401 #: builtin/tag.c:510
9403 msgid "The tag message has been left in %s\n"
9404 msgstr "tag 说明被保留在 %s\n"
9406 #: builtin/tag.c:559
9407 msgid "switch 'points-at' requires an object"
9408 msgstr "开关 'points-at' 需要一个对象"
9410 #: builtin/tag.c:561
9412 msgid "malformed object name '%s'"
9413 msgstr "非法的对象名 '%s'"
9415 #: builtin/tag.c:588
9416 msgid "list tag names"
9419 #: builtin/tag.c:590
9420 msgid "print <n> lines of each tag message"
9421 msgstr "每个 tag 信息打印 <n> 行"
9423 #: builtin/tag.c:592
9427 #: builtin/tag.c:593
9431 #: builtin/tag.c:595
9432 msgid "Tag creation options"
9435 #: builtin/tag.c:597
9436 msgid "annotated tag, needs a message"
9437 msgstr "注解 tag,需要一个说明"
9439 #: builtin/tag.c:599
9443 #: builtin/tag.c:601
9444 msgid "annotated and GPG-signed tag"
9445 msgstr "注解并 GPG 签名的 tag"
9447 #: builtin/tag.c:605
9448 msgid "use another key to sign the tag"
9449 msgstr "使用另外的私钥签名 tag"
9451 #: builtin/tag.c:606
9452 msgid "replace the tag if exists"
9453 msgstr "如果存在,替换现有的 tag"
9455 #: builtin/tag.c:607
9456 msgid "show tag list in columns"
9457 msgstr "以列的方式显示 tag"
9459 #: builtin/tag.c:609
9463 #: builtin/tag.c:613
9464 msgid "Tag listing options"
9467 #: builtin/tag.c:616 builtin/tag.c:622
9468 msgid "print only tags that contain the commit"
9469 msgstr "只打印包含提交的tags"
9471 #: builtin/tag.c:628
9472 msgid "print only tags of the object"
9475 #: builtin/tag.c:654
9476 msgid "--column and -n are incompatible"
9477 msgstr "--column 和 -n 不兼容"
9479 #: builtin/tag.c:666
9480 msgid "--sort and -n are incompatible"
9481 msgstr "--sort 和 -n 不兼容"
9483 #: builtin/tag.c:673
9484 msgid "-n option is only allowed with -l."
9485 msgstr "-n 选项只允许和 -l 同时使用。"
9487 #: builtin/tag.c:675
9488 msgid "--contains option is only allowed with -l."
9489 msgstr "--contains 选项只允许和 -l 同时使用。"
9491 #: builtin/tag.c:677
9492 msgid "--points-at option is only allowed with -l."
9493 msgstr "--points-at 选项只允许和 -l 同时使用。"
9495 #: builtin/tag.c:685
9496 msgid "only one -F or -m option is allowed."
9497 msgstr "只允许一个 -F 或 -m 选项。"
9499 #: builtin/tag.c:705
9500 msgid "too many params"
9503 #: builtin/tag.c:711
9505 msgid "'%s' is not a valid tag name."
9506 msgstr "'%s' 不是一个有效的tag名称。"
9508 #: builtin/tag.c:716
9510 msgid "tag '%s' already exists"
9511 msgstr "tag '%s' 已存在"
9513 #: builtin/tag.c:734
9515 msgid "%s: cannot lock the ref"
9518 #: builtin/tag.c:736
9520 msgid "%s: cannot update the ref"
9523 #: builtin/tag.c:738
9525 msgid "Updated tag '%s' (was %s)\n"
9526 msgstr "已更新tag '%s'(曾为 %s)\n"
9528 #: builtin/unpack-objects.c:483
9529 msgid "Unpacking objects"
9532 #: builtin/update-index.c:402
9533 msgid "git update-index [options] [--] [<file>...]"
9534 msgstr "git update-index [选项] [--] [<文件>...]"
9536 #: builtin/update-index.c:755
9537 msgid "continue refresh even when index needs update"
9538 msgstr "当索引需要更新时继续刷新"
9540 #: builtin/update-index.c:758
9541 msgid "refresh: ignore submodules"
9544 #: builtin/update-index.c:761
9545 msgid "do not ignore new files"
9548 #: builtin/update-index.c:763
9549 msgid "let files replace directories and vice-versa"
9550 msgstr "让文件替换目录(反之亦然)"
9552 #: builtin/update-index.c:765
9553 msgid "notice files missing from worktree"
9556 #: builtin/update-index.c:767
9557 msgid "refresh even if index contains unmerged entries"
9558 msgstr "即使索引区包含未合并的条目也执行刷新"
9560 #: builtin/update-index.c:770
9561 msgid "refresh stat information"
9564 #: builtin/update-index.c:774
9565 msgid "like --refresh, but ignore assume-unchanged setting"
9566 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
9568 #: builtin/update-index.c:778
9569 msgid "<mode>,<object>,<path>"
9570 msgstr "<mode>,<object>,<path>"
9572 #: builtin/update-index.c:779
9573 msgid "add the specified entry to the index"
9574 msgstr "添加指定的条目到索引区"
9576 #: builtin/update-index.c:783
9580 #: builtin/update-index.c:784
9581 msgid "override the executable bit of the listed files"
9582 msgstr "覆盖列表里文件的可执行位"
9584 #: builtin/update-index.c:788
9585 msgid "mark files as \"not changing\""
9586 msgstr "把文件标记为 \"没有变更\""
9588 #: builtin/update-index.c:791
9589 msgid "clear assumed-unchanged bit"
9590 msgstr "清除 assumed-unchanged 位"
9592 #: builtin/update-index.c:794
9593 msgid "mark files as \"index-only\""
9594 msgstr "把文件标记为 \"仅索引\""
9596 #: builtin/update-index.c:797
9597 msgid "clear skip-worktree bit"
9598 msgstr "清除 skip-worktree 位"
9600 #: builtin/update-index.c:800
9601 msgid "add to index only; do not add content to object database"
9602 msgstr "只添加到索引区;不添加对象到对象库"
9604 #: builtin/update-index.c:802
9605 msgid "remove named paths even if present in worktree"
9606 msgstr "即使存在工作区里,也删除路径"
9608 #: builtin/update-index.c:804
9609 msgid "with --stdin: input lines are terminated by null bytes"
9610 msgstr "携带 --stdin:输入的行以 null 字符终止"
9612 #: builtin/update-index.c:806
9613 msgid "read list of paths to be updated from standard input"
9614 msgstr "从标准输入中读取需要更新的路径列表"
9616 #: builtin/update-index.c:810
9617 msgid "add entries from standard input to the index"
9618 msgstr "从标准输入添加条目到索引区"
9620 #: builtin/update-index.c:814
9621 msgid "repopulate stages #2 and #3 for the listed paths"
9622 msgstr "为指定文件重新生成第2和第3暂存区"
9624 #: builtin/update-index.c:818
9625 msgid "only update entries that differ from HEAD"
9626 msgstr "只更新与 HEAD 不同的条目"
9628 #: builtin/update-index.c:822
9629 msgid "ignore files missing from worktree"
9632 #: builtin/update-index.c:825
9633 msgid "report actions to standard output"
9636 #: builtin/update-index.c:827
9637 msgid "(for porcelains) forget saved unresolved conflicts"
9638 msgstr "(for porcelains) 忘记保存的未解决的冲突"
9640 #: builtin/update-index.c:831
9641 msgid "write index in this format"
9644 #: builtin/update-index.c:833
9645 msgid "enable or disable split index"
9648 #: builtin/update-ref.c:9
9649 msgid "git update-ref [options] -d <refname> [<oldval>]"
9650 msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9652 #: builtin/update-ref.c:10
9653 msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9654 msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9656 #: builtin/update-ref.c:11
9657 msgid "git update-ref [options] --stdin [-z]"
9658 msgstr "git update-ref [选项] --stdin [-z]"
9660 #: builtin/update-ref.c:350
9661 msgid "delete the reference"
9664 #: builtin/update-ref.c:352
9665 msgid "update <refname> not the one it points to"
9666 msgstr "更新 <引用名> 本身而不是它指向的引用"
9668 #: builtin/update-ref.c:353
9669 msgid "stdin has NUL-terminated arguments"
9670 msgstr "标准输入有以 NUL 字符终止的参数"
9672 #: builtin/update-ref.c:354
9673 msgid "read updates from stdin"
9676 #: builtin/update-server-info.c:6
9677 msgid "git update-server-info [--force]"
9678 msgstr "git update-server-info [--force]"
9680 #: builtin/update-server-info.c:14
9681 msgid "update the info files from scratch"
9684 #: builtin/verify-commit.c:17
9685 msgid "git verify-commit [-v|--verbose] <commit>..."
9686 msgstr "git verify-commit [-v|--verbose] <提交>..."
9688 #: builtin/verify-commit.c:75
9689 msgid "print commit contents"
9692 #: builtin/verify-pack.c:55
9693 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9694 msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9696 #: builtin/verify-pack.c:65
9700 #: builtin/verify-pack.c:67
9701 msgid "show statistics only"
9704 #: builtin/verify-tag.c:17
9705 msgid "git verify-tag [-v|--verbose] <tag>..."
9706 msgstr "git verify-tag [-v|--verbose] <tag>..."
9708 #: builtin/verify-tag.c:73
9709 msgid "print tag contents"
9712 #: builtin/write-tree.c:13
9713 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
9714 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
9716 #: builtin/write-tree.c:26
9720 #: builtin/write-tree.c:27
9721 msgid "write tree object for a subdirectory <prefix>"
9722 msgstr "将 <前缀> 子目录内容写到一个树对象"
9724 #: builtin/write-tree.c:30
9725 msgid "only useful for debugging"
9730 "'git help -a' and 'git help -g' lists available subcommands and some\n"
9731 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
9732 "to read about a specific subcommand or concept."
9734 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9735 "'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
9737 #: parse-options.h:143
9741 #: parse-options.h:158
9742 msgid "no-op (backward compatibility)"
9745 #: parse-options.h:232
9746 msgid "be more verbose"
9749 #: parse-options.h:234
9750 msgid "be more quiet"
9753 #: parse-options.h:240
9754 msgid "use <n> digits to display SHA-1s"
9755 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
9758 msgid "Add file contents to the index"
9762 msgid "Find by binary search the change that introduced a bug"
9763 msgstr "通过二分查找定位引入 bug 的变更"
9766 msgid "List, create, or delete branches"
9770 msgid "Checkout a branch or paths to the working tree"
9771 msgstr "检出一个分支或路径到工作区"
9774 msgid "Clone a repository into a new directory"
9775 msgstr "克隆一个版本库到一个新目录"
9778 msgid "Record changes to the repository"
9782 msgid "Show changes between commits, commit and working tree, etc"
9783 msgstr "显示提交之间、提交和工作区之间等的差异"
9786 msgid "Download objects and refs from another repository"
9787 msgstr "从另外一个版本库下载对象和引用"
9790 msgid "Print lines matching a pattern"
9794 msgid "Create an empty Git repository or reinitialize an existing one"
9795 msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
9798 msgid "Show commit logs"
9802 msgid "Join two or more development histories together"
9803 msgstr "合并两个或更多开发历史"
9806 msgid "Move or rename a file, a directory, or a symlink"
9807 msgstr "移动或重命名一个文件、目录或符号链接"
9810 msgid "Fetch from and integrate with another repository or a local branch"
9811 msgstr "获取并整合另外的版本库或一个本地分支"
9814 msgid "Update remote refs along with associated objects"
9815 msgstr "更新远程引用和相关的对象"
9818 msgid "Forward-port local commits to the updated upstream head"
9819 msgstr "本地提交转移至更新后的上游分支中"
9822 msgid "Reset current HEAD to the specified state"
9823 msgstr "重置当前HEAD到指定状态"
9826 msgid "Remove files from the working tree and from the index"
9827 msgstr "从工作区和索引中删除文件"
9830 msgid "Show various types of objects"
9834 msgid "Show the working tree status"
9838 msgid "Create, list, delete or verify a tag object signed with GPG"
9839 msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
9842 msgid "You need to set your committer info first"
9843 msgstr "您需要先设置你的提交者信息"
9847 "You seem to have moved HEAD since the last 'am' failure.\n"
9848 "Not rewinding to ORIG_HEAD"
9849 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
9854 "When you have resolved this problem, run \"$cmdline --continue\".\n"
9855 "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9856 "To restore the original branch and stop patching, run \"$cmdline --abort\"."
9858 "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
9859 "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9860 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9863 msgid "Cannot fall back to three-way merge."
9867 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9868 msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
9871 msgid "Using index info to reconstruct a base tree..."
9872 msgstr "使用索引来重建一个(三路合并的)基础目录树..."
9876 "Did you hand edit your patch?\n"
9877 "It does not apply to blobs recorded in its index."
9880 "无法应用补丁到索引中的数据(blob)对象上。"
9883 msgid "Falling back to patching base and 3-way merge..."
9884 msgstr "转而在基础版本上打补丁及进行三路合并..."
9887 msgid "Failed to merge in the changes."
9891 msgid "Only one StGIT patch series can be applied at once"
9892 msgstr "一次只能有一个 StGIT 补丁队列被应用"
9896 msgid "Patch format $patch_format is not supported."
9897 msgstr "不支持 $patch_format 补丁格式。"
9900 msgid "Patch format detection failed."
9905 "The -b/--binary option has been a no-op for long time, and\n"
9906 "it will be removed. Please do not use it anymore."
9908 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9913 msgid "previous rebase directory $dotest still exists but mbox given."
9914 msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
9917 msgid "Please make up your mind. --skip or --abort?"
9918 msgstr "请下决心。--skip 或是 --abort ?"
9923 "Stray $dotest directory found.\n"
9924 "Use \"git am --abort\" to remove it."
9926 "发现了错误的 $dotest 目录。\n"
9927 "使用 \"git am --abort\" 删除它。"
9930 msgid "Resolve operation not in progress, we are not resuming."
9931 msgstr "解决操作未进行,我们不会继续。"
9935 msgid "Dirty index: cannot apply patches (dirty: $files)"
9936 msgstr "脏的索引:不能应用补丁(脏文件:$files)"
9941 "Patch is empty. Was it split wrong?\n"
9942 "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9943 "To restore the original branch and stop patching run \"$cmdline --abort\"."
9946 "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9947 "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9950 msgid "Patch does not have a valid e-mail address."
9951 msgstr "补丁中没有一个有效的邮件地址。"
9954 msgid "cannot be interactive without stdin connected to a terminal."
9955 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
9958 msgid "Commit Body is:"
9962 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9963 #. in your translation. The program will only accept English
9964 #. input at this point.
9966 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9967 msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9971 msgid "Applying: $FIRSTLINE"
9972 msgstr "正应用:$FIRSTLINE"
9976 "No changes - did you forget to use 'git add'?\n"
9977 "If there is nothing left to stage, chances are that something else\n"
9978 "already introduced the same changes; you might want to skip this patch."
9980 "没有变更 —— 您是不是忘了执行 'git add'?\n"
9981 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9986 "You still have unmerged paths in your index\n"
9987 "did you forget to use 'git add'?"
9988 msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
9991 msgid "No changes -- Patch already applied."
9992 msgstr "没有变更 —— 补丁已经应用过。"
9996 msgid "Patch failed at $msgnum $FIRSTLINE"
9997 msgstr "补丁失败于 $msgnum $FIRSTLINE"
10002 "The copy of the patch that failed is found in:\n"
10009 msgid "applying to an empty history"
10010 msgstr "正应用到一个空历史上"
10012 #: git-bisect.sh:48
10013 msgid "You need to start by \"git bisect start\""
10014 msgstr "您需要执行 \"git bisect start\" 来开始"
10017 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10018 #. translation. The program will only accept English input
10020 #: git-bisect.sh:54
10021 msgid "Do you want me to do it for you [Y/n]? "
10022 msgstr "您想让我为您这样做么[Y/n]? "
10024 #: git-bisect.sh:95
10026 msgid "unrecognised option: '$arg'"
10027 msgstr "未能识别的选项:'$arg'"
10029 #: git-bisect.sh:99
10031 msgid "'$arg' does not appear to be a valid revision"
10032 msgstr "'$arg' 看起来不像是一个有效的版本"
10034 #: git-bisect.sh:117
10035 msgid "Bad HEAD - I need a HEAD"
10036 msgstr "坏的 HEAD - 我需要一个 HEAD"
10038 #: git-bisect.sh:130
10041 "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10042 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
10044 #: git-bisect.sh:140
10045 msgid "won't bisect on cg-seek'ed tree"
10046 msgstr "不会在做了 cg-seek 的树上做二分查找"
10048 #: git-bisect.sh:144
10049 msgid "Bad HEAD - strange symbolic ref"
10050 msgstr "坏的 HEAD - 奇怪的符号引用"
10052 #: git-bisect.sh:189
10054 msgid "Bad bisect_write argument: $state"
10055 msgstr "坏的 bisect_write 参数:$state"
10057 #: git-bisect.sh:218
10059 msgid "Bad rev input: $arg"
10060 msgstr "输入坏的版本:$arg"
10062 #: git-bisect.sh:232
10063 msgid "Please call 'bisect_state' with at least one argument."
10064 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10066 #: git-bisect.sh:244
10068 msgid "Bad rev input: $rev"
10069 msgstr "输入坏的版本:$rev"
10071 #: git-bisect.sh:250
10072 msgid "'git bisect bad' can take only one argument."
10073 msgstr "'git bisect bad' 只能带一个参数。"
10075 #: git-bisect.sh:273
10076 msgid "Warning: bisecting only with a bad commit."
10077 msgstr "警告:在仅有一个坏提交下进行二分查找。"
10080 #. TRANSLATORS: Make sure to include [Y] and [n] in your
10081 #. translation. The program will only accept English input
10083 #: git-bisect.sh:279
10084 msgid "Are you sure [Y/n]? "
10085 msgstr "您确认么[Y/n]? "
10087 #: git-bisect.sh:289
10089 "You need to give me at least one good and one bad revisions.\n"
10090 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10092 "您需要给我至少一个好版本和一个坏版本。\n"
10093 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
10095 #: git-bisect.sh:292
10097 "You need to start by \"git bisect start\".\n"
10098 "You then need to give me at least one good and one bad revisions.\n"
10099 "(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10101 "您需要执行 \"git bisect start\" 来开始。\n"
10102 "然后需要提供我至少一个好版本和一个坏版本。\n"
10103 "(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
10105 #: git-bisect.sh:363 git-bisect.sh:490
10106 msgid "We are not bisecting."
10107 msgstr "我们没有在二分查找。"
10109 #: git-bisect.sh:370
10111 msgid "'$invalid' is not a valid commit"
10112 msgstr "'$invalid' 不是一个有效的提交"
10114 #: git-bisect.sh:379
10117 "Could not check out original HEAD '$branch'.\n"
10118 "Try 'git bisect reset <commit>'."
10120 "不能检出原始 HEAD '$branch'。\n"
10121 "尝试 'git bisect reset <提交>'。"
10123 #: git-bisect.sh:406
10124 msgid "No logfile given"
10127 #: git-bisect.sh:407
10129 msgid "cannot read $file for replaying"
10130 msgstr "不能读取 $file 来重放"
10132 #: git-bisect.sh:424
10133 msgid "?? what are you talking about?"
10136 #: git-bisect.sh:436
10138 msgid "running $command"
10139 msgstr "运行 $command"
10141 #: git-bisect.sh:443
10144 "bisect run failed:\n"
10145 "exit code $res from '$command' is < 0 or >= 128"
10148 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
10150 #: git-bisect.sh:469
10151 msgid "bisect run cannot continue any more"
10152 msgstr "二分查找不能继续运行"
10154 #: git-bisect.sh:475
10157 "bisect run failed:\n"
10158 "'bisect_state $state' exited with error code $res"
10161 "'bisect_state $state' 退出码为 $res"
10163 #: git-bisect.sh:482
10164 msgid "bisect run success"
10169 "Pull is not possible because you have unmerged files.\n"
10170 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
10171 "as appropriate to mark resolution, or use 'git commit -a'."
10173 "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
10174 "然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
10175 "或者使用 'git commit -a'。"
10178 msgid "Pull is not possible because you have unmerged files."
10179 msgstr "Pull 不可用,因为您尚有未合并的文件。"
10182 msgid "updating an unborn branch with changes added to the index"
10183 msgstr "更新尚未诞生的分支,变更添加至索引"
10188 "Warning: fetch updated the current branch head.\n"
10189 "Warning: fast-forwarding your working tree from\n"
10190 "Warning: commit $orig_head."
10192 "警告:fetch 更新了当前的分支。您的工作区\n"
10193 "警告:从原提交 $orig_head 快进。"
10196 msgid "Cannot merge multiple branches into empty head"
10197 msgstr "无法将多个分支合并到空分支"
10200 msgid "Cannot rebase onto multiple branches"
10203 #: git-rebase.sh:57
10205 "When you have resolved this problem, run \"git rebase --continue\".\n"
10206 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10207 "To check out the original branch and stop rebasing, run \"git rebase --abort"
10210 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10211 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10212 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10214 #: git-rebase.sh:165
10215 msgid "Applied autostash."
10216 msgstr "成功应用 autostash。"
10218 #: git-rebase.sh:168
10220 msgid "Cannot store $stash_sha1"
10221 msgstr "无法保存 $stash_sha1"
10223 #: git-rebase.sh:169
10225 "Applying autostash resulted in conflicts.\n"
10226 "Your changes are safe in the stash.\n"
10227 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
10229 "应用 autostash 导致冲突。\n"
10230 "您的修改安全地保存在 stash 中。\n"
10231 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10233 #: git-rebase.sh:208
10234 msgid "The pre-rebase hook refused to rebase."
10235 msgstr "钩子 pre-rebase 拒绝变基操作。"
10237 #: git-rebase.sh:213
10238 msgid "It looks like git-am is in progress. Cannot rebase."
10239 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10241 #: git-rebase.sh:351
10242 msgid "The --exec option must be used with the --interactive option"
10243 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10245 #: git-rebase.sh:356
10246 msgid "No rebase in progress?"
10247 msgstr "没有正在进行的变基?"
10249 #: git-rebase.sh:367
10250 msgid "The --edit-todo action can only be used during interactive rebase."
10251 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10253 #: git-rebase.sh:374
10254 msgid "Cannot read HEAD"
10257 #: git-rebase.sh:377
10259 "You must edit all merge conflicts and then\n"
10260 "mark them as resolved using git add"
10262 "您必须编辑所有的合并冲突,然后通过 git add\n"
10265 #: git-rebase.sh:395
10267 msgid "Could not move back to $head_name"
10268 msgstr "无法移回 $head_name"
10270 #: git-rebase.sh:414
10273 "It seems that there is already a $state_dir_base directory, and\n"
10274 "I wonder if you are in the middle of another rebase. If that is the\n"
10275 "case, please try\n"
10276 "\t$cmd_live_rebase\n"
10277 "If that is not the case, please\n"
10278 "\t$cmd_clear_stale_rebase\n"
10279 "and run me again. I am stopping in case you still have something\n"
10282 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10284 "\t$cmd_live_rebase\n"
10286 "\t$cmd_clear_stale_rebase\n"
10287 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
10289 #: git-rebase.sh:465
10291 msgid "invalid upstream $upstream_name"
10292 msgstr "无效的上游 $upstream_name"
10294 #: git-rebase.sh:489
10296 msgid "$onto_name: there are more than one merge bases"
10297 msgstr "$onto_name: 有一个以上的合并基准"
10299 #: git-rebase.sh:492 git-rebase.sh:496
10301 msgid "$onto_name: there is no merge base"
10302 msgstr "$onto_name: 没有合并基准"
10304 #: git-rebase.sh:501
10306 msgid "Does not point to a valid commit: $onto_name"
10307 msgstr "没有指向一个有效的提交:$onto_name"
10309 #: git-rebase.sh:524
10311 msgid "fatal: no such branch: $branch_name"
10312 msgstr "严重错误:无此分支:$branch_name"
10314 #: git-rebase.sh:557
10315 msgid "Cannot autostash"
10316 msgstr "无法 autostash"
10318 #: git-rebase.sh:562
10320 msgid "Created autostash: $stash_abbrev"
10321 msgstr "创建了 autostash: $stash_abbrev"
10323 #: git-rebase.sh:566
10324 msgid "Please commit or stash them."
10325 msgstr "请提交或为它们保存进度。"
10327 #: git-rebase.sh:586
10329 msgid "Current branch $branch_name is up to date."
10330 msgstr "当前分支 $branch_name 是最新的。"
10332 #: git-rebase.sh:590
10334 msgid "Current branch $branch_name is up to date, rebase forced."
10335 msgstr "当前分支 $branch_name 是最新的,强制变基。"
10337 #: git-rebase.sh:601
10339 msgid "Changes from $mb to $onto:"
10340 msgstr "变更从 $mb 到 $onto:"
10342 #: git-rebase.sh:610
10343 msgid "First, rewinding head to replay your work on top of it..."
10344 msgstr "首先,重置头指针以便在上面重放您的工作..."
10346 #: git-rebase.sh:620
10348 msgid "Fast-forwarded $branch_name to $onto_name."
10349 msgstr "快进 $branch_name 至 $onto_name。"
10352 msgid "git stash clear with parameters is unimplemented"
10353 msgstr "git stash clear 不支持参数"
10356 msgid "You do not have the initial commit yet"
10360 msgid "Cannot save the current index state"
10361 msgstr "无法保存当前索引状态"
10363 #: git-stash.sh:124 git-stash.sh:137
10364 msgid "Cannot save the current worktree state"
10365 msgstr "无法保存当前工作区状态"
10367 #: git-stash.sh:141
10368 msgid "No changes selected"
10371 #: git-stash.sh:144
10372 msgid "Cannot remove temporary index (can't happen)"
10373 msgstr "无法删除临时索引(不应发生)"
10375 #: git-stash.sh:157
10376 msgid "Cannot record working tree state"
10379 #: git-stash.sh:191
10381 msgid "Cannot update $ref_stash with $w_commit"
10382 msgstr "无法用 $w_commit 更新 $ref_stash"
10384 #. TRANSLATORS: $option is an invalid option, like
10385 #. `--blah-blah'. The 7 spaces at the beginning of the
10386 #. second line correspond to "error: ". So you should line
10387 #. up the second line with however many characters the
10388 #. translation of "error: " takes in your language. E.g. in
10389 #. English this is:
10391 #. $ git stash save --blah-blah 2>&1 | head -n 2
10392 #. error: unknown option for 'stash save': --blah-blah
10393 #. To provide a message, use git stash save -- '--blah-blah'
10394 #: git-stash.sh:238
10397 "error: unknown option for 'stash save': $option\n"
10398 " To provide a message, use git stash save -- '$option'"
10400 "错误:'stash save' 的未知选项:$option\n"
10401 " 要提供一个描述信息,使用 git stash save -- '$option'"
10403 #: git-stash.sh:259
10404 msgid "No local changes to save"
10405 msgstr "没有要保存的本地修改"
10407 #: git-stash.sh:263
10408 msgid "Cannot initialize stash"
10409 msgstr "无法初始化 stash"
10411 #: git-stash.sh:267
10412 msgid "Cannot save the current status"
10415 #: git-stash.sh:285
10416 msgid "Cannot remove worktree changes"
10419 #: git-stash.sh:384
10420 msgid "No stash found."
10421 msgstr "未发现 stash。"
10423 #: git-stash.sh:391
10425 msgid "Too many revisions specified: $REV"
10426 msgstr "指定了太多的版本:$REV"
10428 #: git-stash.sh:397
10430 msgid "$reference is not valid reference"
10431 msgstr "$reference 不是有效的引用"
10433 #: git-stash.sh:425
10435 msgid "'$args' is not a stash-like commit"
10436 msgstr "'$args' 不是 stash 样提交"
10438 #: git-stash.sh:436
10440 msgid "'$args' is not a stash reference"
10441 msgstr "'$args' 不是一个 stash 引用"
10443 #: git-stash.sh:444
10444 msgid "unable to refresh index"
10447 #: git-stash.sh:448
10448 msgid "Cannot apply a stash in the middle of a merge"
10449 msgstr "无法在合并过程中恢复进度"
10451 #: git-stash.sh:456
10452 msgid "Conflicts in index. Try without --index."
10453 msgstr "索引中有冲突。尝试不使用 --index。"
10455 #: git-stash.sh:458
10456 msgid "Could not save index tree"
10459 #: git-stash.sh:492
10460 msgid "Cannot unstage modified files"
10463 #: git-stash.sh:507
10464 msgid "Index was not unstashed."
10465 msgstr "索引的进度没有被恢复。"
10467 #: git-stash.sh:530
10469 msgid "Dropped ${REV} ($s)"
10470 msgstr "丢弃了 ${REV} ($s)"
10472 #: git-stash.sh:531
10474 msgid "${REV}: Could not drop stash entry"
10475 msgstr "${REV}:不能丢弃进度条目"
10477 #: git-stash.sh:538
10478 msgid "No branch name specified"
10481 #: git-stash.sh:610
10482 msgid "(To restore them type \"git stash apply\")"
10483 msgstr "(为恢复数据输入 \"git stash apply\")"
10485 #: git-submodule.sh:95
10487 msgid "cannot strip one component off url '$remoteurl'"
10488 msgstr "无法从 url '$remoteurl' 剥离一个组件"
10490 #: git-submodule.sh:237
10492 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10493 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
10495 #: git-submodule.sh:287
10497 msgid "Clone of '$url' into submodule path '$sm_path' failed"
10498 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
10500 #: git-submodule.sh:296
10502 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10503 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
10505 #: git-submodule.sh:406
10506 msgid "Relative path can only be used from the toplevel of the working tree"
10507 msgstr "只能在工作区的顶级目录中使用相对路径"
10509 #: git-submodule.sh:416
10511 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10512 msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10514 #: git-submodule.sh:433
10516 msgid "'$sm_path' already exists in the index"
10517 msgstr "'$sm_path' 已经存在于索引中"
10519 #: git-submodule.sh:437
10522 "The following path is ignored by one of your .gitignore files:\n"
10524 "Use -f if you really want to add it."
10526 "以下路径被您的一个 .gitignore 文件所忽略:\n"
10528 "如果您确实想添加它,使用 -f 参数。"
10530 #: git-submodule.sh:455
10532 msgid "Adding existing repo at '$sm_path' to the index"
10533 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10535 #: git-submodule.sh:457
10537 msgid "'$sm_path' already exists and is not a valid git repo"
10538 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
10540 #: git-submodule.sh:465
10542 msgid "A git directory for '$sm_name' is found locally with remote(s):"
10543 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10545 #: git-submodule.sh:467
10548 "If you want to reuse this local git directory instead of cloning again from"
10549 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10551 #: git-submodule.sh:469
10554 "use the '--force' option. If the local git directory is not the correct repo"
10555 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10557 #: git-submodule.sh:470
10560 "or you are unsure what this means choose another name with the '--name' "
10562 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10564 #: git-submodule.sh:472
10566 msgid "Reactivating local git directory for submodule '$sm_name'."
10567 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10569 #: git-submodule.sh:484
10571 msgid "Unable to checkout submodule '$sm_path'"
10572 msgstr "不能检出子模组 '$sm_path'"
10574 #: git-submodule.sh:489
10576 msgid "Failed to add submodule '$sm_path'"
10577 msgstr "无法添加子模组 '$sm_path'"
10579 #: git-submodule.sh:498
10581 msgid "Failed to register submodule '$sm_path'"
10582 msgstr "无法注册子模组 '$sm_path'"
10584 #: git-submodule.sh:542
10586 msgid "Entering '$prefix$displaypath'"
10587 msgstr "正在进入 '$prefix$displaypath'"
10589 #: git-submodule.sh:562
10591 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10592 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
10594 #: git-submodule.sh:608
10596 msgid "No url found for submodule path '$displaypath' in .gitmodules"
10597 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
10599 #: git-submodule.sh:617
10601 msgid "Failed to register url for submodule path '$displaypath'"
10602 msgstr "无法为子模组路径 '$displaypath' 注册 url"
10604 #: git-submodule.sh:619
10606 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10607 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10609 #: git-submodule.sh:636
10611 msgid "Failed to register update mode for submodule path '$displaypath'"
10612 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
10614 #: git-submodule.sh:674
10616 msgid "Use '.' if you really want to deinitialize all submodules"
10617 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10619 #: git-submodule.sh:691
10621 msgid "Submodule work tree '$displaypath' contains a .git directory"
10622 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
10624 #: git-submodule.sh:692
10627 "(use 'rm -rf' if you really want to remove it including all of its history)"
10628 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10630 #: git-submodule.sh:698
10633 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10635 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
10637 #: git-submodule.sh:701
10639 msgid "Cleared directory '$displaypath'"
10640 msgstr "已清除目录 '$displaypath'"
10642 #: git-submodule.sh:702
10644 msgid "Could not remove submodule work tree '$displaypath'"
10645 msgstr "无法移除子模组工作区 '$displaypath'"
10647 #: git-submodule.sh:705
10649 msgid "Could not create empty submodule directory '$displaypath'"
10650 msgstr "不能创建空的子模组目录 '$displaypath'"
10652 #: git-submodule.sh:714
10654 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10655 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
10657 #: git-submodule.sh:830
10660 "Submodule path '$displaypath' not initialized\n"
10661 "Maybe you want to use 'update --init'?"
10663 "子模组路径 '$displaypath' 没有初始化\n"
10664 "也许您想用 'update --init'?"
10666 #: git-submodule.sh:843
10668 msgid "Unable to find current revision in submodule path '$displaypath'"
10669 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
10671 #: git-submodule.sh:852
10673 msgid "Unable to fetch in submodule path '$sm_path'"
10674 msgstr "无法在子模组路径 '$sm_path' 中获取"
10676 #: git-submodule.sh:876
10678 msgid "Unable to fetch in submodule path '$displaypath'"
10679 msgstr "无法在子模组路径 '$displaypath' 中获取"
10681 #: git-submodule.sh:890
10683 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10684 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10686 #: git-submodule.sh:891
10688 msgid "Submodule path '$displaypath': checked out '$sha1'"
10689 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10691 #: git-submodule.sh:895
10693 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10694 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
10696 #: git-submodule.sh:896
10698 msgid "Submodule path '$displaypath': rebased into '$sha1'"
10699 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
10701 #: git-submodule.sh:901
10703 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10704 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
10706 #: git-submodule.sh:902
10708 msgid "Submodule path '$displaypath': merged in '$sha1'"
10709 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
10711 #: git-submodule.sh:907
10714 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10715 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
10717 #: git-submodule.sh:908
10719 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10720 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
10722 #: git-submodule.sh:938
10724 msgid "Failed to recurse into submodule path '$displaypath'"
10725 msgstr "无法递归进子模组路径 '$displaypath'"
10727 #: git-submodule.sh:1046
10728 msgid "The --cached option cannot be used with the --files option"
10729 msgstr "选项 --cached 不能和选项 --files 同时使用"
10731 #: git-submodule.sh:1098
10733 msgid "unexpected mode $mod_dst"
10734 msgstr "意外的模式 $mod_dst"
10737 #: git-submodule.sh:1118
10739 msgid " Warn: $display_name doesn't contain commit $sha1_src"
10740 msgstr " 警告:$display_name 未包含提交 $sha1_src"
10743 #: git-submodule.sh:1121
10745 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10746 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
10749 #: git-submodule.sh:1124
10751 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10752 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
10754 #: git-submodule.sh:1149
10758 #: git-submodule.sh:1267
10760 msgid "Failed to recurse into submodule path '$sm_path'"
10761 msgstr "无法递归进子模组路径 '$sm_path'"
10763 #: git-submodule.sh:1331
10765 msgid "Synchronizing submodule url for '$displaypath'"
10766 msgstr "为 '$displaypath' 同步子模组 url"
10768 #~ msgid "commit has empty message"
10771 #~ msgid "Failed to chdir: %s"
10772 #~ msgstr "无法切换目录:%s"
10777 #~ msgid "Tracking not set up: name too long: %s"
10778 #~ msgstr "跟踪未设置:名字太长:%s"
10788 #~ msgid ", behind "
10791 #~ msgid "could not find .gitmodules in index"
10792 #~ msgstr "无法在索引中找到 .gitmodules"
10794 #~ msgid "reading updated .gitmodules failed"
10795 #~ msgstr "读取更新后的 .gitmodules 失败"
10797 #~ msgid "unable to stat updated .gitmodules"
10798 #~ msgstr "不能枚举更新后的 .gitmodules"
10800 #~ msgid "unable to remove .gitmodules from index"
10801 #~ msgstr "不能从索引中移除 .gitmodules"
10803 #~ msgid "adding updated .gitmodules failed"
10804 #~ msgstr "添加更新后的 .gitmodules 失败"
10806 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10808 #~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
10809 #~ "subdirectory of the tree will change in Git 2.0 and should not be used "
10811 #~ "To add content for the whole tree, run:\n"
10813 #~ " git add %s :/\n"
10814 #~ " (or git add %s :/)\n"
10816 #~ "To restrict the command to the current directory, run:\n"
10818 #~ " git add %s .\n"
10819 #~ " (or git add %s .)\n"
10821 #~ "With the current Git version, the command is restricted to the current "
10824 #~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
10825 #~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
10826 #~ "如果要添加整个目录树的内容,执行:\n"
10828 #~ " git add %s :/\n"
10829 #~ " (或 git add %s :/)\n"
10831 #~ "如果要限制该命令只作用于当前目录,执行:\n"
10833 #~ " git add %s .\n"
10834 #~ " (或 git add %s .)\n"
10836 #~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
10839 #~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
10840 #~ "whose behaviour will change in Git 2.0 with respect to paths you "
10842 #~ "Paths like '%s' that are\n"
10843 #~ "removed from your working tree are ignored with this version of Git.\n"
10845 #~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
10846 #~ " ignores paths you removed from your working tree.\n"
10848 #~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
10850 #~ "Run 'git status' to check the paths you removed from your working tree.\n"
10852 #~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
10853 #~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
10854 #~ "像本地工作区移除的路径 '%s'\n"
10855 #~ "在此版本的 Git 中被忽略。\n"
10857 #~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
10858 #~ " 忽略您本地工作区中移除的文件。\n"
10860 #~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
10862 #~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
10865 #~ "Auto packing the repository for optimum performance. You may also\n"
10866 #~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
10868 #~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
10869 #~ "参见 \"git help gc\" 以获取更多信息。\n"
10872 #~ "Updates were rejected because a pushed branch tip is behind its remote\n"
10873 #~ "counterpart. If you did not intend to push that branch, you may want to\n"
10874 #~ "specify branches to push or set the 'push.default' configuration "
10876 #~ "to 'simple', 'current' or 'upstream' to push only the current branch."
10878 #~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
10879 #~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
10880 #~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
10883 # 译者:为保证在输出中对齐,注意调整句中空格!
10884 #~ msgid "copied: %s -> %s"
10885 #~ msgstr "拷贝: %s -> %s"
10887 # 译者:为保证在输出中对齐,注意调整句中空格!
10888 #~ msgid "deleted: %s"
10891 # 译者:为保证在输出中对齐,注意调整句中空格!
10892 #~ msgid "modified: %s"
10895 # 译者:为保证在输出中对齐,注意调整句中空格!
10896 #~ msgid "renamed: %s -> %s"
10897 #~ msgstr "重命名: %s -> %s"
10899 # 译者:为保证在输出中对齐,注意调整句中空格!
10900 #~ msgid "unmerged: %s"
10901 #~ msgstr "未合并: %s"
10903 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
10905 #~ "push.default is unset; its implicit value is changing in\n"
10906 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
10907 #~ "and maintain the current behavior after the default changes, use:\n"
10909 #~ " git config --global push.default matching\n"
10911 #~ "To squelch this message and adopt the new behavior now, use:\n"
10913 #~ " git config --global push.default simple\n"
10915 #~ "See 'git help config' and search for 'push.default' for further "
10916 #~ "information.\n"
10917 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
10918 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
10920 #~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
10921 #~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
10923 #~ " git config --global push.default matching\n"
10925 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
10927 #~ " git config --global push.default simple\n"
10929 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
10930 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
10931 #~ "为保持兼容,请用 'current' 代替 'simple')"
10933 #~ msgid "input paths are terminated by a null character"
10934 #~ msgstr "输入路径以null字符终止"
10937 #~ "The following untracked files would NOT be saved but need to be removed "
10938 #~ "by stash save:"
10939 #~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
10942 #~ "Aborting. Consider using either the --force or --include-untracked option."
10943 #~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
10946 #~ "the following submodule (or one of its nested submodule)\n"
10947 #~ "uses a .git directory:"
10949 #~ "the following submodules (or one of its nested submodule)\n"
10950 #~ "use a .git directory:"
10951 #~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10952 #~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10955 #~ msgid " (fix conflicts and then run \"git am --resolved\")"
10956 #~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10959 #~ msgid " (all conflicts fixed: run \"git commit\")"
10960 #~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10962 #~ msgid "more than %d trees given: '%s'"
10963 #~ msgstr "提供了超过 %d 个树对象:'%s'"
10965 #~ msgid "You cannot combine --no-ff with --ff-only."
10966 #~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10969 #~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10970 #~ "(use 'rm -rf' if you really want to remove it including all of its "
10973 #~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10974 #~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10977 #~ "'%s' has changes staged in the index\n"
10978 #~ "(use --cached to keep the file, or -f to force removal)"
10980 #~ "'%s' 有变更已暂存至索引中\n"
10981 #~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10983 #~ msgid "show commits where no parent comes before its children"
10984 #~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10986 #~ msgid "show the HEAD reference"
10987 #~ msgstr "显示 HEAD 引用"
10989 #~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10990 #~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10992 #~ msgid "Change flags"
10996 #~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10997 #~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10999 #~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11000 #~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
11002 #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11003 #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11005 #~ msgid "See 'git help <command>' for more information on a specific command."
11006 #~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
11008 #~ msgid "BUG: impossible combination of %d and %p"
11009 #~ msgstr "BUG: 无法组合 %d 和 %p"
11012 #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11013 #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11016 #~ msgid "may speed it up, but you have to be careful not to forget to add"
11017 #~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11019 #~ msgid "new files yourself (see 'git help status')."
11020 #~ msgstr "(参见 'git help status')。"
11022 #~ msgid "use any ref in .git/refs"
11023 #~ msgstr "使用 .git/refs 里的任意引用"
11025 #~ msgid "use any tag in .git/refs/tags"
11026 #~ msgstr "使用 .git/refs/tags 里的任意 tag"
11028 #~ msgid "bad object %s"
11031 #~ msgid "bogus committer info %s"
11032 #~ msgstr "虚假的提交者信息 %s"
11034 #~ msgid "can't fdopen 'show' output fd"
11035 #~ msgstr "不能打开 'show' 输出文件句柄"
11037 #~ msgid "failed to close pipe to 'show' for object '%s'"
11038 #~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11040 #~ msgid " 0 files changed"
11041 #~ msgstr " 0 个文件被修改"
11043 #~ msgid " %d file changed"
11044 #~ msgid_plural " %d files changed"
11045 #~ msgstr[0] " %d 个文件被修改"
11046 #~ msgstr[1] " %d 个文件被修改"
11048 #~ msgid ", %d insertion(+)"
11049 #~ msgid_plural ", %d insertions(+)"
11050 #~ msgstr[0] ",插入 %d 行(+)"
11051 #~ msgstr[1] ",插入 %d 行(+)"
11053 #~ msgid ", %d deletion(-)"
11054 #~ msgid_plural ", %d deletions(-)"
11055 #~ msgstr[0] ",删除 %d 行(-)"
11056 #~ msgstr[1] ",删除 %d 行(-)"
11058 #~ msgid "You do not have a valid HEAD"
11059 #~ msgstr "您没有一个有效的 HEAD"
11064 #~ msgid "Would not remove %s\n"
11065 #~ msgstr "不会删除 %s\n"
11067 #~ msgid "Not removing %s\n"
11068 #~ msgstr "未删除 %s\n"
11070 #~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11071 #~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11073 #~ msgid "Could not read index"
11076 # 译者:中文字符串拼接,可删除前导空格
11077 #~ msgid " (use \"git add\" to track)"
11078 #~ msgstr "(使用 \"git add\" 建立跟踪)"
11080 #~ msgid "--detach cannot be used with -b/-B/--orphan"
11081 #~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11083 #~ msgid "--detach cannot be used with -t"
11084 #~ msgstr "--detach 不能和 -t 同时使用"
11086 #~ msgid "--orphan and -b|-B are mutually exclusive"
11087 #~ msgstr "--orphan 和 -b|-B 互斥"
11089 #~ msgid "--orphan cannot be used with -t"
11090 #~ msgstr "--orphan 不能和 -t 同时使用"
11092 #~ msgid "git checkout: -f and -m are incompatible"
11093 #~ msgstr "git checkout:-f 和 -m 不兼容"
11096 #~ "git checkout: updating paths is incompatible with switching branches."
11097 #~ msgstr "git checkout:更新路径和切换分支不兼容。"
11099 #~ msgid "diff setup failed"
11100 #~ msgstr "diff 设置失败"
11102 #~ msgid "merge-recursive: disk full?"
11103 #~ msgstr "merge-recursive:磁盘已满?"
11105 #~ msgid "diff_setup_done failed"
11106 #~ msgstr "diff_setup_done 失败"