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-03-16 00:16+0800\n"
139 "PO-Revision-Date: 2016-03-16 00:18+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 "%%(body) does not take arguments"
1256 msgstr "%%(body) 不带参数"
1260 msgid "%%(subject) does not take arguments"
1261 msgstr "%%(subject) 不带参数"
1265 msgid "positive value expected contents:lines=%s"
1266 msgstr "要为 contents:lines=%s 提供一个正数"
1270 msgid "unrecognized %%(contents) argument: %s"
1271 msgstr "未能识别的 %%(contents) 参数:%s"
1275 msgid "unrecognized %%(objectname) argument: %s"
1276 msgstr "未能识别的 %%(objectname) 参数:%s"
1280 msgid "expected format: %%(align:<width>,<position>)"
1281 msgstr "期望的格式:%%(align:<width>,<position>)"
1285 msgid "unrecognized position:%s"
1290 msgid "unrecognized width:%s"
1295 msgid "unrecognized %%(align) argument: %s"
1296 msgstr "未能识别的 %%(align) 参数:%s"
1300 msgid "positive width expected with the %%(align) atom"
1301 msgstr "元素 %%(align) 需要一个正数的宽度"
1305 msgid "malformed field name: %.*s"
1306 msgstr "非法的字段名:%.*s"
1310 msgid "unknown field name: %.*s"
1311 msgstr "未知的字段名:%.*s"
1315 msgid "format: %%(end) atom used without corresponding atom"
1316 msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
1320 msgid "malformed format string %s"
1321 msgstr "非法的格式化字符串 %s"
1324 msgid ":strip= requires a positive integer argument"
1325 msgstr ":strip= 需要一个正整型参数"
1329 msgid "ref '%s' does not have %ld components to :strip"
1330 msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
1332 #: ref-filter.c:1046
1334 msgid "unknown %.*s format %s"
1335 msgstr "未知的 %.*s 格式 %s"
1337 #: ref-filter.c:1066 ref-filter.c:1097
1339 msgid "missing object %s for %s"
1340 msgstr "缺失 %2$s 的对象 %1$s"
1342 #: ref-filter.c:1069 ref-filter.c:1100
1344 msgid "parse_object_buffer failed on %s for %s"
1345 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
1347 #: ref-filter.c:1311
1349 msgid "malformed object at '%s'"
1350 msgstr "非法的对象于 '%s'"
1352 #: ref-filter.c:1373
1354 msgid "ignoring ref with broken name %s"
1355 msgstr "忽略带有错误名称 %s 的引用"
1357 #: ref-filter.c:1378
1359 msgid "ignoring broken ref %s"
1362 #: ref-filter.c:1651
1364 msgid "format: %%(end) atom missing"
1365 msgstr "格式:缺少 %%(end) 元素"
1367 #: ref-filter.c:1705
1369 msgid "malformed object name %s"
1374 msgid "Cannot fetch both %s and %s to %s"
1375 msgstr "不能同时获取 %s 和 %s 至 %s"
1379 msgid "%s usually tracks %s, not %s"
1380 msgstr "%s 通常跟踪 %s,而非 %s"
1384 msgid "%s tracks both %s and %s"
1385 msgstr "%s 同时跟踪 %s 和 %s"
1388 msgid "Internal error"
1391 #: remote.c:1677 remote.c:1720
1392 msgid "HEAD does not point to a branch"
1393 msgstr "HEAD 没有指向一个分支"
1397 msgid "no such branch: '%s'"
1402 msgid "no upstream configured for branch '%s'"
1403 msgstr "尚未给分支 '%s' 设置上游"
1407 msgid "upstream branch '%s' not stored as a remote-tracking branch"
1408 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1412 msgid "push destination '%s' on remote '%s' has no local tracking branch"
1413 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1417 msgid "branch '%s' has no remote for pushing"
1418 msgstr "分支 '%s' 没有设置要推送的远程服务器"
1422 msgid "push refspecs for '%s' do not include '%s'"
1423 msgstr "向 '%s' 推送引用规格未包含 '%s'"
1426 msgid "push has no destination (push.default is 'nothing')"
1427 msgstr "推送无目标(push.default 是 'nothing')"
1430 msgid "cannot resolve 'simple' push to a single destination"
1431 msgstr "无法解析 'simple' 推送至一个单独的目标"
1435 msgid "Your branch is based on '%s', but the upstream is gone.\n"
1436 msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1439 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1440 msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1444 msgid "Your branch is up-to-date with '%s'.\n"
1445 msgstr "您的分支与上游分支 '%s' 一致。\n"
1449 msgid "Your branch is ahead of '%s' by %d commit.\n"
1450 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1451 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
1452 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
1455 msgid " (use \"git push\" to publish your local commits)\n"
1456 msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1460 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1462 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
1463 msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1464 msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
1468 msgid " (use \"git pull\" to update your local branch)\n"
1469 msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1474 "Your branch and '%s' have diverged,\n"
1475 "and have %d and %d different commit each, respectively.\n"
1477 "Your branch and '%s' have diverged,\n"
1478 "and have %d and %d different commits each, respectively.\n"
1480 "您的分支和 '%s' 出现了偏离,\n"
1481 "并且分别有 %d 和 %d 处不同的提交。\n"
1483 "您的分支和 '%s' 出现了偏离,\n"
1484 "并且分别有 %d 和 %d 处不同的提交。\n"
1488 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1489 msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1492 msgid "your current branch appears to be broken"
1493 msgstr "您的当前分支好像被损坏"
1497 msgid "your current branch '%s' does not have any commits yet"
1498 msgstr "您的当前分支 '%s' 尚无任何提交"
1501 msgid "--first-parent is incompatible with --bisect"
1502 msgstr "--first-parent 与 --bisect 不兼容"
1505 msgid "open /dev/null failed"
1506 msgstr "不能打开 /dev/null"
1510 msgid "dup2(%d,%d) failed"
1511 msgstr "不能调用 dup2(%d,%d)"
1514 msgid "failed to sign the push certificate"
1518 msgid "the receiving end does not support --signed push"
1523 "not sending a push certificate since the receiving end does not support --"
1525 msgstr "未发送推送证书,因为接收端不支持签名推送"
1528 msgid "the receiving end does not support --atomic push"
1533 "after resolving the conflicts, mark the corrected paths\n"
1534 "with 'git add <paths>' or 'git rm <paths>'"
1536 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1541 "after resolving the conflicts, mark the corrected paths\n"
1542 "with 'git add <paths>' or 'git rm <paths>'\n"
1543 "and commit the result with 'git commit'"
1545 "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
1546 "对修正后的文件做标记,然后用 'git commit' 提交"
1548 #: sequencer.c:190 sequencer.c:833 sequencer.c:913
1550 msgid "Could not write to %s"
1555 msgid "Error wrapping up %s"
1559 msgid "Your local changes would be overwritten by cherry-pick."
1560 msgstr "您的本地修改将被拣选操作覆盖。"
1563 msgid "Your local changes would be overwritten by revert."
1564 msgstr "您的本地修改将被还原操作覆盖。"
1567 msgid "Commit your changes or stash them to proceed."
1568 msgstr "提交您的修改或保存进度后再继续。"
1570 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
1573 msgid "%s: Unable to write new index file"
1574 msgstr "%s:无法写入新索引文件"
1577 msgid "Could not resolve HEAD commit\n"
1578 msgstr "不能解析 HEAD 提交\n"
1581 msgid "Unable to update cache tree\n"
1586 msgid "Could not parse commit %s\n"
1587 msgstr "不能解析提交 %s\n"
1591 msgid "Could not parse parent commit %s\n"
1592 msgstr "不能解析父提交 %s\n"
1595 msgid "Your index file is unmerged."
1596 msgstr "您的索引文件未完成合并。"
1600 msgid "Commit %s is a merge but no -m option was given."
1601 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1605 msgid "Commit %s does not have parent %d"
1606 msgstr "提交 %s 没有父提交 %d"
1610 msgid "Mainline was specified but commit %s is not a merge."
1611 msgstr "指定了主线但提交 %s 不是一个合并。"
1613 #. TRANSLATORS: The first %s will be "revert" or
1614 #. "cherry-pick", the second %s a SHA1
1617 msgid "%s: cannot parse parent commit %s"
1618 msgstr "%s:不能解析父提交 %s"
1622 msgid "Cannot get commit message for %s"
1623 msgstr "不能得到 %s 的提交说明"
1627 msgid "could not revert %s... %s"
1628 msgstr "不能还原 %s... %s"
1632 msgid "could not apply %s... %s"
1633 msgstr "不能应用 %s... %s"
1636 msgid "empty commit set passed"
1641 msgid "git %s: failed to read the index"
1642 msgstr "git %s:无法读取索引"
1646 msgid "git %s: failed to refresh the index"
1647 msgstr "git %s:无法刷新索引"
1651 msgid "Cannot %s during a %s"
1652 msgstr "无法 %s 在一个 %s 过程中"
1656 msgid "Could not parse line %d."
1657 msgstr "不能解析第 %d 行。"
1660 msgid "No commits parsed."
1665 msgid "Could not open %s"
1670 msgid "Could not read %s."
1675 msgid "Unusable instruction sheet: %s"
1680 msgid "Invalid key: %s"
1683 #: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52
1685 msgid "Invalid value for %s: %s"
1690 msgid "Malformed options sheet: %s"
1694 msgid "a cherry-pick or revert is already in progress"
1695 msgstr "一个拣选或还原操作已在进行"
1698 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1699 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1703 msgid "Could not create sequencer directory %s"
1704 msgstr "不能创建序列目录 %s"
1706 #: sequencer.c:835 sequencer.c:917
1708 msgid "Error wrapping up %s."
1711 #: sequencer.c:854 sequencer.c:987
1712 msgid "no cherry-pick or revert in progress"
1713 msgstr "拣选或还原操作并未进行"
1716 msgid "cannot resolve HEAD"
1720 msgid "cannot abort from a branch yet to be born"
1721 msgstr "不能从尚未建立的分支终止"
1723 #: sequencer.c:878 builtin/apply.c:4287
1725 msgid "cannot open %s: %s"
1730 msgid "cannot read %s: %s"
1734 msgid "unexpected end of file"
1739 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1740 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1744 msgid "Could not format %s."
1749 msgid "%s: can't cherry-pick a %s"
1750 msgstr "%s:不能拣选一个%s"
1754 msgid "%s: bad revision"
1758 msgid "Can't revert as initial commit"
1762 msgid "Can't cherry-pick into empty head"
1767 msgid "failed to read %s"
1771 msgid "offset before end of packfile (broken .idx?)"
1772 msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
1776 msgid "offset before start of pack index for %s (corrupt index?)"
1777 msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
1781 msgid "offset beyond end of pack index for %s (truncated index?)"
1782 msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
1786 "Git normally never creates a ref that ends with 40 hex characters\n"
1787 "because it will be ignored when you just specify 40-hex. These refs\n"
1788 "may be created by mistake. For example,\n"
1790 " git checkout -b $br $(git rev-parse ...)\n"
1792 "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1793 "examine these refs and maybe delete them. Turn this message off by\n"
1794 "running \"git config advice.objectNameWarning false\""
1796 "Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1797 "十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1799 " git checkout -b $br $(git rev-parse ...)\n"
1801 "当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
1802 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
1805 #: submodule.c:62 submodule.c:96
1806 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1807 msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1809 #: submodule.c:66 submodule.c:100
1811 msgid "Could not find section in .gitmodules where path=%s"
1812 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1816 msgid "Could not update .gitmodules entry %s"
1817 msgstr "不能更新 .gitmodules 条目 %s"
1821 msgid "Could not remove .gitmodules entry for %s"
1822 msgstr "无法移除 %s 的 .gitmodules 条目"
1825 msgid "staging updated .gitmodules failed"
1826 msgstr "将更新后 .gitmodules 添加暂存区失败"
1830 msgid "running trailer command '%s' failed"
1831 msgstr "执行 trailer 命令 '%s' 失败"
1833 #: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558
1836 msgid "unknown value '%s' for key '%s'"
1837 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1839 #: trailer.c:544 trailer.c:549 builtin/remote.c:289
1841 msgid "more than one %s"
1846 msgid "empty trailer token in trailer '%.*s'"
1847 msgstr "签名 '%.*s' 的键为空"
1851 msgid "could not read input file '%s'"
1852 msgstr "不能读取输入文件 '%s'"
1855 msgid "could not read from stdin"
1858 #: trailer.c:857 builtin/am.c:42
1860 msgid "could not stat %s"
1861 msgstr "不能获取 %s 的文件状态"
1865 msgid "file %s is not a regular file"
1866 msgstr "文件 %s 不是一个正规文件"
1870 msgid "file %s is not writable by user"
1871 msgstr "文件 %s 用户不可写"
1874 msgid "could not open temporary file"
1879 msgid "could not rename temporary file to %s"
1880 msgstr "不能重命名临时文件为 %s"
1882 #: transport-helper.c:1041
1884 msgid "Could not read ref %s"
1887 #: unpack-trees.c:203
1888 msgid "Checking out files"
1892 msgid "invalid URL scheme name or missing '://' suffix"
1893 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1895 #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1897 msgid "invalid %XX escape sequence"
1898 msgstr "无效的 %XX 转义序列"
1901 msgid "missing host and scheme is not 'file:'"
1902 msgstr "缺失主机名且 URL 方案不是 'file:'"
1905 msgid "a 'file:' URL may not have a port number"
1906 msgstr "一个 'file:' URL 不应该包含端口号"
1909 msgid "invalid characters in host name"
1910 msgstr "主机名中包含无效的字符"
1912 #: urlmatch.c:244 urlmatch.c:255
1913 msgid "invalid port number"
1917 msgid "invalid '..' path segment"
1918 msgstr "无效的 '..' 路径片段"
1920 #: wrapper.c:222 wrapper.c:381
1922 msgid "could not open '%s' for reading and writing"
1923 msgstr "无法打开 '%s' 进行读写"
1925 #: wrapper.c:224 wrapper.c:383
1927 msgid "could not open '%s' for writing"
1928 msgstr "无法打开 '%s' 进行写入"
1930 #: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691
1931 #: builtin/merge.c:1075 builtin/pull.c:387
1933 msgid "could not open '%s' for reading"
1934 msgstr "无法打开 '%s' 进行读取"
1938 msgid "unable to access '%s': %s"
1939 msgstr "不能访问 '%s':%s"
1943 msgid "unable to access '%s'"
1947 msgid "unable to get current working directory"
1952 msgid "could not open %s for writing"
1955 #: wrapper.c:678 builtin/am.c:410
1957 msgid "could not write to %s"
1962 msgid "could not close %s"
1966 msgid "Unmerged paths:"
1970 #: wt-status.c:176 wt-status.c:203
1972 msgid " (use \"git reset %s <file>...\" to unstage)"
1973 msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
1976 #: wt-status.c:178 wt-status.c:205
1977 msgid " (use \"git rm --cached <file>...\" to unstage)"
1978 msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
1982 msgid " (use \"git add <file>...\" to mark resolution)"
1983 msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
1986 #: wt-status.c:184 wt-status.c:188
1987 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1988 msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
1992 msgid " (use \"git rm <file>...\" to mark resolution)"
1993 msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
1995 #: wt-status.c:197 wt-status.c:880
1996 msgid "Changes to be committed:"
1999 #: wt-status.c:215 wt-status.c:889
2000 msgid "Changes not staged for commit:"
2001 msgstr "尚未暂存以备提交的变更:"
2005 msgid " (use \"git add <file>...\" to update what will be committed)"
2006 msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
2010 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
2011 msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
2016 " (use \"git checkout -- <file>...\" to discard changes in working directory)"
2017 msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
2021 msgid " (commit or discard the untracked or modified content in submodules)"
2022 msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
2027 msgid " (use \"git %s <file>...\" to include in what will be committed)"
2028 msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
2031 msgid "both deleted:"
2035 msgid "added by us:"
2039 msgid "deleted by them:"
2043 msgid "added by them:"
2047 msgid "deleted by us:"
2055 msgid "both modified:"
2060 msgid "bug: unhandled unmerged status %x"
2061 msgstr "bug:无法处理的未合并状态 %x"
2095 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2097 msgid "new commits, "
2100 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2102 msgid "modified content, "
2105 # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2107 msgid "untracked content, "
2112 msgid "bug: unhandled diff status %c"
2113 msgstr "bug:无法处理的差异状态 %c"
2116 msgid "Submodules changed but not updated:"
2117 msgstr "子模组已修改但尚未更新:"
2120 msgid "Submodule changes to be committed:"
2125 "Do not touch the line above.\n"
2126 "Everything below will be removed."
2132 msgid "You have unmerged paths."
2137 msgid " (fix conflicts and run \"git commit\")"
2138 msgstr " (解决冲突并运行 \"git commit\")"
2141 msgid "All conflicts fixed but you are still merging."
2142 msgstr "所有冲突已解决但您仍处于合并中。"
2146 msgid " (use \"git commit\" to conclude merge)"
2147 msgstr " (使用 \"git commit\" 结束合并)"
2150 msgid "You are in the middle of an am session."
2151 msgstr "您正处于 am 操作过程中。"
2154 msgid "The current patch is empty."
2159 msgid " (fix conflicts and then run \"git am --continue\")"
2160 msgstr " (解决冲突,然后运行 \"git am --continue\")"
2164 msgid " (use \"git am --skip\" to skip this patch)"
2165 msgstr " (使用 \"git am --skip\" 跳过此补丁)"
2169 msgid " (use \"git am --abort\" to restore the original branch)"
2170 msgstr " (使用 \"git am --abort\" 恢复原有分支)"
2173 msgid "No commands done."
2178 msgid "Last command done (%d command done):"
2179 msgid_plural "Last commands done (%d commands done):"
2180 msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
2181 msgstr[1] "最后的命令已完成(%d 条命令被执行):"
2185 msgid " (see more in file %s)"
2186 msgstr " (更多参见文件 %s)"
2189 msgid "No commands remaining."
2194 msgid "Next command to do (%d remaining command):"
2195 msgid_plural "Next commands to do (%d remaining commands):"
2196 msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
2197 msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
2201 msgid " (use \"git rebase --edit-todo\" to view and edit)"
2202 msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
2206 msgid "You are currently rebasing branch '%s' on '%s'."
2207 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
2210 msgid "You are currently rebasing."
2215 msgid " (fix conflicts and then run \"git rebase --continue\")"
2216 msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
2220 msgid " (use \"git rebase --skip\" to skip this patch)"
2221 msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
2225 msgid " (use \"git rebase --abort\" to check out the original branch)"
2226 msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
2230 msgid " (all conflicts fixed: run \"git rebase --continue\")"
2231 msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
2236 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
2237 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
2240 msgid "You are currently splitting a commit during a rebase."
2241 msgstr "您在执行变基操作时拆分提交。"
2245 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
2246 msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
2250 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
2251 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
2254 msgid "You are currently editing a commit during a rebase."
2255 msgstr "您在执行变基操作时编辑提交。"
2259 msgid " (use \"git commit --amend\" to amend the current commit)"
2260 msgstr " (使用 \"git commit --amend\" 修补当前提交)"
2265 " (use \"git rebase --continue\" once you are satisfied with your changes)"
2266 msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
2270 msgid "You are currently cherry-picking commit %s."
2271 msgstr "您在执行拣选提交 %s 的操作。"
2275 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
2276 msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
2280 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
2281 msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
2285 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
2286 msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
2290 msgid "You are currently reverting commit %s."
2291 msgstr "您在执行反转提交 %s 的操作。"
2295 msgid " (fix conflicts and run \"git revert --continue\")"
2296 msgstr " (解决冲突并运行 \"git revert --continue\")"
2300 msgid " (all conflicts fixed: run \"git revert --continue\")"
2301 msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
2305 msgid " (use \"git revert --abort\" to cancel the revert operation)"
2306 msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
2310 msgid "You are currently bisecting, started from branch '%s'."
2311 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
2314 msgid "You are currently bisecting."
2315 msgstr "您在执行二分查找操作。"
2319 msgid " (use \"git bisect reset\" to get back to the original branch)"
2320 msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
2327 msgid "interactive rebase in progress; onto "
2328 msgstr "交互式变基操作正在进行中;至 "
2331 msgid "rebase in progress; onto "
2332 msgstr "变基操作正在进行中;至 "
2335 msgid "HEAD detached at "
2339 msgid "HEAD detached from "
2343 msgid "Not currently on any branch."
2347 msgid "Initial commit"
2351 msgid "Untracked files"
2355 msgid "Ignored files"
2361 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
2362 "may speed it up, but you have to be careful not to forget to add\n"
2363 "new files yourself (see 'git help status')."
2365 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
2366 "但您需要小心不要忘了添加新文件(参见 'git help status')。"
2370 msgid "Untracked files not listed%s"
2371 msgstr "未跟踪的文件没有列出%s"
2373 # 译者:中文字符串拼接,可删除前导空格
2375 msgid " (use -u option to show untracked files)"
2376 msgstr "(使用 -u 参数显示未跟踪的文件)"
2384 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
2385 msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
2389 msgid "no changes added to commit\n"
2395 "nothing added to commit but untracked files present (use \"git add\" to "
2397 msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
2401 msgid "nothing added to commit but untracked files present\n"
2402 msgstr "提交为空,但是存在尚未跟踪的文件\n"
2404 # 译者:中文字符串拼接,可删除前导空格
2407 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
2408 msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
2410 #: wt-status.c:1528 wt-status.c:1533
2412 msgid "nothing to commit\n"
2415 # 译者:中文字符串拼接,可删除前导空格
2418 msgid "nothing to commit (use -u to show untracked files)\n"
2419 msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
2421 # 译者:中文字符串拼接,可删除前导空格
2424 msgid "nothing to commit, working directory clean\n"
2425 msgstr "无文件要提交,干净的工作区\n"
2429 msgid "Initial commit on "
2433 msgid "HEAD (no branch)"
2441 #: wt-status.c:1677 wt-status.c:1685
2445 #: wt-status.c:1680 wt-status.c:1683
2449 #: compat/precompose_utf8.c:57 builtin/clone.c:413
2451 msgid "failed to unlink '%s'"
2455 msgid "git add [<options>] [--] <pathspec>..."
2456 msgstr "git add [<选项>] [--] <路径规格>..."
2460 msgid "unexpected diff status %c"
2463 #: builtin/add.c:70 builtin/commit.c:278
2464 msgid "updating files failed"
2469 msgid "remove '%s'\n"
2472 #: builtin/add.c:134
2473 msgid "Unstaged changes after refreshing the index:"
2474 msgstr "刷新索引之后尚未被暂存的变更:"
2476 #: builtin/add.c:194 builtin/rev-parse.c:797
2477 msgid "Could not read the index"
2480 #: builtin/add.c:205
2482 msgid "Could not open '%s' for writing."
2483 msgstr "无法打开 '%s' 进行写入。"
2485 #: builtin/add.c:209
2486 msgid "Could not write patch"
2489 #: builtin/add.c:212
2490 msgid "editing patch failed"
2493 #: builtin/add.c:215
2495 msgid "Could not stat '%s'"
2496 msgstr "不能查看文件状态 '%s'"
2498 #: builtin/add.c:217
2499 msgid "Empty patch. Aborted."
2502 #: builtin/add.c:222
2504 msgid "Could not apply '%s'"
2507 #: builtin/add.c:232
2508 msgid "The following paths are ignored by one of your .gitignore files:\n"
2509 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2511 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2512 #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2513 #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
2517 #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
2518 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2519 #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
2523 #: builtin/add.c:252
2524 msgid "interactive picking"
2527 #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
2528 msgid "select hunks interactively"
2531 #: builtin/add.c:254
2532 msgid "edit current diff and apply"
2535 #: builtin/add.c:255
2536 msgid "allow adding otherwise ignored files"
2539 #: builtin/add.c:256
2540 msgid "update tracked files"
2543 #: builtin/add.c:257
2544 msgid "record only the fact that the path will be added later"
2545 msgstr "只记录,该路径稍后再添加"
2547 #: builtin/add.c:258
2548 msgid "add changes from all tracked and untracked files"
2549 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2551 #: builtin/add.c:261
2552 msgid "ignore paths removed in the working tree (same as --no-all)"
2553 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2555 #: builtin/add.c:263
2556 msgid "don't add, only refresh the index"
2559 #: builtin/add.c:264
2560 msgid "just skip files which cannot be added because of errors"
2561 msgstr "跳过因出错不能添加的文件"
2563 #: builtin/add.c:265
2564 msgid "check if - even missing - files are ignored in dry run"
2565 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2567 #: builtin/add.c:287
2569 msgid "Use -f if you really want to add them.\n"
2570 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2572 #: builtin/add.c:294
2573 msgid "adding files failed"
2576 #: builtin/add.c:330
2577 msgid "-A and -u are mutually incompatible"
2578 msgstr "-A 和 -u 选项互斥"
2580 #: builtin/add.c:337
2581 msgid "Option --ignore-missing can only be used together with --dry-run"
2582 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2584 #: builtin/add.c:352
2586 msgid "Nothing specified, nothing added.\n"
2587 msgstr "没有指定文件,也没有文件被添加。\n"
2589 #: builtin/add.c:353
2591 msgid "Maybe you wanted to say 'git add .'?\n"
2592 msgstr "也许您想要执行 'git add .'?\n"
2594 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2595 #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2596 #: builtin/submodule--helper.c:35
2597 msgid "index file corrupt"
2600 #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
2601 msgid "Unable to write new index file"
2604 #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
2606 msgid "could not read '%s'"
2610 msgid "could not parse author script"
2615 msgid "'%s' was deleted by the applypatch-msg hook"
2616 msgstr "'%s' 被 applypatch-msg 钩子删除"
2618 #: builtin/am.c:548 builtin/notes.c:300
2620 msgid "Malformed input line: '%s'."
2621 msgstr "非法的输入行:'%s'。"
2623 #: builtin/am.c:585 builtin/notes.c:315
2625 msgid "Failed to copy notes from '%s' to '%s'"
2626 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2629 msgid "fseek failed"
2632 #: builtin/am.c:772 builtin/am.c:860
2634 msgid "could not open '%s' for reading: %s"
2635 msgstr "无法打开 '%s' 进行读取:%s"
2639 msgid "could not open '%s' for writing: %s"
2640 msgstr "无法打开 '%s' 进行写入:%s"
2644 msgid "could not parse patch '%s'"
2645 msgstr "无法解析补丁 '%s'"
2648 msgid "Only one StGIT patch series can be applied at once"
2649 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2652 msgid "invalid timestamp"
2655 #: builtin/am.c:904 builtin/am.c:912
2656 msgid "invalid Date line"
2660 msgid "invalid timezone offset"
2664 msgid "Patch format detection failed."
2667 #: builtin/am.c:1001 builtin/clone.c:378
2669 msgid "failed to create directory '%s'"
2670 msgstr "无法创建目录 '%s'"
2672 #: builtin/am.c:1005
2673 msgid "Failed to split patches."
2676 #: builtin/am.c:1137 builtin/commit.c:363
2677 msgid "unable to write index file"
2680 #: builtin/am.c:1188
2682 msgid "When you have resolved this problem, run \"%s --continue\"."
2683 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2685 #: builtin/am.c:1189
2687 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2688 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2690 #: builtin/am.c:1190
2692 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2693 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2695 #: builtin/am.c:1328
2696 msgid "Patch is empty. Was it split wrong?"
2697 msgstr "补丁为空。是不是切分错误?"
2699 #: builtin/am.c:1402 builtin/log.c:1350
2701 msgid "invalid ident line: %s"
2702 msgstr "包含无效的身份标识:%s"
2704 #: builtin/am.c:1429
2706 msgid "unable to parse commit %s"
2709 #: builtin/am.c:1631
2710 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2711 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2713 #: builtin/am.c:1633
2714 msgid "Using index info to reconstruct a base tree..."
2715 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2717 #: builtin/am.c:1652
2719 "Did you hand edit your patch?\n"
2720 "It does not apply to blobs recorded in its index."
2725 #: builtin/am.c:1658
2726 msgid "Falling back to patching base and 3-way merge..."
2727 msgstr "回落到基础版本上打补丁及进行三方合并..."
2729 #: builtin/am.c:1673
2730 msgid "Failed to merge in the changes."
2733 #: builtin/am.c:1697 builtin/merge.c:633
2734 msgid "git write-tree failed to write a tree"
2735 msgstr "git write-tree 无法写入一树对象"
2737 #: builtin/am.c:1704
2738 msgid "applying to an empty history"
2741 #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2742 #: builtin/merge.c:855
2743 msgid "failed to write commit object"
2746 #: builtin/am.c:1749 builtin/am.c:1753
2748 msgid "cannot resume: %s does not exist."
2749 msgstr "无法继续:%s 不存在。"
2751 #: builtin/am.c:1769
2752 msgid "cannot be interactive without stdin connected to a terminal."
2753 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2755 #: builtin/am.c:1774
2756 msgid "Commit Body is:"
2760 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2761 #. in your translation. The program will only accept English
2762 #. input at this point.
2764 #: builtin/am.c:1784
2765 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2766 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2768 #: builtin/am.c:1834
2770 msgid "Dirty index: cannot apply patches (dirty: %s)"
2771 msgstr "脏索引:不能应用补丁(脏文件:%s)"
2773 #: builtin/am.c:1869 builtin/am.c:1941
2775 msgid "Applying: %.*s"
2778 #: builtin/am.c:1885
2779 msgid "No changes -- Patch already applied."
2780 msgstr "没有变更 —— 补丁已经应用过。"
2782 #: builtin/am.c:1893
2784 msgid "Patch failed at %s %.*s"
2785 msgstr "打补丁失败于 %s %.*s"
2787 #: builtin/am.c:1899
2789 msgid "The copy of the patch that failed is found in: %s"
2790 msgstr "失败的补丁文件副本位于:%s"
2792 #: builtin/am.c:1944
2794 "No changes - did you forget to use 'git add'?\n"
2795 "If there is nothing left to stage, chances are that something else\n"
2796 "already introduced the same changes; you might want to skip this patch."
2798 "没有变更 —— 您是不是忘了执行 'git add'?\n"
2799 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2802 #: builtin/am.c:1951
2804 "You still have unmerged paths in your index.\n"
2805 "Did you forget to use 'git add'?"
2808 "您是否忘了执行 'git add'?"
2810 #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
2811 #: builtin/reset.c:316
2813 msgid "Could not parse object '%s'."
2814 msgstr "不能解析对象 '%s'。"
2816 #: builtin/am.c:2111
2817 msgid "failed to clean index"
2820 #: builtin/am.c:2145
2822 "You seem to have moved HEAD since the last 'am' failure.\n"
2823 "Not rewinding to ORIG_HEAD"
2824 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2826 #: builtin/am.c:2206
2828 msgid "Invalid value for --patch-format: %s"
2829 msgstr "无效的 --patch-format 值:%s"
2831 #: builtin/am.c:2239
2832 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2833 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2835 #: builtin/am.c:2240
2836 msgid "git am [<options>] (--continue | --skip | --abort)"
2837 msgstr "git am [<选项>] (--continue | --skip | --abort)"
2839 #: builtin/am.c:2246
2840 msgid "run interactively"
2843 #: builtin/am.c:2248
2844 msgid "historical option -- no-op"
2845 msgstr "老的参数 —— 无作用"
2847 #: builtin/am.c:2250
2848 msgid "allow fall back on 3way merging if needed"
2849 msgstr "如果必要,允许使用三方合并。"
2851 #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
2852 #: builtin/repack.c:171
2856 #: builtin/am.c:2253
2857 msgid "add a Signed-off-by line to the commit message"
2858 msgstr "在提交说明中添加一个 Signed-off-by 签名"
2860 #: builtin/am.c:2256
2861 msgid "recode into utf8 (default)"
2862 msgstr "使用 utf8 字符集(默认)"
2864 #: builtin/am.c:2258
2865 msgid "pass -k flag to git-mailinfo"
2866 msgstr "向 git-mailinfo 传递 -k 参数"
2868 #: builtin/am.c:2260
2869 msgid "pass -b flag to git-mailinfo"
2870 msgstr "向 git-mailinfo 传递 -b 参数"
2872 #: builtin/am.c:2262
2873 msgid "pass -m flag to git-mailinfo"
2874 msgstr "向 git-mailinfo 传递 -m 参数"
2876 #: builtin/am.c:2264
2877 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2878 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2880 #: builtin/am.c:2267
2881 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2882 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2884 #: builtin/am.c:2270
2885 msgid "strip everything before a scissors line"
2886 msgstr "丢弃裁切线前的所有内容"
2888 #: builtin/am.c:2271 builtin/apply.c:4544
2892 #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2893 #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2894 #: builtin/am.c:2299
2895 msgid "pass it through git-apply"
2896 msgstr "传递给 git-apply"
2898 #: builtin/am.c:2280 builtin/apply.c:4568
2902 #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2903 #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2904 #: builtin/pull.c:171 builtin/submodule--helper.c:72
2905 #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
2909 #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2910 #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2911 #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2912 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2913 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
2917 #: builtin/am.c:2292 builtin/apply.c:4512
2921 #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
2922 #: builtin/tag.c:372
2926 #: builtin/am.c:2296
2927 msgid "format the patch(es) are in"
2930 #: builtin/am.c:2302
2931 msgid "override error message when patch failure occurs"
2932 msgstr "打补丁失败时显示的错误信息"
2934 #: builtin/am.c:2304
2935 msgid "continue applying patches after resolving a conflict"
2936 msgstr "冲突解决后继续应用补丁"
2938 #: builtin/am.c:2307
2939 msgid "synonyms for --continue"
2940 msgstr "和 --continue 同义"
2942 #: builtin/am.c:2310
2943 msgid "skip the current patch"
2946 #: builtin/am.c:2313
2947 msgid "restore the original branch and abort the patching operation."
2948 msgstr "恢复原始分支并终止打补丁操作。"
2950 #: builtin/am.c:2317
2951 msgid "lie about committer date"
2952 msgstr "将作者日期作为提交日期"
2954 #: builtin/am.c:2319
2955 msgid "use current timestamp for author date"
2956 msgstr "用当前时间作为作者日期"
2958 #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2959 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
2963 #: builtin/am.c:2322
2964 msgid "GPG-sign commits"
2965 msgstr "使用 GPG 签名提交"
2967 #: builtin/am.c:2325
2968 msgid "(internal use for git-rebase)"
2969 msgstr "(内部使用,用于 git-rebase)"
2971 #: builtin/am.c:2340
2973 "The -b/--binary option has been a no-op for long time, and\n"
2974 "it will be removed. Please do not use it anymore."
2976 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2979 #: builtin/am.c:2347
2980 msgid "failed to read the index"
2983 #: builtin/am.c:2362
2985 msgid "previous rebase directory %s still exists but mbox given."
2986 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2988 #: builtin/am.c:2386
2991 "Stray %s directory found.\n"
2992 "Use \"git am --abort\" to remove it."
2995 "使用 \"git am --abort\" 删除它。"
2997 #: builtin/am.c:2392
2998 msgid "Resolve operation not in progress, we are not resuming."
2999 msgstr "解决操作未进行,我们不会继续。"
3001 #: builtin/apply.c:59
3002 msgid "git apply [<options>] [<patch>...]"
3003 msgstr "git apply [<选项>] [<补丁>...]"
3005 #: builtin/apply.c:111
3007 msgid "unrecognized whitespace option '%s'"
3008 msgstr "未能识别的空白字符选项 '%s'"
3010 #: builtin/apply.c:126
3012 msgid "unrecognized whitespace ignore option '%s'"
3013 msgstr "未能识别的空白字符忽略选项 '%s'"
3015 #: builtin/apply.c:818
3017 msgid "Cannot prepare timestamp regexp %s"
3018 msgstr "无法准备时间戳正则表达式 %s"
3020 #: builtin/apply.c:827
3022 msgid "regexec returned %d for input: %s"
3023 msgstr "regexec 返回 %d,输入为:%s"
3025 #: builtin/apply.c:908
3027 msgid "unable to find filename in patch at line %d"
3028 msgstr "不能在补丁的第 %d 行找到文件名"
3030 #: builtin/apply.c:940
3032 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3033 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3035 #: builtin/apply.c:944
3037 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3038 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3040 #: builtin/apply.c:945
3042 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3043 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3045 #: builtin/apply.c:952
3047 msgid "git apply: bad git-diff - expected /dev/null on line %d"
3048 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3050 #: builtin/apply.c:1415
3052 msgid "recount: unexpected line: %.*s"
3053 msgstr "recount:意外的行:%.*s"
3055 #: builtin/apply.c:1472
3057 msgid "patch fragment without header at line %d: %.*s"
3058 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3060 #: builtin/apply.c:1489
3063 "git diff header lacks filename information when removing %d leading pathname "
3064 "component (line %d)"
3066 "git diff header lacks filename information when removing %d leading pathname "
3067 "components (line %d)"
3068 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3069 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3071 #: builtin/apply.c:1655
3072 msgid "new file depends on old contents"
3075 #: builtin/apply.c:1657
3076 msgid "deleted file still has contents"
3079 #: builtin/apply.c:1683
3081 msgid "corrupt patch at line %d"
3082 msgstr "补丁在第 %d 行损坏"
3084 #: builtin/apply.c:1719
3086 msgid "new file %s depends on old contents"
3087 msgstr "新文件 %s 依赖旧内容"
3089 #: builtin/apply.c:1721
3091 msgid "deleted file %s still has contents"
3092 msgstr "删除的文件 %s 仍有内容"
3094 #: builtin/apply.c:1724
3096 msgid "** warning: file %s becomes empty but is not deleted"
3097 msgstr "** 警告:文件 %s 成为空文件但并未删除"
3099 #: builtin/apply.c:1870
3101 msgid "corrupt binary patch at line %d: %.*s"
3102 msgstr "二进制补丁在第 %d 行损坏:%.*s"
3104 #: builtin/apply.c:1899
3106 msgid "unrecognized binary patch at line %d"
3107 msgstr "未能识别的二进制补丁位于第 %d 行"
3109 #: builtin/apply.c:2050
3111 msgid "patch with only garbage at line %d"
3112 msgstr "补丁文件的第 %d 行只有垃圾数据"
3114 #: builtin/apply.c:2140
3116 msgid "unable to read symlink %s"
3117 msgstr "无法读取符号链接 %s"
3119 #: builtin/apply.c:2144
3121 msgid "unable to open or read %s"
3124 #: builtin/apply.c:2777
3126 msgid "invalid start of line: '%c'"
3127 msgstr "无效的行首字符:'%c'"
3129 #: builtin/apply.c:2896
3131 msgid "Hunk #%d succeeded at %d (offset %d line)."
3132 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3133 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3134 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3136 #: builtin/apply.c:2908
3138 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3139 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3141 #: builtin/apply.c:2914
3144 "while searching for:\n"
3150 #: builtin/apply.c:2934
3152 msgid "missing binary patch data for '%s'"
3153 msgstr "缺失 '%s' 的二进制补丁数据"
3155 #: builtin/apply.c:3035
3157 msgid "binary patch does not apply to '%s'"
3158 msgstr "二进制补丁未应用到 '%s'"
3160 #: builtin/apply.c:3041
3162 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3163 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3165 #: builtin/apply.c:3062
3167 msgid "patch failed: %s:%ld"
3168 msgstr "打补丁失败:%s:%ld"
3170 #: builtin/apply.c:3186
3172 msgid "cannot checkout %s"
3175 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3177 msgid "read of %s failed"
3180 #: builtin/apply.c:3239
3182 msgid "reading from '%s' beyond a symbolic link"
3183 msgstr "读取位于符号链接中的 '%s'"
3185 #: builtin/apply.c:3267 builtin/apply.c:3489
3187 msgid "path %s has been renamed/deleted"
3188 msgstr "路径 %s 已经被重命名/删除"
3190 #: builtin/apply.c:3348 builtin/apply.c:3503
3192 msgid "%s: does not exist in index"
3195 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3200 #: builtin/apply.c:3357 builtin/apply.c:3511
3202 msgid "%s: does not match index"
3205 #: builtin/apply.c:3459
3206 msgid "removal patch leaves file contents"
3207 msgstr "移除补丁仍留下了文件内容"
3209 #: builtin/apply.c:3528
3211 msgid "%s: wrong type"
3214 #: builtin/apply.c:3530
3216 msgid "%s has type %o, expected %o"
3217 msgstr "%s 的类型是 %o,应为 %o"
3219 #: builtin/apply.c:3689 builtin/apply.c:3691
3221 msgid "invalid path '%s'"
3224 #: builtin/apply.c:3746
3226 msgid "%s: already exists in index"
3227 msgstr "%s:已经存在于索引中"
3229 #: builtin/apply.c:3749
3231 msgid "%s: already exists in working directory"
3232 msgstr "%s:已经存在于工作区中"
3234 #: builtin/apply.c:3769
3236 msgid "new mode (%o) of %s does not match old mode (%o)"
3237 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3239 #: builtin/apply.c:3774
3241 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3242 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3244 #: builtin/apply.c:3794
3246 msgid "affected file '%s' is beyond a symbolic link"
3247 msgstr "受影响的文件 '%s' 位于符号链接中"
3249 #: builtin/apply.c:3798
3251 msgid "%s: patch does not apply"
3254 #: builtin/apply.c:3812
3256 msgid "Checking patch %s..."
3259 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3261 msgid "make_cache_entry failed for path '%s'"
3262 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3264 #: builtin/apply.c:4048
3266 msgid "unable to remove %s from index"
3267 msgstr "不能从索引中移除 %s"
3269 #: builtin/apply.c:4077
3271 msgid "corrupt patch for submodule %s"
3272 msgstr "子模组 %s 损坏的补丁"
3274 #: builtin/apply.c:4081
3276 msgid "unable to stat newly created file '%s'"
3277 msgstr "不能枚举新建文件 '%s' 的状态"
3279 #: builtin/apply.c:4086
3281 msgid "unable to create backing store for newly created file %s"
3282 msgstr "不能为新建文件 %s 创建后端存储"
3284 #: builtin/apply.c:4089 builtin/apply.c:4197
3286 msgid "unable to add cache entry for %s"
3287 msgstr "无法为 %s 添加缓存条目"
3289 #: builtin/apply.c:4122
3291 msgid "closing file '%s'"
3294 #: builtin/apply.c:4171
3296 msgid "unable to write file '%s' mode %o"
3297 msgstr "不能写文件 '%s' 权限 %o"
3299 #: builtin/apply.c:4258
3301 msgid "Applied patch %s cleanly."
3304 #: builtin/apply.c:4266
3305 msgid "internal error"
3308 #: builtin/apply.c:4269
3310 msgid "Applying patch %%s with %d reject..."
3311 msgid_plural "Applying patch %%s with %d rejects..."
3312 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3313 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3315 #: builtin/apply.c:4279
3317 msgid "truncating .rej filename to %.*s.rej"
3318 msgstr "截短 .rej 文件名为 %.*s.rej"
3320 #: builtin/apply.c:4300
3322 msgid "Hunk #%d applied cleanly."
3323 msgstr "第 #%d 个片段成功应用。"
3325 #: builtin/apply.c:4303
3327 msgid "Rejected hunk #%d."
3328 msgstr "拒绝第 #%d 个片段。"
3330 #: builtin/apply.c:4393
3331 msgid "unrecognized input"
3334 #: builtin/apply.c:4404
3335 msgid "unable to read index file"
3338 #: builtin/apply.c:4507
3339 msgid "don't apply changes matching the given path"
3340 msgstr "不要应用与给出路径向匹配的变更"
3342 #: builtin/apply.c:4510
3343 msgid "apply changes matching the given path"
3344 msgstr "应用与给出路径向匹配的变更"
3346 #: builtin/apply.c:4513
3347 msgid "remove <num> leading slashes from traditional diff paths"
3348 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3350 #: builtin/apply.c:4516
3351 msgid "ignore additions made by the patch"
3352 msgstr "忽略补丁中的添加的文件"
3354 #: builtin/apply.c:4518
3355 msgid "instead of applying the patch, output diffstat for the input"
3356 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3358 #: builtin/apply.c:4522
3359 msgid "show number of added and deleted lines in decimal notation"
3360 msgstr "以十进制数显示添加和删除的行数"
3362 #: builtin/apply.c:4524
3363 msgid "instead of applying the patch, output a summary for the input"
3364 msgstr "不应用补丁,而是显示输入的概要"
3366 #: builtin/apply.c:4526
3367 msgid "instead of applying the patch, see if the patch is applicable"
3368 msgstr "不应用补丁,而是查看补丁是否可应用"
3370 #: builtin/apply.c:4528
3371 msgid "make sure the patch is applicable to the current index"
3372 msgstr "确认补丁可以应用到当前索引"
3374 #: builtin/apply.c:4530
3375 msgid "apply a patch without touching the working tree"
3376 msgstr "应用补丁而不修改工作区"
3378 #: builtin/apply.c:4532
3379 msgid "accept a patch that touches outside the working area"
3380 msgstr "接受修改工作区之外文件的补丁"
3382 #: builtin/apply.c:4534
3383 msgid "also apply the patch (use with --stat/--summary/--check)"
3384 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3386 #: builtin/apply.c:4536
3387 msgid "attempt three-way merge if a patch does not apply"
3388 msgstr "如果一个补丁不能应用则尝试三方合并"
3390 #: builtin/apply.c:4538
3391 msgid "build a temporary index based on embedded index information"
3392 msgstr "创建一个临时索引基于嵌入的索引信息"
3394 #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
3395 msgid "paths are separated with NUL character"
3396 msgstr "路径以 NUL 字符分隔"
3398 #: builtin/apply.c:4543
3399 msgid "ensure at least <n> lines of context match"
3400 msgstr "确保至少匹配 <n> 行上下文"
3402 #: builtin/apply.c:4545
3403 msgid "detect new or modified lines that have whitespace errors"
3404 msgstr "检查新增和修改的行中间的空白字符滥用"
3406 #: builtin/apply.c:4548 builtin/apply.c:4551
3407 msgid "ignore changes in whitespace when finding context"
3408 msgstr "查找上下文时忽略空白字符的变更"
3410 #: builtin/apply.c:4554
3411 msgid "apply the patch in reverse"
3414 #: builtin/apply.c:4556
3415 msgid "don't expect at least one line of context"
3418 #: builtin/apply.c:4558
3419 msgid "leave the rejected hunks in corresponding *.rej files"
3420 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3422 #: builtin/apply.c:4560
3423 msgid "allow overlapping hunks"
3426 #: builtin/apply.c:4563
3427 msgid "tolerate incorrectly detected missing new-line at the end of file"
3428 msgstr "允许不正确的文件末尾换行符"
3430 #: builtin/apply.c:4566
3431 msgid "do not trust the line counts in the hunk headers"
3432 msgstr "不信任补丁片段的头信息中的行号"
3434 #: builtin/apply.c:4569
3435 msgid "prepend <root> to all filenames"
3436 msgstr "为所有文件名前添加 <根目录>"
3438 #: builtin/apply.c:4591
3439 msgid "--3way outside a repository"
3440 msgstr "--3way 在一个仓库之外"
3442 #: builtin/apply.c:4599
3443 msgid "--index outside a repository"
3444 msgstr "--index 在一个仓库之外"
3446 #: builtin/apply.c:4602
3447 msgid "--cached outside a repository"
3448 msgstr "--cached 在一个仓库之外"
3450 #: builtin/apply.c:4621
3452 msgid "can't open patch '%s'"
3453 msgstr "不能打开补丁 '%s'"
3455 #: builtin/apply.c:4635
3457 msgid "squelched %d whitespace error"
3458 msgid_plural "squelched %d whitespace errors"
3459 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3460 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3462 #: builtin/apply.c:4641 builtin/apply.c:4651
3464 msgid "%d line adds whitespace errors."
3465 msgid_plural "%d lines add whitespace errors."
3466 msgstr[0] "%d 行有空白字符误用。"
3467 msgstr[1] "%d 行有空白字符误用。"
3469 #: builtin/archive.c:17
3471 msgid "could not create archive file '%s'"
3472 msgstr "不能创建归档文件 '%s'"
3474 #: builtin/archive.c:20
3475 msgid "could not redirect output"
3478 #: builtin/archive.c:37
3479 msgid "git archive: Remote with no URL"
3480 msgstr "git archive:未提供远程 URL"
3482 #: builtin/archive.c:58
3483 msgid "git archive: expected ACK/NAK, got EOF"
3484 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3486 #: builtin/archive.c:61
3488 msgid "git archive: NACK %s"
3489 msgstr "git archive:NACK %s"
3491 #: builtin/archive.c:63
3493 msgid "remote error: %s"
3496 #: builtin/archive.c:64
3497 msgid "git archive: protocol error"
3498 msgstr "git archive:协议错误"
3500 #: builtin/archive.c:68
3501 msgid "git archive: expected a flush"
3502 msgstr "git archive:应为刷新"
3504 #: builtin/bisect--helper.c:7
3505 msgid "git bisect--helper --next-all [--no-checkout]"
3506 msgstr "git bisect--helper --next-all [--no-checkout]"
3508 #: builtin/bisect--helper.c:17
3509 msgid "perform 'git bisect next'"
3510 msgstr "执行 'git bisect next'"
3512 #: builtin/bisect--helper.c:19
3513 msgid "update BISECT_HEAD instead of checking out the current commit"
3514 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3516 #: builtin/blame.c:33
3517 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3518 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3520 #: builtin/blame.c:38
3521 msgid "<rev-opts> are documented in git-rev-list(1)"
3522 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3524 #: builtin/blame.c:1782
3525 msgid "Blaming lines"
3528 #: builtin/blame.c:2530
3529 msgid "Show blame entries as we find them, incrementally"
3530 msgstr "增量式地显示发现的 blame 条目"
3532 #: builtin/blame.c:2531
3533 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3534 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3536 #: builtin/blame.c:2532
3537 msgid "Do not treat root commits as boundaries (Default: off)"
3538 msgstr "不把根提交作为边界(默认:关闭)"
3540 #: builtin/blame.c:2533
3541 msgid "Show work cost statistics"
3544 #: builtin/blame.c:2534
3545 msgid "Force progress reporting"
3548 #: builtin/blame.c:2535
3549 msgid "Show output score for blame entries"
3550 msgstr "显示判断 blame 条目位移的得分诊断信息"
3552 #: builtin/blame.c:2536
3553 msgid "Show original filename (Default: auto)"
3554 msgstr "显示原始文件名(默认:自动)"
3556 #: builtin/blame.c:2537
3557 msgid "Show original linenumber (Default: off)"
3558 msgstr "显示原始的行号(默认:关闭)"
3560 #: builtin/blame.c:2538
3561 msgid "Show in a format designed for machine consumption"
3562 msgstr "显示为一个适合机器读取的格式"
3564 #: builtin/blame.c:2539
3565 msgid "Show porcelain format with per-line commit information"
3566 msgstr "为每一行显示机器适用的提交信息"
3568 #: builtin/blame.c:2540
3569 msgid "Use the same output mode as git-annotate (Default: off)"
3570 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3572 #: builtin/blame.c:2541
3573 msgid "Show raw timestamp (Default: off)"
3574 msgstr "显示原始时间戳(默认:关闭)"
3576 #: builtin/blame.c:2542
3577 msgid "Show long commit SHA1 (Default: off)"
3578 msgstr "显示长的 SHA1 提交号(默认:关闭)"
3580 #: builtin/blame.c:2543
3581 msgid "Suppress author name and timestamp (Default: off)"
3582 msgstr "隐藏作者名字和时间戳(默认:关闭)"
3584 #: builtin/blame.c:2544
3585 msgid "Show author email instead of name (Default: off)"
3586 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3588 #: builtin/blame.c:2545
3589 msgid "Ignore whitespace differences"
3592 #: builtin/blame.c:2546
3593 msgid "Spend extra cycles to find better match"
3594 msgstr "花费额外的循环来找到更好的匹配"
3596 #: builtin/blame.c:2547
3597 msgid "Use revisions from <file> instead of calling git-rev-list"
3598 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3600 #: builtin/blame.c:2548
3601 msgid "Use <file>'s contents as the final image"
3602 msgstr "使用 <文件> 的内容作为最终的图片"
3604 #: builtin/blame.c:2549 builtin/blame.c:2550
3608 #: builtin/blame.c:2549
3609 msgid "Find line copies within and across files"
3610 msgstr "找到文件内及跨文件的行拷贝"
3612 #: builtin/blame.c:2550
3613 msgid "Find line movements within and across files"
3614 msgstr "找到文件内及跨文件的行移动"
3616 #: builtin/blame.c:2551
3620 #: builtin/blame.c:2551
3621 msgid "Process only line range n,m, counting from 1"
3622 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3624 #. TRANSLATORS: This string is used to tell us the maximum
3625 #. display width for a relative timestamp in "git blame"
3626 #. output. For C locale, "4 years, 11 months ago", which
3627 #. takes 22 places, is the longest among various forms of
3628 #. relative timestamps, but your language may need more or
3629 #. fewer display columns.
3630 #: builtin/blame.c:2640
3631 msgid "4 years, 11 months ago"
3634 #: builtin/branch.c:25
3635 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3636 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3638 #: builtin/branch.c:26
3639 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3640 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3642 #: builtin/branch.c:27
3643 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3644 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3646 #: builtin/branch.c:28
3647 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3648 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3650 #: builtin/branch.c:29
3651 msgid "git branch [<options>] [-r | -a] [--points-at]"
3652 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3654 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3655 #: builtin/branch.c:142
3658 "deleting branch '%s' that has been merged to\n"
3659 " '%s', but not yet merged to HEAD."
3661 "将要删除的分支 '%s' 已经被合并到\n"
3664 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3665 #: builtin/branch.c:146
3668 "not deleting branch '%s' that is not yet merged to\n"
3669 " '%s', even though it is merged to HEAD."
3671 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3672 " 然而却尚未被合并到分支 '%s' 。"
3674 #: builtin/branch.c:160
3676 msgid "Couldn't look up commit object for '%s'"
3677 msgstr "无法查询 '%s' 指向的提交对象"
3679 #: builtin/branch.c:164
3682 "The branch '%s' is not fully merged.\n"
3683 "If you are sure you want to delete it, run 'git branch -D %s'."
3686 "如果您确认要删除它,执行 'git branch -D %s'。"
3688 #: builtin/branch.c:177
3689 msgid "Update of config-file failed"
3690 msgstr "无法更新 config 文件"
3692 #: builtin/branch.c:205
3693 msgid "cannot use -a with -d"
3694 msgstr "不能将 -a 和 -d 同时使用"
3696 #: builtin/branch.c:211
3697 msgid "Couldn't look up commit object for HEAD"
3698 msgstr "无法查询 HEAD 指向的提交对象"
3700 #: builtin/branch.c:219
3702 msgid "Cannot delete the branch '%s' which you are currently on."
3703 msgstr "无法删除您当前所在的分支 '%s'。"
3705 #: builtin/branch.c:235
3707 msgid "remote-tracking branch '%s' not found."
3708 msgstr "未能找到远程跟踪分支 '%s'。"
3710 #: builtin/branch.c:236
3712 msgid "branch '%s' not found."
3713 msgstr "分支 '%s' 未发现。"
3715 #: builtin/branch.c:251
3717 msgid "Error deleting remote-tracking branch '%s'"
3718 msgstr "无法删除远程跟踪分支 '%s'"
3720 #: builtin/branch.c:252
3722 msgid "Error deleting branch '%s'"
3723 msgstr "无法删除分支 '%s'"
3725 #: builtin/branch.c:259
3727 msgid "Deleted remote-tracking branch %s (was %s).\n"
3728 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3730 #: builtin/branch.c:260
3732 msgid "Deleted branch %s (was %s).\n"
3733 msgstr "已删除分支 %s(曾为 %s)。\n"
3735 #: builtin/branch.c:303
3740 #: builtin/branch.c:308
3745 #: builtin/branch.c:313
3747 msgid "[%s: behind %d]"
3750 #: builtin/branch.c:315
3755 #: builtin/branch.c:319
3757 msgid "[%s: ahead %d]"
3760 #: builtin/branch.c:321
3765 #: builtin/branch.c:324
3767 msgid "[%s: ahead %d, behind %d]"
3768 msgstr "[%s:领先 %d,落后 %d]"
3770 #: builtin/branch.c:327
3772 msgid "[ahead %d, behind %d]"
3773 msgstr "[领先 %d,落后 %d]"
3775 #: builtin/branch.c:340
3776 msgid " **** invalid ref ****"
3777 msgstr " **** 无效引用 ****"
3779 #: builtin/branch.c:366
3781 msgid "(no branch, rebasing %s)"
3782 msgstr "(非分支,正变基 %s)"
3784 #: builtin/branch.c:369
3786 msgid "(no branch, bisect started on %s)"
3787 msgstr "(非分支,二分查找开始于 %s)"
3789 #: builtin/branch.c:375
3791 msgid "(HEAD detached at %s)"
3792 msgstr "(头指针分离于 %s)"
3794 #: builtin/branch.c:378
3796 msgid "(HEAD detached from %s)"
3797 msgstr "(头指针分离自 %s)"
3799 #: builtin/branch.c:382
3803 #: builtin/branch.c:524
3804 msgid "cannot rename the current branch while not on any."
3805 msgstr "无法重命名当前分支因为不处于任何分支上。"
3807 #: builtin/branch.c:534
3809 msgid "Invalid branch name: '%s'"
3810 msgstr "无效的分支名:'%s'"
3812 #: builtin/branch.c:549
3813 msgid "Branch rename failed"
3816 #: builtin/branch.c:553
3818 msgid "Renamed a misnamed branch '%s' away"
3819 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3821 #: builtin/branch.c:557
3823 msgid "Branch renamed to %s, but HEAD is not updated!"
3824 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3826 #: builtin/branch.c:564
3827 msgid "Branch is renamed, but update of config-file failed"
3828 msgstr "分支被重命名,但更新 config 文件失败"
3830 #: builtin/branch.c:586
3832 msgid "could not write branch description template: %s"
3833 msgstr "不能写分支描述模版:%s"
3835 #: builtin/branch.c:615
3836 msgid "Generic options"
3839 #: builtin/branch.c:617
3840 msgid "show hash and subject, give twice for upstream branch"
3841 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3843 #: builtin/branch.c:618
3844 msgid "suppress informational messages"
3847 #: builtin/branch.c:619
3848 msgid "set up tracking mode (see git-pull(1))"
3849 msgstr "设置跟踪模式(参见 git-pull(1))"
3851 #: builtin/branch.c:621
3852 msgid "change upstream info"
3855 #: builtin/branch.c:625
3856 msgid "use colored output"
3859 #: builtin/branch.c:626
3860 msgid "act on remote-tracking branches"
3863 #: builtin/branch.c:628 builtin/branch.c:629
3864 msgid "print only branches that contain the commit"
3865 msgstr "只打印包含该提交的分支"
3867 #: builtin/branch.c:632
3868 msgid "Specific git-branch actions:"
3869 msgstr "具体的 git-branch 动作:"
3871 #: builtin/branch.c:633
3872 msgid "list both remote-tracking and local branches"
3873 msgstr "列出远程跟踪及本地分支"
3875 #: builtin/branch.c:635
3876 msgid "delete fully merged branch"
3879 #: builtin/branch.c:636
3880 msgid "delete branch (even if not merged)"
3881 msgstr "删除分支(即使没有合并)"
3883 #: builtin/branch.c:637
3884 msgid "move/rename a branch and its reflog"
3885 msgstr "移动/重命名一个分支,以及它的引用日志"
3887 #: builtin/branch.c:638
3888 msgid "move/rename a branch, even if target exists"
3889 msgstr "移动/重命名一个分支,即使目标已存在"
3891 #: builtin/branch.c:639
3892 msgid "list branch names"
3895 #: builtin/branch.c:640
3896 msgid "create the branch's reflog"
3899 #: builtin/branch.c:642
3900 msgid "edit the description for the branch"
3903 #: builtin/branch.c:643
3904 msgid "force creation, move/rename, deletion"
3905 msgstr "强制创建、移动/重命名、删除"
3907 #: builtin/branch.c:644
3908 msgid "print only branches that are merged"
3911 #: builtin/branch.c:645
3912 msgid "print only branches that are not merged"
3915 #: builtin/branch.c:646
3916 msgid "list branches in columns"
3919 #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
3923 #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
3924 msgid "field name to sort on"
3927 #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3928 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
3929 #: builtin/tag.c:369
3933 #: builtin/branch.c:651
3934 msgid "print only branches of the object"
3935 msgstr "只打印指向该对象的分支"
3937 #: builtin/branch.c:669
3938 msgid "Failed to resolve HEAD as a valid ref."
3939 msgstr "无法将 HEAD 解析为有效引用。"
3941 #: builtin/branch.c:673 builtin/clone.c:705
3942 msgid "HEAD not found below refs/heads!"
3943 msgstr "HEAD 没有位于 /refs/heads 之下!"
3945 #: builtin/branch.c:693
3946 msgid "--column and --verbose are incompatible"
3947 msgstr "--column 和 --verbose 不兼容"
3949 #: builtin/branch.c:704 builtin/branch.c:746
3950 msgid "branch name required"
3953 #: builtin/branch.c:722
3954 msgid "Cannot give description to detached HEAD"
3955 msgstr "不能向分离头指针提供描述"
3957 #: builtin/branch.c:727
3958 msgid "cannot edit description of more than one branch"
3959 msgstr "不能为一个以上的分支编辑描述"
3961 #: builtin/branch.c:734
3963 msgid "No commit on branch '%s' yet."
3964 msgstr "分支 '%s' 尚无提交。"
3966 #: builtin/branch.c:737
3968 msgid "No branch named '%s'."
3971 #: builtin/branch.c:752
3972 msgid "too many branches for a rename operation"
3973 msgstr "为重命名操作提供了太多的分支名"
3975 #: builtin/branch.c:757
3976 msgid "too many branches to set new upstream"
3977 msgstr "为设置新上游提供了太多的分支名"
3979 #: builtin/branch.c:761
3982 "could not set upstream of HEAD to %s when it does not point to any branch."
3983 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3985 #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
3987 msgid "no such branch '%s'"
3990 #: builtin/branch.c:768
3992 msgid "branch '%s' does not exist"
3993 msgstr "分支 '%s' 不存在"
3995 #: builtin/branch.c:780
3996 msgid "too many branches to unset upstream"
3997 msgstr "为取消上游设置操作提供了太多的分支名"
3999 #: builtin/branch.c:784
4000 msgid "could not unset upstream of HEAD when it does not point to any branch."
4001 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
4003 #: builtin/branch.c:790
4005 msgid "Branch '%s' has no upstream information"
4006 msgstr "分支 '%s' 没有上游信息"
4008 #: builtin/branch.c:804
4009 msgid "it does not make sense to create 'HEAD' manually"
4010 msgstr "手工创建 'HEAD' 没有意义"
4012 #: builtin/branch.c:810
4013 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4014 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4016 #: builtin/branch.c:813
4019 "The --set-upstream flag is deprecated and will be removed. Consider using --"
4020 "track or --set-upstream-to\n"
4022 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4024 #: builtin/branch.c:830
4028 "If you wanted to make '%s' track '%s', do this:\n"
4032 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4035 #: builtin/branch.c:831
4037 msgid " git branch -d %s\n"
4038 msgstr " git branch -d %s\n"
4040 #: builtin/branch.c:832
4042 msgid " git branch --set-upstream-to %s\n"
4043 msgstr " git branch --set-upstream-to %s\n"
4045 #: builtin/bundle.c:51
4047 msgid "%s is okay\n"
4050 #: builtin/bundle.c:64
4051 msgid "Need a repository to create a bundle."
4052 msgstr "需要一个仓库来创建包。"
4054 #: builtin/bundle.c:68
4055 msgid "Need a repository to unbundle."
4058 #: builtin/cat-file.c:428
4060 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4061 "<type>|--textconv) <object>"
4063 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4064 ">|--textconv) <对象>"
4066 #: builtin/cat-file.c:429
4067 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4068 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4070 #: builtin/cat-file.c:466
4071 msgid "<type> can be one of: blob, tree, commit, tag"
4072 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4074 #: builtin/cat-file.c:467
4075 msgid "show object type"
4078 #: builtin/cat-file.c:468
4079 msgid "show object size"
4082 #: builtin/cat-file.c:470
4083 msgid "exit with zero when there's no error"
4084 msgstr "当没有错误时退出并返回零"
4086 #: builtin/cat-file.c:471
4087 msgid "pretty-print object's content"
4090 #: builtin/cat-file.c:473
4091 msgid "for blob objects, run textconv on object's content"
4092 msgstr "对于数据对象,对其内容执行 textconv"
4094 #: builtin/cat-file.c:475
4095 msgid "allow -s and -t to work with broken/corrupt objects"
4096 msgstr "允许 -s 和 -t 对损坏的对象生效"
4098 #: builtin/cat-file.c:476
4099 msgid "buffer --batch output"
4100 msgstr "缓冲 --batch 的输出"
4102 #: builtin/cat-file.c:478
4103 msgid "show info and content of objects fed from the standard input"
4104 msgstr "显示从标准输入提供的对象的信息和内容"
4106 #: builtin/cat-file.c:481
4107 msgid "show info about objects fed from the standard input"
4108 msgstr "显示从标准输入提供的对象的信息"
4110 #: builtin/cat-file.c:484
4111 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4112 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4114 #: builtin/cat-file.c:486
4115 msgid "show all objects with --batch or --batch-check"
4116 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4118 #: builtin/check-attr.c:11
4119 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4120 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4122 #: builtin/check-attr.c:12
4123 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4124 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4126 #: builtin/check-attr.c:19
4127 msgid "report all attributes set on file"
4128 msgstr "报告设置在文件上的所有属性"
4130 #: builtin/check-attr.c:20
4131 msgid "use .gitattributes only from the index"
4132 msgstr "只使用索引中的 .gitattributes"
4134 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4135 msgid "read file names from stdin"
4138 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
4139 msgid "terminate input and output records by a NUL character"
4140 msgstr "输入和输出的记录使用 NUL 字符终结"
4142 #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
4143 msgid "suppress progress reporting"
4146 #: builtin/check-ignore.c:26
4147 msgid "show non-matching input paths"
4150 #: builtin/check-ignore.c:28
4151 msgid "ignore index when checking"
4154 #: builtin/check-ignore.c:154
4155 msgid "cannot specify pathnames with --stdin"
4156 msgstr "不能同时指定路径及 --stdin 参数"
4158 #: builtin/check-ignore.c:157
4159 msgid "-z only makes sense with --stdin"
4160 msgstr "-z 需要和 --stdin 参数共用才有意义"
4162 #: builtin/check-ignore.c:159
4163 msgid "no path specified"
4166 #: builtin/check-ignore.c:163
4167 msgid "--quiet is only valid with a single pathname"
4168 msgstr "参数 --quiet 只在提供一个路径名时有效"
4170 #: builtin/check-ignore.c:165
4171 msgid "cannot have both --quiet and --verbose"
4172 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4174 #: builtin/check-ignore.c:168
4175 msgid "--non-matching is only valid with --verbose"
4176 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4178 #: builtin/check-mailmap.c:8
4179 msgid "git check-mailmap [<options>] <contact>..."
4180 msgstr "git check-mailmap [<选项>] <联系地址>..."
4182 #: builtin/check-mailmap.c:13
4183 msgid "also read contacts from stdin"
4184 msgstr "还从标准输入读取联系地址"
4186 #: builtin/check-mailmap.c:24
4188 msgid "unable to parse contact: %s"
4189 msgstr "不能解析联系地址:%s"
4191 #: builtin/check-mailmap.c:47
4192 msgid "no contacts specified"
4195 #: builtin/checkout-index.c:127
4196 msgid "git checkout-index [<options>] [--] [<file>...]"
4197 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4199 #: builtin/checkout-index.c:144
4200 msgid "stage should be between 1 and 3 or all"
4201 msgstr "索引值应该取值 1 到 3 或者 all"
4203 #: builtin/checkout-index.c:160
4204 msgid "check out all files in the index"
4207 #: builtin/checkout-index.c:161
4208 msgid "force overwrite of existing files"
4211 #: builtin/checkout-index.c:163
4212 msgid "no warning for existing files and files not in index"
4213 msgstr "存在或不在索引中的文件都没有警告"
4215 #: builtin/checkout-index.c:165
4216 msgid "don't checkout new files"
4219 #: builtin/checkout-index.c:167
4220 msgid "update stat information in the index file"
4221 msgstr "更新索引中文件的状态信息"
4223 #: builtin/checkout-index.c:171
4224 msgid "read list of paths from the standard input"
4225 msgstr "从标准输入读取路径列表"
4227 #: builtin/checkout-index.c:173
4228 msgid "write the content to temporary files"
4231 #: builtin/checkout-index.c:174 builtin/column.c:30
4232 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
4233 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4237 #: builtin/checkout-index.c:175
4238 msgid "when creating files, prepend <string>"
4239 msgstr "在创建文件时,在前面加上 <字符串>"
4241 #: builtin/checkout-index.c:177
4242 msgid "copy out the files from named stage"
4243 msgstr "从指定暂存区中拷出文件"
4245 #: builtin/checkout.c:25
4246 msgid "git checkout [<options>] <branch>"
4247 msgstr "git checkout [<选项>] <分支>"
4249 #: builtin/checkout.c:26
4250 msgid "git checkout [<options>] [<branch>] -- <file>..."
4251 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4253 #: builtin/checkout.c:134 builtin/checkout.c:167
4255 msgid "path '%s' does not have our version"
4256 msgstr "路径 '%s' 没有我们的版本"
4258 #: builtin/checkout.c:136 builtin/checkout.c:169
4260 msgid "path '%s' does not have their version"
4261 msgstr "路径 '%s' 没有他们的版本"
4263 #: builtin/checkout.c:152
4265 msgid "path '%s' does not have all necessary versions"
4266 msgstr "路径 '%s' 没有全部必须的版本"
4268 #: builtin/checkout.c:196
4270 msgid "path '%s' does not have necessary versions"
4271 msgstr "路径 '%s' 没有必须的版本"
4273 #: builtin/checkout.c:213
4275 msgid "path '%s': cannot merge"
4276 msgstr "path '%s':无法合并"
4278 #: builtin/checkout.c:230
4280 msgid "Unable to add merge result for '%s'"
4281 msgstr "无法为 '%s' 添加合并结果"
4283 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4284 #: builtin/checkout.c:260
4286 msgid "'%s' cannot be used with updating paths"
4287 msgstr "'%s' 不能在更新路径时使用"
4289 #: builtin/checkout.c:263 builtin/checkout.c:266
4291 msgid "'%s' cannot be used with %s"
4292 msgstr "'%s' 不能和 %s 同时使用"
4294 #: builtin/checkout.c:269
4296 msgid "Cannot update paths and switch to branch '%s' at the same time."
4297 msgstr "不能同时更新路径并切换到分支'%s'。"
4299 #: builtin/checkout.c:280 builtin/checkout.c:474
4300 msgid "corrupt index file"
4303 #: builtin/checkout.c:340 builtin/checkout.c:347
4305 msgid "path '%s' is unmerged"
4306 msgstr "路径 '%s' 未合并"
4308 #: builtin/checkout.c:496
4309 msgid "you need to resolve your current index first"
4310 msgstr "您需要先解决当前索引的冲突"
4312 #: builtin/checkout.c:623
4314 msgid "Can not do reflog for '%s': %s\n"
4315 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4317 #: builtin/checkout.c:661
4318 msgid "HEAD is now at"
4321 #: builtin/checkout.c:665 builtin/clone.c:659
4322 msgid "unable to update HEAD"
4325 #: builtin/checkout.c:669
4327 msgid "Reset branch '%s'\n"
4328 msgstr "重置分支 '%s'\n"
4330 #: builtin/checkout.c:672
4332 msgid "Already on '%s'\n"
4333 msgstr "已经位于 '%s'\n"
4335 #: builtin/checkout.c:676
4337 msgid "Switched to and reset branch '%s'\n"
4338 msgstr "切换并重置分支 '%s'\n"
4340 #: builtin/checkout.c:678 builtin/checkout.c:1068
4342 msgid "Switched to a new branch '%s'\n"
4343 msgstr "切换到一个新分支 '%s'\n"
4345 #: builtin/checkout.c:680
4347 msgid "Switched to branch '%s'\n"
4348 msgstr "切换到分支 '%s'\n"
4351 #: builtin/checkout.c:732
4353 msgid " ... and %d more.\n"
4354 msgstr " ... 及其它 %d 个。\n"
4356 #: builtin/checkout.c:738
4359 "Warning: you are leaving %d commit behind, not connected to\n"
4360 "any of your branches:\n"
4364 "Warning: you are leaving %d commits behind, not connected to\n"
4365 "any of your branches:\n"
4369 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4373 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4377 #: builtin/checkout.c:757
4380 "If you want to keep it by creating a new branch, this may be a good time\n"
4383 " git branch <new-branch-name> %s\n"
4386 "If you want to keep them by creating a new branch, this may be a good time\n"
4389 " git branch <new-branch-name> %s\n"
4392 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4395 " git branch <新分支名> %s\n"
4398 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4401 " git branch <新分支名> %s\n"
4404 #: builtin/checkout.c:793
4405 msgid "internal error in revision walk"
4406 msgstr "在版本遍历时遇到内部错误"
4408 #: builtin/checkout.c:797
4409 msgid "Previous HEAD position was"
4410 msgstr "之前的 HEAD 位置是"
4412 #: builtin/checkout.c:824 builtin/checkout.c:1063
4413 msgid "You are on a branch yet to be born"
4414 msgstr "您位于一个尚未初始化的分支"
4416 #: builtin/checkout.c:969
4418 msgid "only one reference expected, %d given."
4419 msgstr "只要一个引用,却给出了 %d 个"
4421 #: builtin/checkout.c:1009 builtin/worktree.c:211
4423 msgid "invalid reference: %s"
4426 #: builtin/checkout.c:1038
4428 msgid "reference is not a tree: %s"
4431 #: builtin/checkout.c:1077
4432 msgid "paths cannot be used with switching branches"
4433 msgstr "路径不能和切换分支同时使用"
4435 #: builtin/checkout.c:1080 builtin/checkout.c:1084
4437 msgid "'%s' cannot be used with switching branches"
4438 msgstr "'%s' 不能和切换分支同时使用"
4440 #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4441 #: builtin/checkout.c:1099
4443 msgid "'%s' cannot be used with '%s'"
4444 msgstr "'%s' 不能和 '%s' 同时使用"
4446 #: builtin/checkout.c:1104
4448 msgid "Cannot switch branch to a non-commit '%s'"
4449 msgstr "不能切换分支到一个非提交 '%s'"
4451 #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4452 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4453 #: builtin/worktree.c:320
4457 #: builtin/checkout.c:1138
4458 msgid "create and checkout a new branch"
4459 msgstr "创建并检出一个新的分支"
4461 #: builtin/checkout.c:1140
4462 msgid "create/reset and checkout a branch"
4463 msgstr "创建/重置并检出一个分支"
4465 #: builtin/checkout.c:1141
4466 msgid "create reflog for new branch"
4467 msgstr "为新的分支创建引用日志"
4469 #: builtin/checkout.c:1142
4470 msgid "detach the HEAD at named commit"
4471 msgstr "成为指向该提交的分离头指针"
4473 #: builtin/checkout.c:1143
4474 msgid "set upstream info for new branch"
4475 msgstr "为新的分支设置上游信息"
4477 #: builtin/checkout.c:1145
4481 #: builtin/checkout.c:1145
4482 msgid "new unparented branch"
4485 #: builtin/checkout.c:1146
4486 msgid "checkout our version for unmerged files"
4487 msgstr "对尚未合并的文件检出我们的版本"
4489 #: builtin/checkout.c:1148
4490 msgid "checkout their version for unmerged files"
4491 msgstr "对尚未合并的文件检出他们的版本"
4493 #: builtin/checkout.c:1150
4494 msgid "force checkout (throw away local modifications)"
4495 msgstr "强制检出(丢弃本地修改)"
4497 #: builtin/checkout.c:1151
4498 msgid "perform a 3-way merge with the new branch"
4499 msgstr "和新的分支执行三方合并"
4501 #: builtin/checkout.c:1152 builtin/merge.c:227
4502 msgid "update ignored files (default)"
4503 msgstr "更新忽略的文件(默认)"
4505 #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
4509 #: builtin/checkout.c:1154
4510 msgid "conflict style (merge or diff3)"
4511 msgstr "冲突输出风格(merge 或 diff3)"
4513 #: builtin/checkout.c:1157
4514 msgid "do not limit pathspecs to sparse entries only"
4515 msgstr "对路径不做稀疏检出的限制"
4517 #: builtin/checkout.c:1159
4518 msgid "second guess 'git checkout <no-such-branch>'"
4519 msgstr "二次猜测'git checkout <无此分支>'"
4521 #: builtin/checkout.c:1161
4522 msgid "do not check if another worktree is holding the given ref"
4523 msgstr "不检查指定的引用是否被其他工作区所占用"
4525 #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4526 #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
4527 #: builtin/send-pack.c:168
4528 msgid "force progress reporting"
4531 #: builtin/checkout.c:1193
4532 msgid "-b, -B and --orphan are mutually exclusive"
4533 msgstr "-b、-B 和 --orphan 是互斥的"
4535 #: builtin/checkout.c:1210
4536 msgid "--track needs a branch name"
4537 msgstr "--track 需要一个分支名"
4539 #: builtin/checkout.c:1215
4540 msgid "Missing branch name; try -b"
4541 msgstr "缺少分支名;尝试 -b"
4543 #: builtin/checkout.c:1251
4544 msgid "invalid path specification"
4547 #: builtin/checkout.c:1258
4550 "Cannot update paths and switch to branch '%s' at the same time.\n"
4551 "Did you intend to checkout '%s' which can not be resolved as commit?"
4553 "不能同时更新路径并切换到分支'%s'。\n"
4554 "您是想要检出 '%s' 但其未能解析为提交么?"
4556 #: builtin/checkout.c:1263
4558 msgid "git checkout: --detach does not take a path argument '%s'"
4559 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4561 #: builtin/checkout.c:1267
4563 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4564 "checking out of the index."
4566 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4568 #: builtin/clean.c:25
4570 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4572 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4574 #: builtin/clean.c:29
4576 msgid "Removing %s\n"
4579 #: builtin/clean.c:30
4581 msgid "Would remove %s\n"
4584 #: builtin/clean.c:31
4586 msgid "Skipping repository %s\n"
4589 #: builtin/clean.c:32
4591 msgid "Would skip repository %s\n"
4594 #: builtin/clean.c:33
4596 msgid "failed to remove %s"
4599 #: builtin/clean.c:291
4602 "1 - select a numbered item\n"
4603 "foo - select item based on unique prefix\n"
4604 " - (empty) select nothing"
4608 "foo - 通过标题选择一个选项\n"
4611 #: builtin/clean.c:295
4614 "1 - select a single item\n"
4615 "3-5 - select a range of items\n"
4616 "2-3,6-9 - select multiple ranges\n"
4617 "foo - select item based on unique prefix\n"
4618 "-... - unselect specified items\n"
4619 "* - choose all items\n"
4620 " - (empty) finish selecting"
4624 "3-5 - 选择一个范围内的所有选项\n"
4625 "2-3,6-9 - 选择多个范围内的所有选项\n"
4626 "foo - 通过标题选择一个选项\n"
4631 #: builtin/clean.c:511
4636 #: builtin/clean.c:653
4638 msgid "Input ignore patterns>> "
4639 msgstr "输入模版以排除条目>> "
4641 #: builtin/clean.c:690
4643 msgid "WARNING: Cannot find items matched by: %s"
4644 msgstr "警告:无法找到和 %s 匹配的条目"
4646 #: builtin/clean.c:711
4647 msgid "Select items to delete"
4650 #. TRANSLATORS: Make sure to keep [y/N] as is
4651 #: builtin/clean.c:752
4653 msgid "Remove %s [y/N]? "
4654 msgstr "删除 %s [y/N]?"
4656 #: builtin/clean.c:777
4660 #: builtin/clean.c:785
4662 "clean - start cleaning\n"
4663 "filter by pattern - exclude items from deletion\n"
4664 "select by numbers - select items to be deleted by numbers\n"
4665 "ask each - confirm each deletion (like \"rm -i\")\n"
4666 "quit - stop cleaning\n"
4667 "help - this screen\n"
4668 "? - help for prompt selection"
4671 "filter by pattern - 通过模版排除要删除的条目\n"
4672 "select by numbers - 通过数字选择要删除的条目\n"
4673 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4676 "? - 显示如何在提示符下选择的帮助"
4678 #: builtin/clean.c:812
4679 msgid "*** Commands ***"
4682 #: builtin/clean.c:813
4686 #: builtin/clean.c:821
4687 msgid "Would remove the following item:"
4688 msgid_plural "Would remove the following items:"
4689 msgstr[0] "将删除如下条目:"
4690 msgstr[1] "将删除如下条目:"
4692 #: builtin/clean.c:838
4693 msgid "No more files to clean, exiting."
4694 msgstr "没有要清理的文件,退出。"
4696 #: builtin/clean.c:869
4697 msgid "do not print names of files removed"
4700 #: builtin/clean.c:871
4704 #: builtin/clean.c:872
4705 msgid "interactive cleaning"
4708 #: builtin/clean.c:874
4709 msgid "remove whole directories"
4712 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4713 #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
4717 #: builtin/clean.c:876
4718 msgid "add <pattern> to ignore rules"
4719 msgstr "添加 <模式> 到忽略规则"
4721 #: builtin/clean.c:877
4722 msgid "remove ignored files, too"
4725 #: builtin/clean.c:879
4726 msgid "remove only ignored files"
4729 #: builtin/clean.c:897
4730 msgid "-x and -X cannot be used together"
4731 msgstr "-x 和 -X 不能同时使用"
4733 #: builtin/clean.c:901
4735 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4738 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4740 #: builtin/clean.c:904
4742 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4745 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4747 #: builtin/clone.c:37
4748 msgid "git clone [<options>] [--] <repo> [<dir>]"
4749 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4751 #: builtin/clone.c:60
4752 msgid "don't create a checkout"
4755 #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
4756 msgid "create a bare repository"
4759 #: builtin/clone.c:65
4760 msgid "create a mirror repository (implies bare)"
4761 msgstr "创建一个镜像仓库(也是纯仓库)"
4763 #: builtin/clone.c:67
4764 msgid "to clone from a local repository"
4767 #: builtin/clone.c:69
4768 msgid "don't use local hardlinks, always copy"
4769 msgstr "不使用本地硬链接,始终复制"
4771 #: builtin/clone.c:71
4772 msgid "setup as shared repository"
4775 #: builtin/clone.c:73 builtin/clone.c:75
4776 msgid "initialize submodules in the clone"
4779 #: builtin/clone.c:76 builtin/init-db.c:466
4780 msgid "template-directory"
4783 #: builtin/clone.c:77 builtin/init-db.c:467
4784 msgid "directory from which templates will be used"
4787 #: builtin/clone.c:79 builtin/submodule--helper.c:173
4788 msgid "reference repository"
4791 #: builtin/clone.c:81
4792 msgid "use --reference only while cloning"
4793 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4795 #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
4799 #: builtin/clone.c:83
4800 msgid "use <name> instead of 'origin' to track upstream"
4801 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4803 #: builtin/clone.c:85
4804 msgid "checkout <branch> instead of the remote's HEAD"
4805 msgstr "检出 <分支> 而不是远程 HEAD"
4807 #: builtin/clone.c:87
4808 msgid "path to git-upload-pack on the remote"
4809 msgstr "远程 git-upload-pack 路径"
4811 #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4812 #: builtin/pull.c:193
4816 #: builtin/clone.c:89
4817 msgid "create a shallow clone of that depth"
4818 msgstr "创建一个指定深度的浅克隆"
4820 #: builtin/clone.c:91
4821 msgid "clone only one branch, HEAD or --branch"
4822 msgstr "只克隆一个分支、HEAD 或 --branch"
4824 #: builtin/clone.c:92 builtin/init-db.c:475
4828 #: builtin/clone.c:93 builtin/init-db.c:476
4829 msgid "separate git dir from working tree"
4830 msgstr "git目录和工作区分离"
4832 #: builtin/clone.c:94
4836 #: builtin/clone.c:95
4837 msgid "set config inside the new repository"
4838 msgstr "在新仓库中设置配置信息"
4840 #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4841 msgid "use IPv4 addresses only"
4842 msgstr "只使用 IPv4 地址"
4844 #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4845 msgid "use IPv6 addresses only"
4846 msgstr "只使用 IPv6 地址"
4848 #: builtin/clone.c:239
4850 "No directory name could be guessed.\n"
4851 "Please specify a directory on the command line"
4856 #: builtin/clone.c:305
4858 msgid "reference repository '%s' as a linked checkout is not supported yet."
4859 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4861 #: builtin/clone.c:307
4863 msgid "reference repository '%s' is not a local repository."
4864 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4866 #: builtin/clone.c:312
4868 msgid "reference repository '%s' is shallow"
4869 msgstr "参考仓库 '%s' 是一个浅克隆"
4871 #: builtin/clone.c:315
4873 msgid "reference repository '%s' is grafted"
4874 msgstr "参考仓库 '%s' 已被嫁接"
4876 #: builtin/clone.c:380 builtin/diff.c:84
4878 msgid "failed to stat '%s'"
4879 msgstr "无法枚举 '%s' 状态"
4881 #: builtin/clone.c:382
4883 msgid "%s exists and is not a directory"
4884 msgstr "%s 存在且不是一个目录"
4886 #: builtin/clone.c:396
4888 msgid "failed to stat %s\n"
4889 msgstr "无法枚举 %s 状态\n"
4891 #: builtin/clone.c:418
4893 msgid "failed to create link '%s'"
4894 msgstr "无法创建链接 '%s'"
4896 #: builtin/clone.c:422
4898 msgid "failed to copy file to '%s'"
4899 msgstr "无法拷贝文件至 '%s'"
4901 #: builtin/clone.c:447 builtin/clone.c:631
4906 #: builtin/clone.c:459
4908 "Clone succeeded, but checkout failed.\n"
4909 "You can inspect what was checked out with 'git status'\n"
4910 "and retry the checkout with 'git checkout -f HEAD'\n"
4913 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4914 "'git checkout -f HEAD' 重试\n"
4916 #: builtin/clone.c:536
4918 msgid "Could not find remote branch %s to clone."
4919 msgstr "不能发现要克隆的远程分支 %s。"
4921 #: builtin/clone.c:626
4923 msgid "Checking connectivity... "
4926 #: builtin/clone.c:629
4927 msgid "remote did not send all necessary objects"
4928 msgstr "远程没有发送所有必须的对象"
4930 #: builtin/clone.c:647
4932 msgid "unable to update %s"
4935 #: builtin/clone.c:696
4936 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4937 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4939 #: builtin/clone.c:727
4940 msgid "unable to checkout working tree"
4943 #: builtin/clone.c:753
4944 msgid "unable to write parameters to config file"
4945 msgstr "无法将参数写入配置文件"
4947 #: builtin/clone.c:816
4948 msgid "cannot repack to clean up"
4949 msgstr "无法执行 repack 来清理"
4951 #: builtin/clone.c:818
4952 msgid "cannot unlink temporary alternates file"
4953 msgstr "无法删除临时的 alternates 文件"
4955 #: builtin/clone.c:850
4956 msgid "Too many arguments."
4959 #: builtin/clone.c:854
4960 msgid "You must specify a repository to clone."
4961 msgstr "您必须指定一个仓库来克隆。"
4963 #: builtin/clone.c:865
4965 msgid "--bare and --origin %s options are incompatible."
4966 msgstr "--bare 和 --origin %s 选项不兼容。"
4968 #: builtin/clone.c:868
4969 msgid "--bare and --separate-git-dir are incompatible."
4970 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4972 #: builtin/clone.c:881
4974 msgid "repository '%s' does not exist"
4975 msgstr "仓库 '%s' 不存在"
4977 #: builtin/clone.c:887 builtin/fetch.c:1174
4979 msgid "depth %s is not a positive number"
4980 msgstr "深度 %s 不是一个正数"
4982 #: builtin/clone.c:897
4984 msgid "destination path '%s' already exists and is not an empty directory."
4985 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4987 #: builtin/clone.c:907
4989 msgid "working tree '%s' already exists."
4990 msgstr "工作区 '%s' 已经存在。"
4992 #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4993 #: builtin/worktree.c:219 builtin/worktree.c:246
4995 msgid "could not create leading directories of '%s'"
4996 msgstr "不能为 '%s' 创建先导目录"
4998 #: builtin/clone.c:925
5000 msgid "could not create work tree dir '%s'"
5001 msgstr "不能创建工作区目录 '%s'"
5003 #: builtin/clone.c:943
5005 msgid "Cloning into bare repository '%s'...\n"
5006 msgstr "克隆到纯仓库 '%s'...\n"
5008 #: builtin/clone.c:945
5010 msgid "Cloning into '%s'...\n"
5011 msgstr "正克隆到 '%s'...\n"
5013 #: builtin/clone.c:984
5014 msgid "--depth is ignored in local clones; use file:// instead."
5015 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5017 #: builtin/clone.c:987
5018 msgid "source repository is shallow, ignoring --local"
5019 msgstr "源仓库是浅克隆,忽略 --local"
5021 #: builtin/clone.c:992
5022 msgid "--local is ignored"
5023 msgstr "--local 被忽略"
5025 #: builtin/clone.c:996
5027 msgid "Don't know how to clone %s"
5030 #: builtin/clone.c:1045 builtin/clone.c:1053
5032 msgid "Remote branch %s not found in upstream %s"
5033 msgstr "远程分支 %s 在上游 %s 未发现"
5035 #: builtin/clone.c:1056
5036 msgid "You appear to have cloned an empty repository."
5037 msgstr "您似乎克隆了一个空仓库。"
5039 #: builtin/column.c:9
5040 msgid "git column [<options>]"
5041 msgstr "git column [<选项>]"
5043 #: builtin/column.c:26
5044 msgid "lookup config vars"
5047 #: builtin/column.c:27 builtin/column.c:28
5048 msgid "layout to use"
5051 #: builtin/column.c:29
5052 msgid "Maximum width"
5055 #: builtin/column.c:30
5056 msgid "Padding space on left border"
5059 #: builtin/column.c:31
5060 msgid "Padding space on right border"
5063 #: builtin/column.c:32
5064 msgid "Padding space between columns"
5067 #: builtin/column.c:51
5068 msgid "--command must be the first argument"
5069 msgstr "--command 必须是第一个参数"
5071 #: builtin/commit.c:38
5072 msgid "git commit [<options>] [--] <pathspec>..."
5073 msgstr "git commit [<选项>] [--] <路径规格>..."
5075 #: builtin/commit.c:43
5076 msgid "git status [<options>] [--] <pathspec>..."
5077 msgstr "git status [<选项>] [--] <路径规格>..."
5079 #: builtin/commit.c:48
5081 "Your name and email address were configured automatically based\n"
5082 "on your username and hostname. Please check that they are accurate.\n"
5083 "You can suppress this message by setting them explicitly. Run the\n"
5084 "following command and follow the instructions in your editor to edit\n"
5085 "your configuration file:\n"
5087 " git config --global --edit\n"
5089 "After doing this, you may fix the identity used for this commit with:\n"
5091 " git commit --amend --reset-author\n"
5093 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5094 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5097 " git config --global --edit\n"
5099 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5101 " git commit --amend --reset-author\n"
5103 #: builtin/commit.c:61
5105 "Your name and email address were configured automatically based\n"
5106 "on your username and hostname. Please check that they are accurate.\n"
5107 "You can suppress this message by setting them explicitly:\n"
5109 " git config --global user.name \"Your Name\"\n"
5110 " git config --global user.email you@example.com\n"
5112 "After doing this, you may fix the identity used for this commit with:\n"
5114 " git commit --amend --reset-author\n"
5116 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5117 "与否。您可以对其进行设置以免再出现本提示信息:\n"
5119 " git config --global user.name \"Your Name\"\n"
5120 " git config --global user.email you@example.com\n"
5122 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5124 " git commit --amend --reset-author\n"
5126 #: builtin/commit.c:73
5128 "You asked to amend the most recent commit, but doing so would make\n"
5129 "it empty. You can repeat your command with --allow-empty, or you can\n"
5130 "remove the commit entirely with \"git reset HEAD^\".\n"
5132 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5133 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5135 #: builtin/commit.c:78
5137 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5138 "If you wish to commit it anyway, use:\n"
5140 " git commit --allow-empty\n"
5143 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5146 " git commit --allow-empty\n"
5149 #: builtin/commit.c:85
5150 msgid "Otherwise, please use 'git reset'\n"
5151 msgstr "否则,请使用命令 'git reset'\n"
5153 #: builtin/commit.c:88
5155 "If you wish to skip this commit, use:\n"
5159 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5160 "the remaining commits.\n"
5162 "如果您想跳过这个提交,使用命令:\n"
5166 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5169 #: builtin/commit.c:305
5170 msgid "failed to unpack HEAD tree object"
5171 msgstr "无法解包 HEAD 树对象"
5173 #: builtin/commit.c:346
5174 msgid "unable to create temporary index"
5177 #: builtin/commit.c:352
5178 msgid "interactive add failed"
5181 #: builtin/commit.c:365
5182 msgid "unable to update temporary index"
5185 #: builtin/commit.c:367
5186 msgid "Failed to update main cache tree"
5189 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5190 msgid "unable to write new_index file"
5191 msgstr "无法写 new_index 文件"
5193 #: builtin/commit.c:445
5194 msgid "cannot do a partial commit during a merge."
5195 msgstr "在合并过程中不能做部分提交。"
5197 #: builtin/commit.c:447
5198 msgid "cannot do a partial commit during a cherry-pick."
5199 msgstr "在拣选过程中不能做部分提交。"
5201 #: builtin/commit.c:456
5202 msgid "cannot read the index"
5205 #: builtin/commit.c:475
5206 msgid "unable to write temporary index file"
5209 #: builtin/commit.c:580
5211 msgid "commit '%s' lacks author header"
5212 msgstr "提交 '%s' 缺少作者信息"
5214 #: builtin/commit.c:582
5216 msgid "commit '%s' has malformed author line"
5217 msgstr "提交 '%s' 有非法的作者信息"
5219 #: builtin/commit.c:601
5220 msgid "malformed --author parameter"
5221 msgstr "非法的 --author 参数"
5223 #: builtin/commit.c:609
5225 msgid "invalid date format: %s"
5228 #: builtin/commit.c:653
5230 "unable to select a comment character that is not used\n"
5231 "in the current commit message"
5232 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5234 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5236 msgid "could not lookup commit %s"
5239 #: builtin/commit.c:702 builtin/shortlog.c:285
5241 msgid "(reading log message from standard input)\n"
5242 msgstr "(正从标准输入中读取日志信息)\n"
5244 #: builtin/commit.c:704
5245 msgid "could not read log from standard input"
5246 msgstr "不能从标准输入中读取日志信息"
5248 #: builtin/commit.c:708
5250 msgid "could not read log file '%s'"
5251 msgstr "不能读取日志文件 '%s'"
5253 #: builtin/commit.c:730
5254 msgid "could not read MERGE_MSG"
5255 msgstr "不能读取 MERGE_MSG"
5257 #: builtin/commit.c:734
5258 msgid "could not read SQUASH_MSG"
5259 msgstr "不能读取 SQUASH_MSG"
5261 #: builtin/commit.c:785
5262 msgid "could not write commit template"
5265 #: builtin/commit.c:803
5269 "It looks like you may be committing a merge.\n"
5270 "If this is not correct, please remove the file\n"
5275 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5279 #: builtin/commit.c:808
5283 "It looks like you may be committing a cherry-pick.\n"
5284 "If this is not correct, please remove the file\n"
5289 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5293 #: builtin/commit.c:821
5296 "Please enter the commit message for your changes. Lines starting\n"
5297 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5299 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5302 #: builtin/commit.c:828
5305 "Please enter the commit message for your changes. Lines starting\n"
5306 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5307 "An empty message aborts the commit.\n"
5309 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5310 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5312 # 译者:为保证在输出中对齐,注意调整句中空格!
5313 #: builtin/commit.c:848
5315 msgid "%sAuthor: %.*s <%.*s>"
5316 msgstr "%s作者: %.*s <%.*s>"
5318 # 译者:为保证在输出中对齐,注意调整句中空格!
5319 #: builtin/commit.c:856
5324 # 译者:为保证在输出中对齐,注意调整句中空格!
5325 #: builtin/commit.c:863
5327 msgid "%sCommitter: %.*s <%.*s>"
5328 msgstr "%s提交者:%.*s <%.*s>"
5330 #: builtin/commit.c:881
5331 msgid "Cannot read index"
5334 #: builtin/commit.c:938
5335 msgid "Error building trees"
5338 #: builtin/commit.c:953 builtin/tag.c:266
5340 msgid "Please supply the message using either -m or -F option.\n"
5341 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5343 #: builtin/commit.c:1055
5345 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5346 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5348 #: builtin/commit.c:1070 builtin/commit.c:1310
5350 msgid "Invalid untracked files mode '%s'"
5351 msgstr "无效的未追踪文件参数 '%s'"
5353 #: builtin/commit.c:1107
5354 msgid "--long and -z are incompatible"
5355 msgstr "--long 和 -z 选项不兼容"
5357 #: builtin/commit.c:1137
5358 msgid "Using both --reset-author and --author does not make sense"
5359 msgstr "同时使用 --reset-author 和 --author 没有意义"
5361 #: builtin/commit.c:1146
5362 msgid "You have nothing to amend."
5365 #: builtin/commit.c:1149
5366 msgid "You are in the middle of a merge -- cannot amend."
5367 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5369 #: builtin/commit.c:1151
5370 msgid "You are in the middle of a cherry-pick -- cannot amend."
5371 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5373 #: builtin/commit.c:1154
5374 msgid "Options --squash and --fixup cannot be used together"
5375 msgstr "选项 --squash 和 --fixup 不能同时使用"
5377 #: builtin/commit.c:1164
5378 msgid "Only one of -c/-C/-F/--fixup can be used."
5379 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5381 #: builtin/commit.c:1166
5382 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5383 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5385 #: builtin/commit.c:1174
5386 msgid "--reset-author can be used only with -C, -c or --amend."
5387 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5389 #: builtin/commit.c:1191
5390 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5391 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5393 #: builtin/commit.c:1193
5394 msgid "No paths with --include/--only does not make sense."
5395 msgstr "参数 --include/--only 不跟路径没有意义。"
5397 #: builtin/commit.c:1195
5398 msgid "Clever... amending the last one with dirty index."
5399 msgstr "聪明... 用脏索引修补最后一个提交。"
5401 #: builtin/commit.c:1197
5402 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5403 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5405 #: builtin/commit.c:1209 builtin/tag.c:475
5407 msgid "Invalid cleanup mode %s"
5410 #: builtin/commit.c:1214
5411 msgid "Paths with -a does not make sense."
5412 msgstr "路径和 -a 选项同时使用没有意义。"
5414 #: builtin/commit.c:1324 builtin/commit.c:1605
5415 msgid "show status concisely"
5418 #: builtin/commit.c:1326 builtin/commit.c:1607
5419 msgid "show branch information"
5422 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5423 #: builtin/worktree.c:430
5424 msgid "machine-readable output"
5427 #: builtin/commit.c:1331 builtin/commit.c:1611
5428 msgid "show status in long format (default)"
5429 msgstr "以长格式显示状态(默认)"
5431 #: builtin/commit.c:1334 builtin/commit.c:1614
5432 msgid "terminate entries with NUL"
5433 msgstr "条目以 NUL 字符结尾"
5435 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5436 #: builtin/fast-export.c:984 builtin/tag.c:353
5440 #: builtin/commit.c:1337 builtin/commit.c:1617
5441 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5442 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5444 #: builtin/commit.c:1340
5445 msgid "show ignored files"
5448 #: builtin/commit.c:1341 parse-options.h:155
5452 #: builtin/commit.c:1342
5454 "ignore changes to submodules, optional when: all, dirty, untracked. "
5457 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5459 #: builtin/commit.c:1344
5460 msgid "list untracked files in columns"
5461 msgstr "以列的方式显示未跟踪的文件"
5463 #: builtin/commit.c:1430
5464 msgid "couldn't look up newly created commit"
5467 #: builtin/commit.c:1432
5468 msgid "could not parse newly created commit"
5471 #: builtin/commit.c:1477
5472 msgid "detached HEAD"
5475 # 译者:中文字符串拼接,可删除前导空格
5476 #: builtin/commit.c:1480
5477 msgid " (root-commit)"
5480 #: builtin/commit.c:1575
5481 msgid "suppress summary after successful commit"
5482 msgstr "提交成功后不显示概述信息"
5484 #: builtin/commit.c:1576
5485 msgid "show diff in commit message template"
5486 msgstr "在提交说明模板里显示差异"
5488 #: builtin/commit.c:1578
5489 msgid "Commit message options"
5492 #: builtin/commit.c:1579 builtin/tag.c:351
5493 msgid "read message from file"
5496 #: builtin/commit.c:1580
5500 #: builtin/commit.c:1580
5501 msgid "override author for commit"
5504 #: builtin/commit.c:1581 builtin/gc.c:326
5508 #: builtin/commit.c:1581
5509 msgid "override date for commit"
5512 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5513 #: builtin/notes.c:558 builtin/tag.c:349
5517 #: builtin/commit.c:1582
5518 msgid "commit message"
5521 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5522 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5526 #: builtin/commit.c:1583
5527 msgid "reuse and edit message from specified commit"
5528 msgstr "重用并编辑指定提交的提交说明"
5530 #: builtin/commit.c:1584
5531 msgid "reuse message from specified commit"
5532 msgstr "重用指定提交的提交说明"
5534 #: builtin/commit.c:1585
5535 msgid "use autosquash formatted message to fixup specified commit"
5536 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5538 #: builtin/commit.c:1586
5539 msgid "use autosquash formatted message to squash specified commit"
5540 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5542 #: builtin/commit.c:1587
5543 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5544 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5546 #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
5547 msgid "add Signed-off-by:"
5548 msgstr "添加 Signed-off-by: 签名"
5550 #: builtin/commit.c:1589
5551 msgid "use specified template file"
5554 #: builtin/commit.c:1590
5555 msgid "force edit of commit"
5558 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5559 #: builtin/commit.c:1591
5563 #: builtin/commit.c:1591 builtin/tag.c:354
5564 msgid "how to strip spaces and #comments from message"
5565 msgstr "设置如何删除提交说明里的空格和#注释"
5567 #: builtin/commit.c:1592
5568 msgid "include status in commit message template"
5569 msgstr "在提交说明模板里包含状态信息"
5571 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
5572 #: builtin/revert.c:93
5573 msgid "GPG sign commit"
5576 #: builtin/commit.c:1597
5577 msgid "Commit contents options"
5580 #: builtin/commit.c:1598
5581 msgid "commit all changed files"
5584 #: builtin/commit.c:1599
5585 msgid "add specified files to index for commit"
5586 msgstr "添加指定的文件到索引区等待提交"
5588 #: builtin/commit.c:1600
5589 msgid "interactively add files"
5592 #: builtin/commit.c:1601
5593 msgid "interactively add changes"
5596 #: builtin/commit.c:1602
5597 msgid "commit only specified files"
5600 #: builtin/commit.c:1603
5601 msgid "bypass pre-commit hook"
5602 msgstr "绕过 pre-commit 钩子"
5604 #: builtin/commit.c:1604
5605 msgid "show what would be committed"
5608 #: builtin/commit.c:1615
5609 msgid "amend previous commit"
5612 #: builtin/commit.c:1616
5613 msgid "bypass post-rewrite hook"
5614 msgstr "绕过 post-rewrite 钩子"
5616 #: builtin/commit.c:1621
5617 msgid "ok to record an empty change"
5620 #: builtin/commit.c:1623
5621 msgid "ok to record a change with an empty message"
5624 #: builtin/commit.c:1652
5625 msgid "could not parse HEAD commit"
5626 msgstr "不能解析 HEAD 提交"
5628 #: builtin/commit.c:1698
5630 msgid "Corrupt MERGE_HEAD file (%s)"
5631 msgstr "损坏的 MERGE_HEAD 文件(%s)"
5633 #: builtin/commit.c:1705
5634 msgid "could not read MERGE_MODE"
5635 msgstr "不能读取 MERGE_MODE"
5637 #: builtin/commit.c:1724
5639 msgid "could not read commit message: %s"
5640 msgstr "不能读取提交说明:%s"
5642 #: builtin/commit.c:1735
5644 msgid "Aborting commit; you did not edit the message.\n"
5645 msgstr "终止提交;您未更改来自模版的提交说明。\n"
5647 #: builtin/commit.c:1740
5649 msgid "Aborting commit due to empty commit message.\n"
5650 msgstr "终止提交因为提交说明为空。\n"
5652 #: builtin/commit.c:1788
5654 "Repository has been updated, but unable to write\n"
5655 "new_index file. Check that disk is not full and quota is\n"
5656 "not exceeded, and then \"git reset HEAD\" to recover."
5658 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5659 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5661 #: builtin/config.c:9
5662 msgid "git config [<options>]"
5663 msgstr "git config [<选项>]"
5665 #: builtin/config.c:56
5666 msgid "Config file location"
5669 #: builtin/config.c:57
5670 msgid "use global config file"
5673 #: builtin/config.c:58
5674 msgid "use system config file"
5677 #: builtin/config.c:59
5678 msgid "use repository config file"
5681 #: builtin/config.c:60
5682 msgid "use given config file"
5685 #: builtin/config.c:61
5689 #: builtin/config.c:61
5690 msgid "read config from given blob object"
5691 msgstr "从给定的数据对象读取配置"
5693 #: builtin/config.c:62
5697 #: builtin/config.c:63
5698 msgid "get value: name [value-regex]"
5699 msgstr "获取值:name [value-regex]"
5701 #: builtin/config.c:64
5702 msgid "get all values: key [value-regex]"
5703 msgstr "获得所有的值:key [value-regex]"
5705 #: builtin/config.c:65
5706 msgid "get values for regexp: name-regex [value-regex]"
5707 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5709 #: builtin/config.c:66
5710 msgid "get value specific for the URL: section[.var] URL"
5711 msgstr "获得 URL 取值:section[.var] URL"
5713 #: builtin/config.c:67
5714 msgid "replace all matching variables: name value [value_regex]"
5715 msgstr "替换所有匹配的变量:name value [value_regex]"
5717 #: builtin/config.c:68
5718 msgid "add a new variable: name value"
5719 msgstr "添加一个新的变量:name value"
5721 #: builtin/config.c:69
5722 msgid "remove a variable: name [value-regex]"
5723 msgstr "删除一个变量:name [value-regex]"
5725 #: builtin/config.c:70
5726 msgid "remove all matches: name [value-regex]"
5727 msgstr "删除所有匹配项:name [value-regex]"
5729 #: builtin/config.c:71
5730 msgid "rename section: old-name new-name"
5731 msgstr "重命名小节:old-name new-name"
5733 #: builtin/config.c:72
5734 msgid "remove a section: name"
5735 msgstr "删除一个小节:name"
5737 #: builtin/config.c:73
5741 #: builtin/config.c:74
5742 msgid "open an editor"
5745 #: builtin/config.c:75
5746 msgid "find the color configured: slot [default]"
5747 msgstr "获得配置的颜色:配置 [默认]"
5749 #: builtin/config.c:76
5750 msgid "find the color setting: slot [stdout-is-tty]"
5751 msgstr "获得颜色设置:配置 [stdout-is-tty]"
5753 #: builtin/config.c:77
5757 #: builtin/config.c:78
5758 msgid "value is \"true\" or \"false\""
5759 msgstr "值是 \"true\" 或 \"false\""
5761 #: builtin/config.c:79
5762 msgid "value is decimal number"
5765 #: builtin/config.c:80
5766 msgid "value is --bool or --int"
5767 msgstr "值是 --bool or --int"
5769 #: builtin/config.c:81
5770 msgid "value is a path (file or directory name)"
5771 msgstr "值是一个路径(文件或目录名)"
5773 #: builtin/config.c:82
5777 #: builtin/config.c:83
5778 msgid "terminate values with NUL byte"
5779 msgstr "终止值是 NUL 字节"
5781 #: builtin/config.c:84
5782 msgid "show variable names only"
5785 #: builtin/config.c:85
5786 msgid "respect include directives on lookup"
5787 msgstr "查询时参照 include 指令递归查找"
5789 #: builtin/config.c:86
5790 msgid "show origin of config (file, standard input, blob, command line)"
5791 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
5793 #: builtin/config.c:328
5794 msgid "unable to parse default color value"
5797 #: builtin/config.c:469
5800 "# This is Git's per-user configuration file.\n"
5802 "# Please adapt and uncomment the following lines:\n"
5806 "# This is Git's per-user configuration file.\n"
5808 "# Please adapt and uncomment the following lines:\n"
5812 #: builtin/config.c:611
5814 msgid "cannot create configuration file %s"
5815 msgstr "不能创建配置文件 %s"
5817 #: builtin/count-objects.c:77
5818 msgid "git count-objects [-v] [-H | --human-readable]"
5819 msgstr "git count-objects [-v] [-H | --human-readable]"
5821 #: builtin/count-objects.c:87
5822 msgid "print sizes in human readable format"
5823 msgstr "以用户可读的格式显示大小"
5825 #: builtin/describe.c:17
5826 msgid "git describe [<options>] [<commit-ish>...]"
5827 msgstr "git describe [<选项>] [<提交号>...]"
5829 #: builtin/describe.c:18
5830 msgid "git describe [<options>] --dirty"
5831 msgstr "git describe [<选项>] --dirty"
5833 #: builtin/describe.c:217
5835 msgid "annotated tag %s not available"
5838 #: builtin/describe.c:221
5840 msgid "annotated tag %s has no embedded name"
5841 msgstr "附注标签 %s 没有嵌入名称"
5843 #: builtin/describe.c:223
5845 msgid "tag '%s' is really '%s' here"
5846 msgstr "标签 '%s' 的确是在 '%s'"
5848 #: builtin/describe.c:250 builtin/log.c:459
5850 msgid "Not a valid object name %s"
5851 msgstr "不是一个有效的对象名 %s"
5853 #: builtin/describe.c:253
5855 msgid "%s is not a valid '%s' object"
5856 msgstr "%s 不是一个有效的 '%s' 对象"
5858 #: builtin/describe.c:270
5860 msgid "no tag exactly matches '%s'"
5861 msgstr "没有标签准确匹配 '%s'"
5863 #: builtin/describe.c:272
5865 msgid "searching to describe %s\n"
5868 #: builtin/describe.c:319
5870 msgid "finished search at %s\n"
5873 #: builtin/describe.c:346
5876 "No annotated tags can describe '%s'.\n"
5877 "However, there were unannotated tags: try --tags."
5880 "然而,存在未附注标签:尝试 --tags。"
5882 #: builtin/describe.c:350
5885 "No tags can describe '%s'.\n"
5886 "Try --always, or create some tags."
5889 "尝试 --always,或者创建一些标签。"
5891 #: builtin/describe.c:371
5893 msgid "traversed %lu commits\n"
5894 msgstr "已遍历 %lu 个提交\n"
5896 #: builtin/describe.c:374
5899 "more than %i tags found; listed %i most recent\n"
5900 "gave up search at %s\n"
5902 "发现多于 %i 个标签,列出最近的 %i 个\n"
5905 #: builtin/describe.c:396
5906 msgid "find the tag that comes after the commit"
5909 #: builtin/describe.c:397
5910 msgid "debug search strategy on stderr"
5911 msgstr "在标准错误上调试搜索策略"
5913 #: builtin/describe.c:398
5917 #: builtin/describe.c:399
5918 msgid "use any tag, even unannotated"
5919 msgstr "使用任意标签,即使未附带注释"
5921 #: builtin/describe.c:400
5922 msgid "always use long format"
5925 #: builtin/describe.c:401
5926 msgid "only follow first parent"
5929 #: builtin/describe.c:404
5930 msgid "only output exact matches"
5933 #: builtin/describe.c:406
5934 msgid "consider <n> most recent tags (default: 10)"
5935 msgstr "考虑最近 <n> 个标签(默认:10)"
5937 #: builtin/describe.c:408
5938 msgid "only consider tags matching <pattern>"
5939 msgstr "只考虑匹配 <模式> 的标签"
5941 #: builtin/describe.c:410 builtin/name-rev.c:314
5942 msgid "show abbreviated commit object as fallback"
5943 msgstr "显示简写的提交号作为后备"
5945 #: builtin/describe.c:411
5949 #: builtin/describe.c:412
5950 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5951 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5953 #: builtin/describe.c:430
5954 msgid "--long is incompatible with --abbrev=0"
5955 msgstr "--long 与 --abbrev=0 不兼容"
5957 #: builtin/describe.c:456
5958 msgid "No names found, cannot describe anything."
5959 msgstr "没有发现名称,无法描述任何东西。"
5961 #: builtin/describe.c:476
5962 msgid "--dirty is incompatible with commit-ishes"
5963 msgstr "--dirty 不能与提交同时使用"
5965 #: builtin/diff.c:86
5967 msgid "'%s': not a regular file or symlink"
5968 msgstr "'%s':不是一个正规文件或符号链接"
5970 #: builtin/diff.c:237
5972 msgid "invalid option: %s"
5975 #: builtin/diff.c:358
5976 msgid "Not a git repository"
5977 msgstr "不是一个 git 仓库"
5979 #: builtin/diff.c:401
5981 msgid "invalid object '%s' given."
5982 msgstr "提供了无效对象 '%s'。"
5984 #: builtin/diff.c:410
5986 msgid "more than two blobs given: '%s'"
5987 msgstr "提供了超过两个数据对象:'%s'"
5989 #: builtin/diff.c:417
5991 msgid "unhandled object '%s' given."
5992 msgstr "无法处理的对象 '%s'。"
5994 #: builtin/fast-export.c:25
5995 msgid "git fast-export [rev-list-opts]"
5996 msgstr "git fast-export [rev-list-opts]"
5998 #: builtin/fast-export.c:980
5999 msgid "show progress after <n> objects"
6000 msgstr "在 <n> 个对象之后显示进度"
6002 #: builtin/fast-export.c:982
6003 msgid "select handling of signed tags"
6006 #: builtin/fast-export.c:985
6007 msgid "select handling of tags that tag filtered objects"
6008 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6010 #: builtin/fast-export.c:988
6011 msgid "Dump marks to this file"
6014 #: builtin/fast-export.c:990
6015 msgid "Import marks from this file"
6018 #: builtin/fast-export.c:992
6019 msgid "Fake a tagger when tags lack one"
6020 msgstr "当标签缺少标记者字段时,假装提供一个"
6022 #: builtin/fast-export.c:994
6023 msgid "Output full tree for each commit"
6026 #: builtin/fast-export.c:996
6027 msgid "Use the done feature to terminate the stream"
6028 msgstr "使用 done 功能来终止流"
6030 #: builtin/fast-export.c:997
6031 msgid "Skip output of blob data"
6034 #: builtin/fast-export.c:998
6038 #: builtin/fast-export.c:999
6039 msgid "Apply refspec to exported refs"
6040 msgstr "对导出的引用应用引用规格"
6042 #: builtin/fast-export.c:1000
6043 msgid "anonymize output"
6046 #: builtin/fetch.c:20
6047 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6048 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6050 #: builtin/fetch.c:21
6051 msgid "git fetch [<options>] <group>"
6052 msgstr "git fetch [<选项>] <组>"
6054 #: builtin/fetch.c:22
6055 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6056 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6058 #: builtin/fetch.c:23
6059 msgid "git fetch --all [<options>]"
6060 msgstr "git fetch --all [<选项>]"
6062 #: builtin/fetch.c:92 builtin/pull.c:166
6063 msgid "fetch from all remotes"
6066 #: builtin/fetch.c:94 builtin/pull.c:169
6067 msgid "append to .git/FETCH_HEAD instead of overwriting"
6068 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6070 #: builtin/fetch.c:96 builtin/pull.c:172
6071 msgid "path to upload pack on remote end"
6074 #: builtin/fetch.c:97 builtin/pull.c:174
6075 msgid "force overwrite of local branch"
6078 #: builtin/fetch.c:99
6079 msgid "fetch from multiple remotes"
6082 #: builtin/fetch.c:101 builtin/pull.c:176
6083 msgid "fetch all tags and associated objects"
6084 msgstr "抓取所有的标签和关联对象"
6086 #: builtin/fetch.c:103
6087 msgid "do not fetch all tags (--no-tags)"
6088 msgstr "不抓取任何标签(--no-tags)"
6090 #: builtin/fetch.c:105
6091 msgid "number of submodules fetched in parallel"
6094 #: builtin/fetch.c:107 builtin/pull.c:179
6095 msgid "prune remote-tracking branches no longer on remote"
6096 msgstr "清除远程已经不存在的分支的跟踪分支"
6099 #: builtin/fetch.c:108 builtin/pull.c:182
6103 #: builtin/fetch.c:109 builtin/pull.c:183
6104 msgid "control recursive fetching of submodules"
6107 #: builtin/fetch.c:113 builtin/pull.c:191
6108 msgid "keep downloaded pack"
6111 #: builtin/fetch.c:115
6112 msgid "allow updating of HEAD ref"
6113 msgstr "允许更新 HEAD 引用"
6115 #: builtin/fetch.c:118 builtin/pull.c:194
6116 msgid "deepen history of shallow clone"
6119 #: builtin/fetch.c:120 builtin/pull.c:197
6120 msgid "convert to a complete repository"
6123 #: builtin/fetch.c:122 builtin/log.c:1236
6127 #: builtin/fetch.c:123
6128 msgid "prepend this to submodule path output"
6129 msgstr "在子模组路径输出的前面加上此目录"
6131 #: builtin/fetch.c:126
6132 msgid "default mode for recursion"
6135 #: builtin/fetch.c:128 builtin/pull.c:200
6136 msgid "accept refs that update .git/shallow"
6137 msgstr "接受更新 .git/shallow 的引用"
6139 #: builtin/fetch.c:129 builtin/pull.c:202
6143 #: builtin/fetch.c:130 builtin/pull.c:203
6144 msgid "specify fetch refmap"
6145 msgstr "指定获取操作的引用映射"
6147 #: builtin/fetch.c:386
6148 msgid "Couldn't find remote ref HEAD"
6149 msgstr "无法发现远程 HEAD 引用"
6151 #: builtin/fetch.c:466
6153 msgid "object %s not found"
6156 #: builtin/fetch.c:471
6157 msgid "[up to date]"
6160 #: builtin/fetch.c:485
6162 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6163 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6165 #: builtin/fetch.c:486 builtin/fetch.c:574
6169 #: builtin/fetch.c:497
6170 msgid "[tag update]"
6174 #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6175 msgid " (unable to update local ref)"
6176 msgstr " (不能更新本地引用)"
6178 #: builtin/fetch.c:517
6182 #: builtin/fetch.c:520
6183 msgid "[new branch]"
6186 #: builtin/fetch.c:523
6190 #: builtin/fetch.c:569
6191 msgid "unable to update local ref"
6194 #: builtin/fetch.c:569
6195 msgid "forced update"
6198 #: builtin/fetch.c:576
6199 msgid "(non-fast-forward)"
6202 #: builtin/fetch.c:610 builtin/fetch.c:851
6204 msgid "cannot open %s: %s\n"
6205 msgstr "无法打开 %s:%s\n"
6207 #: builtin/fetch.c:619
6209 msgid "%s did not send all necessary objects\n"
6210 msgstr "%s 未发送所有必须的对象\n"
6212 #: builtin/fetch.c:637
6214 msgid "reject %s because shallow roots are not allowed to be updated"
6215 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6217 #: builtin/fetch.c:724 builtin/fetch.c:816
6222 #: builtin/fetch.c:735
6225 "some local refs could not be updated; try running\n"
6226 " 'git remote prune %s' to remove any old, conflicting branches"
6228 "一些本地引用不能被更新;尝试运行\n"
6229 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6232 #: builtin/fetch.c:787
6234 msgid " (%s will become dangling)"
6235 msgstr " (%s 将成为摇摆状态)"
6238 #: builtin/fetch.c:788
6240 msgid " (%s has become dangling)"
6241 msgstr " (%s 已成为摇摆状态)"
6243 #: builtin/fetch.c:820
6247 #: builtin/fetch.c:821 builtin/remote.c:1025
6251 #: builtin/fetch.c:841
6253 msgid "Refusing to fetch into current branch %s of non-bare repository"
6254 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6256 #: builtin/fetch.c:860
6258 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6259 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6261 #: builtin/fetch.c:863
6263 msgid "Option \"%s\" is ignored for %s\n"
6264 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6266 #: builtin/fetch.c:920
6268 msgid "Don't know how to fetch from %s"
6269 msgstr "不知道如何从 %s 获取"
6271 #: builtin/fetch.c:1080
6273 msgid "Fetching %s\n"
6276 #: builtin/fetch.c:1082 builtin/remote.c:96
6278 msgid "Could not fetch %s"
6281 #: builtin/fetch.c:1100
6283 "No remote repository specified. Please, specify either a URL or a\n"
6284 "remote name from which new revisions should be fetched."
6285 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6287 #: builtin/fetch.c:1123
6288 msgid "You need to specify a tag name."
6289 msgstr "您需要指定一个标签名称。"
6291 #: builtin/fetch.c:1165
6292 msgid "--depth and --unshallow cannot be used together"
6293 msgstr "--depth 和 --unshallow 不能同时使用"
6295 #: builtin/fetch.c:1167
6296 msgid "--unshallow on a complete repository does not make sense"
6297 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6299 #: builtin/fetch.c:1187
6300 msgid "fetch --all does not take a repository argument"
6301 msgstr "fetch --all 不能带一个仓库参数"
6303 #: builtin/fetch.c:1189
6304 msgid "fetch --all does not make sense with refspecs"
6305 msgstr "fetch --all 带引用规格没有任何意义"
6307 #: builtin/fetch.c:1200
6309 msgid "No such remote or remote group: %s"
6310 msgstr "没有这样的远程或远程组:%s"
6312 #: builtin/fetch.c:1208
6313 msgid "Fetching a group and specifying refspecs does not make sense"
6314 msgstr "获取组并指定引用规格没有意义"
6316 #: builtin/fmt-merge-msg.c:14
6318 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6319 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6321 #: builtin/fmt-merge-msg.c:667
6322 msgid "populate log with at most <n> entries from shortlog"
6323 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6325 #: builtin/fmt-merge-msg.c:670
6326 msgid "alias for --log (deprecated)"
6327 msgstr "参数 --log 的别名(已弃用)"
6329 #: builtin/fmt-merge-msg.c:673
6333 #: builtin/fmt-merge-msg.c:674
6334 msgid "use <text> as start of message"
6335 msgstr "使用 <文本> 作为提交说明的开始"
6337 #: builtin/fmt-merge-msg.c:675
6338 msgid "file to read from"
6341 #: builtin/for-each-ref.c:9
6342 msgid "git for-each-ref [<options>] [<pattern>]"
6343 msgstr "git for-each-ref [<选项>] [<模式>]"
6345 #: builtin/for-each-ref.c:10
6346 msgid "git for-each-ref [--points-at <object>]"
6347 msgstr "git for-each-ref [--points-at <对象>]"
6349 #: builtin/for-each-ref.c:11
6350 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6351 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6353 #: builtin/for-each-ref.c:12
6354 msgid "git for-each-ref [--contains [<object>]]"
6355 msgstr "git for-each-ref [--contains [<对象>]]"
6357 #: builtin/for-each-ref.c:27
6358 msgid "quote placeholders suitably for shells"
6359 msgstr "引用占位符适用于 shells"
6361 #: builtin/for-each-ref.c:29
6362 msgid "quote placeholders suitably for perl"
6363 msgstr "引用占位符适用于 perl"
6365 #: builtin/for-each-ref.c:31
6366 msgid "quote placeholders suitably for python"
6367 msgstr "引用占位符适用于 python"
6369 #: builtin/for-each-ref.c:33
6370 msgid "quote placeholders suitably for Tcl"
6371 msgstr "引用占位符适用于 Tcl"
6373 #: builtin/for-each-ref.c:36
6374 msgid "show only <n> matched refs"
6375 msgstr "只显示 <n> 个匹配的引用"
6377 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6378 msgid "format to use for the output"
6381 #: builtin/for-each-ref.c:41
6382 msgid "print only refs which points at the given object"
6383 msgstr "只打印指向给定对象的引用"
6385 #: builtin/for-each-ref.c:43
6386 msgid "print only refs that are merged"
6389 #: builtin/for-each-ref.c:44
6390 msgid "print only refs that are not merged"
6393 #: builtin/for-each-ref.c:45
6394 msgid "print only refs which contain the commit"
6395 msgstr "只打印包含该提交的引用"
6397 #: builtin/fsck.c:156 builtin/prune.c:140
6398 msgid "Checking connectivity"
6401 #: builtin/fsck.c:486
6402 msgid "Checking object directories"
6405 #: builtin/fsck.c:553
6406 msgid "git fsck [<options>] [<object>...]"
6407 msgstr "git fsck [<选项>] [<对象>...]"
6409 #: builtin/fsck.c:559
6410 msgid "show unreachable objects"
6413 #: builtin/fsck.c:560
6414 msgid "show dangling objects"
6417 #: builtin/fsck.c:561
6421 #: builtin/fsck.c:562
6422 msgid "report root nodes"
6425 #: builtin/fsck.c:563
6426 msgid "make index objects head nodes"
6427 msgstr "将索引亦作为检查的头节点"
6429 #: builtin/fsck.c:564
6430 msgid "make reflogs head nodes (default)"
6431 msgstr "将引用日志作为检查的头节点(默认)"
6433 #: builtin/fsck.c:565
6434 msgid "also consider packs and alternate objects"
6437 #: builtin/fsck.c:566
6438 msgid "check only connectivity"
6441 #: builtin/fsck.c:567
6442 msgid "enable more strict checking"
6445 #: builtin/fsck.c:569
6446 msgid "write dangling objects in .git/lost-found"
6447 msgstr "将摇摆对象写入 .git/lost-found 中"
6449 #: builtin/fsck.c:570 builtin/prune.c:107
6450 msgid "show progress"
6453 #: builtin/fsck.c:631
6454 msgid "Checking objects"
6458 msgid "git gc [<options>]"
6459 msgstr "git gc [<选项>]"
6463 msgid "Invalid %s: '%s'"
6468 msgid "insanely long object directory %.*s"
6469 msgstr "不正常的长对象目录 %.*s"
6474 "The last gc run reported the following. Please correct the root cause\n"
6476 "Automatic cleanup will not be performed until the file is removed.\n"
6480 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6481 "在该文件被删除之前,自动清理将不会执行。\n"
6486 msgid "prune unreferenced objects"
6490 msgid "be more thorough (increased runtime)"
6491 msgstr "更彻底(增加运行时间)"
6494 msgid "enable auto-gc mode"
6498 msgid "force running gc even if there may be another gc running"
6499 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6503 msgid "Auto packing the repository in background for optimum performance.\n"
6504 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6508 msgid "Auto packing the repository for optimum performance.\n"
6509 msgstr "自动打包仓库以求最佳性能。\n"
6513 msgid "See \"git help gc\" for manual housekeeping.\n"
6514 msgstr "手工维护参见 \"git help gc\"。\n"
6519 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6521 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6525 "There are too many unreachable loose objects; run 'git prune' to remove them."
6526 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6528 #: builtin/grep.c:23
6529 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6530 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6532 #: builtin/grep.c:219
6534 msgid "grep: failed to create thread: %s"
6535 msgstr "grep:无法创建线程:%s"
6537 #: builtin/grep.c:277
6539 msgid "invalid number of threads specified (%d) for %s"
6540 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6542 #: builtin/grep.c:452 builtin/grep.c:487
6544 msgid "unable to read tree (%s)"
6547 #: builtin/grep.c:502
6549 msgid "unable to grep from object of type %s"
6550 msgstr "无法抓取来自于 %s 类型的对象"
6552 #: builtin/grep.c:558
6554 msgid "switch `%c' expects a numerical value"
6555 msgstr "开关 `%c' 期望一个数字值"
6557 #: builtin/grep.c:575
6559 msgid "cannot open '%s'"
6562 #: builtin/grep.c:644
6563 msgid "search in index instead of in the work tree"
6564 msgstr "在索引区搜索而不是在工作区"
6566 #: builtin/grep.c:646
6567 msgid "find in contents not managed by git"
6568 msgstr "在未被 git 管理的内容中查找"
6570 # 译者:中文字符串拼接,可删除前导空格
6571 #: builtin/grep.c:648
6572 msgid "search in both tracked and untracked files"
6573 msgstr "在跟踪和未跟踪的文件中搜索"
6575 #: builtin/grep.c:650
6576 msgid "ignore files specified via '.gitignore'"
6577 msgstr "忽略 '.gitignore' 包含的文件"
6579 #: builtin/grep.c:653
6580 msgid "show non-matching lines"
6583 #: builtin/grep.c:655
6584 msgid "case insensitive matching"
6587 #: builtin/grep.c:657
6588 msgid "match patterns only at word boundaries"
6591 #: builtin/grep.c:659
6592 msgid "process binary files as text"
6593 msgstr "把二进制文件当做文本处理"
6595 #: builtin/grep.c:661
6596 msgid "don't match patterns in binary files"
6597 msgstr "不在二进制文件中匹配模式"
6599 #: builtin/grep.c:664
6600 msgid "process binary files with textconv filters"
6601 msgstr "用 textconv 过滤器处理二进制文件"
6603 #: builtin/grep.c:666
6604 msgid "descend at most <depth> levels"
6605 msgstr "最多以指定的深度向下寻找"
6607 #: builtin/grep.c:670
6608 msgid "use extended POSIX regular expressions"
6609 msgstr "使用扩展的 POSIX 正则表达式"
6611 #: builtin/grep.c:673
6612 msgid "use basic POSIX regular expressions (default)"
6613 msgstr "使用基本的 POSIX 正则表达式(默认)"
6615 #: builtin/grep.c:676
6616 msgid "interpret patterns as fixed strings"
6617 msgstr "把模式解析为固定的字符串"
6619 #: builtin/grep.c:679
6620 msgid "use Perl-compatible regular expressions"
6621 msgstr "使用 Perl 兼容的正则表达式"
6623 #: builtin/grep.c:682
6624 msgid "show line numbers"
6627 #: builtin/grep.c:683
6628 msgid "don't show filenames"
6631 #: builtin/grep.c:684
6632 msgid "show filenames"
6635 #: builtin/grep.c:686
6636 msgid "show filenames relative to top directory"
6637 msgstr "显示相对于顶级目录的文件名"
6639 #: builtin/grep.c:688
6640 msgid "show only filenames instead of matching lines"
6641 msgstr "只显示文件名而不显示匹配的行"
6643 #: builtin/grep.c:690
6644 msgid "synonym for --files-with-matches"
6645 msgstr "和 --files-with-matches 同义"
6647 #: builtin/grep.c:693
6648 msgid "show only the names of files without match"
6651 #: builtin/grep.c:695
6652 msgid "print NUL after filenames"
6653 msgstr "在文件名后输出 NUL 字符"
6655 #: builtin/grep.c:697
6656 msgid "show the number of matches instead of matching lines"
6657 msgstr "显示总匹配行数,而不显示匹配的行"
6659 #: builtin/grep.c:698
6660 msgid "highlight matches"
6663 #: builtin/grep.c:700
6664 msgid "print empty line between matches from different files"
6665 msgstr "在不同文件的匹配项之间打印空行"
6667 #: builtin/grep.c:702
6668 msgid "show filename only once above matches from same file"
6669 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6671 #: builtin/grep.c:705
6672 msgid "show <n> context lines before and after matches"
6673 msgstr "显示匹配项前后的 <n> 行上下文"
6675 #: builtin/grep.c:708
6676 msgid "show <n> context lines before matches"
6677 msgstr "显示匹配项前 <n> 行上下文"
6679 #: builtin/grep.c:710
6680 msgid "show <n> context lines after matches"
6681 msgstr "显示匹配项后 <n> 行上下文"
6683 #: builtin/grep.c:712
6684 msgid "use <n> worker threads"
6685 msgstr "使用 <n> 个工作线程"
6687 #: builtin/grep.c:713
6688 msgid "shortcut for -C NUM"
6691 #: builtin/grep.c:716
6692 msgid "show a line with the function name before matches"
6693 msgstr "在匹配的前面显示一行函数名"
6695 #: builtin/grep.c:718
6696 msgid "show the surrounding function"
6697 msgstr "显示所在函数的前后内容"
6699 #: builtin/grep.c:721
6700 msgid "read patterns from file"
6703 #: builtin/grep.c:723
6704 msgid "match <pattern>"
6707 #: builtin/grep.c:725
6708 msgid "combine patterns specified with -e"
6709 msgstr "组合用 -e 参数设定的模式"
6711 #: builtin/grep.c:737
6712 msgid "indicate hit with exit status without output"
6713 msgstr "不输出,而用退出码标识命中状态"
6715 #: builtin/grep.c:739
6716 msgid "show only matches from files that match all patterns"
6717 msgstr "只显示匹配所有模式的文件中的匹配"
6719 #: builtin/grep.c:741
6720 msgid "show parse tree for grep expression"
6721 msgstr "显示 grep 表达式的解析树"
6723 #: builtin/grep.c:745
6727 #: builtin/grep.c:745
6728 msgid "show matching files in the pager"
6731 #: builtin/grep.c:748
6732 msgid "allow calling of grep(1) (ignored by this build)"
6733 msgstr "允许调用 grep(1)(本次构建忽略)"
6735 #: builtin/grep.c:811
6736 msgid "no pattern given."
6739 #: builtin/grep.c:843 builtin/index-pack.c:1475
6741 msgid "invalid number of threads specified (%d)"
6742 msgstr "指定的线程数无效(%d)"
6744 #: builtin/grep.c:873
6745 msgid "--open-files-in-pager only works on the worktree"
6746 msgstr "--open-files-in-pager 仅用于工作区"
6748 #: builtin/grep.c:899
6749 msgid "--cached or --untracked cannot be used with --no-index."
6750 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6752 #: builtin/grep.c:904
6753 msgid "--no-index or --untracked cannot be used with revs."
6754 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6756 #: builtin/grep.c:907
6757 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6758 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6760 #: builtin/grep.c:915
6761 msgid "both --cached and trees are given."
6762 msgstr "同时给出了 --cached 和树对象。"
6764 #: builtin/hash-object.c:81
6766 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6769 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6772 #: builtin/hash-object.c:82
6773 msgid "git hash-object --stdin-paths"
6774 msgstr "git hash-object --stdin-paths"
6776 #: builtin/hash-object.c:93
6780 #: builtin/hash-object.c:93
6784 #: builtin/hash-object.c:94
6785 msgid "write the object into the object database"
6788 #: builtin/hash-object.c:96
6789 msgid "read the object from stdin"
6792 #: builtin/hash-object.c:98
6793 msgid "store file as is without filters"
6794 msgstr "原样存储文件不使用过滤器"
6796 #: builtin/hash-object.c:99
6798 "just hash any random garbage to create corrupt objects for debugging Git"
6799 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6801 #: builtin/hash-object.c:100
6802 msgid "process file as it were from this path"
6803 msgstr "处理文件并假设其来自于此路径"
6805 #: builtin/help.c:41
6806 msgid "print all available commands"
6809 #: builtin/help.c:42
6810 msgid "print list of useful guides"
6813 #: builtin/help.c:43
6814 msgid "show man page"
6817 #: builtin/help.c:44
6818 msgid "show manual in web browser"
6819 msgstr "在 web 浏览器中显示手册"
6821 #: builtin/help.c:46
6822 msgid "show info page"
6825 #: builtin/help.c:52
6826 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6827 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6829 #: builtin/help.c:64
6831 msgid "unrecognized help format '%s'"
6832 msgstr "未能识别的帮助格式 '%s'"
6834 #: builtin/help.c:91
6835 msgid "Failed to start emacsclient."
6836 msgstr "无法启动 emacsclient。"
6838 #: builtin/help.c:104
6839 msgid "Failed to parse emacsclient version."
6840 msgstr "无法解析 emacsclient 版本。"
6842 #: builtin/help.c:112
6844 msgid "emacsclient version '%d' too old (< 22)."
6845 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6847 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6849 msgid "failed to exec '%s': %s"
6850 msgstr "无法执行 '%s':%s"
6852 #: builtin/help.c:205
6855 "'%s': path for unsupported man viewer.\n"
6856 "Please consider using 'man.<tool>.cmd' instead."
6858 "'%s':不支持的 man 手册查看器的路径。\n"
6859 "请使用 'man.<工具>.cmd'。"
6861 #: builtin/help.c:217
6864 "'%s': cmd for supported man viewer.\n"
6865 "Please consider using 'man.<tool>.path' instead."
6867 "'%s': 支持的 man 手册查看器命令。\n"
6868 "请使用 'man.<工具>.path'。"
6870 #: builtin/help.c:334
6872 msgid "'%s': unknown man viewer."
6873 msgstr "'%s':未知的 man 查看器。"
6875 #: builtin/help.c:351
6876 msgid "no man viewer handled the request"
6877 msgstr "没有 man 查看器处理此请求"
6879 #: builtin/help.c:359
6880 msgid "no info viewer handled the request"
6881 msgstr "没有 info 查看器处理此请求"
6883 #: builtin/help.c:408
6884 msgid "Defining attributes per path"
6887 #: builtin/help.c:409
6888 msgid "Everyday Git With 20 Commands Or So"
6889 msgstr "每一天 Git 常用的约 20 条命令"
6891 #: builtin/help.c:410
6892 msgid "A Git glossary"
6895 #: builtin/help.c:411
6896 msgid "Specifies intentionally untracked files to ignore"
6899 #: builtin/help.c:412
6900 msgid "Defining submodule properties"
6903 #: builtin/help.c:413
6904 msgid "Specifying revisions and ranges for Git"
6905 msgstr "指定 Git 的版本和版本范围"
6907 #: builtin/help.c:414
6908 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6909 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6911 #: builtin/help.c:415
6912 msgid "An overview of recommended workflows with Git"
6913 msgstr "Git 推荐的工作流概览"
6915 #: builtin/help.c:427
6916 msgid "The common Git guides are:\n"
6917 msgstr "最常用的 Git 向导有:\n"
6919 #: builtin/help.c:448 builtin/help.c:465
6924 #: builtin/help.c:481
6926 msgid "`git %s' is aliased to `%s'"
6927 msgstr "`git %s' 是 `%s' 的别名"
6929 #: builtin/index-pack.c:152
6931 msgid "unable to open %s"
6934 #: builtin/index-pack.c:202
6936 msgid "object type mismatch at %s"
6937 msgstr "%s 的对象类型不匹配"
6939 #: builtin/index-pack.c:222
6941 msgid "did not receive expected object %s"
6942 msgstr "未能获取期望的对象 %s"
6944 #: builtin/index-pack.c:225
6946 msgid "object %s: expected type %s, found %s"
6947 msgstr "对象 %s:期待类型 %s,却是 %s"
6949 #: builtin/index-pack.c:267
6951 msgid "cannot fill %d byte"
6952 msgid_plural "cannot fill %d bytes"
6953 msgstr[0] "无法填充 %d 字节"
6954 msgstr[1] "无法填充 %d 字节"
6956 #: builtin/index-pack.c:277
6958 msgstr "过早的文件结束符(EOF)"
6960 #: builtin/index-pack.c:278
6961 msgid "read error on input"
6964 #: builtin/index-pack.c:290
6965 msgid "used more bytes than were available"
6968 #: builtin/index-pack.c:297
6969 msgid "pack too large for current definition of off_t"
6970 msgstr "包太大超过了当前 off_t 的定义"
6972 #: builtin/index-pack.c:313
6974 msgid "unable to create '%s'"
6977 #: builtin/index-pack.c:318
6979 msgid "cannot open packfile '%s'"
6980 msgstr "无法打开包文件 '%s'"
6982 #: builtin/index-pack.c:332
6983 msgid "pack signature mismatch"
6986 #: builtin/index-pack.c:334
6988 msgid "pack version %<PRIu32> unsupported"
6989 msgstr "不支持包版本 %<PRIu32>"
6991 #: builtin/index-pack.c:352
6993 msgid "pack has bad object at offset %lu: %s"
6994 msgstr "包中有错误的对象位于 %lu:%s"
6996 #: builtin/index-pack.c:473
6998 msgid "inflate returned %d"
7001 #: builtin/index-pack.c:522
7002 msgid "offset value overflow for delta base object"
7003 msgstr "偏移值覆盖了 delta 基准对象"
7005 #: builtin/index-pack.c:530
7006 msgid "delta base offset is out of bound"
7007 msgstr "delta 基准偏移越界"
7009 #: builtin/index-pack.c:538
7011 msgid "unknown object type %d"
7014 #: builtin/index-pack.c:569
7015 msgid "cannot pread pack file"
7018 #: builtin/index-pack.c:571
7020 msgid "premature end of pack file, %lu byte missing"
7021 msgid_plural "premature end of pack file, %lu bytes missing"
7022 msgstr[0] "包文件过早结束,缺少 %lu 字节"
7023 msgstr[1] "包文件过早结束,缺少 %lu 字节"
7025 #: builtin/index-pack.c:597
7026 msgid "serious inflate inconsistency"
7029 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7030 #: builtin/index-pack.c:806 builtin/index-pack.c:815
7032 msgid "SHA1 COLLISION FOUND WITH %s !"
7033 msgstr "发现 %s 出现 SHA1 冲突!"
7035 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
7036 #: builtin/pack-objects.c:254
7038 msgid "unable to read %s"
7041 #: builtin/index-pack.c:812
7043 msgid "cannot read existing object %s"
7044 msgstr "不能读取现存对象 %s"
7046 #: builtin/index-pack.c:826
7048 msgid "invalid blob object %s"
7051 #: builtin/index-pack.c:840
7056 #: builtin/index-pack.c:843
7057 msgid "Error in object"
7060 #: builtin/index-pack.c:845
7062 msgid "Not all child objects of %s are reachable"
7063 msgstr "%s 的所有子对象并非都可达"
7065 #: builtin/index-pack.c:917 builtin/index-pack.c:948
7066 msgid "failed to apply delta"
7069 #: builtin/index-pack.c:1118
7070 msgid "Receiving objects"
7073 #: builtin/index-pack.c:1118
7074 msgid "Indexing objects"
7077 #: builtin/index-pack.c:1150
7078 msgid "pack is corrupted (SHA1 mismatch)"
7079 msgstr "包冲突(SHA1 不匹配)"
7081 #: builtin/index-pack.c:1155
7082 msgid "cannot fstat packfile"
7085 #: builtin/index-pack.c:1158
7086 msgid "pack has junk at the end"
7089 #: builtin/index-pack.c:1169
7090 msgid "confusion beyond insanity in parse_pack_objects()"
7091 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7093 #: builtin/index-pack.c:1194
7094 msgid "Resolving deltas"
7097 #: builtin/index-pack.c:1205
7099 msgid "unable to create thread: %s"
7102 #: builtin/index-pack.c:1247
7103 msgid "confusion beyond insanity"
7106 #: builtin/index-pack.c:1253
7108 msgid "completed with %d local objects"
7109 msgstr "完成 %d 个本地对象"
7111 #: builtin/index-pack.c:1263
7113 msgid "Unexpected tail checksum for %s (disk corruption?)"
7114 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7116 #: builtin/index-pack.c:1267
7118 msgid "pack has %d unresolved delta"
7119 msgid_plural "pack has %d unresolved deltas"
7120 msgstr[0] "包有 %d 个未解决的 delta"
7121 msgstr[1] "包有 %d 个未解决的 delta"
7123 #: builtin/index-pack.c:1291
7125 msgid "unable to deflate appended object (%d)"
7126 msgstr "不能压缩附加对象(%d)"
7128 #: builtin/index-pack.c:1367
7130 msgid "local object %s is corrupt"
7131 msgstr "本地对象 %s 已损坏"
7133 #: builtin/index-pack.c:1391
7134 msgid "error while closing pack file"
7137 #: builtin/index-pack.c:1404
7139 msgid "cannot write keep file '%s'"
7140 msgstr "无法写保留文件 '%s'"
7142 #: builtin/index-pack.c:1412
7144 msgid "cannot close written keep file '%s'"
7145 msgstr "无法关闭保留文件 '%s'"
7147 #: builtin/index-pack.c:1425
7148 msgid "cannot store pack file"
7151 #: builtin/index-pack.c:1436
7152 msgid "cannot store index file"
7155 #: builtin/index-pack.c:1469
7157 msgid "bad pack.indexversion=%<PRIu32>"
7158 msgstr "坏的 pack.indexversion=%<PRIu32>"
7160 #: builtin/index-pack.c:1479 builtin/index-pack.c:1664
7162 msgid "no threads support, ignoring %s"
7163 msgstr "没有线程支持,忽略 %s"
7165 #: builtin/index-pack.c:1538
7167 msgid "Cannot open existing pack file '%s'"
7168 msgstr "无法打开现存包文件 '%s'"
7170 #: builtin/index-pack.c:1540
7172 msgid "Cannot open existing pack idx file for '%s'"
7173 msgstr "无法为 %s 打开包索引文件"
7175 #: builtin/index-pack.c:1587
7177 msgid "non delta: %d object"
7178 msgid_plural "non delta: %d objects"
7179 msgstr[0] "非 delta:%d 个对象"
7180 msgstr[1] "非 delta:%d 个对象"
7182 #: builtin/index-pack.c:1594
7184 msgid "chain length = %d: %lu object"
7185 msgid_plural "chain length = %d: %lu objects"
7186 msgstr[0] "链长 = %d: %lu 对象"
7187 msgstr[1] "链长 = %d: %lu 对象"
7189 #: builtin/index-pack.c:1624
7190 msgid "Cannot come back to cwd"
7193 #: builtin/index-pack.c:1676 builtin/index-pack.c:1679
7194 #: builtin/index-pack.c:1691 builtin/index-pack.c:1695
7199 #: builtin/index-pack.c:1709
7200 msgid "--fix-thin cannot be used without --stdin"
7201 msgstr "--fix-thin 不能和 --stdin 同时使用"
7203 #: builtin/index-pack.c:1713 builtin/index-pack.c:1722
7205 msgid "packfile name '%s' does not end with '.pack'"
7206 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7208 #: builtin/index-pack.c:1730
7209 msgid "--verify with no packfile name given"
7210 msgstr "--verify 没有提供包文件名参数"
7212 #: builtin/init-db.c:55
7214 msgid "cannot stat '%s'"
7215 msgstr "不能枚举 '%s' 状态"
7217 #: builtin/init-db.c:61
7219 msgid "cannot stat template '%s'"
7220 msgstr "不能枚举模版 '%s' 状态"
7222 #: builtin/init-db.c:66
7224 msgid "cannot opendir '%s'"
7225 msgstr "不能打开目录 '%s'"
7227 #: builtin/init-db.c:77
7229 msgid "cannot readlink '%s'"
7230 msgstr "不能读取链接 '%s'"
7232 #: builtin/init-db.c:79
7234 msgid "cannot symlink '%s' '%s'"
7235 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7237 #: builtin/init-db.c:85
7239 msgid "cannot copy '%s' to '%s'"
7240 msgstr "不能拷贝 '%s' 至 '%s'"
7242 #: builtin/init-db.c:89
7244 msgid "ignoring template %s"
7247 #: builtin/init-db.c:118
7249 msgid "templates not found %s"
7252 #: builtin/init-db.c:131
7254 msgid "not copying templates of a wrong format version %d from '%s'"
7255 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7257 #: builtin/init-db.c:309 builtin/init-db.c:312
7259 msgid "%s already exists"
7262 #: builtin/init-db.c:340
7264 msgid "unable to handle file type %d"
7265 msgstr "不能处理 %d 类型的文件"
7267 #: builtin/init-db.c:343
7269 msgid "unable to move %s to %s"
7270 msgstr "不能移动 %s 至 %s"
7272 #. TRANSLATORS: The first '%s' is either "Reinitialized
7273 #. existing" or "Initialized empty", the second " shared" or
7274 #. "", and the last '%s%s' is the verbatim directory name.
7275 #: builtin/init-db.c:399
7277 msgid "%s%s Git repository in %s%s\n"
7278 msgstr "%s%s Git 仓库于 %s%s\n"
7280 #: builtin/init-db.c:400
7281 msgid "Reinitialized existing"
7284 #: builtin/init-db.c:400
7285 msgid "Initialized empty"
7288 # 译者:中文字符串拼接,可删除前导空格
7289 #: builtin/init-db.c:401
7293 #: builtin/init-db.c:448
7295 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7296 "shared[=<permissions>]] [<directory>]"
7298 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7301 #: builtin/init-db.c:471
7305 #: builtin/init-db.c:472
7306 msgid "specify that the git repository is to be shared amongst several users"
7307 msgstr "指定 git 仓库是多个用户之间共享的"
7309 #: builtin/init-db.c:506 builtin/init-db.c:511
7311 msgid "cannot mkdir %s"
7314 #: builtin/init-db.c:515
7316 msgid "cannot chdir to %s"
7319 #: builtin/init-db.c:536
7322 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7324 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7326 #: builtin/init-db.c:564
7328 msgid "Cannot access work tree '%s'"
7329 msgstr "不能访问工作区 '%s'"
7331 #: builtin/interpret-trailers.c:15
7333 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7334 "<token>[(=|:)<value>])...] [<file>...]"
7336 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7339 #: builtin/interpret-trailers.c:26
7340 msgid "edit files in place"
7343 #: builtin/interpret-trailers.c:27
7344 msgid "trim empty trailers"
7347 #: builtin/interpret-trailers.c:28
7351 #: builtin/interpret-trailers.c:29
7352 msgid "trailer(s) to add"
7355 #: builtin/interpret-trailers.c:42
7356 msgid "no input file given for in-place editing"
7357 msgstr "没有给出要原位编辑的文件"
7360 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7361 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7364 msgid "git show [<options>] <object>..."
7365 msgstr "git show [<选项>] <对象>..."
7369 msgid "invalid --decorate option: %s"
7370 msgstr "无效的 --decorate 选项:%s"
7372 #: builtin/log.c:131
7373 msgid "suppress diff output"
7376 #: builtin/log.c:132
7380 #: builtin/log.c:133
7381 msgid "Use mail map file"
7384 #: builtin/log.c:134
7385 msgid "decorate options"
7388 #: builtin/log.c:137
7389 msgid "Process line range n,m in file, counting from 1"
7390 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7392 #: builtin/log.c:233
7394 msgid "Final output: %d %s\n"
7395 msgstr "最终输出:%d %s\n"
7397 #: builtin/log.c:465
7399 msgid "git show %s: bad file"
7400 msgstr "git show %s: 损坏的文件"
7402 #: builtin/log.c:479 builtin/log.c:572
7404 msgid "Could not read object %s"
7407 #: builtin/log.c:596
7409 msgid "Unknown type: %d"
7412 #: builtin/log.c:715
7413 msgid "format.headers without value"
7414 msgstr "format.headers 没有值"
7416 #: builtin/log.c:801
7417 msgid "name of output directory is too long"
7420 #: builtin/log.c:816
7422 msgid "Cannot open patch file %s"
7423 msgstr "无法打开补丁文件 %s"
7425 #: builtin/log.c:830
7426 msgid "Need exactly one range."
7429 #: builtin/log.c:840
7430 msgid "Not a range."
7433 #: builtin/log.c:946
7434 msgid "Cover letter needs email format"
7437 #: builtin/log.c:1025
7439 msgid "insane in-reply-to: %s"
7440 msgstr "不正常的 in-reply-to:%s"
7442 #: builtin/log.c:1053
7443 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7444 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7446 #: builtin/log.c:1098
7447 msgid "Two output directories?"
7450 #: builtin/log.c:1214
7451 msgid "use [PATCH n/m] even with a single patch"
7452 msgstr "使用 [PATCH n/m],即使只有一个补丁"
7454 #: builtin/log.c:1217
7455 msgid "use [PATCH] even with multiple patches"
7456 msgstr "使用 [PATCH],即使有多个补丁"
7458 #: builtin/log.c:1221
7459 msgid "print patches to standard out"
7462 #: builtin/log.c:1223
7463 msgid "generate a cover letter"
7466 #: builtin/log.c:1225
7467 msgid "use simple number sequence for output file names"
7468 msgstr "使用简单的数字序列作为输出文件名"
7470 #: builtin/log.c:1226
7474 #: builtin/log.c:1227
7475 msgid "use <sfx> instead of '.patch'"
7476 msgstr "使用 <后缀> 代替 '.patch'"
7478 #: builtin/log.c:1229
7479 msgid "start numbering patches at <n> instead of 1"
7480 msgstr "补丁以 <n> 开始编号,而不是1"
7482 #: builtin/log.c:1231
7483 msgid "mark the series as Nth re-roll"
7484 msgstr "标记补丁系列是第几次重制"
7486 #: builtin/log.c:1233
7487 msgid "Use [<prefix>] instead of [PATCH]"
7488 msgstr "使用 [<前缀>] 代替 [PATCH]"
7490 #: builtin/log.c:1236
7491 msgid "store resulting files in <dir>"
7492 msgstr "把结果文件存储在 <目录>"
7494 #: builtin/log.c:1239
7495 msgid "don't strip/add [PATCH]"
7496 msgstr "不删除/添加 [PATCH]"
7498 #: builtin/log.c:1242
7499 msgid "don't output binary diffs"
7502 #: builtin/log.c:1244
7503 msgid "output all-zero hash in From header"
7504 msgstr "在 From 头信息中输出全为零的哈希值"
7506 #: builtin/log.c:1246
7507 msgid "don't include a patch matching a commit upstream"
7508 msgstr "不包含已在上游提交中的补丁"
7510 #: builtin/log.c:1248
7511 msgid "show patch format instead of default (patch + stat)"
7512 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7514 #: builtin/log.c:1250
7518 #: builtin/log.c:1251
7522 #: builtin/log.c:1252
7523 msgid "add email header"
7526 #: builtin/log.c:1253 builtin/log.c:1255
7530 #: builtin/log.c:1253
7531 msgid "add To: header"
7534 #: builtin/log.c:1255
7535 msgid "add Cc: header"
7538 #: builtin/log.c:1257
7542 #: builtin/log.c:1258
7543 msgid "set From address to <ident> (or committer ident if absent)"
7544 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7546 #: builtin/log.c:1260
7550 #: builtin/log.c:1261
7551 msgid "make first mail a reply to <message-id>"
7552 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7554 #: builtin/log.c:1262 builtin/log.c:1265
7558 #: builtin/log.c:1263
7559 msgid "attach the patch"
7562 #: builtin/log.c:1266
7563 msgid "inline the patch"
7566 #: builtin/log.c:1270
7567 msgid "enable message threading, styles: shallow, deep"
7568 msgstr "启用邮件线索,风格:浅,深"
7570 #: builtin/log.c:1272
7574 #: builtin/log.c:1273
7575 msgid "add a signature"
7578 #: builtin/log.c:1275
7579 msgid "add a signature from a file"
7582 #: builtin/log.c:1276
7583 msgid "don't print the patch filenames"
7586 #: builtin/log.c:1365
7587 msgid "-n and -k are mutually exclusive."
7588 msgstr "-n 和 -k 互斥。"
7590 #: builtin/log.c:1367
7591 msgid "--subject-prefix and -k are mutually exclusive."
7592 msgstr "--subject-prefix 和 -k 互斥。"
7594 #: builtin/log.c:1375
7595 msgid "--name-only does not make sense"
7596 msgstr "--name-only 无意义"
7598 #: builtin/log.c:1377
7599 msgid "--name-status does not make sense"
7600 msgstr "--name-status 无意义"
7602 #: builtin/log.c:1379
7603 msgid "--check does not make sense"
7604 msgstr "--check 无意义"
7606 #: builtin/log.c:1407
7607 msgid "standard output, or directory, which one?"
7608 msgstr "标准输出或目录,哪一个?"
7610 #: builtin/log.c:1409
7612 msgid "Could not create directory '%s'"
7613 msgstr "不能创建目录 '%s'"
7615 #: builtin/log.c:1506
7617 msgid "unable to read signature file '%s'"
7618 msgstr "无法读取签名文件 '%s'"
7620 #: builtin/log.c:1569
7621 msgid "Failed to create output files"
7624 #: builtin/log.c:1617
7625 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7626 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7628 #: builtin/log.c:1671
7631 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7632 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7634 #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
7636 msgid "Unknown commit %s"
7639 #: builtin/ls-files.c:378
7640 msgid "git ls-files [<options>] [<file>...]"
7641 msgstr "git ls-files [<选项>] [<文件>...]"
7643 #: builtin/ls-files.c:427
7644 msgid "identify the file status with tags"
7647 #: builtin/ls-files.c:429
7648 msgid "use lowercase letters for 'assume unchanged' files"
7649 msgstr "使用小写字母表示 '假设未改变的' 文件"
7651 #: builtin/ls-files.c:431
7652 msgid "show cached files in the output (default)"
7653 msgstr "显示缓存的文件(默认)"
7655 #: builtin/ls-files.c:433
7656 msgid "show deleted files in the output"
7659 #: builtin/ls-files.c:435
7660 msgid "show modified files in the output"
7663 #: builtin/ls-files.c:437
7664 msgid "show other files in the output"
7667 #: builtin/ls-files.c:439
7668 msgid "show ignored files in the output"
7671 #: builtin/ls-files.c:442
7672 msgid "show staged contents' object name in the output"
7673 msgstr "显示暂存区内容的对象名称"
7675 #: builtin/ls-files.c:444
7676 msgid "show files on the filesystem that need to be removed"
7677 msgstr "显示文件系统需要删除的文件"
7679 #: builtin/ls-files.c:446
7680 msgid "show 'other' directories' names only"
7681 msgstr "只显示“其他”目录的名称"
7683 #: builtin/ls-files.c:448
7684 msgid "show line endings of files"
7687 #: builtin/ls-files.c:450
7688 msgid "don't show empty directories"
7691 #: builtin/ls-files.c:453
7692 msgid "show unmerged files in the output"
7695 #: builtin/ls-files.c:455
7696 msgid "show resolve-undo information"
7697 msgstr "显示 resolve-undo 信息"
7699 #: builtin/ls-files.c:457
7700 msgid "skip files matching pattern"
7703 #: builtin/ls-files.c:460
7704 msgid "exclude patterns are read from <file>"
7705 msgstr "从 <文件> 中读取排除模式"
7707 #: builtin/ls-files.c:463
7708 msgid "read additional per-directory exclude patterns in <file>"
7709 msgstr "从 <文件> 读取额外的每个目录的排除模式"
7711 #: builtin/ls-files.c:465
7712 msgid "add the standard git exclusions"
7713 msgstr "添加标准的 git 排除"
7715 #: builtin/ls-files.c:468
7716 msgid "make the output relative to the project top directory"
7717 msgstr "显示相对于顶级目录的文件名"
7719 #: builtin/ls-files.c:471
7720 msgid "if any <file> is not in the index, treat this as an error"
7721 msgstr "如果任何 <文件> 都不在索引区,视为错误"
7723 #: builtin/ls-files.c:472
7727 #: builtin/ls-files.c:473
7728 msgid "pretend that paths removed since <tree-ish> are still present"
7729 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7731 #: builtin/ls-files.c:475
7732 msgid "show debugging data"
7735 #: builtin/ls-remote.c:7
7737 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7738 " [-q | --quiet] [--exit-code] [--get-url]\n"
7739 " [--symref] [<repository> [<refs>...]]"
7741 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7742 " [-q | --quiet] [--exit-code] [--get-url]\n"
7743 " [--symref] [<仓库> [<引用>...]]"
7745 #: builtin/ls-remote.c:50
7746 msgid "do not print remote URL"
7749 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7753 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7754 msgid "path of git-upload-pack on the remote host"
7755 msgstr "远程主机上的 git-upload-pack 路径"
7757 #: builtin/ls-remote.c:56
7758 msgid "limit to tags"
7761 #: builtin/ls-remote.c:57
7762 msgid "limit to heads"
7765 #: builtin/ls-remote.c:58
7766 msgid "do not show peeled tags"
7769 #: builtin/ls-remote.c:60
7770 msgid "take url.<base>.insteadOf into account"
7771 msgstr "参考 url.<base>.insteadOf 设置"
7773 #: builtin/ls-remote.c:62
7774 msgid "exit with exit code 2 if no matching refs are found"
7775 msgstr "若未找到匹配的引用则以退出码2退出"
7777 #: builtin/ls-remote.c:64
7778 msgid "show underlying ref in addition to the object pointed by it"
7779 msgstr "除了显示指向的对象外,显示指向的引用名"
7781 #: builtin/ls-tree.c:28
7782 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7783 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7785 #: builtin/ls-tree.c:128
7786 msgid "only show trees"
7789 #: builtin/ls-tree.c:130
7790 msgid "recurse into subtrees"
7793 #: builtin/ls-tree.c:132
7794 msgid "show trees when recursing"
7797 #: builtin/ls-tree.c:135
7798 msgid "terminate entries with NUL byte"
7799 msgstr "条目以 NUL 字符终止"
7801 #: builtin/ls-tree.c:136
7802 msgid "include object size"
7805 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7806 msgid "list only filenames"
7809 #: builtin/ls-tree.c:143
7810 msgid "use full path names"
7813 #: builtin/ls-tree.c:145
7814 msgid "list entire tree; not just current directory (implies --full-name)"
7815 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7817 #: builtin/merge.c:45
7818 msgid "git merge [<options>] [<commit>...]"
7819 msgstr "git merge [<选项>] [<提交>...]"
7821 #: builtin/merge.c:46
7822 msgid "git merge [<options>] <msg> HEAD <commit>"
7823 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7825 #: builtin/merge.c:47
7826 msgid "git merge --abort"
7827 msgstr "git merge --abort"
7829 #: builtin/merge.c:100
7830 msgid "switch `m' requires a value"
7831 msgstr "开关 `m' 需要一个值"
7833 #: builtin/merge.c:137
7835 msgid "Could not find merge strategy '%s'.\n"
7836 msgstr "不能找到合并策略 '%s'。\n"
7838 #: builtin/merge.c:138
7840 msgid "Available strategies are:"
7843 #: builtin/merge.c:143
7845 msgid "Available custom strategies are:"
7848 #: builtin/merge.c:193 builtin/pull.c:123
7849 msgid "do not show a diffstat at the end of the merge"
7850 msgstr "在合并的最后不显示差异统计"
7852 #: builtin/merge.c:196 builtin/pull.c:126
7853 msgid "show a diffstat at the end of the merge"
7854 msgstr "在合并的最后显示差异统计"
7856 #: builtin/merge.c:197 builtin/pull.c:129
7857 msgid "(synonym to --stat)"
7858 msgstr "(和 --stat 同义)"
7860 #: builtin/merge.c:199 builtin/pull.c:132
7861 msgid "add (at most <n>) entries from shortlog to merge commit message"
7862 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7864 #: builtin/merge.c:202 builtin/pull.c:135
7865 msgid "create a single commit instead of doing a merge"
7866 msgstr "创建一个单独的提交而不是做一次合并"
7868 #: builtin/merge.c:204 builtin/pull.c:138
7869 msgid "perform a commit if the merge succeeds (default)"
7870 msgstr "如果合并成功,执行一次提交(默认)"
7872 #: builtin/merge.c:206 builtin/pull.c:141
7873 msgid "edit message before committing"
7876 #: builtin/merge.c:207
7877 msgid "allow fast-forward (default)"
7880 #: builtin/merge.c:209 builtin/pull.c:147
7881 msgid "abort if fast-forward is not possible"
7882 msgstr "如果不能快进就放弃合并"
7884 #: builtin/merge.c:213
7885 msgid "Verify that the named commit has a valid GPG signature"
7886 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7888 #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
7889 #: builtin/revert.c:89
7893 #: builtin/merge.c:215 builtin/pull.c:153
7894 msgid "merge strategy to use"
7897 #: builtin/merge.c:216 builtin/pull.c:156
7898 msgid "option=value"
7899 msgstr "option=value"
7901 #: builtin/merge.c:217 builtin/pull.c:157
7902 msgid "option for selected merge strategy"
7905 #: builtin/merge.c:219
7906 msgid "merge commit message (for a non-fast-forward merge)"
7907 msgstr "合并的提交说明(针对非快进式合并)"
7909 #: builtin/merge.c:223
7910 msgid "abort the current in-progress merge"
7911 msgstr "放弃当前正在进行的合并"
7913 #: builtin/merge.c:251
7914 msgid "could not run stash."
7917 #: builtin/merge.c:256
7918 msgid "stash failed"
7921 #: builtin/merge.c:261
7923 msgid "not a valid object: %s"
7924 msgstr "不是一个有效对象:%s"
7926 #: builtin/merge.c:280 builtin/merge.c:297
7927 msgid "read-tree failed"
7931 #: builtin/merge.c:327
7932 msgid " (nothing to squash)"
7935 #: builtin/merge.c:340
7937 msgid "Squash commit -- not updating HEAD\n"
7938 msgstr "压缩提交 -- 未更新 HEAD\n"
7940 #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7941 #: builtin/merge.c:989
7943 msgid "Could not write to '%s'"
7946 #: builtin/merge.c:372
7947 msgid "Writing SQUASH_MSG"
7948 msgstr "写入 SQUASH_MSG"
7950 #: builtin/merge.c:374
7951 msgid "Finishing SQUASH_MSG"
7952 msgstr "完成 SQUASH_MSG"
7954 #: builtin/merge.c:397
7956 msgid "No merge message -- not updating HEAD\n"
7957 msgstr "无合并信息 -- 未更新 HEAD\n"
7959 #: builtin/merge.c:448
7961 msgid "'%s' does not point to a commit"
7962 msgstr "'%s' 没有指向一个提交"
7964 #: builtin/merge.c:538
7966 msgid "Bad branch.%s.mergeoptions string: %s"
7967 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7969 #: builtin/merge.c:657
7970 msgid "Not handling anything other than two heads merge."
7971 msgstr "不能处理两个头合并之外的任何操作。"
7973 #: builtin/merge.c:671
7975 msgid "Unknown option for merge-recursive: -X%s"
7976 msgstr "merge-recursive 的未知选项:-X%s"
7978 #: builtin/merge.c:684
7980 msgid "unable to write %s"
7983 #: builtin/merge.c:773
7985 msgid "Could not read from '%s'"
7986 msgstr "不能从 '%s' 读取"
7988 #: builtin/merge.c:782
7990 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7991 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7993 #: builtin/merge.c:788
7996 "Please enter a commit message to explain why this merge is necessary,\n"
7997 "especially if it merges an updated upstream into a topic branch.\n"
7999 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
8002 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8005 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8007 #: builtin/merge.c:812
8008 msgid "Empty commit message."
8011 #: builtin/merge.c:824
8013 msgid "Wonderful.\n"
8016 #: builtin/merge.c:879
8018 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8019 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8021 #: builtin/merge.c:895
8023 msgid "'%s' is not a commit"
8024 msgstr "'%s' 不是一个提交"
8026 #: builtin/merge.c:936
8027 msgid "No current branch."
8030 #: builtin/merge.c:938
8031 msgid "No remote for the current branch."
8032 msgstr "当前分支没有对应的远程仓库。"
8034 #: builtin/merge.c:940
8035 msgid "No default upstream defined for the current branch."
8036 msgstr "当前分支没有定义默认的上游分支。"
8038 #: builtin/merge.c:945
8040 msgid "No remote-tracking branch for %s from %s"
8041 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8043 #: builtin/merge.c:1080
8045 msgid "could not close '%s'"
8048 #: builtin/merge.c:1207
8049 msgid "There is no merge to abort (MERGE_HEAD missing)."
8050 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8052 #: builtin/merge.c:1223
8054 "You have not concluded your merge (MERGE_HEAD exists).\n"
8055 "Please, commit your changes before you merge."
8057 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8060 #: builtin/merge.c:1230
8062 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8063 "Please, commit your changes before you merge."
8065 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8068 #: builtin/merge.c:1233
8069 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8070 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8072 #: builtin/merge.c:1242
8073 msgid "You cannot combine --squash with --no-ff."
8074 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8076 #: builtin/merge.c:1250
8077 msgid "No commit specified and merge.defaultToUpstream not set."
8078 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8080 #: builtin/merge.c:1267
8081 msgid "Squash commit into empty head not supported yet"
8082 msgstr "尚不支持到空分支的压缩提交"
8084 #: builtin/merge.c:1269
8085 msgid "Non-fast-forward commit does not make sense into an empty head"
8086 msgstr "到空分支的非快进式提交没有意义"
8088 #: builtin/merge.c:1275
8090 msgid "%s - not something we can merge"
8093 #: builtin/merge.c:1277
8094 msgid "Can merge only exactly one commit into empty head"
8095 msgstr "只能将一个提交合并到空分支上"
8097 #: builtin/merge.c:1332
8099 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8100 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8102 #: builtin/merge.c:1335
8104 msgid "Commit %s has a bad GPG signature allegedly by %s."
8105 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8107 #: builtin/merge.c:1338
8109 msgid "Commit %s does not have a GPG signature."
8110 msgstr "提交 %s 没有一个 GPG 签名。"
8112 #: builtin/merge.c:1341
8114 msgid "Commit %s has a good GPG signature by %s\n"
8115 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8117 #: builtin/merge.c:1424
8119 msgid "Updating %s..%s\n"
8120 msgstr "更新 %s..%s\n"
8122 #: builtin/merge.c:1461
8124 msgid "Trying really trivial in-index merge...\n"
8125 msgstr "尝试非常小的索引内合并...\n"
8127 #: builtin/merge.c:1468
8132 #: builtin/merge.c:1500
8133 msgid "Not possible to fast-forward, aborting."
8136 #: builtin/merge.c:1523 builtin/merge.c:1602
8138 msgid "Rewinding the tree to pristine...\n"
8139 msgstr "将树回滚至原始状态...\n"
8141 #: builtin/merge.c:1527
8143 msgid "Trying merge strategy %s...\n"
8144 msgstr "尝试合并策略 %s...\n"
8146 #: builtin/merge.c:1593
8148 msgid "No merge strategy handled the merge.\n"
8149 msgstr "没有合并策略处理此合并。\n"
8151 #: builtin/merge.c:1595
8153 msgid "Merge with strategy %s failed.\n"
8154 msgstr "使用策略 %s 合并失败。\n"
8156 #: builtin/merge.c:1604
8158 msgid "Using the %s to prepare resolving by hand.\n"
8159 msgstr "使用 %s 以准备手工解决。\n"
8161 #: builtin/merge.c:1616
8163 msgid "Automatic merge went well; stopped before committing as requested\n"
8164 msgstr "自动合并进展顺利,按要求在提交前停止\n"
8166 #: builtin/merge-base.c:29
8167 msgid "git merge-base [-a | --all] <commit> <commit>..."
8168 msgstr "git merge-base [-a | --all] <提交> <提交>..."
8170 #: builtin/merge-base.c:30
8171 msgid "git merge-base [-a | --all] --octopus <commit>..."
8172 msgstr "git merge-base [-a | --all] --octopus <提交>..."
8174 #: builtin/merge-base.c:31
8175 msgid "git merge-base --independent <commit>..."
8176 msgstr "git merge-base --independent <提交>..."
8178 #: builtin/merge-base.c:32
8179 msgid "git merge-base --is-ancestor <commit> <commit>"
8180 msgstr "git merge-base --is-ancestor <提交> <提交>"
8182 #: builtin/merge-base.c:33
8183 msgid "git merge-base --fork-point <ref> [<commit>]"
8184 msgstr "git merge-base --fork-point <引用> [<提交>]"
8186 #: builtin/merge-base.c:214
8187 msgid "output all common ancestors"
8190 #: builtin/merge-base.c:216
8191 msgid "find ancestors for a single n-way merge"
8192 msgstr "查找一个多路合并的祖先提交"
8194 #: builtin/merge-base.c:218
8195 msgid "list revs not reachable from others"
8196 msgstr "显示不能被其他访问到的版本"
8198 #: builtin/merge-base.c:220
8199 msgid "is the first one ancestor of the other?"
8200 msgstr "第一个是其他的祖先提交么?"
8202 #: builtin/merge-base.c:222
8203 msgid "find where <commit> forked from reflog of <ref>"
8204 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8206 #: builtin/merge-file.c:8
8208 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8209 "<orig-file> <file2>"
8211 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8214 #: builtin/merge-file.c:33
8215 msgid "send results to standard output"
8218 #: builtin/merge-file.c:34
8219 msgid "use a diff3 based merge"
8220 msgstr "使用基于 diff3 的合并"
8222 #: builtin/merge-file.c:35
8223 msgid "for conflicts, use our version"
8224 msgstr "如果冲突,使用我们的版本"
8226 #: builtin/merge-file.c:37
8227 msgid "for conflicts, use their version"
8228 msgstr "如果冲突,使用他们的版本"
8230 #: builtin/merge-file.c:39
8231 msgid "for conflicts, use a union version"
8232 msgstr "如果冲突,使用联合版本"
8234 #: builtin/merge-file.c:42
8235 msgid "for conflicts, use this marker size"
8236 msgstr "如果冲突,使用指定长度的标记"
8238 #: builtin/merge-file.c:43
8239 msgid "do not warn about conflicts"
8242 #: builtin/merge-file.c:45
8243 msgid "set labels for file1/orig-file/file2"
8244 msgstr "为 文件1/初始文件/文件2 设置标签"
8246 #: builtin/mktree.c:65
8247 msgid "git mktree [-z] [--missing] [--batch]"
8248 msgstr "git mktree [-z] [--missing] [--batch]"
8250 #: builtin/mktree.c:152
8251 msgid "input is NUL terminated"
8252 msgstr "输入以 NUL 字符终止"
8254 #: builtin/mktree.c:153 builtin/write-tree.c:24
8255 msgid "allow missing objects"
8258 #: builtin/mktree.c:154
8259 msgid "allow creation of more than one tree"
8263 msgid "git mv [<options>] <source>... <destination>"
8264 msgstr "git mv [<选项>] <源>... <目标>"
8268 msgid "Directory %s is in index and no submodule?"
8269 msgstr "目录 %s 在索引中并且不是子模组?"
8272 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8273 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8277 msgid "%.*s is in index"
8281 msgid "force move/rename even if target exists"
8282 msgstr "强制移动/重命令,即使目标存在"
8285 msgid "skip move/rename errors"
8290 msgid "destination '%s' is not a directory"
8291 msgstr "目标 '%s' 不是一个目录"
8295 msgid "Checking rename of '%s' to '%s'\n"
8296 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8303 msgid "can not move directory into itself"
8307 msgid "cannot move directory over file"
8311 msgid "source directory is empty"
8315 msgid "not under version control"
8319 msgid "destination exists"
8324 msgid "overwriting '%s'"
8328 msgid "Cannot overwrite"
8332 msgid "multiple sources for the same target"
8336 msgid "destination directory does not exist"
8341 msgid "%s, source=%s, destination=%s"
8342 msgstr "%s,源=%s,目标=%s"
8346 msgid "Renaming %s to %s\n"
8347 msgstr "重命名 %s 至 %s\n"
8349 #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
8351 msgid "renaming '%s' failed"
8352 msgstr "重命名 '%s' 失败"
8354 #: builtin/name-rev.c:251
8355 msgid "git name-rev [<options>] <commit>..."
8356 msgstr "git name-rev [<选项>] <提交>..."
8358 #: builtin/name-rev.c:252
8359 msgid "git name-rev [<options>] --all"
8360 msgstr "git name-rev [<选项>] --all"
8362 #: builtin/name-rev.c:253
8363 msgid "git name-rev [<options>] --stdin"
8364 msgstr "git name-rev [<选项>] --stdin"
8366 #: builtin/name-rev.c:305
8367 msgid "print only names (no SHA-1)"
8368 msgstr "只打印名称(无 SHA-1)"
8370 #: builtin/name-rev.c:306
8371 msgid "only use tags to name the commits"
8374 #: builtin/name-rev.c:308
8375 msgid "only use refs matching <pattern>"
8376 msgstr "只使用和 <模式> 相匹配的引用"
8378 #: builtin/name-rev.c:310
8379 msgid "list all commits reachable from all refs"
8380 msgstr "列出可以从所有引用访问的提交"
8382 #: builtin/name-rev.c:311
8383 msgid "read from stdin"
8386 #: builtin/name-rev.c:312
8387 msgid "allow to print `undefined` names (default)"
8388 msgstr "允许打印 `未定义` 的名称(默认)"
8390 #: builtin/name-rev.c:318
8391 msgid "dereference tags in the input (internal use)"
8392 msgstr "反向解析输入中的标签(内部使用)"
8394 #: builtin/notes.c:25
8395 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8396 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8398 #: builtin/notes.c:26
8400 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8401 "| (-c | -C) <object>] [<object>]"
8403 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8404 "| (-c | -C) <对象>] [<对象>]"
8406 #: builtin/notes.c:27
8407 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8408 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8410 #: builtin/notes.c:28
8412 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8413 "(-c | -C) <object>] [<object>]"
8415 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8416 "(-c | -C) <对象>] [<对象>]"
8418 #: builtin/notes.c:29
8419 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8420 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8422 #: builtin/notes.c:30
8423 msgid "git notes [--ref <notes-ref>] show [<object>]"
8424 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8426 #: builtin/notes.c:31
8428 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8429 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8431 #: builtin/notes.c:32
8432 msgid "git notes merge --commit [-v | -q]"
8433 msgstr "git notes merge --commit [-v | -q]"
8435 #: builtin/notes.c:33
8436 msgid "git notes merge --abort [-v | -q]"
8437 msgstr "git notes merge --abort [-v | -q]"
8439 #: builtin/notes.c:34
8440 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8441 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8443 #: builtin/notes.c:35
8444 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8445 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8447 #: builtin/notes.c:36
8448 msgid "git notes [--ref <notes-ref>] get-ref"
8449 msgstr "git notes [--ref <注解引用>] get-ref"
8451 #: builtin/notes.c:41
8452 msgid "git notes [list [<object>]]"
8453 msgstr "git notes [list [<对象>]]"
8455 #: builtin/notes.c:46
8456 msgid "git notes add [<options>] [<object>]"
8457 msgstr "git notes add [<选项>] [<对象>]"
8459 #: builtin/notes.c:51
8460 msgid "git notes copy [<options>] <from-object> <to-object>"
8461 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8463 #: builtin/notes.c:52
8464 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8465 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8467 #: builtin/notes.c:57
8468 msgid "git notes append [<options>] [<object>]"
8469 msgstr "git notes append [<选项>] [<对象>]"
8471 #: builtin/notes.c:62
8472 msgid "git notes edit [<object>]"
8473 msgstr "git notes edit [<对象>]"
8475 #: builtin/notes.c:67
8476 msgid "git notes show [<object>]"
8477 msgstr "git notes show [<对象>]"
8479 #: builtin/notes.c:72
8480 msgid "git notes merge [<options>] <notes-ref>"
8481 msgstr "git notes merge [<选项>] <注解引用>"
8483 #: builtin/notes.c:73
8484 msgid "git notes merge --commit [<options>]"
8485 msgstr "git notes merge --commit [<选项>]"
8487 #: builtin/notes.c:74
8488 msgid "git notes merge --abort [<options>]"
8489 msgstr "git notes merge --abort [<选项>]"
8491 #: builtin/notes.c:79
8492 msgid "git notes remove [<object>]"
8493 msgstr "git notes remove [<对象>]"
8495 #: builtin/notes.c:84
8496 msgid "git notes prune [<options>]"
8497 msgstr "git notes prune [<选项>]"
8499 #: builtin/notes.c:89
8500 msgid "git notes get-ref"
8501 msgstr "git notes get-ref"
8503 #: builtin/notes.c:147
8505 msgid "unable to start 'show' for object '%s'"
8506 msgstr "不能为对象 '%s' 开始 'show'"
8508 #: builtin/notes.c:151
8509 msgid "could not read 'show' output"
8510 msgstr "不能读取 'show' 的输出"
8512 #: builtin/notes.c:159
8514 msgid "failed to finish 'show' for object '%s'"
8515 msgstr "无法为对象 '%s' 完成 'show'"
8517 #: builtin/notes.c:174 builtin/tag.c:248
8519 msgid "could not create file '%s'"
8520 msgstr "不能创建文件 '%s'"
8522 #: builtin/notes.c:193
8523 msgid "Please supply the note contents using either -m or -F option"
8524 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8526 #: builtin/notes.c:202
8527 msgid "unable to write note object"
8530 #: builtin/notes.c:204
8532 msgid "The note contents have been left in %s"
8533 msgstr "注解内容被留在 %s 中"
8535 #: builtin/notes.c:232 builtin/tag.c:440
8537 msgid "cannot read '%s'"
8540 #: builtin/notes.c:234 builtin/tag.c:443
8542 msgid "could not open or read '%s'"
8543 msgstr "不能打开或读取 '%s'"
8545 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8546 #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8547 #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8548 #: builtin/notes.c:880 builtin/tag.c:456
8550 msgid "Failed to resolve '%s' as a valid ref."
8551 msgstr "无法解析 '%s' 为一个有效引用。"
8553 #: builtin/notes.c:256
8555 msgid "Failed to read object '%s'."
8556 msgstr "无法读取对象 '%s'。"
8558 #: builtin/notes.c:260
8560 msgid "Cannot read note data from non-blob object '%s'."
8561 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8563 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8564 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8565 #: builtin/notes.c:945
8566 msgid "too many parameters"
8569 #: builtin/notes.c:375 builtin/notes.c:662
8571 msgid "No note found for object %s."
8572 msgstr "未发现对象 %s 的注解。"
8574 #: builtin/notes.c:396 builtin/notes.c:559
8575 msgid "note contents as a string"
8576 msgstr "注解内容作为一个字符串"
8578 #: builtin/notes.c:399 builtin/notes.c:562
8579 msgid "note contents in a file"
8582 #: builtin/notes.c:402 builtin/notes.c:565
8583 msgid "reuse and edit specified note object"
8584 msgstr "重用和编辑指定的注解对象"
8586 #: builtin/notes.c:405 builtin/notes.c:568
8587 msgid "reuse specified note object"
8590 #: builtin/notes.c:408 builtin/notes.c:571
8591 msgid "allow storing empty note"
8594 #: builtin/notes.c:409 builtin/notes.c:480
8595 msgid "replace existing notes"
8598 #: builtin/notes.c:434
8601 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8603 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8605 #: builtin/notes.c:449 builtin/notes.c:528
8607 msgid "Overwriting existing notes for object %s\n"
8608 msgstr "覆盖对象 %s 现存注解\n"
8610 #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
8612 msgid "Removing note for object %s\n"
8613 msgstr "删除对象 %s 的注解\n"
8615 #: builtin/notes.c:481
8616 msgid "read objects from stdin"
8619 #: builtin/notes.c:483
8620 msgid "load rewriting config for <command> (implies --stdin)"
8621 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8623 #: builtin/notes.c:501
8624 msgid "too few parameters"
8627 #: builtin/notes.c:522
8630 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8632 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8634 #: builtin/notes.c:534
8636 msgid "Missing notes on source object %s. Cannot copy."
8637 msgstr "源对象 %s 缺少注解。不能拷贝。"
8639 #: builtin/notes.c:586
8642 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8643 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8645 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8646 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8648 #: builtin/notes.c:767
8649 msgid "General options"
8652 #: builtin/notes.c:769
8653 msgid "Merge options"
8656 #: builtin/notes.c:771
8658 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8660 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8662 #: builtin/notes.c:773
8663 msgid "Committing unmerged notes"
8666 #: builtin/notes.c:775
8667 msgid "finalize notes merge by committing unmerged notes"
8668 msgstr "通过提交未合并的注解来完成注解合并"
8670 #: builtin/notes.c:777
8671 msgid "Aborting notes merge resolution"
8674 #: builtin/notes.c:779
8675 msgid "abort notes merge"
8678 #: builtin/notes.c:856
8680 msgid "A notes merge into %s is already in-progress at %s"
8681 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8683 #: builtin/notes.c:883
8685 msgid "Object %s has no note\n"
8686 msgstr "对象 %s 没有注解\n"
8688 #: builtin/notes.c:895
8689 msgid "attempt to remove non-existent note is not an error"
8690 msgstr "尝试删除不存在的注解不是一个错误"
8692 #: builtin/notes.c:898
8693 msgid "read object names from the standard input"
8694 msgstr "从标准输入读取对象名称"
8696 #: builtin/notes.c:979
8700 #: builtin/notes.c:980
8701 msgid "use notes from <notes-ref>"
8702 msgstr "从 <注解引用> 使用注解"
8704 #: builtin/notes.c:1015 builtin/remote.c:1626
8706 msgid "Unknown subcommand: %s"
8709 #: builtin/pack-objects.c:28
8711 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8712 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8714 #: builtin/pack-objects.c:29
8716 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8717 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8719 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8721 msgid "deflate error (%d)"
8724 #: builtin/pack-objects.c:772
8725 msgid "Writing objects"
8728 #: builtin/pack-objects.c:1012
8729 msgid "disabling bitmap writing, as some objects are not being packed"
8730 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8732 #: builtin/pack-objects.c:2172
8733 msgid "Compressing objects"
8736 #: builtin/pack-objects.c:2558
8738 msgid "unsupported index version %s"
8739 msgstr "不支持的索引版本 %s"
8741 #: builtin/pack-objects.c:2562
8743 msgid "bad index version '%s'"
8744 msgstr "坏的索引版本 '%s'"
8746 #: builtin/pack-objects.c:2592
8747 msgid "do not show progress meter"
8750 #: builtin/pack-objects.c:2594
8751 msgid "show progress meter"
8754 #: builtin/pack-objects.c:2596
8755 msgid "show progress meter during object writing phase"
8756 msgstr "在对象写入阶段显示进度表"
8758 #: builtin/pack-objects.c:2599
8759 msgid "similar to --all-progress when progress meter is shown"
8760 msgstr "当进度表显示时类似于 --all-progress"
8762 #: builtin/pack-objects.c:2600
8763 msgid "version[,offset]"
8766 #: builtin/pack-objects.c:2601
8767 msgid "write the pack index file in the specified idx format version"
8768 msgstr "用指定的 idx 格式版本来写包索引文件"
8770 #: builtin/pack-objects.c:2604
8771 msgid "maximum size of each output pack file"
8774 #: builtin/pack-objects.c:2606
8775 msgid "ignore borrowed objects from alternate object store"
8776 msgstr "忽略从备用对象存储里借用对象"
8778 #: builtin/pack-objects.c:2608
8779 msgid "ignore packed objects"
8782 #: builtin/pack-objects.c:2610
8783 msgid "limit pack window by objects"
8786 #: builtin/pack-objects.c:2612
8787 msgid "limit pack window by memory in addition to object limit"
8788 msgstr "除对象数量限制外设置打包窗口的内存限制"
8790 #: builtin/pack-objects.c:2614
8791 msgid "maximum length of delta chain allowed in the resulting pack"
8792 msgstr "打包允许的 delta 链的最大长度"
8794 #: builtin/pack-objects.c:2616
8795 msgid "reuse existing deltas"
8796 msgstr "重用已存在的 deltas"
8798 #: builtin/pack-objects.c:2618
8799 msgid "reuse existing objects"
8802 #: builtin/pack-objects.c:2620
8803 msgid "use OFS_DELTA objects"
8804 msgstr "使用 OFS_DELTA 对象"
8806 #: builtin/pack-objects.c:2622
8807 msgid "use threads when searching for best delta matches"
8808 msgstr "使用线程查询最佳 delta 匹配"
8810 #: builtin/pack-objects.c:2624
8811 msgid "do not create an empty pack output"
8814 #: builtin/pack-objects.c:2626
8815 msgid "read revision arguments from standard input"
8816 msgstr "从标准输入读取版本号参数"
8818 #: builtin/pack-objects.c:2628
8819 msgid "limit the objects to those that are not yet packed"
8820 msgstr "限制那些尚未打包的对象"
8822 #: builtin/pack-objects.c:2631
8823 msgid "include objects reachable from any reference"
8824 msgstr "包括可以从任何引用访问到的对象"
8826 #: builtin/pack-objects.c:2634
8827 msgid "include objects referred by reflog entries"
8828 msgstr "包括被引用日志引用到的对象"
8830 #: builtin/pack-objects.c:2637
8831 msgid "include objects referred to by the index"
8832 msgstr "包括被索引引用到的对象"
8834 #: builtin/pack-objects.c:2640
8835 msgid "output pack to stdout"
8838 #: builtin/pack-objects.c:2642
8839 msgid "include tag objects that refer to objects to be packed"
8840 msgstr "包括那些引用了待打包对象的标签对象"
8842 #: builtin/pack-objects.c:2644
8843 msgid "keep unreachable objects"
8846 #: builtin/pack-objects.c:2645 parse-options.h:142
8850 #: builtin/pack-objects.c:2646
8851 msgid "unpack unreachable objects newer than <time>"
8852 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8854 #: builtin/pack-objects.c:2649
8855 msgid "create thin packs"
8858 #: builtin/pack-objects.c:2651
8859 msgid "create packs suitable for shallow fetches"
8860 msgstr "创建适合浅克隆仓库获取的包"
8862 #: builtin/pack-objects.c:2653
8863 msgid "ignore packs that have companion .keep file"
8864 msgstr "忽略配有 .keep 文件的包"
8866 #: builtin/pack-objects.c:2655
8867 msgid "pack compression level"
8870 #: builtin/pack-objects.c:2657
8871 msgid "do not hide commits by grafts"
8874 #: builtin/pack-objects.c:2659
8875 msgid "use a bitmap index if available to speed up counting objects"
8876 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8878 #: builtin/pack-objects.c:2661
8879 msgid "write a bitmap index together with the pack index"
8880 msgstr "在建立包索引的同时创建 bitmap 索引"
8882 #: builtin/pack-objects.c:2752
8883 msgid "Counting objects"
8886 #: builtin/pack-refs.c:6
8887 msgid "git pack-refs [<options>]"
8888 msgstr "git pack-refs [<选项>]"
8890 #: builtin/pack-refs.c:14
8891 msgid "pack everything"
8894 #: builtin/pack-refs.c:15
8895 msgid "prune loose refs (default)"
8896 msgstr "清除松散的引用(默认)"
8898 #: builtin/prune-packed.c:7
8899 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8900 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8902 #: builtin/prune-packed.c:40
8903 msgid "Removing duplicate objects"
8906 #: builtin/prune.c:11
8907 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8908 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8910 #: builtin/prune.c:105 builtin/worktree.c:124
8911 msgid "do not remove, show only"
8914 #: builtin/prune.c:106 builtin/worktree.c:125
8915 msgid "report pruned objects"
8918 #: builtin/prune.c:109 builtin/worktree.c:127
8919 msgid "expire objects older than <time>"
8920 msgstr "使早于给定时间的对象过期"
8922 #: builtin/prune.c:123
8923 msgid "cannot prune in a precious-objects repo"
8924 msgstr "不能在珍品仓库中执行清理操作"
8926 #: builtin/pull.c:72
8927 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8928 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8930 #: builtin/pull.c:117
8931 msgid "Options related to merging"
8934 #: builtin/pull.c:120
8935 msgid "incorporate changes by rebasing rather than merging"
8936 msgstr "使用变基操作取代合并操作以合入修改"
8938 #: builtin/pull.c:144 builtin/revert.c:105
8939 msgid "allow fast-forward"
8942 #: builtin/pull.c:150
8943 msgid "verify that the named commit has a valid GPG signature"
8944 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8946 #: builtin/pull.c:164
8947 msgid "Options related to fetching"
8950 #: builtin/pull.c:186
8951 msgid "number of submodules pulled in parallel"
8952 msgstr "并发拉取的子模组的数量"
8954 #: builtin/pull.c:275
8956 msgid "Invalid value for pull.ff: %s"
8957 msgstr "pull.ff 的取值无效:%s"
8959 #: builtin/pull.c:359
8960 msgid "Cannot pull with rebase: You have unstaged changes."
8961 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8963 #: builtin/pull.c:365
8964 msgid "Additionally, your index contains uncommitted changes."
8965 msgstr "而且您的索引中包含未提交的变更。"
8967 #: builtin/pull.c:367
8968 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8969 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8971 #: builtin/pull.c:443
8973 "There is no candidate for rebasing against among the refs that you just "
8975 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8977 #: builtin/pull.c:445
8979 "There are no candidates for merging among the refs that you just fetched."
8980 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8982 #: builtin/pull.c:446
8984 "Generally this means that you provided a wildcard refspec which had no\n"
8985 "matches on the remote end."
8986 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8988 #: builtin/pull.c:449
8991 "You asked to pull from the remote '%s', but did not specify\n"
8992 "a branch. Because this is not the default configured remote\n"
8993 "for your current branch, you must specify a branch on the command line."
8995 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8996 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8998 #: builtin/pull.c:454
8999 msgid "You are not currently on a branch."
9000 msgstr "您当前不在一个分支上。"
9002 #: builtin/pull.c:456 builtin/pull.c:471
9003 msgid "Please specify which branch you want to rebase against."
9004 msgstr "请指定您要变基到哪一个分支。"
9006 #: builtin/pull.c:458 builtin/pull.c:473
9007 msgid "Please specify which branch you want to merge with."
9008 msgstr "请指定您要合并哪一个分支。"
9010 #: builtin/pull.c:459 builtin/pull.c:474
9011 msgid "See git-pull(1) for details."
9012 msgstr "详见 git-pull(1)。"
9014 #: builtin/pull.c:469
9015 msgid "There is no tracking information for the current branch."
9016 msgstr "当前分支没有跟踪信息。"
9018 #: builtin/pull.c:478
9021 "If you wish to set tracking information for this branch you can do so with:\n"
9023 " git branch --set-upstream-to=%s/<branch> %s\n"
9025 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
9027 " git branch --set-upstream-to=%s/<branch> %s\n"
9029 #: builtin/pull.c:483
9032 "Your configuration specifies to merge with the ref '%s'\n"
9033 "from the remote, but no such ref was fetched."
9035 "您的配置中指定要合并远程的引用 '%s',\n"
9038 #: builtin/pull.c:841
9039 msgid "Updating an unborn branch with changes added to the index."
9040 msgstr "更新尚未诞生的分支,变更添加至索引。"
9042 #: builtin/pull.c:870
9045 "fetch updated the current branch head.\n"
9046 "fast-forwarding your working tree from\n"
9049 "fetch 更新了当前的分支。快进您的工作区\n"
9052 #: builtin/pull.c:875
9055 "Cannot fast-forward your working tree.\n"
9056 "After making sure that you saved anything precious from\n"
9059 "$ git reset --hard\n"
9062 "您当前的工作区无法执行快进操作。\n"
9065 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
9066 "$ git reset --hard\n"
9069 #: builtin/pull.c:890
9070 msgid "Cannot merge multiple branches into empty head."
9071 msgstr "无法将多个分支合并到空分支。"
9073 #: builtin/pull.c:894
9074 msgid "Cannot rebase onto multiple branches."
9077 #: builtin/push.c:16
9078 msgid "git push [<options>] [<repository> [<refspec>...]]"
9079 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9081 #: builtin/push.c:89
9082 msgid "tag shorthand without <tag>"
9083 msgstr "标签后面未提供 <标签> 参数"
9085 #: builtin/push.c:99
9086 msgid "--delete only accepts plain target ref names"
9087 msgstr "--delete 只接受简单的目标引用名"
9089 #: builtin/push.c:143
9092 "To choose either option permanently, see push.default in 'git help config'."
9095 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9097 #: builtin/push.c:146
9100 "The upstream branch of your current branch does not match\n"
9101 "the name of your current branch. To push to the upstream branch\n"
9102 "on the remote, use\n"
9104 " git push %s HEAD:%s\n"
9106 "To push to the branch of the same name on the remote, use\n"
9111 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9114 " git push %s HEAD:%s\n"
9121 #: builtin/push.c:161
9124 "You are not currently on a branch.\n"
9125 "To push the history leading to the current (detached HEAD)\n"
9128 " git push %s HEAD:<name-of-remote-branch>\n"
9131 "现在为推送当前(分离头指针)的历史,使用\n"
9133 " git push %s HEAD:<远程分支名字>\n"
9135 #: builtin/push.c:175
9138 "The current branch %s has no upstream branch.\n"
9139 "To push the current branch and set the remote as upstream, use\n"
9141 " git push --set-upstream %s %s\n"
9143 "当前分支 %s 没有对应的上游分支。\n"
9144 "为推送当前分支并建立与远程上游的跟踪,使用\n"
9146 " git push --set-upstream %s %s\n"
9148 #: builtin/push.c:183
9150 msgid "The current branch %s has multiple upstream branches, refusing to push."
9151 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9153 #: builtin/push.c:186
9156 "You are pushing to remote '%s', which is not the upstream of\n"
9157 "your current branch '%s', without telling me what to push\n"
9158 "to update which remote branch."
9160 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9161 "而没有告诉我要推送什么、更新哪个远程分支。"
9163 #: builtin/push.c:242
9165 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
9166 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9168 #: builtin/push.c:249
9170 "Updates were rejected because the tip of your current branch is behind\n"
9171 "its remote counterpart. Integrate the remote changes (e.g.\n"
9172 "'git pull ...') before pushing again.\n"
9173 "See the 'Note about fast-forwards' in 'git push --help' for details."
9175 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9176 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9177 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9179 #: builtin/push.c:255
9181 "Updates were rejected because a pushed branch tip is behind its remote\n"
9182 "counterpart. Check out this branch and integrate the remote changes\n"
9183 "(e.g. 'git pull ...') before pushing again.\n"
9184 "See the 'Note about fast-forwards' in 'git push --help' for details."
9186 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9187 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9188 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9190 #: builtin/push.c:261
9192 "Updates were rejected because the remote contains work that you do\n"
9193 "not have locally. This is usually caused by another repository pushing\n"
9194 "to the same ref. You may want to first integrate the remote changes\n"
9195 "(e.g., 'git pull ...') before pushing again.\n"
9196 "See the 'Note about fast-forwards' in 'git push --help' for details."
9198 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9199 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9200 "(如 'git pull ...')。\n"
9201 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9203 #: builtin/push.c:268
9204 msgid "Updates were rejected because the tag already exists in the remote."
9205 msgstr "更新被拒绝,因为该标签在远程已经存在。"
9207 #: builtin/push.c:271
9209 "You cannot update a remote ref that points at a non-commit object,\n"
9210 "or update a remote ref to make it point at a non-commit object,\n"
9211 "without using the '--force' option.\n"
9213 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9214 "也不能更新远程引用让其指向一个非提交对象。\n"
9216 #: builtin/push.c:331
9218 msgid "Pushing to %s\n"
9221 #: builtin/push.c:335
9223 msgid "failed to push some refs to '%s'"
9224 msgstr "无法推送一些引用到 '%s'"
9226 #: builtin/push.c:365
9228 msgid "bad repository '%s'"
9231 #: builtin/push.c:366
9233 "No configured push destination.\n"
9234 "Either specify the URL from the command-line or configure a remote "
9235 "repository using\n"
9237 " git remote add <name> <url>\n"
9239 "and then push using the remote name\n"
9241 " git push <name>\n"
9244 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9246 " git remote add <名称> <地址>\n"
9252 #: builtin/push.c:381
9253 msgid "--all and --tags are incompatible"
9254 msgstr "--all 和 --tags 不兼容"
9256 #: builtin/push.c:382
9257 msgid "--all can't be combined with refspecs"
9258 msgstr "--all 不能和引用规格同时使用"
9260 #: builtin/push.c:387
9261 msgid "--mirror and --tags are incompatible"
9262 msgstr "--mirror 和 --tags 不兼容"
9264 #: builtin/push.c:388
9265 msgid "--mirror can't be combined with refspecs"
9266 msgstr "--mirror 不能和引用规格同时使用"
9268 #: builtin/push.c:393
9269 msgid "--all and --mirror are incompatible"
9270 msgstr "--all 和 --mirror 不兼容"
9272 #: builtin/push.c:505
9276 #: builtin/push.c:506 builtin/send-pack.c:161
9277 msgid "push all refs"
9280 #: builtin/push.c:507 builtin/send-pack.c:163
9281 msgid "mirror all refs"
9284 #: builtin/push.c:509
9288 #: builtin/push.c:510
9289 msgid "push tags (can't be used with --all or --mirror)"
9290 msgstr "推送标签(不能使用 --all or --mirror)"
9292 #: builtin/push.c:513 builtin/send-pack.c:164
9293 msgid "force updates"
9296 #: builtin/push.c:515 builtin/send-pack.c:175
9297 msgid "refname>:<expect"
9300 #: builtin/push.c:516 builtin/send-pack.c:176
9301 msgid "require old value of ref to be at this value"
9302 msgstr "要求引用旧的取值为设定值"
9304 #: builtin/push.c:519
9305 msgid "control recursive pushing of submodules"
9308 #: builtin/push.c:521 builtin/send-pack.c:169
9309 msgid "use thin pack"
9312 #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9313 #: builtin/send-pack.c:159
9314 msgid "receive pack program"
9317 #: builtin/push.c:524
9318 msgid "set upstream for git pull/status"
9319 msgstr "设置 git pull/status 的上游"
9321 #: builtin/push.c:527
9322 msgid "prune locally removed refs"
9325 #: builtin/push.c:529
9326 msgid "bypass pre-push hook"
9327 msgstr "绕过 pre-push 钩子"
9329 #: builtin/push.c:530
9330 msgid "push missing but relevant tags"
9333 #: builtin/push.c:533 builtin/send-pack.c:166
9334 msgid "GPG sign the push"
9335 msgstr "用 GPG 为推送签名"
9337 #: builtin/push.c:535 builtin/send-pack.c:170
9338 msgid "request atomic transaction on remote side"
9341 #: builtin/push.c:549
9342 msgid "--delete is incompatible with --all, --mirror and --tags"
9343 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9345 #: builtin/push.c:551
9346 msgid "--delete doesn't make sense without any refs"
9347 msgstr "--delete 未接任何引用没有意义"
9349 #: builtin/read-tree.c:37
9351 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9352 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9353 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9355 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9356 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9357 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9359 #: builtin/read-tree.c:110
9360 msgid "write resulting index to <file>"
9361 msgstr "将索引结果写入 <文件>"
9363 #: builtin/read-tree.c:113
9364 msgid "only empty the index"
9367 #: builtin/read-tree.c:115
9371 #: builtin/read-tree.c:117
9372 msgid "perform a merge in addition to a read"
9373 msgstr "读取之余再执行一个合并"
9375 #: builtin/read-tree.c:119
9376 msgid "3-way merge if no file level merging required"
9377 msgstr "如果没有文件级合并需要,执行三方合并"
9379 #: builtin/read-tree.c:121
9380 msgid "3-way merge in presence of adds and removes"
9381 msgstr "存在添加和删除时,也执行三方合并"
9383 #: builtin/read-tree.c:123
9384 msgid "same as -m, but discard unmerged entries"
9385 msgstr "类似于 -m,但丢弃未合并的条目"
9387 #: builtin/read-tree.c:124
9388 msgid "<subdirectory>/"
9391 #: builtin/read-tree.c:125
9392 msgid "read the tree into the index under <subdirectory>/"
9393 msgstr "读取树对象到索引的 <子目录>/ 下"
9395 #: builtin/read-tree.c:128
9396 msgid "update working tree with merge result"
9397 msgstr "用合并的结果更新工作区"
9399 #: builtin/read-tree.c:130
9403 #: builtin/read-tree.c:131
9404 msgid "allow explicitly ignored files to be overwritten"
9405 msgstr "允许忽略文件中设定的文件可以被覆盖"
9407 #: builtin/read-tree.c:134
9408 msgid "don't check the working tree after merging"
9411 #: builtin/read-tree.c:135
9412 msgid "don't update the index or the work tree"
9415 #: builtin/read-tree.c:137
9416 msgid "skip applying sparse checkout filter"
9417 msgstr "跳过应用稀疏检出过滤器"
9419 #: builtin/read-tree.c:139
9420 msgid "debug unpack-trees"
9421 msgstr "调试 unpack-trees"
9423 #: builtin/reflog.c:423
9425 msgid "'%s' for '%s' is not a valid timestamp"
9426 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9428 #: builtin/reflog.c:540 builtin/reflog.c:545
9430 msgid "'%s' is not a valid timestamp"
9431 msgstr "'%s' 不是一个有效的时间戳"
9433 #: builtin/remote.c:12
9434 msgid "git remote [-v | --verbose]"
9435 msgstr "git remote [-v | --verbose]"
9437 #: builtin/remote.c:13
9439 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9440 "mirror=<fetch|push>] <name> <url>"
9442 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9443 "mirror=<fetch|push>] <名称> <地址>"
9445 #: builtin/remote.c:14 builtin/remote.c:34
9446 msgid "git remote rename <old> <new>"
9447 msgstr "git remote rename <旧名称> <新名称>"
9449 #: builtin/remote.c:15 builtin/remote.c:39
9450 msgid "git remote remove <name>"
9451 msgstr "git remote remove <名称>"
9453 #: builtin/remote.c:16 builtin/remote.c:44
9454 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9455 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9457 #: builtin/remote.c:17
9458 msgid "git remote [-v | --verbose] show [-n] <name>"
9459 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9461 #: builtin/remote.c:18
9462 msgid "git remote prune [-n | --dry-run] <name>"
9463 msgstr "git remote prune [-n | --dry-run] <名称>"
9465 #: builtin/remote.c:19
9467 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9468 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9470 #: builtin/remote.c:20
9471 msgid "git remote set-branches [--add] <name> <branch>..."
9472 msgstr "git remote set-branches [--add] <名称> <分支>..."
9474 #: builtin/remote.c:21 builtin/remote.c:70
9475 msgid "git remote get-url [--push] [--all] <name>"
9476 msgstr "git remote get-url [--push] [--all] <名称>"
9478 #: builtin/remote.c:22 builtin/remote.c:75
9479 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9480 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9482 #: builtin/remote.c:23 builtin/remote.c:76
9483 msgid "git remote set-url --add <name> <newurl>"
9484 msgstr "git remote set-url --add <名称> <新的地址>"
9486 #: builtin/remote.c:24 builtin/remote.c:77
9487 msgid "git remote set-url --delete <name> <url>"
9488 msgstr "git remote set-url --delete <名称> <地址>"
9490 #: builtin/remote.c:29
9491 msgid "git remote add [<options>] <name> <url>"
9492 msgstr "git remote add [<选项>] <名称> <地址>"
9494 #: builtin/remote.c:49
9495 msgid "git remote set-branches <name> <branch>..."
9496 msgstr "git remote set-branches <名称> <分支>..."
9498 #: builtin/remote.c:50
9499 msgid "git remote set-branches --add <name> <branch>..."
9500 msgstr "git remote set-branches --add <名称> <分支>..."
9502 #: builtin/remote.c:55
9503 msgid "git remote show [<options>] <name>"
9504 msgstr "git remote show [<选项>] <名称>"
9506 #: builtin/remote.c:60
9507 msgid "git remote prune [<options>] <name>"
9508 msgstr "git remote prune [<选项>] <名称>"
9510 #: builtin/remote.c:65
9511 msgid "git remote update [<options>] [<group> | <remote>]..."
9512 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9514 #: builtin/remote.c:94
9519 #: builtin/remote.c:126
9521 "--mirror is dangerous and deprecated; please\n"
9522 "\t use --mirror=fetch or --mirror=push instead"
9524 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9525 "\t 或 --mirror=push"
9527 #: builtin/remote.c:143
9529 msgid "unknown mirror argument: %s"
9532 #: builtin/remote.c:159
9533 msgid "fetch the remote branches"
9536 #: builtin/remote.c:161
9537 msgid "import all tags and associated objects when fetching"
9538 msgstr "抓取时导入所有的标签和关联对象"
9540 #: builtin/remote.c:164
9541 msgid "or do not fetch any tag at all (--no-tags)"
9542 msgstr "或不抓取任何标签(--no-tags)"
9544 #: builtin/remote.c:166
9545 msgid "branch(es) to track"
9548 #: builtin/remote.c:167
9549 msgid "master branch"
9552 #: builtin/remote.c:168
9556 #: builtin/remote.c:169
9557 msgid "set up remote as a mirror to push to or fetch from"
9558 msgstr "把远程设置为用以推送或抓取的镜像"
9560 #: builtin/remote.c:181
9561 msgid "specifying a master branch makes no sense with --mirror"
9562 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9564 #: builtin/remote.c:183
9565 msgid "specifying branches to track makes sense only with fetch mirrors"
9566 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9568 #: builtin/remote.c:190 builtin/remote.c:633
9570 msgid "remote %s already exists."
9571 msgstr "远程 %s 已经存在。"
9573 #: builtin/remote.c:194 builtin/remote.c:637
9575 msgid "'%s' is not a valid remote name"
9576 msgstr "'%s' 不是一个有效的远程名称"
9578 #: builtin/remote.c:234
9580 msgid "Could not setup master '%s'"
9581 msgstr "无法设置 master '%s'"
9583 #: builtin/remote.c:336
9585 msgid "Could not get fetch map for refspec %s"
9586 msgstr "无法得到引用规格 %s 的获取列表"
9588 #: builtin/remote.c:437 builtin/remote.c:445
9592 #: builtin/remote.c:449
9596 #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9598 msgid "No such remote: %s"
9601 #: builtin/remote.c:643
9603 msgid "Could not rename config section '%s' to '%s'"
9604 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9606 #: builtin/remote.c:663
9609 "Not updating non-default fetch refspec\n"
9611 "\tPlease update the configuration manually if necessary."
9617 #: builtin/remote.c:699
9619 msgid "deleting '%s' failed"
9622 #: builtin/remote.c:733
9624 msgid "creating '%s' failed"
9627 #: builtin/remote.c:796
9629 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9630 "to delete it, use:"
9632 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9633 "to delete them, use:"
9634 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9635 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9637 #: builtin/remote.c:810
9639 msgid "Could not remove config section '%s'"
9640 msgstr "不能移除配置小节 '%s'"
9642 #: builtin/remote.c:911
9644 msgid " new (next fetch will store in remotes/%s)"
9645 msgstr " 新的(下一次获取将存储于 remotes/%s)"
9647 #: builtin/remote.c:914
9651 #: builtin/remote.c:916
9652 msgid " stale (use 'git remote prune' to remove)"
9653 msgstr " 过时(使用 'git remote prune' 来移除)"
9655 #: builtin/remote.c:918
9659 #: builtin/remote.c:959
9661 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9662 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9664 #: builtin/remote.c:967
9666 msgid "rebases interactively onto remote %s"
9667 msgstr "交互式变基到远程 %s"
9669 #: builtin/remote.c:971
9671 msgid " merges with remote %s"
9674 #: builtin/remote.c:972
9675 msgid " and with remote"
9678 #: builtin/remote.c:974
9680 msgid "merges with remote %s"
9683 #: builtin/remote.c:975
9684 msgid " and with remote"
9687 #: builtin/remote.c:1021
9691 #: builtin/remote.c:1024
9695 #: builtin/remote.c:1028
9699 #: builtin/remote.c:1031
9700 msgid "fast-forwardable"
9703 #: builtin/remote.c:1034
9704 msgid "local out of date"
9707 #: builtin/remote.c:1041
9709 msgid " %-*s forces to %-*s (%s)"
9710 msgstr " %-*s 强制推送至 %-*s (%s)"
9712 #: builtin/remote.c:1044
9714 msgid " %-*s pushes to %-*s (%s)"
9715 msgstr " %-*s 推送至 %-*s (%s)"
9717 #: builtin/remote.c:1048
9719 msgid " %-*s forces to %s"
9720 msgstr " %-*s 强制推送至 %s"
9722 #: builtin/remote.c:1051
9724 msgid " %-*s pushes to %s"
9725 msgstr " %-*s 推送至 %s"
9727 #: builtin/remote.c:1119
9728 msgid "do not query remotes"
9731 #: builtin/remote.c:1146
9736 #: builtin/remote.c:1147
9738 msgid " Fetch URL: %s"
9741 #: builtin/remote.c:1148 builtin/remote.c:1299
9745 #: builtin/remote.c:1157 builtin/remote.c:1159
9747 msgid " Push URL: %s"
9750 #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
9752 msgid " HEAD branch: %s"
9753 msgstr " HEAD 分支:%s"
9755 #: builtin/remote.c:1167
9758 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9759 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9761 #: builtin/remote.c:1179
9763 msgid " Remote branch:%s"
9764 msgid_plural " Remote branches:%s"
9765 msgstr[0] " 远程分支:%s"
9766 msgstr[1] " 远程分支:%s"
9768 # 译者:中文字符串拼接,可删除前导空格
9769 #: builtin/remote.c:1182 builtin/remote.c:1209
9770 msgid " (status not queried)"
9773 #: builtin/remote.c:1191
9774 msgid " Local branch configured for 'git pull':"
9775 msgid_plural " Local branches configured for 'git pull':"
9776 msgstr[0] " 为 'git pull' 配置的本地分支:"
9777 msgstr[1] " 为 'git pull' 配置的本地分支:"
9779 #: builtin/remote.c:1199
9780 msgid " Local refs will be mirrored by 'git push'"
9781 msgstr " 本地引用将在 'git push' 时被镜像"
9783 #: builtin/remote.c:1206
9785 msgid " Local ref configured for 'git push'%s:"
9786 msgid_plural " Local refs configured for 'git push'%s:"
9787 msgstr[0] " 为 'git push' 配置的本地引用%s:"
9788 msgstr[1] " 为 'git push' 配置的本地引用%s:"
9790 #: builtin/remote.c:1227
9791 msgid "set refs/remotes/<name>/HEAD according to remote"
9792 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9794 #: builtin/remote.c:1229
9795 msgid "delete refs/remotes/<name>/HEAD"
9796 msgstr "删除 refs/remotes/<名称>/HEAD"
9798 #: builtin/remote.c:1244
9799 msgid "Cannot determine remote HEAD"
9800 msgstr "无法确定远程 HEAD"
9802 #: builtin/remote.c:1246
9803 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9804 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9806 #: builtin/remote.c:1256
9808 msgid "Could not delete %s"
9811 #: builtin/remote.c:1264
9813 msgid "Not a valid ref: %s"
9814 msgstr "不是一个有效引用:%s"
9816 #: builtin/remote.c:1266
9818 msgid "Could not setup %s"
9822 #: builtin/remote.c:1284
9824 msgid " %s will become dangling!"
9825 msgstr " %s 将成为摇摆状态!"
9828 #: builtin/remote.c:1285
9830 msgid " %s has become dangling!"
9831 msgstr " %s 已成为摇摆状态!"
9833 #: builtin/remote.c:1295
9838 #: builtin/remote.c:1296
9843 #: builtin/remote.c:1312
9845 msgid " * [would prune] %s"
9846 msgstr " * [将删除] %s"
9848 #: builtin/remote.c:1315
9850 msgid " * [pruned] %s"
9851 msgstr " * [已删除] %s"
9853 #: builtin/remote.c:1360
9854 msgid "prune remotes after fetching"
9857 #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
9859 msgid "No such remote '%s'"
9862 #: builtin/remote.c:1439
9866 #: builtin/remote.c:1446
9867 msgid "no remote specified"
9870 #: builtin/remote.c:1463
9871 msgid "query push URLs rather than fetch URLs"
9872 msgstr "查询推送 URL 地址,而非获取 URL 地址"
9874 #: builtin/remote.c:1465
9875 msgid "return all URLs"
9876 msgstr "返回所有 URL 地址"
9878 #: builtin/remote.c:1493
9880 msgid "no URLs configured for remote '%s'"
9881 msgstr "没有给远程仓库 '%s' 设定 URL"
9883 #: builtin/remote.c:1519
9884 msgid "manipulate push URLs"
9887 #: builtin/remote.c:1521
9891 #: builtin/remote.c:1523
9895 #: builtin/remote.c:1530
9896 msgid "--add --delete doesn't make sense"
9897 msgstr "--add --delete 无意义"
9899 #: builtin/remote.c:1571
9901 msgid "Invalid old URL pattern: %s"
9902 msgstr "无效的旧 URL 匹配模版:%s"
9904 #: builtin/remote.c:1579
9906 msgid "No such URL found: %s"
9907 msgstr "未找到此 URL:%s"
9909 #: builtin/remote.c:1581
9910 msgid "Will not delete all non-push URLs"
9911 msgstr "将不会删除所有非推送 URL 地址"
9913 #: builtin/remote.c:1595
9914 msgid "be verbose; must be placed before a subcommand"
9915 msgstr "冗长输出;必须置于子命令之前"
9917 #: builtin/repack.c:17
9918 msgid "git repack [<options>]"
9919 msgstr "git repack [<选项>]"
9921 #: builtin/repack.c:159
9922 msgid "pack everything in a single pack"
9923 msgstr "所有内容打包到一个包文件中"
9925 #: builtin/repack.c:161
9926 msgid "same as -a, and turn unreachable objects loose"
9927 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9929 #: builtin/repack.c:164
9930 msgid "remove redundant packs, and run git-prune-packed"
9931 msgstr "删除多余的包,运行 git-prune-packed"
9933 #: builtin/repack.c:166
9934 msgid "pass --no-reuse-delta to git-pack-objects"
9935 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9937 #: builtin/repack.c:168
9938 msgid "pass --no-reuse-object to git-pack-objects"
9939 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9941 #: builtin/repack.c:170
9942 msgid "do not run git-update-server-info"
9943 msgstr "不运行 git-update-server-info"
9945 #: builtin/repack.c:173
9946 msgid "pass --local to git-pack-objects"
9947 msgstr "向 git-pack-objects 传递参数 --local"
9949 #: builtin/repack.c:175
9950 msgid "write bitmap index"
9951 msgstr "写 bitmap 索引"
9953 #: builtin/repack.c:176
9957 #: builtin/repack.c:177
9958 msgid "with -A, do not loosen objects older than this"
9959 msgstr "使用 -A,不要将早于给定时间的对象过期"
9961 #: builtin/repack.c:179
9962 msgid "size of the window used for delta compression"
9965 #: builtin/repack.c:180 builtin/repack.c:184
9969 #: builtin/repack.c:181
9970 msgid "same as the above, but limit memory size instead of entries count"
9971 msgstr "和上面的相似,但限制内存大小而非条目数"
9973 #: builtin/repack.c:183
9974 msgid "limits the maximum delta depth"
9977 #: builtin/repack.c:185
9978 msgid "maximum size of each packfile"
9981 #: builtin/repack.c:187
9982 msgid "repack objects in packs marked with .keep"
9983 msgstr "对标记为 .keep 的包中的对象重新打包"
9985 #: builtin/repack.c:197
9986 msgid "cannot delete packs in a precious-objects repo"
9987 msgstr "不能删除珍品仓库中的打包文件"
9989 #: builtin/repack.c:381
9991 msgid "removing '%s' failed"
9994 #: builtin/replace.c:19
9995 msgid "git replace [-f] <object> <replacement>"
9996 msgstr "git replace [-f] <对象> <替换物>"
9998 #: builtin/replace.c:20
9999 msgid "git replace [-f] --edit <object>"
10000 msgstr "git replace [-f] --edit <对象>"
10002 #: builtin/replace.c:21
10003 msgid "git replace [-f] --graft <commit> [<parent>...]"
10004 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10006 #: builtin/replace.c:22
10007 msgid "git replace -d <object>..."
10008 msgstr "git replace -d <对象>..."
10010 #: builtin/replace.c:23
10011 msgid "git replace [--format=<format>] [-l [<pattern>]]"
10012 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10014 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10016 msgid "Not a valid object name: '%s'"
10017 msgstr "不是一个有效的对象名:'%s'"
10019 #: builtin/replace.c:355
10021 msgid "bad mergetag in commit '%s'"
10022 msgstr "提交 '%s' 中含有损坏的合并标签"
10024 #: builtin/replace.c:357
10026 msgid "malformed mergetag in commit '%s'"
10027 msgstr "提交 '%s' 中含有非法的合并标签"
10029 #: builtin/replace.c:368
10032 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10033 "instead of --graft"
10034 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10036 #: builtin/replace.c:401
10038 msgid "the original commit '%s' has a gpg signature."
10039 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10041 #: builtin/replace.c:402
10042 msgid "the signature will be removed in the replacement commit!"
10043 msgstr "在替换的提交中签名将被移除!"
10045 #: builtin/replace.c:408
10047 msgid "could not write replacement commit for: '%s'"
10048 msgstr "不能为 '%s' 写替换提交"
10050 #: builtin/replace.c:432
10051 msgid "list replace refs"
10054 #: builtin/replace.c:433
10055 msgid "delete replace refs"
10058 #: builtin/replace.c:434
10059 msgid "edit existing object"
10062 #: builtin/replace.c:435
10063 msgid "change a commit's parents"
10064 msgstr "修改一个提交的父提交"
10066 #: builtin/replace.c:436
10067 msgid "replace the ref if it exists"
10070 #: builtin/replace.c:437
10071 msgid "do not pretty-print contents for --edit"
10072 msgstr "不要为 --edit 操作美观显示内容"
10074 #: builtin/replace.c:438
10075 msgid "use this format"
10078 #: builtin/rerere.c:12
10079 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10080 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10082 #: builtin/rerere.c:58
10083 msgid "register clean resolutions in index"
10084 msgstr "在索引中注册干净的解决方案"
10086 #: builtin/reset.c:26
10088 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10089 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10091 #: builtin/reset.c:27
10092 msgid "git reset [-q] <tree-ish> [--] <paths>..."
10093 msgstr "git reset [-q] <树或提交> [--] <路径>..."
10095 #: builtin/reset.c:28
10096 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10097 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10099 #: builtin/reset.c:34
10103 #: builtin/reset.c:34
10107 #: builtin/reset.c:34
10111 #: builtin/reset.c:34
10115 #: builtin/reset.c:34
10119 #: builtin/reset.c:74
10120 msgid "You do not have a valid HEAD."
10121 msgstr "您没有一个有效的 HEAD。"
10123 #: builtin/reset.c:76
10124 msgid "Failed to find tree of HEAD."
10125 msgstr "无法找到 HEAD 指向的树。"
10127 #: builtin/reset.c:82
10129 msgid "Failed to find tree of %s."
10130 msgstr "无法找到 %s 指向的树。"
10132 #: builtin/reset.c:100
10134 msgid "HEAD is now at %s"
10135 msgstr "HEAD 现在位于 %s"
10137 # 译者:汉字之间无空格,故删除%s前后空格
10138 #: builtin/reset.c:183
10140 msgid "Cannot do a %s reset in the middle of a merge."
10141 msgstr "在合并过程中不能做%s重置操作。"
10143 #: builtin/reset.c:276
10144 msgid "be quiet, only report errors"
10145 msgstr "安静模式,只报告错误"
10147 #: builtin/reset.c:278
10148 msgid "reset HEAD and index"
10149 msgstr "重置 HEAD 和索引"
10151 #: builtin/reset.c:279
10152 msgid "reset only HEAD"
10155 #: builtin/reset.c:281 builtin/reset.c:283
10156 msgid "reset HEAD, index and working tree"
10157 msgstr "重置 HEAD、索引和工作区"
10159 #: builtin/reset.c:285
10160 msgid "reset HEAD but keep local changes"
10161 msgstr "重置 HEAD 但保存本地变更"
10163 #: builtin/reset.c:288
10164 msgid "record only the fact that removed paths will be added later"
10165 msgstr "将删除的路径标记为稍后添加"
10167 #: builtin/reset.c:305
10169 msgid "Failed to resolve '%s' as a valid revision."
10170 msgstr "无法将 '%s' 解析为一个有效的版本。"
10172 #: builtin/reset.c:313
10174 msgid "Failed to resolve '%s' as a valid tree."
10175 msgstr "无法将 '%s' 解析为一个有效的树对象。"
10177 #: builtin/reset.c:322
10178 msgid "--patch is incompatible with --{hard,mixed,soft}"
10179 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10181 #: builtin/reset.c:331
10182 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10183 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10185 # 译者:汉字之间无空格,故删除%s前后空格
10186 #: builtin/reset.c:333
10188 msgid "Cannot do %s reset with paths."
10189 msgstr "不能带路径进行%s重置。"
10191 # 译者:汉字之间无空格,故删除%s前后空格
10192 #: builtin/reset.c:343
10194 msgid "%s reset is not allowed in a bare repository"
10195 msgstr "不能对纯仓库进行%s重置"
10197 #: builtin/reset.c:347
10198 msgid "-N can only be used with --mixed"
10199 msgstr "-N 只能和 --mixed 同时使用"
10201 #: builtin/reset.c:364
10202 msgid "Unstaged changes after reset:"
10203 msgstr "重置后取消暂存的变更:"
10205 #: builtin/reset.c:370
10207 msgid "Could not reset index file to revision '%s'."
10208 msgstr "不能重置索引文件至版本 '%s'。"
10210 #: builtin/reset.c:374
10211 msgid "Could not write new index file."
10212 msgstr "不能写入新的索引文件。"
10214 #: builtin/rev-list.c:350
10215 msgid "rev-list does not support display of notes"
10216 msgstr "rev-list 不支持显示注解"
10218 #: builtin/rev-parse.c:358
10219 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10220 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10222 #: builtin/rev-parse.c:363
10223 msgid "keep the `--` passed as an arg"
10224 msgstr "保持 `--` 作为一个参数传递"
10226 #: builtin/rev-parse.c:365
10227 msgid "stop parsing after the first non-option argument"
10228 msgstr "遇到第一个非选项参数后停止解析"
10230 #: builtin/rev-parse.c:368
10231 msgid "output in stuck long form"
10234 #: builtin/rev-parse.c:499
10236 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10237 " or: git rev-parse --sq-quote [<arg>...]\n"
10238 " or: git rev-parse [<options>] [<arg>...]\n"
10240 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10242 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10243 " 或者:git rev-parse --sq-quote [<参数>...]\n"
10244 " 或者:git rev-parse [<选项>] [<参数>...]\n"
10246 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10248 #: builtin/revert.c:22
10249 msgid "git revert [<options>] <commit-ish>..."
10250 msgstr "git revert [<选项>] <提交号>..."
10252 #: builtin/revert.c:23
10253 msgid "git revert <subcommand>"
10254 msgstr "git revert <子命令>"
10256 #: builtin/revert.c:28
10257 msgid "git cherry-pick [<options>] <commit-ish>..."
10258 msgstr "git cherry-pick [<选项>] <提交号>..."
10260 #: builtin/revert.c:29
10261 msgid "git cherry-pick <subcommand>"
10262 msgstr "git cherry-pick <子命令>"
10264 #: builtin/revert.c:71
10266 msgid "%s: %s cannot be used with %s"
10267 msgstr "%s:%s 不能和 %s 同时使用"
10269 #: builtin/revert.c:80
10270 msgid "end revert or cherry-pick sequence"
10273 #: builtin/revert.c:81
10274 msgid "resume revert or cherry-pick sequence"
10277 #: builtin/revert.c:82
10278 msgid "cancel revert or cherry-pick sequence"
10281 #: builtin/revert.c:83
10282 msgid "don't automatically commit"
10285 #: builtin/revert.c:84
10286 msgid "edit the commit message"
10289 #: builtin/revert.c:87
10290 msgid "parent number"
10293 #: builtin/revert.c:89
10294 msgid "merge strategy"
10297 #: builtin/revert.c:90
10301 #: builtin/revert.c:91
10302 msgid "option for merge strategy"
10305 #: builtin/revert.c:104
10306 msgid "append commit name"
10309 #: builtin/revert.c:106
10310 msgid "preserve initially empty commits"
10313 #: builtin/revert.c:107
10314 msgid "allow commits with empty messages"
10317 #: builtin/revert.c:108
10318 msgid "keep redundant, empty commits"
10319 msgstr "保持多余的、空的提交"
10321 #: builtin/revert.c:112
10322 msgid "program error"
10325 #: builtin/revert.c:197
10326 msgid "revert failed"
10329 #: builtin/revert.c:212
10330 msgid "cherry-pick failed"
10334 msgid "git rm [<options>] [--] <file>..."
10335 msgstr "git rm [<选项>] [--] <文件>..."
10339 "the following submodule (or one of its nested submodules)\n"
10340 "uses a .git directory:"
10342 "the following submodules (or one of their nested submodules)\n"
10343 "use a .git directory:"
10344 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10345 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10350 "(use 'rm -rf' if you really want to remove it including all of its history)"
10353 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10355 #: builtin/rm.c:230
10357 "the following file has staged content different from both the\n"
10358 "file and the HEAD:"
10360 "the following files have staged content different from both the\n"
10361 "file and the HEAD:"
10362 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10363 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10365 #: builtin/rm.c:235
10368 "(use -f to force removal)"
10373 #: builtin/rm.c:239
10374 msgid "the following file has changes staged in the index:"
10375 msgid_plural "the following files have changes staged in the index:"
10376 msgstr[0] "下列文件索引中有变更"
10377 msgstr[1] "下列文件索引中有变更"
10379 #: builtin/rm.c:243 builtin/rm.c:254
10382 "(use --cached to keep the file, or -f to force removal)"
10385 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
10387 #: builtin/rm.c:251
10388 msgid "the following file has local modifications:"
10389 msgid_plural "the following files have local modifications:"
10390 msgstr[0] "如下文件有本地修改:"
10391 msgstr[1] "如下文件有本地修改:"
10393 #: builtin/rm.c:269
10394 msgid "do not list removed files"
10397 #: builtin/rm.c:270
10398 msgid "only remove from the index"
10401 #: builtin/rm.c:271
10402 msgid "override the up-to-date check"
10403 msgstr "忽略文件更新状态检查"
10405 #: builtin/rm.c:272
10406 msgid "allow recursive removal"
10409 #: builtin/rm.c:274
10410 msgid "exit with a zero status even if nothing matched"
10411 msgstr "即使没有匹配,也以零状态退出"
10413 #: builtin/rm.c:317
10414 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10415 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10417 #: builtin/rm.c:335
10419 msgid "not removing '%s' recursively without -r"
10420 msgstr "未提供 -r 选项不会递归删除 '%s'"
10422 #: builtin/rm.c:374
10424 msgid "git rm: unable to remove %s"
10425 msgstr "git rm:不能删除 %s"
10427 #: builtin/send-pack.c:18
10429 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10430 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10432 " --all and explicit <ref> specification are mutually exclusive."
10434 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10435 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10436 " --all 和明确的 <引用> 互斥。"
10438 #: builtin/send-pack.c:160
10439 msgid "remote name"
10442 #: builtin/send-pack.c:171
10443 msgid "use stateless RPC protocol"
10444 msgstr "使用无状态的 RPC 协议"
10446 #: builtin/send-pack.c:172
10447 msgid "read refs from stdin"
10450 #: builtin/send-pack.c:173
10451 msgid "print status from remote helper"
10452 msgstr "打印来自远程 helper 的状态"
10454 #: builtin/shortlog.c:13
10455 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10456 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10458 #: builtin/shortlog.c:242
10459 msgid "sort output according to the number of commits per author"
10460 msgstr "根据每个作者的提交数量排序"
10462 #: builtin/shortlog.c:244
10463 msgid "Suppress commit descriptions, only provides commit count"
10464 msgstr "隐藏提交说明,只提供提交数量"
10466 #: builtin/shortlog.c:246
10467 msgid "Show the email address of each author"
10468 msgstr "显示每个作者的电子邮件地址"
10470 #: builtin/shortlog.c:247
10471 msgid "w[,i1[,i2]]"
10472 msgstr "w[,i1[,i2]]"
10474 #: builtin/shortlog.c:248
10475 msgid "Linewrap output"
10478 #: builtin/show-branch.c:10
10480 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10481 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10482 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10483 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10485 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10486 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10487 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10488 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10490 #: builtin/show-branch.c:14
10491 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10492 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10494 #: builtin/show-branch.c:640
10495 msgid "show remote-tracking and local branches"
10496 msgstr "显示远程跟踪的和本地的分支"
10498 #: builtin/show-branch.c:642
10499 msgid "show remote-tracking branches"
10502 #: builtin/show-branch.c:644
10503 msgid "color '*!+-' corresponding to the branch"
10504 msgstr "着色 '*!+-' 到相应的分支"
10506 #: builtin/show-branch.c:646
10507 msgid "show <n> more commits after the common ancestor"
10508 msgstr "显示共同祖先后的 <n> 个提交"
10510 #: builtin/show-branch.c:648
10511 msgid "synonym to more=-1"
10512 msgstr "和 more=-1 同义"
10514 #: builtin/show-branch.c:649
10515 msgid "suppress naming strings"
10518 #: builtin/show-branch.c:651
10519 msgid "include the current branch"
10522 #: builtin/show-branch.c:653
10523 msgid "name commits with their object names"
10526 #: builtin/show-branch.c:655
10527 msgid "show possible merge bases"
10530 #: builtin/show-branch.c:657
10531 msgid "show refs unreachable from any other ref"
10532 msgstr "显示没有任何引用的的引用"
10534 #: builtin/show-branch.c:659
10535 msgid "show commits in topological order"
10538 #: builtin/show-branch.c:662
10539 msgid "show only commits not on the first branch"
10540 msgstr "只显示不在第一个分支上的提交"
10542 #: builtin/show-branch.c:664
10543 msgid "show merges reachable from only one tip"
10544 msgstr "显示仅一个分支可访问的合并提交"
10546 #: builtin/show-branch.c:666
10547 msgid "topologically sort, maintaining date order where possible"
10548 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10550 #: builtin/show-branch.c:669
10551 msgid "<n>[,<base>]"
10552 msgstr "<n>[,<base>]"
10554 #: builtin/show-branch.c:670
10555 msgid "show <n> most recent ref-log entries starting at base"
10556 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10558 #: builtin/show-ref.c:10
10560 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10561 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10563 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10564 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10566 #: builtin/show-ref.c:11
10567 msgid "git show-ref --exclude-existing[=<pattern>]"
10568 msgstr "git show-ref --exclude-existing[=<模式>]"
10570 #: builtin/show-ref.c:165
10571 msgid "only show tags (can be combined with heads)"
10572 msgstr "只显示标签(可以和头共用)"
10574 #: builtin/show-ref.c:166
10575 msgid "only show heads (can be combined with tags)"
10576 msgstr "只显示头(可以和标签共用)"
10578 #: builtin/show-ref.c:167
10579 msgid "stricter reference checking, requires exact ref path"
10580 msgstr "更严格的引用检测,需要精确的引用路径"
10582 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10583 msgid "show the HEAD reference, even if it would be filtered out"
10584 msgstr "显示 HEAD 引用,即使被过滤掉"
10586 #: builtin/show-ref.c:174
10587 msgid "dereference tags into object IDs"
10588 msgstr "转换标签到对象 ID"
10590 #: builtin/show-ref.c:176
10591 msgid "only show SHA1 hash using <n> digits"
10592 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10594 #: builtin/show-ref.c:180
10595 msgid "do not print results to stdout (useful with --verify)"
10596 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10598 #: builtin/show-ref.c:182
10599 msgid "show refs from stdin that aren't in local repository"
10600 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10602 #: builtin/stripspace.c:17
10603 msgid "git stripspace [-s | --strip-comments]"
10604 msgstr "git stripspace [-s | --strip-comments]"
10606 #: builtin/stripspace.c:18
10607 msgid "git stripspace [-c | --comment-lines]"
10608 msgstr "git stripspace [-c | --comment-lines]"
10610 #: builtin/stripspace.c:35
10611 msgid "skip and remove all lines starting with comment character"
10612 msgstr "跳过和移除所有的注释行"
10614 #: builtin/stripspace.c:38
10615 msgid "prepend comment character and space to each line"
10616 msgstr "为每一行的行首添加注释符和空格"
10618 #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
10619 msgid "alternative anchor for relative paths"
10620 msgstr "相对路径的替代锚记(anchor)"
10622 #: builtin/submodule--helper.c:78
10623 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10624 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10626 #: builtin/submodule--helper.c:108
10627 msgid "git submodule--helper name <path>"
10628 msgstr "git submodule--helper name <路径>"
10630 #: builtin/submodule--helper.c:114
10632 msgid "no submodule mapping found in .gitmodules for path '%s'"
10633 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10635 #: builtin/submodule--helper.c:164
10636 msgid "where the new submodule will be cloned to"
10637 msgstr "新的子模组将要克隆的路径"
10639 #: builtin/submodule--helper.c:167
10640 msgid "name of the new submodule"
10643 #: builtin/submodule--helper.c:170
10644 msgid "url where to clone the submodule from"
10645 msgstr "克隆子模组的 url 地址"
10647 #: builtin/submodule--helper.c:176
10648 msgid "depth for shallow clones"
10651 #: builtin/submodule--helper.c:182
10653 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10654 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10656 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10657 "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10659 #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10660 #: builtin/submodule--helper.c:210
10662 msgid "could not create directory '%s'"
10663 msgstr "不能创建目录 '%s'"
10665 #: builtin/submodule--helper.c:198
10667 msgid "clone of '%s' into submodule path '%s' failed"
10668 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10670 #: builtin/submodule--helper.c:221
10672 msgid "cannot open file '%s'"
10673 msgstr "无法打开文件 '%s'"
10675 #: builtin/submodule--helper.c:226
10677 msgid "could not close file %s"
10680 #: builtin/submodule--helper.c:241
10682 msgid "could not get submodule directory for '%s'"
10683 msgstr "无法得到 '%s' 的子模组目录"
10685 #: builtin/submodule--helper.c:267
10686 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10687 msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10689 #: builtin/submodule--helper.c:274
10691 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10692 msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10694 #: builtin/symbolic-ref.c:7
10695 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10696 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10698 #: builtin/symbolic-ref.c:8
10699 msgid "git symbolic-ref -d [-q] <name>"
10700 msgstr "git symbolic-ref -d [-q] <名称>"
10702 #: builtin/symbolic-ref.c:40
10703 msgid "suppress error message for non-symbolic (detached) refs"
10704 msgstr "不显示非符号(分离的)引用的错误信息"
10706 #: builtin/symbolic-ref.c:41
10707 msgid "delete symbolic ref"
10710 #: builtin/symbolic-ref.c:42
10711 msgid "shorten ref output"
10714 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10718 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10719 msgid "reason of the update"
10722 #: builtin/tag.c:23
10724 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10727 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10729 #: builtin/tag.c:24
10730 msgid "git tag -d <tagname>..."
10731 msgstr "git tag -d <标签名>..."
10733 #: builtin/tag.c:25
10735 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10736 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10738 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10739 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10741 #: builtin/tag.c:27
10742 msgid "git tag -v <tagname>..."
10743 msgstr "git tag -v <标签名>..."
10745 #: builtin/tag.c:80
10747 msgid "tag name too long: %.*s..."
10748 msgstr "标签名称太长:%.*s..."
10750 #: builtin/tag.c:85
10752 msgid "tag '%s' not found."
10753 msgstr "未发现标签 '%s'。"
10755 #: builtin/tag.c:100
10757 msgid "Deleted tag '%s' (was %s)\n"
10758 msgstr "已删除标签 '%s'(曾为 %s)\n"
10760 #: builtin/tag.c:112
10762 msgid "could not verify the tag '%s'"
10763 msgstr "不能校验该标签 '%s'"
10765 #: builtin/tag.c:122
10769 "Write a message for tag:\n"
10771 "Lines starting with '%c' will be ignored.\n"
10776 "以 '%c' 开头的行将被忽略。\n"
10778 #: builtin/tag.c:126
10782 "Write a message for tag:\n"
10784 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10790 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10792 #: builtin/tag.c:199
10793 msgid "unable to sign the tag"
10796 #: builtin/tag.c:201
10797 msgid "unable to write tag file"
10800 #: builtin/tag.c:226
10801 msgid "bad object type."
10804 #: builtin/tag.c:239
10805 msgid "tag header too big."
10808 #: builtin/tag.c:275
10809 msgid "no tag message?"
10812 #: builtin/tag.c:281
10814 msgid "The tag message has been left in %s\n"
10815 msgstr "标签说明被保留在 %s\n"
10817 #: builtin/tag.c:339
10818 msgid "list tag names"
10821 #: builtin/tag.c:341
10822 msgid "print <n> lines of each tag message"
10823 msgstr "每个标签信息打印 <n> 行"
10825 #: builtin/tag.c:343
10826 msgid "delete tags"
10829 #: builtin/tag.c:344
10830 msgid "verify tags"
10833 #: builtin/tag.c:346
10834 msgid "Tag creation options"
10837 #: builtin/tag.c:348
10838 msgid "annotated tag, needs a message"
10839 msgstr "附注标签,需要一个说明"
10841 #: builtin/tag.c:350
10842 msgid "tag message"
10845 #: builtin/tag.c:352
10846 msgid "annotated and GPG-signed tag"
10847 msgstr "附注并附加 GPG 签名的标签"
10849 #: builtin/tag.c:356
10850 msgid "use another key to sign the tag"
10851 msgstr "使用另外的私钥签名该标签"
10853 #: builtin/tag.c:357
10854 msgid "replace the tag if exists"
10855 msgstr "如果存在,替换现有的标签"
10857 #: builtin/tag.c:358 builtin/update-ref.c:368
10858 msgid "create a reflog"
10861 #: builtin/tag.c:360
10862 msgid "Tag listing options"
10865 #: builtin/tag.c:361
10866 msgid "show tag list in columns"
10867 msgstr "以列的方式显示标签列表"
10869 #: builtin/tag.c:362 builtin/tag.c:363
10870 msgid "print only tags that contain the commit"
10871 msgstr "只打印包含提交的标签"
10873 #: builtin/tag.c:364
10874 msgid "print only tags that are merged"
10875 msgstr "只打印已经合并的标签"
10877 #: builtin/tag.c:365
10878 msgid "print only tags that are not merged"
10879 msgstr "只打印尚未合并的标签"
10881 #: builtin/tag.c:370
10882 msgid "print only tags of the object"
10885 #: builtin/tag.c:399
10886 msgid "--column and -n are incompatible"
10887 msgstr "--column 和 -n 不兼容"
10889 #: builtin/tag.c:419
10890 msgid "-n option is only allowed with -l."
10891 msgstr "-n 选项只允许和 -l 同时使用。"
10893 #: builtin/tag.c:421
10894 msgid "--contains option is only allowed with -l."
10895 msgstr "--contains 选项只允许和 -l 同时使用。"
10897 #: builtin/tag.c:423
10898 msgid "--points-at option is only allowed with -l."
10899 msgstr "--points-at 选项只允许和 -l 同时使用。"
10901 #: builtin/tag.c:425
10902 msgid "--merged and --no-merged option are only allowed with -l"
10903 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10905 #: builtin/tag.c:433
10906 msgid "only one -F or -m option is allowed."
10907 msgstr "只允许一个 -F 或 -m 选项。"
10909 #: builtin/tag.c:453
10910 msgid "too many params"
10913 #: builtin/tag.c:459
10915 msgid "'%s' is not a valid tag name."
10916 msgstr "'%s' 不是一个有效的标签名称。"
10918 #: builtin/tag.c:464
10920 msgid "tag '%s' already exists"
10921 msgstr "标签 '%s' 已存在"
10923 #: builtin/tag.c:489
10925 msgid "Updated tag '%s' (was %s)\n"
10926 msgstr "已更新标签 '%s'(曾为 %s)\n"
10928 #: builtin/unpack-objects.c:490
10929 msgid "Unpacking objects"
10932 #: builtin/update-index.c:79
10934 msgid "failed to create directory %s"
10937 #: builtin/update-index.c:85
10939 msgid "failed to stat %s"
10940 msgstr "无法枚举 %s 状态"
10942 #: builtin/update-index.c:95
10944 msgid "failed to create file %s"
10947 #: builtin/update-index.c:103
10949 msgid "failed to delete file %s"
10952 #: builtin/update-index.c:110 builtin/update-index.c:212
10954 msgid "failed to delete directory %s"
10957 #: builtin/update-index.c:133
10959 msgid "Testing mtime in '%s' "
10960 msgstr "在 '%s' 中测试 mtime "
10962 #: builtin/update-index.c:145
10963 msgid "directory stat info does not change after adding a new file"
10964 msgstr "添加一个新文件后,目录的状态信息未改变"
10966 #: builtin/update-index.c:158
10967 msgid "directory stat info does not change after adding a new directory"
10968 msgstr "添加一个新目录后,目录的状态信息未改变"
10970 #: builtin/update-index.c:171
10971 msgid "directory stat info changes after updating a file"
10972 msgstr "更新一个文件后,目录的状态信息被修改"
10974 #: builtin/update-index.c:182
10975 msgid "directory stat info changes after adding a file inside subdirectory"
10976 msgstr "在子目录中添加文件后,目录的状态信息被修改"
10978 #: builtin/update-index.c:193
10979 msgid "directory stat info does not change after deleting a file"
10980 msgstr "删除一个文件后,目录的状态信息未改变"
10982 #: builtin/update-index.c:206
10983 msgid "directory stat info does not change after deleting a directory"
10984 msgstr "删除一个目录后,目录的状态信息未改变"
10986 #: builtin/update-index.c:213
10990 #: builtin/update-index.c:575
10991 msgid "git update-index [<options>] [--] [<file>...]"
10992 msgstr "git update-index [<选项>] [--] [<文件>...]"
10994 #: builtin/update-index.c:930
10995 msgid "continue refresh even when index needs update"
10996 msgstr "当索引需要更新时继续刷新"
10998 #: builtin/update-index.c:933
10999 msgid "refresh: ignore submodules"
11002 #: builtin/update-index.c:936
11003 msgid "do not ignore new files"
11006 #: builtin/update-index.c:938
11007 msgid "let files replace directories and vice-versa"
11008 msgstr "让文件替换目录(反之亦然)"
11010 #: builtin/update-index.c:940
11011 msgid "notice files missing from worktree"
11012 msgstr "通知文件从工作区丢失"
11014 #: builtin/update-index.c:942
11015 msgid "refresh even if index contains unmerged entries"
11016 msgstr "即使索引区包含未合并的条目也执行刷新"
11018 #: builtin/update-index.c:945
11019 msgid "refresh stat information"
11022 #: builtin/update-index.c:949
11023 msgid "like --refresh, but ignore assume-unchanged setting"
11024 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11026 #: builtin/update-index.c:953
11027 msgid "<mode>,<object>,<path>"
11028 msgstr "<存取模式>,<对象>,<路径>"
11030 #: builtin/update-index.c:954
11031 msgid "add the specified entry to the index"
11032 msgstr "添加指定的条目到索引区"
11034 #: builtin/update-index.c:958
11038 #: builtin/update-index.c:959
11039 msgid "override the executable bit of the listed files"
11040 msgstr "覆盖列表里文件的可执行位"
11042 #: builtin/update-index.c:963
11043 msgid "mark files as \"not changing\""
11044 msgstr "把文件标记为 \"没有变更\""
11046 #: builtin/update-index.c:966
11047 msgid "clear assumed-unchanged bit"
11048 msgstr "清除 assumed-unchanged 位"
11050 #: builtin/update-index.c:969
11051 msgid "mark files as \"index-only\""
11052 msgstr "把文件标记为 \"仅索引\""
11054 #: builtin/update-index.c:972
11055 msgid "clear skip-worktree bit"
11056 msgstr "清除 skip-worktree 位"
11058 #: builtin/update-index.c:975
11059 msgid "add to index only; do not add content to object database"
11060 msgstr "只添加到索引区;不添加对象到对象库"
11062 #: builtin/update-index.c:977
11063 msgid "remove named paths even if present in worktree"
11064 msgstr "即使存在工作区里,也删除路径"
11066 #: builtin/update-index.c:979
11067 msgid "with --stdin: input lines are terminated by null bytes"
11068 msgstr "携带 --stdin:输入的行以 null 字符终止"
11070 #: builtin/update-index.c:981
11071 msgid "read list of paths to be updated from standard input"
11072 msgstr "从标准输入中读取需要更新的路径列表"
11074 #: builtin/update-index.c:985
11075 msgid "add entries from standard input to the index"
11076 msgstr "从标准输入添加条目到索引区"
11078 #: builtin/update-index.c:989
11079 msgid "repopulate stages #2 and #3 for the listed paths"
11080 msgstr "为指定文件重新生成第2和第3暂存区"
11082 #: builtin/update-index.c:993
11083 msgid "only update entries that differ from HEAD"
11084 msgstr "只更新与 HEAD 不同的条目"
11086 #: builtin/update-index.c:997
11087 msgid "ignore files missing from worktree"
11088 msgstr "忽略工作区丢失的文件"
11090 #: builtin/update-index.c:1000
11091 msgid "report actions to standard output"
11094 #: builtin/update-index.c:1002
11095 msgid "(for porcelains) forget saved unresolved conflicts"
11096 msgstr "(for porcelains) 忘记保存的未解决的冲突"
11098 #: builtin/update-index.c:1006
11099 msgid "write index in this format"
11100 msgstr "以这种格式写入索引区"
11102 #: builtin/update-index.c:1008
11103 msgid "enable or disable split index"
11106 #: builtin/update-index.c:1010
11107 msgid "enable/disable untracked cache"
11108 msgstr "启用/禁用对未跟踪文件的缓存"
11110 #: builtin/update-index.c:1012
11111 msgid "test if the filesystem supports untracked cache"
11112 msgstr "测试文件系统是否支持未跟踪文件缓存"
11114 #: builtin/update-index.c:1014
11115 msgid "enable untracked cache without testing the filesystem"
11116 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11118 #: builtin/update-index.c:1134
11119 msgid "Untracked cache disabled"
11120 msgstr "缓存未跟踪文件被禁用"
11122 #: builtin/update-index.c:1146
11124 msgid "Untracked cache enabled for '%s'"
11125 msgstr "缓存未跟踪文件在 '%s' 启用"
11127 #: builtin/update-ref.c:9
11128 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11129 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11131 #: builtin/update-ref.c:10
11132 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11133 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
11135 #: builtin/update-ref.c:11
11136 msgid "git update-ref [<options>] --stdin [-z]"
11137 msgstr "git update-ref [<选项>] --stdin [-z]"
11139 #: builtin/update-ref.c:363
11140 msgid "delete the reference"
11143 #: builtin/update-ref.c:365
11144 msgid "update <refname> not the one it points to"
11145 msgstr "更新 <引用名> 本身而不是它指向的引用"
11147 #: builtin/update-ref.c:366
11148 msgid "stdin has NUL-terminated arguments"
11149 msgstr "标准输入有以 NUL 字符终止的参数"
11151 #: builtin/update-ref.c:367
11152 msgid "read updates from stdin"
11155 #: builtin/update-server-info.c:6
11156 msgid "git update-server-info [--force]"
11157 msgstr "git update-server-info [--force]"
11159 #: builtin/update-server-info.c:14
11160 msgid "update the info files from scratch"
11161 msgstr "从头开始更新文件信息"
11163 #: builtin/verify-commit.c:17
11164 msgid "git verify-commit [-v | --verbose] <commit>..."
11165 msgstr "git verify-commit [-v | --verbose] <提交>..."
11167 #: builtin/verify-commit.c:72
11168 msgid "print commit contents"
11171 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
11172 msgid "print raw gpg status output"
11173 msgstr "打印原始 gpg 状态输出"
11175 #: builtin/verify-pack.c:54
11176 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11177 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11179 #: builtin/verify-pack.c:64
11183 #: builtin/verify-pack.c:66
11184 msgid "show statistics only"
11187 #: builtin/verify-tag.c:17
11188 msgid "git verify-tag [-v | --verbose] <tag>..."
11189 msgstr "git verify-tag [-v | --verbose] <标签>..."
11191 #: builtin/verify-tag.c:83
11192 msgid "print tag contents"
11195 #: builtin/worktree.c:15
11196 msgid "git worktree add [<options>] <path> [<branch>]"
11197 msgstr "git worktree add [<选项>] <路径> [<分支>]"
11199 #: builtin/worktree.c:16
11200 msgid "git worktree prune [<options>]"
11201 msgstr "git worktree prune [<选项>]"
11203 #: builtin/worktree.c:17
11204 msgid "git worktree list [<options>]"
11205 msgstr "git worktree list [<选项>]"
11207 #: builtin/worktree.c:39
11209 msgid "Removing worktrees/%s: not a valid directory"
11210 msgstr "删除工作区/%s:不是一个有效的目录"
11212 #: builtin/worktree.c:45
11214 msgid "Removing worktrees/%s: gitdir file does not exist"
11215 msgstr "删除 worktrees/%s:gitdir 文件不存在"
11217 #: builtin/worktree.c:50
11219 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11220 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11222 #: builtin/worktree.c:61
11224 msgid "Removing worktrees/%s: invalid gitdir file"
11225 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11227 #: builtin/worktree.c:77
11229 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11230 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11232 #: builtin/worktree.c:112
11234 msgid "failed to remove: %s"
11237 #: builtin/worktree.c:201
11239 msgid "'%s' already exists"
11242 #: builtin/worktree.c:233
11244 msgid "could not create directory of '%s'"
11245 msgstr "不能创建目录 '%s'"
11247 #: builtin/worktree.c:269
11249 msgid "Preparing %s (identifier %s)"
11250 msgstr "准备 %s (标识符 %s)"
11252 #: builtin/worktree.c:317
11253 msgid "checkout <branch> even if already checked out in other worktree"
11254 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11256 #: builtin/worktree.c:319
11257 msgid "create a new branch"
11260 #: builtin/worktree.c:321
11261 msgid "create or reset a branch"
11264 #: builtin/worktree.c:322
11265 msgid "detach HEAD at named commit"
11266 msgstr "HEAD 从指定的提交分离"
11268 #: builtin/worktree.c:329
11269 msgid "-b, -B, and --detach are mutually exclusive"
11270 msgstr "-b、-B 和 --detach 是互斥的"
11272 #: builtin/write-tree.c:13
11273 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11274 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11276 #: builtin/write-tree.c:26
11280 #: builtin/write-tree.c:27
11281 msgid "write tree object for a subdirectory <prefix>"
11282 msgstr "将 <前缀> 子目录内容写到一个树对象"
11284 #: builtin/write-tree.c:30
11285 msgid "only useful for debugging"
11288 #: credential-cache--daemon.c:262
11289 msgid "print debugging messages to stderr"
11290 msgstr "调试信息输出到标准错误"
11294 "'git help -a' and 'git help -g' list available subcommands and some\n"
11295 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11296 "to read about a specific subcommand or concept."
11298 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11299 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11303 msgid "Public key pinning not supported with cURL < 7.44.0"
11304 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11307 msgid "start a working area (see also: git help tutorial)"
11308 msgstr "开始一个工作区(参见:git help tutorial)"
11310 #: common-cmds.h:10
11311 msgid "work on the current change (see also: git help everyday)"
11312 msgstr "在当前变更上工作(参见:git help everyday)"
11314 #: common-cmds.h:11
11315 msgid "examine the history and state (see also: git help revisions)"
11316 msgstr "检查历史和状态(参见:git help revisions)"
11318 #: common-cmds.h:12
11319 msgid "grow, mark and tweak your common history"
11320 msgstr "扩展、标记和调校您的历史记录"
11322 #: common-cmds.h:13
11323 msgid "collaborate (see also: git help workflows)"
11324 msgstr "协同(参见:git help workflows)"
11326 #: common-cmds.h:17
11327 msgid "Add file contents to the index"
11330 #: common-cmds.h:18
11331 msgid "Use binary search to find the commit that introduced a bug"
11332 msgstr "通过二分查找定位引入 bug 的提交"
11334 #: common-cmds.h:19
11335 msgid "List, create, or delete branches"
11336 msgstr "列出、创建或删除分支"
11338 #: common-cmds.h:20
11339 msgid "Switch branches or restore working tree files"
11340 msgstr "切换分支或恢复工作区文件"
11342 #: common-cmds.h:21
11343 msgid "Clone a repository into a new directory"
11344 msgstr "克隆一个仓库到一个新目录"
11346 #: common-cmds.h:22
11347 msgid "Record changes to the repository"
11350 #: common-cmds.h:23
11351 msgid "Show changes between commits, commit and working tree, etc"
11352 msgstr "显示提交之间、提交和工作区之间等的差异"
11354 #: common-cmds.h:24
11355 msgid "Download objects and refs from another repository"
11356 msgstr "从另外一个仓库下载对象和引用"
11358 #: common-cmds.h:25
11359 msgid "Print lines matching a pattern"
11362 #: common-cmds.h:26
11363 msgid "Create an empty Git repository or reinitialize an existing one"
11364 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11366 #: common-cmds.h:27
11367 msgid "Show commit logs"
11370 #: common-cmds.h:28
11371 msgid "Join two or more development histories together"
11372 msgstr "合并两个或更多开发历史"
11374 #: common-cmds.h:29
11375 msgid "Move or rename a file, a directory, or a symlink"
11376 msgstr "移动或重命名一个文件、目录或符号链接"
11378 #: common-cmds.h:30
11379 msgid "Fetch from and integrate with another repository or a local branch"
11380 msgstr "获取并整合另外的仓库或一个本地分支"
11382 #: common-cmds.h:31
11383 msgid "Update remote refs along with associated objects"
11384 msgstr "更新远程引用和相关的对象"
11386 #: common-cmds.h:32
11387 msgid "Reapply commits on top of another base tip"
11388 msgstr "在另一个分支上重新应用提交"
11390 #: common-cmds.h:33
11391 msgid "Reset current HEAD to the specified state"
11392 msgstr "重置当前 HEAD 到指定状态"
11394 #: common-cmds.h:34
11395 msgid "Remove files from the working tree and from the index"
11396 msgstr "从工作区和索引中删除文件"
11398 #: common-cmds.h:35
11399 msgid "Show various types of objects"
11402 #: common-cmds.h:36
11403 msgid "Show the working tree status"
11406 #: common-cmds.h:37
11407 msgid "Create, list, delete or verify a tag object signed with GPG"
11408 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11410 #: parse-options.h:145
11411 msgid "expiry-date"
11414 #: parse-options.h:160
11415 msgid "no-op (backward compatibility)"
11418 #: parse-options.h:237
11419 msgid "be more verbose"
11422 #: parse-options.h:239
11423 msgid "be more quiet"
11426 #: parse-options.h:245
11427 msgid "use <n> digits to display SHA-1s"
11428 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11431 msgid "update the index with reused conflict resolution if possible"
11432 msgstr "如果可能,重用冲突解决更新索引"
11434 #: git-bisect.sh:55
11435 msgid "You need to start by \"git bisect start\""
11436 msgstr "您需要执行 \"git bisect start\" 来开始"
11439 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11440 #. translation. The program will only accept English input
11442 #: git-bisect.sh:61
11443 msgid "Do you want me to do it for you [Y/n]? "
11444 msgstr "您想让我为您这样做么[Y/n]? "
11446 #: git-bisect.sh:122
11448 msgid "unrecognised option: '$arg'"
11449 msgstr "未能识别的选项:'$arg'"
11451 #: git-bisect.sh:126
11453 msgid "'$arg' does not appear to be a valid revision"
11454 msgstr "'$arg' 看起来不像是一个有效的版本"
11456 #: git-bisect.sh:155
11457 msgid "Bad HEAD - I need a HEAD"
11458 msgstr "坏的 HEAD - 我需要一个 HEAD"
11460 #: git-bisect.sh:168
11463 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11464 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11466 #: git-bisect.sh:178
11467 msgid "won't bisect on cg-seek'ed tree"
11468 msgstr "不会在做了 cg-seek 的树上做二分查找"
11470 #: git-bisect.sh:182
11471 msgid "Bad HEAD - strange symbolic ref"
11472 msgstr "坏的 HEAD - 奇怪的符号引用"
11474 #: git-bisect.sh:234
11476 msgid "Bad bisect_write argument: $state"
11477 msgstr "坏的 bisect_write 参数:$state"
11479 #: git-bisect.sh:263
11481 msgid "Bad rev input: $arg"
11482 msgstr "输入坏的版本:$arg"
11484 #: git-bisect.sh:278
11485 msgid "Please call 'bisect_state' with at least one argument."
11486 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11488 #: git-bisect.sh:290
11490 msgid "Bad rev input: $rev"
11491 msgstr "输入坏的版本:$rev"
11493 #: git-bisect.sh:299
11495 msgid "'git bisect $TERM_BAD' can take only one argument."
11496 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11498 #: git-bisect.sh:322
11500 msgid "Warning: bisecting only with a $TERM_BAD commit."
11501 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11504 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11505 #. translation. The program will only accept English input
11507 #: git-bisect.sh:328
11508 msgid "Are you sure [Y/n]? "
11509 msgstr "您确认么[Y/n]? "
11511 #: git-bisect.sh:340
11514 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11515 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11517 "您需要给我至少一个好版本和一个坏版本。\n"
11518 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11520 #: git-bisect.sh:343
11523 "You need to start by \"git bisect start\".\n"
11524 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11525 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11527 "您需要执行 \"git bisect start\" 来开始。\n"
11528 "然后需要提供我至少一个好版本和一个坏版本。\n"
11529 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11531 #: git-bisect.sh:414 git-bisect.sh:546
11532 msgid "We are not bisecting."
11533 msgstr "我们没有在二分查找。"
11535 #: git-bisect.sh:421
11537 msgid "'$invalid' is not a valid commit"
11538 msgstr "'$invalid' 不是一个有效的提交"
11540 #: git-bisect.sh:430
11543 "Could not check out original HEAD '$branch'.\n"
11544 "Try 'git bisect reset <commit>'."
11546 "不能检出原始 HEAD '$branch'。\n"
11547 "尝试 'git bisect reset <提交>'。"
11549 #: git-bisect.sh:458
11550 msgid "No logfile given"
11553 #: git-bisect.sh:459
11555 msgid "cannot read $file for replaying"
11556 msgstr "不能读取 $file 来重放"
11558 #: git-bisect.sh:480
11559 msgid "?? what are you talking about?"
11562 #: git-bisect.sh:492
11564 msgid "running $command"
11565 msgstr "运行 $command"
11567 #: git-bisect.sh:499
11570 "bisect run failed:\n"
11571 "exit code $res from '$command' is < 0 or >= 128"
11574 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11576 #: git-bisect.sh:525
11577 msgid "bisect run cannot continue any more"
11578 msgstr "二分查找不能继续运行"
11580 #: git-bisect.sh:531
11583 "bisect run failed:\n"
11584 "'bisect_state $state' exited with error code $res"
11587 "'bisect_state $state' 退出码为 $res"
11589 #: git-bisect.sh:538
11590 msgid "bisect run success"
11593 #: git-bisect.sh:565
11594 msgid "please use two different terms"
11595 msgstr "请使用两个不同的术语"
11597 #: git-bisect.sh:575
11599 msgid "'$term' is not a valid term"
11600 msgstr "'$term' 不是一个有效的名称"
11602 #: git-bisect.sh:578
11604 msgid "can't use the builtin command '$term' as a term"
11605 msgstr "不能使用内置命令 '$term' 作为术语"
11607 #: git-bisect.sh:587 git-bisect.sh:593
11609 msgid "can't change the meaning of term '$term'"
11610 msgstr "不能修改术语 '$term' 的含义"
11612 #: git-bisect.sh:606
11614 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11615 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11617 #: git-bisect.sh:636
11618 msgid "no terms defined"
11621 #: git-bisect.sh:653
11624 "invalid argument $arg for 'git bisect terms'.\n"
11625 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11627 "参数 $arg 对命令 'git bisect terms' 无效。\n"
11628 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11630 #: git-rebase.sh:57
11632 "When you have resolved this problem, run \"git rebase --continue\".\n"
11633 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11634 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11637 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11638 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11639 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11641 #: git-rebase.sh:165
11642 msgid "Applied autostash."
11643 msgstr "成功应用 autostash。"
11645 #: git-rebase.sh:168
11647 msgid "Cannot store $stash_sha1"
11648 msgstr "无法保存 $stash_sha1"
11650 #: git-rebase.sh:169
11652 "Applying autostash resulted in conflicts.\n"
11653 "Your changes are safe in the stash.\n"
11654 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11656 "应用 autostash 导致冲突。\n"
11657 "您的修改安全地保存在 stash 中。\n"
11658 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11660 #: git-rebase.sh:208
11661 msgid "The pre-rebase hook refused to rebase."
11662 msgstr "钩子 pre-rebase 拒绝变基操作。"
11664 #: git-rebase.sh:213
11665 msgid "It looks like git-am is in progress. Cannot rebase."
11666 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11668 #: git-rebase.sh:354
11669 msgid "The --exec option must be used with the --interactive option"
11670 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11672 #: git-rebase.sh:359
11673 msgid "No rebase in progress?"
11674 msgstr "没有正在进行的变基?"
11676 #: git-rebase.sh:370
11677 msgid "The --edit-todo action can only be used during interactive rebase."
11678 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11680 #: git-rebase.sh:377
11681 msgid "Cannot read HEAD"
11684 #: git-rebase.sh:380
11686 "You must edit all merge conflicts and then\n"
11687 "mark them as resolved using git add"
11689 "您必须编辑所有的合并冲突,然后通过 git add\n"
11692 #: git-rebase.sh:398
11694 msgid "Could not move back to $head_name"
11695 msgstr "无法移回 $head_name"
11697 #: git-rebase.sh:417
11700 "It seems that there is already a $state_dir_base directory, and\n"
11701 "I wonder if you are in the middle of another rebase. If that is the\n"
11702 "case, please try\n"
11703 "\t$cmd_live_rebase\n"
11704 "If that is not the case, please\n"
11705 "\t$cmd_clear_stale_rebase\n"
11706 "and run me again. I am stopping in case you still have something\n"
11709 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11711 "\t$cmd_live_rebase\n"
11713 "\t$cmd_clear_stale_rebase\n"
11714 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11716 #: git-rebase.sh:468
11718 msgid "invalid upstream $upstream_name"
11719 msgstr "无效的上游 $upstream_name"
11721 #: git-rebase.sh:492
11723 msgid "$onto_name: there are more than one merge bases"
11724 msgstr "$onto_name: 有一个以上的合并基准"
11726 #: git-rebase.sh:495 git-rebase.sh:499
11728 msgid "$onto_name: there is no merge base"
11729 msgstr "$onto_name: 没有合并基准"
11731 #: git-rebase.sh:504
11733 msgid "Does not point to a valid commit: $onto_name"
11734 msgstr "没有指向一个有效的提交:$onto_name"
11736 #: git-rebase.sh:527
11738 msgid "fatal: no such branch: $branch_name"
11739 msgstr "严重错误:无此分支:$branch_name"
11741 #: git-rebase.sh:560
11742 msgid "Cannot autostash"
11743 msgstr "无法 autostash"
11745 #: git-rebase.sh:565
11747 msgid "Created autostash: $stash_abbrev"
11748 msgstr "创建了 autostash: $stash_abbrev"
11750 #: git-rebase.sh:569
11751 msgid "Please commit or stash them."
11752 msgstr "请提交或为它们保存进度。"
11754 #: git-rebase.sh:589
11756 msgid "Current branch $branch_name is up to date."
11757 msgstr "当前分支 $branch_name 是最新的。"
11759 #: git-rebase.sh:593
11761 msgid "Current branch $branch_name is up to date, rebase forced."
11762 msgstr "当前分支 $branch_name 是最新的,强制变基。"
11764 #: git-rebase.sh:604
11766 msgid "Changes from $mb to $onto:"
11767 msgstr "变更从 $mb 到 $onto:"
11769 #: git-rebase.sh:613
11770 msgid "First, rewinding head to replay your work on top of it..."
11771 msgstr "首先,回退分支以便在上面重放您的工作..."
11773 #: git-rebase.sh:623
11775 msgid "Fast-forwarded $branch_name to $onto_name."
11776 msgstr "快进 $branch_name 至 $onto_name。"
11779 msgid "git stash clear with parameters is unimplemented"
11780 msgstr "git stash clear 不支持参数"
11783 msgid "You do not have the initial commit yet"
11787 msgid "Cannot save the current index state"
11788 msgstr "无法保存当前索引状态"
11790 #: git-stash.sh:124 git-stash.sh:137
11791 msgid "Cannot save the current worktree state"
11792 msgstr "无法保存当前工作区状态"
11794 #: git-stash.sh:141
11795 msgid "No changes selected"
11798 #: git-stash.sh:144
11799 msgid "Cannot remove temporary index (can't happen)"
11800 msgstr "无法删除临时索引(不应发生)"
11802 #: git-stash.sh:157
11803 msgid "Cannot record working tree state"
11806 #: git-stash.sh:189
11808 msgid "Cannot update $ref_stash with $w_commit"
11809 msgstr "无法用 $w_commit 更新 $ref_stash"
11811 #. TRANSLATORS: $option is an invalid option, like
11812 #. `--blah-blah'. The 7 spaces at the beginning of the
11813 #. second line correspond to "error: ". So you should line
11814 #. up the second line with however many characters the
11815 #. translation of "error: " takes in your language. E.g. in
11816 #. English this is:
11818 #. $ git stash save --blah-blah 2>&1 | head -n 2
11819 #. error: unknown option for 'stash save': --blah-blah
11820 #. To provide a message, use git stash save -- '--blah-blah'
11821 #: git-stash.sh:239
11824 "error: unknown option for 'stash save': $option\n"
11825 " To provide a message, use git stash save -- '$option'"
11827 "错误:'stash save' 的未知选项:$option\n"
11828 " 要提供一个描述信息,使用 git stash save -- '$option'"
11830 #: git-stash.sh:260
11831 msgid "No local changes to save"
11832 msgstr "没有要保存的本地修改"
11834 #: git-stash.sh:264
11835 msgid "Cannot initialize stash"
11836 msgstr "无法初始化 stash"
11838 #: git-stash.sh:268
11839 msgid "Cannot save the current status"
11842 #: git-stash.sh:286
11843 msgid "Cannot remove worktree changes"
11846 #: git-stash.sh:405
11848 msgid "unknown option: $opt"
11849 msgstr "未知选项: $opt"
11851 #: git-stash.sh:415
11852 msgid "No stash found."
11853 msgstr "未发现 stash。"
11855 #: git-stash.sh:422
11857 msgid "Too many revisions specified: $REV"
11858 msgstr "指定了太多的版本:$REV"
11860 #: git-stash.sh:428
11862 msgid "$reference is not a valid reference"
11863 msgstr "$reference 不是一个有效的引用"
11865 #: git-stash.sh:456
11867 msgid "'$args' is not a stash-like commit"
11868 msgstr "'$args' 不是 stash 样提交"
11870 #: git-stash.sh:467
11872 msgid "'$args' is not a stash reference"
11873 msgstr "'$args' 不是一个 stash 引用"
11875 #: git-stash.sh:475
11876 msgid "unable to refresh index"
11879 #: git-stash.sh:479
11880 msgid "Cannot apply a stash in the middle of a merge"
11881 msgstr "无法在合并过程中恢复进度"
11883 #: git-stash.sh:487
11884 msgid "Conflicts in index. Try without --index."
11885 msgstr "索引中有冲突。尝试不使用 --index。"
11887 #: git-stash.sh:489
11888 msgid "Could not save index tree"
11891 #: git-stash.sh:523
11892 msgid "Cannot unstage modified files"
11893 msgstr "无法将修改的文件取消暂存"
11895 #: git-stash.sh:538
11896 msgid "Index was not unstashed."
11897 msgstr "索引的进度没有被恢复。"
11899 #: git-stash.sh:561
11901 msgid "Dropped ${REV} ($s)"
11902 msgstr "丢弃了 ${REV} ($s)"
11904 #: git-stash.sh:562
11906 msgid "${REV}: Could not drop stash entry"
11907 msgstr "${REV}:不能丢弃进度条目"
11909 #: git-stash.sh:570
11910 msgid "No branch name specified"
11913 #: git-stash.sh:642
11914 msgid "(To restore them type \"git stash apply\")"
11915 msgstr "(为恢复数据输入 \"git stash apply\")"
11917 #: git-submodule.sh:104
11919 msgid "cannot strip one component off url '$remoteurl'"
11920 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11922 #: git-submodule.sh:281
11923 msgid "Relative path can only be used from the toplevel of the working tree"
11924 msgstr "只能在工作区的顶级目录中使用相对路径"
11926 #: git-submodule.sh:291
11928 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11929 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11931 #: git-submodule.sh:308
11933 msgid "'$sm_path' already exists in the index"
11934 msgstr "'$sm_path' 已经存在于索引中"
11936 #: git-submodule.sh:312
11939 "The following path is ignored by one of your .gitignore files:\n"
11941 "Use -f if you really want to add it."
11943 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11945 "如果您确实想添加它,使用 -f 参数。"
11947 #: git-submodule.sh:330
11949 msgid "Adding existing repo at '$sm_path' to the index"
11950 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11952 #: git-submodule.sh:332
11954 msgid "'$sm_path' already exists and is not a valid git repo"
11955 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11957 #: git-submodule.sh:340
11959 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11960 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11962 #: git-submodule.sh:342
11965 "If you want to reuse this local git directory instead of cloning again from"
11966 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11968 #: git-submodule.sh:344
11971 "use the '--force' option. If the local git directory is not the correct repo"
11972 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11974 #: git-submodule.sh:345
11977 "or you are unsure what this means choose another name with the '--name' "
11979 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11981 #: git-submodule.sh:347
11983 msgid "Reactivating local git directory for submodule '$sm_name'."
11984 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11986 #: git-submodule.sh:359
11988 msgid "Unable to checkout submodule '$sm_path'"
11989 msgstr "不能检出子模组 '$sm_path'"
11991 #: git-submodule.sh:364
11993 msgid "Failed to add submodule '$sm_path'"
11994 msgstr "无法添加子模组 '$sm_path'"
11996 #: git-submodule.sh:373
11998 msgid "Failed to register submodule '$sm_path'"
11999 msgstr "无法注册子模组 '$sm_path'"
12001 #: git-submodule.sh:417
12003 msgid "Entering '$prefix$displaypath'"
12004 msgstr "正在进入 '$prefix$displaypath'"
12006 #: git-submodule.sh:437
12008 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
12009 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
12011 #: git-submodule.sh:483
12013 msgid "No url found for submodule path '$displaypath' in .gitmodules"
12014 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
12016 #: git-submodule.sh:492
12018 msgid "Failed to register url for submodule path '$displaypath'"
12019 msgstr "无法为子模组路径 '$displaypath' 注册 url"
12021 #: git-submodule.sh:494
12023 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
12024 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12026 #: git-submodule.sh:511
12028 msgid "Failed to register update mode for submodule path '$displaypath'"
12029 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
12031 #: git-submodule.sh:549
12033 msgid "Use '.' if you really want to deinitialize all submodules"
12034 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
12036 #: git-submodule.sh:566
12038 msgid "Submodule work tree '$displaypath' contains a .git directory"
12039 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
12041 #: git-submodule.sh:567
12044 "(use 'rm -rf' if you really want to remove it including all of its history)"
12045 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12047 #: git-submodule.sh:573
12050 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
12052 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
12054 #: git-submodule.sh:576
12056 msgid "Cleared directory '$displaypath'"
12057 msgstr "已清除目录 '$displaypath'"
12059 #: git-submodule.sh:577
12061 msgid "Could not remove submodule work tree '$displaypath'"
12062 msgstr "无法移除子模组工作区 '$displaypath'"
12064 #: git-submodule.sh:580
12066 msgid "Could not create empty submodule directory '$displaypath'"
12067 msgstr "不能创建空的子模组目录 '$displaypath'"
12069 #: git-submodule.sh:589
12071 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12072 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12074 #: git-submodule.sh:723
12077 "Submodule path '$displaypath' not initialized\n"
12078 "Maybe you want to use 'update --init'?"
12080 "子模组路径 '$displaypath' 没有初始化\n"
12081 "也许您想用 'update --init'?"
12083 #: git-submodule.sh:736
12085 msgid "Unable to find current revision in submodule path '$displaypath'"
12086 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
12088 #: git-submodule.sh:745
12090 msgid "Unable to fetch in submodule path '$sm_path'"
12091 msgstr "无法在子模组路径 '$sm_path' 中获取"
12093 #: git-submodule.sh:768
12095 msgid "Unable to fetch in submodule path '$displaypath'"
12096 msgstr "无法在子模组路径 '$displaypath' 中获取"
12098 #: git-submodule.sh:788
12100 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12101 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12103 #: git-submodule.sh:789
12105 msgid "Submodule path '$displaypath': checked out '$sha1'"
12106 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12108 #: git-submodule.sh:793
12110 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12111 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12113 #: git-submodule.sh:794
12115 msgid "Submodule path '$displaypath': rebased into '$sha1'"
12116 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12118 #: git-submodule.sh:799
12120 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12121 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12123 #: git-submodule.sh:800
12125 msgid "Submodule path '$displaypath': merged in '$sha1'"
12126 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12128 #: git-submodule.sh:805
12131 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
12132 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
12134 #: git-submodule.sh:806
12136 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
12137 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
12139 #: git-submodule.sh:836
12141 msgid "Failed to recurse into submodule path '$displaypath'"
12142 msgstr "无法递归进子模组路径 '$displaypath'"
12144 #: git-submodule.sh:944
12145 msgid "The --cached option cannot be used with the --files option"
12146 msgstr "选项 --cached 不能和选项 --files 同时使用"
12148 #: git-submodule.sh:996
12150 msgid "unexpected mode $mod_dst"
12151 msgstr "意外的模式 $mod_dst"
12154 #: git-submodule.sh:1016
12156 msgid " Warn: $display_name doesn't contain commit $sha1_src"
12157 msgstr " 警告:$display_name 未包含提交 $sha1_src"
12160 #: git-submodule.sh:1019
12162 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12163 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
12166 #: git-submodule.sh:1022
12168 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12169 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12171 #: git-submodule.sh:1047
12175 #: git-submodule.sh:1165
12177 msgid "Failed to recurse into submodule path '$sm_path'"
12178 msgstr "无法递归进子模组路径 '$sm_path'"
12180 #: git-submodule.sh:1229
12182 msgid "Synchronizing submodule url for '$displaypath'"
12183 msgstr "为 '$displaypath' 同步子模组 url"
12185 #~ msgid "Forward-port local commits to the updated upstream head"
12186 #~ msgstr "本地提交转移至更新后的上游分支中"
12188 #~ msgid "unable to parse format"
12191 #~ msgid "improper format entered align:%s"
12192 #~ msgstr "输入了不正确的格式 align:%s"
12194 #~ msgid "Could not set core.worktree in %s"
12195 #~ msgstr "不能在 %s 中设置 core.worktree"
12197 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
12199 #~ "push.default is unset; its implicit value has changed in\n"
12200 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
12201 #~ "and maintain the traditional behavior, use:\n"
12203 #~ " git config --global push.default matching\n"
12205 #~ "To squelch this message and adopt the new behavior now, use:\n"
12207 #~ " git config --global push.default simple\n"
12209 #~ "When push.default is set to 'matching', git will push local branches\n"
12210 #~ "to the remote branches that already exist with the same name.\n"
12212 #~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
12213 #~ "behavior, which only pushes the current branch to the corresponding\n"
12214 #~ "remote branch that 'git pull' uses to update the current branch.\n"
12216 #~ "See 'git help config' and search for 'push.default' for further "
12217 #~ "information.\n"
12218 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
12219 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
12221 #~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
12222 #~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
12224 #~ " git config --global push.default matching\n"
12226 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
12228 #~ " git config --global push.default simple\n"
12230 #~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
12233 #~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
12234 #~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
12236 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
12237 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
12238 #~ "为保持兼容,请用 'current' 代替 'simple')"
12240 #~ msgid "Could not append '%s'"
12241 #~ msgstr "不能追加 '%s'"
12243 #~ msgid "Could not set '%s'"
12244 #~ msgstr "不能设置 '%s'"
12247 #~ msgid "check|on-demand|no"
12248 #~ msgstr "check|on-demand|no"
12250 #~ msgid "Missing author: %s"
12251 #~ msgstr "缺少作者:%s"
12253 #~ msgid "Testing "
12256 #~ msgid "unable to look up current user in the passwd file: %s"
12257 #~ msgstr "无法在口令文件中查询到当前用户:%s"
12259 #~ msgid "no such user"
12262 #~ msgid "show usage"
12265 #~ msgid "branch '%s' does not point at a commit"
12266 #~ msgstr "分支 '%s' 未指向一个提交"
12268 #~ msgid "object '%s' does not point to a commit"
12269 #~ msgstr "对象 '%s' 没有指向一个提交"
12271 #~ msgid "print only merged branches"
12272 #~ msgstr "只打印合并的分支"
12274 #~ msgid "--dissociate given, but there is no --reference"
12275 #~ msgstr "提供了参数 --dissociate,但未提供 --reference"
12277 #~ msgid "insanely long template name %s"
12278 #~ msgstr "太长的模版名 %s"
12280 #~ msgid "insanely long symlink %s"
12281 #~ msgstr "太长的符号链接 %s"
12283 #~ msgid "insanely long template path %s"
12284 #~ msgstr "太长的模版路径 %s"
12286 #~ msgid "insane git directory %s"
12287 #~ msgstr "不正常的 git 目录 %s"
12289 #~ msgid "unsupported sort specification '%s'"
12290 #~ msgstr "不支持的排序规格 '%s'"
12292 #~ msgid "unsupported sort specification '%s' in variable '%s'"
12293 #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12295 #~ msgid "switch 'points-at' requires an object"
12296 #~ msgstr "开关 'points-at' 需要一个对象"
12298 #~ msgid "sort tags"
12301 #~ msgid "--sort and -n are incompatible"
12302 #~ msgstr "--sort 和 -n 不兼容"
12304 #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12305 #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12307 #~ msgid "false|true|preserve"
12308 #~ msgstr "false|true|preserve"
12310 #~ msgid "BUG: reopen a lockfile that is still open"
12311 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12313 #~ msgid "BUG: reopen a lockfile that has been committed"
12314 #~ msgstr "BUG: 重新打开一个已提交的锁文件"
12316 #~ msgid "option %s does not accept negative form"
12317 #~ msgstr "选项 %s 不接受否定格式"
12319 #~ msgid "unable to parse value '%s' for option %s"
12320 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12322 #~ msgid "-b and -B are mutually exclusive"
12323 #~ msgstr "-b 和 -B 互斥"
12325 #~ msgid "You need to set your committer info first"
12326 #~ msgstr "您需要先设置你的提交者信息"
12329 #~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12330 #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12331 #~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12334 #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12335 #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12336 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12338 #~ msgid "Patch format $patch_format is not supported."
12339 #~ msgstr "不支持 $patch_format 补丁格式。"
12341 #~ msgid "Please make up your mind. --skip or --abort?"
12342 #~ msgstr "请下决心。--skip 或是 --abort ?"
12345 #~ "Patch is empty. Was it split wrong?\n"
12346 #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12347 #~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12349 #~ "补丁为空。是不是切分错误?\n"
12350 #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12351 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12353 #~ msgid "Patch does not have a valid e-mail address."
12354 #~ msgstr "补丁中没有一个有效的邮件地址。"
12356 #~ msgid "Applying: $FIRSTLINE"
12357 #~ msgstr "正应用:$FIRSTLINE"
12359 #~ msgid "Patch failed at $msgnum $FIRSTLINE"
12360 #~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12363 #~ "Pull is not possible because you have unmerged files.\n"
12364 #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12365 #~ "as appropriate to mark resolution and make a commit."
12367 #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12368 #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12370 #~ msgid "Pull is not possible because you have unmerged files."
12371 #~ msgstr "Pull 不可用,因为您尚有未合并的文件。"