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 # - Lian Cheng <rhythm.mail AT gmail.com>
8 # - Ray Chen <oldsharp AT gmail.com>
9 # - Riku <lu.riku AT gmail.com>
10 # - Thynson <lanxingcan AT gmail.com>
11 # - ws3389 <willsmith3389 AT gmail.com>
12 # - Wang Sheng <wangsheng2008love AT 163.com>
13 # - Yichao Yu <yyc1992 AT gmail.com>
14 # - Zhuang Ya <zhuangya AT me.com>
16 # Git glossary for Chinese translators
19 # ---------------------------------+--------------------------------------
21 # abbreviate | 简写(的 SHA-1 值)
22 # alternate object database | 备用对象库
25 # annotated tag | 附注标签
26 # bare repository | 纯仓库
41 # commit message | 提交说明
42 # commit object | 提交对象
43 # commit-ish (also committish) | 提交号
45 # core Git | 核心 Git 工具
47 # dangling object | 摇摆对象
48 # detached HEAD | 分离头指针
51 # dumb HTTP protocol | 哑 HTTP 协议
52 # evil merge | 坏合并(合并引入了父提交没有的修改)
57 # Git archive | 仓库(对于 arch 用户)
58 # gitfile | gitfile(仓库链接文件)
61 # HEAD | HEAD(头指针,亦即当前分支)
71 # master | master(默认分支名)
74 # object database | 对象库
75 # object identifier | 对象标识符
78 # octopus | 章鱼式合并(两分支以上的合并)
79 # origin | origin(默认的远程名称)
88 # plumbing | 管件(Git 底层核心命令的别称)
89 # porcelain | 瓷件(Git 上层封装命令的别称)
90 # precious-objects repo | 珍品仓库
100 # remote-tracking branch | 远程跟踪分支
109 # SHA-1 | SHA-1(安全哈希算法1)
110 # shallow repository | 浅(克隆)仓库
112 # smart HTTP protocol | 智能 HTTP 协议
114 # stage | n. 暂存区(即索引); v. 暂存
115 # stash | n. 进度保存; v. 保存进度
118 # tag | n. 标签; v. 打标签
121 # topic branch | 主题分支
125 # tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126 # unmerged index | 未合并索引
128 # unreachable object | 不可达对象
131 # upstream branch | 上游分支
136 "Project-Id-Version: Git\n"
137 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
138 "POT-Creation-Date: 2016-08-27 23:21+0800\n"
139 "PO-Revision-Date: 2016-09-05 23:36+0800\n"
140 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
141 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
143 "MIME-Version: 1.0\n"
144 "Content-Type: text/plain; charset=UTF-8\n"
145 "Content-Transfer-Encoding: 8bit\n"
146 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
154 msgid "Cherry-picking is not possible because you have unmerged files."
155 msgstr "无法拣选,因为您有未合并的文件。"
158 msgid "Committing is not possible because you have unmerged files."
159 msgstr "无法提交,因为您有未合并的文件。"
162 msgid "Merging is not possible because you have unmerged files."
163 msgstr "无法合并,因为您有未合并的文件。"
166 msgid "Pulling is not possible because you have unmerged files."
167 msgstr "无法拉取,因为您有未合并的文件。"
170 msgid "Reverting is not possible because you have unmerged files."
171 msgstr "无法回退,因为您有未合并的文件。"
175 msgid "It is not possible to %s because you have unmerged files."
176 msgstr "无法 %s,因为您有未合并的文件。"
180 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
181 "as appropriate to mark resolution and make a commit."
183 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
187 msgid "Exiting because of an unresolved conflict."
188 msgstr "因为存在未解决的冲突而退出。"
190 #: advice.c:114 builtin/merge.c:1181
191 msgid "You have not concluded your merge (MERGE_HEAD exists)."
192 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
195 msgid "Please, commit your changes before merging."
196 msgstr "请在合并前先提交您的修改。"
199 msgid "Exiting because of unfinished merge."
200 msgstr "因为存在未完成的合并而退出。"
205 "Note: checking out '%s'.\n"
207 "You are in 'detached HEAD' state. You can look around, make experimental\n"
208 "changes and commit them, and you can discard any commits you make in this\n"
209 "state without impacting any branches by performing another checkout.\n"
211 "If you want to create a new branch to retain commits you create, you may\n"
212 "do so (now or later) by using -b with the checkout command again. Example:\n"
214 " git checkout -b <new-branch-name>\n"
219 "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另外\n"
220 "的检出分支操作丢弃在这个状态下所做的任何提交。\n"
222 "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
223 "参数 -b 来实现(现在或稍后)。例如:\n"
225 " git checkout -b <new-branch-name>\n"
229 msgid "git archive [<options>] <tree-ish> [<path>...]"
230 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
233 msgid "git archive --list"
234 msgstr "git archive --list"
238 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
240 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
243 msgid "git archive --remote <repo> [--exec <cmd>] --list"
244 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
246 #: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327
248 msgid "pathspec '%s' did not match any files"
249 msgstr "路径规格 '%s' 未匹配任何文件"
256 msgid "archive format"
259 #: archive.c:430 builtin/log.c:1422
264 msgid "prepend prefix to each pathname in the archive"
265 msgstr "为归档中每个路径名加上前缀"
267 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553
268 #: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987
269 #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100
270 #: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399
271 #: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153
275 #: archive.c:433 builtin/archive.c:89
276 msgid "write the archive to this file"
280 msgid "read .gitattributes in working directory"
281 msgstr "读取工作区中的 .gitattributes"
284 msgid "report archived files on stderr"
285 msgstr "在标准错误上报告归档文件"
292 msgid "compress faster"
296 msgid "compress better"
300 msgid "list supported archive formats"
303 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82
304 #: builtin/submodule--helper.c:832
308 #: archive.c:452 builtin/archive.c:91
309 msgid "retrieve the archive from remote repository <repo>"
310 msgstr "从远程仓库(<仓库>)提取归档文件"
312 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:483
316 #: archive.c:454 builtin/archive.c:93
317 msgid "path to the remote git-upload-archive command"
318 msgstr "远程 git-upload-archive 命令的路径"
321 msgid "Unexpected option --remote"
322 msgstr "未知参数 --remote"
325 msgid "Option --exec can only be used together with --remote"
326 msgstr "选项 --exec 只能和 --remote 同时使用"
329 msgid "Unexpected option --output"
330 msgstr "未知参数 --output"
334 msgid "Unknown archive format '%s'"
339 msgid "Argument not supported for format '%s': -%d"
340 msgstr "参数不支持此格式 '%s':-%d"
344 "Negative patterns are ignored in git attributes\n"
345 "Use '\\!' for literal leading exclamation."
347 "负值模版在 git attributes 中被忽略\n"
348 "当字符串确实要以感叹号开始时,使用 '\\!'。"
352 msgid "Could not open file '%s'"
357 msgid "Badly quoted content in file '%s': %s"
358 msgstr "文件 '%s' 包含错误的引用格式:%s"
362 msgid "We cannot bisect more!\n"
363 msgstr "我们无法进行更多的二分查找!\n"
367 msgid "Not a valid commit name %s"
368 msgstr "不是一个有效的提交名 %s"
373 "The merge base %s is bad.\n"
374 "This means the bug has been fixed between %s and [%s].\n"
377 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
382 "The merge base %s is new.\n"
383 "The property has changed between %s and [%s].\n"
386 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
391 "The merge base %s is %s.\n"
392 "This means the first '%s' commit is between %s and [%s].\n"
395 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
400 "Some %s revs are not ancestor of the %s rev.\n"
401 "git bisect cannot work properly in this case.\n"
402 "Maybe you mistook %s and %s revs?\n"
404 "一些 %s 版本不是 %s 版本的祖先。\n"
405 "这种情况下 git 二分查找无法正常工作。\n"
406 "您可能弄错了 %s 和 %s 版本?\n"
411 "the merge base between %s and [%s] must be skipped.\n"
412 "So we cannot be sure the first %s commit is between %s and %s.\n"
413 "We continue anyway."
415 "介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
416 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
421 msgid "Bisecting: a merge base must be tested\n"
422 msgstr "二分查找中:合并基线必须是经过测试的\n"
426 msgid "a %s revision is needed"
429 #: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
431 msgid "could not create file '%s'"
436 msgid "could not read file '%s'"
440 msgid "reading bisect refs failed"
445 msgid "%s was both %s and %s\n"
446 msgstr "%s 同时为 %s 和 %s\n"
451 "No testable commit found.\n"
452 "Maybe you started with bad path parameters?\n"
455 "可能您在运行时使用了错误的路径参数?\n"
459 msgid "(roughly %d step)"
460 msgid_plural "(roughly %d steps)"
461 msgstr[0] "(大概 %d 步)"
462 msgstr[1] "(大概 %d 步)"
464 #. TRANSLATORS: the last %s will be replaced with
465 #. "(roughly %d steps)" translation
468 msgid "Bisecting: %d revision left to test after this %s\n"
469 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
470 msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
471 msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
477 "After fixing the error cause you may try to fix up\n"
478 "the remote tracking information by invoking\n"
479 "\"git branch --set-upstream-to=%s%s%s\"."
482 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
483 "\"git branch --set-upstream-to=%s%s%s\" 。"
487 msgid "Not setting branch %s as its own upstream."
488 msgstr "未设置分支 %s 作为它自己的上游。"
492 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
493 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
497 msgid "Branch %s set up to track remote branch %s from %s."
498 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
502 msgid "Branch %s set up to track local branch %s by rebasing."
503 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
507 msgid "Branch %s set up to track local branch %s."
508 msgstr "分支 %s 设置为跟踪本地分支 %s。"
512 msgid "Branch %s set up to track remote ref %s by rebasing."
513 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
517 msgid "Branch %s set up to track remote ref %s."
518 msgstr "分支 %s 设置为跟踪远程引用 %s。"
522 msgid "Branch %s set up to track local ref %s by rebasing."
523 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
527 msgid "Branch %s set up to track local ref %s."
528 msgstr "分支 %s 设置为跟踪本地引用 %s。"
531 msgid "Unable to write upstream branch configuration"
536 msgid "Not tracking: ambiguous information for ref %s"
537 msgstr "未跟踪:引用 %s 有歧义"
541 msgid "'%s' is not a valid branch name."
542 msgstr "'%s' 不是一个有效的分支名称。"
546 msgid "A branch named '%s' already exists."
547 msgstr "一个分支名 '%s' 已经存在。"
550 msgid "Cannot force update the current branch."
555 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
556 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
560 msgid "the requested upstream branch '%s' does not exist"
561 msgstr "请求的上游分支 '%s' 不存在"
566 "If you are planning on basing your work on an upstream\n"
567 "branch that already exists at the remote, you may need to\n"
568 "run \"git fetch\" to retrieve it.\n"
570 "If you are planning to push out a new local branch that\n"
571 "will track its remote counterpart, you may want to use\n"
572 "\"git push -u\" to set the upstream config as you push."
575 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
576 "您可能需要执行 \"git fetch\" 来获取分支。\n"
578 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
579 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
583 msgid "Not a valid object name: '%s'."
584 msgstr "不是一个有效的对象名:'%s'。"
588 msgid "Ambiguous object name: '%s'."
589 msgstr "歧义的对象名:'%s'。"
593 msgid "Not a valid branch point: '%s'."
594 msgstr "无效的分支点:'%s'。"
598 msgid "'%s' is already checked out at '%s'"
599 msgstr "'%s' 已经检出到 '%s'"
603 msgid "HEAD of working tree %s is not updated"
604 msgstr "工作区 %s 的 HEAD 指向没有被更新"
608 msgid "'%s' does not look like a v2 bundle file"
609 msgstr "'%s' 不像是一个 v2 版本的包文件"
613 msgid "unrecognized header: %s%s (%d)"
614 msgstr "未能识别的包头:%s%s (%d)"
616 #: bundle.c:87 builtin/commit.c:778
618 msgid "could not open '%s'"
622 msgid "Repository lacks these prerequisite commits:"
623 msgstr "仓库中缺少这些必备的提交:"
625 #: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085
626 #: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348
627 #: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901
628 #: builtin/merge.c:356 builtin/shortlog.c:170
629 msgid "revision walk setup failed"
634 msgid "The bundle contains this ref:"
635 msgid_plural "The bundle contains these %d refs:"
636 msgstr[0] "这个包中含有这个引用:"
637 msgstr[1] "这个包中含有 %d 个引用:"
640 msgid "The bundle records a complete history."
641 msgstr "这个包记录一个完整历史。"
645 msgid "The bundle requires this ref:"
646 msgid_plural "The bundle requires these %d refs:"
647 msgstr[0] "这个包需要这个引用:"
648 msgstr[1] "这个包需要 %d 个引用:"
651 msgid "Could not spawn pack-objects"
652 msgstr "不能生成 pack-objects 进程"
655 msgid "pack-objects died"
656 msgstr "pack-objects 终止"
659 msgid "rev-list died"
664 msgid "ref '%s' is excluded by the rev-list options"
665 msgstr "引用 '%s' 被 rev-list 选项排除"
667 #: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273
669 msgid "unrecognized argument: %s"
673 msgid "Refusing to create empty bundle."
678 msgid "cannot create '%s'"
682 msgid "index-pack died"
683 msgstr "index-pack 终止"
687 msgid "invalid color value: %.*s"
690 #: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505
693 msgid "could not parse %s"
698 msgid "%s %s is not a commit!"
699 msgstr "%s %s 不是一个提交!"
701 #: compat/obstack.c:406 compat/obstack.c:408
702 msgid "memory exhausted"
707 msgid "bad config line %d in blob %s"
708 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
712 msgid "bad config line %d in file %s"
713 msgstr "文件 %2$s 中错误的配置行 %1$d"
717 msgid "bad config line %d in standard input"
718 msgstr "标准输入中错误的配置行 %d"
722 msgid "bad config line %d in submodule-blob %s"
723 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
727 msgid "bad config line %d in command line %s"
728 msgstr "命令行 %2$s 中错误的配置行 %1$d"
732 msgid "bad config line %d in %s"
733 msgstr "在 %2$s 中错误的配置行 %1$d"
745 msgid "bad numeric config value '%s' for '%s': %s"
746 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
750 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
751 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
755 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
756 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
760 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
761 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
765 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
766 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
770 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
771 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
775 msgid "bad numeric config value '%s' for '%s' in %s: %s"
776 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
780 msgid "failed to expand user dir in: '%s'"
781 msgstr "无法扩展 '%s' 中的用户目录"
783 #: config.c:849 config.c:860
785 msgid "bad zlib compression level %d"
786 msgstr "错误的 zlib 压缩级别 %d"
790 msgid "invalid mode for object creation: %s"
791 msgstr "无效的对象创建模式:%s"
794 msgid "unable to parse command-line config"
798 msgid "unknown error occurred while reading the configuration files"
799 msgstr "在读取配置文件时遇到未知错误"
803 msgid "unable to parse '%s' from command-line config"
804 msgstr "无法解析命令行配置中的 '%s'"
808 msgid "bad config variable '%s' in file '%s' at line %d"
809 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
813 msgid "%s has multiple values"
818 msgid "could not set '%s' to '%s'"
819 msgstr "不能设置 '%s' 为 '%s'"
823 msgid "could not unset '%s'"
826 #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
827 msgid "Checking connectivity"
831 msgid "Could not run 'git rev-list'"
832 msgstr "不能执行 'git rev-list'"
835 msgid "failed write to rev-list"
836 msgstr "无法写入 rev-list"
839 msgid "failed to close rev-list's stdin"
840 msgstr "无法关闭 rev-list 的标准输入"
843 msgid "in the future"
848 msgid "%lu second ago"
849 msgid_plural "%lu seconds ago"
855 msgid "%lu minute ago"
856 msgid_plural "%lu minutes ago"
863 msgid_plural "%lu hours ago"
870 msgid_plural "%lu days ago"
877 msgid_plural "%lu weeks ago"
883 msgid "%lu month ago"
884 msgid_plural "%lu months ago"
891 msgid_plural "%lu years"
895 #. TRANSLATORS: "%s" is "<n> years"
898 msgid "%s, %lu month ago"
899 msgid_plural "%s, %lu months ago"
900 msgstr[0] "%s %lu 个月前"
901 msgstr[1] "%s %lu 个月前"
903 #: date.c:156 date.c:161
906 msgid_plural "%lu years ago"
910 #: diffcore-order.c:24
912 msgid "failed to read orderfile '%s'"
913 msgstr "无法读取排序文件 '%s'"
915 #: diffcore-rename.c:540
916 msgid "Performing inexact rename detection"
917 msgstr "正在进行非精确的重命名检测"
922 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
923 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
928 msgid " Unknown dirstat parameter '%s'\n"
929 msgstr " 未知的 dirstat 参数 '%s'\n"
933 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
934 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
939 "Found errors in 'diff.dirstat' config variable:\n"
942 "发现配置变量 'diff.dirstat' 中的错误:\n"
947 msgid "external diff died, stopping at %s"
948 msgstr "外部 diff 退出,停止在 %s"
951 msgid "--follow requires exactly one pathspec"
952 msgstr "--follow 明确要求只跟一个路径规格"
957 "Failed to parse --dirstat/-X option parameter:\n"
960 "无法解析 --dirstat/-X 选项的参数:\n"
965 msgid "Failed to parse --submodule option parameter: '%s'"
966 msgstr "无法解析 --submodule 选项的参数:'%s'"
969 msgid "failed to get kernel name and information"
973 msgid "Untracked cache is disabled on this system or location."
974 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
976 #: gpg-interface.c:178
977 msgid "gpg failed to sign the data"
980 #: gpg-interface.c:208
981 msgid "could not create temporary file"
984 #: gpg-interface.c:210
986 msgid "failed writing detached signature to '%s'"
987 msgstr "无法将分离式签名写入 '%s'"
991 msgid "'%s': unable to read %s"
992 msgstr "'%s':无法读取 %s"
994 #: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155
996 msgid "failed to stat '%s'"
997 msgstr "无法枚举 '%s' 状态"
1001 msgid "'%s': short read"
1006 msgid "available git commands in '%s'"
1007 msgstr "在 '%s' 下可用的 git 命令"
1010 msgid "git commands available from elsewhere on your $PATH"
1011 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
1014 msgid "These are common Git commands used in various situations:"
1015 msgstr "这些是各种场合常见的 Git 命令:"
1020 "'%s' appears to be a git command, but we were not\n"
1021 "able to execute it. Maybe git-%s is broken?"
1023 "'%s' 像是一个 git 命令,但却无法运行。\n"
1027 msgid "Uh oh. Your system reports no Git commands at all."
1028 msgstr "唉呀,您的系统中未发现 Git 命令。"
1033 "WARNING: You called a Git command named '%s', which does not exist.\n"
1034 "Continuing under the assumption that you meant '%s'"
1036 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
1041 msgid "in %0.1f seconds automatically..."
1042 msgstr "在 %0.1f 秒钟后自动运行..."
1046 msgid "git: '%s' is not a git command. See 'git --help'."
1047 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
1049 #: help.c:404 help.c:470
1052 "Did you mean this?"
1055 "Did you mean one of these?"
1071 "Unable to create '%s.lock': %s.\n"
1073 "Another git process seems to be running in this repository, e.g.\n"
1074 "an editor opened by 'git commit'. Please make sure all processes\n"
1075 "are terminated then try again. If it still fails, a git process\n"
1076 "may have crashed in this repository earlier:\n"
1077 "remove the file manually to continue."
1079 "无法创建 '%s.lock':%s。\n"
1081 "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
1082 "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
1083 "可能之前有一个 git 进程在这个仓库中异常退出:\n"
1088 msgid "Unable to create '%s.lock': %s"
1089 msgstr "不能创建 '%s.lock':%s"
1092 msgid "failed to read the cache"
1095 #: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375
1096 #: builtin/checkout.c:589 builtin/clone.c:732
1097 msgid "unable to write new index file"
1100 #: merge-recursive.c:209
1101 msgid "(bad commit)\n"
1104 #: merge-recursive.c:231
1106 msgid "addinfo_cache failed for path '%s'"
1107 msgstr "为路径 '%s' addinfo_cache 失败"
1109 #: merge-recursive.c:301
1110 msgid "error building trees"
1113 #: merge-recursive.c:720
1115 msgid "failed to create path '%s'%s"
1116 msgstr "无法创建路径 '%s'%s"
1118 #: merge-recursive.c:731
1120 msgid "Removing %s to make room for subdirectory\n"
1121 msgstr "删除 %s 以便为子目录留出空间\n"
1123 #: merge-recursive.c:745 merge-recursive.c:764
1124 msgid ": perhaps a D/F conflict?"
1125 msgstr ":可能是一个目录/文件冲突?"
1127 #: merge-recursive.c:754
1129 msgid "refusing to lose untracked file at '%s'"
1130 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
1132 #: merge-recursive.c:796
1134 msgid "cannot read object %s '%s'"
1135 msgstr "不能读取对象 %s '%s'"
1137 #: merge-recursive.c:798
1139 msgid "blob expected for %s '%s'"
1140 msgstr "%s '%s' 应为数据对象"
1142 #: merge-recursive.c:822
1144 msgid "failed to open '%s': %s"
1145 msgstr "无法打开 '%s':%s"
1147 #: merge-recursive.c:833
1149 msgid "failed to symlink '%s': %s"
1150 msgstr "无法创建符号链接 '%s':%s"
1152 #: merge-recursive.c:838
1154 msgid "do not know what to do with %06o %s '%s'"
1155 msgstr "不知道如何处理 %06o %s '%s'"
1157 #: merge-recursive.c:978
1158 msgid "Failed to execute internal merge"
1161 #: merge-recursive.c:982
1163 msgid "Unable to add %s to database"
1164 msgstr "不能添加 %s 至对象库"
1166 #: merge-recursive.c:1081 merge-recursive.c:1095
1169 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
1172 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
1175 #: merge-recursive.c:1087 merge-recursive.c:1100
1178 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
1181 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
1184 #: merge-recursive.c:1143
1188 #: merge-recursive.c:1143
1192 #: merge-recursive.c:1200
1194 msgid "%s is a directory in %s adding as %s instead"
1195 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
1197 #: merge-recursive.c:1225
1200 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
1201 "\"->\"%s\" in \"%s\"%s"
1203 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
1204 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
1206 #: merge-recursive.c:1230
1207 msgid " (left unresolved)"
1210 #: merge-recursive.c:1292
1212 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
1214 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
1217 #: merge-recursive.c:1325
1219 msgid "Renaming %s to %s and %s to %s instead"
1220 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
1222 #: merge-recursive.c:1531
1224 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
1225 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
1227 #: merge-recursive.c:1546
1229 msgid "Adding merged %s"
1232 #: merge-recursive.c:1553 merge-recursive.c:1766
1234 msgid "Adding as %s instead"
1235 msgstr "而是以 %s 为名添加"
1237 #: merge-recursive.c:1610
1239 msgid "cannot read object %s"
1242 #: merge-recursive.c:1613
1244 msgid "object %s is not a blob"
1245 msgstr "对象 %s 不是一个数据对象"
1247 #: merge-recursive.c:1666
1251 #: merge-recursive.c:1666
1255 #: merge-recursive.c:1676
1259 #: merge-recursive.c:1683
1263 #: merge-recursive.c:1718
1265 msgid "Skipped %s (merged same as existing)"
1266 msgstr "略过 %s(已经做过相同合并)"
1268 #: merge-recursive.c:1732
1270 msgid "Auto-merging %s"
1273 #: merge-recursive.c:1736 git-submodule.sh:919
1277 #: merge-recursive.c:1737
1279 msgid "CONFLICT (%s): Merge conflict in %s"
1280 msgstr "冲突(%s):合并冲突于 %s"
1282 #: merge-recursive.c:1831
1287 #: merge-recursive.c:1857
1288 msgid "file/directory"
1291 #: merge-recursive.c:1863
1292 msgid "directory/file"
1295 #: merge-recursive.c:1868
1297 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1298 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1300 #: merge-recursive.c:1877
1305 #: merge-recursive.c:1914
1306 msgid "Already up-to-date!"
1309 #: merge-recursive.c:1923
1311 msgid "merging of trees %s and %s failed"
1312 msgstr "无法合并树 %s 和 %s"
1314 #: merge-recursive.c:2006
1318 #: merge-recursive.c:2019
1320 msgid "found %u common ancestor:"
1321 msgid_plural "found %u common ancestors:"
1322 msgstr[0] "发现 %u 个共同祖先:"
1323 msgstr[1] "发现 %u 个共同祖先:"
1325 #: merge-recursive.c:2058
1326 msgid "merge returned no commit"
1329 #: merge-recursive.c:2121
1331 msgid "Could not parse object '%s'"
1332 msgstr "不能解析对象 '%s'"
1334 #: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
1335 msgid "Unable to write index."
1339 msgid "Cannot commit uninitialized/unreferenced notes tree"
1340 msgstr "不能提交未初始化/未引用的注解树"
1342 #: notes-utils.c:100
1344 msgid "Bad notes.rewriteMode value: '%s'"
1345 msgstr "坏的 notes.rewriteMode 值:'%s'"
1347 #: notes-utils.c:110
1349 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1350 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1352 #. TRANSLATORS: The first %s is the name of the
1353 #. environment variable, the second %s is its value
1354 #: notes-utils.c:137
1356 msgid "Bad %s value: '%s'"
1357 msgstr "坏的 %s 值:'%s'"
1361 msgid "unable to parse object: %s"
1364 #: parse-options.c:572
1368 #: parse-options.c:590
1373 #. TRANSLATORS: the colon here should align with the
1374 #. one in "usage: %s" translation
1375 #: parse-options.c:594
1380 # 译者:为保证在输出中对齐,注意调整句中空格!
1381 #: parse-options.c:597
1386 #: parse-options.c:631
1390 #: parse-options-cb.c:108
1392 msgid "malformed object name '%s'"
1393 msgstr "非法的对象名 '%s'"
1397 msgid "Could not make %s writable by group"
1398 msgstr "不能设置 %s 为组可写"
1401 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1402 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1406 "global 'literal' pathspec setting is incompatible with all other global "
1408 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1411 msgid "invalid parameter for pathspec magic 'prefix'"
1412 msgstr "路径规格包含无效的神奇前缀"
1416 msgid "Invalid pathspec magic '%.*s' in '%s'"
1417 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1421 msgid "Missing ')' at the end of pathspec magic in '%s'"
1422 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1426 msgid "Unimplemented pathspec magic '%c' in '%s'"
1427 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1431 msgid "%s: 'literal' and 'glob' are incompatible"
1432 msgstr "%s:'literal' 和 'glob' 不兼容"
1436 msgid "%s: '%s' is outside repository"
1437 msgstr "%s:'%s' 在仓库之外"
1441 msgid "Pathspec '%s' is in submodule '%.*s'"
1442 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1446 msgid "%s: pathspec magic not supported by this command: %s"
1447 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1451 msgid "pathspec '%s' is beyond a symbolic link"
1452 msgstr "路径规格 '%s' 位于符号链接中"
1456 "There is nothing to exclude from by :(exclude) patterns.\n"
1457 "Perhaps you forgot to add either ':/' or '.' ?"
1459 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1463 msgid "unable to parse --pretty format"
1464 msgstr "不能解析 --pretty 格式"
1470 #: read-cache.c:1281
1473 "index.version set, but the value is invalid.\n"
1476 "设置了 index.version,但是取值无效。\n"
1479 #: read-cache.c:1291
1482 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1485 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1488 #: refs.c:551 builtin/merge.c:840
1490 msgid "Could not open '%s' for writing"
1491 msgstr "无法打开 '%s' 进行写入"
1493 #: refs/files-backend.c:2534
1495 msgid "could not delete reference %s: %s"
1496 msgstr "无法删除引用 %s:%s"
1498 #: refs/files-backend.c:2537
1500 msgid "could not delete references: %s"
1503 #: refs/files-backend.c:2546
1505 msgid "could not remove reference %s"
1510 msgid "expected format: %%(color:<color>)"
1511 msgstr "期望的格式:%%(color:<color>)"
1515 msgid "unrecognized color: %%(color:%s)"
1516 msgstr "未能识别的颜色:%%(color:%s)"
1520 msgid "unrecognized format: %%(%s)"
1521 msgstr "未能识别的格式:%%(%s)"
1525 msgid "%%(body) does not take arguments"
1526 msgstr "%%(body) 不带参数"
1530 msgid "%%(subject) does not take arguments"
1531 msgstr "%%(subject) 不带参数"
1535 msgid "positive value expected contents:lines=%s"
1536 msgstr "要为 contents:lines=%s 提供一个正数"
1540 msgid "unrecognized %%(contents) argument: %s"
1541 msgstr "未能识别的 %%(contents) 参数:%s"
1545 msgid "unrecognized %%(objectname) argument: %s"
1546 msgstr "未能识别的 %%(objectname) 参数:%s"
1550 msgid "expected format: %%(align:<width>,<position>)"
1551 msgstr "期望的格式:%%(align:<width>,<position>)"
1555 msgid "unrecognized position:%s"
1560 msgid "unrecognized width:%s"
1565 msgid "unrecognized %%(align) argument: %s"
1566 msgstr "未能识别的 %%(align) 参数:%s"
1570 msgid "positive width expected with the %%(align) atom"
1571 msgstr "元素 %%(align) 需要一个正数的宽度"
1575 msgid "malformed field name: %.*s"
1576 msgstr "非法的字段名:%.*s"
1580 msgid "unknown field name: %.*s"
1581 msgstr "未知的字段名:%.*s"
1585 msgid "format: %%(end) atom used without corresponding atom"
1586 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1590 msgid "malformed format string %s"
1591 msgstr "非法的格式化字符串 %s"
1594 msgid ":strip= requires a positive integer argument"
1595 msgstr ":strip= 需要一个正整型参数"
1599 msgid "ref '%s' does not have %ld components to :strip"
1600 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1602 #: ref-filter.c:1046
1604 msgid "unknown %.*s format %s"
1605 msgstr "未知的 %.*s 格式 %s"
1607 #: ref-filter.c:1066 ref-filter.c:1097
1609 msgid "missing object %s for %s"
1610 msgstr "缺失 %2$s 的对象 %1$s"
1612 #: ref-filter.c:1069 ref-filter.c:1100
1614 msgid "parse_object_buffer failed on %s for %s"
1615 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1617 #: ref-filter.c:1311
1619 msgid "malformed object at '%s'"
1620 msgstr "非法的对象于 '%s'"
1622 #: ref-filter.c:1373
1624 msgid "ignoring ref with broken name %s"
1625 msgstr "忽略带有错误名称 %s 的引用"
1627 #: ref-filter.c:1378
1629 msgid "ignoring broken ref %s"
1632 #: ref-filter.c:1651
1634 msgid "format: %%(end) atom missing"
1635 msgstr "格式:缺少 %%(end) 元素"
1637 #: ref-filter.c:1705
1639 msgid "malformed object name %s"
1644 msgid "Cannot fetch both %s and %s to %s"
1645 msgstr "不能同时获取 %s 和 %s 至 %s"
1649 msgid "%s usually tracks %s, not %s"
1650 msgstr "%s 通常跟踪 %s,而非 %s"
1654 msgid "%s tracks both %s and %s"
1655 msgstr "%s 同时跟踪 %s 和 %s"
1658 msgid "Internal error"
1661 #: remote.c:1677 remote.c:1720
1662 msgid "HEAD does not point to a branch"
1663 msgstr "HEAD 没有指向一个分支"
1667 msgid "no such branch: '%s'"
1672 msgid "no upstream configured for branch '%s'"
1673 msgstr "尚未给分支 '%s' 设置上游"
1677 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1678 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1682 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1683 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1687 msgid "branch '%s' has no remote for pushing"
1688 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1692 msgid "push refspecs for '%s' do not include '%s'"
1693 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1696 msgid "push has no destination (push.default is 'nothing')"
1697 msgstr "推送无目标(push.default 是 'nothing')"
1700 msgid "cannot resolve 'simple' push to a single destination"
1701 msgstr "无法解析 'simple' 推送至一个单独的目标"
1705 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1706 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1709 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1710 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1714 msgid "Your branch is up-to-date with '%s'.\n"
1715 msgstr "您的分支与上游分支 '%s' 一致。\n"
1719 msgid "Your branch is ahead of '%s' by %d commit.\n"
1720 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1721 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1722 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1725 msgid " (use \"git push\" to publish your local commits)\n"
1726 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1730 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1732 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1733 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1734 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1738 msgid " (use \"git pull\" to update your local branch)\n"
1739 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1744 "Your branch and '%s' have diverged,\n"
1745 "and have %d and %d different commit each, respectively.\n"
1747 "Your branch and '%s' have diverged,\n"
1748 "and have %d and %d different commits each, respectively.\n"
1750 "您的分支和 '%s' 出现了偏离,\n"
1751 "并且分别有 %d 和 %d 处不同的提交。\n"
1753 "您的分支和 '%s' 出现了偏离,\n"
1754 "并且分别有 %d 和 %d 处不同的提交。\n"
1758 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1759 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1762 msgid "your current branch appears to be broken"
1763 msgstr "您的当前分支好像被损坏"
1767 msgid "your current branch '%s' does not have any commits yet"
1768 msgstr "您的当前分支 '%s' 尚无任何提交"
1771 msgid "--first-parent is incompatible with --bisect"
1772 msgstr "--first-parent 与 --bisect 不兼容"
1775 msgid "open /dev/null failed"
1776 msgstr "不能打开 /dev/null"
1780 msgid "dup2(%d,%d) failed"
1781 msgstr "不能调用 dup2(%d,%d)"
1784 msgid "failed to sign the push certificate"
1788 msgid "the receiving end does not support --signed push"
1793 "not sending a push certificate since the receiving end does not support --"
1795 msgstr "未发送推送证书,因为接收端不支持签名推送"
1798 msgid "the receiving end does not support --atomic push"
1802 msgid "the receiving end does not support push options"
1807 "after resolving the conflicts, mark the corrected paths\n"
1808 "with 'git add <paths>' or 'git rm <paths>'"
1810 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1815 "after resolving the conflicts, mark the corrected paths\n"
1816 "with 'git add <paths>' or 'git rm <paths>'\n"
1817 "and commit the result with 'git commit'"
1819 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1820 "对修正后的文件做标记,然后用 'git commit' 提交"
1822 #: sequencer.c:190 sequencer.c:841 sequencer.c:924
1824 msgid "Could not write to %s"
1827 #: sequencer.c:193 sequencer.c:843 sequencer.c:928
1829 msgid "Error wrapping up %s."
1833 msgid "Your local changes would be overwritten by cherry-pick."
1834 msgstr "您的本地修改将被拣选操作覆盖。"
1837 msgid "Your local changes would be overwritten by revert."
1838 msgstr "您的本地修改将被还原操作覆盖。"
1841 msgid "Commit your changes or stash them to proceed."
1842 msgstr "提交您的修改或保存进度后再继续。"
1846 msgid "%s: fast-forward"
1849 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1852 msgid "%s: Unable to write new index file"
1853 msgstr "%s:无法写入新索引文件"
1856 msgid "Could not resolve HEAD commit\n"
1857 msgstr "不能解析 HEAD 提交\n"
1860 msgid "Unable to update cache tree\n"
1865 msgid "Could not parse commit %s\n"
1866 msgstr "不能解析提交 %s\n"
1870 msgid "Could not parse parent commit %s\n"
1871 msgstr "不能解析父提交 %s\n"
1874 msgid "Your index file is unmerged."
1875 msgstr "您的索引文件未完成合并。"
1879 msgid "Commit %s is a merge but no -m option was given."
1880 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1884 msgid "Commit %s does not have parent %d"
1885 msgstr "提交 %s 没有父提交 %d"
1889 msgid "Mainline was specified but commit %s is not a merge."
1890 msgstr "指定了主线但提交 %s 不是一个合并。"
1892 #. TRANSLATORS: The first %s will be "revert" or
1893 #. "cherry-pick", the second %s a SHA1
1896 msgid "%s: cannot parse parent commit %s"
1897 msgstr "%s:不能解析父提交 %s"
1901 msgid "Cannot get commit message for %s"
1902 msgstr "不能得到 %s 的提交说明"
1906 msgid "could not revert %s... %s"
1907 msgstr "不能还原 %s... %s"
1911 msgid "could not apply %s... %s"
1912 msgstr "不能应用 %s... %s"
1915 msgid "empty commit set passed"
1920 msgid "git %s: failed to read the index"
1921 msgstr "git %s:无法读取索引"
1925 msgid "git %s: failed to refresh the index"
1926 msgstr "git %s:无法刷新索引"
1929 msgid "Cannot revert during another revert."
1930 msgstr "不能在回退中执行另一回退。"
1933 msgid "Cannot revert during a cherry-pick."
1934 msgstr "不能在拣选中执行回退。"
1937 msgid "Cannot cherry-pick during a revert."
1938 msgstr "不能在回退中执行拣选。"
1941 msgid "Cannot cherry-pick during another cherry-pick."
1942 msgstr "不能在拣选过程中执行另一拣选。"
1946 msgid "Could not parse line %d."
1947 msgstr "不能解析第 %d 行。"
1950 msgid "No commits parsed."
1955 msgid "Could not open %s"
1960 msgid "Could not read %s."
1965 msgid "Unusable instruction sheet: %s"
1970 msgid "Invalid key: %s"
1973 #: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52
1975 msgid "Invalid value for %s: %s"
1980 msgid "Malformed options sheet: %s"
1984 msgid "a cherry-pick or revert is already in progress"
1985 msgstr "一个拣选或还原操作已在进行"
1988 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1989 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1993 msgid "Could not create sequencer directory %s"
1994 msgstr "不能创建序列目录 %s"
1996 #: sequencer.c:862 sequencer.c:998
1997 msgid "no cherry-pick or revert in progress"
1998 msgstr "拣选或还原操作并未进行"
2001 msgid "cannot resolve HEAD"
2004 #: sequencer.c:866 sequencer.c:900
2005 msgid "cannot abort from a branch yet to be born"
2006 msgstr "不能从尚未建立的分支终止"
2008 #: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970
2010 msgid "cannot open %s"
2015 msgid "cannot read %s: %s"
2019 msgid "unexpected end of file"
2024 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
2025 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
2029 msgid "Could not format %s."
2034 msgid "%s: can't cherry-pick a %s"
2035 msgstr "%s:不能拣选一个%s"
2039 msgid "%s: bad revision"
2043 msgid "Can't revert as initial commit"
2049 "%s: no such path in the working tree.\n"
2050 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
2053 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
2058 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
2059 "Use '--' to separate paths from revisions, like this:\n"
2060 "'git <command> [<revision>...] -- [<file>...]'"
2062 "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
2063 "使用 '--' 来分隔版本和路径,例如:\n"
2064 "'git <command> [<revision>...] -- [<file>...]'"
2069 "ambiguous argument '%s': both revision and filename\n"
2070 "Use '--' to separate paths from revisions, like this:\n"
2071 "'git <command> [<revision>...] -- [<file>...]'"
2073 "有歧义的参数 '%s':可同时是版本和文件\n"
2074 "使用 '--' 来分隔版本和路径,例如:\n"
2075 "'git <command> [<revision>...] -- [<file>...]'"
2077 #: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419
2079 msgid "failed to read %s"
2084 msgid "Expected git repo version <= %d, found %d"
2085 msgstr "期望 git 仓库版本 <= %d,却得到 %d"
2088 msgid "unknown repository extensions found:"
2093 msgid "Not a git repository (or any of the parent directories): %s"
2094 msgstr "不是一个 git 仓库(或者任何父目录):%s"
2096 #: setup.c:764 setup.c:915 builtin/index-pack.c:1641
2097 msgid "Cannot come back to cwd"
2101 msgid "Unable to read current working directory"
2107 "Not a git repository (or any parent up to mount point %s)\n"
2108 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
2110 "不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
2111 "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
2115 msgid "Cannot change to '%s/..'"
2116 msgstr "不能切换到 '%s/..'"
2121 "Problem with core.sharedRepository filemode value (0%.3o).\n"
2122 "The owner of files must always have read and write permissions."
2124 "参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
2128 msgid "offset before end of packfile (broken .idx?)"
2129 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2133 msgid "offset before start of pack index for %s (corrupt index?)"
2134 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2138 msgid "offset beyond end of pack index for %s (truncated index?)"
2139 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2143 "Git normally never creates a ref that ends with 40 hex characters\n"
2144 "because it will be ignored when you just specify 40-hex. These refs\n"
2145 "may be created by mistake. For example,\n"
2147 " git checkout -b $br $(git rev-parse ...)\n"
2149 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
2150 "examine these refs and maybe delete them. Turn this message off by\n"
2151 "running \"git config advice.objectNameWarning false\""
2153 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
2154 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
2156 " git checkout -b $br $(git rev-parse ...)\n"
2158 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
2159 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2162 #: submodule.c:64 submodule.c:98
2163 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
2164 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
2166 #: submodule.c:68 submodule.c:102
2168 msgid "Could not find section in .gitmodules where path=%s"
2169 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
2173 msgid "Could not update .gitmodules entry %s"
2174 msgstr "不能更新 .gitmodules 条目 %s"
2178 msgid "Could not remove .gitmodules entry for %s"
2179 msgstr "无法移除 %s 的 .gitmodules 条目"
2182 msgid "staging updated .gitmodules failed"
2183 msgstr "将更新后 .gitmodules 添加暂存区失败"
2186 msgid "negative values not allowed for submodule.fetchJobs"
2187 msgstr "submodule.fetchJobs 不允许为负值"
2189 #: submodule-config.c:358
2191 msgid "invalid value for %s"
2196 msgid "running trailer command '%s' failed"
2197 msgstr "执行 trailer 命令 '%s' 失败"
2199 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
2202 msgid "unknown value '%s' for key '%s'"
2203 msgstr "键 '%2$s' 的未知取值 '%1$s'"
2205 #: trailer.c:544 trailer.c:549 builtin/remote.c:289
2207 msgid "more than one %s"
2212 msgid "empty trailer token in trailer '%.*s'"
2213 msgstr "签名 '%.*s' 的键为空"
2217 msgid "could not read input file '%s'"
2218 msgstr "不能读取输入文件 '%s'"
2221 msgid "could not read from stdin"
2224 #: trailer.c:857 builtin/am.c:42
2226 msgid "could not stat %s"
2227 msgstr "不能获取 %s 的文件状态"
2231 msgid "file %s is not a regular file"
2232 msgstr "文件 %s 不是一个正规文件"
2236 msgid "file %s is not writable by user"
2237 msgstr "文件 %s 用户不可写"
2240 msgid "could not open temporary file"
2245 msgid "could not rename temporary file to %s"
2246 msgstr "不能重命名临时文件为 %s"
2250 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
2251 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
2255 msgid "transport: invalid depth option '%s'"
2256 msgstr "传输:无效的深度选项 '%s'"
2261 "The following submodule paths contain changes that can\n"
2262 "not be found on any remote:\n"
2263 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
2271 "\tgit push --recurse-submodules=on-demand\n"
2273 "or cd to the path and use\n"
2277 "to push them to a remote.\n"
2283 "\tgit push --recurse-submodules=on-demand\n"
2296 #: transport-helper.c:1041
2298 msgid "Could not read ref %s"
2301 #: unpack-trees.c:64
2304 "Your local changes to the following files would be overwritten by checkout:\n"
2305 "%%sPlease commit your changes or stash them before you switch branches."
2307 "您对下列文件的本地修改将被检出操作覆盖:\n"
2308 "%%s请在切换分支前提交您的修改或者保存进度。"
2310 #: unpack-trees.c:66
2313 "Your local changes to the following files would be overwritten by checkout:\n"
2316 "您对下列文件的本地修改将被检出操作覆盖:\n"
2319 #: unpack-trees.c:69
2322 "Your local changes to the following files would be overwritten by merge:\n"
2323 "%%sPlease commit your changes or stash them before you merge."
2325 "您对下列文件的本地修改将被合并操作覆盖:\n"
2326 "%%s请在合并前提交您的修改或者保存进度。"
2328 #: unpack-trees.c:71
2331 "Your local changes to the following files would be overwritten by merge:\n"
2334 "您对下列文件的本地修改将被合并操作覆盖:\n"
2337 #: unpack-trees.c:74
2340 "Your local changes to the following files would be overwritten by %s:\n"
2341 "%%sPlease commit your changes or stash them before you %s."
2343 "您对下列文件的本地修改将被 %s 覆盖:\n"
2344 "%%s请在 %s 之前提交您的修改或者保存进度。"
2346 #: unpack-trees.c:76
2349 "Your local changes to the following files would be overwritten by %s:\n"
2352 "您对下列文件的本地修改将被 %s 覆盖:\n"
2355 #: unpack-trees.c:81
2358 "Updating the following directories would lose untracked files in it:\n"
2361 "更新如下目录将会丢失其中未跟踪的文件:\n"
2364 #: unpack-trees.c:85
2367 "The following untracked working tree files would be removed by checkout:\n"
2368 "%%sPlease move or remove them before you switch branches."
2370 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2373 #: unpack-trees.c:87
2376 "The following untracked working tree files would be removed by checkout:\n"
2379 "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
2382 #: unpack-trees.c:90
2385 "The following untracked working tree files would be removed by merge:\n"
2386 "%%sPlease move or remove them before you merge."
2388 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2391 #: unpack-trees.c:92
2394 "The following untracked working tree files would be removed by merge:\n"
2397 "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
2400 #: unpack-trees.c:95
2403 "The following untracked working tree files would be removed by %s:\n"
2404 "%%sPlease move or remove them before you %s."
2406 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2409 #: unpack-trees.c:97
2412 "The following untracked working tree files would be removed by %s:\n"
2415 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
2418 #: unpack-trees.c:102
2421 "The following untracked working tree files would be overwritten by "
2423 "%%sPlease move or remove them before you switch branches."
2425 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2428 #: unpack-trees.c:104
2431 "The following untracked working tree files would be overwritten by "
2435 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
2438 #: unpack-trees.c:107
2441 "The following untracked working tree files would be overwritten by merge:\n"
2442 "%%sPlease move or remove them before you merge."
2444 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2447 #: unpack-trees.c:109
2450 "The following untracked working tree files would be overwritten by merge:\n"
2453 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
2456 #: unpack-trees.c:112
2459 "The following untracked working tree files would be overwritten by %s:\n"
2460 "%%sPlease move or remove them before you %s."
2462 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2465 #: unpack-trees.c:114
2468 "The following untracked working tree files would be overwritten by %s:\n"
2471 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
2474 #: unpack-trees.c:121
2476 msgid "Entry '%s' overlaps with '%s'. Cannot bind."
2477 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
2479 #: unpack-trees.c:124
2482 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
2485 "无法更新稀疏检出:如下条目不是最新:\n"
2488 #: unpack-trees.c:126
2491 "The following Working tree files would be overwritten by sparse checkout "
2495 "工作区中下列文件将会因为稀疏检出而被覆盖:\n"
2498 #: unpack-trees.c:128
2501 "The following Working tree files would be removed by sparse checkout "
2505 "工作区中下列文件将会因为稀疏检出而被删除:\n"
2508 #: unpack-trees.c:205
2513 #: unpack-trees.c:237
2514 msgid "Checking out files"
2518 msgid "invalid URL scheme name or missing '://' suffix"
2519 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
2521 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
2523 msgid "invalid %XX escape sequence"
2524 msgstr "无效的 %XX 转义序列"
2527 msgid "missing host and scheme is not 'file:'"
2528 msgstr "缺失主机名且 URL 方案不是 'file:'"
2531 msgid "a 'file:' URL may not have a port number"
2532 msgstr "一个 'file:' URL 不应该包含端口号"
2535 msgid "invalid characters in host name"
2536 msgstr "主机名中包含无效的字符"
2538 #: urlmatch.c:244 urlmatch.c:255
2539 msgid "invalid port number"
2543 msgid "invalid '..' path segment"
2544 msgstr "无效的 '..' 路径片段"
2548 msgid "failed to read '%s'"
2551 #: wrapper.c:222 wrapper.c:392
2553 msgid "could not open '%s' for reading and writing"
2554 msgstr "无法打开 '%s' 进行读写"
2556 #: wrapper.c:224 wrapper.c:394 builtin/am.c:778
2558 msgid "could not open '%s' for writing"
2559 msgstr "无法打开 '%s' 进行写入"
2561 #: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771
2562 #: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029
2563 #: builtin/pull.c:407
2565 msgid "could not open '%s' for reading"
2566 msgstr "无法打开 '%s' 进行读取"
2568 #: wrapper.c:605 wrapper.c:626
2570 msgid "unable to access '%s'"
2574 msgid "unable to get current working directory"
2579 msgid "could not write to %s"
2584 msgid "could not close %s"
2588 msgid "Unmerged paths:"
2592 #: wt-status.c:177 wt-status.c:204
2594 msgid " (use \"git reset %s <file>...\" to unstage)"
2595 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
2598 #: wt-status.c:179 wt-status.c:206
2599 msgid " (use \"git rm --cached <file>...\" to unstage)"
2600 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
2604 msgid " (use \"git add <file>...\" to mark resolution)"
2605 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
2608 #: wt-status.c:185 wt-status.c:189
2609 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
2610 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
2614 msgid " (use \"git rm <file>...\" to mark resolution)"
2615 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
2617 #: wt-status.c:198 wt-status.c:882
2618 msgid "Changes to be committed:"
2621 #: wt-status.c:216 wt-status.c:891
2622 msgid "Changes not staged for commit:"
2623 msgstr "尚未暂存以备提交的变更:"
2627 msgid " (use \"git add <file>...\" to update what will be committed)"
2628 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
2632 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
2633 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2638 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
2639 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2643 msgid " (commit or discard the untracked or modified content in submodules)"
2644 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
2649 msgid " (use \"git %s <file>...\" to include in what will be committed)"
2650 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2653 msgid "both deleted:"
2657 msgid "added by us:"
2661 msgid "deleted by them:"
2665 msgid "added by them:"
2669 msgid "deleted by us:"
2677 msgid "both modified:"
2712 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2714 msgid "new commits, "
2717 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2719 msgid "modified content, "
2722 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2724 msgid "untracked content, "
2728 msgid "Submodules changed but not updated:"
2729 msgstr "子模组已修改但尚未更新:"
2732 msgid "Submodule changes to be committed:"
2737 "Do not touch the line above.\n"
2738 "Everything below will be removed."
2744 msgid "You have unmerged paths."
2749 msgid " (fix conflicts and run \"git commit\")"
2750 msgstr " (解决冲突并运行 \"git commit\")"
2754 msgid " (use \"git merge --abort\" to abort the merge)"
2755 msgstr " (使用 \"git merge --abort\" 终止合并)"
2758 msgid "All conflicts fixed but you are still merging."
2759 msgstr "所有冲突已解决但您仍处于合并中。"
2763 msgid " (use \"git commit\" to conclude merge)"
2764 msgstr " (使用 \"git commit\" 结束合并)"
2767 msgid "You are in the middle of an am session."
2768 msgstr "您正处于 am 操作过程中。"
2771 msgid "The current patch is empty."
2776 msgid " (fix conflicts and then run \"git am --continue\")"
2777 msgstr " (解决冲突,然后运行 \"git am --continue\")"
2781 msgid " (use \"git am --skip\" to skip this patch)"
2782 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2786 msgid " (use \"git am --abort\" to restore the original branch)"
2787 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2790 msgid "No commands done."
2795 msgid "Last command done (%d command done):"
2796 msgid_plural "Last commands done (%d commands done):"
2797 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2798 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2802 msgid " (see more in file %s)"
2803 msgstr " (更多参见文件 %s)"
2806 msgid "No commands remaining."
2811 msgid "Next command to do (%d remaining command):"
2812 msgid_plural "Next commands to do (%d remaining commands):"
2813 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2814 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2818 msgid " (use \"git rebase --edit-todo\" to view and edit)"
2819 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2823 msgid "You are currently rebasing branch '%s' on '%s'."
2824 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2827 msgid "You are currently rebasing."
2832 msgid " (fix conflicts and then run \"git rebase --continue\")"
2833 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2837 msgid " (use \"git rebase --skip\" to skip this patch)"
2838 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2842 msgid " (use \"git rebase --abort\" to check out the original branch)"
2843 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2847 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2848 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2853 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2854 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2857 msgid "You are currently splitting a commit during a rebase."
2858 msgstr "您在执行变基操作时拆分提交。"
2862 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2863 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2867 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2868 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2871 msgid "You are currently editing a commit during a rebase."
2872 msgstr "您在执行变基操作时编辑提交。"
2876 msgid " (use \"git commit --amend\" to amend the current commit)"
2877 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2882 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2883 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2887 msgid "You are currently cherry-picking commit %s."
2888 msgstr "您在执行拣选提交 %s 的操作。"
2892 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2893 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2897 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2898 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2902 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2903 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2907 msgid "You are currently reverting commit %s."
2908 msgstr "您在执行反转提交 %s 的操作。"
2912 msgid " (fix conflicts and run \"git revert --continue\")"
2913 msgstr " (解决冲突并运行 \"git revert --continue\")"
2917 msgid " (all conflicts fixed: run \"git revert --continue\")"
2918 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2922 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2923 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2927 msgid "You are currently bisecting, started from branch '%s'."
2928 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2931 msgid "You are currently bisecting."
2932 msgstr "您在执行二分查找操作。"
2936 msgid " (use \"git bisect reset\" to get back to the original branch)"
2937 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2944 msgid "interactive rebase in progress; onto "
2945 msgstr "交互式变基操作正在进行中;至 "
2948 msgid "rebase in progress; onto "
2949 msgstr "变基操作正在进行中;至 "
2952 msgid "HEAD detached at "
2956 msgid "HEAD detached from "
2960 msgid "Not currently on any branch."
2964 msgid "Initial commit"
2968 msgid "Untracked files"
2972 msgid "Ignored files"
2978 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2979 "may speed it up, but you have to be careful not to forget to add\n"
2980 "new files yourself (see 'git help status')."
2982 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2983 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2987 msgid "Untracked files not listed%s"
2988 msgstr "未跟踪的文件没有列出%s"
2990 # 译者:中文字符串拼接,可删除前导空格
2992 msgid " (use -u option to show untracked files)"
2993 msgstr "(使用 -u 参数显示未跟踪的文件)"
3001 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
3002 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
3006 msgid "no changes added to commit\n"
3012 "nothing added to commit but untracked files present (use \"git add\" to "
3014 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
3018 msgid "nothing added to commit but untracked files present\n"
3019 msgstr "提交为空,但是存在尚未跟踪的文件\n"
3021 # 译者:中文字符串拼接,可删除前导空格
3024 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
3025 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
3027 #: wt-status.c:1554 wt-status.c:1559
3029 msgid "nothing to commit\n"
3032 # 译者:中文字符串拼接,可删除前导空格
3035 msgid "nothing to commit (use -u to show untracked files)\n"
3036 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
3038 # 译者:中文字符串拼接,可删除前导空格
3041 msgid "nothing to commit, working tree clean\n"
3042 msgstr "无文件要提交,干净的工作区\n"
3046 msgid "Initial commit on "
3050 msgid "HEAD (no branch)"
3058 #: wt-status.c:1703 wt-status.c:1711
3062 #: wt-status.c:1706 wt-status.c:1709
3066 #: compat/precompose_utf8.c:57 builtin/clone.c:415
3068 msgid "failed to unlink '%s'"
3072 msgid "git add [<options>] [--] <pathspec>..."
3073 msgstr "git add [<选项>] [--] <路径规格>..."
3077 msgid "unexpected diff status %c"
3080 #: builtin/add.c:71 builtin/commit.c:281
3081 msgid "updating files failed"
3086 msgid "remove '%s'\n"
3089 #: builtin/add.c:136
3090 msgid "Unstaged changes after refreshing the index:"
3091 msgstr "刷新索引之后尚未被暂存的变更:"
3093 #: builtin/add.c:196 builtin/rev-parse.c:811
3094 msgid "Could not read the index"
3097 #: builtin/add.c:207
3099 msgid "Could not open '%s' for writing."
3100 msgstr "无法打开 '%s' 进行写入。"
3102 #: builtin/add.c:211
3103 msgid "Could not write patch"
3106 #: builtin/add.c:214
3107 msgid "editing patch failed"
3110 #: builtin/add.c:217
3112 msgid "Could not stat '%s'"
3113 msgstr "不能查看文件状态 '%s'"
3115 #: builtin/add.c:219
3116 msgid "Empty patch. Aborted."
3119 #: builtin/add.c:224
3121 msgid "Could not apply '%s'"
3124 #: builtin/add.c:234
3125 msgid "The following paths are ignored by one of your .gitignore files:\n"
3126 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
3128 #: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111
3129 #: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521
3130 #: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162
3134 #: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19
3135 #: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593
3136 #: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114
3140 #: builtin/add.c:256
3141 msgid "interactive picking"
3144 #: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286
3145 msgid "select hunks interactively"
3148 #: builtin/add.c:258
3149 msgid "edit current diff and apply"
3152 #: builtin/add.c:259
3153 msgid "allow adding otherwise ignored files"
3156 #: builtin/add.c:260
3157 msgid "update tracked files"
3160 #: builtin/add.c:261
3161 msgid "record only the fact that the path will be added later"
3162 msgstr "只记录,该路径稍后再添加"
3164 #: builtin/add.c:262
3165 msgid "add changes from all tracked and untracked files"
3166 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
3168 #: builtin/add.c:265
3169 msgid "ignore paths removed in the working tree (same as --no-all)"
3170 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
3172 #: builtin/add.c:267
3173 msgid "don't add, only refresh the index"
3176 #: builtin/add.c:268
3177 msgid "just skip files which cannot be added because of errors"
3178 msgstr "跳过因出错不能添加的文件"
3180 #: builtin/add.c:269
3181 msgid "check if - even missing - files are ignored in dry run"
3182 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
3184 #: builtin/add.c:270 builtin/update-index.c:958
3188 #: builtin/add.c:270 builtin/update-index.c:959
3189 msgid "override the executable bit of the listed files"
3190 msgstr "覆盖列表里文件的可执行位"
3192 #: builtin/add.c:292
3194 msgid "Use -f if you really want to add them.\n"
3195 msgstr "使用 -f 参数如果您确实要添加它们。\n"
3197 #: builtin/add.c:300
3198 msgid "adding files failed"
3201 #: builtin/add.c:336
3202 msgid "-A and -u are mutually incompatible"
3203 msgstr "-A 和 -u 选项互斥"
3205 #: builtin/add.c:343
3206 msgid "Option --ignore-missing can only be used together with --dry-run"
3207 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
3209 #: builtin/add.c:352
3211 msgid "--chmod param '%s' must be either -x or +x"
3212 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
3214 #: builtin/add.c:367
3216 msgid "Nothing specified, nothing added.\n"
3217 msgstr "没有指定文件,也没有文件被添加。\n"
3219 #: builtin/add.c:368
3221 msgid "Maybe you wanted to say 'git add .'?\n"
3222 msgstr "也许您想要执行 'git add .'?\n"
3224 #: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279
3225 #: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340
3226 #: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
3227 #: builtin/submodule--helper.c:240
3228 msgid "index file corrupt"
3231 #: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431
3232 msgid "Unable to write new index file"
3235 #: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032
3237 msgid "could not read '%s'"
3241 msgid "could not parse author script"
3246 msgid "'%s' was deleted by the applypatch-msg hook"
3247 msgstr "'%s' 被 applypatch-msg 钩子删除"
3249 #: builtin/am.c:544 builtin/notes.c:301
3251 msgid "Malformed input line: '%s'."
3252 msgstr "非法的输入行:'%s'。"
3254 #: builtin/am.c:581 builtin/notes.c:316
3256 msgid "Failed to copy notes from '%s' to '%s'"
3257 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
3260 msgid "fseek failed"
3265 msgid "could not parse patch '%s'"
3266 msgstr "无法解析补丁 '%s'"
3269 msgid "Only one StGIT patch series can be applied at once"
3270 msgstr "一次只能有一个 StGIT 补丁队列被应用"
3273 msgid "invalid timestamp"
3276 #: builtin/am.c:902 builtin/am.c:910
3277 msgid "invalid Date line"
3281 msgid "invalid timezone offset"
3285 msgid "Patch format detection failed."
3288 #: builtin/am.c:1001 builtin/clone.c:380
3290 msgid "failed to create directory '%s'"
3291 msgstr "无法创建目录 '%s'"
3293 #: builtin/am.c:1005
3294 msgid "Failed to split patches."
3297 #: builtin/am.c:1137 builtin/commit.c:366
3298 msgid "unable to write index file"
3301 #: builtin/am.c:1188
3303 msgid "When you have resolved this problem, run \"%s --continue\"."
3304 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
3306 #: builtin/am.c:1189
3308 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
3309 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
3311 #: builtin/am.c:1190
3313 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
3314 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
3316 #: builtin/am.c:1328
3317 msgid "Patch is empty. Was it split wrong?"
3318 msgstr "补丁为空。是不是切分错误?"
3320 #: builtin/am.c:1402 builtin/log.c:1543
3322 msgid "invalid ident line: %s"
3323 msgstr "包含无效的身份标识:%s"
3325 #: builtin/am.c:1429
3327 msgid "unable to parse commit %s"
3330 #: builtin/am.c:1602
3331 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3332 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
3334 #: builtin/am.c:1604
3335 msgid "Using index info to reconstruct a base tree..."
3336 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
3338 #: builtin/am.c:1623
3340 "Did you hand edit your patch?\n"
3341 "It does not apply to blobs recorded in its index."
3346 #: builtin/am.c:1629
3347 msgid "Falling back to patching base and 3-way merge..."
3348 msgstr "回落到基础版本上打补丁及进行三方合并..."
3350 #: builtin/am.c:1654
3351 msgid "Failed to merge in the changes."
3354 #: builtin/am.c:1679 builtin/merge.c:628
3355 msgid "git write-tree failed to write a tree"
3356 msgstr "git write-tree 无法写入一树对象"
3358 #: builtin/am.c:1686
3359 msgid "applying to an empty history"
3362 #: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798
3363 #: builtin/merge.c:823
3364 msgid "failed to write commit object"
3367 #: builtin/am.c:1731 builtin/am.c:1735
3369 msgid "cannot resume: %s does not exist."
3370 msgstr "无法继续:%s 不存在。"
3372 #: builtin/am.c:1751
3373 msgid "cannot be interactive without stdin connected to a terminal."
3374 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
3376 #: builtin/am.c:1756
3377 msgid "Commit Body is:"
3381 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3382 #. in your translation. The program will only accept English
3383 #. input at this point.
3385 #: builtin/am.c:1766
3386 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
3387 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
3389 #: builtin/am.c:1816
3391 msgid "Dirty index: cannot apply patches (dirty: %s)"
3392 msgstr "脏索引:不能应用补丁(脏文件:%s)"
3394 #: builtin/am.c:1853 builtin/am.c:1925
3396 msgid "Applying: %.*s"
3399 #: builtin/am.c:1869
3400 msgid "No changes -- Patch already applied."
3401 msgstr "没有变更 —— 补丁已经应用过。"
3403 #: builtin/am.c:1877
3405 msgid "Patch failed at %s %.*s"
3406 msgstr "打补丁失败于 %s %.*s"
3408 #: builtin/am.c:1883
3410 msgid "The copy of the patch that failed is found in: %s"
3411 msgstr "失败的补丁文件副本位于:%s"
3413 #: builtin/am.c:1928
3415 "No changes - did you forget to use 'git add'?\n"
3416 "If there is nothing left to stage, chances are that something else\n"
3417 "already introduced the same changes; you might want to skip this patch."
3419 "没有变更 —— 您是不是忘了执行 'git add'?\n"
3420 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
3423 #: builtin/am.c:1935
3425 "You still have unmerged paths in your index.\n"
3426 "Did you forget to use 'git add'?"
3429 "您是否忘了执行 'git add'?"
3431 #: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308
3432 #: builtin/reset.c:316
3434 msgid "Could not parse object '%s'."
3435 msgstr "不能解析对象 '%s'。"
3437 #: builtin/am.c:2095
3438 msgid "failed to clean index"
3441 #: builtin/am.c:2129
3443 "You seem to have moved HEAD since the last 'am' failure.\n"
3444 "Not rewinding to ORIG_HEAD"
3445 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
3447 #: builtin/am.c:2192
3449 msgid "Invalid value for --patch-format: %s"
3450 msgstr "无效的 --patch-format 值:%s"
3452 #: builtin/am.c:2225
3453 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
3454 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
3456 #: builtin/am.c:2226
3457 msgid "git am [<options>] (--continue | --skip | --abort)"
3458 msgstr "git am [<选项>] (--continue | --skip | --abort)"
3460 #: builtin/am.c:2232
3461 msgid "run interactively"
3464 #: builtin/am.c:2234
3465 msgid "historical option -- no-op"
3466 msgstr "老的参数 —— 无作用"
3468 #: builtin/am.c:2236
3469 msgid "allow fall back on 3way merging if needed"
3470 msgstr "如果必要,允许使用三方合并。"
3472 #: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57
3473 #: builtin/repack.c:172
3477 #: builtin/am.c:2239
3478 msgid "add a Signed-off-by line to the commit message"
3479 msgstr "在提交说明中添加一个 Signed-off-by 签名"
3481 #: builtin/am.c:2242
3482 msgid "recode into utf8 (default)"
3483 msgstr "使用 utf8 字符集(默认)"
3485 #: builtin/am.c:2244
3486 msgid "pass -k flag to git-mailinfo"
3487 msgstr "向 git-mailinfo 传递 -k 参数"
3489 #: builtin/am.c:2246
3490 msgid "pass -b flag to git-mailinfo"
3491 msgstr "向 git-mailinfo 传递 -b 参数"
3493 #: builtin/am.c:2248
3494 msgid "pass -m flag to git-mailinfo"
3495 msgstr "向 git-mailinfo 传递 -m 参数"
3497 #: builtin/am.c:2250
3498 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
3499 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
3501 #: builtin/am.c:2253
3502 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
3503 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
3505 #: builtin/am.c:2256
3506 msgid "strip everything before a scissors line"
3507 msgstr "丢弃裁切线前的所有内容"
3509 #: builtin/am.c:2257 builtin/apply.c:4837
3513 #: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
3514 #: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279
3515 #: builtin/am.c:2285
3516 msgid "pass it through git-apply"
3517 msgstr "传递给 git-apply"
3519 #: builtin/am.c:2266 builtin/apply.c:4861
3523 #: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799
3524 #: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96
3525 #: builtin/pull.c:179 builtin/submodule--helper.c:277
3526 #: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482
3527 #: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823
3528 #: builtin/submodule--helper.c:826
3532 #: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
3533 #: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134
3534 #: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185
3535 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
3536 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
3540 #: builtin/am.c:2278 builtin/apply.c:4805
3544 #: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438
3545 #: builtin/tag.c:372
3549 #: builtin/am.c:2282
3550 msgid "format the patch(es) are in"
3553 #: builtin/am.c:2288
3554 msgid "override error message when patch failure occurs"
3555 msgstr "打补丁失败时显示的错误信息"
3557 #: builtin/am.c:2290
3558 msgid "continue applying patches after resolving a conflict"
3559 msgstr "冲突解决后继续应用补丁"
3561 #: builtin/am.c:2293
3562 msgid "synonyms for --continue"
3563 msgstr "和 --continue 同义"
3565 #: builtin/am.c:2296
3566 msgid "skip the current patch"
3569 #: builtin/am.c:2299
3570 msgid "restore the original branch and abort the patching operation."
3571 msgstr "恢复原始分支并终止打补丁操作。"
3573 #: builtin/am.c:2303
3574 msgid "lie about committer date"
3575 msgstr "将作者日期作为提交日期"
3577 #: builtin/am.c:2305
3578 msgid "use current timestamp for author date"
3579 msgstr "用当前时间作为作者日期"
3581 #: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229
3582 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355
3586 #: builtin/am.c:2308
3587 msgid "GPG-sign commits"
3588 msgstr "使用 GPG 签名提交"
3590 #: builtin/am.c:2311
3591 msgid "(internal use for git-rebase)"
3592 msgstr "(内部使用,用于 git-rebase)"
3594 #: builtin/am.c:2326
3596 "The -b/--binary option has been a no-op for long time, and\n"
3597 "it will be removed. Please do not use it anymore."
3599 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
3602 #: builtin/am.c:2333
3603 msgid "failed to read the index"
3606 #: builtin/am.c:2348
3608 msgid "previous rebase directory %s still exists but mbox given."
3609 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
3611 #: builtin/am.c:2372
3614 "Stray %s directory found.\n"
3615 "Use \"git am --abort\" to remove it."
3618 "使用 \"git am --abort\" 删除它。"
3620 #: builtin/am.c:2378
3621 msgid "Resolve operation not in progress, we are not resuming."
3622 msgstr "解决操作未进行,我们不会继续。"
3624 #: builtin/apply.c:122
3625 msgid "git apply [<options>] [<patch>...]"
3626 msgstr "git apply [<选项>] [<补丁>...]"
3628 #: builtin/apply.c:153
3630 msgid "unrecognized whitespace option '%s'"
3631 msgstr "未能识别的空白字符选项 '%s'"
3633 #: builtin/apply.c:169
3635 msgid "unrecognized whitespace ignore option '%s'"
3636 msgstr "未能识别的空白字符忽略选项 '%s'"
3638 #: builtin/apply.c:854
3640 msgid "Cannot prepare timestamp regexp %s"
3641 msgstr "无法准备时间戳正则表达式 %s"
3643 #: builtin/apply.c:863
3645 msgid "regexec returned %d for input: %s"
3646 msgstr "regexec 返回 %d,输入为:%s"
3648 #: builtin/apply.c:947
3650 msgid "unable to find filename in patch at line %d"
3651 msgstr "不能在补丁的第 %d 行找到文件名"
3653 #: builtin/apply.c:984
3655 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3656 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3658 #: builtin/apply.c:989
3660 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3661 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3663 #: builtin/apply.c:990
3665 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3666 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3668 #: builtin/apply.c:995
3670 msgid "git apply: bad git-diff - expected /dev/null on line %d"
3671 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3673 #: builtin/apply.c:1489
3675 msgid "recount: unexpected line: %.*s"
3676 msgstr "recount:意外的行:%.*s"
3678 #: builtin/apply.c:1550
3680 msgid "patch fragment without header at line %d: %.*s"
3681 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3683 #: builtin/apply.c:1567
3686 "git diff header lacks filename information when removing %d leading pathname "
3687 "component (line %d)"
3689 "git diff header lacks filename information when removing %d leading pathname "
3690 "components (line %d)"
3691 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3692 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3694 #: builtin/apply.c:1743
3695 msgid "new file depends on old contents"
3698 #: builtin/apply.c:1745
3699 msgid "deleted file still has contents"
3702 #: builtin/apply.c:1774
3704 msgid "corrupt patch at line %d"
3705 msgstr "补丁在第 %d 行损坏"
3707 #: builtin/apply.c:1810
3709 msgid "new file %s depends on old contents"
3710 msgstr "新文件 %s 依赖旧内容"
3712 #: builtin/apply.c:1812
3714 msgid "deleted file %s still has contents"
3715 msgstr "删除的文件 %s 仍有内容"
3717 #: builtin/apply.c:1815
3719 msgid "** warning: file %s becomes empty but is not deleted"
3720 msgstr "** 警告:文件 %s 成为空文件但并未删除"
3722 #: builtin/apply.c:1962
3724 msgid "corrupt binary patch at line %d: %.*s"
3725 msgstr "二进制补丁在第 %d 行损坏:%.*s"
3727 #: builtin/apply.c:1999
3729 msgid "unrecognized binary patch at line %d"
3730 msgstr "未能识别的二进制补丁位于第 %d 行"
3732 #: builtin/apply.c:2154
3734 msgid "patch with only garbage at line %d"
3735 msgstr "补丁文件的第 %d 行只有垃圾数据"
3737 #: builtin/apply.c:2244
3739 msgid "unable to read symlink %s"
3740 msgstr "无法读取符号链接 %s"
3742 #: builtin/apply.c:2248
3744 msgid "unable to open or read %s"
3747 #: builtin/apply.c:2901
3749 msgid "invalid start of line: '%c'"
3750 msgstr "无效的行首字符:'%c'"
3752 #: builtin/apply.c:3020
3754 msgid "Hunk #%d succeeded at %d (offset %d line)."
3755 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3756 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3757 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3759 #: builtin/apply.c:3032
3761 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3762 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3764 #: builtin/apply.c:3038
3767 "while searching for:\n"
3773 #: builtin/apply.c:3060
3775 msgid "missing binary patch data for '%s'"
3776 msgstr "缺失 '%s' 的二进制补丁数据"
3778 #: builtin/apply.c:3163
3780 msgid "binary patch does not apply to '%s'"
3781 msgstr "二进制补丁未应用到 '%s'"
3783 #: builtin/apply.c:3169
3785 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3786 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3788 #: builtin/apply.c:3190
3790 msgid "patch failed: %s:%ld"
3791 msgstr "打补丁失败:%s:%ld"
3793 #: builtin/apply.c:3314
3795 msgid "cannot checkout %s"
3798 #: builtin/apply.c:3370
3800 msgid "reading from '%s' beyond a symbolic link"
3801 msgstr "读取位于符号链接中的 '%s'"
3803 #: builtin/apply.c:3399 builtin/apply.c:3630
3805 msgid "path %s has been renamed/deleted"
3806 msgstr "路径 %s 已经被重命名/删除"
3808 #: builtin/apply.c:3482 builtin/apply.c:3644
3810 msgid "%s: does not exist in index"
3813 #: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658
3818 #: builtin/apply.c:3491 builtin/apply.c:3652
3820 msgid "%s: does not match index"
3823 #: builtin/apply.c:3597
3824 msgid "removal patch leaves file contents"
3825 msgstr "移除补丁仍留下了文件内容"
3827 #: builtin/apply.c:3669
3829 msgid "%s: wrong type"
3832 #: builtin/apply.c:3671
3834 msgid "%s has type %o, expected %o"
3835 msgstr "%s 的类型是 %o,应为 %o"
3837 #: builtin/apply.c:3822 builtin/apply.c:3824
3839 msgid "invalid path '%s'"
3842 #: builtin/apply.c:3879
3844 msgid "%s: already exists in index"
3845 msgstr "%s:已经存在于索引中"
3847 #: builtin/apply.c:3882
3849 msgid "%s: already exists in working directory"
3850 msgstr "%s:已经存在于工作区中"
3852 #: builtin/apply.c:3902
3854 msgid "new mode (%o) of %s does not match old mode (%o)"
3855 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3857 #: builtin/apply.c:3907
3859 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3860 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3862 #: builtin/apply.c:3927
3864 msgid "affected file '%s' is beyond a symbolic link"
3865 msgstr "受影响的文件 '%s' 位于符号链接中"
3867 #: builtin/apply.c:3931
3869 msgid "%s: patch does not apply"
3872 #: builtin/apply.c:3945
3874 msgid "Checking patch %s..."
3877 #: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135
3879 msgid "make_cache_entry failed for path '%s'"
3880 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3882 #: builtin/apply.c:4182
3884 msgid "unable to remove %s from index"
3885 msgstr "不能从索引中移除 %s"
3887 #: builtin/apply.c:4215
3889 msgid "corrupt patch for submodule %s"
3890 msgstr "子模组 %s 损坏的补丁"
3892 #: builtin/apply.c:4219
3894 msgid "unable to stat newly created file '%s'"
3895 msgstr "不能枚举新建文件 '%s' 的状态"
3897 #: builtin/apply.c:4224
3899 msgid "unable to create backing store for newly created file %s"
3900 msgstr "不能为新建文件 %s 创建后端存储"
3902 #: builtin/apply.c:4227 builtin/apply.c:4340
3904 msgid "unable to add cache entry for %s"
3905 msgstr "无法为 %s 添加缓存条目"
3907 #: builtin/apply.c:4260
3909 msgid "closing file '%s'"
3912 #: builtin/apply.c:4313
3914 msgid "unable to write file '%s' mode %o"
3915 msgstr "不能写文件 '%s' 权限 %o"
3917 #: builtin/apply.c:4403
3919 msgid "Applied patch %s cleanly."
3922 #: builtin/apply.c:4411
3923 msgid "internal error"
3926 #: builtin/apply.c:4414
3928 msgid "Applying patch %%s with %d reject..."
3929 msgid_plural "Applying patch %%s with %d rejects..."
3930 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3931 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3933 #: builtin/apply.c:4424
3935 msgid "truncating .rej filename to %.*s.rej"
3936 msgstr "截短 .rej 文件名为 %.*s.rej"
3938 #: builtin/apply.c:4432
3940 msgid "cannot open %s: %s"
3943 #: builtin/apply.c:4445
3945 msgid "Hunk #%d applied cleanly."
3946 msgstr "第 #%d 个片段成功应用。"
3948 #: builtin/apply.c:4448
3950 msgid "Rejected hunk #%d."
3951 msgstr "拒绝第 #%d 个片段。"
3953 #: builtin/apply.c:4537
3955 msgid "Skipped patch '%s'."
3958 #: builtin/apply.c:4545
3959 msgid "unrecognized input"
3962 #: builtin/apply.c:4556
3963 msgid "unable to read index file"
3966 #: builtin/apply.c:4701
3967 msgid "--3way outside a repository"
3968 msgstr "--3way 在一个仓库之外"
3970 #: builtin/apply.c:4709
3971 msgid "--index outside a repository"
3972 msgstr "--index 在一个仓库之外"
3974 #: builtin/apply.c:4712
3975 msgid "--cached outside a repository"
3976 msgstr "--cached 在一个仓库之外"
3978 #: builtin/apply.c:4745
3980 msgid "can't open patch '%s'"
3981 msgstr "不能打开补丁 '%s'"
3983 #: builtin/apply.c:4760
3985 msgid "squelched %d whitespace error"
3986 msgid_plural "squelched %d whitespace errors"
3987 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3988 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3990 #: builtin/apply.c:4766 builtin/apply.c:4776
3992 msgid "%d line adds whitespace errors."
3993 msgid_plural "%d lines add whitespace errors."
3994 msgstr[0] "%d 行有空白字符误用。"
3995 msgstr[1] "%d 行有空白字符误用。"
3997 #: builtin/apply.c:4800
3998 msgid "don't apply changes matching the given path"
3999 msgstr "不要应用与给出路径向匹配的变更"
4001 #: builtin/apply.c:4803
4002 msgid "apply changes matching the given path"
4003 msgstr "应用与给出路径向匹配的变更"
4005 #: builtin/apply.c:4806
4006 msgid "remove <num> leading slashes from traditional diff paths"
4007 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
4009 #: builtin/apply.c:4809
4010 msgid "ignore additions made by the patch"
4011 msgstr "忽略补丁中的添加的文件"
4013 #: builtin/apply.c:4811
4014 msgid "instead of applying the patch, output diffstat for the input"
4015 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
4017 #: builtin/apply.c:4815
4018 msgid "show number of added and deleted lines in decimal notation"
4019 msgstr "以十进制数显示添加和删除的行数"
4021 #: builtin/apply.c:4817
4022 msgid "instead of applying the patch, output a summary for the input"
4023 msgstr "不应用补丁,而是显示输入的概要"
4025 #: builtin/apply.c:4819
4026 msgid "instead of applying the patch, see if the patch is applicable"
4027 msgstr "不应用补丁,而是查看补丁是否可应用"
4029 #: builtin/apply.c:4821
4030 msgid "make sure the patch is applicable to the current index"
4031 msgstr "确认补丁可以应用到当前索引"
4033 #: builtin/apply.c:4823
4034 msgid "apply a patch without touching the working tree"
4035 msgstr "应用补丁而不修改工作区"
4037 #: builtin/apply.c:4825
4038 msgid "accept a patch that touches outside the working area"
4039 msgstr "接受修改工作区之外文件的补丁"
4041 #: builtin/apply.c:4827
4042 msgid "also apply the patch (use with --stat/--summary/--check)"
4043 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
4045 #: builtin/apply.c:4829
4046 msgid "attempt three-way merge if a patch does not apply"
4047 msgstr "如果一个补丁不能应用则尝试三方合并"
4049 #: builtin/apply.c:4831
4050 msgid "build a temporary index based on embedded index information"
4051 msgstr "创建一个临时索引基于嵌入的索引信息"
4053 #: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426
4054 msgid "paths are separated with NUL character"
4055 msgstr "路径以 NUL 字符分隔"
4057 #: builtin/apply.c:4836
4058 msgid "ensure at least <n> lines of context match"
4059 msgstr "确保至少匹配 <n> 行上下文"
4061 #: builtin/apply.c:4838
4062 msgid "detect new or modified lines that have whitespace errors"
4063 msgstr "检查新增和修改的行中间的空白字符滥用"
4065 #: builtin/apply.c:4841 builtin/apply.c:4844
4066 msgid "ignore changes in whitespace when finding context"
4067 msgstr "查找上下文时忽略空白字符的变更"
4069 #: builtin/apply.c:4847
4070 msgid "apply the patch in reverse"
4073 #: builtin/apply.c:4849
4074 msgid "don't expect at least one line of context"
4077 #: builtin/apply.c:4851
4078 msgid "leave the rejected hunks in corresponding *.rej files"
4079 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
4081 #: builtin/apply.c:4853
4082 msgid "allow overlapping hunks"
4085 #: builtin/apply.c:4856
4086 msgid "tolerate incorrectly detected missing new-line at the end of file"
4087 msgstr "允许不正确的文件末尾换行符"
4089 #: builtin/apply.c:4859
4090 msgid "do not trust the line counts in the hunk headers"
4091 msgstr "不信任补丁片段的头信息中的行号"
4093 #: builtin/apply.c:4862
4094 msgid "prepend <root> to all filenames"
4095 msgstr "为所有文件名前添加 <根目录>"
4097 #: builtin/archive.c:17
4099 msgid "could not create archive file '%s'"
4100 msgstr "不能创建归档文件 '%s'"
4102 #: builtin/archive.c:20
4103 msgid "could not redirect output"
4106 #: builtin/archive.c:37
4107 msgid "git archive: Remote with no URL"
4108 msgstr "git archive:未提供远程 URL"
4110 #: builtin/archive.c:58
4111 msgid "git archive: expected ACK/NAK, got EOF"
4112 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
4114 #: builtin/archive.c:61
4116 msgid "git archive: NACK %s"
4117 msgstr "git archive:NACK %s"
4119 #: builtin/archive.c:63
4121 msgid "remote error: %s"
4124 #: builtin/archive.c:64
4125 msgid "git archive: protocol error"
4126 msgstr "git archive:协议错误"
4128 #: builtin/archive.c:68
4129 msgid "git archive: expected a flush"
4130 msgstr "git archive:应为刷新"
4132 #: builtin/bisect--helper.c:7
4133 msgid "git bisect--helper --next-all [--no-checkout]"
4134 msgstr "git bisect--helper --next-all [--no-checkout]"
4136 #: builtin/bisect--helper.c:17
4137 msgid "perform 'git bisect next'"
4138 msgstr "执行 'git bisect next'"
4140 #: builtin/bisect--helper.c:19
4141 msgid "update BISECT_HEAD instead of checking out the current commit"
4142 msgstr "更新 BISECT_HEAD 而非检出当前提交"
4144 #: builtin/blame.c:33
4145 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
4146 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
4148 #: builtin/blame.c:38
4149 msgid "<rev-opts> are documented in git-rev-list(1)"
4150 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
4152 #: builtin/blame.c:1781
4153 msgid "Blaming lines"
4156 #: builtin/blame.c:2536
4157 msgid "Show blame entries as we find them, incrementally"
4158 msgstr "增量式地显示发现的 blame 条目"
4160 #: builtin/blame.c:2537
4161 msgid "Show blank SHA-1 for boundary commits (Default: off)"
4162 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
4164 #: builtin/blame.c:2538
4165 msgid "Do not treat root commits as boundaries (Default: off)"
4166 msgstr "不把根提交作为边界(默认:关闭)"
4168 #: builtin/blame.c:2539
4169 msgid "Show work cost statistics"
4172 #: builtin/blame.c:2540
4173 msgid "Force progress reporting"
4176 #: builtin/blame.c:2541
4177 msgid "Show output score for blame entries"
4178 msgstr "显示判断 blame 条目位移的得分诊断信息"
4180 #: builtin/blame.c:2542
4181 msgid "Show original filename (Default: auto)"
4182 msgstr "显示原始文件名(默认:自动)"
4184 #: builtin/blame.c:2543
4185 msgid "Show original linenumber (Default: off)"
4186 msgstr "显示原始的行号(默认:关闭)"
4188 #: builtin/blame.c:2544
4189 msgid "Show in a format designed for machine consumption"
4190 msgstr "显示为一个适合机器读取的格式"
4192 #: builtin/blame.c:2545
4193 msgid "Show porcelain format with per-line commit information"
4194 msgstr "为每一行显示机器适用的提交信息"
4196 #: builtin/blame.c:2546
4197 msgid "Use the same output mode as git-annotate (Default: off)"
4198 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
4200 #: builtin/blame.c:2547
4201 msgid "Show raw timestamp (Default: off)"
4202 msgstr "显示原始时间戳(默认:关闭)"
4204 #: builtin/blame.c:2548
4205 msgid "Show long commit SHA1 (Default: off)"
4206 msgstr "显示长的 SHA1 提交号(默认:关闭)"
4208 #: builtin/blame.c:2549
4209 msgid "Suppress author name and timestamp (Default: off)"
4210 msgstr "隐藏作者名字和时间戳(默认:关闭)"
4212 #: builtin/blame.c:2550
4213 msgid "Show author email instead of name (Default: off)"
4214 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
4216 #: builtin/blame.c:2551
4217 msgid "Ignore whitespace differences"
4220 #: builtin/blame.c:2552
4221 msgid "Spend extra cycles to find better match"
4222 msgstr "花费额外的循环来找到更好的匹配"
4224 #: builtin/blame.c:2553
4225 msgid "Use revisions from <file> instead of calling git-rev-list"
4226 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
4228 #: builtin/blame.c:2554
4229 msgid "Use <file>'s contents as the final image"
4230 msgstr "使用 <文件> 的内容作为最终的图片"
4232 #: builtin/blame.c:2555 builtin/blame.c:2556
4236 #: builtin/blame.c:2555
4237 msgid "Find line copies within and across files"
4238 msgstr "找到文件内及跨文件的行拷贝"
4240 #: builtin/blame.c:2556
4241 msgid "Find line movements within and across files"
4242 msgstr "找到文件内及跨文件的行移动"
4244 #: builtin/blame.c:2557
4248 #: builtin/blame.c:2557
4249 msgid "Process only line range n,m, counting from 1"
4250 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
4252 #. TRANSLATORS: This string is used to tell us the maximum
4253 #. display width for a relative timestamp in "git blame"
4254 #. output. For C locale, "4 years, 11 months ago", which
4255 #. takes 22 places, is the longest among various forms of
4256 #. relative timestamps, but your language may need more or
4257 #. fewer display columns.
4258 #: builtin/blame.c:2649
4259 msgid "4 years, 11 months ago"
4262 #: builtin/branch.c:26
4263 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
4264 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
4266 #: builtin/branch.c:27
4267 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
4268 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
4270 #: builtin/branch.c:28
4271 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
4272 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
4274 #: builtin/branch.c:29
4275 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
4276 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
4278 #: builtin/branch.c:30
4279 msgid "git branch [<options>] [-r | -a] [--points-at]"
4280 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
4282 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4283 #: builtin/branch.c:143
4286 "deleting branch '%s' that has been merged to\n"
4287 " '%s', but not yet merged to HEAD."
4289 "将要删除的分支 '%s' 已经被合并到\n"
4292 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4293 #: builtin/branch.c:147
4296 "not deleting branch '%s' that is not yet merged to\n"
4297 " '%s', even though it is merged to HEAD."
4299 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
4300 " 然而却尚未被合并到分支 '%s' 。"
4302 #: builtin/branch.c:161
4304 msgid "Couldn't look up commit object for '%s'"
4305 msgstr "无法查询 '%s' 指向的提交对象"
4307 #: builtin/branch.c:165
4310 "The branch '%s' is not fully merged.\n"
4311 "If you are sure you want to delete it, run 'git branch -D %s'."
4314 "如果您确认要删除它,执行 'git branch -D %s'。"
4316 #: builtin/branch.c:178
4317 msgid "Update of config-file failed"
4318 msgstr "无法更新 config 文件"
4320 #: builtin/branch.c:206
4321 msgid "cannot use -a with -d"
4322 msgstr "不能将 -a 和 -d 同时使用"
4324 #: builtin/branch.c:212
4325 msgid "Couldn't look up commit object for HEAD"
4326 msgstr "无法查询 HEAD 指向的提交对象"
4328 #: builtin/branch.c:226
4330 msgid "Cannot delete branch '%s' checked out at '%s'"
4331 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
4333 #: builtin/branch.c:241
4335 msgid "remote-tracking branch '%s' not found."
4336 msgstr "未能找到远程跟踪分支 '%s'。"
4338 #: builtin/branch.c:242
4340 msgid "branch '%s' not found."
4341 msgstr "分支 '%s' 未发现。"
4343 #: builtin/branch.c:257
4345 msgid "Error deleting remote-tracking branch '%s'"
4346 msgstr "无法删除远程跟踪分支 '%s'"
4348 #: builtin/branch.c:258
4350 msgid "Error deleting branch '%s'"
4351 msgstr "无法删除分支 '%s'"
4353 #: builtin/branch.c:265
4355 msgid "Deleted remote-tracking branch %s (was %s).\n"
4356 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
4358 #: builtin/branch.c:266
4360 msgid "Deleted branch %s (was %s).\n"
4361 msgstr "已删除分支 %s(曾为 %s)。\n"
4363 #: builtin/branch.c:312
4368 #: builtin/branch.c:317
4373 #: builtin/branch.c:322
4375 msgid "[%s: behind %d]"
4378 #: builtin/branch.c:324
4383 #: builtin/branch.c:328
4385 msgid "[%s: ahead %d]"
4388 #: builtin/branch.c:330
4393 #: builtin/branch.c:333
4395 msgid "[%s: ahead %d, behind %d]"
4396 msgstr "[%s:领先 %d,落后 %d]"
4398 #: builtin/branch.c:336
4400 msgid "[ahead %d, behind %d]"
4401 msgstr "[领先 %d,落后 %d]"
4403 #: builtin/branch.c:349
4404 msgid " **** invalid ref ****"
4405 msgstr " **** 无效引用 ****"
4407 #: builtin/branch.c:375
4409 msgid "(no branch, rebasing %s)"
4410 msgstr "(非分支,正变基 %s)"
4412 #: builtin/branch.c:378
4414 msgid "(no branch, bisect started on %s)"
4415 msgstr "(非分支,二分查找开始于 %s)"
4417 #. TRANSLATORS: make sure this matches
4418 #. "HEAD detached at " in wt-status.c
4419 #: builtin/branch.c:384
4421 msgid "(HEAD detached at %s)"
4422 msgstr "(头指针分离于 %s)"
4424 #. TRANSLATORS: make sure this matches
4425 #. "HEAD detached from " in wt-status.c
4426 #: builtin/branch.c:389
4428 msgid "(HEAD detached from %s)"
4429 msgstr "(头指针分离自 %s)"
4431 #: builtin/branch.c:393
4435 #: builtin/branch.c:544
4437 msgid "Branch %s is being rebased at %s"
4438 msgstr "分支 %s 正被变基到 %s"
4440 #: builtin/branch.c:548
4442 msgid "Branch %s is being bisected at %s"
4443 msgstr "分支 %s 正被二分查找于 %s"
4445 #: builtin/branch.c:563
4446 msgid "cannot rename the current branch while not on any."
4447 msgstr "无法重命名当前分支因为不处于任何分支上。"
4449 #: builtin/branch.c:573
4451 msgid "Invalid branch name: '%s'"
4452 msgstr "无效的分支名:'%s'"
4454 #: builtin/branch.c:590
4455 msgid "Branch rename failed"
4458 #: builtin/branch.c:594
4460 msgid "Renamed a misnamed branch '%s' away"
4461 msgstr "重命名掉一个错误命名的旧分支 '%s'"
4463 #: builtin/branch.c:597
4465 msgid "Branch renamed to %s, but HEAD is not updated!"
4466 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
4468 #: builtin/branch.c:604
4469 msgid "Branch is renamed, but update of config-file failed"
4470 msgstr "分支被重命名,但更新 config 文件失败"
4472 #: builtin/branch.c:620
4475 "Please edit the description for the branch\n"
4477 "Lines starting with '%c' will be stripped.\n"
4481 "以 '%c' 开头的行将被过滤。\n"
4483 #: builtin/branch.c:651
4484 msgid "Generic options"
4487 #: builtin/branch.c:653
4488 msgid "show hash and subject, give twice for upstream branch"
4489 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
4491 #: builtin/branch.c:654
4492 msgid "suppress informational messages"
4495 #: builtin/branch.c:655
4496 msgid "set up tracking mode (see git-pull(1))"
4497 msgstr "设置跟踪模式(参见 git-pull(1))"
4499 #: builtin/branch.c:657
4500 msgid "change upstream info"
4503 #: builtin/branch.c:659
4507 #: builtin/branch.c:659
4508 msgid "change the upstream info"
4511 #: builtin/branch.c:661
4512 msgid "use colored output"
4515 #: builtin/branch.c:662
4516 msgid "act on remote-tracking branches"
4519 #: builtin/branch.c:664 builtin/branch.c:665
4520 msgid "print only branches that contain the commit"
4521 msgstr "只打印包含该提交的分支"
4523 #: builtin/branch.c:668
4524 msgid "Specific git-branch actions:"
4525 msgstr "具体的 git-branch 动作:"
4527 #: builtin/branch.c:669
4528 msgid "list both remote-tracking and local branches"
4529 msgstr "列出远程跟踪及本地分支"
4531 #: builtin/branch.c:671
4532 msgid "delete fully merged branch"
4535 #: builtin/branch.c:672
4536 msgid "delete branch (even if not merged)"
4537 msgstr "删除分支(即使没有合并)"
4539 #: builtin/branch.c:673
4540 msgid "move/rename a branch and its reflog"
4541 msgstr "移动/重命名一个分支,以及它的引用日志"
4543 #: builtin/branch.c:674
4544 msgid "move/rename a branch, even if target exists"
4545 msgstr "移动/重命名一个分支,即使目标已存在"
4547 #: builtin/branch.c:675
4548 msgid "list branch names"
4551 #: builtin/branch.c:676
4552 msgid "create the branch's reflog"
4555 #: builtin/branch.c:678
4556 msgid "edit the description for the branch"
4559 #: builtin/branch.c:679
4560 msgid "force creation, move/rename, deletion"
4561 msgstr "强制创建、移动/重命名、删除"
4563 #: builtin/branch.c:680
4564 msgid "print only branches that are merged"
4567 #: builtin/branch.c:681
4568 msgid "print only branches that are not merged"
4571 #: builtin/branch.c:682
4572 msgid "list branches in columns"
4575 #: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
4579 #: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
4580 msgid "field name to sort on"
4583 #: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402
4584 #: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568
4585 #: builtin/tag.c:369
4589 #: builtin/branch.c:687
4590 msgid "print only branches of the object"
4591 msgstr "只打印指向该对象的分支"
4593 #: builtin/branch.c:705
4594 msgid "Failed to resolve HEAD as a valid ref."
4595 msgstr "无法将 HEAD 解析为有效引用。"
4597 #: builtin/branch.c:709 builtin/clone.c:707
4598 msgid "HEAD not found below refs/heads!"
4599 msgstr "HEAD 没有位于 /refs/heads 之下!"
4601 #: builtin/branch.c:729
4602 msgid "--column and --verbose are incompatible"
4603 msgstr "--column 和 --verbose 不兼容"
4605 #: builtin/branch.c:740 builtin/branch.c:782
4606 msgid "branch name required"
4609 #: builtin/branch.c:758
4610 msgid "Cannot give description to detached HEAD"
4611 msgstr "不能向分离头指针提供描述"
4613 #: builtin/branch.c:763
4614 msgid "cannot edit description of more than one branch"
4615 msgstr "不能为一个以上的分支编辑描述"
4617 #: builtin/branch.c:770
4619 msgid "No commit on branch '%s' yet."
4620 msgstr "分支 '%s' 尚无提交。"
4622 #: builtin/branch.c:773
4624 msgid "No branch named '%s'."
4627 #: builtin/branch.c:788
4628 msgid "too many branches for a rename operation"
4629 msgstr "为重命名操作提供了太多的分支名"
4631 #: builtin/branch.c:793
4632 msgid "too many branches to set new upstream"
4633 msgstr "为设置新上游提供了太多的分支名"
4635 #: builtin/branch.c:797
4638 "could not set upstream of HEAD to %s when it does not point to any branch."
4639 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
4641 #: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
4643 msgid "no such branch '%s'"
4646 #: builtin/branch.c:804
4648 msgid "branch '%s' does not exist"
4649 msgstr "分支 '%s' 不存在"
4651 #: builtin/branch.c:816
4652 msgid "too many branches to unset upstream"
4653 msgstr "为取消上游设置操作提供了太多的分支名"
4655 #: builtin/branch.c:820
4656 msgid "could not unset upstream of HEAD when it does not point to any branch."
4657 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4659 #: builtin/branch.c:826
4661 msgid "Branch '%s' has no upstream information"
4662 msgstr "分支 '%s' 没有上游信息"
4664 #: builtin/branch.c:840
4665 msgid "it does not make sense to create 'HEAD' manually"
4666 msgstr "手工创建 'HEAD' 没有意义"
4668 #: builtin/branch.c:846
4669 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4670 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4672 #: builtin/branch.c:849
4675 "The --set-upstream flag is deprecated and will be removed. Consider using --"
4676 "track or --set-upstream-to\n"
4678 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4680 #: builtin/branch.c:866
4684 "If you wanted to make '%s' track '%s', do this:\n"
4688 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4691 #: builtin/bundle.c:51
4693 msgid "%s is okay\n"
4696 #: builtin/bundle.c:64
4697 msgid "Need a repository to create a bundle."
4698 msgstr "需要一个仓库来创建包。"
4700 #: builtin/bundle.c:68
4701 msgid "Need a repository to unbundle."
4704 #: builtin/cat-file.c:443
4706 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4707 "<type>|--textconv) <object>"
4709 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4710 ">|--textconv) <对象>"
4712 #: builtin/cat-file.c:444
4713 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4714 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4716 #: builtin/cat-file.c:481
4717 msgid "<type> can be one of: blob, tree, commit, tag"
4718 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4720 #: builtin/cat-file.c:482
4721 msgid "show object type"
4724 #: builtin/cat-file.c:483
4725 msgid "show object size"
4728 #: builtin/cat-file.c:485
4729 msgid "exit with zero when there's no error"
4730 msgstr "当没有错误时退出并返回零"
4732 #: builtin/cat-file.c:486
4733 msgid "pretty-print object's content"
4736 #: builtin/cat-file.c:488
4737 msgid "for blob objects, run textconv on object's content"
4738 msgstr "对于数据对象,对其内容执行 textconv"
4740 #: builtin/cat-file.c:490
4741 msgid "allow -s and -t to work with broken/corrupt objects"
4742 msgstr "允许 -s 和 -t 对损坏的对象生效"
4744 #: builtin/cat-file.c:491
4745 msgid "buffer --batch output"
4746 msgstr "缓冲 --batch 的输出"
4748 #: builtin/cat-file.c:493
4749 msgid "show info and content of objects fed from the standard input"
4750 msgstr "显示从标准输入提供的对象的信息和内容"
4752 #: builtin/cat-file.c:496
4753 msgid "show info about objects fed from the standard input"
4754 msgstr "显示从标准输入提供的对象的信息"
4756 #: builtin/cat-file.c:499
4757 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4758 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4760 #: builtin/cat-file.c:501
4761 msgid "show all objects with --batch or --batch-check"
4762 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4764 #: builtin/check-attr.c:11
4765 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4766 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4768 #: builtin/check-attr.c:12
4769 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4770 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4772 #: builtin/check-attr.c:19
4773 msgid "report all attributes set on file"
4774 msgstr "报告设置在文件上的所有属性"
4776 #: builtin/check-attr.c:20
4777 msgid "use .gitattributes only from the index"
4778 msgstr "只使用索引中的 .gitattributes"
4780 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4781 msgid "read file names from stdin"
4784 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
4785 msgid "terminate input and output records by a NUL character"
4786 msgstr "输入和输出的记录使用 NUL 字符终结"
4788 #: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325
4789 msgid "suppress progress reporting"
4792 #: builtin/check-ignore.c:26
4793 msgid "show non-matching input paths"
4796 #: builtin/check-ignore.c:28
4797 msgid "ignore index when checking"
4800 #: builtin/check-ignore.c:154
4801 msgid "cannot specify pathnames with --stdin"
4802 msgstr "不能同时指定路径及 --stdin 参数"
4804 #: builtin/check-ignore.c:157
4805 msgid "-z only makes sense with --stdin"
4806 msgstr "-z 需要和 --stdin 参数共用才有意义"
4808 #: builtin/check-ignore.c:159
4809 msgid "no path specified"
4812 #: builtin/check-ignore.c:163
4813 msgid "--quiet is only valid with a single pathname"
4814 msgstr "参数 --quiet 只在提供一个路径名时有效"
4816 #: builtin/check-ignore.c:165
4817 msgid "cannot have both --quiet and --verbose"
4818 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4820 #: builtin/check-ignore.c:168
4821 msgid "--non-matching is only valid with --verbose"
4822 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4824 #: builtin/check-mailmap.c:8
4825 msgid "git check-mailmap [<options>] <contact>..."
4826 msgstr "git check-mailmap [<选项>] <联系地址>..."
4828 #: builtin/check-mailmap.c:13
4829 msgid "also read contacts from stdin"
4830 msgstr "还从标准输入读取联系地址"
4832 #: builtin/check-mailmap.c:24
4834 msgid "unable to parse contact: %s"
4835 msgstr "不能解析联系地址:%s"
4837 #: builtin/check-mailmap.c:47
4838 msgid "no contacts specified"
4841 #: builtin/checkout-index.c:127
4842 msgid "git checkout-index [<options>] [--] [<file>...]"
4843 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4845 #: builtin/checkout-index.c:144
4846 msgid "stage should be between 1 and 3 or all"
4847 msgstr "索引值应该取值 1 到 3 或者 all"
4849 #: builtin/checkout-index.c:160
4850 msgid "check out all files in the index"
4853 #: builtin/checkout-index.c:161
4854 msgid "force overwrite of existing files"
4857 #: builtin/checkout-index.c:163
4858 msgid "no warning for existing files and files not in index"
4859 msgstr "存在或不在索引中的文件都没有警告"
4861 #: builtin/checkout-index.c:165
4862 msgid "don't checkout new files"
4865 #: builtin/checkout-index.c:167
4866 msgid "update stat information in the index file"
4867 msgstr "更新索引中文件的状态信息"
4869 #: builtin/checkout-index.c:171
4870 msgid "read list of paths from the standard input"
4871 msgstr "从标准输入读取路径列表"
4873 #: builtin/checkout-index.c:173
4874 msgid "write the content to temporary files"
4877 #: builtin/checkout-index.c:174 builtin/column.c:30
4878 #: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491
4879 #: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497
4880 #: builtin/submodule--helper.c:830 builtin/worktree.c:469
4884 #: builtin/checkout-index.c:175
4885 msgid "when creating files, prepend <string>"
4886 msgstr "在创建文件时,在前面加上 <字符串>"
4888 #: builtin/checkout-index.c:177
4889 msgid "copy out the files from named stage"
4890 msgstr "从指定暂存区中拷出文件"
4892 #: builtin/checkout.c:25
4893 msgid "git checkout [<options>] <branch>"
4894 msgstr "git checkout [<选项>] <分支>"
4896 #: builtin/checkout.c:26
4897 msgid "git checkout [<options>] [<branch>] -- <file>..."
4898 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4900 #: builtin/checkout.c:134 builtin/checkout.c:167
4902 msgid "path '%s' does not have our version"
4903 msgstr "路径 '%s' 没有我们的版本"
4905 #: builtin/checkout.c:136 builtin/checkout.c:169
4907 msgid "path '%s' does not have their version"
4908 msgstr "路径 '%s' 没有他们的版本"
4910 #: builtin/checkout.c:152
4912 msgid "path '%s' does not have all necessary versions"
4913 msgstr "路径 '%s' 没有全部必须的版本"
4915 #: builtin/checkout.c:196
4917 msgid "path '%s' does not have necessary versions"
4918 msgstr "路径 '%s' 没有必须的版本"
4920 #: builtin/checkout.c:213
4922 msgid "path '%s': cannot merge"
4923 msgstr "path '%s':无法合并"
4925 #: builtin/checkout.c:230
4927 msgid "Unable to add merge result for '%s'"
4928 msgstr "无法为 '%s' 添加合并结果"
4930 #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
4931 #: builtin/checkout.c:259
4933 msgid "'%s' cannot be used with updating paths"
4934 msgstr "'%s' 不能在更新路径时使用"
4936 #: builtin/checkout.c:262 builtin/checkout.c:265
4938 msgid "'%s' cannot be used with %s"
4939 msgstr "'%s' 不能和 %s 同时使用"
4941 #: builtin/checkout.c:268
4943 msgid "Cannot update paths and switch to branch '%s' at the same time."
4944 msgstr "不能同时更新路径并切换到分支'%s'。"
4946 #: builtin/checkout.c:339 builtin/checkout.c:346
4948 msgid "path '%s' is unmerged"
4949 msgstr "路径 '%s' 未合并"
4951 #: builtin/checkout.c:495
4952 msgid "you need to resolve your current index first"
4953 msgstr "您需要先解决当前索引的冲突"
4955 #: builtin/checkout.c:625
4957 msgid "Can not do reflog for '%s': %s\n"
4958 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4960 #: builtin/checkout.c:664
4961 msgid "HEAD is now at"
4964 #: builtin/checkout.c:668 builtin/clone.c:661
4965 msgid "unable to update HEAD"
4968 #: builtin/checkout.c:672
4970 msgid "Reset branch '%s'\n"
4971 msgstr "重置分支 '%s'\n"
4973 #: builtin/checkout.c:675
4975 msgid "Already on '%s'\n"
4976 msgstr "已经位于 '%s'\n"
4978 #: builtin/checkout.c:679
4980 msgid "Switched to and reset branch '%s'\n"
4981 msgstr "切换并重置分支 '%s'\n"
4983 #: builtin/checkout.c:681 builtin/checkout.c:1070
4985 msgid "Switched to a new branch '%s'\n"
4986 msgstr "切换到一个新分支 '%s'\n"
4988 #: builtin/checkout.c:683
4990 msgid "Switched to branch '%s'\n"
4991 msgstr "切换到分支 '%s'\n"
4994 #: builtin/checkout.c:734
4996 msgid " ... and %d more.\n"
4997 msgstr " ... 及其它 %d 个。\n"
4999 #: builtin/checkout.c:740
5002 "Warning: you are leaving %d commit behind, not connected to\n"
5003 "any of your branches:\n"
5007 "Warning: you are leaving %d commits behind, not connected to\n"
5008 "any of your branches:\n"
5012 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5016 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5020 #: builtin/checkout.c:759
5023 "If you want to keep it by creating a new branch, this may be a good time\n"
5026 " git branch <new-branch-name> %s\n"
5029 "If you want to keep them by creating a new branch, this may be a good time\n"
5032 " git branch <new-branch-name> %s\n"
5035 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
5038 " git branch <新分支名> %s\n"
5041 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
5044 " git branch <新分支名> %s\n"
5047 #: builtin/checkout.c:795
5048 msgid "internal error in revision walk"
5049 msgstr "在版本遍历时遇到内部错误"
5051 #: builtin/checkout.c:799
5052 msgid "Previous HEAD position was"
5053 msgstr "之前的 HEAD 位置是"
5055 #: builtin/checkout.c:826 builtin/checkout.c:1065
5056 msgid "You are on a branch yet to be born"
5057 msgstr "您位于一个尚未初始化的分支"
5059 #: builtin/checkout.c:971
5061 msgid "only one reference expected, %d given."
5062 msgstr "只要一个引用,却给出了 %d 个"
5064 #: builtin/checkout.c:1011 builtin/worktree.c:214
5066 msgid "invalid reference: %s"
5069 #: builtin/checkout.c:1040
5071 msgid "reference is not a tree: %s"
5074 #: builtin/checkout.c:1079
5075 msgid "paths cannot be used with switching branches"
5076 msgstr "路径不能和切换分支同时使用"
5078 #: builtin/checkout.c:1082 builtin/checkout.c:1086
5080 msgid "'%s' cannot be used with switching branches"
5081 msgstr "'%s' 不能和切换分支同时使用"
5083 #: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098
5084 #: builtin/checkout.c:1101
5086 msgid "'%s' cannot be used with '%s'"
5087 msgstr "'%s' 不能和 '%s' 同时使用"
5089 #: builtin/checkout.c:1106
5091 msgid "Cannot switch branch to a non-commit '%s'"
5092 msgstr "不能切换分支到一个非提交 '%s'"
5094 #: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88
5095 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
5096 #: builtin/worktree.c:326
5100 #: builtin/checkout.c:1140
5101 msgid "create and checkout a new branch"
5102 msgstr "创建并检出一个新的分支"
5104 #: builtin/checkout.c:1142
5105 msgid "create/reset and checkout a branch"
5106 msgstr "创建/重置并检出一个分支"
5108 #: builtin/checkout.c:1143
5109 msgid "create reflog for new branch"
5110 msgstr "为新的分支创建引用日志"
5112 #: builtin/checkout.c:1144 builtin/worktree.c:328
5113 msgid "detach HEAD at named commit"
5114 msgstr "HEAD 从指定的提交分离"
5116 #: builtin/checkout.c:1145
5117 msgid "set upstream info for new branch"
5118 msgstr "为新的分支设置上游信息"
5120 #: builtin/checkout.c:1147
5124 #: builtin/checkout.c:1147
5125 msgid "new unparented branch"
5128 #: builtin/checkout.c:1148
5129 msgid "checkout our version for unmerged files"
5130 msgstr "对尚未合并的文件检出我们的版本"
5132 #: builtin/checkout.c:1150
5133 msgid "checkout their version for unmerged files"
5134 msgstr "对尚未合并的文件检出他们的版本"
5136 #: builtin/checkout.c:1152
5137 msgid "force checkout (throw away local modifications)"
5138 msgstr "强制检出(丢弃本地修改)"
5140 #: builtin/checkout.c:1153
5141 msgid "perform a 3-way merge with the new branch"
5142 msgstr "和新的分支执行三方合并"
5144 #: builtin/checkout.c:1154 builtin/merge.c:231
5145 msgid "update ignored files (default)"
5146 msgstr "更新忽略的文件(默认)"
5148 #: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250
5152 #: builtin/checkout.c:1156
5153 msgid "conflict style (merge or diff3)"
5154 msgstr "冲突输出风格(merge 或 diff3)"
5156 #: builtin/checkout.c:1159
5157 msgid "do not limit pathspecs to sparse entries only"
5158 msgstr "对路径不做稀疏检出的限制"
5160 #: builtin/checkout.c:1161
5161 msgid "second guess 'git checkout <no-such-branch>'"
5162 msgstr "二次猜测'git checkout <无此分支>'"
5164 #: builtin/checkout.c:1163
5165 msgid "do not check if another worktree is holding the given ref"
5166 msgstr "不检查指定的引用是否被其他工作区所占用"
5168 #: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117
5169 #: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536
5170 #: builtin/send-pack.c:168
5171 msgid "force progress reporting"
5174 #: builtin/checkout.c:1195
5175 msgid "-b, -B and --orphan are mutually exclusive"
5176 msgstr "-b、-B 和 --orphan 是互斥的"
5178 #: builtin/checkout.c:1212
5179 msgid "--track needs a branch name"
5180 msgstr "--track 需要一个分支名"
5182 #: builtin/checkout.c:1217
5183 msgid "Missing branch name; try -b"
5184 msgstr "缺少分支名;尝试 -b"
5186 #: builtin/checkout.c:1253
5187 msgid "invalid path specification"
5190 #: builtin/checkout.c:1260
5193 "Cannot update paths and switch to branch '%s' at the same time.\n"
5194 "Did you intend to checkout '%s' which can not be resolved as commit?"
5196 "不能同时更新路径并切换到分支'%s'。\n"
5197 "您是想要检出 '%s' 但其未能解析为提交么?"
5199 #: builtin/checkout.c:1265
5201 msgid "git checkout: --detach does not take a path argument '%s'"
5202 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
5204 #: builtin/checkout.c:1269
5206 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
5207 "checking out of the index."
5209 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
5211 #: builtin/clean.c:25
5213 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
5215 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
5217 #: builtin/clean.c:29
5219 msgid "Removing %s\n"
5222 #: builtin/clean.c:30
5224 msgid "Would remove %s\n"
5227 #: builtin/clean.c:31
5229 msgid "Skipping repository %s\n"
5232 #: builtin/clean.c:32
5234 msgid "Would skip repository %s\n"
5237 #: builtin/clean.c:33
5239 msgid "failed to remove %s"
5242 #: builtin/clean.c:291
5245 "1 - select a numbered item\n"
5246 "foo - select item based on unique prefix\n"
5247 " - (empty) select nothing"
5251 "foo - 通过标题选择一个选项\n"
5254 #: builtin/clean.c:295
5257 "1 - select a single item\n"
5258 "3-5 - select a range of items\n"
5259 "2-3,6-9 - select multiple ranges\n"
5260 "foo - select item based on unique prefix\n"
5261 "-... - unselect specified items\n"
5262 "* - choose all items\n"
5263 " - (empty) finish selecting"
5267 "3-5 - 选择一个范围内的所有选项\n"
5268 "2-3,6-9 - 选择多个范围内的所有选项\n"
5269 "foo - 通过标题选择一个选项\n"
5274 #: builtin/clean.c:511
5279 #: builtin/clean.c:653
5281 msgid "Input ignore patterns>> "
5282 msgstr "输入模版以排除条目>> "
5284 #: builtin/clean.c:690
5286 msgid "WARNING: Cannot find items matched by: %s"
5287 msgstr "警告:无法找到和 %s 匹配的条目"
5289 #: builtin/clean.c:711
5290 msgid "Select items to delete"
5293 #. TRANSLATORS: Make sure to keep [y/N] as is
5294 #: builtin/clean.c:752
5296 msgid "Remove %s [y/N]? "
5297 msgstr "删除 %s [y/N]?"
5299 #: builtin/clean.c:777
5303 #: builtin/clean.c:785
5305 "clean - start cleaning\n"
5306 "filter by pattern - exclude items from deletion\n"
5307 "select by numbers - select items to be deleted by numbers\n"
5308 "ask each - confirm each deletion (like \"rm -i\")\n"
5309 "quit - stop cleaning\n"
5310 "help - this screen\n"
5311 "? - help for prompt selection"
5314 "filter by pattern - 通过模版排除要删除的条目\n"
5315 "select by numbers - 通过数字选择要删除的条目\n"
5316 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
5319 "? - 显示如何在提示符下选择的帮助"
5321 #: builtin/clean.c:812
5322 msgid "*** Commands ***"
5325 #: builtin/clean.c:813
5329 #: builtin/clean.c:821
5330 msgid "Would remove the following item:"
5331 msgid_plural "Would remove the following items:"
5332 msgstr[0] "将删除如下条目:"
5333 msgstr[1] "将删除如下条目:"
5335 #: builtin/clean.c:838
5336 msgid "No more files to clean, exiting."
5337 msgstr "没有要清理的文件,退出。"
5339 #: builtin/clean.c:869
5340 msgid "do not print names of files removed"
5343 #: builtin/clean.c:871
5347 #: builtin/clean.c:872
5348 msgid "interactive cleaning"
5351 #: builtin/clean.c:874
5352 msgid "remove whole directories"
5355 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724
5356 #: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182
5360 #: builtin/clean.c:876
5361 msgid "add <pattern> to ignore rules"
5362 msgstr "添加 <模式> 到忽略规则"
5364 #: builtin/clean.c:877
5365 msgid "remove ignored files, too"
5368 #: builtin/clean.c:879
5369 msgid "remove only ignored files"
5372 #: builtin/clean.c:897
5373 msgid "-x and -X cannot be used together"
5374 msgstr "-x 和 -X 不能同时使用"
5376 #: builtin/clean.c:901
5378 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
5381 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5383 #: builtin/clean.c:904
5385 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
5388 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
5390 #: builtin/clone.c:37
5391 msgid "git clone [<options>] [--] <repo> [<dir>]"
5392 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
5394 #: builtin/clone.c:62
5395 msgid "don't create a checkout"
5398 #: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476
5399 msgid "create a bare repository"
5402 #: builtin/clone.c:67
5403 msgid "create a mirror repository (implies bare)"
5404 msgstr "创建一个镜像仓库(也是纯仓库)"
5406 #: builtin/clone.c:69
5407 msgid "to clone from a local repository"
5410 #: builtin/clone.c:71
5411 msgid "don't use local hardlinks, always copy"
5412 msgstr "不使用本地硬链接,始终复制"
5414 #: builtin/clone.c:73
5415 msgid "setup as shared repository"
5418 #: builtin/clone.c:75 builtin/clone.c:77
5419 msgid "initialize submodules in the clone"
5422 #: builtin/clone.c:79
5423 msgid "number of submodules cloned in parallel"
5424 msgstr "并发克隆的子模组的数量"
5426 #: builtin/clone.c:80 builtin/init-db.c:473
5427 msgid "template-directory"
5430 #: builtin/clone.c:81 builtin/init-db.c:474
5431 msgid "directory from which templates will be used"
5434 #: builtin/clone.c:83 builtin/submodule--helper.c:495
5435 #: builtin/submodule--helper.c:833
5436 msgid "reference repository"
5439 #: builtin/clone.c:85
5440 msgid "use --reference only while cloning"
5441 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
5443 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44
5447 #: builtin/clone.c:87
5448 msgid "use <name> instead of 'origin' to track upstream"
5449 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
5451 #: builtin/clone.c:89
5452 msgid "checkout <branch> instead of the remote's HEAD"
5453 msgstr "检出 <分支> 而不是远程 HEAD"
5455 #: builtin/clone.c:91
5456 msgid "path to git-upload-pack on the remote"
5457 msgstr "远程 git-upload-pack 路径"
5459 #: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667
5460 #: builtin/pull.c:201
5464 #: builtin/clone.c:93
5465 msgid "create a shallow clone of that depth"
5466 msgstr "创建一个指定深度的浅克隆"
5468 #: builtin/clone.c:95
5469 msgid "clone only one branch, HEAD or --branch"
5470 msgstr "只克隆一个分支、HEAD 或 --branch"
5472 #: builtin/clone.c:97
5473 msgid "any cloned submodules will be shallow"
5474 msgstr "子模组将以浅下载模式克隆"
5476 #: builtin/clone.c:98 builtin/init-db.c:482
5480 #: builtin/clone.c:99 builtin/init-db.c:483
5481 msgid "separate git dir from working tree"
5482 msgstr "git目录和工作区分离"
5484 #: builtin/clone.c:100
5488 #: builtin/clone.c:101
5489 msgid "set config inside the new repository"
5490 msgstr "在新仓库中设置配置信息"
5492 #: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547
5493 msgid "use IPv4 addresses only"
5494 msgstr "只使用 IPv4 地址"
5496 #: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549
5497 msgid "use IPv6 addresses only"
5498 msgstr "只使用 IPv6 地址"
5500 #: builtin/clone.c:241
5502 "No directory name could be guessed.\n"
5503 "Please specify a directory on the command line"
5508 #: builtin/clone.c:307
5510 msgid "reference repository '%s' as a linked checkout is not supported yet."
5511 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
5513 #: builtin/clone.c:309
5515 msgid "reference repository '%s' is not a local repository."
5516 msgstr "参考仓库 '%s' 不是一个本地仓库。"
5518 #: builtin/clone.c:314
5520 msgid "reference repository '%s' is shallow"
5521 msgstr "参考仓库 '%s' 是一个浅克隆"
5523 #: builtin/clone.c:317
5525 msgid "reference repository '%s' is grafted"
5526 msgstr "参考仓库 '%s' 已被嫁接"
5528 #: builtin/clone.c:376
5530 msgid "failed to open '%s'"
5533 #: builtin/clone.c:384
5535 msgid "%s exists and is not a directory"
5536 msgstr "%s 存在且不是一个目录"
5538 #: builtin/clone.c:398
5540 msgid "failed to stat %s\n"
5541 msgstr "无法枚举 %s 状态\n"
5543 #: builtin/clone.c:420
5545 msgid "failed to create link '%s'"
5546 msgstr "无法创建链接 '%s'"
5548 #: builtin/clone.c:424
5550 msgid "failed to copy file to '%s'"
5551 msgstr "无法拷贝文件至 '%s'"
5553 #: builtin/clone.c:449
5558 #: builtin/clone.c:461
5560 "Clone succeeded, but checkout failed.\n"
5561 "You can inspect what was checked out with 'git status'\n"
5562 "and retry the checkout with 'git checkout -f HEAD'\n"
5565 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
5566 "'git checkout -f HEAD' 重试\n"
5568 #: builtin/clone.c:538
5570 msgid "Could not find remote branch %s to clone."
5571 msgstr "不能发现要克隆的远程分支 %s。"
5573 #: builtin/clone.c:633
5574 msgid "remote did not send all necessary objects"
5575 msgstr "远程没有发送所有必须的对象"
5577 #: builtin/clone.c:649
5579 msgid "unable to update %s"
5582 #: builtin/clone.c:698
5583 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5584 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
5586 #: builtin/clone.c:729
5587 msgid "unable to checkout working tree"
5590 #: builtin/clone.c:766
5591 msgid "unable to write parameters to config file"
5592 msgstr "无法将参数写入配置文件"
5594 #: builtin/clone.c:829
5595 msgid "cannot repack to clean up"
5596 msgstr "无法执行 repack 来清理"
5598 #: builtin/clone.c:831
5599 msgid "cannot unlink temporary alternates file"
5600 msgstr "无法删除临时的 alternates 文件"
5602 #: builtin/clone.c:863 builtin/receive-pack.c:1855
5603 msgid "Too many arguments."
5606 #: builtin/clone.c:867
5607 msgid "You must specify a repository to clone."
5608 msgstr "您必须指定一个仓库来克隆。"
5610 #: builtin/clone.c:878
5612 msgid "--bare and --origin %s options are incompatible."
5613 msgstr "--bare 和 --origin %s 选项不兼容。"
5615 #: builtin/clone.c:881
5616 msgid "--bare and --separate-git-dir are incompatible."
5617 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
5619 #: builtin/clone.c:894
5621 msgid "repository '%s' does not exist"
5622 msgstr "仓库 '%s' 不存在"
5624 #: builtin/clone.c:900 builtin/fetch.c:1293
5626 msgid "depth %s is not a positive number"
5627 msgstr "深度 %s 不是一个正数"
5629 #: builtin/clone.c:910
5631 msgid "destination path '%s' already exists and is not an empty directory."
5632 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
5634 #: builtin/clone.c:920
5636 msgid "working tree '%s' already exists."
5637 msgstr "工作区 '%s' 已经存在。"
5639 #: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544
5640 #: builtin/worktree.c:222 builtin/worktree.c:249
5642 msgid "could not create leading directories of '%s'"
5643 msgstr "不能为 '%s' 创建先导目录"
5645 #: builtin/clone.c:938
5647 msgid "could not create work tree dir '%s'"
5648 msgstr "不能创建工作区目录 '%s'"
5650 #: builtin/clone.c:956
5652 msgid "Cloning into bare repository '%s'...\n"
5653 msgstr "克隆到纯仓库 '%s'...\n"
5655 #: builtin/clone.c:958
5657 msgid "Cloning into '%s'...\n"
5658 msgstr "正克隆到 '%s'...\n"
5660 #: builtin/clone.c:997
5661 msgid "--depth is ignored in local clones; use file:// instead."
5662 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5664 #: builtin/clone.c:1000
5665 msgid "source repository is shallow, ignoring --local"
5666 msgstr "源仓库是浅克隆,忽略 --local"
5668 #: builtin/clone.c:1005
5669 msgid "--local is ignored"
5670 msgstr "--local 被忽略"
5672 #: builtin/clone.c:1009
5674 msgid "Don't know how to clone %s"
5677 #: builtin/clone.c:1058 builtin/clone.c:1066
5679 msgid "Remote branch %s not found in upstream %s"
5680 msgstr "远程分支 %s 在上游 %s 未发现"
5682 #: builtin/clone.c:1069
5683 msgid "You appear to have cloned an empty repository."
5684 msgstr "您似乎克隆了一个空仓库。"
5686 #: builtin/column.c:9
5687 msgid "git column [<options>]"
5688 msgstr "git column [<选项>]"
5690 #: builtin/column.c:26
5691 msgid "lookup config vars"
5694 #: builtin/column.c:27 builtin/column.c:28
5695 msgid "layout to use"
5698 #: builtin/column.c:29
5699 msgid "Maximum width"
5702 #: builtin/column.c:30
5703 msgid "Padding space on left border"
5706 #: builtin/column.c:31
5707 msgid "Padding space on right border"
5710 #: builtin/column.c:32
5711 msgid "Padding space between columns"
5714 #: builtin/column.c:51
5715 msgid "--command must be the first argument"
5716 msgstr "--command 必须是第一个参数"
5718 #: builtin/commit.c:38
5719 msgid "git commit [<options>] [--] <pathspec>..."
5720 msgstr "git commit [<选项>] [--] <路径规格>..."
5722 #: builtin/commit.c:43
5723 msgid "git status [<options>] [--] <pathspec>..."
5724 msgstr "git status [<选项>] [--] <路径规格>..."
5726 #: builtin/commit.c:48
5728 "Your name and email address were configured automatically based\n"
5729 "on your username and hostname. Please check that they are accurate.\n"
5730 "You can suppress this message by setting them explicitly. Run the\n"
5731 "following command and follow the instructions in your editor to edit\n"
5732 "your configuration file:\n"
5734 " git config --global --edit\n"
5736 "After doing this, you may fix the identity used for this commit with:\n"
5738 " git commit --amend --reset-author\n"
5740 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5741 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5744 " git config --global --edit\n"
5746 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5748 " git commit --amend --reset-author\n"
5750 #: builtin/commit.c:61
5752 "Your name and email address were configured automatically based\n"
5753 "on your username and hostname. Please check that they are accurate.\n"
5754 "You can suppress this message by setting them explicitly:\n"
5756 " git config --global user.name \"Your Name\"\n"
5757 " git config --global user.email you@example.com\n"
5759 "After doing this, you may fix the identity used for this commit with:\n"
5761 " git commit --amend --reset-author\n"
5763 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5764 "与否。您可以对其进行设置以免再出现本提示信息:\n"
5766 " git config --global user.name \"Your Name\"\n"
5767 " git config --global user.email you@example.com\n"
5769 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5771 " git commit --amend --reset-author\n"
5773 #: builtin/commit.c:73
5775 "You asked to amend the most recent commit, but doing so would make\n"
5776 "it empty. You can repeat your command with --allow-empty, or you can\n"
5777 "remove the commit entirely with \"git reset HEAD^\".\n"
5779 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5780 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5782 #: builtin/commit.c:78
5784 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5785 "If you wish to commit it anyway, use:\n"
5787 " git commit --allow-empty\n"
5790 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5793 " git commit --allow-empty\n"
5796 #: builtin/commit.c:85
5797 msgid "Otherwise, please use 'git reset'\n"
5798 msgstr "否则,请使用命令 'git reset'\n"
5800 #: builtin/commit.c:88
5802 "If you wish to skip this commit, use:\n"
5806 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5807 "the remaining commits.\n"
5809 "如果您想跳过这个提交,使用命令:\n"
5813 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5816 #: builtin/commit.c:308
5817 msgid "failed to unpack HEAD tree object"
5818 msgstr "无法解包 HEAD 树对象"
5820 #: builtin/commit.c:349
5821 msgid "unable to create temporary index"
5824 #: builtin/commit.c:355
5825 msgid "interactive add failed"
5828 #: builtin/commit.c:368
5829 msgid "unable to update temporary index"
5832 #: builtin/commit.c:370
5833 msgid "Failed to update main cache tree"
5836 #: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466
5837 msgid "unable to write new_index file"
5838 msgstr "无法写 new_index 文件"
5840 #: builtin/commit.c:448
5841 msgid "cannot do a partial commit during a merge."
5842 msgstr "在合并过程中不能做部分提交。"
5844 #: builtin/commit.c:450
5845 msgid "cannot do a partial commit during a cherry-pick."
5846 msgstr "在拣选过程中不能做部分提交。"
5848 #: builtin/commit.c:459
5849 msgid "cannot read the index"
5852 #: builtin/commit.c:478
5853 msgid "unable to write temporary index file"
5856 #: builtin/commit.c:583
5858 msgid "commit '%s' lacks author header"
5859 msgstr "提交 '%s' 缺少作者信息"
5861 #: builtin/commit.c:585
5863 msgid "commit '%s' has malformed author line"
5864 msgstr "提交 '%s' 有非法的作者信息"
5866 #: builtin/commit.c:604
5867 msgid "malformed --author parameter"
5868 msgstr "非法的 --author 参数"
5870 #: builtin/commit.c:612
5872 msgid "invalid date format: %s"
5875 #: builtin/commit.c:656
5877 "unable to select a comment character that is not used\n"
5878 "in the current commit message"
5879 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5881 #: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092
5883 msgid "could not lookup commit %s"
5886 #: builtin/commit.c:705 builtin/shortlog.c:286
5888 msgid "(reading log message from standard input)\n"
5889 msgstr "(正从标准输入中读取日志信息)\n"
5891 #: builtin/commit.c:707
5892 msgid "could not read log from standard input"
5893 msgstr "不能从标准输入中读取日志信息"
5895 #: builtin/commit.c:711
5897 msgid "could not read log file '%s'"
5898 msgstr "不能读取日志文件 '%s'"
5900 #: builtin/commit.c:738 builtin/commit.c:746
5901 msgid "could not read SQUASH_MSG"
5902 msgstr "不能读取 SQUASH_MSG"
5904 #: builtin/commit.c:743
5905 msgid "could not read MERGE_MSG"
5906 msgstr "不能读取 MERGE_MSG"
5908 #: builtin/commit.c:797
5909 msgid "could not write commit template"
5912 #: builtin/commit.c:815
5916 "It looks like you may be committing a merge.\n"
5917 "If this is not correct, please remove the file\n"
5922 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5926 #: builtin/commit.c:820
5930 "It looks like you may be committing a cherry-pick.\n"
5931 "If this is not correct, please remove the file\n"
5936 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5940 #: builtin/commit.c:833
5943 "Please enter the commit message for your changes. Lines starting\n"
5944 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5946 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5949 #: builtin/commit.c:840
5952 "Please enter the commit message for your changes. Lines starting\n"
5953 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5954 "An empty message aborts the commit.\n"
5956 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5957 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5959 # 译者:为保证在输出中对齐,注意调整句中空格!
5960 #: builtin/commit.c:860
5962 msgid "%sAuthor: %.*s <%.*s>"
5963 msgstr "%s作者: %.*s <%.*s>"
5965 # 译者:为保证在输出中对齐,注意调整句中空格!
5966 #: builtin/commit.c:868
5971 # 译者:为保证在输出中对齐,注意调整句中空格!
5972 #: builtin/commit.c:875
5974 msgid "%sCommitter: %.*s <%.*s>"
5975 msgstr "%s提交者:%.*s <%.*s>"
5977 #: builtin/commit.c:893
5978 msgid "Cannot read index"
5981 #: builtin/commit.c:950
5982 msgid "Error building trees"
5985 #: builtin/commit.c:965 builtin/tag.c:266
5987 msgid "Please supply the message using either -m or -F option.\n"
5988 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5990 #: builtin/commit.c:1067
5992 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5993 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5995 #: builtin/commit.c:1082 builtin/commit.c:1322
5997 msgid "Invalid untracked files mode '%s'"
5998 msgstr "无效的未追踪文件参数 '%s'"
6000 #: builtin/commit.c:1119
6001 msgid "--long and -z are incompatible"
6002 msgstr "--long 和 -z 选项不兼容"
6004 #: builtin/commit.c:1149
6005 msgid "Using both --reset-author and --author does not make sense"
6006 msgstr "同时使用 --reset-author 和 --author 没有意义"
6008 #: builtin/commit.c:1158
6009 msgid "You have nothing to amend."
6012 #: builtin/commit.c:1161
6013 msgid "You are in the middle of a merge -- cannot amend."
6014 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
6016 #: builtin/commit.c:1163
6017 msgid "You are in the middle of a cherry-pick -- cannot amend."
6018 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
6020 #: builtin/commit.c:1166
6021 msgid "Options --squash and --fixup cannot be used together"
6022 msgstr "选项 --squash 和 --fixup 不能同时使用"
6024 #: builtin/commit.c:1176
6025 msgid "Only one of -c/-C/-F/--fixup can be used."
6026 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
6028 #: builtin/commit.c:1178
6029 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
6030 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
6032 #: builtin/commit.c:1186
6033 msgid "--reset-author can be used only with -C, -c or --amend."
6034 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
6036 #: builtin/commit.c:1203
6037 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
6038 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
6040 #: builtin/commit.c:1205
6041 msgid "No paths with --include/--only does not make sense."
6042 msgstr "参数 --include/--only 不跟路径没有意义。"
6044 #: builtin/commit.c:1207
6045 msgid "Clever... amending the last one with dirty index."
6046 msgstr "聪明... 用脏索引修补最后一个提交。"
6048 #: builtin/commit.c:1209
6049 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
6050 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
6052 #: builtin/commit.c:1221 builtin/tag.c:474
6054 msgid "Invalid cleanup mode %s"
6057 #: builtin/commit.c:1226
6058 msgid "Paths with -a does not make sense."
6059 msgstr "路径和 -a 选项同时使用没有意义。"
6061 #: builtin/commit.c:1336 builtin/commit.c:1622
6062 msgid "show status concisely"
6065 #: builtin/commit.c:1338 builtin/commit.c:1624
6066 msgid "show branch information"
6069 #: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522
6070 #: builtin/worktree.c:440
6071 msgid "machine-readable output"
6074 #: builtin/commit.c:1343 builtin/commit.c:1628
6075 msgid "show status in long format (default)"
6076 msgstr "以长格式显示状态(默认)"
6078 #: builtin/commit.c:1346 builtin/commit.c:1631
6079 msgid "terminate entries with NUL"
6080 msgstr "条目以 NUL 字符结尾"
6082 #: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981
6083 #: builtin/fast-export.c:984 builtin/tag.c:353
6087 #: builtin/commit.c:1349 builtin/commit.c:1634
6088 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
6089 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
6091 #: builtin/commit.c:1352
6092 msgid "show ignored files"
6095 #: builtin/commit.c:1353 parse-options.h:155
6099 #: builtin/commit.c:1354
6101 "ignore changes to submodules, optional when: all, dirty, untracked. "
6104 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
6106 #: builtin/commit.c:1356
6107 msgid "list untracked files in columns"
6108 msgstr "以列的方式显示未跟踪的文件"
6110 #: builtin/commit.c:1442
6111 msgid "couldn't look up newly created commit"
6114 #: builtin/commit.c:1444
6115 msgid "could not parse newly created commit"
6118 #: builtin/commit.c:1489
6119 msgid "detached HEAD"
6122 # 译者:中文字符串拼接,可删除前导空格
6123 #: builtin/commit.c:1492
6124 msgid " (root-commit)"
6127 #: builtin/commit.c:1592
6128 msgid "suppress summary after successful commit"
6129 msgstr "提交成功后不显示概述信息"
6131 #: builtin/commit.c:1593
6132 msgid "show diff in commit message template"
6133 msgstr "在提交说明模板里显示差异"
6135 #: builtin/commit.c:1595
6136 msgid "Commit message options"
6139 #: builtin/commit.c:1596 builtin/tag.c:351
6140 msgid "read message from file"
6143 #: builtin/commit.c:1597
6147 #: builtin/commit.c:1597
6148 msgid "override author for commit"
6151 #: builtin/commit.c:1598 builtin/gc.c:326
6155 #: builtin/commit.c:1598
6156 msgid "override date for commit"
6159 #: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396
6160 #: builtin/notes.c:559 builtin/tag.c:349
6164 #: builtin/commit.c:1599
6165 msgid "commit message"
6168 #: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602
6169 #: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79
6173 #: builtin/commit.c:1600
6174 msgid "reuse and edit message from specified commit"
6175 msgstr "重用并编辑指定提交的提交说明"
6177 #: builtin/commit.c:1601
6178 msgid "reuse message from specified commit"
6179 msgstr "重用指定提交的提交说明"
6181 #: builtin/commit.c:1602
6182 msgid "use autosquash formatted message to fixup specified commit"
6183 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
6185 #: builtin/commit.c:1603
6186 msgid "use autosquash formatted message to squash specified commit"
6187 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
6189 #: builtin/commit.c:1604
6190 msgid "the commit is authored by me now (used with -C/-c/--amend)"
6191 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
6193 #: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86
6194 msgid "add Signed-off-by:"
6195 msgstr "添加 Signed-off-by: 签名"
6197 #: builtin/commit.c:1606
6198 msgid "use specified template file"
6201 #: builtin/commit.c:1607
6202 msgid "force edit of commit"
6205 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6206 #: builtin/commit.c:1608
6210 #: builtin/commit.c:1608 builtin/tag.c:354
6211 msgid "how to strip spaces and #comments from message"
6212 msgstr "设置如何删除提交说明里的空格和#注释"
6214 #: builtin/commit.c:1609
6215 msgid "include status in commit message template"
6216 msgstr "在提交说明模板里包含状态信息"
6218 #: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165
6219 #: builtin/revert.c:93
6220 msgid "GPG sign commit"
6223 #: builtin/commit.c:1614
6224 msgid "Commit contents options"
6227 #: builtin/commit.c:1615
6228 msgid "commit all changed files"
6231 #: builtin/commit.c:1616
6232 msgid "add specified files to index for commit"
6233 msgstr "添加指定的文件到索引区等待提交"
6235 #: builtin/commit.c:1617
6236 msgid "interactively add files"
6239 #: builtin/commit.c:1618
6240 msgid "interactively add changes"
6243 #: builtin/commit.c:1619
6244 msgid "commit only specified files"
6247 #: builtin/commit.c:1620
6248 msgid "bypass pre-commit and commit-msg hooks"
6249 msgstr "绕过 pre-commit 和 commit-msg 钩子"
6251 #: builtin/commit.c:1621
6252 msgid "show what would be committed"
6255 #: builtin/commit.c:1632
6256 msgid "amend previous commit"
6259 #: builtin/commit.c:1633
6260 msgid "bypass post-rewrite hook"
6261 msgstr "绕过 post-rewrite 钩子"
6263 #: builtin/commit.c:1638
6264 msgid "ok to record an empty change"
6267 #: builtin/commit.c:1640
6268 msgid "ok to record a change with an empty message"
6271 #: builtin/commit.c:1669
6272 msgid "could not parse HEAD commit"
6273 msgstr "不能解析 HEAD 提交"
6275 #: builtin/commit.c:1719
6277 msgid "Corrupt MERGE_HEAD file (%s)"
6278 msgstr "损坏的 MERGE_HEAD 文件(%s)"
6280 #: builtin/commit.c:1726
6281 msgid "could not read MERGE_MODE"
6282 msgstr "不能读取 MERGE_MODE"
6284 #: builtin/commit.c:1745
6286 msgid "could not read commit message: %s"
6287 msgstr "不能读取提交说明:%s"
6289 #: builtin/commit.c:1756
6291 msgid "Aborting commit; you did not edit the message.\n"
6292 msgstr "终止提交;您未更改来自模版的提交说明。\n"
6294 #: builtin/commit.c:1761
6296 msgid "Aborting commit due to empty commit message.\n"
6297 msgstr "终止提交因为提交说明为空。\n"
6299 #: builtin/commit.c:1809
6301 "Repository has been updated, but unable to write\n"
6302 "new_index file. Check that disk is not full and quota is\n"
6303 "not exceeded, and then \"git reset HEAD\" to recover."
6305 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
6306 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
6308 #: builtin/config.c:9
6309 msgid "git config [<options>]"
6310 msgstr "git config [<选项>]"
6312 #: builtin/config.c:55
6313 msgid "Config file location"
6316 #: builtin/config.c:56
6317 msgid "use global config file"
6320 #: builtin/config.c:57
6321 msgid "use system config file"
6324 #: builtin/config.c:58
6325 msgid "use repository config file"
6328 #: builtin/config.c:59
6329 msgid "use given config file"
6332 #: builtin/config.c:60
6336 #: builtin/config.c:60
6337 msgid "read config from given blob object"
6338 msgstr "从给定的数据对象读取配置"
6340 #: builtin/config.c:61
6344 #: builtin/config.c:62
6345 msgid "get value: name [value-regex]"
6346 msgstr "获取值:name [value-regex]"
6348 #: builtin/config.c:63
6349 msgid "get all values: key [value-regex]"
6350 msgstr "获得所有的值:key [value-regex]"
6352 #: builtin/config.c:64
6353 msgid "get values for regexp: name-regex [value-regex]"
6354 msgstr "根据正则表达式获得值:name-regex [value-regex]"
6356 #: builtin/config.c:65
6357 msgid "get value specific for the URL: section[.var] URL"
6358 msgstr "获得 URL 取值:section[.var] URL"
6360 #: builtin/config.c:66
6361 msgid "replace all matching variables: name value [value_regex]"
6362 msgstr "替换所有匹配的变量:name value [value_regex]"
6364 #: builtin/config.c:67
6365 msgid "add a new variable: name value"
6366 msgstr "添加一个新的变量:name value"
6368 #: builtin/config.c:68
6369 msgid "remove a variable: name [value-regex]"
6370 msgstr "删除一个变量:name [value-regex]"
6372 #: builtin/config.c:69
6373 msgid "remove all matches: name [value-regex]"
6374 msgstr "删除所有匹配项:name [value-regex]"
6376 #: builtin/config.c:70
6377 msgid "rename section: old-name new-name"
6378 msgstr "重命名小节:old-name new-name"
6380 #: builtin/config.c:71
6381 msgid "remove a section: name"
6382 msgstr "删除一个小节:name"
6384 #: builtin/config.c:72
6388 #: builtin/config.c:73
6389 msgid "open an editor"
6392 #: builtin/config.c:74
6393 msgid "find the color configured: slot [default]"
6394 msgstr "获得配置的颜色:配置 [默认]"
6396 #: builtin/config.c:75
6397 msgid "find the color setting: slot [stdout-is-tty]"
6398 msgstr "获得颜色设置:配置 [stdout-is-tty]"
6400 #: builtin/config.c:76
6404 #: builtin/config.c:77
6405 msgid "value is \"true\" or \"false\""
6406 msgstr "值是 \"true\" 或 \"false\""
6408 #: builtin/config.c:78
6409 msgid "value is decimal number"
6412 #: builtin/config.c:79
6413 msgid "value is --bool or --int"
6414 msgstr "值是 --bool or --int"
6416 #: builtin/config.c:80
6417 msgid "value is a path (file or directory name)"
6418 msgstr "值是一个路径(文件或目录名)"
6420 #: builtin/config.c:81
6424 #: builtin/config.c:82
6425 msgid "terminate values with NUL byte"
6426 msgstr "终止值是 NUL 字节"
6428 #: builtin/config.c:83
6429 msgid "show variable names only"
6432 #: builtin/config.c:84
6433 msgid "respect include directives on lookup"
6434 msgstr "查询时参照 include 指令递归查找"
6436 #: builtin/config.c:85
6437 msgid "show origin of config (file, standard input, blob, command line)"
6438 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
6440 #: builtin/config.c:327
6441 msgid "unable to parse default color value"
6444 #: builtin/config.c:471
6447 "# This is Git's per-user configuration file.\n"
6449 "# Please adapt and uncomment the following lines:\n"
6453 "# This is Git's per-user configuration file.\n"
6455 "# Please adapt and uncomment the following lines:\n"
6459 #: builtin/config.c:613
6461 msgid "cannot create configuration file %s"
6462 msgstr "不能创建配置文件 %s"
6464 #: builtin/count-objects.c:77
6465 msgid "git count-objects [-v] [-H | --human-readable]"
6466 msgstr "git count-objects [-v] [-H | --human-readable]"
6468 #: builtin/count-objects.c:87
6469 msgid "print sizes in human readable format"
6470 msgstr "以用户可读的格式显示大小"
6472 #: builtin/describe.c:17
6473 msgid "git describe [<options>] [<commit-ish>...]"
6474 msgstr "git describe [<选项>] [<提交号>...]"
6476 #: builtin/describe.c:18
6477 msgid "git describe [<options>] --dirty"
6478 msgstr "git describe [<选项>] --dirty"
6480 #: builtin/describe.c:217
6482 msgid "annotated tag %s not available"
6485 #: builtin/describe.c:221
6487 msgid "annotated tag %s has no embedded name"
6488 msgstr "附注标签 %s 没有嵌入名称"
6490 #: builtin/describe.c:223
6492 msgid "tag '%s' is really '%s' here"
6493 msgstr "标签 '%s' 的确是在 '%s'"
6495 #: builtin/describe.c:250 builtin/log.c:480
6497 msgid "Not a valid object name %s"
6498 msgstr "不是一个有效的对象名 %s"
6500 #: builtin/describe.c:253
6502 msgid "%s is not a valid '%s' object"
6503 msgstr "%s 不是一个有效的 '%s' 对象"
6505 #: builtin/describe.c:270
6507 msgid "no tag exactly matches '%s'"
6508 msgstr "没有标签准确匹配 '%s'"
6510 #: builtin/describe.c:272
6512 msgid "searching to describe %s\n"
6515 #: builtin/describe.c:319
6517 msgid "finished search at %s\n"
6520 #: builtin/describe.c:346
6523 "No annotated tags can describe '%s'.\n"
6524 "However, there were unannotated tags: try --tags."
6527 "然而,存在未附注标签:尝试 --tags。"
6529 #: builtin/describe.c:350
6532 "No tags can describe '%s'.\n"
6533 "Try --always, or create some tags."
6536 "尝试 --always,或者创建一些标签。"
6538 #: builtin/describe.c:371
6540 msgid "traversed %lu commits\n"
6541 msgstr "已遍历 %lu 个提交\n"
6543 #: builtin/describe.c:374
6546 "more than %i tags found; listed %i most recent\n"
6547 "gave up search at %s\n"
6549 "发现多于 %i 个标签,列出最近的 %i 个\n"
6552 #: builtin/describe.c:396
6553 msgid "find the tag that comes after the commit"
6556 #: builtin/describe.c:397
6557 msgid "debug search strategy on stderr"
6558 msgstr "在标准错误上调试搜索策略"
6560 #: builtin/describe.c:398
6564 #: builtin/describe.c:399
6565 msgid "use any tag, even unannotated"
6566 msgstr "使用任意标签,即使未附带注释"
6568 #: builtin/describe.c:400
6569 msgid "always use long format"
6572 #: builtin/describe.c:401
6573 msgid "only follow first parent"
6576 #: builtin/describe.c:404
6577 msgid "only output exact matches"
6580 #: builtin/describe.c:406
6581 msgid "consider <n> most recent tags (default: 10)"
6582 msgstr "考虑最近 <n> 个标签(默认:10)"
6584 #: builtin/describe.c:408
6585 msgid "only consider tags matching <pattern>"
6586 msgstr "只考虑匹配 <模式> 的标签"
6588 #: builtin/describe.c:410 builtin/name-rev.c:321
6589 msgid "show abbreviated commit object as fallback"
6590 msgstr "显示简写的提交号作为后备"
6592 #: builtin/describe.c:411
6596 #: builtin/describe.c:412
6597 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
6598 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
6600 #: builtin/describe.c:430
6601 msgid "--long is incompatible with --abbrev=0"
6602 msgstr "--long 与 --abbrev=0 不兼容"
6604 #: builtin/describe.c:456
6605 msgid "No names found, cannot describe anything."
6606 msgstr "没有发现名称,无法描述任何东西。"
6608 #: builtin/describe.c:476
6609 msgid "--dirty is incompatible with commit-ishes"
6610 msgstr "--dirty 不能与提交同时使用"
6612 #: builtin/diff.c:86
6614 msgid "'%s': not a regular file or symlink"
6615 msgstr "'%s':不是一个正规文件或符号链接"
6617 #: builtin/diff.c:237
6619 msgid "invalid option: %s"
6622 #: builtin/diff.c:360
6623 msgid "Not a git repository"
6624 msgstr "不是一个 git 仓库"
6626 #: builtin/diff.c:403
6628 msgid "invalid object '%s' given."
6629 msgstr "提供了无效对象 '%s'。"
6631 #: builtin/diff.c:412
6633 msgid "more than two blobs given: '%s'"
6634 msgstr "提供了超过两个数据对象:'%s'"
6636 #: builtin/diff.c:419
6638 msgid "unhandled object '%s' given."
6639 msgstr "无法处理的对象 '%s'。"
6641 #: builtin/fast-export.c:25
6642 msgid "git fast-export [rev-list-opts]"
6643 msgstr "git fast-export [rev-list-opts]"
6645 #: builtin/fast-export.c:980
6646 msgid "show progress after <n> objects"
6647 msgstr "在 <n> 个对象之后显示进度"
6649 #: builtin/fast-export.c:982
6650 msgid "select handling of signed tags"
6653 #: builtin/fast-export.c:985
6654 msgid "select handling of tags that tag filtered objects"
6655 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6657 #: builtin/fast-export.c:988
6658 msgid "Dump marks to this file"
6661 #: builtin/fast-export.c:990
6662 msgid "Import marks from this file"
6665 #: builtin/fast-export.c:992
6666 msgid "Fake a tagger when tags lack one"
6667 msgstr "当标签缺少标记者字段时,假装提供一个"
6669 #: builtin/fast-export.c:994
6670 msgid "Output full tree for each commit"
6673 #: builtin/fast-export.c:996
6674 msgid "Use the done feature to terminate the stream"
6675 msgstr "使用 done 功能来终止流"
6677 #: builtin/fast-export.c:997
6678 msgid "Skip output of blob data"
6681 #: builtin/fast-export.c:998
6685 #: builtin/fast-export.c:999
6686 msgid "Apply refspec to exported refs"
6687 msgstr "对导出的引用应用引用规格"
6689 #: builtin/fast-export.c:1000
6690 msgid "anonymize output"
6693 #: builtin/fetch.c:21
6694 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6695 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6697 #: builtin/fetch.c:22
6698 msgid "git fetch [<options>] <group>"
6699 msgstr "git fetch [<选项>] <组>"
6701 #: builtin/fetch.c:23
6702 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6703 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6705 #: builtin/fetch.c:24
6706 msgid "git fetch --all [<options>]"
6707 msgstr "git fetch --all [<选项>]"
6709 #: builtin/fetch.c:93 builtin/pull.c:174
6710 msgid "fetch from all remotes"
6713 #: builtin/fetch.c:95 builtin/pull.c:177
6714 msgid "append to .git/FETCH_HEAD instead of overwriting"
6715 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6717 #: builtin/fetch.c:97 builtin/pull.c:180
6718 msgid "path to upload pack on remote end"
6721 #: builtin/fetch.c:98 builtin/pull.c:182
6722 msgid "force overwrite of local branch"
6725 #: builtin/fetch.c:100
6726 msgid "fetch from multiple remotes"
6729 #: builtin/fetch.c:102 builtin/pull.c:184
6730 msgid "fetch all tags and associated objects"
6731 msgstr "抓取所有的标签和关联对象"
6733 #: builtin/fetch.c:104
6734 msgid "do not fetch all tags (--no-tags)"
6735 msgstr "不抓取任何标签(--no-tags)"
6737 #: builtin/fetch.c:106
6738 msgid "number of submodules fetched in parallel"
6741 #: builtin/fetch.c:108 builtin/pull.c:187
6742 msgid "prune remote-tracking branches no longer on remote"
6743 msgstr "清除远程已经不存在的分支的跟踪分支"
6746 #: builtin/fetch.c:109 builtin/pull.c:190
6750 #: builtin/fetch.c:110 builtin/pull.c:191
6751 msgid "control recursive fetching of submodules"
6754 #: builtin/fetch.c:114 builtin/pull.c:199
6755 msgid "keep downloaded pack"
6758 #: builtin/fetch.c:116
6759 msgid "allow updating of HEAD ref"
6760 msgstr "允许更新 HEAD 引用"
6762 #: builtin/fetch.c:119 builtin/pull.c:202
6763 msgid "deepen history of shallow clone"
6766 #: builtin/fetch.c:121 builtin/pull.c:205
6767 msgid "convert to a complete repository"
6770 #: builtin/fetch.c:123 builtin/log.c:1426
6774 #: builtin/fetch.c:124
6775 msgid "prepend this to submodule path output"
6776 msgstr "在子模组路径输出的前面加上此目录"
6778 #: builtin/fetch.c:127
6779 msgid "default mode for recursion"
6782 #: builtin/fetch.c:129 builtin/pull.c:208
6783 msgid "accept refs that update .git/shallow"
6784 msgstr "接受更新 .git/shallow 的引用"
6786 #: builtin/fetch.c:130 builtin/pull.c:210
6790 #: builtin/fetch.c:131 builtin/pull.c:211
6791 msgid "specify fetch refmap"
6792 msgstr "指定获取操作的引用映射"
6794 #: builtin/fetch.c:387
6795 msgid "Couldn't find remote ref HEAD"
6796 msgstr "无法发现远程 HEAD 引用"
6798 #: builtin/fetch.c:503
6800 msgid "configuration fetch.output contains invalid value %s"
6801 msgstr "配置变量 fetch.output 包含无效值 %s"
6803 #: builtin/fetch.c:592
6805 msgid "object %s not found"
6808 #: builtin/fetch.c:596
6809 msgid "[up to date]"
6812 #: builtin/fetch.c:609 builtin/fetch.c:689
6816 #: builtin/fetch.c:610
6817 msgid "can't fetch in current branch"
6818 msgstr "当前分支下不能执行获取操作"
6820 #: builtin/fetch.c:619
6821 msgid "[tag update]"
6824 #: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669
6825 #: builtin/fetch.c:684
6826 msgid "unable to update local ref"
6829 #: builtin/fetch.c:639
6833 #: builtin/fetch.c:642
6834 msgid "[new branch]"
6837 #: builtin/fetch.c:645
6841 #: builtin/fetch.c:684
6842 msgid "forced update"
6845 #: builtin/fetch.c:689
6846 msgid "non-fast-forward"
6849 #: builtin/fetch.c:733
6851 msgid "%s did not send all necessary objects\n"
6852 msgstr "%s 未发送所有必须的对象\n"
6854 #: builtin/fetch.c:753
6856 msgid "reject %s because shallow roots are not allowed to be updated"
6857 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6859 #: builtin/fetch.c:839 builtin/fetch.c:934
6864 #: builtin/fetch.c:850
6867 "some local refs could not be updated; try running\n"
6868 " 'git remote prune %s' to remove any old, conflicting branches"
6870 "一些本地引用不能被更新;尝试运行\n"
6871 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6874 #: builtin/fetch.c:904
6876 msgid " (%s will become dangling)"
6877 msgstr " (%s 将成为摇摆状态)"
6880 #: builtin/fetch.c:905
6882 msgid " (%s has become dangling)"
6883 msgstr " (%s 已成为摇摆状态)"
6885 #: builtin/fetch.c:937
6889 #: builtin/fetch.c:938 builtin/remote.c:1020
6893 #: builtin/fetch.c:960
6895 msgid "Refusing to fetch into current branch %s of non-bare repository"
6896 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6898 #: builtin/fetch.c:979
6900 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6901 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6903 #: builtin/fetch.c:982
6905 msgid "Option \"%s\" is ignored for %s\n"
6906 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6908 #: builtin/fetch.c:1039
6910 msgid "Don't know how to fetch from %s"
6911 msgstr "不知道如何从 %s 获取"
6913 #: builtin/fetch.c:1199
6915 msgid "Fetching %s\n"
6918 #: builtin/fetch.c:1201 builtin/remote.c:96
6920 msgid "Could not fetch %s"
6923 #: builtin/fetch.c:1219
6925 "No remote repository specified. Please, specify either a URL or a\n"
6926 "remote name from which new revisions should be fetched."
6927 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6929 #: builtin/fetch.c:1242
6930 msgid "You need to specify a tag name."
6931 msgstr "您需要指定一个标签名称。"
6933 #: builtin/fetch.c:1284
6934 msgid "--depth and --unshallow cannot be used together"
6935 msgstr "--depth 和 --unshallow 不能同时使用"
6937 #: builtin/fetch.c:1286
6938 msgid "--unshallow on a complete repository does not make sense"
6939 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6941 #: builtin/fetch.c:1306
6942 msgid "fetch --all does not take a repository argument"
6943 msgstr "fetch --all 不能带一个仓库参数"
6945 #: builtin/fetch.c:1308
6946 msgid "fetch --all does not make sense with refspecs"
6947 msgstr "fetch --all 带引用规格没有任何意义"
6949 #: builtin/fetch.c:1319
6951 msgid "No such remote or remote group: %s"
6952 msgstr "没有这样的远程或远程组:%s"
6954 #: builtin/fetch.c:1327
6955 msgid "Fetching a group and specifying refspecs does not make sense"
6956 msgstr "获取组并指定引用规格没有意义"
6958 #: builtin/fmt-merge-msg.c:14
6960 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6961 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6963 #: builtin/fmt-merge-msg.c:667
6964 msgid "populate log with at most <n> entries from shortlog"
6965 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6967 #: builtin/fmt-merge-msg.c:670
6968 msgid "alias for --log (deprecated)"
6969 msgstr "参数 --log 的别名(已弃用)"
6971 #: builtin/fmt-merge-msg.c:673
6975 #: builtin/fmt-merge-msg.c:674
6976 msgid "use <text> as start of message"
6977 msgstr "使用 <文本> 作为提交说明的开始"
6979 #: builtin/fmt-merge-msg.c:675
6980 msgid "file to read from"
6983 #: builtin/for-each-ref.c:9
6984 msgid "git for-each-ref [<options>] [<pattern>]"
6985 msgstr "git for-each-ref [<选项>] [<模式>]"
6987 #: builtin/for-each-ref.c:10
6988 msgid "git for-each-ref [--points-at <object>]"
6989 msgstr "git for-each-ref [--points-at <对象>]"
6991 #: builtin/for-each-ref.c:11
6992 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6993 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6995 #: builtin/for-each-ref.c:12
6996 msgid "git for-each-ref [--contains [<object>]]"
6997 msgstr "git for-each-ref [--contains [<对象>]]"
6999 #: builtin/for-each-ref.c:27
7000 msgid "quote placeholders suitably for shells"
7001 msgstr "引用占位符适用于 shells"
7003 #: builtin/for-each-ref.c:29
7004 msgid "quote placeholders suitably for perl"
7005 msgstr "引用占位符适用于 perl"
7007 #: builtin/for-each-ref.c:31
7008 msgid "quote placeholders suitably for python"
7009 msgstr "引用占位符适用于 python"
7011 #: builtin/for-each-ref.c:33
7012 msgid "quote placeholders suitably for Tcl"
7013 msgstr "引用占位符适用于 Tcl"
7015 #: builtin/for-each-ref.c:36
7016 msgid "show only <n> matched refs"
7017 msgstr "只显示 <n> 个匹配的引用"
7019 #: builtin/for-each-ref.c:37 builtin/tag.c:372
7020 msgid "format to use for the output"
7023 #: builtin/for-each-ref.c:41
7024 msgid "print only refs which points at the given object"
7025 msgstr "只打印指向给定对象的引用"
7027 #: builtin/for-each-ref.c:43
7028 msgid "print only refs that are merged"
7031 #: builtin/for-each-ref.c:44
7032 msgid "print only refs that are not merged"
7035 #: builtin/for-each-ref.c:45
7036 msgid "print only refs which contain the commit"
7037 msgstr "只打印包含该提交的引用"
7039 #: builtin/fsck.c:519
7040 msgid "Checking object directories"
7043 #: builtin/fsck.c:588
7044 msgid "git fsck [<options>] [<object>...]"
7045 msgstr "git fsck [<选项>] [<对象>...]"
7047 #: builtin/fsck.c:594
7048 msgid "show unreachable objects"
7051 #: builtin/fsck.c:595
7052 msgid "show dangling objects"
7055 #: builtin/fsck.c:596
7059 #: builtin/fsck.c:597
7060 msgid "report root nodes"
7063 #: builtin/fsck.c:598
7064 msgid "make index objects head nodes"
7065 msgstr "将索引亦作为检查的头节点"
7067 #: builtin/fsck.c:599
7068 msgid "make reflogs head nodes (default)"
7069 msgstr "将引用日志作为检查的头节点(默认)"
7071 #: builtin/fsck.c:600
7072 msgid "also consider packs and alternate objects"
7075 #: builtin/fsck.c:601
7076 msgid "check only connectivity"
7079 #: builtin/fsck.c:602
7080 msgid "enable more strict checking"
7083 #: builtin/fsck.c:604
7084 msgid "write dangling objects in .git/lost-found"
7085 msgstr "将摇摆对象写入 .git/lost-found 中"
7087 #: builtin/fsck.c:605 builtin/prune.c:107
7088 msgid "show progress"
7091 #: builtin/fsck.c:606
7092 msgid "show verbose names for reachable objects"
7093 msgstr "显示可达对象的详细名称"
7095 #: builtin/fsck.c:671
7096 msgid "Checking objects"
7100 msgid "git gc [<options>]"
7101 msgstr "git gc [<选项>]"
7105 msgid "Invalid %s: '%s'"
7110 msgid "insanely long object directory %.*s"
7111 msgstr "不正常的长对象目录 %.*s"
7116 "The last gc run reported the following. Please correct the root cause\n"
7118 "Automatic cleanup will not be performed until the file is removed.\n"
7122 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
7123 "在该文件被删除之前,自动清理将不会执行。\n"
7128 msgid "prune unreferenced objects"
7132 msgid "be more thorough (increased runtime)"
7133 msgstr "更彻底(增加运行时间)"
7136 msgid "enable auto-gc mode"
7140 msgid "force running gc even if there may be another gc running"
7141 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
7145 msgid "Auto packing the repository in background for optimum performance.\n"
7146 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
7150 msgid "Auto packing the repository for optimum performance.\n"
7151 msgstr "自动打包仓库以求最佳性能。\n"
7155 msgid "See \"git help gc\" for manual housekeeping.\n"
7156 msgstr "手工维护参见 \"git help gc\"。\n"
7161 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
7163 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
7167 "There are too many unreachable loose objects; run 'git prune' to remove them."
7168 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
7170 #: builtin/grep.c:23
7171 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
7172 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
7174 #: builtin/grep.c:219
7176 msgid "grep: failed to create thread: %s"
7177 msgstr "grep:无法创建线程:%s"
7179 #: builtin/grep.c:277
7181 msgid "invalid number of threads specified (%d) for %s"
7182 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
7184 #: builtin/grep.c:452 builtin/grep.c:487
7186 msgid "unable to read tree (%s)"
7189 #: builtin/grep.c:502
7191 msgid "unable to grep from object of type %s"
7192 msgstr "无法抓取来自于 %s 类型的对象"
7194 #: builtin/grep.c:560
7196 msgid "switch `%c' expects a numerical value"
7197 msgstr "开关 `%c' 期望一个数字值"
7199 #: builtin/grep.c:577
7201 msgid "cannot open '%s'"
7204 #: builtin/grep.c:646
7205 msgid "search in index instead of in the work tree"
7206 msgstr "在索引区搜索而不是在工作区"
7208 #: builtin/grep.c:648
7209 msgid "find in contents not managed by git"
7210 msgstr "在未被 git 管理的内容中查找"
7212 # 译者:中文字符串拼接,可删除前导空格
7213 #: builtin/grep.c:650
7214 msgid "search in both tracked and untracked files"
7215 msgstr "在跟踪和未跟踪的文件中搜索"
7217 #: builtin/grep.c:652
7218 msgid "ignore files specified via '.gitignore'"
7219 msgstr "忽略 '.gitignore' 包含的文件"
7221 #: builtin/grep.c:655
7222 msgid "show non-matching lines"
7225 #: builtin/grep.c:657
7226 msgid "case insensitive matching"
7229 #: builtin/grep.c:659
7230 msgid "match patterns only at word boundaries"
7233 #: builtin/grep.c:661
7234 msgid "process binary files as text"
7235 msgstr "把二进制文件当做文本处理"
7237 #: builtin/grep.c:663
7238 msgid "don't match patterns in binary files"
7239 msgstr "不在二进制文件中匹配模式"
7241 #: builtin/grep.c:666
7242 msgid "process binary files with textconv filters"
7243 msgstr "用 textconv 过滤器处理二进制文件"
7245 #: builtin/grep.c:668
7246 msgid "descend at most <depth> levels"
7247 msgstr "最多以指定的深度向下寻找"
7249 #: builtin/grep.c:672
7250 msgid "use extended POSIX regular expressions"
7251 msgstr "使用扩展的 POSIX 正则表达式"
7253 #: builtin/grep.c:675
7254 msgid "use basic POSIX regular expressions (default)"
7255 msgstr "使用基本的 POSIX 正则表达式(默认)"
7257 #: builtin/grep.c:678
7258 msgid "interpret patterns as fixed strings"
7259 msgstr "把模式解析为固定的字符串"
7261 #: builtin/grep.c:681
7262 msgid "use Perl-compatible regular expressions"
7263 msgstr "使用 Perl 兼容的正则表达式"
7265 #: builtin/grep.c:684
7266 msgid "show line numbers"
7269 #: builtin/grep.c:685
7270 msgid "don't show filenames"
7273 #: builtin/grep.c:686
7274 msgid "show filenames"
7277 #: builtin/grep.c:688
7278 msgid "show filenames relative to top directory"
7279 msgstr "显示相对于顶级目录的文件名"
7281 #: builtin/grep.c:690
7282 msgid "show only filenames instead of matching lines"
7283 msgstr "只显示文件名而不显示匹配的行"
7285 #: builtin/grep.c:692
7286 msgid "synonym for --files-with-matches"
7287 msgstr "和 --files-with-matches 同义"
7289 #: builtin/grep.c:695
7290 msgid "show only the names of files without match"
7293 #: builtin/grep.c:697
7294 msgid "print NUL after filenames"
7295 msgstr "在文件名后输出 NUL 字符"
7297 #: builtin/grep.c:699
7298 msgid "show the number of matches instead of matching lines"
7299 msgstr "显示总匹配行数,而不显示匹配的行"
7301 #: builtin/grep.c:700
7302 msgid "highlight matches"
7305 #: builtin/grep.c:702
7306 msgid "print empty line between matches from different files"
7307 msgstr "在不同文件的匹配项之间打印空行"
7309 #: builtin/grep.c:704
7310 msgid "show filename only once above matches from same file"
7311 msgstr "只在同一文件的匹配项的上面显示一次文件名"
7313 #: builtin/grep.c:707
7314 msgid "show <n> context lines before and after matches"
7315 msgstr "显示匹配项前后的 <n> 行上下文"
7317 #: builtin/grep.c:710
7318 msgid "show <n> context lines before matches"
7319 msgstr "显示匹配项前 <n> 行上下文"
7321 #: builtin/grep.c:712
7322 msgid "show <n> context lines after matches"
7323 msgstr "显示匹配项后 <n> 行上下文"
7325 #: builtin/grep.c:714
7326 msgid "use <n> worker threads"
7327 msgstr "使用 <n> 个工作线程"
7329 #: builtin/grep.c:715
7330 msgid "shortcut for -C NUM"
7333 #: builtin/grep.c:718
7334 msgid "show a line with the function name before matches"
7335 msgstr "在匹配的前面显示一行函数名"
7337 #: builtin/grep.c:720
7338 msgid "show the surrounding function"
7339 msgstr "显示所在函数的前后内容"
7341 #: builtin/grep.c:723
7342 msgid "read patterns from file"
7345 #: builtin/grep.c:725
7346 msgid "match <pattern>"
7349 #: builtin/grep.c:727
7350 msgid "combine patterns specified with -e"
7351 msgstr "组合用 -e 参数设定的模式"
7353 #: builtin/grep.c:739
7354 msgid "indicate hit with exit status without output"
7355 msgstr "不输出,而用退出码标识命中状态"
7357 #: builtin/grep.c:741
7358 msgid "show only matches from files that match all patterns"
7359 msgstr "只显示匹配所有模式的文件中的匹配"
7361 #: builtin/grep.c:743
7362 msgid "show parse tree for grep expression"
7363 msgstr "显示 grep 表达式的解析树"
7365 #: builtin/grep.c:747
7369 #: builtin/grep.c:747
7370 msgid "show matching files in the pager"
7373 #: builtin/grep.c:750
7374 msgid "allow calling of grep(1) (ignored by this build)"
7375 msgstr "允许调用 grep(1)(本次构建忽略)"
7377 #: builtin/grep.c:813
7378 msgid "no pattern given."
7381 #: builtin/grep.c:845 builtin/index-pack.c:1479
7383 msgid "invalid number of threads specified (%d)"
7384 msgstr "指定的线程数无效(%d)"
7386 #: builtin/grep.c:875
7387 msgid "--open-files-in-pager only works on the worktree"
7388 msgstr "--open-files-in-pager 仅用于工作区"
7390 #: builtin/grep.c:901
7391 msgid "--cached or --untracked cannot be used with --no-index."
7392 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
7394 #: builtin/grep.c:906
7395 msgid "--no-index or --untracked cannot be used with revs."
7396 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
7398 #: builtin/grep.c:909
7399 msgid "--[no-]exclude-standard cannot be used for tracked contents."
7400 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
7402 #: builtin/grep.c:917
7403 msgid "both --cached and trees are given."
7404 msgstr "同时给出了 --cached 和树对象。"
7406 #: builtin/hash-object.c:81
7408 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
7411 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
7414 #: builtin/hash-object.c:82
7415 msgid "git hash-object --stdin-paths"
7416 msgstr "git hash-object --stdin-paths"
7418 #: builtin/hash-object.c:93
7422 #: builtin/hash-object.c:93
7426 #: builtin/hash-object.c:94
7427 msgid "write the object into the object database"
7430 #: builtin/hash-object.c:96
7431 msgid "read the object from stdin"
7434 #: builtin/hash-object.c:98
7435 msgid "store file as is without filters"
7436 msgstr "原样存储文件不使用过滤器"
7438 #: builtin/hash-object.c:99
7440 "just hash any random garbage to create corrupt objects for debugging Git"
7441 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
7443 #: builtin/hash-object.c:100
7444 msgid "process file as it were from this path"
7445 msgstr "处理文件并假设其来自于此路径"
7447 #: builtin/help.c:41
7448 msgid "print all available commands"
7451 #: builtin/help.c:42
7452 msgid "print list of useful guides"
7455 #: builtin/help.c:43
7456 msgid "show man page"
7459 #: builtin/help.c:44
7460 msgid "show manual in web browser"
7461 msgstr "在 web 浏览器中显示手册"
7463 #: builtin/help.c:46
7464 msgid "show info page"
7467 #: builtin/help.c:52
7468 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
7469 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
7471 #: builtin/help.c:64
7473 msgid "unrecognized help format '%s'"
7474 msgstr "未能识别的帮助格式 '%s'"
7476 #: builtin/help.c:91
7477 msgid "Failed to start emacsclient."
7478 msgstr "无法启动 emacsclient。"
7480 #: builtin/help.c:104
7481 msgid "Failed to parse emacsclient version."
7482 msgstr "无法解析 emacsclient 版本。"
7484 #: builtin/help.c:112
7486 msgid "emacsclient version '%d' too old (< 22)."
7487 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
7489 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
7491 msgid "failed to exec '%s'"
7494 #: builtin/help.c:205
7497 "'%s': path for unsupported man viewer.\n"
7498 "Please consider using 'man.<tool>.cmd' instead."
7500 "'%s':不支持的 man 手册查看器的路径。\n"
7501 "请使用 'man.<工具>.cmd'。"
7503 #: builtin/help.c:217
7506 "'%s': cmd for supported man viewer.\n"
7507 "Please consider using 'man.<tool>.path' instead."
7509 "'%s': 支持的 man 手册查看器命令。\n"
7510 "请使用 'man.<工具>.path'。"
7512 #: builtin/help.c:334
7514 msgid "'%s': unknown man viewer."
7515 msgstr "'%s':未知的 man 查看器。"
7517 #: builtin/help.c:351
7518 msgid "no man viewer handled the request"
7519 msgstr "没有 man 查看器处理此请求"
7521 #: builtin/help.c:359
7522 msgid "no info viewer handled the request"
7523 msgstr "没有 info 查看器处理此请求"
7525 #: builtin/help.c:401
7526 msgid "Defining attributes per path"
7529 #: builtin/help.c:402
7530 msgid "Everyday Git With 20 Commands Or So"
7531 msgstr "每一天 Git 常用的约 20 条命令"
7533 #: builtin/help.c:403
7534 msgid "A Git glossary"
7537 #: builtin/help.c:404
7538 msgid "Specifies intentionally untracked files to ignore"
7541 #: builtin/help.c:405
7542 msgid "Defining submodule properties"
7545 #: builtin/help.c:406
7546 msgid "Specifying revisions and ranges for Git"
7547 msgstr "指定 Git 的版本和版本范围"
7549 #: builtin/help.c:407
7550 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
7551 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
7553 #: builtin/help.c:408
7554 msgid "An overview of recommended workflows with Git"
7555 msgstr "Git 推荐的工作流概览"
7557 #: builtin/help.c:420
7558 msgid "The common Git guides are:\n"
7559 msgstr "最常用的 Git 向导有:\n"
7561 #: builtin/help.c:441 builtin/help.c:458
7566 #: builtin/help.c:474
7568 msgid "`git %s' is aliased to `%s'"
7569 msgstr "`git %s' 是 `%s' 的别名"
7571 #: builtin/index-pack.c:153
7573 msgid "unable to open %s"
7576 #: builtin/index-pack.c:203
7578 msgid "object type mismatch at %s"
7579 msgstr "%s 的对象类型不匹配"
7581 #: builtin/index-pack.c:223
7583 msgid "did not receive expected object %s"
7584 msgstr "未能获取期望的对象 %s"
7586 #: builtin/index-pack.c:226
7588 msgid "object %s: expected type %s, found %s"
7589 msgstr "对象 %s:期待类型 %s,却是 %s"
7591 #: builtin/index-pack.c:268
7593 msgid "cannot fill %d byte"
7594 msgid_plural "cannot fill %d bytes"
7595 msgstr[0] "无法填充 %d 字节"
7596 msgstr[1] "无法填充 %d 字节"
7598 #: builtin/index-pack.c:278
7600 msgstr "过早的文件结束符(EOF)"
7602 #: builtin/index-pack.c:279
7603 msgid "read error on input"
7606 #: builtin/index-pack.c:291
7607 msgid "used more bytes than were available"
7610 #: builtin/index-pack.c:298
7611 msgid "pack too large for current definition of off_t"
7612 msgstr "包太大超过了当前 off_t 的定义"
7614 #: builtin/index-pack.c:314
7616 msgid "unable to create '%s'"
7619 #: builtin/index-pack.c:319
7621 msgid "cannot open packfile '%s'"
7622 msgstr "无法打开包文件 '%s'"
7624 #: builtin/index-pack.c:333
7625 msgid "pack signature mismatch"
7628 #: builtin/index-pack.c:335
7630 msgid "pack version %<PRIu32> unsupported"
7631 msgstr "不支持包版本 %<PRIu32>"
7633 #: builtin/index-pack.c:353
7635 msgid "pack has bad object at offset %<PRIuMAX>: %s"
7636 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
7638 #: builtin/index-pack.c:475
7640 msgid "inflate returned %d"
7643 #: builtin/index-pack.c:524
7644 msgid "offset value overflow for delta base object"
7645 msgstr "偏移值覆盖了 delta 基准对象"
7647 #: builtin/index-pack.c:532
7648 msgid "delta base offset is out of bound"
7649 msgstr "delta 基准偏移越界"
7651 #: builtin/index-pack.c:540
7653 msgid "unknown object type %d"
7656 #: builtin/index-pack.c:571
7657 msgid "cannot pread pack file"
7660 #: builtin/index-pack.c:573
7662 msgid "premature end of pack file, %<PRIuMAX> byte missing"
7663 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
7664 msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
7665 msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
7667 #: builtin/index-pack.c:599
7668 msgid "serious inflate inconsistency"
7671 #: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774
7672 #: builtin/index-pack.c:808 builtin/index-pack.c:817
7674 msgid "SHA1 COLLISION FOUND WITH %s !"
7675 msgstr "发现 %s 出现 SHA1 冲突!"
7677 #: builtin/index-pack.c:748 builtin/pack-objects.c:164
7678 #: builtin/pack-objects.c:256
7680 msgid "unable to read %s"
7683 #: builtin/index-pack.c:814
7685 msgid "cannot read existing object %s"
7686 msgstr "不能读取现存对象 %s"
7688 #: builtin/index-pack.c:828
7690 msgid "invalid blob object %s"
7693 #: builtin/index-pack.c:842
7698 #: builtin/index-pack.c:845
7699 msgid "Error in object"
7702 #: builtin/index-pack.c:847
7704 msgid "Not all child objects of %s are reachable"
7705 msgstr "%s 的所有子对象并非都可达"
7707 #: builtin/index-pack.c:919 builtin/index-pack.c:950
7708 msgid "failed to apply delta"
7711 #: builtin/index-pack.c:1120
7712 msgid "Receiving objects"
7715 #: builtin/index-pack.c:1120
7716 msgid "Indexing objects"
7719 #: builtin/index-pack.c:1152
7720 msgid "pack is corrupted (SHA1 mismatch)"
7721 msgstr "包冲突(SHA1 不匹配)"
7723 #: builtin/index-pack.c:1157
7724 msgid "cannot fstat packfile"
7727 #: builtin/index-pack.c:1160
7728 msgid "pack has junk at the end"
7731 #: builtin/index-pack.c:1171
7732 msgid "confusion beyond insanity in parse_pack_objects()"
7733 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7735 #: builtin/index-pack.c:1196
7736 msgid "Resolving deltas"
7739 #: builtin/index-pack.c:1207
7741 msgid "unable to create thread: %s"
7744 #: builtin/index-pack.c:1249
7745 msgid "confusion beyond insanity"
7748 #: builtin/index-pack.c:1255
7750 msgid "completed with %d local object"
7751 msgid_plural "completed with %d local objects"
7752 msgstr[0] "完成 %d 个本地对象"
7753 msgstr[1] "完成 %d 个本地对象"
7755 #: builtin/index-pack.c:1267
7757 msgid "Unexpected tail checksum for %s (disk corruption?)"
7758 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7760 #: builtin/index-pack.c:1271
7762 msgid "pack has %d unresolved delta"
7763 msgid_plural "pack has %d unresolved deltas"
7764 msgstr[0] "包有 %d 个未解决的 delta"
7765 msgstr[1] "包有 %d 个未解决的 delta"
7767 #: builtin/index-pack.c:1295
7769 msgid "unable to deflate appended object (%d)"
7770 msgstr "不能压缩附加对象(%d)"
7772 #: builtin/index-pack.c:1371
7774 msgid "local object %s is corrupt"
7775 msgstr "本地对象 %s 已损坏"
7777 #: builtin/index-pack.c:1395
7778 msgid "error while closing pack file"
7781 #: builtin/index-pack.c:1408
7783 msgid "cannot write keep file '%s'"
7784 msgstr "无法写保留文件 '%s'"
7786 #: builtin/index-pack.c:1416
7788 msgid "cannot close written keep file '%s'"
7789 msgstr "无法关闭保留文件 '%s'"
7791 #: builtin/index-pack.c:1429
7792 msgid "cannot store pack file"
7795 #: builtin/index-pack.c:1440
7796 msgid "cannot store index file"
7799 #: builtin/index-pack.c:1473
7801 msgid "bad pack.indexversion=%<PRIu32>"
7802 msgstr "坏的 pack.indexversion=%<PRIu32>"
7804 #: builtin/index-pack.c:1483 builtin/index-pack.c:1681
7806 msgid "no threads support, ignoring %s"
7807 msgstr "没有线程支持,忽略 %s"
7809 #: builtin/index-pack.c:1542
7811 msgid "Cannot open existing pack file '%s'"
7812 msgstr "无法打开现存包文件 '%s'"
7814 #: builtin/index-pack.c:1544
7816 msgid "Cannot open existing pack idx file for '%s'"
7817 msgstr "无法为 %s 打开包索引文件"
7819 #: builtin/index-pack.c:1591
7821 msgid "non delta: %d object"
7822 msgid_plural "non delta: %d objects"
7823 msgstr[0] "非 delta:%d 个对象"
7824 msgstr[1] "非 delta:%d 个对象"
7826 #: builtin/index-pack.c:1598
7828 msgid "chain length = %d: %lu object"
7829 msgid_plural "chain length = %d: %lu objects"
7830 msgstr[0] "链长 = %d: %lu 对象"
7831 msgstr[1] "链长 = %d: %lu 对象"
7833 #: builtin/index-pack.c:1611
7835 msgid "packfile name '%s' does not end with '.pack'"
7836 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7838 #: builtin/index-pack.c:1693 builtin/index-pack.c:1696
7839 #: builtin/index-pack.c:1712 builtin/index-pack.c:1716
7844 #: builtin/index-pack.c:1730
7845 msgid "--fix-thin cannot be used without --stdin"
7846 msgstr "--fix-thin 不能和 --stdin 同时使用"
7848 #: builtin/index-pack.c:1738
7849 msgid "--verify with no packfile name given"
7850 msgstr "--verify 没有提供包文件名参数"
7852 #: builtin/init-db.c:55
7854 msgid "cannot stat '%s'"
7855 msgstr "不能枚举 '%s' 状态"
7857 #: builtin/init-db.c:61
7859 msgid "cannot stat template '%s'"
7860 msgstr "不能枚举模版 '%s' 状态"
7862 #: builtin/init-db.c:66
7864 msgid "cannot opendir '%s'"
7865 msgstr "不能打开目录 '%s'"
7867 #: builtin/init-db.c:77
7869 msgid "cannot readlink '%s'"
7870 msgstr "不能读取链接 '%s'"
7872 #: builtin/init-db.c:79
7874 msgid "cannot symlink '%s' '%s'"
7875 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7877 #: builtin/init-db.c:85
7879 msgid "cannot copy '%s' to '%s'"
7880 msgstr "不能拷贝 '%s' 至 '%s'"
7882 #: builtin/init-db.c:89
7884 msgid "ignoring template %s"
7887 #: builtin/init-db.c:120
7889 msgid "templates not found %s"
7892 #: builtin/init-db.c:135
7894 msgid "not copying templates from '%s': %s"
7895 msgstr "没有从 '%s' 复制模版:%s"
7897 #: builtin/init-db.c:312 builtin/init-db.c:315
7899 msgid "%s already exists"
7902 #: builtin/init-db.c:344
7904 msgid "unable to handle file type %d"
7905 msgstr "不能处理 %d 类型的文件"
7907 #: builtin/init-db.c:347
7909 msgid "unable to move %s to %s"
7910 msgstr "不能移动 %s 至 %s"
7912 #: builtin/init-db.c:402
7914 msgid "Reinitialized existing shared Git repository in %s%s\n"
7915 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
7917 #: builtin/init-db.c:403
7919 msgid "Reinitialized existing Git repository in %s%s\n"
7920 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
7922 #: builtin/init-db.c:407
7924 msgid "Initialized empty shared Git repository in %s%s\n"
7925 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
7927 #: builtin/init-db.c:408
7929 msgid "Initialized empty Git repository in %s%s\n"
7930 msgstr "已初始化空的 Git 仓库于 %s%s\n"
7932 #: builtin/init-db.c:455
7934 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7935 "shared[=<permissions>]] [<directory>]"
7937 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7940 #: builtin/init-db.c:478
7944 #: builtin/init-db.c:479
7945 msgid "specify that the git repository is to be shared amongst several users"
7946 msgstr "指定 git 仓库是多个用户之间共享的"
7948 #: builtin/init-db.c:513 builtin/init-db.c:518
7950 msgid "cannot mkdir %s"
7953 #: builtin/init-db.c:522
7955 msgid "cannot chdir to %s"
7958 #: builtin/init-db.c:543
7961 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7963 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7965 #: builtin/init-db.c:571
7967 msgid "Cannot access work tree '%s'"
7968 msgstr "不能访问工作区 '%s'"
7970 #: builtin/interpret-trailers.c:15
7972 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7973 "<token>[(=|:)<value>])...] [<file>...]"
7975 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7978 #: builtin/interpret-trailers.c:26
7979 msgid "edit files in place"
7982 #: builtin/interpret-trailers.c:27
7983 msgid "trim empty trailers"
7986 #: builtin/interpret-trailers.c:28
7990 #: builtin/interpret-trailers.c:29
7991 msgid "trailer(s) to add"
7994 #: builtin/interpret-trailers.c:42
7995 msgid "no input file given for in-place editing"
7996 msgstr "没有给出要原位编辑的文件"
7999 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
8000 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
8003 msgid "git show [<options>] <object>..."
8004 msgstr "git show [<选项>] <对象>..."
8008 msgid "invalid --decorate option: %s"
8009 msgstr "无效的 --decorate 选项:%s"
8011 #: builtin/log.c:139
8012 msgid "suppress diff output"
8015 #: builtin/log.c:140
8019 #: builtin/log.c:141
8020 msgid "Use mail map file"
8023 #: builtin/log.c:142
8024 msgid "decorate options"
8027 #: builtin/log.c:145
8028 msgid "Process line range n,m in file, counting from 1"
8029 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
8031 #: builtin/log.c:241
8033 msgid "Final output: %d %s\n"
8034 msgstr "最终输出:%d %s\n"
8036 #: builtin/log.c:486
8038 msgid "git show %s: bad file"
8039 msgstr "git show %s: 损坏的文件"
8041 #: builtin/log.c:500 builtin/log.c:594
8043 msgid "Could not read object %s"
8046 #: builtin/log.c:618
8048 msgid "Unknown type: %d"
8051 #: builtin/log.c:739
8052 msgid "format.headers without value"
8053 msgstr "format.headers 没有值"
8055 #: builtin/log.c:839
8056 msgid "name of output directory is too long"
8059 #: builtin/log.c:854
8061 msgid "Cannot open patch file %s"
8062 msgstr "无法打开补丁文件 %s"
8064 #: builtin/log.c:868
8065 msgid "Need exactly one range."
8068 #: builtin/log.c:878
8069 msgid "Not a range."
8072 #: builtin/log.c:984
8073 msgid "Cover letter needs email format"
8076 #: builtin/log.c:1064
8078 msgid "insane in-reply-to: %s"
8079 msgstr "不正常的 in-reply-to:%s"
8081 #: builtin/log.c:1092
8082 msgid "git format-patch [<options>] [<since> | <revision-range>]"
8083 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
8085 #: builtin/log.c:1137
8086 msgid "Two output directories?"
8089 #: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897
8091 msgid "Unknown commit %s"
8094 #: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305
8095 #: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425
8096 #: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594
8097 #: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455
8099 msgid "Failed to resolve '%s' as a valid ref."
8100 msgstr "无法解析 '%s' 为一个有效引用。"
8102 #: builtin/log.c:1259
8103 msgid "Could not find exact merge base."
8104 msgstr "不能找到准确的合并基线。"
8106 #: builtin/log.c:1263
8108 "Failed to get upstream, if you want to record base commit automatically,\n"
8109 "please use git branch --set-upstream-to to track a remote branch.\n"
8110 "Or you could specify base commit by --base=<base-commit-id> manually."
8112 "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
8113 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
8114 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
8116 #: builtin/log.c:1283
8117 msgid "Failed to find exact merge base"
8118 msgstr "无法找到准确的合并基线"
8120 #: builtin/log.c:1294
8121 msgid "base commit should be the ancestor of revision list"
8122 msgstr "基线提交应该是版本列表的祖先"
8124 #: builtin/log.c:1298
8125 msgid "base commit shouldn't be in revision list"
8126 msgstr "基线提交不应该出现在版本列表中"
8128 #: builtin/log.c:1347
8129 msgid "cannot get patch id"
8132 #: builtin/log.c:1404
8133 msgid "use [PATCH n/m] even with a single patch"
8134 msgstr "使用 [PATCH n/m],即使只有一个补丁"
8136 #: builtin/log.c:1407
8137 msgid "use [PATCH] even with multiple patches"
8138 msgstr "使用 [PATCH],即使有多个补丁"
8140 #: builtin/log.c:1411
8141 msgid "print patches to standard out"
8144 #: builtin/log.c:1413
8145 msgid "generate a cover letter"
8148 #: builtin/log.c:1415
8149 msgid "use simple number sequence for output file names"
8150 msgstr "使用简单的数字序列作为输出文件名"
8152 #: builtin/log.c:1416
8156 #: builtin/log.c:1417
8157 msgid "use <sfx> instead of '.patch'"
8158 msgstr "使用 <后缀> 代替 '.patch'"
8160 #: builtin/log.c:1419
8161 msgid "start numbering patches at <n> instead of 1"
8162 msgstr "补丁以 <n> 开始编号,而不是1"
8164 #: builtin/log.c:1421
8165 msgid "mark the series as Nth re-roll"
8166 msgstr "标记补丁系列是第几次重制"
8168 #: builtin/log.c:1423
8169 msgid "Use [<prefix>] instead of [PATCH]"
8170 msgstr "使用 [<前缀>] 代替 [PATCH]"
8172 #: builtin/log.c:1426
8173 msgid "store resulting files in <dir>"
8174 msgstr "把结果文件存储在 <目录>"
8176 #: builtin/log.c:1429
8177 msgid "don't strip/add [PATCH]"
8178 msgstr "不删除/添加 [PATCH]"
8180 #: builtin/log.c:1432
8181 msgid "don't output binary diffs"
8184 #: builtin/log.c:1434
8185 msgid "output all-zero hash in From header"
8186 msgstr "在 From 头信息中输出全为零的哈希值"
8188 #: builtin/log.c:1436
8189 msgid "don't include a patch matching a commit upstream"
8190 msgstr "不包含已在上游提交中的补丁"
8192 #: builtin/log.c:1438
8193 msgid "show patch format instead of default (patch + stat)"
8194 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
8196 #: builtin/log.c:1440
8200 #: builtin/log.c:1441
8204 #: builtin/log.c:1442
8205 msgid "add email header"
8208 #: builtin/log.c:1443 builtin/log.c:1445
8212 #: builtin/log.c:1443
8213 msgid "add To: header"
8216 #: builtin/log.c:1445
8217 msgid "add Cc: header"
8220 #: builtin/log.c:1447
8224 #: builtin/log.c:1448
8225 msgid "set From address to <ident> (or committer ident if absent)"
8226 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
8228 #: builtin/log.c:1450
8232 #: builtin/log.c:1451
8233 msgid "make first mail a reply to <message-id>"
8234 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
8236 #: builtin/log.c:1452 builtin/log.c:1455
8240 #: builtin/log.c:1453
8241 msgid "attach the patch"
8244 #: builtin/log.c:1456
8245 msgid "inline the patch"
8248 #: builtin/log.c:1460
8249 msgid "enable message threading, styles: shallow, deep"
8250 msgstr "启用邮件线索,风格:浅,深"
8252 #: builtin/log.c:1462
8256 #: builtin/log.c:1463
8257 msgid "add a signature"
8260 #: builtin/log.c:1464
8264 #: builtin/log.c:1465
8265 msgid "add prerequisite tree info to the patch series"
8266 msgstr "为补丁列表添加前置树信息"
8268 #: builtin/log.c:1467
8269 msgid "add a signature from a file"
8272 #: builtin/log.c:1468
8273 msgid "don't print the patch filenames"
8276 #: builtin/log.c:1558
8277 msgid "-n and -k are mutually exclusive."
8278 msgstr "-n 和 -k 互斥。"
8280 #: builtin/log.c:1560
8281 msgid "--subject-prefix and -k are mutually exclusive."
8282 msgstr "--subject-prefix 和 -k 互斥。"
8284 #: builtin/log.c:1568
8285 msgid "--name-only does not make sense"
8286 msgstr "--name-only 无意义"
8288 #: builtin/log.c:1570
8289 msgid "--name-status does not make sense"
8290 msgstr "--name-status 无意义"
8292 #: builtin/log.c:1572
8293 msgid "--check does not make sense"
8294 msgstr "--check 无意义"
8296 #: builtin/log.c:1602
8297 msgid "standard output, or directory, which one?"
8298 msgstr "标准输出或目录,哪一个?"
8300 #: builtin/log.c:1604
8302 msgid "Could not create directory '%s'"
8303 msgstr "不能创建目录 '%s'"
8305 #: builtin/log.c:1698
8307 msgid "unable to read signature file '%s'"
8308 msgstr "无法读取签名文件 '%s'"
8310 #: builtin/log.c:1769
8311 msgid "Failed to create output files"
8314 #: builtin/log.c:1818
8315 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
8316 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
8318 #: builtin/log.c:1872
8321 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
8322 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
8324 #: builtin/ls-files.c:379
8325 msgid "git ls-files [<options>] [<file>...]"
8326 msgstr "git ls-files [<选项>] [<文件>...]"
8328 #: builtin/ls-files.c:428
8329 msgid "identify the file status with tags"
8332 #: builtin/ls-files.c:430
8333 msgid "use lowercase letters for 'assume unchanged' files"
8334 msgstr "使用小写字母表示 '假设未改变的' 文件"
8336 #: builtin/ls-files.c:432
8337 msgid "show cached files in the output (default)"
8338 msgstr "显示缓存的文件(默认)"
8340 #: builtin/ls-files.c:434
8341 msgid "show deleted files in the output"
8344 #: builtin/ls-files.c:436
8345 msgid "show modified files in the output"
8348 #: builtin/ls-files.c:438
8349 msgid "show other files in the output"
8352 #: builtin/ls-files.c:440
8353 msgid "show ignored files in the output"
8356 #: builtin/ls-files.c:443
8357 msgid "show staged contents' object name in the output"
8358 msgstr "显示暂存区内容的对象名称"
8360 #: builtin/ls-files.c:445
8361 msgid "show files on the filesystem that need to be removed"
8362 msgstr "显示文件系统需要删除的文件"
8364 #: builtin/ls-files.c:447
8365 msgid "show 'other' directories' names only"
8366 msgstr "只显示“其他”目录的名称"
8368 #: builtin/ls-files.c:449
8369 msgid "show line endings of files"
8372 #: builtin/ls-files.c:451
8373 msgid "don't show empty directories"
8376 #: builtin/ls-files.c:454
8377 msgid "show unmerged files in the output"
8380 #: builtin/ls-files.c:456
8381 msgid "show resolve-undo information"
8382 msgstr "显示 resolve-undo 信息"
8384 #: builtin/ls-files.c:458
8385 msgid "skip files matching pattern"
8388 #: builtin/ls-files.c:461
8389 msgid "exclude patterns are read from <file>"
8390 msgstr "从 <文件> 中读取排除模式"
8392 #: builtin/ls-files.c:464
8393 msgid "read additional per-directory exclude patterns in <file>"
8394 msgstr "从 <文件> 读取额外的每个目录的排除模式"
8396 #: builtin/ls-files.c:466
8397 msgid "add the standard git exclusions"
8398 msgstr "添加标准的 git 排除"
8400 #: builtin/ls-files.c:469
8401 msgid "make the output relative to the project top directory"
8402 msgstr "显示相对于顶级目录的文件名"
8404 #: builtin/ls-files.c:472
8405 msgid "if any <file> is not in the index, treat this as an error"
8406 msgstr "如果任何 <文件> 都不在索引区,视为错误"
8408 #: builtin/ls-files.c:473
8412 #: builtin/ls-files.c:474
8413 msgid "pretend that paths removed since <tree-ish> are still present"
8414 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
8416 #: builtin/ls-files.c:476
8417 msgid "show debugging data"
8420 #: builtin/ls-remote.c:7
8422 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8423 " [-q | --quiet] [--exit-code] [--get-url]\n"
8424 " [--symref] [<repository> [<refs>...]]"
8426 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
8427 " [-q | --quiet] [--exit-code] [--get-url]\n"
8428 " [--symref] [<仓库> [<引用>...]]"
8430 #: builtin/ls-remote.c:50
8431 msgid "do not print remote URL"
8434 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
8438 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
8439 msgid "path of git-upload-pack on the remote host"
8440 msgstr "远程主机上的 git-upload-pack 路径"
8442 #: builtin/ls-remote.c:56
8443 msgid "limit to tags"
8446 #: builtin/ls-remote.c:57
8447 msgid "limit to heads"
8450 #: builtin/ls-remote.c:58
8451 msgid "do not show peeled tags"
8454 #: builtin/ls-remote.c:60
8455 msgid "take url.<base>.insteadOf into account"
8456 msgstr "参考 url.<base>.insteadOf 设置"
8458 #: builtin/ls-remote.c:62
8459 msgid "exit with exit code 2 if no matching refs are found"
8460 msgstr "若未找到匹配的引用则以退出码2退出"
8462 #: builtin/ls-remote.c:64
8463 msgid "show underlying ref in addition to the object pointed by it"
8464 msgstr "除了显示指向的对象外,显示指向的引用名"
8466 #: builtin/ls-tree.c:28
8467 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
8468 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
8470 #: builtin/ls-tree.c:128
8471 msgid "only show trees"
8474 #: builtin/ls-tree.c:130
8475 msgid "recurse into subtrees"
8478 #: builtin/ls-tree.c:132
8479 msgid "show trees when recursing"
8482 #: builtin/ls-tree.c:135
8483 msgid "terminate entries with NUL byte"
8484 msgstr "条目以 NUL 字符终止"
8486 #: builtin/ls-tree.c:136
8487 msgid "include object size"
8490 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
8491 msgid "list only filenames"
8494 #: builtin/ls-tree.c:143
8495 msgid "use full path names"
8498 #: builtin/ls-tree.c:145
8499 msgid "list entire tree; not just current directory (implies --full-name)"
8500 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
8502 #: builtin/merge.c:46
8503 msgid "git merge [<options>] [<commit>...]"
8504 msgstr "git merge [<选项>] [<提交>...]"
8506 #: builtin/merge.c:47
8507 msgid "git merge [<options>] <msg> HEAD <commit>"
8508 msgstr "git merge [<选项>] <说明> HEAD <提交>"
8510 #: builtin/merge.c:48
8511 msgid "git merge --abort"
8512 msgstr "git merge --abort"
8514 #: builtin/merge.c:102
8515 msgid "switch `m' requires a value"
8516 msgstr "开关 `m' 需要一个值"
8518 #: builtin/merge.c:139
8520 msgid "Could not find merge strategy '%s'.\n"
8521 msgstr "不能找到合并策略 '%s'。\n"
8523 #: builtin/merge.c:140
8525 msgid "Available strategies are:"
8528 #: builtin/merge.c:145
8530 msgid "Available custom strategies are:"
8533 #: builtin/merge.c:195 builtin/pull.c:126
8534 msgid "do not show a diffstat at the end of the merge"
8535 msgstr "在合并的最后不显示差异统计"
8537 #: builtin/merge.c:198 builtin/pull.c:129
8538 msgid "show a diffstat at the end of the merge"
8539 msgstr "在合并的最后显示差异统计"
8541 #: builtin/merge.c:199 builtin/pull.c:132
8542 msgid "(synonym to --stat)"
8543 msgstr "(和 --stat 同义)"
8545 #: builtin/merge.c:201 builtin/pull.c:135
8546 msgid "add (at most <n>) entries from shortlog to merge commit message"
8547 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
8549 #: builtin/merge.c:204 builtin/pull.c:138
8550 msgid "create a single commit instead of doing a merge"
8551 msgstr "创建一个单独的提交而不是做一次合并"
8553 #: builtin/merge.c:206 builtin/pull.c:141
8554 msgid "perform a commit if the merge succeeds (default)"
8555 msgstr "如果合并成功,执行一次提交(默认)"
8557 #: builtin/merge.c:208 builtin/pull.c:144
8558 msgid "edit message before committing"
8561 #: builtin/merge.c:209
8562 msgid "allow fast-forward (default)"
8565 #: builtin/merge.c:211 builtin/pull.c:150
8566 msgid "abort if fast-forward is not possible"
8567 msgstr "如果不能快进就放弃合并"
8569 #: builtin/merge.c:215 builtin/pull.c:153
8570 msgid "verify that the named commit has a valid GPG signature"
8571 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8573 #: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157
8574 #: builtin/revert.c:89
8578 #: builtin/merge.c:217 builtin/pull.c:158
8579 msgid "merge strategy to use"
8582 #: builtin/merge.c:218 builtin/pull.c:161
8583 msgid "option=value"
8584 msgstr "option=value"
8586 #: builtin/merge.c:219 builtin/pull.c:162
8587 msgid "option for selected merge strategy"
8590 #: builtin/merge.c:221
8591 msgid "merge commit message (for a non-fast-forward merge)"
8592 msgstr "合并的提交说明(针对非快进式合并)"
8594 #: builtin/merge.c:225
8595 msgid "abort the current in-progress merge"
8596 msgstr "放弃当前正在进行的合并"
8598 #: builtin/merge.c:227 builtin/pull.c:169
8599 msgid "allow merging unrelated histories"
8602 #: builtin/merge.c:255
8603 msgid "could not run stash."
8606 #: builtin/merge.c:260
8607 msgid "stash failed"
8610 #: builtin/merge.c:265
8612 msgid "not a valid object: %s"
8613 msgstr "不是一个有效对象:%s"
8615 #: builtin/merge.c:284 builtin/merge.c:301
8616 msgid "read-tree failed"
8620 #: builtin/merge.c:331
8621 msgid " (nothing to squash)"
8624 #: builtin/merge.c:342
8626 msgid "Squash commit -- not updating HEAD\n"
8627 msgstr "压缩提交 -- 未更新 HEAD\n"
8629 #: builtin/merge.c:392
8631 msgid "No merge message -- not updating HEAD\n"
8632 msgstr "无合并信息 -- 未更新 HEAD\n"
8634 #: builtin/merge.c:443
8636 msgid "'%s' does not point to a commit"
8637 msgstr "'%s' 没有指向一个提交"
8639 #: builtin/merge.c:533
8641 msgid "Bad branch.%s.mergeoptions string: %s"
8642 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
8644 #: builtin/merge.c:652
8645 msgid "Not handling anything other than two heads merge."
8646 msgstr "不能处理两个头合并之外的任何操作。"
8648 #: builtin/merge.c:666
8650 msgid "Unknown option for merge-recursive: -X%s"
8651 msgstr "merge-recursive 的未知选项:-X%s"
8653 #: builtin/merge.c:681
8655 msgid "unable to write %s"
8658 #: builtin/merge.c:733
8660 msgid "Could not read from '%s'"
8661 msgstr "不能从 '%s' 读取"
8663 #: builtin/merge.c:742
8665 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
8666 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
8668 #: builtin/merge.c:748
8671 "Please enter a commit message to explain why this merge is necessary,\n"
8672 "especially if it merges an updated upstream into a topic branch.\n"
8674 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
8677 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8680 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8682 #: builtin/merge.c:772
8683 msgid "Empty commit message."
8686 #: builtin/merge.c:792
8688 msgid "Wonderful.\n"
8691 #: builtin/merge.c:847
8693 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8694 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8696 #: builtin/merge.c:863
8698 msgid "'%s' is not a commit"
8699 msgstr "'%s' 不是一个提交"
8701 #: builtin/merge.c:904
8702 msgid "No current branch."
8705 #: builtin/merge.c:906
8706 msgid "No remote for the current branch."
8707 msgstr "当前分支没有对应的远程仓库。"
8709 #: builtin/merge.c:908
8710 msgid "No default upstream defined for the current branch."
8711 msgstr "当前分支没有定义默认的上游分支。"
8713 #: builtin/merge.c:913
8715 msgid "No remote-tracking branch for %s from %s"
8716 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8718 #: builtin/merge.c:960
8720 msgid "Bad value '%s' in environment '%s'"
8721 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
8723 #: builtin/merge.c:1034
8725 msgid "could not close '%s'"
8728 #: builtin/merge.c:1061
8730 msgid "not something we can merge in %s: %s"
8731 msgstr "不能在 %s 中合并:%s"
8733 #: builtin/merge.c:1095
8734 msgid "not something we can merge"
8737 #: builtin/merge.c:1162
8738 msgid "There is no merge to abort (MERGE_HEAD missing)."
8739 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8741 #: builtin/merge.c:1178
8743 "You have not concluded your merge (MERGE_HEAD exists).\n"
8744 "Please, commit your changes before you merge."
8746 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8749 #: builtin/merge.c:1185
8751 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8752 "Please, commit your changes before you merge."
8754 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8757 #: builtin/merge.c:1188
8758 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8759 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8761 #: builtin/merge.c:1197
8762 msgid "You cannot combine --squash with --no-ff."
8763 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8765 #: builtin/merge.c:1205
8766 msgid "No commit specified and merge.defaultToUpstream not set."
8767 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8769 #: builtin/merge.c:1222
8770 msgid "Squash commit into empty head not supported yet"
8771 msgstr "尚不支持到空分支的压缩提交"
8773 #: builtin/merge.c:1224
8774 msgid "Non-fast-forward commit does not make sense into an empty head"
8775 msgstr "到空分支的非快进式提交没有意义"
8777 #: builtin/merge.c:1229
8779 msgid "%s - not something we can merge"
8782 #: builtin/merge.c:1231
8783 msgid "Can merge only exactly one commit into empty head"
8784 msgstr "只能将一个提交合并到空分支上"
8786 #: builtin/merge.c:1287
8788 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8789 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8791 #: builtin/merge.c:1290
8793 msgid "Commit %s has a bad GPG signature allegedly by %s."
8794 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8796 #: builtin/merge.c:1293
8798 msgid "Commit %s does not have a GPG signature."
8799 msgstr "提交 %s 没有一个 GPG 签名。"
8801 #: builtin/merge.c:1296
8803 msgid "Commit %s has a good GPG signature by %s\n"
8804 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8806 #: builtin/merge.c:1358
8807 msgid "refusing to merge unrelated histories"
8810 #: builtin/merge.c:1367
8811 msgid "Already up-to-date."
8814 #: builtin/merge.c:1382
8816 msgid "Updating %s..%s\n"
8817 msgstr "更新 %s..%s\n"
8819 #: builtin/merge.c:1419
8821 msgid "Trying really trivial in-index merge...\n"
8822 msgstr "尝试非常小的索引内合并...\n"
8824 #: builtin/merge.c:1426
8829 #: builtin/merge.c:1451
8830 msgid "Already up-to-date. Yeeah!"
8833 #: builtin/merge.c:1457
8834 msgid "Not possible to fast-forward, aborting."
8837 #: builtin/merge.c:1480 builtin/merge.c:1559
8839 msgid "Rewinding the tree to pristine...\n"
8840 msgstr "将树回滚至原始状态...\n"
8842 #: builtin/merge.c:1484
8844 msgid "Trying merge strategy %s...\n"
8845 msgstr "尝试合并策略 %s...\n"
8847 #: builtin/merge.c:1550
8849 msgid "No merge strategy handled the merge.\n"
8850 msgstr "没有合并策略处理此合并。\n"
8852 #: builtin/merge.c:1552
8854 msgid "Merge with strategy %s failed.\n"
8855 msgstr "使用策略 %s 合并失败。\n"
8857 #: builtin/merge.c:1561
8859 msgid "Using the %s to prepare resolving by hand.\n"
8860 msgstr "使用 %s 以准备手工解决。\n"
8862 #: builtin/merge.c:1573
8864 msgid "Automatic merge went well; stopped before committing as requested\n"
8865 msgstr "自动合并进展顺利,按要求在提交前停止\n"
8867 #: builtin/merge-base.c:29
8868 msgid "git merge-base [-a | --all] <commit> <commit>..."
8869 msgstr "git merge-base [-a | --all] <提交> <提交>..."
8871 #: builtin/merge-base.c:30
8872 msgid "git merge-base [-a | --all] --octopus <commit>..."
8873 msgstr "git merge-base [-a | --all] --octopus <提交>..."
8875 #: builtin/merge-base.c:31
8876 msgid "git merge-base --independent <commit>..."
8877 msgstr "git merge-base --independent <提交>..."
8879 #: builtin/merge-base.c:32
8880 msgid "git merge-base --is-ancestor <commit> <commit>"
8881 msgstr "git merge-base --is-ancestor <提交> <提交>"
8883 #: builtin/merge-base.c:33
8884 msgid "git merge-base --fork-point <ref> [<commit>]"
8885 msgstr "git merge-base --fork-point <引用> [<提交>]"
8887 #: builtin/merge-base.c:214
8888 msgid "output all common ancestors"
8891 #: builtin/merge-base.c:216
8892 msgid "find ancestors for a single n-way merge"
8893 msgstr "查找一个多路合并的祖先提交"
8895 #: builtin/merge-base.c:218
8896 msgid "list revs not reachable from others"
8897 msgstr "显示不能被其他访问到的版本"
8899 #: builtin/merge-base.c:220
8900 msgid "is the first one ancestor of the other?"
8901 msgstr "第一个是其他的祖先提交么?"
8903 #: builtin/merge-base.c:222
8904 msgid "find where <commit> forked from reflog of <ref>"
8905 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8907 #: builtin/merge-file.c:8
8909 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8910 "<orig-file> <file2>"
8912 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8915 #: builtin/merge-file.c:33
8916 msgid "send results to standard output"
8919 #: builtin/merge-file.c:34
8920 msgid "use a diff3 based merge"
8921 msgstr "使用基于 diff3 的合并"
8923 #: builtin/merge-file.c:35
8924 msgid "for conflicts, use our version"
8925 msgstr "如果冲突,使用我们的版本"
8927 #: builtin/merge-file.c:37
8928 msgid "for conflicts, use their version"
8929 msgstr "如果冲突,使用他们的版本"
8931 #: builtin/merge-file.c:39
8932 msgid "for conflicts, use a union version"
8933 msgstr "如果冲突,使用联合版本"
8935 #: builtin/merge-file.c:42
8936 msgid "for conflicts, use this marker size"
8937 msgstr "如果冲突,使用指定长度的标记"
8939 #: builtin/merge-file.c:43
8940 msgid "do not warn about conflicts"
8943 #: builtin/merge-file.c:45
8944 msgid "set labels for file1/orig-file/file2"
8945 msgstr "为 文件1/初始文件/文件2 设置标签"
8947 #: builtin/mktree.c:65
8948 msgid "git mktree [-z] [--missing] [--batch]"
8949 msgstr "git mktree [-z] [--missing] [--batch]"
8951 #: builtin/mktree.c:152
8952 msgid "input is NUL terminated"
8953 msgstr "输入以 NUL 字符终止"
8955 #: builtin/mktree.c:153 builtin/write-tree.c:24
8956 msgid "allow missing objects"
8959 #: builtin/mktree.c:154
8960 msgid "allow creation of more than one tree"
8964 msgid "git mv [<options>] <source>... <destination>"
8965 msgstr "git mv [<选项>] <源>... <目标>"
8969 msgid "Directory %s is in index and no submodule?"
8970 msgstr "目录 %s 在索引中并且不是子模组?"
8972 #: builtin/mv.c:72 builtin/rm.c:317
8973 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8974 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8978 msgid "%.*s is in index"
8982 msgid "force move/rename even if target exists"
8983 msgstr "强制移动/重命令,即使目标存在"
8986 msgid "skip move/rename errors"
8991 msgid "destination '%s' is not a directory"
8992 msgstr "目标 '%s' 不是一个目录"
8996 msgid "Checking rename of '%s' to '%s'\n"
8997 msgstr "检查 '%s' 到 '%s' 的重命名\n"
9004 msgid "can not move directory into itself"
9008 msgid "cannot move directory over file"
9012 msgid "source directory is empty"
9016 msgid "not under version control"
9020 msgid "destination exists"
9025 msgid "overwriting '%s'"
9029 msgid "Cannot overwrite"
9033 msgid "multiple sources for the same target"
9037 msgid "destination directory does not exist"
9042 msgid "%s, source=%s, destination=%s"
9043 msgstr "%s,源=%s,目标=%s"
9047 msgid "Renaming %s to %s\n"
9048 msgstr "重命名 %s 至 %s\n"
9050 #: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
9052 msgid "renaming '%s' failed"
9053 msgstr "重命名 '%s' 失败"
9055 #: builtin/name-rev.c:258
9056 msgid "git name-rev [<options>] <commit>..."
9057 msgstr "git name-rev [<选项>] <提交>..."
9059 #: builtin/name-rev.c:259
9060 msgid "git name-rev [<options>] --all"
9061 msgstr "git name-rev [<选项>] --all"
9063 #: builtin/name-rev.c:260
9064 msgid "git name-rev [<options>] --stdin"
9065 msgstr "git name-rev [<选项>] --stdin"
9067 #: builtin/name-rev.c:312
9068 msgid "print only names (no SHA-1)"
9069 msgstr "只打印名称(无 SHA-1)"
9071 #: builtin/name-rev.c:313
9072 msgid "only use tags to name the commits"
9075 #: builtin/name-rev.c:315
9076 msgid "only use refs matching <pattern>"
9077 msgstr "只使用和 <模式> 相匹配的引用"
9079 #: builtin/name-rev.c:317
9080 msgid "list all commits reachable from all refs"
9081 msgstr "列出可以从所有引用访问的提交"
9083 #: builtin/name-rev.c:318
9084 msgid "read from stdin"
9087 #: builtin/name-rev.c:319
9088 msgid "allow to print `undefined` names (default)"
9089 msgstr "允许打印 `未定义` 的名称(默认)"
9091 #: builtin/name-rev.c:325
9092 msgid "dereference tags in the input (internal use)"
9093 msgstr "反向解析输入中的标签(内部使用)"
9095 #: builtin/notes.c:25
9096 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
9097 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
9099 #: builtin/notes.c:26
9101 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
9102 "| (-c | -C) <object>] [<object>]"
9104 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
9105 "| (-c | -C) <对象>] [<对象>]"
9107 #: builtin/notes.c:27
9108 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
9109 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
9111 #: builtin/notes.c:28
9113 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
9114 "(-c | -C) <object>] [<object>]"
9116 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
9117 "(-c | -C) <对象>] [<对象>]"
9119 #: builtin/notes.c:29
9120 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
9121 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
9123 #: builtin/notes.c:30
9124 msgid "git notes [--ref <notes-ref>] show [<object>]"
9125 msgstr "git notes [--ref <注解引用>] show [<对象>]"
9127 #: builtin/notes.c:31
9129 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
9130 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
9132 #: builtin/notes.c:32
9133 msgid "git notes merge --commit [-v | -q]"
9134 msgstr "git notes merge --commit [-v | -q]"
9136 #: builtin/notes.c:33
9137 msgid "git notes merge --abort [-v | -q]"
9138 msgstr "git notes merge --abort [-v | -q]"
9140 #: builtin/notes.c:34
9141 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
9142 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
9144 #: builtin/notes.c:35
9145 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
9146 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
9148 #: builtin/notes.c:36
9149 msgid "git notes [--ref <notes-ref>] get-ref"
9150 msgstr "git notes [--ref <注解引用>] get-ref"
9152 #: builtin/notes.c:41
9153 msgid "git notes [list [<object>]]"
9154 msgstr "git notes [list [<对象>]]"
9156 #: builtin/notes.c:46
9157 msgid "git notes add [<options>] [<object>]"
9158 msgstr "git notes add [<选项>] [<对象>]"
9160 #: builtin/notes.c:51
9161 msgid "git notes copy [<options>] <from-object> <to-object>"
9162 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
9164 #: builtin/notes.c:52
9165 msgid "git notes copy --stdin [<from-object> <to-object>]..."
9166 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
9168 #: builtin/notes.c:57
9169 msgid "git notes append [<options>] [<object>]"
9170 msgstr "git notes append [<选项>] [<对象>]"
9172 #: builtin/notes.c:62
9173 msgid "git notes edit [<object>]"
9174 msgstr "git notes edit [<对象>]"
9176 #: builtin/notes.c:67
9177 msgid "git notes show [<object>]"
9178 msgstr "git notes show [<对象>]"
9180 #: builtin/notes.c:72
9181 msgid "git notes merge [<options>] <notes-ref>"
9182 msgstr "git notes merge [<选项>] <注解引用>"
9184 #: builtin/notes.c:73
9185 msgid "git notes merge --commit [<options>]"
9186 msgstr "git notes merge --commit [<选项>]"
9188 #: builtin/notes.c:74
9189 msgid "git notes merge --abort [<options>]"
9190 msgstr "git notes merge --abort [<选项>]"
9192 #: builtin/notes.c:79
9193 msgid "git notes remove [<object>]"
9194 msgstr "git notes remove [<对象>]"
9196 #: builtin/notes.c:84
9197 msgid "git notes prune [<options>]"
9198 msgstr "git notes prune [<选项>]"
9200 #: builtin/notes.c:89
9201 msgid "git notes get-ref"
9202 msgstr "git notes get-ref"
9204 #: builtin/notes.c:94
9205 msgid "Write/edit the notes for the following object:"
9206 msgstr "为下面的对象写/编辑说明:"
9208 #: builtin/notes.c:147
9210 msgid "unable to start 'show' for object '%s'"
9211 msgstr "不能为对象 '%s' 开始 'show'"
9213 #: builtin/notes.c:151
9214 msgid "could not read 'show' output"
9215 msgstr "不能读取 'show' 的输出"
9217 #: builtin/notes.c:159
9219 msgid "failed to finish 'show' for object '%s'"
9220 msgstr "无法为对象 '%s' 完成 'show'"
9222 #: builtin/notes.c:194
9223 msgid "Please supply the note contents using either -m or -F option"
9224 msgstr "请通过 -m 或 -F 选项为注解提供内容"
9226 #: builtin/notes.c:203
9227 msgid "unable to write note object"
9230 #: builtin/notes.c:205
9232 msgid "The note contents have been left in %s"
9233 msgstr "注解内容被留在 %s 中"
9235 #: builtin/notes.c:233 builtin/tag.c:439
9237 msgid "cannot read '%s'"
9240 #: builtin/notes.c:235 builtin/tag.c:442
9242 msgid "could not open or read '%s'"
9243 msgstr "不能打开或读取 '%s'"
9245 #: builtin/notes.c:257
9247 msgid "Failed to read object '%s'."
9248 msgstr "无法读取对象 '%s'。"
9250 #: builtin/notes.c:261
9252 msgid "Cannot read note data from non-blob object '%s'."
9253 msgstr "不能从非数据对象 '%s' 中读取注解数据"
9255 #: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494
9256 #: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650
9257 #: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968
9258 msgid "too many parameters"
9261 #: builtin/notes.c:376 builtin/notes.c:663
9263 msgid "No note found for object %s."
9264 msgstr "未发现对象 %s 的注解。"
9266 #: builtin/notes.c:397 builtin/notes.c:560
9267 msgid "note contents as a string"
9268 msgstr "注解内容作为一个字符串"
9270 #: builtin/notes.c:400 builtin/notes.c:563
9271 msgid "note contents in a file"
9274 #: builtin/notes.c:403 builtin/notes.c:566
9275 msgid "reuse and edit specified note object"
9276 msgstr "重用和编辑指定的注解对象"
9278 #: builtin/notes.c:406 builtin/notes.c:569
9279 msgid "reuse specified note object"
9282 #: builtin/notes.c:409 builtin/notes.c:572
9283 msgid "allow storing empty note"
9286 #: builtin/notes.c:410 builtin/notes.c:481
9287 msgid "replace existing notes"
9290 #: builtin/notes.c:435
9293 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
9295 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9297 #: builtin/notes.c:450 builtin/notes.c:529
9299 msgid "Overwriting existing notes for object %s\n"
9300 msgstr "覆盖对象 %s 现存注解\n"
9302 #: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887
9304 msgid "Removing note for object %s\n"
9305 msgstr "删除对象 %s 的注解\n"
9307 #: builtin/notes.c:482
9308 msgid "read objects from stdin"
9311 #: builtin/notes.c:484
9312 msgid "load rewriting config for <command> (implies --stdin)"
9313 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
9315 #: builtin/notes.c:502
9316 msgid "too few parameters"
9319 #: builtin/notes.c:523
9322 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
9324 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
9326 #: builtin/notes.c:535
9328 msgid "Missing notes on source object %s. Cannot copy."
9329 msgstr "源对象 %s 缺少注解。不能拷贝。"
9331 #: builtin/notes.c:587
9334 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
9335 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
9337 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
9338 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
9340 #: builtin/notes.c:753
9342 msgid "unknown notes merge strategy %s"
9343 msgstr "未知的注解合并策略 %s"
9345 #: builtin/notes.c:769
9346 msgid "General options"
9349 #: builtin/notes.c:771
9350 msgid "Merge options"
9353 #: builtin/notes.c:773
9355 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
9357 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
9359 #: builtin/notes.c:775
9360 msgid "Committing unmerged notes"
9363 #: builtin/notes.c:777
9364 msgid "finalize notes merge by committing unmerged notes"
9365 msgstr "通过提交未合并的注解来完成注解合并"
9367 #: builtin/notes.c:779
9368 msgid "Aborting notes merge resolution"
9371 #: builtin/notes.c:781
9372 msgid "abort notes merge"
9375 #: builtin/notes.c:792
9376 msgid "cannot mix --commit, --abort or -s/--strategy"
9377 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
9379 #: builtin/notes.c:797
9380 msgid "Must specify a notes ref to merge"
9381 msgstr "必须指定一个注解引用来合并"
9383 #: builtin/notes.c:821
9385 msgid "Unknown -s/--strategy: %s"
9386 msgstr "未知的 -s/--strategy:%s"
9388 #: builtin/notes.c:858
9390 msgid "A notes merge into %s is already in-progress at %s"
9391 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
9393 #: builtin/notes.c:861
9395 msgid "Failed to store link to current notes ref (%s)"
9396 msgstr "无法存储链接到当前注解的引用(%s)"
9398 #: builtin/notes.c:863
9401 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
9402 "'git notes merge --commit', or abort the merge with 'git notes merge --"
9404 msgstr "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
9406 #: builtin/notes.c:885
9408 msgid "Object %s has no note\n"
9409 msgstr "对象 %s 没有注解\n"
9411 #: builtin/notes.c:897
9412 msgid "attempt to remove non-existent note is not an error"
9413 msgstr "尝试删除不存在的注解不是一个错误"
9415 #: builtin/notes.c:900
9416 msgid "read object names from the standard input"
9417 msgstr "从标准输入读取对象名称"
9419 #: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127
9420 msgid "do not remove, show only"
9423 #: builtin/notes.c:939
9424 msgid "report pruned notes"
9427 #: builtin/notes.c:981
9431 #: builtin/notes.c:982
9432 msgid "use notes from <notes-ref>"
9433 msgstr "从 <注解引用> 使用注解"
9435 #: builtin/notes.c:1017 builtin/remote.c:1623
9437 msgid "Unknown subcommand: %s"
9440 #: builtin/pack-objects.c:28
9442 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
9443 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
9445 #: builtin/pack-objects.c:29
9447 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
9448 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
9450 #: builtin/pack-objects.c:177 builtin/pack-objects.c:180
9452 msgid "deflate error (%d)"
9455 #: builtin/pack-objects.c:766
9456 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
9457 msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
9459 #: builtin/pack-objects.c:779
9460 msgid "Writing objects"
9463 #: builtin/pack-objects.c:1037
9464 msgid "disabling bitmap writing, as some objects are not being packed"
9465 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
9467 #: builtin/pack-objects.c:2197
9468 msgid "Compressing objects"
9471 #: builtin/pack-objects.c:2611
9473 msgid "unsupported index version %s"
9474 msgstr "不支持的索引版本 %s"
9476 #: builtin/pack-objects.c:2615
9478 msgid "bad index version '%s'"
9479 msgstr "坏的索引版本 '%s'"
9481 #: builtin/pack-objects.c:2645
9482 msgid "do not show progress meter"
9485 #: builtin/pack-objects.c:2647
9486 msgid "show progress meter"
9489 #: builtin/pack-objects.c:2649
9490 msgid "show progress meter during object writing phase"
9491 msgstr "在对象写入阶段显示进度表"
9493 #: builtin/pack-objects.c:2652
9494 msgid "similar to --all-progress when progress meter is shown"
9495 msgstr "当进度表显示时类似于 --all-progress"
9497 #: builtin/pack-objects.c:2653
9498 msgid "version[,offset]"
9501 #: builtin/pack-objects.c:2654
9502 msgid "write the pack index file in the specified idx format version"
9503 msgstr "用指定的 idx 格式版本来写包索引文件"
9505 #: builtin/pack-objects.c:2657
9506 msgid "maximum size of each output pack file"
9509 #: builtin/pack-objects.c:2659
9510 msgid "ignore borrowed objects from alternate object store"
9511 msgstr "忽略从备用对象存储里借用对象"
9513 #: builtin/pack-objects.c:2661
9514 msgid "ignore packed objects"
9517 #: builtin/pack-objects.c:2663
9518 msgid "limit pack window by objects"
9521 #: builtin/pack-objects.c:2665
9522 msgid "limit pack window by memory in addition to object limit"
9523 msgstr "除对象数量限制外设置打包窗口的内存限制"
9525 #: builtin/pack-objects.c:2667
9526 msgid "maximum length of delta chain allowed in the resulting pack"
9527 msgstr "打包允许的 delta 链的最大长度"
9529 #: builtin/pack-objects.c:2669
9530 msgid "reuse existing deltas"
9531 msgstr "重用已存在的 deltas"
9533 #: builtin/pack-objects.c:2671
9534 msgid "reuse existing objects"
9537 #: builtin/pack-objects.c:2673
9538 msgid "use OFS_DELTA objects"
9539 msgstr "使用 OFS_DELTA 对象"
9541 #: builtin/pack-objects.c:2675
9542 msgid "use threads when searching for best delta matches"
9543 msgstr "使用线程查询最佳 delta 匹配"
9545 #: builtin/pack-objects.c:2677
9546 msgid "do not create an empty pack output"
9549 #: builtin/pack-objects.c:2679
9550 msgid "read revision arguments from standard input"
9551 msgstr "从标准输入读取版本号参数"
9553 #: builtin/pack-objects.c:2681
9554 msgid "limit the objects to those that are not yet packed"
9555 msgstr "限制那些尚未打包的对象"
9557 #: builtin/pack-objects.c:2684
9558 msgid "include objects reachable from any reference"
9559 msgstr "包括可以从任何引用访问到的对象"
9561 #: builtin/pack-objects.c:2687
9562 msgid "include objects referred by reflog entries"
9563 msgstr "包括被引用日志引用到的对象"
9565 #: builtin/pack-objects.c:2690
9566 msgid "include objects referred to by the index"
9567 msgstr "包括被索引引用到的对象"
9569 #: builtin/pack-objects.c:2693
9570 msgid "output pack to stdout"
9573 #: builtin/pack-objects.c:2695
9574 msgid "include tag objects that refer to objects to be packed"
9575 msgstr "包括那些引用了待打包对象的标签对象"
9577 #: builtin/pack-objects.c:2697
9578 msgid "keep unreachable objects"
9581 #: builtin/pack-objects.c:2699
9582 msgid "pack loose unreachable objects"
9585 #: builtin/pack-objects.c:2700 parse-options.h:142
9589 #: builtin/pack-objects.c:2701
9590 msgid "unpack unreachable objects newer than <time>"
9591 msgstr "将比给定 <时间> 新的无法访问的对象解包"
9593 #: builtin/pack-objects.c:2704
9594 msgid "create thin packs"
9597 #: builtin/pack-objects.c:2706
9598 msgid "create packs suitable for shallow fetches"
9599 msgstr "创建适合浅克隆仓库获取的包"
9601 #: builtin/pack-objects.c:2708
9602 msgid "ignore packs that have companion .keep file"
9603 msgstr "忽略配有 .keep 文件的包"
9605 #: builtin/pack-objects.c:2710
9606 msgid "pack compression level"
9609 #: builtin/pack-objects.c:2712
9610 msgid "do not hide commits by grafts"
9613 #: builtin/pack-objects.c:2714
9614 msgid "use a bitmap index if available to speed up counting objects"
9615 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
9617 #: builtin/pack-objects.c:2716
9618 msgid "write a bitmap index together with the pack index"
9619 msgstr "在建立包索引的同时创建 bitmap 索引"
9621 #: builtin/pack-objects.c:2829
9622 msgid "Counting objects"
9625 #: builtin/pack-refs.c:6
9626 msgid "git pack-refs [<options>]"
9627 msgstr "git pack-refs [<选项>]"
9629 #: builtin/pack-refs.c:14
9630 msgid "pack everything"
9633 #: builtin/pack-refs.c:15
9634 msgid "prune loose refs (default)"
9635 msgstr "清除松散的引用(默认)"
9637 #: builtin/prune-packed.c:7
9638 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
9639 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
9641 #: builtin/prune-packed.c:40
9642 msgid "Removing duplicate objects"
9645 #: builtin/prune.c:11
9646 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
9647 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
9649 #: builtin/prune.c:106 builtin/worktree.c:128
9650 msgid "report pruned objects"
9653 #: builtin/prune.c:109 builtin/worktree.c:130
9654 msgid "expire objects older than <time>"
9655 msgstr "使早于给定时间的对象过期"
9657 #: builtin/prune.c:123
9658 msgid "cannot prune in a precious-objects repo"
9659 msgstr "不能在珍品仓库中执行清理操作"
9661 #: builtin/pull.c:72
9662 msgid "git pull [<options>] [<repository> [<refspec>...]]"
9663 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
9665 #: builtin/pull.c:120
9666 msgid "Options related to merging"
9669 #: builtin/pull.c:123
9670 msgid "incorporate changes by rebasing rather than merging"
9671 msgstr "使用变基操作取代合并操作以合入修改"
9673 #: builtin/pull.c:147 builtin/revert.c:101
9674 msgid "allow fast-forward"
9677 #: builtin/pull.c:156
9678 msgid "automatically stash/stash pop before and after rebase"
9679 msgstr "自动在变基操作前后执行 stash/stash pop"
9681 #: builtin/pull.c:172
9682 msgid "Options related to fetching"
9685 #: builtin/pull.c:194
9686 msgid "number of submodules pulled in parallel"
9687 msgstr "并发拉取的子模组的数量"
9689 #: builtin/pull.c:283
9691 msgid "Invalid value for pull.ff: %s"
9692 msgstr "pull.ff 的取值无效:%s"
9694 #: builtin/pull.c:379 git-sh-setup.sh:226
9695 msgid "Cannot pull with rebase: You have unstaged changes."
9696 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
9698 #: builtin/pull.c:385 git-sh-setup.sh:252
9699 msgid "Additionally, your index contains uncommitted changes."
9700 msgstr "而且您的索引中包含未提交的变更。"
9702 #: builtin/pull.c:387 git-sh-setup.sh:245
9703 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
9704 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
9706 #: builtin/pull.c:463
9708 "There is no candidate for rebasing against among the refs that you just "
9710 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
9712 #: builtin/pull.c:465
9714 "There are no candidates for merging among the refs that you just fetched."
9715 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
9717 #: builtin/pull.c:466
9719 "Generally this means that you provided a wildcard refspec which had no\n"
9720 "matches on the remote end."
9721 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
9723 #: builtin/pull.c:469
9726 "You asked to pull from the remote '%s', but did not specify\n"
9727 "a branch. Because this is not the default configured remote\n"
9728 "for your current branch, you must specify a branch on the command line."
9730 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
9731 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
9733 #: builtin/pull.c:474 git-parse-remote.sh:73
9734 msgid "You are not currently on a branch."
9735 msgstr "您当前不在一个分支上。"
9737 #: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79
9738 msgid "Please specify which branch you want to rebase against."
9739 msgstr "请指定您要变基到哪一个分支。"
9741 #: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82
9742 msgid "Please specify which branch you want to merge with."
9743 msgstr "请指定您要合并哪一个分支。"
9745 #: builtin/pull.c:479 builtin/pull.c:494
9746 msgid "See git-pull(1) for details."
9747 msgstr "详见 git-pull(1)。"
9749 #: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496
9750 #: git-parse-remote.sh:64
9754 #: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451
9755 #: git-parse-remote.sh:65
9759 #: builtin/pull.c:489 git-parse-remote.sh:75
9760 msgid "There is no tracking information for the current branch."
9761 msgstr "当前分支没有跟踪信息。"
9763 #: builtin/pull.c:498 git-parse-remote.sh:95
9765 "If you wish to set tracking information for this branch you can do so with:"
9766 msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
9768 #: builtin/pull.c:503
9771 "Your configuration specifies to merge with the ref '%s'\n"
9772 "from the remote, but no such ref was fetched."
9774 "您的配置中指定要合并远程的引用 '%s',\n"
9777 #: builtin/pull.c:820
9778 msgid "ignoring --verify-signatures for rebase"
9779 msgstr "为变基操作忽略 --verify-signatures"
9781 #: builtin/pull.c:867
9782 msgid "--[no-]autostash option is only valid with --rebase."
9783 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
9785 #: builtin/pull.c:875
9786 msgid "Updating an unborn branch with changes added to the index."
9787 msgstr "更新尚未诞生的分支,变更添加至索引。"
9789 #: builtin/pull.c:903
9792 "fetch updated the current branch head.\n"
9793 "fast-forwarding your working tree from\n"
9796 "fetch 更新了当前的分支。快进您的工作区\n"
9799 #: builtin/pull.c:908
9802 "Cannot fast-forward your working tree.\n"
9803 "After making sure that you saved anything precious from\n"
9806 "$ git reset --hard\n"
9809 "您当前的工作区无法执行快进操作。\n"
9812 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
9813 "$ git reset --hard\n"
9816 #: builtin/pull.c:923
9817 msgid "Cannot merge multiple branches into empty head."
9818 msgstr "无法将多个分支合并到空分支。"
9820 #: builtin/pull.c:927
9821 msgid "Cannot rebase onto multiple branches."
9824 #: builtin/push.c:16
9825 msgid "git push [<options>] [<repository> [<refspec>...]]"
9826 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9828 #: builtin/push.c:89
9829 msgid "tag shorthand without <tag>"
9830 msgstr "标签后面未提供 <标签> 参数"
9832 #: builtin/push.c:99
9833 msgid "--delete only accepts plain target ref names"
9834 msgstr "--delete 只接受简单的目标引用名"
9836 #: builtin/push.c:143
9839 "To choose either option permanently, see push.default in 'git help config'."
9842 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9844 #: builtin/push.c:146
9847 "The upstream branch of your current branch does not match\n"
9848 "the name of your current branch. To push to the upstream branch\n"
9849 "on the remote, use\n"
9851 " git push %s HEAD:%s\n"
9853 "To push to the branch of the same name on the remote, use\n"
9858 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9861 " git push %s HEAD:%s\n"
9868 #: builtin/push.c:161
9871 "You are not currently on a branch.\n"
9872 "To push the history leading to the current (detached HEAD)\n"
9875 " git push %s HEAD:<name-of-remote-branch>\n"
9878 "现在为推送当前(分离头指针)的历史,使用\n"
9880 " git push %s HEAD:<远程分支名字>\n"
9882 #: builtin/push.c:175
9885 "The current branch %s has no upstream branch.\n"
9886 "To push the current branch and set the remote as upstream, use\n"
9888 " git push --set-upstream %s %s\n"
9890 "当前分支 %s 没有对应的上游分支。\n"
9891 "为推送当前分支并建立与远程上游的跟踪,使用\n"
9893 " git push --set-upstream %s %s\n"
9895 #: builtin/push.c:183
9897 msgid "The current branch %s has multiple upstream branches, refusing to push."
9898 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9900 #: builtin/push.c:186
9903 "You are pushing to remote '%s', which is not the upstream of\n"
9904 "your current branch '%s', without telling me what to push\n"
9905 "to update which remote branch."
9907 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9908 "而没有告诉我要推送什么、更新哪个远程分支。"
9910 #: builtin/push.c:242
9912 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
9913 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9915 #: builtin/push.c:249
9917 "Updates were rejected because the tip of your current branch is behind\n"
9918 "its remote counterpart. Integrate the remote changes (e.g.\n"
9919 "'git pull ...') before pushing again.\n"
9920 "See the 'Note about fast-forwards' in 'git push --help' for details."
9922 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9923 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9924 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9926 #: builtin/push.c:255
9928 "Updates were rejected because a pushed branch tip is behind its remote\n"
9929 "counterpart. Check out this branch and integrate the remote changes\n"
9930 "(e.g. 'git pull ...') before pushing again.\n"
9931 "See the 'Note about fast-forwards' in 'git push --help' for details."
9933 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9934 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9935 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9937 #: builtin/push.c:261
9939 "Updates were rejected because the remote contains work that you do\n"
9940 "not have locally. This is usually caused by another repository pushing\n"
9941 "to the same ref. You may want to first integrate the remote changes\n"
9942 "(e.g., 'git pull ...') before pushing again.\n"
9943 "See the 'Note about fast-forwards' in 'git push --help' for details."
9945 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9946 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9947 "(如 'git pull ...')。\n"
9948 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9950 #: builtin/push.c:268
9951 msgid "Updates were rejected because the tag already exists in the remote."
9952 msgstr "更新被拒绝,因为该标签在远程已经存在。"
9954 #: builtin/push.c:271
9956 "You cannot update a remote ref that points at a non-commit object,\n"
9957 "or update a remote ref to make it point at a non-commit object,\n"
9958 "without using the '--force' option.\n"
9960 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9961 "也不能更新远程引用让其指向一个非提交对象。\n"
9963 #: builtin/push.c:331
9965 msgid "Pushing to %s\n"
9968 #: builtin/push.c:335
9970 msgid "failed to push some refs to '%s'"
9971 msgstr "无法推送一些引用到 '%s'"
9973 #: builtin/push.c:366
9975 msgid "bad repository '%s'"
9978 #: builtin/push.c:367
9980 "No configured push destination.\n"
9981 "Either specify the URL from the command-line or configure a remote "
9982 "repository using\n"
9984 " git remote add <name> <url>\n"
9986 "and then push using the remote name\n"
9988 " git push <name>\n"
9991 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9993 " git remote add <名称> <地址>\n"
9999 #: builtin/push.c:385
10000 msgid "--all and --tags are incompatible"
10001 msgstr "--all 和 --tags 不兼容"
10003 #: builtin/push.c:386
10004 msgid "--all can't be combined with refspecs"
10005 msgstr "--all 不能和引用规格同时使用"
10007 #: builtin/push.c:391
10008 msgid "--mirror and --tags are incompatible"
10009 msgstr "--mirror 和 --tags 不兼容"
10011 #: builtin/push.c:392
10012 msgid "--mirror can't be combined with refspecs"
10013 msgstr "--mirror 不能和引用规格同时使用"
10015 #: builtin/push.c:397
10016 msgid "--all and --mirror are incompatible"
10017 msgstr "--all 和 --mirror 不兼容"
10019 #: builtin/push.c:515
10023 #: builtin/push.c:516 builtin/send-pack.c:161
10024 msgid "push all refs"
10027 #: builtin/push.c:517 builtin/send-pack.c:163
10028 msgid "mirror all refs"
10031 #: builtin/push.c:519
10032 msgid "delete refs"
10035 #: builtin/push.c:520
10036 msgid "push tags (can't be used with --all or --mirror)"
10037 msgstr "推送标签(不能使用 --all or --mirror)"
10039 #: builtin/push.c:523 builtin/send-pack.c:164
10040 msgid "force updates"
10043 #: builtin/push.c:525 builtin/send-pack.c:175
10044 msgid "refname>:<expect"
10047 #: builtin/push.c:526 builtin/send-pack.c:176
10048 msgid "require old value of ref to be at this value"
10049 msgstr "要求引用旧的取值为设定值"
10051 #: builtin/push.c:529
10052 msgid "control recursive pushing of submodules"
10053 msgstr "控制子模组的递归推送"
10055 #: builtin/push.c:531 builtin/send-pack.c:169
10056 msgid "use thin pack"
10059 #: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
10060 #: builtin/send-pack.c:159
10061 msgid "receive pack program"
10064 #: builtin/push.c:534
10065 msgid "set upstream for git pull/status"
10066 msgstr "设置 git pull/status 的上游"
10068 #: builtin/push.c:537
10069 msgid "prune locally removed refs"
10072 #: builtin/push.c:539
10073 msgid "bypass pre-push hook"
10074 msgstr "绕过 pre-push 钩子"
10076 #: builtin/push.c:540
10077 msgid "push missing but relevant tags"
10078 msgstr "推送缺失但有关的标签"
10080 #: builtin/push.c:543 builtin/send-pack.c:166
10081 msgid "GPG sign the push"
10082 msgstr "用 GPG 为推送签名"
10084 #: builtin/push.c:545 builtin/send-pack.c:170
10085 msgid "request atomic transaction on remote side"
10086 msgstr "需要远端支持原子事务"
10088 #: builtin/push.c:546
10089 msgid "server-specific"
10090 msgstr "server-specific"
10092 #: builtin/push.c:546
10093 msgid "option to transmit"
10096 #: builtin/push.c:560
10097 msgid "--delete is incompatible with --all, --mirror and --tags"
10098 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
10100 #: builtin/push.c:562
10101 msgid "--delete doesn't make sense without any refs"
10102 msgstr "--delete 未接任何引用没有意义"
10104 #: builtin/push.c:579
10105 msgid "push options must not have new line characters"
10106 msgstr "推送选项不能有换行符"
10108 #: builtin/read-tree.c:37
10110 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
10111 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10112 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
10114 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
10115 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
10116 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
10118 #: builtin/read-tree.c:110
10119 msgid "write resulting index to <file>"
10120 msgstr "将索引结果写入 <文件>"
10122 #: builtin/read-tree.c:113
10123 msgid "only empty the index"
10126 #: builtin/read-tree.c:115
10130 #: builtin/read-tree.c:117
10131 msgid "perform a merge in addition to a read"
10132 msgstr "读取之余再执行一个合并"
10134 #: builtin/read-tree.c:119
10135 msgid "3-way merge if no file level merging required"
10136 msgstr "如果没有文件级合并需要,执行三方合并"
10138 #: builtin/read-tree.c:121
10139 msgid "3-way merge in presence of adds and removes"
10140 msgstr "存在添加和删除时,也执行三方合并"
10142 #: builtin/read-tree.c:123
10143 msgid "same as -m, but discard unmerged entries"
10144 msgstr "类似于 -m,但丢弃未合并的条目"
10146 #: builtin/read-tree.c:124
10147 msgid "<subdirectory>/"
10150 #: builtin/read-tree.c:125
10151 msgid "read the tree into the index under <subdirectory>/"
10152 msgstr "读取树对象到索引的 <子目录>/ 下"
10154 #: builtin/read-tree.c:128
10155 msgid "update working tree with merge result"
10156 msgstr "用合并的结果更新工作区"
10158 #: builtin/read-tree.c:130
10162 #: builtin/read-tree.c:131
10163 msgid "allow explicitly ignored files to be overwritten"
10164 msgstr "允许忽略文件中设定的文件可以被覆盖"
10166 #: builtin/read-tree.c:134
10167 msgid "don't check the working tree after merging"
10170 #: builtin/read-tree.c:135
10171 msgid "don't update the index or the work tree"
10172 msgstr "不更新索引区和工作区"
10174 #: builtin/read-tree.c:137
10175 msgid "skip applying sparse checkout filter"
10176 msgstr "跳过应用稀疏检出过滤器"
10178 #: builtin/read-tree.c:139
10179 msgid "debug unpack-trees"
10180 msgstr "调试 unpack-trees"
10182 #: builtin/receive-pack.c:25
10183 msgid "git receive-pack <git-dir>"
10184 msgstr "git receive-pack <git-dir>"
10186 #: builtin/receive-pack.c:1843
10190 #: builtin/receive-pack.c:1857
10191 msgid "You must specify a directory."
10192 msgstr "您必须指定一个目录。"
10194 #: builtin/reflog.c:423
10196 msgid "'%s' for '%s' is not a valid timestamp"
10197 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
10199 #: builtin/reflog.c:540 builtin/reflog.c:545
10201 msgid "'%s' is not a valid timestamp"
10202 msgstr "'%s' 不是一个有效的时间戳"
10204 #: builtin/remote.c:12
10205 msgid "git remote [-v | --verbose]"
10206 msgstr "git remote [-v | --verbose]"
10208 #: builtin/remote.c:13
10210 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
10211 "mirror=<fetch|push>] <name> <url>"
10213 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
10214 "mirror=<fetch|push>] <名称> <地址>"
10216 #: builtin/remote.c:14 builtin/remote.c:34
10217 msgid "git remote rename <old> <new>"
10218 msgstr "git remote rename <旧名称> <新名称>"
10220 #: builtin/remote.c:15 builtin/remote.c:39
10221 msgid "git remote remove <name>"
10222 msgstr "git remote remove <名称>"
10224 #: builtin/remote.c:16 builtin/remote.c:44
10225 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
10226 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
10228 #: builtin/remote.c:17
10229 msgid "git remote [-v | --verbose] show [-n] <name>"
10230 msgstr "git remote [-v | --verbose] show [-n] <名称>"
10232 #: builtin/remote.c:18
10233 msgid "git remote prune [-n | --dry-run] <name>"
10234 msgstr "git remote prune [-n | --dry-run] <名称>"
10236 #: builtin/remote.c:19
10238 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
10239 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
10241 #: builtin/remote.c:20
10242 msgid "git remote set-branches [--add] <name> <branch>..."
10243 msgstr "git remote set-branches [--add] <名称> <分支>..."
10245 #: builtin/remote.c:21 builtin/remote.c:70
10246 msgid "git remote get-url [--push] [--all] <name>"
10247 msgstr "git remote get-url [--push] [--all] <名称>"
10249 #: builtin/remote.c:22 builtin/remote.c:75
10250 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
10251 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
10253 #: builtin/remote.c:23 builtin/remote.c:76
10254 msgid "git remote set-url --add <name> <newurl>"
10255 msgstr "git remote set-url --add <名称> <新的地址>"
10257 #: builtin/remote.c:24 builtin/remote.c:77
10258 msgid "git remote set-url --delete <name> <url>"
10259 msgstr "git remote set-url --delete <名称> <地址>"
10261 #: builtin/remote.c:29
10262 msgid "git remote add [<options>] <name> <url>"
10263 msgstr "git remote add [<选项>] <名称> <地址>"
10265 #: builtin/remote.c:49
10266 msgid "git remote set-branches <name> <branch>..."
10267 msgstr "git remote set-branches <名称> <分支>..."
10269 #: builtin/remote.c:50
10270 msgid "git remote set-branches --add <name> <branch>..."
10271 msgstr "git remote set-branches --add <名称> <分支>..."
10273 #: builtin/remote.c:55
10274 msgid "git remote show [<options>] <name>"
10275 msgstr "git remote show [<选项>] <名称>"
10277 #: builtin/remote.c:60
10278 msgid "git remote prune [<options>] <name>"
10279 msgstr "git remote prune [<选项>] <名称>"
10281 #: builtin/remote.c:65
10282 msgid "git remote update [<options>] [<group> | <remote>]..."
10283 msgstr "git remote update [<选项>] [<组> | <远程>]..."
10285 #: builtin/remote.c:94
10287 msgid "Updating %s"
10290 #: builtin/remote.c:126
10292 "--mirror is dangerous and deprecated; please\n"
10293 "\t use --mirror=fetch or --mirror=push instead"
10295 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
10296 "\t 或 --mirror=push"
10298 #: builtin/remote.c:143
10300 msgid "unknown mirror argument: %s"
10301 msgstr "未知的镜像参数:%s"
10303 #: builtin/remote.c:159
10304 msgid "fetch the remote branches"
10307 #: builtin/remote.c:161
10308 msgid "import all tags and associated objects when fetching"
10309 msgstr "抓取时导入所有的标签和关联对象"
10311 #: builtin/remote.c:164
10312 msgid "or do not fetch any tag at all (--no-tags)"
10313 msgstr "或不抓取任何标签(--no-tags)"
10315 #: builtin/remote.c:166
10316 msgid "branch(es) to track"
10319 #: builtin/remote.c:167
10320 msgid "master branch"
10323 #: builtin/remote.c:168
10325 msgstr "push|fetch"
10327 #: builtin/remote.c:169
10328 msgid "set up remote as a mirror to push to or fetch from"
10329 msgstr "把远程设置为用以推送或抓取的镜像"
10331 #: builtin/remote.c:181
10332 msgid "specifying a master branch makes no sense with --mirror"
10333 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
10335 #: builtin/remote.c:183
10336 msgid "specifying branches to track makes sense only with fetch mirrors"
10337 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
10339 #: builtin/remote.c:190 builtin/remote.c:629
10341 msgid "remote %s already exists."
10342 msgstr "远程 %s 已经存在。"
10344 #: builtin/remote.c:194 builtin/remote.c:633
10346 msgid "'%s' is not a valid remote name"
10347 msgstr "'%s' 不是一个有效的远程名称"
10349 #: builtin/remote.c:234
10351 msgid "Could not setup master '%s'"
10352 msgstr "无法设置 master '%s'"
10354 #: builtin/remote.c:336
10356 msgid "Could not get fetch map for refspec %s"
10357 msgstr "无法得到引用规格 %s 的获取列表"
10359 #: builtin/remote.c:437 builtin/remote.c:445
10363 #: builtin/remote.c:449
10367 #: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
10369 msgid "No such remote: %s"
10370 msgstr "没有这样的远程:%s"
10372 #: builtin/remote.c:639
10374 msgid "Could not rename config section '%s' to '%s'"
10375 msgstr "不能重命名配置小节 '%s' 到 '%s'"
10377 #: builtin/remote.c:659
10380 "Not updating non-default fetch refspec\n"
10382 "\tPlease update the configuration manually if necessary."
10388 #: builtin/remote.c:695
10390 msgid "deleting '%s' failed"
10391 msgstr "删除 '%s' 失败"
10393 #: builtin/remote.c:729
10395 msgid "creating '%s' failed"
10396 msgstr "创建 '%s' 失败"
10398 #: builtin/remote.c:792
10400 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
10401 "to delete it, use:"
10403 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
10404 "to delete them, use:"
10405 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
10406 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
10408 #: builtin/remote.c:806
10410 msgid "Could not remove config section '%s'"
10411 msgstr "不能移除配置小节 '%s'"
10413 #: builtin/remote.c:907
10415 msgid " new (next fetch will store in remotes/%s)"
10416 msgstr " 新的(下一次获取将存储于 remotes/%s)"
10418 #: builtin/remote.c:910
10422 #: builtin/remote.c:912
10423 msgid " stale (use 'git remote prune' to remove)"
10424 msgstr " 过时(使用 'git remote prune' 来移除)"
10426 #: builtin/remote.c:914
10430 #: builtin/remote.c:955
10432 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
10433 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
10435 #: builtin/remote.c:963
10437 msgid "rebases interactively onto remote %s"
10438 msgstr "交互式变基到远程 %s"
10440 #: builtin/remote.c:964
10442 msgid "rebases onto remote %s"
10445 #: builtin/remote.c:967
10447 msgid " merges with remote %s"
10448 msgstr " 与远程 %s 合并"
10450 #: builtin/remote.c:970
10452 msgid "merges with remote %s"
10455 #: builtin/remote.c:973
10457 msgid "%-*s and with remote %s\n"
10458 msgstr "%-*s 以及和远程 %s\n"
10460 #: builtin/remote.c:1016
10464 #: builtin/remote.c:1019
10468 #: builtin/remote.c:1023
10472 #: builtin/remote.c:1026
10473 msgid "fast-forwardable"
10476 #: builtin/remote.c:1029
10477 msgid "local out of date"
10480 #: builtin/remote.c:1036
10482 msgid " %-*s forces to %-*s (%s)"
10483 msgstr " %-*s 强制推送至 %-*s (%s)"
10485 #: builtin/remote.c:1039
10487 msgid " %-*s pushes to %-*s (%s)"
10488 msgstr " %-*s 推送至 %-*s (%s)"
10490 #: builtin/remote.c:1043
10492 msgid " %-*s forces to %s"
10493 msgstr " %-*s 强制推送至 %s"
10495 #: builtin/remote.c:1046
10497 msgid " %-*s pushes to %s"
10498 msgstr " %-*s 推送至 %s"
10500 #: builtin/remote.c:1114
10501 msgid "do not query remotes"
10504 #: builtin/remote.c:1141
10506 msgid "* remote %s"
10509 #: builtin/remote.c:1142
10511 msgid " Fetch URL: %s"
10514 #: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296
10518 #. TRANSLATORS: the colon ':' should align with
10519 #. the one in " Fetch URL: %s" translation
10520 #: builtin/remote.c:1154 builtin/remote.c:1156
10522 msgid " Push URL: %s"
10525 #: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
10527 msgid " HEAD branch: %s"
10528 msgstr " HEAD 分支:%s"
10530 # 译者:中文字符串拼接,可删除前导空格
10531 #: builtin/remote.c:1158
10532 msgid "(not queried)"
10535 #: builtin/remote.c:1160
10539 #: builtin/remote.c:1164
10542 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
10543 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
10545 #: builtin/remote.c:1176
10547 msgid " Remote branch:%s"
10548 msgid_plural " Remote branches:%s"
10549 msgstr[0] " 远程分支:%s"
10550 msgstr[1] " 远程分支:%s"
10552 # 译者:中文字符串拼接,可删除前导空格
10553 #: builtin/remote.c:1179 builtin/remote.c:1206
10554 msgid " (status not queried)"
10557 #: builtin/remote.c:1188
10558 msgid " Local branch configured for 'git pull':"
10559 msgid_plural " Local branches configured for 'git pull':"
10560 msgstr[0] " 为 'git pull' 配置的本地分支:"
10561 msgstr[1] " 为 'git pull' 配置的本地分支:"
10563 #: builtin/remote.c:1196
10564 msgid " Local refs will be mirrored by 'git push'"
10565 msgstr " 本地引用将在 'git push' 时被镜像"
10567 #: builtin/remote.c:1203
10569 msgid " Local ref configured for 'git push'%s:"
10570 msgid_plural " Local refs configured for 'git push'%s:"
10571 msgstr[0] " 为 'git push' 配置的本地引用%s:"
10572 msgstr[1] " 为 'git push' 配置的本地引用%s:"
10574 #: builtin/remote.c:1224
10575 msgid "set refs/remotes/<name>/HEAD according to remote"
10576 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
10578 #: builtin/remote.c:1226
10579 msgid "delete refs/remotes/<name>/HEAD"
10580 msgstr "删除 refs/remotes/<名称>/HEAD"
10582 #: builtin/remote.c:1241
10583 msgid "Cannot determine remote HEAD"
10584 msgstr "无法确定远程 HEAD"
10586 #: builtin/remote.c:1243
10587 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
10588 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
10590 #: builtin/remote.c:1253
10592 msgid "Could not delete %s"
10595 #: builtin/remote.c:1261
10597 msgid "Not a valid ref: %s"
10598 msgstr "不是一个有效引用:%s"
10600 #: builtin/remote.c:1263
10602 msgid "Could not setup %s"
10606 #: builtin/remote.c:1281
10608 msgid " %s will become dangling!"
10609 msgstr " %s 将成为摇摆状态!"
10612 #: builtin/remote.c:1282
10614 msgid " %s has become dangling!"
10615 msgstr " %s 已成为摇摆状态!"
10617 #: builtin/remote.c:1292
10622 #: builtin/remote.c:1293
10627 #: builtin/remote.c:1309
10629 msgid " * [would prune] %s"
10630 msgstr " * [将删除] %s"
10632 #: builtin/remote.c:1312
10634 msgid " * [pruned] %s"
10635 msgstr " * [已删除] %s"
10637 #: builtin/remote.c:1357
10638 msgid "prune remotes after fetching"
10641 #: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542
10643 msgid "No such remote '%s'"
10644 msgstr "没有此远程 '%s'"
10646 #: builtin/remote.c:1436
10650 #: builtin/remote.c:1443
10651 msgid "no remote specified"
10654 #: builtin/remote.c:1460
10655 msgid "query push URLs rather than fetch URLs"
10656 msgstr "查询推送 URL 地址,而非获取 URL 地址"
10658 #: builtin/remote.c:1462
10659 msgid "return all URLs"
10660 msgstr "返回所有 URL 地址"
10662 #: builtin/remote.c:1490
10664 msgid "no URLs configured for remote '%s'"
10665 msgstr "没有给远程仓库 '%s' 设定 URL"
10667 #: builtin/remote.c:1516
10668 msgid "manipulate push URLs"
10671 #: builtin/remote.c:1518
10675 #: builtin/remote.c:1520
10676 msgid "delete URLs"
10679 #: builtin/remote.c:1527
10680 msgid "--add --delete doesn't make sense"
10681 msgstr "--add --delete 无意义"
10683 #: builtin/remote.c:1568
10685 msgid "Invalid old URL pattern: %s"
10686 msgstr "无效的旧 URL 匹配模版:%s"
10688 #: builtin/remote.c:1576
10690 msgid "No such URL found: %s"
10691 msgstr "未找到此 URL:%s"
10693 #: builtin/remote.c:1578
10694 msgid "Will not delete all non-push URLs"
10695 msgstr "将不会删除所有非推送 URL 地址"
10697 #: builtin/remote.c:1592
10698 msgid "be verbose; must be placed before a subcommand"
10699 msgstr "冗长输出;必须置于子命令之前"
10701 #: builtin/repack.c:17
10702 msgid "git repack [<options>]"
10703 msgstr "git repack [<选项>]"
10705 #: builtin/repack.c:160
10706 msgid "pack everything in a single pack"
10707 msgstr "所有内容打包到一个包文件中"
10709 #: builtin/repack.c:162
10710 msgid "same as -a, and turn unreachable objects loose"
10711 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
10713 #: builtin/repack.c:165
10714 msgid "remove redundant packs, and run git-prune-packed"
10715 msgstr "删除多余的包,运行 git-prune-packed"
10717 #: builtin/repack.c:167
10718 msgid "pass --no-reuse-delta to git-pack-objects"
10719 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
10721 #: builtin/repack.c:169
10722 msgid "pass --no-reuse-object to git-pack-objects"
10723 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
10725 #: builtin/repack.c:171
10726 msgid "do not run git-update-server-info"
10727 msgstr "不运行 git-update-server-info"
10729 #: builtin/repack.c:174
10730 msgid "pass --local to git-pack-objects"
10731 msgstr "向 git-pack-objects 传递参数 --local"
10733 #: builtin/repack.c:176
10734 msgid "write bitmap index"
10735 msgstr "写 bitmap 索引"
10737 #: builtin/repack.c:177
10738 msgid "approxidate"
10741 #: builtin/repack.c:178
10742 msgid "with -A, do not loosen objects older than this"
10743 msgstr "使用 -A,不要将早于给定时间的对象过期"
10745 #: builtin/repack.c:180
10746 msgid "with -a, repack unreachable objects"
10747 msgstr "使用 -a ,重新对不可达对象打包"
10749 #: builtin/repack.c:182
10750 msgid "size of the window used for delta compression"
10751 msgstr "用于增量压缩的窗口值"
10753 #: builtin/repack.c:183 builtin/repack.c:187
10757 #: builtin/repack.c:184
10758 msgid "same as the above, but limit memory size instead of entries count"
10759 msgstr "和上面的相似,但限制内存大小而非条目数"
10761 #: builtin/repack.c:186
10762 msgid "limits the maximum delta depth"
10765 #: builtin/repack.c:188
10766 msgid "maximum size of each packfile"
10767 msgstr "每个包文件的最大尺寸"
10769 #: builtin/repack.c:190
10770 msgid "repack objects in packs marked with .keep"
10771 msgstr "对标记为 .keep 的包中的对象重新打包"
10773 #: builtin/repack.c:200
10774 msgid "cannot delete packs in a precious-objects repo"
10775 msgstr "不能删除珍品仓库中的打包文件"
10777 #: builtin/repack.c:204
10778 msgid "--keep-unreachable and -A are incompatible"
10779 msgstr "--keep-unreachable 和 -A 不兼容"
10781 #: builtin/repack.c:391 builtin/worktree.c:115
10783 msgid "failed to remove '%s'"
10786 #: builtin/replace.c:19
10787 msgid "git replace [-f] <object> <replacement>"
10788 msgstr "git replace [-f] <对象> <替换物>"
10790 #: builtin/replace.c:20
10791 msgid "git replace [-f] --edit <object>"
10792 msgstr "git replace [-f] --edit <对象>"
10794 #: builtin/replace.c:21
10795 msgid "git replace [-f] --graft <commit> [<parent>...]"
10796 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10798 #: builtin/replace.c:22
10799 msgid "git replace -d <object>..."
10800 msgstr "git replace -d <对象>..."
10802 #: builtin/replace.c:23
10803 msgid "git replace [--format=<format>] [-l [<pattern>]]"
10804 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10806 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10808 msgid "Not a valid object name: '%s'"
10809 msgstr "不是一个有效的对象名:'%s'"
10811 #: builtin/replace.c:355
10813 msgid "bad mergetag in commit '%s'"
10814 msgstr "提交 '%s' 中含有损坏的合并标签"
10816 #: builtin/replace.c:357
10818 msgid "malformed mergetag in commit '%s'"
10819 msgstr "提交 '%s' 中含有非法的合并标签"
10821 #: builtin/replace.c:368
10824 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10825 "instead of --graft"
10826 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10828 #: builtin/replace.c:401
10830 msgid "the original commit '%s' has a gpg signature."
10831 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10833 #: builtin/replace.c:402
10834 msgid "the signature will be removed in the replacement commit!"
10835 msgstr "在替换的提交中签名将被移除!"
10837 #: builtin/replace.c:408
10839 msgid "could not write replacement commit for: '%s'"
10840 msgstr "不能为 '%s' 写替换提交"
10842 #: builtin/replace.c:432
10843 msgid "list replace refs"
10846 #: builtin/replace.c:433
10847 msgid "delete replace refs"
10850 #: builtin/replace.c:434
10851 msgid "edit existing object"
10854 #: builtin/replace.c:435
10855 msgid "change a commit's parents"
10856 msgstr "修改一个提交的父提交"
10858 #: builtin/replace.c:436
10859 msgid "replace the ref if it exists"
10862 #: builtin/replace.c:437
10863 msgid "do not pretty-print contents for --edit"
10864 msgstr "不要为 --edit 操作美观显示内容"
10866 #: builtin/replace.c:438
10867 msgid "use this format"
10870 #: builtin/rerere.c:12
10871 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10872 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10874 #: builtin/rerere.c:58
10875 msgid "register clean resolutions in index"
10876 msgstr "在索引中注册干净的解决方案"
10878 #: builtin/reset.c:26
10880 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10881 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10883 #: builtin/reset.c:27
10884 msgid "git reset [-q] <tree-ish> [--] <paths>..."
10885 msgstr "git reset [-q] <树或提交> [--] <路径>..."
10887 #: builtin/reset.c:28
10888 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10889 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10891 #: builtin/reset.c:34
10895 #: builtin/reset.c:34
10899 #: builtin/reset.c:34
10903 #: builtin/reset.c:34
10907 #: builtin/reset.c:34
10911 #: builtin/reset.c:74
10912 msgid "You do not have a valid HEAD."
10913 msgstr "您没有一个有效的 HEAD。"
10915 #: builtin/reset.c:76
10916 msgid "Failed to find tree of HEAD."
10917 msgstr "无法找到 HEAD 指向的树。"
10919 #: builtin/reset.c:82
10921 msgid "Failed to find tree of %s."
10922 msgstr "无法找到 %s 指向的树。"
10924 #: builtin/reset.c:100
10926 msgid "HEAD is now at %s"
10927 msgstr "HEAD 现在位于 %s"
10929 # 译者:汉字之间无空格,故删除%s前后空格
10930 #: builtin/reset.c:183
10932 msgid "Cannot do a %s reset in the middle of a merge."
10933 msgstr "在合并过程中不能做%s重置操作。"
10935 #: builtin/reset.c:276
10936 msgid "be quiet, only report errors"
10937 msgstr "安静模式,只报告错误"
10939 #: builtin/reset.c:278
10940 msgid "reset HEAD and index"
10941 msgstr "重置 HEAD 和索引"
10943 #: builtin/reset.c:279
10944 msgid "reset only HEAD"
10947 #: builtin/reset.c:281 builtin/reset.c:283
10948 msgid "reset HEAD, index and working tree"
10949 msgstr "重置 HEAD、索引和工作区"
10951 #: builtin/reset.c:285
10952 msgid "reset HEAD but keep local changes"
10953 msgstr "重置 HEAD 但保存本地变更"
10955 #: builtin/reset.c:288
10956 msgid "record only the fact that removed paths will be added later"
10957 msgstr "将删除的路径标记为稍后添加"
10959 #: builtin/reset.c:305
10961 msgid "Failed to resolve '%s' as a valid revision."
10962 msgstr "无法将 '%s' 解析为一个有效的版本。"
10964 #: builtin/reset.c:313
10966 msgid "Failed to resolve '%s' as a valid tree."
10967 msgstr "无法将 '%s' 解析为一个有效的树对象。"
10969 #: builtin/reset.c:322
10970 msgid "--patch is incompatible with --{hard,mixed,soft}"
10971 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10973 #: builtin/reset.c:331
10974 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10975 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10977 # 译者:汉字之间无空格,故删除%s前后空格
10978 #: builtin/reset.c:333
10980 msgid "Cannot do %s reset with paths."
10981 msgstr "不能带路径进行%s重置。"
10983 # 译者:汉字之间无空格,故删除%s前后空格
10984 #: builtin/reset.c:343
10986 msgid "%s reset is not allowed in a bare repository"
10987 msgstr "不能对纯仓库进行%s重置"
10989 #: builtin/reset.c:347
10990 msgid "-N can only be used with --mixed"
10991 msgstr "-N 只能和 --mixed 同时使用"
10993 #: builtin/reset.c:364
10994 msgid "Unstaged changes after reset:"
10995 msgstr "重置后取消暂存的变更:"
10997 #: builtin/reset.c:370
10999 msgid "Could not reset index file to revision '%s'."
11000 msgstr "不能重置索引文件至版本 '%s'。"
11002 #: builtin/reset.c:374
11003 msgid "Could not write new index file."
11004 msgstr "不能写入新的索引文件。"
11006 #: builtin/rev-list.c:362
11007 msgid "rev-list does not support display of notes"
11008 msgstr "rev-list 不支持显示注解"
11010 #: builtin/rev-parse.c:358
11011 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
11012 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
11014 #: builtin/rev-parse.c:363
11015 msgid "keep the `--` passed as an arg"
11016 msgstr "保持 `--` 作为一个参数传递"
11018 #: builtin/rev-parse.c:365
11019 msgid "stop parsing after the first non-option argument"
11020 msgstr "遇到第一个非选项参数后停止解析"
11022 #: builtin/rev-parse.c:368
11023 msgid "output in stuck long form"
11026 #: builtin/rev-parse.c:499
11028 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
11029 " or: git rev-parse --sq-quote [<arg>...]\n"
11030 " or: git rev-parse [<options>] [<arg>...]\n"
11032 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
11034 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
11035 " 或者:git rev-parse --sq-quote [<参数>...]\n"
11036 " 或者:git rev-parse [<选项>] [<参数>...]\n"
11038 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
11040 #: builtin/revert.c:22
11041 msgid "git revert [<options>] <commit-ish>..."
11042 msgstr "git revert [<选项>] <提交号>..."
11044 #: builtin/revert.c:23
11045 msgid "git revert <subcommand>"
11046 msgstr "git revert <子命令>"
11048 #: builtin/revert.c:28
11049 msgid "git cherry-pick [<options>] <commit-ish>..."
11050 msgstr "git cherry-pick [<选项>] <提交号>..."
11052 #: builtin/revert.c:29
11053 msgid "git cherry-pick <subcommand>"
11054 msgstr "git cherry-pick <子命令>"
11056 #: builtin/revert.c:71
11058 msgid "%s: %s cannot be used with %s"
11059 msgstr "%s:%s 不能和 %s 同时使用"
11061 #: builtin/revert.c:80
11062 msgid "end revert or cherry-pick sequence"
11065 #: builtin/revert.c:81
11066 msgid "resume revert or cherry-pick sequence"
11069 #: builtin/revert.c:82
11070 msgid "cancel revert or cherry-pick sequence"
11073 #: builtin/revert.c:83
11074 msgid "don't automatically commit"
11077 #: builtin/revert.c:84
11078 msgid "edit the commit message"
11081 #: builtin/revert.c:87
11082 msgid "parent number"
11085 #: builtin/revert.c:89
11086 msgid "merge strategy"
11089 #: builtin/revert.c:90
11093 #: builtin/revert.c:91
11094 msgid "option for merge strategy"
11097 #: builtin/revert.c:100
11098 msgid "append commit name"
11101 #: builtin/revert.c:102
11102 msgid "preserve initially empty commits"
11105 #: builtin/revert.c:103
11106 msgid "allow commits with empty messages"
11109 #: builtin/revert.c:104
11110 msgid "keep redundant, empty commits"
11111 msgstr "保持多余的、空的提交"
11113 #: builtin/revert.c:192
11114 msgid "revert failed"
11117 #: builtin/revert.c:207
11118 msgid "cherry-pick failed"
11122 msgid "git rm [<options>] [--] <file>..."
11123 msgstr "git rm [<选项>] [--] <文件>..."
11127 "the following submodule (or one of its nested submodules)\n"
11128 "uses a .git directory:"
11130 "the following submodules (or one of their nested submodules)\n"
11131 "use a .git directory:"
11132 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11133 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
11138 "(use 'rm -rf' if you really want to remove it including all of its history)"
11141 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11143 #: builtin/rm.c:230
11145 "the following file has staged content different from both the\n"
11146 "file and the HEAD:"
11148 "the following files have staged content different from both the\n"
11149 "file and the HEAD:"
11150 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11151 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
11153 #: builtin/rm.c:235
11156 "(use -f to force removal)"
11161 #: builtin/rm.c:239
11162 msgid "the following file has changes staged in the index:"
11163 msgid_plural "the following files have changes staged in the index:"
11164 msgstr[0] "下列文件索引中有变更"
11165 msgstr[1] "下列文件索引中有变更"
11167 #: builtin/rm.c:243 builtin/rm.c:254
11170 "(use --cached to keep the file, or -f to force removal)"
11173 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
11175 #: builtin/rm.c:251
11176 msgid "the following file has local modifications:"
11177 msgid_plural "the following files have local modifications:"
11178 msgstr[0] "如下文件有本地修改:"
11179 msgstr[1] "如下文件有本地修改:"
11181 #: builtin/rm.c:269
11182 msgid "do not list removed files"
11185 #: builtin/rm.c:270
11186 msgid "only remove from the index"
11189 #: builtin/rm.c:271
11190 msgid "override the up-to-date check"
11191 msgstr "忽略文件更新状态检查"
11193 #: builtin/rm.c:272
11194 msgid "allow recursive removal"
11197 #: builtin/rm.c:274
11198 msgid "exit with a zero status even if nothing matched"
11199 msgstr "即使没有匹配,也以零状态退出"
11201 #: builtin/rm.c:335
11203 msgid "not removing '%s' recursively without -r"
11204 msgstr "未提供 -r 选项不会递归删除 '%s'"
11206 #: builtin/rm.c:374
11208 msgid "git rm: unable to remove %s"
11209 msgstr "git rm:不能删除 %s"
11211 #: builtin/send-pack.c:18
11213 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11214 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
11216 " --all and explicit <ref> specification are mutually exclusive."
11218 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
11219 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
11220 " --all 和明确的 <引用> 互斥。"
11222 #: builtin/send-pack.c:160
11223 msgid "remote name"
11226 #: builtin/send-pack.c:171
11227 msgid "use stateless RPC protocol"
11228 msgstr "使用无状态的 RPC 协议"
11230 #: builtin/send-pack.c:172
11231 msgid "read refs from stdin"
11234 #: builtin/send-pack.c:173
11235 msgid "print status from remote helper"
11236 msgstr "打印来自远程 helper 的状态"
11238 #: builtin/shortlog.c:13
11239 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
11240 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
11242 #: builtin/shortlog.c:242
11243 msgid "sort output according to the number of commits per author"
11244 msgstr "根据每个作者的提交数量排序"
11246 #: builtin/shortlog.c:244
11247 msgid "Suppress commit descriptions, only provides commit count"
11248 msgstr "隐藏提交说明,只提供提交数量"
11250 #: builtin/shortlog.c:246
11251 msgid "Show the email address of each author"
11252 msgstr "显示每个作者的电子邮件地址"
11254 #: builtin/shortlog.c:247
11255 msgid "w[,i1[,i2]]"
11256 msgstr "w[,i1[,i2]]"
11258 #: builtin/shortlog.c:248
11259 msgid "Linewrap output"
11262 #: builtin/show-branch.c:10
11264 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11265 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
11266 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
11267 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
11269 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
11270 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
11271 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
11272 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
11274 #: builtin/show-branch.c:14
11275 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
11276 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
11278 #: builtin/show-branch.c:640
11279 msgid "show remote-tracking and local branches"
11280 msgstr "显示远程跟踪的和本地的分支"
11282 #: builtin/show-branch.c:642
11283 msgid "show remote-tracking branches"
11286 #: builtin/show-branch.c:644
11287 msgid "color '*!+-' corresponding to the branch"
11288 msgstr "着色 '*!+-' 到相应的分支"
11290 #: builtin/show-branch.c:646
11291 msgid "show <n> more commits after the common ancestor"
11292 msgstr "显示共同祖先后的 <n> 个提交"
11294 #: builtin/show-branch.c:648
11295 msgid "synonym to more=-1"
11296 msgstr "和 more=-1 同义"
11298 #: builtin/show-branch.c:649
11299 msgid "suppress naming strings"
11302 #: builtin/show-branch.c:651
11303 msgid "include the current branch"
11306 #: builtin/show-branch.c:653
11307 msgid "name commits with their object names"
11310 #: builtin/show-branch.c:655
11311 msgid "show possible merge bases"
11314 #: builtin/show-branch.c:657
11315 msgid "show refs unreachable from any other ref"
11316 msgstr "显示没有任何引用的的引用"
11318 #: builtin/show-branch.c:659
11319 msgid "show commits in topological order"
11322 #: builtin/show-branch.c:662
11323 msgid "show only commits not on the first branch"
11324 msgstr "只显示不在第一个分支上的提交"
11326 #: builtin/show-branch.c:664
11327 msgid "show merges reachable from only one tip"
11328 msgstr "显示仅一个分支可访问的合并提交"
11330 #: builtin/show-branch.c:666
11331 msgid "topologically sort, maintaining date order where possible"
11332 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
11334 #: builtin/show-branch.c:669
11335 msgid "<n>[,<base>]"
11336 msgstr "<n>[,<base>]"
11338 #: builtin/show-branch.c:670
11339 msgid "show <n> most recent ref-log entries starting at base"
11340 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
11342 #: builtin/show-ref.c:10
11344 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
11345 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
11347 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
11348 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
11350 #: builtin/show-ref.c:11
11351 msgid "git show-ref --exclude-existing[=<pattern>]"
11352 msgstr "git show-ref --exclude-existing[=<模式>]"
11354 #: builtin/show-ref.c:165
11355 msgid "only show tags (can be combined with heads)"
11356 msgstr "只显示标签(可以和头共用)"
11358 #: builtin/show-ref.c:166
11359 msgid "only show heads (can be combined with tags)"
11360 msgstr "只显示头(可以和标签共用)"
11362 #: builtin/show-ref.c:167
11363 msgid "stricter reference checking, requires exact ref path"
11364 msgstr "更严格的引用检测,需要精确的引用路径"
11366 #: builtin/show-ref.c:170 builtin/show-ref.c:172
11367 msgid "show the HEAD reference, even if it would be filtered out"
11368 msgstr "显示 HEAD 引用,即使被过滤掉"
11370 #: builtin/show-ref.c:174
11371 msgid "dereference tags into object IDs"
11372 msgstr "转换标签到对象 ID"
11374 #: builtin/show-ref.c:176
11375 msgid "only show SHA1 hash using <n> digits"
11376 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
11378 #: builtin/show-ref.c:180
11379 msgid "do not print results to stdout (useful with --verify)"
11380 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
11382 #: builtin/show-ref.c:182
11383 msgid "show refs from stdin that aren't in local repository"
11384 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
11386 #: builtin/stripspace.c:17
11387 msgid "git stripspace [-s | --strip-comments]"
11388 msgstr "git stripspace [-s | --strip-comments]"
11390 #: builtin/stripspace.c:18
11391 msgid "git stripspace [-c | --comment-lines]"
11392 msgstr "git stripspace [-c | --comment-lines]"
11394 #: builtin/stripspace.c:35
11395 msgid "skip and remove all lines starting with comment character"
11396 msgstr "跳过和移除所有的注释行"
11398 #: builtin/stripspace.c:38
11399 msgid "prepend comment character and space to each line"
11400 msgstr "为每一行的行首添加注释符和空格"
11402 #: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923
11404 msgid "No such ref: %s"
11405 msgstr "没有这样的引用:%s"
11407 #: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932
11409 msgid "Expecting a full ref name, got %s"
11410 msgstr "期望一个完整的引用名称,却得到 %s"
11412 #: builtin/submodule--helper.c:71
11414 msgid "cannot strip one component off url '%s'"
11415 msgstr "无法从 url '%s' 剥离一个组件"
11417 #: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403
11418 #: builtin/submodule--helper.c:483
11419 msgid "alternative anchor for relative paths"
11420 msgstr "相对路径的替代锚记(anchor)"
11422 #: builtin/submodule--helper.c:283
11423 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
11424 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
11426 #: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338
11428 msgid "No url found for submodule path '%s' in .gitmodules"
11429 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
11431 #: builtin/submodule--helper.c:364
11433 msgid "Failed to register url for submodule path '%s'"
11434 msgstr "无法为子模组 '%s' 注册 url"
11436 #: builtin/submodule--helper.c:368
11438 msgid "Submodule '%s' (%s) registered for path '%s'\n"
11439 msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
11442 #: builtin/submodule--helper.c:378
11444 msgid "warning: command update mode suggested for submodule '%s'\n"
11445 msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
11447 #: builtin/submodule--helper.c:385
11449 msgid "Failed to register update mode for submodule path '%s'"
11450 msgstr "无法为子模组 '%s' 注册更新模式"
11452 #: builtin/submodule--helper.c:404
11453 msgid "Suppress output for initializing a submodule"
11454 msgstr "初始化子模组时抑制输出"
11456 #: builtin/submodule--helper.c:409
11457 msgid "git submodule--helper init [<path>]"
11458 msgstr "git submodule--helper init [<路径>]"
11460 #: builtin/submodule--helper.c:430
11461 msgid "git submodule--helper name <path>"
11462 msgstr "git submodule--helper name <路径>"
11464 #: builtin/submodule--helper.c:436
11466 msgid "no submodule mapping found in .gitmodules for path '%s'"
11467 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
11469 #: builtin/submodule--helper.c:486
11470 msgid "where the new submodule will be cloned to"
11471 msgstr "新的子模组将要克隆的路径"
11473 #: builtin/submodule--helper.c:489
11474 msgid "name of the new submodule"
11477 #: builtin/submodule--helper.c:492
11478 msgid "url where to clone the submodule from"
11479 msgstr "克隆子模组的 url 地址"
11481 #: builtin/submodule--helper.c:498
11482 msgid "depth for shallow clones"
11485 #: builtin/submodule--helper.c:504
11487 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
11488 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
11490 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
11491 "[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
11493 #: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535
11495 msgid "could not create directory '%s'"
11496 msgstr "不能创建目录 '%s'"
11498 #: builtin/submodule--helper.c:531
11500 msgid "clone of '%s' into submodule path '%s' failed"
11501 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
11503 #: builtin/submodule--helper.c:547
11505 msgid "cannot open file '%s'"
11506 msgstr "无法打开文件 '%s'"
11508 #: builtin/submodule--helper.c:552
11510 msgid "could not close file %s"
11513 #: builtin/submodule--helper.c:559
11515 msgid "could not get submodule directory for '%s'"
11516 msgstr "无法得到 '%s' 的子模组目录"
11518 #: builtin/submodule--helper.c:611
11520 msgid "Submodule path '%s' not initialized"
11521 msgstr "子模组 '%s' 尚未初始化"
11523 #: builtin/submodule--helper.c:615
11524 msgid "Maybe you want to use 'update --init'?"
11525 msgstr "也许您想要执行 'update --init'?"
11527 #: builtin/submodule--helper.c:641
11529 msgid "Skipping unmerged submodule %s"
11530 msgstr "略过未合并的子模组 %s"
11532 #: builtin/submodule--helper.c:662
11534 msgid "Skipping submodule '%s'"
11535 msgstr "略过子模组 '%s'"
11537 #: builtin/submodule--helper.c:792
11539 msgid "Failed to clone '%s'. Retry scheduled"
11540 msgstr "克隆 '%s' 失败。按计划重试"
11542 #: builtin/submodule--helper.c:803
11544 msgid "Failed to clone '%s' a second time, aborting"
11545 msgstr "第二次尝试克隆 '%s' 失败,退出"
11547 #: builtin/submodule--helper.c:824
11548 msgid "path into the working tree"
11551 #: builtin/submodule--helper.c:827
11552 msgid "path into the working tree, across nested submodule boundaries"
11553 msgstr "工作区中的路径,递归嵌套子模组"
11555 #: builtin/submodule--helper.c:831
11556 msgid "rebase, merge, checkout or none"
11557 msgstr "rebase、merge、checkout 或 none"
11559 #: builtin/submodule--helper.c:835
11560 msgid "Create a shallow clone truncated to the specified number of revisions"
11561 msgstr "创建一个指定深度的浅克隆"
11563 #: builtin/submodule--helper.c:838
11564 msgid "parallel jobs"
11567 #: builtin/submodule--helper.c:840
11568 msgid "whether the initial clone should follow the shallow recommendation"
11569 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
11571 #: builtin/submodule--helper.c:841
11572 msgid "don't print cloning progress"
11575 #: builtin/submodule--helper.c:846
11576 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
11577 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
11579 #: builtin/submodule--helper.c:856
11580 msgid "bad value for update parameter"
11581 msgstr "update 参数取值错误"
11583 #: builtin/submodule--helper.c:927
11586 "Submodule (%s) branch configured to inherit branch from superproject, but "
11587 "the superproject is not on any branch"
11588 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
11590 #: builtin/submodule--helper.c:977
11591 msgid "submodule--helper subcommand must be called with a subcommand"
11592 msgstr "submodule-helper 子命令必须由另外的子命令调用"
11594 #: builtin/submodule--helper.c:984
11596 msgid "'%s' is not a valid submodule--helper subcommand"
11597 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
11599 #: builtin/symbolic-ref.c:7
11600 msgid "git symbolic-ref [<options>] <name> [<ref>]"
11601 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
11603 #: builtin/symbolic-ref.c:8
11604 msgid "git symbolic-ref -d [-q] <name>"
11605 msgstr "git symbolic-ref -d [-q] <名称>"
11607 #: builtin/symbolic-ref.c:40
11608 msgid "suppress error message for non-symbolic (detached) refs"
11609 msgstr "不显示非符号(分离的)引用的错误信息"
11611 #: builtin/symbolic-ref.c:41
11612 msgid "delete symbolic ref"
11615 #: builtin/symbolic-ref.c:42
11616 msgid "shorten ref output"
11619 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11623 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
11624 msgid "reason of the update"
11627 #: builtin/tag.c:23
11629 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
11632 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
11634 #: builtin/tag.c:24
11635 msgid "git tag -d <tagname>..."
11636 msgstr "git tag -d <标签名>..."
11638 #: builtin/tag.c:25
11640 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
11641 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
11643 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
11644 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
11646 #: builtin/tag.c:27
11647 msgid "git tag -v <tagname>..."
11648 msgstr "git tag -v <标签名>..."
11650 #: builtin/tag.c:81
11652 msgid "tag name too long: %.*s..."
11653 msgstr "标签名称太长:%.*s..."
11655 #: builtin/tag.c:86
11657 msgid "tag '%s' not found."
11658 msgstr "未发现标签 '%s'。"
11660 #: builtin/tag.c:101
11662 msgid "Deleted tag '%s' (was %s)\n"
11663 msgstr "已删除标签 '%s'(曾为 %s)\n"
11665 #: builtin/tag.c:117
11669 "Write a message for tag:\n"
11671 "Lines starting with '%c' will be ignored.\n"
11676 "以 '%c' 开头的行将被忽略。\n"
11678 #: builtin/tag.c:121
11682 "Write a message for tag:\n"
11684 "Lines starting with '%c' will be kept; you may remove them yourself if you "
11690 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
11692 #: builtin/tag.c:199
11693 msgid "unable to sign the tag"
11696 #: builtin/tag.c:201
11697 msgid "unable to write tag file"
11700 #: builtin/tag.c:226
11701 msgid "bad object type."
11704 #: builtin/tag.c:239
11705 msgid "tag header too big."
11708 #: builtin/tag.c:275
11709 msgid "no tag message?"
11712 #: builtin/tag.c:281
11714 msgid "The tag message has been left in %s\n"
11715 msgstr "标签说明被保留在 %s\n"
11717 #: builtin/tag.c:339
11718 msgid "list tag names"
11721 #: builtin/tag.c:341
11722 msgid "print <n> lines of each tag message"
11723 msgstr "每个标签信息打印 <n> 行"
11725 #: builtin/tag.c:343
11726 msgid "delete tags"
11729 #: builtin/tag.c:344
11730 msgid "verify tags"
11733 #: builtin/tag.c:346
11734 msgid "Tag creation options"
11737 #: builtin/tag.c:348
11738 msgid "annotated tag, needs a message"
11739 msgstr "附注标签,需要一个说明"
11741 #: builtin/tag.c:350
11742 msgid "tag message"
11745 #: builtin/tag.c:352
11746 msgid "annotated and GPG-signed tag"
11747 msgstr "附注并附加 GPG 签名的标签"
11749 #: builtin/tag.c:356
11750 msgid "use another key to sign the tag"
11751 msgstr "使用另外的私钥签名该标签"
11753 #: builtin/tag.c:357
11754 msgid "replace the tag if exists"
11755 msgstr "如果存在,替换现有的标签"
11757 #: builtin/tag.c:358 builtin/update-ref.c:368
11758 msgid "create a reflog"
11761 #: builtin/tag.c:360
11762 msgid "Tag listing options"
11765 #: builtin/tag.c:361
11766 msgid "show tag list in columns"
11767 msgstr "以列的方式显示标签列表"
11769 #: builtin/tag.c:362 builtin/tag.c:363
11770 msgid "print only tags that contain the commit"
11771 msgstr "只打印包含提交的标签"
11773 #: builtin/tag.c:364
11774 msgid "print only tags that are merged"
11775 msgstr "只打印已经合并的标签"
11777 #: builtin/tag.c:365
11778 msgid "print only tags that are not merged"
11779 msgstr "只打印尚未合并的标签"
11781 #: builtin/tag.c:370
11782 msgid "print only tags of the object"
11785 #: builtin/tag.c:399
11786 msgid "--column and -n are incompatible"
11787 msgstr "--column 和 -n 不兼容"
11789 #: builtin/tag.c:419
11790 msgid "-n option is only allowed with -l."
11791 msgstr "-n 选项只允许和 -l 同时使用。"
11793 #: builtin/tag.c:421
11794 msgid "--contains option is only allowed with -l."
11795 msgstr "--contains 选项只允许和 -l 同时使用。"
11797 #: builtin/tag.c:423
11798 msgid "--points-at option is only allowed with -l."
11799 msgstr "--points-at 选项只允许和 -l 同时使用。"
11801 #: builtin/tag.c:425
11802 msgid "--merged and --no-merged option are only allowed with -l"
11803 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
11805 #: builtin/tag.c:433
11806 msgid "only one -F or -m option is allowed."
11807 msgstr "只允许一个 -F 或 -m 选项。"
11809 #: builtin/tag.c:452
11810 msgid "too many params"
11813 #: builtin/tag.c:458
11815 msgid "'%s' is not a valid tag name."
11816 msgstr "'%s' 不是一个有效的标签名称。"
11818 #: builtin/tag.c:463
11820 msgid "tag '%s' already exists"
11821 msgstr "标签 '%s' 已存在"
11823 #: builtin/tag.c:491
11825 msgid "Updated tag '%s' (was %s)\n"
11826 msgstr "已更新标签 '%s'(曾为 %s)\n"
11828 #: builtin/unpack-objects.c:490
11829 msgid "Unpacking objects"
11832 #: builtin/update-index.c:79
11834 msgid "failed to create directory %s"
11837 #: builtin/update-index.c:85
11839 msgid "failed to stat %s"
11840 msgstr "无法枚举 %s 状态"
11842 #: builtin/update-index.c:95
11844 msgid "failed to create file %s"
11847 #: builtin/update-index.c:103
11849 msgid "failed to delete file %s"
11852 #: builtin/update-index.c:110 builtin/update-index.c:212
11854 msgid "failed to delete directory %s"
11857 #: builtin/update-index.c:133
11859 msgid "Testing mtime in '%s' "
11860 msgstr "在 '%s' 中测试 mtime "
11862 #: builtin/update-index.c:145
11863 msgid "directory stat info does not change after adding a new file"
11864 msgstr "添加一个新文件后,目录的状态信息未改变"
11866 #: builtin/update-index.c:158
11867 msgid "directory stat info does not change after adding a new directory"
11868 msgstr "添加一个新目录后,目录的状态信息未改变"
11870 #: builtin/update-index.c:171
11871 msgid "directory stat info changes after updating a file"
11872 msgstr "更新一个文件后,目录的状态信息被修改"
11874 #: builtin/update-index.c:182
11875 msgid "directory stat info changes after adding a file inside subdirectory"
11876 msgstr "在子目录中添加文件后,目录的状态信息被修改"
11878 #: builtin/update-index.c:193
11879 msgid "directory stat info does not change after deleting a file"
11880 msgstr "删除一个文件后,目录的状态信息未改变"
11882 #: builtin/update-index.c:206
11883 msgid "directory stat info does not change after deleting a directory"
11884 msgstr "删除一个目录后,目录的状态信息未改变"
11886 #: builtin/update-index.c:213
11890 #: builtin/update-index.c:575
11891 msgid "git update-index [<options>] [--] [<file>...]"
11892 msgstr "git update-index [<选项>] [--] [<文件>...]"
11894 #: builtin/update-index.c:930
11895 msgid "continue refresh even when index needs update"
11896 msgstr "当索引需要更新时继续刷新"
11898 #: builtin/update-index.c:933
11899 msgid "refresh: ignore submodules"
11902 #: builtin/update-index.c:936
11903 msgid "do not ignore new files"
11906 #: builtin/update-index.c:938
11907 msgid "let files replace directories and vice-versa"
11908 msgstr "让文件替换目录(反之亦然)"
11910 #: builtin/update-index.c:940
11911 msgid "notice files missing from worktree"
11912 msgstr "通知文件从工作区丢失"
11914 #: builtin/update-index.c:942
11915 msgid "refresh even if index contains unmerged entries"
11916 msgstr "即使索引区包含未合并的条目也执行刷新"
11918 #: builtin/update-index.c:945
11919 msgid "refresh stat information"
11922 #: builtin/update-index.c:949
11923 msgid "like --refresh, but ignore assume-unchanged setting"
11924 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11926 #: builtin/update-index.c:953
11927 msgid "<mode>,<object>,<path>"
11928 msgstr "<存取模式>,<对象>,<路径>"
11930 #: builtin/update-index.c:954
11931 msgid "add the specified entry to the index"
11932 msgstr "添加指定的条目到索引区"
11934 #: builtin/update-index.c:963
11935 msgid "mark files as \"not changing\""
11936 msgstr "把文件标记为 \"没有变更\""
11938 #: builtin/update-index.c:966
11939 msgid "clear assumed-unchanged bit"
11940 msgstr "清除 assumed-unchanged 位"
11942 #: builtin/update-index.c:969
11943 msgid "mark files as \"index-only\""
11944 msgstr "把文件标记为 \"仅索引\""
11946 #: builtin/update-index.c:972
11947 msgid "clear skip-worktree bit"
11948 msgstr "清除 skip-worktree 位"
11950 #: builtin/update-index.c:975
11951 msgid "add to index only; do not add content to object database"
11952 msgstr "只添加到索引区;不添加对象到对象库"
11954 #: builtin/update-index.c:977
11955 msgid "remove named paths even if present in worktree"
11956 msgstr "即使存在工作区里,也删除路径"
11958 #: builtin/update-index.c:979
11959 msgid "with --stdin: input lines are terminated by null bytes"
11960 msgstr "携带 --stdin:输入的行以 null 字符终止"
11962 #: builtin/update-index.c:981
11963 msgid "read list of paths to be updated from standard input"
11964 msgstr "从标准输入中读取需要更新的路径列表"
11966 #: builtin/update-index.c:985
11967 msgid "add entries from standard input to the index"
11968 msgstr "从标准输入添加条目到索引区"
11970 #: builtin/update-index.c:989
11971 msgid "repopulate stages #2 and #3 for the listed paths"
11972 msgstr "为指定文件重新生成第2和第3暂存区"
11974 #: builtin/update-index.c:993
11975 msgid "only update entries that differ from HEAD"
11976 msgstr "只更新与 HEAD 不同的条目"
11978 #: builtin/update-index.c:997
11979 msgid "ignore files missing from worktree"
11980 msgstr "忽略工作区丢失的文件"
11982 #: builtin/update-index.c:1000
11983 msgid "report actions to standard output"
11986 #: builtin/update-index.c:1002
11987 msgid "(for porcelains) forget saved unresolved conflicts"
11988 msgstr "(for porcelains) 忘记保存的未解决的冲突"
11990 #: builtin/update-index.c:1006
11991 msgid "write index in this format"
11992 msgstr "以这种格式写入索引区"
11994 #: builtin/update-index.c:1008
11995 msgid "enable or disable split index"
11998 #: builtin/update-index.c:1010
11999 msgid "enable/disable untracked cache"
12000 msgstr "启用/禁用对未跟踪文件的缓存"
12002 #: builtin/update-index.c:1012
12003 msgid "test if the filesystem supports untracked cache"
12004 msgstr "测试文件系统是否支持未跟踪文件缓存"
12006 #: builtin/update-index.c:1014
12007 msgid "enable untracked cache without testing the filesystem"
12008 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
12010 #: builtin/update-index.c:1134
12011 msgid "Untracked cache disabled"
12012 msgstr "缓存未跟踪文件被禁用"
12014 #: builtin/update-index.c:1146
12016 msgid "Untracked cache enabled for '%s'"
12017 msgstr "缓存未跟踪文件在 '%s' 启用"
12019 #: builtin/update-ref.c:9
12020 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
12021 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
12023 #: builtin/update-ref.c:10
12024 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
12025 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
12027 #: builtin/update-ref.c:11
12028 msgid "git update-ref [<options>] --stdin [-z]"
12029 msgstr "git update-ref [<选项>] --stdin [-z]"
12031 #: builtin/update-ref.c:363
12032 msgid "delete the reference"
12035 #: builtin/update-ref.c:365
12036 msgid "update <refname> not the one it points to"
12037 msgstr "更新 <引用名> 本身而不是它指向的引用"
12039 #: builtin/update-ref.c:366
12040 msgid "stdin has NUL-terminated arguments"
12041 msgstr "标准输入有以 NUL 字符终止的参数"
12043 #: builtin/update-ref.c:367
12044 msgid "read updates from stdin"
12047 #: builtin/update-server-info.c:6
12048 msgid "git update-server-info [--force]"
12049 msgstr "git update-server-info [--force]"
12051 #: builtin/update-server-info.c:14
12052 msgid "update the info files from scratch"
12053 msgstr "从头开始更新文件信息"
12055 #: builtin/verify-commit.c:17
12056 msgid "git verify-commit [-v | --verbose] <commit>..."
12057 msgstr "git verify-commit [-v | --verbose] <提交>..."
12059 #: builtin/verify-commit.c:72
12060 msgid "print commit contents"
12063 #: builtin/verify-commit.c:73 builtin/verify-tag.c:35
12064 msgid "print raw gpg status output"
12065 msgstr "打印原始 gpg 状态输出"
12067 #: builtin/verify-pack.c:54
12068 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
12069 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
12071 #: builtin/verify-pack.c:64
12075 #: builtin/verify-pack.c:66
12076 msgid "show statistics only"
12079 #: builtin/verify-tag.c:17
12080 msgid "git verify-tag [-v | --verbose] <tag>..."
12081 msgstr "git verify-tag [-v | --verbose] <标签>..."
12083 #: builtin/verify-tag.c:34
12084 msgid "print tag contents"
12087 #: builtin/worktree.c:15
12088 msgid "git worktree add [<options>] <path> [<branch>]"
12089 msgstr "git worktree add [<选项>] <路径> [<分支>]"
12091 #: builtin/worktree.c:16
12092 msgid "git worktree list [<options>]"
12093 msgstr "git worktree list [<选项>]"
12095 #: builtin/worktree.c:17
12096 msgid "git worktree lock [<options>] <path>"
12097 msgstr "git worktree lock [<选项>] <路径>"
12099 #: builtin/worktree.c:18
12100 msgid "git worktree prune [<options>]"
12101 msgstr "git worktree prune [<选项>]"
12103 #: builtin/worktree.c:19
12104 msgid "git worktree unlock <path>"
12105 msgstr "git worktree unlock <路径>"
12107 #: builtin/worktree.c:42
12109 msgid "Removing worktrees/%s: not a valid directory"
12110 msgstr "删除工作区/%s:不是一个有效的目录"
12112 #: builtin/worktree.c:48
12114 msgid "Removing worktrees/%s: gitdir file does not exist"
12115 msgstr "删除 worktrees/%s:gitdir 文件不存在"
12117 #: builtin/worktree.c:53
12119 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
12120 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
12122 #: builtin/worktree.c:64
12124 msgid "Removing worktrees/%s: invalid gitdir file"
12125 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
12127 #: builtin/worktree.c:80
12129 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
12130 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
12132 #: builtin/worktree.c:204
12134 msgid "'%s' already exists"
12137 #: builtin/worktree.c:236
12139 msgid "could not create directory of '%s'"
12140 msgstr "不能创建目录 '%s'"
12142 #: builtin/worktree.c:272
12144 msgid "Preparing %s (identifier %s)"
12145 msgstr "准备 %s (标识符 %s)"
12147 #: builtin/worktree.c:323
12148 msgid "checkout <branch> even if already checked out in other worktree"
12149 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
12151 #: builtin/worktree.c:325
12152 msgid "create a new branch"
12155 #: builtin/worktree.c:327
12156 msgid "create or reset a branch"
12159 #: builtin/worktree.c:329
12160 msgid "populate the new working tree"
12163 #: builtin/worktree.c:337
12164 msgid "-b, -B, and --detach are mutually exclusive"
12165 msgstr "-b、-B 和 --detach 是互斥的"
12167 #: builtin/worktree.c:470
12168 msgid "reason for locking"
12171 #: builtin/worktree.c:482 builtin/worktree.c:515
12173 msgid "'%s' is not a working tree"
12174 msgstr "'%s' 不是一个工作区"
12176 #: builtin/worktree.c:484 builtin/worktree.c:517
12177 msgid "The main working tree cannot be locked or unlocked"
12178 msgstr "主工作区无法被加锁或解锁"
12180 #: builtin/worktree.c:489
12182 msgid "'%s' is already locked, reason: %s"
12183 msgstr "'%s' 已被锁定,原因:%s"
12185 #: builtin/worktree.c:491
12187 msgid "'%s' is already locked"
12190 #: builtin/worktree.c:519
12192 msgid "'%s' is not locked"
12195 #: builtin/write-tree.c:13
12196 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
12197 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
12199 #: builtin/write-tree.c:26
12203 #: builtin/write-tree.c:27
12204 msgid "write tree object for a subdirectory <prefix>"
12205 msgstr "将 <前缀> 子目录内容写到一个树对象"
12207 #: builtin/write-tree.c:30
12208 msgid "only useful for debugging"
12211 #: upload-pack.c:20
12212 msgid "git upload-pack [<options>] <dir>"
12213 msgstr "git upload-pack [<选项>] <目录>"
12215 #: upload-pack.c:837
12216 msgid "quit after a single request/response exchange"
12217 msgstr "在一次单独的请求/响应(request/response)交换后退出"
12219 #: upload-pack.c:839
12220 msgid "exit immediately after initial ref advertisement"
12221 msgstr "在初始的引用广告后立即退出"
12223 #: upload-pack.c:841
12224 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
12225 msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
12227 #: upload-pack.c:843
12228 msgid "interrupt transfer after <n> seconds of inactivity"
12229 msgstr "不活动 <n> 秒钟后终止传输"
12231 #: credential-cache--daemon.c:271
12232 msgid "print debugging messages to stderr"
12233 msgstr "调试信息输出到标准错误"
12237 "'git help -a' and 'git help -g' list available subcommands and some\n"
12238 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
12239 "to read about a specific subcommand or concept."
12241 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
12242 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
12246 msgid "Public key pinning not supported with cURL < 7.44.0"
12247 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
12250 msgid "start a working area (see also: git help tutorial)"
12251 msgstr "开始一个工作区(参见:git help tutorial)"
12253 #: common-cmds.h:10
12254 msgid "work on the current change (see also: git help everyday)"
12255 msgstr "在当前变更上工作(参见:git help everyday)"
12257 #: common-cmds.h:11
12258 msgid "examine the history and state (see also: git help revisions)"
12259 msgstr "检查历史和状态(参见:git help revisions)"
12261 #: common-cmds.h:12
12262 msgid "grow, mark and tweak your common history"
12263 msgstr "扩展、标记和调校您的历史记录"
12265 #: common-cmds.h:13
12266 msgid "collaborate (see also: git help workflows)"
12267 msgstr "协同(参见:git help workflows)"
12269 #: common-cmds.h:17
12270 msgid "Add file contents to the index"
12273 #: common-cmds.h:18
12274 msgid "Use binary search to find the commit that introduced a bug"
12275 msgstr "通过二分查找定位引入 bug 的提交"
12277 #: common-cmds.h:19
12278 msgid "List, create, or delete branches"
12279 msgstr "列出、创建或删除分支"
12281 #: common-cmds.h:20
12282 msgid "Switch branches or restore working tree files"
12283 msgstr "切换分支或恢复工作区文件"
12285 #: common-cmds.h:21
12286 msgid "Clone a repository into a new directory"
12287 msgstr "克隆一个仓库到一个新目录"
12289 #: common-cmds.h:22
12290 msgid "Record changes to the repository"
12293 #: common-cmds.h:23
12294 msgid "Show changes between commits, commit and working tree, etc"
12295 msgstr "显示提交之间、提交和工作区之间等的差异"
12297 #: common-cmds.h:24
12298 msgid "Download objects and refs from another repository"
12299 msgstr "从另外一个仓库下载对象和引用"
12301 #: common-cmds.h:25
12302 msgid "Print lines matching a pattern"
12305 #: common-cmds.h:26
12306 msgid "Create an empty Git repository or reinitialize an existing one"
12307 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
12309 #: common-cmds.h:27
12310 msgid "Show commit logs"
12313 #: common-cmds.h:28
12314 msgid "Join two or more development histories together"
12315 msgstr "合并两个或更多开发历史"
12317 #: common-cmds.h:29
12318 msgid "Move or rename a file, a directory, or a symlink"
12319 msgstr "移动或重命名一个文件、目录或符号链接"
12321 #: common-cmds.h:30
12322 msgid "Fetch from and integrate with another repository or a local branch"
12323 msgstr "获取并整合另外的仓库或一个本地分支"
12325 #: common-cmds.h:31
12326 msgid "Update remote refs along with associated objects"
12327 msgstr "更新远程引用和相关的对象"
12329 #: common-cmds.h:32
12330 msgid "Reapply commits on top of another base tip"
12331 msgstr "在另一个分支上重新应用提交"
12333 #: common-cmds.h:33
12334 msgid "Reset current HEAD to the specified state"
12335 msgstr "重置当前 HEAD 到指定状态"
12337 #: common-cmds.h:34
12338 msgid "Remove files from the working tree and from the index"
12339 msgstr "从工作区和索引中删除文件"
12341 #: common-cmds.h:35
12342 msgid "Show various types of objects"
12345 #: common-cmds.h:36
12346 msgid "Show the working tree status"
12349 #: common-cmds.h:37
12350 msgid "Create, list, delete or verify a tag object signed with GPG"
12351 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
12353 #: parse-options.h:145
12354 msgid "expiry-date"
12357 #: parse-options.h:160
12358 msgid "no-op (backward compatibility)"
12361 #: parse-options.h:237
12362 msgid "be more verbose"
12365 #: parse-options.h:239
12366 msgid "be more quiet"
12369 #: parse-options.h:245
12370 msgid "use <n> digits to display SHA-1s"
12371 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
12374 msgid "update the index with reused conflict resolution if possible"
12375 msgstr "如果可能,重用冲突解决更新索引"
12377 #: git-bisect.sh:54
12378 msgid "You need to start by \"git bisect start\""
12379 msgstr "您需要执行 \"git bisect start\" 来开始"
12382 #. TRANSLATORS: Make sure to include [Y] and [n] in your
12383 #. translation. The program will only accept English input
12385 #: git-bisect.sh:60
12386 msgid "Do you want me to do it for you [Y/n]? "
12387 msgstr "您想让我为您这样做么[Y/n]? "
12389 #: git-bisect.sh:121
12391 msgid "unrecognised option: '$arg'"
12392 msgstr "未能识别的选项:'$arg'"
12394 #: git-bisect.sh:125
12396 msgid "'$arg' does not appear to be a valid revision"
12397 msgstr "'$arg' 看起来不像是一个有效的版本"
12399 #: git-bisect.sh:154
12400 msgid "Bad HEAD - I need a HEAD"
12401 msgstr "坏的 HEAD - 我需要一个 HEAD"
12403 #: git-bisect.sh:167
12406 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
12407 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
12409 #: git-bisect.sh:177
12410 msgid "won't bisect on cg-seek'ed tree"
12411 msgstr "不会在做了 cg-seek 的树上做二分查找"
12413 #: git-bisect.sh:181
12414 msgid "Bad HEAD - strange symbolic ref"
12415 msgstr "坏的 HEAD - 奇怪的符号引用"
12417 #: git-bisect.sh:233
12419 msgid "Bad bisect_write argument: $state"
12420 msgstr "坏的 bisect_write 参数:$state"
12422 #: git-bisect.sh:262
12424 msgid "Bad rev input: $arg"
12425 msgstr "坏的输入版本:$arg"
12427 #: git-bisect.sh:281
12429 msgid "Bad rev input: $bisected_head"
12430 msgstr "坏的输入版本:$bisected_head"
12432 #: git-bisect.sh:290
12434 msgid "Bad rev input: $rev"
12435 msgstr "坏的输入版本:$rev"
12437 #: git-bisect.sh:299
12439 msgid "'git bisect $TERM_BAD' can take only one argument."
12440 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
12442 #: git-bisect.sh:322
12444 msgid "Warning: bisecting only with a $TERM_BAD commit."
12445 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
12448 #. TRANSLATORS: Make sure to include [Y] and [n] in your
12449 #. translation. The program will only accept English input
12451 #: git-bisect.sh:328
12452 msgid "Are you sure [Y/n]? "
12453 msgstr "您确认么[Y/n]? "
12455 #: git-bisect.sh:340
12458 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
12459 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
12461 "您需要给我至少一个好版本和一个坏版本。\n"
12462 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
12464 #: git-bisect.sh:343
12467 "You need to start by \"git bisect start\".\n"
12468 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
12469 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
12471 "您需要执行 \"git bisect start\" 来开始。\n"
12472 "然后需要提供我至少一个好版本和一个坏版本。\n"
12473 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
12475 #: git-bisect.sh:414 git-bisect.sh:546
12476 msgid "We are not bisecting."
12477 msgstr "我们没有在二分查找。"
12479 #: git-bisect.sh:421
12481 msgid "'$invalid' is not a valid commit"
12482 msgstr "'$invalid' 不是一个有效的提交"
12484 #: git-bisect.sh:430
12487 "Could not check out original HEAD '$branch'.\n"
12488 "Try 'git bisect reset <commit>'."
12490 "不能检出原始 HEAD '$branch'。\n"
12491 "尝试 'git bisect reset <提交>'。"
12493 #: git-bisect.sh:458
12494 msgid "No logfile given"
12497 #: git-bisect.sh:459
12499 msgid "cannot read $file for replaying"
12500 msgstr "不能读取 $file 来重放"
12502 #: git-bisect.sh:480
12503 msgid "?? what are you talking about?"
12506 #: git-bisect.sh:492
12508 msgid "running $command"
12509 msgstr "运行 $command"
12511 #: git-bisect.sh:499
12514 "bisect run failed:\n"
12515 "exit code $res from '$command' is < 0 or >= 128"
12518 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
12520 #: git-bisect.sh:525
12521 msgid "bisect run cannot continue any more"
12522 msgstr "二分查找不能继续运行"
12524 #: git-bisect.sh:531
12527 "bisect run failed:\n"
12528 "'bisect_state $state' exited with error code $res"
12531 "'bisect_state $state' 退出码为 $res"
12533 #: git-bisect.sh:538
12534 msgid "bisect run success"
12537 #: git-bisect.sh:565
12538 msgid "please use two different terms"
12539 msgstr "请使用两个不同的术语"
12541 #: git-bisect.sh:575
12543 msgid "'$term' is not a valid term"
12544 msgstr "'$term' 不是一个有效的名称"
12546 #: git-bisect.sh:578
12548 msgid "can't use the builtin command '$term' as a term"
12549 msgstr "不能使用内置命令 '$term' 作为术语"
12551 #: git-bisect.sh:587 git-bisect.sh:593
12553 msgid "can't change the meaning of term '$term'"
12554 msgstr "不能修改术语 '$term' 的含义"
12556 #: git-bisect.sh:606
12558 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
12559 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
12561 #: git-bisect.sh:636
12562 msgid "no terms defined"
12565 #: git-bisect.sh:653
12568 "invalid argument $arg for 'git bisect terms'.\n"
12569 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
12571 "参数 $arg 对命令 'git bisect terms' 无效。\n"
12572 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
12574 #: git-merge-octopus.sh:46
12576 "Error: Your local changes to the following files would be overwritten by "
12578 msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
12580 #: git-merge-octopus.sh:61
12581 msgid "Automated merge did not work."
12584 #: git-merge-octopus.sh:62
12585 msgid "Should not be doing an Octopus."
12586 msgstr "不应该执行章鱼式合并。"
12588 #: git-merge-octopus.sh:73
12590 msgid "Unable to find common commit with $pretty_name"
12591 msgstr "无法找到和 $pretty_name 的基线提交"
12593 #: git-merge-octopus.sh:77
12595 msgid "Already up-to-date with $pretty_name"
12596 msgstr "已经和 $pretty_name 保持一致"
12598 #: git-merge-octopus.sh:89
12600 msgid "Fast-forwarding to: $pretty_name"
12601 msgstr "快进至:$pretty_name"
12603 #: git-merge-octopus.sh:97
12605 msgid "Trying simple merge with $pretty_name"
12606 msgstr "尝试和 $pretty_name 的简单合并"
12608 #: git-merge-octopus.sh:102
12609 msgid "Simple merge did not work, trying automatic merge."
12610 msgstr "简单合并未生效,尝试自动合并。"
12612 #: git-rebase.sh:56
12614 "When you have resolved this problem, run \"git rebase --continue\".\n"
12615 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
12616 "To check out the original branch and stop rebasing, run \"git rebase --abort"
12619 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
12620 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
12621 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
12623 #: git-rebase.sh:156 git-rebase.sh:395
12625 msgid "Could not move back to $head_name"
12626 msgstr "无法移回 $head_name"
12628 #: git-rebase.sh:167
12629 msgid "Applied autostash."
12630 msgstr "成功应用 autostash。"
12632 #: git-rebase.sh:170
12634 msgid "Cannot store $stash_sha1"
12635 msgstr "无法保存 $stash_sha1"
12637 #: git-rebase.sh:171
12639 "Applying autostash resulted in conflicts.\n"
12640 "Your changes are safe in the stash.\n"
12641 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
12643 "应用 autostash 导致冲突。\n"
12644 "您的修改安全地保存在 stash 中。\n"
12645 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
12647 #: git-rebase.sh:210
12648 msgid "The pre-rebase hook refused to rebase."
12649 msgstr "钩子 pre-rebase 拒绝变基操作。"
12651 #: git-rebase.sh:215
12652 msgid "It looks like git-am is in progress. Cannot rebase."
12653 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
12655 #: git-rebase.sh:356
12656 msgid "No rebase in progress?"
12657 msgstr "没有正在进行的变基?"
12659 #: git-rebase.sh:367
12660 msgid "The --edit-todo action can only be used during interactive rebase."
12661 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
12663 #: git-rebase.sh:374
12664 msgid "Cannot read HEAD"
12667 #: git-rebase.sh:377
12669 "You must edit all merge conflicts and then\n"
12670 "mark them as resolved using git add"
12672 "您必须编辑所有的合并冲突,然后通过 git add\n"
12675 #: git-rebase.sh:414
12678 "It seems that there is already a $state_dir_base directory, and\n"
12679 "I wonder if you are in the middle of another rebase. If that is the\n"
12680 "case, please try\n"
12681 "\t$cmd_live_rebase\n"
12682 "If that is not the case, please\n"
12683 "\t$cmd_clear_stale_rebase\n"
12684 "and run me again. I am stopping in case you still have something\n"
12687 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
12689 "\t$cmd_live_rebase\n"
12691 "\t$cmd_clear_stale_rebase\n"
12692 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
12694 #: git-rebase.sh:465
12696 msgid "invalid upstream $upstream_name"
12697 msgstr "无效的上游 $upstream_name"
12699 #: git-rebase.sh:489
12701 msgid "$onto_name: there are more than one merge bases"
12702 msgstr "$onto_name: 有一个以上的合并基准"
12704 #: git-rebase.sh:492 git-rebase.sh:496
12706 msgid "$onto_name: there is no merge base"
12707 msgstr "$onto_name: 没有合并基准"
12709 #: git-rebase.sh:501
12711 msgid "Does not point to a valid commit: $onto_name"
12712 msgstr "没有指向一个有效的提交:$onto_name"
12714 #: git-rebase.sh:524
12716 msgid "fatal: no such branch: $branch_name"
12717 msgstr "严重错误:无此分支:$branch_name"
12719 #: git-rebase.sh:557
12720 msgid "Cannot autostash"
12721 msgstr "无法 autostash"
12723 #: git-rebase.sh:562
12725 msgid "Created autostash: $stash_abbrev"
12726 msgstr "创建了 autostash: $stash_abbrev"
12728 #: git-rebase.sh:566
12729 msgid "Please commit or stash them."
12730 msgstr "请提交或为它们保存进度。"
12732 #: git-rebase.sh:586
12734 msgid "Current branch $branch_name is up to date."
12735 msgstr "当前分支 $branch_name 是最新的。"
12737 #: git-rebase.sh:590
12739 msgid "Current branch $branch_name is up to date, rebase forced."
12740 msgstr "当前分支 $branch_name 是最新的,强制变基。"
12742 #: git-rebase.sh:601
12744 msgid "Changes from $mb to $onto:"
12745 msgstr "变更从 $mb 到 $onto:"
12747 #: git-rebase.sh:610
12748 msgid "First, rewinding head to replay your work on top of it..."
12749 msgstr "首先,回退分支以便在上面重放您的工作..."
12751 #: git-rebase.sh:620
12753 msgid "Fast-forwarded $branch_name to $onto_name."
12754 msgstr "快进 $branch_name 至 $onto_name。"
12757 msgid "git stash clear with parameters is unimplemented"
12758 msgstr "git stash clear 不支持参数"
12761 msgid "You do not have the initial commit yet"
12765 msgid "Cannot save the current index state"
12766 msgstr "无法保存当前索引状态"
12768 #: git-stash.sh:123 git-stash.sh:136
12769 msgid "Cannot save the current worktree state"
12770 msgstr "无法保存当前工作区状态"
12772 #: git-stash.sh:140
12773 msgid "No changes selected"
12776 #: git-stash.sh:143
12777 msgid "Cannot remove temporary index (can't happen)"
12778 msgstr "无法删除临时索引(不应发生)"
12780 #: git-stash.sh:156
12781 msgid "Cannot record working tree state"
12784 #: git-stash.sh:188
12786 msgid "Cannot update $ref_stash with $w_commit"
12787 msgstr "无法用 $w_commit 更新 $ref_stash"
12789 #. TRANSLATORS: $option is an invalid option, like
12790 #. `--blah-blah'. The 7 spaces at the beginning of the
12791 #. second line correspond to "error: ". So you should line
12792 #. up the second line with however many characters the
12793 #. translation of "error: " takes in your language. E.g. in
12794 #. English this is:
12796 #. $ git stash save --blah-blah 2>&1 | head -n 2
12797 #. error: unknown option for 'stash save': --blah-blah
12798 #. To provide a message, use git stash save -- '--blah-blah'
12799 #: git-stash.sh:238
12802 "error: unknown option for 'stash save': $option\n"
12803 " To provide a message, use git stash save -- '$option'"
12805 "错误:'stash save' 的未知选项:$option\n"
12806 " 要提供一个描述信息,使用 git stash save -- '$option'"
12808 #: git-stash.sh:259
12809 msgid "No local changes to save"
12810 msgstr "没有要保存的本地修改"
12812 #: git-stash.sh:263
12813 msgid "Cannot initialize stash"
12814 msgstr "无法初始化 stash"
12816 #: git-stash.sh:267
12817 msgid "Cannot save the current status"
12820 #: git-stash.sh:268
12822 msgid "Saved working directory and index state $stash_msg"
12823 msgstr "保存工作目录和索引状态 $stash_msg"
12825 #: git-stash.sh:285
12826 msgid "Cannot remove worktree changes"
12829 #: git-stash.sh:404
12831 msgid "unknown option: $opt"
12832 msgstr "未知选项: $opt"
12834 #: git-stash.sh:414
12835 msgid "No stash found."
12836 msgstr "未发现 stash。"
12838 #: git-stash.sh:421
12840 msgid "Too many revisions specified: $REV"
12841 msgstr "指定了太多的版本:$REV"
12843 #: git-stash.sh:427
12845 msgid "$reference is not a valid reference"
12846 msgstr "$reference 不是一个有效的引用"
12848 #: git-stash.sh:455
12850 msgid "'$args' is not a stash-like commit"
12851 msgstr "'$args' 不是 stash 样提交"
12853 #: git-stash.sh:466
12855 msgid "'$args' is not a stash reference"
12856 msgstr "'$args' 不是一个 stash 引用"
12858 #: git-stash.sh:474
12859 msgid "unable to refresh index"
12862 #: git-stash.sh:478
12863 msgid "Cannot apply a stash in the middle of a merge"
12864 msgstr "无法在合并过程中恢复进度"
12866 #: git-stash.sh:486
12867 msgid "Conflicts in index. Try without --index."
12868 msgstr "索引中有冲突。尝试不使用 --index。"
12870 #: git-stash.sh:488
12871 msgid "Could not save index tree"
12874 #: git-stash.sh:522
12875 msgid "Cannot unstage modified files"
12876 msgstr "无法将修改的文件取消暂存"
12878 #: git-stash.sh:537
12879 msgid "Index was not unstashed."
12880 msgstr "索引的进度没有被恢复。"
12882 #: git-stash.sh:551
12883 msgid "The stash is kept in case you need it again."
12884 msgstr "暂存被保留以备您再次需要。"
12886 #: git-stash.sh:560
12888 msgid "Dropped ${REV} ($s)"
12889 msgstr "丢弃了 ${REV} ($s)"
12891 #: git-stash.sh:561
12893 msgid "${REV}: Could not drop stash entry"
12894 msgstr "${REV}:不能丢弃进度条目"
12896 #: git-stash.sh:569
12897 msgid "No branch name specified"
12900 #: git-stash.sh:641
12901 msgid "(To restore them type \"git stash apply\")"
12902 msgstr "(为恢复数据输入 \"git stash apply\")"
12904 #: git-submodule.sh:183
12905 msgid "Relative path can only be used from the toplevel of the working tree"
12906 msgstr "只能在工作区的顶级目录中使用相对路径"
12908 #: git-submodule.sh:193
12910 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
12911 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
12913 #: git-submodule.sh:210
12915 msgid "'$sm_path' already exists in the index"
12916 msgstr "'$sm_path' 已经存在于索引中"
12918 #: git-submodule.sh:214
12921 "The following path is ignored by one of your .gitignore files:\n"
12923 "Use -f if you really want to add it."
12925 "以下路径被您的一个 .gitignore 文件所忽略:\n"
12927 "如果您确实想添加它,使用 -f 参数。"
12929 #: git-submodule.sh:232
12931 msgid "Adding existing repo at '$sm_path' to the index"
12932 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
12934 #: git-submodule.sh:234
12936 msgid "'$sm_path' already exists and is not a valid git repo"
12937 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
12939 #: git-submodule.sh:242
12941 msgid "A git directory for '$sm_name' is found locally with remote(s):"
12942 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
12944 #: git-submodule.sh:244
12947 "If you want to reuse this local git directory instead of cloning again from\n"
12949 "use the '--force' option. If the local git directory is not the correct "
12951 "or you are unsure what this means choose another name with the '--name' "
12954 "如果您想要重用这个本地 git 目录而非重新克隆自\n"
12956 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
12957 "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
12959 #: git-submodule.sh:250
12961 msgid "Reactivating local git directory for submodule '$sm_name'."
12962 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
12964 #: git-submodule.sh:262
12966 msgid "Unable to checkout submodule '$sm_path'"
12967 msgstr "不能检出子模组 '$sm_path'"
12969 #: git-submodule.sh:267
12971 msgid "Failed to add submodule '$sm_path'"
12972 msgstr "无法添加子模组 '$sm_path'"
12974 #: git-submodule.sh:276
12976 msgid "Failed to register submodule '$sm_path'"
12977 msgstr "无法注册子模组 '$sm_path'"
12979 #: git-submodule.sh:323
12981 msgid "Entering '$displaypath'"
12982 msgstr "正在进入 '$displaypath'"
12984 #: git-submodule.sh:343
12986 msgid "Stopping at '$displaypath'; script returned non-zero status."
12987 msgstr "停止于 '$displaypath';脚本返回非零值。"
12989 #: git-submodule.sh:414
12991 msgid "pathspec and --all are incompatible"
12992 msgstr "pathspec 和 --all 不兼容"
12994 #: git-submodule.sh:419
12996 msgid "Use '--all' if you really want to deinitialize all submodules"
12997 msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
12999 #: git-submodule.sh:439
13002 "Submodule work tree '$displaypath' contains a .git directory\n"
13003 "(use 'rm -rf' if you really want to remove it including all of its history)"
13005 "子模组工作区 '$displaypath' 包含一个 .git 目录\n"
13006 "(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
13008 #: git-submodule.sh:447
13011 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
13013 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
13015 #: git-submodule.sh:450
13017 msgid "Cleared directory '$displaypath'"
13018 msgstr "已清除目录 '$displaypath'"
13020 #: git-submodule.sh:451
13022 msgid "Could not remove submodule work tree '$displaypath'"
13023 msgstr "无法移除子模组工作区 '$displaypath'"
13025 #: git-submodule.sh:454
13027 msgid "Could not create empty submodule directory '$displaypath'"
13028 msgstr "不能创建空的子模组目录 '$displaypath'"
13030 #: git-submodule.sh:463
13032 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
13033 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
13035 #: git-submodule.sh:612
13037 msgid "Unable to find current revision in submodule path '$displaypath'"
13038 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
13040 #: git-submodule.sh:622
13042 msgid "Unable to fetch in submodule path '$sm_path'"
13043 msgstr "无法在子模组路径 '$sm_path' 中获取"
13045 #: git-submodule.sh:627
13048 "Unable to find current ${remote_name}/${branch} revision in submodule path "
13050 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
13052 #: git-submodule.sh:645
13054 msgid "Unable to fetch in submodule path '$displaypath'"
13055 msgstr "无法在子模组路径 '$displaypath' 中获取"
13057 #: git-submodule.sh:651
13060 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
13061 "Direct fetching of that commit failed."
13062 msgstr "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
13064 #: git-submodule.sh:658
13066 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
13067 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
13069 #: git-submodule.sh:659
13071 msgid "Submodule path '$displaypath': checked out '$sha1'"
13072 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
13074 #: git-submodule.sh:663
13076 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
13077 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
13079 #: git-submodule.sh:664
13081 msgid "Submodule path '$displaypath': rebased into '$sha1'"
13082 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
13084 #: git-submodule.sh:669
13086 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
13087 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
13089 #: git-submodule.sh:670
13091 msgid "Submodule path '$displaypath': merged in '$sha1'"
13092 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
13094 #: git-submodule.sh:675
13096 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
13097 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
13099 #: git-submodule.sh:676
13101 msgid "Submodule path '$displaypath': '$command $sha1'"
13102 msgstr "子模组 '$displaypath':'$command $sha1'"
13104 #: git-submodule.sh:707
13106 msgid "Failed to recurse into submodule path '$displaypath'"
13107 msgstr "无法递归进子模组路径 '$displaypath'"
13109 #: git-submodule.sh:815
13110 msgid "The --cached option cannot be used with the --files option"
13111 msgstr "选项 --cached 不能和选项 --files 同时使用"
13113 #: git-submodule.sh:867
13115 msgid "unexpected mode $mod_dst"
13116 msgstr "意外的模式 $mod_dst"
13119 #: git-submodule.sh:887
13121 msgid " Warn: $display_name doesn't contain commit $sha1_src"
13122 msgstr " 警告:$display_name 未包含提交 $sha1_src"
13125 #: git-submodule.sh:890
13127 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
13128 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
13131 #: git-submodule.sh:893
13133 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
13134 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
13136 #: git-submodule.sh:918
13140 #: git-submodule.sh:1040
13142 msgid "Failed to recurse into submodule path '$sm_path'"
13143 msgstr "无法递归进子模组路径 '$sm_path'"
13145 #: git-submodule.sh:1107
13147 msgid "Synchronizing submodule url for '$displaypath'"
13148 msgstr "为 '$displaypath' 同步子模组 url"
13150 #: git-parse-remote.sh:89
13152 msgid "See git-${cmd}(1) for details."
13153 msgstr "详见 git-${cmd}(1)。"
13155 #: git-rebase--interactive.sh:131
13157 msgid "Rebasing ($new_count/$total)"
13158 msgstr "变基中($new_count/$total)"
13160 #: git-rebase--interactive.sh:147
13164 " p, pick = use commit\n"
13165 " r, reword = use commit, but edit the commit message\n"
13166 " e, edit = use commit, but stop for amending\n"
13167 " s, squash = use commit, but meld into previous commit\n"
13168 " f, fixup = like \"squash\", but discard this commit's log message\n"
13169 " x, exec = run command (the rest of the line) using shell\n"
13170 " d, drop = remove commit\n"
13172 "These lines can be re-ordered; they are executed from top to bottom.\n"
13176 " p, pick = 使用提交\n"
13177 " r, reword = 使用提交,但修改提交说明\n"
13178 " e, edit = 使用提交,但停止以便进行提交修补\n"
13179 " s, squash = 使用提交,但和前一个版本融合\n"
13180 " f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
13181 " x, exec = 使用 shell 运行命令(此行剩余部分)\n"
13182 " d, drop = 删除提交\n"
13184 "这些行可以被重新排序;它们会被从上至下地执行。\n"
13187 #: git-rebase--interactive.sh:162
13190 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
13191 msgstr "\n不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
13193 #: git-rebase--interactive.sh:166
13196 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
13197 msgstr "\n如果您在这里删除一行,对应的提交将会丢失。\n"
13199 #: git-rebase--interactive.sh:202
13202 "You can amend the commit now, with\n"
13204 "\tgit commit --amend $gpg_sign_opt_quoted\n"
13206 "Once you are satisfied with your changes, run\n"
13208 "\tgit rebase --continue"
13212 "\tgit commit --amend $gpg_sign_opt_quoted\n"
13216 "\tgit rebase --continue"
13218 #: git-rebase--interactive.sh:227
13220 msgid "$sha1: not a commit that can be picked"
13221 msgstr "$sha1:不是一个可以被拣选的提交"
13223 #: git-rebase--interactive.sh:266
13225 msgid "Invalid commit name: $sha1"
13226 msgstr "无效的提交名:$sha1"
13228 #: git-rebase--interactive.sh:308
13229 msgid "Cannot write current commit's replacement sha1"
13230 msgstr "不能写入当前提交的替代 sha1"
13232 #: git-rebase--interactive.sh:360
13234 msgid "Fast-forward to $sha1"
13237 #: git-rebase--interactive.sh:362
13239 msgid "Cannot fast-forward to $sha1"
13240 msgstr "不能快进到 $sha1"
13242 #: git-rebase--interactive.sh:371
13244 msgid "Cannot move HEAD to $first_parent"
13245 msgstr "不能移动 HEAD 到 $first_parent"
13247 #: git-rebase--interactive.sh:376
13249 msgid "Refusing to squash a merge: $sha1"
13250 msgstr "拒绝压缩一个合并:$sha1"
13252 #: git-rebase--interactive.sh:390
13254 msgid "Error redoing merge $sha1"
13255 msgstr "无法重做合并 $sha1"
13257 #: git-rebase--interactive.sh:398
13259 msgid "Could not pick $sha1"
13260 msgstr "不能拣选 $sha1"
13262 #: git-rebase--interactive.sh:407
13264 msgid "This is the commit message #${n}:"
13265 msgstr "这是提交说明 #${n}:"
13267 #: git-rebase--interactive.sh:412
13269 msgid "The commit message #${n} will be skipped:"
13270 msgstr "提交说明 #${n} 将被跳过:"
13272 #: git-rebase--interactive.sh:423
13274 msgid "This is a combination of $count commit."
13275 msgid_plural "This is a combination of $count commits."
13276 msgstr[0] "这是一个 $count 个提交的组合。"
13277 msgstr[1] "这是一个 $count 个提交的组合。"
13279 #: git-rebase--interactive.sh:431
13281 msgid "Cannot write $fixup_msg"
13282 msgstr "不能写入 $fixup_msg"
13284 #: git-rebase--interactive.sh:434
13285 msgid "This is a combination of 2 commits."
13286 msgstr "这是一个 2 个提交的组合。"
13288 #: git-rebase--interactive.sh:435
13289 msgid "This is the 1st commit message:"
13290 msgstr "这是第一个提交说明:"
13292 #: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
13293 #: git-rebase--interactive.sh:521
13295 msgid "Could not apply $sha1... $rest"
13296 msgstr "不能应用 $sha1... $rest"
13298 #: git-rebase--interactive.sh:549
13301 "Could not amend commit after successfully picking $sha1... $rest\n"
13302 "This is most likely due to an empty commit message, or the pre-commit hook\n"
13303 "failed. If the pre-commit hook failed, you may need to resolve the issue "
13305 "you are able to reword the commit."
13307 "不能在成功拣选 $sha1... $rest 之后修补提交\n"
13308 "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
13309 "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
13311 #: git-rebase--interactive.sh:564
13313 msgid "Stopped at $sha1_abbrev... $rest"
13314 msgstr "停止在 $sha1_abbrev... $rest"
13316 #: git-rebase--interactive.sh:579
13318 msgid "Cannot '$squash_style' without a previous commit"
13319 msgstr "没有父提交的情况下不能 '$squash_style'"
13321 #: git-rebase--interactive.sh:621
13323 msgid "Executing: $rest"
13326 #: git-rebase--interactive.sh:629
13328 msgid "Execution failed: $rest"
13329 msgstr "执行失败:$rest"
13331 #: git-rebase--interactive.sh:631
13332 msgid "and made changes to the index and/or the working tree"
13333 msgstr "并且修改索引和/或工作区"
13336 #: git-rebase--interactive.sh:633
13338 "You can fix the problem, and then run\n"
13340 "\tgit rebase --continue"
13344 "\tgit rebase --continue"
13346 #. TRANSLATORS: after these lines is a command to be issued by the user
13347 #: git-rebase--interactive.sh:646
13350 "Execution succeeded: $rest\n"
13351 "but left changes to the index and/or the working tree\n"
13352 "Commit or stash your changes, and then run\n"
13354 "\tgit rebase --continue"
13357 "但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
13359 "\tgit rebase --continue"
13361 #: git-rebase--interactive.sh:657
13363 msgid "Unknown command: $command $sha1 $rest"
13364 msgstr "未知命令:$command $sha1 $rest"
13366 #: git-rebase--interactive.sh:658
13367 msgid "Please fix this using 'git rebase --edit-todo'."
13368 msgstr "要修改请使用命令 'git rebase --edit-todo'。"
13370 #: git-rebase--interactive.sh:693
13372 msgid "Successfully rebased and updated $head_name."
13373 msgstr "成功变基并更新 $head_name。"
13375 #: git-rebase--interactive.sh:740
13376 msgid "Could not skip unnecessary pick commands"
13377 msgstr "不能跳过不必要的拣选命令"
13379 #: git-rebase--interactive.sh:898
13382 "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
13385 "警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
13388 #: git-rebase--interactive.sh:931
13391 "Warning: the command isn't recognized in the following line:\n"
13394 "警告:下面一行中的命令未能被识别:\n"
13397 #: git-rebase--interactive.sh:970
13398 msgid "could not detach HEAD"
13399 msgstr "不能检出为分离头指针"
13401 #: git-rebase--interactive.sh:1008
13403 "Warning: some commits may have been dropped accidentally.\n"
13404 "Dropped commits (newer to older):"
13405 msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
13407 #: git-rebase--interactive.sh:1016
13409 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
13411 "Use 'git config rebase.missingCommitsCheck' to change the level of "
13413 "The possible behaviours are: ignore, warn, error."
13415 "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
13417 "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
13418 "可选值有:ignore、warn、error。"
13420 #: git-rebase--interactive.sh:1027
13423 "Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
13425 msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
13427 #: git-rebase--interactive.sh:1044
13428 msgid "You can fix this with 'git rebase --edit-todo'."
13429 msgstr "您可以使用 'git rebase --edit-todo' 命令修改。"
13431 #: git-rebase--interactive.sh:1045
13432 msgid "Or you can abort the rebase with 'git rebase --abort'."
13433 msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
13435 #: git-rebase--interactive.sh:1069
13436 msgid "Could not remove CHERRY_PICK_HEAD"
13437 msgstr "不能删除 CHERRY_PICK_HEAD"
13439 #: git-rebase--interactive.sh:1074
13442 "You have staged changes in your working tree.\n"
13443 "If these changes are meant to be\n"
13444 "squashed into the previous commit, run:\n"
13446 " git commit --amend $gpg_sign_opt_quoted\n"
13448 "If they are meant to go into a new commit, run:\n"
13450 " git commit $gpg_sign_opt_quoted\n"
13452 "In both case, once you're done, continue with:\n"
13454 " git rebase --continue\n"
13456 "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
13458 " git commit --amend $gpg_sign_opt_quoted\n"
13460 "如果这些变更要形成一个新提交,执行:\n"
13462 " git commit $gpg_sign_opt_quoted\n"
13464 "无论哪种情况,当您完成提交,继续执行:\n"
13466 " git rebase --continue\n"
13468 #: git-rebase--interactive.sh:1091
13469 msgid "Error trying to find the author identity to amend commit"
13470 msgstr "在修补提交中查找作者信息时遇到错误"
13472 #: git-rebase--interactive.sh:1096
13474 "You have uncommitted changes in your working tree. Please commit them\n"
13475 "first and then run 'git rebase --continue' again."
13476 msgstr "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
13478 #: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
13479 msgid "Could not commit staged changes."
13480 msgstr "不能提交暂存的修改。"
13482 #: git-rebase--interactive.sh:1129
13485 "You are editing the todo file of an ongoing interactive rebase.\n"
13486 "To continue rebase after editing, run:\n"
13487 " git rebase --continue\n"
13491 "您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
13493 " git rebase --continue\n"
13496 #: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298
13497 msgid "Could not execute editor"
13500 #: git-rebase--interactive.sh:1145
13501 msgid "You need to set your committer info first"
13502 msgstr "您需要先设置您的提交者信息"
13504 #: git-rebase--interactive.sh:1153
13506 msgid "Could not checkout $switch_to"
13507 msgstr "不能检出 $switch_to"
13509 #: git-rebase--interactive.sh:1158
13513 #: git-rebase--interactive.sh:1159
13515 msgid "Could not create temporary $state_dir"
13516 msgstr "不能创建临时 $state_dir"
13518 #: git-rebase--interactive.sh:1161
13519 msgid "Could not mark as interactive"
13522 #: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176
13523 msgid "Could not init rewritten commits"
13524 msgstr "不能对重写提交进行初始化"
13526 #: git-rebase--interactive.sh:1276
13528 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
13529 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
13530 msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
13531 msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
13533 #: git-rebase--interactive.sh:1281
13536 "However, if you remove everything, the rebase will be aborted.\n"
13538 msgstr "\n然而,如果您删除全部内容,变基操作将会终止。\n\n"
13540 #: git-rebase--interactive.sh:1288
13541 msgid "Note that empty commits are commented out"
13542 msgstr "注意空提交已被注释掉"
13544 #: git-sh-setup.sh:89 git-sh-setup.sh:94
13546 msgid "usage: $dashless $USAGE"
13547 msgstr "用法:$dashless $USAGE"
13549 #: git-sh-setup.sh:190
13551 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
13552 msgstr "不能切换目录到 $cdup,工作区的顶级目录"
13554 #: git-sh-setup.sh:199 git-sh-setup.sh:206
13556 msgid "fatal: $program_name cannot be used without a working tree."
13557 msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
13559 #: git-sh-setup.sh:220
13560 msgid "Cannot rebase: You have unstaged changes."
13561 msgstr "不能变基:您有未暂存的变更。"
13563 #: git-sh-setup.sh:223
13564 msgid "Cannot rewrite branches: You have unstaged changes."
13565 msgstr "不能重写分支:您有未暂存的变更。"
13567 #: git-sh-setup.sh:229
13569 msgid "Cannot $action: You have unstaged changes."
13570 msgstr "不能 $action:您有未暂存的变更。"
13572 #: git-sh-setup.sh:242
13573 msgid "Cannot rebase: Your index contains uncommitted changes."
13574 msgstr "不能变基:您的索引中包含未提交的变更。"
13576 #: git-sh-setup.sh:248
13578 msgid "Cannot $action: Your index contains uncommitted changes."
13579 msgstr "不能 $action:您的索引中包含未提交的变更。"
13581 #: git-sh-setup.sh:372
13582 msgid "You need to run this command from the toplevel of the working tree."
13583 msgstr "您需要在工作区的顶级目录中运行这个命令。"
13585 #: git-sh-setup.sh:377
13586 msgid "Unable to determine absolute path of git directory"
13587 msgstr "不能确定 git 目录的绝对路径"