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-12 22:05+0800\n"
139 "PO-Revision-Date: 2016-03-16 00:02+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' 没有提供要脱掉的 %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 #: compat/precompose_utf8.c:57 builtin/clone.c:413
2447 msgid "failed to unlink '%s'"
2451 msgid "git add [<options>] [--] <pathspec>..."
2452 msgstr "git add [<选项>] [--] <路径规格>..."
2456 msgid "unexpected diff status %c"
2459 #: builtin/add.c:70 builtin/commit.c:278
2460 msgid "updating files failed"
2465 msgid "remove '%s'\n"
2468 #: builtin/add.c:134
2469 msgid "Unstaged changes after refreshing the index:"
2470 msgstr "刷新索引之后尚未被暂存的变更:"
2472 #: builtin/add.c:194 builtin/rev-parse.c:797
2473 msgid "Could not read the index"
2476 #: builtin/add.c:205
2478 msgid "Could not open '%s' for writing."
2479 msgstr "无法打开 '%s' 进行写入。"
2481 #: builtin/add.c:209
2482 msgid "Could not write patch"
2485 #: builtin/add.c:212
2486 msgid "editing patch failed"
2489 #: builtin/add.c:215
2491 msgid "Could not stat '%s'"
2492 msgstr "不能查看文件状态 '%s'"
2494 #: builtin/add.c:217
2495 msgid "Empty patch. Aborted."
2498 #: builtin/add.c:222
2500 msgid "Could not apply '%s'"
2503 #: builtin/add.c:232
2504 msgid "The following paths are ignored by one of your .gitignore files:\n"
2505 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
2507 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111
2508 #: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511
2509 #: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162
2513 #: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19
2514 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
2515 #: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114
2519 #: builtin/add.c:252
2520 msgid "interactive picking"
2523 #: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286
2524 msgid "select hunks interactively"
2527 #: builtin/add.c:254
2528 msgid "edit current diff and apply"
2531 #: builtin/add.c:255
2532 msgid "allow adding otherwise ignored files"
2535 #: builtin/add.c:256
2536 msgid "update tracked files"
2539 #: builtin/add.c:257
2540 msgid "record only the fact that the path will be added later"
2541 msgstr "只记录,该路径稍后再添加"
2543 #: builtin/add.c:258
2544 msgid "add changes from all tracked and untracked files"
2545 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
2547 #: builtin/add.c:261
2548 msgid "ignore paths removed in the working tree (same as --no-all)"
2549 msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2551 #: builtin/add.c:263
2552 msgid "don't add, only refresh the index"
2555 #: builtin/add.c:264
2556 msgid "just skip files which cannot be added because of errors"
2557 msgstr "跳过因出错不能添加的文件"
2559 #: builtin/add.c:265
2560 msgid "check if - even missing - files are ignored in dry run"
2561 msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
2563 #: builtin/add.c:287
2565 msgid "Use -f if you really want to add them.\n"
2566 msgstr "使用 -f 参数如果您确实要添加它们。\n"
2568 #: builtin/add.c:294
2569 msgid "adding files failed"
2572 #: builtin/add.c:330
2573 msgid "-A and -u are mutually incompatible"
2574 msgstr "-A 和 -u 选项互斥"
2576 #: builtin/add.c:337
2577 msgid "Option --ignore-missing can only be used together with --dry-run"
2578 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
2580 #: builtin/add.c:352
2582 msgid "Nothing specified, nothing added.\n"
2583 msgstr "没有指定文件,也没有文件被添加。\n"
2585 #: builtin/add.c:353
2587 msgid "Maybe you wanted to say 'git add .'?\n"
2588 msgstr "也许您想要执行 'git add .'?\n"
2590 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914
2591 #: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
2592 #: builtin/submodule--helper.c:35
2593 msgid "index file corrupt"
2596 #: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430
2597 msgid "Unable to write new index file"
2600 #: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078
2602 msgid "could not read '%s'"
2606 msgid "could not parse author script"
2611 msgid "'%s' was deleted by the applypatch-msg hook"
2612 msgstr "'%s' 被 applypatch-msg 钩子删除"
2614 #: builtin/am.c:548 builtin/notes.c:300
2616 msgid "Malformed input line: '%s'."
2617 msgstr "非法的输入行:'%s'。"
2619 #: builtin/am.c:585 builtin/notes.c:315
2621 msgid "Failed to copy notes from '%s' to '%s'"
2622 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
2625 msgid "fseek failed"
2628 #: builtin/am.c:772 builtin/am.c:860
2630 msgid "could not open '%s' for reading: %s"
2631 msgstr "无法打开 '%s' 进行读取:%s"
2635 msgid "could not open '%s' for writing: %s"
2636 msgstr "无法打开 '%s' 进行写入:%s"
2640 msgid "could not parse patch '%s'"
2641 msgstr "无法解析补丁 '%s'"
2644 msgid "Only one StGIT patch series can be applied at once"
2645 msgstr "一次只能有一个 StGIT 补丁队列被应用"
2648 msgid "invalid timestamp"
2651 #: builtin/am.c:904 builtin/am.c:912
2652 msgid "invalid Date line"
2656 msgid "invalid timezone offset"
2660 msgid "Patch format detection failed."
2663 #: builtin/am.c:1001 builtin/clone.c:378
2665 msgid "failed to create directory '%s'"
2666 msgstr "无法创建目录 '%s'"
2668 #: builtin/am.c:1005
2669 msgid "Failed to split patches."
2672 #: builtin/am.c:1137 builtin/commit.c:363
2673 msgid "unable to write index file"
2676 #: builtin/am.c:1188
2678 msgid "When you have resolved this problem, run \"%s --continue\"."
2679 msgstr "当您解决这一问题,执行 \"%s --continue\"。"
2681 #: builtin/am.c:1189
2683 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2684 msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
2686 #: builtin/am.c:1190
2688 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2689 msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
2691 #: builtin/am.c:1328
2692 msgid "Patch is empty. Was it split wrong?"
2693 msgstr "补丁为空。是不是切分错误?"
2695 #: builtin/am.c:1402 builtin/log.c:1350
2697 msgid "invalid ident line: %s"
2698 msgstr "包含无效的身份标识:%s"
2700 #: builtin/am.c:1429
2702 msgid "unable to parse commit %s"
2705 #: builtin/am.c:1631
2706 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2707 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
2709 #: builtin/am.c:1633
2710 msgid "Using index info to reconstruct a base tree..."
2711 msgstr "使用索引来重建一个(三方合并的)基础目录树..."
2713 #: builtin/am.c:1652
2715 "Did you hand edit your patch?\n"
2716 "It does not apply to blobs recorded in its index."
2721 #: builtin/am.c:1658
2722 msgid "Falling back to patching base and 3-way merge..."
2723 msgstr "回落到基础版本上打补丁及进行三方合并..."
2725 #: builtin/am.c:1673
2726 msgid "Failed to merge in the changes."
2729 #: builtin/am.c:1697 builtin/merge.c:633
2730 msgid "git write-tree failed to write a tree"
2731 msgstr "git write-tree 无法写入一树对象"
2733 #: builtin/am.c:1704
2734 msgid "applying to an empty history"
2737 #: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830
2738 #: builtin/merge.c:855
2739 msgid "failed to write commit object"
2742 #: builtin/am.c:1749 builtin/am.c:1753
2744 msgid "cannot resume: %s does not exist."
2745 msgstr "无法继续:%s 不存在。"
2747 #: builtin/am.c:1769
2748 msgid "cannot be interactive without stdin connected to a terminal."
2749 msgstr "标准输入没有和终端关联,不能进行交互式操作。"
2751 #: builtin/am.c:1774
2752 msgid "Commit Body is:"
2756 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2757 #. in your translation. The program will only accept English
2758 #. input at this point.
2760 #: builtin/am.c:1784
2761 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2762 msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
2764 #: builtin/am.c:1834
2766 msgid "Dirty index: cannot apply patches (dirty: %s)"
2767 msgstr "脏索引:不能应用补丁(脏文件:%s)"
2769 #: builtin/am.c:1869 builtin/am.c:1941
2771 msgid "Applying: %.*s"
2774 #: builtin/am.c:1885
2775 msgid "No changes -- Patch already applied."
2776 msgstr "没有变更 —— 补丁已经应用过。"
2778 #: builtin/am.c:1893
2780 msgid "Patch failed at %s %.*s"
2781 msgstr "打补丁失败于 %s %.*s"
2783 #: builtin/am.c:1899
2785 msgid "The copy of the patch that failed is found in: %s"
2786 msgstr "失败的补丁文件副本位于:%s"
2788 #: builtin/am.c:1944
2790 "No changes - did you forget to use 'git add'?\n"
2791 "If there is nothing left to stage, chances are that something else\n"
2792 "already introduced the same changes; you might want to skip this patch."
2794 "没有变更 —— 您是不是忘了执行 'git add'?\n"
2795 "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
2798 #: builtin/am.c:1951
2800 "You still have unmerged paths in your index.\n"
2801 "Did you forget to use 'git add'?"
2804 "您是否忘了执行 'git add'?"
2806 #: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308
2807 #: builtin/reset.c:316
2809 msgid "Could not parse object '%s'."
2810 msgstr "不能解析对象 '%s'。"
2812 #: builtin/am.c:2111
2813 msgid "failed to clean index"
2816 #: builtin/am.c:2145
2818 "You seem to have moved HEAD since the last 'am' failure.\n"
2819 "Not rewinding to ORIG_HEAD"
2820 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2822 #: builtin/am.c:2206
2824 msgid "Invalid value for --patch-format: %s"
2825 msgstr "无效的 --patch-format 值:%s"
2827 #: builtin/am.c:2239
2828 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"
2829 msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"
2831 #: builtin/am.c:2240
2832 msgid "git am [<options>] (--continue | --skip | --abort)"
2833 msgstr "git am [<选项>] (--continue | --skip | --abort)"
2835 #: builtin/am.c:2246
2836 msgid "run interactively"
2839 #: builtin/am.c:2248
2840 msgid "historical option -- no-op"
2841 msgstr "老的参数 —— 无作用"
2843 #: builtin/am.c:2250
2844 msgid "allow fall back on 3way merging if needed"
2845 msgstr "如果必要,允许使用三方合并。"
2847 #: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57
2848 #: builtin/repack.c:171
2852 #: builtin/am.c:2253
2853 msgid "add a Signed-off-by line to the commit message"
2854 msgstr "在提交说明中添加一个 Signed-off-by 签名"
2856 #: builtin/am.c:2256
2857 msgid "recode into utf8 (default)"
2858 msgstr "使用 utf8 字符集(默认)"
2860 #: builtin/am.c:2258
2861 msgid "pass -k flag to git-mailinfo"
2862 msgstr "向 git-mailinfo 传递 -k 参数"
2864 #: builtin/am.c:2260
2865 msgid "pass -b flag to git-mailinfo"
2866 msgstr "向 git-mailinfo 传递 -b 参数"
2868 #: builtin/am.c:2262
2869 msgid "pass -m flag to git-mailinfo"
2870 msgstr "向 git-mailinfo 传递 -m 参数"
2872 #: builtin/am.c:2264
2873 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2874 msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
2876 #: builtin/am.c:2267
2877 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2878 msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
2880 #: builtin/am.c:2270
2881 msgid "strip everything before a scissors line"
2882 msgstr "丢弃裁切线前的所有内容"
2884 #: builtin/am.c:2271 builtin/apply.c:4544
2888 #: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281
2889 #: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293
2890 #: builtin/am.c:2299
2891 msgid "pass it through git-apply"
2892 msgstr "传递给 git-apply"
2894 #: builtin/am.c:2280 builtin/apply.c:4568
2898 #: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506
2899 #: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95
2900 #: builtin/pull.c:171 builtin/submodule--helper.c:72
2901 #: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163
2905 #: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669
2906 #: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131
2907 #: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182
2908 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340
2909 #: parse-options.h:132 parse-options.h:134 parse-options.h:244
2913 #: builtin/am.c:2292 builtin/apply.c:4512
2917 #: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438
2918 #: builtin/tag.c:372
2922 #: builtin/am.c:2296
2923 msgid "format the patch(es) are in"
2926 #: builtin/am.c:2302
2927 msgid "override error message when patch failure occurs"
2928 msgstr "打补丁失败时显示的错误信息"
2930 #: builtin/am.c:2304
2931 msgid "continue applying patches after resolving a conflict"
2932 msgstr "冲突解决后继续应用补丁"
2934 #: builtin/am.c:2307
2935 msgid "synonyms for --continue"
2936 msgstr "和 --continue 同义"
2938 #: builtin/am.c:2310
2939 msgid "skip the current patch"
2942 #: builtin/am.c:2313
2943 msgid "restore the original branch and abort the patching operation."
2944 msgstr "恢复原始分支并终止打补丁操作。"
2946 #: builtin/am.c:2317
2947 msgid "lie about committer date"
2948 msgstr "将作者日期作为提交日期"
2950 #: builtin/am.c:2319
2951 msgid "use current timestamp for author date"
2952 msgstr "用当前时间作为作者日期"
2954 #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
2955 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
2959 #: builtin/am.c:2322
2960 msgid "GPG-sign commits"
2961 msgstr "使用 GPG 签名提交"
2963 #: builtin/am.c:2325
2964 msgid "(internal use for git-rebase)"
2965 msgstr "(内部使用,用于 git-rebase)"
2967 #: builtin/am.c:2340
2969 "The -b/--binary option has been a no-op for long time, and\n"
2970 "it will be removed. Please do not use it anymore."
2972 "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
2975 #: builtin/am.c:2347
2976 msgid "failed to read the index"
2979 #: builtin/am.c:2362
2981 msgid "previous rebase directory %s still exists but mbox given."
2982 msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
2984 #: builtin/am.c:2386
2987 "Stray %s directory found.\n"
2988 "Use \"git am --abort\" to remove it."
2991 "使用 \"git am --abort\" 删除它。"
2993 #: builtin/am.c:2392
2994 msgid "Resolve operation not in progress, we are not resuming."
2995 msgstr "解决操作未进行,我们不会继续。"
2997 #: builtin/apply.c:59
2998 msgid "git apply [<options>] [<patch>...]"
2999 msgstr "git apply [<选项>] [<补丁>...]"
3001 #: builtin/apply.c:111
3003 msgid "unrecognized whitespace option '%s'"
3004 msgstr "未能识别的空白字符选项 '%s'"
3006 #: builtin/apply.c:126
3008 msgid "unrecognized whitespace ignore option '%s'"
3009 msgstr "未能识别的空白字符忽略选项 '%s'"
3011 #: builtin/apply.c:818
3013 msgid "Cannot prepare timestamp regexp %s"
3014 msgstr "无法准备时间戳正则表达式 %s"
3016 #: builtin/apply.c:827
3018 msgid "regexec returned %d for input: %s"
3019 msgstr "regexec 返回 %d,输入为:%s"
3021 #: builtin/apply.c:908
3023 msgid "unable to find filename in patch at line %d"
3024 msgstr "不能在补丁的第 %d 行找到文件名"
3026 #: builtin/apply.c:940
3028 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
3029 msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
3031 #: builtin/apply.c:944
3033 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
3034 msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
3036 #: builtin/apply.c:945
3038 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
3039 msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
3041 #: builtin/apply.c:952
3043 msgid "git apply: bad git-diff - expected /dev/null on line %d"
3044 msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
3046 #: builtin/apply.c:1415
3048 msgid "recount: unexpected line: %.*s"
3049 msgstr "recount:意外的行:%.*s"
3051 #: builtin/apply.c:1472
3053 msgid "patch fragment without header at line %d: %.*s"
3054 msgstr "第 %d 行的补丁片段没有头信息:%.*s"
3056 #: builtin/apply.c:1489
3059 "git diff header lacks filename information when removing %d leading pathname "
3060 "component (line %d)"
3062 "git diff header lacks filename information when removing %d leading pathname "
3063 "components (line %d)"
3064 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3065 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
3067 #: builtin/apply.c:1655
3068 msgid "new file depends on old contents"
3071 #: builtin/apply.c:1657
3072 msgid "deleted file still has contents"
3075 #: builtin/apply.c:1683
3077 msgid "corrupt patch at line %d"
3078 msgstr "补丁在第 %d 行损坏"
3080 #: builtin/apply.c:1719
3082 msgid "new file %s depends on old contents"
3083 msgstr "新文件 %s 依赖旧内容"
3085 #: builtin/apply.c:1721
3087 msgid "deleted file %s still has contents"
3088 msgstr "删除的文件 %s 仍有内容"
3090 #: builtin/apply.c:1724
3092 msgid "** warning: file %s becomes empty but is not deleted"
3093 msgstr "** 警告:文件 %s 成为空文件但并未删除"
3095 #: builtin/apply.c:1870
3097 msgid "corrupt binary patch at line %d: %.*s"
3098 msgstr "二进制补丁在第 %d 行损坏:%.*s"
3100 #: builtin/apply.c:1899
3102 msgid "unrecognized binary patch at line %d"
3103 msgstr "未能识别的二进制补丁位于第 %d 行"
3105 #: builtin/apply.c:2050
3107 msgid "patch with only garbage at line %d"
3108 msgstr "补丁文件的第 %d 行只有垃圾数据"
3110 #: builtin/apply.c:2140
3112 msgid "unable to read symlink %s"
3113 msgstr "无法读取符号链接 %s"
3115 #: builtin/apply.c:2144
3117 msgid "unable to open or read %s"
3120 #: builtin/apply.c:2777
3122 msgid "invalid start of line: '%c'"
3123 msgstr "无效的行首字符:'%c'"
3125 #: builtin/apply.c:2896
3127 msgid "Hunk #%d succeeded at %d (offset %d line)."
3128 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
3129 msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
3130 msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
3132 #: builtin/apply.c:2908
3134 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
3135 msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
3137 #: builtin/apply.c:2914
3140 "while searching for:\n"
3146 #: builtin/apply.c:2934
3148 msgid "missing binary patch data for '%s'"
3149 msgstr "缺失 '%s' 的二进制补丁数据"
3151 #: builtin/apply.c:3035
3153 msgid "binary patch does not apply to '%s'"
3154 msgstr "二进制补丁未应用到 '%s'"
3156 #: builtin/apply.c:3041
3158 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
3159 msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
3161 #: builtin/apply.c:3062
3163 msgid "patch failed: %s:%ld"
3164 msgstr "打补丁失败:%s:%ld"
3166 #: builtin/apply.c:3186
3168 msgid "cannot checkout %s"
3171 #: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287
3173 msgid "read of %s failed"
3176 #: builtin/apply.c:3239
3178 msgid "reading from '%s' beyond a symbolic link"
3179 msgstr "读取位于符号链接中的 '%s'"
3181 #: builtin/apply.c:3267 builtin/apply.c:3489
3183 msgid "path %s has been renamed/deleted"
3184 msgstr "路径 %s 已经被重命名/删除"
3186 #: builtin/apply.c:3348 builtin/apply.c:3503
3188 msgid "%s: does not exist in index"
3191 #: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517
3196 #: builtin/apply.c:3357 builtin/apply.c:3511
3198 msgid "%s: does not match index"
3201 #: builtin/apply.c:3459
3202 msgid "removal patch leaves file contents"
3203 msgstr "移除补丁仍留下了文件内容"
3205 #: builtin/apply.c:3528
3207 msgid "%s: wrong type"
3210 #: builtin/apply.c:3530
3212 msgid "%s has type %o, expected %o"
3213 msgstr "%s 的类型是 %o,应为 %o"
3215 #: builtin/apply.c:3689 builtin/apply.c:3691
3217 msgid "invalid path '%s'"
3220 #: builtin/apply.c:3746
3222 msgid "%s: already exists in index"
3223 msgstr "%s:已经存在于索引中"
3225 #: builtin/apply.c:3749
3227 msgid "%s: already exists in working directory"
3228 msgstr "%s:已经存在于工作区中"
3230 #: builtin/apply.c:3769
3232 msgid "new mode (%o) of %s does not match old mode (%o)"
3233 msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
3235 #: builtin/apply.c:3774
3237 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
3238 msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
3240 #: builtin/apply.c:3794
3242 msgid "affected file '%s' is beyond a symbolic link"
3243 msgstr "受影响的文件 '%s' 位于符号链接中"
3245 #: builtin/apply.c:3798
3247 msgid "%s: patch does not apply"
3250 #: builtin/apply.c:3812
3252 msgid "Checking patch %s..."
3255 #: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135
3257 msgid "make_cache_entry failed for path '%s'"
3258 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
3260 #: builtin/apply.c:4048
3262 msgid "unable to remove %s from index"
3263 msgstr "不能从索引中移除 %s"
3265 #: builtin/apply.c:4077
3267 msgid "corrupt patch for submodule %s"
3268 msgstr "子模组 %s 损坏的补丁"
3270 #: builtin/apply.c:4081
3272 msgid "unable to stat newly created file '%s'"
3273 msgstr "不能枚举新建文件 '%s' 的状态"
3275 #: builtin/apply.c:4086
3277 msgid "unable to create backing store for newly created file %s"
3278 msgstr "不能为新建文件 %s 创建后端存储"
3280 #: builtin/apply.c:4089 builtin/apply.c:4197
3282 msgid "unable to add cache entry for %s"
3283 msgstr "无法为 %s 添加缓存条目"
3285 #: builtin/apply.c:4122
3287 msgid "closing file '%s'"
3290 #: builtin/apply.c:4171
3292 msgid "unable to write file '%s' mode %o"
3293 msgstr "不能写文件 '%s' 权限 %o"
3295 #: builtin/apply.c:4258
3297 msgid "Applied patch %s cleanly."
3300 #: builtin/apply.c:4266
3301 msgid "internal error"
3304 #: builtin/apply.c:4269
3306 msgid "Applying patch %%s with %d reject..."
3307 msgid_plural "Applying patch %%s with %d rejects..."
3308 msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3309 msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
3311 #: builtin/apply.c:4279
3313 msgid "truncating .rej filename to %.*s.rej"
3314 msgstr "截短 .rej 文件名为 %.*s.rej"
3316 #: builtin/apply.c:4300
3318 msgid "Hunk #%d applied cleanly."
3319 msgstr "第 #%d 个片段成功应用。"
3321 #: builtin/apply.c:4303
3323 msgid "Rejected hunk #%d."
3324 msgstr "拒绝第 #%d 个片段。"
3326 #: builtin/apply.c:4393
3327 msgid "unrecognized input"
3330 #: builtin/apply.c:4404
3331 msgid "unable to read index file"
3334 #: builtin/apply.c:4507
3335 msgid "don't apply changes matching the given path"
3336 msgstr "不要应用与给出路径向匹配的变更"
3338 #: builtin/apply.c:4510
3339 msgid "apply changes matching the given path"
3340 msgstr "应用与给出路径向匹配的变更"
3342 #: builtin/apply.c:4513
3343 msgid "remove <num> leading slashes from traditional diff paths"
3344 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
3346 #: builtin/apply.c:4516
3347 msgid "ignore additions made by the patch"
3348 msgstr "忽略补丁中的添加的文件"
3350 #: builtin/apply.c:4518
3351 msgid "instead of applying the patch, output diffstat for the input"
3352 msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
3354 #: builtin/apply.c:4522
3355 msgid "show number of added and deleted lines in decimal notation"
3356 msgstr "以十进制数显示添加和删除的行数"
3358 #: builtin/apply.c:4524
3359 msgid "instead of applying the patch, output a summary for the input"
3360 msgstr "不应用补丁,而是显示输入的概要"
3362 #: builtin/apply.c:4526
3363 msgid "instead of applying the patch, see if the patch is applicable"
3364 msgstr "不应用补丁,而是查看补丁是否可应用"
3366 #: builtin/apply.c:4528
3367 msgid "make sure the patch is applicable to the current index"
3368 msgstr "确认补丁可以应用到当前索引"
3370 #: builtin/apply.c:4530
3371 msgid "apply a patch without touching the working tree"
3372 msgstr "应用补丁而不修改工作区"
3374 #: builtin/apply.c:4532
3375 msgid "accept a patch that touches outside the working area"
3376 msgstr "接受修改工作区之外文件的补丁"
3378 #: builtin/apply.c:4534
3379 msgid "also apply the patch (use with --stat/--summary/--check)"
3380 msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
3382 #: builtin/apply.c:4536
3383 msgid "attempt three-way merge if a patch does not apply"
3384 msgstr "如果一个补丁不能应用则尝试三方合并"
3386 #: builtin/apply.c:4538
3387 msgid "build a temporary index based on embedded index information"
3388 msgstr "创建一个临时索引基于嵌入的索引信息"
3390 #: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425
3391 msgid "paths are separated with NUL character"
3392 msgstr "路径以 NUL 字符分隔"
3394 #: builtin/apply.c:4543
3395 msgid "ensure at least <n> lines of context match"
3396 msgstr "确保至少匹配 <n> 行上下文"
3398 #: builtin/apply.c:4545
3399 msgid "detect new or modified lines that have whitespace errors"
3400 msgstr "检查新增和修改的行中间的空白字符滥用"
3402 #: builtin/apply.c:4548 builtin/apply.c:4551
3403 msgid "ignore changes in whitespace when finding context"
3404 msgstr "查找上下文时忽略空白字符的变更"
3406 #: builtin/apply.c:4554
3407 msgid "apply the patch in reverse"
3410 #: builtin/apply.c:4556
3411 msgid "don't expect at least one line of context"
3414 #: builtin/apply.c:4558
3415 msgid "leave the rejected hunks in corresponding *.rej files"
3416 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
3418 #: builtin/apply.c:4560
3419 msgid "allow overlapping hunks"
3422 #: builtin/apply.c:4563
3423 msgid "tolerate incorrectly detected missing new-line at the end of file"
3424 msgstr "允许不正确的文件末尾换行符"
3426 #: builtin/apply.c:4566
3427 msgid "do not trust the line counts in the hunk headers"
3428 msgstr "不信任补丁片段的头信息中的行号"
3430 #: builtin/apply.c:4569
3431 msgid "prepend <root> to all filenames"
3432 msgstr "为所有文件名前添加 <根目录>"
3434 #: builtin/apply.c:4591
3435 msgid "--3way outside a repository"
3436 msgstr "--3way 在一个仓库之外"
3438 #: builtin/apply.c:4599
3439 msgid "--index outside a repository"
3440 msgstr "--index 在一个仓库之外"
3442 #: builtin/apply.c:4602
3443 msgid "--cached outside a repository"
3444 msgstr "--cached 在一个仓库之外"
3446 #: builtin/apply.c:4621
3448 msgid "can't open patch '%s'"
3449 msgstr "不能打开补丁 '%s'"
3451 #: builtin/apply.c:4635
3453 msgid "squelched %d whitespace error"
3454 msgid_plural "squelched %d whitespace errors"
3455 msgstr[0] "抑制下仍有 %d 个空白字符误用"
3456 msgstr[1] "抑制下仍有 %d 个空白字符误用"
3458 #: builtin/apply.c:4641 builtin/apply.c:4651
3460 msgid "%d line adds whitespace errors."
3461 msgid_plural "%d lines add whitespace errors."
3462 msgstr[0] "%d 行有空白字符误用。"
3463 msgstr[1] "%d 行有空白字符误用。"
3465 #: builtin/archive.c:17
3467 msgid "could not create archive file '%s'"
3468 msgstr "不能创建归档文件 '%s'"
3470 #: builtin/archive.c:20
3471 msgid "could not redirect output"
3474 #: builtin/archive.c:37
3475 msgid "git archive: Remote with no URL"
3476 msgstr "git archive:未提供远程 URL"
3478 #: builtin/archive.c:58
3479 msgid "git archive: expected ACK/NAK, got EOF"
3480 msgstr "git archive:应为 ACK/NACK,却得到 EOF"
3482 #: builtin/archive.c:61
3484 msgid "git archive: NACK %s"
3485 msgstr "git archive:NACK %s"
3487 #: builtin/archive.c:63
3489 msgid "remote error: %s"
3492 #: builtin/archive.c:64
3493 msgid "git archive: protocol error"
3494 msgstr "git archive:协议错误"
3496 #: builtin/archive.c:68
3497 msgid "git archive: expected a flush"
3498 msgstr "git archive:应为刷新"
3500 #: builtin/bisect--helper.c:7
3501 msgid "git bisect--helper --next-all [--no-checkout]"
3502 msgstr "git bisect--helper --next-all [--no-checkout]"
3504 #: builtin/bisect--helper.c:17
3505 msgid "perform 'git bisect next'"
3506 msgstr "执行 'git bisect next'"
3508 #: builtin/bisect--helper.c:19
3509 msgid "update BISECT_HEAD instead of checking out the current commit"
3510 msgstr "更新 BISECT_HEAD 而非检出当前提交"
3512 #: builtin/blame.c:33
3513 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3514 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3516 #: builtin/blame.c:38
3517 msgid "<rev-opts> are documented in git-rev-list(1)"
3518 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
3520 #: builtin/blame.c:1782
3521 msgid "Blaming lines"
3524 #: builtin/blame.c:2530
3525 msgid "Show blame entries as we find them, incrementally"
3526 msgstr "增量式地显示发现的 blame 条目"
3528 #: builtin/blame.c:2531
3529 msgid "Show blank SHA-1 for boundary commits (Default: off)"
3530 msgstr "边界提交显示空的 SHA-1(默认:关闭)"
3532 #: builtin/blame.c:2532
3533 msgid "Do not treat root commits as boundaries (Default: off)"
3534 msgstr "不把根提交作为边界(默认:关闭)"
3536 #: builtin/blame.c:2533
3537 msgid "Show work cost statistics"
3540 #: builtin/blame.c:2534
3541 msgid "Force progress reporting"
3544 #: builtin/blame.c:2535
3545 msgid "Show output score for blame entries"
3546 msgstr "显示判断 blame 条目位移的得分诊断信息"
3548 #: builtin/blame.c:2536
3549 msgid "Show original filename (Default: auto)"
3550 msgstr "显示原始文件名(默认:自动)"
3552 #: builtin/blame.c:2537
3553 msgid "Show original linenumber (Default: off)"
3554 msgstr "显示原始的行号(默认:关闭)"
3556 #: builtin/blame.c:2538
3557 msgid "Show in a format designed for machine consumption"
3558 msgstr "显示为一个适合机器读取的格式"
3560 #: builtin/blame.c:2539
3561 msgid "Show porcelain format with per-line commit information"
3562 msgstr "为每一行显示机器适用的提交信息"
3564 #: builtin/blame.c:2540
3565 msgid "Use the same output mode as git-annotate (Default: off)"
3566 msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
3568 #: builtin/blame.c:2541
3569 msgid "Show raw timestamp (Default: off)"
3570 msgstr "显示原始时间戳(默认:关闭)"
3572 #: builtin/blame.c:2542
3573 msgid "Show long commit SHA1 (Default: off)"
3574 msgstr "显示长的 SHA1 提交号(默认:关闭)"
3576 #: builtin/blame.c:2543
3577 msgid "Suppress author name and timestamp (Default: off)"
3578 msgstr "隐藏作者名字和时间戳(默认:关闭)"
3580 #: builtin/blame.c:2544
3581 msgid "Show author email instead of name (Default: off)"
3582 msgstr "显示作者的邮箱而不是名字(默认:关闭)"
3584 #: builtin/blame.c:2545
3585 msgid "Ignore whitespace differences"
3588 #: builtin/blame.c:2546
3589 msgid "Spend extra cycles to find better match"
3590 msgstr "花费额外的循环来找到更好的匹配"
3592 #: builtin/blame.c:2547
3593 msgid "Use revisions from <file> instead of calling git-rev-list"
3594 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
3596 #: builtin/blame.c:2548
3597 msgid "Use <file>'s contents as the final image"
3598 msgstr "使用 <文件> 的内容作为最终的图片"
3600 #: builtin/blame.c:2549 builtin/blame.c:2550
3604 #: builtin/blame.c:2549
3605 msgid "Find line copies within and across files"
3606 msgstr "找到文件内及跨文件的行拷贝"
3608 #: builtin/blame.c:2550
3609 msgid "Find line movements within and across files"
3610 msgstr "找到文件内及跨文件的行移动"
3612 #: builtin/blame.c:2551
3616 #: builtin/blame.c:2551
3617 msgid "Process only line range n,m, counting from 1"
3618 msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
3620 #. TRANSLATORS: This string is used to tell us the maximum
3621 #. display width for a relative timestamp in "git blame"
3622 #. output. For C locale, "4 years, 11 months ago", which
3623 #. takes 22 places, is the longest among various forms of
3624 #. relative timestamps, but your language may need more or
3625 #. fewer display columns.
3626 #: builtin/blame.c:2640
3627 msgid "4 years, 11 months ago"
3630 #: builtin/branch.c:25
3631 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
3632 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
3634 #: builtin/branch.c:26
3635 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
3636 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
3638 #: builtin/branch.c:27
3639 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3640 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
3642 #: builtin/branch.c:28
3643 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3644 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
3646 #: builtin/branch.c:29
3647 msgid "git branch [<options>] [-r | -a] [--points-at]"
3648 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
3650 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3651 #: builtin/branch.c:142
3654 "deleting branch '%s' that has been merged to\n"
3655 " '%s', but not yet merged to HEAD."
3657 "将要删除的分支 '%s' 已经被合并到\n"
3660 # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
3661 #: builtin/branch.c:146
3664 "not deleting branch '%s' that is not yet merged to\n"
3665 " '%s', even though it is merged to HEAD."
3667 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
3668 " 然而却尚未被合并到分支 '%s' 。"
3670 #: builtin/branch.c:160
3672 msgid "Couldn't look up commit object for '%s'"
3673 msgstr "无法查询 '%s' 指向的提交对象"
3675 #: builtin/branch.c:164
3678 "The branch '%s' is not fully merged.\n"
3679 "If you are sure you want to delete it, run 'git branch -D %s'."
3682 "如果您确认要删除它,执行 'git branch -D %s'。"
3684 #: builtin/branch.c:177
3685 msgid "Update of config-file failed"
3686 msgstr "无法更新 config 文件"
3688 #: builtin/branch.c:205
3689 msgid "cannot use -a with -d"
3690 msgstr "不能将 -a 和 -d 同时使用"
3692 #: builtin/branch.c:211
3693 msgid "Couldn't look up commit object for HEAD"
3694 msgstr "无法查询 HEAD 指向的提交对象"
3696 #: builtin/branch.c:219
3698 msgid "Cannot delete the branch '%s' which you are currently on."
3699 msgstr "无法删除您当前所在的分支 '%s'。"
3701 #: builtin/branch.c:235
3703 msgid "remote-tracking branch '%s' not found."
3704 msgstr "未能找到远程跟踪分支 '%s'。"
3706 #: builtin/branch.c:236
3708 msgid "branch '%s' not found."
3709 msgstr "分支 '%s' 未发现。"
3711 #: builtin/branch.c:251
3713 msgid "Error deleting remote-tracking branch '%s'"
3714 msgstr "无法删除远程跟踪分支 '%s'"
3716 #: builtin/branch.c:252
3718 msgid "Error deleting branch '%s'"
3719 msgstr "无法删除分支 '%s'"
3721 #: builtin/branch.c:259
3723 msgid "Deleted remote-tracking branch %s (was %s).\n"
3724 msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
3726 #: builtin/branch.c:260
3728 msgid "Deleted branch %s (was %s).\n"
3729 msgstr "已删除分支 %s(曾为 %s)。\n"
3731 #: builtin/branch.c:303
3736 #: builtin/branch.c:308
3741 #: builtin/branch.c:313
3743 msgid "[%s: behind %d]"
3746 #: builtin/branch.c:315
3751 #: builtin/branch.c:319
3753 msgid "[%s: ahead %d]"
3756 #: builtin/branch.c:321
3761 #: builtin/branch.c:324
3763 msgid "[%s: ahead %d, behind %d]"
3764 msgstr "[%s:领先 %d,落后 %d]"
3766 #: builtin/branch.c:327
3768 msgid "[ahead %d, behind %d]"
3769 msgstr "[领先 %d,落后 %d]"
3771 #: builtin/branch.c:340
3772 msgid " **** invalid ref ****"
3773 msgstr " **** 无效引用 ****"
3775 #: builtin/branch.c:366
3777 msgid "(no branch, rebasing %s)"
3778 msgstr "(非分支,正变基 %s)"
3780 #: builtin/branch.c:369
3782 msgid "(no branch, bisect started on %s)"
3783 msgstr "(非分支,二分查找开始于 %s)"
3785 #: builtin/branch.c:375
3787 msgid "(HEAD detached at %s)"
3788 msgstr "(头指针分离于 %s)"
3790 #: builtin/branch.c:378
3792 msgid "(HEAD detached from %s)"
3793 msgstr "(头指针分离自 %s)"
3795 #: builtin/branch.c:382
3799 #: builtin/branch.c:524
3800 msgid "cannot rename the current branch while not on any."
3801 msgstr "无法重命名当前分支因为不处于任何分支上。"
3803 #: builtin/branch.c:534
3805 msgid "Invalid branch name: '%s'"
3806 msgstr "无效的分支名:'%s'"
3808 #: builtin/branch.c:549
3809 msgid "Branch rename failed"
3812 #: builtin/branch.c:553
3814 msgid "Renamed a misnamed branch '%s' away"
3815 msgstr "重命名掉一个错误命名的旧分支 '%s'"
3817 #: builtin/branch.c:557
3819 msgid "Branch renamed to %s, but HEAD is not updated!"
3820 msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3822 #: builtin/branch.c:564
3823 msgid "Branch is renamed, but update of config-file failed"
3824 msgstr "分支被重命名,但更新 config 文件失败"
3826 #: builtin/branch.c:586
3828 msgid "could not write branch description template: %s"
3829 msgstr "不能写分支描述模版:%s"
3831 #: builtin/branch.c:615
3832 msgid "Generic options"
3835 #: builtin/branch.c:617
3836 msgid "show hash and subject, give twice for upstream branch"
3837 msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
3839 #: builtin/branch.c:618
3840 msgid "suppress informational messages"
3843 #: builtin/branch.c:619
3844 msgid "set up tracking mode (see git-pull(1))"
3845 msgstr "设置跟踪模式(参见 git-pull(1))"
3847 #: builtin/branch.c:621
3848 msgid "change upstream info"
3851 #: builtin/branch.c:625
3852 msgid "use colored output"
3855 #: builtin/branch.c:626
3856 msgid "act on remote-tracking branches"
3859 #: builtin/branch.c:628 builtin/branch.c:629
3860 msgid "print only branches that contain the commit"
3861 msgstr "只打印包含该提交的分支"
3863 #: builtin/branch.c:632
3864 msgid "Specific git-branch actions:"
3865 msgstr "具体的 git-branch 动作:"
3867 #: builtin/branch.c:633
3868 msgid "list both remote-tracking and local branches"
3869 msgstr "列出远程跟踪及本地分支"
3871 #: builtin/branch.c:635
3872 msgid "delete fully merged branch"
3875 #: builtin/branch.c:636
3876 msgid "delete branch (even if not merged)"
3877 msgstr "删除分支(即使没有合并)"
3879 #: builtin/branch.c:637
3880 msgid "move/rename a branch and its reflog"
3881 msgstr "移动/重命名一个分支,以及它的引用日志"
3883 #: builtin/branch.c:638
3884 msgid "move/rename a branch, even if target exists"
3885 msgstr "移动/重命名一个分支,即使目标已存在"
3887 #: builtin/branch.c:639
3888 msgid "list branch names"
3891 #: builtin/branch.c:640
3892 msgid "create the branch's reflog"
3895 #: builtin/branch.c:642
3896 msgid "edit the description for the branch"
3899 #: builtin/branch.c:643
3900 msgid "force creation, move/rename, deletion"
3901 msgstr "强制创建、移动/重命名、删除"
3903 #: builtin/branch.c:644
3904 msgid "print only branches that are merged"
3907 #: builtin/branch.c:645
3908 msgid "print only branches that are not merged"
3911 #: builtin/branch.c:646
3912 msgid "list branches in columns"
3915 #: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366
3919 #: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367
3920 msgid "field name to sort on"
3923 #: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401
3924 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567
3925 #: builtin/tag.c:369
3929 #: builtin/branch.c:651
3930 msgid "print only branches of the object"
3931 msgstr "只打印指向该对象的分支"
3933 #: builtin/branch.c:669
3934 msgid "Failed to resolve HEAD as a valid ref."
3935 msgstr "无法将 HEAD 解析为有效引用。"
3937 #: builtin/branch.c:673 builtin/clone.c:705
3938 msgid "HEAD not found below refs/heads!"
3939 msgstr "HEAD 没有位于 /refs/heads 之下!"
3941 #: builtin/branch.c:693
3942 msgid "--column and --verbose are incompatible"
3943 msgstr "--column 和 --verbose 不兼容"
3945 #: builtin/branch.c:704 builtin/branch.c:746
3946 msgid "branch name required"
3949 #: builtin/branch.c:722
3950 msgid "Cannot give description to detached HEAD"
3951 msgstr "不能向分离头指针提供描述"
3953 #: builtin/branch.c:727
3954 msgid "cannot edit description of more than one branch"
3955 msgstr "不能为一个以上的分支编辑描述"
3957 #: builtin/branch.c:734
3959 msgid "No commit on branch '%s' yet."
3960 msgstr "分支 '%s' 尚无提交。"
3962 #: builtin/branch.c:737
3964 msgid "No branch named '%s'."
3967 #: builtin/branch.c:752
3968 msgid "too many branches for a rename operation"
3969 msgstr "为重命名操作提供了太多的分支名"
3971 #: builtin/branch.c:757
3972 msgid "too many branches to set new upstream"
3973 msgstr "为设置新上游提供了太多的分支名"
3975 #: builtin/branch.c:761
3978 "could not set upstream of HEAD to %s when it does not point to any branch."
3979 msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3981 #: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807
3983 msgid "no such branch '%s'"
3986 #: builtin/branch.c:768
3988 msgid "branch '%s' does not exist"
3989 msgstr "分支 '%s' 不存在"
3991 #: builtin/branch.c:780
3992 msgid "too many branches to unset upstream"
3993 msgstr "为取消上游设置操作提供了太多的分支名"
3995 #: builtin/branch.c:784
3996 msgid "could not unset upstream of HEAD when it does not point to any branch."
3997 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3999 #: builtin/branch.c:790
4001 msgid "Branch '%s' has no upstream information"
4002 msgstr "分支 '%s' 没有上游信息"
4004 #: builtin/branch.c:804
4005 msgid "it does not make sense to create 'HEAD' manually"
4006 msgstr "手工创建 'HEAD' 没有意义"
4008 #: builtin/branch.c:810
4009 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
4010 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
4012 #: builtin/branch.c:813
4015 "The --set-upstream flag is deprecated and will be removed. Consider using --"
4016 "track or --set-upstream-to\n"
4018 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
4020 #: builtin/branch.c:830
4024 "If you wanted to make '%s' track '%s', do this:\n"
4028 "如果你想用 '%s' 跟踪 '%s', 这么做:\n"
4031 #: builtin/branch.c:831
4033 msgid " git branch -d %s\n"
4034 msgstr " git branch -d %s\n"
4036 #: builtin/branch.c:832
4038 msgid " git branch --set-upstream-to %s\n"
4039 msgstr " git branch --set-upstream-to %s\n"
4041 #: builtin/bundle.c:51
4043 msgid "%s is okay\n"
4046 #: builtin/bundle.c:64
4047 msgid "Need a repository to create a bundle."
4048 msgstr "需要一个仓库来创建包。"
4050 #: builtin/bundle.c:68
4051 msgid "Need a repository to unbundle."
4054 #: builtin/cat-file.c:428
4056 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
4057 "<type>|--textconv) <object>"
4059 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
4060 ">|--textconv) <对象>"
4062 #: builtin/cat-file.c:429
4063 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4064 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"
4066 #: builtin/cat-file.c:466
4067 msgid "<type> can be one of: blob, tree, commit, tag"
4068 msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
4070 #: builtin/cat-file.c:467
4071 msgid "show object type"
4074 #: builtin/cat-file.c:468
4075 msgid "show object size"
4078 #: builtin/cat-file.c:470
4079 msgid "exit with zero when there's no error"
4080 msgstr "当没有错误时退出并返回零"
4082 #: builtin/cat-file.c:471
4083 msgid "pretty-print object's content"
4086 #: builtin/cat-file.c:473
4087 msgid "for blob objects, run textconv on object's content"
4088 msgstr "对于数据对象,对其内容执行 textconv"
4090 #: builtin/cat-file.c:475
4091 msgid "allow -s and -t to work with broken/corrupt objects"
4092 msgstr "允许 -s 和 -t 对损坏的对象生效"
4094 #: builtin/cat-file.c:476
4095 msgid "buffer --batch output"
4096 msgstr "缓冲 --batch 的输出"
4098 #: builtin/cat-file.c:478
4099 msgid "show info and content of objects fed from the standard input"
4100 msgstr "显示从标准输入提供的对象的信息和内容"
4102 #: builtin/cat-file.c:481
4103 msgid "show info about objects fed from the standard input"
4104 msgstr "显示从标准输入提供的对象的信息"
4106 #: builtin/cat-file.c:484
4107 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
4108 msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
4110 #: builtin/cat-file.c:486
4111 msgid "show all objects with --batch or --batch-check"
4112 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
4114 #: builtin/check-attr.c:11
4115 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4116 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4118 #: builtin/check-attr.c:12
4119 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4120 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4122 #: builtin/check-attr.c:19
4123 msgid "report all attributes set on file"
4124 msgstr "报告设置在文件上的所有属性"
4126 #: builtin/check-attr.c:20
4127 msgid "use .gitattributes only from the index"
4128 msgstr "只使用索引中的 .gitattributes"
4130 #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97
4131 msgid "read file names from stdin"
4134 #: builtin/check-attr.c:23 builtin/check-ignore.c:24
4135 msgid "terminate input and output records by a NUL character"
4136 msgstr "输入和输出的记录使用 NUL 字符终结"
4138 #: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325
4139 msgid "suppress progress reporting"
4142 #: builtin/check-ignore.c:26
4143 msgid "show non-matching input paths"
4146 #: builtin/check-ignore.c:28
4147 msgid "ignore index when checking"
4150 #: builtin/check-ignore.c:154
4151 msgid "cannot specify pathnames with --stdin"
4152 msgstr "不能同时指定路径及 --stdin 参数"
4154 #: builtin/check-ignore.c:157
4155 msgid "-z only makes sense with --stdin"
4156 msgstr "-z 需要和 --stdin 参数共用才有意义"
4158 #: builtin/check-ignore.c:159
4159 msgid "no path specified"
4162 #: builtin/check-ignore.c:163
4163 msgid "--quiet is only valid with a single pathname"
4164 msgstr "参数 --quiet 只在提供一个路径名时有效"
4166 #: builtin/check-ignore.c:165
4167 msgid "cannot have both --quiet and --verbose"
4168 msgstr "不能同时提供 --quiet 和 --verbose 参数"
4170 #: builtin/check-ignore.c:168
4171 msgid "--non-matching is only valid with --verbose"
4172 msgstr "--non-matching 选项只在使用 --verbose 时有效"
4174 #: builtin/check-mailmap.c:8
4175 msgid "git check-mailmap [<options>] <contact>..."
4176 msgstr "git check-mailmap [<选项>] <联系地址>..."
4178 #: builtin/check-mailmap.c:13
4179 msgid "also read contacts from stdin"
4180 msgstr "还从标准输入读取联系地址"
4182 #: builtin/check-mailmap.c:24
4184 msgid "unable to parse contact: %s"
4185 msgstr "不能解析联系地址:%s"
4187 #: builtin/check-mailmap.c:47
4188 msgid "no contacts specified"
4191 #: builtin/checkout-index.c:127
4192 msgid "git checkout-index [<options>] [--] [<file>...]"
4193 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
4195 #: builtin/checkout-index.c:144
4196 msgid "stage should be between 1 and 3 or all"
4197 msgstr "索引值应该取值 1 到 3 或者 all"
4199 #: builtin/checkout-index.c:160
4200 msgid "check out all files in the index"
4203 #: builtin/checkout-index.c:161
4204 msgid "force overwrite of existing files"
4207 #: builtin/checkout-index.c:163
4208 msgid "no warning for existing files and files not in index"
4209 msgstr "存在或不在索引中的文件都没有警告"
4211 #: builtin/checkout-index.c:165
4212 msgid "don't checkout new files"
4215 #: builtin/checkout-index.c:167
4216 msgid "update stat information in the index file"
4217 msgstr "更新索引中文件的状态信息"
4219 #: builtin/checkout-index.c:171
4220 msgid "read list of paths from the standard input"
4221 msgstr "从标准输入读取路径列表"
4223 #: builtin/checkout-index.c:173
4224 msgid "write the content to temporary files"
4227 #: builtin/checkout-index.c:174 builtin/column.c:30
4228 #: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169
4229 #: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175
4233 #: builtin/checkout-index.c:175
4234 msgid "when creating files, prepend <string>"
4235 msgstr "在创建文件时,在前面加上 <字符串>"
4237 #: builtin/checkout-index.c:177
4238 msgid "copy out the files from named stage"
4239 msgstr "从指定暂存区中拷出文件"
4241 #: builtin/checkout.c:25
4242 msgid "git checkout [<options>] <branch>"
4243 msgstr "git checkout [<选项>] <分支>"
4245 #: builtin/checkout.c:26
4246 msgid "git checkout [<options>] [<branch>] -- <file>..."
4247 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4249 #: builtin/checkout.c:134 builtin/checkout.c:167
4251 msgid "path '%s' does not have our version"
4252 msgstr "路径 '%s' 没有我们的版本"
4254 #: builtin/checkout.c:136 builtin/checkout.c:169
4256 msgid "path '%s' does not have their version"
4257 msgstr "路径 '%s' 没有他们的版本"
4259 #: builtin/checkout.c:152
4261 msgid "path '%s' does not have all necessary versions"
4262 msgstr "路径 '%s' 没有全部必须的版本"
4264 #: builtin/checkout.c:196
4266 msgid "path '%s' does not have necessary versions"
4267 msgstr "路径 '%s' 没有必须的版本"
4269 #: builtin/checkout.c:213
4271 msgid "path '%s': cannot merge"
4272 msgstr "path '%s':无法合并"
4274 #: builtin/checkout.c:230
4276 msgid "Unable to add merge result for '%s'"
4277 msgstr "无法为 '%s' 添加合并结果"
4279 #: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
4280 #: builtin/checkout.c:260
4282 msgid "'%s' cannot be used with updating paths"
4283 msgstr "'%s' 不能在更新路径时使用"
4285 #: builtin/checkout.c:263 builtin/checkout.c:266
4287 msgid "'%s' cannot be used with %s"
4288 msgstr "'%s' 不能和 %s 同时使用"
4290 #: builtin/checkout.c:269
4292 msgid "Cannot update paths and switch to branch '%s' at the same time."
4293 msgstr "不能同时更新路径并切换到分支'%s'。"
4295 #: builtin/checkout.c:280 builtin/checkout.c:474
4296 msgid "corrupt index file"
4299 #: builtin/checkout.c:340 builtin/checkout.c:347
4301 msgid "path '%s' is unmerged"
4302 msgstr "路径 '%s' 未合并"
4304 #: builtin/checkout.c:496
4305 msgid "you need to resolve your current index first"
4306 msgstr "您需要先解决当前索引的冲突"
4308 #: builtin/checkout.c:623
4310 msgid "Can not do reflog for '%s': %s\n"
4311 msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
4313 #: builtin/checkout.c:661
4314 msgid "HEAD is now at"
4317 #: builtin/checkout.c:665 builtin/clone.c:659
4318 msgid "unable to update HEAD"
4321 #: builtin/checkout.c:669
4323 msgid "Reset branch '%s'\n"
4324 msgstr "重置分支 '%s'\n"
4326 #: builtin/checkout.c:672
4328 msgid "Already on '%s'\n"
4329 msgstr "已经位于 '%s'\n"
4331 #: builtin/checkout.c:676
4333 msgid "Switched to and reset branch '%s'\n"
4334 msgstr "切换并重置分支 '%s'\n"
4336 #: builtin/checkout.c:678 builtin/checkout.c:1068
4338 msgid "Switched to a new branch '%s'\n"
4339 msgstr "切换到一个新分支 '%s'\n"
4341 #: builtin/checkout.c:680
4343 msgid "Switched to branch '%s'\n"
4344 msgstr "切换到分支 '%s'\n"
4347 #: builtin/checkout.c:732
4349 msgid " ... and %d more.\n"
4350 msgstr " ... 及其它 %d 个。\n"
4352 #: builtin/checkout.c:738
4355 "Warning: you are leaving %d commit behind, not connected to\n"
4356 "any of your branches:\n"
4360 "Warning: you are leaving %d commits behind, not connected to\n"
4361 "any of your branches:\n"
4365 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4369 "警告:您正丢下 %d 个提交,未和任何分支关联:\n"
4373 #: builtin/checkout.c:757
4376 "If you want to keep it by creating a new branch, this may be a good time\n"
4379 " git branch <new-branch-name> %s\n"
4382 "If you want to keep them by creating a new branch, this may be a good time\n"
4385 " git branch <new-branch-name> %s\n"
4388 "如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
4391 " git branch <新分支名> %s\n"
4394 "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
4397 " git branch <新分支名> %s\n"
4400 #: builtin/checkout.c:793
4401 msgid "internal error in revision walk"
4402 msgstr "在版本遍历时遇到内部错误"
4404 #: builtin/checkout.c:797
4405 msgid "Previous HEAD position was"
4406 msgstr "之前的 HEAD 位置是"
4408 #: builtin/checkout.c:824 builtin/checkout.c:1063
4409 msgid "You are on a branch yet to be born"
4410 msgstr "您位于一个尚未初始化的分支"
4412 #: builtin/checkout.c:969
4414 msgid "only one reference expected, %d given."
4415 msgstr "只要一个引用,却给出了 %d 个"
4417 #: builtin/checkout.c:1009 builtin/worktree.c:211
4419 msgid "invalid reference: %s"
4422 #: builtin/checkout.c:1038
4424 msgid "reference is not a tree: %s"
4427 #: builtin/checkout.c:1077
4428 msgid "paths cannot be used with switching branches"
4429 msgstr "路径不能和切换分支同时使用"
4431 #: builtin/checkout.c:1080 builtin/checkout.c:1084
4433 msgid "'%s' cannot be used with switching branches"
4434 msgstr "'%s' 不能和切换分支同时使用"
4436 #: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096
4437 #: builtin/checkout.c:1099
4439 msgid "'%s' cannot be used with '%s'"
4440 msgstr "'%s' 不能和 '%s' 同时使用"
4442 #: builtin/checkout.c:1104
4444 msgid "Cannot switch branch to a non-commit '%s'"
4445 msgstr "不能切换分支到一个非提交 '%s'"
4447 #: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84
4448 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318
4449 #: builtin/worktree.c:320
4453 #: builtin/checkout.c:1138
4454 msgid "create and checkout a new branch"
4455 msgstr "创建并检出一个新的分支"
4457 #: builtin/checkout.c:1140
4458 msgid "create/reset and checkout a branch"
4459 msgstr "创建/重置并检出一个分支"
4461 #: builtin/checkout.c:1141
4462 msgid "create reflog for new branch"
4463 msgstr "为新的分支创建引用日志"
4465 #: builtin/checkout.c:1142
4466 msgid "detach the HEAD at named commit"
4467 msgstr "成为指向该提交的分离头指针"
4469 #: builtin/checkout.c:1143
4470 msgid "set upstream info for new branch"
4471 msgstr "为新的分支设置上游信息"
4473 #: builtin/checkout.c:1145
4477 #: builtin/checkout.c:1145
4478 msgid "new unparented branch"
4481 #: builtin/checkout.c:1146
4482 msgid "checkout our version for unmerged files"
4483 msgstr "对尚未合并的文件检出我们的版本"
4485 #: builtin/checkout.c:1148
4486 msgid "checkout their version for unmerged files"
4487 msgstr "对尚未合并的文件检出他们的版本"
4489 #: builtin/checkout.c:1150
4490 msgid "force checkout (throw away local modifications)"
4491 msgstr "强制检出(丢弃本地修改)"
4493 #: builtin/checkout.c:1151
4494 msgid "perform a 3-way merge with the new branch"
4495 msgstr "和新的分支执行三方合并"
4497 #: builtin/checkout.c:1152 builtin/merge.c:227
4498 msgid "update ignored files (default)"
4499 msgstr "更新忽略的文件(默认)"
4501 #: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250
4505 #: builtin/checkout.c:1154
4506 msgid "conflict style (merge or diff3)"
4507 msgstr "冲突输出风格(merge 或 diff3)"
4509 #: builtin/checkout.c:1157
4510 msgid "do not limit pathspecs to sparse entries only"
4511 msgstr "对路径不做稀疏检出的限制"
4513 #: builtin/checkout.c:1159
4514 msgid "second guess 'git checkout <no-such-branch>'"
4515 msgstr "二次猜测'git checkout <无此分支>'"
4517 #: builtin/checkout.c:1161
4518 msgid "do not check if another worktree is holding the given ref"
4519 msgstr "不检查指定的引用是否被其他工作区所占用"
4521 #: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116
4522 #: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526
4523 #: builtin/send-pack.c:168
4524 msgid "force progress reporting"
4527 #: builtin/checkout.c:1193
4528 msgid "-b, -B and --orphan are mutually exclusive"
4529 msgstr "-b、-B 和 --orphan 是互斥的"
4531 #: builtin/checkout.c:1210
4532 msgid "--track needs a branch name"
4533 msgstr "--track 需要一个分支名"
4535 #: builtin/checkout.c:1215
4536 msgid "Missing branch name; try -b"
4537 msgstr "缺少分支名;尝试 -b"
4539 #: builtin/checkout.c:1251
4540 msgid "invalid path specification"
4543 #: builtin/checkout.c:1258
4546 "Cannot update paths and switch to branch '%s' at the same time.\n"
4547 "Did you intend to checkout '%s' which can not be resolved as commit?"
4549 "不能同时更新路径并切换到分支'%s'。\n"
4550 "您是想要检出 '%s' 但其未能解析为提交么?"
4552 #: builtin/checkout.c:1263
4554 msgid "git checkout: --detach does not take a path argument '%s'"
4555 msgstr "git checkout:--detach 不能接收路径参数 '%s'"
4557 #: builtin/checkout.c:1267
4559 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4560 "checking out of the index."
4562 "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
4564 #: builtin/clean.c:25
4566 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4568 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4570 #: builtin/clean.c:29
4572 msgid "Removing %s\n"
4575 #: builtin/clean.c:30
4577 msgid "Would remove %s\n"
4580 #: builtin/clean.c:31
4582 msgid "Skipping repository %s\n"
4585 #: builtin/clean.c:32
4587 msgid "Would skip repository %s\n"
4590 #: builtin/clean.c:33
4592 msgid "failed to remove %s"
4595 #: builtin/clean.c:291
4598 "1 - select a numbered item\n"
4599 "foo - select item based on unique prefix\n"
4600 " - (empty) select nothing"
4604 "foo - 通过标题选择一个选项\n"
4607 #: builtin/clean.c:295
4610 "1 - select a single item\n"
4611 "3-5 - select a range of items\n"
4612 "2-3,6-9 - select multiple ranges\n"
4613 "foo - select item based on unique prefix\n"
4614 "-... - unselect specified items\n"
4615 "* - choose all items\n"
4616 " - (empty) finish selecting"
4620 "3-5 - 选择一个范围内的所有选项\n"
4621 "2-3,6-9 - 选择多个范围内的所有选项\n"
4622 "foo - 通过标题选择一个选项\n"
4627 #: builtin/clean.c:511
4632 #: builtin/clean.c:653
4634 msgid "Input ignore patterns>> "
4635 msgstr "输入模版以排除条目>> "
4637 #: builtin/clean.c:690
4639 msgid "WARNING: Cannot find items matched by: %s"
4640 msgstr "警告:无法找到和 %s 匹配的条目"
4642 #: builtin/clean.c:711
4643 msgid "Select items to delete"
4646 #. TRANSLATORS: Make sure to keep [y/N] as is
4647 #: builtin/clean.c:752
4649 msgid "Remove %s [y/N]? "
4650 msgstr "删除 %s [y/N]?"
4652 #: builtin/clean.c:777
4656 #: builtin/clean.c:785
4658 "clean - start cleaning\n"
4659 "filter by pattern - exclude items from deletion\n"
4660 "select by numbers - select items to be deleted by numbers\n"
4661 "ask each - confirm each deletion (like \"rm -i\")\n"
4662 "quit - stop cleaning\n"
4663 "help - this screen\n"
4664 "? - help for prompt selection"
4667 "filter by pattern - 通过模版排除要删除的条目\n"
4668 "select by numbers - 通过数字选择要删除的条目\n"
4669 "ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
4672 "? - 显示如何在提示符下选择的帮助"
4674 #: builtin/clean.c:812
4675 msgid "*** Commands ***"
4678 #: builtin/clean.c:813
4682 #: builtin/clean.c:821
4683 msgid "Would remove the following item:"
4684 msgid_plural "Would remove the following items:"
4685 msgstr[0] "将删除如下条目:"
4686 msgstr[1] "将删除如下条目:"
4688 #: builtin/clean.c:838
4689 msgid "No more files to clean, exiting."
4690 msgstr "没有要清理的文件,退出。"
4692 #: builtin/clean.c:869
4693 msgid "do not print names of files removed"
4696 #: builtin/clean.c:871
4700 #: builtin/clean.c:872
4701 msgid "interactive cleaning"
4704 #: builtin/clean.c:874
4705 msgid "remove whole directories"
4708 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722
4709 #: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182
4713 #: builtin/clean.c:876
4714 msgid "add <pattern> to ignore rules"
4715 msgstr "添加 <模式> 到忽略规则"
4717 #: builtin/clean.c:877
4718 msgid "remove ignored files, too"
4721 #: builtin/clean.c:879
4722 msgid "remove only ignored files"
4725 #: builtin/clean.c:897
4726 msgid "-x and -X cannot be used together"
4727 msgstr "-x 和 -X 不能同时使用"
4729 #: builtin/clean.c:901
4731 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4734 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4736 #: builtin/clean.c:904
4738 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4741 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
4743 #: builtin/clone.c:37
4744 msgid "git clone [<options>] [--] <repo> [<dir>]"
4745 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
4747 #: builtin/clone.c:60
4748 msgid "don't create a checkout"
4751 #: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469
4752 msgid "create a bare repository"
4755 #: builtin/clone.c:65
4756 msgid "create a mirror repository (implies bare)"
4757 msgstr "创建一个镜像仓库(也是纯仓库)"
4759 #: builtin/clone.c:67
4760 msgid "to clone from a local repository"
4763 #: builtin/clone.c:69
4764 msgid "don't use local hardlinks, always copy"
4765 msgstr "不使用本地硬链接,始终复制"
4767 #: builtin/clone.c:71
4768 msgid "setup as shared repository"
4771 #: builtin/clone.c:73 builtin/clone.c:75
4772 msgid "initialize submodules in the clone"
4775 #: builtin/clone.c:76 builtin/init-db.c:466
4776 msgid "template-directory"
4779 #: builtin/clone.c:77 builtin/init-db.c:467
4780 msgid "directory from which templates will be used"
4783 #: builtin/clone.c:79 builtin/submodule--helper.c:173
4784 msgid "reference repository"
4787 #: builtin/clone.c:81
4788 msgid "use --reference only while cloning"
4789 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
4791 #: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44
4795 #: builtin/clone.c:83
4796 msgid "use <name> instead of 'origin' to track upstream"
4797 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
4799 #: builtin/clone.c:85
4800 msgid "checkout <branch> instead of the remote's HEAD"
4801 msgstr "检出 <分支> 而不是远程 HEAD"
4803 #: builtin/clone.c:87
4804 msgid "path to git-upload-pack on the remote"
4805 msgstr "远程 git-upload-pack 路径"
4807 #: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665
4808 #: builtin/pull.c:193
4812 #: builtin/clone.c:89
4813 msgid "create a shallow clone of that depth"
4814 msgstr "创建一个指定深度的浅克隆"
4816 #: builtin/clone.c:91
4817 msgid "clone only one branch, HEAD or --branch"
4818 msgstr "只克隆一个分支、HEAD 或 --branch"
4820 #: builtin/clone.c:92 builtin/init-db.c:475
4824 #: builtin/clone.c:93 builtin/init-db.c:476
4825 msgid "separate git dir from working tree"
4826 msgstr "git目录和工作区分离"
4828 #: builtin/clone.c:94
4832 #: builtin/clone.c:95
4833 msgid "set config inside the new repository"
4834 msgstr "在新仓库中设置配置信息"
4836 #: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536
4837 msgid "use IPv4 addresses only"
4838 msgstr "只使用 IPv4 地址"
4840 #: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538
4841 msgid "use IPv6 addresses only"
4842 msgstr "只使用 IPv6 地址"
4844 #: builtin/clone.c:239
4846 "No directory name could be guessed.\n"
4847 "Please specify a directory on the command line"
4852 #: builtin/clone.c:305
4854 msgid "reference repository '%s' as a linked checkout is not supported yet."
4855 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4857 #: builtin/clone.c:307
4859 msgid "reference repository '%s' is not a local repository."
4860 msgstr "参考仓库 '%s' 不是一个本地仓库。"
4862 #: builtin/clone.c:312
4864 msgid "reference repository '%s' is shallow"
4865 msgstr "参考仓库 '%s' 是一个浅克隆"
4867 #: builtin/clone.c:315
4869 msgid "reference repository '%s' is grafted"
4870 msgstr "参考仓库 '%s' 已被嫁接"
4872 #: builtin/clone.c:380 builtin/diff.c:84
4874 msgid "failed to stat '%s'"
4875 msgstr "无法枚举 '%s' 状态"
4877 #: builtin/clone.c:382
4879 msgid "%s exists and is not a directory"
4880 msgstr "%s 存在且不是一个目录"
4882 #: builtin/clone.c:396
4884 msgid "failed to stat %s\n"
4885 msgstr "无法枚举 %s 状态\n"
4887 #: builtin/clone.c:418
4889 msgid "failed to create link '%s'"
4890 msgstr "无法创建链接 '%s'"
4892 #: builtin/clone.c:422
4894 msgid "failed to copy file to '%s'"
4895 msgstr "无法拷贝文件至 '%s'"
4897 #: builtin/clone.c:447 builtin/clone.c:631
4902 #: builtin/clone.c:459
4904 "Clone succeeded, but checkout failed.\n"
4905 "You can inspect what was checked out with 'git status'\n"
4906 "and retry the checkout with 'git checkout -f HEAD'\n"
4909 "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4910 "'git checkout -f HEAD' 重试\n"
4912 #: builtin/clone.c:536
4914 msgid "Could not find remote branch %s to clone."
4915 msgstr "不能发现要克隆的远程分支 %s。"
4917 #: builtin/clone.c:626
4919 msgid "Checking connectivity... "
4922 #: builtin/clone.c:629
4923 msgid "remote did not send all necessary objects"
4924 msgstr "远程没有发送所有必须的对象"
4926 #: builtin/clone.c:647
4928 msgid "unable to update %s"
4931 #: builtin/clone.c:696
4932 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4933 msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4935 #: builtin/clone.c:727
4936 msgid "unable to checkout working tree"
4939 #: builtin/clone.c:753
4940 msgid "unable to write parameters to config file"
4941 msgstr "无法将参数写入配置文件"
4943 #: builtin/clone.c:816
4944 msgid "cannot repack to clean up"
4945 msgstr "无法执行 repack 来清理"
4947 #: builtin/clone.c:818
4948 msgid "cannot unlink temporary alternates file"
4949 msgstr "无法删除临时的 alternates 文件"
4951 #: builtin/clone.c:850
4952 msgid "Too many arguments."
4955 #: builtin/clone.c:854
4956 msgid "You must specify a repository to clone."
4957 msgstr "您必须指定一个仓库来克隆。"
4959 #: builtin/clone.c:865
4961 msgid "--bare and --origin %s options are incompatible."
4962 msgstr "--bare 和 --origin %s 选项不兼容。"
4964 #: builtin/clone.c:868
4965 msgid "--bare and --separate-git-dir are incompatible."
4966 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4968 #: builtin/clone.c:881
4970 msgid "repository '%s' does not exist"
4971 msgstr "仓库 '%s' 不存在"
4973 #: builtin/clone.c:887 builtin/fetch.c:1174
4975 msgid "depth %s is not a positive number"
4976 msgstr "深度 %s 不是一个正数"
4978 #: builtin/clone.c:897
4980 msgid "destination path '%s' already exists and is not an empty directory."
4981 msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
4983 #: builtin/clone.c:907
4985 msgid "working tree '%s' already exists."
4986 msgstr "工作区 '%s' 已经存在。"
4988 #: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218
4989 #: builtin/worktree.c:219 builtin/worktree.c:246
4991 msgid "could not create leading directories of '%s'"
4992 msgstr "不能为 '%s' 创建先导目录"
4994 #: builtin/clone.c:925
4996 msgid "could not create work tree dir '%s'"
4997 msgstr "不能创建工作区目录 '%s'"
4999 #: builtin/clone.c:943
5001 msgid "Cloning into bare repository '%s'...\n"
5002 msgstr "克隆到纯仓库 '%s'...\n"
5004 #: builtin/clone.c:945
5006 msgid "Cloning into '%s'...\n"
5007 msgstr "正克隆到 '%s'...\n"
5009 #: builtin/clone.c:984
5010 msgid "--depth is ignored in local clones; use file:// instead."
5011 msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
5013 #: builtin/clone.c:987
5014 msgid "source repository is shallow, ignoring --local"
5015 msgstr "源仓库是浅克隆,忽略 --local"
5017 #: builtin/clone.c:992
5018 msgid "--local is ignored"
5019 msgstr "--local 被忽略"
5021 #: builtin/clone.c:996
5023 msgid "Don't know how to clone %s"
5026 #: builtin/clone.c:1045 builtin/clone.c:1053
5028 msgid "Remote branch %s not found in upstream %s"
5029 msgstr "远程分支 %s 在上游 %s 未发现"
5031 #: builtin/clone.c:1056
5032 msgid "You appear to have cloned an empty repository."
5033 msgstr "您似乎克隆了一个空仓库。"
5035 #: builtin/column.c:9
5036 msgid "git column [<options>]"
5037 msgstr "git column [<选项>]"
5039 #: builtin/column.c:26
5040 msgid "lookup config vars"
5043 #: builtin/column.c:27 builtin/column.c:28
5044 msgid "layout to use"
5047 #: builtin/column.c:29
5048 msgid "Maximum width"
5051 #: builtin/column.c:30
5052 msgid "Padding space on left border"
5055 #: builtin/column.c:31
5056 msgid "Padding space on right border"
5059 #: builtin/column.c:32
5060 msgid "Padding space between columns"
5063 #: builtin/column.c:51
5064 msgid "--command must be the first argument"
5065 msgstr "--command 必须是第一个参数"
5067 #: builtin/commit.c:38
5068 msgid "git commit [<options>] [--] <pathspec>..."
5069 msgstr "git commit [<选项>] [--] <路径规格>..."
5071 #: builtin/commit.c:43
5072 msgid "git status [<options>] [--] <pathspec>..."
5073 msgstr "git status [<选项>] [--] <路径规格>..."
5075 #: builtin/commit.c:48
5077 "Your name and email address were configured automatically based\n"
5078 "on your username and hostname. Please check that they are accurate.\n"
5079 "You can suppress this message by setting them explicitly. Run the\n"
5080 "following command and follow the instructions in your editor to edit\n"
5081 "your configuration file:\n"
5083 " git config --global --edit\n"
5085 "After doing this, you may fix the identity used for this commit with:\n"
5087 " git commit --amend --reset-author\n"
5089 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5090 "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5093 " git config --global --edit\n"
5095 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5097 " git commit --amend --reset-author\n"
5099 #: builtin/commit.c:61
5101 "Your name and email address were configured automatically based\n"
5102 "on your username and hostname. Please check that they are accurate.\n"
5103 "You can suppress this message by setting them explicitly:\n"
5105 " git config --global user.name \"Your Name\"\n"
5106 " git config --global user.email you@example.com\n"
5108 "After doing this, you may fix the identity used for this commit with:\n"
5110 " git commit --amend --reset-author\n"
5112 "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5113 "与否。您可以对其进行设置以免再出现本提示信息:\n"
5115 " git config --global user.name \"Your Name\"\n"
5116 " git config --global user.email you@example.com\n"
5118 "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5120 " git commit --amend --reset-author\n"
5122 #: builtin/commit.c:73
5124 "You asked to amend the most recent commit, but doing so would make\n"
5125 "it empty. You can repeat your command with --allow-empty, or you can\n"
5126 "remove the commit entirely with \"git reset HEAD^\".\n"
5128 "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
5129 "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
5131 #: builtin/commit.c:78
5133 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
5134 "If you wish to commit it anyway, use:\n"
5136 " git commit --allow-empty\n"
5139 "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
5142 " git commit --allow-empty\n"
5145 #: builtin/commit.c:85
5146 msgid "Otherwise, please use 'git reset'\n"
5147 msgstr "否则,请使用命令 'git reset'\n"
5149 #: builtin/commit.c:88
5151 "If you wish to skip this commit, use:\n"
5155 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
5156 "the remaining commits.\n"
5158 "如果您想跳过这个提交,使用命令:\n"
5162 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
5165 #: builtin/commit.c:305
5166 msgid "failed to unpack HEAD tree object"
5167 msgstr "无法解包 HEAD 树对象"
5169 #: builtin/commit.c:346
5170 msgid "unable to create temporary index"
5173 #: builtin/commit.c:352
5174 msgid "interactive add failed"
5177 #: builtin/commit.c:365
5178 msgid "unable to update temporary index"
5181 #: builtin/commit.c:367
5182 msgid "Failed to update main cache tree"
5185 #: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463
5186 msgid "unable to write new_index file"
5187 msgstr "无法写 new_index 文件"
5189 #: builtin/commit.c:445
5190 msgid "cannot do a partial commit during a merge."
5191 msgstr "在合并过程中不能做部分提交。"
5193 #: builtin/commit.c:447
5194 msgid "cannot do a partial commit during a cherry-pick."
5195 msgstr "在拣选过程中不能做部分提交。"
5197 #: builtin/commit.c:456
5198 msgid "cannot read the index"
5201 #: builtin/commit.c:475
5202 msgid "unable to write temporary index file"
5205 #: builtin/commit.c:580
5207 msgid "commit '%s' lacks author header"
5208 msgstr "提交 '%s' 缺少作者信息"
5210 #: builtin/commit.c:582
5212 msgid "commit '%s' has malformed author line"
5213 msgstr "提交 '%s' 有非法的作者信息"
5215 #: builtin/commit.c:601
5216 msgid "malformed --author parameter"
5217 msgstr "非法的 --author 参数"
5219 #: builtin/commit.c:609
5221 msgid "invalid date format: %s"
5224 #: builtin/commit.c:653
5226 "unable to select a comment character that is not used\n"
5227 "in the current commit message"
5228 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5230 #: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
5232 msgid "could not lookup commit %s"
5235 #: builtin/commit.c:702 builtin/shortlog.c:285
5237 msgid "(reading log message from standard input)\n"
5238 msgstr "(正从标准输入中读取日志信息)\n"
5240 #: builtin/commit.c:704
5241 msgid "could not read log from standard input"
5242 msgstr "不能从标准输入中读取日志信息"
5244 #: builtin/commit.c:708
5246 msgid "could not read log file '%s'"
5247 msgstr "不能读取日志文件 '%s'"
5249 #: builtin/commit.c:730
5250 msgid "could not read MERGE_MSG"
5251 msgstr "不能读取 MERGE_MSG"
5253 #: builtin/commit.c:734
5254 msgid "could not read SQUASH_MSG"
5255 msgstr "不能读取 SQUASH_MSG"
5257 #: builtin/commit.c:785
5258 msgid "could not write commit template"
5261 #: builtin/commit.c:803
5265 "It looks like you may be committing a merge.\n"
5266 "If this is not correct, please remove the file\n"
5271 "似乎您正在做一个合并提交。如果不对,请删除文件\n"
5275 #: builtin/commit.c:808
5279 "It looks like you may be committing a cherry-pick.\n"
5280 "If this is not correct, please remove the file\n"
5285 "似乎您正在做一个拣选提交。如果不对,请删除文件\n"
5289 #: builtin/commit.c:821
5292 "Please enter the commit message for your changes. Lines starting\n"
5293 "with '%c' will be ignored, and an empty message aborts the commit.\n"
5295 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
5298 #: builtin/commit.c:828
5301 "Please enter the commit message for your changes. Lines starting\n"
5302 "with '%c' will be kept; you may remove them yourself if you want to.\n"
5303 "An empty message aborts the commit.\n"
5305 "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
5306 "也可以删除它们。一个空的提交说明将会终止提交。\n"
5308 # 译者:为保证在输出中对齐,注意调整句中空格!
5309 #: builtin/commit.c:848
5311 msgid "%sAuthor: %.*s <%.*s>"
5312 msgstr "%s作者: %.*s <%.*s>"
5314 # 译者:为保证在输出中对齐,注意调整句中空格!
5315 #: builtin/commit.c:856
5320 # 译者:为保证在输出中对齐,注意调整句中空格!
5321 #: builtin/commit.c:863
5323 msgid "%sCommitter: %.*s <%.*s>"
5324 msgstr "%s提交者:%.*s <%.*s>"
5326 #: builtin/commit.c:881
5327 msgid "Cannot read index"
5330 #: builtin/commit.c:938
5331 msgid "Error building trees"
5334 #: builtin/commit.c:953 builtin/tag.c:266
5336 msgid "Please supply the message using either -m or -F option.\n"
5337 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
5339 #: builtin/commit.c:1055
5341 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
5342 msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
5344 #: builtin/commit.c:1070 builtin/commit.c:1310
5346 msgid "Invalid untracked files mode '%s'"
5347 msgstr "无效的未追踪文件参数 '%s'"
5349 #: builtin/commit.c:1107
5350 msgid "--long and -z are incompatible"
5351 msgstr "--long 和 -z 选项不兼容"
5353 #: builtin/commit.c:1137
5354 msgid "Using both --reset-author and --author does not make sense"
5355 msgstr "同时使用 --reset-author 和 --author 没有意义"
5357 #: builtin/commit.c:1146
5358 msgid "You have nothing to amend."
5361 #: builtin/commit.c:1149
5362 msgid "You are in the middle of a merge -- cannot amend."
5363 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
5365 #: builtin/commit.c:1151
5366 msgid "You are in the middle of a cherry-pick -- cannot amend."
5367 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
5369 #: builtin/commit.c:1154
5370 msgid "Options --squash and --fixup cannot be used together"
5371 msgstr "选项 --squash 和 --fixup 不能同时使用"
5373 #: builtin/commit.c:1164
5374 msgid "Only one of -c/-C/-F/--fixup can be used."
5375 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
5377 #: builtin/commit.c:1166
5378 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
5379 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
5381 #: builtin/commit.c:1174
5382 msgid "--reset-author can be used only with -C, -c or --amend."
5383 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
5385 #: builtin/commit.c:1191
5386 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
5387 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
5389 #: builtin/commit.c:1193
5390 msgid "No paths with --include/--only does not make sense."
5391 msgstr "参数 --include/--only 不跟路径没有意义。"
5393 #: builtin/commit.c:1195
5394 msgid "Clever... amending the last one with dirty index."
5395 msgstr "聪明... 用脏索引修补最后一个提交。"
5397 #: builtin/commit.c:1197
5398 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
5399 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
5401 #: builtin/commit.c:1209 builtin/tag.c:475
5403 msgid "Invalid cleanup mode %s"
5406 #: builtin/commit.c:1214
5407 msgid "Paths with -a does not make sense."
5408 msgstr "路径和 -a 选项同时使用没有意义。"
5410 #: builtin/commit.c:1324 builtin/commit.c:1605
5411 msgid "show status concisely"
5414 #: builtin/commit.c:1326 builtin/commit.c:1607
5415 msgid "show branch information"
5418 #: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512
5419 #: builtin/worktree.c:430
5420 msgid "machine-readable output"
5423 #: builtin/commit.c:1331 builtin/commit.c:1611
5424 msgid "show status in long format (default)"
5425 msgstr "以长格式显示状态(默认)"
5427 #: builtin/commit.c:1334 builtin/commit.c:1614
5428 msgid "terminate entries with NUL"
5429 msgstr "条目以 NUL 字符结尾"
5431 #: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981
5432 #: builtin/fast-export.c:984 builtin/tag.c:353
5436 #: builtin/commit.c:1337 builtin/commit.c:1617
5437 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5438 msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
5440 #: builtin/commit.c:1340
5441 msgid "show ignored files"
5444 #: builtin/commit.c:1341 parse-options.h:155
5448 #: builtin/commit.c:1342
5450 "ignore changes to submodules, optional when: all, dirty, untracked. "
5453 "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
5455 #: builtin/commit.c:1344
5456 msgid "list untracked files in columns"
5457 msgstr "以列的方式显示未跟踪的文件"
5459 #: builtin/commit.c:1430
5460 msgid "couldn't look up newly created commit"
5463 #: builtin/commit.c:1432
5464 msgid "could not parse newly created commit"
5467 #: builtin/commit.c:1477
5468 msgid "detached HEAD"
5471 # 译者:中文字符串拼接,可删除前导空格
5472 #: builtin/commit.c:1480
5473 msgid " (root-commit)"
5476 #: builtin/commit.c:1575
5477 msgid "suppress summary after successful commit"
5478 msgstr "提交成功后不显示概述信息"
5480 #: builtin/commit.c:1576
5481 msgid "show diff in commit message template"
5482 msgstr "在提交说明模板里显示差异"
5484 #: builtin/commit.c:1578
5485 msgid "Commit message options"
5488 #: builtin/commit.c:1579 builtin/tag.c:351
5489 msgid "read message from file"
5492 #: builtin/commit.c:1580
5496 #: builtin/commit.c:1580
5497 msgid "override author for commit"
5500 #: builtin/commit.c:1581 builtin/gc.c:326
5504 #: builtin/commit.c:1581
5505 msgid "override date for commit"
5508 #: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395
5509 #: builtin/notes.c:558 builtin/tag.c:349
5513 #: builtin/commit.c:1582
5514 msgid "commit message"
5517 #: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585
5518 #: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79
5522 #: builtin/commit.c:1583
5523 msgid "reuse and edit message from specified commit"
5524 msgstr "重用并编辑指定提交的提交说明"
5526 #: builtin/commit.c:1584
5527 msgid "reuse message from specified commit"
5528 msgstr "重用指定提交的提交说明"
5530 #: builtin/commit.c:1585
5531 msgid "use autosquash formatted message to fixup specified commit"
5532 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
5534 #: builtin/commit.c:1586
5535 msgid "use autosquash formatted message to squash specified commit"
5536 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
5538 #: builtin/commit.c:1587
5539 msgid "the commit is authored by me now (used with -C/-c/--amend)"
5540 msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
5542 #: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86
5543 msgid "add Signed-off-by:"
5544 msgstr "添加 Signed-off-by: 签名"
5546 #: builtin/commit.c:1589
5547 msgid "use specified template file"
5550 #: builtin/commit.c:1590
5551 msgid "force edit of commit"
5554 # 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5555 #: builtin/commit.c:1591
5559 #: builtin/commit.c:1591 builtin/tag.c:354
5560 msgid "how to strip spaces and #comments from message"
5561 msgstr "设置如何删除提交说明里的空格和#注释"
5563 #: builtin/commit.c:1592
5564 msgid "include status in commit message template"
5565 msgstr "在提交说明模板里包含状态信息"
5567 #: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160
5568 #: builtin/revert.c:93
5569 msgid "GPG sign commit"
5572 #: builtin/commit.c:1597
5573 msgid "Commit contents options"
5576 #: builtin/commit.c:1598
5577 msgid "commit all changed files"
5580 #: builtin/commit.c:1599
5581 msgid "add specified files to index for commit"
5582 msgstr "添加指定的文件到索引区等待提交"
5584 #: builtin/commit.c:1600
5585 msgid "interactively add files"
5588 #: builtin/commit.c:1601
5589 msgid "interactively add changes"
5592 #: builtin/commit.c:1602
5593 msgid "commit only specified files"
5596 #: builtin/commit.c:1603
5597 msgid "bypass pre-commit hook"
5598 msgstr "绕过 pre-commit 钩子"
5600 #: builtin/commit.c:1604
5601 msgid "show what would be committed"
5604 #: builtin/commit.c:1615
5605 msgid "amend previous commit"
5608 #: builtin/commit.c:1616
5609 msgid "bypass post-rewrite hook"
5610 msgstr "绕过 post-rewrite 钩子"
5612 #: builtin/commit.c:1621
5613 msgid "ok to record an empty change"
5616 #: builtin/commit.c:1623
5617 msgid "ok to record a change with an empty message"
5620 #: builtin/commit.c:1652
5621 msgid "could not parse HEAD commit"
5622 msgstr "不能解析 HEAD 提交"
5624 #: builtin/commit.c:1698
5626 msgid "Corrupt MERGE_HEAD file (%s)"
5627 msgstr "损坏的 MERGE_HEAD 文件(%s)"
5629 #: builtin/commit.c:1705
5630 msgid "could not read MERGE_MODE"
5631 msgstr "不能读取 MERGE_MODE"
5633 #: builtin/commit.c:1724
5635 msgid "could not read commit message: %s"
5636 msgstr "不能读取提交说明:%s"
5638 #: builtin/commit.c:1735
5640 msgid "Aborting commit; you did not edit the message.\n"
5641 msgstr "终止提交;您未更改来自模版的提交说明。\n"
5643 #: builtin/commit.c:1740
5645 msgid "Aborting commit due to empty commit message.\n"
5646 msgstr "终止提交因为提交说明为空。\n"
5648 #: builtin/commit.c:1788
5650 "Repository has been updated, but unable to write\n"
5651 "new_index file. Check that disk is not full and quota is\n"
5652 "not exceeded, and then \"git reset HEAD\" to recover."
5654 "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
5655 "或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
5657 #: builtin/config.c:9
5658 msgid "git config [<options>]"
5659 msgstr "git config [<选项>]"
5661 #: builtin/config.c:56
5662 msgid "Config file location"
5665 #: builtin/config.c:57
5666 msgid "use global config file"
5669 #: builtin/config.c:58
5670 msgid "use system config file"
5673 #: builtin/config.c:59
5674 msgid "use repository config file"
5677 #: builtin/config.c:60
5678 msgid "use given config file"
5681 #: builtin/config.c:61
5685 #: builtin/config.c:61
5686 msgid "read config from given blob object"
5687 msgstr "从给定的数据对象读取配置"
5689 #: builtin/config.c:62
5693 #: builtin/config.c:63
5694 msgid "get value: name [value-regex]"
5695 msgstr "获取值:name [value-regex]"
5697 #: builtin/config.c:64
5698 msgid "get all values: key [value-regex]"
5699 msgstr "获得所有的值:key [value-regex]"
5701 #: builtin/config.c:65
5702 msgid "get values for regexp: name-regex [value-regex]"
5703 msgstr "根据正则表达式获得值:name-regex [value-regex]"
5705 #: builtin/config.c:66
5706 msgid "get value specific for the URL: section[.var] URL"
5707 msgstr "获得 URL 取值:section[.var] URL"
5709 #: builtin/config.c:67
5710 msgid "replace all matching variables: name value [value_regex]"
5711 msgstr "替换所有匹配的变量:name value [value_regex]"
5713 #: builtin/config.c:68
5714 msgid "add a new variable: name value"
5715 msgstr "添加一个新的变量:name value"
5717 #: builtin/config.c:69
5718 msgid "remove a variable: name [value-regex]"
5719 msgstr "删除一个变量:name [value-regex]"
5721 #: builtin/config.c:70
5722 msgid "remove all matches: name [value-regex]"
5723 msgstr "删除所有匹配项:name [value-regex]"
5725 #: builtin/config.c:71
5726 msgid "rename section: old-name new-name"
5727 msgstr "重命名小节:old-name new-name"
5729 #: builtin/config.c:72
5730 msgid "remove a section: name"
5731 msgstr "删除一个小节:name"
5733 #: builtin/config.c:73
5737 #: builtin/config.c:74
5738 msgid "open an editor"
5741 #: builtin/config.c:75
5742 msgid "find the color configured: slot [default]"
5743 msgstr "获得配置的颜色:配置 [默认]"
5745 #: builtin/config.c:76
5746 msgid "find the color setting: slot [stdout-is-tty]"
5747 msgstr "获得颜色设置:配置 [stdout-is-tty]"
5749 #: builtin/config.c:77
5753 #: builtin/config.c:78
5754 msgid "value is \"true\" or \"false\""
5755 msgstr "值是 \"true\" 或 \"false\""
5757 #: builtin/config.c:79
5758 msgid "value is decimal number"
5761 #: builtin/config.c:80
5762 msgid "value is --bool or --int"
5763 msgstr "值是 --bool or --int"
5765 #: builtin/config.c:81
5766 msgid "value is a path (file or directory name)"
5767 msgstr "值是一个路径(文件或目录名)"
5769 #: builtin/config.c:82
5773 #: builtin/config.c:83
5774 msgid "terminate values with NUL byte"
5775 msgstr "终止值是 NUL 字节"
5777 #: builtin/config.c:84
5778 msgid "show variable names only"
5781 #: builtin/config.c:85
5782 msgid "respect include directives on lookup"
5783 msgstr "查询时参照 include 指令递归查找"
5785 #: builtin/config.c:86
5786 msgid "show origin of config (file, standard input, blob, command line)"
5787 msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
5789 #: builtin/config.c:328
5790 msgid "unable to parse default color value"
5793 #: builtin/config.c:469
5796 "# This is Git's per-user configuration file.\n"
5798 "# Please adapt and uncomment the following lines:\n"
5802 "# This is Git's per-user configuration file.\n"
5804 "# Please adapt and uncomment the following lines:\n"
5808 #: builtin/config.c:611
5810 msgid "cannot create configuration file %s"
5811 msgstr "不能创建配置文件 %s"
5813 #: builtin/count-objects.c:77
5814 msgid "git count-objects [-v] [-H | --human-readable]"
5815 msgstr "git count-objects [-v] [-H | --human-readable]"
5817 #: builtin/count-objects.c:87
5818 msgid "print sizes in human readable format"
5819 msgstr "以用户可读的格式显示大小"
5821 #: builtin/describe.c:17
5822 msgid "git describe [<options>] [<commit-ish>...]"
5823 msgstr "git describe [<选项>] [<提交号>...]"
5825 #: builtin/describe.c:18
5826 msgid "git describe [<options>] --dirty"
5827 msgstr "git describe [<选项>] --dirty"
5829 #: builtin/describe.c:217
5831 msgid "annotated tag %s not available"
5834 #: builtin/describe.c:221
5836 msgid "annotated tag %s has no embedded name"
5837 msgstr "附注标签 %s 没有嵌入名称"
5839 #: builtin/describe.c:223
5841 msgid "tag '%s' is really '%s' here"
5842 msgstr "标签 '%s' 的确是在 '%s'"
5844 #: builtin/describe.c:250 builtin/log.c:459
5846 msgid "Not a valid object name %s"
5847 msgstr "不是一个有效的对象名 %s"
5849 #: builtin/describe.c:253
5851 msgid "%s is not a valid '%s' object"
5852 msgstr "%s 不是一个有效的 '%s' 对象"
5854 #: builtin/describe.c:270
5856 msgid "no tag exactly matches '%s'"
5857 msgstr "没有标签准确匹配 '%s'"
5859 #: builtin/describe.c:272
5861 msgid "searching to describe %s\n"
5864 #: builtin/describe.c:319
5866 msgid "finished search at %s\n"
5869 #: builtin/describe.c:346
5872 "No annotated tags can describe '%s'.\n"
5873 "However, there were unannotated tags: try --tags."
5876 "然而,存在未附注标签:尝试 --tags。"
5878 #: builtin/describe.c:350
5881 "No tags can describe '%s'.\n"
5882 "Try --always, or create some tags."
5885 "尝试 --always,或者创建一些标签。"
5887 #: builtin/describe.c:371
5889 msgid "traversed %lu commits\n"
5890 msgstr "已遍历 %lu 个提交\n"
5892 #: builtin/describe.c:374
5895 "more than %i tags found; listed %i most recent\n"
5896 "gave up search at %s\n"
5898 "发现多于 %i 个标签,列出最近的 %i 个\n"
5901 #: builtin/describe.c:396
5902 msgid "find the tag that comes after the commit"
5905 #: builtin/describe.c:397
5906 msgid "debug search strategy on stderr"
5907 msgstr "在标准错误上调试搜索策略"
5909 #: builtin/describe.c:398
5913 #: builtin/describe.c:399
5914 msgid "use any tag, even unannotated"
5915 msgstr "使用任意标签,即使未附带注释"
5917 #: builtin/describe.c:400
5918 msgid "always use long format"
5921 #: builtin/describe.c:401
5922 msgid "only follow first parent"
5925 #: builtin/describe.c:404
5926 msgid "only output exact matches"
5929 #: builtin/describe.c:406
5930 msgid "consider <n> most recent tags (default: 10)"
5931 msgstr "考虑最近 <n> 个标签(默认:10)"
5933 #: builtin/describe.c:408
5934 msgid "only consider tags matching <pattern>"
5935 msgstr "只考虑匹配 <模式> 的标签"
5937 #: builtin/describe.c:410 builtin/name-rev.c:314
5938 msgid "show abbreviated commit object as fallback"
5939 msgstr "显示简写的提交号作为后备"
5941 #: builtin/describe.c:411
5945 #: builtin/describe.c:412
5946 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
5947 msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
5949 #: builtin/describe.c:430
5950 msgid "--long is incompatible with --abbrev=0"
5951 msgstr "--long 与 --abbrev=0 不兼容"
5953 #: builtin/describe.c:456
5954 msgid "No names found, cannot describe anything."
5955 msgstr "没有发现名称,无法描述任何东西。"
5957 #: builtin/describe.c:476
5958 msgid "--dirty is incompatible with commit-ishes"
5959 msgstr "--dirty 不能与提交同时使用"
5961 #: builtin/diff.c:86
5963 msgid "'%s': not a regular file or symlink"
5964 msgstr "'%s':不是一个正规文件或符号链接"
5966 #: builtin/diff.c:237
5968 msgid "invalid option: %s"
5971 #: builtin/diff.c:358
5972 msgid "Not a git repository"
5973 msgstr "不是一个 git 仓库"
5975 #: builtin/diff.c:401
5977 msgid "invalid object '%s' given."
5978 msgstr "提供了无效对象 '%s'。"
5980 #: builtin/diff.c:410
5982 msgid "more than two blobs given: '%s'"
5983 msgstr "提供了超过两个数据对象:'%s'"
5985 #: builtin/diff.c:417
5987 msgid "unhandled object '%s' given."
5988 msgstr "无法处理的对象 '%s'。"
5990 #: builtin/fast-export.c:25
5991 msgid "git fast-export [rev-list-opts]"
5992 msgstr "git fast-export [rev-list-opts]"
5994 #: builtin/fast-export.c:980
5995 msgid "show progress after <n> objects"
5996 msgstr "在 <n> 个对象之后显示进度"
5998 #: builtin/fast-export.c:982
5999 msgid "select handling of signed tags"
6002 #: builtin/fast-export.c:985
6003 msgid "select handling of tags that tag filtered objects"
6004 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
6006 #: builtin/fast-export.c:988
6007 msgid "Dump marks to this file"
6010 #: builtin/fast-export.c:990
6011 msgid "Import marks from this file"
6014 #: builtin/fast-export.c:992
6015 msgid "Fake a tagger when tags lack one"
6016 msgstr "当标签缺少标记者字段时,假装提供一个"
6018 #: builtin/fast-export.c:994
6019 msgid "Output full tree for each commit"
6022 #: builtin/fast-export.c:996
6023 msgid "Use the done feature to terminate the stream"
6024 msgstr "使用 done 功能来终止流"
6026 #: builtin/fast-export.c:997
6027 msgid "Skip output of blob data"
6030 #: builtin/fast-export.c:998
6034 #: builtin/fast-export.c:999
6035 msgid "Apply refspec to exported refs"
6036 msgstr "对导出的引用应用引用规格"
6038 #: builtin/fast-export.c:1000
6039 msgid "anonymize output"
6042 #: builtin/fetch.c:20
6043 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
6044 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
6046 #: builtin/fetch.c:21
6047 msgid "git fetch [<options>] <group>"
6048 msgstr "git fetch [<选项>] <组>"
6050 #: builtin/fetch.c:22
6051 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
6052 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
6054 #: builtin/fetch.c:23
6055 msgid "git fetch --all [<options>]"
6056 msgstr "git fetch --all [<选项>]"
6058 #: builtin/fetch.c:92 builtin/pull.c:166
6059 msgid "fetch from all remotes"
6062 #: builtin/fetch.c:94 builtin/pull.c:169
6063 msgid "append to .git/FETCH_HEAD instead of overwriting"
6064 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
6066 #: builtin/fetch.c:96 builtin/pull.c:172
6067 msgid "path to upload pack on remote end"
6070 #: builtin/fetch.c:97 builtin/pull.c:174
6071 msgid "force overwrite of local branch"
6074 #: builtin/fetch.c:99
6075 msgid "fetch from multiple remotes"
6078 #: builtin/fetch.c:101 builtin/pull.c:176
6079 msgid "fetch all tags and associated objects"
6080 msgstr "抓取所有的标签和关联对象"
6082 #: builtin/fetch.c:103
6083 msgid "do not fetch all tags (--no-tags)"
6084 msgstr "不抓取任何标签(--no-tags)"
6086 #: builtin/fetch.c:105
6087 msgid "number of submodules fetched in parallel"
6090 #: builtin/fetch.c:107 builtin/pull.c:179
6091 msgid "prune remote-tracking branches no longer on remote"
6092 msgstr "清除远程已经不存在的分支的跟踪分支"
6095 #: builtin/fetch.c:108 builtin/pull.c:182
6099 #: builtin/fetch.c:109 builtin/pull.c:183
6100 msgid "control recursive fetching of submodules"
6103 #: builtin/fetch.c:113 builtin/pull.c:191
6104 msgid "keep downloaded pack"
6107 #: builtin/fetch.c:115
6108 msgid "allow updating of HEAD ref"
6109 msgstr "允许更新 HEAD 引用"
6111 #: builtin/fetch.c:118 builtin/pull.c:194
6112 msgid "deepen history of shallow clone"
6115 #: builtin/fetch.c:120 builtin/pull.c:197
6116 msgid "convert to a complete repository"
6119 #: builtin/fetch.c:122 builtin/log.c:1236
6123 #: builtin/fetch.c:123
6124 msgid "prepend this to submodule path output"
6125 msgstr "在子模组路径输出的前面加上此目录"
6127 #: builtin/fetch.c:126
6128 msgid "default mode for recursion"
6131 #: builtin/fetch.c:128 builtin/pull.c:200
6132 msgid "accept refs that update .git/shallow"
6133 msgstr "接受更新 .git/shallow 的引用"
6135 #: builtin/fetch.c:129 builtin/pull.c:202
6139 #: builtin/fetch.c:130 builtin/pull.c:203
6140 msgid "specify fetch refmap"
6141 msgstr "指定获取操作的引用映射"
6143 #: builtin/fetch.c:386
6144 msgid "Couldn't find remote ref HEAD"
6145 msgstr "无法发现远程 HEAD 引用"
6147 #: builtin/fetch.c:466
6149 msgid "object %s not found"
6152 #: builtin/fetch.c:471
6153 msgid "[up to date]"
6156 #: builtin/fetch.c:485
6158 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
6159 msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
6161 #: builtin/fetch.c:486 builtin/fetch.c:574
6165 #: builtin/fetch.c:497
6166 msgid "[tag update]"
6170 #: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552
6171 msgid " (unable to update local ref)"
6172 msgstr " (不能更新本地引用)"
6174 #: builtin/fetch.c:517
6178 #: builtin/fetch.c:520
6179 msgid "[new branch]"
6182 #: builtin/fetch.c:523
6186 #: builtin/fetch.c:569
6187 msgid "unable to update local ref"
6190 #: builtin/fetch.c:569
6191 msgid "forced update"
6194 #: builtin/fetch.c:576
6195 msgid "(non-fast-forward)"
6198 #: builtin/fetch.c:610 builtin/fetch.c:851
6200 msgid "cannot open %s: %s\n"
6201 msgstr "无法打开 %s:%s\n"
6203 #: builtin/fetch.c:619
6205 msgid "%s did not send all necessary objects\n"
6206 msgstr "%s 未发送所有必须的对象\n"
6208 #: builtin/fetch.c:637
6210 msgid "reject %s because shallow roots are not allowed to be updated"
6211 msgstr "拒绝 %s 因为浅克隆不允许被更新"
6213 #: builtin/fetch.c:724 builtin/fetch.c:816
6218 #: builtin/fetch.c:735
6221 "some local refs could not be updated; try running\n"
6222 " 'git remote prune %s' to remove any old, conflicting branches"
6224 "一些本地引用不能被更新;尝试运行\n"
6225 " 'git remote prune %s' 来删除旧的、有冲突的分支"
6228 #: builtin/fetch.c:787
6230 msgid " (%s will become dangling)"
6231 msgstr " (%s 将成为摇摆状态)"
6234 #: builtin/fetch.c:788
6236 msgid " (%s has become dangling)"
6237 msgstr " (%s 已成为摇摆状态)"
6239 #: builtin/fetch.c:820
6243 #: builtin/fetch.c:821 builtin/remote.c:1025
6247 #: builtin/fetch.c:841
6249 msgid "Refusing to fetch into current branch %s of non-bare repository"
6250 msgstr "拒绝获取到非纯仓库的当前分支 %s"
6252 #: builtin/fetch.c:860
6254 msgid "Option \"%s\" value \"%s\" is not valid for %s"
6255 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
6257 #: builtin/fetch.c:863
6259 msgid "Option \"%s\" is ignored for %s\n"
6260 msgstr "选项 \"%s\" 为 %s 所忽略\n"
6262 #: builtin/fetch.c:920
6264 msgid "Don't know how to fetch from %s"
6265 msgstr "不知道如何从 %s 获取"
6267 #: builtin/fetch.c:1080
6269 msgid "Fetching %s\n"
6272 #: builtin/fetch.c:1082 builtin/remote.c:96
6274 msgid "Could not fetch %s"
6277 #: builtin/fetch.c:1100
6279 "No remote repository specified. Please, specify either a URL or a\n"
6280 "remote name from which new revisions should be fetched."
6281 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
6283 #: builtin/fetch.c:1123
6284 msgid "You need to specify a tag name."
6285 msgstr "您需要指定一个标签名称。"
6287 #: builtin/fetch.c:1165
6288 msgid "--depth and --unshallow cannot be used together"
6289 msgstr "--depth 和 --unshallow 不能同时使用"
6291 #: builtin/fetch.c:1167
6292 msgid "--unshallow on a complete repository does not make sense"
6293 msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
6295 #: builtin/fetch.c:1187
6296 msgid "fetch --all does not take a repository argument"
6297 msgstr "fetch --all 不能带一个仓库参数"
6299 #: builtin/fetch.c:1189
6300 msgid "fetch --all does not make sense with refspecs"
6301 msgstr "fetch --all 带引用规格没有任何意义"
6303 #: builtin/fetch.c:1200
6305 msgid "No such remote or remote group: %s"
6306 msgstr "没有这样的远程或远程组:%s"
6308 #: builtin/fetch.c:1208
6309 msgid "Fetching a group and specifying refspecs does not make sense"
6310 msgstr "获取组并指定引用规格没有意义"
6312 #: builtin/fmt-merge-msg.c:14
6314 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
6315 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
6317 #: builtin/fmt-merge-msg.c:667
6318 msgid "populate log with at most <n> entries from shortlog"
6319 msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
6321 #: builtin/fmt-merge-msg.c:670
6322 msgid "alias for --log (deprecated)"
6323 msgstr "参数 --log 的别名(已弃用)"
6325 #: builtin/fmt-merge-msg.c:673
6329 #: builtin/fmt-merge-msg.c:674
6330 msgid "use <text> as start of message"
6331 msgstr "使用 <文本> 作为提交说明的开始"
6333 #: builtin/fmt-merge-msg.c:675
6334 msgid "file to read from"
6337 #: builtin/for-each-ref.c:9
6338 msgid "git for-each-ref [<options>] [<pattern>]"
6339 msgstr "git for-each-ref [<选项>] [<模式>]"
6341 #: builtin/for-each-ref.c:10
6342 msgid "git for-each-ref [--points-at <object>]"
6343 msgstr "git for-each-ref [--points-at <对象>]"
6345 #: builtin/for-each-ref.c:11
6346 msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
6347 msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
6349 #: builtin/for-each-ref.c:12
6350 msgid "git for-each-ref [--contains [<object>]]"
6351 msgstr "git for-each-ref [--contains [<对象>]]"
6353 #: builtin/for-each-ref.c:27
6354 msgid "quote placeholders suitably for shells"
6355 msgstr "引用占位符适用于 shells"
6357 #: builtin/for-each-ref.c:29
6358 msgid "quote placeholders suitably for perl"
6359 msgstr "引用占位符适用于 perl"
6361 #: builtin/for-each-ref.c:31
6362 msgid "quote placeholders suitably for python"
6363 msgstr "引用占位符适用于 python"
6365 #: builtin/for-each-ref.c:33
6366 msgid "quote placeholders suitably for Tcl"
6367 msgstr "引用占位符适用于 Tcl"
6369 #: builtin/for-each-ref.c:36
6370 msgid "show only <n> matched refs"
6371 msgstr "只显示 <n> 个匹配的引用"
6373 #: builtin/for-each-ref.c:37 builtin/tag.c:372
6374 msgid "format to use for the output"
6377 #: builtin/for-each-ref.c:41
6378 msgid "print only refs which points at the given object"
6379 msgstr "只打印指向给定对象的引用"
6381 #: builtin/for-each-ref.c:43
6382 msgid "print only refs that are merged"
6385 #: builtin/for-each-ref.c:44
6386 msgid "print only refs that are not merged"
6389 #: builtin/for-each-ref.c:45
6390 msgid "print only refs which contain the commit"
6391 msgstr "只打印包含该提交的引用"
6393 #: builtin/fsck.c:156 builtin/prune.c:140
6394 msgid "Checking connectivity"
6397 #: builtin/fsck.c:486
6398 msgid "Checking object directories"
6401 #: builtin/fsck.c:553
6402 msgid "git fsck [<options>] [<object>...]"
6403 msgstr "git fsck [<选项>] [<对象>...]"
6405 #: builtin/fsck.c:559
6406 msgid "show unreachable objects"
6409 #: builtin/fsck.c:560
6410 msgid "show dangling objects"
6413 #: builtin/fsck.c:561
6417 #: builtin/fsck.c:562
6418 msgid "report root nodes"
6421 #: builtin/fsck.c:563
6422 msgid "make index objects head nodes"
6423 msgstr "将索引亦作为检查的头节点"
6425 #: builtin/fsck.c:564
6426 msgid "make reflogs head nodes (default)"
6427 msgstr "将引用日志作为检查的头节点(默认)"
6429 #: builtin/fsck.c:565
6430 msgid "also consider packs and alternate objects"
6433 #: builtin/fsck.c:566
6434 msgid "check only connectivity"
6437 #: builtin/fsck.c:567
6438 msgid "enable more strict checking"
6441 #: builtin/fsck.c:569
6442 msgid "write dangling objects in .git/lost-found"
6443 msgstr "将摇摆对象写入 .git/lost-found 中"
6445 #: builtin/fsck.c:570 builtin/prune.c:107
6446 msgid "show progress"
6449 #: builtin/fsck.c:631
6450 msgid "Checking objects"
6454 msgid "git gc [<options>]"
6455 msgstr "git gc [<选项>]"
6459 msgid "Invalid %s: '%s'"
6464 msgid "insanely long object directory %.*s"
6465 msgstr "不正常的长对象目录 %.*s"
6470 "The last gc run reported the following. Please correct the root cause\n"
6472 "Automatic cleanup will not be performed until the file is removed.\n"
6476 "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
6477 "在该文件被删除之前,自动清理将不会执行。\n"
6482 msgid "prune unreferenced objects"
6486 msgid "be more thorough (increased runtime)"
6487 msgstr "更彻底(增加运行时间)"
6490 msgid "enable auto-gc mode"
6494 msgid "force running gc even if there may be another gc running"
6495 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
6499 msgid "Auto packing the repository in background for optimum performance.\n"
6500 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6504 msgid "Auto packing the repository for optimum performance.\n"
6505 msgstr "自动打包仓库以求最佳性能。\n"
6509 msgid "See \"git help gc\" for manual housekeeping.\n"
6510 msgstr "手工维护参见 \"git help gc\"。\n"
6515 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
6517 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
6521 "There are too many unreachable loose objects; run 'git prune' to remove them."
6522 msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
6524 #: builtin/grep.c:23
6525 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
6526 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
6528 #: builtin/grep.c:219
6530 msgid "grep: failed to create thread: %s"
6531 msgstr "grep:无法创建线程:%s"
6533 #: builtin/grep.c:277
6535 msgid "invalid number of threads specified (%d) for %s"
6536 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
6538 #: builtin/grep.c:452 builtin/grep.c:487
6540 msgid "unable to read tree (%s)"
6543 #: builtin/grep.c:502
6545 msgid "unable to grep from object of type %s"
6546 msgstr "无法抓取来自于 %s 类型的对象"
6548 #: builtin/grep.c:558
6550 msgid "switch `%c' expects a numerical value"
6551 msgstr "开关 `%c' 期望一个数字值"
6553 #: builtin/grep.c:575
6555 msgid "cannot open '%s'"
6558 #: builtin/grep.c:644
6559 msgid "search in index instead of in the work tree"
6560 msgstr "在索引区搜索而不是在工作区"
6562 #: builtin/grep.c:646
6563 msgid "find in contents not managed by git"
6564 msgstr "在未被 git 管理的内容中查找"
6566 # 译者:中文字符串拼接,可删除前导空格
6567 #: builtin/grep.c:648
6568 msgid "search in both tracked and untracked files"
6569 msgstr "在跟踪和未跟踪的文件中搜索"
6571 #: builtin/grep.c:650
6572 msgid "ignore files specified via '.gitignore'"
6573 msgstr "忽略 '.gitignore' 包含的文件"
6575 #: builtin/grep.c:653
6576 msgid "show non-matching lines"
6579 #: builtin/grep.c:655
6580 msgid "case insensitive matching"
6583 #: builtin/grep.c:657
6584 msgid "match patterns only at word boundaries"
6587 #: builtin/grep.c:659
6588 msgid "process binary files as text"
6589 msgstr "把二进制文件当做文本处理"
6591 #: builtin/grep.c:661
6592 msgid "don't match patterns in binary files"
6593 msgstr "不在二进制文件中匹配模式"
6595 #: builtin/grep.c:664
6596 msgid "process binary files with textconv filters"
6597 msgstr "用 textconv 过滤器处理二进制文件"
6599 #: builtin/grep.c:666
6600 msgid "descend at most <depth> levels"
6601 msgstr "最多以指定的深度向下寻找"
6603 #: builtin/grep.c:670
6604 msgid "use extended POSIX regular expressions"
6605 msgstr "使用扩展的 POSIX 正则表达式"
6607 #: builtin/grep.c:673
6608 msgid "use basic POSIX regular expressions (default)"
6609 msgstr "使用基本的 POSIX 正则表达式(默认)"
6611 #: builtin/grep.c:676
6612 msgid "interpret patterns as fixed strings"
6613 msgstr "把模式解析为固定的字符串"
6615 #: builtin/grep.c:679
6616 msgid "use Perl-compatible regular expressions"
6617 msgstr "使用 Perl 兼容的正则表达式"
6619 #: builtin/grep.c:682
6620 msgid "show line numbers"
6623 #: builtin/grep.c:683
6624 msgid "don't show filenames"
6627 #: builtin/grep.c:684
6628 msgid "show filenames"
6631 #: builtin/grep.c:686
6632 msgid "show filenames relative to top directory"
6633 msgstr "显示相对于顶级目录的文件名"
6635 #: builtin/grep.c:688
6636 msgid "show only filenames instead of matching lines"
6637 msgstr "只显示文件名而不显示匹配的行"
6639 #: builtin/grep.c:690
6640 msgid "synonym for --files-with-matches"
6641 msgstr "和 --files-with-matches 同义"
6643 #: builtin/grep.c:693
6644 msgid "show only the names of files without match"
6647 #: builtin/grep.c:695
6648 msgid "print NUL after filenames"
6649 msgstr "在文件名后输出 NUL 字符"
6651 #: builtin/grep.c:697
6652 msgid "show the number of matches instead of matching lines"
6653 msgstr "显示总匹配行数,而不显示匹配的行"
6655 #: builtin/grep.c:698
6656 msgid "highlight matches"
6659 #: builtin/grep.c:700
6660 msgid "print empty line between matches from different files"
6661 msgstr "在不同文件的匹配项之间打印空行"
6663 #: builtin/grep.c:702
6664 msgid "show filename only once above matches from same file"
6665 msgstr "只在同一文件的匹配项的上面显示一次文件名"
6667 #: builtin/grep.c:705
6668 msgid "show <n> context lines before and after matches"
6669 msgstr "显示匹配项前后的 <n> 行上下文"
6671 #: builtin/grep.c:708
6672 msgid "show <n> context lines before matches"
6673 msgstr "显示匹配项前 <n> 行上下文"
6675 #: builtin/grep.c:710
6676 msgid "show <n> context lines after matches"
6677 msgstr "显示匹配项后 <n> 行上下文"
6679 #: builtin/grep.c:712
6680 msgid "use <n> worker threads"
6681 msgstr "使用 <n> 个工作线程"
6683 #: builtin/grep.c:713
6684 msgid "shortcut for -C NUM"
6687 #: builtin/grep.c:716
6688 msgid "show a line with the function name before matches"
6689 msgstr "在匹配的前面显示一行函数名"
6691 #: builtin/grep.c:718
6692 msgid "show the surrounding function"
6693 msgstr "显示所在函数的前后内容"
6695 #: builtin/grep.c:721
6696 msgid "read patterns from file"
6699 #: builtin/grep.c:723
6700 msgid "match <pattern>"
6703 #: builtin/grep.c:725
6704 msgid "combine patterns specified with -e"
6705 msgstr "组合用 -e 参数设定的模式"
6707 #: builtin/grep.c:737
6708 msgid "indicate hit with exit status without output"
6709 msgstr "不输出,而用退出码标识命中状态"
6711 #: builtin/grep.c:739
6712 msgid "show only matches from files that match all patterns"
6713 msgstr "只显示匹配所有模式的文件中的匹配"
6715 #: builtin/grep.c:741
6716 msgid "show parse tree for grep expression"
6717 msgstr "显示 grep 表达式的解析树"
6719 #: builtin/grep.c:745
6723 #: builtin/grep.c:745
6724 msgid "show matching files in the pager"
6727 #: builtin/grep.c:748
6728 msgid "allow calling of grep(1) (ignored by this build)"
6729 msgstr "允许调用 grep(1)(本次构建忽略)"
6731 #: builtin/grep.c:811
6732 msgid "no pattern given."
6735 #: builtin/grep.c:843 builtin/index-pack.c:1475
6737 msgid "invalid number of threads specified (%d)"
6738 msgstr "指定的线程数无效(%d)"
6740 #: builtin/grep.c:873
6741 msgid "--open-files-in-pager only works on the worktree"
6742 msgstr "--open-files-in-pager 仅用于工作区"
6744 #: builtin/grep.c:899
6745 msgid "--cached or --untracked cannot be used with --no-index."
6746 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
6748 #: builtin/grep.c:904
6749 msgid "--no-index or --untracked cannot be used with revs."
6750 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
6752 #: builtin/grep.c:907
6753 msgid "--[no-]exclude-standard cannot be used for tracked contents."
6754 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
6756 #: builtin/grep.c:915
6757 msgid "both --cached and trees are given."
6758 msgstr "同时给出了 --cached 和树对象。"
6760 #: builtin/hash-object.c:81
6762 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
6765 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
6768 #: builtin/hash-object.c:82
6769 msgid "git hash-object --stdin-paths"
6770 msgstr "git hash-object --stdin-paths"
6772 #: builtin/hash-object.c:93
6776 #: builtin/hash-object.c:93
6780 #: builtin/hash-object.c:94
6781 msgid "write the object into the object database"
6784 #: builtin/hash-object.c:96
6785 msgid "read the object from stdin"
6788 #: builtin/hash-object.c:98
6789 msgid "store file as is without filters"
6790 msgstr "原样存储文件不使用过滤器"
6792 #: builtin/hash-object.c:99
6794 "just hash any random garbage to create corrupt objects for debugging Git"
6795 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
6797 #: builtin/hash-object.c:100
6798 msgid "process file as it were from this path"
6799 msgstr "处理文件并假设其来自于此路径"
6801 #: builtin/help.c:41
6802 msgid "print all available commands"
6805 #: builtin/help.c:42
6806 msgid "print list of useful guides"
6809 #: builtin/help.c:43
6810 msgid "show man page"
6813 #: builtin/help.c:44
6814 msgid "show manual in web browser"
6815 msgstr "在 web 浏览器中显示手册"
6817 #: builtin/help.c:46
6818 msgid "show info page"
6821 #: builtin/help.c:52
6822 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
6823 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
6825 #: builtin/help.c:64
6827 msgid "unrecognized help format '%s'"
6828 msgstr "未能识别的帮助格式 '%s'"
6830 #: builtin/help.c:91
6831 msgid "Failed to start emacsclient."
6832 msgstr "无法启动 emacsclient。"
6834 #: builtin/help.c:104
6835 msgid "Failed to parse emacsclient version."
6836 msgstr "无法解析 emacsclient 版本。"
6838 #: builtin/help.c:112
6840 msgid "emacsclient version '%d' too old (< 22)."
6841 msgstr "emacsclient 版本 '%d' 太老(< 22)。"
6843 #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168
6845 msgid "failed to exec '%s': %s"
6846 msgstr "无法执行 '%s':%s"
6848 #: builtin/help.c:205
6851 "'%s': path for unsupported man viewer.\n"
6852 "Please consider using 'man.<tool>.cmd' instead."
6854 "'%s':不支持的 man 手册查看器的路径。\n"
6855 "请使用 'man.<工具>.cmd'。"
6857 #: builtin/help.c:217
6860 "'%s': cmd for supported man viewer.\n"
6861 "Please consider using 'man.<tool>.path' instead."
6863 "'%s': 支持的 man 手册查看器命令。\n"
6864 "请使用 'man.<工具>.path'。"
6866 #: builtin/help.c:334
6868 msgid "'%s': unknown man viewer."
6869 msgstr "'%s':未知的 man 查看器。"
6871 #: builtin/help.c:351
6872 msgid "no man viewer handled the request"
6873 msgstr "没有 man 查看器处理此请求"
6875 #: builtin/help.c:359
6876 msgid "no info viewer handled the request"
6877 msgstr "没有 info 查看器处理此请求"
6879 #: builtin/help.c:408
6880 msgid "Defining attributes per path"
6883 #: builtin/help.c:409
6884 msgid "Everyday Git With 20 Commands Or So"
6885 msgstr "每一天 Git 常用的约 20 条命令"
6887 #: builtin/help.c:410
6888 msgid "A Git glossary"
6891 #: builtin/help.c:411
6892 msgid "Specifies intentionally untracked files to ignore"
6895 #: builtin/help.c:412
6896 msgid "Defining submodule properties"
6899 #: builtin/help.c:413
6900 msgid "Specifying revisions and ranges for Git"
6901 msgstr "指定 Git 的版本和版本范围"
6903 #: builtin/help.c:414
6904 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6905 msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6907 #: builtin/help.c:415
6908 msgid "An overview of recommended workflows with Git"
6909 msgstr "Git 推荐的工作流概览"
6911 #: builtin/help.c:427
6912 msgid "The common Git guides are:\n"
6913 msgstr "最常用的 Git 向导有:\n"
6915 #: builtin/help.c:448 builtin/help.c:465
6920 #: builtin/help.c:481
6922 msgid "`git %s' is aliased to `%s'"
6923 msgstr "`git %s' 是 `%s' 的别名"
6925 #: builtin/index-pack.c:152
6927 msgid "unable to open %s"
6930 #: builtin/index-pack.c:202
6932 msgid "object type mismatch at %s"
6933 msgstr "%s 的对象类型不匹配"
6935 #: builtin/index-pack.c:222
6937 msgid "did not receive expected object %s"
6938 msgstr "未能获取期望的对象 %s"
6940 #: builtin/index-pack.c:225
6942 msgid "object %s: expected type %s, found %s"
6943 msgstr "对象 %s:期待类型 %s,却是 %s"
6945 #: builtin/index-pack.c:267
6947 msgid "cannot fill %d byte"
6948 msgid_plural "cannot fill %d bytes"
6949 msgstr[0] "无法填充 %d 字节"
6950 msgstr[1] "无法填充 %d 字节"
6952 #: builtin/index-pack.c:277
6954 msgstr "过早的文件结束符(EOF)"
6956 #: builtin/index-pack.c:278
6957 msgid "read error on input"
6960 #: builtin/index-pack.c:290
6961 msgid "used more bytes than were available"
6964 #: builtin/index-pack.c:297
6965 msgid "pack too large for current definition of off_t"
6966 msgstr "包太大超过了当前 off_t 的定义"
6968 #: builtin/index-pack.c:313
6970 msgid "unable to create '%s'"
6973 #: builtin/index-pack.c:318
6975 msgid "cannot open packfile '%s'"
6976 msgstr "无法打开包文件 '%s'"
6978 #: builtin/index-pack.c:332
6979 msgid "pack signature mismatch"
6982 #: builtin/index-pack.c:334
6984 msgid "pack version %<PRIu32> unsupported"
6985 msgstr "不支持包版本 %<PRIu32>"
6987 #: builtin/index-pack.c:352
6989 msgid "pack has bad object at offset %lu: %s"
6990 msgstr "包中有错误的对象位于 %lu:%s"
6992 #: builtin/index-pack.c:473
6994 msgid "inflate returned %d"
6997 #: builtin/index-pack.c:522
6998 msgid "offset value overflow for delta base object"
6999 msgstr "偏移值覆盖了 delta 基准对象"
7001 #: builtin/index-pack.c:530
7002 msgid "delta base offset is out of bound"
7003 msgstr "delta 基准偏移越界"
7005 #: builtin/index-pack.c:538
7007 msgid "unknown object type %d"
7010 #: builtin/index-pack.c:569
7011 msgid "cannot pread pack file"
7014 #: builtin/index-pack.c:571
7016 msgid "premature end of pack file, %lu byte missing"
7017 msgid_plural "premature end of pack file, %lu bytes missing"
7018 msgstr[0] "包文件过早结束,缺少 %lu 字节"
7019 msgstr[1] "包文件过早结束,缺少 %lu 字节"
7021 #: builtin/index-pack.c:597
7022 msgid "serious inflate inconsistency"
7025 #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
7026 #: builtin/index-pack.c:806 builtin/index-pack.c:815
7028 msgid "SHA1 COLLISION FOUND WITH %s !"
7029 msgstr "发现 %s 出现 SHA1 冲突!"
7031 #: builtin/index-pack.c:746 builtin/pack-objects.c:162
7032 #: builtin/pack-objects.c:254
7034 msgid "unable to read %s"
7037 #: builtin/index-pack.c:812
7039 msgid "cannot read existing object %s"
7040 msgstr "不能读取现存对象 %s"
7042 #: builtin/index-pack.c:826
7044 msgid "invalid blob object %s"
7047 #: builtin/index-pack.c:840
7052 #: builtin/index-pack.c:843
7053 msgid "Error in object"
7056 #: builtin/index-pack.c:845
7058 msgid "Not all child objects of %s are reachable"
7059 msgstr "%s 的所有子对象并非都可达"
7061 #: builtin/index-pack.c:917 builtin/index-pack.c:948
7062 msgid "failed to apply delta"
7065 #: builtin/index-pack.c:1118
7066 msgid "Receiving objects"
7069 #: builtin/index-pack.c:1118
7070 msgid "Indexing objects"
7073 #: builtin/index-pack.c:1150
7074 msgid "pack is corrupted (SHA1 mismatch)"
7075 msgstr "包冲突(SHA1 不匹配)"
7077 #: builtin/index-pack.c:1155
7078 msgid "cannot fstat packfile"
7081 #: builtin/index-pack.c:1158
7082 msgid "pack has junk at the end"
7085 #: builtin/index-pack.c:1169
7086 msgid "confusion beyond insanity in parse_pack_objects()"
7087 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
7089 #: builtin/index-pack.c:1194
7090 msgid "Resolving deltas"
7093 #: builtin/index-pack.c:1205
7095 msgid "unable to create thread: %s"
7098 #: builtin/index-pack.c:1247
7099 msgid "confusion beyond insanity"
7102 #: builtin/index-pack.c:1253
7104 msgid "completed with %d local objects"
7105 msgstr "完成 %d 个本地对象"
7107 #: builtin/index-pack.c:1263
7109 msgid "Unexpected tail checksum for %s (disk corruption?)"
7110 msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
7112 #: builtin/index-pack.c:1267
7114 msgid "pack has %d unresolved delta"
7115 msgid_plural "pack has %d unresolved deltas"
7116 msgstr[0] "包有 %d 个未解决的 delta"
7117 msgstr[1] "包有 %d 个未解决的 delta"
7119 #: builtin/index-pack.c:1291
7121 msgid "unable to deflate appended object (%d)"
7122 msgstr "不能压缩附加对象(%d)"
7124 #: builtin/index-pack.c:1367
7126 msgid "local object %s is corrupt"
7127 msgstr "本地对象 %s 已损坏"
7129 #: builtin/index-pack.c:1391
7130 msgid "error while closing pack file"
7133 #: builtin/index-pack.c:1404
7135 msgid "cannot write keep file '%s'"
7136 msgstr "无法写保留文件 '%s'"
7138 #: builtin/index-pack.c:1412
7140 msgid "cannot close written keep file '%s'"
7141 msgstr "无法关闭保留文件 '%s'"
7143 #: builtin/index-pack.c:1425
7144 msgid "cannot store pack file"
7147 #: builtin/index-pack.c:1436
7148 msgid "cannot store index file"
7151 #: builtin/index-pack.c:1469
7153 msgid "bad pack.indexversion=%<PRIu32>"
7154 msgstr "坏的 pack.indexversion=%<PRIu32>"
7156 #: builtin/index-pack.c:1479 builtin/index-pack.c:1664
7158 msgid "no threads support, ignoring %s"
7159 msgstr "没有线程支持,忽略 %s"
7161 #: builtin/index-pack.c:1538
7163 msgid "Cannot open existing pack file '%s'"
7164 msgstr "无法打开现存包文件 '%s'"
7166 #: builtin/index-pack.c:1540
7168 msgid "Cannot open existing pack idx file for '%s'"
7169 msgstr "无法为 %s 打开包索引文件"
7171 #: builtin/index-pack.c:1587
7173 msgid "non delta: %d object"
7174 msgid_plural "non delta: %d objects"
7175 msgstr[0] "非 delta:%d 个对象"
7176 msgstr[1] "非 delta:%d 个对象"
7178 #: builtin/index-pack.c:1594
7180 msgid "chain length = %d: %lu object"
7181 msgid_plural "chain length = %d: %lu objects"
7182 msgstr[0] "链长 = %d: %lu 对象"
7183 msgstr[1] "链长 = %d: %lu 对象"
7185 #: builtin/index-pack.c:1624
7186 msgid "Cannot come back to cwd"
7189 #: builtin/index-pack.c:1676 builtin/index-pack.c:1679
7190 #: builtin/index-pack.c:1691 builtin/index-pack.c:1695
7195 #: builtin/index-pack.c:1709
7196 msgid "--fix-thin cannot be used without --stdin"
7197 msgstr "--fix-thin 不能和 --stdin 同时使用"
7199 #: builtin/index-pack.c:1713 builtin/index-pack.c:1722
7201 msgid "packfile name '%s' does not end with '.pack'"
7202 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
7204 #: builtin/index-pack.c:1730
7205 msgid "--verify with no packfile name given"
7206 msgstr "--verify 没有提供包文件名参数"
7208 #: builtin/init-db.c:55
7210 msgid "cannot stat '%s'"
7211 msgstr "不能枚举 '%s' 状态"
7213 #: builtin/init-db.c:61
7215 msgid "cannot stat template '%s'"
7216 msgstr "不能枚举模版 '%s' 状态"
7218 #: builtin/init-db.c:66
7220 msgid "cannot opendir '%s'"
7221 msgstr "不能打开目录 '%s'"
7223 #: builtin/init-db.c:77
7225 msgid "cannot readlink '%s'"
7226 msgstr "不能读取链接 '%s'"
7228 #: builtin/init-db.c:79
7230 msgid "cannot symlink '%s' '%s'"
7231 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
7233 #: builtin/init-db.c:85
7235 msgid "cannot copy '%s' to '%s'"
7236 msgstr "不能拷贝 '%s' 至 '%s'"
7238 #: builtin/init-db.c:89
7240 msgid "ignoring template %s"
7243 #: builtin/init-db.c:118
7245 msgid "templates not found %s"
7248 #: builtin/init-db.c:131
7250 msgid "not copying templates of a wrong format version %d from '%s'"
7251 msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
7253 #: builtin/init-db.c:309 builtin/init-db.c:312
7255 msgid "%s already exists"
7258 #: builtin/init-db.c:340
7260 msgid "unable to handle file type %d"
7261 msgstr "不能处理 %d 类型的文件"
7263 #: builtin/init-db.c:343
7265 msgid "unable to move %s to %s"
7266 msgstr "不能移动 %s 至 %s"
7268 #. TRANSLATORS: The first '%s' is either "Reinitialized
7269 #. existing" or "Initialized empty", the second " shared" or
7270 #. "", and the last '%s%s' is the verbatim directory name.
7271 #: builtin/init-db.c:399
7273 msgid "%s%s Git repository in %s%s\n"
7274 msgstr "%s%s Git 仓库于 %s%s\n"
7276 #: builtin/init-db.c:400
7277 msgid "Reinitialized existing"
7280 #: builtin/init-db.c:400
7281 msgid "Initialized empty"
7284 # 译者:中文字符串拼接,可删除前导空格
7285 #: builtin/init-db.c:401
7289 #: builtin/init-db.c:448
7291 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
7292 "shared[=<permissions>]] [<directory>]"
7294 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
7297 #: builtin/init-db.c:471
7301 #: builtin/init-db.c:472
7302 msgid "specify that the git repository is to be shared amongst several users"
7303 msgstr "指定 git 仓库是多个用户之间共享的"
7305 #: builtin/init-db.c:506 builtin/init-db.c:511
7307 msgid "cannot mkdir %s"
7310 #: builtin/init-db.c:515
7312 msgid "cannot chdir to %s"
7315 #: builtin/init-db.c:536
7318 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
7320 msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
7322 #: builtin/init-db.c:564
7324 msgid "Cannot access work tree '%s'"
7325 msgstr "不能访问工作区 '%s'"
7327 #: builtin/interpret-trailers.c:15
7329 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
7330 "<token>[(=|:)<value>])...] [<file>...]"
7332 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
7335 #: builtin/interpret-trailers.c:26
7336 msgid "edit files in place"
7339 #: builtin/interpret-trailers.c:27
7340 msgid "trim empty trailers"
7343 #: builtin/interpret-trailers.c:28
7347 #: builtin/interpret-trailers.c:29
7348 msgid "trailer(s) to add"
7351 #: builtin/interpret-trailers.c:42
7352 msgid "no input file given for in-place editing"
7353 msgstr "没有给出要原位编辑的文件"
7356 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
7357 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
7360 msgid "git show [<options>] <object>..."
7361 msgstr "git show [<选项>] <对象>..."
7365 msgid "invalid --decorate option: %s"
7366 msgstr "无效的 --decorate 选项:%s"
7368 #: builtin/log.c:131
7369 msgid "suppress diff output"
7372 #: builtin/log.c:132
7376 #: builtin/log.c:133
7377 msgid "Use mail map file"
7380 #: builtin/log.c:134
7381 msgid "decorate options"
7384 #: builtin/log.c:137
7385 msgid "Process line range n,m in file, counting from 1"
7386 msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
7388 #: builtin/log.c:233
7390 msgid "Final output: %d %s\n"
7391 msgstr "最终输出:%d %s\n"
7393 #: builtin/log.c:465
7395 msgid "git show %s: bad file"
7396 msgstr "git show %s: 损坏的文件"
7398 #: builtin/log.c:479 builtin/log.c:572
7400 msgid "Could not read object %s"
7403 #: builtin/log.c:596
7405 msgid "Unknown type: %d"
7408 #: builtin/log.c:715
7409 msgid "format.headers without value"
7410 msgstr "format.headers 没有值"
7412 #: builtin/log.c:801
7413 msgid "name of output directory is too long"
7416 #: builtin/log.c:816
7418 msgid "Cannot open patch file %s"
7419 msgstr "无法打开补丁文件 %s"
7421 #: builtin/log.c:830
7422 msgid "Need exactly one range."
7425 #: builtin/log.c:840
7426 msgid "Not a range."
7429 #: builtin/log.c:946
7430 msgid "Cover letter needs email format"
7433 #: builtin/log.c:1025
7435 msgid "insane in-reply-to: %s"
7436 msgstr "不正常的 in-reply-to:%s"
7438 #: builtin/log.c:1053
7439 msgid "git format-patch [<options>] [<since> | <revision-range>]"
7440 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
7442 #: builtin/log.c:1098
7443 msgid "Two output directories?"
7446 #: builtin/log.c:1214
7447 msgid "use [PATCH n/m] even with a single patch"
7448 msgstr "使用 [PATCH n/m],即使只有一个补丁"
7450 #: builtin/log.c:1217
7451 msgid "use [PATCH] even with multiple patches"
7452 msgstr "使用 [PATCH],即使有多个补丁"
7454 #: builtin/log.c:1221
7455 msgid "print patches to standard out"
7458 #: builtin/log.c:1223
7459 msgid "generate a cover letter"
7462 #: builtin/log.c:1225
7463 msgid "use simple number sequence for output file names"
7464 msgstr "使用简单的数字序列作为输出文件名"
7466 #: builtin/log.c:1226
7470 #: builtin/log.c:1227
7471 msgid "use <sfx> instead of '.patch'"
7472 msgstr "使用 <后缀> 代替 '.patch'"
7474 #: builtin/log.c:1229
7475 msgid "start numbering patches at <n> instead of 1"
7476 msgstr "补丁以 <n> 开始编号,而不是1"
7478 #: builtin/log.c:1231
7479 msgid "mark the series as Nth re-roll"
7480 msgstr "标记补丁系列是第几次重制"
7482 #: builtin/log.c:1233
7483 msgid "Use [<prefix>] instead of [PATCH]"
7484 msgstr "使用 [<前缀>] 代替 [PATCH]"
7486 #: builtin/log.c:1236
7487 msgid "store resulting files in <dir>"
7488 msgstr "把结果文件存储在 <目录>"
7490 #: builtin/log.c:1239
7491 msgid "don't strip/add [PATCH]"
7492 msgstr "不删除/添加 [PATCH]"
7494 #: builtin/log.c:1242
7495 msgid "don't output binary diffs"
7498 #: builtin/log.c:1244
7499 msgid "output all-zero hash in From header"
7500 msgstr "在 From 头信息中输出全为零的哈希值"
7502 #: builtin/log.c:1246
7503 msgid "don't include a patch matching a commit upstream"
7504 msgstr "不包含已在上游提交中的补丁"
7506 #: builtin/log.c:1248
7507 msgid "show patch format instead of default (patch + stat)"
7508 msgstr "显示纯补丁格式而非默认的(补丁+状态)"
7510 #: builtin/log.c:1250
7514 #: builtin/log.c:1251
7518 #: builtin/log.c:1252
7519 msgid "add email header"
7522 #: builtin/log.c:1253 builtin/log.c:1255
7526 #: builtin/log.c:1253
7527 msgid "add To: header"
7530 #: builtin/log.c:1255
7531 msgid "add Cc: header"
7534 #: builtin/log.c:1257
7538 #: builtin/log.c:1258
7539 msgid "set From address to <ident> (or committer ident if absent)"
7540 msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
7542 #: builtin/log.c:1260
7546 #: builtin/log.c:1261
7547 msgid "make first mail a reply to <message-id>"
7548 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
7550 #: builtin/log.c:1262 builtin/log.c:1265
7554 #: builtin/log.c:1263
7555 msgid "attach the patch"
7558 #: builtin/log.c:1266
7559 msgid "inline the patch"
7562 #: builtin/log.c:1270
7563 msgid "enable message threading, styles: shallow, deep"
7564 msgstr "启用邮件线索,风格:浅,深"
7566 #: builtin/log.c:1272
7570 #: builtin/log.c:1273
7571 msgid "add a signature"
7574 #: builtin/log.c:1275
7575 msgid "add a signature from a file"
7578 #: builtin/log.c:1276
7579 msgid "don't print the patch filenames"
7582 #: builtin/log.c:1365
7583 msgid "-n and -k are mutually exclusive."
7584 msgstr "-n 和 -k 互斥。"
7586 #: builtin/log.c:1367
7587 msgid "--subject-prefix and -k are mutually exclusive."
7588 msgstr "--subject-prefix 和 -k 互斥。"
7590 #: builtin/log.c:1375
7591 msgid "--name-only does not make sense"
7592 msgstr "--name-only 无意义"
7594 #: builtin/log.c:1377
7595 msgid "--name-status does not make sense"
7596 msgstr "--name-status 无意义"
7598 #: builtin/log.c:1379
7599 msgid "--check does not make sense"
7600 msgstr "--check 无意义"
7602 #: builtin/log.c:1407
7603 msgid "standard output, or directory, which one?"
7604 msgstr "标准输出或目录,哪一个?"
7606 #: builtin/log.c:1409
7608 msgid "Could not create directory '%s'"
7609 msgstr "不能创建目录 '%s'"
7611 #: builtin/log.c:1506
7613 msgid "unable to read signature file '%s'"
7614 msgstr "无法读取签名文件 '%s'"
7616 #: builtin/log.c:1569
7617 msgid "Failed to create output files"
7620 #: builtin/log.c:1617
7621 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
7622 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
7624 #: builtin/log.c:1671
7627 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
7628 msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
7630 #: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696
7632 msgid "Unknown commit %s"
7635 #: builtin/ls-files.c:378
7636 msgid "git ls-files [<options>] [<file>...]"
7637 msgstr "git ls-files [<选项>] [<文件>...]"
7639 #: builtin/ls-files.c:427
7640 msgid "identify the file status with tags"
7643 #: builtin/ls-files.c:429
7644 msgid "use lowercase letters for 'assume unchanged' files"
7645 msgstr "使用小写字母表示 '假设未改变的' 文件"
7647 #: builtin/ls-files.c:431
7648 msgid "show cached files in the output (default)"
7649 msgstr "显示缓存的文件(默认)"
7651 #: builtin/ls-files.c:433
7652 msgid "show deleted files in the output"
7655 #: builtin/ls-files.c:435
7656 msgid "show modified files in the output"
7659 #: builtin/ls-files.c:437
7660 msgid "show other files in the output"
7663 #: builtin/ls-files.c:439
7664 msgid "show ignored files in the output"
7667 #: builtin/ls-files.c:442
7668 msgid "show staged contents' object name in the output"
7669 msgstr "显示暂存区内容的对象名称"
7671 #: builtin/ls-files.c:444
7672 msgid "show files on the filesystem that need to be removed"
7673 msgstr "显示文件系统需要删除的文件"
7675 #: builtin/ls-files.c:446
7676 msgid "show 'other' directories' names only"
7677 msgstr "只显示“其他”目录的名称"
7679 #: builtin/ls-files.c:448
7680 msgid "show line endings of files"
7683 #: builtin/ls-files.c:450
7684 msgid "don't show empty directories"
7687 #: builtin/ls-files.c:453
7688 msgid "show unmerged files in the output"
7691 #: builtin/ls-files.c:455
7692 msgid "show resolve-undo information"
7693 msgstr "显示 resolve-undo 信息"
7695 #: builtin/ls-files.c:457
7696 msgid "skip files matching pattern"
7699 #: builtin/ls-files.c:460
7700 msgid "exclude patterns are read from <file>"
7701 msgstr "从 <文件> 中读取排除模式"
7703 #: builtin/ls-files.c:463
7704 msgid "read additional per-directory exclude patterns in <file>"
7705 msgstr "从 <文件> 读取额外的每个目录的排除模式"
7707 #: builtin/ls-files.c:465
7708 msgid "add the standard git exclusions"
7709 msgstr "添加标准的 git 排除"
7711 #: builtin/ls-files.c:468
7712 msgid "make the output relative to the project top directory"
7713 msgstr "显示相对于顶级目录的文件名"
7715 #: builtin/ls-files.c:471
7716 msgid "if any <file> is not in the index, treat this as an error"
7717 msgstr "如果任何 <文件> 都不在索引区,视为错误"
7719 #: builtin/ls-files.c:472
7723 #: builtin/ls-files.c:473
7724 msgid "pretend that paths removed since <tree-ish> are still present"
7725 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
7727 #: builtin/ls-files.c:475
7728 msgid "show debugging data"
7731 #: builtin/ls-remote.c:7
7733 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7734 " [-q | --quiet] [--exit-code] [--get-url]\n"
7735 " [--symref] [<repository> [<refs>...]]"
7737 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7738 " [-q | --quiet] [--exit-code] [--get-url]\n"
7739 " [--symref] [<仓库> [<引用>...]]"
7741 #: builtin/ls-remote.c:50
7742 msgid "do not print remote URL"
7745 #: builtin/ls-remote.c:51 builtin/ls-remote.c:53
7749 #: builtin/ls-remote.c:52 builtin/ls-remote.c:54
7750 msgid "path of git-upload-pack on the remote host"
7751 msgstr "远程主机上的 git-upload-pack 路径"
7753 #: builtin/ls-remote.c:56
7754 msgid "limit to tags"
7757 #: builtin/ls-remote.c:57
7758 msgid "limit to heads"
7761 #: builtin/ls-remote.c:58
7762 msgid "do not show peeled tags"
7765 #: builtin/ls-remote.c:60
7766 msgid "take url.<base>.insteadOf into account"
7767 msgstr "参考 url.<base>.insteadOf 设置"
7769 #: builtin/ls-remote.c:62
7770 msgid "exit with exit code 2 if no matching refs are found"
7771 msgstr "若未找到匹配的引用则以退出码2退出"
7773 #: builtin/ls-remote.c:64
7774 msgid "show underlying ref in addition to the object pointed by it"
7775 msgstr "除了显示指向的对象外,显示指向的引用名"
7777 #: builtin/ls-tree.c:28
7778 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
7779 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
7781 #: builtin/ls-tree.c:128
7782 msgid "only show trees"
7785 #: builtin/ls-tree.c:130
7786 msgid "recurse into subtrees"
7789 #: builtin/ls-tree.c:132
7790 msgid "show trees when recursing"
7793 #: builtin/ls-tree.c:135
7794 msgid "terminate entries with NUL byte"
7795 msgstr "条目以 NUL 字符终止"
7797 #: builtin/ls-tree.c:136
7798 msgid "include object size"
7801 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
7802 msgid "list only filenames"
7805 #: builtin/ls-tree.c:143
7806 msgid "use full path names"
7809 #: builtin/ls-tree.c:145
7810 msgid "list entire tree; not just current directory (implies --full-name)"
7811 msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
7813 #: builtin/merge.c:45
7814 msgid "git merge [<options>] [<commit>...]"
7815 msgstr "git merge [<选项>] [<提交>...]"
7817 #: builtin/merge.c:46
7818 msgid "git merge [<options>] <msg> HEAD <commit>"
7819 msgstr "git merge [<选项>] <说明> HEAD <提交>"
7821 #: builtin/merge.c:47
7822 msgid "git merge --abort"
7823 msgstr "git merge --abort"
7825 #: builtin/merge.c:100
7826 msgid "switch `m' requires a value"
7827 msgstr "开关 `m' 需要一个值"
7829 #: builtin/merge.c:137
7831 msgid "Could not find merge strategy '%s'.\n"
7832 msgstr "不能找到合并策略 '%s'。\n"
7834 #: builtin/merge.c:138
7836 msgid "Available strategies are:"
7839 #: builtin/merge.c:143
7841 msgid "Available custom strategies are:"
7844 #: builtin/merge.c:193 builtin/pull.c:123
7845 msgid "do not show a diffstat at the end of the merge"
7846 msgstr "在合并的最后不显示差异统计"
7848 #: builtin/merge.c:196 builtin/pull.c:126
7849 msgid "show a diffstat at the end of the merge"
7850 msgstr "在合并的最后显示差异统计"
7852 #: builtin/merge.c:197 builtin/pull.c:129
7853 msgid "(synonym to --stat)"
7854 msgstr "(和 --stat 同义)"
7856 #: builtin/merge.c:199 builtin/pull.c:132
7857 msgid "add (at most <n>) entries from shortlog to merge commit message"
7858 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
7860 #: builtin/merge.c:202 builtin/pull.c:135
7861 msgid "create a single commit instead of doing a merge"
7862 msgstr "创建一个单独的提交而不是做一次合并"
7864 #: builtin/merge.c:204 builtin/pull.c:138
7865 msgid "perform a commit if the merge succeeds (default)"
7866 msgstr "如果合并成功,执行一次提交(默认)"
7868 #: builtin/merge.c:206 builtin/pull.c:141
7869 msgid "edit message before committing"
7872 #: builtin/merge.c:207
7873 msgid "allow fast-forward (default)"
7876 #: builtin/merge.c:209 builtin/pull.c:147
7877 msgid "abort if fast-forward is not possible"
7878 msgstr "如果不能快进就放弃合并"
7880 #: builtin/merge.c:213
7881 msgid "Verify that the named commit has a valid GPG signature"
7882 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7884 #: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152
7885 #: builtin/revert.c:89
7889 #: builtin/merge.c:215 builtin/pull.c:153
7890 msgid "merge strategy to use"
7893 #: builtin/merge.c:216 builtin/pull.c:156
7894 msgid "option=value"
7895 msgstr "option=value"
7897 #: builtin/merge.c:217 builtin/pull.c:157
7898 msgid "option for selected merge strategy"
7901 #: builtin/merge.c:219
7902 msgid "merge commit message (for a non-fast-forward merge)"
7903 msgstr "合并的提交说明(针对非快进式合并)"
7905 #: builtin/merge.c:223
7906 msgid "abort the current in-progress merge"
7907 msgstr "放弃当前正在进行的合并"
7909 #: builtin/merge.c:251
7910 msgid "could not run stash."
7913 #: builtin/merge.c:256
7914 msgid "stash failed"
7917 #: builtin/merge.c:261
7919 msgid "not a valid object: %s"
7920 msgstr "不是一个有效对象:%s"
7922 #: builtin/merge.c:280 builtin/merge.c:297
7923 msgid "read-tree failed"
7927 #: builtin/merge.c:327
7928 msgid " (nothing to squash)"
7931 #: builtin/merge.c:340
7933 msgid "Squash commit -- not updating HEAD\n"
7934 msgstr "压缩提交 -- 未更新 HEAD\n"
7936 #: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976
7937 #: builtin/merge.c:989
7939 msgid "Could not write to '%s'"
7942 #: builtin/merge.c:372
7943 msgid "Writing SQUASH_MSG"
7944 msgstr "写入 SQUASH_MSG"
7946 #: builtin/merge.c:374
7947 msgid "Finishing SQUASH_MSG"
7948 msgstr "完成 SQUASH_MSG"
7950 #: builtin/merge.c:397
7952 msgid "No merge message -- not updating HEAD\n"
7953 msgstr "无合并信息 -- 未更新 HEAD\n"
7955 #: builtin/merge.c:448
7957 msgid "'%s' does not point to a commit"
7958 msgstr "'%s' 没有指向一个提交"
7960 #: builtin/merge.c:538
7962 msgid "Bad branch.%s.mergeoptions string: %s"
7963 msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
7965 #: builtin/merge.c:657
7966 msgid "Not handling anything other than two heads merge."
7967 msgstr "不能处理两个头合并之外的任何操作。"
7969 #: builtin/merge.c:671
7971 msgid "Unknown option for merge-recursive: -X%s"
7972 msgstr "merge-recursive 的未知选项:-X%s"
7974 #: builtin/merge.c:684
7976 msgid "unable to write %s"
7979 #: builtin/merge.c:773
7981 msgid "Could not read from '%s'"
7982 msgstr "不能从 '%s' 读取"
7984 #: builtin/merge.c:782
7986 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7987 msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7989 #: builtin/merge.c:788
7992 "Please enter a commit message to explain why this merge is necessary,\n"
7993 "especially if it merges an updated upstream into a topic branch.\n"
7995 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
7998 "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
8001 "以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
8003 #: builtin/merge.c:812
8004 msgid "Empty commit message."
8007 #: builtin/merge.c:824
8009 msgid "Wonderful.\n"
8012 #: builtin/merge.c:879
8014 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
8015 msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
8017 #: builtin/merge.c:895
8019 msgid "'%s' is not a commit"
8020 msgstr "'%s' 不是一个提交"
8022 #: builtin/merge.c:936
8023 msgid "No current branch."
8026 #: builtin/merge.c:938
8027 msgid "No remote for the current branch."
8028 msgstr "当前分支没有对应的远程仓库。"
8030 #: builtin/merge.c:940
8031 msgid "No default upstream defined for the current branch."
8032 msgstr "当前分支没有定义默认的上游分支。"
8034 #: builtin/merge.c:945
8036 msgid "No remote-tracking branch for %s from %s"
8037 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
8039 #: builtin/merge.c:1080
8041 msgid "could not close '%s'"
8044 #: builtin/merge.c:1207
8045 msgid "There is no merge to abort (MERGE_HEAD missing)."
8046 msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
8048 #: builtin/merge.c:1223
8050 "You have not concluded your merge (MERGE_HEAD exists).\n"
8051 "Please, commit your changes before you merge."
8053 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
8056 #: builtin/merge.c:1230
8058 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
8059 "Please, commit your changes before you merge."
8061 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
8064 #: builtin/merge.c:1233
8065 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
8066 msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
8068 #: builtin/merge.c:1242
8069 msgid "You cannot combine --squash with --no-ff."
8070 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
8072 #: builtin/merge.c:1250
8073 msgid "No commit specified and merge.defaultToUpstream not set."
8074 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
8076 #: builtin/merge.c:1267
8077 msgid "Squash commit into empty head not supported yet"
8078 msgstr "尚不支持到空分支的压缩提交"
8080 #: builtin/merge.c:1269
8081 msgid "Non-fast-forward commit does not make sense into an empty head"
8082 msgstr "到空分支的非快进式提交没有意义"
8084 #: builtin/merge.c:1275
8086 msgid "%s - not something we can merge"
8089 #: builtin/merge.c:1277
8090 msgid "Can merge only exactly one commit into empty head"
8091 msgstr "只能将一个提交合并到空分支上"
8093 #: builtin/merge.c:1332
8095 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
8096 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
8098 #: builtin/merge.c:1335
8100 msgid "Commit %s has a bad GPG signature allegedly by %s."
8101 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
8103 #: builtin/merge.c:1338
8105 msgid "Commit %s does not have a GPG signature."
8106 msgstr "提交 %s 没有一个 GPG 签名。"
8108 #: builtin/merge.c:1341
8110 msgid "Commit %s has a good GPG signature by %s\n"
8111 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
8113 #: builtin/merge.c:1424
8115 msgid "Updating %s..%s\n"
8116 msgstr "更新 %s..%s\n"
8118 #: builtin/merge.c:1461
8120 msgid "Trying really trivial in-index merge...\n"
8121 msgstr "尝试非常小的索引内合并...\n"
8123 #: builtin/merge.c:1468
8128 #: builtin/merge.c:1500
8129 msgid "Not possible to fast-forward, aborting."
8132 #: builtin/merge.c:1523 builtin/merge.c:1602
8134 msgid "Rewinding the tree to pristine...\n"
8135 msgstr "将树回滚至原始状态...\n"
8137 #: builtin/merge.c:1527
8139 msgid "Trying merge strategy %s...\n"
8140 msgstr "尝试合并策略 %s...\n"
8142 #: builtin/merge.c:1593
8144 msgid "No merge strategy handled the merge.\n"
8145 msgstr "没有合并策略处理此合并。\n"
8147 #: builtin/merge.c:1595
8149 msgid "Merge with strategy %s failed.\n"
8150 msgstr "使用策略 %s 合并失败。\n"
8152 #: builtin/merge.c:1604
8154 msgid "Using the %s to prepare resolving by hand.\n"
8155 msgstr "使用 %s 以准备手工解决。\n"
8157 #: builtin/merge.c:1616
8159 msgid "Automatic merge went well; stopped before committing as requested\n"
8160 msgstr "自动合并进展顺利,按要求在提交前停止\n"
8162 #: builtin/merge-base.c:29
8163 msgid "git merge-base [-a | --all] <commit> <commit>..."
8164 msgstr "git merge-base [-a | --all] <提交> <提交>..."
8166 #: builtin/merge-base.c:30
8167 msgid "git merge-base [-a | --all] --octopus <commit>..."
8168 msgstr "git merge-base [-a | --all] --octopus <提交>..."
8170 #: builtin/merge-base.c:31
8171 msgid "git merge-base --independent <commit>..."
8172 msgstr "git merge-base --independent <提交>..."
8174 #: builtin/merge-base.c:32
8175 msgid "git merge-base --is-ancestor <commit> <commit>"
8176 msgstr "git merge-base --is-ancestor <提交> <提交>"
8178 #: builtin/merge-base.c:33
8179 msgid "git merge-base --fork-point <ref> [<commit>]"
8180 msgstr "git merge-base --fork-point <引用> [<提交>]"
8182 #: builtin/merge-base.c:214
8183 msgid "output all common ancestors"
8186 #: builtin/merge-base.c:216
8187 msgid "find ancestors for a single n-way merge"
8188 msgstr "查找一个多路合并的祖先提交"
8190 #: builtin/merge-base.c:218
8191 msgid "list revs not reachable from others"
8192 msgstr "显示不能被其他访问到的版本"
8194 #: builtin/merge-base.c:220
8195 msgid "is the first one ancestor of the other?"
8196 msgstr "第一个是其他的祖先提交么?"
8198 #: builtin/merge-base.c:222
8199 msgid "find where <commit> forked from reflog of <ref>"
8200 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
8202 #: builtin/merge-file.c:8
8204 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
8205 "<orig-file> <file2>"
8207 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
8210 #: builtin/merge-file.c:33
8211 msgid "send results to standard output"
8214 #: builtin/merge-file.c:34
8215 msgid "use a diff3 based merge"
8216 msgstr "使用基于 diff3 的合并"
8218 #: builtin/merge-file.c:35
8219 msgid "for conflicts, use our version"
8220 msgstr "如果冲突,使用我们的版本"
8222 #: builtin/merge-file.c:37
8223 msgid "for conflicts, use their version"
8224 msgstr "如果冲突,使用他们的版本"
8226 #: builtin/merge-file.c:39
8227 msgid "for conflicts, use a union version"
8228 msgstr "如果冲突,使用联合版本"
8230 #: builtin/merge-file.c:42
8231 msgid "for conflicts, use this marker size"
8232 msgstr "如果冲突,使用指定长度的标记"
8234 #: builtin/merge-file.c:43
8235 msgid "do not warn about conflicts"
8238 #: builtin/merge-file.c:45
8239 msgid "set labels for file1/orig-file/file2"
8240 msgstr "为 文件1/初始文件/文件2 设置标签"
8242 #: builtin/mktree.c:65
8243 msgid "git mktree [-z] [--missing] [--batch]"
8244 msgstr "git mktree [-z] [--missing] [--batch]"
8246 #: builtin/mktree.c:152
8247 msgid "input is NUL terminated"
8248 msgstr "输入以 NUL 字符终止"
8250 #: builtin/mktree.c:153 builtin/write-tree.c:24
8251 msgid "allow missing objects"
8254 #: builtin/mktree.c:154
8255 msgid "allow creation of more than one tree"
8259 msgid "git mv [<options>] <source>... <destination>"
8260 msgstr "git mv [<选项>] <源>... <目标>"
8264 msgid "Directory %s is in index and no submodule?"
8265 msgstr "目录 %s 在索引中并且不是子模组?"
8268 msgid "Please stage your changes to .gitmodules or stash them to proceed"
8269 msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
8273 msgid "%.*s is in index"
8277 msgid "force move/rename even if target exists"
8278 msgstr "强制移动/重命令,即使目标存在"
8281 msgid "skip move/rename errors"
8286 msgid "destination '%s' is not a directory"
8287 msgstr "目标 '%s' 不是一个目录"
8291 msgid "Checking rename of '%s' to '%s'\n"
8292 msgstr "检查 '%s' 到 '%s' 的重命名\n"
8299 msgid "can not move directory into itself"
8303 msgid "cannot move directory over file"
8307 msgid "source directory is empty"
8311 msgid "not under version control"
8315 msgid "destination exists"
8320 msgid "overwriting '%s'"
8324 msgid "Cannot overwrite"
8328 msgid "multiple sources for the same target"
8332 msgid "destination directory does not exist"
8337 msgid "%s, source=%s, destination=%s"
8338 msgstr "%s,源=%s,目标=%s"
8342 msgid "Renaming %s to %s\n"
8343 msgstr "重命名 %s 至 %s\n"
8345 #: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365
8347 msgid "renaming '%s' failed"
8348 msgstr "重命名 '%s' 失败"
8350 #: builtin/name-rev.c:251
8351 msgid "git name-rev [<options>] <commit>..."
8352 msgstr "git name-rev [<选项>] <提交>..."
8354 #: builtin/name-rev.c:252
8355 msgid "git name-rev [<options>] --all"
8356 msgstr "git name-rev [<选项>] --all"
8358 #: builtin/name-rev.c:253
8359 msgid "git name-rev [<options>] --stdin"
8360 msgstr "git name-rev [<选项>] --stdin"
8362 #: builtin/name-rev.c:305
8363 msgid "print only names (no SHA-1)"
8364 msgstr "只打印名称(无 SHA-1)"
8366 #: builtin/name-rev.c:306
8367 msgid "only use tags to name the commits"
8370 #: builtin/name-rev.c:308
8371 msgid "only use refs matching <pattern>"
8372 msgstr "只使用和 <模式> 相匹配的引用"
8374 #: builtin/name-rev.c:310
8375 msgid "list all commits reachable from all refs"
8376 msgstr "列出可以从所有引用访问的提交"
8378 #: builtin/name-rev.c:311
8379 msgid "read from stdin"
8382 #: builtin/name-rev.c:312
8383 msgid "allow to print `undefined` names (default)"
8384 msgstr "允许打印 `未定义` 的名称(默认)"
8386 #: builtin/name-rev.c:318
8387 msgid "dereference tags in the input (internal use)"
8388 msgstr "反向解析输入中的标签(内部使用)"
8390 #: builtin/notes.c:25
8391 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
8392 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
8394 #: builtin/notes.c:26
8396 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
8397 "| (-c | -C) <object>] [<object>]"
8399 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
8400 "| (-c | -C) <对象>] [<对象>]"
8402 #: builtin/notes.c:27
8403 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
8404 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
8406 #: builtin/notes.c:28
8408 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
8409 "(-c | -C) <object>] [<object>]"
8411 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
8412 "(-c | -C) <对象>] [<对象>]"
8414 #: builtin/notes.c:29
8415 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
8416 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
8418 #: builtin/notes.c:30
8419 msgid "git notes [--ref <notes-ref>] show [<object>]"
8420 msgstr "git notes [--ref <注解引用>] show [<对象>]"
8422 #: builtin/notes.c:31
8424 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
8425 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
8427 #: builtin/notes.c:32
8428 msgid "git notes merge --commit [-v | -q]"
8429 msgstr "git notes merge --commit [-v | -q]"
8431 #: builtin/notes.c:33
8432 msgid "git notes merge --abort [-v | -q]"
8433 msgstr "git notes merge --abort [-v | -q]"
8435 #: builtin/notes.c:34
8436 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
8437 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
8439 #: builtin/notes.c:35
8440 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
8441 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
8443 #: builtin/notes.c:36
8444 msgid "git notes [--ref <notes-ref>] get-ref"
8445 msgstr "git notes [--ref <注解引用>] get-ref"
8447 #: builtin/notes.c:41
8448 msgid "git notes [list [<object>]]"
8449 msgstr "git notes [list [<对象>]]"
8451 #: builtin/notes.c:46
8452 msgid "git notes add [<options>] [<object>]"
8453 msgstr "git notes add [<选项>] [<对象>]"
8455 #: builtin/notes.c:51
8456 msgid "git notes copy [<options>] <from-object> <to-object>"
8457 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
8459 #: builtin/notes.c:52
8460 msgid "git notes copy --stdin [<from-object> <to-object>]..."
8461 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
8463 #: builtin/notes.c:57
8464 msgid "git notes append [<options>] [<object>]"
8465 msgstr "git notes append [<选项>] [<对象>]"
8467 #: builtin/notes.c:62
8468 msgid "git notes edit [<object>]"
8469 msgstr "git notes edit [<对象>]"
8471 #: builtin/notes.c:67
8472 msgid "git notes show [<object>]"
8473 msgstr "git notes show [<对象>]"
8475 #: builtin/notes.c:72
8476 msgid "git notes merge [<options>] <notes-ref>"
8477 msgstr "git notes merge [<选项>] <注解引用>"
8479 #: builtin/notes.c:73
8480 msgid "git notes merge --commit [<options>]"
8481 msgstr "git notes merge --commit [<选项>]"
8483 #: builtin/notes.c:74
8484 msgid "git notes merge --abort [<options>]"
8485 msgstr "git notes merge --abort [<选项>]"
8487 #: builtin/notes.c:79
8488 msgid "git notes remove [<object>]"
8489 msgstr "git notes remove [<对象>]"
8491 #: builtin/notes.c:84
8492 msgid "git notes prune [<options>]"
8493 msgstr "git notes prune [<选项>]"
8495 #: builtin/notes.c:89
8496 msgid "git notes get-ref"
8497 msgstr "git notes get-ref"
8499 #: builtin/notes.c:147
8501 msgid "unable to start 'show' for object '%s'"
8502 msgstr "不能为对象 '%s' 开始 'show'"
8504 #: builtin/notes.c:151
8505 msgid "could not read 'show' output"
8506 msgstr "不能读取 'show' 的输出"
8508 #: builtin/notes.c:159
8510 msgid "failed to finish 'show' for object '%s'"
8511 msgstr "无法为对象 '%s' 完成 'show'"
8513 #: builtin/notes.c:174 builtin/tag.c:248
8515 msgid "could not create file '%s'"
8516 msgstr "不能创建文件 '%s'"
8518 #: builtin/notes.c:193
8519 msgid "Please supply the note contents using either -m or -F option"
8520 msgstr "请通过 -m 或 -F 选项为注解提供内容"
8522 #: builtin/notes.c:202
8523 msgid "unable to write note object"
8526 #: builtin/notes.c:204
8528 msgid "The note contents have been left in %s"
8529 msgstr "注解内容被留在 %s 中"
8531 #: builtin/notes.c:232 builtin/tag.c:440
8533 msgid "cannot read '%s'"
8536 #: builtin/notes.c:234 builtin/tag.c:443
8538 msgid "could not open or read '%s'"
8539 msgstr "不能打开或读取 '%s'"
8541 #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
8542 #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510
8543 #: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656
8544 #: builtin/notes.c:880 builtin/tag.c:456
8546 msgid "Failed to resolve '%s' as a valid ref."
8547 msgstr "无法解析 '%s' 为一个有效引用。"
8549 #: builtin/notes.c:256
8551 msgid "Failed to read object '%s'."
8552 msgstr "无法读取对象 '%s'。"
8554 #: builtin/notes.c:260
8556 msgid "Cannot read note data from non-blob object '%s'."
8557 msgstr "不能从非数据对象 '%s' 中读取注解数据"
8559 #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493
8560 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649
8561 #: builtin/notes.c:945
8562 msgid "too many parameters"
8565 #: builtin/notes.c:375 builtin/notes.c:662
8567 msgid "No note found for object %s."
8568 msgstr "未发现对象 %s 的注解。"
8570 #: builtin/notes.c:396 builtin/notes.c:559
8571 msgid "note contents as a string"
8572 msgstr "注解内容作为一个字符串"
8574 #: builtin/notes.c:399 builtin/notes.c:562
8575 msgid "note contents in a file"
8578 #: builtin/notes.c:402 builtin/notes.c:565
8579 msgid "reuse and edit specified note object"
8580 msgstr "重用和编辑指定的注解对象"
8582 #: builtin/notes.c:405 builtin/notes.c:568
8583 msgid "reuse specified note object"
8586 #: builtin/notes.c:408 builtin/notes.c:571
8587 msgid "allow storing empty note"
8590 #: builtin/notes.c:409 builtin/notes.c:480
8591 msgid "replace existing notes"
8594 #: builtin/notes.c:434
8597 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
8599 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8601 #: builtin/notes.c:449 builtin/notes.c:528
8603 msgid "Overwriting existing notes for object %s\n"
8604 msgstr "覆盖对象 %s 现存注解\n"
8606 #: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885
8608 msgid "Removing note for object %s\n"
8609 msgstr "删除对象 %s 的注解\n"
8611 #: builtin/notes.c:481
8612 msgid "read objects from stdin"
8615 #: builtin/notes.c:483
8616 msgid "load rewriting config for <command> (implies --stdin)"
8617 msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
8619 #: builtin/notes.c:501
8620 msgid "too few parameters"
8623 #: builtin/notes.c:522
8626 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
8628 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
8630 #: builtin/notes.c:534
8632 msgid "Missing notes on source object %s. Cannot copy."
8633 msgstr "源对象 %s 缺少注解。不能拷贝。"
8635 #: builtin/notes.c:586
8638 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
8639 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
8641 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
8642 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
8644 #: builtin/notes.c:767
8645 msgid "General options"
8648 #: builtin/notes.c:769
8649 msgid "Merge options"
8652 #: builtin/notes.c:771
8654 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
8656 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
8658 #: builtin/notes.c:773
8659 msgid "Committing unmerged notes"
8662 #: builtin/notes.c:775
8663 msgid "finalize notes merge by committing unmerged notes"
8664 msgstr "通过提交未合并的注解来完成注解合并"
8666 #: builtin/notes.c:777
8667 msgid "Aborting notes merge resolution"
8670 #: builtin/notes.c:779
8671 msgid "abort notes merge"
8674 #: builtin/notes.c:856
8676 msgid "A notes merge into %s is already in-progress at %s"
8677 msgstr "一个到 %s 的注解合并已经在 %s 执行中"
8679 #: builtin/notes.c:883
8681 msgid "Object %s has no note\n"
8682 msgstr "对象 %s 没有注解\n"
8684 #: builtin/notes.c:895
8685 msgid "attempt to remove non-existent note is not an error"
8686 msgstr "尝试删除不存在的注解不是一个错误"
8688 #: builtin/notes.c:898
8689 msgid "read object names from the standard input"
8690 msgstr "从标准输入读取对象名称"
8692 #: builtin/notes.c:979
8696 #: builtin/notes.c:980
8697 msgid "use notes from <notes-ref>"
8698 msgstr "从 <注解引用> 使用注解"
8700 #: builtin/notes.c:1015 builtin/remote.c:1626
8702 msgid "Unknown subcommand: %s"
8705 #: builtin/pack-objects.c:28
8707 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
8708 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
8710 #: builtin/pack-objects.c:29
8712 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
8713 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
8715 #: builtin/pack-objects.c:175 builtin/pack-objects.c:178
8717 msgid "deflate error (%d)"
8720 #: builtin/pack-objects.c:772
8721 msgid "Writing objects"
8724 #: builtin/pack-objects.c:1012
8725 msgid "disabling bitmap writing, as some objects are not being packed"
8726 msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
8728 #: builtin/pack-objects.c:2172
8729 msgid "Compressing objects"
8732 #: builtin/pack-objects.c:2558
8734 msgid "unsupported index version %s"
8735 msgstr "不支持的索引版本 %s"
8737 #: builtin/pack-objects.c:2562
8739 msgid "bad index version '%s'"
8740 msgstr "坏的索引版本 '%s'"
8742 #: builtin/pack-objects.c:2592
8743 msgid "do not show progress meter"
8746 #: builtin/pack-objects.c:2594
8747 msgid "show progress meter"
8750 #: builtin/pack-objects.c:2596
8751 msgid "show progress meter during object writing phase"
8752 msgstr "在对象写入阶段显示进度表"
8754 #: builtin/pack-objects.c:2599
8755 msgid "similar to --all-progress when progress meter is shown"
8756 msgstr "当进度表显示时类似于 --all-progress"
8758 #: builtin/pack-objects.c:2600
8759 msgid "version[,offset]"
8762 #: builtin/pack-objects.c:2601
8763 msgid "write the pack index file in the specified idx format version"
8764 msgstr "用指定的 idx 格式版本来写包索引文件"
8766 #: builtin/pack-objects.c:2604
8767 msgid "maximum size of each output pack file"
8770 #: builtin/pack-objects.c:2606
8771 msgid "ignore borrowed objects from alternate object store"
8772 msgstr "忽略从备用对象存储里借用对象"
8774 #: builtin/pack-objects.c:2608
8775 msgid "ignore packed objects"
8778 #: builtin/pack-objects.c:2610
8779 msgid "limit pack window by objects"
8782 #: builtin/pack-objects.c:2612
8783 msgid "limit pack window by memory in addition to object limit"
8784 msgstr "除对象数量限制外设置打包窗口的内存限制"
8786 #: builtin/pack-objects.c:2614
8787 msgid "maximum length of delta chain allowed in the resulting pack"
8788 msgstr "打包允许的 delta 链的最大长度"
8790 #: builtin/pack-objects.c:2616
8791 msgid "reuse existing deltas"
8792 msgstr "重用已存在的 deltas"
8794 #: builtin/pack-objects.c:2618
8795 msgid "reuse existing objects"
8798 #: builtin/pack-objects.c:2620
8799 msgid "use OFS_DELTA objects"
8800 msgstr "使用 OFS_DELTA 对象"
8802 #: builtin/pack-objects.c:2622
8803 msgid "use threads when searching for best delta matches"
8804 msgstr "使用线程查询最佳 delta 匹配"
8806 #: builtin/pack-objects.c:2624
8807 msgid "do not create an empty pack output"
8810 #: builtin/pack-objects.c:2626
8811 msgid "read revision arguments from standard input"
8812 msgstr "从标准输入读取版本号参数"
8814 #: builtin/pack-objects.c:2628
8815 msgid "limit the objects to those that are not yet packed"
8816 msgstr "限制那些尚未打包的对象"
8818 #: builtin/pack-objects.c:2631
8819 msgid "include objects reachable from any reference"
8820 msgstr "包括可以从任何引用访问到的对象"
8822 #: builtin/pack-objects.c:2634
8823 msgid "include objects referred by reflog entries"
8824 msgstr "包括被引用日志引用到的对象"
8826 #: builtin/pack-objects.c:2637
8827 msgid "include objects referred to by the index"
8828 msgstr "包括被索引引用到的对象"
8830 #: builtin/pack-objects.c:2640
8831 msgid "output pack to stdout"
8834 #: builtin/pack-objects.c:2642
8835 msgid "include tag objects that refer to objects to be packed"
8836 msgstr "包括那些引用了待打包对象的标签对象"
8838 #: builtin/pack-objects.c:2644
8839 msgid "keep unreachable objects"
8842 #: builtin/pack-objects.c:2645 parse-options.h:142
8846 #: builtin/pack-objects.c:2646
8847 msgid "unpack unreachable objects newer than <time>"
8848 msgstr "将比给定 <时间> 新的无法访问的对象解包"
8850 #: builtin/pack-objects.c:2649
8851 msgid "create thin packs"
8854 #: builtin/pack-objects.c:2651
8855 msgid "create packs suitable for shallow fetches"
8856 msgstr "创建适合浅克隆仓库获取的包"
8858 #: builtin/pack-objects.c:2653
8859 msgid "ignore packs that have companion .keep file"
8860 msgstr "忽略配有 .keep 文件的包"
8862 #: builtin/pack-objects.c:2655
8863 msgid "pack compression level"
8866 #: builtin/pack-objects.c:2657
8867 msgid "do not hide commits by grafts"
8870 #: builtin/pack-objects.c:2659
8871 msgid "use a bitmap index if available to speed up counting objects"
8872 msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8874 #: builtin/pack-objects.c:2661
8875 msgid "write a bitmap index together with the pack index"
8876 msgstr "在建立包索引的同时创建 bitmap 索引"
8878 #: builtin/pack-objects.c:2752
8879 msgid "Counting objects"
8882 #: builtin/pack-refs.c:6
8883 msgid "git pack-refs [<options>]"
8884 msgstr "git pack-refs [<选项>]"
8886 #: builtin/pack-refs.c:14
8887 msgid "pack everything"
8890 #: builtin/pack-refs.c:15
8891 msgid "prune loose refs (default)"
8892 msgstr "清除松散的引用(默认)"
8894 #: builtin/prune-packed.c:7
8895 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8896 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
8898 #: builtin/prune-packed.c:40
8899 msgid "Removing duplicate objects"
8902 #: builtin/prune.c:11
8903 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
8904 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
8906 #: builtin/prune.c:105 builtin/worktree.c:124
8907 msgid "do not remove, show only"
8910 #: builtin/prune.c:106 builtin/worktree.c:125
8911 msgid "report pruned objects"
8914 #: builtin/prune.c:109 builtin/worktree.c:127
8915 msgid "expire objects older than <time>"
8916 msgstr "使早于给定时间的对象过期"
8918 #: builtin/prune.c:123
8919 msgid "cannot prune in a precious-objects repo"
8920 msgstr "不能在珍品仓库中执行清理操作"
8922 #: builtin/pull.c:72
8923 msgid "git pull [<options>] [<repository> [<refspec>...]]"
8924 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
8926 #: builtin/pull.c:117
8927 msgid "Options related to merging"
8930 #: builtin/pull.c:120
8931 msgid "incorporate changes by rebasing rather than merging"
8932 msgstr "使用变基操作取代合并操作以合入修改"
8934 #: builtin/pull.c:144 builtin/revert.c:105
8935 msgid "allow fast-forward"
8938 #: builtin/pull.c:150
8939 msgid "verify that the named commit has a valid GPG signature"
8940 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
8942 #: builtin/pull.c:164
8943 msgid "Options related to fetching"
8946 #: builtin/pull.c:186
8947 msgid "number of submodules pulled in parallel"
8948 msgstr "并发拉取的子模组的数量"
8950 #: builtin/pull.c:275
8952 msgid "Invalid value for pull.ff: %s"
8953 msgstr "pull.ff 的取值无效:%s"
8955 #: builtin/pull.c:359
8956 msgid "Cannot pull with rebase: You have unstaged changes."
8957 msgstr "无法通过变基方式拉取:您有未暂存的变更。"
8959 #: builtin/pull.c:365
8960 msgid "Additionally, your index contains uncommitted changes."
8961 msgstr "而且您的索引中包含未提交的变更。"
8963 #: builtin/pull.c:367
8964 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
8965 msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
8967 #: builtin/pull.c:443
8969 "There is no candidate for rebasing against among the refs that you just "
8971 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
8973 #: builtin/pull.c:445
8975 "There are no candidates for merging among the refs that you just fetched."
8976 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
8978 #: builtin/pull.c:446
8980 "Generally this means that you provided a wildcard refspec which had no\n"
8981 "matches on the remote end."
8982 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
8984 #: builtin/pull.c:449
8987 "You asked to pull from the remote '%s', but did not specify\n"
8988 "a branch. Because this is not the default configured remote\n"
8989 "for your current branch, you must specify a branch on the command line."
8991 "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
8992 "分支默认的远程仓库,您必须在命令行中指定一个分支名。"
8994 #: builtin/pull.c:454
8995 msgid "You are not currently on a branch."
8996 msgstr "您当前不在一个分支上。"
8998 #: builtin/pull.c:456 builtin/pull.c:471
8999 msgid "Please specify which branch you want to rebase against."
9000 msgstr "请指定您要变基到哪一个分支。"
9002 #: builtin/pull.c:458 builtin/pull.c:473
9003 msgid "Please specify which branch you want to merge with."
9004 msgstr "请指定您要合并哪一个分支。"
9006 #: builtin/pull.c:459 builtin/pull.c:474
9007 msgid "See git-pull(1) for details."
9008 msgstr "详见 git-pull(1)。"
9010 #: builtin/pull.c:469
9011 msgid "There is no tracking information for the current branch."
9012 msgstr "当前分支没有跟踪信息。"
9014 #: builtin/pull.c:478
9017 "If you wish to set tracking information for this branch you can do so with:\n"
9019 " git branch --set-upstream-to=%s/<branch> %s\n"
9021 "如果您想要为此分支创建跟踪信息,您可以执行:\n"
9023 " git branch --set-upstream-to=%s/<branch> %s\n"
9025 #: builtin/pull.c:483
9028 "Your configuration specifies to merge with the ref '%s'\n"
9029 "from the remote, but no such ref was fetched."
9031 "您的配置中指定要合并远程的引用 '%s',\n"
9034 #: builtin/pull.c:841
9035 msgid "Updating an unborn branch with changes added to the index."
9036 msgstr "更新尚未诞生的分支,变更添加至索引。"
9038 #: builtin/pull.c:870
9041 "fetch updated the current branch head.\n"
9042 "fast-forwarding your working tree from\n"
9045 "fetch 更新了当前的分支。快进您的工作区\n"
9048 #: builtin/pull.c:875
9051 "Cannot fast-forward your working tree.\n"
9052 "After making sure that you saved anything precious from\n"
9055 "$ git reset --hard\n"
9058 "您当前的工作区无法执行快进操作。\n"
9061 "以确认所有有用的数据均已保存。然后执行下面的命令\n"
9062 "$ git reset --hard\n"
9065 #: builtin/pull.c:890
9066 msgid "Cannot merge multiple branches into empty head."
9067 msgstr "无法将多个分支合并到空分支。"
9069 #: builtin/pull.c:894
9070 msgid "Cannot rebase onto multiple branches."
9073 #: builtin/push.c:16
9074 msgid "git push [<options>] [<repository> [<refspec>...]]"
9075 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
9077 #: builtin/push.c:89
9078 msgid "tag shorthand without <tag>"
9079 msgstr "标签后面未提供 <标签> 参数"
9081 #: builtin/push.c:99
9082 msgid "--delete only accepts plain target ref names"
9083 msgstr "--delete 只接受简单的目标引用名"
9085 #: builtin/push.c:143
9088 "To choose either option permanently, see push.default in 'git help config'."
9091 "为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
9093 #: builtin/push.c:146
9096 "The upstream branch of your current branch does not match\n"
9097 "the name of your current branch. To push to the upstream branch\n"
9098 "on the remote, use\n"
9100 " git push %s HEAD:%s\n"
9102 "To push to the branch of the same name on the remote, use\n"
9107 "如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
9110 " git push %s HEAD:%s\n"
9117 #: builtin/push.c:161
9120 "You are not currently on a branch.\n"
9121 "To push the history leading to the current (detached HEAD)\n"
9124 " git push %s HEAD:<name-of-remote-branch>\n"
9127 "现在为推送当前(分离头指针)的历史,使用\n"
9129 " git push %s HEAD:<远程分支名字>\n"
9131 #: builtin/push.c:175
9134 "The current branch %s has no upstream branch.\n"
9135 "To push the current branch and set the remote as upstream, use\n"
9137 " git push --set-upstream %s %s\n"
9139 "当前分支 %s 没有对应的上游分支。\n"
9140 "为推送当前分支并建立与远程上游的跟踪,使用\n"
9142 " git push --set-upstream %s %s\n"
9144 #: builtin/push.c:183
9146 msgid "The current branch %s has multiple upstream branches, refusing to push."
9147 msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
9149 #: builtin/push.c:186
9152 "You are pushing to remote '%s', which is not the upstream of\n"
9153 "your current branch '%s', without telling me what to push\n"
9154 "to update which remote branch."
9156 "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
9157 "而没有告诉我要推送什么、更新哪个远程分支。"
9159 #: builtin/push.c:242
9161 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
9162 msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
9164 #: builtin/push.c:249
9166 "Updates were rejected because the tip of your current branch is behind\n"
9167 "its remote counterpart. Integrate the remote changes (e.g.\n"
9168 "'git pull ...') before pushing again.\n"
9169 "See the 'Note about fast-forwards' in 'git push --help' for details."
9171 "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
9172 "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
9173 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9175 #: builtin/push.c:255
9177 "Updates were rejected because a pushed branch tip is behind its remote\n"
9178 "counterpart. Check out this branch and integrate the remote changes\n"
9179 "(e.g. 'git pull ...') before pushing again.\n"
9180 "See the 'Note about fast-forwards' in 'git push --help' for details."
9182 "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
9183 "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
9184 "'git push --help' 中的 'Note about fast-forwards' 小节。"
9186 #: builtin/push.c:261
9188 "Updates were rejected because the remote contains work that you do\n"
9189 "not have locally. This is usually caused by another repository pushing\n"
9190 "to the same ref. You may want to first integrate the remote changes\n"
9191 "(e.g., 'git pull ...') before pushing again.\n"
9192 "See the 'Note about fast-forwards' in 'git push --help' for details."
9194 "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
9195 "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
9196 "(如 'git pull ...')。\n"
9197 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
9199 #: builtin/push.c:268
9200 msgid "Updates were rejected because the tag already exists in the remote."
9201 msgstr "更新被拒绝,因为该标签在远程已经存在。"
9203 #: builtin/push.c:271
9205 "You cannot update a remote ref that points at a non-commit object,\n"
9206 "or update a remote ref to make it point at a non-commit object,\n"
9207 "without using the '--force' option.\n"
9209 "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
9210 "也不能更新远程引用让其指向一个非提交对象。\n"
9212 #: builtin/push.c:331
9214 msgid "Pushing to %s\n"
9217 #: builtin/push.c:335
9219 msgid "failed to push some refs to '%s'"
9220 msgstr "无法推送一些引用到 '%s'"
9222 #: builtin/push.c:365
9224 msgid "bad repository '%s'"
9227 #: builtin/push.c:366
9229 "No configured push destination.\n"
9230 "Either specify the URL from the command-line or configure a remote "
9231 "repository using\n"
9233 " git remote add <name> <url>\n"
9235 "and then push using the remote name\n"
9237 " git push <name>\n"
9240 "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
9242 " git remote add <名称> <地址>\n"
9248 #: builtin/push.c:381
9249 msgid "--all and --tags are incompatible"
9250 msgstr "--all 和 --tags 不兼容"
9252 #: builtin/push.c:382
9253 msgid "--all can't be combined with refspecs"
9254 msgstr "--all 不能和引用规格同时使用"
9256 #: builtin/push.c:387
9257 msgid "--mirror and --tags are incompatible"
9258 msgstr "--mirror 和 --tags 不兼容"
9260 #: builtin/push.c:388
9261 msgid "--mirror can't be combined with refspecs"
9262 msgstr "--mirror 不能和引用规格同时使用"
9264 #: builtin/push.c:393
9265 msgid "--all and --mirror are incompatible"
9266 msgstr "--all 和 --mirror 不兼容"
9268 #: builtin/push.c:505
9272 #: builtin/push.c:506 builtin/send-pack.c:161
9273 msgid "push all refs"
9276 #: builtin/push.c:507 builtin/send-pack.c:163
9277 msgid "mirror all refs"
9280 #: builtin/push.c:509
9284 #: builtin/push.c:510
9285 msgid "push tags (can't be used with --all or --mirror)"
9286 msgstr "推送标签(不能使用 --all or --mirror)"
9288 #: builtin/push.c:513 builtin/send-pack.c:164
9289 msgid "force updates"
9292 #: builtin/push.c:515 builtin/send-pack.c:175
9293 msgid "refname>:<expect"
9296 #: builtin/push.c:516 builtin/send-pack.c:176
9297 msgid "require old value of ref to be at this value"
9298 msgstr "要求引用旧的取值为设定值"
9300 #: builtin/push.c:519
9301 msgid "control recursive pushing of submodules"
9304 #: builtin/push.c:521 builtin/send-pack.c:169
9305 msgid "use thin pack"
9308 #: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158
9309 #: builtin/send-pack.c:159
9310 msgid "receive pack program"
9313 #: builtin/push.c:524
9314 msgid "set upstream for git pull/status"
9315 msgstr "设置 git pull/status 的上游"
9317 #: builtin/push.c:527
9318 msgid "prune locally removed refs"
9321 #: builtin/push.c:529
9322 msgid "bypass pre-push hook"
9323 msgstr "绕过 pre-push 钩子"
9325 #: builtin/push.c:530
9326 msgid "push missing but relevant tags"
9329 #: builtin/push.c:533 builtin/send-pack.c:166
9330 msgid "GPG sign the push"
9331 msgstr "用 GPG 为推送签名"
9333 #: builtin/push.c:535 builtin/send-pack.c:170
9334 msgid "request atomic transaction on remote side"
9337 #: builtin/push.c:549
9338 msgid "--delete is incompatible with --all, --mirror and --tags"
9339 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
9341 #: builtin/push.c:551
9342 msgid "--delete doesn't make sense without any refs"
9343 msgstr "--delete 未接任何引用没有意义"
9345 #: builtin/read-tree.c:37
9347 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
9348 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9349 "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
9351 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
9352 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
9353 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
9355 #: builtin/read-tree.c:110
9356 msgid "write resulting index to <file>"
9357 msgstr "将索引结果写入 <文件>"
9359 #: builtin/read-tree.c:113
9360 msgid "only empty the index"
9363 #: builtin/read-tree.c:115
9367 #: builtin/read-tree.c:117
9368 msgid "perform a merge in addition to a read"
9369 msgstr "读取之余再执行一个合并"
9371 #: builtin/read-tree.c:119
9372 msgid "3-way merge if no file level merging required"
9373 msgstr "如果没有文件级合并需要,执行三方合并"
9375 #: builtin/read-tree.c:121
9376 msgid "3-way merge in presence of adds and removes"
9377 msgstr "存在添加和删除时,也执行三方合并"
9379 #: builtin/read-tree.c:123
9380 msgid "same as -m, but discard unmerged entries"
9381 msgstr "类似于 -m,但丢弃未合并的条目"
9383 #: builtin/read-tree.c:124
9384 msgid "<subdirectory>/"
9387 #: builtin/read-tree.c:125
9388 msgid "read the tree into the index under <subdirectory>/"
9389 msgstr "读取树对象到索引的 <子目录>/ 下"
9391 #: builtin/read-tree.c:128
9392 msgid "update working tree with merge result"
9393 msgstr "用合并的结果更新工作区"
9395 #: builtin/read-tree.c:130
9399 #: builtin/read-tree.c:131
9400 msgid "allow explicitly ignored files to be overwritten"
9401 msgstr "允许忽略文件中设定的文件可以被覆盖"
9403 #: builtin/read-tree.c:134
9404 msgid "don't check the working tree after merging"
9407 #: builtin/read-tree.c:135
9408 msgid "don't update the index or the work tree"
9411 #: builtin/read-tree.c:137
9412 msgid "skip applying sparse checkout filter"
9413 msgstr "跳过应用稀疏检出过滤器"
9415 #: builtin/read-tree.c:139
9416 msgid "debug unpack-trees"
9417 msgstr "调试 unpack-trees"
9419 #: builtin/reflog.c:423
9421 msgid "'%s' for '%s' is not a valid timestamp"
9422 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
9424 #: builtin/reflog.c:540 builtin/reflog.c:545
9426 msgid "'%s' is not a valid timestamp"
9427 msgstr "'%s' 不是一个有效的时间戳"
9429 #: builtin/remote.c:12
9430 msgid "git remote [-v | --verbose]"
9431 msgstr "git remote [-v | --verbose]"
9433 #: builtin/remote.c:13
9435 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
9436 "mirror=<fetch|push>] <name> <url>"
9438 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
9439 "mirror=<fetch|push>] <名称> <地址>"
9441 #: builtin/remote.c:14 builtin/remote.c:34
9442 msgid "git remote rename <old> <new>"
9443 msgstr "git remote rename <旧名称> <新名称>"
9445 #: builtin/remote.c:15 builtin/remote.c:39
9446 msgid "git remote remove <name>"
9447 msgstr "git remote remove <名称>"
9449 #: builtin/remote.c:16 builtin/remote.c:44
9450 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
9451 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
9453 #: builtin/remote.c:17
9454 msgid "git remote [-v | --verbose] show [-n] <name>"
9455 msgstr "git remote [-v | --verbose] show [-n] <名称>"
9457 #: builtin/remote.c:18
9458 msgid "git remote prune [-n | --dry-run] <name>"
9459 msgstr "git remote prune [-n | --dry-run] <名称>"
9461 #: builtin/remote.c:19
9463 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
9464 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
9466 #: builtin/remote.c:20
9467 msgid "git remote set-branches [--add] <name> <branch>..."
9468 msgstr "git remote set-branches [--add] <名称> <分支>..."
9470 #: builtin/remote.c:21 builtin/remote.c:70
9471 msgid "git remote get-url [--push] [--all] <name>"
9472 msgstr "git remote get-url [--push] [--all] <名称>"
9474 #: builtin/remote.c:22 builtin/remote.c:75
9475 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
9476 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
9478 #: builtin/remote.c:23 builtin/remote.c:76
9479 msgid "git remote set-url --add <name> <newurl>"
9480 msgstr "git remote set-url --add <名称> <新的地址>"
9482 #: builtin/remote.c:24 builtin/remote.c:77
9483 msgid "git remote set-url --delete <name> <url>"
9484 msgstr "git remote set-url --delete <名称> <地址>"
9486 #: builtin/remote.c:29
9487 msgid "git remote add [<options>] <name> <url>"
9488 msgstr "git remote add [<选项>] <名称> <地址>"
9490 #: builtin/remote.c:49
9491 msgid "git remote set-branches <name> <branch>..."
9492 msgstr "git remote set-branches <名称> <分支>..."
9494 #: builtin/remote.c:50
9495 msgid "git remote set-branches --add <name> <branch>..."
9496 msgstr "git remote set-branches --add <名称> <分支>..."
9498 #: builtin/remote.c:55
9499 msgid "git remote show [<options>] <name>"
9500 msgstr "git remote show [<选项>] <名称>"
9502 #: builtin/remote.c:60
9503 msgid "git remote prune [<options>] <name>"
9504 msgstr "git remote prune [<选项>] <名称>"
9506 #: builtin/remote.c:65
9507 msgid "git remote update [<options>] [<group> | <remote>]..."
9508 msgstr "git remote update [<选项>] [<组> | <远程>]..."
9510 #: builtin/remote.c:94
9515 #: builtin/remote.c:126
9517 "--mirror is dangerous and deprecated; please\n"
9518 "\t use --mirror=fetch or --mirror=push instead"
9520 "--mirror 选项危险且过时,请使用 --mirror=fetch\n"
9521 "\t 或 --mirror=push"
9523 #: builtin/remote.c:143
9525 msgid "unknown mirror argument: %s"
9528 #: builtin/remote.c:159
9529 msgid "fetch the remote branches"
9532 #: builtin/remote.c:161
9533 msgid "import all tags and associated objects when fetching"
9534 msgstr "抓取时导入所有的标签和关联对象"
9536 #: builtin/remote.c:164
9537 msgid "or do not fetch any tag at all (--no-tags)"
9538 msgstr "或不抓取任何标签(--no-tags)"
9540 #: builtin/remote.c:166
9541 msgid "branch(es) to track"
9544 #: builtin/remote.c:167
9545 msgid "master branch"
9548 #: builtin/remote.c:168
9552 #: builtin/remote.c:169
9553 msgid "set up remote as a mirror to push to or fetch from"
9554 msgstr "把远程设置为用以推送或抓取的镜像"
9556 #: builtin/remote.c:181
9557 msgid "specifying a master branch makes no sense with --mirror"
9558 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
9560 #: builtin/remote.c:183
9561 msgid "specifying branches to track makes sense only with fetch mirrors"
9562 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
9564 #: builtin/remote.c:190 builtin/remote.c:633
9566 msgid "remote %s already exists."
9567 msgstr "远程 %s 已经存在。"
9569 #: builtin/remote.c:194 builtin/remote.c:637
9571 msgid "'%s' is not a valid remote name"
9572 msgstr "'%s' 不是一个有效的远程名称"
9574 #: builtin/remote.c:234
9576 msgid "Could not setup master '%s'"
9577 msgstr "无法设置 master '%s'"
9579 #: builtin/remote.c:336
9581 msgid "Could not get fetch map for refspec %s"
9582 msgstr "无法得到引用规格 %s 的获取列表"
9584 #: builtin/remote.c:437 builtin/remote.c:445
9588 #: builtin/remote.c:449
9592 #: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858
9594 msgid "No such remote: %s"
9597 #: builtin/remote.c:643
9599 msgid "Could not rename config section '%s' to '%s'"
9600 msgstr "不能重命名配置小节 '%s' 到 '%s'"
9602 #: builtin/remote.c:663
9605 "Not updating non-default fetch refspec\n"
9607 "\tPlease update the configuration manually if necessary."
9613 #: builtin/remote.c:699
9615 msgid "deleting '%s' failed"
9618 #: builtin/remote.c:733
9620 msgid "creating '%s' failed"
9623 #: builtin/remote.c:796
9625 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
9626 "to delete it, use:"
9628 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
9629 "to delete them, use:"
9630 msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
9631 msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
9633 #: builtin/remote.c:810
9635 msgid "Could not remove config section '%s'"
9636 msgstr "不能移除配置小节 '%s'"
9638 #: builtin/remote.c:911
9640 msgid " new (next fetch will store in remotes/%s)"
9641 msgstr " 新的(下一次获取将存储于 remotes/%s)"
9643 #: builtin/remote.c:914
9647 #: builtin/remote.c:916
9648 msgid " stale (use 'git remote prune' to remove)"
9649 msgstr " 过时(使用 'git remote prune' 来移除)"
9651 #: builtin/remote.c:918
9655 #: builtin/remote.c:959
9657 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
9658 msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
9660 #: builtin/remote.c:967
9662 msgid "rebases interactively onto remote %s"
9663 msgstr "交互式变基到远程 %s"
9665 #: builtin/remote.c:971
9667 msgid " merges with remote %s"
9670 #: builtin/remote.c:972
9671 msgid " and with remote"
9674 #: builtin/remote.c:974
9676 msgid "merges with remote %s"
9679 #: builtin/remote.c:975
9680 msgid " and with remote"
9683 #: builtin/remote.c:1021
9687 #: builtin/remote.c:1024
9691 #: builtin/remote.c:1028
9695 #: builtin/remote.c:1031
9696 msgid "fast-forwardable"
9699 #: builtin/remote.c:1034
9700 msgid "local out of date"
9703 #: builtin/remote.c:1041
9705 msgid " %-*s forces to %-*s (%s)"
9706 msgstr " %-*s 强制推送至 %-*s (%s)"
9708 #: builtin/remote.c:1044
9710 msgid " %-*s pushes to %-*s (%s)"
9711 msgstr " %-*s 推送至 %-*s (%s)"
9713 #: builtin/remote.c:1048
9715 msgid " %-*s forces to %s"
9716 msgstr " %-*s 强制推送至 %s"
9718 #: builtin/remote.c:1051
9720 msgid " %-*s pushes to %s"
9721 msgstr " %-*s 推送至 %s"
9723 #: builtin/remote.c:1119
9724 msgid "do not query remotes"
9727 #: builtin/remote.c:1146
9732 #: builtin/remote.c:1147
9734 msgid " Fetch URL: %s"
9737 #: builtin/remote.c:1148 builtin/remote.c:1299
9741 #: builtin/remote.c:1157 builtin/remote.c:1159
9743 msgid " Push URL: %s"
9746 #: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165
9748 msgid " HEAD branch: %s"
9749 msgstr " HEAD 分支:%s"
9751 #: builtin/remote.c:1167
9754 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
9755 msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
9757 #: builtin/remote.c:1179
9759 msgid " Remote branch:%s"
9760 msgid_plural " Remote branches:%s"
9761 msgstr[0] " 远程分支:%s"
9762 msgstr[1] " 远程分支:%s"
9764 # 译者:中文字符串拼接,可删除前导空格
9765 #: builtin/remote.c:1182 builtin/remote.c:1209
9766 msgid " (status not queried)"
9769 #: builtin/remote.c:1191
9770 msgid " Local branch configured for 'git pull':"
9771 msgid_plural " Local branches configured for 'git pull':"
9772 msgstr[0] " 为 'git pull' 配置的本地分支:"
9773 msgstr[1] " 为 'git pull' 配置的本地分支:"
9775 #: builtin/remote.c:1199
9776 msgid " Local refs will be mirrored by 'git push'"
9777 msgstr " 本地引用将在 'git push' 时被镜像"
9779 #: builtin/remote.c:1206
9781 msgid " Local ref configured for 'git push'%s:"
9782 msgid_plural " Local refs configured for 'git push'%s:"
9783 msgstr[0] " 为 'git push' 配置的本地引用%s:"
9784 msgstr[1] " 为 'git push' 配置的本地引用%s:"
9786 #: builtin/remote.c:1227
9787 msgid "set refs/remotes/<name>/HEAD according to remote"
9788 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
9790 #: builtin/remote.c:1229
9791 msgid "delete refs/remotes/<name>/HEAD"
9792 msgstr "删除 refs/remotes/<名称>/HEAD"
9794 #: builtin/remote.c:1244
9795 msgid "Cannot determine remote HEAD"
9796 msgstr "无法确定远程 HEAD"
9798 #: builtin/remote.c:1246
9799 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
9800 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
9802 #: builtin/remote.c:1256
9804 msgid "Could not delete %s"
9807 #: builtin/remote.c:1264
9809 msgid "Not a valid ref: %s"
9810 msgstr "不是一个有效引用:%s"
9812 #: builtin/remote.c:1266
9814 msgid "Could not setup %s"
9818 #: builtin/remote.c:1284
9820 msgid " %s will become dangling!"
9821 msgstr " %s 将成为摇摆状态!"
9824 #: builtin/remote.c:1285
9826 msgid " %s has become dangling!"
9827 msgstr " %s 已成为摇摆状态!"
9829 #: builtin/remote.c:1295
9834 #: builtin/remote.c:1296
9839 #: builtin/remote.c:1312
9841 msgid " * [would prune] %s"
9842 msgstr " * [将删除] %s"
9844 #: builtin/remote.c:1315
9846 msgid " * [pruned] %s"
9847 msgstr " * [已删除] %s"
9849 #: builtin/remote.c:1360
9850 msgid "prune remotes after fetching"
9853 #: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545
9855 msgid "No such remote '%s'"
9858 #: builtin/remote.c:1439
9862 #: builtin/remote.c:1446
9863 msgid "no remote specified"
9866 #: builtin/remote.c:1463
9867 msgid "query push URLs rather than fetch URLs"
9868 msgstr "查询推送 URL 地址,而非获取 URL 地址"
9870 #: builtin/remote.c:1465
9871 msgid "return all URLs"
9872 msgstr "返回所有 URL 地址"
9874 #: builtin/remote.c:1493
9876 msgid "no URLs configured for remote '%s'"
9877 msgstr "没有给远程仓库 '%s' 设定 URL"
9879 #: builtin/remote.c:1519
9880 msgid "manipulate push URLs"
9883 #: builtin/remote.c:1521
9887 #: builtin/remote.c:1523
9891 #: builtin/remote.c:1530
9892 msgid "--add --delete doesn't make sense"
9893 msgstr "--add --delete 无意义"
9895 #: builtin/remote.c:1571
9897 msgid "Invalid old URL pattern: %s"
9898 msgstr "无效的旧 URL 匹配模版:%s"
9900 #: builtin/remote.c:1579
9902 msgid "No such URL found: %s"
9903 msgstr "未找到此 URL:%s"
9905 #: builtin/remote.c:1581
9906 msgid "Will not delete all non-push URLs"
9907 msgstr "将不会删除所有非推送 URL 地址"
9909 #: builtin/remote.c:1595
9910 msgid "be verbose; must be placed before a subcommand"
9911 msgstr "冗长输出;必须置于子命令之前"
9913 #: builtin/repack.c:17
9914 msgid "git repack [<options>]"
9915 msgstr "git repack [<选项>]"
9917 #: builtin/repack.c:159
9918 msgid "pack everything in a single pack"
9919 msgstr "所有内容打包到一个包文件中"
9921 #: builtin/repack.c:161
9922 msgid "same as -a, and turn unreachable objects loose"
9923 msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9925 #: builtin/repack.c:164
9926 msgid "remove redundant packs, and run git-prune-packed"
9927 msgstr "删除多余的包,运行 git-prune-packed"
9929 #: builtin/repack.c:166
9930 msgid "pass --no-reuse-delta to git-pack-objects"
9931 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9933 #: builtin/repack.c:168
9934 msgid "pass --no-reuse-object to git-pack-objects"
9935 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9937 #: builtin/repack.c:170
9938 msgid "do not run git-update-server-info"
9939 msgstr "不运行 git-update-server-info"
9941 #: builtin/repack.c:173
9942 msgid "pass --local to git-pack-objects"
9943 msgstr "向 git-pack-objects 传递参数 --local"
9945 #: builtin/repack.c:175
9946 msgid "write bitmap index"
9947 msgstr "写 bitmap 索引"
9949 #: builtin/repack.c:176
9953 #: builtin/repack.c:177
9954 msgid "with -A, do not loosen objects older than this"
9955 msgstr "使用 -A,不要将早于给定时间的对象过期"
9957 #: builtin/repack.c:179
9958 msgid "size of the window used for delta compression"
9961 #: builtin/repack.c:180 builtin/repack.c:184
9965 #: builtin/repack.c:181
9966 msgid "same as the above, but limit memory size instead of entries count"
9967 msgstr "和上面的相似,但限制内存大小而非条目数"
9969 #: builtin/repack.c:183
9970 msgid "limits the maximum delta depth"
9973 #: builtin/repack.c:185
9974 msgid "maximum size of each packfile"
9977 #: builtin/repack.c:187
9978 msgid "repack objects in packs marked with .keep"
9979 msgstr "对标记为 .keep 的包中的对象重新打包"
9981 #: builtin/repack.c:197
9982 msgid "cannot delete packs in a precious-objects repo"
9983 msgstr "不能删除珍品仓库中的打包文件"
9985 #: builtin/repack.c:381
9987 msgid "removing '%s' failed"
9990 #: builtin/replace.c:19
9991 msgid "git replace [-f] <object> <replacement>"
9992 msgstr "git replace [-f] <对象> <替换物>"
9994 #: builtin/replace.c:20
9995 msgid "git replace [-f] --edit <object>"
9996 msgstr "git replace [-f] --edit <对象>"
9998 #: builtin/replace.c:21
9999 msgid "git replace [-f] --graft <commit> [<parent>...]"
10000 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
10002 #: builtin/replace.c:22
10003 msgid "git replace -d <object>..."
10004 msgstr "git replace -d <对象>..."
10006 #: builtin/replace.c:23
10007 msgid "git replace [--format=<format>] [-l [<pattern>]]"
10008 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
10010 #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
10012 msgid "Not a valid object name: '%s'"
10013 msgstr "不是一个有效的对象名:'%s'"
10015 #: builtin/replace.c:355
10017 msgid "bad mergetag in commit '%s'"
10018 msgstr "提交 '%s' 中含有损坏的合并标签"
10020 #: builtin/replace.c:357
10022 msgid "malformed mergetag in commit '%s'"
10023 msgstr "提交 '%s' 中含有非法的合并标签"
10025 #: builtin/replace.c:368
10028 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
10029 "instead of --graft"
10030 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
10032 #: builtin/replace.c:401
10034 msgid "the original commit '%s' has a gpg signature."
10035 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
10037 #: builtin/replace.c:402
10038 msgid "the signature will be removed in the replacement commit!"
10039 msgstr "在替换的提交中签名将被移除!"
10041 #: builtin/replace.c:408
10043 msgid "could not write replacement commit for: '%s'"
10044 msgstr "不能为 '%s' 写替换提交"
10046 #: builtin/replace.c:432
10047 msgid "list replace refs"
10050 #: builtin/replace.c:433
10051 msgid "delete replace refs"
10054 #: builtin/replace.c:434
10055 msgid "edit existing object"
10058 #: builtin/replace.c:435
10059 msgid "change a commit's parents"
10060 msgstr "修改一个提交的父提交"
10062 #: builtin/replace.c:436
10063 msgid "replace the ref if it exists"
10066 #: builtin/replace.c:437
10067 msgid "do not pretty-print contents for --edit"
10068 msgstr "不要为 --edit 操作美观显示内容"
10070 #: builtin/replace.c:438
10071 msgid "use this format"
10074 #: builtin/rerere.c:12
10075 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
10076 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
10078 #: builtin/rerere.c:58
10079 msgid "register clean resolutions in index"
10080 msgstr "在索引中注册干净的解决方案"
10082 #: builtin/reset.c:26
10084 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
10085 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
10087 #: builtin/reset.c:27
10088 msgid "git reset [-q] <tree-ish> [--] <paths>..."
10089 msgstr "git reset [-q] <树或提交> [--] <路径>..."
10091 #: builtin/reset.c:28
10092 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
10093 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
10095 #: builtin/reset.c:34
10099 #: builtin/reset.c:34
10103 #: builtin/reset.c:34
10107 #: builtin/reset.c:34
10111 #: builtin/reset.c:34
10115 #: builtin/reset.c:74
10116 msgid "You do not have a valid HEAD."
10117 msgstr "您没有一个有效的 HEAD。"
10119 #: builtin/reset.c:76
10120 msgid "Failed to find tree of HEAD."
10121 msgstr "无法找到 HEAD 指向的树。"
10123 #: builtin/reset.c:82
10125 msgid "Failed to find tree of %s."
10126 msgstr "无法找到 %s 指向的树。"
10128 #: builtin/reset.c:100
10130 msgid "HEAD is now at %s"
10131 msgstr "HEAD 现在位于 %s"
10133 # 译者:汉字之间无空格,故删除%s前后空格
10134 #: builtin/reset.c:183
10136 msgid "Cannot do a %s reset in the middle of a merge."
10137 msgstr "在合并过程中不能做%s重置操作。"
10139 #: builtin/reset.c:276
10140 msgid "be quiet, only report errors"
10141 msgstr "安静模式,只报告错误"
10143 #: builtin/reset.c:278
10144 msgid "reset HEAD and index"
10145 msgstr "重置 HEAD 和索引"
10147 #: builtin/reset.c:279
10148 msgid "reset only HEAD"
10151 #: builtin/reset.c:281 builtin/reset.c:283
10152 msgid "reset HEAD, index and working tree"
10153 msgstr "重置 HEAD、索引和工作区"
10155 #: builtin/reset.c:285
10156 msgid "reset HEAD but keep local changes"
10157 msgstr "重置 HEAD 但保存本地变更"
10159 #: builtin/reset.c:288
10160 msgid "record only the fact that removed paths will be added later"
10161 msgstr "将删除的路径标记为稍后添加"
10163 #: builtin/reset.c:305
10165 msgid "Failed to resolve '%s' as a valid revision."
10166 msgstr "无法将 '%s' 解析为一个有效的版本。"
10168 #: builtin/reset.c:313
10170 msgid "Failed to resolve '%s' as a valid tree."
10171 msgstr "无法将 '%s' 解析为一个有效的树对象。"
10173 #: builtin/reset.c:322
10174 msgid "--patch is incompatible with --{hard,mixed,soft}"
10175 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
10177 #: builtin/reset.c:331
10178 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
10179 msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
10181 # 译者:汉字之间无空格,故删除%s前后空格
10182 #: builtin/reset.c:333
10184 msgid "Cannot do %s reset with paths."
10185 msgstr "不能带路径进行%s重置。"
10187 # 译者:汉字之间无空格,故删除%s前后空格
10188 #: builtin/reset.c:343
10190 msgid "%s reset is not allowed in a bare repository"
10191 msgstr "不能对纯仓库进行%s重置"
10193 #: builtin/reset.c:347
10194 msgid "-N can only be used with --mixed"
10195 msgstr "-N 只能和 --mixed 同时使用"
10197 #: builtin/reset.c:364
10198 msgid "Unstaged changes after reset:"
10199 msgstr "重置后取消暂存的变更:"
10201 #: builtin/reset.c:370
10203 msgid "Could not reset index file to revision '%s'."
10204 msgstr "不能重置索引文件至版本 '%s'。"
10206 #: builtin/reset.c:374
10207 msgid "Could not write new index file."
10208 msgstr "不能写入新的索引文件。"
10210 #: builtin/rev-list.c:350
10211 msgid "rev-list does not support display of notes"
10212 msgstr "rev-list 不支持显示注解"
10214 #: builtin/rev-parse.c:358
10215 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
10216 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
10218 #: builtin/rev-parse.c:363
10219 msgid "keep the `--` passed as an arg"
10220 msgstr "保持 `--` 作为一个参数传递"
10222 #: builtin/rev-parse.c:365
10223 msgid "stop parsing after the first non-option argument"
10224 msgstr "遇到第一个非选项参数后停止解析"
10226 #: builtin/rev-parse.c:368
10227 msgid "output in stuck long form"
10230 #: builtin/rev-parse.c:499
10232 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
10233 " or: git rev-parse --sq-quote [<arg>...]\n"
10234 " or: git rev-parse [<options>] [<arg>...]\n"
10236 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
10238 "git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
10239 " 或者:git rev-parse --sq-quote [<参数>...]\n"
10240 " 或者:git rev-parse [<选项>] [<参数>...]\n"
10242 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
10244 #: builtin/revert.c:22
10245 msgid "git revert [<options>] <commit-ish>..."
10246 msgstr "git revert [<选项>] <提交号>..."
10248 #: builtin/revert.c:23
10249 msgid "git revert <subcommand>"
10250 msgstr "git revert <子命令>"
10252 #: builtin/revert.c:28
10253 msgid "git cherry-pick [<options>] <commit-ish>..."
10254 msgstr "git cherry-pick [<选项>] <提交号>..."
10256 #: builtin/revert.c:29
10257 msgid "git cherry-pick <subcommand>"
10258 msgstr "git cherry-pick <子命令>"
10260 #: builtin/revert.c:71
10262 msgid "%s: %s cannot be used with %s"
10263 msgstr "%s:%s 不能和 %s 同时使用"
10265 #: builtin/revert.c:80
10266 msgid "end revert or cherry-pick sequence"
10269 #: builtin/revert.c:81
10270 msgid "resume revert or cherry-pick sequence"
10273 #: builtin/revert.c:82
10274 msgid "cancel revert or cherry-pick sequence"
10277 #: builtin/revert.c:83
10278 msgid "don't automatically commit"
10281 #: builtin/revert.c:84
10282 msgid "edit the commit message"
10285 #: builtin/revert.c:87
10286 msgid "parent number"
10289 #: builtin/revert.c:89
10290 msgid "merge strategy"
10293 #: builtin/revert.c:90
10297 #: builtin/revert.c:91
10298 msgid "option for merge strategy"
10301 #: builtin/revert.c:104
10302 msgid "append commit name"
10305 #: builtin/revert.c:106
10306 msgid "preserve initially empty commits"
10309 #: builtin/revert.c:107
10310 msgid "allow commits with empty messages"
10313 #: builtin/revert.c:108
10314 msgid "keep redundant, empty commits"
10315 msgstr "保持多余的、空的提交"
10317 #: builtin/revert.c:112
10318 msgid "program error"
10321 #: builtin/revert.c:197
10322 msgid "revert failed"
10325 #: builtin/revert.c:212
10326 msgid "cherry-pick failed"
10330 msgid "git rm [<options>] [--] <file>..."
10331 msgstr "git rm [<选项>] [--] <文件>..."
10335 "the following submodule (or one of its nested submodules)\n"
10336 "uses a .git directory:"
10338 "the following submodules (or one of their nested submodules)\n"
10339 "use a .git directory:"
10340 msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10341 msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
10346 "(use 'rm -rf' if you really want to remove it including all of its history)"
10349 "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10351 #: builtin/rm.c:230
10353 "the following file has staged content different from both the\n"
10354 "file and the HEAD:"
10356 "the following files have staged content different from both the\n"
10357 "file and the HEAD:"
10358 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10359 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
10361 #: builtin/rm.c:235
10364 "(use -f to force removal)"
10369 #: builtin/rm.c:239
10370 msgid "the following file has changes staged in the index:"
10371 msgid_plural "the following files have changes staged in the index:"
10372 msgstr[0] "下列文件索引中有变更"
10373 msgstr[1] "下列文件索引中有变更"
10375 #: builtin/rm.c:243 builtin/rm.c:254
10378 "(use --cached to keep the file, or -f to force removal)"
10381 "(使用 --cached 保留本地文件,或用 -f 强制删除)"
10383 #: builtin/rm.c:251
10384 msgid "the following file has local modifications:"
10385 msgid_plural "the following files have local modifications:"
10386 msgstr[0] "如下文件有本地修改:"
10387 msgstr[1] "如下文件有本地修改:"
10389 #: builtin/rm.c:269
10390 msgid "do not list removed files"
10393 #: builtin/rm.c:270
10394 msgid "only remove from the index"
10397 #: builtin/rm.c:271
10398 msgid "override the up-to-date check"
10399 msgstr "忽略文件更新状态检查"
10401 #: builtin/rm.c:272
10402 msgid "allow recursive removal"
10405 #: builtin/rm.c:274
10406 msgid "exit with a zero status even if nothing matched"
10407 msgstr "即使没有匹配,也以零状态退出"
10409 #: builtin/rm.c:317
10410 msgid "Please, stage your changes to .gitmodules or stash them to proceed"
10411 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
10413 #: builtin/rm.c:335
10415 msgid "not removing '%s' recursively without -r"
10416 msgstr "未提供 -r 选项不会递归删除 '%s'"
10418 #: builtin/rm.c:374
10420 msgid "git rm: unable to remove %s"
10421 msgstr "git rm:不能删除 %s"
10423 #: builtin/send-pack.c:18
10425 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10426 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
10428 " --all and explicit <ref> specification are mutually exclusive."
10430 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
10431 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
10432 " --all 和明确的 <引用> 互斥。"
10434 #: builtin/send-pack.c:160
10435 msgid "remote name"
10438 #: builtin/send-pack.c:171
10439 msgid "use stateless RPC protocol"
10440 msgstr "使用无状态的 RPC 协议"
10442 #: builtin/send-pack.c:172
10443 msgid "read refs from stdin"
10446 #: builtin/send-pack.c:173
10447 msgid "print status from remote helper"
10448 msgstr "打印来自远程 helper 的状态"
10450 #: builtin/shortlog.c:13
10451 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
10452 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
10454 #: builtin/shortlog.c:242
10455 msgid "sort output according to the number of commits per author"
10456 msgstr "根据每个作者的提交数量排序"
10458 #: builtin/shortlog.c:244
10459 msgid "Suppress commit descriptions, only provides commit count"
10460 msgstr "隐藏提交说明,只提供提交数量"
10462 #: builtin/shortlog.c:246
10463 msgid "Show the email address of each author"
10464 msgstr "显示每个作者的电子邮件地址"
10466 #: builtin/shortlog.c:247
10467 msgid "w[,i1[,i2]]"
10468 msgstr "w[,i1[,i2]]"
10470 #: builtin/shortlog.c:248
10471 msgid "Linewrap output"
10474 #: builtin/show-branch.c:10
10476 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10477 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
10478 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10479 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
10481 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
10482 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
10483 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
10484 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
10486 #: builtin/show-branch.c:14
10487 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
10488 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
10490 #: builtin/show-branch.c:640
10491 msgid "show remote-tracking and local branches"
10492 msgstr "显示远程跟踪的和本地的分支"
10494 #: builtin/show-branch.c:642
10495 msgid "show remote-tracking branches"
10498 #: builtin/show-branch.c:644
10499 msgid "color '*!+-' corresponding to the branch"
10500 msgstr "着色 '*!+-' 到相应的分支"
10502 #: builtin/show-branch.c:646
10503 msgid "show <n> more commits after the common ancestor"
10504 msgstr "显示共同祖先后的 <n> 个提交"
10506 #: builtin/show-branch.c:648
10507 msgid "synonym to more=-1"
10508 msgstr "和 more=-1 同义"
10510 #: builtin/show-branch.c:649
10511 msgid "suppress naming strings"
10514 #: builtin/show-branch.c:651
10515 msgid "include the current branch"
10518 #: builtin/show-branch.c:653
10519 msgid "name commits with their object names"
10522 #: builtin/show-branch.c:655
10523 msgid "show possible merge bases"
10526 #: builtin/show-branch.c:657
10527 msgid "show refs unreachable from any other ref"
10528 msgstr "显示没有任何引用的的引用"
10530 #: builtin/show-branch.c:659
10531 msgid "show commits in topological order"
10534 #: builtin/show-branch.c:662
10535 msgid "show only commits not on the first branch"
10536 msgstr "只显示不在第一个分支上的提交"
10538 #: builtin/show-branch.c:664
10539 msgid "show merges reachable from only one tip"
10540 msgstr "显示仅一个分支可访问的合并提交"
10542 #: builtin/show-branch.c:666
10543 msgid "topologically sort, maintaining date order where possible"
10544 msgstr "拓扑方式排序,并尽可能地保持日期顺序"
10546 #: builtin/show-branch.c:669
10547 msgid "<n>[,<base>]"
10548 msgstr "<n>[,<base>]"
10550 #: builtin/show-branch.c:670
10551 msgid "show <n> most recent ref-log entries starting at base"
10552 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
10554 #: builtin/show-ref.c:10
10556 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10557 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
10559 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
10560 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
10562 #: builtin/show-ref.c:11
10563 msgid "git show-ref --exclude-existing[=<pattern>]"
10564 msgstr "git show-ref --exclude-existing[=<模式>]"
10566 #: builtin/show-ref.c:165
10567 msgid "only show tags (can be combined with heads)"
10568 msgstr "只显示标签(可以和头共用)"
10570 #: builtin/show-ref.c:166
10571 msgid "only show heads (can be combined with tags)"
10572 msgstr "只显示头(可以和标签共用)"
10574 #: builtin/show-ref.c:167
10575 msgid "stricter reference checking, requires exact ref path"
10576 msgstr "更严格的引用检测,需要精确的引用路径"
10578 #: builtin/show-ref.c:170 builtin/show-ref.c:172
10579 msgid "show the HEAD reference, even if it would be filtered out"
10580 msgstr "显示 HEAD 引用,即使被过滤掉"
10582 #: builtin/show-ref.c:174
10583 msgid "dereference tags into object IDs"
10584 msgstr "转换标签到对象 ID"
10586 #: builtin/show-ref.c:176
10587 msgid "only show SHA1 hash using <n> digits"
10588 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
10590 #: builtin/show-ref.c:180
10591 msgid "do not print results to stdout (useful with --verify)"
10592 msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
10594 #: builtin/show-ref.c:182
10595 msgid "show refs from stdin that aren't in local repository"
10596 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
10598 #: builtin/stripspace.c:17
10599 msgid "git stripspace [-s | --strip-comments]"
10600 msgstr "git stripspace [-s | --strip-comments]"
10602 #: builtin/stripspace.c:18
10603 msgid "git stripspace [-c | --comment-lines]"
10604 msgstr "git stripspace [-c | --comment-lines]"
10606 #: builtin/stripspace.c:35
10607 msgid "skip and remove all lines starting with comment character"
10608 msgstr "跳过和移除所有的注释行"
10610 #: builtin/stripspace.c:38
10611 msgid "prepend comment character and space to each line"
10612 msgstr "为每一行的行首添加注释符和空格"
10614 #: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161
10615 msgid "alternative anchor for relative paths"
10616 msgstr "相对路径的替代锚记(anchor)"
10618 #: builtin/submodule--helper.c:78
10619 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
10620 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
10622 #: builtin/submodule--helper.c:108
10623 msgid "git submodule--helper name <path>"
10624 msgstr "git submodule--helper name <路径>"
10626 #: builtin/submodule--helper.c:114
10628 msgid "no submodule mapping found in .gitmodules for path '%s'"
10629 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
10631 #: builtin/submodule--helper.c:164
10632 msgid "where the new submodule will be cloned to"
10633 msgstr "新的子模组将要克隆的路径"
10635 #: builtin/submodule--helper.c:167
10636 msgid "name of the new submodule"
10639 #: builtin/submodule--helper.c:170
10640 msgid "url where to clone the submodule from"
10641 msgstr "克隆子模组的 url 地址"
10643 #: builtin/submodule--helper.c:176
10644 msgid "depth for shallow clones"
10647 #: builtin/submodule--helper.c:182
10649 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
10650 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
10652 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
10653 "[--name <名字>] [--url <地址>][--depth <深度>] [--] [<路径>...]"
10655 #: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202
10656 #: builtin/submodule--helper.c:210
10658 msgid "could not create directory '%s'"
10659 msgstr "不能创建目录 '%s'"
10661 #: builtin/submodule--helper.c:198
10663 msgid "clone of '%s' into submodule path '%s' failed"
10664 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
10666 #: builtin/submodule--helper.c:221
10668 msgid "cannot open file '%s'"
10669 msgstr "无法打开文件 '%s'"
10671 #: builtin/submodule--helper.c:226
10673 msgid "could not close file %s"
10676 #: builtin/submodule--helper.c:241
10678 msgid "could not get submodule directory for '%s'"
10679 msgstr "无法得到 '%s' 的子模组目录"
10681 #: builtin/submodule--helper.c:267
10682 msgid "fatal: submodule--helper subcommand must be called with a subcommand"
10683 msgstr "严重错误:submodule-helper 子命令必须由另外的子命令调用"
10685 #: builtin/submodule--helper.c:274
10687 msgid "fatal: '%s' is not a valid submodule--helper subcommand"
10688 msgstr "严重错误:'%s' 不是一个有效的 submodule--helper 子命令"
10690 #: builtin/symbolic-ref.c:7
10691 msgid "git symbolic-ref [<options>] <name> [<ref>]"
10692 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
10694 #: builtin/symbolic-ref.c:8
10695 msgid "git symbolic-ref -d [-q] <name>"
10696 msgstr "git symbolic-ref -d [-q] <名称>"
10698 #: builtin/symbolic-ref.c:40
10699 msgid "suppress error message for non-symbolic (detached) refs"
10700 msgstr "不显示非符号(分离的)引用的错误信息"
10702 #: builtin/symbolic-ref.c:41
10703 msgid "delete symbolic ref"
10706 #: builtin/symbolic-ref.c:42
10707 msgid "shorten ref output"
10710 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10714 #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
10715 msgid "reason of the update"
10718 #: builtin/tag.c:23
10720 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
10723 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
10725 #: builtin/tag.c:24
10726 msgid "git tag -d <tagname>..."
10727 msgstr "git tag -d <标签名>..."
10729 #: builtin/tag.c:25
10731 "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
10732 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
10734 "git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
10735 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
10737 #: builtin/tag.c:27
10738 msgid "git tag -v <tagname>..."
10739 msgstr "git tag -v <标签名>..."
10741 #: builtin/tag.c:80
10743 msgid "tag name too long: %.*s..."
10744 msgstr "标签名称太长:%.*s..."
10746 #: builtin/tag.c:85
10748 msgid "tag '%s' not found."
10749 msgstr "未发现标签 '%s'。"
10751 #: builtin/tag.c:100
10753 msgid "Deleted tag '%s' (was %s)\n"
10754 msgstr "已删除标签 '%s'(曾为 %s)\n"
10756 #: builtin/tag.c:112
10758 msgid "could not verify the tag '%s'"
10759 msgstr "不能校验该标签 '%s'"
10761 #: builtin/tag.c:122
10765 "Write a message for tag:\n"
10767 "Lines starting with '%c' will be ignored.\n"
10772 "以 '%c' 开头的行将被忽略。\n"
10774 #: builtin/tag.c:126
10778 "Write a message for tag:\n"
10780 "Lines starting with '%c' will be kept; you may remove them yourself if you "
10786 "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
10788 #: builtin/tag.c:199
10789 msgid "unable to sign the tag"
10792 #: builtin/tag.c:201
10793 msgid "unable to write tag file"
10796 #: builtin/tag.c:226
10797 msgid "bad object type."
10800 #: builtin/tag.c:239
10801 msgid "tag header too big."
10804 #: builtin/tag.c:275
10805 msgid "no tag message?"
10808 #: builtin/tag.c:281
10810 msgid "The tag message has been left in %s\n"
10811 msgstr "标签说明被保留在 %s\n"
10813 #: builtin/tag.c:339
10814 msgid "list tag names"
10817 #: builtin/tag.c:341
10818 msgid "print <n> lines of each tag message"
10819 msgstr "每个标签信息打印 <n> 行"
10821 #: builtin/tag.c:343
10822 msgid "delete tags"
10825 #: builtin/tag.c:344
10826 msgid "verify tags"
10829 #: builtin/tag.c:346
10830 msgid "Tag creation options"
10833 #: builtin/tag.c:348
10834 msgid "annotated tag, needs a message"
10835 msgstr "附注标签,需要一个说明"
10837 #: builtin/tag.c:350
10838 msgid "tag message"
10841 #: builtin/tag.c:352
10842 msgid "annotated and GPG-signed tag"
10843 msgstr "附注并附加 GPG 签名的标签"
10845 #: builtin/tag.c:356
10846 msgid "use another key to sign the tag"
10847 msgstr "使用另外的私钥签名该标签"
10849 #: builtin/tag.c:357
10850 msgid "replace the tag if exists"
10851 msgstr "如果存在,替换现有的标签"
10853 #: builtin/tag.c:358 builtin/update-ref.c:368
10854 msgid "create a reflog"
10857 #: builtin/tag.c:360
10858 msgid "Tag listing options"
10861 #: builtin/tag.c:361
10862 msgid "show tag list in columns"
10863 msgstr "以列的方式显示标签列表"
10865 #: builtin/tag.c:362 builtin/tag.c:363
10866 msgid "print only tags that contain the commit"
10867 msgstr "只打印包含提交的标签"
10869 #: builtin/tag.c:364
10870 msgid "print only tags that are merged"
10871 msgstr "只打印已经合并的标签"
10873 #: builtin/tag.c:365
10874 msgid "print only tags that are not merged"
10875 msgstr "只打印尚未合并的标签"
10877 #: builtin/tag.c:370
10878 msgid "print only tags of the object"
10881 #: builtin/tag.c:399
10882 msgid "--column and -n are incompatible"
10883 msgstr "--column 和 -n 不兼容"
10885 #: builtin/tag.c:419
10886 msgid "-n option is only allowed with -l."
10887 msgstr "-n 选项只允许和 -l 同时使用。"
10889 #: builtin/tag.c:421
10890 msgid "--contains option is only allowed with -l."
10891 msgstr "--contains 选项只允许和 -l 同时使用。"
10893 #: builtin/tag.c:423
10894 msgid "--points-at option is only allowed with -l."
10895 msgstr "--points-at 选项只允许和 -l 同时使用。"
10897 #: builtin/tag.c:425
10898 msgid "--merged and --no-merged option are only allowed with -l"
10899 msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
10901 #: builtin/tag.c:433
10902 msgid "only one -F or -m option is allowed."
10903 msgstr "只允许一个 -F 或 -m 选项。"
10905 #: builtin/tag.c:453
10906 msgid "too many params"
10909 #: builtin/tag.c:459
10911 msgid "'%s' is not a valid tag name."
10912 msgstr "'%s' 不是一个有效的标签名称。"
10914 #: builtin/tag.c:464
10916 msgid "tag '%s' already exists"
10917 msgstr "标签 '%s' 已存在"
10919 #: builtin/tag.c:489
10921 msgid "Updated tag '%s' (was %s)\n"
10922 msgstr "已更新标签 '%s'(曾为 %s)\n"
10924 #: builtin/unpack-objects.c:490
10925 msgid "Unpacking objects"
10928 #: builtin/update-index.c:79
10930 msgid "failed to create directory %s"
10933 #: builtin/update-index.c:85
10935 msgid "failed to stat %s"
10936 msgstr "无法枚举 %s 状态"
10938 #: builtin/update-index.c:95
10940 msgid "failed to create file %s"
10943 #: builtin/update-index.c:103
10945 msgid "failed to delete file %s"
10948 #: builtin/update-index.c:110 builtin/update-index.c:212
10950 msgid "failed to delete directory %s"
10953 #: builtin/update-index.c:133
10955 msgid "Testing mtime in '%s' "
10956 msgstr "在 '%s' 中测试 mtime "
10958 #: builtin/update-index.c:145
10959 msgid "directory stat info does not change after adding a new file"
10960 msgstr "添加一个新文件后,目录的状态信息未改变"
10962 #: builtin/update-index.c:158
10963 msgid "directory stat info does not change after adding a new directory"
10964 msgstr "添加一个新目录后,目录的状态信息未改变"
10966 #: builtin/update-index.c:171
10967 msgid "directory stat info changes after updating a file"
10968 msgstr "更新一个文件后,目录的状态信息被修改"
10970 #: builtin/update-index.c:182
10971 msgid "directory stat info changes after adding a file inside subdirectory"
10972 msgstr "在子目录中添加文件后,目录的状态信息被修改"
10974 #: builtin/update-index.c:193
10975 msgid "directory stat info does not change after deleting a file"
10976 msgstr "删除一个文件后,目录的状态信息未改变"
10978 #: builtin/update-index.c:206
10979 msgid "directory stat info does not change after deleting a directory"
10980 msgstr "删除一个目录后,目录的状态信息未改变"
10982 #: builtin/update-index.c:213
10986 #: builtin/update-index.c:575
10987 msgid "git update-index [<options>] [--] [<file>...]"
10988 msgstr "git update-index [<选项>] [--] [<文件>...]"
10990 #: builtin/update-index.c:930
10991 msgid "continue refresh even when index needs update"
10992 msgstr "当索引需要更新时继续刷新"
10994 #: builtin/update-index.c:933
10995 msgid "refresh: ignore submodules"
10998 #: builtin/update-index.c:936
10999 msgid "do not ignore new files"
11002 #: builtin/update-index.c:938
11003 msgid "let files replace directories and vice-versa"
11004 msgstr "让文件替换目录(反之亦然)"
11006 #: builtin/update-index.c:940
11007 msgid "notice files missing from worktree"
11008 msgstr "通知文件从工作区丢失"
11010 #: builtin/update-index.c:942
11011 msgid "refresh even if index contains unmerged entries"
11012 msgstr "即使索引区包含未合并的条目也执行刷新"
11014 #: builtin/update-index.c:945
11015 msgid "refresh stat information"
11018 #: builtin/update-index.c:949
11019 msgid "like --refresh, but ignore assume-unchanged setting"
11020 msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
11022 #: builtin/update-index.c:953
11023 msgid "<mode>,<object>,<path>"
11024 msgstr "<存取模式>,<对象>,<路径>"
11026 #: builtin/update-index.c:954
11027 msgid "add the specified entry to the index"
11028 msgstr "添加指定的条目到索引区"
11030 #: builtin/update-index.c:958
11034 #: builtin/update-index.c:959
11035 msgid "override the executable bit of the listed files"
11036 msgstr "覆盖列表里文件的可执行位"
11038 #: builtin/update-index.c:963
11039 msgid "mark files as \"not changing\""
11040 msgstr "把文件标记为 \"没有变更\""
11042 #: builtin/update-index.c:966
11043 msgid "clear assumed-unchanged bit"
11044 msgstr "清除 assumed-unchanged 位"
11046 #: builtin/update-index.c:969
11047 msgid "mark files as \"index-only\""
11048 msgstr "把文件标记为 \"仅索引\""
11050 #: builtin/update-index.c:972
11051 msgid "clear skip-worktree bit"
11052 msgstr "清除 skip-worktree 位"
11054 #: builtin/update-index.c:975
11055 msgid "add to index only; do not add content to object database"
11056 msgstr "只添加到索引区;不添加对象到对象库"
11058 #: builtin/update-index.c:977
11059 msgid "remove named paths even if present in worktree"
11060 msgstr "即使存在工作区里,也删除路径"
11062 #: builtin/update-index.c:979
11063 msgid "with --stdin: input lines are terminated by null bytes"
11064 msgstr "携带 --stdin:输入的行以 null 字符终止"
11066 #: builtin/update-index.c:981
11067 msgid "read list of paths to be updated from standard input"
11068 msgstr "从标准输入中读取需要更新的路径列表"
11070 #: builtin/update-index.c:985
11071 msgid "add entries from standard input to the index"
11072 msgstr "从标准输入添加条目到索引区"
11074 #: builtin/update-index.c:989
11075 msgid "repopulate stages #2 and #3 for the listed paths"
11076 msgstr "为指定文件重新生成第2和第3暂存区"
11078 #: builtin/update-index.c:993
11079 msgid "only update entries that differ from HEAD"
11080 msgstr "只更新与 HEAD 不同的条目"
11082 #: builtin/update-index.c:997
11083 msgid "ignore files missing from worktree"
11084 msgstr "忽略工作区丢失的文件"
11086 #: builtin/update-index.c:1000
11087 msgid "report actions to standard output"
11090 #: builtin/update-index.c:1002
11091 msgid "(for porcelains) forget saved unresolved conflicts"
11092 msgstr "(for porcelains) 忘记保存的未解决的冲突"
11094 #: builtin/update-index.c:1006
11095 msgid "write index in this format"
11096 msgstr "以这种格式写入索引区"
11098 #: builtin/update-index.c:1008
11099 msgid "enable or disable split index"
11102 #: builtin/update-index.c:1010
11103 msgid "enable/disable untracked cache"
11104 msgstr "启用/禁用对未跟踪文件的缓存"
11106 #: builtin/update-index.c:1012
11107 msgid "test if the filesystem supports untracked cache"
11108 msgstr "测试文件系统是否支持未跟踪文件缓存"
11110 #: builtin/update-index.c:1014
11111 msgid "enable untracked cache without testing the filesystem"
11112 msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
11114 #: builtin/update-index.c:1134
11115 msgid "Untracked cache disabled"
11116 msgstr "缓存未跟踪文件被禁用"
11118 #: builtin/update-index.c:1146
11120 msgid "Untracked cache enabled for '%s'"
11121 msgstr "缓存未跟踪文件在 '%s' 启用"
11123 #: builtin/update-ref.c:9
11124 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
11125 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
11127 #: builtin/update-ref.c:10
11128 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
11129 msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
11131 #: builtin/update-ref.c:11
11132 msgid "git update-ref [<options>] --stdin [-z]"
11133 msgstr "git update-ref [<选项>] --stdin [-z]"
11135 #: builtin/update-ref.c:363
11136 msgid "delete the reference"
11139 #: builtin/update-ref.c:365
11140 msgid "update <refname> not the one it points to"
11141 msgstr "更新 <引用名> 本身而不是它指向的引用"
11143 #: builtin/update-ref.c:366
11144 msgid "stdin has NUL-terminated arguments"
11145 msgstr "标准输入有以 NUL 字符终止的参数"
11147 #: builtin/update-ref.c:367
11148 msgid "read updates from stdin"
11151 #: builtin/update-server-info.c:6
11152 msgid "git update-server-info [--force]"
11153 msgstr "git update-server-info [--force]"
11155 #: builtin/update-server-info.c:14
11156 msgid "update the info files from scratch"
11157 msgstr "从头开始更新文件信息"
11159 #: builtin/verify-commit.c:17
11160 msgid "git verify-commit [-v | --verbose] <commit>..."
11161 msgstr "git verify-commit [-v | --verbose] <提交>..."
11163 #: builtin/verify-commit.c:72
11164 msgid "print commit contents"
11167 #: builtin/verify-commit.c:73 builtin/verify-tag.c:84
11168 msgid "print raw gpg status output"
11169 msgstr "打印原始 gpg 状态输出"
11171 #: builtin/verify-pack.c:54
11172 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
11173 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
11175 #: builtin/verify-pack.c:64
11179 #: builtin/verify-pack.c:66
11180 msgid "show statistics only"
11183 #: builtin/verify-tag.c:17
11184 msgid "git verify-tag [-v | --verbose] <tag>..."
11185 msgstr "git verify-tag [-v | --verbose] <标签>..."
11187 #: builtin/verify-tag.c:83
11188 msgid "print tag contents"
11191 #: builtin/worktree.c:15
11192 msgid "git worktree add [<options>] <path> [<branch>]"
11193 msgstr "git worktree add [<选项>] <路径> [<分支>]"
11195 #: builtin/worktree.c:16
11196 msgid "git worktree prune [<options>]"
11197 msgstr "git worktree prune [<选项>]"
11199 #: builtin/worktree.c:17
11200 msgid "git worktree list [<options>]"
11201 msgstr "git worktree list [<选项>]"
11203 #: builtin/worktree.c:39
11205 msgid "Removing worktrees/%s: not a valid directory"
11206 msgstr "删除工作区/%s:不是一个有效的目录"
11208 #: builtin/worktree.c:45
11210 msgid "Removing worktrees/%s: gitdir file does not exist"
11211 msgstr "删除 worktrees/%s:gitdir 文件不存在"
11213 #: builtin/worktree.c:50
11215 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
11216 msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
11218 #: builtin/worktree.c:61
11220 msgid "Removing worktrees/%s: invalid gitdir file"
11221 msgstr "删除 worktrees/%s:无效的 gitdir 文件"
11223 #: builtin/worktree.c:77
11225 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
11226 msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
11228 #: builtin/worktree.c:112
11230 msgid "failed to remove: %s"
11233 #: builtin/worktree.c:201
11235 msgid "'%s' already exists"
11238 #: builtin/worktree.c:233
11240 msgid "could not create directory of '%s'"
11241 msgstr "不能创建目录 '%s'"
11243 #: builtin/worktree.c:269
11245 msgid "Preparing %s (identifier %s)"
11246 msgstr "准备 %s (标识符 %s)"
11248 #: builtin/worktree.c:317
11249 msgid "checkout <branch> even if already checked out in other worktree"
11250 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
11252 #: builtin/worktree.c:319
11253 msgid "create a new branch"
11256 #: builtin/worktree.c:321
11257 msgid "create or reset a branch"
11260 #: builtin/worktree.c:322
11261 msgid "detach HEAD at named commit"
11262 msgstr "HEAD 从指定的提交分离"
11264 #: builtin/worktree.c:329
11265 msgid "-b, -B, and --detach are mutually exclusive"
11266 msgstr "-b、-B 和 --detach 是互斥的"
11268 #: builtin/write-tree.c:13
11269 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
11270 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
11272 #: builtin/write-tree.c:26
11276 #: builtin/write-tree.c:27
11277 msgid "write tree object for a subdirectory <prefix>"
11278 msgstr "将 <前缀> 子目录内容写到一个树对象"
11280 #: builtin/write-tree.c:30
11281 msgid "only useful for debugging"
11284 #: credential-cache--daemon.c:262
11285 msgid "print debugging messages to stderr"
11286 msgstr "调试信息输出到标准错误"
11290 "'git help -a' and 'git help -g' list available subcommands and some\n"
11291 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
11292 "to read about a specific subcommand or concept."
11294 "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
11295 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
11299 msgid "Public key pinning not supported with cURL < 7.44.0"
11300 msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
11303 msgid "start a working area (see also: git help tutorial)"
11304 msgstr "开始一个工作区(参见:git help tutorial)"
11306 #: common-cmds.h:10
11307 msgid "work on the current change (see also: git help everyday)"
11308 msgstr "在当前变更上工作(参见:git help everyday)"
11310 #: common-cmds.h:11
11311 msgid "examine the history and state (see also: git help revisions)"
11312 msgstr "检查历史和状态(参见:git help revisions)"
11314 #: common-cmds.h:12
11315 msgid "grow, mark and tweak your common history"
11316 msgstr "扩展、标记和调校您的历史记录"
11318 #: common-cmds.h:13
11319 msgid "collaborate (see also: git help workflows)"
11320 msgstr "协同(参见:git help workflows)"
11322 #: common-cmds.h:17
11323 msgid "Add file contents to the index"
11326 #: common-cmds.h:18
11327 msgid "Use binary search to find the commit that introduced a bug"
11328 msgstr "通过二分查找定位引入 bug 的提交"
11330 #: common-cmds.h:19
11331 msgid "List, create, or delete branches"
11332 msgstr "列出、创建或删除分支"
11334 #: common-cmds.h:20
11335 msgid "Switch branches or restore working tree files"
11336 msgstr "切换分支或恢复工作区文件"
11338 #: common-cmds.h:21
11339 msgid "Clone a repository into a new directory"
11340 msgstr "克隆一个仓库到一个新目录"
11342 #: common-cmds.h:22
11343 msgid "Record changes to the repository"
11346 #: common-cmds.h:23
11347 msgid "Show changes between commits, commit and working tree, etc"
11348 msgstr "显示提交之间、提交和工作区之间等的差异"
11350 #: common-cmds.h:24
11351 msgid "Download objects and refs from another repository"
11352 msgstr "从另外一个仓库下载对象和引用"
11354 #: common-cmds.h:25
11355 msgid "Print lines matching a pattern"
11358 #: common-cmds.h:26
11359 msgid "Create an empty Git repository or reinitialize an existing one"
11360 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
11362 #: common-cmds.h:27
11363 msgid "Show commit logs"
11366 #: common-cmds.h:28
11367 msgid "Join two or more development histories together"
11368 msgstr "合并两个或更多开发历史"
11370 #: common-cmds.h:29
11371 msgid "Move or rename a file, a directory, or a symlink"
11372 msgstr "移动或重命名一个文件、目录或符号链接"
11374 #: common-cmds.h:30
11375 msgid "Fetch from and integrate with another repository or a local branch"
11376 msgstr "获取并整合另外的仓库或一个本地分支"
11378 #: common-cmds.h:31
11379 msgid "Update remote refs along with associated objects"
11380 msgstr "更新远程引用和相关的对象"
11382 #: common-cmds.h:32
11383 msgid "Reapply commits on top of another base tip"
11384 msgstr "在另一个分支上重新应用提交"
11386 #: common-cmds.h:33
11387 msgid "Reset current HEAD to the specified state"
11388 msgstr "重置当前 HEAD 到指定状态"
11390 #: common-cmds.h:34
11391 msgid "Remove files from the working tree and from the index"
11392 msgstr "从工作区和索引中删除文件"
11394 #: common-cmds.h:35
11395 msgid "Show various types of objects"
11398 #: common-cmds.h:36
11399 msgid "Show the working tree status"
11402 #: common-cmds.h:37
11403 msgid "Create, list, delete or verify a tag object signed with GPG"
11404 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
11406 #: parse-options.h:145
11407 msgid "expiry-date"
11410 #: parse-options.h:160
11411 msgid "no-op (backward compatibility)"
11414 #: parse-options.h:237
11415 msgid "be more verbose"
11418 #: parse-options.h:239
11419 msgid "be more quiet"
11422 #: parse-options.h:245
11423 msgid "use <n> digits to display SHA-1s"
11424 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
11427 msgid "update the index with reused conflict resolution if possible"
11428 msgstr "如果可能,重用冲突解决更新索引"
11430 #: git-bisect.sh:55
11431 msgid "You need to start by \"git bisect start\""
11432 msgstr "您需要执行 \"git bisect start\" 来开始"
11435 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11436 #. translation. The program will only accept English input
11438 #: git-bisect.sh:61
11439 msgid "Do you want me to do it for you [Y/n]? "
11440 msgstr "您想让我为您这样做么[Y/n]? "
11442 #: git-bisect.sh:122
11444 msgid "unrecognised option: '$arg'"
11445 msgstr "未能识别的选项:'$arg'"
11447 #: git-bisect.sh:126
11449 msgid "'$arg' does not appear to be a valid revision"
11450 msgstr "'$arg' 看起来不像是一个有效的版本"
11452 #: git-bisect.sh:155
11453 msgid "Bad HEAD - I need a HEAD"
11454 msgstr "坏的 HEAD - 我需要一个 HEAD"
11456 #: git-bisect.sh:168
11459 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
11460 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
11462 #: git-bisect.sh:178
11463 msgid "won't bisect on cg-seek'ed tree"
11464 msgstr "不会在做了 cg-seek 的树上做二分查找"
11466 #: git-bisect.sh:182
11467 msgid "Bad HEAD - strange symbolic ref"
11468 msgstr "坏的 HEAD - 奇怪的符号引用"
11470 #: git-bisect.sh:234
11472 msgid "Bad bisect_write argument: $state"
11473 msgstr "坏的 bisect_write 参数:$state"
11475 #: git-bisect.sh:263
11477 msgid "Bad rev input: $arg"
11478 msgstr "输入坏的版本:$arg"
11480 #: git-bisect.sh:278
11481 msgid "Please call 'bisect_state' with at least one argument."
11482 msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
11484 #: git-bisect.sh:290
11486 msgid "Bad rev input: $rev"
11487 msgstr "输入坏的版本:$rev"
11489 #: git-bisect.sh:299
11491 msgid "'git bisect $TERM_BAD' can take only one argument."
11492 msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
11494 #: git-bisect.sh:322
11496 msgid "Warning: bisecting only with a $TERM_BAD commit."
11497 msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
11500 #. TRANSLATORS: Make sure to include [Y] and [n] in your
11501 #. translation. The program will only accept English input
11503 #: git-bisect.sh:328
11504 msgid "Are you sure [Y/n]? "
11505 msgstr "您确认么[Y/n]? "
11507 #: git-bisect.sh:340
11510 "You need to give me at least one $bad_syn and one $good_syn revision.\n"
11511 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11513 "您需要给我至少一个好版本和一个坏版本。\n"
11514 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11516 #: git-bisect.sh:343
11519 "You need to start by \"git bisect start\".\n"
11520 "You then need to give me at least one $good_syn and one $bad_syn revision.\n"
11521 "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
11523 "您需要执行 \"git bisect start\" 来开始。\n"
11524 "然后需要提供我至少一个好版本和一个坏版本。\n"
11525 "(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
11527 #: git-bisect.sh:414 git-bisect.sh:546
11528 msgid "We are not bisecting."
11529 msgstr "我们没有在二分查找。"
11531 #: git-bisect.sh:421
11533 msgid "'$invalid' is not a valid commit"
11534 msgstr "'$invalid' 不是一个有效的提交"
11536 #: git-bisect.sh:430
11539 "Could not check out original HEAD '$branch'.\n"
11540 "Try 'git bisect reset <commit>'."
11542 "不能检出原始 HEAD '$branch'。\n"
11543 "尝试 'git bisect reset <提交>'。"
11545 #: git-bisect.sh:458
11546 msgid "No logfile given"
11549 #: git-bisect.sh:459
11551 msgid "cannot read $file for replaying"
11552 msgstr "不能读取 $file 来重放"
11554 #: git-bisect.sh:480
11555 msgid "?? what are you talking about?"
11558 #: git-bisect.sh:492
11560 msgid "running $command"
11561 msgstr "运行 $command"
11563 #: git-bisect.sh:499
11566 "bisect run failed:\n"
11567 "exit code $res from '$command' is < 0 or >= 128"
11570 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
11572 #: git-bisect.sh:525
11573 msgid "bisect run cannot continue any more"
11574 msgstr "二分查找不能继续运行"
11576 #: git-bisect.sh:531
11579 "bisect run failed:\n"
11580 "'bisect_state $state' exited with error code $res"
11583 "'bisect_state $state' 退出码为 $res"
11585 #: git-bisect.sh:538
11586 msgid "bisect run success"
11589 #: git-bisect.sh:565
11590 msgid "please use two different terms"
11591 msgstr "请使用两个不同的术语"
11593 #: git-bisect.sh:575
11595 msgid "'$term' is not a valid term"
11596 msgstr "'$term' 不是一个有效的名称"
11598 #: git-bisect.sh:578
11600 msgid "can't use the builtin command '$term' as a term"
11601 msgstr "不能使用内置命令 '$term' 作为术语"
11603 #: git-bisect.sh:587 git-bisect.sh:593
11605 msgid "can't change the meaning of term '$term'"
11606 msgstr "不能修改术语 '$term' 的含义"
11608 #: git-bisect.sh:606
11610 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
11611 msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
11613 #: git-bisect.sh:636
11614 msgid "no terms defined"
11617 #: git-bisect.sh:653
11620 "invalid argument $arg for 'git bisect terms'.\n"
11621 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
11623 "参数 $arg 对命令 'git bisect terms' 无效。\n"
11624 "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11626 #: git-rebase.sh:57
11628 "When you have resolved this problem, run \"git rebase --continue\".\n"
11629 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
11630 "To check out the original branch and stop rebasing, run \"git rebase --abort"
11633 "当您解决了此问题后,执行 \"git rebase --continue\"。\n"
11634 "如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
11635 "要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
11637 #: git-rebase.sh:165
11638 msgid "Applied autostash."
11639 msgstr "成功应用 autostash。"
11641 #: git-rebase.sh:168
11643 msgid "Cannot store $stash_sha1"
11644 msgstr "无法保存 $stash_sha1"
11646 #: git-rebase.sh:169
11648 "Applying autostash resulted in conflicts.\n"
11649 "Your changes are safe in the stash.\n"
11650 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
11652 "应用 autostash 导致冲突。\n"
11653 "您的修改安全地保存在 stash 中。\n"
11654 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
11656 #: git-rebase.sh:208
11657 msgid "The pre-rebase hook refused to rebase."
11658 msgstr "钩子 pre-rebase 拒绝变基操作。"
11660 #: git-rebase.sh:213
11661 msgid "It looks like git-am is in progress. Cannot rebase."
11662 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
11664 #: git-rebase.sh:354
11665 msgid "The --exec option must be used with the --interactive option"
11666 msgstr "选项 --exec 必须和选项 --interactive 同时使用"
11668 #: git-rebase.sh:359
11669 msgid "No rebase in progress?"
11670 msgstr "没有正在进行的变基?"
11672 #: git-rebase.sh:370
11673 msgid "The --edit-todo action can only be used during interactive rebase."
11674 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
11676 #: git-rebase.sh:377
11677 msgid "Cannot read HEAD"
11680 #: git-rebase.sh:380
11682 "You must edit all merge conflicts and then\n"
11683 "mark them as resolved using git add"
11685 "您必须编辑所有的合并冲突,然后通过 git add\n"
11688 #: git-rebase.sh:398
11690 msgid "Could not move back to $head_name"
11691 msgstr "无法移回 $head_name"
11693 #: git-rebase.sh:417
11696 "It seems that there is already a $state_dir_base directory, and\n"
11697 "I wonder if you are in the middle of another rebase. If that is the\n"
11698 "case, please try\n"
11699 "\t$cmd_live_rebase\n"
11700 "If that is not the case, please\n"
11701 "\t$cmd_clear_stale_rebase\n"
11702 "and run me again. I am stopping in case you still have something\n"
11705 "好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
11707 "\t$cmd_live_rebase\n"
11709 "\t$cmd_clear_stale_rebase\n"
11710 "然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
11712 #: git-rebase.sh:468
11714 msgid "invalid upstream $upstream_name"
11715 msgstr "无效的上游 $upstream_name"
11717 #: git-rebase.sh:492
11719 msgid "$onto_name: there are more than one merge bases"
11720 msgstr "$onto_name: 有一个以上的合并基准"
11722 #: git-rebase.sh:495 git-rebase.sh:499
11724 msgid "$onto_name: there is no merge base"
11725 msgstr "$onto_name: 没有合并基准"
11727 #: git-rebase.sh:504
11729 msgid "Does not point to a valid commit: $onto_name"
11730 msgstr "没有指向一个有效的提交:$onto_name"
11732 #: git-rebase.sh:527
11734 msgid "fatal: no such branch: $branch_name"
11735 msgstr "严重错误:无此分支:$branch_name"
11737 #: git-rebase.sh:560
11738 msgid "Cannot autostash"
11739 msgstr "无法 autostash"
11741 #: git-rebase.sh:565
11743 msgid "Created autostash: $stash_abbrev"
11744 msgstr "创建了 autostash: $stash_abbrev"
11746 #: git-rebase.sh:569
11747 msgid "Please commit or stash them."
11748 msgstr "请提交或为它们保存进度。"
11750 #: git-rebase.sh:589
11752 msgid "Current branch $branch_name is up to date."
11753 msgstr "当前分支 $branch_name 是最新的。"
11755 #: git-rebase.sh:593
11757 msgid "Current branch $branch_name is up to date, rebase forced."
11758 msgstr "当前分支 $branch_name 是最新的,强制变基。"
11760 #: git-rebase.sh:604
11762 msgid "Changes from $mb to $onto:"
11763 msgstr "变更从 $mb 到 $onto:"
11765 #: git-rebase.sh:613
11766 msgid "First, rewinding head to replay your work on top of it..."
11767 msgstr "首先,回退分支以便在上面重放您的工作..."
11769 #: git-rebase.sh:623
11771 msgid "Fast-forwarded $branch_name to $onto_name."
11772 msgstr "快进 $branch_name 至 $onto_name。"
11775 msgid "git stash clear with parameters is unimplemented"
11776 msgstr "git stash clear 不支持参数"
11779 msgid "You do not have the initial commit yet"
11783 msgid "Cannot save the current index state"
11784 msgstr "无法保存当前索引状态"
11786 #: git-stash.sh:124 git-stash.sh:137
11787 msgid "Cannot save the current worktree state"
11788 msgstr "无法保存当前工作区状态"
11790 #: git-stash.sh:141
11791 msgid "No changes selected"
11794 #: git-stash.sh:144
11795 msgid "Cannot remove temporary index (can't happen)"
11796 msgstr "无法删除临时索引(不应发生)"
11798 #: git-stash.sh:157
11799 msgid "Cannot record working tree state"
11802 #: git-stash.sh:189
11804 msgid "Cannot update $ref_stash with $w_commit"
11805 msgstr "无法用 $w_commit 更新 $ref_stash"
11807 #. TRANSLATORS: $option is an invalid option, like
11808 #. `--blah-blah'. The 7 spaces at the beginning of the
11809 #. second line correspond to "error: ". So you should line
11810 #. up the second line with however many characters the
11811 #. translation of "error: " takes in your language. E.g. in
11812 #. English this is:
11814 #. $ git stash save --blah-blah 2>&1 | head -n 2
11815 #. error: unknown option for 'stash save': --blah-blah
11816 #. To provide a message, use git stash save -- '--blah-blah'
11817 #: git-stash.sh:239
11820 "error: unknown option for 'stash save': $option\n"
11821 " To provide a message, use git stash save -- '$option'"
11823 "错误:'stash save' 的未知选项:$option\n"
11824 " 要提供一个描述信息,使用 git stash save -- '$option'"
11826 #: git-stash.sh:260
11827 msgid "No local changes to save"
11828 msgstr "没有要保存的本地修改"
11830 #: git-stash.sh:264
11831 msgid "Cannot initialize stash"
11832 msgstr "无法初始化 stash"
11834 #: git-stash.sh:268
11835 msgid "Cannot save the current status"
11838 #: git-stash.sh:286
11839 msgid "Cannot remove worktree changes"
11842 #: git-stash.sh:405
11844 msgid "unknown option: $opt"
11845 msgstr "未知选项: $opt"
11847 #: git-stash.sh:415
11848 msgid "No stash found."
11849 msgstr "未发现 stash。"
11851 #: git-stash.sh:422
11853 msgid "Too many revisions specified: $REV"
11854 msgstr "指定了太多的版本:$REV"
11856 #: git-stash.sh:428
11858 msgid "$reference is not a valid reference"
11859 msgstr "$reference 不是一个有效的引用"
11861 #: git-stash.sh:456
11863 msgid "'$args' is not a stash-like commit"
11864 msgstr "'$args' 不是 stash 样提交"
11866 #: git-stash.sh:467
11868 msgid "'$args' is not a stash reference"
11869 msgstr "'$args' 不是一个 stash 引用"
11871 #: git-stash.sh:475
11872 msgid "unable to refresh index"
11875 #: git-stash.sh:479
11876 msgid "Cannot apply a stash in the middle of a merge"
11877 msgstr "无法在合并过程中恢复进度"
11879 #: git-stash.sh:487
11880 msgid "Conflicts in index. Try without --index."
11881 msgstr "索引中有冲突。尝试不使用 --index。"
11883 #: git-stash.sh:489
11884 msgid "Could not save index tree"
11887 #: git-stash.sh:523
11888 msgid "Cannot unstage modified files"
11889 msgstr "无法将修改的文件取消暂存"
11891 #: git-stash.sh:538
11892 msgid "Index was not unstashed."
11893 msgstr "索引的进度没有被恢复。"
11895 #: git-stash.sh:561
11897 msgid "Dropped ${REV} ($s)"
11898 msgstr "丢弃了 ${REV} ($s)"
11900 #: git-stash.sh:562
11902 msgid "${REV}: Could not drop stash entry"
11903 msgstr "${REV}:不能丢弃进度条目"
11905 #: git-stash.sh:570
11906 msgid "No branch name specified"
11909 #: git-stash.sh:642
11910 msgid "(To restore them type \"git stash apply\")"
11911 msgstr "(为恢复数据输入 \"git stash apply\")"
11913 #: git-submodule.sh:104
11915 msgid "cannot strip one component off url '$remoteurl'"
11916 msgstr "无法从 url '$remoteurl' 剥离一个组件"
11918 #: git-submodule.sh:281
11919 msgid "Relative path can only be used from the toplevel of the working tree"
11920 msgstr "只能在工作区的顶级目录中使用相对路径"
11922 #: git-submodule.sh:291
11924 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11925 msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11927 #: git-submodule.sh:308
11929 msgid "'$sm_path' already exists in the index"
11930 msgstr "'$sm_path' 已经存在于索引中"
11932 #: git-submodule.sh:312
11935 "The following path is ignored by one of your .gitignore files:\n"
11937 "Use -f if you really want to add it."
11939 "以下路径被您的一个 .gitignore 文件所忽略:\n"
11941 "如果您确实想添加它,使用 -f 参数。"
11943 #: git-submodule.sh:330
11945 msgid "Adding existing repo at '$sm_path' to the index"
11946 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
11948 #: git-submodule.sh:332
11950 msgid "'$sm_path' already exists and is not a valid git repo"
11951 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
11953 #: git-submodule.sh:340
11955 msgid "A git directory for '$sm_name' is found locally with remote(s):"
11956 msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
11958 #: git-submodule.sh:342
11961 "If you want to reuse this local git directory instead of cloning again from"
11962 msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11964 #: git-submodule.sh:344
11967 "use the '--force' option. If the local git directory is not the correct repo"
11968 msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
11970 #: git-submodule.sh:345
11973 "or you are unsure what this means choose another name with the '--name' "
11975 msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11977 #: git-submodule.sh:347
11979 msgid "Reactivating local git directory for submodule '$sm_name'."
11980 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11982 #: git-submodule.sh:359
11984 msgid "Unable to checkout submodule '$sm_path'"
11985 msgstr "不能检出子模组 '$sm_path'"
11987 #: git-submodule.sh:364
11989 msgid "Failed to add submodule '$sm_path'"
11990 msgstr "无法添加子模组 '$sm_path'"
11992 #: git-submodule.sh:373
11994 msgid "Failed to register submodule '$sm_path'"
11995 msgstr "无法注册子模组 '$sm_path'"
11997 #: git-submodule.sh:417
11999 msgid "Entering '$prefix$displaypath'"
12000 msgstr "正在进入 '$prefix$displaypath'"
12002 #: git-submodule.sh:437
12004 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
12005 msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
12007 #: git-submodule.sh:483
12009 msgid "No url found for submodule path '$displaypath' in .gitmodules"
12010 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
12012 #: git-submodule.sh:492
12014 msgid "Failed to register url for submodule path '$displaypath'"
12015 msgstr "无法为子模组路径 '$displaypath' 注册 url"
12017 #: git-submodule.sh:494
12019 msgid "Submodule '$name' ($url) registered for path '$displaypath'"
12020 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12022 #: git-submodule.sh:511
12024 msgid "Failed to register update mode for submodule path '$displaypath'"
12025 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
12027 #: git-submodule.sh:549
12029 msgid "Use '.' if you really want to deinitialize all submodules"
12030 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
12032 #: git-submodule.sh:566
12034 msgid "Submodule work tree '$displaypath' contains a .git directory"
12035 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
12037 #: git-submodule.sh:567
12040 "(use 'rm -rf' if you really want to remove it including all of its history)"
12041 msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
12043 #: git-submodule.sh:573
12046 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
12048 msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
12050 #: git-submodule.sh:576
12052 msgid "Cleared directory '$displaypath'"
12053 msgstr "已清除目录 '$displaypath'"
12055 #: git-submodule.sh:577
12057 msgid "Could not remove submodule work tree '$displaypath'"
12058 msgstr "无法移除子模组工作区 '$displaypath'"
12060 #: git-submodule.sh:580
12062 msgid "Could not create empty submodule directory '$displaypath'"
12063 msgstr "不能创建空的子模组目录 '$displaypath'"
12065 #: git-submodule.sh:589
12067 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
12068 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
12070 #: git-submodule.sh:723
12073 "Submodule path '$displaypath' not initialized\n"
12074 "Maybe you want to use 'update --init'?"
12076 "子模组路径 '$displaypath' 没有初始化\n"
12077 "也许您想用 'update --init'?"
12079 #: git-submodule.sh:736
12081 msgid "Unable to find current revision in submodule path '$displaypath'"
12082 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
12084 #: git-submodule.sh:745
12086 msgid "Unable to fetch in submodule path '$sm_path'"
12087 msgstr "无法在子模组路径 '$sm_path' 中获取"
12089 #: git-submodule.sh:768
12091 msgid "Unable to fetch in submodule path '$displaypath'"
12092 msgstr "无法在子模组路径 '$displaypath' 中获取"
12094 #: git-submodule.sh:788
12096 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
12097 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
12099 #: git-submodule.sh:789
12101 msgid "Submodule path '$displaypath': checked out '$sha1'"
12102 msgstr "子模组路径 '$displaypath':检出 '$sha1'"
12104 #: git-submodule.sh:793
12106 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
12107 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
12109 #: git-submodule.sh:794
12111 msgid "Submodule path '$displaypath': rebased into '$sha1'"
12112 msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
12114 #: git-submodule.sh:799
12116 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
12117 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
12119 #: git-submodule.sh:800
12121 msgid "Submodule path '$displaypath': merged in '$sha1'"
12122 msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
12124 #: git-submodule.sh:805
12127 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
12128 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
12130 #: git-submodule.sh:806
12132 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
12133 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
12135 #: git-submodule.sh:836
12137 msgid "Failed to recurse into submodule path '$displaypath'"
12138 msgstr "无法递归进子模组路径 '$displaypath'"
12140 #: git-submodule.sh:944
12141 msgid "The --cached option cannot be used with the --files option"
12142 msgstr "选项 --cached 不能和选项 --files 同时使用"
12144 #: git-submodule.sh:996
12146 msgid "unexpected mode $mod_dst"
12147 msgstr "意外的模式 $mod_dst"
12150 #: git-submodule.sh:1016
12152 msgid " Warn: $display_name doesn't contain commit $sha1_src"
12153 msgstr " 警告:$display_name 未包含提交 $sha1_src"
12156 #: git-submodule.sh:1019
12158 msgid " Warn: $display_name doesn't contain commit $sha1_dst"
12159 msgstr " 警告:$display_name 未包含提交 $sha1_dst"
12162 #: git-submodule.sh:1022
12164 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
12165 msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
12167 #: git-submodule.sh:1047
12171 #: git-submodule.sh:1165
12173 msgid "Failed to recurse into submodule path '$sm_path'"
12174 msgstr "无法递归进子模组路径 '$sm_path'"
12176 #: git-submodule.sh:1229
12178 msgid "Synchronizing submodule url for '$displaypath'"
12179 msgstr "为 '$displaypath' 同步子模组 url"
12181 #~ msgid "Forward-port local commits to the updated upstream head"
12182 #~ msgstr "本地提交转移至更新后的上游分支中"
12184 #~ msgid "unable to parse format"
12187 #~ msgid "improper format entered align:%s"
12188 #~ msgstr "输入了不正确的格式 align:%s"
12190 #~ msgid "Could not set core.worktree in %s"
12191 #~ msgstr "不能在 %s 中设置 core.worktree"
12193 # 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
12195 #~ "push.default is unset; its implicit value has changed in\n"
12196 #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
12197 #~ "and maintain the traditional behavior, use:\n"
12199 #~ " git config --global push.default matching\n"
12201 #~ "To squelch this message and adopt the new behavior now, use:\n"
12203 #~ " git config --global push.default simple\n"
12205 #~ "When push.default is set to 'matching', git will push local branches\n"
12206 #~ "to the remote branches that already exist with the same name.\n"
12208 #~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
12209 #~ "behavior, which only pushes the current branch to the corresponding\n"
12210 #~ "remote branch that 'git pull' uses to update the current branch.\n"
12212 #~ "See 'git help config' and search for 'push.default' for further "
12213 #~ "information.\n"
12214 #~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
12215 #~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
12217 #~ "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
12218 #~ "变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
12220 #~ " git config --global push.default matching\n"
12222 #~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
12224 #~ " git config --global push.default simple\n"
12226 #~ "当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
12229 #~ "从 Git 2.0 开始,Git 默认采用更为保守的 'simple' 模式,只推送当前\n"
12230 #~ "分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
12232 #~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
12233 #~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
12234 #~ "为保持兼容,请用 'current' 代替 'simple')"
12236 #~ msgid "Could not append '%s'"
12237 #~ msgstr "不能追加 '%s'"
12239 #~ msgid "Could not set '%s'"
12240 #~ msgstr "不能设置 '%s'"
12243 #~ msgid "check|on-demand|no"
12244 #~ msgstr "check|on-demand|no"
12246 #~ msgid "Missing author: %s"
12247 #~ msgstr "缺少作者:%s"
12249 #~ msgid "Testing "
12252 #~ msgid "unable to look up current user in the passwd file: %s"
12253 #~ msgstr "无法在口令文件中查询到当前用户:%s"
12255 #~ msgid "no such user"
12258 #~ msgid "show usage"
12261 #~ msgid "branch '%s' does not point at a commit"
12262 #~ msgstr "分支 '%s' 未指向一个提交"
12264 #~ msgid "object '%s' does not point to a commit"
12265 #~ msgstr "对象 '%s' 没有指向一个提交"
12267 #~ msgid "print only merged branches"
12268 #~ msgstr "只打印合并的分支"
12270 #~ msgid "--dissociate given, but there is no --reference"
12271 #~ msgstr "提供了参数 --dissociate,但未提供 --reference"
12273 #~ msgid "insanely long template name %s"
12274 #~ msgstr "太长的模版名 %s"
12276 #~ msgid "insanely long symlink %s"
12277 #~ msgstr "太长的符号链接 %s"
12279 #~ msgid "insanely long template path %s"
12280 #~ msgstr "太长的模版路径 %s"
12282 #~ msgid "insane git directory %s"
12283 #~ msgstr "不正常的 git 目录 %s"
12285 #~ msgid "unsupported sort specification '%s'"
12286 #~ msgstr "不支持的排序规格 '%s'"
12288 #~ msgid "unsupported sort specification '%s' in variable '%s'"
12289 #~ msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
12291 #~ msgid "switch 'points-at' requires an object"
12292 #~ msgstr "开关 'points-at' 需要一个对象"
12294 #~ msgid "sort tags"
12297 #~ msgid "--sort and -n are incompatible"
12298 #~ msgstr "--sort 和 -n 不兼容"
12300 #~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
12301 #~ msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
12303 #~ msgid "false|true|preserve"
12304 #~ msgstr "false|true|preserve"
12306 #~ msgid "BUG: reopen a lockfile that is still open"
12307 #~ msgstr "BUG: 重新打开一个仍打开着的锁文件"
12309 #~ msgid "BUG: reopen a lockfile that has been committed"
12310 #~ msgstr "BUG: 重新打开一个已提交的锁文件"
12312 #~ msgid "option %s does not accept negative form"
12313 #~ msgstr "选项 %s 不接受否定格式"
12315 #~ msgid "unable to parse value '%s' for option %s"
12316 #~ msgstr "不能解析选项 %1$s 的值 '%2$s'"
12318 #~ msgid "-b and -B are mutually exclusive"
12319 #~ msgstr "-b 和 -B 互斥"
12321 #~ msgid "You need to set your committer info first"
12322 #~ msgstr "您需要先设置你的提交者信息"
12325 #~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
12326 #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
12327 #~ "To restore the original branch and stop patching, run \"$cmdline --abort"
12330 #~ "当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
12331 #~ "如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
12332 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12334 #~ msgid "Patch format $patch_format is not supported."
12335 #~ msgstr "不支持 $patch_format 补丁格式。"
12337 #~ msgid "Please make up your mind. --skip or --abort?"
12338 #~ msgstr "请下决心。--skip 或是 --abort ?"
12341 #~ "Patch is empty. Was it split wrong?\n"
12342 #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
12343 #~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
12345 #~ "补丁为空。是不是切分错误?\n"
12346 #~ "如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
12347 #~ "要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
12349 #~ msgid "Patch does not have a valid e-mail address."
12350 #~ msgstr "补丁中没有一个有效的邮件地址。"
12352 #~ msgid "Applying: $FIRSTLINE"
12353 #~ msgstr "正应用:$FIRSTLINE"
12355 #~ msgid "Patch failed at $msgnum $FIRSTLINE"
12356 #~ msgstr "补丁失败于 $msgnum $FIRSTLINE"
12359 #~ "Pull is not possible because you have unmerged files.\n"
12360 #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
12361 #~ "as appropriate to mark resolution and make a commit."
12363 #~ "Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
12364 #~ "然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
12366 #~ msgid "Pull is not possible because you have unmerged files."
12367 #~ msgstr "Pull 不可用,因为您尚有未合并的文件。"