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-02-28 20:31+0800\n"
139 "PO-Revision-Date: 2016-03-06 22:12+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"
155 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
156 "as appropriate to mark resolution and make a commit."
158 "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
161 #: advice.c:101 builtin/merge.c:1226
162 msgid "You have not concluded your merge (MERGE_HEAD exists)."
163 msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
166 msgid "Please, commit your changes before merging."
167 msgstr "请在合并前先提交您的修改。"
170 msgid "Exiting because of unfinished merge."
171 msgstr "因为存在未完成的合并而退出。"
174 msgid "git archive [<options>] <tree-ish> [<path>...]"
175 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
178 msgid "git archive --list"
179 msgstr "git archive --list"
183 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
185 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
188 msgid "git archive --remote <repo> [--exec <cmd>] --list"
189 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
191 #: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327
193 msgid "pathspec '%s' did not match any files"
194 msgstr "路径规格 '%s' 未匹配任何文件"
201 msgid "archive format"
204 #: archive.c:430 builtin/log.c:1232
209 msgid "prepend prefix to each pathname in the archive"
210 msgstr "为归档中每个路径名加上前缀"
212 #: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547
213 #: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987
214 #: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100
215 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398
216 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153
220 #: archive.c:433 builtin/archive.c:89
221 msgid "write the archive to this file"
225 msgid "read .gitattributes in working directory"
226 msgstr "读取工作区中的 .gitattributes"
229 msgid "report archived files on stderr"
230 msgstr "在标准错误上报告归档文件"
237 msgid "compress faster"
241 msgid "compress better"
245 msgid "list supported archive formats"
248 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:78
252 #: archive.c:452 builtin/archive.c:91
253 msgid "retrieve the archive from remote repository <repo>"
254 msgstr "从远程仓库(<仓库>)提取归档文件"
256 #: archive.c:453 builtin/archive.c:92 builtin/notes.c:482
260 #: archive.c:454 builtin/archive.c:93
261 msgid "path to the remote git-upload-archive command"
262 msgstr "远程 git-upload-archive 命令的路径"
266 "Negative patterns are ignored in git attributes\n"
267 "Use '\\!' for literal leading exclamation."
269 "负值模版在 git attributes 中被忽略\n"
270 "当字符串确实要以感叹号开始时,使用 '\\!'。"
276 "After fixing the error cause you may try to fix up\n"
277 "the remote tracking information by invoking\n"
278 "\"git branch --set-upstream-to=%s%s%s\"."
281 "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
282 "\"git branch --set-upstream-to=%s%s%s\" 。"
286 msgid "Not setting branch %s as its own upstream."
287 msgstr "未设置分支 %s 作为它自己的上游。"
291 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
292 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
296 msgid "Branch %s set up to track remote branch %s from %s."
297 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
301 msgid "Branch %s set up to track local branch %s by rebasing."
302 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
306 msgid "Branch %s set up to track local branch %s."
307 msgstr "分支 %s 设置为跟踪本地分支 %s。"
311 msgid "Branch %s set up to track remote ref %s by rebasing."
312 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
316 msgid "Branch %s set up to track remote ref %s."
317 msgstr "分支 %s 设置为跟踪远程引用 %s。"
321 msgid "Branch %s set up to track local ref %s by rebasing."
322 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
326 msgid "Branch %s set up to track local ref %s."
327 msgstr "分支 %s 设置为跟踪本地引用 %s。"
330 msgid "Unable to write upstream branch configuration"
335 msgid "Not tracking: ambiguous information for ref %s"
336 msgstr "未跟踪:引用 %s 有歧义"
340 msgid "'%s' is not a valid branch name."
341 msgstr "'%s' 不是一个有效的分支名称。"
345 msgid "A branch named '%s' already exists."
346 msgstr "一个分支名 '%s' 已经存在。"
349 msgid "Cannot force update the current branch."
354 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
355 msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
359 msgid "the requested upstream branch '%s' does not exist"
360 msgstr "请求的上游分支 '%s' 不存在"
365 "If you are planning on basing your work on an upstream\n"
366 "branch that already exists at the remote, you may need to\n"
367 "run \"git fetch\" to retrieve it.\n"
369 "If you are planning to push out a new local branch that\n"
370 "will track its remote counterpart, you may want to use\n"
371 "\"git push -u\" to set the upstream config as you push."
374 "如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
375 "您可能需要执行 \"git fetch\" 来获取分支。\n"
377 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
378 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
382 msgid "Not a valid object name: '%s'."
383 msgstr "不是一个有效的对象名:'%s'。"
387 msgid "Ambiguous object name: '%s'."
388 msgstr "歧义的对象名:'%s'。"
392 msgid "Not a valid branch point: '%s'."
393 msgstr "无效的分支点:'%s'。"
397 msgid "'%s' is already checked out at '%s'"
398 msgstr "'%s' 已经检出到 '%s'"
402 msgid "'%s' does not look like a v2 bundle file"
403 msgstr "'%s' 不像是一个 v2 版本的包文件"
407 msgid "unrecognized header: %s%s (%d)"
408 msgstr "未能识别的包头:%s%s (%d)"
410 #: bundle.c:87 builtin/commit.c:766
412 msgid "could not open '%s'"
416 msgid "Repository lacks these prerequisite commits:"
417 msgstr "仓库中缺少这些必备的提交:"
419 #: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074
420 #: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334
421 #: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358
422 #: builtin/shortlog.c:170
423 msgid "revision walk setup failed"
428 msgid "The bundle contains this ref:"
429 msgid_plural "The bundle contains these %d refs:"
430 msgstr[0] "这个包中含有这个引用:"
431 msgstr[1] "这个包中含有 %d 个引用:"
434 msgid "The bundle records a complete history."
435 msgstr "这个包记录一个完整历史。"
439 msgid "The bundle requires this ref:"
440 msgid_plural "The bundle requires these %d refs:"
441 msgstr[0] "这个包需要这个引用:"
442 msgstr[1] "这个包需要 %d 个引用:"
445 msgid "Could not spawn pack-objects"
446 msgstr "不能生成 pack-objects 进程"
449 msgid "pack-objects died"
450 msgstr "pack-objects 终止"
453 msgid "rev-list died"
458 msgid "ref '%s' is excluded by the rev-list options"
459 msgstr "引用 '%s' 被 rev-list 选项排除"
461 #: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273
463 msgid "unrecognized argument: %s"
467 msgid "Refusing to create empty bundle."
472 msgid "cannot create '%s'"
476 msgid "index-pack died"
477 msgstr "index-pack 终止"
481 msgid "invalid color value: %.*s"
484 #: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505
487 msgid "could not parse %s"
492 msgid "%s %s is not a commit!"
493 msgstr "%s %s 不是一个提交!"
495 #: compat/obstack.c:406 compat/obstack.c:408
496 msgid "memory exhausted"
499 #: config.c:475 config.c:477
501 msgid "bad config line %d in %s %s"
502 msgstr "%2$s %3$s 出错于第 %1$d 行"
506 msgid "bad numeric config value '%s' for '%s' in %s %s: %s"
507 msgstr "%3$s %4$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %5$s"
511 msgid "bad numeric config value '%s' for '%s': %s"
512 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
516 msgid "failed to expand user dir in: '%s'"
517 msgstr "无法扩展 '%s' 中的用户目录"
519 #: config.c:758 config.c:769
521 msgid "bad zlib compression level %d"
522 msgstr "错误的 zlib 压缩级别 %d"
526 msgid "invalid mode for object creation: %s"
527 msgstr "无效的对象创建模式:%s"
530 msgid "unable to parse command-line config"
534 msgid "unknown error occured while reading the configuration files"
535 msgstr "在读取配置文件时遇到未知错误"
539 msgid "unable to parse '%s' from command-line config"
540 msgstr "无法解析命令行配置中的 '%s'"
544 msgid "bad config variable '%s' in file '%s' at line %d"
545 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
549 msgid "%s has multiple values"
554 msgid "Could not set '%s' to '%s'"
555 msgstr "不能设置 '%s' 为 '%s'"
558 msgid "Could not run 'git rev-list'"
559 msgstr "不能执行 'git rev-list'"
563 msgid "failed write to rev-list: %s"
564 msgstr "无法写入 rev-list:%s"
568 msgid "failed to close rev-list's stdin: %s"
569 msgstr "无法关闭 rev-list 的标准输入:%s"
572 msgid "in the future"
577 msgid "%lu second ago"
578 msgid_plural "%lu seconds ago"
584 msgid "%lu minute ago"
585 msgid_plural "%lu minutes ago"
592 msgid_plural "%lu hours ago"
599 msgid_plural "%lu days ago"
606 msgid_plural "%lu weeks ago"
612 msgid "%lu month ago"
613 msgid_plural "%lu months ago"
620 msgid_plural "%lu years"
624 #. TRANSLATORS: "%s" is "<n> years"
627 msgid "%s, %lu month ago"
628 msgid_plural "%s, %lu months ago"
629 msgstr[0] "%s %lu 个月前"
630 msgstr[1] "%s %lu 个月前"
632 #: date.c:154 date.c:159
635 msgid_plural "%lu years ago"
639 #: diffcore-order.c:24
641 msgid "failed to read orderfile '%s'"
642 msgstr "无法读取排序文件 '%s'"
644 #: diffcore-rename.c:536
645 msgid "Performing inexact rename detection"
646 msgstr "正在进行非精确的重命名检测"
651 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
652 msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
657 msgid " Unknown dirstat parameter '%s'\n"
658 msgstr " 未知的 dirstat 参数 '%s'\n"
662 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
663 msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
668 "Found errors in 'diff.dirstat' config variable:\n"
671 "发现配置变量 'diff.dirstat' 中的错误:\n"
676 msgid "external diff died, stopping at %s"
677 msgstr "外部 diff 退出,停止在 %s"
680 msgid "--follow requires exactly one pathspec"
681 msgstr "--follow 参数后只跟一个 pathspec"
686 "Failed to parse --dirstat/-X option parameter:\n"
689 "无法解析 --dirstat/-X 选项的参数:\n"
694 msgid "Failed to parse --submodule option parameter: '%s'"
695 msgstr "无法解析 --submodule 选项的参数:'%s'"
698 msgid "failed to get kernel name and information"
702 msgid "Untracked cache is disabled on this system or location."
703 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
705 #: gpg-interface.c:166 gpg-interface.c:237
706 msgid "could not run gpg."
709 #: gpg-interface.c:178
710 msgid "gpg did not accept the data"
713 #: gpg-interface.c:189
714 msgid "gpg failed to sign the data"
717 #: gpg-interface.c:222
719 msgid "could not create temporary file '%s': %s"
720 msgstr "不能创建临时文件 '%s':%s"
722 #: gpg-interface.c:225
724 msgid "failed writing detached signature to '%s': %s"
725 msgstr "无法将分离式签名写入 '%s':%s"
729 msgid "'%s': unable to read %s"
730 msgstr "'%s':无法读取 %s"
739 msgid "'%s': short read %s"
740 msgstr "'%s':读取不完整 %s"
744 msgid "available git commands in '%s'"
745 msgstr "在 '%s' 下可用的 git 命令"
748 msgid "git commands available from elsewhere on your $PATH"
749 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
752 msgid "These are common Git commands used in various situations:"
753 msgstr "这些是各种场合常见的 Git 命令:"
758 "'%s' appears to be a git command, but we were not\n"
759 "able to execute it. Maybe git-%s is broken?"
761 "'%s' 像是一个 git 命令,但却无法运行。\n"
765 msgid "Uh oh. Your system reports no Git commands at all."
766 msgstr "唉呀,您的系统中未发现 Git 命令。"
771 "WARNING: You called a Git command named '%s', which does not exist.\n"
772 "Continuing under the assumption that you meant '%s'"
774 "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
779 msgid "in %0.1f seconds automatically..."
780 msgstr "在 %0.1f 秒钟后自动运行..."
784 msgid "git: '%s' is not a git command. See 'git --help'."
785 msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
787 #: help.c:404 help.c:464
793 "Did you mean one of these?"
807 msgid "failed to read the cache"
810 #: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376
811 #: builtin/checkout.c:587 builtin/clone.c:730
812 msgid "unable to write new index file"
815 #: merge-recursive.c:189
817 msgid "(bad commit)\n"
820 #: merge-recursive.c:209
822 msgid "addinfo_cache failed for path '%s'"
823 msgstr "为路径 '%s' addinfo_cache 失败"
825 #: merge-recursive.c:270
826 msgid "error building trees"
829 #: merge-recursive.c:689
831 msgid "failed to create path '%s'%s"
832 msgstr "无法创建路径 '%s'%s"
834 #: merge-recursive.c:700
836 msgid "Removing %s to make room for subdirectory\n"
837 msgstr "删除 %s 以便为子目录留出空间\n"
839 #: merge-recursive.c:714 merge-recursive.c:735
840 msgid ": perhaps a D/F conflict?"
841 msgstr ":可能是一个目录/文件冲突?"
843 #: merge-recursive.c:725
845 msgid "refusing to lose untracked file at '%s'"
846 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
848 #: merge-recursive.c:765
850 msgid "cannot read object %s '%s'"
851 msgstr "不能读取对象 %s '%s'"
853 #: merge-recursive.c:767
855 msgid "blob expected for %s '%s'"
856 msgstr "%s '%s' 应为数据对象"
858 #: merge-recursive.c:790 builtin/clone.c:374
860 msgid "failed to open '%s'"
863 #: merge-recursive.c:798
865 msgid "failed to symlink '%s'"
866 msgstr "无法创建符号链接 '%s'"
868 #: merge-recursive.c:801
870 msgid "do not know what to do with %06o %s '%s'"
871 msgstr "不知道如何处理 %06o %s '%s'"
873 #: merge-recursive.c:939
874 msgid "Failed to execute internal merge"
877 #: merge-recursive.c:943
879 msgid "Unable to add %s to database"
880 msgstr "不能添加 %s 至对象库"
882 #: merge-recursive.c:959
883 msgid "unsupported object type in the tree"
884 msgstr "在树中有不支持的对象类型"
886 #: merge-recursive.c:1034 merge-recursive.c:1048
889 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
892 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
895 #: merge-recursive.c:1040 merge-recursive.c:1053
898 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
901 "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
904 #: merge-recursive.c:1094
908 #: merge-recursive.c:1094
912 #: merge-recursive.c:1150
914 msgid "%s is a directory in %s adding as %s instead"
915 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
917 #: merge-recursive.c:1172
920 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
921 "\"->\"%s\" in \"%s\"%s"
923 "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
924 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
926 #: merge-recursive.c:1177
927 msgid " (left unresolved)"
930 #: merge-recursive.c:1231
932 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
934 "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
937 #: merge-recursive.c:1261
939 msgid "Renaming %s to %s and %s to %s instead"
940 msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
942 #: merge-recursive.c:1460
944 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
945 msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
947 #: merge-recursive.c:1470
949 msgid "Adding merged %s"
952 #: merge-recursive.c:1475 merge-recursive.c:1677
954 msgid "Adding as %s instead"
957 #: merge-recursive.c:1526
959 msgid "cannot read object %s"
962 #: merge-recursive.c:1529
964 msgid "object %s is not a blob"
965 msgstr "对象 %s 不是一个数据对象"
967 #: merge-recursive.c:1581
971 #: merge-recursive.c:1581
975 #: merge-recursive.c:1591
979 #: merge-recursive.c:1598
983 #: merge-recursive.c:1632
985 msgid "Skipped %s (merged same as existing)"
986 msgstr "略过 %s(已经做过相同合并)"
988 #: merge-recursive.c:1646
990 msgid "Auto-merging %s"
993 #: merge-recursive.c:1650 git-submodule.sh:1048
997 #: merge-recursive.c:1651
999 msgid "CONFLICT (%s): Merge conflict in %s"
1000 msgstr "冲突(%s):合并冲突于 %s"
1002 #: merge-recursive.c:1737
1007 #: merge-recursive.c:1762
1008 msgid "file/directory"
1011 #: merge-recursive.c:1768
1012 msgid "directory/file"
1015 #: merge-recursive.c:1773
1017 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
1018 msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
1020 #: merge-recursive.c:1783
1025 #: merge-recursive.c:1800
1026 msgid "Fatal merge failure, shouldn't happen."
1027 msgstr "严重的合并错误,不应发生。"
1029 #: merge-recursive.c:1819
1030 msgid "Already up-to-date!"
1033 #: merge-recursive.c:1828
1035 msgid "merging of trees %s and %s failed"
1036 msgstr "无法合并树 %s 和 %s"
1038 #: merge-recursive.c:1858
1040 msgid "Unprocessed path??? %s"
1041 msgstr "未处理的路径??? %s"
1043 #: merge-recursive.c:1906
1047 #: merge-recursive.c:1919
1049 msgid "found %u common ancestor:"
1050 msgid_plural "found %u common ancestors:"
1051 msgstr[0] "发现 %u 个共同祖先:"
1052 msgstr[1] "发现 %u 个共同祖先:"
1054 #: merge-recursive.c:1956
1055 msgid "merge returned no commit"
1058 #: merge-recursive.c:2013
1060 msgid "Could not parse object '%s'"
1061 msgstr "不能解析对象 '%s'"
1063 #: merge-recursive.c:2024 builtin/merge.c:646
1064 msgid "Unable to write index."
1068 msgid "Cannot commit uninitialized/unreferenced notes tree"
1069 msgstr "不能提交未初始化/未引用的注解树"
1071 #: notes-utils.c:100
1073 msgid "Bad notes.rewriteMode value: '%s'"
1074 msgstr "坏的 notes.rewriteMode 值:'%s'"
1076 #: notes-utils.c:110
1078 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
1079 msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
1081 #. TRANSLATORS: The first %s is the name of the
1082 #. environment variable, the second %s is its value
1083 #: notes-utils.c:137
1085 msgid "Bad %s value: '%s'"
1086 msgstr "坏的 %s 值:'%s'"
1090 msgid "unable to parse object: %s"
1093 #: parse-options.c:570
1097 #: parse-options.c:588
1102 #. TRANSLATORS: the colon here should align with the
1103 #. one in "usage: %s" translation
1104 #: parse-options.c:592
1109 # 译者:为保证在输出中对齐,注意调整句中空格!
1110 #: parse-options.c:595
1115 #: parse-options.c:629
1119 #: parse-options-cb.c:108
1121 msgid "malformed object name '%s'"
1122 msgstr "非法的对象名 '%s'"
1126 msgid "Could not make %s writable by group"
1127 msgstr "不能设置 %s 为组可写"
1130 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
1131 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
1135 "global 'literal' pathspec setting is incompatible with all other global "
1137 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
1140 msgid "invalid parameter for pathspec magic 'prefix'"
1141 msgstr "路径规格包含无效的神奇前缀"
1145 msgid "Invalid pathspec magic '%.*s' in '%s'"
1146 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
1150 msgid "Missing ')' at the end of pathspec magic in '%s'"
1151 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
1155 msgid "Unimplemented pathspec magic '%c' in '%s'"
1156 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
1160 msgid "%s: 'literal' and 'glob' are incompatible"
1161 msgstr "%s:'literal' 和 'glob' 不兼容"
1165 msgid "%s: '%s' is outside repository"
1166 msgstr "%s:'%s' 在仓库之外"
1170 msgid "Pathspec '%s' is in submodule '%.*s'"
1171 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
1175 msgid "%s: pathspec magic not supported by this command: %s"
1176 msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
1180 msgid "pathspec '%s' is beyond a symbolic link"
1181 msgstr "路径规格 '%s' 位于符号链接中"
1185 "There is nothing to exclude from by :(exclude) patterns.\n"
1186 "Perhaps you forgot to add either ':/' or '.' ?"
1188 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1192 msgid "unable to parse --pretty format"
1193 msgstr "不能解析 --pretty 格式"
1199 #: read-cache.c:1281
1202 "index.version set, but the value is invalid.\n"
1205 "设置了 index.version,但是取值无效。\n"
1208 #: read-cache.c:1291
1211 "GIT_INDEX_VERSION set, but the value is invalid.\n"
1214 "设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1217 #: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974
1218 #: builtin/merge.c:984
1220 msgid "Could not open '%s' for writing"
1221 msgstr "无法打开 '%s' 进行写入"
1223 #: refs/files-backend.c:2374
1225 msgid "could not delete reference %s: %s"
1226 msgstr "无法删除引用 %s:%s"
1228 #: refs/files-backend.c:2377
1230 msgid "could not delete references: %s"
1233 #: refs/files-backend.c:2386
1235 msgid "could not remove reference %s"
1240 msgid "expected format: %%(color:<color>)"
1241 msgstr "期望的格式:%%(color:<color>)"
1245 msgid "unrecognized color: %%(color:%s)"
1246 msgstr "未能识别的颜色:%%(color:%s)"
1250 msgid "unrecognized format: %%(%s)"
1251 msgstr "未能识别的格式:%%(%s)"
1255 msgid "positive value expected contents:lines=%s"
1256 msgstr "要为 contents:lines=%s 提供一个正数"
1260 msgid "unrecognized %%(contents) argument: %s"
1261 msgstr "未能识别的 %%(contents) 参数:%s"
1265 msgid "unrecognized %%(objectname) argument: %s"
1266 msgstr "未能识别的 %%(objectname) 参数:%s"
1270 msgid "expected format: %%(align:<width>,<position>)"
1271 msgstr "期望的格式:%%(align:<width>,<position>)"
1275 msgid "unrecognized position:%s"
1280 msgid "unrecognized width:%s"
1285 msgid "unrecognized %%(align) argument: %s"
1286 msgstr "未能识别的 %%(align) 参数:%s"
1290 msgid "positive width expected with the %%(align) atom"
1291 msgstr "元素 %%(align) 需要一个正数的宽度"
1295 msgid "format: %%(end) atom used without corresponding atom"
1296 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1298 #: ref-filter.c:1311
1300 msgid "malformed object at '%s'"
1301 msgstr "非法的对象于 '%s'"
1303 #: ref-filter.c:1651
1305 msgid "format: %%(end) atom missing"
1306 msgstr "格式:缺少 %%(end) 元素"
1308 #: ref-filter.c:1705
1310 msgid "malformed object name %s"
1315 msgid "Cannot fetch both %s and %s to %s"
1316 msgstr "不能同时获取 %s 和 %s 至 %s"
1320 msgid "%s usually tracks %s, not %s"
1321 msgstr "%s 通常跟踪 %s,而非 %s"
1325 msgid "%s tracks both %s and %s"
1326 msgstr "%s 同时跟踪 %s 和 %s"
1329 msgid "Internal error"
1332 #: remote.c:1677 remote.c:1720
1333 msgid "HEAD does not point to a branch"
1334 msgstr "HEAD 没有指向一个分支"
1338 msgid "no such branch: '%s'"
1343 msgid "no upstream configured for branch '%s'"
1344 msgstr "尚未给分支 '%s' 设置上游"
1348 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1349 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1353 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1354 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1358 msgid "branch '%s' has no remote for pushing"
1359 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1363 msgid "push refspecs for '%s' do not include '%s'"
1364 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1367 msgid "push has no destination (push.default is 'nothing')"
1368 msgstr "推送无目标(push.default 是 'nothing')"
1371 msgid "cannot resolve 'simple' push to a single destination"
1372 msgstr "无法解析 'simple' 推送至一个单独的目标"
1376 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1377 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1380 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1381 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1385 msgid "Your branch is up-to-date with '%s'.\n"
1386 msgstr "您的分支与上游分支 '%s' 一致。\n"
1390 msgid "Your branch is ahead of '%s' by %d commit.\n"
1391 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1392 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1393 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1396 msgid " (use \"git push\" to publish your local commits)\n"
1397 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1401 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1403 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1404 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1405 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1409 msgid " (use \"git pull\" to update your local branch)\n"
1410 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1415 "Your branch and '%s' have diverged,\n"
1416 "and have %d and %d different commit each, respectively.\n"
1418 "Your branch and '%s' have diverged,\n"
1419 "and have %d and %d different commits each, respectively.\n"
1421 "您的分支和 '%s' 出现了偏离,\n"
1422 "并且分别有 %d 和 %d 处不同的提交。\n"
1424 "您的分支和 '%s' 出现了偏离,\n"
1425 "并且分别有 %d 和 %d 处不同的提交。\n"
1429 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1430 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1433 msgid "your current branch appears to be broken"
1434 msgstr "您的当前分支好像被损坏"
1438 msgid "your current branch '%s' does not have any commits yet"
1439 msgstr "您的当前分支 '%s' 尚无任何提交"
1442 msgid "--first-parent is incompatible with --bisect"
1443 msgstr "--first-parent 与 --bisect 不兼容"
1446 msgid "open /dev/null failed"
1447 msgstr "不能打开 /dev/null"
1451 msgid "dup2(%d,%d) failed"
1452 msgstr "不能调用 dup2(%d,%d)"
1455 msgid "failed to sign the push certificate"
1459 msgid "the receiving end does not support --signed push"
1464 "not sending a push certificate since the receiving end does not support --"
1466 msgstr "未发送推送证书,因为接收端不支持签名推送"
1469 msgid "the receiving end does not support --atomic push"
1474 "after resolving the conflicts, mark the corrected paths\n"
1475 "with 'git add <paths>' or 'git rm <paths>'"
1477 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1482 "after resolving the conflicts, mark the corrected paths\n"
1483 "with 'git add <paths>' or 'git rm <paths>'\n"
1484 "and commit the result with 'git commit'"
1486 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1487 "对修正后的文件做标记,然后用 'git commit' 提交"
1489 #: sequencer.c:190 sequencer.c:833 sequencer.c:913
1491 msgid "Could not write to %s"
1496 msgid "Error wrapping up %s"
1500 msgid "Your local changes would be overwritten by cherry-pick."
1501 msgstr "您的本地修改将被拣选操作覆盖。"
1504 msgid "Your local changes would be overwritten by revert."
1505 msgstr "您的本地修改将被还原操作覆盖。"
1508 msgid "Commit your changes or stash them to proceed."
1509 msgstr "提交您的修改或保存进度后再继续。"
1511 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1514 msgid "%s: Unable to write new index file"
1515 msgstr "%s:无法写入新索引文件"
1518 msgid "Could not resolve HEAD commit\n"
1519 msgstr "不能解析 HEAD 提交\n"
1522 msgid "Unable to update cache tree\n"
1527 msgid "Could not parse commit %s\n"
1528 msgstr "不能解析提交 %s\n"
1532 msgid "Could not parse parent commit %s\n"
1533 msgstr "不能解析父提交 %s\n"
1536 msgid "Your index file is unmerged."
1537 msgstr "您的索引文件未完成合并。"
1541 msgid "Commit %s is a merge but no -m option was given."
1542 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1546 msgid "Commit %s does not have parent %d"
1547 msgstr "提交 %s 没有父提交 %d"
1551 msgid "Mainline was specified but commit %s is not a merge."
1552 msgstr "指定了主线但提交 %s 不是一个合并。"
1554 #. TRANSLATORS: The first %s will be "revert" or
1555 #. "cherry-pick", the second %s a SHA1
1558 msgid "%s: cannot parse parent commit %s"
1559 msgstr "%s:不能解析父提交 %s"
1563 msgid "Cannot get commit message for %s"
1564 msgstr "不能得到 %s 的提交说明"
1568 msgid "could not revert %s... %s"
1569 msgstr "不能还原 %s... %s"
1573 msgid "could not apply %s... %s"
1574 msgstr "不能应用 %s... %s"
1577 msgid "empty commit set passed"
1582 msgid "git %s: failed to read the index"
1583 msgstr "git %s:无法读取索引"
1587 msgid "git %s: failed to refresh the index"
1588 msgstr "git %s:无法刷新索引"
1592 msgid "Cannot %s during a %s"
1593 msgstr "无法 %s 在一个 %s 过程中"
1597 msgid "Could not parse line %d."
1598 msgstr "不能解析第 %d 行。"
1601 msgid "No commits parsed."
1606 msgid "Could not open %s"
1611 msgid "Could not read %s."
1616 msgid "Unusable instruction sheet: %s"
1621 msgid "Invalid key: %s"
1624 #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1626 msgid "Invalid value for %s: %s"
1631 msgid "Malformed options sheet: %s"
1635 msgid "a cherry-pick or revert is already in progress"
1636 msgstr "一个拣选或还原操作已在进行"
1639 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1640 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1644 msgid "Could not create sequencer directory %s"
1645 msgstr "不能创建序列目录 %s"
1647 #: sequencer.c:835 sequencer.c:917
1649 msgid "Error wrapping up %s."
1652 #: sequencer.c:854 sequencer.c:987
1653 msgid "no cherry-pick or revert in progress"
1654 msgstr "拣选或还原操作并未进行"
1657 msgid "cannot resolve HEAD"
1661 msgid "cannot abort from a branch yet to be born"
1662 msgstr "不能从尚未建立的分支终止"
1664 #: sequencer.c:878 builtin/apply.c:4287
1666 msgid "cannot open %s: %s"
1671 msgid "cannot read %s: %s"
1675 msgid "unexpected end of file"
1680 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1681 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1685 msgid "Could not format %s."
1690 msgid "%s: can't cherry-pick a %s"
1691 msgstr "%s:不能拣选一个%s"
1695 msgid "%s: bad revision"
1699 msgid "Can't revert as initial commit"
1703 msgid "Can't cherry-pick into empty head"
1708 msgid "failed to read %s"
1713 "Git normally never creates a ref that ends with 40 hex characters\n"
1714 "because it will be ignored when you just specify 40-hex. These refs\n"
1715 "may be created by mistake. For example,\n"
1717 " git checkout -b $br $(git rev-parse ...)\n"
1719 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1720 "examine these refs and maybe delete them. Turn this message off by\n"
1721 "running \"git config advice.objectNameWarning false\""
1723 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1724 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1726 " git checkout -b $br $(git rev-parse ...)\n"
1728 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1729 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1732 #: submodule.c:62 submodule.c:96
1733 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1734 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1736 #: submodule.c:66 submodule.c:100
1738 msgid "Could not find section in .gitmodules where path=%s"
1739 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1743 msgid "Could not update .gitmodules entry %s"
1744 msgstr "不能更新 .gitmodules 条目 %s"
1748 msgid "Could not remove .gitmodules entry for %s"
1749 msgstr "无法移除 %s 的 .gitmodules 条目"
1752 msgid "staging updated .gitmodules failed"
1753 msgstr "将更新后 .gitmodules 添加暂存区失败"
1755 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1758 msgid "unknown value '%s' for key '%s'"
1759 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1761 #: trailer.c:544 trailer.c:549 builtin/remote.c:289
1763 msgid "more than one %s"
1768 msgid "empty trailer token in trailer '%.*s'"
1769 msgstr "签名 '%.*s' 的键为空"
1773 msgid "could not read input file '%s'"
1774 msgstr "不能读取输入文件 '%s'"
1777 msgid "could not read from stdin"
1780 #: trailer.c:857 builtin/am.c:42
1782 msgid "could not stat %s"
1783 msgstr "不能获取 %s 的文件状态"
1787 msgid "file %s is not a regular file"
1788 msgstr "文件 %s 不是一个正规文件"
1792 msgid "file %s is not writable by user"
1793 msgstr "文件 %s 用户不可写"
1796 msgid "could not open temporary file"
1801 msgid "could not rename temporary file to %s"
1802 msgstr "不能重命名临时文件为 %s"
1804 #: transport-helper.c:1041
1806 msgid "Could not read ref %s"
1809 #: unpack-trees.c:203
1810 msgid "Checking out files"
1814 msgid "invalid URL scheme name or missing '://' suffix"
1815 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1817 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1819 msgid "invalid %XX escape sequence"
1820 msgstr "无效的 %XX 转义序列"
1823 msgid "missing host and scheme is not 'file:'"
1824 msgstr "缺失主机名且 URL 方案不是 'file:'"
1827 msgid "a 'file:' URL may not have a port number"
1828 msgstr "一个 'file:' URL 不应该包含端口号"
1831 msgid "invalid characters in host name"
1832 msgstr "主机名中包含无效的字符"
1834 #: urlmatch.c:244 urlmatch.c:255
1835 msgid "invalid port number"
1839 msgid "invalid '..' path segment"
1840 msgstr "无效的 '..' 路径片段"
1842 #: wrapper.c:222 wrapper.c:381
1844 msgid "could not open '%s' for reading and writing"
1845 msgstr "无法打开 '%s' 进行读写"
1847 #: wrapper.c:224 wrapper.c:383
1849 msgid "could not open '%s' for writing"
1850 msgstr "无法打开 '%s' 进行写入"
1852 #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
1853 #: builtin/merge.c:1075 builtin/pull.c:387
1855 msgid "could not open '%s' for reading"
1856 msgstr "无法打开 '%s' 进行读取"
1860 msgid "unable to access '%s': %s"
1861 msgstr "不能访问 '%s':%s"
1865 msgid "unable to access '%s'"
1869 msgid "unable to get current working directory"
1874 msgid "could not open %s for writing"
1877 #: wrapper.c:678 builtin/am.c:410
1879 msgid "could not write to %s"
1884 msgid "could not close %s"
1888 msgid "Unmerged paths:"
1892 #: wt-status.c:176 wt-status.c:203
1894 msgid " (use \"git reset %s <file>...\" to unstage)"
1895 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1898 #: wt-status.c:178 wt-status.c:205
1899 msgid " (use \"git rm --cached <file>...\" to unstage)"
1900 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1904 msgid " (use \"git add <file>...\" to mark resolution)"
1905 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1908 #: wt-status.c:184 wt-status.c:188
1909 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1910 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1914 msgid " (use \"git rm <file>...\" to mark resolution)"
1915 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1917 #: wt-status.c:197 wt-status.c:880
1918 msgid "Changes to be committed:"
1921 #: wt-status.c:215 wt-status.c:889
1922 msgid "Changes not staged for commit:"
1923 msgstr "尚未暂存以备提交的变更:"
1927 msgid " (use \"git add <file>...\" to update what will be committed)"
1928 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
1932 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1933 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
1938 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
1939 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
1943 msgid " (commit or discard the untracked or modified content in submodules)"
1944 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1949 msgid " (use \"git %s <file>...\" to include in what will be committed)"
1950 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
1953 msgid "both deleted:"
1957 msgid "added by us:"
1961 msgid "deleted by them:"
1965 msgid "added by them:"
1969 msgid "deleted by us:"
1977 msgid "both modified:"
1982 msgid "bug: unhandled unmerged status %x"
1983 msgstr "bug:无法处理的未合并状态 %x"
2017 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2019 msgid "new commits, "
2022 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2024 msgid "modified content, "
2027 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2029 msgid "untracked content, "
2034 msgid "bug: unhandled diff status %c"
2035 msgstr "bug:无法处理的差异状态 %c"
2038 msgid "Submodules changed but not updated:"
2039 msgstr "子模组已修改但尚未更新:"
2042 msgid "Submodule changes to be committed:"
2047 "Do not touch the line above.\n"
2048 "Everything below will be removed."
2054 msgid "You have unmerged paths."
2059 msgid " (fix conflicts and run \"git commit\")"
2060 msgstr " (解决冲突并运行 \"git commit\")"
2063 msgid "All conflicts fixed but you are still merging."
2064 msgstr "所有冲突已解决但您仍处于合并中。"
2068 msgid " (use \"git commit\" to conclude merge)"
2069 msgstr " (使用 \"git commit\" 结束合并)"
2072 msgid "You are in the middle of an am session."
2073 msgstr "您正处于 am 操作过程中。"
2076 msgid "The current patch is empty."
2081 msgid " (fix conflicts and then run \"git am --continue\")"
2082 msgstr " (解决冲突,然后运行 \"git am --continue\")"
2086 msgid " (use \"git am --skip\" to skip this patch)"
2087 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2091 msgid " (use \"git am --abort\" to restore the original branch)"
2092 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2095 msgid "No commands done."
2100 msgid "Last command done (%d command done):"
2101 msgid_plural "Last commands done (%d commands done):"
2102 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2103 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2107 msgid " (see more in file %s)"
2108 msgstr " (更多参见文件 %s)"
2111 msgid "No commands remaining."
2116 msgid "Next command to do (%d remaining command):"
2117 msgid_plural "Next commands to do (%d remaining commands):"
2118 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2119 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2123 msgid " (use \"git rebase --edit-todo\" to view and edit)"
2124 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2128 msgid "You are currently rebasing branch '%s' on '%s'."
2129 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2132 msgid "You are currently rebasing."
2137 msgid " (fix conflicts and then run \"git rebase --continue\")"
2138 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2142 msgid " (use \"git rebase --skip\" to skip this patch)"
2143 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2147 msgid " (use \"git rebase --abort\" to check out the original branch)"
2148 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2152 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2153 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2158 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2159 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2162 msgid "You are currently splitting a commit during a rebase."
2163 msgstr "您在执行变基操作时拆分提交。"
2167 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2168 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2172 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2173 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2176 msgid "You are currently editing a commit during a rebase."
2177 msgstr "您在执行变基操作时编辑提交。"
2181 msgid " (use \"git commit --amend\" to amend the current commit)"
2182 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2187 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2188 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2192 msgid "You are currently cherry-picking commit %s."
2193 msgstr "您在执行拣选提交 %s 的操作。"
2197 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2198 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2202 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2203 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2207 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2208 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2212 msgid "You are currently reverting commit %s."
2213 msgstr "您在执行反转提交 %s 的操作。"
2217 msgid " (fix conflicts and run \"git revert --continue\")"
2218 msgstr " (解决冲突并运行 \"git revert --continue\")"
2222 msgid " (all conflicts fixed: run \"git revert --continue\")"
2223 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2227 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2228 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2232 msgid "You are currently bisecting, started from branch '%s'."
2233 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2236 msgid "You are currently bisecting."
2237 msgstr "您在执行二分查找操作。"
2241 msgid " (use \"git bisect reset\" to get back to the original branch)"
2242 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2249 msgid "interactive rebase in progress; onto "
2250 msgstr "交互式变基操作正在进行中;至 "
2253 msgid "rebase in progress; onto "
2254 msgstr "变基操作正在进行中;至 "
2257 msgid "HEAD detached at "
2261 msgid "HEAD detached from "
2265 msgid "Not currently on any branch."
2269 msgid "Initial commit"
2273 msgid "Untracked files"
2277 msgid "Ignored files"
2283 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2284 "may speed it up, but you have to be careful not to forget to add\n"
2285 "new files yourself (see 'git help status')."
2287 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2288 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2292 msgid "Untracked files not listed%s"
2293 msgstr "未跟踪的文件没有列出%s"
2295 # 译者:中文字符串拼接,可删除前导空格
2297 msgid " (use -u option to show untracked files)"
2298 msgstr "(使用 -u 参数显示未跟踪的文件)"
2306 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2307 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2311 msgid "no changes added to commit\n"
2317 "nothing added to commit but untracked files present (use \"git add\" to "
2319 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2323 msgid "nothing added to commit but untracked files present\n"
2324 msgstr "提交为空,但是存在尚未跟踪的文件\n"
2326 # 译者:中文字符串拼接,可删除前导空格
2329 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2330 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2332 #: wt-status.c:1528 wt-status.c:1533
2334 msgid "nothing to commit\n"
2337 # 译者:中文字符串拼接,可删除前导空格
2340 msgid "nothing to commit (use -u to show untracked files)\n"
2341 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2343 # 译者:中文字符串拼接,可删除前导空格
2346 msgid "nothing to commit, working directory clean\n"
2347 msgstr "无文件要提交,干净的工作区\n"
2351 msgid "Initial commit on "
2355 msgid "HEAD (no branch)"
2363 #: wt-status.c:1677 wt-status.c:1685
2367 #: compat/precompose_utf8.c:57 builtin/clone.c:413
2369 msgid "failed to unlink '%s'"
2373 msgid "git add [<options>] [--] <pathspec>..."
2374 msgstr "git add [<选项>] [--] <路径规格>..."
2378 msgid "unexpected diff status %c"
2381 #: builtin/add.c:70 builtin/commit.c:278
2382 msgid "updating files failed"
2387 msgid "remove '%s'\n"
2390 #: builtin/add.c:134
2391 msgid "Unstaged changes after refreshing the index:"
2392 msgstr "刷新索引之后尚未被暂存的变更:"
2394 #: builtin/add.c:194 builtin/rev-parse.c:797
2395 msgid "Could not read the index"
2398 #: builtin/add.c:205
2400 msgid "Could not open '%s' for writing."
2401 msgstr "无法打开 '%s' 进行写入。"
2403 #: builtin/add.c:209
2404 msgid "Could not write patch"
2407 #: builtin/add.c:212
2408 msgid "editing patch failed"
2411 #: builtin/add.c:215
2413 msgid "Could not stat '%s'"
2414 msgstr "不能查看文件状态 '%s'"
2416 #: builtin/add.c:217
2417 msgid "Empty patch. Aborted."
2420 #: builtin/add.c:222
2422 msgid "Could not apply '%s'"
2425 #: builtin/add.c:232
2426 msgid "The following paths are ignored by one of your .gitignore files:\n"
2427 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2429 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2430 #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2431 #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
2435 #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
2436 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2437 #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
2441 #: builtin/add.c:252
2442 msgid "interactive picking"
2445 #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
2446 msgid "select hunks interactively"
2449 #: builtin/add.c:254
2450 msgid "edit current diff and apply"
2453 #: builtin/add.c:255
2454 msgid "allow adding otherwise ignored files"
2457 #: builtin/add.c:256
2458 msgid "update tracked files"
2461 #: builtin/add.c:257
2462 msgid "record only the fact that the path will be added later"
2463 msgstr "只记录,该路径稍后再添加"
2465 #: builtin/add.c:258
2466 msgid "add changes from all tracked and untracked files"
2467 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2469 #: builtin/add.c:261
2470 msgid "ignore paths removed in the working tree (same as --no-all)"
2471 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2473 #: builtin/add.c:263
2474 msgid "don't add, only refresh the index"
2477 #: builtin/add.c:264
2478 msgid "just skip files which cannot be added because of errors"
2479 msgstr "跳过因出错不能添加的文件"
2481 #: builtin/add.c:265
2482 msgid "check if - even missing - files are ignored in dry run"
2483 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2485 #: builtin/add.c:287
2487 msgid "Use -f if you really want to add them.\n"
2488 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2490 #: builtin/add.c:294
2491 msgid "adding files failed"
2494 #: builtin/add.c:330
2495 msgid "-A and -u are mutually incompatible"
2496 msgstr "-A 和 -u 选项互斥"
2498 #: builtin/add.c:337
2499 msgid "Option --ignore-missing can only be used together with --dry-run"
2500 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2502 #: builtin/add.c:352
2504 msgid "Nothing specified, nothing added.\n"
2505 msgstr "没有指定文件,也没有文件被添加。\n"
2507 #: builtin/add.c:353
2509 msgid "Maybe you wanted to say 'git add .'?\n"
2510 msgstr "也许您想要执行 'git add .'?\n"
2512 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2513 #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2514 #: builtin/submodule--helper.c:35
2515 msgid "index file corrupt"
2518 #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
2519 msgid "Unable to write new index file"
2522 #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
2524 msgid "could not read '%s'"
2528 msgid "could not parse author script"
2533 msgid "'%s' was deleted by the applypatch-msg hook"
2534 msgstr "'%s' 被 applypatch-msg 钩子删除"
2536 #: builtin/am.c:548 builtin/notes.c:300
2538 msgid "Malformed input line: '%s'."
2539 msgstr "非法的输入行:'%s'。"
2541 #: builtin/am.c:585 builtin/notes.c:315
2543 msgid "Failed to copy notes from '%s' to '%s'"
2544 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2547 msgid "fseek failed"
2550 #: builtin/am.c:772 builtin/am.c:860
2552 msgid "could not open '%s' for reading: %s"
2553 msgstr "无法打开 '%s' 进行读取:%s"
2557 msgid "could not open '%s' for writing: %s"
2558 msgstr "无法打开 '%s' 进行写入:%s"
2562 msgid "could not parse patch '%s'"
2563 msgstr "无法解析补丁 '%s'"
2566 msgid "Only one StGIT patch series can be applied at once"
2567 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2570 msgid "invalid timestamp"
2573 #: builtin/am.c:904 builtin/am.c:912
2574 msgid "invalid Date line"
2578 msgid "invalid timezone offset"
2582 msgid "Patch format detection failed."
2585 #: builtin/am.c:1001 builtin/clone.c:378
2587 msgid "failed to create directory '%s'"
2588 msgstr "无法创建目录 '%s'"
2590 #: builtin/am.c:1005
2591 msgid "Failed to split patches."
2594 #: builtin/am.c:1137 builtin/commit.c:363
2595 msgid "unable to write index file"
2598 #: builtin/am.c:1188
2600 msgid "When you have resolved this problem, run \"%s --continue\"."
2601 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2603 #: builtin/am.c:1189
2605 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2606 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2608 #: builtin/am.c:1190
2610 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2611 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2613 #: builtin/am.c:1328
2614 msgid "Patch is empty. Was it split wrong?"
2615 msgstr "补丁为空。是不是切分错误?"
2617 #: builtin/am.c:1402 builtin/log.c:1350
2619 msgid "invalid ident line: %s"
2620 msgstr "包含无效的身份标识:%s"
2622 #: builtin/am.c:1429
2624 msgid "unable to parse commit %s"
2627 #: builtin/am.c:1631
2628 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2629 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2631 #: builtin/am.c:1633
2632 msgid "Using index info to reconstruct a base tree..."
2633 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2635 #: builtin/am.c:1652
2637 "Did you hand edit your patch?\n"
2638 "It does not apply to blobs recorded in its index."
2643 #: builtin/am.c:1658
2644 msgid "Falling back to patching base and 3-way merge..."
2645 msgstr "回落到基础版本上打补丁及进行三方合并..."
2647 #: builtin/am.c:1673
2648 msgid "Failed to merge in the changes."
2651 #: builtin/am.c:1697 builtin/merge.c:633
2652 msgid "git write-tree failed to write a tree"
2653 msgstr "git write-tree 无法写入一树对象"
2655 #: builtin/am.c:1704
2656 msgid "applying to an empty history"
2659 #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2660 #: builtin/merge.c:855
2661 msgid "failed to write commit object"
2664 #: builtin/am.c:1749 builtin/am.c:1753
2666 msgid "cannot resume: %s does not exist."
2667 msgstr "无法继续:%s 不存在。"
2669 #: builtin/am.c:1769
2670 msgid "cannot be interactive without stdin connected to a terminal."
2671 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2673 #: builtin/am.c:1774
2674 msgid "Commit Body is:"
2678 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2679 #. in your translation. The program will only accept English
2680 #. input at this point.
2682 #: builtin/am.c:1784
2683 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2684 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2686 #: builtin/am.c:1834
2688 msgid "Dirty index: cannot apply patches (dirty: %s)"
2689 msgstr "脏索引:不能应用补丁(脏文件:%s)"
2691 #: builtin/am.c:1869 builtin/am.c:1941
2693 msgid "Applying: %.*s"
2696 #: builtin/am.c:1885
2697 msgid "No changes -- Patch already applied."
2698 msgstr "没有变更 —— 补丁已经应用过。"
2700 #: builtin/am.c:1893
2702 msgid "Patch failed at %s %.*s"
2703 msgstr "打补丁失败于 %s %.*s"
2705 #: builtin/am.c:1899
2707 msgid "The copy of the patch that failed is found in: %s"
2708 msgstr "失败的补丁文件副本位于:%s"
2710 #: builtin/am.c:1944
2712 "No changes - did you forget to use 'git add'?\n"
2713 "If there is nothing left to stage, chances are that something else\n"
2714 "already introduced the same changes; you might want to skip this patch."
2716 "没有变更 —— 您是不是忘了执行 'git add'?\n"
2717 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2720 #: builtin/am.c:1951
2722 "You still have unmerged paths in your index.\n"
2723 "Did you forget to use 'git add'?"
2726 "您是否忘了执行 'git add'?"
2728 #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
2729 #: builtin/reset.c:316
2731 msgid "Could not parse object '%s'."
2732 msgstr "不能解析对象 '%s'。"
2734 #: builtin/am.c:2111
2735 msgid "failed to clean index"
2738 #: builtin/am.c:2145
2740 "You seem to have moved HEAD since the last 'am' failure.\n"
2741 "Not rewinding to ORIG_HEAD"
2742 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2744 #: builtin/am.c:2206
2746 msgid "Invalid value for --patch-format: %s"
2747 msgstr "无效的 --patch-format 值:%s"
2749 #: builtin/am.c:2239
2750 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2751 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2753 #: builtin/am.c:2240
2754 msgid "git am [<options>] (--continue | --skip | --abort)"
2755 msgstr "git am [<选项>] (--continue | --skip | --abort)"
2757 #: builtin/am.c:2246
2758 msgid "run interactively"
2761 #: builtin/am.c:2248
2762 msgid "historical option -- no-op"
2763 msgstr "老的参数 —— 无作用"
2765 #: builtin/am.c:2250
2766 msgid "allow fall back on 3way merging if needed"
2767 msgstr "如果必要,允许使用三方合并。"
2769 #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
2770 #: builtin/repack.c:171
2774 #: builtin/am.c:2253
2775 msgid "add a Signed-off-by line to the commit message"
2776 msgstr "在提交说明中添加一个 Signed-off-by 签名"
2778 #: builtin/am.c:2256
2779 msgid "recode into utf8 (default)"
2780 msgstr "使用 utf8 字符集(默认)"
2782 #: builtin/am.c:2258
2783 msgid "pass -k flag to git-mailinfo"
2784 msgstr "向 git-mailinfo 传递 -k 参数"
2786 #: builtin/am.c:2260
2787 msgid "pass -b flag to git-mailinfo"
2788 msgstr "向 git-mailinfo 传递 -b 参数"
2790 #: builtin/am.c:2262
2791 msgid "pass -m flag to git-mailinfo"
2792 msgstr "向 git-mailinfo 传递 -m 参数"
2794 #: builtin/am.c:2264
2795 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2796 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2798 #: builtin/am.c:2267
2799 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2800 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2802 #: builtin/am.c:2270
2803 msgid "strip everything before a scissors line"
2804 msgstr "丢弃裁切线前的所有内容"
2806 #: builtin/am.c:2271 builtin/apply.c:4544
2810 #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2811 #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2812 #: builtin/am.c:2299
2813 msgid "pass it through git-apply"
2814 msgstr "传递给 git-apply"
2816 #: builtin/am.c:2280 builtin/apply.c:4568
2820 #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2821 #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2822 #: builtin/pull.c:171 builtin/submodule--helper.c:72
2823 #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
2827 #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2828 #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2829 #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2830 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2831 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
2835 #: builtin/am.c:2292 builtin/apply.c:4512
2839 #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
2840 #: builtin/tag.c:372
2844 #: builtin/am.c:2296
2845 msgid "format the patch(es) are in"
2848 #: builtin/am.c:2302
2849 msgid "override error message when patch failure occurs"
2850 msgstr "打补丁失败时显示的错误信息"
2852 #: builtin/am.c:2304
2853 msgid "continue applying patches after resolving a conflict"
2854 msgstr "冲突解决后继续应用补丁"
2856 #: builtin/am.c:2307
2857 msgid "synonyms for --continue"
2858 msgstr "和 --continue 同义"
2860 #: builtin/am.c:2310
2861 msgid "skip the current patch"
2864 #: builtin/am.c:2313
2865 msgid "restore the original branch and abort the patching operation."
2866 msgstr "恢复原始分支并终止打补丁操作。"
2868 #: builtin/am.c:2317
2869 msgid "lie about committer date"
2870 msgstr "将作者日期作为提交日期"
2872 #: builtin/am.c:2319
2873 msgid "use current timestamp for author date"
2874 msgstr "用当前时间作为作者日期"
2876 #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2877 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
2881 #: builtin/am.c:2322
2882 msgid "GPG-sign commits"
2883 msgstr "使用 GPG 签名提交"
2885 #: builtin/am.c:2325
2886 msgid "(internal use for git-rebase)"
2887 msgstr "(内部使用,用于 git-rebase)"
2889 #: builtin/am.c:2340
2891 "The -b/--binary option has been a no-op for long time, and\n"
2892 "it will be removed. Please do not use it anymore."
2894 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2897 #: builtin/am.c:2347
2898 msgid "failed to read the index"
2901 #: builtin/am.c:2362
2903 msgid "previous rebase directory %s still exists but mbox given."
2904 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2906 #: builtin/am.c:2386
2909 "Stray %s directory found.\n"
2910 "Use \"git am --abort\" to remove it."
2913 "使用 \"git am --abort\" 删除它。"
2915 #: builtin/am.c:2392
2916 msgid "Resolve operation not in progress, we are not resuming."
2917 msgstr "解决操作未进行,我们不会继续。"
2919 #: builtin/apply.c:59
2920 msgid "git apply [<options>] [<patch>...]"
2921 msgstr "git apply [<选项>] [<补丁>...]"
2923 #: builtin/apply.c:111
2925 msgid "unrecognized whitespace option '%s'"
2926 msgstr "未能识别的空白字符选项 '%s'"
2928 #: builtin/apply.c:126
2930 msgid "unrecognized whitespace ignore option '%s'"
2931 msgstr "未能识别的空白字符忽略选项 '%s'"
2933 #: builtin/apply.c:818
2935 msgid "Cannot prepare timestamp regexp %s"
2936 msgstr "无法准备时间戳正则表达式 %s"
2938 #: builtin/apply.c:827
2940 msgid "regexec returned %d for input: %s"
2941 msgstr "regexec 返回 %d,输入为:%s"
2943 #: builtin/apply.c:908
2945 msgid "unable to find filename in patch at line %d"
2946 msgstr "不能在补丁的第 %d 行找到文件名"
2948 #: builtin/apply.c:940
2950 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2951 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
2953 #: builtin/apply.c:944
2955 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2956 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
2958 #: builtin/apply.c:945
2960 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2961 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
2963 #: builtin/apply.c:952
2965 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2966 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
2968 #: builtin/apply.c:1415
2970 msgid "recount: unexpected line: %.*s"
2971 msgstr "recount:意外的行:%.*s"
2973 #: builtin/apply.c:1472
2975 msgid "patch fragment without header at line %d: %.*s"
2976 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
2978 #: builtin/apply.c:1489
2981 "git diff header lacks filename information when removing %d leading pathname "
2982 "component (line %d)"
2984 "git diff header lacks filename information when removing %d leading pathname "
2985 "components (line %d)"
2986 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2987 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2989 #: builtin/apply.c:1655
2990 msgid "new file depends on old contents"
2993 #: builtin/apply.c:1657
2994 msgid "deleted file still has contents"
2997 #: builtin/apply.c:1683
2999 msgid "corrupt patch at line %d"
3000 msgstr "补丁在第 %d 行损坏"
3002 #: builtin/apply.c:1719
3004 msgid "new file %s depends on old contents"
3005 msgstr "新文件 %s 依赖旧内容"
3007 #: builtin/apply.c:1721
3009 msgid "deleted file %s still has contents"
3010 msgstr "删除的文件 %s 仍有内容"
3012 #: builtin/apply.c:1724
3014 msgid "** warning: file %s becomes empty but is not deleted"
3015 msgstr "** 警告:文件 %s 成为空文件但并未删除"
3017 #: builtin/apply.c:1870
3019 msgid "corrupt binary patch at line %d: %.*s"
3020 msgstr "二进制补丁在第 %d 行损坏:%.*s"
3022 #: builtin/apply.c:1899
3024 msgid "unrecognized binary patch at line %d"
3025 msgstr "未能识别的二进制补丁位于第 %d 行"
3027 #: builtin/apply.c:2050
3029 msgid "patch with only garbage at line %d"
3030 msgstr "补丁文件的第 %d 行只有垃圾数据"
3032 #: builtin/apply.c:2140
3034 msgid "unable to read symlink %s"
3035 msgstr "无法读取符号链接 %s"
3037 #: builtin/apply.c:2144
3039 msgid "unable to open or read %s"
3042 #: builtin/apply.c:2777
3044 msgid "invalid start of line: '%c'"
3045 msgstr "无效的行首字符:'%c'"
3047 #: builtin/apply.c:2896
3049 msgid "Hunk #%d succeeded at %d (offset %d line)."
3050 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3051 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3052 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3054 #: builtin/apply.c:2908
3056 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3057 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3059 #: builtin/apply.c:2914
3062 "while searching for:\n"
3068 #: builtin/apply.c:2934
3070 msgid "missing binary patch data for '%s'"
3071 msgstr "缺失 '%s' 的二进制补丁数据"
3073 #: builtin/apply.c:3035
3075 msgid "binary patch does not apply to '%s'"
3076 msgstr "二进制补丁未应用到 '%s'"
3078 #: builtin/apply.c:3041
3080 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3081 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3083 #: builtin/apply.c:3062
3085 msgid "patch failed: %s:%ld"
3086 msgstr "打补丁失败:%s:%ld"
3088 #: builtin/apply.c:3186
3090 msgid "cannot checkout %s"
3093 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3095 msgid "read of %s failed"
3098 #: builtin/apply.c:3239
3100 msgid "reading from '%s' beyond a symbolic link"
3101 msgstr "读取位于符号链接中的 '%s'"
3103 #: builtin/apply.c:3267 builtin/apply.c:3489
3105 msgid "path %s has been renamed/deleted"
3106 msgstr "路径 %s 已经被重命名/删除"
3108 #: builtin/apply.c:3348 builtin/apply.c:3503
3110 msgid "%s: does not exist in index"
3113 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3118 #: builtin/apply.c:3357 builtin/apply.c:3511
3120 msgid "%s: does not match index"
3123 #: builtin/apply.c:3459
3124 msgid "removal patch leaves file contents"
3125 msgstr "移除补丁仍留下了文件内容"
3127 #: builtin/apply.c:3528
3129 msgid "%s: wrong type"
3132 #: builtin/apply.c:3530
3134 msgid "%s has type %o, expected %o"
3135 msgstr "%s 的类型是 %o,应为 %o"
3137 #: builtin/apply.c:3689 builtin/apply.c:3691
3139 msgid "invalid path '%s'"
3142 #: builtin/apply.c:3746
3144 msgid "%s: already exists in index"
3145 msgstr "%s:已经存在于索引中"
3147 #: builtin/apply.c:3749
3149 msgid "%s: already exists in working directory"
3150 msgstr "%s:已经存在于工作区中"
3152 #: builtin/apply.c:3769
3154 msgid "new mode (%o) of %s does not match old mode (%o)"
3155 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3157 #: builtin/apply.c:3774
3159 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3160 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3162 #: builtin/apply.c:3794
3164 msgid "affected file '%s' is beyond a symbolic link"
3165 msgstr "受影响的文件 '%s' 位于符号链接中"
3167 #: builtin/apply.c:3798
3169 msgid "%s: patch does not apply"
3172 #: builtin/apply.c:3812
3174 msgid "Checking patch %s..."
3177 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3179 msgid "make_cache_entry failed for path '%s'"
3180 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3182 #: builtin/apply.c:4048
3184 msgid "unable to remove %s from index"
3185 msgstr "不能从索引中移除 %s"
3187 #: builtin/apply.c:4077
3189 msgid "corrupt patch for submodule %s"
3190 msgstr "子模组 %s 损坏的补丁"
3192 #: builtin/apply.c:4081
3194 msgid "unable to stat newly created file '%s'"
3195 msgstr "不能枚举新建文件 '%s' 的状态"
3197 #: builtin/apply.c:4086
3199 msgid "unable to create backing store for newly created file %s"
3200 msgstr "不能为新建文件 %s 创建后端存储"
3202 #: builtin/apply.c:4089 builtin/apply.c:4197
3204 msgid "unable to add cache entry for %s"
3205 msgstr "无法为 %s 添加缓存条目"
3207 #: builtin/apply.c:4122
3209 msgid "closing file '%s'"
3212 #: builtin/apply.c:4171
3214 msgid "unable to write file '%s' mode %o"
3215 msgstr "不能写文件 '%s' 权限 %o"
3217 #: builtin/apply.c:4258
3219 msgid "Applied patch %s cleanly."
3222 #: builtin/apply.c:4266
3223 msgid "internal error"
3226 #: builtin/apply.c:4269
3228 msgid "Applying patch %%s with %d reject..."
3229 msgid_plural "Applying patch %%s with %d rejects..."
3230 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3231 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3233 #: builtin/apply.c:4279
3235 msgid "truncating .rej filename to %.*s.rej"
3236 msgstr "截短 .rej 文件名为 %.*s.rej"
3238 #: builtin/apply.c:4300
3240 msgid "Hunk #%d applied cleanly."
3241 msgstr "第 #%d 个片段成功应用。"
3243 #: builtin/apply.c:4303
3245 msgid "Rejected hunk #%d."
3246 msgstr "拒绝第 #%d 个片段。"
3248 #: builtin/apply.c:4393
3249 msgid "unrecognized input"
3252 #: builtin/apply.c:4404
3253 msgid "unable to read index file"
3256 #: builtin/apply.c:4507
3257 msgid "don't apply changes matching the given path"
3258 msgstr "不要应用与给出路径向匹配的变更"
3260 #: builtin/apply.c:4510
3261 msgid "apply changes matching the given path"
3262 msgstr "应用与给出路径向匹配的变更"
3264 #: builtin/apply.c:4513
3265 msgid "remove <num> leading slashes from traditional diff paths"
3266 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3268 #: builtin/apply.c:4516
3269 msgid "ignore additions made by the patch"
3270 msgstr "忽略补丁中的添加的文件"
3272 #: builtin/apply.c:4518
3273 msgid "instead of applying the patch, output diffstat for the input"
3274 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3276 #: builtin/apply.c:4522
3277 msgid "show number of added and deleted lines in decimal notation"
3278 msgstr "以十进制数显示添加和删除的行数"
3280 #: builtin/apply.c:4524
3281 msgid "instead of applying the patch, output a summary for the input"
3282 msgstr "不应用补丁,而是显示输入的概要"
3284 #: builtin/apply.c:4526
3285 msgid "instead of applying the patch, see if the patch is applicable"
3286 msgstr "不应用补丁,而是查看补丁是否可应用"
3288 #: builtin/apply.c:4528
3289 msgid "make sure the patch is applicable to the current index"
3290 msgstr "确认补丁可以应用到当前索引"
3292 #: builtin/apply.c:4530
3293 msgid "apply a patch without touching the working tree"
3294 msgstr "应用补丁而不修改工作区"
3296 #: builtin/apply.c:4532
3297 msgid "accept a patch that touches outside the working area"
3298 msgstr "接受修改工作区之外文件的补丁"
3300 #: builtin/apply.c:4534
3301 msgid "also apply the patch (use with --stat/--summary/--check)"
3302 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3304 #: builtin/apply.c:4536
3305 msgid "attempt three-way merge if a patch does not apply"
3306 msgstr "如果一个补丁不能应用则尝试三方合并"
3308 #: builtin/apply.c:4538
3309 msgid "build a temporary index based on embedded index information"
3310 msgstr "创建一个临时索引基于嵌入的索引信息"
3312 #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
3313 msgid "paths are separated with NUL character"
3314 msgstr "路径以 NUL 字符分隔"
3316 #: builtin/apply.c:4543
3317 msgid "ensure at least <n> lines of context match"
3318 msgstr "确保至少匹配 <n> 行上下文"
3320 #: builtin/apply.c:4545
3321 msgid "detect new or modified lines that have whitespace errors"
3322 msgstr "检查新增和修改的行中间的空白字符滥用"
3324 #: builtin/apply.c:4548 builtin/apply.c:4551
3325 msgid "ignore changes in whitespace when finding context"
3326 msgstr "查找上下文时忽略空白字符的变更"
3328 #: builtin/apply.c:4554
3329 msgid "apply the patch in reverse"
3332 #: builtin/apply.c:4556
3333 msgid "don't expect at least one line of context"
3336 #: builtin/apply.c:4558
3337 msgid "leave the rejected hunks in corresponding *.rej files"
3338 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3340 #: builtin/apply.c:4560
3341 msgid "allow overlapping hunks"
3344 #: builtin/apply.c:4563
3345 msgid "tolerate incorrectly detected missing new-line at the end of file"
3346 msgstr "允许不正确的文件末尾换行符"
3348 #: builtin/apply.c:4566
3349 msgid "do not trust the line counts in the hunk headers"
3350 msgstr "不信任补丁片段的头信息中的行号"
3352 #: builtin/apply.c:4569
3353 msgid "prepend <root> to all filenames"
3354 msgstr "为所有文件名前添加 <根目录>"
3356 #: builtin/apply.c:4591
3357 msgid "--3way outside a repository"
3358 msgstr "--3way 在一个仓库之外"
3360 #: builtin/apply.c:4599
3361 msgid "--index outside a repository"
3362 msgstr "--index 在一个仓库之外"
3364 #: builtin/apply.c:4602
3365 msgid "--cached outside a repository"
3366 msgstr "--cached 在一个仓库之外"
3368 #: builtin/apply.c:4621
3370 msgid "can't open patch '%s'"
3371 msgstr "不能打开补丁 '%s'"
3373 #: builtin/apply.c:4635
3375 msgid "squelched %d whitespace error"
3376 msgid_plural "squelched %d whitespace errors"
3377 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3378 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3380 #: builtin/apply.c:4641 builtin/apply.c:4651
3382 msgid "%d line adds whitespace errors."
3383 msgid_plural "%d lines add whitespace errors."
3384 msgstr[0] "%d 行有空白字符误用。"
3385 msgstr[1] "%d 行有空白字符误用。"
3387 #: builtin/archive.c:17
3389 msgid "could not create archive file '%s'"
3390 msgstr "不能创建归档文件 '%s'"
3392 #: builtin/archive.c:20
3393 msgid "could not redirect output"
3396 #: builtin/archive.c:37
3397 msgid "git archive: Remote with no URL"
3398 msgstr "git archive:未提供远程 URL"
3400 #: builtin/archive.c:58
3401 msgid "git archive: expected ACK/NAK, got EOF"
3402 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3404 #: builtin/archive.c:61
3406 msgid "git archive: NACK %s"
3407 msgstr "git archive:NACK %s"
3409 #: builtin/archive.c:63
3411 msgid "remote error: %s"
3414 #: builtin/archive.c:64
3415 msgid "git archive: protocol error"
3416 msgstr "git archive:协议错误"
3418 #: builtin/archive.c:68
3419 msgid "git archive: expected a flush"
3420 msgstr "git archive:应为刷新"
3422 #: builtin/bisect--helper.c:7
3423 msgid "git bisect--helper --next-all [--no-checkout]"
3424 msgstr "git bisect--helper --next-all [--no-checkout]"
3426 #: builtin/bisect--helper.c:17
3427 msgid "perform 'git bisect next'"
3428 msgstr "执行 'git bisect next'"
3430 #: builtin/bisect--helper.c:19
3431 msgid "update BISECT_HEAD instead of checking out the current commit"
3432 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3434 #: builtin/blame.c:33
3435 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3436 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3438 #: builtin/blame.c:38
3439 msgid "<rev-opts> are documented in git-rev-list(1)"
3440 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3442 #: builtin/blame.c:1782
3443 msgid "Blaming lines"
3446 #: builtin/blame.c:2530
3447 msgid "Show blame entries as we find them, incrementally"
3448 msgstr "增量式地显示发现的 blame 条目"
3450 #: builtin/blame.c:2531
3451 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3452 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3454 #: builtin/blame.c:2532
3455 msgid "Do not treat root commits as boundaries (Default: off)"
3456 msgstr "不把根提交作为边界(默认:关闭)"
3458 #: builtin/blame.c:2533
3459 msgid "Show work cost statistics"
3462 #: builtin/blame.c:2534
3463 msgid "Force progress reporting"
3466 #: builtin/blame.c:2535
3467 msgid "Show output score for blame entries"
3468 msgstr "显示判断 blame 条目位移的得分诊断信息"
3470 #: builtin/blame.c:2536
3471 msgid "Show original filename (Default: auto)"
3472 msgstr "显示原始文件名(默认:自动)"
3474 #: builtin/blame.c:2537
3475 msgid "Show original linenumber (Default: off)"
3476 msgstr "显示原始的行号(默认:关闭)"
3478 #: builtin/blame.c:2538
3479 msgid "Show in a format designed for machine consumption"
3480 msgstr "显示为一个适合机器读取的格式"
3482 #: builtin/blame.c:2539
3483 msgid "Show porcelain format with per-line commit information"
3484 msgstr "为每一行显示机器适用的提交信息"
3486 #: builtin/blame.c:2540
3487 msgid "Use the same output mode as git-annotate (Default: off)"
3488 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3490 #: builtin/blame.c:2541
3491 msgid "Show raw timestamp (Default: off)"
3492 msgstr "显示原始时间戳(默认:关闭)"
3494 #: builtin/blame.c:2542
3495 msgid "Show long commit SHA1 (Default: off)"
3496 msgstr "显示长的 SHA1 提交号(默认:关闭)"
3498 #: builtin/blame.c:2543
3499 msgid "Suppress author name and timestamp (Default: off)"
3500 msgstr "隐藏作者名字和时间戳(默认:关闭)"
3502 #: builtin/blame.c:2544
3503 msgid "Show author email instead of name (Default: off)"
3504 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3506 #: builtin/blame.c:2545
3507 msgid "Ignore whitespace differences"
3510 #: builtin/blame.c:2546
3511 msgid "Spend extra cycles to find better match"
3512 msgstr "花费额外的循环来找到更好的匹配"
3514 #: builtin/blame.c:2547
3515 msgid "Use revisions from <file> instead of calling git-rev-list"
3516 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3518 #: builtin/blame.c:2548
3519 msgid "Use <file>'s contents as the final image"
3520 msgstr "使用 <文件> 的内容作为最终的图片"
3522 #: builtin/blame.c:2549 builtin/blame.c:2550
3526 #: builtin/blame.c:2549
3527 msgid "Find line copies within and across files"
3528 msgstr "找到文件内及跨文件的行拷贝"
3530 #: builtin/blame.c:2550
3531 msgid "Find line movements within and across files"
3532 msgstr "找到文件内及跨文件的行移动"
3534 #: builtin/blame.c:2551
3538 #: builtin/blame.c:2551
3539 msgid "Process only line range n,m, counting from 1"
3540 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3542 #. TRANSLATORS: This string is used to tell us the maximum
3543 #. display width for a relative timestamp in "git blame"
3544 #. output. For C locale, "4 years, 11 months ago", which
3545 #. takes 22 places, is the longest among various forms of
3546 #. relative timestamps, but your language may need more or
3547 #. fewer display columns.
3548 #: builtin/blame.c:2640
3549 msgid "4 years, 11 months ago"
3552 #: builtin/branch.c:25
3553 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3554 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3556 #: builtin/branch.c:26
3557 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3558 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3560 #: builtin/branch.c:27
3561 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3562 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3564 #: builtin/branch.c:28
3565 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3566 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3568 #: builtin/branch.c:29
3569 msgid "git branch [<options>] [-r | -a] [--points-at]"
3570 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3572 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3573 #: builtin/branch.c:142
3576 "deleting branch '%s' that has been merged to\n"
3577 " '%s', but not yet merged to HEAD."
3579 "将要删除的分支 '%s' 已经被合并到\n"
3582 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3583 #: builtin/branch.c:146
3586 "not deleting branch '%s' that is not yet merged to\n"
3587 " '%s', even though it is merged to HEAD."
3589 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3590 " 然而却尚未被合并到分支 '%s' 。"
3592 #: builtin/branch.c:160
3594 msgid "Couldn't look up commit object for '%s'"
3595 msgstr "无法查询 '%s' 指向的提交对象"
3597 #: builtin/branch.c:164
3600 "The branch '%s' is not fully merged.\n"
3601 "If you are sure you want to delete it, run 'git branch -D %s'."
3604 "如果您确认要删除它,执行 'git branch -D %s'。"
3606 #: builtin/branch.c:177
3607 msgid "Update of config-file failed"
3608 msgstr "无法更新 config 文件"
3610 #: builtin/branch.c:205
3611 msgid "cannot use -a with -d"
3612 msgstr "不能将 -a 和 -d 同时使用"
3614 #: builtin/branch.c:211
3615 msgid "Couldn't look up commit object for HEAD"
3616 msgstr "无法查询 HEAD 指向的提交对象"
3618 #: builtin/branch.c:219
3620 msgid "Cannot delete the branch '%s' which you are currently on."
3621 msgstr "无法删除您当前所在的分支 '%s'。"
3623 #: builtin/branch.c:235
3625 msgid "remote-tracking branch '%s' not found."
3626 msgstr "未能找到远程跟踪分支 '%s'。"
3628 #: builtin/branch.c:236
3630 msgid "branch '%s' not found."
3631 msgstr "分支 '%s' 未发现。"
3633 #: builtin/branch.c:251
3635 msgid "Error deleting remote-tracking branch '%s'"
3636 msgstr "无法删除远程跟踪分支 '%s'"
3638 #: builtin/branch.c:252
3640 msgid "Error deleting branch '%s'"
3641 msgstr "无法删除分支 '%s'"
3643 #: builtin/branch.c:259
3645 msgid "Deleted remote-tracking branch %s (was %s).\n"
3646 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3648 #: builtin/branch.c:260
3650 msgid "Deleted branch %s (was %s).\n"
3651 msgstr "已删除分支 %s(曾为 %s)。\n"
3653 #: builtin/branch.c:303
3658 #: builtin/branch.c:308
3663 #: builtin/branch.c:313
3665 msgid "[%s: behind %d]"
3668 #: builtin/branch.c:315
3673 #: builtin/branch.c:319
3675 msgid "[%s: ahead %d]"
3678 #: builtin/branch.c:321
3683 #: builtin/branch.c:324
3685 msgid "[%s: ahead %d, behind %d]"
3686 msgstr "[%s:领先 %d,落后 %d]"
3688 #: builtin/branch.c:327
3690 msgid "[ahead %d, behind %d]"
3691 msgstr "[领先 %d,落后 %d]"
3693 #: builtin/branch.c:340
3694 msgid " **** invalid ref ****"
3695 msgstr " **** 无效引用 ****"
3697 #: builtin/branch.c:366
3699 msgid "(no branch, rebasing %s)"
3700 msgstr "(非分支,正变基 %s)"
3702 #: builtin/branch.c:369
3704 msgid "(no branch, bisect started on %s)"
3705 msgstr "(非分支,二分查找开始于 %s)"
3707 #: builtin/branch.c:375
3709 msgid "(HEAD detached at %s)"
3710 msgstr "(头指针分离于 %s)"
3712 #: builtin/branch.c:378
3714 msgid "(HEAD detached from %s)"
3715 msgstr "(头指针分离自 %s)"
3717 #: builtin/branch.c:382
3721 #: builtin/branch.c:524
3722 msgid "cannot rename the current branch while not on any."
3723 msgstr "无法重命名当前分支因为不处于任何分支上。"
3725 #: builtin/branch.c:534
3727 msgid "Invalid branch name: '%s'"
3728 msgstr "无效的分支名:'%s'"
3730 #: builtin/branch.c:549
3731 msgid "Branch rename failed"
3734 #: builtin/branch.c:553
3736 msgid "Renamed a misnamed branch '%s' away"
3737 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3739 #: builtin/branch.c:557
3741 msgid "Branch renamed to %s, but HEAD is not updated!"
3742 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3744 #: builtin/branch.c:564
3745 msgid "Branch is renamed, but update of config-file failed"
3746 msgstr "分支被重命名,但更新 config 文件失败"
3748 #: builtin/branch.c:586
3750 msgid "could not write branch description template: %s"
3751 msgstr "不能写分支描述模版:%s"
3753 #: builtin/branch.c:615
3754 msgid "Generic options"
3757 #: builtin/branch.c:617
3758 msgid "show hash and subject, give twice for upstream branch"
3759 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3761 #: builtin/branch.c:618
3762 msgid "suppress informational messages"
3765 #: builtin/branch.c:619
3766 msgid "set up tracking mode (see git-pull(1))"
3767 msgstr "设置跟踪模式(参见 git-pull(1))"
3769 #: builtin/branch.c:621
3770 msgid "change upstream info"
3773 #: builtin/branch.c:625
3774 msgid "use colored output"
3777 #: builtin/branch.c:626
3778 msgid "act on remote-tracking branches"
3781 #: builtin/branch.c:628 builtin/branch.c:629
3782 msgid "print only branches that contain the commit"
3783 msgstr "只打印包含该提交的分支"
3785 #: builtin/branch.c:632
3786 msgid "Specific git-branch actions:"
3787 msgstr "具体的 git-branch 动作:"
3789 #: builtin/branch.c:633
3790 msgid "list both remote-tracking and local branches"
3791 msgstr "列出远程跟踪及本地分支"
3793 #: builtin/branch.c:635
3794 msgid "delete fully merged branch"
3797 #: builtin/branch.c:636
3798 msgid "delete branch (even if not merged)"
3799 msgstr "删除分支(即使没有合并)"
3801 #: builtin/branch.c:637
3802 msgid "move/rename a branch and its reflog"
3803 msgstr "移动/重命名一个分支,以及它的引用日志"
3805 #: builtin/branch.c:638
3806 msgid "move/rename a branch, even if target exists"
3807 msgstr "移动/重命名一个分支,即使目标已存在"
3809 #: builtin/branch.c:639
3810 msgid "list branch names"
3813 #: builtin/branch.c:640
3814 msgid "create the branch's reflog"
3817 #: builtin/branch.c:642
3818 msgid "edit the description for the branch"
3821 #: builtin/branch.c:643
3822 msgid "force creation, move/rename, deletion"
3823 msgstr "强制创建、移动/重命名、删除"
3825 #: builtin/branch.c:644
3826 msgid "print only branches that are merged"
3829 #: builtin/branch.c:645
3830 msgid "print only branches that are not merged"
3833 #: builtin/branch.c:646
3834 msgid "list branches in columns"
3837 #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
3841 #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
3842 msgid "field name to sort on"
3845 #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3846 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
3847 #: builtin/tag.c:369
3851 #: builtin/branch.c:651
3852 msgid "print only branches of the object"
3853 msgstr "只打印指向该对象的分支"
3855 #: builtin/branch.c:669
3856 msgid "Failed to resolve HEAD as a valid ref."
3857 msgstr "无法将 HEAD 解析为有效引用。"
3859 #: builtin/branch.c:673 builtin/clone.c:705
3860 msgid "HEAD not found below refs/heads!"
3861 msgstr "HEAD 没有位于 /refs/heads 之下!"
3863 #: builtin/branch.c:693
3864 msgid "--column and --verbose are incompatible"
3865 msgstr "--column 和 --verbose 不兼容"
3867 #: builtin/branch.c:704 builtin/branch.c:746
3868 msgid "branch name required"
3871 #: builtin/branch.c:722
3872 msgid "Cannot give description to detached HEAD"
3873 msgstr "不能向分离头指针提供描述"
3875 #: builtin/branch.c:727
3876 msgid "cannot edit description of more than one branch"
3877 msgstr "不能为一个以上的分支编辑描述"
3879 #: builtin/branch.c:734
3881 msgid "No commit on branch '%s' yet."
3882 msgstr "分支 '%s' 尚无提交。"
3884 #: builtin/branch.c:737
3886 msgid "No branch named '%s'."
3889 #: builtin/branch.c:752
3890 msgid "too many branches for a rename operation"
3891 msgstr "为重命名操作提供了太多的分支名"
3893 #: builtin/branch.c:757
3894 msgid "too many branches to set new upstream"
3895 msgstr "为设置新上游提供了太多的分支名"
3897 #: builtin/branch.c:761
3900 "could not set upstream of HEAD to %s when it does not point to any branch."
3901 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3903 #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
3905 msgid "no such branch '%s'"
3908 #: builtin/branch.c:768
3910 msgid "branch '%s' does not exist"
3911 msgstr "分支 '%s' 不存在"
3913 #: builtin/branch.c:780
3914 msgid "too many branches to unset upstream"
3915 msgstr "为取消上游设置操作提供了太多的分支名"
3917 #: builtin/branch.c:784
3918 msgid "could not unset upstream of HEAD when it does not point to any branch."
3919 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3921 #: builtin/branch.c:790
3923 msgid "Branch '%s' has no upstream information"
3924 msgstr "分支 '%s' 没有上游信息"
3926 #: builtin/branch.c:804
3927 msgid "it does not make sense to create 'HEAD' manually"
3928 msgstr "手工创建 'HEAD' 没有意义"
3930 #: builtin/branch.c:810
3931 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3932 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3934 #: builtin/branch.c:813
3937 "The --set-upstream flag is deprecated and will be removed. Consider using --"
3938 "track or --set-upstream-to\n"
3940 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3942 #: builtin/branch.c:830
3946 "If you wanted to make '%s' track '%s', do this:\n"
3950 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3953 #: builtin/branch.c:831
3955 msgid " git branch -d %s\n"
3956 msgstr " git branch -d %s\n"
3958 #: builtin/branch.c:832
3960 msgid " git branch --set-upstream-to %s\n"
3961 msgstr " git branch --set-upstream-to %s\n"
3963 #: builtin/bundle.c:51
3965 msgid "%s is okay\n"
3968 #: builtin/bundle.c:64
3969 msgid "Need a repository to create a bundle."
3970 msgstr "需要一个仓库来创建包。"
3972 #: builtin/bundle.c:68
3973 msgid "Need a repository to unbundle."
3976 #: builtin/cat-file.c:428
3978 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3979 "<type>|--textconv) <object>"
3981 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3982 ">|--textconv) <对象>"
3984 #: builtin/cat-file.c:429
3985 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3986 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
3988 #: builtin/cat-file.c:466
3989 msgid "<type> can be one of: blob, tree, commit, tag"
3990 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
3992 #: builtin/cat-file.c:467
3993 msgid "show object type"
3996 #: builtin/cat-file.c:468
3997 msgid "show object size"
4000 #: builtin/cat-file.c:470
4001 msgid "exit with zero when there's no error"
4002 msgstr "当没有错误时退出并返回零"
4004 #: builtin/cat-file.c:471
4005 msgid "pretty-print object's content"
4008 #: builtin/cat-file.c:473
4009 msgid "for blob objects, run textconv on object's content"
4010 msgstr "对于数据对象,对其内容执行 textconv"
4012 #: builtin/cat-file.c:475
4013 msgid "allow -s and -t to work with broken/corrupt objects"
4014 msgstr "允许 -s 和 -t 对损坏的对象生效"
4016 #: builtin/cat-file.c:476
4017 msgid "buffer --batch output"
4018 msgstr "缓冲 --batch 的输出"
4020 #: builtin/cat-file.c:478
4021 msgid "show info and content of objects fed from the standard input"
4022 msgstr "显示从标准输入提供的对象的信息和内容"
4024 #: builtin/cat-file.c:481
4025 msgid "show info about objects fed from the standard input"
4026 msgstr "显示从标准输入提供的对象的信息"
4028 #: builtin/cat-file.c:484
4029 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4030 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4032 #: builtin/cat-file.c:486
4033 msgid "show all objects with --batch or --batch-check"
4034 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4036 #: builtin/check-attr.c:11
4037 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4038 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4040 #: builtin/check-attr.c:12
4041 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4042 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4044 #: builtin/check-attr.c:19
4045 msgid "report all attributes set on file"
4046 msgstr "报告设置在文件上的所有属性"
4048 #: builtin/check-attr.c:20
4049 msgid "use .gitattributes only from the index"
4050 msgstr "只使用索引中的 .gitattributes"
4052 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4053 msgid "read file names from stdin"
4056 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
4057 msgid "terminate input and output records by a NUL character"
4058 msgstr "输入和输出的记录使用 NUL 字符终结"
4060 #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
4061 msgid "suppress progress reporting"
4064 #: builtin/check-ignore.c:26
4065 msgid "show non-matching input paths"
4068 #: builtin/check-ignore.c:28
4069 msgid "ignore index when checking"
4072 #: builtin/check-ignore.c:154
4073 msgid "cannot specify pathnames with --stdin"
4074 msgstr "不能同时指定路径及 --stdin 参数"
4076 #: builtin/check-ignore.c:157
4077 msgid "-z only makes sense with --stdin"
4078 msgstr "-z 需要和 --stdin 参数共用才有意义"
4080 #: builtin/check-ignore.c:159
4081 msgid "no path specified"
4084 #: builtin/check-ignore.c:163
4085 msgid "--quiet is only valid with a single pathname"
4086 msgstr "参数 --quiet 只在提供一个路径名时有效"
4088 #: builtin/check-ignore.c:165
4089 msgid "cannot have both --quiet and --verbose"
4090 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4092 #: builtin/check-ignore.c:168
4093 msgid "--non-matching is only valid with --verbose"
4094 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4096 #: builtin/check-mailmap.c:8
4097 msgid "git check-mailmap [<options>] <contact>..."
4098 msgstr "git check-mailmap [<选项>] <联系地址>..."
4100 #: builtin/check-mailmap.c:13
4101 msgid "also read contacts from stdin"
4102 msgstr "还从标准输入读取联系地址"
4104 #: builtin/check-mailmap.c:24
4106 msgid "unable to parse contact: %s"
4107 msgstr "不能解析联系地址:%s"
4109 #: builtin/check-mailmap.c:47
4110 msgid "no contacts specified"
4113 #: builtin/checkout-index.c:127
4114 msgid "git checkout-index [<options>] [--] [<file>...]"
4115 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4117 #: builtin/checkout-index.c:144
4118 msgid "stage should be between 1 and 3 or all"
4119 msgstr "索引值应该取值 1 到 3 或者 all"
4121 #: builtin/checkout-index.c:160
4122 msgid "check out all files in the index"
4125 #: builtin/checkout-index.c:161
4126 msgid "force overwrite of existing files"
4129 #: builtin/checkout-index.c:163
4130 msgid "no warning for existing files and files not in index"
4131 msgstr "存在或不在索引中的文件都没有警告"
4133 #: builtin/checkout-index.c:165
4134 msgid "don't checkout new files"
4137 #: builtin/checkout-index.c:167
4138 msgid "update stat information in the index file"
4139 msgstr "更新索引中文件的状态信息"
4141 #: builtin/checkout-index.c:171
4142 msgid "read list of paths from the standard input"
4143 msgstr "从标准输入读取路径列表"
4145 #: builtin/checkout-index.c:173
4146 msgid "write the content to temporary files"
4149 #: builtin/checkout-index.c:174 builtin/column.c:30
4150 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
4151 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4155 #: builtin/checkout-index.c:175
4156 msgid "when creating files, prepend <string>"
4157 msgstr "在创建文件时,在前面加上 <字符串>"
4159 #: builtin/checkout-index.c:177
4160 msgid "copy out the files from named stage"
4161 msgstr "从指定暂存区中拷出文件"
4163 #: builtin/checkout.c:25
4164 msgid "git checkout [<options>] <branch>"
4165 msgstr "git checkout [<选项>] <分支>"
4167 #: builtin/checkout.c:26
4168 msgid "git checkout [<options>] [<branch>] -- <file>..."
4169 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4171 #: builtin/checkout.c:134 builtin/checkout.c:167
4173 msgid "path '%s' does not have our version"
4174 msgstr "路径 '%s' 没有我们的版本"
4176 #: builtin/checkout.c:136 builtin/checkout.c:169
4178 msgid "path '%s' does not have their version"
4179 msgstr "路径 '%s' 没有他们的版本"
4181 #: builtin/checkout.c:152
4183 msgid "path '%s' does not have all necessary versions"
4184 msgstr "路径 '%s' 没有全部必须的版本"
4186 #: builtin/checkout.c:196
4188 msgid "path '%s' does not have necessary versions"
4189 msgstr "路径 '%s' 没有必须的版本"
4191 #: builtin/checkout.c:213
4193 msgid "path '%s': cannot merge"
4194 msgstr "path '%s':无法合并"
4196 #: builtin/checkout.c:230
4198 msgid "Unable to add merge result for '%s'"
4199 msgstr "无法为 '%s' 添加合并结果"
4201 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4202 #: builtin/checkout.c:260
4204 msgid "'%s' cannot be used with updating paths"
4205 msgstr "'%s' 不能在更新路径时使用"
4207 #: builtin/checkout.c:263 builtin/checkout.c:266
4209 msgid "'%s' cannot be used with %s"
4210 msgstr "'%s' 不能和 %s 同时使用"
4212 #: builtin/checkout.c:269
4214 msgid "Cannot update paths and switch to branch '%s' at the same time."
4215 msgstr "不能同时更新路径并切换到分支'%s'。"
4217 #: builtin/checkout.c:280 builtin/checkout.c:474
4218 msgid "corrupt index file"
4221 #: builtin/checkout.c:340 builtin/checkout.c:347
4223 msgid "path '%s' is unmerged"
4224 msgstr "路径 '%s' 未合并"
4226 #: builtin/checkout.c:496
4227 msgid "you need to resolve your current index first"
4228 msgstr "您需要先解决当前索引的冲突"
4230 #: builtin/checkout.c:623
4232 msgid "Can not do reflog for '%s': %s\n"
4233 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4235 #: builtin/checkout.c:661
4236 msgid "HEAD is now at"
4239 #: builtin/checkout.c:669
4241 msgid "Reset branch '%s'\n"
4242 msgstr "重置分支 '%s'\n"
4244 #: builtin/checkout.c:672
4246 msgid "Already on '%s'\n"
4247 msgstr "已经位于 '%s'\n"
4249 #: builtin/checkout.c:676
4251 msgid "Switched to and reset branch '%s'\n"
4252 msgstr "切换并重置分支 '%s'\n"
4254 #: builtin/checkout.c:678 builtin/checkout.c:1068
4256 msgid "Switched to a new branch '%s'\n"
4257 msgstr "切换到一个新分支 '%s'\n"
4259 #: builtin/checkout.c:680
4261 msgid "Switched to branch '%s'\n"
4262 msgstr "切换到分支 '%s'\n"
4265 #: builtin/checkout.c:732
4267 msgid " ... and %d more.\n"
4268 msgstr " ... 及其它 %d 个。\n"
4270 #: builtin/checkout.c:738
4273 "Warning: you are leaving %d commit behind, not connected to\n"
4274 "any of your branches:\n"
4278 "Warning: you are leaving %d commits behind, not connected to\n"
4279 "any of your branches:\n"
4283 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4287 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4291 #: builtin/checkout.c:757
4294 "If you want to keep it by creating a new branch, this may be a good time\n"
4297 " git branch <new-branch-name> %s\n"
4300 "If you want to keep them by creating a new branch, this may be a good time\n"
4303 " git branch <new-branch-name> %s\n"
4306 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4309 " git branch <新分支名> %s\n"
4312 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4315 " git branch <新分支名> %s\n"
4318 #: builtin/checkout.c:793
4319 msgid "internal error in revision walk"
4320 msgstr "在版本遍历时遇到内部错误"
4322 #: builtin/checkout.c:797
4323 msgid "Previous HEAD position was"
4324 msgstr "之前的 HEAD 位置是"
4326 #: builtin/checkout.c:824 builtin/checkout.c:1063
4327 msgid "You are on a branch yet to be born"
4328 msgstr "您位于一个尚未初始化的分支"
4330 #: builtin/checkout.c:969
4332 msgid "only one reference expected, %d given."
4333 msgstr "只要一个引用,却给出了 %d 个"
4335 #: builtin/checkout.c:1009 builtin/worktree.c:211
4337 msgid "invalid reference: %s"
4340 #: builtin/checkout.c:1038
4342 msgid "reference is not a tree: %s"
4345 #: builtin/checkout.c:1077
4346 msgid "paths cannot be used with switching branches"
4347 msgstr "路径不能和切换分支同时使用"
4349 #: builtin/checkout.c:1080 builtin/checkout.c:1084
4351 msgid "'%s' cannot be used with switching branches"
4352 msgstr "'%s' 不能和切换分支同时使用"
4354 #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4355 #: builtin/checkout.c:1099
4357 msgid "'%s' cannot be used with '%s'"
4358 msgstr "'%s' 不能和 '%s' 同时使用"
4360 #: builtin/checkout.c:1104
4362 msgid "Cannot switch branch to a non-commit '%s'"
4363 msgstr "不能切换分支到一个非提交 '%s'"
4365 #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4366 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4367 #: builtin/worktree.c:320
4371 #: builtin/checkout.c:1138
4372 msgid "create and checkout a new branch"
4373 msgstr "创建并检出一个新的分支"
4375 #: builtin/checkout.c:1140
4376 msgid "create/reset and checkout a branch"
4377 msgstr "创建/重置并检出一个分支"
4379 #: builtin/checkout.c:1141
4380 msgid "create reflog for new branch"
4381 msgstr "为新的分支创建引用日志"
4383 #: builtin/checkout.c:1142
4384 msgid "detach the HEAD at named commit"
4385 msgstr "成为指向该提交的分离头指针"
4387 #: builtin/checkout.c:1143
4388 msgid "set upstream info for new branch"
4389 msgstr "为新的分支设置上游信息"
4391 #: builtin/checkout.c:1145
4395 #: builtin/checkout.c:1145
4396 msgid "new unparented branch"
4399 #: builtin/checkout.c:1146
4400 msgid "checkout our version for unmerged files"
4401 msgstr "对尚未合并的文件检出我们的版本"
4403 #: builtin/checkout.c:1148
4404 msgid "checkout their version for unmerged files"
4405 msgstr "对尚未合并的文件检出他们的版本"
4407 #: builtin/checkout.c:1150
4408 msgid "force checkout (throw away local modifications)"
4409 msgstr "强制检出(丢弃本地修改)"
4411 #: builtin/checkout.c:1151
4412 msgid "perform a 3-way merge with the new branch"
4413 msgstr "和新的分支执行三方合并"
4415 #: builtin/checkout.c:1152 builtin/merge.c:227
4416 msgid "update ignored files (default)"
4417 msgstr "更新忽略的文件(默认)"
4419 #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
4423 #: builtin/checkout.c:1154
4424 msgid "conflict style (merge or diff3)"
4425 msgstr "冲突输出风格(merge 或 diff3)"
4427 #: builtin/checkout.c:1157
4428 msgid "do not limit pathspecs to sparse entries only"
4429 msgstr "对路径不做稀疏检出的限制"
4431 #: builtin/checkout.c:1159
4432 msgid "second guess 'git checkout <no-such-branch>'"
4433 msgstr "二次猜测'git checkout <无此分支>'"
4435 #: builtin/checkout.c:1161
4436 msgid "do not check if another worktree is holding the given ref"
4437 msgstr "不检查指定的引用是否被其他工作区所占用"
4439 #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4440 #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
4441 #: builtin/send-pack.c:168
4442 msgid "force progress reporting"
4445 #: builtin/checkout.c:1193
4446 msgid "-b, -B and --orphan are mutually exclusive"
4447 msgstr "-b、-B 和 --orphan 是互斥的"
4449 #: builtin/checkout.c:1210
4450 msgid "--track needs a branch name"
4451 msgstr "--track 需要一个分支名"
4453 #: builtin/checkout.c:1215
4454 msgid "Missing branch name; try -b"
4455 msgstr "缺少分支名;尝试 -b"
4457 #: builtin/checkout.c:1251
4458 msgid "invalid path specification"
4461 #: builtin/checkout.c:1258
4464 "Cannot update paths and switch to branch '%s' at the same time.\n"
4465 "Did you intend to checkout '%s' which can not be resolved as commit?"
4467 "不能同时更新路径并切换到分支'%s'。\n"
4468 "您是想要检出 '%s' 但其未能解析为提交么?"
4470 #: builtin/checkout.c:1263
4472 msgid "git checkout: --detach does not take a path argument '%s'"
4473 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4475 #: builtin/checkout.c:1267
4477 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4478 "checking out of the index."
4480 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4482 #: builtin/clean.c:25
4484 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4486 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4488 #: builtin/clean.c:29
4490 msgid "Removing %s\n"
4493 #: builtin/clean.c:30
4495 msgid "Would remove %s\n"
4498 #: builtin/clean.c:31
4500 msgid "Skipping repository %s\n"
4503 #: builtin/clean.c:32
4505 msgid "Would skip repository %s\n"
4508 #: builtin/clean.c:33
4510 msgid "failed to remove %s"
4513 #: builtin/clean.c:291
4516 "1 - select a numbered item\n"
4517 "foo - select item based on unique prefix\n"
4518 " - (empty) select nothing"
4522 "foo - 通过标题选择一个选项\n"
4525 #: builtin/clean.c:295
4528 "1 - select a single item\n"
4529 "3-5 - select a range of items\n"
4530 "2-3,6-9 - select multiple ranges\n"
4531 "foo - select item based on unique prefix\n"
4532 "-... - unselect specified items\n"
4533 "* - choose all items\n"
4534 " - (empty) finish selecting"
4538 "3-5 - 选择一个范围内的所有选项\n"
4539 "2-3,6-9 - 选择多个范围内的所有选项\n"
4540 "foo - 通过标题选择一个选项\n"
4545 #: builtin/clean.c:511
4550 #: builtin/clean.c:653
4552 msgid "Input ignore patterns>> "
4553 msgstr "输入模版以排除条目>> "
4555 #: builtin/clean.c:690
4557 msgid "WARNING: Cannot find items matched by: %s"
4558 msgstr "警告:无法找到和 %s 匹配的条目"
4560 #: builtin/clean.c:711
4561 msgid "Select items to delete"
4564 #. TRANSLATORS: Make sure to keep [y/N] as is
4565 #: builtin/clean.c:752
4567 msgid "Remove %s [y/N]? "
4568 msgstr "删除 %s [y/N]?"
4570 #: builtin/clean.c:777
4574 #: builtin/clean.c:785
4576 "clean - start cleaning\n"
4577 "filter by pattern - exclude items from deletion\n"
4578 "select by numbers - select items to be deleted by numbers\n"
4579 "ask each - confirm each deletion (like \"rm -i\")\n"
4580 "quit - stop cleaning\n"
4581 "help - this screen\n"
4582 "? - help for prompt selection"
4585 "filter by pattern - 通过模版排除要删除的条目\n"
4586 "select by numbers - 通过数字选择要删除的条目\n"
4587 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4590 "? - 显示如何在提示符下选择的帮助"
4592 #: builtin/clean.c:812
4593 msgid "*** Commands ***"
4596 #: builtin/clean.c:813
4600 #: builtin/clean.c:821
4601 msgid "Would remove the following item:"
4602 msgid_plural "Would remove the following items:"
4603 msgstr[0] "将删除如下条目:"
4604 msgstr[1] "将删除如下条目:"
4606 #: builtin/clean.c:838
4607 msgid "No more files to clean, exiting."
4608 msgstr "没有要清理的文件,退出。"
4610 #: builtin/clean.c:869
4611 msgid "do not print names of files removed"
4614 #: builtin/clean.c:871
4618 #: builtin/clean.c:872
4619 msgid "interactive cleaning"
4622 #: builtin/clean.c:874
4623 msgid "remove whole directories"
4626 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4627 #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
4631 #: builtin/clean.c:876
4632 msgid "add <pattern> to ignore rules"
4633 msgstr "添加 <模式> 到忽略规则"
4635 #: builtin/clean.c:877
4636 msgid "remove ignored files, too"
4639 #: builtin/clean.c:879
4640 msgid "remove only ignored files"
4643 #: builtin/clean.c:897
4644 msgid "-x and -X cannot be used together"
4645 msgstr "-x 和 -X 不能同时使用"
4647 #: builtin/clean.c:901
4649 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4652 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4654 #: builtin/clean.c:904
4656 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4659 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4661 #: builtin/clone.c:37
4662 msgid "git clone [<options>] [--] <repo> [<dir>]"
4663 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4665 #: builtin/clone.c:60
4666 msgid "don't create a checkout"
4669 #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
4670 msgid "create a bare repository"
4673 #: builtin/clone.c:65
4674 msgid "create a mirror repository (implies bare)"
4675 msgstr "创建一个镜像仓库(也是纯仓库)"
4677 #: builtin/clone.c:67
4678 msgid "to clone from a local repository"
4681 #: builtin/clone.c:69
4682 msgid "don't use local hardlinks, always copy"
4683 msgstr "不使用本地硬链接,始终复制"
4685 #: builtin/clone.c:71
4686 msgid "setup as shared repository"
4689 #: builtin/clone.c:73 builtin/clone.c:75
4690 msgid "initialize submodules in the clone"
4693 #: builtin/clone.c:76 builtin/init-db.c:466
4694 msgid "template-directory"
4697 #: builtin/clone.c:77 builtin/init-db.c:467
4698 msgid "directory from which templates will be used"
4701 #: builtin/clone.c:79 builtin/submodule--helper.c:173
4702 msgid "reference repository"
4705 #: builtin/clone.c:81
4706 msgid "use --reference only while cloning"
4707 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4709 #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
4713 #: builtin/clone.c:83
4714 msgid "use <name> instead of 'origin' to track upstream"
4715 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4717 #: builtin/clone.c:85
4718 msgid "checkout <branch> instead of the remote's HEAD"
4719 msgstr "检出 <分支> 而不是远程 HEAD"
4721 #: builtin/clone.c:87
4722 msgid "path to git-upload-pack on the remote"
4723 msgstr "远程 git-upload-pack 路径"
4725 #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4726 #: builtin/pull.c:193
4730 #: builtin/clone.c:89
4731 msgid "create a shallow clone of that depth"
4732 msgstr "创建一个指定深度的浅克隆"
4734 #: builtin/clone.c:91
4735 msgid "clone only one branch, HEAD or --branch"
4736 msgstr "只克隆一个分支、HEAD 或 --branch"
4738 #: builtin/clone.c:92 builtin/init-db.c:475
4742 #: builtin/clone.c:93 builtin/init-db.c:476
4743 msgid "separate git dir from working tree"
4744 msgstr "git目录和工作区分离"
4746 #: builtin/clone.c:94
4750 #: builtin/clone.c:95
4751 msgid "set config inside the new repository"
4752 msgstr "在新仓库中设置配置信息"
4754 #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4755 msgid "use IPv4 addresses only"
4756 msgstr "只使用 IPv4 地址"
4758 #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4759 msgid "use IPv6 addresses only"
4760 msgstr "只使用 IPv6 地址"
4762 #: builtin/clone.c:305
4764 msgid "reference repository '%s' as a linked checkout is not supported yet."
4765 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4767 #: builtin/clone.c:307
4769 msgid "reference repository '%s' is not a local repository."
4770 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4772 #: builtin/clone.c:312
4774 msgid "reference repository '%s' is shallow"
4775 msgstr "参考仓库 '%s' 是一个浅克隆"
4777 #: builtin/clone.c:315
4779 msgid "reference repository '%s' is grafted"
4780 msgstr "参考仓库 '%s' 已被嫁接"
4782 #: builtin/clone.c:380 builtin/diff.c:84
4784 msgid "failed to stat '%s'"
4785 msgstr "无法枚举 '%s' 状态"
4787 #: builtin/clone.c:382
4789 msgid "%s exists and is not a directory"
4790 msgstr "%s 存在且不是一个目录"
4792 #: builtin/clone.c:396
4794 msgid "failed to stat %s\n"
4795 msgstr "无法枚举 %s 状态\n"
4797 #: builtin/clone.c:418
4799 msgid "failed to create link '%s'"
4800 msgstr "无法创建链接 '%s'"
4802 #: builtin/clone.c:422
4804 msgid "failed to copy file to '%s'"
4805 msgstr "无法拷贝文件至 '%s'"
4807 #: builtin/clone.c:447 builtin/clone.c:631
4812 #: builtin/clone.c:459
4814 "Clone succeeded, but checkout failed.\n"
4815 "You can inspect what was checked out with 'git status'\n"
4816 "and retry the checkout with 'git checkout -f HEAD'\n"
4819 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4820 "'git checkout -f HEAD' 重试\n"
4822 #: builtin/clone.c:536
4824 msgid "Could not find remote branch %s to clone."
4825 msgstr "不能发现要克隆的远程分支 %s。"
4827 #: builtin/clone.c:626
4829 msgid "Checking connectivity... "
4832 #: builtin/clone.c:629
4833 msgid "remote did not send all necessary objects"
4834 msgstr "远程没有发送所有必须的对象"
4836 #: builtin/clone.c:696
4837 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4838 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4840 #: builtin/clone.c:727
4841 msgid "unable to checkout working tree"
4844 #: builtin/clone.c:816
4845 msgid "cannot repack to clean up"
4846 msgstr "无法执行 repack 来清理"
4848 #: builtin/clone.c:818
4849 msgid "cannot unlink temporary alternates file"
4850 msgstr "无法删除临时的 alternates 文件"
4852 #: builtin/clone.c:850
4853 msgid "Too many arguments."
4856 #: builtin/clone.c:854
4857 msgid "You must specify a repository to clone."
4858 msgstr "您必须指定一个仓库来克隆。"
4860 #: builtin/clone.c:865
4862 msgid "--bare and --origin %s options are incompatible."
4863 msgstr "--bare 和 --origin %s 选项不兼容。"
4865 #: builtin/clone.c:868
4866 msgid "--bare and --separate-git-dir are incompatible."
4867 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4869 #: builtin/clone.c:881
4871 msgid "repository '%s' does not exist"
4872 msgstr "仓库 '%s' 不存在"
4874 #: builtin/clone.c:887 builtin/fetch.c:1174
4876 msgid "depth %s is not a positive number"
4877 msgstr "深度 %s 不是一个正数"
4879 #: builtin/clone.c:897
4881 msgid "destination path '%s' already exists and is not an empty directory."
4882 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4884 #: builtin/clone.c:907
4886 msgid "working tree '%s' already exists."
4887 msgstr "工作区 '%s' 已经存在。"
4889 #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4890 #: builtin/worktree.c:219 builtin/worktree.c:246
4892 msgid "could not create leading directories of '%s'"
4893 msgstr "不能为 '%s' 创建先导目录"
4895 #: builtin/clone.c:925
4897 msgid "could not create work tree dir '%s'"
4898 msgstr "不能创建工作区目录 '%s'"
4900 #: builtin/clone.c:943
4902 msgid "Cloning into bare repository '%s'...\n"
4903 msgstr "克隆到纯仓库 '%s'...\n"
4905 #: builtin/clone.c:945
4907 msgid "Cloning into '%s'...\n"
4908 msgstr "正克隆到 '%s'...\n"
4910 #: builtin/clone.c:984
4911 msgid "--depth is ignored in local clones; use file:// instead."
4912 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4914 #: builtin/clone.c:987
4915 msgid "source repository is shallow, ignoring --local"
4916 msgstr "源仓库是浅克隆,忽略 --local"
4918 #: builtin/clone.c:992
4919 msgid "--local is ignored"
4920 msgstr "--local 被忽略"
4922 #: builtin/clone.c:996
4924 msgid "Don't know how to clone %s"
4927 #: builtin/clone.c:1045 builtin/clone.c:1053
4929 msgid "Remote branch %s not found in upstream %s"
4930 msgstr "远程分支 %s 在上游 %s 未发现"
4932 #: builtin/clone.c:1056
4933 msgid "You appear to have cloned an empty repository."
4934 msgstr "您似乎克隆了一个空仓库。"
4936 #: builtin/column.c:9
4937 msgid "git column [<options>]"
4938 msgstr "git column [<选项>]"
4940 #: builtin/column.c:26
4941 msgid "lookup config vars"
4944 #: builtin/column.c:27 builtin/column.c:28
4945 msgid "layout to use"
4948 #: builtin/column.c:29
4949 msgid "Maximum width"
4952 #: builtin/column.c:30
4953 msgid "Padding space on left border"
4956 #: builtin/column.c:31
4957 msgid "Padding space on right border"
4960 #: builtin/column.c:32
4961 msgid "Padding space between columns"
4964 #: builtin/column.c:51
4965 msgid "--command must be the first argument"
4966 msgstr "--command 必须是第一个参数"
4968 #: builtin/commit.c:38
4969 msgid "git commit [<options>] [--] <pathspec>..."
4970 msgstr "git commit [<选项>] [--] <路径规格>..."
4972 #: builtin/commit.c:43
4973 msgid "git status [<options>] [--] <pathspec>..."
4974 msgstr "git status [<选项>] [--] <路径规格>..."
4976 #: builtin/commit.c:48
4978 "Your name and email address were configured automatically based\n"
4979 "on your username and hostname. Please check that they are accurate.\n"
4980 "You can suppress this message by setting them explicitly. Run the\n"
4981 "following command and follow the instructions in your editor to edit\n"
4982 "your configuration file:\n"
4984 " git config --global --edit\n"
4986 "After doing this, you may fix the identity used for this commit with:\n"
4988 " git commit --amend --reset-author\n"
4990 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4991 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4994 " git config --global --edit\n"
4996 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4998 " git commit --amend --reset-author\n"
5000 #: builtin/commit.c:61
5002 "Your name and email address were configured automatically based\n"
5003 "on your username and hostname. Please check that they are accurate.\n"
5004 "You can suppress this message by setting them explicitly:\n"
5006 " git config --global user.name \"Your Name\"\n"
5007 " git config --global user.email you@example.com\n"
5009 "After doing this, you may fix the identity used for this commit with:\n"
5011 " git commit --amend --reset-author\n"
5013 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5014 "与否。您可以对其进行设置以免再出现本提示信息:\n"
5016 " git config --global user.name \"Your Name\"\n"
5017 " git config --global user.email you@example.com\n"
5019 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5021 " git commit --amend --reset-author\n"
5023 #: builtin/commit.c:73
5025 "You asked to amend the most recent commit, but doing so would make\n"
5026 "it empty. You can repeat your command with --allow-empty, or you can\n"
5027 "remove the commit entirely with \"git reset HEAD^\".\n"
5029 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5030 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5032 #: builtin/commit.c:78
5034 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5035 "If you wish to commit it anyway, use:\n"
5037 " git commit --allow-empty\n"
5040 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5043 " git commit --allow-empty\n"
5046 #: builtin/commit.c:85
5047 msgid "Otherwise, please use 'git reset'\n"
5048 msgstr "否则,请使用命令 'git reset'\n"
5050 #: builtin/commit.c:88
5052 "If you wish to skip this commit, use:\n"
5056 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5057 "the remaining commits.\n"
5059 "如果您想跳过这个提交,使用命令:\n"
5063 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5066 #: builtin/commit.c:305
5067 msgid "failed to unpack HEAD tree object"
5068 msgstr "无法解包 HEAD 树对象"
5070 #: builtin/commit.c:346
5071 msgid "unable to create temporary index"
5074 #: builtin/commit.c:352
5075 msgid "interactive add failed"
5078 #: builtin/commit.c:365
5079 msgid "unable to update temporary index"
5082 #: builtin/commit.c:367
5083 msgid "Failed to update main cache tree"
5086 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5087 msgid "unable to write new_index file"
5088 msgstr "无法写 new_index 文件"
5090 #: builtin/commit.c:445
5091 msgid "cannot do a partial commit during a merge."
5092 msgstr "在合并过程中不能做部分提交。"
5094 #: builtin/commit.c:447
5095 msgid "cannot do a partial commit during a cherry-pick."
5096 msgstr "在拣选过程中不能做部分提交。"
5098 #: builtin/commit.c:456
5099 msgid "cannot read the index"
5102 #: builtin/commit.c:475
5103 msgid "unable to write temporary index file"
5106 #: builtin/commit.c:580
5108 msgid "commit '%s' lacks author header"
5109 msgstr "提交 '%s' 缺少作者信息"
5111 #: builtin/commit.c:582
5113 msgid "commit '%s' has malformed author line"
5114 msgstr "提交 '%s' 有非法的作者信息"
5116 #: builtin/commit.c:601
5117 msgid "malformed --author parameter"
5118 msgstr "非法的 --author 参数"
5120 #: builtin/commit.c:609
5122 msgid "invalid date format: %s"
5125 #: builtin/commit.c:653
5127 "unable to select a comment character that is not used\n"
5128 "in the current commit message"
5129 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5131 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5133 msgid "could not lookup commit %s"
5136 #: builtin/commit.c:702 builtin/shortlog.c:285
5138 msgid "(reading log message from standard input)\n"
5139 msgstr "(正从标准输入中读取日志信息)\n"
5141 #: builtin/commit.c:704
5142 msgid "could not read log from standard input"
5143 msgstr "不能从标准输入中读取日志信息"
5145 #: builtin/commit.c:708
5147 msgid "could not read log file '%s'"
5148 msgstr "不能读取日志文件 '%s'"
5150 #: builtin/commit.c:730
5151 msgid "could not read MERGE_MSG"
5152 msgstr "不能读取 MERGE_MSG"
5154 #: builtin/commit.c:734
5155 msgid "could not read SQUASH_MSG"
5156 msgstr "不能读取 SQUASH_MSG"
5158 #: builtin/commit.c:785
5159 msgid "could not write commit template"
5162 #: builtin/commit.c:803
5166 "It looks like you may be committing a merge.\n"
5167 "If this is not correct, please remove the file\n"
5172 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5176 #: builtin/commit.c:808
5180 "It looks like you may be committing a cherry-pick.\n"
5181 "If this is not correct, please remove the file\n"
5186 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5190 #: builtin/commit.c:821
5193 "Please enter the commit message for your changes. Lines starting\n"
5194 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5196 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5199 #: builtin/commit.c:828
5202 "Please enter the commit message for your changes. Lines starting\n"
5203 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5204 "An empty message aborts the commit.\n"
5206 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5207 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5209 # 译者:为保证在输出中对齐,注意调整句中空格!
5210 #: builtin/commit.c:848
5212 msgid "%sAuthor: %.*s <%.*s>"
5213 msgstr "%s作者: %.*s <%.*s>"
5215 # 译者:为保证在输出中对齐,注意调整句中空格!
5216 #: builtin/commit.c:856
5221 # 译者:为保证在输出中对齐,注意调整句中空格!
5222 #: builtin/commit.c:863
5224 msgid "%sCommitter: %.*s <%.*s>"
5225 msgstr "%s提交者:%.*s <%.*s>"
5227 #: builtin/commit.c:881
5228 msgid "Cannot read index"
5231 #: builtin/commit.c:938
5232 msgid "Error building trees"
5235 #: builtin/commit.c:953 builtin/tag.c:266
5237 msgid "Please supply the message using either -m or -F option.\n"
5238 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5240 #: builtin/commit.c:1055
5242 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5243 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5245 #: builtin/commit.c:1070 builtin/commit.c:1310
5247 msgid "Invalid untracked files mode '%s'"
5248 msgstr "无效的未追踪文件参数 '%s'"
5250 #: builtin/commit.c:1107
5251 msgid "--long and -z are incompatible"
5252 msgstr "--long 和 -z 选项不兼容"
5254 #: builtin/commit.c:1137
5255 msgid "Using both --reset-author and --author does not make sense"
5256 msgstr "同时使用 --reset-author 和 --author 没有意义"
5258 #: builtin/commit.c:1146
5259 msgid "You have nothing to amend."
5262 #: builtin/commit.c:1149
5263 msgid "You are in the middle of a merge -- cannot amend."
5264 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5266 #: builtin/commit.c:1151
5267 msgid "You are in the middle of a cherry-pick -- cannot amend."
5268 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5270 #: builtin/commit.c:1154
5271 msgid "Options --squash and --fixup cannot be used together"
5272 msgstr "选项 --squash 和 --fixup 不能同时使用"
5274 #: builtin/commit.c:1164
5275 msgid "Only one of -c/-C/-F/--fixup can be used."
5276 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5278 #: builtin/commit.c:1166
5279 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5280 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5282 #: builtin/commit.c:1174
5283 msgid "--reset-author can be used only with -C, -c or --amend."
5284 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5286 #: builtin/commit.c:1191
5287 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5288 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5290 #: builtin/commit.c:1193
5291 msgid "No paths with --include/--only does not make sense."
5292 msgstr "参数 --include/--only 不跟路径没有意义。"
5294 #: builtin/commit.c:1195
5295 msgid "Clever... amending the last one with dirty index."
5296 msgstr "聪明... 用脏索引修补最后一个提交。"
5298 #: builtin/commit.c:1197
5299 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5300 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5302 #: builtin/commit.c:1209 builtin/tag.c:475
5304 msgid "Invalid cleanup mode %s"
5307 #: builtin/commit.c:1214
5308 msgid "Paths with -a does not make sense."
5309 msgstr "路径和 -a 选项同时使用没有意义。"
5311 #: builtin/commit.c:1324 builtin/commit.c:1605
5312 msgid "show status concisely"
5315 #: builtin/commit.c:1326 builtin/commit.c:1607
5316 msgid "show branch information"
5319 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5320 #: builtin/worktree.c:430
5321 msgid "machine-readable output"
5324 #: builtin/commit.c:1331 builtin/commit.c:1611
5325 msgid "show status in long format (default)"
5326 msgstr "以长格式显示状态(默认)"
5328 #: builtin/commit.c:1334 builtin/commit.c:1614
5329 msgid "terminate entries with NUL"
5330 msgstr "条目以 NUL 字符结尾"
5332 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5333 #: builtin/fast-export.c:984 builtin/tag.c:353
5337 #: builtin/commit.c:1337 builtin/commit.c:1617
5338 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5339 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5341 #: builtin/commit.c:1340
5342 msgid "show ignored files"
5345 #: builtin/commit.c:1341 parse-options.h:155
5349 #: builtin/commit.c:1342
5351 "ignore changes to submodules, optional when: all, dirty, untracked. "
5354 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5356 #: builtin/commit.c:1344
5357 msgid "list untracked files in columns"
5358 msgstr "以列的方式显示未跟踪的文件"
5360 #: builtin/commit.c:1430
5361 msgid "couldn't look up newly created commit"
5364 #: builtin/commit.c:1432
5365 msgid "could not parse newly created commit"
5368 #: builtin/commit.c:1477
5369 msgid "detached HEAD"
5372 # 译者:中文字符串拼接,可删除前导空格
5373 #: builtin/commit.c:1480
5374 msgid " (root-commit)"
5377 #: builtin/commit.c:1575
5378 msgid "suppress summary after successful commit"
5379 msgstr "提交成功后不显示概述信息"
5381 #: builtin/commit.c:1576
5382 msgid "show diff in commit message template"
5383 msgstr "在提交说明模板里显示差异"
5385 #: builtin/commit.c:1578
5386 msgid "Commit message options"
5389 #: builtin/commit.c:1579 builtin/tag.c:351
5390 msgid "read message from file"
5393 #: builtin/commit.c:1580
5397 #: builtin/commit.c:1580
5398 msgid "override author for commit"
5401 #: builtin/commit.c:1581 builtin/gc.c:326
5405 #: builtin/commit.c:1581
5406 msgid "override date for commit"
5409 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5410 #: builtin/notes.c:558 builtin/tag.c:349
5414 #: builtin/commit.c:1582
5415 msgid "commit message"
5418 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5419 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5423 #: builtin/commit.c:1583
5424 msgid "reuse and edit message from specified commit"
5425 msgstr "重用并编辑指定提交的提交说明"
5427 #: builtin/commit.c:1584
5428 msgid "reuse message from specified commit"
5429 msgstr "重用指定提交的提交说明"
5431 #: builtin/commit.c:1585
5432 msgid "use autosquash formatted message to fixup specified commit"
5433 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5435 #: builtin/commit.c:1586
5436 msgid "use autosquash formatted message to squash specified commit"
5437 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5439 #: builtin/commit.c:1587
5440 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5441 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5443 #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
5444 msgid "add Signed-off-by:"
5445 msgstr "添加 Signed-off-by: 签名"
5447 #: builtin/commit.c:1589
5448 msgid "use specified template file"
5451 #: builtin/commit.c:1590
5452 msgid "force edit of commit"
5455 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5456 #: builtin/commit.c:1591
5460 #: builtin/commit.c:1591 builtin/tag.c:354
5461 msgid "how to strip spaces and #comments from message"
5462 msgstr "设置如何删除提交说明里的空格和#注释"
5464 #: builtin/commit.c:1592
5465 msgid "include status in commit message template"
5466 msgstr "在提交说明模板里包含状态信息"
5468 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
5469 #: builtin/revert.c:93
5470 msgid "GPG sign commit"
5473 #: builtin/commit.c:1597
5474 msgid "Commit contents options"
5477 #: builtin/commit.c:1598
5478 msgid "commit all changed files"
5481 #: builtin/commit.c:1599
5482 msgid "add specified files to index for commit"
5483 msgstr "添加指定的文件到索引区等待提交"
5485 #: builtin/commit.c:1600
5486 msgid "interactively add files"
5489 #: builtin/commit.c:1601
5490 msgid "interactively add changes"
5493 #: builtin/commit.c:1602
5494 msgid "commit only specified files"
5497 #: builtin/commit.c:1603
5498 msgid "bypass pre-commit hook"
5499 msgstr "绕过 pre-commit 钩子"
5501 #: builtin/commit.c:1604
5502 msgid "show what would be committed"
5505 #: builtin/commit.c:1615
5506 msgid "amend previous commit"
5509 #: builtin/commit.c:1616
5510 msgid "bypass post-rewrite hook"
5511 msgstr "绕过 post-rewrite 钩子"
5513 #: builtin/commit.c:1621
5514 msgid "ok to record an empty change"
5517 #: builtin/commit.c:1623
5518 msgid "ok to record a change with an empty message"
5521 #: builtin/commit.c:1652
5522 msgid "could not parse HEAD commit"
5523 msgstr "不能解析 HEAD 提交"
5525 #: builtin/commit.c:1698
5527 msgid "Corrupt MERGE_HEAD file (%s)"
5528 msgstr "损坏的 MERGE_HEAD 文件(%s)"
5530 #: builtin/commit.c:1705
5531 msgid "could not read MERGE_MODE"
5532 msgstr "不能读取 MERGE_MODE"
5534 #: builtin/commit.c:1724
5536 msgid "could not read commit message: %s"
5537 msgstr "不能读取提交说明:%s"
5539 #: builtin/commit.c:1735
5541 msgid "Aborting commit; you did not edit the message.\n"
5542 msgstr "终止提交;您未更改来自模版的提交说明。\n"
5544 #: builtin/commit.c:1740
5546 msgid "Aborting commit due to empty commit message.\n"
5547 msgstr "终止提交因为提交说明为空。\n"
5549 #: builtin/commit.c:1788
5551 "Repository has been updated, but unable to write\n"
5552 "new_index file. Check that disk is not full and quota is\n"
5553 "not exceeded, and then \"git reset HEAD\" to recover."
5555 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5556 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5558 #: builtin/config.c:9
5559 msgid "git config [<options>]"
5560 msgstr "git config [<选项>]"
5562 #: builtin/config.c:56
5563 msgid "Config file location"
5566 #: builtin/config.c:57
5567 msgid "use global config file"
5570 #: builtin/config.c:58
5571 msgid "use system config file"
5574 #: builtin/config.c:59
5575 msgid "use repository config file"
5578 #: builtin/config.c:60
5579 msgid "use given config file"
5582 #: builtin/config.c:61
5586 #: builtin/config.c:61
5587 msgid "read config from given blob object"
5588 msgstr "从给定的数据对象读取配置"
5590 #: builtin/config.c:62
5594 #: builtin/config.c:63
5595 msgid "get value: name [value-regex]"
5596 msgstr "获取值:name [value-regex]"
5598 #: builtin/config.c:64
5599 msgid "get all values: key [value-regex]"
5600 msgstr "获得所有的值:key [value-regex]"
5602 #: builtin/config.c:65
5603 msgid "get values for regexp: name-regex [value-regex]"
5604 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5606 #: builtin/config.c:66
5607 msgid "get value specific for the URL: section[.var] URL"
5608 msgstr "获得 URL 取值:section[.var] URL"
5610 #: builtin/config.c:67
5611 msgid "replace all matching variables: name value [value_regex]"
5612 msgstr "替换所有匹配的变量:name value [value_regex]"
5614 #: builtin/config.c:68
5615 msgid "add a new variable: name value"
5616 msgstr "添加一个新的变量:name value"
5618 #: builtin/config.c:69
5619 msgid "remove a variable: name [value-regex]"
5620 msgstr "删除一个变量:name [value-regex]"
5622 #: builtin/config.c:70
5623 msgid "remove all matches: name [value-regex]"
5624 msgstr "删除所有匹配项:name [value-regex]"
5626 #: builtin/config.c:71
5627 msgid "rename section: old-name new-name"
5628 msgstr "重命名小节:old-name new-name"
5630 #: builtin/config.c:72
5631 msgid "remove a section: name"
5632 msgstr "删除一个小节:name"
5634 #: builtin/config.c:73
5638 #: builtin/config.c:74
5639 msgid "open an editor"
5642 #: builtin/config.c:75
5643 msgid "find the color configured: slot [default]"
5644 msgstr "获得配置的颜色:配置 [默认]"
5646 #: builtin/config.c:76
5647 msgid "find the color setting: slot [stdout-is-tty]"
5648 msgstr "获得颜色设置:配置 [stdout-is-tty]"
5650 #: builtin/config.c:77
5654 #: builtin/config.c:78
5655 msgid "value is \"true\" or \"false\""
5656 msgstr "值是 \"true\" 或 \"false\""
5658 #: builtin/config.c:79
5659 msgid "value is decimal number"
5662 #: builtin/config.c:80
5663 msgid "value is --bool or --int"
5664 msgstr "值是 --bool or --int"
5666 #: builtin/config.c:81
5667 msgid "value is a path (file or directory name)"
5668 msgstr "值是一个路径(文件或目录名)"
5670 #: builtin/config.c:82
5674 #: builtin/config.c:83
5675 msgid "terminate values with NUL byte"
5676 msgstr "终止值是 NUL 字节"
5678 #: builtin/config.c:84
5679 msgid "show variable names only"
5682 #: builtin/config.c:85
5683 msgid "respect include directives on lookup"
5684 msgstr "查询时参照 include 指令递归查找"
5686 #: builtin/config.c:86
5687 msgid "show origin of config (file, standard input, blob, command line)"
5688 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
5690 #: builtin/config.c:328
5691 msgid "unable to parse default color value"
5694 #: builtin/config.c:469
5697 "# This is Git's per-user configuration file.\n"
5699 "# Please adapt and uncomment the following lines:\n"
5703 "# This is Git's per-user configuration file.\n"
5705 "# Please adapt and uncomment the following lines:\n"
5709 #: builtin/config.c:611
5711 msgid "cannot create configuration file %s"
5712 msgstr "不能创建配置文件 %s"
5714 #: builtin/count-objects.c:77
5715 msgid "git count-objects [-v] [-H | --human-readable]"
5716 msgstr "git count-objects [-v] [-H | --human-readable]"
5718 #: builtin/count-objects.c:87
5719 msgid "print sizes in human readable format"
5720 msgstr "以用户可读的格式显示大小"
5722 #: builtin/describe.c:17
5723 msgid "git describe [<options>] [<commit-ish>...]"
5724 msgstr "git describe [<选项>] [<提交号>...]"
5726 #: builtin/describe.c:18
5727 msgid "git describe [<options>] --dirty"
5728 msgstr "git describe [<选项>] --dirty"
5730 #: builtin/describe.c:217
5732 msgid "annotated tag %s not available"
5735 #: builtin/describe.c:221
5737 msgid "annotated tag %s has no embedded name"
5738 msgstr "附注标签 %s 没有嵌入名称"
5740 #: builtin/describe.c:223
5742 msgid "tag '%s' is really '%s' here"
5743 msgstr "标签 '%s' 的确是在 '%s'"
5745 #: builtin/describe.c:250 builtin/log.c:459
5747 msgid "Not a valid object name %s"
5748 msgstr "不是一个有效的对象名 %s"
5750 #: builtin/describe.c:253
5752 msgid "%s is not a valid '%s' object"
5753 msgstr "%s 不是一个有效的 '%s' 对象"
5755 #: builtin/describe.c:270
5757 msgid "no tag exactly matches '%s'"
5758 msgstr "没有标签准确匹配 '%s'"
5760 #: builtin/describe.c:272
5762 msgid "searching to describe %s\n"
5765 #: builtin/describe.c:319
5767 msgid "finished search at %s\n"
5770 #: builtin/describe.c:346
5773 "No annotated tags can describe '%s'.\n"
5774 "However, there were unannotated tags: try --tags."
5777 "然而,存在未附注标签:尝试 --tags。"
5779 #: builtin/describe.c:350
5782 "No tags can describe '%s'.\n"
5783 "Try --always, or create some tags."
5786 "尝试 --always,或者创建一些标签。"
5788 #: builtin/describe.c:371
5790 msgid "traversed %lu commits\n"
5791 msgstr "已遍历 %lu 个提交\n"
5793 #: builtin/describe.c:374
5796 "more than %i tags found; listed %i most recent\n"
5797 "gave up search at %s\n"
5799 "发现多于 %i 个标签,列出最近的 %i 个\n"
5802 #: builtin/describe.c:396
5803 msgid "find the tag that comes after the commit"
5806 #: builtin/describe.c:397
5807 msgid "debug search strategy on stderr"
5808 msgstr "在标准错误上调试搜索策略"
5810 #: builtin/describe.c:398
5814 #: builtin/describe.c:399
5815 msgid "use any tag, even unannotated"
5816 msgstr "使用任意标签,即使未附带注释"
5818 #: builtin/describe.c:400
5819 msgid "always use long format"
5822 #: builtin/describe.c:401
5823 msgid "only follow first parent"
5826 #: builtin/describe.c:404
5827 msgid "only output exact matches"
5830 #: builtin/describe.c:406
5831 msgid "consider <n> most recent tags (default: 10)"
5832 msgstr "考虑最近 <n> 个标签(默认:10)"
5834 #: builtin/describe.c:408
5835 msgid "only consider tags matching <pattern>"
5836 msgstr "只考虑匹配 <模式> 的标签"
5838 #: builtin/describe.c:410 builtin/name-rev.c:314
5839 msgid "show abbreviated commit object as fallback"
5840 msgstr "显示简写的提交号作为后备"
5842 #: builtin/describe.c:411
5846 #: builtin/describe.c:412
5847 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5848 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5850 #: builtin/describe.c:430
5851 msgid "--long is incompatible with --abbrev=0"
5852 msgstr "--long 与 --abbrev=0 不兼容"
5854 #: builtin/describe.c:456
5855 msgid "No names found, cannot describe anything."
5856 msgstr "没有发现名称,无法描述任何东西。"
5858 #: builtin/describe.c:476
5859 msgid "--dirty is incompatible with commit-ishes"
5860 msgstr "--dirty 不能与提交同时使用"
5862 #: builtin/diff.c:86
5864 msgid "'%s': not a regular file or symlink"
5865 msgstr "'%s':不是一个正规文件或符号链接"
5867 #: builtin/diff.c:237
5869 msgid "invalid option: %s"
5872 #: builtin/diff.c:358
5873 msgid "Not a git repository"
5874 msgstr "不是一个 git 仓库"
5876 #: builtin/diff.c:401
5878 msgid "invalid object '%s' given."
5879 msgstr "提供了无效对象 '%s'。"
5881 #: builtin/diff.c:410
5883 msgid "more than two blobs given: '%s'"
5884 msgstr "提供了超过两个数据对象:'%s'"
5886 #: builtin/diff.c:417
5888 msgid "unhandled object '%s' given."
5889 msgstr "无法处理的对象 '%s'。"
5891 #: builtin/fast-export.c:25
5892 msgid "git fast-export [rev-list-opts]"
5893 msgstr "git fast-export [rev-list-opts]"
5895 #: builtin/fast-export.c:980
5896 msgid "show progress after <n> objects"
5897 msgstr "在 <n> 个对象之后显示进度"
5899 #: builtin/fast-export.c:982
5900 msgid "select handling of signed tags"
5903 #: builtin/fast-export.c:985
5904 msgid "select handling of tags that tag filtered objects"
5905 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
5907 #: builtin/fast-export.c:988
5908 msgid "Dump marks to this file"
5911 #: builtin/fast-export.c:990
5912 msgid "Import marks from this file"
5915 #: builtin/fast-export.c:992
5916 msgid "Fake a tagger when tags lack one"
5917 msgstr "当标签缺少标记者字段时,假装提供一个"
5919 #: builtin/fast-export.c:994
5920 msgid "Output full tree for each commit"
5923 #: builtin/fast-export.c:996
5924 msgid "Use the done feature to terminate the stream"
5925 msgstr "使用 done 功能来终止流"
5927 #: builtin/fast-export.c:997
5928 msgid "Skip output of blob data"
5931 #: builtin/fast-export.c:998
5935 #: builtin/fast-export.c:999
5936 msgid "Apply refspec to exported refs"
5937 msgstr "对导出的引用应用引用规格"
5939 #: builtin/fast-export.c:1000
5940 msgid "anonymize output"
5943 #: builtin/fetch.c:20
5944 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5945 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
5947 #: builtin/fetch.c:21
5948 msgid "git fetch [<options>] <group>"
5949 msgstr "git fetch [<选项>] <组>"
5951 #: builtin/fetch.c:22
5952 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5953 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
5955 #: builtin/fetch.c:23
5956 msgid "git fetch --all [<options>]"
5957 msgstr "git fetch --all [<选项>]"
5959 #: builtin/fetch.c:92 builtin/pull.c:166
5960 msgid "fetch from all remotes"
5963 #: builtin/fetch.c:94 builtin/pull.c:169
5964 msgid "append to .git/FETCH_HEAD instead of overwriting"
5965 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5967 #: builtin/fetch.c:96 builtin/pull.c:172
5968 msgid "path to upload pack on remote end"
5971 #: builtin/fetch.c:97 builtin/pull.c:174
5972 msgid "force overwrite of local branch"
5975 #: builtin/fetch.c:99
5976 msgid "fetch from multiple remotes"
5979 #: builtin/fetch.c:101 builtin/pull.c:176
5980 msgid "fetch all tags and associated objects"
5981 msgstr "抓取所有的标签和关联对象"
5983 #: builtin/fetch.c:103
5984 msgid "do not fetch all tags (--no-tags)"
5985 msgstr "不抓取任何标签(--no-tags)"
5987 #: builtin/fetch.c:105
5988 msgid "number of submodules fetched in parallel"
5991 #: builtin/fetch.c:107 builtin/pull.c:179
5992 msgid "prune remote-tracking branches no longer on remote"
5993 msgstr "清除远程已经不存在的分支的跟踪分支"
5996 #: builtin/fetch.c:108 builtin/pull.c:182
6000 #: builtin/fetch.c:109 builtin/pull.c:183
6001 msgid "control recursive fetching of submodules"
6004 #: builtin/fetch.c:113 builtin/pull.c:191
6005 msgid "keep downloaded pack"
6008 #: builtin/fetch.c:115
6009 msgid "allow updating of HEAD ref"
6010 msgstr "允许更新 HEAD 引用"
6012 #: builtin/fetch.c:118 builtin/pull.c:194
6013 msgid "deepen history of shallow clone"
6016 #: builtin/fetch.c:120 builtin/pull.c:197
6017 msgid "convert to a complete repository"
6020 #: builtin/fetch.c:122 builtin/log.c:1236
6024 #: builtin/fetch.c:123
6025 msgid "prepend this to submodule path output"
6026 msgstr "在子模组路径输出的前面加上此目录"
6028 #: builtin/fetch.c:126
6029 msgid "default mode for recursion"
6032 #: builtin/fetch.c:128 builtin/pull.c:200
6033 msgid "accept refs that update .git/shallow"
6034 msgstr "接受更新 .git/shallow 的引用"
6036 #: builtin/fetch.c:129 builtin/pull.c:202
6040 #: builtin/fetch.c:130 builtin/pull.c:203
6041 msgid "specify fetch refmap"
6042 msgstr "指定获取操作的引用映射"
6044 #: builtin/fetch.c:386
6045 msgid "Couldn't find remote ref HEAD"
6046 msgstr "无法发现远程 HEAD 引用"
6048 #: builtin/fetch.c:466
6050 msgid "object %s not found"
6053 #: builtin/fetch.c:471
6054 msgid "[up to date]"
6057 #: builtin/fetch.c:485
6059 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6060 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6062 #: builtin/fetch.c:486 builtin/fetch.c:574
6066 #: builtin/fetch.c:497
6067 msgid "[tag update]"
6071 #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6072 msgid " (unable to update local ref)"
6073 msgstr " (不能更新本地引用)"
6075 #: builtin/fetch.c:517
6079 #: builtin/fetch.c:520
6080 msgid "[new branch]"
6083 #: builtin/fetch.c:523
6087 #: builtin/fetch.c:569
6088 msgid "unable to update local ref"
6091 #: builtin/fetch.c:569
6092 msgid "forced update"
6095 #: builtin/fetch.c:576
6096 msgid "(non-fast-forward)"
6099 #: builtin/fetch.c:610 builtin/fetch.c:851
6101 msgid "cannot open %s: %s\n"
6102 msgstr "无法打开 %s:%s\n"
6104 #: builtin/fetch.c:619
6106 msgid "%s did not send all necessary objects\n"
6107 msgstr "%s 未发送所有必须的对象\n"
6109 #: builtin/fetch.c:637
6111 msgid "reject %s because shallow roots are not allowed to be updated"
6112 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6114 #: builtin/fetch.c:724 builtin/fetch.c:816
6119 #: builtin/fetch.c:735
6122 "some local refs could not be updated; try running\n"
6123 " 'git remote prune %s' to remove any old, conflicting branches"
6125 "一些本地引用不能被更新;尝试运行\n"
6126 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6129 #: builtin/fetch.c:787
6131 msgid " (%s will become dangling)"
6132 msgstr " (%s 将成为摇摆状态)"
6135 #: builtin/fetch.c:788
6137 msgid " (%s has become dangling)"
6138 msgstr " (%s 已成为摇摆状态)"
6140 #: builtin/fetch.c:820
6144 #: builtin/fetch.c:821 builtin/remote.c:1025
6148 #: builtin/fetch.c:841
6150 msgid "Refusing to fetch into current branch %s of non-bare repository"
6151 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6153 #: builtin/fetch.c:860
6155 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6156 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6158 #: builtin/fetch.c:863
6160 msgid "Option \"%s\" is ignored for %s\n"
6161 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6163 #: builtin/fetch.c:920
6165 msgid "Don't know how to fetch from %s"
6166 msgstr "不知道如何从 %s 获取"
6168 #: builtin/fetch.c:1080
6170 msgid "Fetching %s\n"
6173 #: builtin/fetch.c:1082 builtin/remote.c:96
6175 msgid "Could not fetch %s"
6178 #: builtin/fetch.c:1100
6180 "No remote repository specified. Please, specify either a URL or a\n"
6181 "remote name from which new revisions should be fetched."
6182 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6184 #: builtin/fetch.c:1123
6185 msgid "You need to specify a tag name."
6186 msgstr "您需要指定一个标签名称。"
6188 #: builtin/fetch.c:1165
6189 msgid "--depth and --unshallow cannot be used together"
6190 msgstr "--depth 和 --unshallow 不能同时使用"
6192 #: builtin/fetch.c:1167
6193 msgid "--unshallow on a complete repository does not make sense"
6194 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6196 #: builtin/fetch.c:1187
6197 msgid "fetch --all does not take a repository argument"
6198 msgstr "fetch --all 不能带一个仓库参数"
6200 #: builtin/fetch.c:1189
6201 msgid "fetch --all does not make sense with refspecs"
6202 msgstr "fetch --all 带引用规格没有任何意义"
6204 #: builtin/fetch.c:1200
6206 msgid "No such remote or remote group: %s"
6207 msgstr "没有这样的远程或远程组:%s"
6209 #: builtin/fetch.c:1208
6210 msgid "Fetching a group and specifying refspecs does not make sense"
6211 msgstr "获取组并指定引用规格没有意义"
6213 #: builtin/fmt-merge-msg.c:14
6215 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6216 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6218 #: builtin/fmt-merge-msg.c:667
6219 msgid "populate log with at most <n> entries from shortlog"
6220 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6222 #: builtin/fmt-merge-msg.c:670
6223 msgid "alias for --log (deprecated)"
6224 msgstr "参数 --log 的别名(已弃用)"
6226 #: builtin/fmt-merge-msg.c:673
6230 #: builtin/fmt-merge-msg.c:674
6231 msgid "use <text> as start of message"
6232 msgstr "使用 <文本> 作为提交说明的开始"
6234 #: builtin/fmt-merge-msg.c:675
6235 msgid "file to read from"
6238 #: builtin/for-each-ref.c:9
6239 msgid "git for-each-ref [<options>] [<pattern>]"
6240 msgstr "git for-each-ref [<选项>] [<模式>]"
6242 #: builtin/for-each-ref.c:10
6243 msgid "git for-each-ref [--points-at <object>]"
6244 msgstr "git for-each-ref [--points-at <对象>]"
6246 #: builtin/for-each-ref.c:11
6247 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6248 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6250 #: builtin/for-each-ref.c:12
6251 msgid "git for-each-ref [--contains [<object>]]"
6252 msgstr "git for-each-ref [--contains [<对象>]]"
6254 #: builtin/for-each-ref.c:27
6255 msgid "quote placeholders suitably for shells"
6256 msgstr "引用占位符适用于 shells"
6258 #: builtin/for-each-ref.c:29
6259 msgid "quote placeholders suitably for perl"
6260 msgstr "引用占位符适用于 perl"
6262 #: builtin/for-each-ref.c:31
6263 msgid "quote placeholders suitably for python"
6264 msgstr "引用占位符适用于 python"
6266 #: builtin/for-each-ref.c:33
6267 msgid "quote placeholders suitably for Tcl"
6268 msgstr "引用占位符适用于 Tcl"
6270 #: builtin/for-each-ref.c:36
6271 msgid "show only <n> matched refs"
6272 msgstr "只显示 <n> 个匹配的引用"
6274 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6275 msgid "format to use for the output"
6278 #: builtin/for-each-ref.c:41
6279 msgid "print only refs which points at the given object"
6280 msgstr "只打印指向给定对象的引用"
6282 #: builtin/for-each-ref.c:43
6283 msgid "print only refs that are merged"
6286 #: builtin/for-each-ref.c:44
6287 msgid "print only refs that are not merged"
6290 #: builtin/for-each-ref.c:45
6291 msgid "print only refs which contain the commit"
6292 msgstr "只打印包含该提交的引用"
6294 #: builtin/fsck.c:156 builtin/prune.c:140
6295 msgid "Checking connectivity"
6298 #: builtin/fsck.c:486
6299 msgid "Checking object directories"
6302 #: builtin/fsck.c:553
6303 msgid "git fsck [<options>] [<object>...]"
6304 msgstr "git fsck [<选项>] [<对象>...]"
6306 #: builtin/fsck.c:559
6307 msgid "show unreachable objects"
6310 #: builtin/fsck.c:560
6311 msgid "show dangling objects"
6314 #: builtin/fsck.c:561
6318 #: builtin/fsck.c:562
6319 msgid "report root nodes"
6322 #: builtin/fsck.c:563
6323 msgid "make index objects head nodes"
6324 msgstr "将索引亦作为检查的头节点"
6326 #: builtin/fsck.c:564
6327 msgid "make reflogs head nodes (default)"
6328 msgstr "将引用日志作为检查的头节点(默认)"
6330 #: builtin/fsck.c:565
6331 msgid "also consider packs and alternate objects"
6334 #: builtin/fsck.c:566
6335 msgid "check only connectivity"
6338 #: builtin/fsck.c:567
6339 msgid "enable more strict checking"
6342 #: builtin/fsck.c:569
6343 msgid "write dangling objects in .git/lost-found"
6344 msgstr "将摇摆对象写入 .git/lost-found 中"
6346 #: builtin/fsck.c:570 builtin/prune.c:107
6347 msgid "show progress"
6350 #: builtin/fsck.c:631
6351 msgid "Checking objects"
6355 msgid "git gc [<options>]"
6356 msgstr "git gc [<选项>]"
6360 msgid "Invalid %s: '%s'"
6365 msgid "insanely long object directory %.*s"
6366 msgstr "不正常的长对象目录 %.*s"
6371 "The last gc run reported the following. Please correct the root cause\n"
6373 "Automatic cleanup will not be performed until the file is removed.\n"
6377 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6378 "在该文件被删除之前,自动清理将不会执行。\n"
6383 msgid "prune unreferenced objects"
6387 msgid "be more thorough (increased runtime)"
6388 msgstr "更彻底(增加运行时间)"
6391 msgid "enable auto-gc mode"
6395 msgid "force running gc even if there may be another gc running"
6396 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6400 msgid "Auto packing the repository in background for optimum performance.\n"
6401 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6405 msgid "Auto packing the repository for optimum performance.\n"
6406 msgstr "自动打包仓库以求最佳性能。\n"
6410 msgid "See \"git help gc\" for manual housekeeping.\n"
6411 msgstr "手工维护参见 \"git help gc\"。\n"
6416 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6418 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6422 "There are too many unreachable loose objects; run 'git prune' to remove them."
6423 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6425 #: builtin/grep.c:23
6426 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6427 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6429 #: builtin/grep.c:219
6431 msgid "grep: failed to create thread: %s"
6432 msgstr "grep:无法创建线程:%s"
6434 #: builtin/grep.c:277
6436 msgid "invalid number of threads specified (%d) for %s"
6437 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6439 #: builtin/grep.c:452 builtin/grep.c:487
6441 msgid "unable to read tree (%s)"
6444 #: builtin/grep.c:502
6446 msgid "unable to grep from object of type %s"
6447 msgstr "无法抓取来自于 %s 类型的对象"
6449 #: builtin/grep.c:558
6451 msgid "switch `%c' expects a numerical value"
6452 msgstr "开关 `%c' 期望一个数字值"
6454 #: builtin/grep.c:575
6456 msgid "cannot open '%s'"
6459 #: builtin/grep.c:644
6460 msgid "search in index instead of in the work tree"
6461 msgstr "在索引区搜索而不是在工作区"
6463 #: builtin/grep.c:646
6464 msgid "find in contents not managed by git"
6465 msgstr "在未被 git 管理的内容中查找"
6467 # 译者:中文字符串拼接,可删除前导空格
6468 #: builtin/grep.c:648
6469 msgid "search in both tracked and untracked files"
6470 msgstr "在跟踪和未跟踪的文件中搜索"
6472 #: builtin/grep.c:650
6473 msgid "ignore files specified via '.gitignore'"
6474 msgstr "忽略 '.gitignore' 包含的文件"
6476 #: builtin/grep.c:653
6477 msgid "show non-matching lines"
6480 #: builtin/grep.c:655
6481 msgid "case insensitive matching"
6484 #: builtin/grep.c:657
6485 msgid "match patterns only at word boundaries"
6488 #: builtin/grep.c:659
6489 msgid "process binary files as text"
6490 msgstr "把二进制文件当做文本处理"
6492 #: builtin/grep.c:661
6493 msgid "don't match patterns in binary files"
6494 msgstr "不在二进制文件中匹配模式"
6496 #: builtin/grep.c:664
6497 msgid "process binary files with textconv filters"
6498 msgstr "用 textconv 过滤器处理二进制文件"
6500 #: builtin/grep.c:666
6501 msgid "descend at most <depth> levels"
6502 msgstr "最多以指定的深度向下寻找"
6504 #: builtin/grep.c:670
6505 msgid "use extended POSIX regular expressions"
6506 msgstr "使用扩展的 POSIX 正则表达式"
6508 #: builtin/grep.c:673
6509 msgid "use basic POSIX regular expressions (default)"
6510 msgstr "使用基本的 POSIX 正则表达式(默认)"
6512 #: builtin/grep.c:676
6513 msgid "interpret patterns as fixed strings"
6514 msgstr "把模式解析为固定的字符串"
6516 #: builtin/grep.c:679
6517 msgid "use Perl-compatible regular expressions"
6518 msgstr "使用 Perl 兼容的正则表达式"
6520 #: builtin/grep.c:682
6521 msgid "show line numbers"
6524 #: builtin/grep.c:683
6525 msgid "don't show filenames"
6528 #: builtin/grep.c:684
6529 msgid "show filenames"
6532 #: builtin/grep.c:686
6533 msgid "show filenames relative to top directory"
6534 msgstr "显示相对于顶级目录的文件名"
6536 #: builtin/grep.c:688
6537 msgid "show only filenames instead of matching lines"
6538 msgstr "只显示文件名而不显示匹配的行"
6540 #: builtin/grep.c:690
6541 msgid "synonym for --files-with-matches"
6542 msgstr "和 --files-with-matches 同义"
6544 #: builtin/grep.c:693
6545 msgid "show only the names of files without match"
6548 #: builtin/grep.c:695
6549 msgid "print NUL after filenames"
6550 msgstr "在文件名后输出 NUL 字符"
6552 #: builtin/grep.c:697
6553 msgid "show the number of matches instead of matching lines"
6554 msgstr "显示总匹配行数,而不显示匹配的行"
6556 #: builtin/grep.c:698
6557 msgid "highlight matches"
6560 #: builtin/grep.c:700
6561 msgid "print empty line between matches from different files"
6562 msgstr "在不同文件的匹配项之间打印空行"
6564 #: builtin/grep.c:702
6565 msgid "show filename only once above matches from same file"
6566 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6568 #: builtin/grep.c:705
6569 msgid "show <n> context lines before and after matches"
6570 msgstr "显示匹配项前后的 <n> 行上下文"
6572 #: builtin/grep.c:708
6573 msgid "show <n> context lines before matches"
6574 msgstr "显示匹配项前 <n> 行上下文"
6576 #: builtin/grep.c:710
6577 msgid "show <n> context lines after matches"
6578 msgstr "显示匹配项后 <n> 行上下文"
6580 #: builtin/grep.c:712
6581 msgid "use <n> worker threads"
6582 msgstr "使用 <n> 个工作线程"
6584 #: builtin/grep.c:713
6585 msgid "shortcut for -C NUM"
6588 #: builtin/grep.c:716
6589 msgid "show a line with the function name before matches"
6590 msgstr "在匹配的前面显示一行函数名"
6592 #: builtin/grep.c:718
6593 msgid "show the surrounding function"
6594 msgstr "显示所在函数的前后内容"
6596 #: builtin/grep.c:721
6597 msgid "read patterns from file"
6600 #: builtin/grep.c:723
6601 msgid "match <pattern>"
6604 #: builtin/grep.c:725
6605 msgid "combine patterns specified with -e"
6606 msgstr "组合用 -e 参数设定的模式"
6608 #: builtin/grep.c:737
6609 msgid "indicate hit with exit status without output"
6610 msgstr "不输出,而用退出码标识命中状态"
6612 #: builtin/grep.c:739
6613 msgid "show only matches from files that match all patterns"
6614 msgstr "只显示匹配所有模式的文件中的匹配"
6616 #: builtin/grep.c:741
6617 msgid "show parse tree for grep expression"
6618 msgstr "显示 grep 表达式的解析树"
6620 #: builtin/grep.c:745
6624 #: builtin/grep.c:745
6625 msgid "show matching files in the pager"
6628 #: builtin/grep.c:748
6629 msgid "allow calling of grep(1) (ignored by this build)"
6630 msgstr "允许调用 grep(1)(本次构建忽略)"
6632 #: builtin/grep.c:811
6633 msgid "no pattern given."
6636 #: builtin/grep.c:843 builtin/index-pack.c:1475
6638 msgid "invalid number of threads specified (%d)"
6639 msgstr "指定的线程数无效(%d)"
6641 #: builtin/grep.c:873
6642 msgid "--open-files-in-pager only works on the worktree"
6643 msgstr "--open-files-in-pager 仅用于工作区"
6645 #: builtin/grep.c:899
6646 msgid "--cached or --untracked cannot be used with --no-index."
6647 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6649 #: builtin/grep.c:904
6650 msgid "--no-index or --untracked cannot be used with revs."
6651 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6653 #: builtin/grep.c:907
6654 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6655 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6657 #: builtin/grep.c:915
6658 msgid "both --cached and trees are given."
6659 msgstr "同时给出了 --cached 和树对象。"
6661 #: builtin/hash-object.c:81
6663 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6666 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6669 #: builtin/hash-object.c:82
6670 msgid "git hash-object --stdin-paths"
6671 msgstr "git hash-object --stdin-paths"
6673 #: builtin/hash-object.c:93
6677 #: builtin/hash-object.c:93
6681 #: builtin/hash-object.c:94
6682 msgid "write the object into the object database"
6685 #: builtin/hash-object.c:96
6686 msgid "read the object from stdin"
6689 #: builtin/hash-object.c:98
6690 msgid "store file as is without filters"
6691 msgstr "原样存储文件不使用过滤器"
6693 #: builtin/hash-object.c:99
6695 "just hash any random garbage to create corrupt objects for debugging Git"
6696 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6698 #: builtin/hash-object.c:100
6699 msgid "process file as it were from this path"
6700 msgstr "处理文件并假设其来自于此路径"
6702 #: builtin/help.c:41
6703 msgid "print all available commands"
6706 #: builtin/help.c:42
6707 msgid "print list of useful guides"
6710 #: builtin/help.c:43
6711 msgid "show man page"
6714 #: builtin/help.c:44
6715 msgid "show manual in web browser"
6716 msgstr "在 web 浏览器中显示手册"
6718 #: builtin/help.c:46
6719 msgid "show info page"
6722 #: builtin/help.c:52
6723 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6724 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6726 #: builtin/help.c:64
6728 msgid "unrecognized help format '%s'"
6729 msgstr "未能识别的帮助格式 '%s'"
6731 #: builtin/help.c:91
6732 msgid "Failed to start emacsclient."
6733 msgstr "无法启动 emacsclient。"
6735 #: builtin/help.c:104
6736 msgid "Failed to parse emacsclient version."
6737 msgstr "无法解析 emacsclient 版本。"
6739 #: builtin/help.c:112
6741 msgid "emacsclient version '%d' too old (< 22)."
6742 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6744 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6746 msgid "failed to exec '%s': %s"
6747 msgstr "无法执行 '%s':%s"
6749 #: builtin/help.c:205
6752 "'%s': path for unsupported man viewer.\n"
6753 "Please consider using 'man.<tool>.cmd' instead."
6755 "'%s':不支持的 man 手册查看器的路径。\n"
6756 "请使用 'man.<工具>.cmd'。"
6758 #: builtin/help.c:217
6761 "'%s': cmd for supported man viewer.\n"
6762 "Please consider using 'man.<tool>.path' instead."
6764 "'%s': 支持的 man 手册查看器命令。\n"
6765 "请使用 'man.<工具>.path'。"
6767 #: builtin/help.c:334
6769 msgid "'%s': unknown man viewer."
6770 msgstr "'%s':未知的 man 查看器。"
6772 #: builtin/help.c:351
6773 msgid "no man viewer handled the request"
6774 msgstr "没有 man 查看器处理此请求"
6776 #: builtin/help.c:359
6777 msgid "no info viewer handled the request"
6778 msgstr "没有 info 查看器处理此请求"
6780 #: builtin/help.c:408
6781 msgid "Defining attributes per path"
6784 #: builtin/help.c:409
6785 msgid "Everyday Git With 20 Commands Or So"
6786 msgstr "每一天 Git 常用的约 20 条命令"
6788 #: builtin/help.c:410
6789 msgid "A Git glossary"
6792 #: builtin/help.c:411
6793 msgid "Specifies intentionally untracked files to ignore"
6796 #: builtin/help.c:412
6797 msgid "Defining submodule properties"
6800 #: builtin/help.c:413
6801 msgid "Specifying revisions and ranges for Git"
6802 msgstr "指定 Git 的版本和版本范围"
6804 #: builtin/help.c:414
6805 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6806 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6808 #: builtin/help.c:415
6809 msgid "An overview of recommended workflows with Git"
6810 msgstr "Git 推荐的工作流概览"
6812 #: builtin/help.c:427
6813 msgid "The common Git guides are:\n"
6814 msgstr "最常用的 Git 向导有:\n"
6816 #: builtin/help.c:448 builtin/help.c:465
6821 #: builtin/help.c:481
6823 msgid "`git %s' is aliased to `%s'"
6824 msgstr "`git %s' 是 `%s' 的别名"
6826 #: builtin/index-pack.c:152
6828 msgid "unable to open %s"
6831 #: builtin/index-pack.c:202
6833 msgid "object type mismatch at %s"
6834 msgstr "%s 的对象类型不匹配"
6836 #: builtin/index-pack.c:222
6838 msgid "did not receive expected object %s"
6839 msgstr "未能获取期望的对象 %s"
6841 #: builtin/index-pack.c:225
6843 msgid "object %s: expected type %s, found %s"
6844 msgstr "对象 %s:期待类型 %s,却是 %s"
6846 #: builtin/index-pack.c:267
6848 msgid "cannot fill %d byte"
6849 msgid_plural "cannot fill %d bytes"
6850 msgstr[0] "无法填充 %d 字节"
6851 msgstr[1] "无法填充 %d 字节"
6853 #: builtin/index-pack.c:277
6855 msgstr "过早的文件结束符(EOF)"
6857 #: builtin/index-pack.c:278
6858 msgid "read error on input"
6861 #: builtin/index-pack.c:290
6862 msgid "used more bytes than were available"
6865 #: builtin/index-pack.c:297
6866 msgid "pack too large for current definition of off_t"
6867 msgstr "包太大超过了当前 off_t 的定义"
6869 #: builtin/index-pack.c:313
6871 msgid "unable to create '%s'"
6874 #: builtin/index-pack.c:318
6876 msgid "cannot open packfile '%s'"
6877 msgstr "无法打开包文件 '%s'"
6879 #: builtin/index-pack.c:332
6880 msgid "pack signature mismatch"
6883 #: builtin/index-pack.c:334
6885 msgid "pack version %<PRIu32> unsupported"
6886 msgstr "不支持包版本 %<PRIu32>"
6888 #: builtin/index-pack.c:352
6890 msgid "pack has bad object at offset %lu: %s"
6891 msgstr "包中有错误的对象位于 %lu:%s"
6893 #: builtin/index-pack.c:473
6895 msgid "inflate returned %d"
6898 #: builtin/index-pack.c:522
6899 msgid "offset value overflow for delta base object"
6900 msgstr "偏移值覆盖了 delta 基准对象"
6902 #: builtin/index-pack.c:530
6903 msgid "delta base offset is out of bound"
6904 msgstr "delta 基准偏移越界"
6906 #: builtin/index-pack.c:538
6908 msgid "unknown object type %d"
6911 #: builtin/index-pack.c:569
6912 msgid "cannot pread pack file"
6915 #: builtin/index-pack.c:571
6917 msgid "premature end of pack file, %lu byte missing"
6918 msgid_plural "premature end of pack file, %lu bytes missing"
6919 msgstr[0] "包文件过早结束,缺少 %lu 字节"
6920 msgstr[1] "包文件过早结束,缺少 %lu 字节"
6922 #: builtin/index-pack.c:597
6923 msgid "serious inflate inconsistency"
6926 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
6927 #: builtin/index-pack.c:806 builtin/index-pack.c:815
6929 msgid "SHA1 COLLISION FOUND WITH %s !"
6930 msgstr "发现 %s 出现 SHA1 冲突!"
6932 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
6933 #: builtin/pack-objects.c:254
6935 msgid "unable to read %s"
6938 #: builtin/index-pack.c:812
6940 msgid "cannot read existing object %s"
6941 msgstr "不能读取现存对象 %s"
6943 #: builtin/index-pack.c:826
6945 msgid "invalid blob object %s"
6948 #: builtin/index-pack.c:840
6953 #: builtin/index-pack.c:843
6954 msgid "Error in object"
6957 #: builtin/index-pack.c:845
6959 msgid "Not all child objects of %s are reachable"
6960 msgstr "%s 的所有子对象并非都可达"
6962 #: builtin/index-pack.c:917 builtin/index-pack.c:948
6963 msgid "failed to apply delta"
6966 #: builtin/index-pack.c:1118
6967 msgid "Receiving objects"
6970 #: builtin/index-pack.c:1118
6971 msgid "Indexing objects"
6974 #: builtin/index-pack.c:1150
6975 msgid "pack is corrupted (SHA1 mismatch)"
6976 msgstr "包冲突(SHA1 不匹配)"
6978 #: builtin/index-pack.c:1155
6979 msgid "cannot fstat packfile"
6982 #: builtin/index-pack.c:1158
6983 msgid "pack has junk at the end"
6986 #: builtin/index-pack.c:1169
6987 msgid "confusion beyond insanity in parse_pack_objects()"
6988 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6990 #: builtin/index-pack.c:1194
6991 msgid "Resolving deltas"
6994 #: builtin/index-pack.c:1205
6996 msgid "unable to create thread: %s"
6999 #: builtin/index-pack.c:1247
7000 msgid "confusion beyond insanity"
7003 #: builtin/index-pack.c:1253
7005 msgid "completed with %d local objects"
7006 msgstr "完成 %d 个本地对象"
7008 #: builtin/index-pack.c:1263
7010 msgid "Unexpected tail checksum for %s (disk corruption?)"
7011 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7013 #: builtin/index-pack.c:1267
7015 msgid "pack has %d unresolved delta"
7016 msgid_plural "pack has %d unresolved deltas"
7017 msgstr[0] "包有 %d 个未解决的 delta"
7018 msgstr[1] "包有 %d 个未解决的 delta"
7020 #: builtin/index-pack.c:1291
7022 msgid "unable to deflate appended object (%d)"
7023 msgstr "不能压缩附加对象(%d)"
7025 #: builtin/index-pack.c:1367
7027 msgid "local object %s is corrupt"
7028 msgstr "本地对象 %s 已损坏"
7030 #: builtin/index-pack.c:1391
7031 msgid "error while closing pack file"
7034 #: builtin/index-pack.c:1404
7036 msgid "cannot write keep file '%s'"
7037 msgstr "无法写保留文件 '%s'"
7039 #: builtin/index-pack.c:1412
7041 msgid "cannot close written keep file '%s'"
7042 msgstr "无法关闭保留文件 '%s'"
7044 #: builtin/index-pack.c:1425
7045 msgid "cannot store pack file"
7048 #: builtin/index-pack.c:1436
7049 msgid "cannot store index file"
7052 #: builtin/index-pack.c:1469
7054 msgid "bad pack.indexversion=%<PRIu32>"
7055 msgstr "坏的 pack.indexversion=%<PRIu32>"
7057 #: builtin/index-pack.c:1479 builtin/index-pack.c:1663
7059 msgid "no threads support, ignoring %s"
7060 msgstr "没有线程支持,忽略 %s"
7062 #: builtin/index-pack.c:1537
7064 msgid "Cannot open existing pack file '%s'"
7065 msgstr "无法打开现存包文件 '%s'"
7067 #: builtin/index-pack.c:1539
7069 msgid "Cannot open existing pack idx file for '%s'"
7070 msgstr "无法为 %s 打开包索引文件"
7072 #: builtin/index-pack.c:1586
7074 msgid "non delta: %d object"
7075 msgid_plural "non delta: %d objects"
7076 msgstr[0] "非 delta:%d 个对象"
7077 msgstr[1] "非 delta:%d 个对象"
7079 #: builtin/index-pack.c:1593
7081 msgid "chain length = %d: %lu object"
7082 msgid_plural "chain length = %d: %lu objects"
7083 msgstr[0] "链长 = %d: %lu 对象"
7084 msgstr[1] "链长 = %d: %lu 对象"
7086 #: builtin/index-pack.c:1623
7087 msgid "Cannot come back to cwd"
7090 #: builtin/index-pack.c:1675 builtin/index-pack.c:1678
7091 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694
7096 #: builtin/index-pack.c:1708
7097 msgid "--fix-thin cannot be used without --stdin"
7098 msgstr "--fix-thin 不能和 --stdin 同时使用"
7100 #: builtin/index-pack.c:1712 builtin/index-pack.c:1721
7102 msgid "packfile name '%s' does not end with '.pack'"
7103 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7105 #: builtin/index-pack.c:1729
7106 msgid "--verify with no packfile name given"
7107 msgstr "--verify 没有提供包文件名参数"
7109 #: builtin/init-db.c:55
7111 msgid "cannot stat '%s'"
7112 msgstr "不能枚举 '%s' 状态"
7114 #: builtin/init-db.c:61
7116 msgid "cannot stat template '%s'"
7117 msgstr "不能枚举模版 '%s' 状态"
7119 #: builtin/init-db.c:66
7121 msgid "cannot opendir '%s'"
7122 msgstr "不能打开目录 '%s'"
7124 #: builtin/init-db.c:77
7126 msgid "cannot readlink '%s'"
7127 msgstr "不能读取链接 '%s'"
7129 #: builtin/init-db.c:79
7131 msgid "cannot symlink '%s' '%s'"
7132 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7134 #: builtin/init-db.c:85
7136 msgid "cannot copy '%s' to '%s'"
7137 msgstr "不能拷贝 '%s' 至 '%s'"
7139 #: builtin/init-db.c:89
7141 msgid "ignoring template %s"
7144 #: builtin/init-db.c:118
7146 msgid "templates not found %s"
7149 #: builtin/init-db.c:131
7151 msgid "not copying templates of a wrong format version %d from '%s'"
7152 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7154 #: builtin/init-db.c:309 builtin/init-db.c:312
7156 msgid "%s already exists"
7159 #: builtin/init-db.c:340
7161 msgid "unable to handle file type %d"
7162 msgstr "不能处理 %d 类型的文件"
7164 #: builtin/init-db.c:343
7166 msgid "unable to move %s to %s"
7167 msgstr "不能移动 %s 至 %s"
7169 #. TRANSLATORS: The first '%s' is either "Reinitialized
7170 #. existing" or "Initialized empty", the second " shared" or
7171 #. "", and the last '%s%s' is the verbatim directory name.
7172 #: builtin/init-db.c:399
7174 msgid "%s%s Git repository in %s%s\n"
7175 msgstr "%s%s Git 仓库于 %s%s\n"
7177 #: builtin/init-db.c:400
7178 msgid "Reinitialized existing"
7181 #: builtin/init-db.c:400
7182 msgid "Initialized empty"
7185 # 译者:中文字符串拼接,可删除前导空格
7186 #: builtin/init-db.c:401
7190 #: builtin/init-db.c:448
7192 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7193 "shared[=<permissions>]] [<directory>]"
7195 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7198 #: builtin/init-db.c:471
7202 #: builtin/init-db.c:472
7203 msgid "specify that the git repository is to be shared amongst several users"
7204 msgstr "指定 git 仓库是多个用户之间共享的"
7206 #: builtin/init-db.c:506 builtin/init-db.c:511
7208 msgid "cannot mkdir %s"
7211 #: builtin/init-db.c:515
7213 msgid "cannot chdir to %s"
7216 #: builtin/init-db.c:536
7219 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7221 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7223 #: builtin/init-db.c:564
7225 msgid "Cannot access work tree '%s'"
7226 msgstr "不能访问工作区 '%s'"
7228 #: builtin/interpret-trailers.c:15
7230 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7231 "<token>[(=|:)<value>])...] [<file>...]"
7232 msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件>...]"
7234 #: builtin/interpret-trailers.c:26
7235 msgid "edit files in place"
7238 #: builtin/interpret-trailers.c:27
7239 msgid "trim empty trailers"
7242 #: builtin/interpret-trailers.c:28
7246 #: builtin/interpret-trailers.c:29
7247 msgid "trailer(s) to add"
7250 #: builtin/interpret-trailers.c:42
7251 msgid "no input file given for in-place editing"
7252 msgstr "没有给出要原位编辑的文件"
7255 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7256 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7259 msgid "git show [<options>] <object>..."
7260 msgstr "git show [<选项>] <对象>..."
7264 msgid "invalid --decorate option: %s"
7265 msgstr "无效的 --decorate 选项:%s"
7267 #: builtin/log.c:131
7268 msgid "suppress diff output"
7271 #: builtin/log.c:132
7275 #: builtin/log.c:133
7276 msgid "Use mail map file"
7279 #: builtin/log.c:134
7280 msgid "decorate options"
7283 #: builtin/log.c:137
7284 msgid "Process line range n,m in file, counting from 1"
7285 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7287 #: builtin/log.c:233
7289 msgid "Final output: %d %s\n"
7290 msgstr "最终输出:%d %s\n"
7292 #: builtin/log.c:465
7294 msgid "git show %s: bad file"
7295 msgstr "git show %s: 损坏的文件"
7297 #: builtin/log.c:479 builtin/log.c:572
7299 msgid "Could not read object %s"
7302 #: builtin/log.c:596
7304 msgid "Unknown type: %d"
7307 #: builtin/log.c:715
7308 msgid "format.headers without value"
7309 msgstr "format.headers 没有值"
7311 #: builtin/log.c:801
7312 msgid "name of output directory is too long"
7315 #: builtin/log.c:816
7317 msgid "Cannot open patch file %s"
7318 msgstr "无法打开补丁文件 %s"
7320 #: builtin/log.c:830
7321 msgid "Need exactly one range."
7324 #: builtin/log.c:840
7325 msgid "Not a range."
7328 #: builtin/log.c:946
7329 msgid "Cover letter needs email format"
7332 #: builtin/log.c:1025
7334 msgid "insane in-reply-to: %s"
7335 msgstr "不正常的 in-reply-to:%s"
7337 #: builtin/log.c:1053
7338 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7339 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7341 #: builtin/log.c:1098
7342 msgid "Two output directories?"
7345 #: builtin/log.c:1214
7346 msgid "use [PATCH n/m] even with a single patch"
7347 msgstr "使用 [PATCH n/m],即使只有一个补丁"
7349 #: builtin/log.c:1217
7350 msgid "use [PATCH] even with multiple patches"
7351 msgstr "使用 [PATCH],即使有多个补丁"
7353 #: builtin/log.c:1221
7354 msgid "print patches to standard out"
7357 #: builtin/log.c:1223
7358 msgid "generate a cover letter"
7361 #: builtin/log.c:1225
7362 msgid "use simple number sequence for output file names"
7363 msgstr "使用简单的数字序列作为输出文件名"
7365 #: builtin/log.c:1226
7369 #: builtin/log.c:1227
7370 msgid "use <sfx> instead of '.patch'"
7371 msgstr "使用 <后缀> 代替 '.patch'"
7373 #: builtin/log.c:1229
7374 msgid "start numbering patches at <n> instead of 1"
7375 msgstr "补丁以 <n> 开始编号,而不是1"
7377 #: builtin/log.c:1231
7378 msgid "mark the series as Nth re-roll"
7379 msgstr "标记补丁系列是第几次重制"
7381 #: builtin/log.c:1233
7382 msgid "Use [<prefix>] instead of [PATCH]"
7383 msgstr "使用 [<前缀>] 代替 [PATCH]"
7385 #: builtin/log.c:1236
7386 msgid "store resulting files in <dir>"
7387 msgstr "把结果文件存储在 <目录>"
7389 #: builtin/log.c:1239
7390 msgid "don't strip/add [PATCH]"
7391 msgstr "不删除/添加 [PATCH]"
7393 #: builtin/log.c:1242
7394 msgid "don't output binary diffs"
7397 #: builtin/log.c:1244
7398 msgid "output all-zero hash in From header"
7399 msgstr "在 From 头信息中输出全为零的哈希值"
7401 #: builtin/log.c:1246
7402 msgid "don't include a patch matching a commit upstream"
7403 msgstr "不包含已在上游提交中的补丁"
7405 #: builtin/log.c:1248
7406 msgid "show patch format instead of default (patch + stat)"
7407 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7409 #: builtin/log.c:1250
7413 #: builtin/log.c:1251
7417 #: builtin/log.c:1252
7418 msgid "add email header"
7421 #: builtin/log.c:1253 builtin/log.c:1255
7425 #: builtin/log.c:1253
7426 msgid "add To: header"
7429 #: builtin/log.c:1255
7430 msgid "add Cc: header"
7433 #: builtin/log.c:1257
7437 #: builtin/log.c:1258
7438 msgid "set From address to <ident> (or committer ident if absent)"
7439 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7441 #: builtin/log.c:1260
7445 #: builtin/log.c:1261
7446 msgid "make first mail a reply to <message-id>"
7447 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7449 #: builtin/log.c:1262 builtin/log.c:1265
7453 #: builtin/log.c:1263
7454 msgid "attach the patch"
7457 #: builtin/log.c:1266
7458 msgid "inline the patch"
7461 #: builtin/log.c:1270
7462 msgid "enable message threading, styles: shallow, deep"
7463 msgstr "启用邮件线索,风格:浅,深"
7465 #: builtin/log.c:1272
7469 #: builtin/log.c:1273
7470 msgid "add a signature"
7473 #: builtin/log.c:1275
7474 msgid "add a signature from a file"
7477 #: builtin/log.c:1276
7478 msgid "don't print the patch filenames"
7481 #: builtin/log.c:1365
7482 msgid "-n and -k are mutually exclusive."
7483 msgstr "-n 和 -k 互斥。"
7485 #: builtin/log.c:1367
7486 msgid "--subject-prefix and -k are mutually exclusive."
7487 msgstr "--subject-prefix 和 -k 互斥。"
7489 #: builtin/log.c:1375
7490 msgid "--name-only does not make sense"
7491 msgstr "--name-only 无意义"
7493 #: builtin/log.c:1377
7494 msgid "--name-status does not make sense"
7495 msgstr "--name-status 无意义"
7497 #: builtin/log.c:1379
7498 msgid "--check does not make sense"
7499 msgstr "--check 无意义"
7501 #: builtin/log.c:1407
7502 msgid "standard output, or directory, which one?"
7503 msgstr "标准输出或目录,哪一个?"
7505 #: builtin/log.c:1409
7507 msgid "Could not create directory '%s'"
7508 msgstr "不能创建目录 '%s'"
7510 #: builtin/log.c:1506
7512 msgid "unable to read signature file '%s'"
7513 msgstr "无法读取签名文件 '%s'"
7515 #: builtin/log.c:1569
7516 msgid "Failed to create output files"
7519 #: builtin/log.c:1617
7520 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7521 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7523 #: builtin/log.c:1671
7526 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7527 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7529 #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
7531 msgid "Unknown commit %s"
7534 #: builtin/ls-files.c:378
7535 msgid "git ls-files [<options>] [<file>...]"
7536 msgstr "git ls-files [<选项>] [<文件>...]"
7538 #: builtin/ls-files.c:427
7539 msgid "identify the file status with tags"
7542 #: builtin/ls-files.c:429
7543 msgid "use lowercase letters for 'assume unchanged' files"
7544 msgstr "使用小写字母表示 '假设未改变的' 文件"
7546 #: builtin/ls-files.c:431
7547 msgid "show cached files in the output (default)"
7548 msgstr "显示缓存的文件(默认)"
7550 #: builtin/ls-files.c:433
7551 msgid "show deleted files in the output"
7554 #: builtin/ls-files.c:435
7555 msgid "show modified files in the output"
7558 #: builtin/ls-files.c:437
7559 msgid "show other files in the output"
7562 #: builtin/ls-files.c:439
7563 msgid "show ignored files in the output"
7566 #: builtin/ls-files.c:442
7567 msgid "show staged contents' object name in the output"
7568 msgstr "显示暂存区内容的对象名称"
7570 #: builtin/ls-files.c:444
7571 msgid "show files on the filesystem that need to be removed"
7572 msgstr "显示文件系统需要删除的文件"
7574 #: builtin/ls-files.c:446
7575 msgid "show 'other' directories' names only"
7576 msgstr "只显示“其他”目录的名称"
7578 #: builtin/ls-files.c:448
7579 msgid "show line endings of files"
7582 #: builtin/ls-files.c:450
7583 msgid "don't show empty directories"
7586 #: builtin/ls-files.c:453
7587 msgid "show unmerged files in the output"
7590 #: builtin/ls-files.c:455
7591 msgid "show resolve-undo information"
7592 msgstr "显示 resolve-undo 信息"
7594 #: builtin/ls-files.c:457
7595 msgid "skip files matching pattern"
7598 #: builtin/ls-files.c:460
7599 msgid "exclude patterns are read from <file>"
7600 msgstr "从 <文件> 中读取排除模式"
7602 #: builtin/ls-files.c:463
7603 msgid "read additional per-directory exclude patterns in <file>"
7604 msgstr "从 <文件> 读取额外的每个目录的排除模式"
7606 #: builtin/ls-files.c:465
7607 msgid "add the standard git exclusions"
7608 msgstr "添加标准的 git 排除"
7610 #: builtin/ls-files.c:468
7611 msgid "make the output relative to the project top directory"
7612 msgstr "显示相对于顶级目录的文件名"
7614 #: builtin/ls-files.c:471
7615 msgid "if any <file> is not in the index, treat this as an error"
7616 msgstr "如果任何 <文件> 都不在索引区,视为错误"
7618 #: builtin/ls-files.c:472
7622 #: builtin/ls-files.c:473
7623 msgid "pretend that paths removed since <tree-ish> are still present"
7624 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7626 #: builtin/ls-files.c:475
7627 msgid "show debugging data"
7630 #: builtin/ls-remote.c:7
7632 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7633 " [-q | --quiet] [--exit-code] [--get-url]\n"
7634 " [--symref] [<repository> [<refs>...]]"
7636 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7637 " [-q | --quiet] [--exit-code] [--get-url]\n"
7638 " [--symref] [<仓库> [<引用>...]]"
7640 #: builtin/ls-remote.c:50
7641 msgid "do not print remote URL"
7644 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7648 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7649 msgid "path of git-upload-pack on the remote host"
7650 msgstr "远程主机上的 git-upload-pack 路径"
7652 #: builtin/ls-remote.c:56
7653 msgid "limit to tags"
7656 #: builtin/ls-remote.c:57
7657 msgid "limit to heads"
7660 #: builtin/ls-remote.c:58
7661 msgid "do not show peeled tags"
7664 #: builtin/ls-remote.c:60
7665 msgid "take url.<base>.insteadOf into account"
7666 msgstr "参考 url.<base>.insteadOf 设置"
7668 #: builtin/ls-remote.c:62
7669 msgid "exit with exit code 2 if no matching refs are found"
7670 msgstr "若未找到匹配的引用则以退出码2退出"
7672 #: builtin/ls-remote.c:64
7673 msgid "show underlying ref in addition to the object pointed by it"
7674 msgstr "除了显示指向的对象外,显示指向的引用名"
7676 #: builtin/ls-tree.c:28
7677 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7678 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7680 #: builtin/ls-tree.c:128
7681 msgid "only show trees"
7684 #: builtin/ls-tree.c:130
7685 msgid "recurse into subtrees"
7688 #: builtin/ls-tree.c:132
7689 msgid "show trees when recursing"
7692 #: builtin/ls-tree.c:135
7693 msgid "terminate entries with NUL byte"
7694 msgstr "条目以 NUL 字符终止"
7696 #: builtin/ls-tree.c:136
7697 msgid "include object size"
7700 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7701 msgid "list only filenames"
7704 #: builtin/ls-tree.c:143
7705 msgid "use full path names"
7708 #: builtin/ls-tree.c:145
7709 msgid "list entire tree; not just current directory (implies --full-name)"
7710 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7712 #: builtin/merge.c:45
7713 msgid "git merge [<options>] [<commit>...]"
7714 msgstr "git merge [<选项>] [<提交>...]"
7716 #: builtin/merge.c:46
7717 msgid "git merge [<options>] <msg> HEAD <commit>"
7718 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7720 #: builtin/merge.c:47
7721 msgid "git merge --abort"
7722 msgstr "git merge --abort"
7724 #: builtin/merge.c:100
7725 msgid "switch `m' requires a value"
7726 msgstr "开关 `m' 需要一个值"
7728 #: builtin/merge.c:137
7730 msgid "Could not find merge strategy '%s'.\n"
7731 msgstr "不能找到合并策略 '%s'。\n"
7733 #: builtin/merge.c:138
7735 msgid "Available strategies are:"
7738 #: builtin/merge.c:143
7740 msgid "Available custom strategies are:"
7743 #: builtin/merge.c:193 builtin/pull.c:123
7744 msgid "do not show a diffstat at the end of the merge"
7745 msgstr "在合并的最后不显示差异统计"
7747 #: builtin/merge.c:196 builtin/pull.c:126
7748 msgid "show a diffstat at the end of the merge"
7749 msgstr "在合并的最后显示差异统计"
7751 #: builtin/merge.c:197 builtin/pull.c:129
7752 msgid "(synonym to --stat)"
7753 msgstr "(和 --stat 同义)"
7755 #: builtin/merge.c:199 builtin/pull.c:132
7756 msgid "add (at most <n>) entries from shortlog to merge commit message"
7757 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7759 #: builtin/merge.c:202 builtin/pull.c:135
7760 msgid "create a single commit instead of doing a merge"
7761 msgstr "创建一个单独的提交而不是做一次合并"
7763 #: builtin/merge.c:204 builtin/pull.c:138
7764 msgid "perform a commit if the merge succeeds (default)"
7765 msgstr "如果合并成功,执行一次提交(默认)"
7767 #: builtin/merge.c:206 builtin/pull.c:141
7768 msgid "edit message before committing"
7771 #: builtin/merge.c:207
7772 msgid "allow fast-forward (default)"
7775 #: builtin/merge.c:209 builtin/pull.c:147
7776 msgid "abort if fast-forward is not possible"
7777 msgstr "如果不能快进就放弃合并"
7779 #: builtin/merge.c:213
7780 msgid "Verify that the named commit has a valid GPG signature"
7781 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7783 #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
7784 #: builtin/revert.c:89
7788 #: builtin/merge.c:215 builtin/pull.c:153
7789 msgid "merge strategy to use"
7792 #: builtin/merge.c:216 builtin/pull.c:156
7793 msgid "option=value"
7794 msgstr "option=value"
7796 #: builtin/merge.c:217 builtin/pull.c:157
7797 msgid "option for selected merge strategy"
7800 #: builtin/merge.c:219
7801 msgid "merge commit message (for a non-fast-forward merge)"
7802 msgstr "合并的提交说明(针对非快进式合并)"
7804 #: builtin/merge.c:223
7805 msgid "abort the current in-progress merge"
7806 msgstr "放弃当前正在进行的合并"
7808 #: builtin/merge.c:251
7809 msgid "could not run stash."
7812 #: builtin/merge.c:256
7813 msgid "stash failed"
7816 #: builtin/merge.c:261
7818 msgid "not a valid object: %s"
7819 msgstr "不是一个有效对象:%s"
7821 #: builtin/merge.c:280 builtin/merge.c:297
7822 msgid "read-tree failed"
7826 #: builtin/merge.c:327
7827 msgid " (nothing to squash)"
7830 #: builtin/merge.c:340
7832 msgid "Squash commit -- not updating HEAD\n"
7833 msgstr "压缩提交 -- 未更新 HEAD\n"
7835 #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7836 #: builtin/merge.c:989
7838 msgid "Could not write to '%s'"
7841 #: builtin/merge.c:372
7842 msgid "Writing SQUASH_MSG"
7843 msgstr "写入 SQUASH_MSG"
7845 #: builtin/merge.c:374
7846 msgid "Finishing SQUASH_MSG"
7847 msgstr "完成 SQUASH_MSG"
7849 #: builtin/merge.c:397
7851 msgid "No merge message -- not updating HEAD\n"
7852 msgstr "无合并信息 -- 未更新 HEAD\n"
7854 #: builtin/merge.c:448
7856 msgid "'%s' does not point to a commit"
7857 msgstr "'%s' 没有指向一个提交"
7859 #: builtin/merge.c:538
7861 msgid "Bad branch.%s.mergeoptions string: %s"
7862 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7864 #: builtin/merge.c:657
7865 msgid "Not handling anything other than two heads merge."
7866 msgstr "不能处理两个头合并之外的任何操作。"
7868 #: builtin/merge.c:671
7870 msgid "Unknown option for merge-recursive: -X%s"
7871 msgstr "merge-recursive 的未知选项:-X%s"
7873 #: builtin/merge.c:684
7875 msgid "unable to write %s"
7878 #: builtin/merge.c:773
7880 msgid "Could not read from '%s'"
7881 msgstr "不能从 '%s' 读取"
7883 #: builtin/merge.c:782
7885 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7886 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7888 #: builtin/merge.c:788
7891 "Please enter a commit message to explain why this merge is necessary,\n"
7892 "especially if it merges an updated upstream into a topic branch.\n"
7894 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7897 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7900 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
7902 #: builtin/merge.c:812
7903 msgid "Empty commit message."
7906 #: builtin/merge.c:824
7908 msgid "Wonderful.\n"
7911 #: builtin/merge.c:879
7913 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7914 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7916 #: builtin/merge.c:895
7918 msgid "'%s' is not a commit"
7919 msgstr "'%s' 不是一个提交"
7921 #: builtin/merge.c:936
7922 msgid "No current branch."
7925 #: builtin/merge.c:938
7926 msgid "No remote for the current branch."
7927 msgstr "当前分支没有对应的远程仓库。"
7929 #: builtin/merge.c:940
7930 msgid "No default upstream defined for the current branch."
7931 msgstr "当前分支没有定义默认的上游分支。"
7933 #: builtin/merge.c:945
7935 msgid "No remote-tracking branch for %s from %s"
7936 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
7938 #: builtin/merge.c:1080
7940 msgid "could not close '%s'"
7943 #: builtin/merge.c:1207
7944 msgid "There is no merge to abort (MERGE_HEAD missing)."
7945 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
7947 #: builtin/merge.c:1223
7949 "You have not concluded your merge (MERGE_HEAD exists).\n"
7950 "Please, commit your changes before you merge."
7952 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
7955 #: builtin/merge.c:1230
7957 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
7958 "Please, commit your changes before you merge."
7960 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
7963 #: builtin/merge.c:1233
7964 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7965 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7967 #: builtin/merge.c:1242
7968 msgid "You cannot combine --squash with --no-ff."
7969 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
7971 #: builtin/merge.c:1250
7972 msgid "No commit specified and merge.defaultToUpstream not set."
7973 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
7975 #: builtin/merge.c:1267
7976 msgid "Squash commit into empty head not supported yet"
7977 msgstr "尚不支持到空分支的压缩提交"
7979 #: builtin/merge.c:1269
7980 msgid "Non-fast-forward commit does not make sense into an empty head"
7981 msgstr "到空分支的非快进式提交没有意义"
7983 #: builtin/merge.c:1275
7985 msgid "%s - not something we can merge"
7988 #: builtin/merge.c:1277
7989 msgid "Can merge only exactly one commit into empty head"
7990 msgstr "只能将一个提交合并到空分支上"
7992 #: builtin/merge.c:1332
7994 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7995 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7997 #: builtin/merge.c:1335
7999 msgid "Commit %s has a bad GPG signature allegedly by %s."
8000 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8002 #: builtin/merge.c:1338
8004 msgid "Commit %s does not have a GPG signature."
8005 msgstr "提交 %s 没有一个 GPG 签名。"
8007 #: builtin/merge.c:1341
8009 msgid "Commit %s has a good GPG signature by %s\n"
8010 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8012 #: builtin/merge.c:1424
8014 msgid "Updating %s..%s\n"
8015 msgstr "更新 %s..%s\n"
8017 #: builtin/merge.c:1461
8019 msgid "Trying really trivial in-index merge...\n"
8020 msgstr "尝试非常小的索引内合并...\n"
8022 #: builtin/merge.c:1468
8027 #: builtin/merge.c:1500
8028 msgid "Not possible to fast-forward, aborting."
8031 #: builtin/merge.c:1523 builtin/merge.c:1602
8033 msgid "Rewinding the tree to pristine...\n"
8034 msgstr "将树回滚至原始状态...\n"
8036 #: builtin/merge.c:1527
8038 msgid "Trying merge strategy %s...\n"
8039 msgstr "尝试合并策略 %s...\n"
8041 #: builtin/merge.c:1593
8043 msgid "No merge strategy handled the merge.\n"
8044 msgstr "没有合并策略处理此合并。\n"
8046 #: builtin/merge.c:1595
8048 msgid "Merge with strategy %s failed.\n"
8049 msgstr "使用策略 %s 合并失败。\n"
8051 #: builtin/merge.c:1604
8053 msgid "Using the %s to prepare resolving by hand.\n"
8054 msgstr "使用 %s 以准备手工解决。\n"
8056 #: builtin/merge.c:1616
8058 msgid "Automatic merge went well; stopped before committing as requested\n"
8059 msgstr "自动合并进展顺利,按要求在提交前停止\n"
8061 #: builtin/merge-base.c:29
8062 msgid "git merge-base [-a | --all] <commit> <commit>..."
8063 msgstr "git merge-base [-a | --all] <提交> <提交>..."
8065 #: builtin/merge-base.c:30
8066 msgid "git merge-base [-a | --all] --octopus <commit>..."
8067 msgstr "git merge-base [-a | --all] --octopus <提交>..."
8069 #: builtin/merge-base.c:31
8070 msgid "git merge-base --independent <commit>..."
8071 msgstr "git merge-base --independent <提交>..."
8073 #: builtin/merge-base.c:32
8074 msgid "git merge-base --is-ancestor <commit> <commit>"
8075 msgstr "git merge-base --is-ancestor <提交> <提交>"
8077 #: builtin/merge-base.c:33
8078 msgid "git merge-base --fork-point <ref> [<commit>]"
8079 msgstr "git merge-base --fork-point <引用> [<提交>]"
8081 #: builtin/merge-base.c:214
8082 msgid "output all common ancestors"
8085 #: builtin/merge-base.c:216
8086 msgid "find ancestors for a single n-way merge"
8087 msgstr "查找一个多路合并的祖先提交"
8089 #: builtin/merge-base.c:218
8090 msgid "list revs not reachable from others"
8091 msgstr "显示不能被其他访问到的版本"
8093 #: builtin/merge-base.c:220
8094 msgid "is the first one ancestor of the other?"
8095 msgstr "第一个是其他的祖先提交么?"
8097 #: builtin/merge-base.c:222
8098 msgid "find where <commit> forked from reflog of <ref>"
8099 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8101 #: builtin/merge-file.c:8
8103 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8104 "<orig-file> <file2>"
8106 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8109 #: builtin/merge-file.c:33
8110 msgid "send results to standard output"
8113 #: builtin/merge-file.c:34
8114 msgid "use a diff3 based merge"
8115 msgstr "使用基于 diff3 的合并"
8117 #: builtin/merge-file.c:35
8118 msgid "for conflicts, use our version"
8119 msgstr "如果冲突,使用我们的版本"
8121 #: builtin/merge-file.c:37
8122 msgid "for conflicts, use their version"
8123 msgstr "如果冲突,使用他们的版本"
8125 #: builtin/merge-file.c:39
8126 msgid "for conflicts, use a union version"
8127 msgstr "如果冲突,使用联合版本"
8129 #: builtin/merge-file.c:42
8130 msgid "for conflicts, use this marker size"
8131 msgstr "如果冲突,使用指定长度的标记"
8133 #: builtin/merge-file.c:43
8134 msgid "do not warn about conflicts"
8137 #: builtin/merge-file.c:45
8138 msgid "set labels for file1/orig-file/file2"
8139 msgstr "为 文件1/初始文件/文件2 设置标签"
8141 #: builtin/mktree.c:65
8142 msgid "git mktree [-z] [--missing] [--batch]"
8143 msgstr "git mktree [-z] [--missing] [--batch]"
8145 #: builtin/mktree.c:152
8146 msgid "input is NUL terminated"
8147 msgstr "输入以 NUL 字符终止"
8149 #: builtin/mktree.c:153 builtin/write-tree.c:24
8150 msgid "allow missing objects"
8153 #: builtin/mktree.c:154
8154 msgid "allow creation of more than one tree"
8158 msgid "git mv [<options>] <source>... <destination>"
8159 msgstr "git mv [<选项>] <源>... <目标>"
8163 msgid "Directory %s is in index and no submodule?"
8164 msgstr "目录 %s 在索引中并且不是子模组?"
8167 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8168 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8172 msgid "%.*s is in index"
8176 msgid "force move/rename even if target exists"
8177 msgstr "强制移动/重命令,即使目标存在"
8180 msgid "skip move/rename errors"
8185 msgid "destination '%s' is not a directory"
8186 msgstr "目标 '%s' 不是一个目录"
8190 msgid "Checking rename of '%s' to '%s'\n"
8191 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8198 msgid "can not move directory into itself"
8202 msgid "cannot move directory over file"
8206 msgid "source directory is empty"
8210 msgid "not under version control"
8214 msgid "destination exists"
8219 msgid "overwriting '%s'"
8223 msgid "Cannot overwrite"
8227 msgid "multiple sources for the same target"
8231 msgid "destination directory does not exist"
8236 msgid "%s, source=%s, destination=%s"
8237 msgstr "%s,源=%s,目标=%s"
8241 msgid "Renaming %s to %s\n"
8242 msgstr "重命名 %s 至 %s\n"
8244 #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
8246 msgid "renaming '%s' failed"
8247 msgstr "重命名 '%s' 失败"
8249 #: builtin/name-rev.c:251
8250 msgid "git name-rev [<options>] <commit>..."
8251 msgstr "git name-rev [<选项>] <提交>..."
8253 #: builtin/name-rev.c:252
8254 msgid "git name-rev [<options>] --all"
8255 msgstr "git name-rev [<选项>] --all"
8257 #: builtin/name-rev.c:253
8258 msgid "git name-rev [<options>] --stdin"
8259 msgstr "git name-rev [<选项>] --stdin"
8261 #: builtin/name-rev.c:305
8262 msgid "print only names (no SHA-1)"
8263 msgstr "只打印名称(无 SHA-1)"
8265 #: builtin/name-rev.c:306
8266 msgid "only use tags to name the commits"
8269 #: builtin/name-rev.c:308
8270 msgid "only use refs matching <pattern>"
8271 msgstr "只使用和 <模式> 相匹配的引用"
8273 #: builtin/name-rev.c:310
8274 msgid "list all commits reachable from all refs"
8275 msgstr "列出可以从所有引用访问的提交"
8277 #: builtin/name-rev.c:311
8278 msgid "read from stdin"
8281 #: builtin/name-rev.c:312
8282 msgid "allow to print `undefined` names (default)"
8283 msgstr "允许打印 `未定义` 的名称(默认)"
8285 #: builtin/name-rev.c:318
8286 msgid "dereference tags in the input (internal use)"
8287 msgstr "反向解析输入中的标签(内部使用)"
8289 #: builtin/notes.c:25
8290 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8291 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8293 #: builtin/notes.c:26
8295 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8296 "| (-c | -C) <object>] [<object>]"
8298 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8299 "| (-c | -C) <对象>] [<对象>]"
8301 #: builtin/notes.c:27
8302 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8303 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8305 #: builtin/notes.c:28
8307 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8308 "(-c | -C) <object>] [<object>]"
8310 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8311 "(-c | -C) <对象>] [<对象>]"
8313 #: builtin/notes.c:29
8314 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8315 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8317 #: builtin/notes.c:30
8318 msgid "git notes [--ref <notes-ref>] show [<object>]"
8319 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8321 #: builtin/notes.c:31
8323 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8324 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8326 #: builtin/notes.c:32
8327 msgid "git notes merge --commit [-v | -q]"
8328 msgstr "git notes merge --commit [-v | -q]"
8330 #: builtin/notes.c:33
8331 msgid "git notes merge --abort [-v | -q]"
8332 msgstr "git notes merge --abort [-v | -q]"
8334 #: builtin/notes.c:34
8335 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8336 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8338 #: builtin/notes.c:35
8339 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8340 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8342 #: builtin/notes.c:36
8343 msgid "git notes [--ref <notes-ref>] get-ref"
8344 msgstr "git notes [--ref <注解引用>] get-ref"
8346 #: builtin/notes.c:41
8347 msgid "git notes [list [<object>]]"
8348 msgstr "git notes [list [<对象>]]"
8350 #: builtin/notes.c:46
8351 msgid "git notes add [<options>] [<object>]"
8352 msgstr "git notes add [<选项>] [<对象>]"
8354 #: builtin/notes.c:51
8355 msgid "git notes copy [<options>] <from-object> <to-object>"
8356 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8358 #: builtin/notes.c:52
8359 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8360 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8362 #: builtin/notes.c:57
8363 msgid "git notes append [<options>] [<object>]"
8364 msgstr "git notes append [<选项>] [<对象>]"
8366 #: builtin/notes.c:62
8367 msgid "git notes edit [<object>]"
8368 msgstr "git notes edit [<对象>]"
8370 #: builtin/notes.c:67
8371 msgid "git notes show [<object>]"
8372 msgstr "git notes show [<对象>]"
8374 #: builtin/notes.c:72
8375 msgid "git notes merge [<options>] <notes-ref>"
8376 msgstr "git notes merge [<选项>] <注解引用>"
8378 #: builtin/notes.c:73
8379 msgid "git notes merge --commit [<options>]"
8380 msgstr "git notes merge --commit [<选项>]"
8382 #: builtin/notes.c:74
8383 msgid "git notes merge --abort [<options>]"
8384 msgstr "git notes merge --abort [<选项>]"
8386 #: builtin/notes.c:79
8387 msgid "git notes remove [<object>]"
8388 msgstr "git notes remove [<对象>]"
8390 #: builtin/notes.c:84
8391 msgid "git notes prune [<options>]"
8392 msgstr "git notes prune [<选项>]"
8394 #: builtin/notes.c:89
8395 msgid "git notes get-ref"
8396 msgstr "git notes get-ref"
8398 #: builtin/notes.c:147
8400 msgid "unable to start 'show' for object '%s'"
8401 msgstr "不能为对象 '%s' 开始 'show'"
8403 #: builtin/notes.c:151
8404 msgid "could not read 'show' output"
8405 msgstr "不能读取 'show' 的输出"
8407 #: builtin/notes.c:159
8409 msgid "failed to finish 'show' for object '%s'"
8410 msgstr "无法为对象 '%s' 完成 'show'"
8412 #: builtin/notes.c:174 builtin/tag.c:248
8414 msgid "could not create file '%s'"
8415 msgstr "不能创建文件 '%s'"
8417 #: builtin/notes.c:193
8418 msgid "Please supply the note contents using either -m or -F option"
8419 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8421 #: builtin/notes.c:202
8422 msgid "unable to write note object"
8425 #: builtin/notes.c:204
8427 msgid "The note contents have been left in %s"
8428 msgstr "注解内容被留在 %s 中"
8430 #: builtin/notes.c:232 builtin/tag.c:440
8432 msgid "cannot read '%s'"
8435 #: builtin/notes.c:234 builtin/tag.c:443
8437 msgid "could not open or read '%s'"
8438 msgstr "不能打开或读取 '%s'"
8440 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8441 #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8442 #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8443 #: builtin/notes.c:880 builtin/tag.c:456
8445 msgid "Failed to resolve '%s' as a valid ref."
8446 msgstr "无法解析 '%s' 为一个有效引用。"
8448 #: builtin/notes.c:256
8450 msgid "Failed to read object '%s'."
8451 msgstr "无法读取对象 '%s'。"
8453 #: builtin/notes.c:260
8455 msgid "Cannot read note data from non-blob object '%s'."
8456 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8458 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8459 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8460 #: builtin/notes.c:945
8461 msgid "too many parameters"
8464 #: builtin/notes.c:375 builtin/notes.c:662
8466 msgid "No note found for object %s."
8467 msgstr "未发现对象 %s 的注解。"
8469 #: builtin/notes.c:396 builtin/notes.c:559
8470 msgid "note contents as a string"
8471 msgstr "注解内容作为一个字符串"
8473 #: builtin/notes.c:399 builtin/notes.c:562
8474 msgid "note contents in a file"
8477 #: builtin/notes.c:402 builtin/notes.c:565
8478 msgid "reuse and edit specified note object"
8479 msgstr "重用和编辑指定的注解对象"
8481 #: builtin/notes.c:405 builtin/notes.c:568
8482 msgid "reuse specified note object"
8485 #: builtin/notes.c:408 builtin/notes.c:571
8486 msgid "allow storing empty note"
8489 #: builtin/notes.c:409 builtin/notes.c:480
8490 msgid "replace existing notes"
8493 #: builtin/notes.c:434
8496 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8498 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8500 #: builtin/notes.c:449 builtin/notes.c:528
8502 msgid "Overwriting existing notes for object %s\n"
8503 msgstr "覆盖对象 %s 现存注解\n"
8505 #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
8507 msgid "Removing note for object %s\n"
8508 msgstr "删除对象 %s 的注解\n"
8510 #: builtin/notes.c:481
8511 msgid "read objects from stdin"
8514 #: builtin/notes.c:483
8515 msgid "load rewriting config for <command> (implies --stdin)"
8516 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8518 #: builtin/notes.c:501
8519 msgid "too few parameters"
8522 #: builtin/notes.c:522
8525 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8527 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8529 #: builtin/notes.c:534
8531 msgid "Missing notes on source object %s. Cannot copy."
8532 msgstr "源对象 %s 缺少注解。不能拷贝。"
8534 #: builtin/notes.c:586
8537 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8538 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8540 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8541 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8543 #: builtin/notes.c:767
8544 msgid "General options"
8547 #: builtin/notes.c:769
8548 msgid "Merge options"
8551 #: builtin/notes.c:771
8553 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8555 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8557 #: builtin/notes.c:773
8558 msgid "Committing unmerged notes"
8561 #: builtin/notes.c:775
8562 msgid "finalize notes merge by committing unmerged notes"
8563 msgstr "通过提交未合并的注解来完成注解合并"
8565 #: builtin/notes.c:777
8566 msgid "Aborting notes merge resolution"
8569 #: builtin/notes.c:779
8570 msgid "abort notes merge"
8573 #: builtin/notes.c:856
8575 msgid "A notes merge into %s is already in-progress at %s"
8576 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8578 #: builtin/notes.c:883
8580 msgid "Object %s has no note\n"
8581 msgstr "对象 %s 没有注解\n"
8583 #: builtin/notes.c:895
8584 msgid "attempt to remove non-existent note is not an error"
8585 msgstr "尝试删除不存在的注解不是一个错误"
8587 #: builtin/notes.c:898
8588 msgid "read object names from the standard input"
8589 msgstr "从标准输入读取对象名称"
8591 #: builtin/notes.c:979
8595 #: builtin/notes.c:980
8596 msgid "use notes from <notes-ref>"
8597 msgstr "从 <注解引用> 使用注解"
8599 #: builtin/notes.c:1015 builtin/remote.c:1626
8601 msgid "Unknown subcommand: %s"
8604 #: builtin/pack-objects.c:28
8606 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8607 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8609 #: builtin/pack-objects.c:29
8611 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8612 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8614 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8616 msgid "deflate error (%d)"
8619 #: builtin/pack-objects.c:772
8620 msgid "Writing objects"
8623 #: builtin/pack-objects.c:1012
8624 msgid "disabling bitmap writing, as some objects are not being packed"
8625 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8627 #: builtin/pack-objects.c:2172
8628 msgid "Compressing objects"
8631 #: builtin/pack-objects.c:2558
8633 msgid "unsupported index version %s"
8634 msgstr "不支持的索引版本 %s"
8636 #: builtin/pack-objects.c:2562
8638 msgid "bad index version '%s'"
8639 msgstr "坏的索引版本 '%s'"
8641 #: builtin/pack-objects.c:2592
8642 msgid "do not show progress meter"
8645 #: builtin/pack-objects.c:2594
8646 msgid "show progress meter"
8649 #: builtin/pack-objects.c:2596
8650 msgid "show progress meter during object writing phase"
8651 msgstr "在对象写入阶段显示进度表"
8653 #: builtin/pack-objects.c:2599
8654 msgid "similar to --all-progress when progress meter is shown"
8655 msgstr "当进度表显示时类似于 --all-progress"
8657 #: builtin/pack-objects.c:2600
8658 msgid "version[,offset]"
8661 #: builtin/pack-objects.c:2601
8662 msgid "write the pack index file in the specified idx format version"
8663 msgstr "用指定的 idx 格式版本来写包索引文件"
8665 #: builtin/pack-objects.c:2604
8666 msgid "maximum size of each output pack file"
8669 #: builtin/pack-objects.c:2606
8670 msgid "ignore borrowed objects from alternate object store"
8671 msgstr "忽略从备用对象存储里借用对象"
8673 #: builtin/pack-objects.c:2608
8674 msgid "ignore packed objects"
8677 #: builtin/pack-objects.c:2610
8678 msgid "limit pack window by objects"
8681 #: builtin/pack-objects.c:2612
8682 msgid "limit pack window by memory in addition to object limit"
8683 msgstr "除对象数量限制外设置打包窗口的内存限制"
8685 #: builtin/pack-objects.c:2614
8686 msgid "maximum length of delta chain allowed in the resulting pack"
8687 msgstr "打包允许的 delta 链的最大长度"
8689 #: builtin/pack-objects.c:2616
8690 msgid "reuse existing deltas"
8691 msgstr "重用已存在的 deltas"
8693 #: builtin/pack-objects.c:2618
8694 msgid "reuse existing objects"
8697 #: builtin/pack-objects.c:2620
8698 msgid "use OFS_DELTA objects"
8699 msgstr "使用 OFS_DELTA 对象"
8701 #: builtin/pack-objects.c:2622
8702 msgid "use threads when searching for best delta matches"
8703 msgstr "使用线程查询最佳 delta 匹配"
8705 #: builtin/pack-objects.c:2624
8706 msgid "do not create an empty pack output"
8709 #: builtin/pack-objects.c:2626
8710 msgid "read revision arguments from standard input"
8711 msgstr "从标准输入读取版本号参数"
8713 #: builtin/pack-objects.c:2628
8714 msgid "limit the objects to those that are not yet packed"
8715 msgstr "限制那些尚未打包的对象"
8717 #: builtin/pack-objects.c:2631
8718 msgid "include objects reachable from any reference"
8719 msgstr "包括可以从任何引用访问到的对象"
8721 #: builtin/pack-objects.c:2634
8722 msgid "include objects referred by reflog entries"
8723 msgstr "包括被引用日志引用到的对象"
8725 #: builtin/pack-objects.c:2637
8726 msgid "include objects referred to by the index"
8727 msgstr "包括被索引引用到的对象"
8729 #: builtin/pack-objects.c:2640
8730 msgid "output pack to stdout"
8733 #: builtin/pack-objects.c:2642
8734 msgid "include tag objects that refer to objects to be packed"
8735 msgstr "包括那些引用了待打包对象的标签对象"
8737 #: builtin/pack-objects.c:2644
8738 msgid "keep unreachable objects"
8741 #: builtin/pack-objects.c:2645 parse-options.h:142
8745 #: builtin/pack-objects.c:2646
8746 msgid "unpack unreachable objects newer than <time>"
8747 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8749 #: builtin/pack-objects.c:2649
8750 msgid "create thin packs"
8753 #: builtin/pack-objects.c:2651
8754 msgid "create packs suitable for shallow fetches"
8755 msgstr "创建适合浅克隆仓库获取的包"
8757 #: builtin/pack-objects.c:2653
8758 msgid "ignore packs that have companion .keep file"
8759 msgstr "忽略配有 .keep 文件的包"
8761 #: builtin/pack-objects.c:2655
8762 msgid "pack compression level"
8765 #: builtin/pack-objects.c:2657
8766 msgid "do not hide commits by grafts"
8769 #: builtin/pack-objects.c:2659
8770 msgid "use a bitmap index if available to speed up counting objects"
8771 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8773 #: builtin/pack-objects.c:2661
8774 msgid "write a bitmap index together with the pack index"
8775 msgstr "在建立包索引的同时创建 bitmap 索引"
8777 #: builtin/pack-objects.c:2752
8778 msgid "Counting objects"
8781 #: builtin/pack-refs.c:6
8782 msgid "git pack-refs [<options>]"
8783 msgstr "git pack-refs [<选项>]"
8785 #: builtin/pack-refs.c:14
8786 msgid "pack everything"
8789 #: builtin/pack-refs.c:15
8790 msgid "prune loose refs (default)"
8791 msgstr "清除松散的引用(默认)"
8793 #: builtin/prune-packed.c:7
8794 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8795 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8797 #: builtin/prune-packed.c:40
8798 msgid "Removing duplicate objects"
8801 #: builtin/prune.c:11
8802 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8803 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8805 #: builtin/prune.c:105 builtin/worktree.c:124
8806 msgid "do not remove, show only"
8809 #: builtin/prune.c:106 builtin/worktree.c:125
8810 msgid "report pruned objects"
8813 #: builtin/prune.c:109 builtin/worktree.c:127
8814 msgid "expire objects older than <time>"
8815 msgstr "使早于给定时间的对象过期"
8817 #: builtin/prune.c:123
8818 msgid "cannot prune in a precious-objects repo"
8819 msgstr "不能在珍品仓库中执行清理操作"
8821 #: builtin/pull.c:72
8822 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8823 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8825 #: builtin/pull.c:117
8826 msgid "Options related to merging"
8829 #: builtin/pull.c:120
8830 msgid "incorporate changes by rebasing rather than merging"
8831 msgstr "使用变基操作取代合并操作以合入修改"
8833 #: builtin/pull.c:144 builtin/revert.c:105
8834 msgid "allow fast-forward"
8837 #: builtin/pull.c:150
8838 msgid "verify that the named commit has a valid GPG signature"
8839 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8841 #: builtin/pull.c:164
8842 msgid "Options related to fetching"
8845 #: builtin/pull.c:186
8846 msgid "number of submodules pulled in parallel"
8847 msgstr "并发拉取的子模组的数量"
8849 #: builtin/pull.c:275
8851 msgid "Invalid value for pull.ff: %s"
8852 msgstr "pull.ff 的取值无效:%s"
8854 #: builtin/pull.c:359
8855 msgid "Cannot pull with rebase: You have unstaged changes."
8856 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8858 #: builtin/pull.c:365
8859 msgid "Additionally, your index contains uncommitted changes."
8860 msgstr "而且您的索引中包含未提交的变更。"
8862 #: builtin/pull.c:367
8863 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8864 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8866 #: builtin/pull.c:443
8868 "There is no candidate for rebasing against among the refs that you just "
8870 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8872 #: builtin/pull.c:445
8874 "There are no candidates for merging among the refs that you just fetched."
8875 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8877 #: builtin/pull.c:446
8879 "Generally this means that you provided a wildcard refspec which had no\n"
8880 "matches on the remote end."
8881 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8883 #: builtin/pull.c:449
8886 "You asked to pull from the remote '%s', but did not specify\n"
8887 "a branch. Because this is not the default configured remote\n"
8888 "for your current branch, you must specify a branch on the command line."
8890 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8891 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8893 #: builtin/pull.c:454
8894 msgid "You are not currently on a branch."
8895 msgstr "您当前不在一个分支上。"
8897 #: builtin/pull.c:456 builtin/pull.c:471
8898 msgid "Please specify which branch you want to rebase against."
8899 msgstr "请指定您要变基到哪一个分支。"
8901 #: builtin/pull.c:458 builtin/pull.c:473
8902 msgid "Please specify which branch you want to merge with."
8903 msgstr "请指定您要合并哪一个分支。"
8905 #: builtin/pull.c:459 builtin/pull.c:474
8906 msgid "See git-pull(1) for details."
8907 msgstr "详见 git-pull(1)。"
8909 #: builtin/pull.c:469
8910 msgid "There is no tracking information for the current branch."
8911 msgstr "当前分支没有跟踪信息。"
8913 #: builtin/pull.c:478
8916 "If you wish to set tracking information for this branch you can do so with:\n"
8918 " git branch --set-upstream-to=%s/<branch> %s\n"
8920 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
8922 " git branch --set-upstream-to=%s/<branch> %s\n"
8924 #: builtin/pull.c:483
8927 "Your configuration specifies to merge with the ref '%s'\n"
8928 "from the remote, but no such ref was fetched."
8930 "您的配置中指定要合并远程的引用 '%s',\n"
8933 #: builtin/pull.c:841
8934 msgid "Updating an unborn branch with changes added to the index."
8935 msgstr "更新尚未诞生的分支,变更添加至索引。"
8937 #: builtin/pull.c:870
8940 "fetch updated the current branch head.\n"
8941 "fast-forwarding your working tree from\n"
8944 "fetch 更新了当前的分支。快进您的工作区\n"
8947 #: builtin/pull.c:875
8950 "Cannot fast-forward your working tree.\n"
8951 "After making sure that you saved anything precious from\n"
8954 "$ git reset --hard\n"
8957 "您当前的工作区无法执行快进操作。\n"
8960 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
8961 "$ git reset --hard\n"
8964 #: builtin/pull.c:890
8965 msgid "Cannot merge multiple branches into empty head."
8966 msgstr "无法将多个分支合并到空分支。"
8968 #: builtin/pull.c:894
8969 msgid "Cannot rebase onto multiple branches."
8972 #: builtin/push.c:16
8973 msgid "git push [<options>] [<repository> [<refspec>...]]"
8974 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
8976 #: builtin/push.c:89
8977 msgid "tag shorthand without <tag>"
8978 msgstr "标签后面未提供 <标签> 参数"
8980 #: builtin/push.c:99
8981 msgid "--delete only accepts plain target ref names"
8982 msgstr "--delete 只接受简单的目标引用名"
8984 #: builtin/push.c:143
8987 "To choose either option permanently, see push.default in 'git help config'."
8990 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8992 #: builtin/push.c:146
8995 "The upstream branch of your current branch does not match\n"
8996 "the name of your current branch. To push to the upstream branch\n"
8997 "on the remote, use\n"
8999 " git push %s HEAD:%s\n"
9001 "To push to the branch of the same name on the remote, use\n"
9006 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9009 " git push %s HEAD:%s\n"
9016 #: builtin/push.c:161
9019 "You are not currently on a branch.\n"
9020 "To push the history leading to the current (detached HEAD)\n"
9023 " git push %s HEAD:<name-of-remote-branch>\n"
9026 "现在为推送当前(分离头指针)的历史,使用\n"
9028 " git push %s HEAD:<远程分支名字>\n"
9030 #: builtin/push.c:175
9033 "The current branch %s has no upstream branch.\n"
9034 "To push the current branch and set the remote as upstream, use\n"
9036 " git push --set-upstream %s %s\n"
9038 "当前分支 %s 没有对应的上游分支。\n"
9039 "为推送当前分支并建立与远程上游的跟踪,使用\n"
9041 " git push --set-upstream %s %s\n"
9043 #: builtin/push.c:183
9045 msgid "The current branch %s has multiple upstream branches, refusing to push."
9046 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9048 #: builtin/push.c:186
9051 "You are pushing to remote '%s', which is not the upstream of\n"
9052 "your current branch '%s', without telling me what to push\n"
9053 "to update which remote branch."
9055 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9056 "而没有告诉我要推送什么、更新哪个远程分支。"
9058 #: builtin/push.c:242
9060 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
9061 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9063 #: builtin/push.c:249
9065 "Updates were rejected because the tip of your current branch is behind\n"
9066 "its remote counterpart. Integrate the remote changes (e.g.\n"
9067 "'git pull ...') before pushing again.\n"
9068 "See the 'Note about fast-forwards' in 'git push --help' for details."
9070 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9071 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9072 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9074 #: builtin/push.c:255
9076 "Updates were rejected because a pushed branch tip is behind its remote\n"
9077 "counterpart. Check out this branch and integrate the remote changes\n"
9078 "(e.g. 'git pull ...') before pushing again.\n"
9079 "See the 'Note about fast-forwards' in 'git push --help' for details."
9081 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9082 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9083 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9085 #: builtin/push.c:261
9087 "Updates were rejected because the remote contains work that you do\n"
9088 "not have locally. This is usually caused by another repository pushing\n"
9089 "to the same ref. You may want to first integrate the remote changes\n"
9090 "(e.g., 'git pull ...') before pushing again.\n"
9091 "See the 'Note about fast-forwards' in 'git push --help' for details."
9093 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9094 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9095 "(如 'git pull ...')。\n"
9096 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9098 #: builtin/push.c:268
9099 msgid "Updates were rejected because the tag already exists in the remote."
9100 msgstr "更新被拒绝,因为该标签在远程已经存在。"
9102 #: builtin/push.c:271
9104 "You cannot update a remote ref that points at a non-commit object,\n"
9105 "or update a remote ref to make it point at a non-commit object,\n"
9106 "without using the '--force' option.\n"
9108 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9109 "也不能更新远程引用让其指向一个非提交对象。\n"
9111 #: builtin/push.c:331
9113 msgid "Pushing to %s\n"
9116 #: builtin/push.c:335
9118 msgid "failed to push some refs to '%s'"
9119 msgstr "无法推送一些引用到 '%s'"
9121 #: builtin/push.c:365
9123 msgid "bad repository '%s'"
9126 #: builtin/push.c:366
9128 "No configured push destination.\n"
9129 "Either specify the URL from the command-line or configure a remote "
9130 "repository using\n"
9132 " git remote add <name> <url>\n"
9134 "and then push using the remote name\n"
9136 " git push <name>\n"
9139 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9141 " git remote add <名称> <地址>\n"
9147 #: builtin/push.c:381
9148 msgid "--all and --tags are incompatible"
9149 msgstr "--all 和 --tags 不兼容"
9151 #: builtin/push.c:382
9152 msgid "--all can't be combined with refspecs"
9153 msgstr "--all 不能和引用规格同时使用"
9155 #: builtin/push.c:387
9156 msgid "--mirror and --tags are incompatible"
9157 msgstr "--mirror 和 --tags 不兼容"
9159 #: builtin/push.c:388
9160 msgid "--mirror can't be combined with refspecs"
9161 msgstr "--mirror 不能和引用规格同时使用"
9163 #: builtin/push.c:393
9164 msgid "--all and --mirror are incompatible"
9165 msgstr "--all 和 --mirror 不兼容"
9167 #: builtin/push.c:505
9171 #: builtin/push.c:506 builtin/send-pack.c:161
9172 msgid "push all refs"
9175 #: builtin/push.c:507 builtin/send-pack.c:163
9176 msgid "mirror all refs"
9179 #: builtin/push.c:509
9183 #: builtin/push.c:510
9184 msgid "push tags (can't be used with --all or --mirror)"
9185 msgstr "推送标签(不能使用 --all or --mirror)"
9187 #: builtin/push.c:513 builtin/send-pack.c:164
9188 msgid "force updates"
9191 #: builtin/push.c:515 builtin/send-pack.c:175
9192 msgid "refname>:<expect"
9195 #: builtin/push.c:516 builtin/send-pack.c:176
9196 msgid "require old value of ref to be at this value"
9197 msgstr "要求引用旧的取值为设定值"
9199 #: builtin/push.c:519
9200 msgid "control recursive pushing of submodules"
9203 #: builtin/push.c:521 builtin/send-pack.c:169
9204 msgid "use thin pack"
9207 #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9208 #: builtin/send-pack.c:159
9209 msgid "receive pack program"
9212 #: builtin/push.c:524
9213 msgid "set upstream for git pull/status"
9214 msgstr "设置 git pull/status 的上游"
9216 #: builtin/push.c:527
9217 msgid "prune locally removed refs"
9220 #: builtin/push.c:529
9221 msgid "bypass pre-push hook"
9222 msgstr "绕过 pre-push 钩子"
9224 #: builtin/push.c:530
9225 msgid "push missing but relevant tags"
9228 #: builtin/push.c:533 builtin/send-pack.c:166
9229 msgid "GPG sign the push"
9230 msgstr "用 GPG 为推送签名"
9232 #: builtin/push.c:535 builtin/send-pack.c:170
9233 msgid "request atomic transaction on remote side"
9236 #: builtin/push.c:549
9237 msgid "--delete is incompatible with --all, --mirror and --tags"
9238 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9240 #: builtin/push.c:551
9241 msgid "--delete doesn't make sense without any refs"
9242 msgstr "--delete 未接任何引用没有意义"
9244 #: builtin/read-tree.c:37
9246 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9247 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9248 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9250 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9251 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9252 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9254 #: builtin/read-tree.c:110
9255 msgid "write resulting index to <file>"
9256 msgstr "将索引结果写入 <文件>"
9258 #: builtin/read-tree.c:113
9259 msgid "only empty the index"
9262 #: builtin/read-tree.c:115
9266 #: builtin/read-tree.c:117
9267 msgid "perform a merge in addition to a read"
9268 msgstr "读取之余再执行一个合并"
9270 #: builtin/read-tree.c:119
9271 msgid "3-way merge if no file level merging required"
9272 msgstr "如果没有文件级合并需要,执行三方合并"
9274 #: builtin/read-tree.c:121
9275 msgid "3-way merge in presence of adds and removes"
9276 msgstr "存在添加和删除时,也执行三方合并"
9278 #: builtin/read-tree.c:123
9279 msgid "same as -m, but discard unmerged entries"
9280 msgstr "类似于 -m,但丢弃未合并的条目"
9282 #: builtin/read-tree.c:124
9283 msgid "<subdirectory>/"
9286 #: builtin/read-tree.c:125
9287 msgid "read the tree into the index under <subdirectory>/"
9288 msgstr "读取树对象到索引的 <子目录>/ 下"
9290 #: builtin/read-tree.c:128
9291 msgid "update working tree with merge result"
9292 msgstr "用合并的结果更新工作区"
9294 #: builtin/read-tree.c:130
9298 #: builtin/read-tree.c:131
9299 msgid "allow explicitly ignored files to be overwritten"
9300 msgstr "允许忽略文件中设定的文件可以被覆盖"
9302 #: builtin/read-tree.c:134
9303 msgid "don't check the working tree after merging"
9306 #: builtin/read-tree.c:135
9307 msgid "don't update the index or the work tree"
9310 #: builtin/read-tree.c:137
9311 msgid "skip applying sparse checkout filter"
9312 msgstr "跳过应用稀疏检出过滤器"
9314 #: builtin/read-tree.c:139
9315 msgid "debug unpack-trees"
9316 msgstr "调试 unpack-trees"
9318 #: builtin/reflog.c:423
9320 msgid "'%s' for '%s' is not a valid timestamp"
9321 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9323 #: builtin/reflog.c:540 builtin/reflog.c:545
9325 msgid "'%s' is not a valid timestamp"
9326 msgstr "'%s' 不是一个有效的时间戳"
9328 #: builtin/remote.c:12
9329 msgid "git remote [-v | --verbose]"
9330 msgstr "git remote [-v | --verbose]"
9332 #: builtin/remote.c:13
9334 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9335 "mirror=<fetch|push>] <name> <url>"
9337 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9338 "mirror=<fetch|push>] <名称> <地址>"
9340 #: builtin/remote.c:14 builtin/remote.c:34
9341 msgid "git remote rename <old> <new>"
9342 msgstr "git remote rename <旧名称> <新名称>"
9344 #: builtin/remote.c:15 builtin/remote.c:39
9345 msgid "git remote remove <name>"
9346 msgstr "git remote remove <名称>"
9348 #: builtin/remote.c:16 builtin/remote.c:44
9349 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9350 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9352 #: builtin/remote.c:17
9353 msgid "git remote [-v | --verbose] show [-n] <name>"
9354 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9356 #: builtin/remote.c:18
9357 msgid "git remote prune [-n | --dry-run] <name>"
9358 msgstr "git remote prune [-n | --dry-run] <名称>"
9360 #: builtin/remote.c:19
9362 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9363 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9365 #: builtin/remote.c:20
9366 msgid "git remote set-branches [--add] <name> <branch>..."
9367 msgstr "git remote set-branches [--add] <名称> <分支>..."
9369 #: builtin/remote.c:21 builtin/remote.c:70
9370 msgid "git remote get-url [--push] [--all] <name>"
9371 msgstr "git remote get-url [--push] [--all] <名称>"
9373 #: builtin/remote.c:22 builtin/remote.c:75
9374 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9375 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9377 #: builtin/remote.c:23 builtin/remote.c:76
9378 msgid "git remote set-url --add <name> <newurl>"
9379 msgstr "git remote set-url --add <名称> <新的地址>"
9381 #: builtin/remote.c:24 builtin/remote.c:77
9382 msgid "git remote set-url --delete <name> <url>"
9383 msgstr "git remote set-url --delete <名称> <地址>"
9385 #: builtin/remote.c:29
9386 msgid "git remote add [<options>] <name> <url>"
9387 msgstr "git remote add [<选项>] <名称> <地址>"
9389 #: builtin/remote.c:49
9390 msgid "git remote set-branches <name> <branch>..."
9391 msgstr "git remote set-branches <名称> <分支>..."
9393 #: builtin/remote.c:50
9394 msgid "git remote set-branches --add <name> <branch>..."
9395 msgstr "git remote set-branches --add <名称> <分支>..."
9397 #: builtin/remote.c:55
9398 msgid "git remote show [<options>] <name>"
9399 msgstr "git remote show [<选项>] <名称>"
9401 #: builtin/remote.c:60
9402 msgid "git remote prune [<options>] <name>"
9403 msgstr "git remote prune [<选项>] <名称>"
9405 #: builtin/remote.c:65
9406 msgid "git remote update [<options>] [<group> | <remote>]..."
9407 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9409 #: builtin/remote.c:94
9414 #: builtin/remote.c:126
9416 "--mirror is dangerous and deprecated; please\n"
9417 "\t use --mirror=fetch or --mirror=push instead"
9419 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9420 "\t 或 --mirror=push"
9422 #: builtin/remote.c:143
9424 msgid "unknown mirror argument: %s"
9427 #: builtin/remote.c:159
9428 msgid "fetch the remote branches"
9431 #: builtin/remote.c:161
9432 msgid "import all tags and associated objects when fetching"
9433 msgstr "抓取时导入所有的标签和关联对象"
9435 #: builtin/remote.c:164
9436 msgid "or do not fetch any tag at all (--no-tags)"
9437 msgstr "或不抓取任何标签(--no-tags)"
9439 #: builtin/remote.c:166
9440 msgid "branch(es) to track"
9443 #: builtin/remote.c:167
9444 msgid "master branch"
9447 #: builtin/remote.c:168
9451 #: builtin/remote.c:169
9452 msgid "set up remote as a mirror to push to or fetch from"
9453 msgstr "把远程设置为用以推送或抓取的镜像"
9455 #: builtin/remote.c:181
9456 msgid "specifying a master branch makes no sense with --mirror"
9457 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9459 #: builtin/remote.c:183
9460 msgid "specifying branches to track makes sense only with fetch mirrors"
9461 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9463 #: builtin/remote.c:190 builtin/remote.c:633
9465 msgid "remote %s already exists."
9466 msgstr "远程 %s 已经存在。"
9468 #: builtin/remote.c:194 builtin/remote.c:637
9470 msgid "'%s' is not a valid remote name"
9471 msgstr "'%s' 不是一个有效的远程名称"
9473 #: builtin/remote.c:234
9475 msgid "Could not setup master '%s'"
9476 msgstr "无法设置 master '%s'"
9478 #: builtin/remote.c:336
9480 msgid "Could not get fetch map for refspec %s"
9481 msgstr "无法得到引用规格 %s 的获取列表"
9483 #: builtin/remote.c:437 builtin/remote.c:445
9487 #: builtin/remote.c:449
9491 #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9493 msgid "No such remote: %s"
9496 #: builtin/remote.c:643
9498 msgid "Could not rename config section '%s' to '%s'"
9499 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9501 #: builtin/remote.c:663
9504 "Not updating non-default fetch refspec\n"
9506 "\tPlease update the configuration manually if necessary."
9512 #: builtin/remote.c:699
9514 msgid "deleting '%s' failed"
9517 #: builtin/remote.c:733
9519 msgid "creating '%s' failed"
9522 #: builtin/remote.c:796
9524 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9525 "to delete it, use:"
9527 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9528 "to delete them, use:"
9529 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9530 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9532 #: builtin/remote.c:810
9534 msgid "Could not remove config section '%s'"
9535 msgstr "不能移除配置小节 '%s'"
9537 #: builtin/remote.c:911
9539 msgid " new (next fetch will store in remotes/%s)"
9540 msgstr " 新的(下一次获取将存储于 remotes/%s)"
9542 #: builtin/remote.c:914
9546 #: builtin/remote.c:916
9547 msgid " stale (use 'git remote prune' to remove)"
9548 msgstr " 过时(使用 'git remote prune' 来移除)"
9550 #: builtin/remote.c:918
9554 #: builtin/remote.c:959
9556 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9557 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9559 #: builtin/remote.c:967
9561 msgid "rebases interactively onto remote %s"
9562 msgstr "交互式变基到远程 %s"
9564 #: builtin/remote.c:971
9566 msgid " merges with remote %s"
9569 #: builtin/remote.c:972
9570 msgid " and with remote"
9573 #: builtin/remote.c:974
9575 msgid "merges with remote %s"
9578 #: builtin/remote.c:975
9579 msgid " and with remote"
9582 #: builtin/remote.c:1021
9586 #: builtin/remote.c:1024
9590 #: builtin/remote.c:1028
9594 #: builtin/remote.c:1031
9595 msgid "fast-forwardable"
9598 #: builtin/remote.c:1034
9599 msgid "local out of date"
9602 #: builtin/remote.c:1041
9604 msgid " %-*s forces to %-*s (%s)"
9605 msgstr " %-*s 强制推送至 %-*s (%s)"
9607 #: builtin/remote.c:1044
9609 msgid " %-*s pushes to %-*s (%s)"
9610 msgstr " %-*s 推送至 %-*s (%s)"
9612 #: builtin/remote.c:1048
9614 msgid " %-*s forces to %s"
9615 msgstr " %-*s 强制推送至 %s"
9617 #: builtin/remote.c:1051
9619 msgid " %-*s pushes to %s"
9620 msgstr " %-*s 推送至 %s"
9622 #: builtin/remote.c:1119
9623 msgid "do not query remotes"
9626 #: builtin/remote.c:1146
9631 #: builtin/remote.c:1147
9633 msgid " Fetch URL: %s"
9636 #: builtin/remote.c:1148 builtin/remote.c:1299
9640 #: builtin/remote.c:1157 builtin/remote.c:1159
9642 msgid " Push URL: %s"
9645 #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
9647 msgid " HEAD branch: %s"
9648 msgstr " HEAD 分支:%s"
9650 #: builtin/remote.c:1167
9653 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9654 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9656 #: builtin/remote.c:1179
9658 msgid " Remote branch:%s"
9659 msgid_plural " Remote branches:%s"
9660 msgstr[0] " 远程分支:%s"
9661 msgstr[1] " 远程分支:%s"
9663 # 译者:中文字符串拼接,可删除前导空格
9664 #: builtin/remote.c:1182 builtin/remote.c:1209
9665 msgid " (status not queried)"
9668 #: builtin/remote.c:1191
9669 msgid " Local branch configured for 'git pull':"
9670 msgid_plural " Local branches configured for 'git pull':"
9671 msgstr[0] " 为 'git pull' 配置的本地分支:"
9672 msgstr[1] " 为 'git pull' 配置的本地分支:"
9674 #: builtin/remote.c:1199
9675 msgid " Local refs will be mirrored by 'git push'"
9676 msgstr " 本地引用将在 'git push' 时被镜像"
9678 #: builtin/remote.c:1206
9680 msgid " Local ref configured for 'git push'%s:"
9681 msgid_plural " Local refs configured for 'git push'%s:"
9682 msgstr[0] " 为 'git push' 配置的本地引用%s:"
9683 msgstr[1] " 为 'git push' 配置的本地引用%s:"
9685 #: builtin/remote.c:1227
9686 msgid "set refs/remotes/<name>/HEAD according to remote"
9687 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9689 #: builtin/remote.c:1229
9690 msgid "delete refs/remotes/<name>/HEAD"
9691 msgstr "删除 refs/remotes/<名称>/HEAD"
9693 #: builtin/remote.c:1244
9694 msgid "Cannot determine remote HEAD"
9695 msgstr "无法确定远程 HEAD"
9697 #: builtin/remote.c:1246
9698 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9699 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9701 #: builtin/remote.c:1256
9703 msgid "Could not delete %s"
9706 #: builtin/remote.c:1264
9708 msgid "Not a valid ref: %s"
9709 msgstr "不是一个有效引用:%s"
9711 #: builtin/remote.c:1266
9713 msgid "Could not setup %s"
9717 #: builtin/remote.c:1284
9719 msgid " %s will become dangling!"
9720 msgstr " %s 将成为摇摆状态!"
9723 #: builtin/remote.c:1285
9725 msgid " %s has become dangling!"
9726 msgstr " %s 已成为摇摆状态!"
9728 #: builtin/remote.c:1295
9733 #: builtin/remote.c:1296
9738 #: builtin/remote.c:1312
9740 msgid " * [would prune] %s"
9741 msgstr " * [将删除] %s"
9743 #: builtin/remote.c:1315
9745 msgid " * [pruned] %s"
9746 msgstr " * [已删除] %s"
9748 #: builtin/remote.c:1360
9749 msgid "prune remotes after fetching"
9752 #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
9754 msgid "No such remote '%s'"
9757 #: builtin/remote.c:1439
9761 #: builtin/remote.c:1446
9762 msgid "no remote specified"
9765 #: builtin/remote.c:1463
9766 msgid "query push URLs rather than fetch URLs"
9767 msgstr "查询推送 URL 地址,而非获取 URL 地址"
9769 #: builtin/remote.c:1465
9770 msgid "return all URLs"
9771 msgstr "返回所有 URL 地址"
9773 #: builtin/remote.c:1493
9775 msgid "no URLs configured for remote '%s'"
9776 msgstr "没有给远程仓库 '%s' 设定 URL"
9778 #: builtin/remote.c:1519
9779 msgid "manipulate push URLs"
9782 #: builtin/remote.c:1521
9786 #: builtin/remote.c:1523
9790 #: builtin/remote.c:1530
9791 msgid "--add --delete doesn't make sense"
9792 msgstr "--add --delete 无意义"
9794 #: builtin/remote.c:1571
9796 msgid "Invalid old URL pattern: %s"
9797 msgstr "无效的旧 URL 匹配模版:%s"
9799 #: builtin/remote.c:1579
9801 msgid "No such URL found: %s"
9802 msgstr "未找到此 URL:%s"
9804 #: builtin/remote.c:1581
9805 msgid "Will not delete all non-push URLs"
9806 msgstr "将不会删除所有非推送 URL 地址"
9808 #: builtin/remote.c:1595
9809 msgid "be verbose; must be placed before a subcommand"
9810 msgstr "冗长输出;必须置于子命令之前"
9812 #: builtin/repack.c:17
9813 msgid "git repack [<options>]"
9814 msgstr "git repack [<选项>]"
9816 #: builtin/repack.c:159
9817 msgid "pack everything in a single pack"
9818 msgstr "所有内容打包到一个包文件中"
9820 #: builtin/repack.c:161
9821 msgid "same as -a, and turn unreachable objects loose"
9822 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9824 #: builtin/repack.c:164
9825 msgid "remove redundant packs, and run git-prune-packed"
9826 msgstr "删除多余的包,运行 git-prune-packed"
9828 #: builtin/repack.c:166
9829 msgid "pass --no-reuse-delta to git-pack-objects"
9830 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9832 #: builtin/repack.c:168
9833 msgid "pass --no-reuse-object to git-pack-objects"
9834 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9836 #: builtin/repack.c:170
9837 msgid "do not run git-update-server-info"
9838 msgstr "不运行 git-update-server-info"
9840 #: builtin/repack.c:173
9841 msgid "pass --local to git-pack-objects"
9842 msgstr "向 git-pack-objects 传递参数 --local"
9844 #: builtin/repack.c:175
9845 msgid "write bitmap index"
9846 msgstr "写 bitmap 索引"
9848 #: builtin/repack.c:176
9852 #: builtin/repack.c:177
9853 msgid "with -A, do not loosen objects older than this"
9854 msgstr "使用 -A,不要将早于给定时间的对象过期"
9856 #: builtin/repack.c:179
9857 msgid "size of the window used for delta compression"
9860 #: builtin/repack.c:180 builtin/repack.c:184
9864 #: builtin/repack.c:181
9865 msgid "same as the above, but limit memory size instead of entries count"
9866 msgstr "和上面的相似,但限制内存大小而非条目数"
9868 #: builtin/repack.c:183
9869 msgid "limits the maximum delta depth"
9872 #: builtin/repack.c:185
9873 msgid "maximum size of each packfile"
9876 #: builtin/repack.c:187
9877 msgid "repack objects in packs marked with .keep"
9878 msgstr "对标记为 .keep 的包中的对象重新打包"
9880 #: builtin/repack.c:197
9881 msgid "cannot delete packs in a precious-objects repo"
9882 msgstr "不能删除珍品仓库中的打包文件"
9884 #: builtin/repack.c:381
9886 msgid "removing '%s' failed"
9889 #: builtin/replace.c:19
9890 msgid "git replace [-f] <object> <replacement>"
9891 msgstr "git replace [-f] <对象> <替换物>"
9893 #: builtin/replace.c:20
9894 msgid "git replace [-f] --edit <object>"
9895 msgstr "git replace [-f] --edit <对象>"
9897 #: builtin/replace.c:21
9898 msgid "git replace [-f] --graft <commit> [<parent>...]"
9899 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9901 #: builtin/replace.c:22
9902 msgid "git replace -d <object>..."
9903 msgstr "git replace -d <对象>..."
9905 #: builtin/replace.c:23
9906 msgid "git replace [--format=<format>] [-l [<pattern>]]"
9907 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
9909 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
9911 msgid "Not a valid object name: '%s'"
9912 msgstr "不是一个有效的对象名:'%s'"
9914 #: builtin/replace.c:355
9916 msgid "bad mergetag in commit '%s'"
9917 msgstr "提交 '%s' 中含有损坏的合并标签"
9919 #: builtin/replace.c:357
9921 msgid "malformed mergetag in commit '%s'"
9922 msgstr "提交 '%s' 中含有非法的合并标签"
9924 #: builtin/replace.c:368
9927 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9928 "instead of --graft"
9929 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
9931 #: builtin/replace.c:401
9933 msgid "the original commit '%s' has a gpg signature."
9934 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9936 #: builtin/replace.c:402
9937 msgid "the signature will be removed in the replacement commit!"
9938 msgstr "在替换的提交中签名将被移除!"
9940 #: builtin/replace.c:408
9942 msgid "could not write replacement commit for: '%s'"
9943 msgstr "不能为 '%s' 写替换提交"
9945 #: builtin/replace.c:432
9946 msgid "list replace refs"
9949 #: builtin/replace.c:433
9950 msgid "delete replace refs"
9953 #: builtin/replace.c:434
9954 msgid "edit existing object"
9957 #: builtin/replace.c:435
9958 msgid "change a commit's parents"
9961 #: builtin/replace.c:436
9962 msgid "replace the ref if it exists"
9965 #: builtin/replace.c:437
9966 msgid "do not pretty-print contents for --edit"
9967 msgstr "不要为 --edit 操作美观显示内容"
9969 #: builtin/replace.c:438
9970 msgid "use this format"
9973 #: builtin/rerere.c:12
9974 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9975 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9977 #: builtin/rerere.c:58
9978 msgid "register clean resolutions in index"
9979 msgstr "在索引中注册干净的解决方案"
9981 #: builtin/reset.c:26
9983 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
9984 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
9986 #: builtin/reset.c:27
9987 msgid "git reset [-q] <tree-ish> [--] <paths>..."
9988 msgstr "git reset [-q] <树或提交> [--] <路径>..."
9990 #: builtin/reset.c:28
9991 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9992 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
9994 #: builtin/reset.c:34
9998 #: builtin/reset.c:34
10002 #: builtin/reset.c:34
10006 #: builtin/reset.c:34
10010 #: builtin/reset.c:34
10014 #: builtin/reset.c:74
10015 msgid "You do not have a valid HEAD."
10016 msgstr "您没有一个有效的 HEAD。"
10018 #: builtin/reset.c:76
10019 msgid "Failed to find tree of HEAD."
10020 msgstr "无法找到 HEAD 指向的树。"
10022 #: builtin/reset.c:82
10024 msgid "Failed to find tree of %s."
10025 msgstr "无法找到 %s 指向的树。"
10027 #: builtin/reset.c:100
10029 msgid "HEAD is now at %s"
10030 msgstr "HEAD 现在位于 %s"
10032 # 译者:汉字之间无空格,故删除%s前后空格
10033 #: builtin/reset.c:183
10035 msgid "Cannot do a %s reset in the middle of a merge."
10036 msgstr "在合并过程中不能做%s重置操作。"
10038 #: builtin/reset.c:276
10039 msgid "be quiet, only report errors"
10040 msgstr "安静模式,只报告错误"
10042 #: builtin/reset.c:278
10043 msgid "reset HEAD and index"
10044 msgstr "重置 HEAD 和索引"
10046 #: builtin/reset.c:279
10047 msgid "reset only HEAD"
10050 #: builtin/reset.c:281 builtin/reset.c:283
10051 msgid "reset HEAD, index and working tree"
10052 msgstr "重置 HEAD、索引和工作区"
10054 #: builtin/reset.c:285
10055 msgid "reset HEAD but keep local changes"
10056 msgstr "重置 HEAD 但保存本地变更"
10058 #: builtin/reset.c:288
10059 msgid "record only the fact that removed paths will be added later"
10060 msgstr "将删除的路径标记为稍后添加"
10062 #: builtin/reset.c:305
10064 msgid "Failed to resolve '%s' as a valid revision."
10065 msgstr "无法将 '%s' 解析为一个有效的版本。"
10067 #: builtin/reset.c:313
10069 msgid "Failed to resolve '%s' as a valid tree."
10070 msgstr "无法将 '%s' 解析为一个有效的树对象。"
10072 #: builtin/reset.c:322
10073 msgid "--patch is incompatible with --{hard,mixed,soft}"
10074 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10076 #: builtin/reset.c:331
10077 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10078 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10080 # 译者:汉字之间无空格,故删除%s前后空格
10081 #: builtin/reset.c:333
10083 msgid "Cannot do %s reset with paths."
10084 msgstr "不能带路径进行%s重置。"
10086 # 译者:汉字之间无空格,故删除%s前后空格
10087 #: builtin/reset.c:343
10089 msgid "%s reset is not allowed in a bare repository"
10090 msgstr "不能对纯仓库进行%s重置"
10092 #: builtin/reset.c:347
10093 msgid "-N can only be used with --mixed"
10094 msgstr "-N 只能和 --mixed 同时使用"
10096 #: builtin/reset.c:364
10097 msgid "Unstaged changes after reset:"
10098 msgstr "重置后取消暂存的变更:"
10100 #: builtin/reset.c:370
10102 msgid "Could not reset index file to revision '%s'."
10103 msgstr "不能重置索引文件至版本 '%s'。"
10105 #: builtin/reset.c:374
10106 msgid "Could not write new index file."
10107 msgstr "不能写入新的索引文件。"
10109 #: builtin/rev-list.c:350
10110 msgid "rev-list does not support display of notes"
10111 msgstr "rev-list 不支持显示注解"
10113 #: builtin/rev-parse.c:358
10114 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10115 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10117 #: builtin/rev-parse.c:363
10118 msgid "keep the `--` passed as an arg"
10119 msgstr "保持 `--` 作为一个参数传递"
10121 #: builtin/rev-parse.c:365
10122 msgid "stop parsing after the first non-option argument"
10123 msgstr "遇到第一个非选项参数后停止解析"
10125 #: builtin/rev-parse.c:368
10126 msgid "output in stuck long form"
10129 #: builtin/rev-parse.c:499
10131 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10132 " or: git rev-parse --sq-quote [<arg>...]\n"
10133 " or: git rev-parse [<options>] [<arg>...]\n"
10135 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10137 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10138 " 或者:git rev-parse --sq-quote [<参数>...]\n"
10139 " 或者:git rev-parse [<选项>] [<参数>...]\n"
10141 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10143 #: builtin/revert.c:22
10144 msgid "git revert [<options>] <commit-ish>..."
10145 msgstr "git revert [<选项>] <提交号>..."
10147 #: builtin/revert.c:23
10148 msgid "git revert <subcommand>"
10149 msgstr "git revert <子命令>"
10151 #: builtin/revert.c:28
10152 msgid "git cherry-pick [<options>] <commit-ish>..."
10153 msgstr "git cherry-pick [<选项>] <提交号>..."
10155 #: builtin/revert.c:29
10156 msgid "git cherry-pick <subcommand>"
10157 msgstr "git cherry-pick <子命令>"
10159 #: builtin/revert.c:71
10161 msgid "%s: %s cannot be used with %s"
10162 msgstr "%s:%s 不能和 %s 同时使用"
10164 #: builtin/revert.c:80
10165 msgid "end revert or cherry-pick sequence"
10168 #: builtin/revert.c:81
10169 msgid "resume revert or cherry-pick sequence"
10172 #: builtin/revert.c:82
10173 msgid "cancel revert or cherry-pick sequence"
10176 #: builtin/revert.c:83
10177 msgid "don't automatically commit"
10180 #: builtin/revert.c:84
10181 msgid "edit the commit message"
10184 #: builtin/revert.c:87
10185 msgid "parent number"
10188 #: builtin/revert.c:89
10189 msgid "merge strategy"
10192 #: builtin/revert.c:90
10196 #: builtin/revert.c:91
10197 msgid "option for merge strategy"
10200 #: builtin/revert.c:104
10201 msgid "append commit name"
10204 #: builtin/revert.c:106
10205 msgid "preserve initially empty commits"
10208 #: builtin/revert.c:107
10209 msgid "allow commits with empty messages"
10212 #: builtin/revert.c:108
10213 msgid "keep redundant, empty commits"
10214 msgstr "保持多余的、空的提交"
10216 #: builtin/revert.c:112
10217 msgid "program error"
10220 #: builtin/revert.c:197
10221 msgid "revert failed"
10224 #: builtin/revert.c:212
10225 msgid "cherry-pick failed"
10229 msgid "git rm [<options>] [--] <file>..."
10230 msgstr "git rm [<选项>] [--] <文件>..."
10234 "the following submodule (or one of its nested submodules)\n"
10235 "uses a .git directory:"
10237 "the following submodules (or one of their nested submodules)\n"
10238 "use a .git directory:"
10239 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10240 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10245 "(use 'rm -rf' if you really want to remove it including all of its history)"
10248 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10250 #: builtin/rm.c:230
10252 "the following file has staged content different from both the\n"
10253 "file and the HEAD:"
10255 "the following files have staged content different from both the\n"
10256 "file and the HEAD:"
10257 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10258 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10260 #: builtin/rm.c:235
10263 "(use -f to force removal)"
10268 #: builtin/rm.c:239
10269 msgid "the following file has changes staged in the index:"
10270 msgid_plural "the following files have changes staged in the index:"
10271 msgstr[0] "下列文件索引中有变更"
10272 msgstr[1] "下列文件索引中有变更"
10274 #: builtin/rm.c:243 builtin/rm.c:254
10277 "(use --cached to keep the file, or -f to force removal)"
10280 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
10282 #: builtin/rm.c:251
10283 msgid "the following file has local modifications:"
10284 msgid_plural "the following files have local modifications:"
10285 msgstr[0] "如下文件有本地修改:"
10286 msgstr[1] "如下文件有本地修改:"
10288 #: builtin/rm.c:269
10289 msgid "do not list removed files"
10292 #: builtin/rm.c:270
10293 msgid "only remove from the index"
10296 #: builtin/rm.c:271
10297 msgid "override the up-to-date check"
10298 msgstr "忽略文件更新状态检查"
10300 #: builtin/rm.c:272
10301 msgid "allow recursive removal"
10304 #: builtin/rm.c:274
10305 msgid "exit with a zero status even if nothing matched"
10306 msgstr "即使没有匹配,也以零状态退出"
10308 #: builtin/rm.c:317
10309 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10310 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10312 #: builtin/rm.c:335
10314 msgid "not removing '%s' recursively without -r"
10315 msgstr "未提供 -r 选项不会递归删除 '%s'"
10317 #: builtin/rm.c:374
10319 msgid "git rm: unable to remove %s"
10320 msgstr "git rm:不能删除 %s"
10322 #: builtin/send-pack.c:18
10324 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10325 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10327 " --all and explicit <ref> specification are mutually exclusive."
10329 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10330 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10331 " --all 和明确的 <引用> 互斥。"
10333 #: builtin/send-pack.c:160
10334 msgid "remote name"
10337 #: builtin/send-pack.c:171
10338 msgid "use stateless RPC protocol"
10339 msgstr "使用无状态的 RPC 协议"
10341 #: builtin/send-pack.c:172
10342 msgid "read refs from stdin"
10345 #: builtin/send-pack.c:173
10346 msgid "print status from remote helper"
10347 msgstr "打印来自远程 helper 的状态"
10349 #: builtin/shortlog.c:13
10350 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10351 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10353 #: builtin/shortlog.c:242
10354 msgid "sort output according to the number of commits per author"
10355 msgstr "根据每个作者的提交数量排序"
10357 #: builtin/shortlog.c:244
10358 msgid "Suppress commit descriptions, only provides commit count"
10359 msgstr "隐藏提交说明,只提供提交数量"
10361 #: builtin/shortlog.c:246
10362 msgid "Show the email address of each author"
10363 msgstr "显示每个作者的电子邮件地址"
10365 #: builtin/shortlog.c:247
10366 msgid "w[,i1[,i2]]"
10367 msgstr "w[,i1[,i2]]"
10369 #: builtin/shortlog.c:248
10370 msgid "Linewrap output"
10373 #: builtin/show-branch.c:10
10375 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10376 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10377 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10378 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10380 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10381 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10382 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10383 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10385 #: builtin/show-branch.c:14
10386 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10387 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10389 #: builtin/show-branch.c:640
10390 msgid "show remote-tracking and local branches"
10391 msgstr "显示远程跟踪的和本地的分支"
10393 #: builtin/show-branch.c:642
10394 msgid "show remote-tracking branches"
10397 #: builtin/show-branch.c:644
10398 msgid "color '*!+-' corresponding to the branch"
10399 msgstr "着色 '*!+-' 到相应的分支"
10401 #: builtin/show-branch.c:646
10402 msgid "show <n> more commits after the common ancestor"
10403 msgstr "显示共同祖先后的 <n> 个提交"
10405 #: builtin/show-branch.c:648
10406 msgid "synonym to more=-1"
10407 msgstr "和 more=-1 同义"
10409 #: builtin/show-branch.c:649
10410 msgid "suppress naming strings"
10413 #: builtin/show-branch.c:651
10414 msgid "include the current branch"
10417 #: builtin/show-branch.c:653
10418 msgid "name commits with their object names"
10421 #: builtin/show-branch.c:655
10422 msgid "show possible merge bases"
10425 #: builtin/show-branch.c:657
10426 msgid "show refs unreachable from any other ref"
10427 msgstr "显示没有任何引用的的引用"
10429 #: builtin/show-branch.c:659
10430 msgid "show commits in topological order"
10433 #: builtin/show-branch.c:662
10434 msgid "show only commits not on the first branch"
10435 msgstr "只显示不在第一个分支上的提交"
10437 #: builtin/show-branch.c:664
10438 msgid "show merges reachable from only one tip"
10439 msgstr "显示仅一个分支可访问的合并提交"
10441 #: builtin/show-branch.c:666
10442 msgid "topologically sort, maintaining date order where possible"
10443 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10445 #: builtin/show-branch.c:669
10446 msgid "<n>[,<base>]"
10447 msgstr "<n>[,<base>]"
10449 #: builtin/show-branch.c:670
10450 msgid "show <n> most recent ref-log entries starting at base"
10451 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10453 #: builtin/show-ref.c:10
10455 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10456 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10458 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10459 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10461 #: builtin/show-ref.c:11
10462 msgid "git show-ref --exclude-existing[=<pattern>]"
10463 msgstr "git show-ref --exclude-existing[=<模式>]"
10465 #: builtin/show-ref.c:165
10466 msgid "only show tags (can be combined with heads)"
10467 msgstr "只显示标签(可以和头共用)"
10469 #: builtin/show-ref.c:166
10470 msgid "only show heads (can be combined with tags)"
10471 msgstr "只显示头(可以和标签共用)"
10473 #: builtin/show-ref.c:167
10474 msgid "stricter reference checking, requires exact ref path"
10475 msgstr "更严格的引用检测,需要精确的引用路径"
10477 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10478 msgid "show the HEAD reference, even if it would be filtered out"
10479 msgstr "显示 HEAD 引用,即使被过滤掉"
10481 #: builtin/show-ref.c:174
10482 msgid "dereference tags into object IDs"
10483 msgstr "转换标签到对象 ID"
10485 #: builtin/show-ref.c:176
10486 msgid "only show SHA1 hash using <n> digits"
10487 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10489 #: builtin/show-ref.c:180
10490 msgid "do not print results to stdout (useful with --verify)"
10491 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10493 #: builtin/show-ref.c:182
10494 msgid "show refs from stdin that aren't in local repository"
10495 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10497 #: builtin/stripspace.c:17
10498 msgid "git stripspace [-s | --strip-comments]"
10499 msgstr "git stripspace [-s | --strip-comments]"
10501 #: builtin/stripspace.c:18
10502 msgid "git stripspace [-c | --comment-lines]"
10503 msgstr "git stripspace [-c | --comment-lines]"
10505 #: builtin/stripspace.c:35
10506 msgid "skip and remove all lines starting with comment character"
10507 msgstr "跳过和移除所有的注释行"
10509 #: builtin/stripspace.c:38
10510 msgid "prepend comment character and space to each line"
10511 msgstr "为每一行的行首添加注释符和空格"
10513 #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
10514 msgid "alternative anchor for relative paths"
10515 msgstr "相对路径的替代锚记(anchor)"
10517 #: builtin/submodule--helper.c:78
10518 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10519 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10521 #: builtin/submodule--helper.c:108
10522 msgid "git submodule--helper name <path>"
10523 msgstr "git submodule--helper name <路径>"
10525 #: builtin/submodule--helper.c:114
10527 msgid "no submodule mapping found in .gitmodules for path '%s'"
10528 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10530 #: builtin/submodule--helper.c:164
10531 msgid "where the new submodule will be cloned to"
10532 msgstr "新的子模组将要克隆的路径"
10534 #: builtin/submodule--helper.c:167
10535 msgid "name of the new submodule"
10538 #: builtin/submodule--helper.c:170
10539 msgid "url where to clone the submodule from"
10540 msgstr "克隆子模组的 url 地址"
10542 #: builtin/submodule--helper.c:176
10543 msgid "depth for shallow clones"
10546 #: builtin/submodule--helper.c:182
10548 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10549 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10551 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10552 "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10554 #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10555 #: builtin/submodule--helper.c:210
10557 msgid "could not create directory '%s'"
10558 msgstr "不能创建目录 '%s'"
10560 #: builtin/submodule--helper.c:198
10562 msgid "clone of '%s' into submodule path '%s' failed"
10563 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10565 #: builtin/submodule--helper.c:221
10567 msgid "cannot open file '%s'"
10568 msgstr "无法打开文件 '%s'"
10570 #: builtin/submodule--helper.c:226
10572 msgid "could not close file %s"
10575 #: builtin/submodule--helper.c:241
10577 msgid "could not get submodule directory for '%s'"
10578 msgstr "无法得到 '%s' 的子模组目录"
10580 #: builtin/submodule--helper.c:267
10581 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10582 msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10584 #: builtin/submodule--helper.c:274
10586 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10587 msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10589 #: builtin/symbolic-ref.c:7
10590 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10591 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10593 #: builtin/symbolic-ref.c:8
10594 msgid "git symbolic-ref -d [-q] <name>"
10595 msgstr "git symbolic-ref -d [-q] <名称>"
10597 #: builtin/symbolic-ref.c:40
10598 msgid "suppress error message for non-symbolic (detached) refs"
10599 msgstr "不显示非符号(分离的)引用的错误信息"
10601 #: builtin/symbolic-ref.c:41
10602 msgid "delete symbolic ref"
10605 #: builtin/symbolic-ref.c:42
10606 msgid "shorten ref output"
10609 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10613 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10614 msgid "reason of the update"
10617 #: builtin/tag.c:23
10619 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10622 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10624 #: builtin/tag.c:24
10625 msgid "git tag -d <tagname>..."
10626 msgstr "git tag -d <标签名>..."
10628 #: builtin/tag.c:25
10630 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10631 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10633 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10634 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10636 #: builtin/tag.c:27
10637 msgid "git tag -v <tagname>..."
10638 msgstr "git tag -v <标签名>..."
10640 #: builtin/tag.c:80
10642 msgid "tag name too long: %.*s..."
10643 msgstr "标签名称太长:%.*s..."
10645 #: builtin/tag.c:85
10647 msgid "tag '%s' not found."
10648 msgstr "未发现标签 '%s'。"
10650 #: builtin/tag.c:100
10652 msgid "Deleted tag '%s' (was %s)\n"
10653 msgstr "已删除标签 '%s'(曾为 %s)\n"
10655 #: builtin/tag.c:112
10657 msgid "could not verify the tag '%s'"
10658 msgstr "不能校验该标签 '%s'"
10660 #: builtin/tag.c:122
10664 "Write a message for tag:\n"
10666 "Lines starting with '%c' will be ignored.\n"
10671 "以 '%c' 开头的行将被忽略。\n"
10673 #: builtin/tag.c:126
10677 "Write a message for tag:\n"
10679 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10685 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10687 #: builtin/tag.c:199
10688 msgid "unable to sign the tag"
10691 #: builtin/tag.c:201
10692 msgid "unable to write tag file"
10695 #: builtin/tag.c:226
10696 msgid "bad object type."
10699 #: builtin/tag.c:239
10700 msgid "tag header too big."
10703 #: builtin/tag.c:275
10704 msgid "no tag message?"
10707 #: builtin/tag.c:281
10709 msgid "The tag message has been left in %s\n"
10710 msgstr "标签说明被保留在 %s\n"
10712 #: builtin/tag.c:339
10713 msgid "list tag names"
10716 #: builtin/tag.c:341
10717 msgid "print <n> lines of each tag message"
10718 msgstr "每个标签信息打印 <n> 行"
10720 #: builtin/tag.c:343
10721 msgid "delete tags"
10724 #: builtin/tag.c:344
10725 msgid "verify tags"
10728 #: builtin/tag.c:346
10729 msgid "Tag creation options"
10732 #: builtin/tag.c:348
10733 msgid "annotated tag, needs a message"
10734 msgstr "附注标签,需要一个说明"
10736 #: builtin/tag.c:350
10737 msgid "tag message"
10740 #: builtin/tag.c:352
10741 msgid "annotated and GPG-signed tag"
10742 msgstr "附注并附加 GPG 签名的标签"
10744 #: builtin/tag.c:356
10745 msgid "use another key to sign the tag"
10746 msgstr "使用另外的私钥签名该标签"
10748 #: builtin/tag.c:357
10749 msgid "replace the tag if exists"
10750 msgstr "如果存在,替换现有的标签"
10752 #: builtin/tag.c:358 builtin/update-ref.c:368
10753 msgid "create a reflog"
10756 #: builtin/tag.c:360
10757 msgid "Tag listing options"
10760 #: builtin/tag.c:361
10761 msgid "show tag list in columns"
10762 msgstr "以列的方式显示标签列表"
10764 #: builtin/tag.c:362 builtin/tag.c:363
10765 msgid "print only tags that contain the commit"
10766 msgstr "只打印包含提交的标签"
10768 #: builtin/tag.c:364
10769 msgid "print only tags that are merged"
10770 msgstr "只打印已经合并的标签"
10772 #: builtin/tag.c:365
10773 msgid "print only tags that are not merged"
10774 msgstr "只打印尚未合并的标签"
10776 #: builtin/tag.c:370
10777 msgid "print only tags of the object"
10780 #: builtin/tag.c:399
10781 msgid "--column and -n are incompatible"
10782 msgstr "--column 和 -n 不兼容"
10784 #: builtin/tag.c:419
10785 msgid "-n option is only allowed with -l."
10786 msgstr "-n 选项只允许和 -l 同时使用。"
10788 #: builtin/tag.c:421
10789 msgid "--contains option is only allowed with -l."
10790 msgstr "--contains 选项只允许和 -l 同时使用。"
10792 #: builtin/tag.c:423
10793 msgid "--points-at option is only allowed with -l."
10794 msgstr "--points-at 选项只允许和 -l 同时使用。"
10796 #: builtin/tag.c:425
10797 msgid "--merged and --no-merged option are only allowed with -l"
10798 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10800 #: builtin/tag.c:433
10801 msgid "only one -F or -m option is allowed."
10802 msgstr "只允许一个 -F 或 -m 选项。"
10804 #: builtin/tag.c:453
10805 msgid "too many params"
10808 #: builtin/tag.c:459
10810 msgid "'%s' is not a valid tag name."
10811 msgstr "'%s' 不是一个有效的标签名称。"
10813 #: builtin/tag.c:464
10815 msgid "tag '%s' already exists"
10816 msgstr "标签 '%s' 已存在"
10818 #: builtin/tag.c:489
10820 msgid "Updated tag '%s' (was %s)\n"
10821 msgstr "已更新标签 '%s'(曾为 %s)\n"
10823 #: builtin/unpack-objects.c:490
10824 msgid "Unpacking objects"
10827 #: builtin/update-index.c:79
10829 msgid "failed to create directory %s"
10832 #: builtin/update-index.c:85
10834 msgid "failed to stat %s"
10835 msgstr "无法枚举 %s 状态"
10837 #: builtin/update-index.c:95
10839 msgid "failed to create file %s"
10842 #: builtin/update-index.c:103
10844 msgid "failed to delete file %s"
10847 #: builtin/update-index.c:110 builtin/update-index.c:212
10849 msgid "failed to delete directory %s"
10852 #: builtin/update-index.c:133
10854 msgid "Testing mtime in '%s' "
10855 msgstr "在 '%s' 中测试 mtime "
10857 #: builtin/update-index.c:145
10858 msgid "directory stat info does not change after adding a new file"
10859 msgstr "添加一个新文件后,目录的状态信息未改变"
10861 #: builtin/update-index.c:158
10862 msgid "directory stat info does not change after adding a new directory"
10863 msgstr "添加一个新目录后,目录的状态信息未改变"
10865 #: builtin/update-index.c:171
10866 msgid "directory stat info changes after updating a file"
10867 msgstr "更新一个文件后,目录的状态信息被修改"
10869 #: builtin/update-index.c:182
10870 msgid "directory stat info changes after adding a file inside subdirectory"
10871 msgstr "在子目录中添加文件后,目录的状态信息被修改"
10873 #: builtin/update-index.c:193
10874 msgid "directory stat info does not change after deleting a file"
10875 msgstr "删除一个文件后,目录的状态信息未改变"
10877 #: builtin/update-index.c:206
10878 msgid "directory stat info does not change after deleting a directory"
10879 msgstr "删除一个目录后,目录的状态信息未改变"
10881 #: builtin/update-index.c:213
10885 #: builtin/update-index.c:575
10886 msgid "git update-index [<options>] [--] [<file>...]"
10887 msgstr "git update-index [<选项>] [--] [<文件>...]"
10889 #: builtin/update-index.c:930
10890 msgid "continue refresh even when index needs update"
10891 msgstr "当索引需要更新时继续刷新"
10893 #: builtin/update-index.c:933
10894 msgid "refresh: ignore submodules"
10897 #: builtin/update-index.c:936
10898 msgid "do not ignore new files"
10901 #: builtin/update-index.c:938
10902 msgid "let files replace directories and vice-versa"
10903 msgstr "让文件替换目录(反之亦然)"
10905 #: builtin/update-index.c:940
10906 msgid "notice files missing from worktree"
10907 msgstr "通知文件从工作区丢失"
10909 #: builtin/update-index.c:942
10910 msgid "refresh even if index contains unmerged entries"
10911 msgstr "即使索引区包含未合并的条目也执行刷新"
10913 #: builtin/update-index.c:945
10914 msgid "refresh stat information"
10917 #: builtin/update-index.c:949
10918 msgid "like --refresh, but ignore assume-unchanged setting"
10919 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
10921 #: builtin/update-index.c:953
10922 msgid "<mode>,<object>,<path>"
10923 msgstr "<存取模式>,<对象>,<路径>"
10925 #: builtin/update-index.c:954
10926 msgid "add the specified entry to the index"
10927 msgstr "添加指定的条目到索引区"
10929 #: builtin/update-index.c:958
10933 #: builtin/update-index.c:959
10934 msgid "override the executable bit of the listed files"
10935 msgstr "覆盖列表里文件的可执行位"
10937 #: builtin/update-index.c:963
10938 msgid "mark files as \"not changing\""
10939 msgstr "把文件标记为 \"没有变更\""
10941 #: builtin/update-index.c:966
10942 msgid "clear assumed-unchanged bit"
10943 msgstr "清除 assumed-unchanged 位"
10945 #: builtin/update-index.c:969
10946 msgid "mark files as \"index-only\""
10947 msgstr "把文件标记为 \"仅索引\""
10949 #: builtin/update-index.c:972
10950 msgid "clear skip-worktree bit"
10951 msgstr "清除 skip-worktree 位"
10953 #: builtin/update-index.c:975
10954 msgid "add to index only; do not add content to object database"
10955 msgstr "只添加到索引区;不添加对象到对象库"
10957 #: builtin/update-index.c:977
10958 msgid "remove named paths even if present in worktree"
10959 msgstr "即使存在工作区里,也删除路径"
10961 #: builtin/update-index.c:979
10962 msgid "with --stdin: input lines are terminated by null bytes"
10963 msgstr "携带 --stdin:输入的行以 null 字符终止"
10965 #: builtin/update-index.c:981
10966 msgid "read list of paths to be updated from standard input"
10967 msgstr "从标准输入中读取需要更新的路径列表"
10969 #: builtin/update-index.c:985
10970 msgid "add entries from standard input to the index"
10971 msgstr "从标准输入添加条目到索引区"
10973 #: builtin/update-index.c:989
10974 msgid "repopulate stages #2 and #3 for the listed paths"
10975 msgstr "为指定文件重新生成第2和第3暂存区"
10977 #: builtin/update-index.c:993
10978 msgid "only update entries that differ from HEAD"
10979 msgstr "只更新与 HEAD 不同的条目"
10981 #: builtin/update-index.c:997
10982 msgid "ignore files missing from worktree"
10983 msgstr "忽略工作区丢失的文件"
10985 #: builtin/update-index.c:1000
10986 msgid "report actions to standard output"
10989 #: builtin/update-index.c:1002
10990 msgid "(for porcelains) forget saved unresolved conflicts"
10991 msgstr "(for porcelains) 忘记保存的未解决的冲突"
10993 #: builtin/update-index.c:1006
10994 msgid "write index in this format"
10995 msgstr "以这种格式写入索引区"
10997 #: builtin/update-index.c:1008
10998 msgid "enable or disable split index"
11001 #: builtin/update-index.c:1010
11002 msgid "enable/disable untracked cache"
11003 msgstr "启用/禁用对未跟踪文件的缓存"
11005 #: builtin/update-index.c:1012
11006 msgid "test if the filesystem supports untracked cache"
11007 msgstr "测试文件系统是否支持未跟踪文件缓存"
11009 #: builtin/update-index.c:1014
11010 msgid "enable untracked cache without testing the filesystem"
11011 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11013 #: builtin/update-index.c:1134
11014 msgid "Untracked cache disabled"
11015 msgstr "缓存未跟踪文件被禁用"
11017 #: builtin/update-index.c:1146
11019 msgid "Untracked cache enabled for '%s'"
11020 msgstr "缓存未跟踪文件在 '%s' 启用"
11022 #: builtin/update-ref.c:9
11023 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11024 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11026 #: builtin/update-ref.c:10
11027 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11028 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
11030 #: builtin/update-ref.c:11
11031 msgid "git update-ref [<options>] --stdin [-z]"
11032 msgstr "git update-ref [<选项>] --stdin [-z]"
11034 #: builtin/update-ref.c:363
11035 msgid "delete the reference"
11038 #: builtin/update-ref.c:365
11039 msgid "update <refname> not the one it points to"
11040 msgstr "更新 <引用名> 本身而不是它指向的引用"
11042 #: builtin/update-ref.c:366
11043 msgid "stdin has NUL-terminated arguments"
11044 msgstr "标准输入有以 NUL 字符终止的参数"
11046 #: builtin/update-ref.c:367
11047 msgid "read updates from stdin"
11050 #: builtin/update-server-info.c:6
11051 msgid "git update-server-info [--force]"
11052 msgstr "git update-server-info [--force]"
11054 #: builtin/update-server-info.c:14
11055 msgid "update the info files from scratch"
11056 msgstr "从头开始更新文件信息"
11058 #: builtin/verify-commit.c:17
11059 msgid "git verify-commit [-v | --verbose] <commit>..."
11060 msgstr "git verify-commit [-v | --verbose] <提交>..."
11062 #: builtin/verify-commit.c:72
11063 msgid "print commit contents"
11066 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
11067 msgid "print raw gpg status output"
11068 msgstr "打印原始 gpg 状态输出"
11070 #: builtin/verify-pack.c:54
11071 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11072 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11074 #: builtin/verify-pack.c:64
11078 #: builtin/verify-pack.c:66
11079 msgid "show statistics only"
11082 #: builtin/verify-tag.c:17
11083 msgid "git verify-tag [-v | --verbose] <tag>..."
11084 msgstr "git verify-tag [-v | --verbose] <标签>..."
11086 #: builtin/verify-tag.c:83
11087 msgid "print tag contents"
11090 #: builtin/worktree.c:15
11091 msgid "git worktree add [<options>] <path> [<branch>]"
11092 msgstr "git worktree add [<选项>] <路径> [<分支>]"
11094 #: builtin/worktree.c:16
11095 msgid "git worktree prune [<options>]"
11096 msgstr "git worktree prune [<选项>]"
11098 #: builtin/worktree.c:17
11099 msgid "git worktree list [<options>]"
11100 msgstr "git worktree list [<选项>]"
11102 #: builtin/worktree.c:39
11104 msgid "Removing worktrees/%s: not a valid directory"
11105 msgstr "删除工作区/%s:不是一个有效的目录"
11107 #: builtin/worktree.c:45
11109 msgid "Removing worktrees/%s: gitdir file does not exist"
11110 msgstr "删除 worktrees/%s:gitdir 文件不存在"
11112 #: builtin/worktree.c:50
11114 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11115 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11117 #: builtin/worktree.c:61
11119 msgid "Removing worktrees/%s: invalid gitdir file"
11120 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11122 #: builtin/worktree.c:77
11124 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11125 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11127 #: builtin/worktree.c:112
11129 msgid "failed to remove: %s"
11132 #: builtin/worktree.c:201
11134 msgid "'%s' already exists"
11137 #: builtin/worktree.c:233
11139 msgid "could not create directory of '%s'"
11140 msgstr "不能创建目录 '%s'"
11142 #: builtin/worktree.c:269
11144 msgid "Preparing %s (identifier %s)"
11145 msgstr "准备 %s (标识符 %s)"
11147 #: builtin/worktree.c:317
11148 msgid "checkout <branch> even if already checked out in other worktree"
11149 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11151 #: builtin/worktree.c:319
11152 msgid "create a new branch"
11155 #: builtin/worktree.c:321
11156 msgid "create or reset a branch"
11159 #: builtin/worktree.c:322
11160 msgid "detach HEAD at named commit"
11161 msgstr "HEAD 从指定的提交分离"
11163 #: builtin/worktree.c:329
11164 msgid "-b, -B, and --detach are mutually exclusive"
11165 msgstr "-b、-B 和 --detach 是互斥的"
11167 #: builtin/write-tree.c:13
11168 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11169 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11171 #: builtin/write-tree.c:26
11175 #: builtin/write-tree.c:27
11176 msgid "write tree object for a subdirectory <prefix>"
11177 msgstr "将 <前缀> 子目录内容写到一个树对象"
11179 #: builtin/write-tree.c:30
11180 msgid "only useful for debugging"
11183 #: credential-cache--daemon.c:262
11184 msgid "print debugging messages to stderr"
11185 msgstr "调试信息输出到标准错误"
11189 "'git help -a' and 'git help -g' list available subcommands and some\n"
11190 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11191 "to read about a specific subcommand or concept."
11193 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11194 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11198 msgid "Public key pinning not supported with cURL < 7.44.0"
11199 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11202 msgid "start a working area (see also: git help tutorial)"
11203 msgstr "开始一个工作区(参见:git help tutorial)"
11205 #: common-cmds.h:10
11206 msgid "work on the current change (see also: git help everyday)"
11207 msgstr "在当前变更上工作(参见:git help everyday)"
11209 #: common-cmds.h:11
11210 msgid "examine the history and state (see also: git help revisions)"
11211 msgstr "检查历史和状态(参见:git help revisions)"
11213 #: common-cmds.h:12
11214 msgid "grow, mark and tweak your common history"
11215 msgstr "扩展、标记和调校您的历史记录"
11217 #: common-cmds.h:13
11218 msgid "collaborate (see also: git help workflows)"
11219 msgstr "协同(参见:git help workflows)"
11221 #: common-cmds.h:17
11222 msgid "Add file contents to the index"
11225 #: common-cmds.h:18
11226 msgid "Use binary search to find the commit that introduced a bug"
11227 msgstr "通过二分查找定位引入 bug 的提交"
11229 #: common-cmds.h:19
11230 msgid "List, create, or delete branches"
11231 msgstr "列出、创建或删除分支"
11233 #: common-cmds.h:20
11234 msgid "Switch branches or restore working tree files"
11235 msgstr "切换分支或恢复工作区文件"
11237 #: common-cmds.h:21
11238 msgid "Clone a repository into a new directory"
11239 msgstr "克隆一个仓库到一个新目录"
11241 #: common-cmds.h:22
11242 msgid "Record changes to the repository"
11245 #: common-cmds.h:23
11246 msgid "Show changes between commits, commit and working tree, etc"
11247 msgstr "显示提交之间、提交和工作区之间等的差异"
11249 #: common-cmds.h:24
11250 msgid "Download objects and refs from another repository"
11251 msgstr "从另外一个仓库下载对象和引用"
11253 #: common-cmds.h:25
11254 msgid "Print lines matching a pattern"
11257 #: common-cmds.h:26
11258 msgid "Create an empty Git repository or reinitialize an existing one"
11259 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11261 #: common-cmds.h:27
11262 msgid "Show commit logs"
11265 #: common-cmds.h:28
11266 msgid "Join two or more development histories together"
11267 msgstr "合并两个或更多开发历史"
11269 #: common-cmds.h:29
11270 msgid "Move or rename a file, a directory, or a symlink"
11271 msgstr "移动或重命名一个文件、目录或符号链接"
11273 #: common-cmds.h:30
11274 msgid "Fetch from and integrate with another repository or a local branch"
11275 msgstr "获取并整合另外的仓库或一个本地分支"
11277 #: common-cmds.h:31
11278 msgid "Update remote refs along with associated objects"
11279 msgstr "更新远程引用和相关的对象"
11281 #: common-cmds.h:32
11282 msgid "Forward-port local commits to the updated upstream head"
11283 msgstr "本地提交转移至更新后的上游分支中"
11285 #: common-cmds.h:33
11286 msgid "Reset current HEAD to the specified state"
11287 msgstr "重置当前 HEAD 到指定状态"
11289 #: common-cmds.h:34
11290 msgid "Remove files from the working tree and from the index"
11291 msgstr "从工作区和索引中删除文件"
11293 #: common-cmds.h:35
11294 msgid "Show various types of objects"
11297 #: common-cmds.h:36
11298 msgid "Show the working tree status"
11301 #: common-cmds.h:37
11302 msgid "Create, list, delete or verify a tag object signed with GPG"
11303 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11305 #: parse-options.h:145
11306 msgid "expiry-date"
11309 #: parse-options.h:160
11310 msgid "no-op (backward compatibility)"
11313 #: parse-options.h:237
11314 msgid "be more verbose"
11317 #: parse-options.h:239
11318 msgid "be more quiet"
11321 #: parse-options.h:245
11322 msgid "use <n> digits to display SHA-1s"
11323 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11326 msgid "update the index with reused conflict resolution if possible"
11327 msgstr "如果可能,重用冲突解决更新索引"
11329 #: git-bisect.sh:55
11330 msgid "You need to start by \"git bisect start\""
11331 msgstr "您需要执行 \"git bisect start\" 来开始"
11334 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11335 #. translation. The program will only accept English input
11337 #: git-bisect.sh:61
11338 msgid "Do you want me to do it for you [Y/n]? "
11339 msgstr "您想让我为您这样做么[Y/n]? "
11341 #: git-bisect.sh:122
11343 msgid "unrecognised option: '$arg'"
11344 msgstr "未能识别的选项:'$arg'"
11346 #: git-bisect.sh:126
11348 msgid "'$arg' does not appear to be a valid revision"
11349 msgstr "'$arg' 看起来不像是一个有效的版本"
11351 #: git-bisect.sh:155
11352 msgid "Bad HEAD - I need a HEAD"
11353 msgstr "坏的 HEAD - 我需要一个 HEAD"
11355 #: git-bisect.sh:168
11358 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11359 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11361 #: git-bisect.sh:178
11362 msgid "won't bisect on cg-seek'ed tree"
11363 msgstr "不会在做了 cg-seek 的树上做二分查找"
11365 #: git-bisect.sh:182
11366 msgid "Bad HEAD - strange symbolic ref"
11367 msgstr "坏的 HEAD - 奇怪的符号引用"
11369 #: git-bisect.sh:234
11371 msgid "Bad bisect_write argument: $state"
11372 msgstr "坏的 bisect_write 参数:$state"
11374 #: git-bisect.sh:263
11376 msgid "Bad rev input: $arg"
11377 msgstr "输入坏的版本:$arg"
11379 #: git-bisect.sh:278
11380 msgid "Please call 'bisect_state' with at least one argument."
11381 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11383 #: git-bisect.sh:290
11385 msgid "Bad rev input: $rev"
11386 msgstr "输入坏的版本:$rev"
11388 #: git-bisect.sh:299
11390 msgid "'git bisect $TERM_BAD' can take only one argument."
11391 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11393 #: git-bisect.sh:322
11395 msgid "Warning: bisecting only with a $TERM_BAD commit."
11396 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11399 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11400 #. translation. The program will only accept English input
11402 #: git-bisect.sh:328
11403 msgid "Are you sure [Y/n]? "
11404 msgstr "您确认么[Y/n]? "
11406 #: git-bisect.sh:340
11409 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11410 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11412 "您需要给我至少一个好版本和一个坏版本。\n"
11413 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11415 #: git-bisect.sh:343
11418 "You need to start by \"git bisect start\".\n"
11419 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11420 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11422 "您需要执行 \"git bisect start\" 来开始。\n"
11423 "然后需要提供我至少一个好版本和一个坏版本。\n"
11424 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11426 #: git-bisect.sh:414 git-bisect.sh:546
11427 msgid "We are not bisecting."
11428 msgstr "我们没有在二分查找。"
11430 #: git-bisect.sh:421
11432 msgid "'$invalid' is not a valid commit"
11433 msgstr "'$invalid' 不是一个有效的提交"
11435 #: git-bisect.sh:430
11438 "Could not check out original HEAD '$branch'.\n"
11439 "Try 'git bisect reset <commit>'."
11441 "不能检出原始 HEAD '$branch'。\n"
11442 "尝试 'git bisect reset <提交>'。"
11444 #: git-bisect.sh:458
11445 msgid "No logfile given"
11448 #: git-bisect.sh:459
11450 msgid "cannot read $file for replaying"
11451 msgstr "不能读取 $file 来重放"
11453 #: git-bisect.sh:480
11454 msgid "?? what are you talking about?"
11457 #: git-bisect.sh:492
11459 msgid "running $command"
11460 msgstr "运行 $command"
11462 #: git-bisect.sh:499
11465 "bisect run failed:\n"
11466 "exit code $res from '$command' is < 0 or >= 128"
11469 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11471 #: git-bisect.sh:525
11472 msgid "bisect run cannot continue any more"
11473 msgstr "二分查找不能继续运行"
11475 #: git-bisect.sh:531
11478 "bisect run failed:\n"
11479 "'bisect_state $state' exited with error code $res"
11482 "'bisect_state $state' 退出码为 $res"
11484 #: git-bisect.sh:538
11485 msgid "bisect run success"
11488 #: git-bisect.sh:565
11489 msgid "please use two different terms"
11490 msgstr "请使用两个不同的术语"
11492 #: git-bisect.sh:575
11494 msgid "'$term' is not a valid term"
11495 msgstr "'$term' 不是一个有效的名称"
11497 #: git-bisect.sh:578
11499 msgid "can't use the builtin command '$term' as a term"
11500 msgstr "不能使用内置命令 '$term' 作为术语"
11502 #: git-bisect.sh:587 git-bisect.sh:593
11504 msgid "can't change the meaning of term '$term'"
11505 msgstr "不能修改术语 '$term' 的含义"
11507 #: git-bisect.sh:606
11509 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11510 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11512 #: git-bisect.sh:636
11513 msgid "no terms defined"
11516 #: git-bisect.sh:653
11519 "invalid argument $arg for 'git bisect terms'.\n"
11520 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11522 "参数 $arg 对命令 'git bisect terms' 无效。\n"
11523 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11525 #: git-rebase.sh:57
11527 "When you have resolved this problem, run \"git rebase --continue\".\n"
11528 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11529 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11532 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11533 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11534 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11536 #: git-rebase.sh:165
11537 msgid "Applied autostash."
11538 msgstr "成功应用 autostash。"
11540 #: git-rebase.sh:168
11542 msgid "Cannot store $stash_sha1"
11543 msgstr "无法保存 $stash_sha1"
11545 #: git-rebase.sh:169
11547 "Applying autostash resulted in conflicts.\n"
11548 "Your changes are safe in the stash.\n"
11549 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11551 "应用 autostash 导致冲突。\n"
11552 "您的修改安全地保存在 stash 中。\n"
11553 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11555 #: git-rebase.sh:208
11556 msgid "The pre-rebase hook refused to rebase."
11557 msgstr "钩子 pre-rebase 拒绝变基操作。"
11559 #: git-rebase.sh:213
11560 msgid "It looks like git-am is in progress. Cannot rebase."
11561 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11563 #: git-rebase.sh:354
11564 msgid "The --exec option must be used with the --interactive option"
11565 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11567 #: git-rebase.sh:359
11568 msgid "No rebase in progress?"
11569 msgstr "没有正在进行的变基?"
11571 #: git-rebase.sh:370
11572 msgid "The --edit-todo action can only be used during interactive rebase."
11573 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11575 #: git-rebase.sh:377
11576 msgid "Cannot read HEAD"
11579 #: git-rebase.sh:380
11581 "You must edit all merge conflicts and then\n"
11582 "mark them as resolved using git add"
11584 "您必须编辑所有的合并冲突,然后通过 git add\n"
11587 #: git-rebase.sh:398
11589 msgid "Could not move back to $head_name"
11590 msgstr "无法移回 $head_name"
11592 #: git-rebase.sh:417
11595 "It seems that there is already a $state_dir_base directory, and\n"
11596 "I wonder if you are in the middle of another rebase. If that is the\n"
11597 "case, please try\n"
11598 "\t$cmd_live_rebase\n"
11599 "If that is not the case, please\n"
11600 "\t$cmd_clear_stale_rebase\n"
11601 "and run me again. I am stopping in case you still have something\n"
11604 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11606 "\t$cmd_live_rebase\n"
11608 "\t$cmd_clear_stale_rebase\n"
11609 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11611 #: git-rebase.sh:468
11613 msgid "invalid upstream $upstream_name"
11614 msgstr "无效的上游 $upstream_name"
11616 #: git-rebase.sh:492
11618 msgid "$onto_name: there are more than one merge bases"
11619 msgstr "$onto_name: 有一个以上的合并基准"
11621 #: git-rebase.sh:495 git-rebase.sh:499
11623 msgid "$onto_name: there is no merge base"
11624 msgstr "$onto_name: 没有合并基准"
11626 #: git-rebase.sh:504
11628 msgid "Does not point to a valid commit: $onto_name"
11629 msgstr "没有指向一个有效的提交:$onto_name"
11631 #: git-rebase.sh:527
11633 msgid "fatal: no such branch: $branch_name"
11634 msgstr "严重错误:无此分支:$branch_name"
11636 #: git-rebase.sh:560
11637 msgid "Cannot autostash"
11638 msgstr "无法 autostash"
11640 #: git-rebase.sh:565
11642 msgid "Created autostash: $stash_abbrev"
11643 msgstr "创建了 autostash: $stash_abbrev"
11645 #: git-rebase.sh:569
11646 msgid "Please commit or stash them."
11647 msgstr "请提交或为它们保存进度。"
11649 #: git-rebase.sh:589
11651 msgid "Current branch $branch_name is up to date."
11652 msgstr "当前分支 $branch_name 是最新的。"
11654 #: git-rebase.sh:593
11656 msgid "Current branch $branch_name is up to date, rebase forced."
11657 msgstr "当前分支 $branch_name 是最新的,强制变基。"
11659 #: git-rebase.sh:604
11661 msgid "Changes from $mb to $onto:"
11662 msgstr "变更从 $mb 到 $onto:"
11664 #: git-rebase.sh:613
11665 msgid "First, rewinding head to replay your work on top of it..."
11666 msgstr "首先,回退分支以便在上面重放您的工作..."
11668 #: git-rebase.sh:623
11670 msgid "Fast-forwarded $branch_name to $onto_name."
11671 msgstr "快进 $branch_name 至 $onto_name。"
11674 msgid "git stash clear with parameters is unimplemented"
11675 msgstr "git stash clear 不支持参数"
11678 msgid "You do not have the initial commit yet"
11682 msgid "Cannot save the current index state"
11683 msgstr "无法保存当前索引状态"
11685 #: git-stash.sh:124 git-stash.sh:137
11686 msgid "Cannot save the current worktree state"
11687 msgstr "无法保存当前工作区状态"
11689 #: git-stash.sh:141
11690 msgid "No changes selected"
11693 #: git-stash.sh:144
11694 msgid "Cannot remove temporary index (can't happen)"
11695 msgstr "无法删除临时索引(不应发生)"
11697 #: git-stash.sh:157
11698 msgid "Cannot record working tree state"
11701 #: git-stash.sh:189
11703 msgid "Cannot update $ref_stash with $w_commit"
11704 msgstr "无法用 $w_commit 更新 $ref_stash"
11706 #. TRANSLATORS: $option is an invalid option, like
11707 #. `--blah-blah'. The 7 spaces at the beginning of the
11708 #. second line correspond to "error: ". So you should line
11709 #. up the second line with however many characters the
11710 #. translation of "error: " takes in your language. E.g. in
11711 #. English this is:
11713 #. $ git stash save --blah-blah 2>&1 | head -n 2
11714 #. error: unknown option for 'stash save': --blah-blah
11715 #. To provide a message, use git stash save -- '--blah-blah'
11716 #: git-stash.sh:239
11719 "error: unknown option for 'stash save': $option\n"
11720 " To provide a message, use git stash save -- '$option'"
11722 "错误:'stash save' 的未知选项:$option\n"
11723 " 要提供一个描述信息,使用 git stash save -- '$option'"
11725 #: git-stash.sh:260
11726 msgid "No local changes to save"
11727 msgstr "没有要保存的本地修改"
11729 #: git-stash.sh:264
11730 msgid "Cannot initialize stash"
11731 msgstr "无法初始化 stash"
11733 #: git-stash.sh:268
11734 msgid "Cannot save the current status"
11737 #: git-stash.sh:286
11738 msgid "Cannot remove worktree changes"
11741 #: git-stash.sh:405
11743 msgid "unknown option: $opt"
11744 msgstr "未知选项: $opt"
11746 #: git-stash.sh:415
11747 msgid "No stash found."
11748 msgstr "未发现 stash。"
11750 #: git-stash.sh:422
11752 msgid "Too many revisions specified: $REV"
11753 msgstr "指定了太多的版本:$REV"
11755 #: git-stash.sh:428
11757 msgid "$reference is not a valid reference"
11758 msgstr "$reference 不是一个有效的引用"
11760 #: git-stash.sh:456
11762 msgid "'$args' is not a stash-like commit"
11763 msgstr "'$args' 不是 stash 样提交"
11765 #: git-stash.sh:467
11767 msgid "'$args' is not a stash reference"
11768 msgstr "'$args' 不是一个 stash 引用"
11770 #: git-stash.sh:475
11771 msgid "unable to refresh index"
11774 #: git-stash.sh:479
11775 msgid "Cannot apply a stash in the middle of a merge"
11776 msgstr "无法在合并过程中恢复进度"
11778 #: git-stash.sh:487
11779 msgid "Conflicts in index. Try without --index."
11780 msgstr "索引中有冲突。尝试不使用 --index。"
11782 #: git-stash.sh:489
11783 msgid "Could not save index tree"
11786 #: git-stash.sh:523
11787 msgid "Cannot unstage modified files"
11788 msgstr "无法将修改的文件取消暂存"
11790 #: git-stash.sh:538
11791 msgid "Index was not unstashed."
11792 msgstr "索引的进度没有被恢复。"
11794 #: git-stash.sh:561
11796 msgid "Dropped ${REV} ($s)"
11797 msgstr "丢弃了 ${REV} ($s)"
11799 #: git-stash.sh:562
11801 msgid "${REV}: Could not drop stash entry"
11802 msgstr "${REV}:不能丢弃进度条目"
11804 #: git-stash.sh:570
11805 msgid "No branch name specified"
11808 #: git-stash.sh:642
11809 msgid "(To restore them type \"git stash apply\")"
11810 msgstr "(为恢复数据输入 \"git stash apply\")"
11812 #: git-submodule.sh:104
11814 msgid "cannot strip one component off url '$remoteurl'"
11815 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11817 #: git-submodule.sh:281
11818 msgid "Relative path can only be used from the toplevel of the working tree"
11819 msgstr "只能在工作区的顶级目录中使用相对路径"
11821 #: git-submodule.sh:291
11823 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11824 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11826 #: git-submodule.sh:308
11828 msgid "'$sm_path' already exists in the index"
11829 msgstr "'$sm_path' 已经存在于索引中"
11831 #: git-submodule.sh:312
11834 "The following path is ignored by one of your .gitignore files:\n"
11836 "Use -f if you really want to add it."
11838 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11840 "如果您确实想添加它,使用 -f 参数。"
11842 #: git-submodule.sh:330
11844 msgid "Adding existing repo at '$sm_path' to the index"
11845 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11847 #: git-submodule.sh:332
11849 msgid "'$sm_path' already exists and is not a valid git repo"
11850 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11852 #: git-submodule.sh:340
11854 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11855 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11857 #: git-submodule.sh:342
11860 "If you want to reuse this local git directory instead of cloning again from"
11861 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11863 #: git-submodule.sh:344
11866 "use the '--force' option. If the local git directory is not the correct repo"
11867 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11869 #: git-submodule.sh:345
11872 "or you are unsure what this means choose another name with the '--name' "
11874 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11876 #: git-submodule.sh:347
11878 msgid "Reactivating local git directory for submodule '$sm_name'."
11879 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11881 #: git-submodule.sh:359
11883 msgid "Unable to checkout submodule '$sm_path'"
11884 msgstr "不能检出子模组 '$sm_path'"
11886 #: git-submodule.sh:364
11888 msgid "Failed to add submodule '$sm_path'"
11889 msgstr "无法添加子模组 '$sm_path'"
11891 #: git-submodule.sh:373
11893 msgid "Failed to register submodule '$sm_path'"
11894 msgstr "无法注册子模组 '$sm_path'"
11896 #: git-submodule.sh:417
11898 msgid "Entering '$prefix$displaypath'"
11899 msgstr "正在进入 '$prefix$displaypath'"
11901 #: git-submodule.sh:437
11903 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11904 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
11906 #: git-submodule.sh:483
11908 msgid "No url found for submodule path '$displaypath' in .gitmodules"
11909 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
11911 #: git-submodule.sh:492
11913 msgid "Failed to register url for submodule path '$displaypath'"
11914 msgstr "无法为子模组路径 '$displaypath' 注册 url"
11916 #: git-submodule.sh:494
11918 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11919 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11921 #: git-submodule.sh:511
11923 msgid "Failed to register update mode for submodule path '$displaypath'"
11924 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
11926 #: git-submodule.sh:549
11928 msgid "Use '.' if you really want to deinitialize all submodules"
11929 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11931 #: git-submodule.sh:566
11933 msgid "Submodule work tree '$displaypath' contains a .git directory"
11934 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
11936 #: git-submodule.sh:567
11939 "(use 'rm -rf' if you really want to remove it including all of its history)"
11940 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11942 #: git-submodule.sh:573
11945 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
11947 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
11949 #: git-submodule.sh:576
11951 msgid "Cleared directory '$displaypath'"
11952 msgstr "已清除目录 '$displaypath'"
11954 #: git-submodule.sh:577
11956 msgid "Could not remove submodule work tree '$displaypath'"
11957 msgstr "无法移除子模组工作区 '$displaypath'"
11959 #: git-submodule.sh:580
11961 msgid "Could not create empty submodule directory '$displaypath'"
11962 msgstr "不能创建空的子模组目录 '$displaypath'"
11964 #: git-submodule.sh:589
11966 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11967 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
11969 #: git-submodule.sh:723
11972 "Submodule path '$displaypath' not initialized\n"
11973 "Maybe you want to use 'update --init'?"
11975 "子模组路径 '$displaypath' 没有初始化\n"
11976 "也许您想用 'update --init'?"
11978 #: git-submodule.sh:736
11980 msgid "Unable to find current revision in submodule path '$displaypath'"
11981 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
11983 #: git-submodule.sh:745
11985 msgid "Unable to fetch in submodule path '$sm_path'"
11986 msgstr "无法在子模组路径 '$sm_path' 中获取"
11988 #: git-submodule.sh:768
11990 msgid "Unable to fetch in submodule path '$displaypath'"
11991 msgstr "无法在子模组路径 '$displaypath' 中获取"
11993 #: git-submodule.sh:788
11995 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11996 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11998 #: git-submodule.sh:789
12000 msgid "Submodule path '$displaypath': checked out '$sha1'"
12001 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12003 #: git-submodule.sh:793
12005 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12006 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12008 #: git-submodule.sh:794
12010 msgid "Submodule path '$displaypath': rebased into '$sha1'"
12011 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12013 #: git-submodule.sh:799
12015 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12016 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12018 #: git-submodule.sh:800
12020 msgid "Submodule path '$displaypath': merged in '$sha1'"
12021 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12023 #: git-submodule.sh:805
12026 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
12027 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
12029 #: git-submodule.sh:806
12031 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
12032 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
12034 #: git-submodule.sh:836
12036 msgid "Failed to recurse into submodule path '$displaypath'"
12037 msgstr "无法递归进子模组路径 '$displaypath'"
12039 #: git-submodule.sh:944
12040 msgid "The --cached option cannot be used with the --files option"
12041 msgstr "选项 --cached 不能和选项 --files 同时使用"
12043 #: git-submodule.sh:996
12045 msgid "unexpected mode $mod_dst"
12046 msgstr "意外的模式 $mod_dst"
12049 #: git-submodule.sh:1016
12051 msgid " Warn: $display_name doesn't contain commit $sha1_src"
12052 msgstr " 警告:$display_name 未包含提交 $sha1_src"
12055 #: git-submodule.sh:1019
12057 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12058 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
12061 #: git-submodule.sh:1022
12063 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12064 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12066 #: git-submodule.sh:1047
12070 #: git-submodule.sh:1165
12072 msgid "Failed to recurse into submodule path '$sm_path'"
12073 msgstr "无法递归进子模组路径 '$sm_path'"
12075 #: git-submodule.sh:1229
12077 msgid "Synchronizing submodule url for '$displaypath'"
12078 msgstr "为 '$displaypath' 同步子模组 url"
12080 #~ msgid "unable to parse format"
12083 #~ msgid "improper format entered align:%s"
12084 #~ msgstr "输入了不正确的格式 align:%s"
12086 #~ msgid "Could not set core.worktree in %s"
12087 #~ msgstr "不能在 %s 中设置 core.worktree"
12089 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
12091 #~ "push.default is unset; its implicit value has changed in\n"
12092 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
12093 #~ "and maintain the traditional behavior, use:\n"
12095 #~ " git config --global push.default matching\n"
12097 #~ "To squelch this message and adopt the new behavior now, use:\n"
12099 #~ " git config --global push.default simple\n"
12101 #~ "When push.default is set to 'matching', git will push local branches\n"
12102 #~ "to the remote branches that already exist with the same name.\n"
12104 #~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
12105 #~ "behavior, which only pushes the current branch to the corresponding\n"
12106 #~ "remote branch that 'git pull' uses to update the current branch.\n"
12108 #~ "See 'git help config' and search for 'push.default' for further "
12109 #~ "information.\n"
12110 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
12111 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
12113 #~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
12114 #~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
12116 #~ " git config --global push.default matching\n"
12118 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
12120 #~ " git config --global push.default simple\n"
12122 #~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
12125 #~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
12126 #~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
12128 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
12129 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
12130 #~ "为保持兼容,请用 'current' 代替 'simple')"
12132 #~ msgid "Could not append '%s'"
12133 #~ msgstr "不能追加 '%s'"
12135 #~ msgid "Could not set '%s'"
12136 #~ msgstr "不能设置 '%s'"
12139 #~ msgid "check|on-demand|no"
12140 #~ msgstr "check|on-demand|no"
12142 #~ msgid "Missing author: %s"
12143 #~ msgstr "缺少作者:%s"
12145 #~ msgid "Testing "
12148 #~ msgid "unable to look up current user in the passwd file: %s"
12149 #~ msgstr "无法在口令文件中查询到当前用户:%s"
12151 #~ msgid "no such user"
12154 #~ msgid "show usage"
12157 #~ msgid "branch '%s' does not point at a commit"
12158 #~ msgstr "分支 '%s' 未指向一个提交"
12160 #~ msgid "object '%s' does not point to a commit"
12161 #~ msgstr "对象 '%s' 没有指向一个提交"
12163 #~ msgid "print only merged branches"
12164 #~ msgstr "只打印合并的分支"
12166 #~ msgid "--dissociate given, but there is no --reference"
12167 #~ msgstr "提供了参数 --dissociate,但未提供 --reference"
12169 #~ msgid "insanely long template name %s"
12170 #~ msgstr "太长的模版名 %s"
12172 #~ msgid "insanely long symlink %s"
12173 #~ msgstr "太长的符号链接 %s"
12175 #~ msgid "insanely long template path %s"
12176 #~ msgstr "太长的模版路径 %s"
12178 #~ msgid "insane git directory %s"
12179 #~ msgstr "不正常的 git 目录 %s"
12181 #~ msgid "unsupported sort specification '%s'"
12182 #~ msgstr "不支持的排序规格 '%s'"
12184 #~ msgid "unsupported sort specification '%s' in variable '%s'"
12185 #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12187 #~ msgid "switch 'points-at' requires an object"
12188 #~ msgstr "开关 'points-at' 需要一个对象"
12190 #~ msgid "sort tags"
12193 #~ msgid "--sort and -n are incompatible"
12194 #~ msgstr "--sort 和 -n 不兼容"
12196 #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12197 #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12199 #~ msgid "false|true|preserve"
12200 #~ msgstr "false|true|preserve"
12202 #~ msgid "BUG: reopen a lockfile that is still open"
12203 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12205 #~ msgid "BUG: reopen a lockfile that has been committed"
12206 #~ msgstr "BUG: 重新打开一个已提交的锁文件"
12208 #~ msgid "option %s does not accept negative form"
12209 #~ msgstr "选项 %s 不接受否定格式"
12211 #~ msgid "unable to parse value '%s' for option %s"
12212 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12214 #~ msgid "unable to resolve HEAD"
12215 #~ msgstr "不能解析 HEAD"
12217 #~ msgid "-b and -B are mutually exclusive"
12218 #~ msgstr "-b 和 -B 互斥"
12220 #~ msgid "You need to set your committer info first"
12221 #~ msgstr "您需要先设置你的提交者信息"
12224 #~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12225 #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12226 #~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12229 #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12230 #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12231 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12233 #~ msgid "Patch format $patch_format is not supported."
12234 #~ msgstr "不支持 $patch_format 补丁格式。"
12236 #~ msgid "Please make up your mind. --skip or --abort?"
12237 #~ msgstr "请下决心。--skip 或是 --abort ?"
12240 #~ "Patch is empty. Was it split wrong?\n"
12241 #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12242 #~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12244 #~ "补丁为空。是不是切分错误?\n"
12245 #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12246 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12248 #~ msgid "Patch does not have a valid e-mail address."
12249 #~ msgstr "补丁中没有一个有效的邮件地址。"
12251 #~ msgid "Applying: $FIRSTLINE"
12252 #~ msgstr "正应用:$FIRSTLINE"
12254 #~ msgid "Patch failed at $msgnum $FIRSTLINE"
12255 #~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12258 #~ "Pull is not possible because you have unmerged files.\n"
12259 #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12260 #~ "as appropriate to mark resolution and make a commit."
12262 #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12263 #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12265 #~ msgid "Pull is not possible because you have unmerged files."
12266 #~ msgstr "Pull 不可用,因为您尚有未合并的文件。"